Arnaud Pineux (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-workflow-fix-api into
lp:openobject-addons.
Requested reviews:
qdp (OpenERP) (qdp)
Olivier Dony (OpenERP) (odo-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-workflow-fix-api/+merge/138951
Re-organize the workflow for:
mrp_jit,
purchase,
procurement,
mrp and hr_payroll_account
The re-organization consists to add new activities and transitions to avoid
overriding older transactions. Overriding will create problems at
uninstallation.
(The re-organization is done with the same method as the merge branch
trunk-approval-order-api)
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-workflow-fix-api/+merge/138951
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-workflow-fix-api.
=== removed file 'hr_payroll_account/hr_payroll_account_workflow.xml'
--- hr_payroll_account/hr_payroll_account_workflow.xml 2011-01-14 00:11:01 +0000
+++ hr_payroll_account/hr_payroll_account_workflow.xml 1970-01-01 00:00:00 +0000
@@ -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>
=== modified file 'mrp/mrp_workflow.xml'
--- mrp/mrp_workflow.xml 2011-12-19 16:54:40 +0000
+++ mrp/mrp_workflow.xml 2012-12-10 12:49:21 +0000
@@ -136,13 +136,15 @@
<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">
+ <record id="trans_conf_conf_wait" model="workflow.transition">
+ <field name="act_from" ref="procurement.act_confirm"/>
+ <field name="act_to" ref="procurement.act_confirm_temp"/>
<field name="condition">not test_cancel() and not get_phantom_bom_id()</field>
</record>
=== modified file 'mrp_jit/mrp_jit.xml'
--- mrp_jit/mrp_jit.xml 2012-11-29 22:26:45 +0000
+++ mrp_jit/mrp_jit.xml 2012-12-10 12:49:21 +0000
@@ -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_temp"/>
+ <field name="condition">not test_cancel()</field>
</record>
</data>
=== modified file 'procurement/procurement_workflow.xml'
--- procurement/procurement_workflow.xml 2011-12-19 16:54:40 +0000
+++ procurement/procurement_workflow.xml 2012-12-10 12:49:21 +0000
@@ -25,12 +25,19 @@
<field name="name">confirm</field>
<field name="kind">function</field>
<field name="action">action_confirm()</field>
+ <field name="slip_mode">OR</field>
</record>
<record id="act_confirm_wait" model="workflow.activity">
<field name="wkf_id" ref="wkf_procurement"/>
<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 +47,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,9 +123,13 @@
</record>
<record id="trans_confirm_confirm_wait" model="workflow.transition">
<field name="act_from" ref="act_confirm"/>
+ <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"/>
- <field name="signal">button_check</field>
- <field name="condition">not test_cancel()</field>
</record>
<record id="trans_confirm_wait_confirm_mto" model="workflow.transition">
<field name="act_from" ref="act_confirm_wait"/>
@@ -142,9 +163,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"/>
=== modified file 'purchase/purchase_workflow.xml'
--- purchase/purchase_workflow.xml 2012-12-05 15:08:44 +0000
+++ purchase/purchase_workflow.xml 2012-12-10 12:49:21 +0000
@@ -203,28 +203,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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
