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

[Lionel Sausin - Initiatives/Numérigraphe]

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

55. By Numérigraphe on 2014-06-10

[FIX] don't make the inventory location mandatory when it's invisible (ie. when the inventory is not exhaustive)

56. By Numérigraphe on 2014-06-10

[FIX] when starting the fill inventory wizard, get 'location_id' and 'exhaustive' from the inventory

57. By Numérigraphe on 2014-06-10

[IMP] better placement for the new fields in stock_inventory_location

58. By Numérigraphe on 2014-06-10

[ FIX] Fix onchange_location_id (it still looked for multiple locations in the inventory header), and get the default location for inventory lines from the inventory header if it's an exhaustive one, otherwise the on_change check does not let us enter anything.

59. By Numérigraphe on 2014-06-10

[REF] improve description, remove TODOs done, remove debugging "print" statements

60. By Numérigraphe on 2014-06-10

[IMP] don't show the confirmation wizard if all the locations are actually present in inventory lines

61. By Numérigraphe on 2014-06-10

[REF] pep8

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

[IMP] update screenshots

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

[IMP] make the default location company-sensitive (take the location of the 1st warehouse of the default company - courtesy of Laetitia Gangloff (Acsone)

=== 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:01:48 +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-28 16:13:01 +0000
+++ stock_inventory_location/__openerp__.py	2014-06-11 15:01:48 +0000
@@ -18,45 +18,60 @@
 #
 ##############################################################################
 
-
 {
     "name": "Exhaustive Stock Inventories",
-    "version": "1.0",
+    "version": "1.1",
     "depends": ["stock"],
     "author": u"Numérigraphe",
     "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:01:48 +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-28 16:13:01 +0000
+++ stock_inventory_location/i18n/fr.po	2014-06-11 15:01:48 +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
@@ -87,7 +87,7 @@
 #: 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"
+msgid "Error: Location locked down"
 msgstr "Erreur: emplacement en inventaire"
 
 #. module: stock_inventory_location
@@ -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"
@@ -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:01:48 +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:01:48 +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:01:48 +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:01:48 +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:01:48 +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:01:48 +0000 differ
=== modified file 'stock_inventory_location/stock_inventory_location.py'
--- stock_inventory_location/stock_inventory_location.py	2014-03-28 16:13:01 +0000
+++ stock_inventory_location/stock_inventory_location.py	2014-06-11 15:01:48 +0000
@@ -18,192 +18,205 @@
 #
 ##############################################################################
 
+import time
 from collections import Iterable
 
 from openerp.osv import orm, fields
 from openerp.tools.translate import _
-
-
-class EmptyLocationException(orm.except_orm):
-    def __init__(self, name, value):
-        self.name = name
-        self.value = value
-        self.args = (name, value)
+# 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 orm.except_orm(_('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': '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 EmptyLocationException(_('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
+                }
+        return self.action_confirm(cr, uid, ids, context=context)
 
 
 class StockInventoryLine(orm.Model):
@@ -211,21 +224,39 @@
 
     _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
 
 
@@ -234,16 +265,20 @@
     _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 orm.except_orm(_('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):
@@ -252,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"""
@@ -274,29 +312,40 @@
 
     _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 orm.except_orm(_('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:01:48 +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-28 16:13:01 +0000
+++ stock_inventory_location/stock_inventory_location_view.xml	2014-06-11 15:01:48 +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-31 13:19:48 +0000
+++ stock_inventory_location/test/inventory_exhaustive_test.yml	2014-06-11 15:01:48 +0000
@@ -3,93 +3,109 @@
   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.
+    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_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 USB Keyboard, QWERTY.
--      
+-
   !record {model: stock.inventory.line, id: lines_inventory_location_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)    
+    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]) 
-  
--  
+    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'} 
+    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
 
 
=== 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:01:48 +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-31 13:19:48 +0000
+++ stock_inventory_location/test/inventory_standard_test.yml	2014-06-11 15:01:48 +0000
@@ -3,11 +3,10 @@
   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 Azerty Keyboard.
@@ -16,7 +15,7 @@
     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
 
@@ -27,7 +26,7 @@
     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
 
@@ -38,26 +37,23 @@
     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)    
+    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'} 
+    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
-    
 \ No newline at end of file
 
=== modified file 'stock_inventory_location/wizard/stock_confirm_uninventoried_location.py'
--- stock_inventory_location/wizard/stock_confirm_uninventoried_location.py	2014-03-28 16:13:01 +0000
+++ stock_inventory_location/wizard/stock_confirm_uninventoried_location.py	2014-06-11 15:01:48 +0000
@@ -19,8 +19,6 @@
 ##############################################################################
 
 from openerp.osv import fields, orm
-from openerp.tools.translate import _
-from stock_inventory_location.stock_inventory_location import EmptyLocationException
 
 
 class stock_inventory_uninventoried_location(orm.TransientModel):
@@ -28,71 +26,37 @@
     _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 """
-        if context is None or 'active_ids' not in context:
-            return False
+        """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 EmptyLocationException:
-                    pass  # Don't care about empty location exception
-
-                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:01:48 +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-28 16:13:01 +0000
+++ stock_inventory_location/wizard/stock_fill_location_inventory.py	2014-06-11 15:01:48 +0000
@@ -19,79 +19,29 @@
 ##############################################################################
 
 from openerp.osv import fields, orm
-from openerp.tools.translate import _
-from collections import OrderedDict
-
-
-class stock_fill_location_inventory(orm.TransientModel):
+
+
+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 orm.except_orm(_('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 orm.except_orm(_('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 orm.except_orm(_('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:01:48 +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>