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

[Laetitia Gangloff (Acsone)]

Hello,

I propose some little change following my first test of your module.

In stock_inventory_hierarchical :
I redefine tree view for sub-inventories, because the context seems not transferred to name_get. I get problem in the following case :
create inventory - create sub-inventory - create sub-inventory on the sub-inventory
I also set default value for parent_id and exhaustive when create sub-inventory.

In stock_inventory_location :
I replace the onchange_location on inventory line by a domain, I found it is easier to have only available location than display a warning message. (Maybe add an help to explain why there is not all location ?)
I update default_location method for exhaustive inventory, to take the stock location define of the first warehouse of the user company. In a multi-company context this stock location should be always correct.

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

I see 2 problems with replacing onchange_location with a domain:
- if the inventory is not exhaustive, the content of location_id is unspecified (probably the default, but we can't be sure)
- if users insist on entering a wrong location, openerp will propose to create it which is going to be confusing

review: Needs Fixing

[lp:~acsone-openerp/stock-logistic-warehouse/7.0-inventory-hierarchical-lga]

65. By Laetitia Gangloff (Acsone) on 2014-06-11

stock_inventory_location : add use of a domain in inventory_line keep onchange_location

[Laetitia Gangloff (Acsone) (laetitia-gangloff)]

I reset the onchange_location and keep the domain.

For the first problem, in which case, it is not the default ?! It is not modifiable, and the stock value is set, maybe if there is many warehouse, and we want the second warehouse ?

For the second problem, the onchange do not resolve it, the creation is possible with or without the onchange.

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

It may not be the default for example if you create an inventory as exhaustive, change the location, then change your mind and make it non-exhaustive.
The onchange does not prevent the location's quick-create but at least you can't add the new/wrong location to the inventory.

I'll merge the other changes but I need to spread them correctly among the branches and modules to keep them modular and easy the main reviews.

review: Approve

[Laetitia Gangloff (Acsone) (laetitia-gangloff)]

No problem, I just try to get the easiest way to propose my change.

Thank you for your review !

=== modified file 'stock_inventory_hierarchical/hierarchical_inventory_view.xml'
--- stock_inventory_hierarchical/hierarchical_inventory_view.xml	2014-04-02 14:24:38 +0000
+++ stock_inventory_hierarchical/hierarchical_inventory_view.xml	2014-06-11 13:56:48 +0000
@@ -52,8 +52,13 @@
                     expr="//page[@string='General Information']"
                     position="after">
                     <page string="Sub-inventories">
-                        <field name="inventory_ids" nolabel="1"
-                            context="{'inventory_display': 'short'}" />
+                        <field name="inventory_ids" nolabel="1" context="{'default_parent_id': active_id, 'default_exhaustive': exhaustive}">
+                            <tree>
+                                <field name="name" />
+                                <field name="state" />
+                                <field name="progress_rate" widget="progressbar" />
+                            </tree>
+                        </field>
                     </page>
                 </xpath>
             </field>
 
=== modified file 'stock_inventory_location/stock_inventory_location.py'
--- stock_inventory_location/stock_inventory_location.py	2014-06-10 14:10:31 +0000
+++ stock_inventory_location/stock_inventory_location.py	2014-06-11 13:56:48 +0000
@@ -29,7 +29,6 @@
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
 
 from .exceptions import ExhaustiveInventoryException
-from openerp.tools.misc import mute_logger
 
 
 class StockInventory(orm.Model):
@@ -113,16 +112,15 @@
 
     # TODO: remove this in v8
     def _default_location(self, cr, uid, ids, context=None):
-        """Default stock location"""
-        try:
-            location = self.pool['ir.model.data'].get_object(
-                cr, uid, 'stock', 'stock_location_stock')
-            with mute_logger('openerp.osv.orm'):
-                location.check_access_rule('read', context=context)
-            location_id = location.id
-        except ValueError, orm.except_orm:
-            return False
-        return location_id or False
+        """Default stock location
+           get the stock location define on the first warehouse of the default company
+        """
+        location_id = False
+        company_id = self.pool['res.company']._company_default_get(cr, uid, 'stock.warehouse', context=context)
+        warehouse_id = self.pool['stock.warehouse'].search(cr, uid, [('company_id', '=', company_id)], limit=1)
+        if warehouse_id:
+            location_id = self.pool['stock.warehouse'].read(cr, uid, warehouse_id[0], ['lot_stock_id'])['lot_stock_id'][0]
+        return location_id
 
     _defaults = {
         'state': 'draft',
 
=== modified file 'stock_inventory_location/stock_inventory_location_view.xml'
--- stock_inventory_location/stock_inventory_location_view.xml	2014-06-10 14:00:45 +0000
+++ stock_inventory_location/stock_inventory_location_view.xml	2014-06-11 13:56:48 +0000
@@ -36,10 +36,12 @@
                 <xpath expr="/form//field[@name='inventory_line_id']/tree//field[@name='location_id']"
                        position="attributes">
                     <attribute name="on_change">onchange_location_id(parent.location_id, parent.exhaustive, location_id)</attribute>
+                    <attribute name="domain">[('usage', '=', 'internal'), ('id', 'child_of', parent.location_id)]</attribute>
                 </xpath>
                 <xpath expr="/form//field[@name='inventory_line_id']/form//field[@name='location_id']"
                        position="attributes">
                     <attribute name="on_change">onchange_location_id(parent.location_id, parent.exhaustive, location_id)</attribute>
+                    <attribute name="domain">[('usage', '=', 'internal'), ('id', 'child_of', parent.location_id)]</attribute>
                 </xpath>
 
                 <!-- Add button to open an inventory. Call wizard on confirm inventory -->