Merge lp:~acsone-openerp/stock-logistic-warehouse/7.0-inventory-hierarchical-fill-lga into lp:~numerigraphe-team/stock-logistic-warehouse/7.0-inventory-hierarchical

[Laetitia Gangloff (Acsone)]

I make some change in the module stock_inventory_hierarchical_location.

The goal is to take account of sub-inventories in case of an exhaustive inventory in two case :
-confirm inventory
-fill inventory

[Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives)]

Thanks for your help.
I've just merged our own fixes of the day, will you please merge them to avoid conflicts ?

I think I understand what you're trying to do in fill_inventory and it's not exactly how we had it in v6 - which is broken right now in v7, and would require a patch on the code addons.
Your patch completely excludes the locations of sub-inventories, whereas we used to only exclude the generated inventory lines. That would allow us to "catch" the lines that could have been missing from sub-inventories, but since they're exhaustive anyway there should not be any.
So I guess your approach is correct.
I'll let Loïc decide, he's working on the problem too.

review: Needs Resubmitting (has conflicts)

[Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives)]

review: Needs Fixing (has conflicts)

Unmerged revisions

39. By Laetitia Gangloff (Acsone) on 2014-06-12

stock_inventory_hierarchical_location: to fill inventory, check if it is an exhaustive fill to define if location should be exclude

38. By Laetitia Gangloff (Acsone) on 2014-06-12

stock_inventory_hierarchical_location: use sub-inventories to determine missing locations and to fill inventory with the fill_inventory wizard - move test in tests and add some python test for the previous issue / stock_inventory_location: correct a mysterious problem that hapenned when many inventory ids are passed

=== modified file 'stock_inventory_hierarchical_location/__openerp__.py'
--- stock_inventory_hierarchical_location/__openerp__.py	2014-06-10 14:04:38 +0000
+++ stock_inventory_hierarchical_location/__openerp__.py	2014-06-12 15:33:45 +0000
@@ -43,6 +43,6 @@
     "data": [
         "inventory_hierarchical_location_view.xml",
     ],
-    "test": ["test/inventory_hierarchical_location_test.yml"],
+    "test": ["tests/inventory_hierarchical_location_test.yml"],
     "demo": ["inventory_hierarchical_location_demo.xml"],
 }
 
=== modified file 'stock_inventory_hierarchical_location/inventory_hierarchical_location.py'
--- stock_inventory_hierarchical_location/inventory_hierarchical_location.py	2014-06-10 14:09:03 +0000
+++ stock_inventory_hierarchical_location/inventory_hierarchical_location.py	2014-06-12 15:33:45 +0000
@@ -44,6 +44,25 @@
         return super(HierarchicalExhInventory, self).action_open(
             cr, uid, ids, context=context)
 
+    def _get_all_sub_inventories(self, cr, uid, ids, res, context=None):
+        """Get the list of all sub inventories of a list inventories
+        """
+        for inventory in self.browse(cr, uid, ids, context=context):
+            for i in inventory.inventory_ids:
+                res.append(i.id)
+                self._get_all_sub_inventories(cr, uid, [i.id], res, context)
+        return res
+
+    def get_missing_locations(self, cr, uid, ids, context=None):
+        """Compute the list of location_ids which are missing from the lines
+
+        Here, "missing" means the location is the inventory's location or one
+        of it's children, and the inventory or a sub-inventory does not contain
+        any line with this location."""
+        # remove location of sub inventory
+        inventory_ids = self._get_all_sub_inventories(cr, uid, ids, ids, context=context)
+        return super(HierarchicalExhInventory, self).get_missing_locations(cr, uid, inventory_ids, context=context)
+
     # TODO v8: probably only keep the state "done"
     def confirm_missing_locations(self, cr, uid, ids, context=None):
         """Do something only if children state are confirm or done."""
@@ -80,12 +99,3 @@
                     }
         return {}
 
-    def _fill_location_lines(self, cr, uid, inventory_id, location_ids,
-                             set_stock_zero, context=None):
-        """Add ids of children inventory into list """
-        children_inventory_ids = self.search(
-            cr, uid, [('parent_id', 'child_of', inventory_id)])
-        context['children_inventory_ids'] = children_inventory_ids
-        return super(HierarchicalExhInventory, self)._fill_location_lines(
-            cr, uid, inventory_id, location_ids, set_stock_zero,
-            context=context)
 
=== modified file 'stock_inventory_hierarchical_location/inventory_hierarchical_location_view.xml'
--- stock_inventory_hierarchical_location/inventory_hierarchical_location_view.xml	2014-06-11 15:02:33 +0000
+++ stock_inventory_hierarchical_location/inventory_hierarchical_location_view.xml	2014-06-12 15:33:45 +0000
@@ -5,7 +5,7 @@
         <record model="ir.ui.view" id="stock_inventory_hierarchical_location_form_view">
             <field name="name">hierarchical.inventory.location.form</field>
             <field name="model">stock.inventory</field>
-            <field name="inherit_id" ref="stock.view_inventory_form" />
+            <field name="inherit_id" ref="stock_inventory_hierarchical.stock_inventory_hierarchical_form_view" />
             <field name="arch" type="xml">
                  <xpath expr="/form//field[@name='exhaustive']" position="attributes">
                     <attribute name="attrs">{'readonly':[('parent_id', '!=', False)]}</attribute>
 
=== renamed directory 'stock_inventory_hierarchical_location/test' => 'stock_inventory_hierarchical_location/tests'
=== added file 'stock_inventory_hierarchical_location/tests/__init__.py'
--- stock_inventory_hierarchical_location/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ stock_inventory_hierarchical_location/tests/__init__.py	2014-06-12 15:33:45 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+#
+#
+#    Authors: Laetitia Gangloff
+#    Copyright (c) 2014 Acsone SA/NV (http://www.acsone.eu)
+#    All Rights Reserved
+#
+#    WARNING: This program as such is intended to be used by professional
+#    programmers who take the whole responsibility of assessing all potential
+#    consequences resulting from its eventual inadequacies and bugs.
+#    End users who are looking for a ready-to-use solution with commercial
+#    guarantees and support are strongly advised to contact a Free Software
+#    Service Company.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+import fill_inventory_test
+
+fast_suite = [
+]
+
+checks = [
+    fill_inventory_test,
+]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'stock_inventory_hierarchical_location/tests/fill_inventory_test.py'
--- stock_inventory_hierarchical_location/tests/fill_inventory_test.py	1970-01-01 00:00:00 +0000
+++ stock_inventory_hierarchical_location/tests/fill_inventory_test.py	2014-06-12 15:33:45 +0000
@@ -0,0 +1,117 @@
+# -*- coding: utf-8 -*-
+#
+#
+#    Authors: Laetitia Gangloff
+#    Copyright (c) 2014 Acsone SA/NV (http://www.acsone.eu)
+#    All Rights Reserved
+#
+#    WARNING: This program as such is intended to be used by professional
+#    programmers who take the whole responsibility of assessing all potential
+#    consequences resulting from its eventual inadequacies and bugs.
+#    End users who are looking for a ready-to-use solution with commercial
+#    guarantees and support are strongly advised to contact a Free Software
+#    Service Company.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+import openerp.tests.common as common
+
+DB = common.DB
+ADMIN_USER_ID = common.ADMIN_USER_ID
+
+
+class fill_inventory_test(common.TransactionCase):
+
+    def setUp(self):
+        super(fill_inventory_test, self).setUp()
+
+    def test_missing_location(self):
+        """
+        Test that when confirm a parent inventory, the child location are not in the confirmation result
+        """
+        parent_inventory_id = self.ref('stock_inventory_hierarchical_location.parent_inventory_location')
+        self.registry('stock.inventory').action_open(self.cr, self.uid, [parent_inventory_id])
+        # confirm shelf 1 inventory
+        inventory_id = self.ref('stock_inventory_hierarchical_location.child_1_id')
+        self.registry('stock.inventory').action_open(self.cr, self.uid, [inventory_id])
+        missing_location = self.registry('stock.inventory').get_missing_locations(self.cr, self.uid, [inventory_id])
+        self.assertEqual(len(missing_location), 1, "1 missing location should be find, because the inventory is empty")
+        wizard_id = self.registry('stock.inventory.uninventoried.locations').create(self.cr, self.uid, {}, context={'active_ids': [inventory_id]})
+        self.registry('stock.inventory.uninventoried.locations').confirm_uninventoried_locations(self.cr, self.uid, wizard_id, context={'active_ids': [inventory_id]})
+        missing_location = self.registry('stock.inventory').get_missing_locations(self.cr, self.uid, [inventory_id])
+        self.assertEqual(len(missing_location), 0, "No missing location should be find, because the inventory is confirmed")
+        # confirm shelf 2 inventory
+        inventory_id = self.ref('stock_inventory_hierarchical_location.child_2_id')
+        self.registry('stock.inventory').action_open(self.cr, self.uid, [inventory_id])
+        missing_location = self.registry('stock.inventory').get_missing_locations(self.cr, self.uid, [inventory_id])
+        self.assertEqual(len(missing_location), 1, "1 missing location should be fine, because the inventory is empty")
+        self.registry('stock.inventory.line').create(self.cr, self.uid, {'product_id': self.ref('product.product_product_7'),
+                                                                         'product_uom': self.ref('product.product_uom_unit'),
+                                                                         'company_id': self.ref('base.main_company'),
+                                                                         'inventory_id': inventory_id,
+                                                                         'product_qty': 18.0,
+                                                                         'location_id': self.ref('stock.stock_location_14')})
+        missing_location = self.registry('stock.inventory').get_missing_locations(self.cr, self.uid, [inventory_id])
+        self.assertEqual(len(missing_location), 0, "No missing location should be find, because the inventory is filled")
+        wizard_id = self.registry('stock.inventory.uninventoried.locations').create(self.cr, self.uid, {}, context={'active_ids': [inventory_id]})
+        wizard = self.registry('stock.inventory.uninventoried.locations').browse(self.cr, self.uid, wizard_id, context={'active_ids': [inventory_id]})
+        self.assertEqual(len(wizard.location_ids), 0, "The wizard should not contain any lines but contains %s." % wizard.location_ids)
+        self.registry('stock.inventory.uninventoried.locations').confirm_uninventoried_locations(self.cr, self.uid, wizard_id, context={'active_ids': [inventory_id]})
+        # confirm parent inventory
+        missing_location = self.registry('stock.inventory').get_missing_locations(self.cr, self.uid, [parent_inventory_id])
+        self.assertEqual(len(missing_location), 1, "Only 1 missing location should be find, because there is some location in child inventory")
+
+    def test_fill_inventory(self):
+        """
+        Test that when fill a parent inventory, the child location are not in the result
+        """
+        parent_inventory_id = self.ref('stock_inventory_hierarchical_location.parent_inventory_location')
+        self.registry('stock.inventory').action_open(self.cr, self.uid, [parent_inventory_id])
+        # confirm shelf 1 inventory
+        inventory_id = self.ref('stock_inventory_hierarchical_location.child_1_id')
+        self.registry('stock.inventory').action_open(self.cr, self.uid, [inventory_id])
+        wizard_id = self.registry('stock.fill.inventory').create(self.cr, self.uid, {'location_id': self.ref('stock.stock_location_components'),
+                                                                                     'recursive': True,
+                                                                                     'exhaustive': True,
+                                                                                     'set_stock_zero': True}, context={'active_ids': [inventory_id]})
+        self.registry('stock.fill.inventory').fill_inventory(self.cr, self.uid, [wizard_id], context={'active_ids': [inventory_id]})
+        inventory_line_ids = self.registry('stock.inventory.line').search(self.cr, self.uid, [('inventory_id', '=', inventory_id)])
+        self.assertEqual(len(inventory_line_ids), 12, "12 inventory line is fount after filling inventory")
+        # confirm shelf 2 inventory
+        inventory_id = self.ref('stock_inventory_hierarchical_location.child_2_id')
+        self.registry('stock.inventory').action_open(self.cr, self.uid, [inventory_id])
+        wizard_id = self.registry('stock.fill.inventory').create(self.cr, self.uid, {'location_id': self.ref('stock.stock_location_14'),
+                                                                                     'recursive': True,
+                                                                                     'exhaustive': True,
+                                                                                     'set_stock_zero': True}, context={'active_ids': [inventory_id]})
+        self.registry('stock.fill.inventory').fill_inventory(self.cr, self.uid, [wizard_id], context={'active_ids': [inventory_id]})
+        inventory_line_ids = self.registry('stock.inventory.line').search(self.cr, self.uid, [('inventory_id', '=', inventory_id)])
+        self.assertEqual(len(inventory_line_ids), 4, "1 inventory line is fount after filling inventory")
+        # confirm parent inventory
+        wizard_id = self.registry('stock.fill.inventory').create(self.cr, self.uid, {'location_id': self.ref('stock.stock_location_stock'),
+                                                                                     'recursive': True,
+                                                                                     'exhaustive': True,
+                                                                                     'set_stock_zero': True}, context={'active_ids': [parent_inventory_id]})
+        try:
+            self.registry('stock.fill.inventory').fill_inventory(self.cr, self.uid, [wizard_id], context={'active_ids': [parent_inventory_id]})
+        except Exception:
+            exception_happened = True
+            pass
+        self.assertTrue(exception_happened)
+        inventory_line_ids = self.registry('stock.inventory.line').search(self.cr, self.uid, [('inventory_id', '=', parent_inventory_id)])
+        self.assertEqual(len(inventory_line_ids), 0, "No inventory line is fount after filling inventory")
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'stock_inventory_hierarchical_location/wizard/__init__.py'
--- stock_inventory_hierarchical_location/wizard/__init__.py	2014-04-02 10:04:21 +0000
+++ stock_inventory_hierarchical_location/wizard/__init__.py	2014-06-12 15:33:45 +0000
@@ -19,3 +19,4 @@
 ##############################################################################
 
 import stock_confirm_uninventoried_location
+from . import stock_fill_location_inventory
 
=== added file 'stock_inventory_hierarchical_location/wizard/stock_fill_location_inventory.py'
--- stock_inventory_hierarchical_location/wizard/stock_fill_location_inventory.py	1970-01-01 00:00:00 +0000
+++ stock_inventory_hierarchical_location/wizard/stock_fill_location_inventory.py	2014-06-12 15:33:45 +0000
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+#
+#
+#    Authors: Laetitia Gangloff
+#    Copyright (c) 2014 Acsone SA/NV (http://www.acsone.eu)
+#    All Rights Reserved
+#
+#    WARNING: This program as such is intended to be used by professional
+#    programmers who take the whole responsibility of assessing all potential
+#    consequences resulting from its eventual inadequacies and bugs.
+#    End users who are looking for a ready-to-use solution with commercial
+#    guarantees and support are strongly advised to contact a Free Software
+#    Service Company.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+from openerp.osv import orm
+
+
+class FillInventoryWizard(orm.TransientModel):
+    """If inventory as sub inventories, do not fill with sub inventories location"""
+    _inherit = 'stock.fill.inventory'
+
+    def fill_inventory(self, cr, uid, ids, context=None):
+        """ To Import stock inventory according to products available in the location and not already in a sub inventory
+
+        We split fill_inventory on many fill_inventory (one for each location)
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: the ID or list of IDs if we want more than one
+        @param context: A standard dictionary
+        @return:
+        """
+        if context is None:
+            context = {}
+
+        if ids and len(ids):
+            ids = ids[0]
+        else:
+            return {'type': 'ir.actions.act_window_close'}
+        fill_inventory = self.browse(cr, uid, ids, context=context)
+        if fill_inventory.recursive and fill_inventory.exhaustive:
+            exclude_location_ids = []
+            for i in self.pool['stock.inventory'].browse(cr, uid, context['active_ids']):
+                for sub_inventory in i.inventory_ids:
+                    # exclude these location
+                    exclude_location_ids.append(sub_inventory.location_id.id)
+            location_ids = self.pool['stock.location'].search(cr, uid,
+                                                [('location_id', 'child_of', [fill_inventory.location_id.id]),
+                                                 '!', ('location_id', 'child_of', exclude_location_ids)],
+                                                              order="id",
+                                                              context=context)
+            for location_id in location_ids:
+                super(FillInventoryWizard, self).fill_inventory(cr, uid,
+                            [self.copy(cr, uid, ids, {'location_id': location_id,
+                                                     'recursive': False, }, context=context)],
+                                                                context=context)
+            return {'type': 'ir.actions.act_window_close'}
+        else:
+            return super(FillInventoryWizard, self).fill_inventory(cr, uid, [ids], context=context)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'stock_inventory_location/stock_inventory_location.py'
--- stock_inventory_location/stock_inventory_location.py	2014-06-11 15:01:17 +0000
+++ stock_inventory_location/stock_inventory_location.py	2014-06-12 15:33:45 +0000
@@ -195,9 +195,11 @@
                 ('location_id', 'child_of', inv_location_ids),
                 ('usage', '=', 'internal')], context=context))
         # Find the locations already recorded in inventory lines
-        line_locations_ids = set([l.location_id.id
-                                  for l in i.inventory_line_id
-                                  for i in inventories])
+        line_locations_ids = set()
+        for i in inventories:
+            for l in i.inventory_line_id:
+                line_locations_ids.add(l.location_id.id)
+
         return list(inv_location_ids - line_locations_ids)
 
     def confirm_missing_locations(self, cr, uid, ids, context=None):