diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index a8b256811cf..ac7dd8abf15 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -279,7 +279,7 @@ if ($_socid > 0) * Commandes * */ - print ''; + print '
'; $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.total_ht, p.ref, ".$db->pdate("p.date_commande")." as dp"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as p WHERE p.fk_soc = s.idp "; $sql .= " AND s.idp = $objsoc->id ORDER BY p.date_commande DESC"; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 6013b951ff4..114d83f59b4 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -90,7 +90,7 @@ if ($conf->propal->enabled) { print '
'; print ''; print "'; + print $langs->trans("Ref").' :  '; print "
Rechercher une proposition
"; - print 'Num. :  

\n"; $sql = "SELECT p.rowid, p.ref"; diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 7ded322dad8..ef66234e36d 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -60,7 +60,7 @@ if ($conf->propal->enabled) print ''; print ''; print "'; + print $langs->trans("Ref").' : '; print "
Rechercher une proposition
"; - print 'Num. :

\n"; } diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 4ddbef767fe..a31eeed658a 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -23,6 +23,7 @@ require("./pre.inc.php"); $langs->load("orders"); +$langs->load("companies"); $user->getrights('commande'); $user->getrights('expedition'); @@ -229,7 +230,7 @@ if ($_GET["action"] == 'create') print ''; - print ''; + print ''; print ''; print ''; @@ -450,7 +451,7 @@ else } print '
Client :'.$obj->nom.'
'.$langs->trans("Customer").' :'.$obj->nom.''.$langs->trans("Comments").' :
'.$langs->trans("Author").' :'.$user->fullname.'
'; - print ""; + print ""; print ''; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index ae706c25574..dcaaf87eda6 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -78,7 +78,7 @@ print '
Client
".$langs->trans("Customer")."'; print ''.$soc->nom.'
'; print ""; print ''; print "'; +print $langs->trans("Ref").' :  '; print "
Rechercher une facture
"; -print 'Num. :  
"; diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index 0623aa91fb9..b3b2213fa83 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -35,7 +35,7 @@ print '
'; print ''; print ''; print "'; +print $langs->trans("Ref").' : '; print "
Rechercher une expédition
"; -print 'Num. :
\n"; /* diff --git a/htdocs/includes/boxes/box_commandes.php b/htdocs/includes/boxes/box_commandes.php index 04bfba9fd98..911221130a6 100644 --- a/htdocs/includes/boxes/box_commandes.php +++ b/htdocs/includes/boxes/box_commandes.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * 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 @@ -49,7 +50,7 @@ if ($user->rights->commande->lire) $objp = $db->fetch_object( $i); $info_box_contents[$i][0] = array('align' => 'left', - 'text' => $objp->ref, + 'text' => img_file()." ".$objp->ref, 'url' => DOL_URL_ROOT."/commande/fiche.php?id=".$objp->rowid); $info_box_contents[$i][1] = array('align' => 'left', diff --git a/htdocs/includes/boxes/box_factures.php b/htdocs/includes/boxes/box_factures.php index c56e7e81f35..de079e12792 100644 --- a/htdocs/includes/boxes/box_factures.php +++ b/htdocs/includes/boxes/box_factures.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * 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 @@ -50,7 +51,7 @@ if ($user->rights->facture->lire) $objp = $db->fetch_object( $i); $info_box_contents[$i][0] = array('align' => 'left', - 'text' => $objp->facnumber, + 'text' => img_file()." ".$objp->facnumber, 'url' => DOL_URL_ROOT."/compta/facture.php?facid=".$objp->facid); $info_box_contents[$i][1] = array('align' => 'left', diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index e1a0eeaa569..747994f21ff 100755 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -6,4 +6,5 @@ OrdersToValid=Orders to valid OrdersToBill=Orders to bill OrdersInProcess=Orders in process OrdersToProcess=Orders to process -SearchOrder=Search order \ No newline at end of file +SearchOrder=Search order +Sendings=Sendings \ No newline at end of file diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang index a2ae5d676fa..ca03a74c197 100755 --- a/htdocs/langs/fr_FR/orders.lang +++ b/htdocs/langs/fr_FR/orders.lang @@ -6,4 +6,5 @@ OrdersToValid=Commandes OrdersToBill=Commandes à facturer OrdersInProcess=Commandes en traitement OrdersToProcess=Commandes à traiter -SearchOrder=Rechercher une commande \ No newline at end of file +SearchOrder=Rechercher une commande +Sendings=Expéditions \ No newline at end of file diff --git a/htdocs/pre.inc.php b/htdocs/pre.inc.php index bd2520a778b..d3de67e6507 100644 --- a/htdocs/pre.inc.php +++ b/htdocs/pre.inc.php @@ -109,9 +109,10 @@ function llxHeader($head = "") { if ($conf->commande->enabled) { - $menu->add(DOL_URL_ROOT."/commande/index.php", "Commandes"); + $langs->load("orders"); + $menu->add(DOL_URL_ROOT."/commande/index.php", $langs->trans("Orders")); if ($conf->expedition->enabled) { - $menu->add_submenu(DOL_URL_ROOT."/expedition/index.php", "Expéditions"); + $menu->add_submenu(DOL_URL_ROOT."/expedition/index.php", $langs->trans("Sendings")); } }