openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #05497
[Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-report-psi into lp:~openerp-dev/openobject-addons/trunk-payroll
Purnendu Singh (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-payroll-report-psi into lp:~openerp-dev/openobject-addons/trunk-payroll.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-report-psi/+merge/57676
Hello sir,
I have improve the payslip report as per requirement and new changes.
Please go through it and please guide me if there are any changes.
Thanks and regards,
Purnendu Singh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-report-psi/+merge/57676
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-payroll-report-psi into lp:~openerp-dev/openobject-addons/trunk-payroll.
=== modified file 'hr_payroll/report/report_payslip.py'
--- hr_payroll/report/report_payslip.py 2011-04-07 05:29:46 +0000
+++ hr_payroll/report/report_payslip.py 2011-04-14 13:23:16 +0000
@@ -37,8 +37,8 @@
'get_deductions':self.get_deductions,
'get_leave': self.get_leave,
'get_payslip_lines': self.get_payslip_lines,
-# 'get_details_by_salary_head': self.get_details_by_salary_head
- })
+ 'get_details_by_salary_head': self.get_details_by_salary_head,
+ })
def convert(self, amount, cur):
amt_en = amount_to_text_en.amount_to_text(amount, 'en', cur)
@@ -84,7 +84,7 @@
date = datetime.strptime(obj.date, '%Y-%m-%d')
res['mname']= date.strftime('%B')+"-"+date.strftime('%Y')
return res['mname']
-
+
def get_payslip_lines(self, obj):
payslip_line = self.pool.get('hr.payslip.line')
res = []
@@ -96,6 +96,54 @@
res = payslip_line.browse(self.cr, self.uid, ids)
return res
+ def get_recursive_parent(self, heads):
+ if not heads:
+ return []
+ if heads[0].parent_id:
+ heads.insert(0, heads[0].parent_id)
+ self.get_recursive_parent(heads)
+ return heads
+
+ def get_details_by_salary_head(self, obj):
+ payslip_line = self.pool.get('hr.payslip.line')
+ salary_head = self.pool.get('hr.salary.head')
+ res = []
+ result = {}
+ ids = []
+ for id in range(len(obj)):
+ ids.append(obj[id].id)
+ if ids:
+ self.cr.execute('''SELECT pl.id, pl.category_id FROM hr_payslip_line as pl \
+ LEFT JOIN hr_salary_head AS sh on (pl.category_id = sh.id) \
+ WHERE pl.id in %s \
+ GROUP BY sh.parent_id, sh.sequence, pl.sequence, pl.id, pl.category_id \
+ ORDER BY sh.sequence, pl.sequence, sh.parent_id''',(tuple(ids),))
+ for x in self.cr.fetchall():
+ result.setdefault(x[1], [])
+ result[x[1]].append(x[0])
+ for key, value in result.iteritems():
+ heads = salary_head.browse(self.cr, self.uid, [key])
+ parents = self.get_recursive_parent(heads)
+ level = 0
+ for parent in parents:
+ res.append({
+ 'salary_head': parent.name,
+ 'name': parent.name,
+ 'code': parent.code,
+ 'level': level
+ })
+ level += 1
+ lines = payslip_line.browse(self.cr, self.uid, value)
+ for line in lines:
+ res.append({
+ 'salary_head': line.name,
+ 'name': line.name,
+ 'code': line.code,
+ 'total': line.total,
+ 'level': level
+ })
+ return res
+
report_sxw.report_sxw('report.payslip.pdf', 'hr.payslip', 'hr_payroll/report/payslip.rml', parser=payslip_report)
report_sxw.report_sxw('report.test.pdf', 'hr.payslip', 'hr_payroll/report/report_payslip.rml', parser=payslip_report)
=== modified file 'hr_payroll/report/report_payslip.rml'
--- hr_payroll/report/report_payslip.rml 2011-04-07 05:29:46 +0000
+++ hr_payroll/report/report_payslip.rml 2011-04-14 13:23:16 +0000
@@ -10,13 +10,13 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
+ <blockTableStyle id="Table1">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table15">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
@@ -31,7 +31,7 @@
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table16">
+ <blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
@@ -42,302 +42,371 @@
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table1">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table17">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table18">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table3">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#000000" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,1" stop="2,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,1" stop="3,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#000000" start="3,1" stop="3,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+ <blockTableStyle id="Table4">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table5">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table6">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
</blockTableStyle>
<blockTableStyle id="Table7">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
+ <blockTableStyle id="Table8">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table9">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table10">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table11">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table12">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table13">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
- <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
- <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
- <paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P1" fontName="Helvetica" fontSize="2.0" leading="3"/>
+ <paraStyle name="P2" fontName="Helvetica"/>
+ <paraStyle name="P3" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT"/>
+ <paraStyle name="P4" rightIndent="-56.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P5" rightIndent="-56.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+ <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+ <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+ <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P22" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+ <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"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
- <paraStyle name="Table Contents" fontName="Helvetica"/>
- <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<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"/>
- <paraStyle name="Footer" fontName="Helvetica"/>
- <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
- <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <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"/>
- <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Right_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <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"/>
+ <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<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"/>
- <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_address" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <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"/>
<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"/>
+ <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"/>
<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"/>
- <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"/>
- <paraStyle name="terp_default_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Bold_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
- <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Table" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
- <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"/>
- <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="Table Contents" fontName="Helvetica"/>
+ <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+ <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"/>
<images/>
</stylesheet>
<story>
- <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
- <blockTable colWidths="539.0" style="Table2">
- <tr>
- <td>
- <para style="terp_header_Centre">Pay Slip </para>
- <para style="terp_default_Centre_9">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="42.0,207.0,93.0,197.0" style="Table15">
- <tr>
- <td>
- <para style="terp_default_Bold_9">Code</para>
- </td>
- <td>
- <para style="terp_default_9">[[ o.employee_id.sinid or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Bold_9">Name </para>
- </td>
- <td>
- <para style="terp_default_Bold_9">[[o.employee_id.name]]</para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="42.0,497.0" style="Table16">
- <tr>
- <td>
- <para style="terp_default_Bold_9">Address </para>
- </td>
- <td>
- <para style="terp_default_9">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]</para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="42.0,207.0,93.0,197.0" style="Table1">
- <tr>
- <td>
- <para style="terp_default_Bold_9">Email</para>
- </td>
- <td>
- <para style="terp_default_9">[[ o.employee_id.work_email or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Bold_9">Bank Details </para>
- </td>
- <td>
- <para style="terp_default_9">[[ o.employee_id.otherid or '' ]]</para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="42.0,208.0,93.0,197.0" style="Table17">
- <tr>
- <td>
- <para style="terp_default_Bold_9">Slip ID</para>
- </td>
- <td>
- <para style="terp_default_9">[[ o.number or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Bold_9">Identification No</para>
- </td>
- <td>
- <para style="terp_default_9">[[ o.employee_id.passport_id and o.employee_id.passport_id.name or '' ]]</para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="42.0,208.0,93.0,197.0" style="Table18">
- <tr>
- <td>
- <para style="terp_default_Bold_9">Register</para>
- </td>
- <td>
- <para style="terp_default_9">[[ o.register_id and o.register_id.name or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Bold_9">Designation </para>
- </td>
- <td>
- <para style="terp_default_9">[[ o.employee_id.contract_id and o.employee_id.contract_id.job_id.name or '' ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_space"/>
- <para style="terp_default_Bold_9">
- <font face="Helvetica" size="9.0">Payslip Lines </font>
- </para>
- <blockTable colWidths="135.0,135.0,135.0,135.0" style="Table3">
- <tr>
- <td>
- <para style="P2">Sequence</para>
- </td>
- <td>
- <para style="P2">Name</para>
- </td>
- <td>
- <para style="P2">Code</para>
- </td>
- <td>
- <para style="P2">Sub Total</para>
- </td>
- </tr>
- <tr>
- <td>
- <para style="P8"><font face="Helvetica">[[repeatIn(get_payslip_lines(o.line_ids),'p') ]] </font>[[ p.sequence ]]</para>
- </td>
- <td>
- <para style="P8">[[ p.name ]]</para>
- </td>
- <td>
- <para style="P8">[[ p.code ]]</para>
- </td>
- <td>
- <para style="P8">[[ p.total ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="P4">
- <font color="white"> </font>
- </para>
- <para style="P4"/>
- <para style="P4"/>
- <para style="P4"/>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- <section>
- <para style="P8">
- <font color="white"> </font>
- </para>
- </section>
- <para style="terp_default_space">
- <font color="white"> </font>
- </para>
- <section>
- <para style="P8">
- <font color="white"> </font>
- </para>
- </section>
+ <para style="P4">[[repeatIn(objects,'o')]]</para>
+ <blockTable colWidths="539.0" style="Table1">
+ <tr>
+ <td>
+ <para style="P8">Pay Slip</para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="terp_header_Centre">
+ <font face="Helvetica" size="6.0">[[o.credit_note==False and removeParentNode('para')]]</font>
+ <font face="Helvetica-Bold" size="14.0">Credit</font>
+ <font face="Helvetica" size="14.0"/>
+ <font face="Helvetica-Bold" size="14.0">Note</font>
+ </para>
+ <para style="P9">([[o.name]])</para>
+ <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table2">
+ <tr>
+ <td>
+ <para style="P19">Name</para>
+ </td>
+ <td>
+ <para style="P19">[[o.employee_id.name]]</para>
+ </td>
+ <td>
+ <para style="P19">Designation </para>
+ </td>
+ <td>
+ <para style="P6">[[ o.employee_id.contract_id and o.employee_id.contract_id.job_id.name or '' ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="63.0,475.0" style="Table3">
+ <tr>
+ <td>
+ <para style="terp_default_Bold_8">
+ <font face="Helvetica">Address </font>
+ </para>
+ </td>
+ <td>
+ <para style="P6">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table4">
+ <tr>
+ <td>
+ <para style="P19">Email</para>
+ </td>
+ <td>
+ <para style="P6">[[ o.employee_id.work_email or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_8">
+ <font face="Helvetica">Identification No</font>
+ </para>
+ </td>
+ <td>
+ <para style="P6">[[ o.employee_id.identification_id or '' ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="63.0,205.0,89.0,181.0" style="Table5">
+ <tr>
+ <td>
+ <para style="P19">Slip ID</para>
+ </td>
+ <td>
+ <para style="P6">[[ o.number or '' ]]</para>
+ </td>
+ <td>
+ <para style="P19">Bank Details</para>
+ </td>
+ <td>
+ <para style="P6">[[ o.employee_id.otherid or '' ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="63.0,205.0,89.0,181.0" style="Table6">
+ <tr>
+ <td>
+ <para style="P19">Date From</para>
+ </td>
+ <td>
+ <para style="P6">[[ o.date_from or '']]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_8">
+ <font face="Helvetica" size="8.0">Date To</font>
+ </para>
+ </td>
+ <td>
+ <para style="P6">[[ o.date_to or '' ]]</para>
+ </td>
+ </tr>
+ </blockTable>
<para style="P7">
<font color="white"> </font>
</para>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- <para style="Standard">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="269.0,269.0" style="Table7">
- <tr>
- <td>
- <para style="terp_default_8">
+ <para style="P7"/>
+ <blockTable colWidths="539.0" style="Table7">
+ <tr>
+ <td>
+ <para style="P11">Payslip Lines: </para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="54.0,387.0,97.0" style="Table8">
+ <tr>
+ <td>
+ <para style="P16">Code</para>
+ </td>
+ <td>
+ <para style="P16">Name</para>
+ </td>
+ <td>
+ <para style="P23">Amount (in [[o.company_id and o.company_id.currency_id.symbol or '']])</para>
+ </td>
+ </tr>
+ </blockTable>
+ <section>
+ <para style="P6">[[repeatIn(get_payslip_lines(o.line_ids),'p') ]]</para>
+ <blockTable colWidths="54.0,387.0,97.0" style="Table9">
+ <tr>
+ <td>
+ <para style="P6">[[ p.code ]]</para>
+ </td>
+ <td>
+ <para style="P6">[[ p.name ]]</para>
+ </td>
+ <td>
+ <para style="P22">[[ p.total or '0.0']]</para>
+ </td>
+ </tr>
+ </blockTable>
+ </section>
+ <para style="P10">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="539.0" style="Table10">
+ <tr>
+ <td>
+ <para style="P12">Details By Salary Head: </para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="54.0,215.0,173.0,97.0" style="Table11">
+ <tr>
+ <td>
+ <para style="P17">Code</para>
+ </td>
+ <td>
+ <para style="P17">Salary Head</para>
+ </td>
+ <td>
+ <para style="P17">Name</para>
+ </td>
+ <td>
+ <para style="P18">Amount<font face="Helvetica">(in [[o.company_id and o.company_id.currency_id.symbol or '']])</font></para>
+ </td>
+ </tr>
+ </blockTable>
+ <section>
+ <para style="P19">[[repeatIn(get_details_by_salary_head(o.line_ids),'h') ]]</para>
+ <blockTable colWidths="54.0,215.0,173.0,97.0" style="Table12">
+ <tr>
+ <td>
+ <para style="P19">
+ <font face="Helvetica">[[ h['code'] ]]</font>
+ <font face="Helvetica">[[ h['total'] and ( setTag('para','para',{'style':'terp_default_8'}))]]</font>
+ </para>
+ </td>
+ <td>
+ <para style="P20"><font face="Helvetica" color="white">[[ '..'*h['level'] ]]</font>[[ h['salary_head'] ]]<font face="Helvetica">[[ h['total'] and ( setTag('para','para',{'style':'terp_default_9'}))]]</font></para>
+ </td>
+ <td>
+ <para style="P24">[[ h['name'] ]]<font face="Helvetica">[[ h['total'] and ( setTag('para','para',{'style':'terp_default_8'}))]]</font></para>
+ </td>
+ <td>
+ <para style="P22">[[ h['total'] ]] </para>
+ </td>
+ </tr>
+ </blockTable>
+ </section>
+ <para style="P2">
+ <font color="white"> </font>
+ </para>
+ <para style="P2">
+ <font color="white"> </font>
+ </para>
+ <para style="P2">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="269.0,269.0" style="Table13">
+ <tr>
+ <td>
+ <para style="P6">
<font color="white"> </font>
</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Authorized Signature </para>
+ <para style="P15">Authorized Signature </para>
</td>
</tr>
</blockTable>
- <para style="terp_default_space">
+ <para style="P5">
<font color="white"> </font>
</para>
</story>
=== modified file 'hr_payroll/report/report_payslip.sxw'
Binary files hr_payroll/report/report_payslip.sxw 2011-04-07 05:29:46 +0000 and hr_payroll/report/report_payslip.sxw 2011-04-14 13:23:16 +0000 differ
Follow ups
