Merge lp:~vauxoo/openerp-venezuela-localization/7.0-wh_src-rev-kty into lp:openerp-venezuela-localization

Proposed by Katherine Zaoral (Vauxoo)
Status: Merged
Merged at revision: 968
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/7.0-wh_src-rev-kty
Merge into: lp:openerp-venezuela-localization
Diff against target: 42 lines (+3/-3)
2 files modified
l10n_ve_withholding_src/__openerp__.py (+1/-1)
l10n_ve_withholding_src/test/aws_supplier.yml (+2/-2)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/7.0-wh_src-rev-kty
Reviewer Review Type Date Requested Status
hbto [Vauxoo] http://www.vauxoo.com Approve
Review via email: mp+201838@code.launchpad.net

Description of the change

[MERGE] Change journal data to demo section and fix some small bugs in yaml test.

To post a comment you must log in.
Revision history for this message
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) wrote :

./openerp-server -r v7 -w v7 --addons-path=../addons/,../web/addons/,../lp/ovl,.. --xmlrpc-port=10000 -i ovl -d OVL02 --log-level=test --test-enable

Cuando corro las pruebas pasan

Saludos.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ve_withholding_src/__openerp__.py'
2--- l10n_ve_withholding_src/__openerp__.py 2013-12-16 16:49:31 +0000
3+++ l10n_ve_withholding_src/__openerp__.py 2014-01-15 19:45:58 +0000
4@@ -51,6 +51,7 @@
5 ],
6 "init_xml" : [],
7 "demo_xml" : [
8+ 'demo/demo_journals.xml',
9 'demo/demo_accounts.xml',
10 'demo/demo_company.xml',
11 ],
12@@ -67,7 +68,6 @@
13 'view/company_view.xml',
14 'view/partner_view.xml',
15 'workflow/l10n_ve_wh_src_wf.xml',
16- 'data/data.xml',
17 'report/wh_src_report.xml',
18
19 ],
20
21=== renamed file 'l10n_ve_withholding_src/data/data.xml' => 'l10n_ve_withholding_src/demo/demo_journals.xml'
22=== modified file 'l10n_ve_withholding_src/test/aws_supplier.yml'
23--- l10n_ve_withholding_src/test/aws_supplier.yml 2014-01-08 16:46:09 +0000
24+++ l10n_ve_withholding_src/test/aws_supplier.yml 2014-01-15 19:45:58 +0000
25@@ -14,7 +14,7 @@
26 company_id: base.main_company
27 currency_id: base.EUR
28 invoice_line:
29- - account_id: account.a_sale
30+ - account_id: account.a_recv
31 name: 'Test product description'
32 price_unit: 180.0
33 product_id: product.product_product_3
34@@ -51,7 +51,7 @@
35 account_id: account.a_pay
36 company_id: base.main_company
37 currency_id: base.EUR
38- journal_id: withholding_src_sale_journal
39+ journal_id: withholding_scr_purchase_journal
40 partner_id: l10n_ve_fiscal_requirements.f_req_partner_8
41 type: 'in_invoice'
42 number: '1112131415'