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

[jftempo]

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py	2021-01-14 09:02:32 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py	2022-03-09 15:05:32 +0000
@@ -499,6 +499,8 @@
         pick_obj = self.pool.get('stock.picking')
         for wiz_read in self.browse(cr, uid, ids, context=context):
             picking_id = wiz_read.picking_id.id
+            if wiz_read.picking_id.state != 'assigned':
+                return self.write(cr, uid, ids, {'message': _('%s must be \'Available\' to use the import') % wiz_read.picking_id.name})
             if not wiz_read.file:
                 return self.write(cr, uid, ids, {'message': _("Nothing to import")})
             try:

=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2022-02-08 10:57:39 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2022-03-09 15:05:32 +0000
@@ -2393,6 +2393,7 @@
         'in_ref': fields.char(string='IN Reference', size=1024),
         'from_manage_expired': fields.boolean(string='The Picking was created with Manage Expired Stock'),
         'requestor': fields.char(size=128, string='Requestor'),
+        'from_ir': fields.related('sale_id', 'procurement_request', type='boolean', relation='sale.order', string='Is the linked Sale Order IR'),
     }
 
     _defaults = {

=== modified file 'bin/addons/msf_outgoing/msf_outgoing_view.xml'
--- bin/addons/msf_outgoing/msf_outgoing_view.xml	2021-07-05 10:17:31 +0000
+++ bin/addons/msf_outgoing/msf_outgoing_view.xml	2022-03-09 15:05:32 +0000
@@ -187,13 +187,13 @@
                             <field name="name" readonly="1"/>
                             <field name="origin" readonly="1"/>
                             <field name="partner_id2" on_change="on_change_partner(partner_id2, address_id)" required="1"
-                                    attrs="{'readonly': [('state', 'not in', ['draft', 'waiting', 'confirmed', 'assigned'])]}" />
+                                    attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'waiting', 'confirmed', 'assigned']), ('from_ir', '=', True)]}" />
                             <field name="packing_list" attrs="{'readonly': [('state', 'not in', ['draft', 'confirmed', 'assigned'])]}" />
                             <field name="address_id" colspan="2" context="{'contact_display':'partner'}"
                                    domain="[('partner_id', '=', partner_id2)]"
-                                   attrs="{'required': [('subtype', 'in', ('picking', 'ppl'))], 'readonly': ['|', ('state', 'in', ['done', 'cancel']), ('partner_id2', '=', False)]}" />
+                                   attrs="{'required': [('subtype', 'in', ('picking', 'ppl'))], 'readonly': ['|', '|', ('state', 'in', ['done', 'cancel']), ('partner_id2', '=', False), ('from_ir', '=', True)]}" />
                             <field name="backorder_id" readonly="1" string="Original PICK" />
-                            <field name="reason_type_id" widget="selection" domain="[('outgoing_ok', '=', True)]" attrs="{'readonly': [('from_wkf', '=', True)]}" />
+                            <field name="reason_type_id" widget="selection" readonly="1" />
                             <field name="order_category" />
                         </group>
 
@@ -410,6 +410,7 @@
                             <field name="allocation_setup" invisible="1" />
                             <field name="flow_type" invisible="1" />
                             <field name="has_draft_moves" invisible="1" />
+                            <field name="from_ir" invisible="1" />
                             <field name="auto_picking" invisible="1"/>
                             <field name="date_done" />
                             <field name="move_type" invisible="1"/>
@@ -650,16 +651,16 @@
                             <field name="origin" readonly="1"/>
                             <field name="partner_id2" on_change="on_change_partner(partner_id2, address_id)"
                                                         required="1"
-                            attrs="{'readonly': [('state', 'not in', ['draft', 'waiting', 'confirmed', 'assigned'])]}" />
+                            attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'waiting', 'confirmed', 'assigned']), ('from_ir', '=', True)]}" />
                             <field name="packing_list" attrs="{'readonly': [('state', 'not in', ['draft', 'confirmed', 'assigned'])]}" on_change="change_packing_list(packing_list)"/>
                             <field name="address_id" colspan="2" context="{'contact_display':'partner'}"
-                                   attrs="{'required': [('subtype', 'in', ('picking', 'ppl'))], 'readonly': [('partner_id2', '=', False)]}"
+                                   attrs="{'required': [('subtype', 'in', ('picking', 'ppl'))], 'readonly': ['|', ('partner_id2', '=', False), ('from_ir', '=', True)]}"
                                    domain="[('partner_id', '=', partner_id2)]"
                             />
                             <field name="order_category" />
                             <field name="invoice_state" invisible="1" />
                             <field name="backorder_id" readonly="1" />
-                            <field name="reason_type_id" widget="selection" domain="[('outgoing_ok', '=', True)]" attrs="{'readonly': [('from_wkf', '=', True)]}"/>
+                            <field name="reason_type_id" widget="selection" readonly="1"/>
                             <field name="num_of_packs" />
                             <field name="total_volume" />
                             <field name="total_weight" />
@@ -771,6 +772,7 @@
                             <field name="date_done" />
                             <field name="move_type" invisible="1"/>
                             <field name="type" invisible="1"/>
+                            <field name="from_ir" invisible="1"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection" invisible="1"/>
                         </page>
                         <page string="Notes">

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2022-03-02 17:30:56 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2022-03-09 15:05:32 +0000
@@ -114265,6 +114265,12 @@
 msgid "Unable to read file. Please check the file format."
 msgstr "Impossible de lire le fichier. Veuillez vérifier le format du fichier."
 
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py:503
+#, python-format
+msgid "%s must be 'Available' to use the import"
+msgstr "%s doit être 'Disponible' pour utiliser l'import"
+
 #. module: base
 #: code:osv/orm.py:1224
 #, python-format