[MRG] merge lp:~openerp-dev/openobject-addons/trunk-10click-warehouse-tpa-fix-aja

bzr revid: tpa@tinyerp.com-20121109124943-l3ojm3bcld78vt7h

diff --cc addons/stock/wizard/stock_fill_inventory.py
index 11907b6,1d3b8dd..8627e78
--- 1/addons/stock/wizard/stock_fill_inventory.py
--- 2/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@@ -132,13 -129,12 +129,15 @@@ class stock_fill_inventory(osv.osv_memo
              for stock_move_details in stock_move.values():
                  stock_move_details.update({'inventory_id': context['active_ids'][0]})
                  domain = []
+                 for field, value in stock_move_details.items():
+                     if field == 'product_qty' and fill_inventory.set_stock_zero:
+                          domain.append((field, 'in', [value,'0']))
+                          continue
+                     domain.append((field, '=', value))
  
 +                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))
- 
                  line_ids = inventory_line_obj.search(cr, uid, domain, context=context)
  
                  if not line_ids: