Merge lp:~vauxoo/openerp-venezuela-localization/jose-fiscal-requirements into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

Status: Rejected
Rejected by: Gabriela Quilarque
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/jose-fiscal-requirements
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 154 lines (+81/-18)
2 files modified
l10n_ve_fiscal_requirements/installer.py (+5/-3)
l10n_ve_withholding_iva/demo/l10n_ve_withholding_iva_demo.xml (+76/-15)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/jose-fiscal-requirements
Reviewer Review Type Date Requested Status
Gabriela Quilarque Pending
Review via email: mp+80710@code.launchpad.net

Description of the change

Added invoice address in position one of partner company.

To post a comment you must log in.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ve_fiscal_requirements/installer.py'
2--- l10n_ve_fiscal_requirements/installer.py 2011-10-25 20:33:16 +0000
3+++ l10n_ve_fiscal_requirements/installer.py 2011-10-28 19:54:24 +0000
4@@ -48,13 +48,15 @@
5 '''
6 wiz_data = self.browse(cr, uid, ids[0])
7 partner = self.pool.get('res.users').browse(cr, uid, uid).company_id.partner_id
8+ address_obj = self.pool.get('res.partner.address')
9 #Data on res partner address - Invoice
10- address=self.pool.get('res.partner.address').create(cr, uid, {'partner_id':partner.id,
11+ address_ids = address_obj.search(cr,uid,[('partner_id','=',partner.id)])
12+ address=address_obj.write(cr, uid,address_ids, {'partner_id':partner.id,
13 'type':'invoice',
14 'street':wiz_data.add,
15- 'country':self.pool.get("res.country").search(cr,uid,[('code','=','VE')])[0]})
16+ 'country_id':self.pool.get("res.country").search(cr,uid,[('code','=','VE')])[0]})
17 #Data on res.partner
18- data = {'name': wiz_data.name, 'vat': "VE%s" % wiz_data.vat, 'vat_apply': wiz_data.vat_apply}
19+ data = {'name': wiz_data.name, 'vat': "VE%s" % wiz_data.vat, 'vat_apply': wiz_data.vat_apply,}
20 self.pool.get('res.partner').write(cr, uid, [partner.id], data)
21
22 _columns = {
23
24=== modified file 'l10n_ve_withholding_iva/demo/l10n_ve_withholding_iva_demo.xml'
25--- l10n_ve_withholding_iva/demo/l10n_ve_withholding_iva_demo.xml 2011-10-25 20:33:16 +0000
26+++ l10n_ve_withholding_iva/demo/l10n_ve_withholding_iva_demo.xml 2011-10-28 19:54:24 +0000
27@@ -2,6 +2,34 @@
28 <openerp>
29 <data noupdate='0'>
30
31+<!-- Minimal Account -->
32+
33+ <record id="a_iva" model="account.account">
34+ <field name="code">X2003</field>
35+ <field name="name">Otros gastos</field>
36+ <field ref="account.rev" name="parent_id"/>
37+ <field name="type">other</field>
38+ <field name="user_type" ref="account.account_type_income"/>
39+ </record>
40+
41+ <record id="iva_rec" model="account.account">
42+ <field name="code">X11007</field>
43+ <field name="name">Impuestos al valor agregado por Cobrar(IVA)</field>
44+ <field ref="account.cas" name="parent_id"/>
45+ <field name="type">other</field>
46+ <field name="user_type" ref="account.account_type_asset"/>
47+ </record>
48+
49+ <record id="iva_pay" model="account.account">
50+ <field name="code">X1115</field>
51+ <field name="name">Impuestos al valor agregado por Pagar(IVA)</field>
52+ <field ref="account.cli" name="parent_id"/>
53+ <field name="type">other</field>
54+ <field name="user_type" ref="account.account_type_liability"/>
55+ </record>
56+
57+ <!--Partner -->
58+
59 <record id="res_partner_address_0" model="res.partner.address">
60 <field eval="&quot;&quot;&quot;AV SAN JUAN NO TE IMPORTA CON 2DA TRANSVERSAL DEL CUCHILLITO EDF SAN JUAN PISO 10. CARACAS&quot;&quot;&quot;" name="street"/>
61 <field name="country_id" ref="base.ve"/>
62@@ -12,7 +40,6 @@
63 <field eval="&quot;&quot;&quot;elpapiruqui@cantv.net&quot;&quot;&quot;" name="email"/>
64 </record>
65
66-
67 <record id="res_partner_administradoramengimca0" model="res.partner">
68 <field eval="1" name="active"/>
69 <field eval="100.0" name="wh_iva_rate"/>
70@@ -21,22 +48,21 @@
71 <field eval="&quot;&quot;&quot;86&quot;&quot;&quot;" name="ref"/>
72 <field eval="1" name="supplier"/>
73 <field eval="&quot;&quot;&quot;VEJ147744443&quot;&quot;&quot;" name="vat"/>
74- <field eval="0" name="customer"/>
75+ <field eval="1" name="customer"/>
76 <field eval="&quot;&quot;&quot;WHATEVER YOU WANT, C.A.&quot;&quot;&quot;" name="name"/>
77 <field name="property_account_receivable" ref="account.a_recv"/>
78 <field name="property_account_payable" ref="account.a_pay"/>
79+ <field name="property_wh_iva_payable" ref="l10n_ve_withholding_iva.iva_pay"/>
80+ <field name="property_wh_iva_receivable" ref="l10n_ve_withholding_iva.iva_rec"/>
81 </record>
82
83- <!--
84- Invoices Suppliers
85- -->
86+ <!-- Invoices Suppliers -->
87
88 <record id="account_invoice_0" model="account.invoice">
89 <field eval="700000.0" name="check_total"/>
90 <field name="journal_id" ref="account.expenses_journal"/>
91 <field name="currency_id" ref="base.VEB"/>
92 <field name="address_invoice_id" ref="l10n_ve_withholding_iva.res_partner_address_0"/>
93- <field name="nro_ctrl">00-786347</field>
94 <field name="user_id" ref="base.user_admin"/>
95 <field name="reference">libre-0003873</field>
96 <field name="address_contact_id" ref="l10n_ve_withholding_iva.res_partner_address_0"/>
97@@ -47,13 +73,48 @@
98 <field name="partner_id" ref="l10n_ve_withholding_iva.res_partner_administradoramengimca0"/>
99 </record>
100
101-<!-- <record id="account_invoice_line_iva" model="account.invoice.line">-->
102-<!-- <field name="invoice_id" ref="account_invoice_0"/>-->
103-<!-- <field eval="3500.0" name="price_unit"/>-->
104-<!-- <field eval="2.0" name="quantity"/>-->
105-<!-- <field name="partner_id" ref="l10n_ve_withholding_iva.res_partner_administradoramengimca0"/>-->
106-<!-- <field name="company_id" ref="base.main_company"/>-->
107-<!-- <field name="name">What product you want</field>-->
108-<!-- </record>-->
109- </data>
110+ <record id="account_invoice_line_cpugenregularprocessorconfig0" model="account.invoice.line">
111+ <field name="uos_id" ref="product.product_uom_unit"/>
112+ <field name="account_id" ref="l10n_ve_withholding_iva.a_iva"/>
113+ <field name="invoice_id" ref="l10n_ve_withholding_iva.account_invoice_0"/>
114+ <field eval="200.0" name="price_unit"/>
115+ <field eval="200.6" name="price_subtotal"/>
116+ <field name="company_id" ref="base.main_company"/>
117+ <field name="product_id" ref="product.product_product_cpu_gen"/>
118+ <field eval="1.0" name="quantity"/>
119+ <field name="partner_id" ref="l10n_ve_withholding_iva.res_partner_administradoramengimca0"/>
120+ <field name="name">[CPU_GEN] Regular processor config</field>
121+ </record>
122+
123+ <!-- Invoices Customer -->
124+
125+ <record id="account_invoice_0" model="account.invoice">
126+ <field eval="700000.0" name="check_total"/>
127+ <field name="journal_id" ref="account.sales_journal"/>
128+ <field name="currency_id" ref="base.VEB"/>
129+ <field name="address_invoice_id" ref="l10n_ve_withholding_iva.res_partner_address_0"/>
130+ <field name="nro_ctrl">00-786347</field>
131+ <field name="user_id" ref="base.user_admin"/>
132+ <field name="address_contact_id" ref="l10n_ve_withholding_iva.res_partner_address_0"/>
133+ <field name="reference_type">none</field>
134+ <field name="state">draft</field>
135+ <field name="type">out_invoice</field>
136+ <field name="account_id" ref="account.a_recv"/>
137+ <field name="partner_id" ref="l10n_ve_withholding_iva.res_partner_administradoramengimca0"/>
138+ </record>
139+
140+ <record id="account_invoice_line_cpugenregularprocessorconfig0" model="account.invoice.line">
141+ <field name="uos_id" ref="product.product_uom_unit"/>
142+ <field name="account_id" ref="l10n_ve_withholding_iva.a_iva"/>
143+ <field name="invoice_id" ref="l10n_ve_withholding_iva.account_invoice_0"/>
144+ <field eval="200.0" name="price_unit"/>
145+ <field eval="200.6" name="price_subtotal"/>
146+ <field name="company_id" ref="base.main_company"/>
147+ <field name="product_id" ref="product.product_product_cpu_gen"/>
148+ <field eval="1.0" name="quantity"/>
149+ <field name="partner_id" ref="l10n_ve_withholding_iva.res_partner_administradoramengimca0"/>
150+ <field name="name">[CPU_GEN] Regular processor config</field>
151+ </record>
152+
153+ </data>
154 </openerp>