Merge lp:~openerp-dev/openobject-addons/6.0-opw-578768-rha into lp:openobject-addons/6.0

[Rifakat Husen (OpenERP)]

Hello,

Fixed problem of 'Fill Inventory' wizard which adds qty for dummy moves also,
Ex. Stock -> Stock

If we try to fill inventory for location 'Stock',
It searches for all possible stock movements with location 'Stock' as Source or Destination
which includes dummy movement too which results into posting wrong qty moves for inventory.

Detail steps are provided in lp:1045334

Please review this fix.

[lp:~openerp-dev/openobject-addons/6.0-opw-578768-rha]

5336. By Rifakat Husen (OpenERP) on 2012-09-04

[IMP] improved code, fetch result in a single search() domain

[Naresh(OpenERP) (nch-openerp)]

review: Approve

Unmerged revisions

5336. By Rifakat Husen (OpenERP) on 2012-09-04

[IMP] improved code, fetch result in a single search() domain

5335. By Rifakat Husen (OpenERP) on 2012-09-04

[IMP] optimized code

5334. By Rifakat Husen (OpenERP) on 2012-09-04

[IMP] removed unused import

5333. By Rifakat Husen (OpenERP) on 2012-09-04

[FIX] stock: fixed import invertory wizard problem, restricted dummy moves' qty to be added into total

=== 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-09-04 13:10:29 +0000
@@ -67,7 +67,6 @@
 
         inventory_line_obj = self.pool.get('stock.inventory.line')
         location_obj = self.pool.get('stock.location')
-        product_obj = self.pool.get('product.product')
         move_obj = self.pool.get('stock.move')
         uom_obj = self.pool.get('product.uom')
         
@@ -87,7 +86,11 @@
         for location in location_ids:
             datas = {}
             res[location] = {}
-            move_ids = move_obj.search(cr, uid, ['|',('location_dest_id','=',location),('location_id','=',location),('state','=','done')], context=context)
+            move_ids = move_obj.search(cr, uid, ['|', '&', ('location_id', '!=', location),
+                                                ('location_dest_id', '=', location),
+                                                '&', ('location_id', '=', location),
+                                                ('location_dest_id', '!=', location),
+                                                ('state', '=', 'done')], context=context)
 
             for move in move_obj.browse(cr, uid, move_ids, context=context):
                 lot_id = move.prodlot_id.id