diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index cfe2ba753b2..13f342559e8 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -44,6 +44,7 @@ $langs->load('sendings'); $langs->load('companies'); $langs->load('bills'); $langs->load('propal'); +$langs->load('deliveries'); $user->getrights('commande'); $user->getrights('expedition'); @@ -1523,7 +1524,6 @@ else print ''.img_object($langs->trans('ShowSending'),'sending').' '.$objp->ref.''; if ($conf->livraison->enabled) { - $langs->load('deliveries'); if ($objp->livraison_id) { print ''.img_object($langs->trans("ShowSending"),'generic').' '.$objp->livraison_ref.''; diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index aa7e594a7e0..c66997f838d 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -36,6 +36,7 @@ if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/project.class.php") $langs->load("orders"); $langs->load("companies"); $langs->load("bills"); +$langs->load('deliveries'); $user->getrights('commande'); @@ -615,7 +616,6 @@ if ($_GET["id"] > 0) print ''.img_object($langs->trans("ShowSending"),"sending").' '.$objp->ref.''; if ($conf->livraison->enabled) { - $langs->load('deliveries'); if ($objp->livraison_id) { print ''.img_object($langs->trans("ShowSending"),'generic').' '.$objp->livraison_ref.''; diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php index b6b43732d24..966dc1f5f65 100644 --- a/htdocs/expedition/commande.php +++ b/htdocs/expedition/commande.php @@ -37,6 +37,7 @@ require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); $langs->load("bills"); +$langs->load('deliveries'); $user->getrights('commande'); $user->getrights('expedition'); @@ -539,7 +540,6 @@ if ($_GET["id"] > 0) if ($conf->livraison->enabled) { - $langs->load('deliveries'); if ($objp->livraison_id) { print ''.img_object($langs->trans("ShowSending"),'generic').' '.$objp->livraison_ref.''; diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang index 1e3ddb11f3f..e4e179d6717 100644 --- a/htdocs/langs/en_US/deliveries.lang +++ b/htdocs/langs/en_US/deliveries.lang @@ -1,6 +1,8 @@ # Dolibarr language file - en_US - deliveries Delivery=Delivery Deliveries=Deliveries +DeliveryCard=Delivery card DeliveryOrder=Delivery order DeliveryOrders=Delivery orders -DeliveryDate=Delivery date \ No newline at end of file +DeliveryDate=Delivery date +CreateDeliveryOrder=Generate delivery order \ No newline at end of file diff --git a/htdocs/langs/fr_FR/deliveries.lang b/htdocs/langs/fr_FR/deliveries.lang index 3ef5bb2b1c1..a2fa76cbea7 100644 --- a/htdocs/langs/fr_FR/deliveries.lang +++ b/htdocs/langs/fr_FR/deliveries.lang @@ -1,6 +1,8 @@ # Dolibarr language file - fr_FR - deliveries Delivery=Livraison Deliveries=Livraisons +DeliveryCard=Fiche livraison DeliveryOrder=Bon de livraison DeliveryOrders=Bons de livraison DeliveryDate=Date de livraison +CreateDeliveryOrder=Générer bon de livraison \ No newline at end of file