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

hr_payroll: fix payroll-register report, after last patch 

when introducing the "dp='Account'" argument, the first "o" argument to
get_xx() was falsely removed.

bzr revid: p_christ@hol.gr-20101231193400-pjz3zxikt4o68ph4
This commit is contained in:
P. Christeas 2010-12-31 21:34:00 +02:00
parent 9b33bc24cc
commit 926a29f7fd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/hr_payroll/report/payroll_register.rml
View File

@ -206,22 +206,22 @@
<para style="terp_tblheader_details">Total Salary</para>
</td>
<td>
<para style="terp_tbleheader_details_right">[[formatLang(get_basic(), dp='Account')]][[ company.currency_id.symbol]] </para>
<para style="terp_tbleheader_details_right">[[formatLang(get_basic(o), dp='Account')]][[ company.currency_id.symbol]] </para>
</td>
<td>
<para style="terp_tbleheader_details_right">[[formatLang(get_other(), dp='Account')]] [[ company.currency_id.symbol]]</para>
<para style="terp_tbleheader_details_right">[[formatLang(get_other(o), dp='Account')]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tbleheader_details_right">[[formatLang(get_allow(), dp='Account')]] [[ company.currency_id.symbol]]</para>
<para style="terp_tbleheader_details_right">[[formatLang(get_allow(o), dp='Account')]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tbleheader_details_right">[[formatLang(get_grows(), dp='Account')]] [[ company.currency_id.symbol]]</para>
<para style="terp_tbleheader_details_right">[[formatLang(get_grows(o), dp='Account')]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tbleheader_details_right">[[formatLang(get_deduct(), dp='Account')]] [[ company.currency_id.symbol]]</para>
<para style="terp_tbleheader_details_right">[[formatLang(get_deduct(o), dp='Account')]] [[ company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tbleheader_details_right">[[formatLang(get_net(), dp='Account')]] [[ company.currency_id.symbol]]</para>
<para style="terp_tbleheader_details_right">[[formatLang(get_net(o), dp='Account')]] [[ company.currency_id.symbol]]</para>
</td>
</tr>
</blockTable>