Merge branch 'ticket-14436-WP' into develop

This commit is contained in:
Marion Muszynski 2017-11-06 17:41:16 +01:00
commit 7d06b3c212

View File

@ -280,7 +280,7 @@ class GenerateWp
->setCellValue('AO'.$i, '=AA'.$i.'*AF'.$i)
->setCellValue('AP'.$i, isset($row['nc8'])?$row['nc8']:"")
->setCellValue('AQ'.$i, isset($row['id_country'])?$row['id_country']:"")
->setCellValue('AR'.$i, $sales[$id_categories[0]]);
->setCellValue('AR'.$i, date('d/m/Y',strtotime($sales[$id_categories[0]]));
$this->objPHPExcel->setActiveSheetIndex(0)->getStyle('B'.$i.':AR'.$i.'')->applyFromArray($borders_style);
$this->objPHPExcel->setActiveSheetIndex(1)->setCellValue('B'.$i, (String)$row['ean'])