Merge lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_facturae_cbb_cfdi_test_data_demo_dev_jorge into lp:openerp-mexico-localization/7.0

Status: Merged
Merged at revision: 290
Proposed branch: lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_facturae_cbb_cfdi_test_data_demo_dev_jorge
Merge into: lp:openerp-mexico-localization/7.0
Diff against target: 209 lines (+77/-52)
9 files modified
l10n_mx_facturae/__openerp__.py (+1/-0)
l10n_mx_facturae/demo/account_invoice_cfd_demo.xml (+24/-0)
l10n_mx_facturae/test/account_invoice_cfd.yml (+0/-17)
l10n_mx_facturae_cbb/__openerp__.py (+3/-1)
l10n_mx_facturae_cbb/demo/account_invoice_cbb_demo.xml (+24/-0)
l10n_mx_facturae_cbb/test/account_invoice_cbb.yml (+0/-17)
l10n_mx_facturae_pac_sf/__openerp__.py (+1/-0)
l10n_mx_facturae_pac_sf/demo/account_invoice_cfdi_pac_sf_demo.xml (+24/-0)
l10n_mx_facturae_pac_sf/test/account_invoice_cfdi_pac_sf.yml (+0/-17)
To merge this branch: bzr merge lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_facturae_cbb_cfdi_test_data_demo_dev_jorge
Reviewer Review Type Date Requested Status
Moisés López - http://www.vauxoo.com Approve
Jorge Angel Naranjo Rogel - http://www.vauxoo.com Needs Resubmitting
Rodolfo Lopez Pending
Isaac López Zúñiga Pending
Review via email: mp+184800@code.launchpad.net

Description of the change

Se separan la creacion de las facturas de los test/test.yml para agregarse a demo y estas facturas estén en estado borrador.

To post a comment you must log in.
Revision history for this message
Moisés López - http://www.vauxoo.com (moylop260) wrote :

En el archivo demo.yml usa el sufijo "demo"
(como el xml) en el nombre del archivo.

288. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com

[IMP][l10n_mx_facturae] Changed name of file demo to account_invoice_cfd_demo.yml
[IMP][l10n_mx_facturae_cbb] Changed name of file demo to account_invoice_cbb_demo.yml
[IMP][l10n_mx_facturae_pac_sf] Changed name of file demo to account_invoice_cfdi_pac_sf_demo.yml

289. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com

[FIX][l10n_mx_facturae] Changed files .yml to .xml in data demo
[FIX][l10n_mx_facturae_cbb] Changed files .yml to .xml in data demo
[FIX][l10n_mx_facturae_pac_sf] Changed files .yml to .xml in data demo

290. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com

[FIX][l10n_mx_facturae] Fixed account.invoice.line
[FIX][l10n_mx_facturae_cbb] Fixed account.invoice.line
[FIX][l10n_mx_facturae_pac_sf] Fixed account.invoice.line

Revision history for this message
Jorge Angel Naranjo Rogel - http://www.vauxoo.com (jorge-nr) wrote :

Quedan los archivos de demo en .xml

review: Needs Resubmitting
Revision history for this message
Moisés López - http://www.vauxoo.com (moylop260) wrote :

Lo puedes mergear, por favor.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_mx_facturae/__openerp__.py'
2--- l10n_mx_facturae/__openerp__.py 2013-08-04 17:50:31 +0000
3+++ l10n_mx_facturae/__openerp__.py 2013-09-11 15:06:23 +0000
4@@ -66,6 +66,7 @@
5 ],
6 "demo" : [
7 "demo/l10n_mx_facturae_seq_demo.xml",
8+ "demo/account_invoice_cfd_demo.xml",
9 ],
10 "data" : [
11 #'security/l10n_mx_facturae_security.xml',
12
13=== added file 'l10n_mx_facturae/demo/account_invoice_cfd_demo.xml'
14--- l10n_mx_facturae/demo/account_invoice_cfd_demo.xml 1970-01-01 00:00:00 +0000
15+++ l10n_mx_facturae/demo/account_invoice_cfd_demo.xml 2013-09-11 15:06:23 +0000
16@@ -0,0 +1,24 @@
17+<?xml version="1.0" encoding="utf-8"?>
18+<openerp>
19+ <data noupdate="1">
20+ <!-- Invoices -->
21+ <record id="account_invoice_cfd0" model="account.invoice">
22+ <field name="payment_term" ref="account.account_payment_term"/>
23+ <field name="currency_id" ref="base.EUR"/>
24+ <field name="account_id" ref="account.a_recv"/>
25+ <field name="company_id" ref="base.main_company"/>
26+ <field name="partner_id" ref="l10n_mx_partner_address.res_partner_address_vauxoo_1"/>
27+ <field name="journal_id" ref="l10n_mx_facturae.l10n_mx_cfd_journal_0"/>
28+ <field name="state">draft</field>
29+ <field name="type">out_invoice</field>
30+ </record>
31+ <record id="account_invoice_cfd0_line" model="account.invoice.line">
32+ <field name="name">PC Assemble + Custom RAM (PC on Demand)</field>
33+ <field name="product_id" ref="product.product_product_5"/>
34+ <field name="price_unit" eval="900.0" />
35+ <field name="uos_id" ref="product.product_uom_unit"/>
36+ <field name="invoice_id" ref="account_invoice_cfd0"/>
37+ <field name="quantity">22</field>
38+ </record>
39+ </data>
40+</openerp>
41
42=== modified file 'l10n_mx_facturae/test/account_invoice_cfd.yml'
43--- l10n_mx_facturae/test/account_invoice_cfd.yml 2013-08-25 10:05:16 +0000
44+++ l10n_mx_facturae/test/account_invoice_cfd.yml 2013-09-11 15:06:23 +0000
45@@ -1,23 +1,6 @@
46 -
47 To test the Mexican Electronic Invoice CFD
48 -
49- I create a cfd customer invoice
50--
51- !record {model: account.invoice, id: account_invoice_cfd0, view: account.invoice_form}:
52- payment_term: account.account_payment_term_advance
53- journal_id: l10n_mx_cfd_journal_0
54- partner_id: l10n_mx_partner_address.res_partner_address_vauxoo_1
55- reference_type: none
56- name: 'Test cfd Customer Invoice'
57- invoice_line:
58- - product_id: product.product_product_5
59- quantity: 22.0
60--
61- I rewrite the journal field (BUG I need overwrite two times this field for done! only in test yaml)
62--
63- !record {model: account.invoice, id: account_invoice_cfd0, view: account.invoice_form}:
64- journal_id: l10n_mx_cfd_journal_0
65--
66 I check that Journal is cfd
67 -
68 !assert {model: account.invoice, id: account_invoice_cfd0}:
69
70=== modified file 'l10n_mx_facturae_cbb/__openerp__.py'
71--- l10n_mx_facturae_cbb/__openerp__.py 2013-08-04 19:58:10 +0000
72+++ l10n_mx_facturae_cbb/__openerp__.py 2013-09-11 15:06:23 +0000
73@@ -50,7 +50,9 @@
74 "l10n_mx_facturae_report",
75 "l10n_mx_company_multi_address",
76 ],
77- "demo" : ["demo/l10n_mx_facturae_seq_demo.xml",],
78+ "demo" : ["demo/l10n_mx_facturae_seq_demo.xml",
79+ "demo/account_invoice_cbb_demo.xml",
80+ ],
81 "data" : [
82 #'security/l10n_mx_facturae_cbb_security.xml',
83 'ir_sequence_view_v6.xml',
84
85=== added file 'l10n_mx_facturae_cbb/demo/account_invoice_cbb_demo.xml'
86--- l10n_mx_facturae_cbb/demo/account_invoice_cbb_demo.xml 1970-01-01 00:00:00 +0000
87+++ l10n_mx_facturae_cbb/demo/account_invoice_cbb_demo.xml 2013-09-11 15:06:23 +0000
88@@ -0,0 +1,24 @@
89+<?xml version="1.0" encoding="utf-8"?>
90+<openerp>
91+ <data noupdate="1">
92+ <!-- Invoices -->
93+ <record id="account_invoice_cbb0" model="account.invoice">
94+ <field name="payment_term" ref="account.account_payment_term"/>
95+ <field name="currency_id" ref="base.EUR"/>
96+ <field name="account_id" ref="account.a_recv"/>
97+ <field name="company_id" ref="base.main_company"/>
98+ <field name="partner_id" ref="l10n_mx_partner_address.res_partner_address_vauxoo_1"/>
99+ <field name="journal_id" ref="l10n_mx_facturae_cbb.l10n_mx_cbb_journal_0"/>
100+ <field name="state">draft</field>
101+ <field name="type">out_invoice</field>
102+ </record>
103+ <record id="account_invoice_cbb0_line" model="account.invoice.line">
104+ <field name="name">PC Assemble + Custom RAM (PC on Demand)</field>
105+ <field name="product_id" ref="product.product_product_5"/>
106+ <field name="price_unit" eval="900.0" />
107+ <field name="uos_id" ref="product.product_uom_unit"/>
108+ <field name="invoice_id" ref="account_invoice_cbb0"/>
109+ <field name="quantity">10</field>
110+ </record>
111+ </data>
112+</openerp>
113
114=== modified file 'l10n_mx_facturae_cbb/test/account_invoice_cbb.yml'
115--- l10n_mx_facturae_cbb/test/account_invoice_cbb.yml 2013-08-25 10:05:16 +0000
116+++ l10n_mx_facturae_cbb/test/account_invoice_cbb.yml 2013-09-11 15:06:23 +0000
117@@ -1,23 +1,6 @@
118 -
119 To test the Mexican Electronic Invoice cbb
120 -
121- I create a cbb customer invoice
122--
123- !record {model: account.invoice, id: account_invoice_cbb0, view: account.invoice_form}:
124- payment_term: account.account_payment_term_advance
125- journal_id: l10n_mx_cbb_journal_0
126- partner_id: l10n_mx_partner_address.res_partner_address_vauxoo_1
127- reference_type: none
128- name: 'Test cbb Customer Invoice'
129- invoice_line:
130- - product_id: product.product_product_5
131- quantity: 10.0
132--
133- I rewrite the journal field (BUG I need overwrite two times this field for done! only in test yaml)
134--
135- !record {model: account.invoice, id: account_invoice_cbb0, view: account.invoice_form}:
136- journal_id: l10n_mx_cbb_journal_0
137--
138 I check that Journal is cbb
139 -
140 !assert {model: account.invoice, id: account_invoice_cbb0}:
141
142=== modified file 'l10n_mx_facturae_pac_sf/__openerp__.py'
143--- l10n_mx_facturae_pac_sf/__openerp__.py 2013-08-16 18:47:52 +0000
144+++ l10n_mx_facturae_pac_sf/__openerp__.py 2013-09-11 15:06:23 +0000
145@@ -47,6 +47,7 @@
146 "demo" : [
147 "demo/l10n_mx_facturae_pac_sf_demo.xml",
148 "demo/l10n_mx_facturae_seq_demo.xml",
149+ "demo/account_invoice_cfdi_pac_sf_demo.xml",
150 ],
151 "data" : [
152 #"security/l10n_mx_facturae_pac_sf_security.xml",
153
154=== added file 'l10n_mx_facturae_pac_sf/demo/account_invoice_cfdi_pac_sf_demo.xml'
155--- l10n_mx_facturae_pac_sf/demo/account_invoice_cfdi_pac_sf_demo.xml 1970-01-01 00:00:00 +0000
156+++ l10n_mx_facturae_pac_sf/demo/account_invoice_cfdi_pac_sf_demo.xml 2013-09-11 15:06:23 +0000
157@@ -0,0 +1,24 @@
158+<?xml version="1.0" encoding="utf-8"?>
159+<openerp>
160+ <data noupdate="1">
161+ <!-- Invoices -->
162+ <record id="account_invoice_cfdi_pac_sf0" model="account.invoice">
163+ <field name="payment_term" ref="account.account_payment_term"/>
164+ <field name="currency_id" ref="base.EUR"/>
165+ <field name="account_id" ref="account.a_recv"/>
166+ <field name="company_id" ref="base.main_company"/>
167+ <field name="partner_id" ref="l10n_mx_partner_address.res_partner_address_vauxoo_1"/>
168+ <field name="journal_id" ref="l10n_mx_facturae_pac_sf.l10n_mx_cfdi_pac_sf_journal_0"/>
169+ <field name="state">draft</field>
170+ <field name="type">out_invoice</field>
171+ </record>
172+ <record id="account_invoice_cfdi_pac_sf0_line" model="account.invoice.line">
173+ <field name="name">PC Assemble + Custom RAM (PC on Demand)</field>
174+ <field name="product_id" ref="product.product_product_5"/>
175+ <field name="price_unit" eval="900.0" />
176+ <field name="uos_id" ref="product.product_uom_unit"/>
177+ <field name="invoice_id" ref="account_invoice_cfdi_pac_sf0"/>
178+ <field name="quantity">32</field>
179+ </record>
180+ </data>
181+</openerp>
182
183=== modified file 'l10n_mx_facturae_pac_sf/test/account_invoice_cfdi_pac_sf.yml'
184--- l10n_mx_facturae_pac_sf/test/account_invoice_cfdi_pac_sf.yml 2013-08-25 10:05:16 +0000
185+++ l10n_mx_facturae_pac_sf/test/account_invoice_cfdi_pac_sf.yml 2013-09-11 15:06:23 +0000
186@@ -1,23 +1,6 @@
187 -
188 To test the Mexican Electronic Invoice CFDI PAC SF
189 -
190- I create a cfdi_pac_sf customer invoice
191--
192- !record {model: account.invoice, id: account_invoice_cfdi_pac_sf0, view: account.invoice_form}:
193- payment_term: account.account_payment_term_advance
194- journal_id: l10n_mx_cfdi_pac_sf_journal_0
195- partner_id: l10n_mx_partner_address.res_partner_address_vauxoo_1
196- reference_type: none
197- name: 'Test cfdi_pac_sf Customer Invoice'
198- invoice_line:
199- - product_id: product.product_product_5
200- quantity: 32.0
201--
202- I rewrite the journal field (BUG I need overwrite two times this field for done! only in test yaml)
203--
204- !record {model: account.invoice, id: account_invoice_cfdi_pac_sf0, view: account.invoice_form}:
205- journal_id: l10n_mx_cfdi_pac_sf_journal_0
206--
207 I check that Journal is cfdi_pac_sf
208 -
209 !assert {model: account.invoice, id: account_invoice_cfdi_pac_sf0}: