Merge lp:~therp-nl/ocb-addons/6.1-lp1244663_failing_test_purchase_double_validation into lp:ocb-addons/6.1

Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 6827
Proposed branch: lp:~therp-nl/ocb-addons/6.1-lp1244663_failing_test_purchase_double_validation
Merge into: lp:ocb-addons/6.1
Diff against target: 51 lines (+35/-1)
2 files modified
account_anglo_saxon/__openerp__.py (+1/-1)
account_anglo_saxon/account_anglo_saxon_demo.xml (+34/-0)
To merge this branch: bzr merge lp:~therp-nl/ocb-addons/6.1-lp1244663_failing_test_purchase_double_validation
Reviewer Review Type Date Requested Status
Joël Grand-Guillaume @ camptocamp code review, no tests Approve
Sandy Carter (http://www.savoirfairelinux.com) code review, no test Approve
Holger Brunn (Therp) code review Approve
Review via email: mp+192708@code.launchpad.net

Description of the change

Rev. 6800 of ocb-addons/6.1 adds a new check on missing stock input accounts, which raises in a test from the purchase_double_validation module. This change adds demo data to configure the products from this test correctly.

To post a comment you must log in.
Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve (code review)
Revision history for this message
Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter) wrote :

LGTM

review: Approve (code review, no test)
Revision history for this message
Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c) wrote :

LGTM

review: Approve (code review, no tests)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account_anglo_saxon/__openerp__.py'
--- account_anglo_saxon/__openerp__.py 2012-01-31 13:36:57 +0000
+++ account_anglo_saxon/__openerp__.py 2013-10-25 14:19:40 +0000
@@ -38,7 +38,7 @@
38 "depends": ["product", "purchase"],38 "depends": ["product", "purchase"],
39 "category": "Hidden/Dependency",39 "category": "Hidden/Dependency",
40 "init_xml": [],40 "init_xml": [],
41 "demo_xml": [],41 "demo_xml": ['account_anglo_saxon_demo.xml'],
42 "update_xml": ["product_view.xml",],42 "update_xml": ["product_view.xml",],
43 "auto_install": False,43 "auto_install": False,
44 "installable": True,44 "installable": True,
4545
=== added file 'account_anglo_saxon/account_anglo_saxon_demo.xml'
--- account_anglo_saxon/account_anglo_saxon_demo.xml 1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/account_anglo_saxon_demo.xml 2013-10-25 14:19:40 +0000
@@ -0,0 +1,34 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp>
3 <data>
4
5 <!--
6 Create a stock input account in the minimal
7 chart of accounts
8 -->
9
10 <record id="stk_in" model="account.account">
11 <field name="code">X12000</field>
12 <field name="name">Incoming Stocks - (test)</field>
13 <field ref="account.cas" name="parent_id"/>
14 <field name="type">other</field>
15 <field name="user_type" ref="account.data_account_type_asset"/>
16 </record>
17
18 <!--
19 Set the input account to these products, purchased in
20 the tests in purchase_double_validation
21 -->
22
23 <record id="product.product_product_pc4" model="product.product">
24 <field name="property_stock_account_input"
25 ref="stk_in" />
26 </record>
27
28 <record id="product.product_product_hdd2" model="product.product">
29 <field name="property_stock_account_input"
30 ref="stk_in" />
31 </record>
32
33 </data>
34</openerp>

Subscribers

People subscribed via source and target branches