Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in-yearly-salary-detail-ssh into lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in

  1. trunk-qwebreport-l10n_in-yearly-salary-detail-ssh
  2. Merge into trunk-qwebreport-l10n_in
Proposed by Sunil Sharma(OpenERP)
Status: Merged
Merged at revision: 9360
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in-yearly-salary-detail-ssh
Merge into: lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in
Diff against target: 804 lines (+137/-600)
6 files modified
l10n_in_hr_payroll/__openerp__.py (+1/-0)
l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml (+3/-2)
l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py (+8/-3)
l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml (+0/-588)
l10n_in_hr_payroll/view/report_hr_yearly_salary_detail.xml (+123/-0)
l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py (+2/-7)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in-yearly-salary-detail-ssh
Reviewer Review Type Date Requested Status
Atul Patel(OpenERP) Pending
Review via email: mp+216818@code.launchpad.net

Description of the change

Hello,

 Add a QwebReport and remove rml report in l10n_in_hr_payroll modules.

Thanks
Sunil Sharma (SSH)

To post a comment you must log in.
Revision history for this message
Atul Patel(OpenERP) (atp-openerp) wrote :

Hello,

you forgot to remove related sxw file.
I merged it with that fix.

Thanks for work.

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-24 06:44:45 +0000
3+++ l10n_in_hr_payroll/__openerp__.py 2014-04-24 15:46:28 +0000
4@@ -55,6 +55,7 @@
5 'wizard/hr_yearly_salary_detail_view.xml',
6 'report/payment_advice_report_view.xml',
7 'report/payslip_report_view.xml',
8+ 'view/report_hr_yearly_salary_detail.xml',
9
10 ],
11 'test': [
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-24 06:44:45 +0000
15+++ l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml 2014-04-24 15:46:28 +0000
16@@ -30,8 +30,9 @@
17 auto="False"
18 id="yearly_salary"
19 model="yearly.salary.detail"
20- name="salary.detail.byyear"
21- rml="l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml"
22+ name="l10n_in_hr_payroll.report_hr_yearly_salary"
23+ file="l10n_in_hr_payroll.report_hr_yearly_salary"
24+ report_type="qweb-pdf"
25 string="Yearly Salary by Employee" />
26
27 </data>
28
29=== modified file 'l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py'
30--- l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py 2012-12-06 14:56:32 +0000
31+++ l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py 2014-04-24 15:46:28 +0000
32@@ -22,6 +22,7 @@
33 import time
34 import datetime
35 from openerp.report import report_sxw
36+from openerp.osv import osv
37
38 class employees_yearly_salary_report(report_sxw.rml_parse):
39
40@@ -64,8 +65,8 @@
41 current_year = last_year
42 current_month = current_month + 1
43 for c in range(0, (12-no_months)):
44- mnth_name.append('None')
45- self.mnths.append('None')
46+ mnth_name.append('')
47+ self.mnths.append('')
48 return [mnth_name]
49
50 def get_employee(self, form):
51@@ -159,6 +160,10 @@
52 def get_total(self):
53 return self.total
54
55-report_sxw.report_sxw('report.salary.detail.byyear', 'yearly.salary.detail', 'hr_payroll/report/report_hr_yearly_salary_detail.rml', parser=employees_yearly_salary_report, header='internal landscape')
56+class wrapped_report_payslip(osv.AbstractModel):
57+ _name = 'report.l10n_in_hr_payroll.report_hr_yearly_salary'
58+ _inherit = 'report.abstract_report'
59+ _template = 'l10n_in_hr_payroll.report_hr_yearly_salary'
60+ _wrapped_report_class = employees_yearly_salary_report
61
62 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
63\ No newline at end of file
64
65=== removed file 'l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml'
66--- l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml 2012-10-03 07:14:21 +0000
67+++ l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml 1970-01-01 00:00:00 +0000
68@@ -1,588 +0,0 @@
69-<?xml version="1.0"?>
70-<document filename="hr_yearly_salary_detail_report.pdf">
71- <template pageSize="(842.0,595.0)" title="hr_yearly_salary_detail_report" author="Openerp S.A." allowSplitting="20">
72- <pageTemplate id="first">
73- <frame id="first" x1="28.0" y1="57.0" width="786" height="481"/>
74- </pageTemplate>
75- </template>
76- <stylesheet>
77- <blockTableStyle id="Standard_Outline">
78- <blockAlignment value="LEFT"/>
79- <blockValign value="TOP"/>
80- </blockTableStyle>
81- <blockTableStyle id="Table12">
82- <blockAlignment value="LEFT"/>
83- <blockValign value="TOP"/>
84- </blockTableStyle>
85- <blockTableStyle id="Table2">
86- <blockAlignment value="LEFT"/>
87- <blockValign value="TOP"/>
88- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
89- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
90- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
91- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
92- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
93- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
94- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
95- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
96- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
97- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
98- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
99- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
100- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
101- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
102- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
103- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
104- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
105- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
106- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
107- </blockTableStyle>
108- <blockTableStyle id="Table3">
109- <blockAlignment value="LEFT"/>
110- <blockValign value="TOP"/>
111- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
112- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
113- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
114- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
115- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
116- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
117- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
118- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
119- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
120- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
121- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
122- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
123- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
124- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
125- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
126- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
127- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
128- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
129- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
130- </blockTableStyle>
131- <blockTableStyle id="Table5">
132- <blockAlignment value="LEFT"/>
133- <blockValign value="TOP"/>
134- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
135- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
136- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
137- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
138- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
139- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
140- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
141- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
142- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
143- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
144- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
145- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
146- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
147- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
148- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
149- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
150- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
151- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
152- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
153- </blockTableStyle>
154- <blockTableStyle id="Table4">
155- <blockAlignment value="LEFT"/>
156- <blockValign value="TOP"/>
157- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
158- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
159- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
160- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
161- <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
162- <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
163- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
164- <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
165- <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
166- <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
167- <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
168- <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
169- <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
170- <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
171- <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
172- <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
173- <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
174- <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
175- <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
176- <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
177- <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
178- <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
179- <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
180- <lineStyle kind="LINEBELOW" colorName="#000000" start="11,-1" stop="11,-1"/>
181- <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
182- <lineStyle kind="LINEBELOW" colorName="#000000" start="12,-1" stop="12,-1"/>
183- <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
184- <lineStyle kind="LINEBELOW" colorName="#000000" start="13,-1" stop="13,-1"/>
185- </blockTableStyle>
186- <blockTableStyle id="Table7">
187- <blockAlignment value="LEFT"/>
188- <blockValign value="TOP"/>
189- </blockTableStyle>
190- <blockTableStyle id="Table6">
191- <blockAlignment value="LEFT"/>
192- <blockValign value="TOP"/>
193- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
194- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
195- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
196- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
197- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
198- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
199- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
200- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
201- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
202- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
203- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
204- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
205- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
206- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
207- </blockTableStyle>
208- <blockTableStyle id="Table10">
209- <blockAlignment value="LEFT"/>
210- <blockValign value="TOP"/>
211- </blockTableStyle>
212- <blockTableStyle id="Table8">
213- <blockAlignment value="LEFT"/>
214- <blockValign value="TOP"/>
215- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
216- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
217- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
218- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
219- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
220- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
221- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
222- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
223- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
224- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
225- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
226- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
227- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
228- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
229- </blockTableStyle>
230- <blockTableStyle id="Table11">
231- <blockAlignment value="LEFT"/>
232- <blockValign value="TOP"/>
233- </blockTableStyle>
234- <blockTableStyle id="Table9">
235- <blockAlignment value="LEFT"/>
236- <blockValign value="TOP"/>
237- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
238- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
239- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
240- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
241- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
242- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
243- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
244- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
245- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
246- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
247- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
248- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
249- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
250- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
251- </blockTableStyle>
252- <blockTableStyle id="Table1">
253- <blockAlignment value="LEFT"/>
254- <blockValign value="TOP"/>
255- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
256- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
257- <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
258- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
259- <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
260- <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
261- <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
262- <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
263- <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
264- <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
265- <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
266- <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
267- <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
268- <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
269- </blockTableStyle>
270- <initialize>
271- <paraStyle name="all" alignment="justify"/>
272- </initialize>
273- <paraStyle name="Standard" fontName="Helvetica"/>
274- <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
275- <paraStyle name="Text body" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
276- <paraStyle name="List" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
277- <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
278- <paraStyle name="Index" fontName="Helvetica"/>
279- <paraStyle name="Table Contents" fontName="Helvetica"/>
280- <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
281- <paraStyle name="Drawing" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
282- <paraStyle name="Header" fontName="Helvetica"/>
283- <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
284- <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
285- <paraStyle name="Signature" fontName="Helvetica"/>
286- <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
287- <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
288- <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
289- <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
290- <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
291- <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
292- <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
293- <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
294- <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
295- <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
296- <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
297- <paraStyle name="Salutation" fontName="Helvetica"/>
298- <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
299- <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
300- <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
301- <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
302- <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
303- <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
304- <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
305- <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
306- <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
307- <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
308- <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
309- <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
310- <paraStyle name="terp_tblheader_Details" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
311- <paraStyle name="Footer" fontName="Helvetica"/>
312- <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
313- <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
314- <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
315- <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
316- <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
317- <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
318- <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
319- <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
320- <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
321- <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
322- <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
323- <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
324- <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
325- <images/>
326- </stylesheet>
327- <story>
328- <para style="terp_default_8">[[ repeatIn(get_employee(data['form']), 'o') ]] </para>
329- <blockTable colWidths="785.0" style="Table12">
330- <tr>
331- <td>
332- <para style="terp_default_Centre_9">From <u>[[ formatLang(data['form']['date_from'], date=True) ]]</u> To <u>[[ formatLang(data['form']['date_to'], date=True) ]]</u></para>
333- </td>
334- </tr>
335- </blockTable>
336- <para style="terp_default_Centre_9">
337- <font color="white"> </font>
338- </para>
339- <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table2">
340- <tr>
341- <td>
342- <para style="terp_tblheader_Details">Employee Code</para>
343- </td>
344- <td>
345- <para style="terp_default_9">[[ o.identification_id ]]</para>
346- </td>
347- <td>
348- <para style="terp_tblheader_Details">Department</para>
349- </td>
350- <td>
351- <para style="terp_default_9">[[ o.department_id and o.department_id.name or '' ]]</para>
352- </td>
353- <td>
354- <para style="terp_tblheader_Details">Bank</para>
355- </td>
356- <td>
357- <para style="terp_default_9">[[ o.bank_account_id and o.bank_account_id.bank.name or '' ]]</para>
358- </td>
359- </tr>
360- </blockTable>
361- <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table3">
362- <tr>
363- <td>
364- <para style="terp_tblheader_Details">Employee Name</para>
365- </td>
366- <td>
367- <para style="terp_default_9">[[ o.name ]]</para>
368- </td>
369- <td>
370- <para style="terp_tblheader_Details">Other No.</para>
371- </td>
372- <td>
373- <para style="terp_default_9">[[ o.otherid or '' ]]</para>
374- </td>
375- <td>
376- <para style="terp_tblheader_Details">Address</para>
377- </td>
378- <td>
379- <para style="terp_default_9">[[o.address_home_id and o.address_home_id.name or '' ]]</para>
380- </td>
381- </tr>
382- </blockTable>
383- <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table5">
384- <tr>
385- <td>
386- <para style="terp_tblheader_Details">Designation</para>
387- </td>
388- <td>
389- <para style="terp_default_9">[[ o.job_id and o.job_id.name or '' ]]</para>
390- </td>
391- <td>
392- <para style="terp_tblheader_Details">Phone No.</para>
393- </td>
394- <td>
395- <para style="terp_default_9">[[ o.work_phone or '' ]]</para>
396- </td>
397- <td>
398- <para style="terp_tblheader_Details">E-mail Address</para>
399- </td>
400- <td>
401- <para style="terp_default_9">[[o.work_email or '' ]]</para>
402- </td>
403- </tr>
404- </blockTable>
405- <para style="terp_default_space">
406- <font color="white"> </font>
407- </para>
408- <section>
409- <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
410- <para style="terp_default_1">[[ get_employee_detail((data['form']),o) ]]</para>
411- <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table4">
412- <tr>
413- <td>
414- <para style="terp_tblheader_Details">Title</para>
415- </td>
416- <td>
417- <para style="terp_tblheader_Details_Right">[[ m[0] != 'None' and m[0] or '' ]]</para>
418- </td>
419- <td>
420- <para style="terp_tblheader_Details_Right">[[ m[1] != 'None' and m[1] or '' ]]</para>
421- </td>
422- <td>
423- <para style="terp_tblheader_Details_Right">[[ m[2] != 'None' and m[2] or '' ]]</para>
424- </td>
425- <td>
426- <para style="terp_tblheader_Details_Right">[[ m[3] != 'None' and m[3] or '' ]]</para>
427- </td>
428- <td>
429- <para style="terp_tblheader_Details_Right">[[ m[4] != 'None' and m[4] or '' ]]</para>
430- </td>
431- <td>
432- <para style="terp_tblheader_Details_Right">[[ m[5] != 'None' and m[5] or '' ]]</para>
433- </td>
434- <td>
435- <para style="terp_tblheader_Details_Right">[[ m[6] != 'None' and m[6] or '' ]]</para>
436- </td>
437- <td>
438- <para style="terp_tblheader_Details_Right">[[ m[7] != 'None' and m[7] or '' ]]</para>
439- </td>
440- <td>
441- <para style="terp_tblheader_Details_Right">[[ m[8] != 'None' and m[8] or '' ]]</para>
442- </td>
443- <td>
444- <para style="terp_tblheader_Details_Right">[[ m[9] != 'None' and m[9] or '' ]]</para>
445- </td>
446- <td>
447- <para style="terp_tblheader_Details_Right">[[ m[10] != 'None' and m[10] or '' ]]</para>
448- </td>
449- <td>
450- <para style="terp_tblheader_Details_Right">[[ m[11] != 'None' and m[11] or '' ]]</para>
451- </td>
452- <td>
453- <para style="terp_tblheader_Details_Right">Total</para>
454- </td>
455- </tr>
456- </blockTable>
457- <para style="terp_default_1">
458- <font color="white"> </font>
459- </para>
460- <section>
461- <blockTable colWidths="803.0" style="Table7">
462- <tr>
463- <td>
464- <para style="terp_tblheader_Details">Allowances with Basic: </para>
465- </td>
466- </tr>
467- </blockTable>
468- <section>
469- <para style="terp_default_1">[[ repeatIn(get_allow(),'e1') ]]</para>
470- <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table6">
471- <tr>
472- <td>
473- <para style="terp_default_9"><b>[[ e1[0] in ["Basic","Gross"] and e1[0] ]]</b> </para>
474- <para style="terp_default_9">[[ e1[0] not in ["Basic","Gross"] and e1[0] ]]</para>
475- </td>
476- <td>
477- <para style="terp_default_Right_8">
478- <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]]</font>
479- <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]]</font>
480- </para>
481- </td>
482- <td>
483- <para style="terp_default_Right_8">
484- <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]]</font>
485- <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]]</font>
486- </para>
487- </td>
488- <td>
489- <para style="terp_default_Right_8">
490- <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]]</font>
491- <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]]</font>
492- </para>
493- </td>
494- <td>
495- <para style="terp_default_Right_8">
496- <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]]</font>
497- <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]]</font>
498- </para>
499- </td>
500- <td>
501- <para style="terp_default_Right_8">
502- <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]]</font>
503- <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]]</font>
504- </para>
505- </td>
506- <td>
507- <para style="terp_default_Right_8">
508- <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]]</font>
509- <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]]</font>
510- </para>
511- </td>
512- <td>
513- <para style="terp_default_Right_8">
514- <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]]</font>
515- <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]]</font>
516- </para>
517- </td>
518- <td>
519- <para style="terp_default_Right_8">
520- <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]]</font>
521- <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]]</font>
522- </para>
523- </td>
524- <td>
525- <para style="terp_default_Right_8">
526- <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]]</font>
527- <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]]</font>
528- </para>
529- </td>
530- <td>
531- <para style="terp_default_Right_8">
532- <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]]</font>
533- <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]]</font>
534- </para>
535- </td>
536- <td>
537- <para style="terp_default_Right_8">
538- <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]]</font>
539- <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]]</font>
540- </para>
541- </td>
542- <td>
543- <para style="terp_default_Right_8">
544- <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]]</font>
545- <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]]</font>
546- </para>
547- </td>
548- <td>
549- <para style="terp_default_Right_9_Bold">[[ formatLang(e1[13],currency_obj= company.currency_id) ]] </para>
550- </td>
551- </tr>
552- </blockTable>
553- </section>
554- <blockTable colWidths="803.0" style="Table10">
555- <tr>
556- <td>
557- <para style="terp_tblheader_Details">Deductions: </para>
558- </td>
559- </tr>
560- </blockTable>
561- <section>
562- <para style="terp_default_1">[[ repeatIn(get_deduct(),'e2') ]]</para>
563- <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table8">
564- <tr>
565- <td>
566- <para style="terp_default_9"><b>[[ e2[0] in ["Net"] and e2[0] ]]</b> </para>
567- <para style="terp_default_9">[[ e2[0] not in ["Net"] and e2[0] ]]</para>
568- </td>
569- <td>
570- <para style="terp_default_Right_8">
571- <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]]</font>
572- <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]]</font>
573- </para>
574- </td>
575- <td>
576- <para style="terp_default_Right_8">
577- <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]]</font>
578- <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]]</font>
579- </para>
580- </td>
581- <td>
582- <para style="terp_default_Right_8">
583- <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]]</font>
584- <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]]</font>
585- </para>
586- </td>
587- <td>
588- <para style="terp_default_Right_8">
589- <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]]</font>
590- <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]]</font>
591- </para>
592- </td>
593- <td>
594- <para style="terp_default_Right_8">
595- <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]]</font>
596- <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]]</font>
597- </para>
598- </td>
599- <td>
600- <para style="terp_default_Right_8">
601- <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]]</font>
602- <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]]</font>
603- </para>
604- </td>
605- <td>
606- <para style="terp_default_Right_8">
607- <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]]</font>
608- <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]]</font>
609- </para>
610- </td>
611- <td>
612- <para style="terp_default_Right_8">
613- <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]]</font>
614- <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]]</font>
615- </para>
616- </td>
617- <td>
618- <para style="terp_default_Right_8">
619- <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]]</font>
620- <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]]</font>
621- </para>
622- </td>
623- <td>
624- <para style="terp_default_Right_8">
625- <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]]</font>
626- <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]]</font>
627- </para>
628- </td>
629- <td>
630- <para style="terp_default_Right_8">
631- <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]]</font>
632- <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]]</font>
633- </para>
634- </td>
635- <td>
636- <para style="terp_default_Right_8">
637- <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]</font>
638- <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]</font>
639- </para>
640- </td>
641- <td>
642- <para style="terp_default_Right_9_Bold">[[ formatLang(e2[13],currency_obj= company.currency_id) ]] </para>
643- </td>
644- </tr>
645- </blockTable>
646- </section>
647- </section>
648- <para style="terp_default_1">
649- <font color="white"> </font>
650- </para>
651- </section>
652- <para style="terp_default_9">
653- <font color="white"> </font>
654- </para>
655- </story>
656-</document>
657
658=== added directory 'l10n_in_hr_payroll/view'
659=== added file 'l10n_in_hr_payroll/view/report_hr_yearly_salary_detail.xml'
660--- l10n_in_hr_payroll/view/report_hr_yearly_salary_detail.xml 1970-01-01 00:00:00 +0000
661+++ l10n_in_hr_payroll/view/report_hr_yearly_salary_detail.xml 2014-04-24 15:46:28 +0000
662@@ -0,0 +1,123 @@
663+<?xml version="1.0" encoding="utf-8"?>
664+<openerp>
665+<data>
666+<template id="report_hr_yearly_salary">
667+ <t t-call="report.html_container">
668+ <t t-call="report.external_layout">
669+ <div class="page">
670+ <t t-foreach="get_employee(data['form'])" t-as="employee">
671+ <h2><span t-field="employee.company_id"/></h2>
672+ <p> From
673+ <u><span t-esc="data['form']['date_from']"/></u>
674+ To <u><span t-esc="data['form']['date_to']"/></u> </p>
675+ <table class="table table-condensed table-bordered">
676+ <tr>
677+ <td><strong>Employee Code</strong></td>
678+ <td>
679+ <t t-if="employee.identification_id">
680+ <span t-field="employee.identification_id"/>
681+ </t>
682+ </td>
683+ <td><strong>Department</strong></td>
684+ <td>
685+ <t t-if="employee.department_id">
686+ <span t-field="employee.department_id.name"/>
687+ </t>
688+ </td>
689+ <td><strong>Bank</strong></td>
690+ <td>
691+ <t t-if="employee.bank_account_id">
692+ <span t-field="employee.bank_account_id.bank.name"/>
693+ </t>
694+ </td>
695+ </tr>
696+ <tr>
697+ <td><strong>Employee Name</strong></td>
698+ <td>
699+ <t t-if="employee.name">
700+ <span t-field="employee.name"/>
701+ </t>
702+ </td>
703+ <td><strong>Other No.</strong></td>
704+ <td>
705+ <t t-if="employee.otherid">
706+ <span t-field="employee.otherid"/>
707+ </t>
708+ </td>
709+ <td><strong>Address</strong></td>
710+ <td>
711+ <t t-if="employee.address_home_id">
712+ <span t-field="employee.address_home_id.name"/>
713+ </t>
714+ </td>
715+ </tr>
716+ <tr>
717+ <td><strong>Designation</strong></td>
718+ <td>
719+ <t t-if="employee.job_id">
720+ <span t-field="employee.job_id.name"/>
721+ </t>
722+ </td>
723+ <td><strong>Phone No.</strong></td>
724+ <td>
725+ <t t-if="employee.work_phone">
726+ <span t-field="employee.work_phone"/>
727+ </t>
728+ </td>
729+ <td><strong>E-mail Address</strong></td>
730+ <td>
731+ <t t-if="employee.work_email">
732+ <span t-field="employee.work_email"/>
733+ </t>
734+ </td>
735+ </tr>
736+ </table>
737+ <span t-esc="get_employee_detail(data['form'], employee)"/>
738+ <table class="table table-condensed">
739+ <thead>
740+ <tr>
741+ <th>Title</th>
742+ <t t-foreach="get_periods(data['form'])[0]" t-as="months">
743+ <th>
744+ <t t-if="months">
745+ <span t-esc="months"/>
746+ </t>
747+ </th>
748+ </t>
749+ <th>Total</th>
750+ </tr>
751+ </thead>
752+ <tr>
753+ <td><strong> Allowances with Basic:</strong></td>
754+ <t t-foreach="get_allow()" t-as="allowanc">
755+ <tr>
756+ <t t-if="allowanc[0] == 'Basic' or allowanc[0] == 'Gross'">
757+ <strong><span t-esc="allowanc[0]"/></strong>
758+ </t>
759+ <t t-if="allowanc[0] != 'Basic' and allowanc[0] == 'Gross'">
760+ <span t-esc="allowanc[0]"/>
761+ </t>
762+ </tr>
763+ </t>
764+ </tr>
765+ <tr>
766+ <td><strong>Deductions:</strong></td>
767+ <t t-foreach="get_deduct()" t-as="deduct">
768+ <tr>
769+ <t t-if="deduct[0] == 'Net'">
770+ <strong><span t-esc="deduct[0]"/></strong>
771+ </t>
772+ <t t-if="deduct[0] != 'Net'">
773+ <span t-esc="deduct[0]"/>
774+ </t>
775+ </tr>
776+ </t>
777+ </tr>
778+ </table>
779+ </t>
780+ </div>
781+ </t>
782+ </t>
783+</template>
784+</data>
785+</openerp>
786
787=== modified file 'l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py'
788--- l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py 2013-10-27 12:31:04 +0000
789+++ l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py 2014-04-24 15:46:28 +0000
790@@ -54,12 +54,7 @@
791
792 res = self.read(cr, uid, ids, context=context)
793 res = res and res[0] or {}
794- datas.update({'form': res})
795- return {
796- 'type': 'ir.actions.report.xml',
797- 'report_name': 'salary.detail.byyear',
798- 'datas': datas,
799- }
800-
801+ datas.update({'form':res})
802+ return self.pool['report'].get_action(cr, uid, ids, 'l10n_in_hr_payroll.report_hr_yearly_salary', data=datas, context=context)
803
804 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

Subscribers

People subscribed via source and target branches

to all changes: