diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 6726ef25d62..63f7b9d1653 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -749,7 +749,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) print ""; print "propalid\">".img_object($langs->trans("ShowPropal"),"propal")." ".$objp->ref."\n"; print "idp\">".dolibarr_trunc($objp->nom,18)."\n"; - print "". strftime("%d %b",$objp->dp)."\n"; + print "".dolibarr_print_date($objp->dp,"%d %b")."\n"; print ''; print ''; print ''.$langs->trans("Discount"); @@ -780,12 +780,12 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) { $var=false; print '
'; - print ''.$otherprop; + print '
'; print ''; print ''; - print '"; } + print "
'.$langs->trans("OtherPropals").''; $html->select_array("propalid", $otherprop); print '
'. strftime("%d %b",$objp->dp)."\n"; + print '
'.$langs->trans("Qty"); print ''.$langs->trans("Discount"); print '%'; print ''; @@ -828,19 +828,19 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) if ($result) { $num = $db->num_rows($result); + $var=true; + print ''; + print ''; if ($num) { $i = 0; - print '
'; - $var=true; while ($i < $num) { $objc = $db->fetch_object($result); $var=!$var; - print ''; print ""; print "\n"; print "\n"; - print "\n"; + print "\n"; print ''; print ''; print ''; - print ''; $i++; } - print "
commandeid\">".img_object($langs->trans("ShowOrder"),"order")." ".$objc->ref."idp\">".dolibarr_trunc($objc->nom,18)."". strftime("%d %b",$objc->dc)."".dolibarr_print_date($objc->dc,"%d %b")."'; print ''.$langs->trans("Discount"); @@ -850,14 +850,16 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) print ''; print '
"; } else { + print "
"; print $langs->trans("NoOpenedOrders"); + print "
"; + print ''; $db->free($result); } @@ -871,12 +873,12 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) { $var=false; print '
'; - print ''.$othercom; + print '
'; print ''; print ''; - print ''; } + print "
'.$langs->trans("OtherOrders").''; $html->select_array("commandeid", $othercom); print '
'. strftime("%d %b",$objc->dc)."\n"; + print '
'.$langs->trans("Qty"); print ''.$langs->trans("Discount"); print '%'; print ''; @@ -915,20 +917,20 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) if ($result) { $num = $db->num_rows($result); + $var=true; if ($num) { $i = 0; print ''; - $var=true; + print ''; while ($i < $num) { $objp = $db->fetch_object($result); $var=!$var; - print ''; print ""; print "\n"; print "\n"; - print "\n"; + print "\n"; print ''; print ''; print ''; - print ''; $i++; } - print "
factureid\">".img_object($langs->trans("ShowBills"),"bill")." ".$objp->facnumber."idp\">".dolibarr_trunc($objp->nom,18)."". strftime("%d %b",$objp->df)."".dolibarr_print_date($objp->df,"%d %b")."'; print ''.$langs->trans("Discount"); @@ -937,14 +939,16 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) print ''; print '
"; } else { + print "
"; print $langs->trans("NoDraftBills"); + print '
"; + print ''; $db->free($result); } else @@ -966,20 +970,20 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) if ($result) { $num = $db->num_rows($result); + $var=true; + print '
'; + print ''; if ($num) { $i = 0; - print '
'; - $var=true; while ($i < $num) { $objp = $db->fetch_object($result); $var=!$var; - print ''; print ""; print "\n"; print "\n"; - print "\n"; + print "'; print ''; - print ''; $i++; } - print "
factureid\">$objp->facnumberidp\">$objp->nom". strftime("%d %b",$objp->df)."".$langs->trans("Qty"); print ''; print ''; print ''.$langs->trans("Discount"); @@ -988,14 +992,16 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) print ''; print '
"; } else { + print ""; print $langs->trans("NoOtherDraftBills"); + print ''; } + print ""; + print ''; $db->free($result); } else diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 985565420d0..720a6713f51 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -177,7 +177,7 @@ if ($_GET["id"]) if ($ret < 0) dolibarr_print_error($db); $langs->load("propal"); print ''; - print ''.$langs->trans("Proposals").''; + print ''.img_object('','propal').' '.$langs->trans("Proposals").''; print ''; print $product->stats_propale['customers']; print ''; @@ -194,7 +194,7 @@ if ($_GET["id"]) if ($ret < 0) dolibarr_print_error($db); $langs->load("orders"); print ''; - print ''.$langs->trans("Orders").''; + print ''.img_object('','order').' '.$langs->trans("Orders").''; print ''; print $product->stats_commande['customers']; print ''; @@ -211,7 +211,7 @@ if ($_GET["id"]) if ($ret < 0) dolibarr_print_error($db); $langs->load("contracts"); print ''; - print ''.$langs->trans("Contracts").''; + print ''.img_object('','contract').' '.$langs->trans("Contracts").''; print ''; print $product->stats_contrat['customers']; print ''; @@ -228,7 +228,7 @@ if ($_GET["id"]) if ($ret < 0) dolibarr_print_error($db); $langs->load("bills"); print ''; - print ''.$langs->trans("Bills").''; + print ''.img_object('','bill').' '.$langs->trans("Bills").''; print ''; print $product->stats_facture['customers']; print ''; diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index 038f3851497..a17777d31d6 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -177,7 +177,7 @@ if ($_GET["id"]) if ($ret < 0) dolibarr_print_error($db); $langs->load("propal"); print ''; - print ''.$langs->trans("Proposals").''; + print ''.img_object('','propal').' '.$langs->trans("Proposals").''; print ''; print $product->stats_propale['customers']; print ''; @@ -194,7 +194,7 @@ if ($_GET["id"]) if ($ret < 0) dolibarr_print_error($db); $langs->load("orders"); print ''; - print ''.$langs->trans("Orders").''; + print ''.img_object('','order').' '.$langs->trans("Orders").''; print ''; print $product->stats_commande['customers']; print ''; @@ -211,7 +211,7 @@ if ($_GET["id"]) if ($ret < 0) dolibarr_print_error($db); $langs->load("contracts"); print ''; - print ''.$langs->trans("Contracts").''; + print ''.img_object('','contract').' '.$langs->trans("Contracts").''; print ''; print $product->stats_contrat['customers']; print ''; @@ -228,7 +228,7 @@ if ($_GET["id"]) if ($ret < 0) dolibarr_print_error($db); $langs->load("bills"); print ''; - print ''.$langs->trans("Bills").''; + print ''.img_object('','bill').' '.$langs->trans("Bills").''; print ''; print $product->stats_facture['customers']; print ''; diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 1fc835ebd2b..ab821a6a63e 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -190,7 +190,7 @@ if ($_GET["id"] || $_GET["ref"]) if ($ret < 0) dolibarr_print_error($db); $langs->load("propal"); print ''; - print ''.$langs->trans("Proposals").''; + print ''.img_object('','propal').' '.$langs->trans("Proposals").''; print ''; print $product->stats_propale['customers']; print ''; @@ -207,7 +207,7 @@ if ($_GET["id"] || $_GET["ref"]) if ($ret < 0) dolibarr_print_error($db); $langs->load("orders"); print ''; - print ''.$langs->trans("Orders").''; + print ''.img_object('','order').' '.$langs->trans("Orders").''; print ''; print $product->stats_commande['customers']; print ''; @@ -224,7 +224,7 @@ if ($_GET["id"] || $_GET["ref"]) if ($ret < 0) dolibarr_print_error($db); $langs->load("contracts"); print ''; - print ''.$langs->trans("Contracts").''; + print ''.img_object('','contract').' '.$langs->trans("Contracts").''; print ''; print $product->stats_contrat['customers']; print ''; @@ -241,7 +241,7 @@ if ($_GET["id"] || $_GET["ref"]) if ($ret < 0) dolibarr_print_error($db); $langs->load("bills"); print ''; - print ''.$langs->trans("Bills").''; + print ''.img_object('','bill').' '.$langs->trans("Bills").''; print ''; print $product->stats_facture['customers']; print ''; diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 7367bb032b6..6e4404a25e0 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -173,7 +173,7 @@ if ($_GET["id"]) if ($ret < 0) dolibarr_print_error($db); $langs->load("propal"); print ''; - print ''.$langs->trans("Proposals").''; + print ''.img_object('','propal').' '.$langs->trans("Proposals").''; print ''; print $product->stats_propale['customers']; print ''; @@ -190,7 +190,7 @@ if ($_GET["id"]) if ($ret < 0) dolibarr_print_error($db); $langs->load("orders"); print ''; - print ''.$langs->trans("Orders").''; + print ''.img_object('','order').' '.$langs->trans("Orders").''; print ''; print $product->stats_commande['customers']; print ''; @@ -207,7 +207,7 @@ if ($_GET["id"]) if ($ret < 0) dolibarr_print_error($db); $langs->load("contracts"); print ''; - print ''.$langs->trans("Contracts").''; + print ''.img_object('','contract').' '.$langs->trans("Contracts").''; print ''; print $product->stats_contrat['customers']; print ''; @@ -224,7 +224,7 @@ if ($_GET["id"]) if ($ret < 0) dolibarr_print_error($db); $langs->load("bills"); print ''; - print ''.$langs->trans("Bills").''; + print ''.img_object('','bill').' '.$langs->trans("Bills").''; print ''; print $product->stats_facture['customers']; print '';