Split confirmed state into confirmed and processing

issue3874
review7261002

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

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
 

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