From 34b59d6b3f4be02eda98c91b7bc13849b3d9f2df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20=C3=89vrard?= <nicoe@b2ck.com>
Date: Wed, 2 Jul 2014 19:04:59 +0200
Subject: [PATCH] Split confirmed state into confirmed and processing

issue3874
review7261002
---
 purchase.py                    | 10 +---------
 sale.py                        |  2 +-
 tests/scenario_sale_supply.rst |  7 ++++---
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/purchase.py b/purchase.py
index 11f1a121ec..63e13e13ac 100644
--- a/purchase.py
+++ b/purchase.py
@@ -80,17 +80,9 @@ class Purchase:
 
     @classmethod
     @ModelView.button
-    @Workflow.transition('confirmed')
-    def confirm(cls, purchases):
-        super(Purchase, cls).confirm(purchases)
-        cls._sale_supply_process(purchases)
-
-    @classmethod
     def process(cls, purchases):
         super(Purchase, cls).process(purchases)
-        # If not yet confirmed, it will be processed by confirm
-        if any(p.state == 'confirmed' for p in purchases):
-            cls._sale_supply_process(purchases)
+        cls._sale_supply_process(purchases)
 
     @classmethod
     @ModelView.button
diff --git a/sale.py b/sale.py
index a74f744414..99b71824bf 100644
--- a/sale.py
+++ b/sale.py
@@ -65,7 +65,7 @@ class SaleLine:
                         purchase = purchase_line.purchase
                         if purchase.state == 'cancel':
                             states[line.id] = 'cancel'
-                        elif purchase.state in ('confirmed', 'done'):
+                        elif purchase.state in ('processing', 'done'):
                             states[line.id] = 'purchased'
         return states
 
diff --git a/tests/scenario_sale_supply.rst b/tests/scenario_sale_supply.rst
index 7749d055ed..1f613522c3 100644
--- a/tests/scenario_sale_supply.rst
+++ b/tests/scenario_sale_supply.rst
@@ -244,10 +244,11 @@ Create Purchase from Request::
     >>> create_purchase.form.payment_term = payment_term
     >>> create_purchase.execute('start')
     >>> purchase, = Purchase.find()
-    >>> Purchase.quote([purchase.id], config.context)
-    >>> Purchase.confirm([purchase.id], config.context)
+    >>> purchase.click('quote')
+    >>> purchase.click('confirm')
+    >>> purchase.click('process')
     >>> purchase.state
-    u'confirmed'
+    u'processing'
     >>> config.user = sale_user.id
     >>> sale.reload()
     >>> shipment, = sale.shipments