antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-9374-SaveEuroSign' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-02-09 10:06:20 +01:00
commit eadaa6320a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
adm/tabs/AdminImport.php
View File

@ -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;

2
modules/privatesales_logistique/exportOrderForm.php
View File

@ -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) {