openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #07317
[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-780589-ron into lp:openobject-addons
Rohan Nayani(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-780589-ron into lp:openobject-addons.
Requested reviews:
Rucha (Open ERP) (rpa-openerp)
Related bugs:
Bug #780589 in OpenERP Addons: "[mrp] extensibility broken in action_scrap"
https://bugs.launchpad.net/openobject-addons/+bug/780589
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-780589-ron/+merge/62118
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-780589-ron/+merge/62118
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-780589-ron.
=== modified file 'mrp/stock.py'
--- mrp/stock.py 2011-04-07 11:32:08 +0000
+++ mrp/stock.py 2011-05-24 12:38:23 +0000
@@ -137,14 +137,13 @@
wf_service = netsvc.LocalService("workflow")
for move in self.browse(cr, uid, ids, context=context):
new_moves = super(StockMove, self).action_scrap(cr, uid, [move.id], product_qty, location_id, context=context)
- self.write(cr, uid, [move.id], {'prodlot_id': False, 'tracking_id': False})
production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
for prod_id in production_ids:
wf_service.trg_validate(uid, 'mrp.production', prod_id, 'button_produce', cr)
for new_move in new_moves:
production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
res.append(new_move)
- return {}
+ return res
StockMove()