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

[jftempo]

=== modified file 'bin/addons/msf_doc_import/check_line.py'
--- bin/addons/msf_doc_import/check_line.py	2020-08-19 14:50:17 +0000
+++ bin/addons/msf_doc_import/check_line.py	2021-03-22 13:02:25 +0000
@@ -214,9 +214,9 @@
             if loc_name:
                 domain = [('name', '=ilike', loc_name)]
                 if check_type and product_id and check_type == 'src' and pick_type == 'internal':
-                    domain.extend([('internal_src', '=', product_id), ('usage', '!=', 'view')])
+                    domain.extend([('internal_src', '=', product_id), ('usage', '!=', 'view'), ('virtual_ok', '!=', 't')])
                 elif check_type and product_id and check_type == 'dest' and pick_type == 'internal':
-                    domain.extend([('internal_dest', '=', product_id), ('usage', '!=', 'view')])
+                    domain.extend([('internal_dest', '=', product_id), ('usage', '!=', 'view'), ('virtual_ok', '!=', 't')])
                 elif check_type and product_id and check_type == 'src' and pick_type == 'in':
                     domain.extend([('usage', '=', 'supplier')])
                 elif check_type and product_id and check_type == 'dest' and pick_type == 'in':

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_picking_line.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_picking_line.py	2021-02-03 14:18:07 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_picking_line.py	2021-03-22 13:02:25 +0000
@@ -168,7 +168,7 @@
                                                                       pick_ext_cu=picking.ext_cu, product_id=to_write['product_id'],
                                                                       check_type='src', row=row, cell_nb=8, context=context)
                         if partner_loc and partner_loc != src_value['location_id']:
-                            raise osv.except_osv(_('Error'), _('The source location is not compatible with the patner'))
+                            raise osv.except_osv(_('Error'), _('The source location is not compatible with the partner'))
 
                         to_write.update({'location_id': src_value['location_id'], 'is_ext_cu': src_value['is_ext_cu'],
                                          'error_list': src_value['error_list'],})

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2021-02-24 09:28:37 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2021-03-22 13:02:25 +0000
@@ -87584,7 +87584,7 @@
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:196
 #, python-format
-msgid "The source location is not compatible with the patner"
+msgid "The source location is not compatible with the partner"
 msgstr "La zone source n'est pas compatible avec le partenaire"
 
 #. module: account

=== modified file 'bin/addons/stock_override/stock_view.xml'
--- bin/addons/stock_override/stock_view.xml	2020-12-04 11:19:40 +0000
+++ bin/addons/stock_override/stock_view.xml	2021-03-22 13:02:25 +0000
@@ -300,11 +300,11 @@
                                         <separator string="Locations" colspan="2"/>
                                         <field name="location_id" 
                                             attrs="{'readonly': [('state', '=', 'assigned')]}"
-                                            domain="[('internal_src', '=', product_id), ('usage', '!=', 'view'), ('id', '!=', location_dest_id)]"
+                                            domain="[('internal_src', '=', product_id), ('usage', '!=', 'view'), ('id', '!=', location_dest_id), ('virtual_ok', '!=', 't')]"
                                             context="{'specific_rules_tree_view': True, 'prodlot_id': prodlot_id, 'product_id': product_id, 'compute_child': False}" 
                                             />
                                        <field name="location_dest_id"
-                                            domain="[('internal_dest', '=', product_id), ('usage', '!=', 'view'), ('id', '!=', location_id)]"
+                                            domain="[('internal_dest', '=', product_id), ('usage', '!=', 'view'), ('id', '!=', location_id), ('virtual_ok', '!=', 't')]"
                                             on_change="location_dest_change(location_dest_id, location_id, product_id)"
                                             />
                                     </group>

=== modified file 'bin/addons/stock_override/wizard/change_dest_location_view.xml'
--- bin/addons/stock_override/wizard/change_dest_location_view.xml	2019-08-22 10:11:24 +0000
+++ bin/addons/stock_override/wizard/change_dest_location_view.xml	2021-03-22 13:02:25 +0000
@@ -22,7 +22,7 @@
 
                     <group attrs="{'invisible':  [('type', '=', 'out')]}" colspan="4">
                         <separator colspan="4" string="New destination location" />
-                        <field name="dest_location_id" colspan="4" domain="[('usage', 'not in', ['view', 'supplier', 'customer']), ('input_ok', '!=', True)]" attrs="{'readonly': [('state', '=', 'end')], 'required': [('type', '=', 'internal')]}" />
+                        <field name="dest_location_id" colspan="4" domain="[('usage', 'not in', ['view', 'supplier', 'customer']), ('input_ok', '!=', True), ('virtual_ok', '!=', 't')]" attrs="{'readonly': [('state', '=', 'end')], 'required': [('type', '=', 'internal')]}" />
                     </group>
 
                     <group attrs="{'invisible':  [('type', '=', 'internal')]}" colspan="4">