Merge lp:~numerigraphe/openobject-addons/6.0-stock-inventory-fill-duplicate into lp:openobject-addons/6.0

[Numérigraphe]

This branch proposes to fix a bug in the wizard to fill inventories : when run in a inventory which already contains lines, it generate duplicate lines when the quantities in stock are not the same as those in the inventory.
Lionel Sausin.

Unmerged revisions

5233. By Numerigraphe - Lionel Sausin <email address hidden> on 2012-06-14

[FIX] stock: in import inventory wizard, don't add the same line twice when the quantity changes

=== 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	2012-06-14 10:05:41 +0000
@@ -113,13 +113,16 @@
         for stock_move in res.values():
             for stock_move_details in stock_move.values():
                 stock_move_details.update({'inventory_id': context['active_ids'][0]})
-                domain = []
-                
+
                 if fill_inventory.set_stock_zero:
                     stock_move_details.update({'product_qty': 0})
 
-                for field, value in stock_move_details.items():
-                    domain.append((field, '=', value))
+                domain = [(field, '=', stock_move_details[field])
+                           for field in ['location_id',
+                                         'product_id',
+                                         'prod_lot_id',
+                                         'inventory_id']
+                          ]
 
                 line_ids = inventory_line_obj.search(cr, uid, domain, context=context)