Merge lp:~openerp-dev/openobject-addons/trunk-opw-578768-port-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello,

    I have 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.

   Code is forward port from 6.1

Thanks
Mayur

[Fabien (Open ERP) (fp-tinyerp)]

was already fixed in another way

Unmerged revisions

7905. By Rifakat (OpenERP) on 2012-11-01

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

7904. By Launchpad Translations on behalf of openerp on 2012-11-01

Launchpad automatic translations update.

7903. By Stephane Wirtel (OpenERP) on 2012-10-31

[MERGE] point_of_sale: Fix some bugs

7902. By Vo Minh Thu on 2012-10-31

[FIX] base_gengo: fixed RST warnings in module description.

7901. By Quentin (OpenERP) <email address hidden> on 2012-10-31

[MERGE] merged the branch that adds yaml test on account voucher

7900. By Cedric Snauwaert (OpenERP) on 2012-10-31

[FIX]module mrp_repair: remove duplicate cancel button uppon creation of a repair order

7899. By Vo Minh Thu on 2012-10-31

[FIX] sale, hr: fixed RST warnings in module descriptions.

7898. By Launchpad Translations on behalf of openerp on 2012-10-31

Launchpad automatic translations update.

7897. By Olivier Dony (Odoo) on 2012-10-30

[FIX] account: currency_id must be passed to the chart installation wizard

Otherwise the installation of a chart of account
via the settings page fails miserably.

=== modified file 'stock/wizard/stock_fill_inventory.py'
--- stock/wizard/stock_fill_inventory.py	2012-09-29 10:51:04 +0000
+++ stock/wizard/stock_fill_inventory.py	2012-11-01 12:55:26 +0000
@@ -79,8 +79,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):
@@ -104,7 +102,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