diff --git a/addons/hr_payroll/report/report_payslip.rml b/addons/hr_payroll/report/report_payslip.rml index 6e9cc84235d..a17b9ca4fc1 100644 --- a/addons/hr_payroll/report/report_payslip.rml +++ b/addons/hr_payroll/report/report_payslip.rml @@ -107,9 +107,15 @@ - + + + + + + + @@ -117,6 +123,8 @@ + + @@ -134,20 +142,16 @@ - - - - - - - - - - - - - - + + + + + + + + + + @@ -190,20 +194,20 @@ - Name + Name - [[o.employee_id.name]] + [[o.employee_id.name]] - Designation + Designation [[ o.employee_id.job_id.name or '' ]] - + @@ -218,7 +222,7 @@ - Email + Email [[ o.employee_id.work_email or '' ]] @@ -233,26 +237,26 @@ - + - Reference + Reference [[ o.number or '' ]] - Bank Account + Bank Account [[ o.employee_id.otherid or '' ]] - + - Date From + Date From [[ o.date_from or '']] @@ -278,25 +282,28 @@ - + - Code + Code - Name + Name - Amount (in [[o.company_id and o.company_id.currency_id.symbol or '']]) + Quantity + + + Amount + + + Total - - -
[[repeatIn(get_payslip_lines(o.line_ids),'p') ]] - + [[ p.code ]] @@ -305,18 +312,21 @@ [[ p.name ]] - [[ p.total or '0.0']] + [[ p.quantity ]] + + + [[ p.amount ]] + + + [[ p.total or '0.0']] [[o.company_id and o.company_id.currency_id.symbol or '']] - - -
- + - + @@ -333,16 +343,16 @@ - + - + - + - Authorized Signature + Authorized Signature
diff --git a/addons/hr_payroll/report/report_payslip_details.rml b/addons/hr_payroll/report/report_payslip_details.rml index 43ad71a7c9e..8e7c9497e2b 100644 --- a/addons/hr_payroll/report/report_payslip_details.rml +++ b/addons/hr_payroll/report/report_payslip_details.rml @@ -237,7 +237,7 @@
- + @@ -267,7 +267,7 @@ - + Reference @@ -283,7 +283,7 @@ - + Date From @@ -327,7 +327,7 @@ Name - Amount(in [[o.company_id and o.company_id.currency_id.symbol or '']]) + Total @@ -351,7 +351,7 @@ [[ h['name'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]] - [[ h['total'] ]] [[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]] + [[ h['total'] ]] [[o.company_id and o.company_id.currency_id.symbol or '']] [[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]] @@ -379,7 +379,7 @@ Name - Amount (in [[o.company_id and o.company_id.currency_id.symbol or '']]) + Total @@ -397,7 +397,7 @@ [[ r['name'] ]] - [[ r['total'] or '0.0']] + [[ r['total'] or '0.0']] [[o.company_id and o.company_id.currency_id.symbol or '']] @@ -428,4 +428,3 @@
-