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

[Laetitia Gangloff (Acsone)]

Hello,

with your last version there is a problem in the view (use of an action before the declaration). And a test failing.

In case of hierarchical and exhaustive inventory, it is correct to have only one location when test the missing location. Missing location ignore location of sub inventories.

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

Marking merges because I've included it in the github PR here: https://github.com/OCA/stock-logistics-warehouse/pull/17.

=== modified file 'stock_inventory_hierarchical/hierarchical_inventory_view.xml'
--- stock_inventory_hierarchical/hierarchical_inventory_view.xml	2014-07-01 11:13:51 +0000
+++ stock_inventory_hierarchical/hierarchical_inventory_view.xml	2014-07-22 08:15:56 +0000
@@ -37,6 +37,17 @@
             <field name="context">{'full':'1', 'search_default_main_inventories':1}</field>
         </record>
 
+        <!-- Open the children of the current Inventory in a distinct list
+              to let users work in a normal window instead of a popup -->
+        <act_window id="action_view_sub_inventory"
+            name="View Sub-inventories"
+            res_model="stock.inventory"
+            src_model="stock.inventory"
+            view_mode="tree,form"
+            view_type="form"
+            domain="[('parent_id', 'child_of', active_id),('id', '!=', active_id)]"
+            context="{'full':1, 'search_default_main_inventories':0}"/>
+
         <record model="ir.ui.view" id="stock_inventory_hierarchical_form_view">
             <field name="name">hierarchical.inventory.form</field>
             <field name="model">stock.inventory</field>
@@ -70,15 +81,5 @@
             </field>
         </record>
 
-        <!-- Open the children of the current Inventory in a distinct list
-              to let users work in a normal window instead of a popup -->
-        <act_window id="action_view_sub_inventory"
-            name="View Sub-inventories"
-            res_model="stock.inventory"
-            src_model="stock.inventory"
-            view_mode="tree,form"
-            view_type="form"
-            domain="[('parent_id', 'child_of', active_id),('id', '!=', active_id)]"
-            context="{'full':1, 'search_default_main_inventories':0}"/>
     </data>
 </openerp>
 
=== modified file 'stock_inventory_hierarchical_location/tests/inventory_hierarchical_location_test.yml'
--- stock_inventory_hierarchical_location/tests/inventory_hierarchical_location_test.yml	2014-06-12 16:40:46 +0000
+++ stock_inventory_hierarchical_location/tests/inventory_hierarchical_location_test.yml	2014-07-22 08:15:56 +0000
@@ -24,7 +24,8 @@
 -
   !python {model: stock.inventory}: |
     missing_loc_ids = self.get_missing_locations(cr, uid, [ref('parent_inventory')], context=context)
-    assert len(missing_loc_ids)==3, "get_missing_locations did not return any ID."
+    # missing locations give only location that are not included in sub-inventories
+    assert len(missing_loc_ids)==1, "get_missing_locations did not return any ID."
 
 -
   I will fill the inventory and check that the function get_missing_locations return no locations.