Merge lp:~dorian-kemps/unifield-server/US-9127-9174 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2021-11-18 11:18:31 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2022-01-05 14:33:34 +0000
@@ -1372,7 +1372,7 @@
 #: code:addons/msf_doc_import/wizard/__init__.py:63
 #, python-format
 msgid "fo_import_drd"
-msgstr "Date de livraison souhaitée"
+msgstr "Date de Livraison Demandée"
 
 #. module: analytic_distribution
 #: field:analytic.distribution.wizard.f1.lines,wizard_id:0
@@ -10340,7 +10340,7 @@
 #. module: procurement_request
 #: report:procurement.request.report:0
 msgid "Requested date :"
-msgstr "Date souhaitée :"
+msgstr "Date demandée :"
 
 #. module: msf_outgoing
 #: report:packing.list:0
@@ -23752,7 +23752,7 @@
 #: field:purchase.order.followup,delivery_requested_date:0
 #: report:addons/msf_budget/report/order_impact_vs_budget.mako:212
 msgid "Delivery requested date"
-msgstr "Date de livraison souhaitée"
+msgstr "Date de Livraison Demandée"
 
 #. module: msf_tools
 #: code:addons/msf_tools/automated_export.py:481
@@ -25579,20 +25579,25 @@
 #: field:update.lines,delivery_requested_date:0
 #: report:addons/msf_supply_doc_export/report/report_tender_xls.mako:74
 #: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:110
-#: field:purchase.order,delivery_requested_date:0
 #: field:purchase.order.merged.line,date_planned:0
 #: report:addons/stock/report/stock_reception_report_xls.mako:232
 #: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:897
 #, python-format
 msgid "Delivery Requested Date"
-msgstr "Date de Livraison Souhaitée"
+msgstr "Date de Livraison Demandée"
+
+#. modules: purchase
+#: field:purchase.order,delivery_requested_date:0
+#, python-format
+msgid "Requested Delivery Date"
+msgstr "Date de Livraison Demandée"
 
 #. modules: purchase, msf_order_date
 #: field:purchase.order.line,date_planned:0
 #: field:sale.order.line,date_planned:0
 #, python-format
 msgid "Requested DD"
-msgstr "DL Souhaitée"
+msgstr "DL Demandée"
 
 #. module: msf_supply_doc_export, msf_doc_import
 #: report:addons/msf_supply_doc_export/report/report_purchase_order_xls.mako:78
@@ -32191,7 +32196,7 @@
 #. module: sales_followup
 #: report:sales.follow.up.multi.report_pdf:0
 msgid "Req. Delivery date:"
-msgstr "Date Livraison Souhaité:"
+msgstr "Date Livraison Demandée:"
 
 #. module: stock_schedule
 #: selection:stock.frequence,name:0
@@ -33344,7 +33349,7 @@
 #: code:addons/msf_order_date/order_dates.py:339
 #, python-format
 msgid "The number of days between Creation Date and Delivery Expected Date (%s) is less than the supplier lead-time (%s)."
-msgstr "Le nombre de jours entre Date de Création et Date de Livraison Souhaitée (%s) est inférieur à ceux du délai de livraison du fournisseur (%s)."
+msgstr "Le nombre de jours entre Date de Création et Date de Livraison Demandée (%s) est inférieur à ceux du délai de livraison du fournisseur (%s)."
 
 #. modules: account, account_override
 #: field:account.move.line,invoice_partner_link:0
@@ -36903,7 +36908,7 @@
 "                                        WARNING: The requested date of this purchase order is in the past.\n"
 "                                    "
 msgstr "\n"
-"                                        ATTENTION: La Date de Livraison Souhaitée est déjà passée.\n"
+"                                        ATTENTION: La Date de Livraison Demandée est déjà passée.\n"
 "                                    "
 
 #. modules: base, unifield_setup
@@ -39463,13 +39468,13 @@
 #. module: purchase
 #: code:addons/purchase/purchase_order_line.py:1654
 #, python-format
-msgid "Delivery Confirmed Date is a mandatory field."
+msgid "Confirmed Delivery Date is a mandatory field."
 msgstr "La Date de Livraison Confirmée est un champ obligatoire."
 
 #. module: purchase
 #: code:addons/purchase/purchase_workflow.py:673
 #, python-format
-msgid "Line #%s: Delivery Confirmed Date is a mandatory field."
+msgid "Line #%s: Confirmed Delivery Date is a mandatory field."
 msgstr "Ligne #%s: La Date de Livraison Confirmée est un champ obligatoire."
 
 #. module: stock_schedule
@@ -44286,7 +44291,7 @@
 #. module: purchase
 #: report:purchase.order:0
 msgid "Date Req."
-msgstr "Date Souhaitée"
+msgstr "Date Demandée"
 
 #. modules: purchase, sale
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
@@ -49848,7 +49853,7 @@
 "                                    All information of the PO template will be written in the new PO, <br/>except the Delivery Requested date which will be the earliest date of all POs.<br/>Any sourcing group will be taken from the template PO/DPO.\n"
 "                                "
 msgstr "\n"
-"                                    Toutes les informations du modèle de BC seront écrites dans le nouveau BC, <br/>sauf la date de livraison souhaitée qui sera la date la plus ancienne de tous les BCs.<br/>Tout groupe de sourcing sera pris du BdC/BdC direct modèle.\n"
+"                                    Toutes les informations du modèle de BC seront écrites dans le nouveau BC, <br/>sauf la date de livraison demandée qui sera la date la plus ancienne de tous les BCs.<br/>Tout groupe de sourcing sera pris du BdC/BdC direct modèle.\n"
 "                                "
 
 #. module: stock
@@ -51713,7 +51718,7 @@
 #: report:addons/sales_followup/report/sale_follow_up_report_xls.mako:187
 #: report:sales.follow.up.report_pdf:0
 msgid "Requested date:"
-msgstr "Date Souhaitée:"
+msgstr "Date demandée:"
 
 #. module: consumption_calculation
 #: view:real.average.consumption:0
@@ -53298,7 +53303,7 @@
 #: report:purchase.order.merged:0
 #: report:msf.sale.order:0
 msgid "Requested delivery date :"
-msgstr "Date de Livraison Souhaitée :"
+msgstr "Date de Livraison Demandée :"
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:379
@@ -61935,7 +61940,7 @@
 #. module: purchase
 #: field:purchase.order,requested_date_in_past:0
 msgid "Requested date in past"
-msgstr "Date souhaitée dans le passé"
+msgstr "Date demandée dans le passé"
 
 #. module: base
 #: help:attachment.config,next_migration:0
@@ -66282,7 +66287,6 @@
 #: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:74
 #: field:sale.order,delivery_confirmed_date:0
 #: field:update.lines,delivery_confirmed_date:0
-#: field:purchase.order,delivery_confirmed_date:0
 #: field:international.transport.cost.report,delivery_confirmed_date:0
 #: field:local.transport.cost.report,delivery_confirmed_date:0
 #: report:addons/msf_doc_import/report/po_simulation_screen_xls_report.mako:236
@@ -66299,6 +66303,12 @@
 msgid "Delivery Confirmed Date"
 msgstr "Date de Livraison Confirmée"
 
+#. modules: purchase
+#: field:purchase.order,delivery_confirmed_date:0
+#, python-format
+msgid "Confirmed Delivery Date"
+msgstr "Date de Livraison Confirmée"
+
 #. modules: purchase, msf_order_date
 #: field:purchase.order.line,confirmed_delivery_date:0
 #: field:sale.order.line,confirmed_delivery_date:0
@@ -70309,7 +70319,7 @@
 #. module: msf_budget
 #: report:msf.pdf.engagement:0
 msgid "Delivery requested date:"
-msgstr "Date de Livraison souhaitée: "
+msgstr "Date de Livraison demandée: "
 
 #. module: msf_outgoing
 #: report:invoice:0
@@ -70889,7 +70899,7 @@
 #: code:addons/msf_doc_import/check_line.py:467
 #, python-format
 msgid "Delivery requested date not found. The date from the header has been taken."
-msgstr "Date de livraison souhaitée non trouvée, le système a pris la date de l'en-tête"
+msgstr "Date de livraison demandée non trouvée, le système a pris la date de l'en-tête"
 
 #. modules: return_claim, msf_outgoing
 #: code:addons/msf_outgoing/msf_outgoing.py:555
@@ -79859,10 +79869,15 @@
 msgid "Current available quantity of products with this Batch Numbre Number in company warehouses"
 msgstr "Quantité de produits actuellement disponibles sous ce Numéro de Lot dans les entrepôts de la société."
 
-#. modules: msf_doc_import, msf_supply_doc_export
+#. modules: msf_supply_doc_export
+#: report:addons/msf_supply_doc_export/report/report_purchase_order_xls.mako:75
+#, python-format
+msgid "Delivery Request Date"
+msgstr "Date de Livraison Demandée"
+
+#. modules: msf_doc_import
 #: code:addons/msf_doc_import/wizard/__init__.py:58
 #: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:249
-#: report:addons/msf_supply_doc_export/report/report_purchase_order_xls.mako:75
 #, python-format
 msgid "Delivery Request Date"
 msgstr "Date de Livraison Requise"
@@ -81654,7 +81669,7 @@
 #: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1537
 #, python-format
 msgid "Incorrect date value for field 'Delivery Requested Date'"
-msgstr "Valeur inocrrect pour le champ 'Date de livraison souhaitée'"
+msgstr "Valeur inocrrect pour le champ 'Date de livraison Demandée'"
 
 #. modules: msf_doc_import, purchase
 #: view:purchase.order:0
@@ -85896,7 +85911,7 @@
 #: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:283
 #: report:addons/procurement_cycle/report/chronogram.mako:2149
 msgid "RDD"
-msgstr "DLS"
+msgstr "DLD"
 
 #. module: account
 #: field:account.tax,child_ids:0
@@ -97101,7 +97116,7 @@
 #: field:sale.order.followup,requested_date:0
 #: field:internal.request.import,in_requested_date:0
 msgid "Requested date"
-msgstr "Date souhaitée"
+msgstr "Date demandée"
 
 #. module: msf_outgoing
 #: field:shipment,cargo_manifest_reference:0
@@ -97325,7 +97340,7 @@
 #: code:addons/msf_doc_import/check_line.py:474
 #, python-format
 msgid "The delivery requested date format was not correct. The date from the header has been taken."
-msgstr "La date de livraison souhaitée est mal formatée, le système a pris la date de l'en-tête"
+msgstr "La date de livraison demandée est mal formatée, le système a pris la date de l'en-tête"
 
 #. modules: purchase, stock
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
@@ -97418,7 +97433,7 @@
 #: code:addons/msf_order_date/order_dates.py:181
 #, python-format
 msgid "The Delivery Requested Date should be between today and today + 24 months !"
-msgstr "La date de Livraison Souhaitée devrait être comprise entre aujourd'hui et aujourd'hui+24mois !"
+msgstr "La date de Livraison Demandée devrait être comprise entre aujourd'hui et aujourd'hui+24mois !"
 
 #. module: procurement_auto
 #: model:ir.module.module,description:procurement_auto.module_meta_information
@@ -99698,7 +99713,7 @@
 #: field:tender,requested_date:0
 #: field:tender.line,date_planned:0
 msgid "Requested Date"
-msgstr "Date Souhaitée"
+msgstr "Date Demandée"
 
 #. module: msf_supply_doc_export
 #: report:addons/msf_supply_doc_export/report/internal_request_export_xls.mako:60
@@ -100747,7 +100762,7 @@
 #. module: purchase
 #: code:addons/purchase/purchase_workflow.py:879
 #, python-format
-msgid "Line #%s: Delivery Confirmed Date is a mandatory field."
+msgid "Line #%s: Confirmed Delivery Date is a mandatory field."
 msgstr "Ligne #%s: La date de livraison confirmée est un champ obligatoire."
 
 #. module: purchase
@@ -101573,7 +101588,7 @@
 #: code:addons/sale/wizard/internal_request_import.py:510
 #, python-format
 msgid "Requested Date: The Requested Date '%s' is incorrect, you will need to correct this manually."
-msgstr "Date Souhaitée: La Date Souhaitée '%s' incorrecte, vous devrez la corriger manuellement."
+msgstr "Date Demandée: La Date Demandée '%s' incorrecte, vous devrez la corriger manuellement."
 
 #. module: sale
 #: code:addons/sale/wizard/internal_request_import.py:531
@@ -101597,13 +101612,13 @@
 #: code:addons/sale/sale_workflow.py:702
 #, python-format
 msgid "You can not validate '%s' without a Requested date."
-msgstr "Vous ne pouvez pas valider '%s' sans la Date Souhaitée."
+msgstr "Vous ne pouvez pas valider '%s' sans la Date Demandée."
 
 #. module: sale
 #: code:addons/sale/sale_workflow.py:554
 #, python-format
 msgid "You can not validate the line without a Requested date."
-msgstr "Vous ne pouvez pas valider la ligne sans la Date Souhaitée."
+msgstr "Vous ne pouvez pas valider la ligne sans la Date Demandée."
 
 #. module: sale
 #: code:addons/sale/sale_workflow.py:551
@@ -103611,7 +103626,7 @@
 #: code:addons/msf_order_date/wizard/update_lines.py:114
 #, python-format
 msgid "requested"
-msgstr "souhaitée"
+msgstr "demandée"
 
 #. module: consumption_calculation, procurement_cycle
 #: report:addons/consumption_calculation/report/weekly_forecast_report_xls.mako:98
@@ -105680,12 +105695,12 @@
 #. module: msf_supply_doc_export
 #: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:254
 msgid "Delivery Requested Date (RDD)"
-msgstr "Date de Livraison souhaitée (RDD)"
+msgstr "Date de Livraison Demandée (DLD)"
 
 #. module: msf_supply_doc_export
 #: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:255
 msgid "Delivery Confirmed Date (CDD)"
-msgstr "Date de Livraison Confirmée (CDD)"
+msgstr "Date de Livraison Confirmée (DLC)"
 
 #. module: msf_supply_doc_export
 #: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:257
@@ -105700,12 +105715,12 @@
 #. module: msf_supply_doc_export
 #: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:260
 msgid "Delay b/w actual delivery and RDD (days)"
-msgstr "Délai entre la réception physique et la RDD (jours)"
+msgstr "Délai entre la réception physique et la DLD (jours)"
 
 #. module: msf_supply_doc_export
 #: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:259
 msgid "Delay b/w actual delivery and CDD (days)"
-msgstr "Délai entre la réception physique et la CDD (jours)"
+msgstr "Délai entre la réception physique et la DLC (jours)"
 
 #. module: msf_supply_doc_export
 #: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:261
@@ -112817,7 +112832,7 @@
 #: code:addons/purchase/purchase_order.py:1507
 #, python-format
 msgid "Do you want to update the Requested Date of all/selected Order lines ?"
-msgstr "Voulez-vous mettre à jour la Date de Livraison Souhaitée sur toutes les lignes de la Commande ou les lignes sélectionnées ?"
+msgstr "Voulez-vous mettre à jour la Date de Livraison Demandée sur toutes les lignes de la Commande ou les lignes sélectionnées ?"
 
 #. module: stock
 #: field:physical.inventory.generate.counting.sheet,only_with_pos_move:0

=== modified file 'bin/addons/purchase/purchase_order.py'
--- bin/addons/purchase/purchase_order.py	2021-10-15 15:14:28 +0000
+++ bin/addons/purchase/purchase_order.py	2022-01-05 14:33:34 +0000
@@ -884,9 +884,9 @@
             'purchase.order.line': (_order_line_order_type, ['order_id'], 10),
         },
         ),
-        'delivery_requested_date': fields.date(string='Delivery Requested Date', required=True),
+        'delivery_requested_date': fields.date(string='Requested Delivery Date', required=True),
         'delivery_requested_date_modified': fields.date(string='Estimated Delivery Date'),
-        'delivery_confirmed_date': fields.date(string='Delivery Confirmed Date'),
+        'delivery_confirmed_date': fields.date(string='Confirmed Delivery Date'),
         'ready_to_ship_date': fields.date(string='Ready To Ship Date'),
         'shipment_date': fields.date(string='Shipment Date', help='Date on which picking is created at supplier'),
         'arrival_date': fields.date(string='Arrival date in the country', help='Date of the arrival of the goods at custom'),

=== modified file 'bin/addons/purchase/purchase_order_line.py'
--- bin/addons/purchase/purchase_order_line.py	2021-11-15 13:14:33 +0000
+++ bin/addons/purchase/purchase_order_line.py	2022-01-05 14:33:34 +0000
@@ -1910,7 +1910,7 @@
                 commitment_voucher_id = commitment_voucher_id[0]
             else: # create commitment voucher
                 if not pol.confirmed_delivery_date:
-                    raise osv.except_osv(_('Error'), _('Delivery Confirmed Date is a mandatory field.'))
+                    raise osv.except_osv(_('Error'), _('Confirmed Delivery Date is a mandatory field.'))
                 commitment_voucher_id = self.pool.get('purchase.order').create_commitment_voucher_from_po(cr, uid, [pol.order_id.id], cv_date=pol.confirmed_delivery_date, context=context)
 
             expense_account = pol.account_4_distribution and pol.account_4_distribution.id or False

=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2021-07-13 16:16:16 +0000
+++ bin/addons/purchase/purchase_workflow.py	2022-01-05 14:33:34 +0000
@@ -748,7 +748,7 @@
 
         for pol in self.browse(cr, uid, ids):
             if not pol.confirmed_delivery_date:
-                raise osv.except_osv(_('Error'), _('Line #%s: Delivery Confirmed Date is a mandatory field.') % pol.line_number)
+                raise osv.except_osv(_('Error'), _('Line #%s: Confirmed Delivery Date is a mandatory field.') % pol.line_number)
 
             if not pol.product_id:
                 raise osv.except_osv(_('Error'), _('Line %s: Please choose a product before confirming the line') % pol.line_number)
@@ -975,7 +975,7 @@
             missing_cdd = pol_obj.search(cr, uid, [('confirmed_delivery_date', '=', False), ('id', 'in', pol_ids_to_confirm)], limit=1, context=context)
             if missing_cdd:
                 pol_line = pol_obj.read(cr, uid, missing_cdd, ['line_number'], context=context)
-                raise osv.except_osv(_('Error'), _('Line #%s: Delivery Confirmed Date is a mandatory field.') % pol_line[0]['line_number'])
+                raise osv.except_osv(_('Error'), _('Line #%s: Confirmed Delivery Date is a mandatory field.') % pol_line[0]['line_number'])
 
             missing_prod = pol_obj.search(cr, uid, [('product_id', '=', False), ('id', 'in', pol_ids_to_confirm)], limit=1, context=context)
             if missing_prod: