Merge branch 'ticket-14436-WP' into develop

This commit is contained in:
Marion Muszynski 2017-10-31 12:41:21 +01:00
commit e72bdef669
2 changed files with 3 additions and 2 deletions

View File

@ -190,6 +190,7 @@ class AdminAntWp extends AdminTab
if(!empty($params['lines'])){
$wp = new GenerateWp();
$wp->generate($params);
$filename = str_replace(' ', '_', $filename);
$wp->objWriter->save(dirname(__FILE__).'/'.$filename.'.xlsx');
$this->_html .= HelperFormBootstrap::displaySuccess('Génération complète <br><a class="btn btn-primary btn-xs" href="../modules/ant_wp/'.$filename.'.xlsx" download="'.$filename.'.xlsx">Télécharger le XLS</a><br>Produits trouvés : '.$product_found.'<br>Produits nouveaux : '.$new_products);
} else {

View File

@ -294,8 +294,8 @@ class GenerateWp
->setCellValue('E'.$i, '')
->setCellValue('F'.$i, '')
->setCellValue('G'.$i, '')
->setCellValue('H'.$i, '')
->setCellValue('I'.$i, $row['name_ha'])
->setCellValue('H'.$i, $row['name_ha'])
->setCellValue('I'.$i, '')
->setCellValue('J'.$i, '=LEN(D'.$i.')')
->setCellValue('K'.$i, '')
->setCellValue('L'.$i, '')