[IMP] hr_payroll: Improved Employee Salary Structure report.

bzr revid: vra@tinyerp.com-20101007143507-6apfh565afuxamn3
This commit is contained in:
vra 2010-10-07 20:05:07 +05:30
parent f2e3f5fc2b
commit d0e0cb7ad2
2 changed files with 95 additions and 90 deletions

View File

@ -51,7 +51,7 @@
name="salary.structure"
rml="hr_payroll/report/report_emp_salary_structure.rml"
menu = "True"
string="Print Salary Structure" />
string="Salary Structure" />
</data>
</openerp>

View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Salary Structure" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
@ -10,10 +10,6 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
@ -127,6 +123,46 @@
<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="Table14">
<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="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
<lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
<lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
</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"/>
<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="Table9">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
@ -138,10 +174,6 @@
<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="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
</blockTableStyle>
<blockTableStyle id="Table8">
<blockAlignment value="LEFT"/>
@ -150,10 +182,6 @@
<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"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
</blockTableStyle>
<blockTableStyle id="Table10">
<blockAlignment value="LEFT"/>
@ -166,9 +194,6 @@
<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="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
</blockTableStyle>
<blockTableStyle id="Table12">
<blockAlignment value="LEFT"/>
@ -177,9 +202,6 @@
<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"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
@ -241,20 +263,7 @@
</stylesheet>
<story>
<para style="terp_default_8">[[repeatIn(objects,'employee')]]</para>
<blockTable colWidths="539.0" style="Table1">
<tr>
<td>
<para style="terp_header_Centre">Salary Structure</para>
<para style="terp_header_Centre">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<para style="terp_default_space">
<font color="white"> </font>
</para>
<para style="terp_default_9">
<para style="terp_default_1">
<font color="white"> </font>
</para>
<section>
@ -290,7 +299,7 @@
<para style="terp_default_9">[[ employee.name ]]</para>
</td>
<td>
<para style="terp_tblheader_Details">Other Id</para>
<para style="terp_tblheader_Details">Other No.</para>
</td>
<td>
<para style="terp_default_9">[[ employee.otherid or '' ]]</para>
@ -379,6 +388,44 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="68.0,111.0,63.0,111.0,71.0,115.0" style="Table14">
<tr>
<td>
<para style="terp_tblheader_Details">Basic</para>
</td>
<td>
<para style="terp_default_9">[[ cont.basic ]] [[ employee.company_id.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_tblheader_Details">Allowances</para>
</td>
<td>
<para style="terp_default_9">[[ cont.advantages_gross ]] [[ employee.company_id.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_tblheader_Details">Gross Salary</para>
</td>
<td>
<para style="terp_default_9">[[ cont.gross ]] [[ employee.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="68.0,111.0,63.0,297.0" style="Table15">
<tr>
<td>
<para style="terp_tblheader_Details">Deductions</para>
</td>
<td>
<para style="terp_default_9">[[ cont.advantages_net ]] [[ employee.company_id.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_tblheader_Details">Net Salary</para>
</td>
<td>
<para style="terp_default_9">[[ cont.net ]] [[ employee.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_space">
<font color="white"> </font>
</para>
@ -396,7 +443,7 @@
<para style="terp_default_1">
<font color="white"> </font>
</para>
<blockTable colWidths="34.0,116.0,40.0,67.0,44.0,109.0,70.0,59.0" style="Table5">
<blockTable colWidths="34.0,341.0,80.0,83.0" style="Table5">
<tr>
<td>
<para style="terp_tblheader_Details">Code</para>
@ -404,24 +451,12 @@
<td>
<para style="terp_tblheader_Details">Name</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Amount</para>
</td>
<td>
<para style="terp_tblheader_Details">Amount Type</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Amount / Percentage</para>
</td>
<td>
<para style="terp_tblheader_Details">Type</para>
</td>
<td>
<para style="terp_tblheader_Details">Category</para>
</td>
<td>
<para style="terp_tblheader_Details">General Account</para>
</td>
<td>
<para style="terp_tblheader_Details">Analytic Account</para>
</td>
</tr>
</blockTable>
<para style="terp_default_1">
@ -429,7 +464,7 @@
</para>
<section>
<para style="terp_default_9">[[repeatIn(cont.struct_id.line_ids,'line')]]</para>
<blockTable colWidths="34.0,117.0,39.0,67.0,44.0,110.0,69.0,59.0" style="Table8">
<blockTable colWidths="34.0,340.0,80.0,84.0" style="Table8">
<tr>
<td>
<para style="terp_default_9">[[ line.code or '' ]]</para>
@ -437,23 +472,11 @@
<td>
<para style="terp_default_9">[[ line.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ get_line_amount_type(line.amount_type) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line.amount) or '']][[ get_line_amount_symbol(line.amount_type) ]]</para>
</td>
<td>
<para style="terp_default_9">[[ get_line_type(line.type) ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line.category_id.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line.account_id.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line.analytic_account_id and line.analytic_account_id.name or '' ]]</para>
<para style="terp_default_9">[[ get_line_amount_type(line.amount_type) ]]</para>
</td>
</tr>
</blockTable>
@ -483,7 +506,7 @@
<para style="terp_default_1">
<font color="white"> </font>
</para>
<blockTable colWidths="34.0,116.0,40.0,67.0,44.0,109.0,128.0" style="Table11">
<blockTable colWidths="34.0,338.0,82.0,84.0" style="Table11">
<tr>
<td>
<para style="terp_tblheader_Details">Code</para>
@ -491,21 +514,12 @@
<td>
<para style="terp_tblheader_Details">Name</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Amount</para>
</td>
<td>
<para style="terp_tblheader_Details">Amount Type</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Amount / Percentage</para>
</td>
<td>
<para style="terp_tblheader_Details">Type</para>
</td>
<td>
<para style="terp_tblheader_Details">Category</para>
</td>
<td>
<para style="terp_tblheader_Details">General Account</para>
</td>
</tr>
</blockTable>
<para style="terp_default_1">
@ -513,7 +527,7 @@
</para>
<section>
<para style="terp_default_9">[[repeatIn(employee.line_ids,'line1')]]</para>
<blockTable colWidths="34.0,117.0,39.0,67.0,44.0,110.0,128.0" style="Table12">
<blockTable colWidths="34.0,338.0,81.0,86.0" style="Table12">
<tr>
<td>
<para style="terp_default_9">[[ line1.code or '' ]]</para>
@ -521,20 +535,11 @@
<td>
<para style="terp_default_9">[[ line1.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ get_line_amount_type(line1.amount_type) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line1.amount) ]]</para>
</td>
<td>
<para style="terp_default_9">[[ get_line_type(line1.type) ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line1.category_id.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line1.account_id.name ]]</para>
<para style="terp_default_9">[[ get_line_amount_type(line1.amount_type) ]]</para>
</td>
</tr>
</blockTable>
@ -550,4 +555,4 @@
<font color="white"> </font>
</para>
</story>
</document>
</document>