odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] l10n_in_hr_payroll: Advice report with correct format 

bzr revid: mra@tinyerp.com-20120718061835-ghgyj2qcpnqffwge
This commit is contained in:
Mustufa Rangwala (OpenERP) 2012-07-18 11:48:35 +05:30
parent 82c8e5388c 6eca282266
commit 180b120569
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
View File

@ -305,7 +305,33 @@
</tr>
</blockTable>
</section>
<blockTable colWidths="58.0,251.0,67.0,94.0,70.0" style="Table6">
<blockTable colWidths="50.0,221.0,106.0,82.0,80.0" style="Table6">[[ o.neft == True and removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P2">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P1">Total : <font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font></para>
<para style="P4"/>
</td>
<td>
<para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
</td>
<td>
<para style="P4">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="50.0,113.0,214.0,82.0,80.0" style="Table6">[[ o.neft !=True and removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">