From 74704acbcb618d98c5f11f8feb3fa99b67341041 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 18 Jul 2018 16:13:13 +0200 Subject: [PATCH] clean and update code --- htdocs/imports/import.php | 5 ++--- htdocs/livraison/card.php | 6 +++--- htdocs/product/admin/product.php | 4 +--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 10747ed0212..73c3d071110 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -905,12 +905,11 @@ if ($step == 4 && $datatoimport) $height=24; $i = 0; $mandatoryfieldshavesource=true; - $var=true; + print ''; foreach($fieldstarget as $code=>$label) { - $var = !$var; - print ''; + print ''; $i++; $entity=(! empty($objimport->array_import_entities[0][$code])?$objimport->array_import_entities[0][$code]:$objimport->array_import_icon[0]); diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php index 072c53aa3cb..b33b9b4fb7a 100644 --- a/htdocs/livraison/card.php +++ b/htdocs/livraison/card.php @@ -5,7 +5,7 @@ * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2013 Florian Henry - * Copyright (C) 2015 Claudio Aschieri + * Copyright (C) 2015 Claudio Aschieri * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -586,7 +586,7 @@ else print ''; /* - * Lignes produits + * Products lines */ $num_prod = count($object->lines); @@ -683,7 +683,7 @@ else $line->array_options = array_merge($line->array_options, $srcLine->array_options); } print ''; - print $line->showOptionals($extrafieldsline, $mode, array('style'=>$bc[$var], 'colspan'=>$colspan),$i); + print $line->showOptionals($extrafieldsline, $mode, array('style'=>'class="oddeven"', 'colspan'=>$colspan),$i); print ''; } diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 2e57e452928..cbf47bbcd21 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -658,7 +658,6 @@ if (! empty($conf->global->PRODUCT_CANVAS_ABILITY)) { // Add canvas feature $dir = DOL_DOCUMENT_ROOT . "/product/canvas/"; - $var = false; print ''; print ''."\n"; @@ -686,8 +685,7 @@ if (! empty($conf->global->PRODUCT_CANVAS_ABILITY)) if ($conf->$module->enabled) { - - print "
'.$langs->trans("ProductSpecial").'
"; + print '
'; print $object->description;