From 9a8d8ef7caae2bb2013538e05770f2a6433360e1 Mon Sep 17 00:00:00 2001
From: gpa <gpa@tinyerp.com>
Date: Tue, 11 May 2010 13:58:56 +0530
Subject: [PATCH] [MERGE] merge donkirkby's patch to re-enable purchase module
 smoke test

bzr revid: gpa@tinyerp.com-20100511082856-fa5dgasx3xou1lg6
---
 addons/purchase/__openerp__.py         | 2 +-
 addons/purchase/purchase_unit_test.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 6687b330b2c..af16b3776ca 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -50,7 +50,7 @@
         'process/purchase_process.xml',
         'report/purchase_report_view.xml',
     ],
-    'demo_xml': ['purchase_demo.xml'],
+    'demo_xml': ['purchase_demo.xml','purchase_unit_test.xml'],
     'installable': True,
     'active': False,
     'certificate': '0057234283549',
diff --git a/addons/purchase/purchase_unit_test.xml b/addons/purchase/purchase_unit_test.xml
index 890062a66b9..00678589999 100644
--- a/addons/purchase/purchase_unit_test.xml
+++ b/addons/purchase/purchase_unit_test.xml
@@ -8,7 +8,7 @@
             <field name="pricelist_id" ref="list0"/>
             <field name="partner_id" search="[]" model="res.partner"/>
             <field name="partner_address_id" search="[]" model="res.partner.address"/>
-            <field name="location_id" search="[]" model="stock.location"/>
+            <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record model="purchase.order.line" id="test_purchase_1_line_1">
             <field name="order_id" ref="test_purchase_1"/>
@@ -63,10 +63,10 @@
         <function model="account.invoice" name="pay_and_reconcile">
             <value model="purchase.order" eval="[obj(ref('test_purchase_1')).invoice_id.id]" />
             <value eval="1164" />
-            <value search="[('type', '=', 'cash')]" model="account.account"/>
+            <value eval="ref('account.cash')"/>
             <value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
             <value eval="ref('account.bank_journal')" />
-            <value search="[('type', '=', 'cash')]" model="account.account"/>
+            <value eval="ref('account.cash')"/>
             <value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
             <value eval="ref('account.bank_journal')" />
         </function>