[MERGE] merge donkirkby's patch to re-enable purchase module smoke test

bzr revid: gpa@tinyerp.com-20100511082856-fa5dgasx3xou1lg6
This commit is contained in:
gpa
2010-05-11 13:58:56 +05:30
parent 13c8ba09ce
commit 9a8d8ef7ca
2 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -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',
+3 -3
View File
@@ -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>