pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] hr_payroll: yearly salary detail report now uses decimal.precision

Browse Source 
bzr revid: olt@tinyerp.com-20101005115631-ytlplyukezcqi717
This commit is contained in:
olt@tinyerp.com
2010-10-05 13:56:31 +02:00
parent e9bed69abe
commit bd438c2c65
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_payroll/report/report_employees_detail.rml
+1 -1
View File
@@ -572,7 +572,7 @@
<blockTable colWidths="101.0,73.0,68.0,74.0,70.0,74.0,74.0,73.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_Details">[[ get_monthly_total()[0]+'xxx' ]]</para>
<para style="terp_tblheader_Details">[[ get_monthly_total()[0] ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[1], dp='Account') ]][[ company.currency_id.symbol ]]</para>
addons/hr_payroll/report/report_year_report.rml
+26 -26
View File
@@ -191,43 +191,43 @@
<para style="terp_default_9">[[ e[0] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(e[1]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_default_Right_9">[[ formatLang(e[1], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(e[2]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_default_Right_9">[[ formatLang(e[2], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(e[3]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_default_Right_9">[[ formatLang(e[3], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(e[4]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_default_Right_9">[[ formatLang(e[4], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(e[5]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_default_Right_9">[[ formatLang(e[5], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(e[6]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_default_Right_9">[[ formatLang(e[6], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(e[7]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_default_Right_9">[[ formatLang(e[7], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(e[8]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_default_Right_9">[[ formatLang(e[8], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(e[9]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_default_Right_9">[[ formatLang(e[9], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(e[10]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_default_Right_9">[[ formatLang(e[10], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(e[11]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_default_Right_9">[[ formatLang(e[11], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(e[12]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_default_Right_9">[[ formatLang(e[12], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(e[13]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_default_Right_9_Bold">[[ formatLang(e[13], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
</tr>
</blockTable>
@@ -250,43 +250,43 @@
<para style="terp_tblheader_Details">Total([[company.currency_id.code]])</para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ formatLang(t[1]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_tblheader_General_Right">[[ formatLang(t[1], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ formatLang(t[2]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_tblheader_General_Right">[[ formatLang(t[2], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ formatLang(t[3]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_tblheader_General_Right">[[ formatLang(t[3], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ formatLang(t[4]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_tblheader_General_Right">[[ formatLang(t[4], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ formatLang(t[5]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_tblheader_General_Right">[[ formatLang(t[5], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ formatLang(t[6]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_tblheader_General_Right">[[ formatLang(t[6], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ formatLang(t[7]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_tblheader_General_Right">[[ formatLang(t[7], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ formatLang(t[8]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_tblheader_General_Right">[[ formatLang(t[8], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ formatLang(t[9]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_tblheader_General_Right">[[ formatLang(t[9], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ formatLang(t[10]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_tblheader_General_Right">[[ formatLang(t[10], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ formatLang(t[11]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_tblheader_General_Right">[[ formatLang(t[11], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ formatLang(t[12]) ]] [[company.currency_id.symbol]]</para>
<para style="terp_tblheader_General_Right">[[ formatLang(t[12], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]] [[company.currency_id.symbol]]</para>
<para style="terp_tblheader_General_Right">[[ formatLang(get_total(), dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
</tr>
</blockTable>