diff options
| author | Jagdish Panchal <jap@tinyerp.com> | 2013-05-01 19:02:29 +0530 |
|---|---|---|
| committer | Jagdish Panchal <jap@tinyerp.com> | 2013-05-01 19:02:29 +0530 |
| commit | 0d9dfd54e795c822e4353869a4fd79aeff9d6984 (patch) | |
| tree | 994415a48705c8a48b387389e67e72c2ea13714a | |
| parent | b4910caba846eceaf72c25c3719ac96047dcfeaa (diff) | |
[IMP] Improve code in mrp.py for service type product
bzr revid: jap@tinyerp.com-20130501133229-1kt9kp9aunm5np9l
| -rw-r--r-- | addons/mrp/mrp.py | 4 | ||||
| -rw-r--r-- | addons/mrp/mrp_workflow.xml | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 44fbaafbcfe..df798762b5a 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -774,8 +774,10 @@ 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") + for componant in production.bom_id.bom_lines: + if componant.product_id.type == 'service' and not production.move_lines or not production.move_lines2: + wf_service.trg_validate(uid, 'mrp.production', production_id, 'button_produce', cr) wf_service.trg_validate(uid, 'mrp.production', production_id, 'button_produce_done', cr) return True diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml index c8102ae2a3a..1c3e2ac6b1f 100644 --- a/addons/mrp/mrp_workflow.xml +++ b/addons/mrp/mrp_workflow.xml @@ -78,13 +78,6 @@ <field name="signal">button_produce</field> </record> - <record id="prod_trans_done" model="workflow.transition"> - <field name="act_from" ref="prod_act_ready"/> - <field name="act_to" ref="prod_act_done"/> - <field name="signal">button_produce_done</field> - <field name="condition">test_production_done()</field> - </record> - <record id="prod_trans_in_production_done" model="workflow.transition"> <field name="act_from" ref="prod_act_in_production"/> <field name="act_to" ref="prod_act_done"/> |