From 21fb81f501d582c8bdf045222e24dbb8c6b0bbd8 Mon Sep 17 00:00:00 2001 From: Christophe Latour Date: Thu, 1 Sep 2016 14:45:58 +0200 Subject: [PATCH] #10655 Address color red to black Address neolys formatted Add privatesale id in the file name --- modules/privatesales_tools/classes/MakeFile.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/privatesales_tools/classes/MakeFile.php b/modules/privatesales_tools/classes/MakeFile.php index 3e0d2dc3..1d798b58 100755 --- a/modules/privatesales_tools/classes/MakeFile.php +++ b/modules/privatesales_tools/classes/MakeFile.php @@ -45,7 +45,7 @@ class MakeFile { case self::TYPE_BDC : $show_product_ids = LOGISTIQUE_SHOW_DECIMAL_ID_PRODUCT; // $title = 'Bon de commande ' . $private_sale->name . ' du '.$date_from->getDate('STR').' au '.$date_to->getDate('STR'); - $title = 'BDC '.$private_sale->title; + $title = 'BDC '.$private_sale->title.' - '.$private_sale->id_privatesales; $letter_bdc_logo = 'B'; $letter_bdc_logo_end = 'C'; @@ -222,8 +222,9 @@ class MakeFile { $activeSheet->getStyle($letter_address.$i)->getAlignment()->setWrapText(true); $activeSheet->getStyle($letter_address.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_TOP); $activeSheet->getStyle($letter_address.$i)->getFont()->setSize(10); - $activeSheet->getStyle($letter_address.$i)->getFont()->getColor()->setRGB('FF0000'); + $activeSheet->getStyle($letter_address.$i)->getFont()->getColor()->setRGB('000000'); $activeSheet->getStyle($letter_address.$i)->getFont()->setBold(true); + $activeSheet->getRowDimension($i)->setRowHeight(110); $activeSheet->mergeCells($letter_address.$i.':'.$letter_address_end.$i ); $activeSheet->mergeCells($letter_address.$iOri.':'.$letter_address.$i );