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: 387
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: 294 lines (+277/-0) (has conflicts)
2 files modified
l10n_ve_islr_withholding/__openerp__.py (+5/-0)
l10n_ve_islr_withholding/demo/l10n_ve_islr_withholding_demo.xml (+272/-0)
Text conflict in l10n_ve_islr_withholding/__openerp__.py
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+77608@code.launchpad.net

Description of the change

First merge, this branch to join with Israel's works.

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

[MERGE] Merge 0 from load of data xml of withholding income.

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-26 22:38:20 +0000
3+++ l10n_ve_islr_withholding/__openerp__.py 2011-09-29 20:52:24 +0000
4@@ -71,7 +71,12 @@
5 "islr_xml_wh_report.xml",
6 "islr_wh_report.xml",
7 "islr_xml_wh.xml",
8+<<<<<<< TREE
9 "data/islr_concept_data.xml",
10+=======
11+ "islr_concept_data.xml",
12+ "demo/l10n_ve_islr_withholding_demo.xml"
13+>>>>>>> MERGE-SOURCE
14 ],
15 "active": False,
16 "installable": True
17
18=== added directory 'l10n_ve_islr_withholding/demo'
19=== added file 'l10n_ve_islr_withholding/demo/l10n_ve_islr_withholding_demo.xml'
20--- l10n_ve_islr_withholding/demo/l10n_ve_islr_withholding_demo.xml 1970-01-01 00:00:00 +0000
21+++ l10n_ve_islr_withholding/demo/l10n_ve_islr_withholding_demo.xml 2011-09-29 20:52:24 +0000
22@@ -0,0 +1,272 @@
23+<?xml version="1.0" encoding="utf-8"?>
24+<openerp>
25+ <data noupdate="0">
26+ <!--
27+ Minimal Account
28+ -->
29+ <record id="a_islr" model="account.account">
30+ <field name="code">X2002</field>
31+ <field name="name">Servicios de analistas, programadores y soporte</field>
32+ <field ref="account.rev" name="parent_id"/>
33+ <field name="type">other</field>
34+ <field name="user_type" ref="account.account_type_income"/>
35+ </record>
36+
37+ <record id="islr_rec" model="account.account">
38+ <field name="code">X11006</field>
39+ <field name="name">Impuestos sobre la Renta por Cobrar(ISLR)</field>
40+ <field ref="account.cas" name="parent_id"/>
41+ <field name="type">other</field>
42+ <field name="user_type" ref="account.account_type_asset"/>
43+ </record>
44+
45+ <record id="islr_pay" model="account.account">
46+ <field name="code">X1114</field>
47+ <field name="name">Impuestos sobre la Renta por Pagar(ISLR)</field>
48+ <field ref="account.cli" name="parent_id"/>
49+ <field name="type">other</field>
50+ <field name="user_type" ref="account.account_type_liability"/>
51+ </record>
52+
53+ <!--
54+ Sequence
55+ -->
56+ <record id="seq_wh_islr_purchase_type" model="ir.sequence.type">
57+ <field name="name">Retencion de ISLR Compra</field>
58+ <field name="code">account.journal</field>
59+ </record>
60+
61+ <record id="seq_wh_islr_purchase_journal" model="ir.sequence">
62+ <field name="name">Retencion de ISLR Compra</field>
63+ <field name="code">account.journal</field>
64+ <field name="prefix">RE:</field>
65+ <field name="padding">6</field>
66+ <field name="number_increment">1</field>
67+ </record>
68+
69+ <record id="seq_wh_islr_sale_type" model="ir.sequence.type">
70+ <field name="name">Retencion de ISLR Venta</field>
71+ <field name="code">account.journal</field>
72+ </record>
73+
74+ <record id="seq_wh_islr_sale_journal" model="ir.sequence">
75+ <field name="name">Retencion de ISLR Venta</field>
76+ <field name="code">account.journal</field>
77+ <field name="prefix">RE:</field>
78+ <field name="padding">6</field>
79+ <field name="number_increment">1</field>
80+ </record>
81+
82+ <!--
83+ Journal
84+ -->
85+ <record id="withholding_purchase_journal" model="account.journal">
86+ <field name="name">DIARIO DE ISLR COMPRA</field>
87+ <field name="code">ISLRC</field>
88+ <field name="type">islr_purchase</field>
89+ <field name="view_id" ref="account.account_journal_view"/>
90+ <field name="sequence_id" ref="seq_wh_islr_purchase_journal"/>
91+ </record>
92+
93+ <record id="withholding_sale_journal" model="account.journal">
94+ <field name="name">DIARIO DE ISLR VENTA</field>
95+ <field name="code">ISLRS</field>
96+ <field name="type">islr_sale</field>
97+ <field name="view_id" ref="account.account_journal_view"/>
98+ <field name="sequence_id" ref="seq_wh_islr_sale_journal"/>
99+ </record>
100+
101+ <!--
102+ Supplier Partners
103+ -->
104+
105+ <record id="res_partner_address_0" model="res.partner.address">
106+ <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"/>
107+ <field name="country_id" ref="base.ve"/>
108+ <field eval="&quot;&quot;&quot;invoice&quot;&quot;&quot;" name="type"/>
109+ <field eval="&quot;&quot;&quot;0212-299.09.01&quot;&quot;&quot;" name="fax"/>
110+ <field eval="&quot;&quot;&quot;0212-268.18.31&quot;&quot;&quot;" name="phone"/>
111+ <field eval="1" name="active"/>
112+ <field eval="&quot;&quot;&quot;elpapiruqui@cantv.net&quot;&quot;&quot;" name="email"/>
113+ </record>
114+
115+ <record id="res_partner_address_1" model="res.partner.address">
116+ <field eval="&quot;&quot;&quot;AV CUCHILLITO EDF SAN JUAN PISO 10. GUARENAS&quot;&quot;&quot;" name="street"/>
117+ <field name="country_id" ref="base.ve"/>
118+ <field eval="&quot;&quot;&quot;invoice&quot;&quot;&quot;" name="type"/>
119+ <field eval="&quot;&quot;&quot;0212-888.09.11&quot;&quot;&quot;" name="fax"/>
120+ <field eval="&quot;&quot;&quot;0212-999.18.31&quot;&quot;&quot;" name="phone"/>
121+ <field eval="1" name="active"/>
122+ <field eval="&quot;&quot;&quot;eli@cantv.net&quot;&quot;&quot;" name="email"/>
123+ </record>
124+
125+ <record id="res_partner_address_2" model="res.partner.address">
126+ <field eval="&quot;&quot;&quot;AV SAN JUAN NO TE IMPORTA EDF SAN JUAN PISO 10. CARACAS&quot;&quot;&quot;" name="street"/>
127+ <field name="country_id" ref="base.be"/>
128+ <field eval="&quot;&quot;&quot;invoice&quot;&quot;&quot;" name="type"/>
129+ <field eval="&quot;&quot;&quot;0212-555.09.01&quot;&quot;&quot;" name="fax"/>
130+ <field eval="&quot;&quot;&quot;0212-777.18.31&quot;&quot;&quot;" name="phone"/>
131+ <field eval="1" name="active"/>
132+ <field eval="&quot;&quot;&quot;ruqui@cantv.net&quot;&quot;&quot;" name="email"/>
133+ </record>
134+
135+ <record id="res_partner_address_3" model="res.partner.address">
136+ <field eval="&quot;&quot;&quot;AV MARIA SI TE IMPORTA EDF SAN PEDRO DE LA CASA PISO 90. MARACAIBO&quot;&quot;&quot;" name="street"/>
137+ <field name="country_id" ref="base.be"/>
138+ <field eval="&quot;&quot;&quot;invoice&quot;&quot;&quot;" name="type"/>
139+ <field eval="&quot;&quot;&quot;0212-111.19.01&quot;&quot;&quot;" name="fax"/>
140+ <field eval="&quot;&quot;&quot;0212-222.28.31&quot;&quot;&quot;" name="phone"/>
141+ <field eval="1" name="active"/>
142+ <field eval="&quot;&quot;&quot;ruqui@cantv.net&quot;&quot;&quot;" name="email"/>
143+ </record>
144+
145+ <record id="res_partner_administradoramengimca0" model="res.partner">
146+ <field eval="0" name="islr_withholding_agent"/>
147+ <field eval="1" name="active"/>
148+ <field name="address" eval="[(4, ref('res_partner_address_0'))]"/>
149+ <field eval="&quot;&quot;&quot;86&quot;&quot;&quot;" name="ref"/>
150+ <field eval="1" name="supplier"/>
151+ <field eval="&quot;&quot;&quot;VEJ307514153&quot;&quot;&quot;" name="vat"/>
152+ <field eval="0" name="customer"/>
153+ <field eval="&quot;&quot;&quot;Administradora Mamita, C.A.&quot;&quot;&quot;" name="name"/>
154+ </record>
155+
156+ <record id="res_partner_gutierrezrrohgere0" model="res.partner">
157+ <field eval="0" name="islr_withholding_agent"/>
158+ <field eval="1" name="active"/>
159+ <field name="address" eval="[(4, ref('res_partner_address_1'))]"/>
160+ <field eval="&quot;&quot;&quot;256&quot;&quot;&quot;" name="ref"/>
161+ <field eval="1" name="supplier"/>
162+ <field eval="&quot;&quot;&quot;VEV029785053&quot;&quot;&quot;" name="vat"/>
163+ <field eval="0" name="customer"/>
164+ <field eval="&quot;&quot;&quot;Gutierrez R. Rohger E.&quot;&quot;&quot;" name="name"/>
165+ </record>
166+
167+ <record id="res_partner_nhomarhernandez0" model="res.partner">
168+ <field eval="0" name="islr_withholding_agent"/>
169+ <field eval="1" name="active"/>
170+ <field name="address" eval="[(4, ref('res_partner_address_2'))]"/>
171+ <field eval="&quot;&quot;&quot;J000004500&quot;&quot;&quot;" name="ref"/>
172+ <field eval="1" name="supplier"/>
173+ <field eval="&quot;&quot;&quot;VEV147714443&quot;&quot;&quot;" name="vat"/>
174+ <field eval="0" name="customer"/>
175+ <field eval="&quot;&quot;&quot;Nhomar Hernandez&quot;&quot;&quot;" name="name"/>
176+ </record>
177+
178+ <record id="res_partner_viajesmirandaca0" model="res.partner">
179+ <field eval="0" name="islr_withholding_agent"/>
180+ <field eval="1" name="active"/>
181+ <field name="address" eval="[(4, ref('res_partner_address_3'))]"/>
182+ <field eval="&quot;&quot;&quot;J000004960&quot;&quot;&quot;" name="ref"/>
183+ <field eval="1" name="supplier"/>
184+ <field eval="&quot;&quot;&quot;VEJ044004960&quot;&quot;&quot;" name="vat"/>
185+ <field eval="0" name="customer"/>
186+ <field eval="&quot;&quot;&quot;Viajes Miranda, C.A.&quot;&quot;&quot;" name="name"/>
187+ </record>
188+
189+ <!--
190+ Customer Partner
191+ -->
192+
193+ <record id="res_partner_address_4" model="res.partner.address">
194+ <field eval="&quot;&quot;&quot;AV LECUNA CON 2DA TRANSVERSAL DEL CUCHILLITO EDF SAN JUAN PISO 10. CARACAS&quot;&quot;&quot;" name="street"/>
195+ <field name="country_id" ref="base.ve"/>
196+ <field eval="&quot;&quot;&quot;invoice&quot;&quot;&quot;" name="type"/>
197+ <field eval="&quot;&quot;&quot;0212-111.09.01&quot;&quot;&quot;" name="fax"/>
198+ <field eval="&quot;&quot;&quot;0212-111.18.31&quot;&quot;&quot;" name="phone"/>
199+ <field eval="1" name="active"/>
200+ <field eval="&quot;&quot;&quot;elpapiruqui@cantv.net&quot;&quot;&quot;" name="email"/>
201+ </record>
202+
203+ <record id="res_partner_address_5" model="res.partner.address">
204+ <field eval="&quot;&quot;&quot;AV SAN JUAN EDF CUCHILLITO PISO 10. PETARES&quot;&quot;&quot;" name="street"/>
205+ <field name="country_id" ref="base.ve"/>
206+ <field eval="&quot;&quot;&quot;invoice&quot;&quot;&quot;" name="type"/>
207+ <field eval="&quot;&quot;&quot;0212-222.09.11&quot;&quot;&quot;" name="fax"/>
208+ <field eval="&quot;&quot;&quot;0212-222.18.31&quot;&quot;&quot;" name="phone"/>
209+ <field eval="1" name="active"/>
210+ <field eval="&quot;&quot;&quot;eli@cantv.net&quot;&quot;&quot;" name="email"/>
211+ </record>
212+
213+ <record id="res_partner_address_6" model="res.partner.address">
214+ <field eval="&quot;&quot;&quot;AV CARACAS EDF SAN JUAN PISO 10. CARACAS&quot;&quot;&quot;" name="street"/>
215+ <field name="country_id" ref="base.be"/>
216+ <field eval="&quot;&quot;&quot;invoice&quot;&quot;&quot;" name="type"/>
217+ <field eval="&quot;&quot;&quot;0212-123.09.01&quot;&quot;&quot;" name="fax"/>
218+ <field eval="&quot;&quot;&quot;0212-321.18.31&quot;&quot;&quot;" name="phone"/>
219+ <field eval="1" name="active"/>
220+ <field eval="&quot;&quot;&quot;ruqui@cantv.net&quot;&quot;&quot;" name="email"/>
221+ </record>
222+
223+ <record id="res_partner_address_7" model="res.partner.address">
224+ <field eval="&quot;&quot;&quot;AV MARIA QUIEN SABE EDF SAN PEDRO DE LA CASA PISO 90. MARACAIBO&quot;&quot;&quot;" name="street"/>
225+ <field name="country_id" ref="base.be"/>
226+ <field eval="&quot;&quot;&quot;invoice&quot;&quot;&quot;" name="type"/>
227+ <field eval="&quot;&quot;&quot;0212-234.19.01&quot;&quot;&quot;" name="fax"/>
228+ <field eval="&quot;&quot;&quot;0212-432.28.31&quot;&quot;&quot;" name="phone"/>
229+ <field eval="1" name="active"/>
230+ <field eval="&quot;&quot;&quot;ruqui@cantv.net&quot;&quot;&quot;" name="email"/>
231+ </record>
232+
233+ <record id="res_partner_1" model="res.partner">
234+ <field eval="0" name="islr_withholding_agent"/>
235+ <field eval="1" name="active"/>
236+ <field name="address" eval="[(4, ref('res_partner_address_4'))]"/>
237+ <field eval="&quot;&quot;&quot;86&quot;&quot;&quot;" name="ref"/>
238+ <field eval="1" name="customer"/>
239+ <field eval="&quot;&quot;&quot;VEJ307514153&quot;&quot;&quot;" name="vat"/>
240+ <field eval="0" name="supplier"/>
241+ <field eval="&quot;&quot;&quot;PERCHO, C.A.&quot;&quot;&quot;" name="name"/>
242+ </record>
243+
244+ <record id="res_partner_2" model="res.partner">
245+ <field eval="0" name="islr_withholding_agent"/>
246+ <field eval="1" name="active"/>
247+ <field name="address" eval="[(4, ref('res_partner_address_5'))]"/>
248+ <field eval="&quot;&quot;&quot;256&quot;&quot;&quot;" name="ref"/>
249+ <field eval="1" name="customer"/>
250+ <field eval="&quot;&quot;&quot;VEV029785053&quot;&quot;&quot;" name="vat"/>
251+ <field eval="0" name="supplier"/>
252+ <field eval="&quot;&quot;&quot;MIGUEL P PEREZ L.&quot;&quot;&quot;" name="name"/>
253+ </record>
254+
255+ <record id="res_partner_3" model="res.partner">
256+ <field eval="0" name="islr_withholding_agent"/>
257+ <field eval="1" name="active"/>
258+ <field name="address" eval="[(4, ref('res_partner_address_6'))]"/>
259+ <field eval="&quot;&quot;&quot;J000004500&quot;&quot;&quot;" name="ref"/>
260+ <field eval="1" name="customer"/>
261+ <field eval="&quot;&quot;&quot;VEJ124804443&quot;&quot;&quot;" name="vat"/>
262+ <field eval="1" name="supplier"/>
263+ <field eval="&quot;&quot;&quot;JAVIER Hernandez&quot;&quot;&quot;" name="name"/>
264+ <field eval="1" name="islr_withholding_agent"/>
265+ </record>
266+
267+ <record id="res_partner_4" model="res.partner">
268+ <field eval="0" name="islr_withholding_agent"/>
269+ <field eval="1" name="active"/>
270+ <field name="address" eval="[(4, ref('res_partner_address_7'))]"/>
271+ <field eval="&quot;&quot;&quot;J000004960&quot;&quot;&quot;" name="ref"/>
272+ <field eval="1" name="customer"/>
273+ <field eval="&quot;&quot;&quot;VEV056024160&quot;&quot;&quot;" name="vat"/>
274+ <field eval="0" name="supplier"/>
275+ <field eval="&quot;&quot;&quot;MIRANDA Miranda, C.A.&quot;&quot;&quot;" name="name"/>
276+ </record>
277+
278+ <!-- Basic Company -->
279+ <record id="main_company" model="res.company">
280+ <field name="name">Vauxita C.A.</field>
281+ <field name="partner_id" ref="res_partner_3"/>
282+ <field name="rml_header1">Free Business Solutions</field>
283+ <field name="rml_footer1">Web: http://www.openerp.com - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
284+ <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: CPHBBE75 - VAT: BE0477.472.701</field>
285+ <field name="currency_id" ref="base.VEB"/>
286+ </record>
287+
288+ <!-- Invoices -->
289+
290+
291+
292+
293+ </data>
294+</openerp>