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

Merge branch 'ticket-9791' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-04-06 13:21:41 +02:00
commit cc700bbebd
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/privatesales_logistique/exportOrderForm.php
View File

@ -46,6 +46,9 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
'Purchase order logistic' => 'Purchase order logistic',
'State order' => 'Sales report',
'Missing' => 'Missing',
'Colisage' => 'Packing',
'The number below must be present on each document regarding this order, delivery note, invoice :' => 'The number below must be present on each document regarding this order, delivery note, invoice :',
'PURCHASE ORDER NUMBER' => 'PURCHASE ORDER NUMBER',
'Delivery adress' => 'Delivery address',
@ -69,6 +72,9 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
'State order' => 'Etat des ventes',
'YES' => 'OUI',
'Missing' => 'Manquant',
'Colisage' => 'Colisage/Ferme',
'PURCHASE ORDER NUMBER' => 'NUMERO DE BON DE COMMANDE',
'Delivery adress' => 'Adresse de livraison',
'PURCHASE ORDER DATE' => 'DATE DU BON DE COMMANDE',
@ -691,7 +697,7 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
$activeSheet->getStyle($letter_product_multi.$i)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
$activeSheet->getStyle($letter_product_multi.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
$activeSheet->setCellValue($letter_product_colisage.$i, 'Colisage/ferme');
$activeSheet->setCellValue($letter_product_colisage.$i, $lang['Colisage']);
$activeSheet->getStyle($letter_product_colisage.$i)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
$activeSheet->getStyle($letter_product_colisage.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
@ -699,7 +705,7 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
$activeSheet->getStyle($letter_product_stock3btk.$i)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
$activeSheet->getStyle($letter_product_stock3btk.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
$activeSheet->setCellValue($letter_product_missing.$i, 'Manquant');
$activeSheet->setCellValue($letter_product_missing.$i, $lang['Missing']);
$activeSheet->getStyle($letter_product_missing.$i)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
$activeSheet->getStyle($letter_product_missing.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);