diana-addons

Merge lp:~inddiana/diana-addons/edgar_reporte_intereses_sobre_prestaciones into lp:diana-addons

  1. edgar_reporte_intereses_sobre_prestaciones
  2. Merge into trunk
Proposed by [SISB] Edgar Rivero
Status: Merged
Merged at revision: 44
Proposed branch: lp:~inddiana/diana-addons/edgar_reporte_intereses_sobre_prestaciones
Merge into: lp:diana-addons
Diff against target: 227 lines (+91/-64)
3 files modified
reportes_nomina/report/intereses.rml (+46/-28)
reportes_nomina/report/prestaciones.rml (+44/-31)
reportes_nomina/wizard/intereses_wizard.py (+1/-5)
To merge this branch: bzr merge lp:~inddiana/diana-addons/edgar_reporte_intereses_sobre_prestaciones
Reviewer Review Type Date Requested Status
[SISB] Edgar Rivero Pending
Review via email: mp+256378@code.launchpad.net

Description of the change

[IMP] Se modifican reporte de prestaciones y de intereses sobre prestaciones para
ajustar formato de impresion.
[IMP] Se organiza los intereses por fecha.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'reportes_nomina/report/intereses.rml'
2--- reportes_nomina/report/intereses.rml 2013-08-21 18:41:46 +0000
3+++ reportes_nomina/report/intereses.rml 2015-04-15 18:30:42 +0000
4@@ -1,8 +1,23 @@
5 <?xml version="1.0"?>
6 <document filename="test.pdf">
7- <template pageSize="(21cm,27cm)" title="prestaciones" author="Anthony Gudiño" allowSplitting="20">
8-
9+ <template pageSize="(21.59cm,27.94cm)" title="Compensacion" author="Industrias Diana, C.A." allowSplitting="100">
10+ <pageTemplate id="first">
11+ <frame id="first" x1="1.5cm" y1="1cm" width="19cm" height="23.5cm"/>
12+ <pageGraphics>
13+ <drawString x="7cm" y="700">Edo. Cta. de Intereses / Prestaciones Sociales</drawString>
14+
15+ <setFont name="Helvetica" size="8" />
16+ <fill color="black" />
17+ <stroke color="black" />
18+ <drawString x="2cm" y="750" style="estilo2">[[ company.partner_id.name ]]</drawString>
19+ <drawString x="2cm" y="740" style="estilo4">[[ company.partner_id.vat[2:] or '']]</drawString>
20
21+ <drawString x="18cm" y="750">[[get_final_date()]]</drawString>
22+ <drawString x="18cm" y="740">[[get_hour_date()]]</drawString>
23+ <drawString x="10mm" y="5mm">SISB / [[ user.login ]] / Fecha de Impresion: [[formatLang(time.strftime('%Y-%m-%d'),date=True)]] [[time.strftime('%H:%m')]] / Pagina:<pageNumber/> </drawString>
24+ </pageGraphics>
25+ </pageTemplate>
26+ </template>
27
28 <stylesheet>
29
30@@ -92,38 +107,38 @@
31
32 </stylesheet>
33
34-
35- <pageTemplate id="first">
36- <frame id="first" x1="2cm" y1="-1cm" width="20cm" height="25cm"/>
37-
38- <pageGraphics>
39-
40- <drawString x="5cm" y="700">Edo. Cta. de Intereses s/ Prestaciones Sociales</drawString>
41-
42- <setFont name="Helvetica" size="8" />
43- <fill color="black" />
44- <stroke color="black" />
45-
46- <drawString x="1cm" y="13" style= "terp_pie">SISB / [[ user.login ]] / Fecha de Impresion: [[formatLang(time.strftime('%Y-%m-%d'),date=True)]], [[get_hour_date()]] / Pagina:<pageNumber/></drawString>
47- <drawString x="1cm" y="750" style="estilo2">[[ company.partner_id.name ]]</drawString>
48- <drawString x="1cm" y="740" style="estilo4">[[ company.partner_id.vat[2:] or '']]</drawString>
49-
50- <drawString x="17cm" y="750">[[get_final_date()]]</drawString>
51- <drawString x="17cm" y="740">[[get_hour_date()]]</drawString>
52-
53-
54-
55- </pageGraphics>
56- </pageTemplate>
57- </template>
58-
59
60 <story>
61 <para style="P2">[[ repeatIn(data['form']['perso'],'o') ]]</para>
62 <pto>
63+ <pto_header>
64+ <blockTable colWidths="2cm,3cm,7cm,2cm,2cm,2cm" style="Table2">
65+ <tr>
66+ <td>
67+ <para style="P10">Fecha</para>
68+ </td>
69+ <td>
70+ <para style="P10">Mes</para>
71+ </td>
72+ <td>
73+ <para style="P10">Concepto</para>
74+ </td>
75+
76+ <td>
77+ <para style="P10">Tasa</para>
78+ </td>
79+ <td>
80+ <para style="P10">Deposito</para>
81+ </td>
82+ <td>
83+ <para style="P10">Saldo</para>
84+ </td>
85+ </tr>
86+ </blockTable>
87+ </pto_header>
88 <section>
89
90- <blockTable colWidths="450.0" style="Table1">
91+ <blockTable colWidths="18cm" style="Table1">
92 <tr>
93 <td>
94 <para style="P10" alignment="left">Datos de Trabajador</para>
95@@ -152,7 +167,10 @@
96
97 <section>
98
99+<!--
100 <blockTable colWidths="50.0,75.0,175.0,50.0,50.0,50.0" style="Table2">
101+-->
102+ <blockTable colWidths="2cm,3cm,7cm,2cm,2cm,2cm" style="Table2">
103 <tr>
104 <td>
105 <para style="P10">Fecha</para>
106
107=== modified file 'reportes_nomina/report/prestaciones.rml'
108--- reportes_nomina/report/prestaciones.rml 2013-08-08 19:47:32 +0000
109+++ reportes_nomina/report/prestaciones.rml 2015-04-15 18:30:42 +0000
110@@ -1,8 +1,23 @@
111 <?xml version="1.0"?>
112 <document filename="test.pdf">
113- <template pageSize="(21cm,27cm)" title="prestaciones" author="Anthony Gudiño" allowSplitting="20">
114-
115+ <template pageSize="(21.59cm,27.94cm)" title="Compensacion" author="Industrias Diana, C.A." allowSplitting="100">
116+ <pageTemplate id="first">
117+ <frame id="first" x1="2cm" y1="1cm" width="18cm" height="23.5cm"/>
118+ <pageGraphics>
119+ <drawString x="7cm" y="700">Estado de Cuentas Prestaciones Sociales</drawString>
120+
121+ <setFont name="Helvetica" size="8" />
122+ <fill color="black" />
123+ <stroke color="black" />
124+ <drawString x="1cm" y="750" style="estilo2">[[ company.partner_id.name ]]</drawString>
125+ <drawString x="1cm" y="740" style="estilo4">[[ company.partner_id.vat[2:] or '']]</drawString>
126
127+ <drawString x="17cm" y="750">[[get_final_date()]]</drawString>
128+ <drawString x="17cm" y="740">[[get_hour_date()]]</drawString>
129+ <drawString x="10mm" y="5mm">SISB / [[ user.login ]] / Fecha de Impresion: [[formatLang(time.strftime('%Y-%m-%d'),date=True)]] [[time.strftime('%H:%m')]] / Pagina:<pageNumber/> </drawString>
130+ </pageGraphics>
131+ </pageTemplate>
132+ </template>
133
134 <stylesheet>
135
136@@ -88,38 +103,36 @@
137
138 </stylesheet>
139
140-
141- <pageTemplate id="first">
142- <frame id="first" x1="2cm" y1="-1cm" width="20cm" height="25cm"/>
143-
144- <pageGraphics>
145-
146- <drawString x="7cm" y="700">Estado de cuentas prestaciones sociales</drawString>
147-
148- <setFont name="Helvetica" size="8" />
149- <fill color="black" />
150- <stroke color="black" />
151-
152- <drawString x="1cm" y="13" style= "terp_pie">SISB / [[ user.login ]] / Fecha de Impresion: [[formatLang(time.strftime('%Y-%m-%d'),date=True)]], [[get_hour_date()]] / Pagina:<pageNumber/></drawString>
153- <drawString x="1cm" y="750" style="estilo2">[[ company.partner_id.name ]]</drawString>
154- <drawString x="1cm" y="740" style="estilo4">[[ company.partner_id.vat[2:] or '']]</drawString>
155-
156- <drawString x="17cm" y="750">[[get_final_date()]]</drawString>
157- <drawString x="17cm" y="740">[[get_hour_date()]]</drawString>
158-
159-
160-
161- </pageGraphics>
162- </pageTemplate>
163- </template>
164-
165
166 <story>
167 <para style="P2">[[ repeatIn(data['form']['perso'],'o') ]]</para>
168 <pto>
169+ <pto_header>
170+ <blockTable colWidths="2cm,2cm,8cm,1cm,2cm,2cm" style="Table2">
171+ <tr>
172+ <td>
173+ <para style="P10">Fecha</para>
174+ </td>
175+ <td>
176+ <para style="P10">Mes</para>
177+ </td>
178+ <td>
179+ <para style="P10">Concepto</para>
180+ </td>
181+ <td>
182+ <para style="P10">Dias</para>
183+ </td>
184+ <td>
185+ <para style="P10">Total</para>
186+ </td>
187+ <td>
188+ <para style="P10">Saldo</para>
189+ </td>
190+ </tr>
191+ </blockTable>
192+ </pto_header>
193 <section>
194-
195- <blockTable colWidths="425.0" style="Table1">
196+ <blockTable colWidths="17cm" style="Table1">
197 <tr>
198 <td>
199 <para style="P10" alignment="left">Datos de Trabajador</para>
200@@ -147,8 +160,8 @@
201
202
203 <section>
204-
205- <blockTable colWidths="50.0,50.0,200.0,25.0,50.0,50.0" style="Table2">
206+
207+ <blockTable colWidths="2cm,2cm,8cm,1cm,2cm,2cm" style="Table2">
208 <tr>
209 <td>
210 <para style="P10">Fecha</para>
211
212=== modified file 'reportes_nomina/wizard/intereses_wizard.py'
213--- reportes_nomina/wizard/intereses_wizard.py 2013-10-24 18:48:39 +0000
214+++ reportes_nomina/wizard/intereses_wizard.py 2015-04-15 18:30:42 +0000
215@@ -106,11 +106,7 @@
216 m = g[0].upper()
217 y = g[1]
218
219- fe = y +"-"+ meses[m] + "-01"
220- fes = datetime.datetime.strptime(fe, "%Y-%m-%d")
221-
222- dateMonthEnd="%s-%s-%s" % (fes.year, fes.month, calendar.monthrange(fes.year, fes.month)[1])
223-
224+ dateMonthEnd = y +"-"+ meses[m] + "-" + str(calendar.monthrange(int(y),int(meses[m]))[1])
225 lista.append({'fecha':dateMonthEnd, 'cd':dat.concept_id.code, 'concepto':dat.concept_id.name, 'mess':m, 'interes':h.interes_prest, 'total':dat.amount})
226
227 lista.sort(key=lambda x: x['fecha'])

Subscribers

People subscribed via source and target branches