diff options
| author | Jagdish Panchal (Open ERP) <jap@tinyerp.com> | 2011-12-21 12:25:53 +0530 |
|---|---|---|
| committer | Jagdish Panchal (Open ERP) <jap@tinyerp.com> | 2011-12-21 12:25:53 +0530 |
| commit | c028b3050d84cebf33fdadaf205b24e39b27d2e7 (patch) | |
| tree | fe426c13b249bd1da2381777710e17e59a3f76a3 /addons/procurement/procurement_workflow.xml | |
| parent | 22c4f560b3b0622d1465b257f842c0766b65c635 (diff) | |
| parent | bf47bea6f7b886384176c0dbb59860f72677e69e (diff) | |
[MERGE] branch merged with lp:openobject-addons
bzr revid: jap@tinyerp.com-20111221065553-k0h0ksnnr29mklna
Diffstat (limited to 'addons/procurement/procurement_workflow.xml')
| -rw-r--r-- | addons/procurement/procurement_workflow.xml | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml index 23b0a08af78..53b6608fa6f 100644 --- a/addons/procurement/procurement_workflow.xml +++ b/addons/procurement/procurement_workflow.xml @@ -50,12 +50,14 @@ <field name="wkf_id" ref="wkf_procurement"/> <field name="name">produce_check</field> </record> + <!-- act_produce_service should be move in project_mrp module. --> <record id="act_produce_service" model="workflow.activity"> <field name="wkf_id" ref="wkf_procurement"/> <field name="name">produce_service</field> <field name="kind">function</field> <field name="action">action_produce_assign_service()</field> </record> + <record id="act_make_done" model="workflow.activity"> <field name="wkf_id" ref="wkf_procurement"/> <field name="name">ready</field> @@ -163,18 +165,28 @@ <field name="act_to" ref="act_produce_check"/> <field name="condition">check_produce()</field> </record> - <record id="trans_product_check_produce_service" model="workflow.transition"> - <field name="act_from" ref="act_produce_check"/> - <field name="act_to" ref="act_produce_service"/> - <field name="condition">not check_product()</field> - </record> + <record id="trans_make_to_stock_make_done" model="workflow.transition"> - <field name="act_from" ref="act_make_to_stock"/> + <field name="act_from" ref="act_make_to_stock"/> <!-- TOFIX: If product is service product and procure method is 'make_to_stock', procurement is closed without generated service --> <field name="act_to" ref="act_make_done"/> <field name="condition">True</field> <field name="trigger_model" eval="False"/> <field name="trigger_expr_id" eval="False"/> </record> + <!-- TOFIX: Without installing 'mrp' module, If product is produce(mto), procurement never close (Its gone in idle) so sale order never close and also invoice never created if post paid invoice. solution of this issue is below, just add one transition from act_produce_check to act_make_done --> + <!-- + <record id="trans_produce_make_done" model="workflow.transition"> + <field name="act_from" ref="act_produce_check"/> + <field name="act_to" ref="procurement.act_make_done"/> + <field name="condition">check_product()</field> + </record> --> + + <!-- TOFIX: service related transition should be move into project_mrp module. --> + <record id="trans_product_check_produce_service" model="workflow.transition"> + <field name="act_from" ref="act_produce_check"/> + <field name="act_to" ref="act_produce_service"/> + <field name="condition">not check_product()</field> + </record> <record id="trans_produce_service_cancel" model="workflow.transition"> <field name="act_from" ref="act_produce_service"/> <field name="act_to" ref="act_cancel"/> @@ -184,6 +196,7 @@ <field name="act_from" ref="act_produce_service"/> <field name="act_to" ref="act_make_done"/> </record> + <record id="trans_make_done_done" model="workflow.transition"> <field name="act_from" ref="act_make_done"/> <field name="act_to" ref="act_done"/> |