Merge branch 'ticket-9791' into develop

This commit is contained in:
Marion Muszynski 2016-04-08 16:10:18 +02:00
commit 261ef37fd4

View File

@ -689,6 +689,10 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
)
);
$activeSheet->SetCellValue($firstColumn.$i, $lang['Product ID']);
$activeSheet->getStyle($firstColumn.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
$activeSheet->getStyle($firstColumn.$i)->applyFromArray($borders_style);
$activeSheet->SetCellValue($letter_product_ref_interne.$i, $lang['Reference BB']);
$activeSheet->getStyle($letter_product_ref_interne.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
$activeSheet->getStyle($letter_product_ref_interne.$i)->applyFromArray($borders_style);
@ -861,6 +865,10 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
$wholesale_price = $current_product->wholesale_price;
}
$activeSheet->SetCellValue($firstColumn.$i, $values['line']['product_supplier_reference']);
$activeSheet->getStyle($firstColumn.$i)->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_TEXT );
$activeSheet->getStyle($firstColumn.$i)->applyFromArray($borders_style);
$activeSheet->SetCellValue($letter_product_ref_interne.$i, $values['line']['product_reference']);
$activeSheet->getStyle($letter_product_ref_interne.$i)->applyFromArray($borders_style);
@ -1108,9 +1116,9 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
$activeSheet->getStyle($letter_product_name.$i)->applyFromArray($borders_style);
}
$activeSheet->SetCellValue($letter_product_ht.$i, '=SUM('.$letter_product_ht.($iOri).':'.$letter_product_ht.($i-1).')');
$activeSheet->getStyle($letter_product_ht.$i)->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_EUR );
$activeSheet->getStyle($letter_product_ht.$i)->getFont()->setBold(true);
//$activeSheet->SetCellValue($letter_product_ht.$i, '=SUM('.$letter_product_ht.($iOri).':'.$letter_product_ht.($i-1).')');
//$activeSheet->getStyle($letter_product_ht.$i)->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_EUR );
//$activeSheet->getStyle($letter_product_ht.$i)->getFont()->setBold(true);
$activeSheet->getStyle($letter_product_ht.$i)->applyFromArray($borders_style);
$activeSheet->SetCellValue($letter_product_multi.$i, '=SUM('.$letter_product_multi.($iOri).':'.$letter_product_multi.($i-1).')');