devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4741 from expsa/bakry_hr 

fix report payroll
This commit is contained in:
bakry 2025-09-24 17:40:30 +03:00 committed by GitHub
parent 5994b5ca9e b42942e613
commit 5238889679
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
odex25_hr/exp_payroll_custom/templates/report_payslip.xml
View File

@ -53,7 +53,7 @@
</td>
<td>
<!-- <strong>-->
<!-- <span t-esc="sum([s.total for s in o.loan_ids])"-->
<!-- <span t-esc="sum([s.amount for s in o.loan_ids])"-->
<!-- t-esc-options='{"widget": "monetary", "display_currency": o.company_id.currency_id}'/>-->
<!-- </strong>-->
</td>
@ -65,13 +65,13 @@
</td>
<td>
<strong>
<span t-esc="sum([s.amount for s in o.line_ids.filtered(lambda line: line.appears_on_payslip)])"
<span t-esc="round( sum([s.amount for s in o.line_ids.filtered(lambda line: line.appears_on_payslip)]) + sum([s.amount for s in o.loan_ids]), 2)"
t-esc-options='{"widget": "monetary", "display_currency": o.company_id.currency_id}'/>
</strong>
</td>
<td>
<strong>
<span t-esc="sum([s.total for s in o.line_ids.filtered(lambda line: line.appears_on_payslip)])"
<span t-esc="round(sum([s.total for s in o.line_ids.filtered(lambda line: line.appears_on_payslip)]) + sum([s.amount for s in o.loan_ids]), 2)"
t-esc-options='{"widget": "monetary", "display_currency": o.company_id.currency_id}'/>
</strong>
</td>