pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed: bad sql query if no inventory location was chosen when trying to set stock to 0.

Browse Source 
Now a warning dialog appear asking to choose at least one inventory location

bzr revid: olt@tinyerp.com-20081215124113-v4omh9enhed60ek4
This commit is contained in:
Olivier Laurent
2008-12-15 13:41:13 +01:00
parent 8f688adaa9
commit a9ddac89a6
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/wizard/inventory_merge_zero.py
+18 -14
View File
@@ -40,7 +40,7 @@ def do_merge(self, cr, uid, data, context):
if len(data['ids']) <> 1:
raise wizard.except_wizard("Warning",
"Please select one and only one inventory!")
"Please select one and only one inventory !")
cr.execute('select distinct location_id from stock_inventory_line where inventory_id=%s', (data['ids'][0],))
loc_ids = map(lambda x: x[0], cr.fetchall())
@@ -49,19 +49,23 @@ def do_merge(self, cr, uid, data, context):
cr.execute('select distinct location_id,product_id from stock_inventory_line where inventory_id=%s', (data['ids'][0],))
inv = cr.fetchall()
cr.execute('select distinct product_id from stock_move where (location_dest_id in ('+locs+')) or (location_id in ('+locs+'))')
stock = cr.fetchall()
for s in stock:
for loc in loc_ids:
if (loc,s[0]) not in inv:
p = prod_obj.browse(cr, uid, s[0])
invent_line_obj.create(cr, uid, {
'inventory_id': data['ids'][0],
'location_id': loc,
'product_id': s[0],
'product_uom': p.uom_id.id,
'product_qty': 0.0,
})
if not inv:
raise wizard.except_wizard("Warning",
"Please select at least one inventory location !")
else:
cr.execute('select distinct product_id from stock_move where (location_dest_id in ('+locs+')) or (location_id in ('+locs+'))')
stock = cr.fetchall()
for s in stock:
for loc in loc_ids:
if (loc,s[0]) not in inv:
p = prod_obj.browse(cr, uid, s[0])
invent_line_obj.create(cr, uid, {
'inventory_id': data['ids'][0],
'location_id': loc,
'product_id': s[0],
'product_uom': p.uom_id.id,
'product_qty': 0.0,
})
return {}