Merge lp:~openerp-dev/openobject-addons/6.1-opw-586838-acl into lp:openobject-addons/6.1

[Anaël Closson (openerp)]

  Steps to reproduce:
   - create a purchase order
   - cancel the created invoice
   - receive products (PO state changed to approved even if still in invoice exception)
   - reset the invoice to draft => pay it

  The purchase order still is in approved state even if all subprocesses are done.

  You need to edit the view and modify the "manually corrected" button visibility to change the PO state to done.

[lp:~openerp-dev/openobject-addons/6.1-opw-586838-acl]

7180. By Anaël Closson (openerp) on 2013-03-14

[FIX] OPW 586838 sale order shipping exception overwriting invoice_exception and then sale order cannot reach done state
Steps to reproduce :
* Create a new sale order
* Create the associated invoice
* Cancel the invoice, reset to draft
* Cancel the picking

The sale order is now in picking exception which can be manually corrected, but this change the state to 'in progress' instead of 'invoice_except'.
The patch avoids shipping exception to erase invoice_exception state.
The opposite doesn't harm, as the scheduler will notice the shipping exception.

Unmerged revisions

7180. By Anaël Closson (openerp) on 2013-03-14

[FIX] OPW 586838 sale order shipping exception overwriting invoice_exception and then sale order cannot reach done state
Steps to reproduce :
* Create a new sale order
* Create the associated invoice
* Cancel the invoice, reset to draft
* Cancel the picking

The sale order is now in picking exception which can be manually corrected, but this change the state to 'in progress' instead of 'invoice_except'.
The patch avoids shipping exception to erase invoice_exception state.
The opposite doesn't harm, as the scheduler will notice the shipping exception.

7179. By Anaël Closson (openerp) on 2013-03-14

[FIX] OPW 586838 purchase orders cannot switch to state 'done' when invoice cancelled once

Steps to reproduce:
 - create a purchase order
 - cancel the created invoice
 - receive products (PO state changed to approved even if still in invoice exception)
 - reset the invoice to draft => pay it

The purchase order still is in approved state even if all subprocesses are done.

You need to edit the view and modify the "manually corrected" button visibility to change the PO state to done.

=== modified file 'purchase/purchase_workflow.xml'
--- purchase/purchase_workflow.xml	2011-11-09 11:49:08 +0000
+++ purchase/purchase_workflow.xml	2013-03-14 15:19:25 +0000
@@ -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({'state':'approved'})</field>
+            <field name="action">(state != 'except_shipping') and 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,'state':'approved'})</field>
+            <field name="action">write({'shipped':1}) and (state != 'except_invoice') and write({'state':'approved'})</field>
             <field name="kind">function</field>
             <field name="signal_send">subflow.delivery_done</field>
         </record>
 
=== modified file 'sale/sale_workflow.xml'
--- sale/sale_workflow.xml	2011-12-19 16:54:40 +0000
+++ sale/sale_workflow.xml	2013-03-14 15:19:25 +0000
@@ -94,7 +94,7 @@
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">ship_except</field>
             <field name="kind">function</field>
-            <field name="action">write({'state':'shipping_except'})</field>
+            <field name="action">(state != 'invoice_except') and write({'state':'shipping_except'})</field>
         </record>
         <record id="act_ship_end" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>