Merge lp:~dorian-kemps/unifield-server/US-2445 into lp:~jfb-tempo-consulting/unifield-server/jfb-int

[jftempo]

=== modified file 'bin/addons/msf_doc_import/initial_stock_inventory.py'
--- bin/addons/msf_doc_import/initial_stock_inventory.py	2019-07-30 09:13:43 +0000
+++ bin/addons/msf_doc_import/initial_stock_inventory.py	2019-10-22 09:02:04 +0000
@@ -635,6 +635,7 @@
         location_obj = self.pool.get('stock.location')
         obj_data = self.pool.get('ir.model.data')
 
+
         vals = {}
         vals['inventory_line_id'] = []
         msg_to_return = _("All lines successfully imported")
@@ -647,6 +648,7 @@
         product_non_stockable_cache = {}
         product_error = []
         no_product_error = []
+        wrong_location = []
 
         fileobj = SpreadsheetXML(xmlstring=base64.decodestring(obj.file_to_import))
 
@@ -751,6 +753,10 @@
                         location_not_found = True
                     else:
                         location_id = loc_ids[0]
+                        loc = location_obj.browse(cr, uid, location_id, fields_to_fetch=['initial_stock_inv_display', 'usage'],
+                                                  context=context)
+                        if not loc.initial_stock_inv_display or loc.usage != 'internal':
+                            wrong_location.append(_('Line #%s: The location "%s" is not allowed') % (line_num, location_name))
                 except Exception:
                     location_id = False
 
@@ -903,6 +909,11 @@
                     len(no_product_error) > 1 and 's' or '',
                     ' / '.join(tools.ustr(x) for x in no_product_error)),
             )
+        if wrong_location:
+            raise osv.except_osv(
+                _('Error'),
+                '\n'.join(wrong_location)
+            )
 
         # write order line on Inventory
         vals.update({'file_to_import': False})
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-10-18 15:58:30 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-10-22 09:02:04 +0000
@@ -106911,6 +106911,12 @@
 msgid "Stop report"
 msgstr "Arrêter le rapport"
 
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/initial_stock_inventory.py:648
+#, python-format
+msgid "Line #%s: The location \"%s\" is not allowed"
+msgstr "Ligne #%s: La Zone \"%s\" n'est pas autorisée"
+
 #. module: stock
 #: code:addons/stock/stock.py:1780
 #, python-format
 
=== modified file 'bin/addons/specific_rules/stock_view.xml'
--- bin/addons/specific_rules/stock_view.xml	2016-05-23 12:40:15 +0000
+++ bin/addons/specific_rules/stock_view.xml	2019-10-22 09:02:04 +0000
@@ -51,7 +51,7 @@
                                            on_change="product_change(product_id, location_id, 'product_id', True,  prod_lot_id)" />
                                     <field name="average_cost" />
                                     <field name="currency_id" />
-                                    <field name="location_id" domain="[('usage', '=', 'internal')]" on_change="product_change(product_id, location_id, 'location_id', prod_lot_id)" required="True" />
+                                    <field name="location_id" domain="['&amp;', ('usage', '=', 'internal'), ('initial_stock_inv_display', '!=', False)]" on_change="product_change(product_id, location_id, 'location_id', prod_lot_id)" required="True" />
                                     <field name="prodlot_name"
                                         attrs="{'required': [('hidden_batch_management_mandatory', '=', True)], 'readonly': [('hidden_batch_management_mandatory', '=', False)]}" />
                                     <field name="expiry_date"
 
=== modified file 'bin/addons/stock/stock.py'
--- bin/addons/stock/stock.py	2019-09-25 14:20:09 +0000
+++ bin/addons/stock/stock.py	2019-10-22 09:02:04 +0000
@@ -155,6 +155,50 @@
                         result[loc_id][f] += amount
         return result
 
+    def _get_loc_ids_to_hide(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        loc_to_hide = [
+            'msf_cross_docking_stock_location_input',
+            'stock_stock_location_stock',
+            'stock_stock_location_output',
+            'msf_outgoing_stock_location_packing',
+            'msf_outgoing_stock_location_dispatch',
+            'msf_outgoing_stock_location_distribution',
+            'stock_location_quarantine_view',
+        ]
+
+        data_domain = [('model', '=', 'stock.location'), ('name', 'in', loc_to_hide)]
+        if ids:
+            data_domain.append(('res_id', 'in', ids))
+        loc_ids_to_hide = self.pool.get('ir.model.data').search(cr, uid, data_domain, context=context)
+
+        return [x.get('res_id') for x in self.pool.get('ir.model.data').read(cr, uid, loc_ids_to_hide, ['res_id'], context=context)]
+
+    def _get_initial_stock_inv_display(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
+
+        res = {}
+
+        loc_ids_to_hide = self._get_loc_ids_to_hide(cr, uid, ids, context=context)
+        for _id in ids:
+            res[_id] = True 
+            if _id in loc_ids_to_hide:
+                res[_id] = False
+
+        return res
+
+    def _search_initial_stock_inv_display(self, cr, uid, obj, name, args, context=None):
+        '''
+        Returns locations allowed in the Initial Stock Inventory
+        '''
+        if context is None:
+            context = {}
+
+        return [('id', 'not in', self._get_loc_ids_to_hide(cr, uid, [], context=context))]
+
     _columns = {
         'name': fields.char('Location Name', size=64, required=True, translate=True),
         'active': fields.boolean('Active', help="By unchecking the active field, you may hide a location without deleting it."),
@@ -214,6 +258,7 @@
         'scrap_location': fields.boolean('Scrap Location', help='Check this box to allow using this location to put scrapped/damaged goods.'),
         'valuation_in_account_id': fields.many2one('account.account', 'Stock Input Account',domain = [('type','=','other')], help='This account will be used to value stock moves that have this location as destination, instead of the stock output account from the product.'),
         'valuation_out_account_id': fields.many2one('account.account', 'Stock Output Account',domain = [('type','=','other')], help='This account will be used to value stock moves that have this location as source, instead of the stock input account from the product.'),
+        'initial_stock_inv_display': fields.function(_get_initial_stock_inv_display, method=True, type='boolean', store=False, fnct_search=_search_initial_stock_inv_display, string='Display in Initial stock inventory', readonly=True),
     }
     _defaults = {
         'active': True,