Openerp Venezuela

Merge lp:~inddiana/openerp-venezuela-localization/reporte_compromiso_social into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

  1. reporte_compromiso_social
  2. Merge into 6.0-trunk
Proposed by [SISB] Joyza Carrasquero
Status: Superseded
Proposed branch: lp:~inddiana/openerp-venezuela-localization/reporte_compromiso_social
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 331 lines (+149/-98)
1 file modified
l10n_ve_withholding_src/report/wh_src_report.rml (+149/-98)
To merge this branch: bzr merge lp:~inddiana/openerp-venezuela-localization/reporte_compromiso_social
Reviewer Review Type Date Requested Status
OpenERP para localización Venezolana. Pending
Review via email: mp+118139@code.launchpad.net

This proposal has been superseded by a proposal from 2012-08-06.

Description of the change

[IMP] Modificación sobre el reporte de comprobante de retencion de responsabilidad social

To post a comment you must log in.
lp:~inddiana/openerp-venezuela-localization/reporte_compromiso_social updated
685. By [SISB] Joyza Carrasquero

[IMP]Modificación sobre el reporte de retencion de compromiso social

Unmerged revisions

685. By [SISB] Joyza Carrasquero

[IMP]Modificación sobre el reporte de retencion de compromiso social

684. By [SISB] Joyza Carrasquero

[IMP] Modificación sobre el reporte de comprobante de retencion de responsabilidad
social

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ve_withholding_src/report/wh_src_report.rml'
2--- l10n_ve_withholding_src/report/wh_src_report.rml 2012-02-20 20:11:16 +0000
3+++ l10n_ve_withholding_src/report/wh_src_report.rml 2012-08-06 13:54:20 +0000
4@@ -1,26 +1,27 @@
5 <?xml version="1.0"?>
6 <document filename="Voucher.pdf">
7- <template pageSize="(595.0,842.0)" title="Voucher" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
8+ <template pageSize="(27.7cm,21.5cm)" title="Retención Responsabilidad Social" author="Industrias Diana, C.A. " allowSplitting="20">
9 <pageTemplate id="first">
10- <frame id="first" x1="25.0" y1="40.0" width="525" height="740"/>
11+ <frame id="reporte" x1="13.0mm" y1="8.0mm" width="253.0mm" height="191mm" />
12 <pageGraphics>
13- <drawCentredString x="700" y="550">Pag.<pageNumber style="estilo2" /></drawCentredString>
14+
15 <drawCentredString x="700" y="550"></drawCentredString>
16- <image x="2,5" y="750" width="28.06mm" height="28.06mm">[[ company.logo or removeParentNode('image') ]]</image>
17+ <image x="45" y="530" width="21.06mm" height="21.06mm">[[ company.logo or removeParentNode('image') ]]</image>
18 <setFont name="DejaVu Sans" size="8" />
19 <fill color="black" />
20 <stroke color="black" />
21- <drawString x="3.2cm" y="29cm" style="estilo2">[[ company.partner_id.name ]]</drawString>
22- <drawString x="3.7cm" y="28.7cm" style="estilo4">[[ company.partner_id.vat or '']]</drawString>
23- <drawString x="2.5cm" y="28.4cm" style="estilo4">[[ get_empresa(company.partner_id.id)['street'] or '']]</drawString>
24- <drawString x="2.4cm" y="28.1cm" style="estilo4">Telf.: [[ get_empresa(company.partner_id.id)['phone'] or '']] - Fax: [[ get_empresa(company.partner_id.id)['fax'] or '']]</drawString>
25- <drawString x="2.7cm" y="27.8cm" style="estilo4">Email: [[ get_empresa(company.partner_id.id)['email'] or '']]</drawString>
26- <drawString x="3.4cm" y="27.6cm" style="estilo4">[[ get_empresa(company.partner_id.id)['city'] or '']] - [[ get_empresa(company.partner_id.id)['country'] or '']]</drawString>
27- <lines>1.2cm 2.15cm 19.9cm 2.15cm</lines>
28+ <drawString x="5.2cm" y="20.5cm" style="estilo2">[[ company.partner_id.name ]]</drawString>
29+ <drawString x="5.7cm" y="20.2cm" style="estilo4">[[ company.partner_id.vat[2:] or '']]</drawString>
30+ <drawString x="4.2cm" y="19.9cm" style="estilo4">[[ get_empresa(company.partner_id.id)['street'] or '']]</drawString>
31+ <drawString x="3.9cm" y="19.6cm" style="estilo4">Telf.: [[ get_empresa(company.partner_id.id)['phone'] or '']] - Fax: [[ get_empresa(company.partner_id.id)['fax'] or '']]</drawString>
32+ <drawString x="4.7cm" y="19.3cm" style="estilo4">Email: [[ get_empresa(company.partner_id.id)['email'] or '']]</drawString>
33+ <drawString x="5.4cm" y="19.0cm" style="estilo4">[[ get_empresa(company.partner_id.id)['city'] or '']] - [[ get_empresa(company.partner_id.id)['country'] or '']]</drawString>
34+
35+ <lines>7.2cm 2.15cm 19.9cm 2.15cm</lines>
36
37- <drawCentredString x="10.5cm" y="1.7cm">Elaborado por: SISB</drawCentredString>
38- <drawCentredString x="10.5cm" y="1.25cm">[[ get_empresa(company.partner_id.id)['email'] or '']]</drawCentredString>
39- <drawCentredString x="10.5cm" y="0.8cm">Diana La Soberana 100.5 FM<pageNumber/></drawCentredString>
40+ <drawCentredString x="13.5cm" y="1.7cm">Elaborado por: SISB</drawCentredString>
41+ <drawCentredString x="13.5cm" y="1.25cm">[[ get_empresa(company.partner_id.id)['email'] or '']]</drawCentredString>
42+ <drawCentredString x="13.5cm" y="0.8cm">Diana La Soberana 100.5 FM<pageNumber/></drawCentredString>
43 <drawString x="680" y="535">[[get_final_date()]]</drawString>
44
45 </pageGraphics>
46@@ -30,14 +31,28 @@
47 <blockTableStyle id="Table7">
48 <blockAlignment value="LEFT" />
49 <blockValign value="TOP" />
50- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,1" />
51- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,2" />
52- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="0,1" />
53- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,0" stop="1,2" />
54- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="1,2" />
55- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,2" />
56- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="0,0" stop="0,2" />
57- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,2" />
58+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1" />
59+ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0" />
60+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1" />
61+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1" />
62+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0" />
63+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1" />
64+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1" />
65+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0" />
66+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1" />
67+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1" />
68+ <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0" />
69+ <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1" />
70+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1" />
71+ <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0" />
72+ <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1" />
73+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,0" stop="5,-1" />
74+ <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0" />
75+ <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1" />
76+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="6,0" stop="6,-1" />
77+ <lineStyle kind="LINEAFTER" colorName="#000000" start="6,0" stop="6,-1" />
78+ <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0" />
79+ <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1" />
80 </blockTableStyle>
81 <blockTableStyle id="Table5">
82 <blockAlignment value="LEFT" />
83@@ -218,7 +233,7 @@
84
85 <spacer length='10mm'/>
86
87- <blockTable colWidths="524.0" style="Table6">
88+ <blockTable colWidths="530.0" style="Table6">
89 <tr>
90 <td>
91 <para style="P21_a">COMPROBANTE DE RETENCION DE RESPONSABILIDAD SOCIAL</para>
92@@ -226,40 +241,54 @@
93 </tr>
94 </blockTable>
95 <spacer length='2mm'/>
96- <blockTable colWidths="524.0" style="Table6">
97+ <blockTable colWidths="530.0" style="Table6">
98 <tr>
99 <td>
100 <para style="P21_a">DATOS DEL BENEFICIARIO</para>
101 </td>
102 </tr>
103 </blockTable>
104-
105- <blockTable colWidths="300.0,224.0" style="Table7">
106- <tr>
107- <td>
108- <para style="P21_C">[[ o.partner_id.name ]]</para>
109- </td>
110- <td>
111- <para style="P21_C">[[ o.partner_id.vat or '']]</para>
112- </td>
113- </tr>
114- <tr>
115- <td>
116- <para style="P21_b">[[ o.partner_id.address and o.partner_id.address[0].street ]]</para>
117- </td>
118- <td>
119- <para style="P21_b">[[ o.partner_id.address and o.partner_id.address[0].phone ]]</para>
120- </td>
121- </tr>
122- <tr>
123- <td>
124- <para style="P20_a"></para>
125- </td>
126- <td>
127- <para style="P21_b">Contrato</para>
128- </td>
129- </tr>
130- </blockTable>
131+ <blockTable colWidths="200.0,100.0,210.0,100.0,100.0" style="Table7">
132+ <tr>
133+ <td>
134+ <para style="estilo6" alignment="CENTER">Nombre</para>
135+ </td>
136+ <td>
137+ <para style="estilo6" alignment="CENTER">Rif</para>
138+ </td>
139+ <td>
140+ <para style="estilo6" alignment="CENTER">Dirección</para>
141+ </td>
142+ <td>
143+ <para style="estilo6" alignment="CENTER">Teléfono</para>
144+ </td>
145+ <td>
146+ <para style="estilo6" alignment="CENTER">Contrato</para>
147+ </td>
148+
149+ </tr>
150+ </blockTable>
151+ <blockTable colWidths="200.0,100.0,210.0,100.0,100.0" style="Table7">
152+ <tr>
153+ <td>
154+ <para style="estilo6" alignment="CENTER">[[ o.partner_id.name ]]</para>
155+ </td>
156+ <td>
157+ <para style="estilo6" alignment="CENTER">[[ o.partner_id.vat[2:] or '']]</para>
158+ </td>
159+ <td>
160+ <para style="estilo6" alignment="CENTER">[[ o.partner_id.address and o.partner_id.address[0].street ]]</para>
161+ </td>
162+ <td>
163+ <para style="estilo6" alignment="CENTER">[[ o.partner_id.address and o.partner_id.address[0].phone ]]</para>
164+ </td>
165+ <td>
166+ <para style="estilo6" alignment="CENTER"></para>
167+ </td>
168+
169+ </tr>
170+ </blockTable>
171+
172
173 <spacer length='5mm'/>
174 <blockTable colWidths="524.0" style="Table6">
175@@ -269,20 +298,38 @@
176 </td>
177 </tr>
178 </blockTable>
179- <blockTable colWidths="524" style="Table5">
180+
181+ <blockTable colWidths="200.0,100.0,250.0" style="Table7">
182 <tr>
183 <td>
184- <para style="P21_b" alignment="CENTER">[[ company.name ]] [[ company.partner_id.vat or '']]</para>
185- </td>
186-
187- </tr>
188+ <para style="estilo6" alignment="CENTER">Nombre</para>
189+ </td>
190+ <td>
191+ <para style="estilo6" alignment="CENTER">Rif</para>
192+ </td>
193+ <td>
194+ <para style="estilo6" alignment="CENTER">Dirección</para>
195+ </td>
196+
197+
198+ </tr>
199 </blockTable>
200- <blockTable colWidths="524" style="Table8">
201+
202+
203+ <blockTable colWidths="200.0,100.0,250.0" style="Table7">
204 <tr>
205 <td>
206- <para style="P21_b">[[ get_empresa(company.partner_id.id)['street'] or '']]</para>
207- </td>
208- </tr>
209+ <para style="estilo6" alignment="CENTER">[[ company.name ]]</para>
210+ </td>
211+ <td>
212+ <para style="estilo6" alignment="CENTER">[[ company.partner_id.vat[2:] or '']]</para>
213+ </td>
214+ <td>
215+ <para style="estilo6" alignment="CENTER">[[ get_empresa(company.partner_id.id)['street'] or '']]</para>
216+ </td>
217+
218+
219+ </tr>
220 </blockTable>
221
222 <spacer length='5mm'/>
223@@ -294,58 +341,62 @@
224 </tr>
225 </blockTable>
226
227- <blockTable colWidths="87.3,87.3,87.3,87.3,87.3,87.3" style="Table9">
228+ <blockTable colWidths="200.0,100.0,100.0,100.0,100.0,100.0" style="Table7">
229 <tr>
230 <td>
231- <para style="P_b" alignment="CENTER">POR CONCEPTO DE:</para>
232- </td>
233- <td>
234- <para style="P_b" alignment="CENTER">MONTO RETENIDO BS.</para>
235- </td>
236- <td>
237- <para style="P_b" alignment="CENTER">% DE LA RETENCION </para>
238- </td>
239- <td>
240- <para style="P_b" alignment="CENTER">MONTO BRUTO BS</para>
241- </td>
242- <td>
243- <para style="P_b" alignment="CENTER">MONTO NETO</para>
244- </td>
245- <td>
246- <para style="P_b" alignment="CENTER">FECHA</para>
247- </td>
248+ <para style="estilo6" alignment="CENTER">POR CONCEPTO DE:</para>
249+ </td>
250+ <td>
251+ <para style="estilo6" alignment="CENTER">MONTO RETENIDO BS.</para>
252+ </td>
253+ <td>
254+ <para style="estilo6" alignment="CENTER">% DE LA RETENCION</para>
255+ </td>
256+ <td>
257+ <para style="estilo6" alignment="CENTER">MONTO BRUTO BS</para>
258+ </td>
259+ <td>
260+ <para style="estilo6" alignment="CENTER">MONTO NETO</para>
261+ </td>
262+ <td>
263+ <para style="estilo6" alignment="CENTER">FECHA</para>
264+ </td>
265+
266 </tr>
267 </blockTable>
268
269 <section>
270 <para style="P9">[[repeatIn(o.line_ids,'l')]]</para>
271- <blockTable colWidths="87.3,87.3,87.3,87.3,87.3,87.3" style="Table11">
272+
273+
274+ <blockTable colWidths="200.0,100.0,100.0,100.0,100.0,100.0" style="Table7">
275 <tr>
276 <td>
277- <para style="P21_b" alignment="CENTER">[[l.name]]</para>
278- </td>
279- <td>
280- <para style="P21_b" alignment="CENTER">[[l.wh_amount]]</para>
281- </td>
282- <td>
283- <para style="P21_b" alignment="CENTER">[[l.wh_src_rate]]%</para>
284- </td>
285- <td>
286- <para style="P21_b" alignment="CENTER">[[l.base_amount]]</para>
287- </td>
288- <td>
289- <para style="P21_b" alignment="CENTER">[[l.invoice_id.amount_total]]</para>
290- </td>
291- <td>
292- <para style="P21_b" alignment="CENTER">[[l.invoice_id.date_invoice]]</para>
293- </td>
294+ <para style="estilo6" alignment="CENTER">[[l.name]]</para>
295+ </td>
296+ <td>
297+ <para style="estilo6" alignment="CENTER">[[l.wh_amount]]</para>
298+ </td>
299+ <td>
300+ <para style="estilo6" alignment="CENTER">[[l.wh_src_rate]]%</para>
301+ </td>
302+ <td>
303+ <para style="estilo6" alignment="CENTER">[[l.base_amount]]</para>
304+ </td>
305+ <td>
306+ <para style="estilo6" alignment="CENTER">[[l.invoice_id.amount_total]]</para>
307+ </td>
308+ <td>
309+ <para style="estilo6" alignment="CENTER">[[l.invoice_id.date_invoice]]</para>
310+ </td>
311+
312 </tr>
313 </blockTable>
314 </section>
315
316 <spacer length='5mm'/>
317
318- <blockTable colWidths="87.3,436.7" style="Table10">
319+ <blockTable colWidths="100,436.7" style="Table7">
320 <tr>
321 <td>
322 <para style="estilo6" alignment="CENTER">Código de Retención</para>
323@@ -357,7 +408,7 @@
324 </blockTable>
325
326
327- <spacer length='3mm'/>
328+ <spacer length='4mm'/>
329 <blockTable colWidths="174.0,174.0,174.0">
330 <tr>
331 <td>