Openerp Venezuela

Merge lp:~vauxoo/openerp-venezuela-localization/gaby-create-workflow-withholding-model into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

  1. gaby-create-workflow-withholding-model
  2. Merge into 6.0-trunk
Proposed by Gabriela Quilarque
Status: Merged
Merged at revision: 389
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/gaby-create-workflow-withholding-model
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 230 lines (+126/-47)
3 files modified
l10n_ve_islr_withholding/__openerp__.py (+1/-1)
l10n_ve_islr_withholding/demo/l10n_ve_islr_withholding_demo.xml (+119/-42)
l10n_ve_islr_withholding/invoice.py (+6/-4)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/gaby-create-workflow-withholding-model
Reviewer Review Type Date Requested Status
Gabriela Quilarque Pending
Review via email: mp+77705@code.launchpad.net

Description of the change

[IMP] Modified orden in the __openerp__.py
[ADD] Added data demo for invoice.

To post a comment you must log in.
lp:~vauxoo/openerp-venezuela-localization/gaby-create-workflow-withholding-model updated
389. By Gabriela Quilarque

[MERGE] Merge work to Gabys.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ve_islr_withholding/__openerp__.py'
2--- l10n_ve_islr_withholding/__openerp__.py 2011-09-29 20:59:27 +0000
3+++ l10n_ve_islr_withholding/__openerp__.py 2011-09-30 13:50:05 +0000
4@@ -58,6 +58,7 @@
5 "update_xml" : [
6 "security/wh_islr_security.xml",
7 "security/ir.model.access.csv",
8+ "demo/l10n_ve_islr_withholding_demo.xml",
9 "data/l10n_ve_islr_withholding_data.xml",
10 "data/islr_concept_data.xml",
11 "retencion_islr_sequence.xml",
12@@ -72,7 +73,6 @@
13 "islr_xml_wh_report.xml",
14 "islr_wh_report.xml",
15 "islr_xml_wh.xml",
16- "demo/l10n_ve_islr_withholding_demo.xml"
17 ],
18 "active": False,
19 "installable": True
20
21=== modified file 'l10n_ve_islr_withholding/demo/l10n_ve_islr_withholding_demo.xml'
22--- l10n_ve_islr_withholding/demo/l10n_ve_islr_withholding_demo.xml 2011-09-29 20:50:21 +0000
23+++ l10n_ve_islr_withholding/demo/l10n_ve_islr_withholding_demo.xml 2011-09-30 13:50:05 +0000
24@@ -219,54 +219,131 @@
25 <field eval="&quot;&quot;&quot;PERCHO, C.A.&quot;&quot;&quot;" name="name"/>
26 </record>
27
28- <record id="res_partner_2" model="res.partner">
29- <field eval="0" name="islr_withholding_agent"/>
30- <field eval="1" name="active"/>
31+ <record id="res_partner_2" model="res.partner">
32+ <field eval="0" name="islr_withholding_agent"/>
33+ <field eval="1" name="active"/>
34 <field name="address" eval="[(4, ref('res_partner_address_5'))]"/>
35- <field eval="&quot;&quot;&quot;256&quot;&quot;&quot;" name="ref"/>
36- <field eval="1" name="customer"/>
37- <field eval="&quot;&quot;&quot;VEV029785053&quot;&quot;&quot;" name="vat"/>
38- <field eval="0" name="supplier"/>
39- <field eval="&quot;&quot;&quot;MIGUEL P PEREZ L.&quot;&quot;&quot;" name="name"/>
40- </record>
41+ <field eval="&quot;&quot;&quot;256&quot;&quot;&quot;" name="ref"/>
42+ <field eval="1" name="customer"/>
43+ <field eval="&quot;&quot;&quot;VEV029785053&quot;&quot;&quot;" name="vat"/>
44+ <field eval="0" name="supplier"/>
45+ <field eval="&quot;&quot;&quot;MIGUEL P PEREZ L.&quot;&quot;&quot;" name="name"/>
46+ </record>
47
48- <record id="res_partner_3" model="res.partner">
49- <field eval="0" name="islr_withholding_agent"/>
50- <field eval="1" name="active"/>
51+ <record id="res_partner_3" model="res.partner">
52+ <field eval="0" name="islr_withholding_agent"/>
53+ <field eval="1" name="active"/>
54 <field name="address" eval="[(4, ref('res_partner_address_6'))]"/>
55 <field eval="&quot;&quot;&quot;J000004500&quot;&quot;&quot;" name="ref"/>
56- <field eval="1" name="customer"/>
57- <field eval="&quot;&quot;&quot;VEJ124804443&quot;&quot;&quot;" name="vat"/>
58- <field eval="1" name="supplier"/>
59- <field eval="&quot;&quot;&quot;JAVIER Hernandez&quot;&quot;&quot;" name="name"/>
60- <field eval="1" name="islr_withholding_agent"/>
61- </record>
62+ <field eval="1" name="customer"/>
63+ <field eval="&quot;&quot;&quot;VEJ124804443&quot;&quot;&quot;" name="vat"/>
64+ <field eval="1" name="supplier"/>
65+ <field eval="&quot;&quot;&quot;JAVIER Hernandez&quot;&quot;&quot;" name="name"/>
66+ <field eval="1" name="islr_withholding_agent"/>
67+ </record>
68
69- <record id="res_partner_4" model="res.partner">
70- <field eval="0" name="islr_withholding_agent"/>
71- <field eval="1" name="active"/>
72+ <record id="res_partner_4" model="res.partner">
73+ <field eval="0" name="islr_withholding_agent"/>
74+ <field eval="1" name="active"/>
75 <field name="address" eval="[(4, ref('res_partner_address_7'))]"/>
76- <field eval="&quot;&quot;&quot;J000004960&quot;&quot;&quot;" name="ref"/>
77- <field eval="1" name="customer"/>
78- <field eval="&quot;&quot;&quot;VEV056024160&quot;&quot;&quot;" name="vat"/>
79- <field eval="0" name="supplier"/>
80- <field eval="&quot;&quot;&quot;MIRANDA Miranda, C.A.&quot;&quot;&quot;" name="name"/>
81- </record>
82-
83- <!-- Basic Company -->
84- <record id="main_company" model="res.company">
85- <field name="name">Vauxita C.A.</field>
86- <field name="partner_id" ref="res_partner_3"/>
87- <field name="rml_header1">Free Business Solutions</field>
88- <field name="rml_footer1">Web: http://www.openerp.com - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
89- <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: CPHBBE75 - VAT: BE0477.472.701</field>
90- <field name="currency_id" ref="base.VEB"/>
91- </record>
92-
93- <!-- Invoices -->
94-
95-
96-
97+ <field eval="&quot;&quot;&quot;J000004960&quot;&quot;&quot;" name="ref"/>
98+ <field eval="1" name="customer"/>
99+ <field eval="&quot;&quot;&quot;VEV056024160&quot;&quot;&quot;" name="vat"/>
100+ <field eval="0" name="supplier"/>
101+ <field eval="&quot;&quot;&quot;MIRANDA Miranda, C.A.&quot;&quot;&quot;" name="name"/>
102+ </record>
103+
104+ <record id="base.main_address" model="res.partner.address">
105+ <field name="partner_id" ref="base.main_partner"/>
106+ <field name="name">Fabien Pinckaers</field>
107+ <field name="street">Chaussee de Namur 40</field>
108+ <field name="zip">1367</field>
109+ <field name="phone">(+32).81.81.37.00</field>
110+ <field name="type">invoice</field>
111+ <field name="country_id" ref="base.ve"/>
112+ <!-- Company ID will be set later -->
113+ <field name="company_id" eval="None"/>
114+ </record>
115+
116+ <record id="base.main_partner" model="res.partner">
117+ <field eval="1" name="islr_withholding_agent"/>
118+ <field eval="&quot;&quot;&quot;VEJ846123456&quot;&quot;&quot;" name="vat"/>
119+ <field eval="1" name="customer"/>
120+ <field eval="1" name="supplier"/>
121+ <field name="currency_id" ref="base.VEB"/>
122+ </record>
123+
124+ <!--
125+ Invoices
126+ -->
127+
128+<!--
129+ <record id="account_invoice_0" model="account.invoice">
130+ <field eval="450000.0" name="check_total"/>
131+ <field name="currency_id" ref="base.VEB"/>
132+ <field name="address_invoice_id" ref="res_partner_address_0"/>
133+ <field name="nro_ctrl">00-0005678</field>
134+ <field eval="0" name="sin_cred"/>
135+ <field name="user_id" ref="base.user_admin"/>
136+ <field name="reference">libre-345678</field>
137+ <field name="address_contact_id" ref="res_partner_address_0"/>
138+ <field name="reference_type">none</field>
139+ <field name="company_id" ref="base.main_company"/>
140+ <field name="state">draft</field>
141+ <field name="type">in_invoice</field>
142+ <field name="status">no_pro</field>
143+ <field eval="450000.0" name="residual"/>
144+ <field eval="450000.0" name="amount_untaxed"/>
145+ <field eval="450000.0" name="amount_total"/>
146+ <field name="partner_id" ref="l10n_ve_islr_withholding.res_partner_administradoramengimca0"/>
147+ </record>
148+ <record id="account_invoice_line_personajuridicadomiciliada0" model="account.invoice.line">
149+ <field eval="0" name="apply_wh"/>
150+ <field name="account_id" ref="l10n_ve_islr_withholding.a_islr"/>
151+ <field name="invoice_id" ref="account_invoice_0"/>
152+ <field eval="450000.0" name="price_unit"/>
153+ <field eval="450000.0" name="price_subtotal"/>
154+ <field name="company_id" ref="base.main_company"/>
155+ <field eval="1.0" name="quantity"/>
156+ <field name="partner_id" ref="l10n_ve_islr_withholding.res_partner_administradoramengimca0"/>
157+ <field name="concept_id" ref="l10n_ve_islr_withholding.islr_wh_concept_pago_contratistas"/>
158+ <field name="name">Persona Juridica Domiciliada</field>
159+ </record>
160+-->
161+<!--
162+ <record id="account_invoice_0" model="account.invoice">
163+ <field eval="564998.75" name="check_total"/>
164+ <field name="currency_id" ref="base.VEB"/>
165+ <field name="address_invoice_id" ref="l10n_ve_islr_withholding.res_partner_address_1"/>
166+ <field name="account_id" ref=""/>
167+ <field name="nro_ctrl">00-0008464</field>
168+ <field eval="0" name="sin_cred"/>
169+ <field name="user_id" ref="base.user_admin"/>
170+ <field name="reference">libre-8973287</field>
171+ <field name="address_contact_id" ref="l10n_ve_islr_withholding.res_partner_address_1"/>
172+ <field name="reference_type">none</field>
173+ <field name="company_id" ref="base.main_company"/>
174+ <field name="state">draft</field>
175+ <field name="type">in_invoice</field>
176+ <field name="status">no_pro</field>
177+ <field eval="0" name="reconciled"/>
178+ <field eval="564998.75" name="amount_untaxed"/>
179+ <field eval="564998.75" name="amount_total"/>
180+ <field name="partner_id" ref="l10n_ve_islr_withholding.res_partner_gutierrezrrohgere0"/>
181+ </record>
182+ <record id="account_invoice_line_factura0" model="account.invoice.line">
183+ <field eval="0" name="apply_wh"/>
184+ <field name="account_id" ref="l10n_ve_islr_withholding.a_islr"/>
185+ <field name="invoice_id" ref="account_invoice_0"/>
186+ <field eval="565000.0" name="price_unit"/>
187+ <field eval="564998.75" name="price_subtotal"/>
188+ <field name="company_id" ref="base.main_company"/>
189+ <field eval="1.0" name="quantity"/>
190+ <field name="partner_id" ref="l10n_ve_islr_withholding.res_partner_gutierrezrrohgere0"/>
191+ <field name="concept_id" ref="l10n_ve_islr_withholding.islr_wh_concept_pago_contratistas"/>
192+ <field name="name">Factura2</field>
193+ </record>
194+-->
195
196 </data>
197 </openerp>
198
199=== modified file 'l10n_ve_islr_withholding/invoice.py'
200--- l10n_ve_islr_withholding/invoice.py 2011-07-01 19:31:45 +0000
201+++ l10n_ve_islr_withholding/invoice.py 2011-09-30 13:50:05 +0000
202@@ -263,7 +263,6 @@
203 '''
204 inv_brw = self.pool.get('account.invoice.line').browse(cr, uid, line).invoice_id
205 vat = inv_brw.partner_id.vat[2:]
206- control = '1234567'
207 if inv_brw.type == 'in_invoice' or inv_brw.type == 'in_refund':
208 #~ number = inv_brw.reference.strip()
209 if not inv_brw.reference:
210@@ -283,7 +282,6 @@
211
212 return (vat, number, control)
213
214-
215 def _write_wh_apply(self,cr, uid,line,dict,apply,type):
216 '''
217 Si el campo wh_xml_id en la linea de la factura tiene un id de xml asociado:
218@@ -390,8 +388,12 @@
219 subtract = 0.0
220 res.update(self._get_wh(cr, uid, subtract,concept, wh_dict, dict_rate, False))
221 else: #Si ya se aplico alguna vez la retencion, se aplica rete de una vez, sobre la base sin chequear monto minimo.(Dentro de este periodo)
222- subtract = 0.0
223- res.update(self._get_wh(cr, uid, subtract,concept, wh_dict, dict_rate, True))# El True sirve para indicar que la linea si se va a retener.
224+ if nature:
225+ subtract = dict_rate[concept][3]
226+ res.update(self._get_wh(cr, uid, subtract,concept, wh_dict, dict_rate, True))
227+ else:
228+ subtract = 0.0
229+ res.update(self._get_wh(cr, uid, subtract,concept, wh_dict, dict_rate, True))# El True sirve para indicar que la linea si se va a retener.
230 return res
231
232