diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php index de8868a45ee..0ba0a6776c7 100644 --- a/htdocs/admin/confexped.php +++ b/htdocs/admin/confexped.php @@ -91,7 +91,7 @@ if ($conf->global->MAIN_SUBMODULE_EXPEDITION) if ($conf->global->MAIN_SUBMODULE_LIVRAISON) { $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php"; - $head[$h][1] = $langs->trans("Delivery"); + $head[$h][1] = $langs->trans("Receivings"); $h++; } @@ -170,6 +170,9 @@ print ''; print ''; print ''; +print ''; + +print info_admin($langs->trans("NoNeedForDeliveryReceipts")); $db->close(); diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index daec48e4b9f..e5ac9ae43ea 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -230,7 +230,7 @@ $h++; if ($conf->global->MAIN_SUBMODULE_LIVRAISON) { $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php"; - $head[$h][1] = $langs->trans("Delivery"); + $head[$h][1] = $langs->trans("Receivings"); $h++; } diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 42938f4a84a..0630c2965e1 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -170,7 +170,7 @@ if ($conf->global->MAIN_SUBMODULE_EXPEDITION) } $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php"; -$head[$h][1] = $langs->trans("Delivery"); +$head[$h][1] = $langs->trans("Receivings"); $hselected=$h; $h++; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index a85d2bcec25..13afbf4ca40 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -867,10 +867,11 @@ NotificationEMailFrom=Sender EMail (From) for emails sent for notifications SendingsSetup=Sending module setup SendingsReceiptModel=Sending receipt model SendingsAbility=Support sendings sheets for customer deliveries +NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated. ##### Deliveries ##### DeliveryOrderNumberingModules=Products deliveries receipt numbering module DeliveryOrderModel=Products deliveries receipt model -DeliveriesOrderAbility=Products deliveries receipt ability +DeliveriesOrderAbility=Support products deliveries receipts ##### FCKeditor ##### ActivateFCKeditor=Activate FCKeditor for: FCKeditorForUsers=WYSIWIG creation/edition of users' description and note diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 5ede850a9a9..126067eaf64 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -867,7 +867,8 @@ NotificationEMailFrom=Email emetteur (From) des mails envoy ##### Sendings ##### SendingsSetup=Configuration du module Expéditions/Livraisons SendingsReceiptModel=Modèle du bordereau d'expédition -SendingsAbility=Prise en charge des bons d'expéditions vers le client +SendingsAbility=Prise en charge des bons d'expéditions/livraisons vers le client +NoNeedForDeliveryReceipts=Dans la plupart des cas, ce sont les bons d'expéditions/livraisons (liste des produits à envoyés par le transporteur) qui font office de bons de réceptions et qui sont signés par le client. La gestion des bons de réceptions fait donc double emploi et sera rarement activé. ##### Deliveries ##### DeliveryOrderNumberingModules=Module de numérotation des bons de réception client DeliveryOrderModel=Modèle de bon de réception client