Merge lp:~numerigraphe/openobject-addons/6.0-inventory-dummy-moves into lp:openobject-addons/6.0

[Numérigraphe]

Fixes a corner-case bug when importing inventories

Unmerged revisions

5494. By Lionel Sausin, Loïc Bellier on 2013-09-23

[FIX] Inventory fill wizard gives wrong results when there are stock moves having source = destination.

=== modified file 'stock/__openerp__.py'
--- stock/__openerp__.py	2011-01-14 00:11:01 +0000
+++ stock/__openerp__.py	2013-09-23 15:27:09 +0000
@@ -74,6 +74,7 @@
     ],
     'test': ['test/stock_test.yml',
              'test/stock_report.yml',
+             'test/stock_inventory_dummy_moves.yml',
              ],
     'installable': True,
     'active': False,

=== added file 'stock/test/stock_inventory_dummy_moves.yml'
--- stock/test/stock_inventory_dummy_moves.yml	1970-01-01 00:00:00 +0000
+++ stock/test/stock_inventory_dummy_moves.yml	2013-09-23 15:27:09 +0000
@@ -0,0 +1,51 @@
+-
+  This file test will verify the bug reported at https://bugs.launchpad.net/openobject-addons/+bug/1228156.
+  In order, to test the bug fix, i will create stock move with same location for source and destination location,
+  create inventory, import inventory lines
+-
+  I create stock move with same source and destination location for product_pc2.
+-
+ !record {model: stock.move, id: same_location_move}:
+    name: 'Test move with same source and destination location'
+    location_id: stock_location_14
+    location_dest_id: stock_location_14
+    product_id: product.product_product_pc2
+    product_qty: 12.0
+    product_uom: product.product_uom_unit
+    state: 'done'
+-
+  I create inventory.
+-
+   !record {model: stock.inventory, id: stock_inventory_same_location}:
+    company_id: base.main_company
+    date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
+    date_done: !eval time.strftime('%Y-%m-%d %H:%M:%S')
+    name: Physical inventory
+    state: draft
+-
+  I create a stock.fill.inventory wizard .
+-
+  !record {model: stock.fill.inventory, id: stock_fill_inventory_1}:
+    location_id: stock.stock_location_14
+-
+  I fill the inventory for location stock_location_14.
+-    
+  !python {model: stock.fill.inventory}: |
+    from osv import osv
+    try:
+      self.fill_inventory(cr, uid, [ref("stock_fill_inventory_1")], {"lang": 'en_US',
+        "full": "1", "tz": False, "active_model": "stock.inventory", "active_ids":
+        [ref("stock_inventory_same_location")], "active_id": ref("stock_inventory_same_location"), })
+    except osv.except_osv:
+      # The wizard may throw an exception since there is actually nothing to import
+      pass
+-
+  I confirm and validate inventory - the quantity available must not change
+-
+  !python {model: stock.inventory}: |
+    prod_obj = self.pool.get("product.product")
+    old_qty = prod_obj.read(cr, uid, [ref('product.product_product_pc2')], ['qty_available'])[0]['qty_available']
+    self.action_confirm(cr,uid,[ref('stock_inventory_same_location')])
+    self.action_done(cr,uid,[ref('stock_inventory_same_location')])
+    new_qty = prod_obj.read(cr, uid, [ref('product.product_product_pc2')], ['qty_available'])[0]['qty_available']
+    assert old_qty == new_qty, "The quantity available should not change (%s -> %s)." % (old_qty, new_qty)

=== modified file 'stock/wizard/stock_fill_inventory.py'
--- stock/wizard/stock_fill_inventory.py	2012-04-25 12:22:20 +0000
+++ stock/wizard/stock_fill_inventory.py	2013-09-23 15:27:09 +0000
@@ -90,6 +90,8 @@
             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: