[IMP] project_scrum: re-enable email send (they are not actually sent in test mode)

[odoo/odoo.git] / addons / purchase / purchase_workflow.xml

diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index ee6c36f..c978712 100644 (file)
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <record id="purchase_order" model="workflow">
             <field name="name">Purchase Order Basic Workflow</field>
             <field name="osv">purchase.order</field>
             <field name="on_create">True</field>
         </record>
-        
+
         <record id="act_draft" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="flow_start">True</field>
@@ -22,9 +22,9 @@
         <record id="act_cancel" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">cancel</field>
-            <field name="action">write({'state':'cancel'})</field>
-            <field name="kind">stopall</field>
+            <field name="kind">function</field>
             <field name="flow_stop">True</field>
+            <field name="action">write({'state':'cancel'})</field>
         </record>
         <record id="act_except_invoice" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
@@ -55,7 +55,7 @@
         <record id="act_invoice_done" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">invoice_done</field>
-            <field name="action">write({'invoiced':1})</field>
+            <field name="action">write({'state':'approved'})</field>
             <field name="kind">function</field>
         </record>
         <record id="act_invoice_end" model="workflow.activity">
@@ -72,7 +72,7 @@
         <record id="act_picking_done" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">picking_done</field>
-            <field name="action">write({'shipped':1})</field>
+            <field name="action">write({'shipped':1,'state':'approved'})</field>
             <field name="kind">function</field>
             <field name="signal_send">subflow.delivery_done</field>
         </record>
@@ -84,7 +84,7 @@
             <field name="flow_stop">True</field>
             <field name="join_mode">AND</field>
         </record>
-        
+
         <record id="trans_draft_confirmed" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_confirmed"/>
@@ -103,7 +103,7 @@
         <record id="trans_confirmed_router" model="workflow.transition">
             <field name="act_from" ref="act_confirmed"/>
             <field name="act_to" ref="act_router"/>
-            <field name="signal">purchase_approve</field>
+            <!-- <field name="signal">purchase_approve</field> removed from simplification/useability -->
         </record>
         <record id="trans_router_picking" model="workflow.transition">
             <field name="act_from" ref="act_router"/>
@@ -138,12 +138,12 @@
         <record id="trans_except_picking" model="workflow.transition">
             <field name="act_from" ref="act_except_picking"/>
             <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel</field>
+            <field name="signal">purchase_cancel</field>
         </record>
         <record id="trans_except_invoice" model="workflow.transition">
             <field name="act_from" ref="act_except_invoice"/>
             <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel</field>
+            <field name="signal">purchase_cancel</field>
         </record>
         <record id="trans_picking_except_picking" model="workflow.transition">
             <field name="act_from" ref="act_picking"/>
@@ -177,6 +177,33 @@
             <field name="act_from" ref="act_invoice_end"/>
             <field name="act_to" ref="act_done"/>
         </record>
+       
+       <!-- Procurement -->
+               <record id="act_buy" model="workflow.activity">
+            <field name="wkf_id" ref="procurement.wkf_procurement"/>
+            <field name="name">buy</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>
         
+        <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="signal">subflow.delivery_done</field>
+        </record>
+        
+        <record id="trans_buy_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_buy"/>
+            <field name="act_to" ref="procurement.act_cancel"/>
+            <field name="signal">subflow.cancel</field>
+        </record>
+
     </data>
 </openerp>