diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 282c103401e..02a11adeeac 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -857,7 +857,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') print ''; // Status - print ''; + print ''; print $form->selectarray('search_status', array('-1'=>'','0'=>$contactstatic->LibStatut(0,1),'1'=>$contactstatic->LibStatut(1,1)),$search_status); print ''; diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php index f2494592815..36f9e1a7f7c 100644 --- a/htdocs/product/stock/index.php +++ b/htdocs/product/stock/index.php @@ -140,8 +140,8 @@ if ($resql) if (! empty($conf->productbatch->enabled)) { print ''.$langs->trans("Batch").''; - print ''.$langs->trans("EatByDate").''; print ''.$langs->trans("SellByDate").''; + print ''.$langs->trans("EatByDate").''; } print ''.$langs->trans("Warehouse").''; print ''.$langs->trans("FullList").''; @@ -152,23 +152,24 @@ if ($resql) { $objp = $db->fetch_object($resql); - print ''; - print ''.dol_print_date($db->jdate($objp->datem),'dayhour').''; - print ""; $producttmp->id = $objp->rowid; $producttmp->ref = $objp->produit; $producttmp->status_batch = $objp->tobatch; $producttmp->status_sell = $objp->tosell; $producttmp->status_buy = $objp->tobuy; + + print ''; + print ''.dol_print_date($db->jdate($objp->datem),'dayhour').''; + print ''; print $producttmp->getNomUrl(1); print "\n"; if (! empty($conf->productbatch->enabled)) { print ''.$objp->batch.''; - print ''.dol_print_date($db->jdate($objp->eatby),'day').''; print ''.dol_print_date($db->jdate($objp->sellby),'day').''; + print ''.dol_print_date($db->jdate($objp->eatby),'day').''; } - print ''; + print ''; print img_object($langs->trans("ShowWarehouse"),"stock").' '.$objp->stock; print "\n"; print '';