From 21d80930b00ef237ec2e823cce157b509853cd40 Mon Sep 17 00:00:00 2001 From: Jagdish Panchal Date: Fri, 17 May 2013 12:10:41 +0530 Subject: [PATCH] [IMP] remove unwanted change bzr revid: jap@tinyerp.com-20130517064041-bf7jq2p04zgp480n --- addons/mrp/mrp.py | 3 +++ addons/mrp/stock.py | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 91b6a7a0798..0d210544356 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -776,6 +776,7 @@ class mrp_production(osv.osv): new_parent_ids.append(final_product.id) for new_parent_id in new_parent_ids: stock_mov_obj.write(cr, uid, [raw_product.id], {'move_history_ids': [(4,new_parent_id)]}) + wf_service = netsvc.LocalService("workflow") wf_service.trg_validate(uid, 'mrp.production', production_id, 'button_produce_done', cr) return True @@ -984,6 +985,7 @@ class mrp_production(osv.osv): for production in self.browse(cr, uid, ids, context=context): shipment_id = self._make_production_internal_shipment(cr, uid, production, context=context) produce_move_id = self._make_production_produce_line(cr, uid, production, context=context) + # Take routing location as a Source Location. source_location_id = production.location_src_id.id if production.bom_id.routing_id and production.bom_id.routing_id.location_id: @@ -994,6 +996,7 @@ class mrp_production(osv.osv): shipment_move_id = self._make_production_internal_shipment_line(cr, uid, line, shipment_id, consume_move_id,\ destination_location_id=source_location_id, context=context) self._make_production_line_procurement(cr, uid, line, shipment_move_id, context=context) + wf_service.trg_validate(uid, 'stock.picking', shipment_id, 'button_confirm', cr) production.write({'state':'confirmed'}, context=context) return shipment_id diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py index 3ae8736641c..1404f2bbcb0 100644 --- a/addons/mrp/stock.py +++ b/addons/mrp/stock.py @@ -203,8 +203,6 @@ class split_in_production_lot(osv.osv_memory): production_obj.write(cr, uid, production_ids, {'move_lines': [(4, m) for m in new_moves]}) return new_moves - - split_in_production_lot() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: