diff options
| author | Denis Ledoux <dle@openerp.com> | 2014-01-14 18:36:53 +0100 |
|---|---|---|
| committer | Denis Ledoux <dle@openerp.com> | 2014-01-14 18:36:53 +0100 |
| commit | 899166ecac2dd913c0e48d39d7bce5aa4b8a56ea (patch) | |
| tree | 60321484a306512e1e18f98d238b60fe5636d8b2 /addons/purchase/purchase_workflow.xml | |
| parent | 14783179868cd90288e1509df70dc7f4a8464708 (diff) | |
| parent | 8a729c10faa83c9d3e17060e92ef5efd8e9b8773 (diff) | |
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9761 revid:dle@openerp.com-20140114164804-zhfy9lb308554kp1
bzr revid: dle@openerp.com-20140114173653-xhh85ubx27uu1306
Diffstat (limited to 'addons/purchase/purchase_workflow.xml')
| -rw-r--r-- | addons/purchase/purchase_workflow.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml index 68a6cd12733..ec4632c45a9 100644 --- a/addons/purchase/purchase_workflow.xml +++ b/addons/purchase/purchase_workflow.xml @@ -147,7 +147,7 @@ <record id="trans_router_invoice_no_order" model="workflow.transition"> <field name="act_from" ref="act_router"/> <field name="act_to" ref="act_invoice_end"/> - <field name="condition">invoice_method<>'order' and invoiced</field> + <field name="condition">invoice_method<>'order'</field> </record> <record id="trans_except_picking_picking_done" model="workflow.transition"> <field name="act_from" ref="act_except_picking"/> @@ -200,6 +200,7 @@ <record id="trans_invoice_end_done" model="workflow.transition"> <field name="act_from" ref="act_invoice_end"/> <field name="act_to" ref="act_done"/> + <field name="condition">invoiced</field> </record> <!-- Procurement --> |