diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php index c37a2a8e3ff..5934e8dff55 100644 --- a/htdocs/product/stock/productlot_list.php +++ b/htdocs/product/stock/productlot_list.php @@ -99,8 +99,8 @@ $arrayfields=array( //'t.entity'=>array('label'=>$langs->trans("Fieldentity"), 'checked'=>1), 't.batch'=>array('label'=>$langs->trans("Batch"), 'checked'=>1), 't.fk_product'=>array('label'=>$langs->trans("Product"), 'checked'=>1), - 't.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>1), 't.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>1), + 't.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>1), //'t.import_key'=>array('label'=>$langs->trans("ImportKey"), 'checked'=>1), //'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))), //'t.fk_user_creat'=>array('label'=>$langs->trans("UserCreationShort"), 'checked'=>0, 'position'=>500), @@ -207,8 +207,8 @@ $sql.= " t.rowid,"; $sql.= " t.entity,"; $sql.= " t.fk_product,"; $sql.= " t.batch,"; -$sql.= " t.eatby,"; $sql.= " t.sellby,"; +$sql.= " t.eatby,"; $sql.= " t.datec as date_creation,"; $sql.= " t.tms as date_update,"; $sql.= " t.fk_user_creat,"; @@ -337,8 +337,8 @@ if ($resql) if (! empty($arrayfields['t.entity']['checked'])) print ''; if (! empty($arrayfields['t.batch']['checked'])) print ''; if (! empty($arrayfields['t.fk_product']['checked'])) print ''; - if (! empty($arrayfields['t.eatby']['checked'])) print ''; if (! empty($arrayfields['t.sellby']['checked'])) print ''; + if (! empty($arrayfields['t.eatby']['checked'])) print ''; if (! empty($arrayfields['t.fk_user_creat']['checked'])) print ''; if (! empty($arrayfields['t.fk_user_modif']['checked'])) print ''; if (! empty($arrayfields['t.import_key']['checked'])) print ''; @@ -380,8 +380,8 @@ if ($resql) if (! empty($arrayfields['t.entity']['checked'])) print_liste_field_titre($arrayfields['t.entity']['label'],$_SERVER['PHP_SELF'],'t.entity','',$param,'',$sortfield,$sortorder); if (! empty($arrayfields['t.batch']['checked'])) print_liste_field_titre($arrayfields['t.batch']['label'],$_SERVER['PHP_SELF'],'t.batch','',$param,'',$sortfield,$sortorder); if (! empty($arrayfields['t.fk_product']['checked'])) print_liste_field_titre($arrayfields['t.fk_product']['label'],$_SERVER['PHP_SELF'],'t.fk_product','',$param,'',$sortfield,$sortorder); - if (! empty($arrayfields['t.eatby']['checked'])) print_liste_field_titre($arrayfields['t.eatby']['label'],$_SERVER['PHP_SELF'],'t.eatby','',$param,'',$sortfield,$sortorder); if (! empty($arrayfields['t.sellby']['checked'])) print_liste_field_titre($arrayfields['t.sellby']['label'],$_SERVER['PHP_SELF'],'t.sellby','',$param,'',$sortfield,$sortorder); + if (! empty($arrayfields['t.eatby']['checked'])) print_liste_field_titre($arrayfields['t.eatby']['label'],$_SERVER['PHP_SELF'],'t.eatby','',$param,'',$sortfield,$sortorder); if (! empty($arrayfields['t.fk_user_creat']['checked'])) print_liste_field_titre($arrayfields['t.fk_user_creat']['label'],$_SERVER['PHP_SELF'],'t.fk_user_creat','',$param,'',$sortfield,$sortorder); if (! empty($arrayfields['t.fk_user_modif']['checked'])) print_liste_field_titre($arrayfields['t.fk_user_modif']['label'],$_SERVER['PHP_SELF'],'t.fk_user_modif','',$param,'',$sortfield,$sortorder); if (! empty($arrayfields['t.import_key']['checked'])) print_liste_field_titre($arrayfields['t.import_key']['label'],$_SERVER['PHP_SELF'],'t.import_key','',$param,'',$sortfield,$sortorder); @@ -433,16 +433,16 @@ if ($resql) print ''.$productstatic->getNomUrl(1).''; if (! $i) $totalarray['nbfield']++; } - if (! empty($arrayfields['t.eatby']['checked'])) - { - print ''.dol_print_date($db->jdate($obj->eatby), 'day').''; - if (! $i) $totalarray['nbfield']++; - } if (! empty($arrayfields['t.sellby']['checked'])) { print ''.dol_print_date($db->jdate($obj->sellby), 'day').''; if (! $i) $totalarray['nbfield']++; } + if (! empty($arrayfields['t.eatby']['checked'])) + { + print ''.dol_print_date($db->jdate($obj->eatby), 'day').''; + if (! $i) $totalarray['nbfield']++; + } if (! empty($arrayfields['t.fk_user_creat']['checked'])) { print ''.$obj->fk_user_creat.'';