Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in-payslip_details-rsi into lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in

  1. trunk-qwebreport-l10n_in-payslip_details-rsi
  2. Merge into trunk-qwebreport-l10n_in
Proposed by Rakesh Sindhav(OpenERP)
Status: Merged
Merged at revision: 9359
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in-payslip_details-rsi
Merge into: lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in
Diff against target: 535 lines (+105/-377)
5 files modified
l10n_in_hr_payroll/__openerp__.py (+1/-0)
l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml (+4/-4)
l10n_in_hr_payroll/report/report_payslip_details.py (+6/-1)
l10n_in_hr_payroll/report/report_payslip_details.rml (+0/-372)
l10n_in_hr_payroll/views/report_payslipdetails.xml (+94/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in-payslip_details-rsi
Reviewer Review Type Date Requested Status
OpenERP R&D Team Pending
Review via email: mp+216978@code.launchpad.net

Description of the change

Hello sir,

Here is the proposal for merging QWEB report of Pay Slip Details of l10n_in_hr_payroll module. This report is in the RML format so now i convert it into the QWEB report.

Thanks & Regard,
rsi

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 'l10n_in_hr_payroll/__openerp__.py'
2--- l10n_in_hr_payroll/__openerp__.py 2014-04-22 12:09:15 +0000
3+++ l10n_in_hr_payroll/__openerp__.py 2014-04-24 10:02:33 +0000
4@@ -49,6 +49,7 @@
5 'security/ir.model.access.csv',
6 'l10n_in_hr_payroll_report.xml',
7 'l10n_in_hr_payroll_sequence.xml',
8+ 'views/report_payslipdetails.xml',
9 'views/report_hrsalarybymonth.xml',
10 'wizard/hr_salary_employee_bymonth_view.xml',
11 'wizard/hr_yearly_salary_detail_view.xml',
12
13=== modified file 'l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml'
14--- l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml 2014-04-22 12:09:15 +0000
15+++ l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml 2014-04-24 10:02:33 +0000
16@@ -3,12 +3,12 @@
17 <data>
18
19 <report
20- auto="False"
21 id="payslip_details_report"
22 model="hr.payslip"
23- name="paylip.details.in"
24- rml="l10n_in_hr_payroll/report/report_payslip_details.rml"
25- string="PaySlip Details" />
26+ string="PaySlip Details"
27+ report_type="qweb-pdf"
28+ name="l10n_in_hr_payroll.report_payslipdetails"
29+ file="l10n_in_hr_payroll.report_payslipdetails" />
30
31 <report
32 auto="False"
33
34=== modified file 'l10n_in_hr_payroll/report/report_payslip_details.py'
35--- l10n_in_hr_payroll/report/report_payslip_details.py 2013-10-27 12:31:04 +0000
36+++ l10n_in_hr_payroll/report/report_payslip_details.py 2014-04-24 10:02:33 +0000
37@@ -20,6 +20,7 @@
38 ##############################################################################
39
40 from openerp.report import report_sxw
41+from openerp.osv import osv
42 from openerp.addons.hr_payroll import report
43
44 class payslip_details_report_in(report.report_payslip_details.payslip_details_report):
45@@ -30,6 +31,10 @@
46 'get_details_by_rule_category': self.get_details_by_rule_category,
47 })
48
49-report_sxw.report_sxw('report.paylip.details.in', 'hr.payslip', 'l10n_in_hr_payroll/report/report_payslip_details.rml', parser=payslip_details_report_in)
50+class wrapped_report_payslipdetailsin(osv.AbstractModel):
51+ _name = 'report.l10n_in_hr_payroll.report_payslipdetails'
52+ _inherit = 'report.abstract_report'
53+ _template = 'l10n_in_hr_payroll.report_payslipdetails'
54+ _wrapped_report_class = payslip_details_report_in
55
56 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
57
58=== removed file 'l10n_in_hr_payroll/report/report_payslip_details.rml'
59--- l10n_in_hr_payroll/report/report_payslip_details.rml 2012-10-02 14:45:47 +0000
60+++ l10n_in_hr_payroll/report/report_payslip_details.rml 1970-01-01 00:00:00 +0000
61@@ -1,372 +0,0 @@
62-<?xml version="1.0"?>
63-<document filename="test.pdf">
64- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
65- <pageTemplate id="first">
66- <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
67- </pageTemplate>
68- </template>
69- <stylesheet>
70- <blockTableStyle id="Standard_Outline">
71- <blockAlignment value="LEFT"/>
72- <blockValign value="TOP"/>
73- </blockTableStyle>
74- <blockTableStyle id="Table1">
75- <blockAlignment value="LEFT"/>
76- <blockValign value="TOP"/>
77- </blockTableStyle>
78- <blockTableStyle id="Table2">
79- <blockAlignment value="LEFT"/>
80- <blockValign value="TOP"/>
81- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
82- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
83- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
84- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
85- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
86- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
87- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
88- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
89- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
90- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
91- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
92- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
93- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
94- </blockTableStyle>
95- <blockTableStyle id="Table3">
96- <blockAlignment value="LEFT"/>
97- <blockValign value="TOP"/>
98- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
99- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
100- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
101- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
102- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
103- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
104- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
105- </blockTableStyle>
106- <blockTableStyle id="Table4">
107- <blockAlignment value="LEFT"/>
108- <blockValign value="TOP"/>
109- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
110- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
111- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
112- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
113- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
114- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
115- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
116- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
117- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
118- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
119- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
120- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
121- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
122- </blockTableStyle>
123- <blockTableStyle id="Table5">
124- <blockAlignment value="LEFT"/>
125- <blockValign value="TOP"/>
126- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
127- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
128- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
129- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
130- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
131- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
132- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
133- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
134- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
135- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
136- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
137- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
138- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
139- </blockTableStyle>
140- <blockTableStyle id="Table6">
141- <blockAlignment value="LEFT"/>
142- <blockValign value="TOP"/>
143- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
144- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
145- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
146- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
147- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
148- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
149- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
150- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
151- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
152- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
153- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
154- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
155- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
156- </blockTableStyle>
157- <blockTableStyle id="Table10">
158- <blockAlignment value="LEFT"/>
159- <blockValign value="TOP"/>
160- </blockTableStyle>
161- <blockTableStyle id="Table11">
162- <blockAlignment value="LEFT"/>
163- <blockValign value="TOP"/>
164- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
165- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
166- <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
167- <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
168- </blockTableStyle>
169- <blockTableStyle id="Table12">
170- <blockAlignment value="LEFT"/>
171- <blockValign value="TOP"/>
172- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
173- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
174- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
175- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
176- </blockTableStyle>
177- <blockTableStyle id="Table8">
178- <blockAlignment value="LEFT"/>
179- <blockValign value="TOP"/>
180- </blockTableStyle>
181- <blockTableStyle id="Table7">
182- <blockAlignment value="LEFT"/>
183- <blockValign value="TOP"/>
184- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
185- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
186- <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
187- <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
188- <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
189- <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
190- </blockTableStyle>
191- <blockTableStyle id="Table16">
192- <blockAlignment value="LEFT"/>
193- <blockValign value="TOP"/>
194- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
195- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
196- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
197- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
198- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
199- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
200- </blockTableStyle>
201- <blockTableStyle id="Table13">
202- <blockAlignment value="LEFT"/>
203- <blockValign value="TOP"/>
204- </blockTableStyle>
205- <initialize>
206- <paraStyle name="all" alignment="justify"/>
207- </initialize>
208- <paraStyle name="P1" fontName="Helvetica" fontSize="2.0" leading="3"/>
209- <paraStyle name="P2" fontName="Helvetica" fontSize="2.0" leading="3"/>
210- <paraStyle name="P3" rightIndent="-56.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
211- <paraStyle name="P4" rightIndent="-56.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
212- <paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
213- <paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
214- <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
215- <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
216- <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
217- <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
218- <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
219- <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
220- <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
221- <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
222- <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
223- <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
224- <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
225- <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
226- <paraStyle name="P19" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT"/>
227- <paraStyle name="P20" fontName="Helvetica" fontSize="2.0" leading="3"/>
228- <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
229- <paraStyle name="P22" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
230- <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
231- <paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
232- <paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
233- <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
234- <paraStyle name="Standard" fontName="Helvetica"/>
235- <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
236- <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
237- <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
238- <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
239- <paraStyle name="Index" fontName="Helvetica"/>
240- <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
241- <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
242- <paraStyle name="terp_default_space" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
243- <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
244- <paraStyle name="terp_default_Centre_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
245- <paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
246- <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
247- <paraStyle name="terp_default_Bold_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
248- <paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
249- <paraStyle name="terp_default_10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
250- <paraStyle name="Table Contents" fontName="Helvetica"/>
251- <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
252- <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
253- <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
254- <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
255- <paraStyle name="payslip_adj" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
256- <images/>
257- </stylesheet>
258- <story>
259- <para style="P3">[[repeatIn(objects,'o')]]</para>
260- <blockTable colWidths="539.0" style="Table1">
261- <tr>
262- <td>
263- <para style="P8">Pay Slip Details</para>
264- </td>
265- </tr>
266- </blockTable>
267- <para style="terp_header_Centre">
268- <font face="Helvetica" size="6.0">[[o.credit_note==False and removeParentNode('para')]]</font>
269- <font face="Helvetica-Bold" size="14.0">Credit</font>
270- <font face="Helvetica" size="14.0"/>
271- <font face="Helvetica-Bold" size="14.0">Note</font>
272- </para>
273- <para style="P9">([[o.name or removeParentNode('para')]])</para>
274- <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table2">
275- <tr>
276- <td>
277- <para style="P16">Name</para>
278- </td>
279- <td>
280- <para style="P16">[[o.employee_id.name]]</para>
281- </td>
282- <td>
283- <para style="P16">Designation </para>
284- </td>
285- <td>
286- <para style="P5">[[ o.employee_id.job_id.name or '' ]]</para>
287- </td>
288- </tr>
289- </blockTable>
290- <blockTable colWidths="63.0,476.0" style="Table3">
291- <tr>
292- <td>
293- <para style="terp_default_Bold_8">
294- <font face="Helvetica">Address </font>
295- </para>
296- </td>
297- <td>
298- <para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]</para>
299- </td>
300- </tr>
301- </blockTable>
302- <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table4">
303- <tr>
304- <td>
305- <para style="P16">Email</para>
306- </td>
307- <td>
308- <para style="P5">[[ o.employee_id.work_email or '' ]]</para>
309- </td>
310- <td>
311- <para style="terp_default_Bold_8">
312- <font face="Helvetica">Identification No</font>
313- </para>
314- </td>
315- <td>
316- <para style="P5">[[ o.employee_id.identification_id or '' ]]</para>
317- </td>
318- </tr>
319- </blockTable>
320- <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table5">
321- <tr>
322- <td>
323- <para style="P16">Reference</para>
324- </td>
325- <td>
326- <para style="P5">[[ o.number or '' ]]</para>
327- </td>
328- <td>
329- <para style="P16">Bank Account</para>
330- </td>
331- <td>
332- <para style="P5">[[ o.employee_id.otherid or '' ]]</para>
333- </td>
334- </tr>
335- </blockTable>
336- <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table6">
337- <tr>
338- <td>
339- <para style="P16">Date From</para>
340- </td>
341- <td>
342- <para style="P5">[[ o.date_from or '']]</para>
343- </td>
344- <td>
345- <para style="terp_default_Bold_8">
346- <font face="Helvetica" size="8.0">Date To</font>
347- </para>
348- </td>
349- <td>
350- <para style="P5">[[ o.date_to or '' ]]</para>
351- </td>
352- </tr>
353- </blockTable>
354- <para style="P7"/>
355- <para style="P11">
356- <font color="white"> </font>
357- </para>
358- <para style="P5">
359- <font color="white"> </font>
360- </para>
361- <blockTable colWidths="539.0" style="Table10">
362- <tr>
363- <td>
364- <para style="P10">Details by Salary Rule Category: </para>
365- </td>
366- </tr>
367- </blockTable>
368- <blockTable colWidths="54.0,388.0,97.0" style="Table11">
369- <tr>
370- <td>
371- <para style="P15">Code</para>
372- </td>
373- <td>
374- <para style="P15">Salary Rule Category</para>
375- </td>
376- <td>
377- <para style="P14">Total</para>
378- </td>
379- </tr>
380- </blockTable>
381- <para style="P1">
382- <font color="white"> </font>
383- </para>
384- <section>
385- <para style="P16">[[repeatIn(get_details_by_rule_category(o.details_by_salary_rule_category),'h') ]]</para>
386- <blockTable colWidths="54.0,388.0,97.0" style="Table12">
387- <tr>
388- <td>
389- <para style="P16">
390- <font face="Helvetica">[[ h['code'] ]]</font>
391- <font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]]</font>
392- </para>
393- </td>
394- <td>
395- <para style="P17"><font face="Helvetica" color="white">[[ '..'*h['level'] ]]</font>[[ h['rule_category'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]</font></para>
396- </td>
397- <td>
398- <para style="P6">[[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
399- </td>
400- </tr>
401- </blockTable>
402- </section>
403- <para style="P7">
404- <font color="white"> </font>
405- </para>
406-
407- <blockTable colWidths="269.0,269.0" style="Table13">
408- <tr>
409- <td>
410- <para style="P5">
411- <font color="white"> </font>
412- </para>
413- </td>
414- <td>
415- <para style="P12">
416- <font color="white"> </font>
417- </para>
418- <para style="P12">
419- <font color="white"> </font>
420- </para>
421- <para style="P12">
422- <font color="white"> </font>
423- </para>
424- <para style="P12">Authorized Signature </para>
425- </td>
426- </tr>
427- </blockTable>
428- <para style="P4">
429- <font color="white"> </font>
430- </para>
431- </story>
432-</document>
433-
434
435=== removed file 'l10n_in_hr_payroll/report/report_payslip_details.sxw'
436Binary files l10n_in_hr_payroll/report/report_payslip_details.sxw 2012-10-02 14:45:47 +0000 and l10n_in_hr_payroll/report/report_payslip_details.sxw 1970-01-01 00:00:00 +0000 differ
437=== added file 'l10n_in_hr_payroll/views/report_payslipdetails.xml'
438--- l10n_in_hr_payroll/views/report_payslipdetails.xml 1970-01-01 00:00:00 +0000
439+++ l10n_in_hr_payroll/views/report_payslipdetails.xml 2014-04-24 10:02:33 +0000
440@@ -0,0 +1,94 @@
441+<?xml version="1.0" encoding="utf-8"?>
442+<openerp>
443+<data>
444+ <template id="report_payslipdetails">
445+ <t t-call="report.html_container">
446+ <t t-call="report.external_layout">
447+ <t t-foreach="docs" t-as="o">
448+ <div class="page">
449+ <h2>Pay Slip Details</h2>
450+ <p t-field="o.name"/>
451+
452+ <table class="table table-condensed table-bordered">
453+ <tr>
454+ <td><strong>Name</strong></td>
455+ <td><span t-field="o.employee_id"/></td>
456+ <td><strong>Designation</strong></td>
457+ <td><span t-field="o.employee_id.job_id"/></td>
458+ </tr>
459+ <tr>
460+ <td><strong>Address</strong></td>
461+ <td colspan="3">
462+ <div t-field="o.employee_id.address_home_id"
463+ t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/>
464+ </td>
465+ </tr>
466+ <tr>
467+ <td><strong>Email</strong></td>
468+ <td><span t-field="o.employee_id.work_email"/></td>
469+ <td><strong>Identification No</strong></td>
470+ <td><span t-field="o.employee_id.job_id"/></td>
471+ </tr>
472+ <tr>
473+ <td><strong>Reference</strong></td>
474+ <td><span t-field="o.number"/></td>
475+ <td><strong>Bank Account</strong></td>
476+ <td><span t-field="o.employee_id.otherid"/></td>
477+ </tr>
478+ <tr>
479+ <td><strong>Date From</strong></td>
480+ <td><span t-field="o.date_from"/></td>
481+ <td><strong>Date To</strong></td>
482+ <td><span t-field="o.date_to"/></td>
483+ </tr>
484+ </table>
485+
486+ <h3>Details by Salary Rule Category</h3>
487+ <table class="table table-condensed mb32">
488+ <thead>
489+ <tr>
490+ <th>Code</th>
491+ <th>Salary Rule Category</th>
492+ <th>Total</th>
493+ </tr>
494+ </thead>
495+ <tbody>
496+ <t t-foreach="get_details_by_rule_category(o.details_by_salary_rule_category)" t-as="h">
497+ <t t-if="h['level']==0">
498+ <tr>
499+ <td>
500+ <strong><span t-esc="h['code']"/></strong>
501+ </td>
502+ <td>
503+ <strong><span t-esc="h['rule_category']"/></strong>
504+ </td>
505+ <td>
506+ <strong><span t-esc="formatLang(h['total'], currency_obj=o.company_id.currency_id)"/></strong>
507+ </td>
508+ </tr>
509+ </t>
510+ <t t-if="h['level']!=0">
511+ <tr>
512+ <td>
513+ <span t-esc="h['code']"/>
514+ </td>
515+ <td>
516+ <span t-esc="'..'*h['level']"/><span t-esc="h['rule_category']"/>
517+ </td>
518+ <td>
519+ <span t-esc="formatLang(h['total'], currency_obj=o.company_id.currency_id)"/>
520+ </td>
521+ </tr>
522+ </t>
523+ </t>
524+ </tbody>
525+ </table>
526+
527+ <p class="text-right"><strong>Authorized signature</strong></p>
528+ </div>
529+ </t>
530+ </t>
531+ </t>
532+ </template>
533+</data>
534+</openerp>
535\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: