pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] WORKFLOW: avoid overwriting transitions for clean uninstallation

Browse Source 
bzr revid: api@openerp.com-20121207115304-3uhsbnhv8i3g4qdx
This commit is contained in:
Arnaud Pineux
2012-12-07 12:53:04 +01:00
parent 538834d9c3
commit ef0b59cb85
5 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_payroll_account/hr_payroll_account_workflow.xml
-31
View File
@@ -1,31 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="act_account_check" model="workflow.activity">
<field name="wkf_id" ref="hr_payroll.wkf"/>
<field name="name">account_check</field>
<field name="action">account_check_sheet()</field>
<field name="kind">function</field>
</record>
<record id="hr_payroll.t4" model="workflow.transition">
<field name="act_from" ref="hr_payroll.act_confirm"/>
<field name="act_to" ref="act_account_check"/>
<field name="condition">True</field>
<field name="signal">account_verify_sheet</field>
</record>
<record id="t3" model="workflow.transition">
<field name="act_from" ref="act_account_check"/>
<field name="act_to" ref="hr_payroll.act_done"/>
<field name="condition">True</field>
<field name="signal">final_verify_sheet</field>
</record>
<record id="hr_payroll.t9" model="workflow.transition">
<field name="act_from" ref="act_account_check"/>
<field name="act_to" ref="hr_payroll.act_cancel"/>
<field name="signal">cancel_sheet</field>
</record>
</data>
</openerp>
addons/mrp/mrp_workflow.xml
+5 -3
View File
@@ -136,14 +136,16 @@
<field name="signal">subflow.cancel</field>
</record>
<record id="procurement.trans_produce_make_done" model="workflow.transition">
<record id="trans_produce_make_done" model="workflow.transition">
<field name="act_from" ref="act_produce"/>
<field name="act_to" ref="procurement.act_make_done"/>
<field name="signal">subflow.done</field>
</record>
<record id="procurement.trans_confirm_confirm_wait" model="workflow.transition">
<field name="condition">not test_cancel() and not get_phantom_bom_id()</field>
<record id="trans_conf_conf_wait" model="workflow.transition">
<field name="act_from" ref="procurement.act_confirm_temp"/>
<field name="act_to" ref="procurement.act_confirm_wait"/>
<field name="condition">not get_phantom_bom_id()</field>
</record>
</data>
addons/mrp_jit/mrp_jit.xml
+4 -2
View File
@@ -2,8 +2,10 @@
<openerp>
<data>
<record model="workflow.transition" id="procurement.trans_confirm_confirm_wait">
<field name="signal" eval="False"/>
<record model="workflow.transition" id="trans_confirm_to_confirm_wait">
<field name="act_from" ref="procurement.act_confirm"/>
<field name="act_to" ref="procurement.act_confirm_wait"/>
<field name="condition">not test_cancel()</field>
</record>
</data>
addons/procurement/procurement_workflow.xml
+30 -2
View File
@@ -31,6 +31,12 @@
<field name="name">confirm_wait</field>
<field name="kind">function</field>
<field name="action">write({'state':'exception'})</field>
<field name="join_mode">AND</field>
</record>
<record id="act_confirm_temp" model="workflow.activity">
<field name="wkf_id" ref="wkf_procurement"/>
<field name="name">confirm_temp</field>
<field name="slip_mode">OR</field>
</record>
<record id="act_confirm_mts" model="workflow.activity">
<field name="wkf_id" ref="wkf_procurement"/>
@@ -40,6 +46,16 @@
<field name="wkf_id" ref="wkf_procurement"/>
<field name="name">confirm_mto</field>
</record>
<record id="act_buy" model="workflow.activity">
<field name="wkf_id" ref="wkf_procurement"/>
<field name="name">buy</field>
<field name="split_mode">OR</field>
</record>
<record id="act_buy_end" model="workflow.activity">
<field name="wkf_id" ref="wkf_procurement"/>
<field name="name">buy_end</field>
<field name="join_mode">AND</field>
</record>
<record id="act_make_to_stock" model="workflow.activity">
<field name="wkf_id" ref="wkf_procurement"/>
<field name="name">make_to_stock</field>
@@ -106,10 +122,14 @@
</record>
<record id="trans_confirm_confirm_wait" model="workflow.transition">
<field name="act_from" ref="act_confirm"/>
<field name="act_to" ref="act_confirm_wait"/>
<field name="act_to" ref="act_confirm_temp"/>
<field name="signal">button_check</field>
<field name="condition">not test_cancel()</field>
</record>
<record id="trans_confirm_temp_confirm_wait" model="workflow.transition">
<field name="act_from" ref="act_confirm_temp"/>
<field name="act_to" ref="act_confirm_wait"/>
</record>
<record id="trans_confirm_wait_confirm_mto" model="workflow.transition">
<field name="act_from" ref="act_confirm_wait"/>
<field name="act_to" ref="act_confirm_mto"/>
@@ -142,9 +162,17 @@
</record>
<record id="trans_confirm_mto_purchase" model="workflow.transition">
<field name="act_from" ref="act_confirm_mto"/>
<field name="act_to" ref="act_make_done"/>
<field name="act_to" ref="act_buy"/>
<field name="condition">check_buy()</field>
</record>
<record id="trans_buy_buy_end" model="workflow.transition">
<field name="act_from" ref="act_buy"/>
<field name="act_to" ref="act_buy_end"/>
</record>
<record id="trans_buy_done" model="workflow.transition">
<field name="act_from" ref="act_buy_end"/>
<field name="act_to" ref="act_make_done"/>
</record>
<record id="trans_confirm_mto_confirm" model="workflow.transition">
<field name="act_from" ref="act_confirm_mto"/>
<field name="act_to" ref="act_confirm"/>
addons/purchase/purchase_workflow.xml
+8 -9
View File
@@ -201,28 +201,27 @@
</record>
<!-- Procurement -->
<record id="act_buy" model="workflow.activity">
<record id="act_buy_sub" model="workflow.activity">
<field name="wkf_id" ref="procurement.wkf_procurement"/>
<field name="name">buy</field>
<field name="name">buy_subflows</field>
<field name="kind">subflow</field>
<field name="subflow_id" search="[('osv','=','purchase.order')]"/>
<field name="action">action_po_assign()</field>
</record>
<record id="procurement.trans_confirm_mto_purchase" model="workflow.transition">
<field name="act_from" ref="procurement.act_confirm_mto"/>
<field name="act_to" ref="act_buy"/>
<field name="condition">check_buy()</field>
<record id="trans_buy_buy_sub" model="workflow.transition">
<field name="act_from" ref="procurement.act_buy"/>
<field name="act_to" ref="act_buy_sub"/>
</record>
<record id="trans_buy_make_done" model="workflow.transition">
<field name="act_from" ref="act_buy"/>
<field name="act_to" ref="procurement.act_make_done"/>
<field name="act_from" ref="act_buy_sub"/>
<field name="act_to" ref="procurement.act_buy_end"/>
<field name="signal">subflow.delivery_done</field>
</record>
<record id="trans_buy_cancel" model="workflow.transition">
<field name="act_from" ref="act_buy"/>
<field name="act_from" ref="act_buy_sub"/>
<field name="act_to" ref="procurement.act_cancel"/>
<field name="signal">subflow.cancel</field>
</record>