diff --git a/adm/tabs/AdminImport.php b/adm/tabs/AdminImport.php index c691b93e..eaec6673 100755 --- a/adm/tabs/AdminImport.php +++ b/adm/tabs/AdminImport.php @@ -1463,13 +1463,19 @@ class AdminImport extends AdminTab $value = str_replace("\x92", "'", $value); $value = str_replace("’", "'", $value); $value = str_replace("\x9C", "oe", $value); + $value = str_replace("\x80", "€", $value); + $value = str_replace("\x26", "&", $value); $array[$key] = utf8_encode($value); + $array[$key] = str_replace("€", "€", $array[$key]); } else{ $array = str_replace("\x92", "'", $array); $array = str_replace("’", "'", $array); - $value = str_replace("\x9C", "oe", $value); + $array = str_replace("\x9C", "oe", $array); + $array = str_replace("\x80", "€", $array); + $array = str_replace("\x26", "&", $array); $array = utf8_encode($array); + $array = str_replace("€", "€", $array); } return $array; diff --git a/modules/privatesales_logistique/exportOrderForm.php b/modules/privatesales_logistique/exportOrderForm.php index a493a216..a062a0b6 100755 --- a/modules/privatesales_logistique/exportOrderForm.php +++ b/modules/privatesales_logistique/exportOrderForm.php @@ -904,6 +904,7 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV $activeSheet->getStyle($firstColumn.$i)->applyFromArray($borders_style); $activeSheet->SetCellValue($letter_product_ean.$i, $values['line']['product_ean13']); + $activeSheet->getStyle($letter_product_ean.$i)->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_NUMBER ); $activeSheet->getStyle($letter_product_ean.$i)->applyFromArray($borders_style); $activeSheet->SetCellValue($letter_product_ref_interne.$i, $values['line']['product_reference']); @@ -1190,6 +1191,7 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV $activeSheet->getStyle($letter_product_shipped.$i)->applyFromArray($borders_style); $activeSheet->getColumnDimension($firstColumn)->setWidth(25); + $activeSheet->getColumnDimension($letter_product_ean)->setWidth(25); $activeSheet->getColumnDimension($letter_product_ref_interne)->setWidth(25); $activeSheet->getColumnDimension($letter_product_name)->setWidth(40); if ($have_declinaison === true) {