Merge lp:~jfb-tempo-consulting/unifield-server/US-8310 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2021-02-05 16:30:31 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2021-02-22 14:05:02 +0000
@@ -15957,8 +15957,8 @@
 #. module: purchase
 #: code:addons/purchase/purchase_workflow.py:677
 #, python-format
-msgid "Line %s: Please choose a product before confirming the line"
-msgstr "Ligne %s: Veuillez choisir un produit avant de confirmer la ligne"
+msgid "Line #%s: Please choose a product before confirming the line."
+msgstr "Ligne #%s: Veuillez choisir un produit avant de confirmer la ligne."
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -39401,11 +39401,16 @@
 
 #. module: purchase
 #: code:addons/purchase/purchase_order_line.py:1654
-#: code:addons/purchase/purchase_workflow.py:673
 #, python-format
 msgid "Delivery Confirmed 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."
+msgstr "Ligne #%s: La Date de Livraison Confirmée est un champ obligatoire."
+
 #. module: stock_schedule
 #: selection:stock.frequence,recurrence_type:0
 msgid "Week(s)"

=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2021-02-15 08:43:34 +0000
+++ bin/addons/purchase/purchase_workflow.py	2021-02-22 14:05:02 +0000
@@ -744,11 +744,10 @@
 
         for pol in self.browse(cr, uid, ids):
             if not pol.confirmed_delivery_date:
-                raise osv.except_osv(_('Error'), _('Delivery Confirmed Date is a mandatory field.'))
+                raise osv.except_osv(_('Error'), _('Line #%s: Delivery Confirmed Date is a mandatory field.') % pol.line_number)
 
-            if not pol.product_id and pol.linked_sol_id and not pol.linked_sol_id.order_id.procurement_request:
-                # PO nomen (PROJ) => FO (nomen COO)
-                raise osv.except_osv(_('Error'), _('Line %s: Please choose a product before confirming the line') % 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)
 
             sourced_on_dpo = pol.from_dpo_line_id
 
@@ -958,18 +957,25 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
+        pol_obj = self.pool.get('purchase.order.line')
         for po in self.browse(cr, uid, ids, context=context):
-            pol_ids_to_confirm = []
+            # raise asap
             if po.partner_type == 'esc':
-                pol_ids = self.pool.get('purchase.order.line').search(cr, uid, [('order_id', '=', po.id), ('state', 'in', ['validated', 'validated_p']), ('stock_take_date', '=', False)], context=context)
+                pol_ids = pol_obj.search(cr, uid, [('order_id', '=', po.id), ('state', 'in', ['validated', 'validated_n']), ('stock_take_date', '=', False)], context=context)
                 if pol_ids:
-                    pol_line = self.pool.get('purchase.order.line').read(cr, uid, pol_ids, ['line_number'], context=context)
+                    pol_line = pol_obj.read(cr, uid, pol_ids, ['line_number'], context=context)
                     raise osv.except_osv(_('Error'), _('Line %s: Date of Stock Take is required for PO to ESC') % ', '.join(['#%s'%x['line_number'] for x in pol_line]))
 
-            for pol in po.order_line:
-                if pol.state not in ('cancel', 'cancel_r') and not pol.confirmed_delivery_date:
-                    raise osv.except_osv(_('Error'), _('Line #%s: Delivery Confirmed Date is a mandatory field.') % pol.line_number)
-                pol_ids_to_confirm.append(pol.id)
+            pol_ids_to_confirm = pol_obj.search(cr, uid, [('order_id', '=', po.id), ('state', 'not in', ['cancel', 'cancel_r'])], context=context)
+            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'])
+
+            missing_prod = pol_obj.search(cr, uid, [('product_id', '=', False), ('id', 'in', pol_ids_to_confirm)], limit=1, context=context)
+            if missing_prod:
+                pol_line = pol_obj.read(cr, uid, missing_prod, ['line_number'], context=context)
+                raise osv.except_osv(_('Error'), _('Line #%s: Please choose a product before confirming the line.') % pol_line[0]['line_number'])
 
             return self.pool.get('purchase.order.line').button_confirmed(cr, uid, pol_ids_to_confirm, context=context)