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

[jftempo]

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2019-04-02 12:09:36 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2019-05-10 11:43:04 +0000
@@ -1514,6 +1514,7 @@
         '''
         prod_obj = self.pool.get('product.product')
         uom_obj = self.pool.get('product.uom')
+        sale_obj = self.pool.get('sale.order')
 
         if isinstance(ids, (int, long)):
             ids = [ids]
@@ -1660,22 +1661,27 @@
                 write_vals['type_change'] = 'error'
 
             # Origin
-            write_vals['imp_origin'] = values[8]
-            if line.simu_id.order_id.po_from_fo and not values[8]:
-                err_msg = _('The Origin is mandatory for a PO coming from a FO')
-                errors.append(err_msg)
-                write_vals['type_change'] = 'error'
-            elif line.simu_id.order_id.po_from_fo:
-                fo_ids = self.pool.get('sale.order').search(cr, uid,
-                                                            [('name', '=', values[8]),
-                                                             ('procurement_request', '=', False)], context=context)
-                ir_ids = self.pool.get('sale.order').search(cr, uid,
-                                                            [('name', '=', values[8]),
-                                                             ('procurement_request', '=', True)], context=context)
-                if not fo_ids and not ir_ids:
+            origin = values[8]
+            if origin:
+                so_ids = sale_obj.search(cr, uid, [('name', '=', origin), ('procurement_request', 'in', ['t', 'f'])],
+                                         limit=1, context=context)
+                if so_ids:
+                    so_state = sale_obj.browse(cr, uid, so_ids[0], fields_to_fetch=['state'], context=context).state
+                    if so_state not in ('done', 'cancel'):
+                        write_vals['imp_origin'] = origin
+                    else:
+                        err_msg = _('\'Origin\' Document can\'t be Closed or Cancelled')
+                        errors.append(err_msg)
+                        write_vals['type_change'] = 'error'
+                else:
                     err_msg = _('The FO reference in \'Origin\' is not consistent with this PO')
                     errors.append(err_msg)
                     write_vals['type_change'] = 'error'
+            else:
+                if line.simu_id.order_id.po_from_fo:
+                    err_msg = _('The Origin is mandatory for a PO coming from a FO')
+                    errors.append(err_msg)
+                    write_vals['type_change'] = 'error'
 
             # Stock Take Date
             stock_take_date = values[9]
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-05-03 13:44:52 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-05-10 11:43:04 +0000
@@ -105519,6 +105519,7 @@
 msgstr "\n"
 "                                        Attention: Les lignes suivantes ont des qté ou des montants sur plus de 15 chiffres. Veuillez vérifier la qté et le prix unitaire pour éviter des pertes d'information:\n"
 "                                    "
+<<<<<<< TREE
 
 #. module: msf_homere_interface
 #: code:addons/msf_homere_interface/wizard/hr_payroll_import.py:580
@@ -105888,3 +105889,11 @@
 #: field:product.mass.update,empty_status:0
 msgid "Set Status as empty"
 msgstr "Mettre le Statut à vide"
+=======
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1621
+#, python-format
+msgid "'Origin' Document can't be Closed or Cancelled"
+msgstr "Le Document de 'Origine' ne peut pas être Fermé ou Annulé"
+>>>>>>> MERGE-SOURCE
 
=== modified file 'bin/addons/purchase/purchase_view.xml'
--- bin/addons/purchase/purchase_view.xml	2019-04-01 13:16:17 +0000
+++ bin/addons/purchase/purchase_view.xml	2019-05-10 11:43:04 +0000
@@ -629,7 +629,7 @@
                             <separator string="Linked Information" colspan="4" />
                                 <group colspan="2" col="3">
                                 <field name="origin" on_change="on_change_origin(origin, linked_sol_id, parent.partner_type)" attrs="{'required': [('from_fo', '=', True)], 'readonly': ['|', '|', ('linked_sol_id', '!=', False), ('tender_id', '!=', False), ('tender_line_id', '!=', False)]}" string="Source Document"/>
-                                <field name="select_fo" on_change="on_change_select_fo(select_fo)" nolabel="1" domain="['|', ('state', 'in', ['draft', 'draft_p', 'validated', 'validated_p', 'sourced', 'sourced_p']), ('procurement_request', '=', True)]" attrs="{'invisible': ['|', '|', ('linked_sol_id', '!=', False), ('tender_id', '!=', False), ('tender_line_id', '!=', False)]}"/>
+                                <field name="select_fo" on_change="on_change_select_fo(select_fo)" nolabel="1" domain="[('state', 'in', ['draft', 'draft_p', 'validated', 'validated_p', 'sourced', 'sourced_p']), ('procurement_request', 'in', ['t', 'f'])]" attrs="{'invisible': ['|', '|', ('linked_sol_id', '!=', False), ('tender_id', '!=', False), ('tender_line_id', '!=', False)]}"/>
                                 </group>
                                 <field name="customer_ref" string="Customer ref" widget="char"/>
                                 <field name="external_ref" readonly="1"/>