odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Use correct wizard and solve infinite loop 

bzr revid: jco@openerp.com-20140128164048-43ptahppk2w2tyn7
This commit is contained in:
Josse Colpaert 2014-01-28 17:40:48 +01:00
parent 3562a6d3bf
commit 68f0f8db8f
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mrp/__openerp__.py
View File

@ -63,6 +63,7 @@ Dashboard / Reports for MRP will include:
'wizard/change_production_qty_view.xml',
'wizard/mrp_price_view.xml',
'wizard/mrp_workcenter_load_view.xml',
'wizard/stock_move_view.xml',
'mrp_view.xml',
'mrp_report.xml',
'company_view.xml',
@ -73,7 +74,6 @@ Dashboard / Reports for MRP will include:
'report/mrp_production_order_view.xml',
'board_manufacturing_view.xml',
'res_config_view.xml',
'wizard/stock_move_view.xml',
],
'demo': ['mrp_demo.xml'],
'test': [

2
addons/mrp/mrp_view.xml
View File

@ -726,7 +726,7 @@
<field name="product_qty" string="Quantity"/>
<field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
<field name="state" invisible="1"/>
<button name="%(stock.move_consume)d"
<button name="%(mrp.move_consume)d"
string="Consume Products" type="action"
icon="gtk-go-forward" context="{'consume': True}"
states="draft,waiting,confirmed,assigned"

1
addons/mrp/stock.py
View File

@ -151,7 +151,6 @@ class StockMove(osv.osv):
if new_move != move.id:
#This move is not already there in move lines of production order
production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
res.append(new_move)
return res
def action_scrap(self, cr, uid, ids, product_qty, location_id, restrict_lot_id = False, restrict_partner_id = False, context=None):