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

[Rifakat Husen (OpenERP)]

Hello,

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

If we try to fill inventory for location 'Stock',
It search for all the stock movements with location 'Stock' as Source or Destination
which includes dummy movement too and adds qty for dummy movement which results into
posting wrong move for inventory.

Detail steps are provided in lp:1045334

Please review this fix.

Regards,
Rifakat

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

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

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

[Ferdinand (office-chricar)]

Hello!

I do not know how the SQL statement will look like and how postgresql will optimize the search.

performance is critical and full table scans must be avoided

a statement like
select id from stock_move where (location_id = 12 and location_dest_id != 12) or (location_id !=12 and location_dest_id =12);

would generate an optimized query plan
explain select id from stock_move where (location_id = 12 and location_dest_id != 12) or (location_id !=12 and location_dest_id =12);
                                                     QUERY PLAN
--------------------------------------------------------------------------------------------------------------------
 Bitmap Heap Scan on stock_move (cost=68.96..324.66 rows=2632 width=4)
   Recheck Cond: ((location_id = 12) OR (location_dest_id = 12))
   Filter: (((location_id = 12) AND (location_dest_id <> 12)) OR ((location_id <> 12) AND (location_dest_id = 12)))
   -> BitmapOr (cost=68.96..68.96 rows=3085 width=0)
         -> Bitmap Index Scan on stock_move_location_id_index (cost=0.00..55.68 rows=2590 width=0)
               Index Cond: (location_id = 12)
         -> Bitmap Index Scan on stock_move_location_dest_id_index (cost=0.00..11.96 rows=495 width=0)
               Index Cond: (location_dest_id = 12)

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-578768-port-mma/+merge/132541 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

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

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

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

[IMP] optimized code

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

[IMP] removed unused imports

6975. 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	2011-12-08 05:58:41 +0000
+++ stock/wizard/stock_fill_inventory.py	2012-09-04 13:09:20 +0000
@@ -67,8 +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')
-        stock_location_obj = self.pool.get('stock.location')
         move_obj = self.pool.get('stock.move')
         uom_obj = self.pool.get('product.uom')
         if ids and len(ids):
@@ -92,7 +90,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