From b67363d76988e5a7c0de8c436016b47fbf64d24e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 May 2019 18:54:43 +0200
Subject: [PATCH] Fix rename export php lib to avoi duplicate with old library.

---
 htdocs/core/modules/export/export_excel.modules.php        | 2 +-
 htdocs/core/modules/export/export_excel2007.modules.php    | 2 +-
 htdocs/core/modules/export/export_excel2007new.modules.php | 2 +-
 htdocs/exports/export.php                                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php
index 3eafc454530..ffb1fd83cce 100644
--- a/htdocs/core/modules/export/export_excel.modules.php
+++ b/htdocs/core/modules/export/export_excel.modules.php
@@ -76,7 +76,7 @@ class ExportExcel extends ModeleExports
 		$this->db = $db;
 
 		$this->id='excel';                  // Same value then xxx in file name export_xxx.modules.php
-		$this->label='Excel 95';            // Label of driver
+		$this->label='Excel 95 (old library)';            // Label of driver
 		$this->desc = $langs->trans('Excel95FormatDesc');
 		$this->extension='xls';             // Extension for generated file by this driver
         $this->picto='mime/xls';            // Picto
diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php
index e33849427b1..7460d71ff13 100644
--- a/htdocs/core/modules/export/export_excel2007.modules.php
+++ b/htdocs/core/modules/export/export_excel2007.modules.php
@@ -76,7 +76,7 @@ class ExportExcel2007 extends ExportExcel
 		$this->db = $db;
 
 		$this->id='excel2007';                  // Same value then xxx in file name export_xxx.modules.php
-		$this->label='Excel 2007';               // Label of driver
+		$this->label='Excel 2007 (old library)';               // Label of driver
 		$this->desc = $langs->trans('Excel2007FormatDesc');
 		$this->extension='xlsx';             // Extension for generated file by this driver
         $this->picto='mime/xls';			// Picto
diff --git a/htdocs/core/modules/export/export_excel2007new.modules.php b/htdocs/core/modules/export/export_excel2007new.modules.php
index 32b6029a294..266cedc1310 100644
--- a/htdocs/core/modules/export/export_excel2007new.modules.php
+++ b/htdocs/core/modules/export/export_excel2007new.modules.php
@@ -78,7 +78,7 @@ class ExportExcel2007new extends ModeleExports
 		$this->db = $db;
 
 		$this->id='excel2007new';                  // Same value then xxx in file name export_xxx.modules.php
-		$this->label='Excel 2007 by PHPSpreadSheet';             // Label of driver
+		$this->label='Excel 2007';             // Label of driver
 		$this->desc = $langs->trans('Excel2007FormatDesc');
 		$this->extension='xlsx';             // Extension for generated file by this driver
         $this->picto='mime/xls';					// Picto
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 9663806fdc2..b6dfc23cf48 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -1009,7 +1009,7 @@ if ($step == 4 && $datatoexport)
 
         print '<td class="right" width="100">';
         print $value.' ';
-        print '</td><td class="center" width="20">';
+        print '</td><td class="center nowraponall" width="40">';
         if ($value < count($array_selected)) print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=downfield&field='.$code.'">'.img_down().'</a>';
         if ($value > 1) print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=upfield&field='.$code.'">'.img_up().'</a>';
         print '</td>';