diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index 45be4ce6d1f..94accf43f38 100644 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -43,7 +43,7 @@ if ($user->societe_id > 0) $commande = new CommandeFournisseur($db); -print_barre_liste("Commandes fournisseurs", $page, "index.php", "", $sortfield, $sortorder, '', $num); +print_barre_liste($langs->trans("SuppliersOrders"), $page, "index.php", "", $sortfield, $sortorder, '', $num); print ''; print '
'; @@ -66,7 +66,7 @@ if ($result) $i = 0; print ''; - print ''; + print ''; print "\n"; $var=True; @@ -88,7 +88,7 @@ if ($result) } else { - print $db->error() . ' ' . $sql; + dolibarr_print_error($db); } print ''; diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/liste.php index add148ae9b4..297580392eb 100644 --- a/htdocs/fourn/commande/liste.php +++ b/htdocs/fourn/commande/liste.php @@ -102,7 +102,8 @@ if ($result) $num = $db->num_rows(); $i = 0; - print_barre_liste("Commandes fournisseurs", $page, "liste.php", "", $sortfield, $sortorder, '', $num); + $langs->load("orders"); + print_barre_liste($langs->trans("SuppliersOrders"), $page, "liste.php", "", $sortfield, $sortorder, '', $num); if ($sortorder == "DESC") { $sortorder="ASC"; @@ -136,8 +137,8 @@ if ($result) print ""; print ''."\n"; - print ''."\n"; + print ''."\n"; print "
StatutNb 
'.$langs->trans("Status").''.$langs->trans("Nb").' 
 
'; print ' '.$obj->ref.''.img_file().''; - print ' '.$obj->nom.''.img_object($langs->trans("ShowCompany"),"company").' '; + print $obj->nom.'"; if ($obj->dc) @@ -157,7 +158,7 @@ if ($result) } else { - print $db->error() . ' ' . $sql; + dolibarr_print_error($db); } $db->close(); diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index a2805f03c3b..4744028a3e8 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -200,12 +200,12 @@ if ($_GET["action"] == 'create' or $_GET["action"] == 'copy') $fac_ori = new FactureFourn($db); $fac_ori->fetch($_GET["facid"]); } - print_titre("Saisir une facture fournisseur"); + print_titre($langs->trans("NewBill")); print '
'; print ''; print ''; - print ''; + print ''; print ''; + print ''; print ''; print ''; print '
Société
'.$langs->trans("Company").'
Ligne '.$i.'
'.$i.''; diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index caeb8031bf9..696ab0af867 100755 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -2,6 +2,8 @@ OrdersArea=Orders area Order=Order Orders=Orders +SupplierOrder=Supplier order +SuppliersOrders=Suppliers' orders OrdersToValid=Orders to valid OrdersToBill=Orders to bill OrdersInProcess=Orders in process diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang index 026a6639756..f1d9617da8d 100755 --- a/htdocs/langs/fr_FR/orders.lang +++ b/htdocs/langs/fr_FR/orders.lang @@ -2,6 +2,8 @@ OrdersArea=Espace commandes Order=Commande Orders=Commandes +SupplierOrder=Commande fournisseur +SuppliersOrders=Commandes fournisseurs OrdersToValid=Commandes à valider OrdersToBill=Commandes à facturer OrdersInProcess=Commandes en traitement