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

[Lionel Sausin - Initiatives/Numérigraphe]

[lp:~numerigraphe-team/stock-logistic-warehouse/7.0-inventory-hierarchical-ls]

62. By Numérigraphe on 2014-06-11

[FIX] avoid division by zero when no inventory is found (ie. new inventory is beeing created)

63. By Numérigraphe on 2014-06-11

[MERGE] update screenshots

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

[IMP] stock_inventory_hierarchical : use different tree form for sub-inventories and propagate location and exhaustivity - courtesy of Laetitia Gangloff (Acsone)

65. By Numérigraphe on 2014-06-11

[MERGE] stock_inventory_location update

=== modified file 'stock_inventory_hierarchical/__init__.py'
--- stock_inventory_hierarchical/__init__.py	2014-03-12 15:08:22 +0000
+++ stock_inventory_hierarchical/__init__.py	2014-06-11 15:04:27 +0000
@@ -18,4 +18,11 @@
 #
 ##############################################################################
 
+# This package-wide list keeps the names of the field that must be
+# propagated from root inventories to their children.
+# Add field names in the Model's definition.
+PARENT_VALUES = []
+
 import hierarchical_inventory
+# Bring the main exception into the package's scope for easier reuse
+from .exceptions import HierarchicalInventoryException
 
=== modified file 'stock_inventory_hierarchical/__openerp__.py'
--- stock_inventory_hierarchical/__openerp__.py	2014-03-12 15:08:22 +0000
+++ stock_inventory_hierarchical/__openerp__.py	2014-06-11 15:04:27 +0000
@@ -20,22 +20,27 @@
 
 {
     "name": "Hierarchical Physical Inventory",
-    "version": "1.0",
+    "version": "1.1",
     "depends": ["stock"],
     "author": "Numérigraphe",
-    "category": "stock inventory",
+    "category": "Warehouse Management",
     "description": """
 Hierarchical structure for Physical Inventories and sub-Inventories
 ===================================================================
 
-This module adds a parent-child relationship between Physical Inventories, to help users
-manage complex inventories.
+This module adds a parent-child relationship between Physical Inventories, to
+help users manage complex inventories.
 Using several inventories, you can distribute the counting to several persons
 and still keep a clear overview of global Inventory's status.
 
-OpenERP will make sure the status of the Inventory and it's sub-Inventories are consistent.
+OpenERP will make sure the status of the Inventory and it's Sub-Inventories are
+consistent.
 """,
-    "update_xml": ["hierarchical_inventory_view.xml"],
-     "test": ["test/hierarchical_inventory_test.yml"],
-     "demo": ["hierarchical_inventory_demo.xml"]
+    "data": ["hierarchical_inventory_view.xml"],
+    "test": ["test/hierarchical_inventory_test.yml"],
+    "demo": ["hierarchical_inventory_demo.xml"],
+    "images": [
+        "inventory_form.png",
+        "inventory_form_actions.png",
+    ],
 }
 
=== added file 'stock_inventory_hierarchical/exceptions.py'
--- stock_inventory_hierarchical/exceptions.py	1970-01-01 00:00:00 +0000
+++ stock_inventory_hierarchical/exceptions.py	2014-06-11 15:04:27 +0000
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    This module is copyright (C) 2013 Numérigraphe SARL. All Rights Reserved.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm
+
+
+class HierarchicalInventoryException(orm.except_orm):
+    """The operation is not possible for a hierarchical inventory"""
+    pass
 
=== modified file 'stock_inventory_hierarchical/hierarchical_inventory.py'
--- stock_inventory_hierarchical/hierarchical_inventory.py	2014-03-12 15:08:22 +0000
+++ stock_inventory_hierarchical/hierarchical_inventory.py	2014-06-11 15:04:27 +0000
@@ -18,11 +18,17 @@
 #
 ##############################################################################
 
-from openerp.osv import osv, fields
+from openerp.osv import orm, fields
 from openerp.tools.translate import _
 
-
-class stock_inventory_hierarchical(osv.osv):
+from .exceptions import HierarchicalInventoryException
+
+# Add the date to the list of fields we must propagate to children inventories
+from . import PARENT_VALUES
+PARENT_VALUES.append('date')
+
+
+class HierarchicalInventory(orm.Model):
     _inherit = 'stock.inventory'
 
     _parent_store = True
@@ -30,7 +36,19 @@
     _order = 'parent_left'
 
     def name_get(self, cr, uid, ids, context=None):
-        """Show the parent inventory's name in the name of the children"""
+        """Show the parent inventory's name in the name of the children
+
+        :param dict context: the ``inventory_display`` key can be
+                             used to select the short version of the
+                             inventory name (without the direct parent),
+                             when set to ``'short'``. The default is
+                             the long version."""
+        if context is None:
+            context = {}
+        if context.get('inventory_display') == 'short':
+            # Short name context: just do the usual stuff
+            return super(HierarchicalInventory, self).name_get(
+                cr, uid, ids, context=context)
         if isinstance(ids, (list, tuple)) and not len(ids):
             return []
         if isinstance(ids, (long, int)):
@@ -44,130 +62,105 @@
             res.append((record['id'], name))
         return res
 
-    def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
-        """Allow search on value returned by name_get ("parent/ child")"""
+    def name_search(self, cr, uid, name='', args=None, operator='ilike',
+                    context=None, limit=100):
+        """Enable search on value returned by name_get ("parent / child")"""
         if not args:
             args = []
         if not context:
             context = {}
         if name:
-            # Be sure name_search is symetric to name_get
+            # Make sure name_search is symmetric to name_get
             name = name.split(' / ')[-1]
-            ids = self.search(cr, uid, [('name', operator, name)] + args, limit=limit, context=context)
+            ids = self.search(cr, uid, [('name', operator, name)] + args,
+                              limit=limit, context=context)
         else:
             ids = self.search(cr, uid, args, limit=limit, context=context)
         return self.name_get(cr, uid, ids, context=context)
 
-    def _name_get_fnc(self, cr, uid, ids, field_name, arg, context=None):
-        """Function field containing the long name"""
+    def _complete_name(self, cr, uid, ids, field_name, arg, context=None):
+        """Function-field wrapper to get the complete name from name_get"""
         res = self.name_get(cr, uid, ids, context=context)
         return dict(res)
 
-    def _confirmed_rate(self, cr, uid, ids, field_name, arg, context=None):
-        """Number of (sub)inventories confirmed/total"""
+    def _progress_rate(self, cr, uid, ids, field_name, arg, context=None):
+        """Rate of (sub)inventories done/total"""
         rates = {}
-        for id in ids:
-            nb = self.search(cr, uid, [('parent_id', 'child_of', id)], context=context, count=True)
-            nb_confirmed = self.search(cr, uid, [('parent_id', 'child_of', id),
-                                                 ('state', 'in', ('confirm', 'done'))], context=context, count=True)
-            rates[id] = 100 * nb_confirmed / nb
+        for current_id in ids:
+            nb = self.search(
+                cr, uid, [('parent_id', 'child_of', current_id)],
+                context=context, count=True)
+            if not nb:
+                # No inventory, consider it's 0% done
+                rates[current_id] = 0
+                continue
+            nb_done = self.search(
+                cr, uid, [('parent_id', 'child_of', current_id),
+                          ('state', '=', 'done')],
+                context=context, count=True)
+            rates[current_id] = 100 * nb_done / nb
         return rates
 
     _columns = {
-        # XXX remove "method=True" in v7 ?
-        'complete_name': fields.function(_name_get_fnc, method=True, type="char", string='Complete reference'),
-        'parent_id': fields.many2one('stock.inventory', 'Parent', ondelete='cascade', readonly=True, states={'draft': [('readonly', False)]}),
-        'inventory_ids': fields.one2many('stock.inventory', 'parent_id', 'List of Sub-inventories', readonly=True, states={'draft': [('readonly', False)]}),
+        # name_get() only changes the default name of the record, not the
+        # content of the field "name" so we add another field for that
+        'complete_name': fields.function(
+            _complete_name, type="char",
+            string='Complete reference'),
+        'parent_id': fields.many2one(
+            'stock.inventory', 'Parent', ondelete='cascade', readonly=True,
+            states={'draft': [('readonly', False)]}),
+        'inventory_ids': fields.one2many(
+            'stock.inventory', 'parent_id', 'List of Sub-inventories',
+            readonly=True, states={'draft': [('readonly', False)]}),
         'parent_left': fields.integer('Parent Left', select=1),
         'parent_right': fields.integer('Parent Right', select=1),
-        'confirmed_rate': fields.function(_confirmed_rate, method=True, string='Confirmed', type='float'),
+        'progress_rate': fields.function(
+            _progress_rate, string='Progress', type='float'),
         }
 
-    # XXX: drop this in v7
-    def _check_recursion(self, cr, uid, ids, context=None, parent=None):
-        """Backport of osv.osv._check_recursion from v7.0, to allow writing parents and children in the same write()"""
-        if not parent:
-            parent = self._parent_name
-
-        # must ignore 'active' flag, ir.rules, etc. => direct SQL query
-        query = 'SELECT "%s" FROM "%s" WHERE id = %%s' % (parent, self._table)
-        for id in ids:
-            current_id = id
-            while current_id is not None:
-                cr.execute(query, (current_id,))
-                result = cr.fetchone()
-                current_id = result[0] if result else None
-                if current_id == id:
-                    return False
-        return True
-
-    # XXX: use this in v7
-    # _constraints = [(osv.osv._check_recursion, 'Error! You can not create recursive inventories.', ['parent_id']), ]
     _constraints = [
-        (_check_recursion,
-         _('Error! You can not create recursive inventories.'), ['parent_id']),
+        (orm.Model._check_recursion,
+         'Error: You can not create recursive inventories.',
+         ['parent_id']),
     ]
 
-    # This is the list of fields that must be forced from Inventories to Sub-Inventories 
-    # TODO: propose this as a new feature of the ORM's API using (using a field named _parent_values for example)
-    PARENT_VALUES = ['date']
-
-# XXX: Ideally we would have liked to have a button to open Sub-inventories,
-# but unfortunately the v6.0 GTK client crashes, and the 6.0 web client opens a windows without action buttons.
-# Maybe we may try that again with the new web client one day... 
-#     def open_sub_inventory(self, cr, uid, id, context=None):
-#         """Method to open Sub-inventory from one2many list on new tab, with specific view."""
-#         # Find out the form view id
-#         if not isinstance(id, list):
-#             id = [id]
-#         id = id[0]
-#         res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'view_inventory_form')
-#         view_id = res and res[1] or False
-#         inv = self.browse(cr, uid, id, context=context)
-#         return {
-#             'type': 'ir.actions.act_window',
-#             'name': _("Sub-inventory : %s") % inv.name,
-#             'view_type': 'form',
-#             'view_mode': 'form',
-#             'view_id': [view_id],
-#             'res_model': 'stock.inventory',
-#             'res_id': id,
-#         }
-#         return True
-
-    # TODO: propose this as a new feature of the ORM's API using (using a field named _parent_values for example)
-    def create(self, cr, user, vals, context=None):
+    def create(self, cr, uid, vals, context=None):
         """Copy selected values from parent to child"""
         if vals and vals.get('parent_id'):
-            for f in self.PARENT_VALUES:
-                parent_field = self.read(cr, user, [vals['parent_id']], [f], context=context)
-                vals = vals.copy()
-                vals[f] = parent_field[0][f]
-        return super(stock_inventory_hierarchical, self).create(cr, user, vals, context=context)
+            existing_fields = self.fields_get_keys(cr, uid, context=context)
+            parent_values = self.read(cr, uid, [vals['parent_id']],
+                                      PARENT_VALUES, context=context)
+            vals = vals.copy()
+            vals.update({field: parent_values[0][field]
+                         for field in PARENT_VALUES
+                         if field in existing_fields})
+        return super(HierarchicalInventory, self).create(
+            cr, uid, vals, context=context)
 
-    # TODO: propose this as a new feature of the ORM's API using (using a field named _parent_values for example)
     def write(self, cr, uid, ids, vals, context=None):
         """Copy selected values from parent to children"""
         if context is None:
             context = {}
 
-        values = super(stock_inventory_hierarchical, self).write(cr, uid, ids, vals, context=context)
-        if not vals or context.get('norecurs'):
+        values = super(HierarchicalInventory, self).write(
+            cr, uid, ids, vals, context=context)
+        if not vals or context.get('norecurse', False):
             return values
 
-        record = {}
-        for f in self.PARENT_VALUES:
-            if f in vals:
-                record[f] = vals[f]
-        if not record:
+        # filter the fields we want to propagate
+        children_values = {
+            field: vals[field] for field in PARENT_VALUES if field in vals
+        }
+        if not children_values:
             return values
 
         if not isinstance(ids, list):
             ids = [ids]
-        children_ids = self.search(cr, uid, [('parent_id', 'child_of', ids)])
-        ctx = context.copy()
-        ctx['norecurs'] = True  # needed to write children once.
-        return self.write(cr, uid, children_ids, record, context=ctx)
+        # The context disables recursion - children are already included
+        return self.write(
+            cr, uid, self.search(cr, uid, [('parent_id', 'child_of', ids)]),
+            children_values, context=dict(context, norecurse=True))
 
     def action_cancel_inventory(self, cr, uid, ids, context=None):
         """Cancel inventory only if all the parents are canceled"""
@@ -176,25 +169,34 @@
             while inventory.parent_id:
                 inventory = inventory.parent_id
                 if inventory.state != 'cancel':
-                    raise osv.except_osv(_('Warning !'), 
-                                         _('One of the parent Inventories is not canceled.'))
-        return super(stock_inventory_hierarchical, self).action_cancel_inventory(cr, uid, ids, context=context)
+                    raise HierarchicalInventoryException(
+                        _('Warning'),
+                        _('One of the parent Inventories is not canceled.'))
+        return super(HierarchicalInventory,
+                     self).action_cancel_inventory(cr, uid, ids,
+                                                   context=context)
 
     def action_confirm(self, cr, uid, ids, context=None):
         """Confirm inventory only if all the children are confirmed"""
-        children_count = self.search(cr, uid, [('parent_id', 'child_of', ids),
-                                             ('state', 'not in', ['confirm', 'done'])], context=context, count=True)
+        children_count = self.search(
+            cr, uid, [('parent_id', 'child_of', ids),
+                      ('state', 'not in', ['confirm', 'done'])],
+            context=context, count=True)
         if children_count > 1:
-            raise osv.except_osv(_('Warning !'),
-                                 _('Some Sub-inventories are not confirmed.'))
-        return super(stock_inventory_hierarchical, self).action_confirm(cr, uid, ids, context=context)
+            raise HierarchicalInventoryException(
+                _('Warning'),
+                _('Some Sub-inventories are not confirmed.'))
+        return super(HierarchicalInventory, self).action_confirm(
+            cr, uid, ids, context=context)
 
     def action_done(self, cr, uid, ids, context=None):
         """Perform validation only if all the children states are 'done'."""
         children_count = self.search(cr, uid, [('parent_id', 'child_of', ids),
                                                ('state', '!=', 'done')],
-                                               context=context, count=True)
+                                     context=context, count=True)
         if children_count > 1:
-            raise osv.except_osv(_('Warning !'),
-                                 _('Some Sub-inventories are not done.'))
-        return super(stock_inventory_hierarchical, self).action_done(cr, uid, ids, context=context)
+            raise HierarchicalInventoryException(
+                _('Warning'),
+                _('Some Sub-inventories are not validated.'))
+        return super(HierarchicalInventory, self).action_done(
+            cr, uid, ids, context=context)
 
=== modified file 'stock_inventory_hierarchical/hierarchical_inventory_demo.xml'
--- stock_inventory_hierarchical/hierarchical_inventory_demo.xml	2014-03-12 15:08:22 +0000
+++ stock_inventory_hierarchical/hierarchical_inventory_demo.xml	2014-06-11 15:04:27 +0000
@@ -1,30 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="0">
-
-        <!-- Record a production lot we can use in the tests. -->
-        <record id="lot_test0" model="stock.production.lot">
-            <field name="product_id" ref="product.product_product_10" />
-        </record>
-
-        <!-- Record inventories we can use in the tests. -->
-        <!-- We need them in the demo data because test data is rolled back 
-            whenever an exception is raised. -->
-        
-        <!-- Record an inventory to make sure the next one will have stock moves posted. -->
+        <!-- Example Inventory with Sub-Inventories. -->
         <record id="stock_inventory_parent0" model="stock.inventory">
-            <field name="name">Parent test inventory</field>
-            <field name="state">draft</field>
+            <field name="name">Main Inventory</field>
             <field name="date">2020-01-01 00:00:00</field>
-        </record>        
-        <record id="stock_inventory_line" model="stock.inventory.line">
-            <field name="inventory_id" ref="stock_inventory_parent0" />
-            <field name="product_id" ref="product.product_product_10" />
-            <field name="prod_lot_id" ref="lot_test0"/>
-            <field name="product_uom" ref="product.product_uom_unit" />
-            <field name="product_qty">27.0</field>
-            <field name="location_id" ref="stock.stock_location_components" />
-        </record>        
-
+        </record>
+        <record id="child_1_id" model="stock.inventory">
+            <field name="name">Sub-Inventory 1</field>
+            <field name="parent_id" ref="stock_inventory_parent0" />
+        </record>
+        <record id="child_2_id" model="stock.inventory">
+            <field name="name">Sub-Inventory 2</field>
+            <field name="parent_id" ref="stock_inventory_parent0" />
+        </record>
     </data>
 </openerp>
 
=== modified file 'stock_inventory_hierarchical/hierarchical_inventory_view.xml'
--- stock_inventory_hierarchical/hierarchical_inventory_view.xml	2014-03-12 15:08:22 +0000
+++ stock_inventory_hierarchical/hierarchical_inventory_view.xml	2014-06-11 15:04:27 +0000
@@ -5,16 +5,14 @@
         <record model="ir.ui.view" id="stock_inventory_hierarchical_tree_view">
             <field name="name">hierarchical.inventory.tree</field>
             <field name="model">stock.inventory</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="stock.view_inventory_tree" />
             <field name="field_parent">inventory_ids</field>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='name']" position="replace">
-                    <field name="complete_name"/>
+                    <field name="complete_name" string="Reference"/>
                 </xpath>
                 <xpath expr="//field[@name='state']" position="after">
-                    <field name="confirmed_rate" widget="progressbar" />
-                    <field name="inventory_ids" string="Number of Sub-inventories" />
+                    <field name="progress_rate" widget="progressbar" />
                 </xpath>
             </field>
         </record>
@@ -23,7 +21,6 @@
         <record model="ir.ui.view" id="view_inventory_subinventories_filter">
             <field name="name">hierarchical.inventory.filter</field>
             <field name="model">stock.inventory</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="stock.view_inventory_filter" />
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='name']" position="before">
@@ -43,9 +40,11 @@
         <record model="ir.ui.view" id="stock_inventory_hierarchical_form_view">
             <field name="name">hierarchical.inventory.form</field>
             <field name="model">stock.inventory</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_inventory_form" />
             <field name="arch" type="xml">
+                <xpath expr="/form//field[@name='name']" position="after">
+                    <field name="parent_id"/>
+                </xpath>
                 <xpath expr="/form//field[@name='date']" position="attributes">
                     <attribute name="attrs">{'readonly':[('parent_id', '!=', False)]}</attribute>
                 </xpath>
@@ -53,62 +52,22 @@
                     expr="//page[@string='General Information']"
                     position="after">
                     <page string="Sub-inventories">
-                        <field name="parent_id" invisible="1" />
-                        <field name="inventory_ids" nolabel="1" 
-                            context="{'form_view_ref' : 'stock_inventory_hierarchical.stock_inventory_hierarchical_subinventory_form_view', 'tree_view_ref' : 'stock_inventory_hierarchical.stock_inventory_hierarchical_subinventory_tree_view'}" />
+                        <field name="inventory_ids" nolabel="1" context="{'default_parent_id': active_id}">
+                            <tree>
+                                <field name="name" />
+                                <field name="state" />
+                                <field name="progress_rate" widget="progressbar" />
+                            </tree>
+                        </field>
                     </page>
                 </xpath>
             </field>
         </record>
 
-        <record model="ir.ui.view"
-            id="stock_inventory_hierarchical_subinventory_tree_view">
-            <field name="name">hierarchical.inventory.subinventory.tree</field>
-            <field name="model">stock.inventory</field>
-            <field name="type">tree</field>
-            <field name="priority" eval="99" />
-            <field name="arch" type="xml">
-                <tree string="Sub-inventories" version="7.0">
-                    <field name="name" />
-                    <field name="state" />
-                    <field name="confirmed_rate" widget="progressbar" />
-                    <field name="inventory_ids" string="Number of Sub-inventories"/>
-                    <!-- XXX: Ideally we would have liked to have a button to open Sub-inventories,
-                    but unfortunately the v6.0 GTK client crashes, and the 6.0 web client opens a windows without action buttons.
-                    Maybe we may try that again with the new web client one day... 
-                    <button string="View this inventory" type="object" name="open_sub_inventory"/>
-                    -->
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view"
-            id="stock_inventory_hierarchical_subinventory_form_view">
-            <field name="name">hierarchical.inventory.subinventory.form</field>
-            <field name="model">stock.inventory</field>
-            <field name="type">form</field>
-            <field name="priority" eval="99" />
-            <field name="arch" type="xml">
-                <form string="Sub-inventories" version="7.0">
-                    <group colspan="4" col="2">
-                        <field name="name" default_focus="1"/>
-                    </group>
-                    <field name="inventory_ids" nolabel="1" colspan="4"
-                        context="{'form_view_ref' : 'stock_inventory_hierarchical.stock_inventory_hierarchical_subinventory_form_view', 'tree_view_ref' : 'stock_inventory_hierarchical.stock_inventory_hierarchical_subinventory_tree_view'}" />
-                    <group colspan="4" col="3">
-                        <field name="state" />
-                        <!-- XXX: Ideally we would have liked to have a button to open Sub-inventories,
-                            but unfortunately the v6.0 GTK client crashes, and the 6.0 web client opens a windows without action buttons.
-                            Maybe we may try that again with the new web client one day...                             
-                            <button string="View this inventory" type="object" name="open_sub_inventory"/>
-                        -->
-                    </group>
-                </form>
-            </field>
-        </record>
-        
-         <act_window id="action_view_sub_inventory"
-            name="Sub-inventories"
+        <!-- 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"
 
=== modified file 'stock_inventory_hierarchical/i18n/fr.po'
--- stock_inventory_hierarchical/i18n/fr.po	2014-03-12 15:08:22 +0000
+++ stock_inventory_hierarchical/i18n/fr.po	2014-06-11 15:04:27 +0000
@@ -21,16 +21,16 @@
 msgstr "Réference complète"
 
 #. module: stock_inventory_hierarchical
-#: field:stock.inventory,confirmed_rate:0
-msgid "Confirmed"
-msgstr "Confirmé"
+#: field:stock.inventory,progress_rate:0
+msgid "Done"
+msgstr "Terminé"
 
 #. module: stock_inventory_hierarchical
 #: code:addons/stock_inventory_hierarchical/hierarchical_inventory.py:108
 #: constraint:stock.inventory:0
 #, python-format
-msgid "Error! You can not create recursive inventories."
-msgstr "Erreur! Vous ne pouvez pas créer d'inventaire récursifs."
+msgid "Error: You can not create recursive inventories."
+msgstr "Erreur : Vous ne pouvez pas créer d'inventaire récursifs."
 
 #. module: stock_inventory_hierarchical
 #: model:ir.model,name:stock_inventory_hierarchical.model_stock_inventory
@@ -61,7 +61,7 @@
 #. module: stock_inventory_hierarchical
 #: constraint:stock.inventory:0
 msgid "Other Physical inventories are being conducted using the same Locations."
-msgstr "Erreur: certains emplacements sont déjà dans un autre inventaire."
+msgstr "Certains emplacements sont déjà dans un autre inventaire."
 
 #. module: stock_inventory_hierarchical
 #: field:stock.inventory,parent_id:0
@@ -87,19 +87,19 @@
 #. module: stock_inventory_hierarchical
 #: code:addons/stock_inventory_hierarchical/hierarchical_inventory.py:196
 #, python-format
-msgid "Some Sub-inventories are not done."
+msgid "Some Sub-inventories are not validated."
 msgstr "Certains sous-inventaires ne sont pas terminés."
 
 #. module: stock_inventory_hierarchical
 #: model:ir.actions.act_window,name:stock_inventory_hierarchical.action_view_sub_inventory
 #: view:stock.inventory:0
-msgid "Sub-inventories"
-msgstr "Sous-inventaires"
+msgid "View Sub-inventories"
+msgstr "Voir les sous-inventaires"
 
 #. module: stock_inventory_hierarchical
 #: code:addons/stock_inventory_hierarchical/hierarchical_inventory.py:130
 #, python-format
-msgid "Sub-inventory : %s"
+msgid "Sub-inventory: %s"
 msgstr "Sous-inventaire : %s"
 
 #. module: stock_inventory_hierarchical
@@ -107,6 +107,6 @@
 #: code:addons/stock_inventory_hierarchical/hierarchical_inventory.py:188
 #: code:addons/stock_inventory_hierarchical/hierarchical_inventory.py:196
 #, python-format
-msgid "Warning !"
-msgstr "Attention !"
+msgid "Warning"
+msgstr "Attention"
 
 
=== added directory 'stock_inventory_hierarchical/images'
=== added file 'stock_inventory_hierarchical/images/inventory_form.png'
 Binary files stock_inventory_hierarchical/images/inventory_form.png	1970-01-01 00:00:00 +0000 and stock_inventory_hierarchical/images/inventory_form.png	2014-06-11 15:04:27 +0000 differ
=== added file 'stock_inventory_hierarchical/images/inventory_form_actions.png'
 Binary files stock_inventory_hierarchical/images/inventory_form_actions.png	1970-01-01 00:00:00 +0000 and stock_inventory_hierarchical/images/inventory_form_actions.png	2014-06-11 15:04:27 +0000 differ
=== added directory 'stock_inventory_hierarchical/static'
=== added directory 'stock_inventory_hierarchical/static/src'
=== added directory 'stock_inventory_hierarchical/static/src/img'
=== added file 'stock_inventory_hierarchical/static/src/img/icon.png'
 Binary files stock_inventory_hierarchical/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and stock_inventory_hierarchical/static/src/img/icon.png	2014-06-11 15:04:27 +0000 differ
=== modified file 'stock_inventory_hierarchical/test/hierarchical_inventory_test.yml'
--- stock_inventory_hierarchical/test/hierarchical_inventory_test.yml	2014-03-12 15:08:22 +0000
+++ stock_inventory_hierarchical/test/hierarchical_inventory_test.yml	2014-06-11 15:04:27 +0000
@@ -1,48 +1,39 @@
 -
   In this file, i check rules about hierarchical inventories.
-  children date must be the same of parent date for each state,
-  the state of parent and children can change only if conditions are true.
-  First, i'll create two children inventory of stock_inventory_parent inventory.
--
-  !python {model: stock.inventory}: |
-    from osv import orm                                          
-    self.child_1_id = self.create(cr, uid, {'parent_id': ref('stock_inventory_parent0'), 
-                                       'inventory_ids': [], 
-                                       'name': 'Children 1 test inventory'})
-    self.child_2_id = self.create(cr, uid, {'parent_id': ref('stock_inventory_parent0'), 
-                                       'inventory_ids': [], 
-                                       'name': 'Children 2 test inventory'})
--
-  Check if date of children are the same than parent date.
-  I'll read the date for 2 children and compare them with parent inventory date.  
--
-  !python {model: stock.inventory}: |
-    from osv import orm
-    parent_date = self.read(cr, uid, [ref('stock_inventory_parent0')], ['date'])[0]['date']
-    child_1_date = self.read(cr, uid, [self.child_1_id], ['date'])[0]['date']
-    assert child_1_date == parent_date, "Date are not equals : %s - %s" % (parent_date, child_1_date)
-           
-    child_2_date = self.read(cr, uid, [self.child_2_id], ['date'])[0]['date']    
-    assert child_2_date == parent_date, "Date are not equals : %s - %s" % (parent_date, child_2_date)
+  Children date must be the same of parent date for each state,
+  the state of parent and children can change only if conditions are correct.
+-
+  Check if date of children are the same as the parent's.
+-
+  !python {model: stock.inventory}: |
+    parent_date = self.read(
+      cr, uid, [ref('stock_inventory_parent0')], ['date'])[0]['date']
+    child_1_date = self.read(
+      cr, uid, [ref('child_1_id')], ['date'])[0]['date']
+    assert child_1_date == parent_date, "Date are different: %s - %s" % (parent_date, child_1_date)
+
+    child_2_date = self.read(
+      cr, uid, [ref('child_2_id')], ['date'])[0]['date']
+    assert child_2_date == parent_date, "Date are different: %s - %s" % (parent_date, child_2_date)
 
 -
   Check if children cannot be canceled if the parent was not canceled.
   I'll try to cancel both children inventory while parent inventory having "draft" state.
-  After, i'll verify the state of each inventory. 
+  After, i'll verify the state of each inventory.
 -
-  !python {model: stock.inventory}: |  
-    from osv import orm, osv    
-    try:
-      self.action_cancel_inventary(cr, uid, [self.child_1_id])      
-    except osv.except_osv as e:
-      log("Good ! The Inventory could not be canceled : %s" % e)
-    try:
-      self.action_cancel_inventary(cr, uid, [self.child_2_id])      
-    except osv.except_osv as e:
-      log("Good ! The Inventory could not be canceled : %s" % e)      
-    child_1_state = self.read(cr, uid, [self.child_1_id], ['state'])[0]['state']
+  !python {model: stock.inventory}: |
+    from stock_inventory_hierarchical import HierarchicalInventoryException
+    try:
+      self.action_cancel_inventory(cr, uid, [ref('child_1_id')])
+    except HierarchicalInventoryException as e:
+      log("Good ! The Inventory could not be canceled: %s" % e)
+    try:
+      self.action_cancel_inventory(cr, uid, [ref('child_2_id')])
+    except HierarchicalInventoryException as e:
+      log("Good ! The Inventory could not be canceled: %s" % e)
+    child_1_state = self.read(cr, uid, [ref('child_1_id')], ['state'])[0]['state']
     assert child_1_state == 'draft', "Child inventory 1 have '%s' state. It should be 'draft'" % child_1_state
-    child_2_state = self.read(cr, uid, [self.child_2_id], ['state'])[0]['state']
+    child_2_state = self.read(cr, uid, [ref('child_2_id')], ['state'])[0]['state']
     assert child_2_state == 'draft', "Child inventory 2 have '%s' state. It should be 'draft'" % child_2_state
 
 -
@@ -50,58 +41,56 @@
   To check this, i'll try to confirm parent inventory when children inventory having "draft" state,
   and i'll check if state is still 'draft'.
 -
-  !python {model: stock.inventory}: |  
-    from osv import orm, osv          
+  !python {model: stock.inventory}: |
+    from stock_inventory_hierarchical import HierarchicalInventoryException
     try:
-      self.action_confirm(cr, uid, [ref('stock_inventory_parent0')])    
-    except osv.except_osv as e:
-      log("Good, the inventory could not be confirm : %s", e)
+      self.action_confirm(cr, uid, [ref('stock_inventory_parent0')])
+    except HierarchicalInventoryException as e:
+      log("Good, the inventory could not be confirmed: %s", e)
     parent_state = self.read(cr, uid, [ref('stock_inventory_parent0')], ['state'])[0]['state']
     assert parent_state == 'draft', "Parent inventory have '%s' state. It should be 'draft'" % parent_state
 
 -
   In order, i'll confirm the children inventories, and the parent inventory after.
 -
-  !python {model: stock.inventory}: |  
-    from osv import orm, osv
-    self.action_confirm(cr, uid, [self.child_1_id])
-    child_1_state = self.read(cr, uid, [self.child_1_id], ['state'])[0]['state']
+  !python {model: stock.inventory}: |
+    self.action_confirm(cr, uid, [ref('child_1_id')])
+    child_1_state = self.read(cr, uid, [ref('child_1_id')], ['state'])[0]['state']
     assert child_1_state == 'confirm', "Child inventory 1 have '%s' state. It should be 'confirm'" % child_1_state
-    
-    self.action_confirm(cr, uid, [self.child_2_id])
-    child_2_state = self.read(cr, uid, [self.child_2_id], ['state'])[0]['state']
+
+    self.action_confirm(cr, uid, [ref('child_2_id')])
+    child_2_state = self.read(cr, uid, [ref('child_2_id')], ['state'])[0]['state']
     assert child_2_state == 'confirm', "Child inventory 2 have '%s' state. It should be 'confirm'" % child_2_state
-        
+
     self.action_confirm(cr, uid, [ref('stock_inventory_parent0')])
     parent_state = self.read(cr, uid, [ref('stock_inventory_parent0')], ['state'])[0]['state']
     assert parent_state == 'confirm', "Parent inventory have '%s' state. It should be 'confirm'" % parent_state
-    
+
 -
   Check if children inventory have done state before validate parent inventory.
-  I'll try to validate parent inventory before children. 
+  I'll try to validate parent inventory before children.
 -
-  !python {model: stock.inventory}: |  
-    from osv import orm, osv
+  !python {model: stock.inventory}: |
+    from stock_inventory_hierarchical import HierarchicalInventoryException
     try:
       self.action_done(cr, uid, [ref('stock_inventory_parent0')])
-    except osv.except_osv as e:
-      log("Good, the inventory could not be validate : %s", e)
+    except HierarchicalInventoryException as e:
+      log("Good, the inventory could not be validated: %s", e)
     parent_state = self.read(cr, uid, [ref('stock_inventory_parent0')], ['state'])[0]['state']
     assert parent_state == 'confirm', "Parent inventory have '%s' state. It should be 'confirm'" % parent_state
 
 -
   Now, i'll validate all children inventory before validate the parent.
 -
-  !python {model: stock.inventory}: |  
-    from osv import orm, osv
-    self.action_done(cr, uid, [self.child_1_id])
-    child_1_state = self.read(cr, uid, [self.child_1_id], ['state'])[0]['state']
+  !python {model: stock.inventory}: |
+    self.action_done(cr, uid, [ref('child_1_id')])
+    child_1_state = self.read(cr, uid, [ref('child_1_id')], ['state'])[0]['state']
     assert child_1_state == 'done', "Child inventory 1 have '%s' state. It should be 'done'" % child_1_state
-    
-    self.action_done(cr, uid, [self.child_2_id])
-    child_2_state = self.read(cr, uid, [self.child_2_id], ['state'])[0]['state']
+
+    self.action_done(cr, uid, [ref('child_2_id')])
+    child_2_state = self.read(cr, uid, [ref('child_2_id')], ['state'])[0]['state']
     assert child_2_state == 'done', "Child inventory 2 have '%s' state. It should be 'done'" % child_2_state
-        
+
     self.action_done(cr, uid, [ref('stock_inventory_parent0')])
     parent_state = self.read(cr, uid, [ref('stock_inventory_parent0')], ['state'])[0]['state']
-    assert parent_state == 'done', "Parent inventory have '%s' state. It should be 'done'" % parent_state    
+    assert parent_state == 'done', "Parent inventory have '%s' state. It should be 'done'" % parent_state
 
=== modified file 'stock_inventory_hierarchical_location/__init__.py'
--- stock_inventory_hierarchical_location/__init__.py	2014-03-12 15:08:22 +0000
+++ stock_inventory_hierarchical_location/__init__.py	2014-06-11 15:04:27 +0000
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    This module is copyright (C) 2013 Numérigraphe SARL. All Rights Reserved.
@@ -18,5 +18,5 @@
 #
 ##############################################################################
 
-import inventory_hierarchical_location
-import wizard
+from . import inventory_hierarchical_location
+from . import wizard
 
=== modified file 'stock_inventory_hierarchical_location/__openerp__.py'
--- stock_inventory_hierarchical_location/__openerp__.py	2014-03-12 15:08:22 +0000
+++ stock_inventory_hierarchical_location/__openerp__.py	2014-06-11 15:04:27 +0000
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    This module is copyright (C) 2013 Numérigraphe SARL. All Rights Reserved.
@@ -19,34 +19,30 @@
 ##############################################################################
 
 {
-    "name": "Exhaustive and hierachical Stock Inventories",
-    "version": "1.0",
+    "name": "Exhaustive and hierarchical Stock Inventories",
+    "version": "1.1",
     "depends": ["stock_inventory_hierarchical", "stock_inventory_location"],
+    "auto_install": True,
     "author": u"Numérigraphe",
-    "category": "stock inventory",
+    "category": "Hidden",
     "description": """
-This module makes exhaustive Inventories aware of their Sub-Inventories.
-========================================================================
-
-It should be installed if both modules "stock_inventory_location"
-and "stock_inventory_hierarchical" are installed.
+Make exhaustive Inventories aware of their Sub-Inventories.
+===========================================================
 
 This module allows an inventory to contain a general Location,
 and it's sub-inventories to contain some of it's sub-Locations.
-When you open an inventory, OpenERP will warn you if some of the sub-Locations
-of an inventory are absent from the sub-Inventories.
-It will also prevent you from setting the Inventories and sub-Inventories 
+It will prevent you from setting the Inventories and sub-Inventories
 in inconsistent status.
+
+This module will be installed automatically if the modules
+"stock_inventory_location" and "stock_inventory_hierarchical" are both
+installed.
+You must keep this module installed to ensure proper functioning.
+
     """,
-    "init_xml": [],
-    "update_xml": [
-                   "wizard/stock_inventory_missing_locations_view.xml",
-                   "inventory_hierarchical_location_view.xml",
-                   ],
-
-     "test": ["test/inventory_hierarchical_location_test.yml"],
-     "demo": ["inventory_hierarchical_location_demo.xml"],
-
-    # Will work with v6.1 and later
-    "auto_install": True,
+    "data": [
+        "inventory_hierarchical_location_view.xml",
+    ],
+    "test": ["test/inventory_hierarchical_location_test.yml"],
+    "demo": ["inventory_hierarchical_location_demo.xml"],
 }
 
=== modified file 'stock_inventory_hierarchical_location/i18n/fr.po'
--- stock_inventory_hierarchical_location/i18n/fr.po	2014-03-12 15:08:22 +0000
+++ stock_inventory_hierarchical_location/i18n/fr.po	2014-06-11 15:04:27 +0000
@@ -64,8 +64,8 @@
 #. module: stock_inventory_hierarchical_location
 #: code:addons/stock_inventory_hierarchical_location/inventory_hierarchical_location.py:41
 #, python-format
-msgid "One of the parent inventories are not open."
-msgstr "Un inventaire parent n'est pas ouvert."
+msgid "One of the parent inventories is not open."
+msgstr "Un des inventaire parent n'est pas ouvert."
 
 #. module: stock_inventory_hierarchical_location
 #: view:stock.inventory:0
@@ -97,9 +97,9 @@
 #: code:addons/stock_inventory_hierarchical_location/inventory_hierarchical_location.py:58
 #, python-format
 msgid "This location is not declared on the parent inventory\n"
-"You cannot add it !"
+"It cannot be added."
 msgstr "Cet emplacement n'est pas déclaré dans l'inventaire parent\n"
-"Vous ne pouvez pas l'ajouter !"
+"Vous ne pouvez pas l'ajouter."
 
 #. module: stock_inventory_hierarchical_location
 #: code:addons/stock_inventory_hierarchical_location/inventory_hierarchical_location.py:41
 
=== modified file 'stock_inventory_hierarchical_location/inventory_hierarchical_location.py'
--- stock_inventory_hierarchical_location/inventory_hierarchical_location.py	2014-03-12 15:08:22 +0000
+++ stock_inventory_hierarchical_location/inventory_hierarchical_location.py	2014-06-11 15:04:27 +0000
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    This module is copyright (C) 2013 Numérigraphe SARL. All Rights Reserved.
@@ -18,120 +18,74 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
+from openerp.osv import orm
 from openerp.tools.translate import _
 
-
-class StockInventory(osv.osv):
+from stock_inventory_hierarchical import HierarchicalInventoryException
+
+# Add the date to the list of fields we must propagate to children inventories
+from stock_inventory_hierarchical import PARENT_VALUES
+PARENT_VALUES.append('exhaustive')
+
+
+class HierarchicalExhInventory(orm.Model):
+    """Add hierarchical structure features to exhaustive Inventories"""
     _inherit = 'stock.inventory'
 
-    def __init__(self, pool, cr):
-        """Propagate the "exhaustive" field from inventories to sub-inventories"""
-        s = super(StockInventory, self)
-        s.PARENT_VALUES.append('exhaustive')
-        return s.__init__(pool, cr)
-
     def action_open(self, cr, uid, ids, context=None):
         """Open only if all the parents are Open."""
-        #XXX the dosctring used to say this but it's not implemented, normal?
-        # --> "Before opening, if locations are  missing, ask the user 
-        # to validate the opening without these locations."
         for inventory in self.browse(cr, uid, ids, context=context):
             while inventory.parent_id:
                 inventory = inventory.parent_id
                 if inventory.state != 'open':
-                    raise osv.except_osv(_('Warning !'),
-                                         _('One of the parent inventories are not open.'))
-        return super(StockInventory, self).action_open(cr, uid, ids, context=context)
-
-    def check_location(self, cr, uid, ids, location_ids, name, context=None):
+                    raise HierarchicalInventoryException(
+                        _('Warning'),
+                        _('One of the parent inventories is not open.'))
+        return super(HierarchicalExhInventory, self).action_open(
+            cr, uid, 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."""
+        children_count = self.search(
+            cr, uid, [('parent_id', 'child_of', ids),
+                      ('id', 'not in', ids),
+                      ('state', 'not in', ['confirm', 'done'])],
+            context=context, count=True)
+        if children_count > 0:
+            raise HierarchicalInventoryException(
+                _('Warning'),
+                _('Some Sub-inventories are not confirmed.'))
+        return super(HierarchicalExhInventory,
+                     self).confirm_missing_locations(
+            cr, uid, ids, context=context)
+
+    def onchange_location_id(self, cr, uid, ids, location_id, context=None):
         """Check if location is a child of parent inventory location"""
-        res_location_ids = location_ids[0][2]
-        nbr_location_ids = len(res_location_ids)
-        for inventory in self.browse(cr, uid, ids, context=None):
-            if inventory.parent_id.id:
-                parent_locations = self.read(cr, uid, [inventory.parent_id.id], ['location_ids'])
-                parent_children_locations = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', parent_locations[0]['location_ids'])])
-                for location_id in res_location_ids:
-                    if location_id not in parent_children_locations:
-                        res_location_ids.remove(location_id)
-        res = {}
-        if nbr_location_ids != len(res_location_ids):
-            res['warning'] = {'title': _('Warning: Wrong location'),
-                              'message': _("This location is not declared on the parent inventory\n"
-                                           "You cannot add it !")}
-        res['value'] = {'location_ids': res_location_ids, }
-        return res
+        loc_obj = self.pool['stock.location']
+        for inventory in self.browse(cr, uid, ids, context=context):
+            if inventory.parent_id:
+                allowed_location_ids = loc_obj.search(
+                    cr, uid, [('location_id', 'child_of',
+                               inventory.parent_id.location_id.id)],
+                    context=context)
+                if location_id not in allowed_location_ids:
+                    return {
+                        'location_id': False,
+                        'warning': {
+                            'title': _('Warning: Wrong location'),
+                            'message': _("This location is not declared on "
+                                         "the parent inventory\n"
+                                         "It cannot be added.")}
+                    }
+        return {}
 
-    def _fill_location_lines(self, cr, uid, inventory_id, location_ids, set_stock_zero, context=None):
+    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)])
+        children_inventory_ids = self.search(
+            cr, uid, [('parent_id', 'child_of', inventory_id)])
         context['children_inventory_ids'] = children_inventory_ids
-        return super(StockInventory, self)._fill_location_lines(cr, uid, inventory_id, location_ids, set_stock_zero, context=context)
-
-    def open_missing_location_wizard(self, cr, uid, ids, context=None):
-        """Open wizard if inventory have children.
-        Before, verify if all children of exhaustive inventory have at least one location."""
-        children_ids = self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context)
-        for inventory in self.browse(cr, uid, children_ids, context=context):
-            if inventory.exhaustive:
-                if not inventory.location_ids:
-                    raise osv.except_osv(_('Warning !'),
-                                         _('Location missing for inventory "%s".') % inventory.name)
-        children_count = self.pool.get('stock.inventory').search(cr, uid, [('parent_id', 'child_of', ids)], count=True)
-        if children_count == 1:
-            return self.action_open(cr, uid, ids, context)
-        else:
-            context['active_ids'] = ids
-            context['active_id'] = ids[0]
-            return {
-                'type': 'ir.actions.act_window',
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'stock.inventory.missing.location',
-                'target': 'new',
-                'context': context,
-                'nodestroy': True,
-                }
-
-
-# XXX: move to /wizard
-class StockInventoryUninventoriedLocation(osv.osv_memory):
-    _inherit = 'stock.inventory.uninventoried.locations'
-
-    def inventories(self, cr, uid, inventory_parent_id):
-        """Iterator of children inventories.
-        return inventory_id;
-       """
-        children_ids = self.pool.get('stock.inventory').search(cr, uid, [('parent_id', 'child_of', inventory_parent_id)])
-        for inventory_id in children_ids:
-            yield inventory_id
-
-    def get_locations(self, cr, uid, inventory_id, context=None):
-        """Get all locations through inventory tree."""
-        list_inventories_locations_ids = []
-        for i_id in self.inventories(cr, uid, inventory_id):
-            location_ids = super(StockInventoryUninventoriedLocation, self).get_locations(cr, uid, i_id, context=context)
-            list_inventories_locations_ids = list(set(list_inventories_locations_ids + location_ids))
-        return list_inventories_locations_ids
-
-    def get_locations_inventoried(self, cr, uid, inventory_id, location_ids, context=None):
-        """Get all locations on inventory lines through inventory tree."""
-        list_all_inventoried_location_ids = []
-        for i_id in self.inventories(cr, uid, inventory_id):
-            list_loc_ids = super(StockInventoryUninventoriedLocation, self).get_locations_inventoried(cr, uid, i_id, location_ids, context=context)
-            list_all_inventoried_location_ids = list(set(list_all_inventoried_location_ids + list_loc_ids))
-        return list_all_inventoried_location_ids
-
-    def default_locations(self, cr, uid, context=None):
-        """Do something only if children state are confirm or done."""
-        children_count = self.pool.get('stock.inventory').search(cr, uid, [('parent_id', 'child_of', context['active_id']),
-                                             ('state', 'not in', ['confirm', 'done'])], context=context, count=True)
-        if children_count > 1:
-            raise osv.except_osv(_('Warning !'), _('Some Sub-inventories are not confirmed.'))
-        return super(StockInventoryUninventoriedLocation, self).default_locations(cr, uid, context=context)
-
-    _defaults = {
-        'location_ids': default_locations,
-        }
-
+        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_demo.xml'
--- stock_inventory_hierarchical_location/inventory_hierarchical_location_demo.xml	2014-03-12 15:08:22 +0000
+++ stock_inventory_hierarchical_location/inventory_hierarchical_location_demo.xml	2014-06-11 15:04:27 +0000
@@ -3,16 +3,26 @@
     <data noupdate="0">
 
         <!-- Record inventories we can use in the tests. -->
-        <!-- We need them in the demo data because test data is rolled back 
+        <!-- We need them in the demo data because test data is rolled back
             whenever an exception is raised. -->
-        
-        <!-- Record an exhaustive inventory -->
+
+        <!-- Record a hierarchical exhaustive inventory -->
         <record id="parent_inventory_location" model="stock.inventory">
-            <field name="name">Hierarchical location exhaustive inventory</field>
+            <field name="name">Hierarchical exhaustive inventory</field>
             <field name="state">draft</field>
             <field name="date">2020-04-15 00:00:00</field>
-            <field name="exhaustive">True</field>          
-            <field name="location_ids"  model="stock.location" search="[('name', '=', 'Shelf 2')]" />
+            <field name="exhaustive">True</field>
+            <field name="location_ids"  model="stock.location" search="[('name', 'like', 'Stock')]" />
+        </record>
+        <record id="child_1_id" model="stock.inventory">
+            <field name="name">Team A</field>
+            <field name="parent_id" ref="parent_inventory_location"/>
+            <field name="location_id"  model="stock.location" search="[('name', '=', 'Shelf 1')]" />
+        </record>
+        <record id="child_2_id" model="stock.inventory">
+            <field name="name">Team B</field>
+            <field name="parent_id" ref="parent_inventory_location"/>
+            <field name="location_id"  model="stock.location" search="[('name', '=', 'Shelf 2')]" />
         </record>
     </data>
 </openerp>
 
=== modified file 'stock_inventory_hierarchical_location/inventory_hierarchical_location_view.xml'
--- stock_inventory_hierarchical_location/inventory_hierarchical_location_view.xml	2014-03-12 15:08:22 +0000
+++ stock_inventory_hierarchical_location/inventory_hierarchical_location_view.xml	2014-06-11 15:04:27 +0000
@@ -5,34 +5,21 @@
         <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="type">form</field>
             <field name="inherit_id" ref="stock.view_inventory_form" />
             <field name="arch" type="xml">
-
-                 <xpath expr="//form[@string='Physical Inventory']//field[@name='exhaustive']" position="attributes">
-                    <attribute name="attrs">{'readonly':[('parent_id', '!=', False)]}</attribute>                    
-                </xpath>
- 
-                <xpath expr="/form[@string='Physical Inventory']//page[@string='General Information']/field[@name='location_ids']" position="replace">           
-                    <field colspan="1" nolabel="1" name="location_ids" domain="[('usage','in',('view', 'internal'))]" 
-                            attrs="{'invisible':[('exhaustive','!=',True)]}"
-                            on_change="check_location(location_ids, name)">
-                        <tree string="Locations" editable="bottom">                                                                                                       
-                            <field name="name"/> 
-                        </tree>                                    
-                    </field>           
-                </xpath>
-                
-                <!-- replace action_open button to open wizard missing locations -->                
-                <xpath expr="/form//button[@name='action_open']" position="replace">
-                     <button name="open_missing_location_wizard"
-                      string="Open Inventory" type="object" states="draft" icon="gtk-apply"/>                    
-                </xpath>                 
-                
+                 <xpath expr="/form//field[@name='exhaustive']" position="attributes">
+                    <attribute name="attrs">{'readonly':[('parent_id', '!=', False)]}</attribute>
+                </xpath>
+                <xpath expr="/form//field[@name='location_id']" position="attributes">
+                    <attribute name="on_change">onchange_location_id(location_id)</attribute>
+                </xpath>
+                <xpath expr="/form//field[@name='inventory_ids']" position="attributes">
+                    <attribute name="context">{'default_parent_id': active_id, 'default_exhaustive': exhaustive}</attribute>
+                </xpath>
             </field>
         </record>
 
-        <!-- Show exhaustive inventories by default -->
+        <!-- Show hierarchical exhaustive inventories by default -->
         <record id="stock.action_inventory_form" model="ir.actions.act_window">
             <field name="context">{'full':'1', 'search_default_exhaustive':1, 'search_default_main_inventories':1}</field>
         </record>
 
=== added directory 'stock_inventory_hierarchical_location/static'
=== added directory 'stock_inventory_hierarchical_location/static/src'
=== added directory 'stock_inventory_hierarchical_location/static/src/img'
=== added file 'stock_inventory_hierarchical_location/static/src/img/icon.png'
 Binary files stock_inventory_hierarchical_location/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and stock_inventory_hierarchical_location/static/src/img/icon.png	2014-06-11 15:04:27 +0000 differ
=== modified file 'stock_inventory_hierarchical_location/test/inventory_hierarchical_location_test.yml'
--- stock_inventory_hierarchical_location/test/inventory_hierarchical_location_test.yml	2014-03-12 15:08:22 +0000
+++ stock_inventory_hierarchical_location/test/inventory_hierarchical_location_test.yml	2014-06-11 15:04:27 +0000
@@ -1,31 +1,20 @@
 -
-  I will create children inventory.
+  Check that the exhaustive field of parent inventory has been propagated to children.
 -
-  !python {model: stock.inventory}: |                                          
-    self.child_1_id = self.create(cr, uid, {'parent_id': ref('parent_inventory_location'), 
-                                       'inventory_ids': [], 
-                                       'name': 'Children 1 test inventory'})
+  !python {model: stock.inventory}: |
+    exhaustive = self.read(cr, uid, [ref("child_1_id")], ['exhaustive'])[0]['exhaustive']
+    assert exhaustive, "Exhaustive field not propagated to child inventory"
 
 -
-  I will check if exhaustive information of parent inventory has been added to children.
--
-  !python {model: stock.inventory}: |
-    exhaustive = self.read(cr, uid, [self.child_1_id], ['exhaustive'])[0]['exhaustive']
-    assert exhaustive == True, "Exhaustive information not added to children inventory"
-    
--
-  I will check if i can't open children inventory while parent inventory is open. 
--     
-  !python {model: stock.inventory}: |
-    from osv import orm, osv
+  Check that I can't open child inventory while parent inventory is open.
+-
+  !python {model: stock.inventory}: |
+    from stock_inventory_hierarchical import HierarchicalInventoryException
+    parent_state = self.read(cr, uid, [ref("parent_inventory_location")], ['state'])[0]['state']
+    assert parent_state == 'draft', "Parent inventory in state '%s'. It should be 'draft'" % parent_state
     try:
-      self.action_open(cr, uid, [self.child_1_id])
-    except osv.except_osv as e:
-      log("Good ! The Inventory could not be opened : %s" % e)        
-    child_1_state = self.read(cr, uid, [self.child_1_id], ['state'])[0]['state']
+      self.action_open(cr, uid, [ref("child_1_id")])
+    except HierarchicalInventoryException as e:
+      log("Good ! The Inventory could not be opened: %s" % e)
+    child_1_state = self.read(cr, uid, [ref("child_1_id")], ['state'])[0]['state']
     assert child_1_state == 'draft', "Child inventory 1 have '%s' state. It should be 'draft'" % child_1_state
-    
-    
-    
-    
-    
 \ No newline at end of file
 
=== modified file 'stock_inventory_hierarchical_location/wizard/__init__.py'
--- stock_inventory_hierarchical_location/wizard/__init__.py	2014-03-12 15:08:22 +0000
+++ stock_inventory_hierarchical_location/wizard/__init__.py	2014-06-11 15:04:27 +0000
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    This module is copyright (C) 2013 Numérigraphe SARL. All Rights Reserved.
@@ -18,4 +18,4 @@
 #
 ##############################################################################
 
-import stock_inventory_missing_locations
+import stock_confirm_uninventoried_location
 
=== added file 'stock_inventory_hierarchical_location/wizard/stock_confirm_uninventoried_location.py'
--- stock_inventory_hierarchical_location/wizard/stock_confirm_uninventoried_location.py	1970-01-01 00:00:00 +0000
+++ stock_inventory_hierarchical_location/wizard/stock_confirm_uninventoried_location.py	2014-06-11 15:04:27 +0000
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    This module is copyright (C) 2013 Numérigraphe SARL. All Rights Reserved.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm
+from openerp.tools.translate import _
+
+from stock_inventory_hierarchical import HierarchicalInventoryException
+
+
+class StockInventoryUninventoriedLocation(orm.TransientModel):
+    """Consider the lines of the sub-inventories when checking for locations"""
+    _inherit = 'stock.inventory.uninventoried.locations'
+
+    def inventories(self, cr, uid, inventory_parent_id):
+        """Iterator of children inventories.
+
+        @return: inventory_id
+        """
+        children_ids = self.pool['stock.inventory'].search(
+            cr, uid, [('parent_id', 'child_of', inventory_parent_id)])
+        for inventory_id in children_ids:
+            yield inventory_id
+
+    def get_locations(self, cr, uid, inventory_id, context=None):
+        """Get all locations through inventory tree."""
+        list_inventories_locations_ids = []
+        for i_id in self.inventories(cr, uid, inventory_id):
+            location_ids = super(
+                StockInventoryUninventoriedLocation, self).get_locations(
+                cr, uid, i_id, context=context)
+            list_inventories_locations_ids = list(set(
+                list_inventories_locations_ids + location_ids))
+        return list_inventories_locations_ids
+
+    def get_locations_inventoried(self, cr, uid, inventory_id, location_ids,
+                                  context=None):
+        """Get all locations on inventory lines throughout inventory tree."""
+        list_all_inventoried_location_ids = []
+        for i_id in self.inventories(cr, uid, inventory_id):
+            list_loc_ids = super(
+                StockInventoryUninventoriedLocation,
+                self).get_locations_inventoried(
+                cr, uid, i_id, location_ids, context=context)
+            list_all_inventoried_location_ids = list(set(
+                list_all_inventoried_location_ids + list_loc_ids))
+        return list_all_inventoried_location_ids
 
=== removed file 'stock_inventory_hierarchical_location/wizard/stock_inventory_missing_locations.py'
--- stock_inventory_hierarchical_location/wizard/stock_inventory_missing_locations.py	2014-03-12 15:08:22 +0000
+++ stock_inventory_hierarchical_location/wizard/stock_inventory_missing_locations.py	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    This module is copyright (C) 2013 Numérigraphe SARL. All Rights Reserved.
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import osv, fields
-from openerp.tools.translate import _
-
-
-class inventory_missing_location(osv.osv_memory):
-
-    _name = 'stock.inventory.missing.location'
-    _description = 'Search on inventory tree for missing declared locations.'
-
-    _columns = {
-                'location_ids': fields.many2many('stock.location',
-                                                 'stock_inventory_missing_location_rel',
-                                                 'location_id',
-                                                 'wizard_id',
-                                                 'Missing location', readonly=True),
-                }
-
-    def confirm_missing_locations(self, cr, uid, ids, context=None):
-        """ Call action open method from stock.inventory """
-        ids = context['active_ids']
-        self.pool.get('stock.inventory').action_open(cr, uid, ids, context=context)
-        return {'type': 'ir.actions.act_window_close'}
-
-    def inventories(self, cr, uid, inventory_parent_id):
-        """ Iterator of children inventories.
-        """
-        children_ids = self.pool.get('stock.inventory').search(cr, uid, [('parent_id', 'child_of', inventory_parent_id)])
-        for inventory_id in children_ids:
-            if inventory_id == inventory_parent_id:
-                continue  # pass the parent inventory
-            yield inventory_id
-
-    def get_locations_from_children(self, cr, uid, inventory_id, context=None):
-        """ Get all locations through inventory tree. """
-        list_inventories_locations_ids = []
-        for i_id in self.inventories(cr, uid, inventory_id):
-            location_ids = self.pool.get('stock.inventory').read(cr, uid, [i_id], ['location_ids'], context=context)[0]
-            location_ids = self.pool.get('stock.location').search(cr, uid, [
-                                            ('location_id', 'child_of', location_ids['location_ids']),
-                                            ('usage', '=', 'internal')], context=context)
-            list_inventories_locations_ids = list(set(list_inventories_locations_ids + location_ids))
-        return list_inventories_locations_ids
-
-    def default_missing_locations(self, cr, uid, context=None):
-        """ Initialize view with the list of missing locations on inventory tree.
-        """
-        if context is None:
-            context = {}
-
-        # get children locations for parent/current inventory
-        parent_location_ids = self.pool.get('stock.inventory').read(cr, uid, [context['active_id']], ['location_ids'], context=context)[0]
-        parent_location_ids = self.pool.get('stock.location').search(cr, uid, [
-                                        ('location_id', 'child_of', parent_location_ids['location_ids']),
-                                        ('usage', '=', 'internal')], context=context)
-        # get locations for each sub-inventory
-        location_ids = self.get_locations_from_children(cr, uid, context['active_id'])
-        list_missing_ids = [_id for _id in parent_location_ids if _id not in location_ids]
-        return list_missing_ids
-
-    _defaults = {
-        'location_ids': default_missing_locations,
-        }
 
=== removed file 'stock_inventory_hierarchical_location/wizard/stock_inventory_missing_locations_view.xml'
--- stock_inventory_hierarchical_location/wizard/stock_inventory_missing_locations_view.xml	2014-03-12 15:08:22 +0000
+++ stock_inventory_hierarchical_location/wizard/stock_inventory_missing_locations_view.xml	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
- 
-        <record id="action_view_stock_inventory_missing_location" model="ir.actions.act_window">
-            <field name="name">Confirm missing location</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">stock.inventory.missing.location</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-        <!-- The view definition is similar with stock_inventory_location/wizard/stock_confirm_uninventoried_location.xml, 
-        but the code is different. 
-        This wizard compare the locations of inventory with locations declared on parent inventory to 
-        to present to user the missing locations. -->
-        <record id="view_confirm_missing_location" model="ir.ui.view">
-            <field name="name">Confirm missing location</field>
-            <field name="model">stock.inventory.missing.location</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Confirm missing locations">
-                    <group colspan="4" col="1">
-                        <field name="location_ids" nolabel="1">
-                            <tree>
-                                <field name="name"/>
-                            </tree>
-                        </field>                        
-                    </group>
-                    <group colspan="4" col="2">
-                        <label string="This is the list of missing locations."/>
-                        <label string="Do you want to continue ?"/>
-                        <separator string="" colspan="4" />
-                        <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
-                        <button name="confirm_missing_locations" string="_Confirm missing locations" type="object" icon="gtk-ok"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-    </data>
-</openerp>
 \ No newline at end of file
 
=== modified file 'stock_inventory_location/__init__.py'
--- stock_inventory_location/__init__.py	2014-03-12 14:55:39 +0000
+++ stock_inventory_location/__init__.py	2014-06-11 15:04:27 +0000
@@ -20,3 +20,5 @@
 
 import stock_inventory_location
 import wizard
+# Bring the main exception into the package's scope for easier reuse
+from .exceptions import ExhaustiveInventoryException
 
=== modified file 'stock_inventory_location/__openerp__.py'
--- stock_inventory_location/__openerp__.py	2014-03-12 14:55:39 +0000
+++ stock_inventory_location/__openerp__.py	2014-06-11 15:04:27 +0000
@@ -18,45 +18,60 @@
 #
 ##############################################################################
 
-
 {
     "name": "Exhaustive Stock Inventories",
-    "version": "1.0",
+    "version": "1.1",
     "depends": ["stock"],
     "author": u"Numérigraphe",
-    "category": "Inventory",
+    "category": "Warehouse Management",
     "description": """
-Let users choose between standard and exhaustive Inventories
-============================================================
+Let users make exhaustive Inventories
+=====================================
 
-Standard Physical Inventories in OpenERP only contain a generic list of products by locations,
-which is well suited to partial Inventories and simple warehouses.
-When the a standard Inventory is confirmed, only the products in the inventory are checked.
-If a Product is present in the computed stock and not in the recorded Inventory, OpenERP will
-consider that it remains unchanged.
+Standard Physical Inventories in OpenERP only contain a generic list of
+products by locations, which is well suited to partial Inventories and simple
+warehouses. When the a standard Inventory is confirmed, only the products in
+the inventory are checked. If a Product is present in the computed stock and
+not in the recorded Inventory, OpenERP will consider that it remains unchanged.
 
 But for exhaustive inventories in complex warehouses, it is not practical:
- - you want to avoid Stock Moves in/out of these Locations while you count the goods
+ - you want to avoid Stock Moves to/from these Locations while counting goods
  - you must make sure all the locations you want have been counted
  - you must make sure no other location has been counted by mistake
- - you want the computed stock to perfectly match the inventory when you confirm it.
+ - you want the computed stock to perfectly match the inventory when you
+   confirm it.
 
-This module lets choose whether an Physical Inventory is exhaustive or standard.
-For an exhaustive Inventory, in the state "Draft" you define the list of Locations where goods must be counted.
- - a new Inventory status ("Open") lets you indicate that the list of Locations is definitive and you are now counting the goods.
-    In that status, no Stock Moves can be recorded in/out of the Inventory's Locations.
- - if some of the Inventory's Locations have not been entered in the Inventory Lines, OpenERP warns you when you confirm the Inventory.
- - only the Inventory's Locations can be entered in the Inventory Lines.
- - every good that is not in the Inventory Lines is considered lost, and gets moved out of the stock when you confirm the Inventory.avec openerp
+This module lets choose whether an Physical Inventory is exhaustive or
+standard.
+For an exhaustive Inventory:
+ - in the state "Draft" you define the Location where goods must be counted.
+ - the new Inventory status "Open" lets you indicate that the list of Locations
+   is final and you are now counting the goods.
+   In that status, no Stock Moves can be recorded in/out of the Inventory's
+   Locations.
+ - if the Location or some of it's children have not been entered in the
+   Inventory Lines, OpenERP warns you when you confirm the Inventory.
+ - only the Inventory's Location or its children can be entered in the
+   Inventory Lines.
+ - every good that is not in the Inventory Lines is considered lost, and gets
+   moved out of the stock when you confirm the Inventory.
 """,
-    "update_xml": [
-                   "wizard/stock_confirm_uninventoried_location.xml",
-                   "stock_inventory_location_view.xml",
-                   "wizard/stock_fill_location_inventory_view.xml",
-                   ],
-     "test": ["test/location_inventory_test.yml",
-              "test/location_exhaustive_inventory_test.yml",
-              ],
-     "demo": ["stock_inventory_location_demo.xml"]
-
+    "data": [
+        "wizard/stock_confirm_uninventoried_location.xml",
+        "stock_inventory_location_view.xml",
+        "wizard/stock_fill_location_inventory_view.xml",
+    ],
+    "test": [
+        "test/inventory_standard_test.yml",
+        "test/inventory_exhaustive_test.yml",
+        "test/inventory_future_test.yml",
+    ],
+    "images": [
+        "images/inventory_form.png",
+        "inventory_empty_locations.png",
+        "images/move_error.png",
+        "images/location_locked.png",
+        "images/future_inventory.png",
+    ],
+    "demo": ["stock_inventory_location_demo.xml"]
 }
 
=== added file 'stock_inventory_location/exceptions.py'
--- stock_inventory_location/exceptions.py	1970-01-01 00:00:00 +0000
+++ stock_inventory_location/exceptions.py	2014-06-11 15:04:27 +0000
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    This module is copyright (C) 2013 Numérigraphe SARL. All Rights Reserved.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm
+
+
+class ExhaustiveInventoryException(orm.except_orm):
+    """The operation is not possible for an exhaustive inventory"""
+    pass
 
=== modified file 'stock_inventory_location/i18n/fr.po'
--- stock_inventory_location/i18n/fr.po	2014-03-12 14:55:39 +0000
+++ stock_inventory_location/i18n/fr.po	2014-06-11 15:04:27 +0000
@@ -20,7 +20,7 @@
 #: constraint:stock.move:0
 #, python-format
 msgid "A Physical Inventory is being conducted at this location"
-msgstr "Un inventaire est déjà en cours à cet emplacement"
+msgstr "Un inventaire est en cours à cet emplacement"
 
 #. module: stock_inventory_location
 #: view:stock.inventory.uninventoried.locations:0
@@ -63,8 +63,8 @@
 
 #. module: stock_inventory_location
 #: view:stock.inventory.uninventoried.locations:0
-msgid "Confirm uninventoried locations"
-msgstr "Confirmez les emplacements non-inventoriés"
+msgid "Confirm empty locations"
+msgstr "Confirmez les emplacements vides"
 
 #. module: stock_inventory_location
 #: model:ir.model,name:stock_inventory_location.model_stock_location
@@ -74,26 +74,26 @@
 #. module: stock_inventory_location
 #: code:addons/stock_inventory_location/wizard/stock_fill_location_inventory.py:54
 #, python-format
-msgid "Error !"
-msgstr "Erreur !"
+msgid "Error"
+msgstr "Erreur"
 
 #. module: stock_inventory_location
 #: code:addons/stock_inventory_location/wizard/stock_fill_location_inventory.py:75
 #, python-format
-msgid "Error : Empty location !"
-msgstr "Erreur : Emplacement vide !"
+msgid "Error: Empty location"
+msgstr "Erreur : Emplacement vide"
 
 #. module: stock_inventory_location
 #: code:addons/stock_inventory_location/stock_inventory_location.py:231
 #: code:addons/stock_inventory_location/stock_inventory_location.py:282
 #, python-format
-msgid "Error! Location on inventory"
-msgstr "Erreur! emplacement en inventaire"
+msgid "Error: Location locked down"
+msgstr "Erreur: emplacement en inventaire"
 
 #. module: stock_inventory_location
 #: constraint:stock.inventory:0
-msgid "Error! You can not create recursive inventories."
-msgstr "Erreur! Vous ne pouvez pas créer un inventaire récursif."
+msgid "Error: You can not create recursive inventories."
+msgstr "Erreur: Vous ne pouvez pas créer un inventaire récursif."
 
 #. module: stock_inventory_location
 #: constraint:stock.inventory.line:0
@@ -138,12 +138,6 @@
 msgstr "Emplacement manquant pour cet inventaire."
 
 #. module: stock_inventory_location
-#: view:stock.inventory:0
-#: field:stock.inventory,location_ids:0
-msgid "Locations"
-msgstr "Emplacements"
-
-#. module: stock_inventory_location
 #: model:ir.model,name:stock_inventory_location.model_stock_move
 msgid "Mouvement de stock"
 msgstr "Mouvement de stock"
@@ -171,15 +165,10 @@
 #. module: stock_inventory_location
 #: code:addons/stock_inventory_location/stock_inventory_location.py:283
 #, python-format
-msgid "One or more locations are inventoried :\n"
-"%s"
-msgstr "Un ou plusieurs emplacements sont en inventaire :\n"
-"%s"
-
-#. module: stock_inventory_location
-#: constraint:stock.move:0
-msgid "One or more lots are awaiting quality control and cannot be moved."
-msgstr "Un ou plusieurs lots sont en attente de contrôle qualité, et ne peuvent pas être déplacés."
+msgid "A Physical Inventory is being conducted at the following location(s):\n"
+"%s"
+msgstr "Les emplacements suivants sont en inventaire :\n"
+"%s"
 
 #. module: stock_inventory_location
 #: view:stock.inventory:0
@@ -198,19 +187,10 @@
 
 #. module: stock_inventory_location
 #: view:stock.inventory.uninventoried.locations:0
-msgid "The following Stock Locations are part of the current Physical Inventory, but not Inventory Line has been recorded for them."
+msgid "The following Stock Locations are part of the current Physical Inventory, but no Inventory Line has been recorded for them."
 msgstr "Les emplacements suivants font partie de l'inventaire en cours, mais aucune ligne d'inventaire les concernant n'a été enregistrée."
 
 #. module: stock_inventory_location
-#: help:stock.inventory,location_ids:0
-msgid "This is the list of the Stock Locations that you want to count the goods in.\n"
-"Only these Locations can be entered in the Inventory Lines.\n"
-"If some of them have not been entered in the Inventory Lines, OpenERP will warn you when you confirm the Inventory."
-msgstr "Ceci est la liste des emplacements dont vous voulez compter la marchandise.\n"
-"Seuls ces emplacements peuvent être enregistrés dans les lignes d'inventaire.\n"
-"Si certains ne sont enregistrés sur aucune ligne d'inventaire, OpenERP vous avertit lors de la confirmation de l'inventaire."
-
-#. module: stock_inventory_location
 #: field:stock.inventory.uninventoried.locations,location_ids:0
 msgid "Uninventoried location"
 msgstr "Emplacements non inventoriés"
@@ -220,8 +200,8 @@
 #: code:addons/stock_inventory_location/stock_inventory_location.py:163
 #: code:addons/stock_inventory_location/wizard/stock_fill_location_inventory.py:58
 #, python-format
-msgid "Warning !"
-msgstr "Attention !"
+msgid "Warning"
+msgstr "Attention"
 
 #. module: stock_inventory_location
 #: code:addons/stock_inventory_location/stock_inventory_location.py:209
@@ -232,8 +212,8 @@
 #. module: stock_inventory_location
 #: code:addons/stock_inventory_location/stock_inventory_location.py:210
 #, python-format
-msgid "You cannot add this location to inventory line.\n"
-"You must add this location on the locations list"
+msgid "You cannot record an Inventory Line for this Location.\n"
+"You must first add this Location to the list of affected Locations on the Inventory form."
 msgstr "Vous ne pouvez pas ajouter cet emplacement.\n"
 "Il ne fait pas partie de la liste des emplacements à inventorier"
 
 
=== added directory 'stock_inventory_location/images'
=== added file 'stock_inventory_location/images/future_inventory.png'
 Binary files stock_inventory_location/images/future_inventory.png	1970-01-01 00:00:00 +0000 and stock_inventory_location/images/future_inventory.png	2014-06-11 15:04:27 +0000 differ
=== added file 'stock_inventory_location/images/inventory_empty_locations.png'
 Binary files stock_inventory_location/images/inventory_empty_locations.png	1970-01-01 00:00:00 +0000 and stock_inventory_location/images/inventory_empty_locations.png	2014-06-11 15:04:27 +0000 differ
=== added file 'stock_inventory_location/images/inventory_form.png'
 Binary files stock_inventory_location/images/inventory_form.png	1970-01-01 00:00:00 +0000 and stock_inventory_location/images/inventory_form.png	2014-06-11 15:04:27 +0000 differ
=== added file 'stock_inventory_location/images/location_locked.png'
 Binary files stock_inventory_location/images/location_locked.png	1970-01-01 00:00:00 +0000 and stock_inventory_location/images/location_locked.png	2014-06-11 15:04:27 +0000 differ
=== added file 'stock_inventory_location/images/move_error.png'
 Binary files stock_inventory_location/images/move_error.png	1970-01-01 00:00:00 +0000 and stock_inventory_location/images/move_error.png	2014-06-11 15:04:27 +0000 differ
=== added directory 'stock_inventory_location/static'
=== added directory 'stock_inventory_location/static/src'
=== added directory 'stock_inventory_location/static/src/img'
=== added file 'stock_inventory_location/static/src/img/icon.png'
 Binary files stock_inventory_location/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and stock_inventory_location/static/src/img/icon.png	2014-06-11 15:04:27 +0000 differ
=== modified file 'stock_inventory_location/stock_inventory_location.py'
--- stock_inventory_location/stock_inventory_location.py	2014-03-12 14:55:39 +0000
+++ stock_inventory_location/stock_inventory_location.py	2014-06-11 15:04:27 +0000
@@ -18,225 +18,267 @@
 #
 ##############################################################################
 
+import time
 from collections import Iterable
 
-from openerp.osv import osv, orm, fields
+from openerp.osv import orm, fields
 from openerp.tools.translate import _
-
-
-class StockInventory(osv.osv):
+# The next 2 imports are only needed for a feature backported from trunk-wms
+# TODOv8! remove, feature is included upstream
+from openerp.osv import osv
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
+
+from .exceptions import ExhaustiveInventoryException
+
+
+class StockInventory(orm.Model):
     """Add locations to the inventories"""
     _inherit = 'stock.inventory'
+
+    INVENTORY_STATE_SELECTION = [
+        ('draft', 'Draft'),
+        ('open', 'Open'),
+        ('done', 'Done'),
+        ('confirm', 'Confirmed'),
+        ('cancel', 'Cancelled')
+    ]
+
     _columns = {
-        # XXX refactor if ever lp:~numerigraphe/openobject-addons/7.0-inventory-states is accepted upstream
-        'state': fields.selection((('draft', 'Draft'),
-                                   ('open', 'Open'),
-                                   ('done', 'Done'),
-                                   ('confirm', 'Confirmed'),
-                                   ('cancel', 'Cancelled')), 'State', readonly=True, select=True),
-        # Make the inventory lines read-only in all states except "Open", to ensure that no unwanted Location can be inserted
-        'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventory lines', readonly=True, states={'open': [('readonly', False)]}),
-        'location_ids': fields.many2many('stock.location', 'stock_inventory_location_rel',
-                                         'location_id', 'inventory_id',
-                                         'Locations',
-                                         readonly=True, states={'draft': [('readonly', False)]},
-                                         help="""This is the list of the Stock Locations that you want to count the goods in.
-Only these Locations can be entered in the Inventory Lines.
-If some of them have not been entered in the Inventory Lines, OpenERP will warn you when you confirm the Inventory."""),
-        'exhaustive': fields.boolean('Exhaustive', readonly=True, states={'draft': [('readonly', False)]},
-                                         help="""Check the box if you are conducting an exhaustive Inventory.
-Leave the box unchecked if you are conducting a standard Inventory (partial inventory for example).
-For an exhaustive Inventory:
- - the status "Draft" lets you define the list of Locations where goods must be counted
- - the status "Open" indicates that the list of Locations is definitive and you are now counting the goods. In that status, no Stock Moves can be recorded in/out of the Inventory's Locations
- - only the Inventory's Locations can be entered in the Inventory Lines
- - if some of the Inventory's Locations have not been entered in the Inventory Lines, OpenERP warns you when you confirm the Inventory
- - every good that is not in the Inventory Lines is considered lost, and gets moved out of the stock when you confirm the Inventory"""),
+        # TODO v8: should we use "confirm" instead of adding "open"?
+        'state': fields.selection(
+            INVENTORY_STATE_SELECTION, 'State', readonly=True, select=True),
+        # TODO v8: remove this, should not be needed anymore
+        # Make the inventory lines read-only in all states except "Open",
+        # to ensure that no unwanted Location can be inserted
+        'inventory_line_id': fields.one2many(
+            'stock.inventory.line', 'inventory_id', 'Inventory lines',
+            readonly=True, states={'open': [('readonly', False)]}),
+        # TODO v8: remove this, it's backported from v8
+        'location_id': fields.many2one(
+            'stock.location', 'Inventoried Location',
+            readonly=True, states={'draft': [('readonly', False)]}),
+        'exhaustive': fields.boolean(
+            'Exhaustive', readonly=True,
+            states={'draft': [('readonly', False)]},
+            help="Check the box if you are conducting an exhaustive "
+                 "Inventory.\n"
+                 "Leave the box unchecked if you are conducting a standard "
+                 "Inventory (partial inventory for example).\n"
+                 "For an exhaustive Inventory:\n"
+                 " - the status \"Draft\" lets you define the list of "
+                 "Locations where goods must be counted\n"
+                 " - the status \"Open\" indicates that the list of Locations "
+                 "is definitive and you are now counting the goods. In that "
+                 "status, no Stock Moves can be recorded in/out of the "
+                 "Inventory's Locations\n"
+                 " - only the Inventory's Locations can be entered in the "
+                 "Inventory Lines\n"
+                 " - if some of the Inventory's Locations have not been "
+                 "entered in the Inventory Lines, OpenERP warns you "
+                 "when you confirm the Inventory\n"
+                 " - every good that is not in the Inventory Lines is "
+                 "considered lost, and gets moved out of the stock when you "
+                 "confirm the Inventory"),
         }
 
     def action_open(self, cr, uid, ids, context=None):
-        """Open the inventory: open all locations, import and print inventory sheet become possible"""
-        # verify if exhaustive inventory have locations before open inventory
-        for inventory in self.browse(cr, uid, ids, context=None):
-            if inventory.exhaustive:
-                if not inventory.location_ids:
-                    raise osv.except_osv(_('Warning !'), _('Location missing for this inventory.'))
+        """Change the state of the inventory to 'open'"""
         return self.write(cr, uid, ids, {'state': 'open'}, context=context)
 
-    # XXX refactor if ever lp:~numerigraphe/openobject-addons/7.0-inventory-states is accepted upstream
+    # TODO v8: remove this method? the feature looks already done upstream
+    def action_done(self, cr, uid, ids, context=None):
+        """
+        Don't allow to make an inventory with a date in the future.
+
+        This makes sure no stock moves will be introduced between the
+        moment you finish the inventory and the date of the Stock Moves.
+        Backported from trunk-wms:
+            revid:[e-mail]-20140317090656-o7lo22tzm8yuv3r8
+
+        @raise osv.except_osv:
+            We raise this exception on purpose instead of
+            ExhaustiveInventoryException to ensure forward-compatibility
+            with v8.
+        """
+        for inventory in self.browse(cr, uid, ids, context=None):
+            if inventory.date > time.strftime(DEFAULT_SERVER_DATETIME_FORMAT):
+                raise osv.except_osv(
+                    _('Error!'),
+                    _('It\'s impossible to confirm an inventory in the '
+                      'future. Please change the inventory date to proceed '
+                      'further.'))
+        return super(StockInventory, self).action_done(cr, uid, ids,
+                                                       context=context)
+
+    # TODO: remove this in v8
+    def _default_location(self, cr, uid, ids, context=None):
+        """Default stock location
+
+        @return: id of the stock location of 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': lambda *a: 'draft',
-        'exhaustive': lambda *a: False,
+        'state': 'draft',
+        'exhaustive': False,
+        # TODO: remove this in v8
+        'location_id': _default_location,
         }
 
     def _check_location_free_from_inventories(self, cr, uid, ids):
-        """Verify that no other Inventory is being conducted on the location (exact id, not children)."""
-        for inventory in self.browse(cr, uid, ids, context=None):
+        """
+        Verify that no other Inventory is being conducted on the same locations
+
+        Open Inventories are matched using the exact Location IDs,
+        excluding children.
+        """
+        # We don't get a context because we're called from a _constraint
+        for inventory in self.browse(cr, uid, ids):
             if not inventory.exhaustive:
-                continue  # always accepted on partial inventories
-            location_ids = [location.id for location in inventory.location_ids]
-            inv_ids = self.search(cr, uid, [('location_ids', 'in', location_ids),
-                                            ('id', '!=', inventory.id),
-                                            ('date', '=', inventory.date),
-                                            ('exhaustive', '=', True), ])
-            if inv_ids:
+                # never block standard inventories
+                continue
+            if self.search(cr, uid,
+                           [('location_id', '=', inventory.location_id.id),
+                            ('id', '!=', inventory.id),
+                            ('date', '=', inventory.date),
+                            ('exhaustive', '=', True)]):
+                # Quit as soon as one offending inventory is found
                 return False
         return True
 
-    _constraints = [(_check_location_free_from_inventories,
-                     'Other Physical inventories are being conducted using the same Locations.',
-                     ['location_ids', 'date', 'exhaustive'])]
+    _constraints = [
+        (_check_location_free_from_inventories,
+         'Other Physical inventories are being conducted using the same '
+         'Locations.',
+         ['location_id', 'date', 'exhaustive'])
+    ]
 
     def _get_locations_open_inventories(self, cr, uid, context=None):
-        """Search for locations on open inventories (exhaustive inventory only), and their children """
-        open_inventories_ids = self.search(cr, uid, [('state', '=', 'open'), ], context=context)
-        location_ids = set()
-        for open_inventory in self.browse(cr, uid, open_inventories_ids, context=context):
-            location_ids.update([location.id for location in open_inventory.location_ids])
+        """IDs of location in open exhaustive inventories, with children"""
+        inv_ids = self.search(
+            cr, uid, [('state', '=', 'open'), ('exhaustive', '=', True)],
+            context=context)
+        if not inv_ids:
+            # Early exit if no match found
+            return []
+        # List the Locations - normally all exhaustive inventories have one
+        location_ids = [inventory.location_id.id
+                        for inventory in self.browse(cr, uid, inv_ids,
+                                                     context=context)]
         # Extend to the children Locations
-        if location_ids:  # XXX probably works even otherwise
-            location_ids = self.pool.get('stock.location').search(cr, uid,
-                [('location_id', 'child_of', location_ids), ('usage', '=', 'internal')],
-                context=context)
-        return location_ids
-
-    def confirm_uninventoried_location_wizard(self, cr, uid, ids, context=None):
-        """ Open wizard if inventory is exhautive """
+        return self.pool['stock.location'].search(
+            cr, uid,
+            [('location_id', 'child_of', set(location_ids)),
+             ('usage', '=', 'internal')],
+            context=context)
+
+    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 does not contain any line with
+        this location."""
+        inventories = self.browse(cr, uid, ids, context=context)
+        # Find the locations of the inventories
+        inv_location_ids = [i.location_id.id for i in inventories]
+        # Extend to the children locations
+        inv_location_ids = set(self.pool['stock.location'].search(
+            cr, uid, [
+                ('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])
+        return list(inv_location_ids - line_locations_ids)
+
+    def confirm_missing_locations(self, cr, uid, ids, context=None):
+        """Open wizard to confirm empty locations on exhaustive inventories"""
         for inventory in self.browse(cr, uid, ids, context=context):
-            if not inventory.exhaustive:
-                return self.action_confirm(cr, uid, ids, context=context)
-            else:
-                context['active_ids'] = ids
-                context['active_id'] = ids[0]
+            if (self.get_missing_locations(cr, uid, ids, context=context)
+                    and inventory.exhaustive):
                 return {
                     'type': 'ir.actions.act_window',
                     'view_type': 'form',
                     'view_mode': 'form',
                     'res_model': 'stock.inventory.uninventoried.locations',
                     'target': 'new',
-                    'context': context,
+                    'context': dict(context,
+                                    active_ids=ids,
+                                    active_id=ids[0]),
                     'nodestroy': True,
-                    }
-
-    # XXX : get from stock.py v6.0 patch. Waiting for integration on standard by openerp ... 
-    def _fill_location_lines(self, cr, uid, inventory_id, location_ids, set_stock_zero, context=None):
-        """ To Import stock inventory according to products available in the selected locations.
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param location_ids: the location ID or list of location IDs if we want more than one
-        @param inventory_id: the inventory ID
-        @param set_stock_zero: indicate if all the lines will be imported with zero quantity
-        @param context: A standard dictionary
-        @return:
-        """
-        inventory_line_obj = self.pool.get('stock.inventory.line')
-        move_obj = self.pool.get('stock.move')
-        uom_obj = self.pool.get('product.uom')
-        res = []
-        flag = False
-        for location in location_ids:
-            datas = {}
-            move_ids = move_obj.search(cr, uid, ['|', ('location_dest_id', '=', location),
-                                                      ('location_id', '=', location),
-                                                      ('state', '=', 'done')], context=context)
-            for move in move_obj.browse(cr, uid, move_ids, context=context):
-                if move.location_dest_id.id == move.location_id.id:
-                    continue
-                lot_id = move.prodlot_id.id
-                prod_id = move.product_id.id
-                if move.location_dest_id.id == location:
-                    qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, move.product_id.uom_id.id)
-                else:
-                    qty = -uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, move.product_id.uom_id.id)
-                if datas.get((prod_id, lot_id)):
-                    qty = qty + datas[(prod_id, lot_id)]['product_qty']
-
-                datas[(prod_id, lot_id)] = {'product_id': prod_id,
-                                            'location_id': location,
-                                            # Floating point sum could introduce some tiny rounding errors. 
-                                            # The uom are the same on input and output to use api for rounding.
-                                            'product_qty': uom_obj._compute_qty_obj(cr, uid, move.product_id.uom_id, qty, move.product_id.uom_id),
-                                            'product_uom': move.product_id.uom_id.id,
-                                            'prod_lot_id': lot_id,
-                                            'default_code': move.product_id.default_code,
-                                            'prodlot_name': move.prodlot_id.name}
-            if datas:
-                flag = True
-                res.append(datas)
-        if not flag:
-            raise osv.except_osv(_('Warning !'), _('No product in this location.'))
-
-        stock_moves = []
-        for stock_move in res:
-            prod_lots = sorted(stock_move, key=lambda k: (stock_move[k]['default_code'], stock_move[k]['prodlot_name']))
-            for prod_lot in prod_lots:
-                stock_move_details = stock_move.get(prod_lot)
-
-                if stock_move_details['product_qty'] == 0:
-                    continue  # ignore product if stock equal 0
-
-                stock_move_details.update({'inventory_id': inventory_id})
-
-                if set_stock_zero:
-                    stock_move_details.update({'product_qty': 0})
-
-                domain = [(field, '=', stock_move_details[field])
-                           for field in ['location_id',
-                                         'product_id',
-                                         'prod_lot_id']
-                          ]
-                # children_inventory_ids is present if stock_inventory_hierarchical_location module has been installed
-                inventory_ids = context.get('children_inventory_ids', False)
-                if inventory_ids:
-                    domain.append(('inventory_id', 'child_of', inventory_ids))
-                else:
-                    domain.append(('inventory_id', '=', stock_move_details['inventory_id']))
-
-                line_ids = inventory_line_obj.search(cr, uid, domain, context=context)
-                if not line_ids:
-                    stock_moves.append(stock_move_details)
-        return stock_moves
-
-
-class StockInventoryLine(osv.osv):
+                }
+        return self.action_confirm(cr, uid, ids, context=context)
+
+
+class StockInventoryLine(orm.Model):
     """Only allow the Inventory's Locations"""
 
     _inherit = 'stock.inventory.line'
 
-    def onchange_location_id(self, cr, uid, ids, location_ids, exhaustive, location_id, context=None):
-        """ Raise exception if Location is not internal, or location_id not in locations list for this inventory """
-        location_ids = location_ids[0][2]
-        if not exhaustive or not location_ids:
-            return True  # don't check if partial inventory
+    def _default_stock_location(self, cr, uid, context=None):
+        res = super(StockInventoryLine, self)._default_stock_location(
+            cr, uid, context=context)
+        if context is None or not context.get('location_id', False):
+            return res
+        else:
+            return context['location_id']
+
+    _defaults = {
+        'location_id': _default_stock_location
+    }
+
+    def onchange_location_id(self, cr, uid, ids, inventory_location_id,
+                             exhaustive, location_id, context=None):
+        """Warn if the new is not in the location list for this inventory."""
+        if not exhaustive:
+            # Don't check if partial inventory
+            return True
 
         # search children of location
-        location_ids = self.pool.get('stock.location').search(cr, uid,
-                        [('location_id', 'child_of', location_ids)], context=context)
-        if location_id not in location_ids:
-            return {'value': {'location_id': False},
-                    'warning': {'title': _('Warning: Wrong location'),
-                                'message': _("You cannot add this location to inventory line.\n"
-                                             "You must add this location on the locations list")}
-                    }
+        if location_id not in self.pool['stock.location'].search(
+                cr, uid, [('location_id', 'child_of', inventory_location_id)],
+                context=context):
+            return {
+                'value': {'location_id': False},
+                'warning': {
+                    'title': _('Warning: Wrong location'),
+                    'message': _(
+                        "You cannot record an Inventory Line for this "
+                        "Location.\n"
+                        "You must first add this Location to the list of "
+                        "affected Locations on the Inventory form.")}
+            }
         return True
 
 
-class StockLocation(osv.osv):
+class StockLocation(orm.Model):
     """Refuse changes during exhaustive Inventories"""
     _inherit = 'stock.location'
     _order = 'name'
 
+    # TODOv7: why not put this in an ORM "_constraint" instead?
     def _check_inventory(self, cr, uid, ids, context=None):
-        """Raise an error if an exhaustive Inventory is being conducted on this Location"""
-        inventory_obj = self.pool.get('stock.inventory')
-        location_inventory_open_ids = inventory_obj._get_locations_open_inventories(cr, uid, context=context)
+        """Error if an exhaustive Inventory is being conducted here"""
+        inv_obj = self.pool['stock.inventory']
+        location_inventory_open_ids = inv_obj._get_locations_open_inventories(
+            cr, uid, context=context)
         if not isinstance(ids, Iterable):
             ids = [ids]
-        for id in ids:
-            if id in location_inventory_open_ids:
-                raise osv.except_osv(_('Error! Location on inventory'),
-                                     _('A Physical Inventory is being conducted at this location'))
+        for inv_id in ids:
+            if inv_id in location_inventory_open_ids:
+                raise ExhaustiveInventoryException(
+                    _('Error: Location locked down'),
+                    _('A Physical Inventory is being conducted at this '
+                      'location'))
         return True
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -245,16 +287,19 @@
         if not isinstance(ids, Iterable):
             ids = [ids]
         ids_to_check = ids
-        # If we are changing the parent, there must be no inventory must conducted there either
-        if  vals.get('location_id'):
+        # If changing the parent, no inventory must conducted there either
+        if vals.get('location_id'):
             ids_to_check.append(vals['location_id'])
         self._check_inventory(cr, uid, ids_to_check, context=context)
-        return super(StockLocation, self).write(cr, uid, ids, vals, context=context)
+        return super(StockLocation, self).write(cr, uid, ids, vals,
+                                                context=context)
 
     def create(self, cr, uid, vals, context=None):
         """Refuse create if an inventory is being conducted at the parent"""
-        self._check_inventory(cr, uid, vals.get('location_id'), context=context)
-        return super(StockLocation, self).create(cr, uid, vals, context=context)
+        self._check_inventory(cr, uid, vals.get('location_id'),
+                              context=context)
+        return super(StockLocation, self).create(cr, uid, vals,
+                                                 context=context)
 
     def unlink(self, cr, uid, ids, context=None):
         """Refuse unlink if an inventory is being conducted"""
@@ -262,34 +307,45 @@
         return super(StockLocation, self).unlink(cr, uid, ids, context=context)
 
 
-class StockMove(osv.osv):
+class StockMove(orm.Model):
     """Refuse Moves during exhaustive Inventories"""
 
     _inherit = 'stock.move'
 
+    # TODOv7: adapt this to match trunk-wms
     def _check_open_inventory_location(self, cr, uid, ids, context=None):
-        """ Check if location is not in opened inventory
-        Don't check on partial inventory (checkbox "Exhaustive" not checked).
+        """
+        Check that the locations are not locked by an open inventory
+
+        Standard inventories are not checked.
+
+        @raise ExhaustiveInventoryException: an error is raised if locations
+            are locked, instead of returning False, in order to pass an
+            extensive error message back to users.
         """
         message = ""
-        inventory_obj = self.pool.get('stock.inventory')
-        location_inventory_open_ids = inventory_obj._get_locations_open_inventories(cr, uid, context=context)
-        if not location_inventory_open_ids:
-            return True  # Nothing to verify
+        inv_obj = self.pool['stock.inventory']
+        locked_location_ids = inv_obj._get_locations_open_inventories(
+            cr, uid, context=context)
+        if not locked_location_ids:
+            # Nothing to verify
+            return True
         for move in self.browse(cr, uid, ids, context=context):
             if (move.location_id.usage != 'inventory'
-                and move.location_dest_id.id in location_inventory_open_ids):
+                    and move.location_dest_id.id in locked_location_ids):
                 message += " - %s\n" % (move.location_dest_id.name)
-
             if (move.location_dest_id.usage != 'inventory'
-                and move.location_id.id in location_inventory_open_ids):
+                    and move.location_id.id in locked_location_ids):
                 message += " - %s\n" % (move.location_id.name)
         if message:
-            raise osv.except_osv(_('Error! Location on inventory'),
-                                 _('One or more locations are inventoried :\n%s') % message)
+            raise ExhaustiveInventoryException(
+                _('Error: Location locked down'),
+                _('A Physical Inventory is being conducted at the following '
+                  'location(s):\n%s') % message)
         return True
 
     _constraints = [
-                    (_check_open_inventory_location,
-                     "A Physical Inventory is being conducted at this location", ['location_id', 'location_dest_id']),
-                   ]
+        (_check_open_inventory_location,
+         "A Physical Inventory is being conducted at this location",
+         ['location_id', 'location_dest_id']),
+    ]
 
=== modified file 'stock_inventory_location/stock_inventory_location_demo.xml'
--- stock_inventory_location/stock_inventory_location_demo.xml	2014-03-12 14:55:39 +0000
+++ stock_inventory_location/stock_inventory_location_demo.xml	2014-06-11 15:04:27 +0000
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="0">
+        <!-- Record a non exhaustive inventory -->
+        <record id="inventory_standard" model="stock.inventory">
+            <field name="name">Standard inventory</field>
+            <field name="state">draft</field>
+        </record>
 
-        <!-- Record inventories we can use in the tests. -->
-        <!-- We need them in the demo data because test data is rolled back 
-            whenever an exception is raised. -->
-        
-        <!-- Record an non exhaustive inventory -->
-        <record id="stock_inventory_location_0" model="stock.inventory">
-            <field name="name">Location test inventory</field>
-            <field name="state">draft</field>
-            <field name="date">2020-03-01 00:00:00</field>          
-        </record>        
-        
         <!-- Record an exhaustive inventory -->
-        <record id="stock_inventory_location_1" model="stock.inventory">
-            <field name="name">Location test exhaustive inventory</field>
-            <field name="state">draft</field>
-            <field name="date">2020-03-15 00:00:00</field>
-            <field name="exhaustive">True</field>          
-            <field name="location_ids"  model="stock.location" search="[('name', '=', 'Shelf 2')]" />
+        <record id="inventory_exhaustive" model="stock.inventory">
+            <field name="name">Exhaustive inventory</field>
+            <field name="state">draft</field>
+            <field name="exhaustive">True</field>
+            <field name="location_id" model="stock.location" search="[('name', '=', 'Shelf 2')]" />
+        </record>
+
+        <!-- Record an inventory dated in the future -->
+        <!--  TODOv8: remove this entry, only useful for a test already in trunk-wms -->
+        <record id="inventory_future" model="stock.inventory">
+            <field name="name">Inventory in the future</field>
+            <field name="state">draft</field>
+            <field name="date">2020-03-01 00:00:00</field>
         </record>
     </data>
 </openerp>
 
=== modified file 'stock_inventory_location/stock_inventory_location_view.xml'
--- stock_inventory_location/stock_inventory_location_view.xml	2014-03-12 14:55:39 +0000
+++ stock_inventory_location/stock_inventory_location_view.xml	2014-06-11 15:04:27 +0000
@@ -1,59 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-           
+
         <record model="ir.ui.view" id="stock_inventory_location_form_view">
             <field name="name">stock.inventory.location.form</field>
             <field name="model">stock.inventory</field>
             <field name="inherit_id" ref="stock.view_inventory_form"/>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
-                <!-- Add type of inventory : partial or complete. -->
-                <xpath expr="/form//field[@name='date']" position="after">
+                <!-- Show the state 'done' in the statusbar -->
+                <xpath expr="/form//field[@name='state']" position="attributes">
+                    <attribute name="statusbar_visible">draft,open,confirm</attribute>
+                </xpath>
+                
+                <!-- TODO v8 place "exhaustive" next to "location_id" -->
+                <!-- Add type of inventory: standard or exhaustive. -->
+                <xpath expr="/form//field[@name='name']" position="after">
                     <field name="exhaustive"/>
-                </xpath>
-
-                <!-- Add the list of Locations on exhaustive inventories --> 
-                <xpath expr="/form//field[@name='inventory_line_id']" position="before">
-                    <!-- Add the locations list for inventory -->
-                    <field colspan="1" nolabel="1" name="location_ids" domain="[('usage','in',('view', 'internal'))]" attrs="{'invisible':[('exhaustive','!=',True)]}">
-                        <tree string="Locations" editable="bottom">
-                            <field name="name"/>
-                        </tree>
-                    </field>
-                </xpath>                    
-
-				<!-- Add Fill Inventory button when state is open -->
-				<xpath expr="//button[@string='Fill Inventory']" position="attributes">
-					<attribute name="states">draft,open,confirm</attribute>
-				</xpath>
-
-                <!-- Reduce the colspan of the lines to make room for the Locations-->
-                <xpath expr="/form//field[@name='inventory_line_id']" position="attributes">
-                    <attribute name="colspan">3</attribute>
-                </xpath>                
-
-                <!-- Control locations added by user on inventory line -->  
-                <xpath expr="/form//field[@name='inventory_line_id']/tree//field[@name='location_id']" position="attributes">
-                    <attribute name="on_change">onchange_location_id(parent.location_ids, parent.exhaustive, 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_ids, parent.exhaustive, location_id)</attribute>
-                </xpath>
-                                
-                <!-- #XXX change the attributes  instead and add the button -->
-                <!-- #XXX enlarge the group's colspan? -->
+                    <field name="location_id" groups="stock.group_locations"
+                           domain="[('usage','in',('view', 'internal'))]"
+                           attrs="{'invisible':[('exhaustive','!=',True)], 'required':[('exhaustive','=',True)]}"/>
+                </xpath>
+
+                <!-- Enable Fill Inventory button when state is open -->
+                <xpath expr="//button[@string='Fill Inventory']" position="attributes">
+                    <attribute name="states">open</attribute>
+                    <attribute name="context">{'default_exhaustive': exhaustive}</attribute>
+                </xpath>
+
+                <!-- Control locations added by user on inventory line -->
+                <xpath expr="/form//field[@name='inventory_line_id']"
+                       position="attributes">
+                    <attribute name="context">{'location_id': location_id}</attribute>
+                </xpath>
+                <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>
+                </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>
+                </xpath>
+
                 <!-- Add button to open an inventory. Call wizard on confirm inventory -->
-                <xpath expr="/form//button[@name='action_cancel_inventory']" position="replace">
-                    <button name="action_cancel_inventory" states="draft,open,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
-                    <button name="action_open" states="draft" string="Open Inventory" type="object" icon="gtk-go-forward"/>
-                </xpath>
-                
-                <!-- replace action_confirm button  -->
-                <!-- #XXX change the attributes instead -->
-                <xpath expr="/form//button[@name='action_confirm']" position="replace">
-                      <button name="confirm_uninventoried_location_wizard" 
-                      string="Confirm Inventory" type="object" states="open" icon="gtk-apply"/>                          
+                <xpath expr="/form//button[@name='action_cancel_inventory']" position="before">
+                    <button name="action_open" states="draft" string="Open Inventory" type="object" class="oe_highlight" groups="stock.group_stock_user"/>
+                </xpath>
+                <!-- Show the "cancel" button in state "open" -->
+                <xpath expr="/form//button[@name='action_cancel_inventory']" position="attributes">
+                    <attribute name="states">draft,open,confirm,done</attribute>
+                </xpath>
+                <!-- hijack the "confirm" button -->
+                <xpath expr="/form//button[@name='action_confirm']" position="attributes">
+                      <attribute name="states">open</attribute>
+                      <attribute name="name">confirm_missing_locations</attribute>
                 </xpath>
             </field>
         </record>
@@ -62,16 +62,16 @@
         <record model="ir.ui.view" id="view_inventory_complete_filter">
             <field name="name">complete.inventory.filter</field>
             <field name="model">stock.inventory</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="stock.view_inventory_filter"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='name']" position="before">
-                    <filter icon="terp-check" name="exhaustive" string="Exhaustive" domain="[('exhaustive', '=', True)]" help="Only select inventories that have no parents." />
+                    <filter icon="terp-check" name="exhaustive" string="Exhaustive" domain="[('exhaustive', '=', True)]"
+                            help="Only select exhaustive Inventories." />
                     <separator orientation="vertical"/>
                 </xpath>
             </field>
         </record>
-        
+
         <!-- Show exhaustive inventories by default -->
         <record id="stock.action_inventory_form" model="ir.actions.act_window">
             <field name="context">{'full':'1', 'search_default_exhaustive':1}</field>
 
=== renamed file 'stock_inventory_location/test/location_exhaustive_inventory_test.yml' => 'stock_inventory_location/test/inventory_exhaustive_test.yml'
--- stock_inventory_location/test/location_exhaustive_inventory_test.yml	2014-03-12 14:55:39 +0000
+++ stock_inventory_location/test/inventory_exhaustive_test.yml	2014-06-11 15:04:27 +0000
@@ -3,99 +3,114 @@
   I will call open_action method and check if state of inventories are 'open'.
 -
   !python {model: stock.inventory}: |
-    from osv import orm, osv     
-    self.action_open(cr, uid, [ref('stock_inventory_location_1')])    
-    inventory_state = self.read(cr, uid, [ref('stock_inventory_location_1')], ['state'])[0]['state']
-    assert inventory_state == 'open', "Parent inventory have '%s' state. It should be 'open'" % inventory_state
-
--
-  In order, i add products to exhaustive inventory.
-  Don't add mou(product.product_product_25) and keya (product.product_product_24) products.
-  Adding pc1.
--    
+    self.action_open(cr, uid, [ref('inventory_exhaustive')])
+    inventory_state = self.read(cr, uid, [ref('inventory_exhaustive')], ['state'])[0]['state']
+    assert inventory_state == 'open', "Inventory in state '%s'. It should be 'open'" % inventory_state
+-
+  I create a wizard record for stock_confirm_uninventoried_location to verify that it contains the uninventoried locations
+-
+  !python {model: stock.inventory.uninventoried.locations}: |
+    ctx = dict(context, active_ids=[ref('inventory_exhaustive')])
+    wizard_id = self.create(cr, uid, {}, context=ctx)
+    wizard = self.browse(cr, uid, wizard_id, context=ctx)
+    assert len(wizard.location_ids) > 0 , "The wizard does not contain any lines."
+-
+  I add products to exhaustive inventory.
+  Adding 17” LCD Monitor.
+-
   !record {model: stock.inventory.line, id: lines_inventory_location_pc1}:
-    product_id: product.product_product_10
+    product_id: product.product_product_7
     product_uom: product.product_uom_unit
     company_id: base.main_company
-    inventory_id: stock_inventory_location_1    
+    inventory_id: inventory_exhaustive
     product_qty: 18.0
     location_id: stock.stock_location_14
 
 -
-  Adding pc3.
--      
+  Adding USB Keyboard, QWERTY.
+-
   !record {model: stock.inventory.line, id: lines_inventory_location_pc3}:
-    product_id: product.product_product_pc3
+    product_id: product.product_product_8
     product_uom: product.product_uom_unit
     company_id: base.main_company
-    inventory_id: stock_inventory_location_1    
+    inventory_id: inventory_exhaustive
     product_qty: 5.0
-    location_id: stock.stock_location_14    
+    location_id: stock.stock_location_14
 
 -
   I will call the function _get_locations_open_inventories and check the result.
-  The function will return only the location_ids of the exhaustive inventory.
+  The function will return only the location_id of the exhaustive inventory.
 -
   !python {model: stock.inventory}: |
-    from osv import orm, osv
-    locations = self._get_locations_open_inventories(cr, uid)    
-    assert len(locations) == 1, "Function return wrong results : %s" % locations
-    assert locations[0] == ref('stock.stock_location_14'), "Function '_get_locations_open_inventories' return wrong location_id. Should be '%s' : '%s'" % (stock.stock_location_14, locations[0]) 
-  
--  
+    locations = self._get_locations_open_inventories(cr, uid)
+    assert len(locations) == 1, "Function return wrong results: %s" % locations
+    assert locations[0] == ref('stock.stock_location_14'), "Function '_get_locations_open_inventories' return wrong location_id. Should be '%s': '%s'" % (stock.stock_location_14, locations[0])
+-
   I will call the function onchange_location_id.
-  The function must to return true in the first case, and return a warning dictionnary in the second test.  
+  The function must return True in the first case, and return a warning dictionnary in the second test.
 -
   !python {model: stock.inventory.line}: |
-    from osv import orm, osv
     res = self.onchange_location_id(cr, uid, [], [(6,0,[ref('stock.stock_location_14')])], True, ref('stock.stock_location_14'))
-    assert res == True, "Exhaustive : The function 'onchange_location_id' should return True and return '%s'" % res    
+    assert res == True, "Exhaustive: The function 'onchange_location_id' should return True and return '%s'" % res
     res = self.onchange_location_id(cr, uid, [], [(6,0,[ref('stock.stock_location_14')])], True, ref('stock.stock_location_components'))
-    assert res.get('warning', False) != False , "Function 'onchange_location_id' : Warning not raise. ('%s)" % res    
+    assert res.get('warning', False) != False , "Function 'onchange_location_id': Warning not raise. ('%s)" % res
 
 -
-  I will call _fill_location_lines to simulate confirmation for stock_confirm_uninventoried_location,
-  and create stock_moves
--
-  !python {model: stock.inventory}: |
-    from osv import orm, osv
-    ctx={'location': [ref('stock.stock_location_14')]}      
-    lines = self._fill_location_lines(cr, uid, ref('stock_inventory_location_1'), [ref('stock.stock_location_14')], True, context=ctx)
-    for line in lines:
-      self.pool.get('stock.inventory.line').create(cr, uid, line, context=context)    
-    
--
-  I will confirm exhaustive inventory 
--    
-  !python {model: stock.inventory}: |
-    from osv import orm, osv     
-    self.action_confirm(cr, uid, [ref('stock_inventory_location_1')])    
-    inventory_state = self.read(cr, uid, [ref('stock_inventory_location_1')], ['state'])[0]['state']
+  I create a wizard record for stock_confirm_uninventoried_location and validate it
+-
+  !python {model: stock.inventory.uninventoried.locations}: |
+    ctx = dict(context, active_ids=[ref('inventory_exhaustive')])
+    wizard_id = self.create(cr, uid, {}, context=ctx)
+    wizard = self.browse(cr, uid, wizard_id, context=ctx)
+    assert len(wizard.location_ids) == 0 , "The wizard should not contain any lines but contains %s." % wizard.location_ids
+    self.confirm_uninventoried_locations(cr, uid, wizard_id, context=ctx)
+-
+  Stock moves are not allowed in the locations during the inventory.
+-
+  !python {model: stock.move}: |
+    # TODOv8: remove this test, this is already part of trunk-wms
+    from stock_inventory_location import ExhaustiveInventoryException
+    try:
+      self.create(
+        cr,uid, {
+          'name': 'Bad move',
+          'location_id': ref('stock.stock_location_14'),
+          'location_dest_id': ref('stock.stock_location_3'),
+          'product_id': ref('product.product_product_8'),
+          'product_uom': ref('product.product_uom_unit'),
+          'date_expected': '2020-01-01 00:00:00'
+      })
+    except ExhaustiveInventoryException as e:
+      log("Good! The Stock Move was refused: %s" % e)
+-
+  I will confirm the exhaustive inventory
+-
+  !python {model: stock.inventory}: |
+    self.action_confirm(cr, uid, [ref('inventory_exhaustive')])
+    inventory_state = self.read(cr, uid, [ref('inventory_exhaustive')], ['state'])[0]['state']
     assert inventory_state == 'confirm', "Exhaustive inventory have '%s' state. It should be 'confirm'" % inventory_state
-              
+
 -
-  I will validate exhaustive inventory
+  I will validate the exhaustive inventory
 -
   !python {model: stock.inventory}: |
-    from osv import orm, osv   
-    self.action_done(cr, uid, [ref('stock_inventory_location_1')])
-    inventory_state = self.read(cr, uid, [ref('stock_inventory_location_1')], ['state'])[0]['state']
+    self.action_done(cr, uid, [ref('inventory_exhaustive')])
+    inventory_state = self.read(cr, uid, [ref('inventory_exhaustive')], ['state'])[0]['state']
     assert inventory_state == 'done', "Exhaustive inventory have '%s' state. It should be 'done'" % inventory_state
-       
+
 -
   I will verify the quantity for each products.
--    
+-
   !python {model: product.product}: |
-    from osv import orm, osv 
-    ctx={'location': [ref('stock.stock_location_14')], 'to_date': '2020-12-31 23:59:59'} 
-    prod_qty_avail = self.read(cr, uid, [ref('product.product_product_10')], ['qty_available'], context=ctx)[0]['qty_available']
-    assert prod_qty_avail == 18.0, "The stock of PC1 was not set to 18.0 : %s" % prod_qty_avail
-    
-    prod_qty_avail = self.read(cr, uid, [ref('product.product_product_pc3')], ['qty_available'], context=ctx)[0]['qty_available']
-    assert prod_qty_avail == 5.0, "The stock of PC3 was not set to 5.0 : %s" % prod_qty_avail
+    ctx = dict(context, location=[ref('stock.stock_location_14')])
+    prod_qty_avail = self.read(cr, uid, [ref('product.product_product_7')], ['qty_available'], context=ctx)[0]['qty_available']
+    assert prod_qty_avail == 18.0, "The stock of PC1 was not set to 18.0: %s" % prod_qty_avail
+
+    prod_qty_avail = self.read(cr, uid, [ref('product.product_product_8')], ['qty_available'], context=ctx)[0]['qty_available']
+    assert prod_qty_avail == 5.0, "The stock of PC3 was not set to 5.0: %s" % prod_qty_avail
 
     prod_qty_avail = self.read(cr, uid, [ref('product.product_product_24')], ['qty_available'], context=ctx)[0]['qty_available']
-    assert prod_qty_avail == 0.0, "The stock of KEYA was not set to 0 : %s" % prod_qty_avail
+    assert prod_qty_avail == 0.0, "The stock of KEYA was not set to 0: %s" % prod_qty_avail
 
     prod_qty_avail = self.read(cr, uid, [ref('product.product_product_25')], ['qty_available'], context=ctx)[0]['qty_available']
-    assert prod_qty_avail == 0.0, "The stock of MOU was not set to 0 : %s" % prod_qty_avail
+    assert prod_qty_avail == 0.0, "The stock of MOU was not set to 0: %s" % prod_qty_avail
 
=== added file 'stock_inventory_location/test/inventory_future_test.yml'
--- stock_inventory_location/test/inventory_future_test.yml	1970-01-01 00:00:00 +0000
+++ stock_inventory_location/test/inventory_future_test.yml	2014-06-11 15:04:27 +0000
@@ -0,0 +1,13 @@
+-
+  Check that an inventory with a date in the future cannot be opened.
+-
+  !python {model: stock.inventory}: |
+    # TODO v8: maybe this is already part of the new WMS
+    from osv.osv import except_osv
+    self.action_open(cr, uid, [ref('inventory_future')])
+    try:
+      self.action_done(cr, uid, [ref('inventory_future')])
+    except except_osv as e:
+      log("Good! The Inventory could not be opened: %s" % e)
+    inventory_state = self.read(cr, uid, [ref('inventory_future')], ['state'])[0]['state']
+    assert inventory_state != 'done', "Future inventory is done."
 
=== renamed file 'stock_inventory_location/test/location_inventory_test.yml' => 'stock_inventory_location/test/inventory_standard_test.yml'
--- stock_inventory_location/test/location_inventory_test.yml	2014-03-12 14:55:39 +0000
+++ stock_inventory_location/test/inventory_standard_test.yml	2014-06-11 15:04:27 +0000
@@ -3,61 +3,57 @@
   I will call open_action method and check if state of inventories are 'open'.
 -
   !python {model: stock.inventory}: |
-    from osv import orm, osv     
-    self.action_open(cr, uid, [ref('stock_inventory_location_0')])    
-    inventory_state = self.read(cr, uid, [ref('stock_inventory_location_0')], ['state'])[0]['state']
-    assert inventory_state == 'open', "Partial inventory have '%s' state. It should be 'open'" % inventory_state    
-   
+    self.action_open(cr, uid, [ref('inventory_standard')])
+    inventory_state = self.read(cr, uid, [ref('inventory_standard')], ['state'])[0]['state']
+    assert inventory_state == 'open', "Partial inventory have '%s' state. It should be 'open'" % inventory_state
+
 -
   In order, I add products to inventory.
-  Adding cpu1.
+  Adding Azerty Keyboard.
 -
-  !record {model: stock.inventory.line, id: lines_inventory_location_cpu1}:
-    product_id: product.product_product_cpu1
+  !record {model: stock.inventory.line, id: lines_inventory_location_kbaz}:
+    product_id: product.product_product_9
     product_uom: product.product_uom_unit
     company_id: base.main_company
-    inventory_id: stock_inventory_location_0    
+    inventory_id: inventory_standard
     product_qty: 18.0
     location_id: stock.stock_location_components
 
 -
-  Adding cpu3.
+  Adding Optical Mouse.
 -
-  !record {model: stock.inventory.line, id: lines_inventory_location_cpu3}:
-    product_id: product.product_product_cpu3
+  !record {model: stock.inventory.line, id: lines_inventory_location_optm}:
+    product_id: product.product_product_10
     product_uom: product.product_uom_unit
     company_id: base.main_company
-    inventory_id: stock_inventory_location_0    
+    inventory_id: inventory_standard
     product_qty: 12.0
     location_id: stock.stock_location_components
 
 -
-  Adding fan.
+  Adding Multimedia Speakers.
 -
-  !record {model: stock.inventory.line, id: lines_inventory_location_fan}:
-    product_id: product.product_product_fan
+  !record {model: stock.inventory.line, id: lines_inventory_location_grca}:
+    product_id: product.product_template_31
     product_uom: product.product_uom_unit
     company_id: base.main_company
-    inventory_id: stock_inventory_location_0    
+    inventory_id: inventory_standard
     product_qty: 32.0
     location_id: stock.stock_location_components
 
 -
   I will call the function _get_locations_open_inventories and check the result.
-  The function will return no locations.
+  The function will return no locations because it's not an exhaustive inventory.
 -
   !python {model: stock.inventory}: |
-    from osv import orm, osv
-    locations = self._get_locations_open_inventories(cr, uid)    
-    assert len(locations) == 0, "Function return wrong results : %s" % locations
-     
+    locations = self._get_locations_open_inventories(cr, uid)
+    assert len(locations) == 0, "Function return wrong results: %s" % locations
+
 -
   I will call the function onchange_location_id.
-  The function must to return true in all test case.  
+  The function must to return true in all test case.
 -
   !python {model: stock.inventory.line}: |
-    from osv import orm, osv
-    pass
     res = self.onchange_location_id(cr, uid, [], [(6,0,[ref('stock.stock_location_components')])], False, ref('stock.stock_location_components'))
     assert res == True, "The function 'onchange_location_id' should return True and return '%s'" % res
     res = self.onchange_location_id(cr, uid, [], [(6,0,[ref('stock.stock_location_components')])], False, ref('stock.stock_location_14'))
@@ -68,42 +64,37 @@
   The function must return True in all test cases.
 -
   !python {model: stock.location}: |
-    from osv import orm, osv    
     res = self._check_inventory(cr, uid, ref('stock.stock_location_components'))
     assert res == True, "The function '_check_inventory' should return True and return '%s'" % res
     res = self._check_inventory(cr, uid, ref('stock.stock_location_14'))
     assert res == True, "The function '_check_inventory' should return True and return '%s'" % res
-        
--
-  I will confirm inventory. 
--    
+
+-
+  I will confirm inventory.
+-
   !python {model: stock.inventory}: |
-    from osv import orm, osv     
-    self.action_confirm(cr, uid, [ref('stock_inventory_location_0')])    
-    inventory_state = self.read(cr, uid, [ref('stock_inventory_location_0')], ['state'])[0]['state']
+    self.action_confirm(cr, uid, [ref('inventory_standard')])
+    inventory_state = self.read(cr, uid, [ref('inventory_standard')], ['state'])[0]['state']
     assert inventory_state == 'confirm', "Partial inventory have '%s' state. It should be 'confirm'" % inventory_state
 
 -
   I will validate inventory
 -
   !python {model: stock.inventory}: |
-    from osv import orm, osv 
-    self.action_done(cr, uid, [ref('stock_inventory_location_0')])    
-    inventory_state = self.read(cr, uid, [ref('stock_inventory_location_0')], ['state'])[0]['state']
-    assert inventory_state == 'done', "Partial inventory have '%s' state. It should be 'done'" % inventory_state    
-       
+    self.action_done(cr, uid, [ref('inventory_standard')])
+    inventory_state = self.read(cr, uid, [ref('inventory_standard')], ['state'])[0]['state']
+    assert inventory_state == 'done', "Partial inventory have '%s' state. It should be 'done'" % inventory_state
+
 -
   I will verify the quantity for each products.
--    
+-
   !python {model: product.product}: |
-    from osv import orm, osv 
-    ctx={'location': [ref('stock.stock_location_components')], 'to_date': '2020-12-31 23:59:59'} 
-    prod_qty_avail = self.read(cr, uid, [ref('product.product_product_cpu1')], ['qty_available'], context=ctx)[0]['qty_available']
-    assert prod_qty_avail == 18.0, "The stock of CPU1 was not set to 18.0 : %s" % prod_qty_avail
-    
-    prod_qty_avail = self.read(cr, uid, [ref('product.product_product_cpu3')], ['qty_available'], context=ctx)[0]['qty_available']
-    assert prod_qty_avail == 12.0, "The stock of CPU3 was not set to 12.0 : %s" % prod_qty_avail
-    
-    prod_qty_avail = self.read(cr, uid, [ref('product.product_product_fan')], ['qty_available'], context=ctx)[0]['qty_available']
-    assert prod_qty_avail == 32.0, "The stock of FAN was not set to 32.0 : %s" % prod_qty_avail
-    
 \ No newline at end of file
+    ctx={'location': [ref('stock.stock_location_components')]}
+    prod_qty_avail = self.read(cr, uid, [ref('product.product_product_9')], ['qty_available'], context=ctx)[0]['qty_available']
+    assert prod_qty_avail == 18.0, "The stock of CPU1 was not set to 18.0: %s" % prod_qty_avail
+
+    prod_qty_avail = self.read(cr, uid, [ref('product.product_product_10')], ['qty_available'], context=ctx)[0]['qty_available']
+    assert prod_qty_avail == 12.0, "The stock of CPU3 was not set to 12.0: %s" % prod_qty_avail
+
+    prod_qty_avail = self.read(cr, uid, [ref('product.product_template_31')], ['qty_available'], context=ctx)[0]['qty_available']
+    assert prod_qty_avail == 32.0, "The stock of FAN was not set to 32.0: %s" % prod_qty_avail
 
=== modified file 'stock_inventory_location/wizard/stock_confirm_uninventoried_location.py'
--- stock_inventory_location/wizard/stock_confirm_uninventoried_location.py	2014-03-12 14:55:39 +0000
+++ stock_inventory_location/wizard/stock_confirm_uninventoried_location.py	2014-06-11 15:04:27 +0000
@@ -18,78 +18,45 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
-
-
-class stock_inventory_uninventoried_location(osv.osv_memory):
+from openerp.osv import fields, orm
+
+
+class stock_inventory_uninventoried_location(orm.TransientModel):
     _name = 'stock.inventory.uninventoried.locations'
     _description = 'Confirm the uninventoried Locations.'
 
     _columns = {
-                'location_ids': fields.many2many('stock.location',
-                                                 'stock_inventory_uninventoried_location_rel',
-                                                 'location_id',
-                                                 'wizard_id',
-                                                 'Uninventoried location', readonly=True),
-                }
-
-    def get_locations(self, cr, uid, inventory_id, context=None):
-        """ Get all locations from inventory. """
-        location_ids = self.pool.get('stock.inventory').read(cr, uid, [inventory_id], ['location_ids'], context=context)[0]
-        return self.pool.get('stock.location').search(cr, uid, [
-                        ('location_id', 'child_of', location_ids['location_ids']),
-                        ('usage', '=', 'internal')], context=context)
-
-    def get_locations_inventoried(self, cr, uid, inventory_id, location_ids, context=None):
-        """ Get all locations on inventory lines. """
-        inventory_line_obj = self.pool.get('stock.inventory.line')
-        inventory_line_ids = inventory_line_obj.search(cr, uid, [('location_id', 'in', location_ids),
-                                                                 ('inventory_id', '=', inventory_id)], context=context)
-        inventory_line_locations_ids = inventory_line_obj.read(cr, uid, inventory_line_ids, ['location_id'], context=context)
-        return list(set([_id['location_id'][0] for _id in inventory_line_locations_ids]))
+        'location_ids': fields.many2many(
+            'stock.location',
+            'stock_inventory_uninventoried_location_rel',
+            'location_id', 'wizard_id',
+            'Uninventoried location', readonly=True),
+        }
 
     def default_locations(self, cr, uid, context=None):
-        """ Initialize view with the list of uninventoried locations.
-            Search for children of the location if exists.
-        """
-        if context is None:
-            context = {}
-        location_ids = self.get_locations(cr, uid, context['active_id'])
-        inventory_line_locations_ids = self.get_locations_inventoried(cr, uid, context['active_id'], location_ids)
-        return  [_id for _id in location_ids if _id not in inventory_line_locations_ids]
+        """Initialize view with the list of uninventoried locations."""
+        return self.pool['stock.inventory'].get_missing_locations(
+            cr, uid, context['active_ids'], context=context)
 
     _defaults = {
         'location_ids': default_locations,
-        }
+    }
 
     def confirm_uninventoried_locations(self, cr, uid, ids, context=None):
-        """ Call action confirm method from stock.inventory """
+        """Add the missing inventory lines with qty=0 and confirm inventory"""
         inventory_ids = context['active_ids']
-        # call the wizard to add lines for uninventoried locations with zero quantity
-        inventory_obj = self.pool.get('stock.inventory')
-        if not isinstance(inventory_ids, list):
-            inventory_ids = [inventory_ids]
-
-        for inventory in inventory_obj.browse(cr, uid, inventory_ids, context=context):
+        inventory_obj = self.pool['stock.inventory']
+        wizard_obj = self.pool['stock.fill.inventory']
+        for inventory in inventory_obj.browse(cr, uid, inventory_ids,
+                                              context=context):
             if inventory.exhaustive:
-                location_ids = self.get_locations(cr, uid, inventory.id, context=context)
-                # get stock inventory lines
-                lines = []
-                try:
-                    # create inventory lines with zero qty
-                    lines = inventory_obj._fill_location_lines(cr, uid,
-                                                               inventory.id,
-                                                               location_ids,
-                                                               True,
-                                                               context=context)
-                except osv.except_osv as e:
-                    pass
-
-                for line in lines:
-                    self.pool.get('stock.inventory.line').create(cr, uid, line, context=context)
+                # silently run the import wizard with qty=0
+                wizard_id = wizard_obj.create(
+                    cr, uid, {'location_id': inventory.location_id.id,
+                              'recursive': True,
+                              'set_stock_zero': True}, context=context)
+                wizard_obj.fill_inventory(cr, uid, [wizard_id],
+                                          context=context)
 
         inventory_obj.action_confirm(cr, uid, inventory_ids, context=context)
         return {'type': 'ir.actions.act_window_close'}
-
-
 
=== modified file 'stock_inventory_location/wizard/stock_confirm_uninventoried_location.xml'
--- stock_inventory_location/wizard/stock_confirm_uninventoried_location.xml	2014-03-12 14:55:39 +0000
+++ stock_inventory_location/wizard/stock_confirm_uninventoried_location.xml	2014-06-11 15:04:27 +0000
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!-- The view definition is similar with stock_inventory_hierarchical_location/wizard/stock_inventory_missing_locations_view.xml, 
-        but the code is different. 
+        <!-- The view definition is similar with stock_inventory_hierarchical_location/wizard/stock_inventory_missing_locations_view.xml,
+        but the code is different.
         This wizard compare declared locations with locations on inventory lines to present the uninventoried (empty) locations to user. -->
         <record id="view_confirm_uninventoried_location" model="ir.ui.view">
             <field name="name">stock.inventory.uninventoried.locations.form</field>
             <field name="model">stock.inventory.uninventoried.locations</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Confirm uninventoried locations">
+                <form string="Confirm empty locations" version="7.0">
                     <group colspan="4" col="1">
-                        <label string="The following Stock Locations are part of the current Physical Inventory, but not Inventory Line has been recorded for them."/>
+                        <separator string="The following Locations are empty"/>
+                        <label string="The following Stock Locations are part of the current Physical Inventory, but no Inventory Line has been recorded for them."/>
+                        <label string="It could either mean that the Locations are empty, or that the Inventory is not yet complete."/>
+                        <label string="If you confirm the Inventory, these Locations will be considered empty and their content will be purged."/>
                         <field name="location_ids" nolabel="1">
                             <tree>
                                 <field name="name"/>
                             </tree>
                         </field>
-                        <label string="It could either mean that the Locations are empty, or that the Inventory is not yet complete."/>
-                        <label string="If you confirm the Inventory, these Locations will be considered empty and their content will be purged."/>
                         <separator string=""/>
                     </group>
-                    <group colspan="4" col="2">
-                        <button special="cancel" string="Cancel" icon="gtk-cancel" default_focus="1" />
-                        <button name="confirm_uninventoried_locations" string="Purge contents and confirm Inventory" type="object" icon="gtk-ok"/>                        
-                    </group>
+                  <footer>
+                      <button name="confirm_uninventoried_locations" string="Purge contents and confirm Inventory" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" default_focus="1"/>
+                  </footer>
                 </form>
             </field>
         </record>
-
 	</data>
 </openerp>
 \ No newline at end of file
 
=== modified file 'stock_inventory_location/wizard/stock_fill_location_inventory.py'
--- stock_inventory_location/wizard/stock_fill_location_inventory.py	2014-03-12 14:55:39 +0000
+++ stock_inventory_location/wizard/stock_fill_location_inventory.py	2014-06-11 15:04:27 +0000
@@ -18,80 +18,30 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
-from collections import OrderedDict
-
-
-class stock_fill_location_inventory(osv.osv_memory):
+from openerp.osv import fields, orm
+
+
+class FillInventoryWizard(orm.TransientModel):
+    """Add a field that lets the client make the location read-only"""
     _inherit = 'stock.fill.inventory'
 
     _columns = {
-         'location_id': fields.many2one('stock.location', 'Location'),
-         #'exhaustive': fields.boolean('stock.inventory', 'Type'),
-         'exhaustive': fields.boolean('stock.inventory'),
-         }
-
-    def get_inventory_type(self, cr, uid, context=None):
-        if context.get('active_id', False):
-            inventory_obj = self.pool.get('stock.inventory')
-            exhaustive = inventory_obj.read(cr, uid, [context.get('active_id')], ['exhaustive'], context=context)[0]['exhaustive']
-            return exhaustive
-        return False
-
-    _defaults = {
-        'exhaustive': get_inventory_type,
-        }
-
-    def view_init(self, cr, uid, fields_list, context=None):
-        """ inherit from original to add multiple selection of location
-        and exclude from location list the locations already choosen by another inventory """
-        if context is None:
-            context = {}
-
-        inventory_obj = self.pool.get('stock.inventory')
-        inventory_state = inventory_obj.read(cr, uid, [context.get('active_id')], ['state'], context=context)[0]
-        if inventory_state['state'] != 'open':
-            raise osv.except_osv(_('Error !'),
-                                 _('the inventory must be in "Open" state.'))
-
-        nb_inventory = inventory_obj.search(cr, uid, [('id', '=', context.get('active_id'))], count=True, context=context)
-        if nb_inventory == 0:
-            raise osv.except_osv(_('Warning !'),
-                                 _('No locations found for the inventory.'))
-
-        return super(stock_fill_location_inventory, self).view_init(cr, uid, fields_list, context=context)
-
-    def fill_inventory(self, cr, uid, ids, context=None):
-        """ Fill the inventory only with open locations on the inventory.
-        """
-        if context is None:
-            context = {}
-
-        fill_inventory = self.browse(cr, uid, ids[0], context=context)
-        if not fill_inventory.exhaustive:
-            return super(stock_fill_location_inventory, self).fill_inventory(cr, uid, ids, context=context)  # call standard wizard
-
-        location_ids = self.pool.get('stock.inventory').read(cr, uid, [context.get('active_id')], ['location_ids'])[0]
-
-        if not location_ids['location_ids']:
-            raise osv.except_osv(_('Error : Empty location !'), _('No location to import.\nYou must add a location on the locations list.'))
-
-        if fill_inventory.recursive:
-            location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids['location_ids']),
-                                                                            ('usage', '=', 'internal')], context=context)
-        else:
-            location_ids = location_ids['location_ids']
-
-        location_ids = list(OrderedDict.fromkeys(location_ids))
-
-        lines = self.pool.get('stock.inventory')._fill_location_lines(cr, uid,
-                                                   context['active_ids'][0],
-                                                   location_ids,
-                                                   fill_inventory.set_stock_zero,
-                                                   context=context)
-
-        inventory_lines_obj = self.pool.get('stock.inventory.line')
-        for line in lines:
-            inventory_lines_obj.create(cr, uid, line, context=context)
-        return {'type': 'ir.actions.act_window_close'}
+        'exhaustive': fields.boolean('Exhaustive', readonly=True)
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        """Get 'location_id' and 'exhaustive' from the inventory"""
+        if context is None:
+            context = {}
+        inv_id = context.get('active_id')
+
+        res = super(FillInventoryWizard, self).default_get(
+            cr, uid, fields, context=context)
+        if (context.get('active_model') == 'stock.inventory'
+                and inv_id
+                and 'location_id' in fields):
+            inventory = self.pool['stock.inventory'].browse(
+                cr, uid, context['active_id'], context=context)
+            res.update({'location_id': inventory.location_id.id,
+                        'exhaustive': inventory.exhaustive})
+        return res
 
=== modified file 'stock_inventory_location/wizard/stock_fill_location_inventory_view.xml'
--- stock_inventory_location/wizard/stock_fill_location_inventory_view.xml	2014-03-12 14:55:39 +0000
+++ stock_inventory_location/wizard/stock_fill_location_inventory_view.xml	2014-06-11 15:04:27 +0000
@@ -10,7 +10,7 @@
                     <field name="exhaustive" invisible="1" />
                 </xpath>
                 <xpath expr="//field[@name='location_id']" position="attributes">
-                    <attribute name="attrs">{'invisible':[('exhaustive','=',True)]}</attribute>
+                    <attribute name="attrs">{'readonly':[('exhaustive','=',True)]}</attribute>
                 </xpath>
             </field>
         </record>