From afafa2df7b25ee9977f77e42f4b3f888c7b6eac0 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 11 Oct 2010 15:15:20 +0530
Subject: [PATCH] [FIX] purchase: Fixed yaml issues due to workflow changes.

bzr revid: uco@tinyerp.com-20101011094520-2z1fjpu315t82dam
---
 addons/purchase/purchase_unit_test.xml         | 6 ------
 addons/purchase/test/procurement_buy.yml       | 1 -
 addons/purchase/test/purchase_from_manual.yml  | 6 +-----
 addons/purchase/test/purchase_from_order.yml   | 6 +-----
 addons/purchase/test/purchase_from_picking.yml | 6 +-----
 5 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/addons/purchase/purchase_unit_test.xml b/addons/purchase/purchase_unit_test.xml
index 0c6de9312c2..93c0e42fae2 100644
--- a/addons/purchase/purchase_unit_test.xml
+++ b/addons/purchase/purchase_unit_test.xml
@@ -35,12 +35,6 @@
 
         <workflow model="purchase.order" ref="test_purchase_1" action="purchase_confirm" />
 
-        <assert model="purchase.order" id="test_purchase_1" string="Test purchase is now confirmed">
-            <test expr="state">confirmed</test>
-        </assert>
-
-        <workflow model="purchase.order" ref="test_purchase_1" action="purchase_approve" uid="base.user_root" />
-
         <assert model="purchase.order" id="test_purchase_1" string="Test purchase is now in progress">
             <test expr="state">approved</test>
         </assert>
diff --git a/addons/purchase/test/procurement_buy.yml b/addons/purchase/test/procurement_buy.yml
index 4f28ccfafcf..2afd6c2fb62 100644
--- a/addons/purchase/test/procurement_buy.yml
+++ b/addons/purchase/test/procurement_buy.yml
@@ -76,7 +76,6 @@
     import netsvc
     wf_service = netsvc.LocalService("workflow")
     wf_service.trg_validate(uid, 'purchase.order',proc_ids.purchase_id.id,'purchase_confirm', cr)  
-    wf_service.trg_validate(uid, 'purchase.order',proc_ids.purchase_id.id,'purchase_approve', cr)  
 -   
   I receive the order of the supplier ASUStek from the Incoming Shipments menu.
 -   
diff --git a/addons/purchase/test/purchase_from_manual.yml b/addons/purchase/test/purchase_from_manual.yml
index e7a608b7557..0c406635b85 100644
--- a/addons/purchase/test/purchase_from_manual.yml
+++ b/addons/purchase/test/purchase_from_manual.yml
@@ -56,7 +56,7 @@
   I check that the order which was initially in the draft state has transit to confirm state.
 -
   !assert {model: purchase.order, id: purchase_order_po1}:
-    - state == 'confirmed'  
+    - state == 'approved'  
 -
   I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line
 -
@@ -101,10 +101,6 @@
     account_obj = self.pool.get('account.invoice')
     ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
     assert ids, _('Pending Invoice is not created!')
--
-  Supplier approve the purchase order.
--
-  !workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po1}
 -
   I check that the order which was initially in the confirmed state has transit to approved state.
 -
diff --git a/addons/purchase/test/purchase_from_order.yml b/addons/purchase/test/purchase_from_order.yml
index a13c687c4a5..8c14611661c 100644
--- a/addons/purchase/test/purchase_from_order.yml
+++ b/addons/purchase/test/purchase_from_order.yml
@@ -56,7 +56,7 @@
   I check that the order which was initially in the draft state has transit to confirm state.
 -
   !assert {model: purchase.order, id: purchase_order_po0}:
-    - state == 'confirmed'  
+    - state == 'approved'  
 -
   I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line.
 -
@@ -101,10 +101,6 @@
     account_obj = self.pool.get('account.invoice')
     ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
     assert ids, _('Pending Invoice is not created!')
--
-  Supplier approve the purchase order.
--
-  !workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po0}
 -
   I check that the order which was initially in the confirmed state has transit to approved state.
 -
diff --git a/addons/purchase/test/purchase_from_picking.yml b/addons/purchase/test/purchase_from_picking.yml
index 6250772a872..d0c1cbcb527 100644
--- a/addons/purchase/test/purchase_from_picking.yml
+++ b/addons/purchase/test/purchase_from_picking.yml
@@ -56,7 +56,7 @@
  I check that the order which was initially in the draft state has transit to confirm state.
 -
   !assert {model: purchase.order, id: purchase_order_po2}:
-    - state == 'confirmed'  
+    - state == 'approved'  
 -
   I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line.
 -
@@ -101,10 +101,6 @@
     account_obj = self.pool.get('account.invoice')
     ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
     assert ids, _('Pending Invoice is not created!')
--
-  Supplier approve the purchase order.
--
-  !workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po2}
 -
  I check that the order which was initially in the confirmed state has transit to approved state.
 -