Purnendu Singh (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-payroll-payslip-report-imp-psi into
lp:~openerp-dev/openobject-addons/trunk-payroll.
Requested reviews:
Purnendu Singh (OpenERP) (psi-tinyerp)
Mustufa Rangwala (Open ERP) (mra-tinyerp)
qdp (OpenERP) (qdp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-payslip-report-imp-psi/+merge/62614
Hello,
Improve the payslip and payslip details report.
Payslip: Added quantity and amount fields and currency added in each row.
Payslip details: update the label and currency added in each row
Thanks
Purnendu Singh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-payslip-report-imp-psi/+merge/62614
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-payroll.
=== modified file 'hr_payroll/hr_payroll_view.xml'
--- hr_payroll/hr_payroll_view.xml 2011-05-26 16:56:10 +0000
+++ hr_payroll/hr_payroll_view.xml 2011-05-31 13:46:05 +0000
@@ -248,7 +248,7 @@
<field name="code"/>
<field name="category_id"/>
<field name="sequence" invisible="1"/>
- <field name="quantity"/>
+ <field name="quantity" string="Quantity/Rate"/>
<field name="amount"/>
<field name="total"/>
</tree>
=== modified file 'hr_payroll/report/report_payslip.rml'
--- hr_payroll/report/report_payslip.rml 2011-05-23 09:10:29 +0000
+++ hr_payroll/report/report_payslip.rml 2011-05-31 13:46:05 +0000
@@ -100,23 +100,20 @@
<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"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
</blockTableStyle>
<blockTableStyle id="Table9">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
</blockTableStyle>
<blockTableStyle id="Table13">
<blockAlignment value="LEFT"/>
@@ -134,20 +131,14 @@
<paraStyle name="P7" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <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"/>
+ <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<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"/>
<paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P14" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
<paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
- <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
- <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
- <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"/>
- <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-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P23" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <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"/>
+ <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="2.0" leading="3" 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"/>
@@ -190,20 +181,20 @@
<blockTable colWidths="63.0,206.0,89.0,181.0" style="Table2">
<tr>
<td>
- <para style="P18">Name</para>
- </td>
- <td>
- <para style="P18">[[o.employee_id.name]]</para>
- </td>
- <td>
- <para style="P18">Designation </para>
+ <para style="P16">Name</para>
+ </td>
+ <td>
+ <para style="P16">[[o.employee_id.name]]</para>
+ </td>
+ <td>
+ <para style="P16">Designation </para>
</td>
<td>
<para style="P4">[[ o.employee_id.job_id.name or '' ]]</para>
</td>
</tr>
</blockTable>
- <blockTable colWidths="63.0,475.0" style="Table3">
+ <blockTable colWidths="63.0,476.0" style="Table3">
<tr>
<td>
<para style="terp_default_Bold_8">
@@ -218,7 +209,7 @@
<blockTable colWidths="63.0,206.0,89.0,181.0" style="Table4">
<tr>
<td>
- <para style="P18">Email</para>
+ <para style="P16">Email</para>
</td>
<td>
<para style="P4">[[ o.employee_id.work_email or '' ]]</para>
@@ -233,26 +224,26 @@
</td>
</tr>
</blockTable>
- <blockTable colWidths="63.0,205.0,89.0,181.0" style="Table5">
+ <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table5">
<tr>
<td>
- <para style="P18">Reference</para>
+ <para style="P16">Reference</para>
</td>
<td>
<para style="P4">[[ o.number or '' ]]</para>
</td>
<td>
- <para style="P18">Bank Account</para>
+ <para style="P16">Bank Account</para>
</td>
<td>
<para style="P4">[[ o.employee_id.otherid or '' ]]</para>
</td>
</tr>
</blockTable>
- <blockTable colWidths="63.0,205.0,89.0,181.0" style="Table6">
+ <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table6">
<tr>
<td>
- <para style="P18">Date From</para>
+ <para style="P16">Date From</para>
</td>
<td>
<para style="P4">[[ o.date_from or '']]</para>
@@ -278,7 +269,7 @@
</td>
</tr>
</blockTable>
- <blockTable colWidths="54.0,387.0,97.0" style="Table8">
+ <blockTable colWidths="31.0,337.0,56.0,57.0,57.0" style="Table8">
<tr>
<td>
<para style="P14">Code</para>
@@ -287,16 +278,22 @@
<para style="P14">Name</para>
</td>
<td>
- <para style="P15">Amount (in [[o.company_id and o.company_id.currency_id.symbol or '']])</para>
+ <para style="P14">Quantity</para>
+ </td>
+ <td>
+ <para style="P14">Amount</para>
+ </td>
+ <td>
+ <para style="P15">Total</para>
</td>
</tr>
</blockTable>
- <para style="P11">
+ <para style="P10">
<font color="white"> </font>
</para>
<section>
<para style="P4">[[repeatIn(get_payslip_lines(o.line_ids),'p') ]]</para>
- <blockTable colWidths="54.0,387.0,97.0" style="Table9">
+ <blockTable colWidths="31.0,337.0,56.0,59.0,56.0" style="Table9">
<tr>
<td>
<para style="P4">[[ p.code ]]</para>
@@ -305,7 +302,13 @@
<para style="P4">[[ p.name ]]</para>
</td>
<td>
- <para style="P5">[[ p.total or '0.0']]</para>
+ <para style="P4">[[ p.quantity or '0.0']]</para>
+ </td>
+ <td>
+ <para style="P4">[[ p.amount or '0.0' ]]</para>
+ </td>
+ <td>
+ <para style="P5">[[ p.total or '0.0']] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
</td>
</tr>
</blockTable>
@@ -313,10 +316,10 @@
<font color="white"> </font>
</para>
</section>
- <para style="P23">
+ <para style="P11">
<font color="white"> </font>
</para>
- <para style="P22">
+ <para style="P17">
<font color="white"> </font>
</para>
<para style="P6">
=== modified file 'hr_payroll/report/report_payslip.sxw'
Binary files hr_payroll/report/report_payslip.sxw 2011-05-23 09:10:29 +0000 and hr_payroll/report/report_payslip.sxw 2011-05-31 13:46:05 +0000 differ
=== modified file 'hr_payroll/report/report_payslip_details.py'
--- hr_payroll/report/report_payslip_details.py 2011-05-23 09:10:29 +0000
+++ hr_payroll/report/report_payslip_details.py 2011-05-31 13:46:05 +0000
@@ -64,9 +64,8 @@
for key, value in result.iteritems():
rule_categories = rule_cate_obj.browse(self.cr, self.uid, [key])
parents = get_recursive_parent(rule_categories)
- category_total = 0
- for line in payslip_line.browse(self.cr, self.uid, value):
- category_total += line.total
+ self.cr.execute('''SELECT SUM(pl.total) FROM hr_payslip_line pl\
+ WHERE pl.id in %s''',(tuple(value),))
level = 0
for parent in parents:
res.append({
@@ -74,7 +73,7 @@
'name': parent.name,
'code': parent.code,
'level': level,
- 'total': category_total,
+ 'total': self.cr.fetchone()[0] or 0.0,
})
level += 1
for line in payslip_line.browse(self.cr, self.uid, value):
@@ -97,13 +96,18 @@
result.setdefault(obj[id].register_id.name, [])
result[obj[id].register_id.name].append(obj[id].id)
for key, value in result.iteritems():
+ self.cr.execute('''SELECT SUM(pl.total) FROM hr_payslip_line pl\
+ WHERE pl.id in %s''',(tuple(value),))
res.append({
'register_name': key,
+ 'total': self.cr.fetchone()[0] or 0.0,
})
for line in payslip_line.browse(self.cr, self.uid, value):
res.append({
'name': line.name,
'code': line.code,
+ 'quantity': line.quantity,
+ 'amount': line.amount,
'total': line.total,
})
return res
=== modified file 'hr_payroll/report/report_payslip_details.rml'
--- hr_payroll/report/report_payslip_details.rml 2011-05-23 09:10:29 +0000
+++ hr_payroll/report/report_payslip_details.rml 2011-05-31 13:46:05 +0000
@@ -100,56 +100,42 @@
<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="#cccccc" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table14">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table15">
- <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="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table8">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table7">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
<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"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Table16">
<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"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Table13">
<blockAlignment value="LEFT"/>
@@ -159,28 +145,31 @@
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica" fontSize="2.0" leading="3"/>
- <paraStyle name="P2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT"/>
- <paraStyle name="P3" fontName="Helvetica" fontSize="2.0" leading="3"/>
+ <paraStyle name="P2" fontName="Helvetica" fontSize="2.0" leading="3"/>
+ <paraStyle name="P3" rightIndent="-56.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<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="RIGHT" 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="P9" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" 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" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
- <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
- <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-Bold" 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="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P23" 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="P6" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" 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" 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="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <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"/>
+ <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+ <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+ <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+ <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"/>
+ <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"/>
+ <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"/>
+ <paraStyle name="P19" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT"/>
+ <paraStyle name="P20" fontName="Helvetica" fontSize="2.0" leading="3"/>
+ <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" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+ <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="P25" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" 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"/>
@@ -196,7 +185,7 @@
<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_10" 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_10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" 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"/>
@@ -206,11 +195,11 @@
<images/>
</stylesheet>
<story>
- <para style="P4">[[repeatIn(objects,'o')]]</para>
+ <para style="P3">[[repeatIn(objects,'o')]]</para>
<blockTable colWidths="539.0" style="Table1">
<tr>
<td>
- <para style="P9">Pay Slip Details</para>
+ <para style="P8">Pay Slip Details</para>
</td>
</tr>
</blockTable>
@@ -220,24 +209,24 @@
<font face="Helvetica" size="14.0"/>
<font face="Helvetica-Bold" size="14.0">Note</font>
</para>
- <para style="P10">([[o.name or removeParentNode('para') ]])</para>
+ <para style="P9">([[o.name or removeParentNode('para')]])</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.job_id.name or '' ]]</para>
+ <para style="P16">Name</para>
+ </td>
+ <td>
+ <para style="P16">[[o.employee_id.name]]</para>
+ </td>
+ <td>
+ <para style="P16">Designation </para>
+ </td>
+ <td>
+ <para style="P5">[[ o.employee_id.job_id.name or '' ]]</para>
</td>
</tr>
</blockTable>
- <blockTable colWidths="63.0,475.0" style="Table3">
+ <blockTable colWidths="63.0,476.0" style="Table3">
<tr>
<td>
<para style="terp_default_Bold_8">
@@ -245,17 +234,17 @@
</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>
+ <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 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>
+ <para style="P16">Email</para>
</td>
<td>
- <para style="P6">[[ o.employee_id.work_email or '' ]]</para>
+ <para style="P5">[[ o.employee_id.work_email or '' ]]</para>
</td>
<td>
<para style="terp_default_Bold_8">
@@ -263,33 +252,33 @@
</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">Reference</para>
- </td>
- <td>
- <para style="P6">[[ o.number or '' ]]</para>
- </td>
- <td>
- <para style="P19">Bank Account</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>
+ <para style="P5">[[ o.employee_id.identification_id or '' ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table5">
+ <tr>
+ <td>
+ <para style="P16">Reference</para>
+ </td>
+ <td>
+ <para style="P5">[[ o.number or '' ]]</para>
+ </td>
+ <td>
+ <para style="P16">Bank Account</para>
+ </td>
+ <td>
+ <para style="P5">[[ o.employee_id.otherid or '' ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table6">
+ <tr>
+ <td>
+ <para style="P16">Date From</para>
+ </td>
+ <td>
+ <para style="P5">[[ o.date_from or '']]</para>
</td>
<td>
<para style="terp_default_Bold_8">
@@ -297,37 +286,37 @@
</para>
</td>
<td>
- <para style="P6">[[ o.date_to or '' ]]</para>
+ <para style="P5">[[ o.date_to or '' ]]</para>
</td>
</tr>
</blockTable>
- <para style="P8"/>
- <para style="P13">
+ <para style="P7"/>
+ <para style="P11">
<font color="white"> </font>
</para>
- <para style="P6">
+ <para style="P5">
<font color="white"> </font>
</para>
<blockTable colWidths="539.0" style="Table10">
<tr>
<td>
- <para style="P12">Details by Salary Rule Category: </para>
+ <para style="P10">Details by Salary Rule Category: </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 Rule Category</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>
+ <para style="P15">Code</para>
+ </td>
+ <td>
+ <para style="P15">Salary Rule Category</para>
+ </td>
+ <td>
+ <para style="P15">Name</para>
+ </td>
+ <td>
+ <para style="P14">Total</para>
</td>
</tr>
</blockTable>
@@ -335,69 +324,80 @@
<font color="white"> </font>
</para>
<section>
- <para style="P19">[[repeatIn(get_details_by_rule_category(o.details_by_salary_rule_category),'h') ]]</para>
+ <para style="P16">[[repeatIn(get_details_by_rule_category(o.details_by_salary_rule_category),'h') ]]</para>
<blockTable colWidths="54.0,215.0,173.0,97.0" style="Table12">
<tr>
<td>
- <para style="P19">
+ <para style="P16">
<font face="Helvetica">[[ h['code'] ]]</font>
<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]]</font>
</para>
</td>
<td>
- <para style="P20"><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>
- </td>
- <td>
- <para style="P21">[[ h['name'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]]</font></para>
- </td>
- <td>
- <para style="P7">[[ h['total'] ]] <font face="Helvetica" size="8.0">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
+ <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>
+ </td>
+ <td>
+ <para style="P18">[[ h['name'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]]</font></para>
+ </td>
+ <td>
+ <para style="P6">[[ h['total'] or '0.0' ]] [[o.company_id and o.company_id.currency_id.symbol or '']] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
</td>
</tr>
</blockTable>
</section>
- <para style="P8">
+ <para style="P7">
<font color="white"> </font>
</para>
- <condPageBreak height="2cm"/>
- <blockTable colWidths="539.0" style="Table14">
+ <blockTable colWidths="539.0" style="Table8">
<tr>
<td>
- <para style="P12">Payslip Lines by Contribution Register:</para>
+ <para style="P10">Payslip Lines by Contribution Register:</para>
</td>
</tr>
</blockTable>
- <blockTable colWidths="115.0,46.0,289.0,88.0" style="Table15">
+ <blockTable colWidths="114.0,42.0,170.0,85.0,56.0,71.0" style="Table7">
<tr>
<td>
- <para style="P15">Register Name</para>
- </td>
- <td>
- <para style="P15">Code</para>
- </td>
- <td>
- <para style="P15">Name</para>
- </td>
- <td>
- <para style="P16">Amount (in [[o.company_id and o.company_id.currency_id.symbol or '']])</para>
+ <para style="P13">Register Name</para>
+ </td>
+ <td>
+ <para style="P13">Code</para>
+ </td>
+ <td>
+ <para style="P13">Name</para>
+ </td>
+ <td>
+ <para style="P13">Quantity/Rate</para>
+ </td>
+ <td>
+ <para style="P13">Amount</para>
+ </td>
+ <td>
+ <para style="P14">Total</para>
</td>
</tr>
</blockTable>
<section>
- <para style="P19">[[repeatIn(get_lines_by_contribution_register(o.details_by_salary_rule_category),'r')]]</para>
- <blockTable colWidths="116.0,46.0,289.0,88.0" style="Table16">
+ <para style="P16">[[repeatIn(get_lines_by_contribution_register(o.details_by_salary_rule_category),'r') ]]</para>
+ <blockTable colWidths="113.0,44.0,169.0,85.0,56.0,72.0" style="Table16">
<tr>
<td>
- <para style="P19">[[ r.get('register_name', False) ]]<font face="Helvetica">[[ h.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]]</font></para>
- </td>
- <td>
- <para style="P6">[[ r['code'] ]]</para>
- </td>
- <td>
- <para style="P6">[[ r['name'] ]]</para>
- </td>
- <td>
- <para style="P7">[[ r['total'] or '0.0']]</para>
+ <para style="P16">[[ r.get('register_name', False) ]]<font face="Helvetica">[[ h.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]]</font></para>
+ </td>
+ <td>
+ <para style="P5">[[ r['code'] ]]</para>
+ </td>
+ <td>
+ <para style="P5">[[ r['name'] ]]</para>
+ </td>
+ <td>
+ <para style="P5">[[ r['quantity'] or '0.0' ]]</para>
+ </td>
+ <td>
+ <para style="P5">[[ r['amount'] or '0.0' ]]</para>
+ </td>
+ <td>
+ <para style="P6">[[ r['total'] or '0.0']] [[ o.company_id and o.company_id.currency_id.symbol or '']]<font face="Helvetica">[[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]</font></para>
</td>
</tr>
</blockTable>
@@ -405,25 +405,25 @@
<blockTable colWidths="269.0,269.0" style="Table13">
<tr>
<td>
- <para style="P6">
+ <para style="P5">
<font color="white"> </font>
</para>
</td>
<td>
- <para style="P14">
- <font color="white"> </font>
- </para>
- <para style="P14">
- <font color="white"> </font>
- </para>
- <para style="P14">
- <font color="white"> </font>
- </para>
- <para style="P14">Authorized Signature </para>
+ <para style="P12">
+ <font color="white"> </font>
+ </para>
+ <para style="P12">
+ <font color="white"> </font>
+ </para>
+ <para style="P12">
+ <font color="white"> </font>
+ </para>
+ <para style="P12">Authorized Signature </para>
</td>
</tr>
</blockTable>
- <para style="P5">
+ <para style="P4">
<font color="white"> </font>
</para>
</story>
=== modified file 'hr_payroll/report/report_payslip_details.sxw'
Binary files hr_payroll/report/report_payslip_details.sxw 2011-05-23 09:10:29 +0000 and hr_payroll/report/report_payslip_details.sxw 2011-05-31 13:46:05 +0000 differ
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
