From d25e8fe61a25ba75798ebd0de5de3daa62fb78b2 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Fri, 27 May 2011 12:26:41 +0530 Subject: [PATCH 1/8] [IMP] hr_payroll: Add total and quantity field on payslip report and add currency symbol to every row in payslip report and payslip details report bzr revid: psi@tinyerp.co.in-20110527065641-uks394pt8eyj5r5y --- addons/hr_payroll/report/report_payslip.rml | 96 ++++++++++--------- .../report/report_payslip_details.rml | 15 ++- 2 files changed, 60 insertions(+), 51 deletions(-) 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 @@ - From 546725cca0a735905dcafafb36215d8e79550817 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Fri, 27 May 2011 16:09:33 +0530 Subject: [PATCH 2/8] [IMP] hr_payroll: payslip and payslip details report will show value in column like amount, quantiry and total even it is zero bzr revid: psi@tinyerp.co.in-20110527103933-2eqspaubjc5beqfx --- addons/hr_payroll/report/report_payslip.rml | 4 ++-- addons/hr_payroll/report/report_payslip_details.rml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/hr_payroll/report/report_payslip.rml b/addons/hr_payroll/report/report_payslip.rml index a17b9ca4fc1..010f2b968a0 100644 --- a/addons/hr_payroll/report/report_payslip.rml +++ b/addons/hr_payroll/report/report_payslip.rml @@ -312,10 +312,10 @@ [[ p.name ]] - [[ p.quantity ]] + [[ p.quantity or '0.0']] - [[ p.amount ]] + [[ p.amount or '0.0']] [[ p.total or '0.0']] [[o.company_id and o.company_id.currency_id.symbol or '']] diff --git a/addons/hr_payroll/report/report_payslip_details.rml b/addons/hr_payroll/report/report_payslip_details.rml index 8e7c9497e2b..ee9d16479e7 100644 --- a/addons/hr_payroll/report/report_payslip_details.rml +++ b/addons/hr_payroll/report/report_payslip_details.rml @@ -351,7 +351,7 @@ [[ h['name'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) 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') ]] + [[ h['total'] or '0.0' ]] [[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') ]] From abfeeabd5fb8244b04a35eb674d1702294a0ad6c Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Tue, 31 May 2011 19:12:37 +0530 Subject: [PATCH 3/8] [IMP] hr_payslip: improve layout and add field amount and qunatity in contribution register section on payslip details report bzr revid: psi@tinyerp.co.in-20110531134237-ka2v0mkxa1ume0fk --- addons/hr_payroll/hr_payroll_view.xml | 2 +- addons/hr_payroll/report/report_payslip.rml | 81 ++++--- .../report/report_payslip_details.py | 12 +- .../report/report_payslip_details.rml | 205 +++++++++--------- 4 files changed, 149 insertions(+), 151 deletions(-) diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index f7d95c572e8..03f3adbe2d1 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -248,7 +248,7 @@ - + diff --git a/addons/hr_payroll/report/report_payslip.rml b/addons/hr_payroll/report/report_payslip.rml index 010f2b968a0..b2082613bba 100644 --- a/addons/hr_payroll/report/report_payslip.rml +++ b/addons/hr_payroll/report/report_payslip.rml @@ -100,31 +100,20 @@ - - - - - - - - - - - - - - - - + + + + + @@ -143,15 +132,13 @@ - - - - - - - - - + + + + + + + @@ -194,13 +181,13 @@ - Name + Name - [[o.employee_id.name]] + [[o.employee_id.name]] - Designation + Designation [[ o.employee_id.job_id.name or '' ]] @@ -222,7 +209,7 @@ - Email + Email [[ o.employee_id.work_email or '' ]] @@ -240,13 +227,13 @@ - Reference + Reference [[ o.number or '' ]] - Bank Account + Bank Account [[ o.employee_id.otherid or '' ]] @@ -256,7 +243,7 @@ - Date From + Date From [[ o.date_from or '']] @@ -285,22 +272,25 @@ - Code + Code - Name + Name - Quantity + Quantity - Amount + Amount - Total + Total + + +
[[repeatIn(get_payslip_lines(o.line_ids),'p') ]] @@ -315,18 +305,21 @@ [[ p.quantity or '0.0']] - [[ p.amount or '0.0']] + [[ p.amount or '0.0' ]] [[ p.total or '0.0']] [[o.company_id and o.company_id.currency_id.symbol or '']] + + +
- + - + @@ -343,16 +336,16 @@ - + - + - + - Authorized Signature + Authorized Signature diff --git a/addons/hr_payroll/report/report_payslip_details.py b/addons/hr_payroll/report/report_payslip_details.py index be40a2ec02a..d65065eb6f6 100644 --- a/addons/hr_payroll/report/report_payslip_details.py +++ b/addons/hr_payroll/report/report_payslip_details.py @@ -64,9 +64,8 @@ class payslip_details_report(report_sxw.rml_parse): for key, value in result.iteritems(): rule_categories = rule_cate_obj.browse(self.cr, self.uid, [key]) parents = get_recursive_parent(rule_categories) - category_total = 0 - for line in payslip_line.browse(self.cr, self.uid, value): - category_total += line.total + self.cr.execute('''SELECT SUM(pl.total) FROM hr_payslip_line pl\ + WHERE pl.id in %s''',(tuple(value),)) level = 0 for parent in parents: res.append({ @@ -74,7 +73,7 @@ class payslip_details_report(report_sxw.rml_parse): 'name': parent.name, 'code': parent.code, 'level': level, - 'total': category_total, + 'total': self.cr.fetchone()[0] or 0.0, }) level += 1 for line in payslip_line.browse(self.cr, self.uid, value): @@ -97,13 +96,18 @@ class payslip_details_report(report_sxw.rml_parse): result.setdefault(obj[id].register_id.name, []) result[obj[id].register_id.name].append(obj[id].id) for key, value in result.iteritems(): + self.cr.execute('''SELECT SUM(pl.total) FROM hr_payslip_line pl\ + WHERE pl.id in %s''',(tuple(value),)) res.append({ 'register_name': key, + 'total': self.cr.fetchone()[0] or 0.0, }) for line in payslip_line.browse(self.cr, self.uid, value): res.append({ 'name': line.name, 'code': line.code, + 'quantity': line.quantity, + 'amount': line.amount, 'total': line.total, }) return res diff --git a/addons/hr_payroll/report/report_payslip_details.rml b/addons/hr_payroll/report/report_payslip_details.rml index ee9d16479e7..395654151f5 100644 --- a/addons/hr_payroll/report/report_payslip_details.rml +++ b/addons/hr_payroll/report/report_payslip_details.rml @@ -100,56 +100,42 @@ - - - - - - - - - - - - - + + + + - + - + - - - - - - - - - + + - - - - + + + + + + @@ -159,28 +145,31 @@ - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -196,7 +185,7 @@ - + @@ -206,11 +195,11 @@ - [[repeatIn(objects,'o')]] + [[repeatIn(objects,'o')]] - Pay Slip Details + Pay Slip Details @@ -220,20 +209,20 @@ Note - ([[o.name or removeParentNode('para') ]]) + ([[o.name or removeParentNode('para')]]) - Name + Name - [[o.employee_id.name]] + [[o.employee_id.name]] - Designation + Designation - [[ o.employee_id.job_id.name or '' ]] + [[ o.employee_id.job_id.name or '' ]] @@ -245,17 +234,17 @@ - [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]] + [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]] - Email + Email - [[ o.employee_id.work_email or '' ]] + [[ o.employee_id.work_email or '' ]] @@ -263,33 +252,33 @@ - [[ o.employee_id.identification_id or '' ]] + [[ o.employee_id.identification_id or '' ]] - Reference + Reference - [[ o.number or '' ]] + [[ o.number or '' ]] - Bank Account + Bank Account - [[ o.employee_id.otherid or '' ]] + [[ o.employee_id.otherid or '' ]] - Date From + Date From - [[ o.date_from or '']] + [[ o.date_from or '']] @@ -297,37 +286,37 @@ - [[ o.date_to or '' ]] + [[ o.date_to or '' ]] - - + + - + - Details by Salary Rule Category: + Details by Salary Rule Category: - Code + Code - Salary Rule Category + Salary Rule Category - Name + Name - Total + Total @@ -335,69 +324,80 @@
- [[repeatIn(get_details_by_rule_category(o.details_by_salary_rule_category),'h') ]] + [[repeatIn(get_details_by_rule_category(o.details_by_salary_rule_category),'h') ]] - + [[ h['code'] ]] [[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]] - [[ '..'*h['level'] ]][[ h['rule_category'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]] + [[ '..'*h['level'] ]][[ h['rule_category'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]] - [[ h['name'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]] + [[ h['name'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]] - [[ h['total'] or '0.0' ]] [[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') ]] + [[ h['total'] or '0.0' ]] [[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') ]]
- + - - + - Payslip Lines by Contribution Register: + Payslip Lines by Contribution Register: - + - Register Name + Register Name - Code + Code - Name + Name - Total + Quantity/Rate + + + Amount + + + Total
- [[repeatIn(get_lines_by_contribution_register(o.details_by_salary_rule_category),'r')]] - + [[repeatIn(get_lines_by_contribution_register(o.details_by_salary_rule_category),'r') ]] + - [[ r.get('register_name', False) ]][[ h.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]] + [[ r.get('register_name', False) ]][[ h.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]] - [[ r['code'] ]] + [[ r['code'] ]] - [[ r['name'] ]] + [[ r['name'] ]] - [[ r['total'] or '0.0']] [[o.company_id and o.company_id.currency_id.symbol or '']] + [[ r['quantity'] or '0.0' ]] + + + [[ r['amount'] or '0.0' ]] + + + [[ r['total'] or '0.0']] [[ o.company_id and o.company_id.currency_id.symbol or '']][[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]] @@ -405,26 +405,27 @@ - + - + - + - + - Authorized Signature + Authorized Signature - + + From 51f861565173b91decfb952c62e2eddd8facc488 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Thu, 2 Jun 2011 18:45:32 +0530 Subject: [PATCH 4/8] [IMP] hr_payroll: Label improve on payslip report bzr revid: psi@tinyerp.co.in-20110602131532-7qkksk94tt0okpb9 --- addons/hr_payroll/report/report_payslip.rml | 23 ++++++--------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/addons/hr_payroll/report/report_payslip.rml b/addons/hr_payroll/report/report_payslip.rml index b2082613bba..894be44d5fd 100644 --- a/addons/hr_payroll/report/report_payslip.rml +++ b/addons/hr_payroll/report/report_payslip.rml @@ -93,10 +93,6 @@ - - - - @@ -194,7 +190,7 @@ - + @@ -224,7 +220,7 @@ - + Reference @@ -240,7 +236,7 @@ - + Date From @@ -262,14 +258,7 @@ - - - - Payslip Lines: - - - - + Code @@ -278,7 +267,7 @@ Name - Quantity + Quantity/Rate Amount @@ -293,7 +282,7 @@
[[repeatIn(get_payslip_lines(o.line_ids),'p') ]] - + [[ p.code ]] From 664fbb68d6c4bd0c482adc87b5e0ca47c8db893d Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Thu, 2 Jun 2011 18:53:46 +0530 Subject: [PATCH 5/8] [IMP] hr_payroll: code improvment in details by payslip report bzr revid: psi@tinyerp.co.in-20110602132346-x23d19p3j2ulancv --- addons/hr_payroll/report/report_payslip_details.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/addons/hr_payroll/report/report_payslip_details.py b/addons/hr_payroll/report/report_payslip_details.py index d65065eb6f6..e8df94d3b5a 100644 --- a/addons/hr_payroll/report/report_payslip_details.py +++ b/addons/hr_payroll/report/report_payslip_details.py @@ -64,8 +64,9 @@ class payslip_details_report(report_sxw.rml_parse): for key, value in result.iteritems(): rule_categories = rule_cate_obj.browse(self.cr, self.uid, [key]) parents = get_recursive_parent(rule_categories) - self.cr.execute('''SELECT SUM(pl.total) FROM hr_payslip_line pl\ - WHERE pl.id in %s''',(tuple(value),)) + category_total = 0 + for line in payslip_line.browse(self.cr, self.uid, value): + category_total += line.total level = 0 for parent in parents: res.append({ @@ -73,7 +74,7 @@ class payslip_details_report(report_sxw.rml_parse): 'name': parent.name, 'code': parent.code, 'level': level, - 'total': self.cr.fetchone()[0] or 0.0, + 'total': category_total, }) level += 1 for line in payslip_line.browse(self.cr, self.uid, value): @@ -96,11 +97,12 @@ class payslip_details_report(report_sxw.rml_parse): result.setdefault(obj[id].register_id.name, []) result[obj[id].register_id.name].append(obj[id].id) for key, value in result.iteritems(): - self.cr.execute('''SELECT SUM(pl.total) FROM hr_payslip_line pl\ - WHERE pl.id in %s''',(tuple(value),)) + register_total = 0 + for line in payslip_line.browse(self.cr, self.uid, value): + register_total += line.total res.append({ 'register_name': key, - 'total': self.cr.fetchone()[0] or 0.0, + 'total': register_total, }) for line in payslip_line.browse(self.cr, self.uid, value): res.append({ From a9327bd59e23bba32d0f3b6db0776953a0532264 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Fri, 3 Jun 2011 10:30:02 +0530 Subject: [PATCH 6/8] [IMP] hr_payroll: Update the label of quantity field bzr revid: psi@tinyerp.co.in-20110603050002-g5932m0150i9pccp --- addons/hr_payroll/hr_payroll_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 03f3adbe2d1..5ec6be58f26 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -258,7 +258,7 @@ - + From 939fed8f4f7f03c3035d57484ff0d4ef946a59c5 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Fri, 3 Jun 2011 13:09:17 +0530 Subject: [PATCH 7/8] [IMP] hr_payroll: Increase the width of columns and rename lable bzr revid: psi@tinyerp.co.in-20110603073917-v9cf1nl1voa9fxvb --- addons/hr_payroll/hr_payroll_view.xml | 2 +- addons/hr_payroll/report/report_payslip.rml | 67 +++++++++------------ 2 files changed, 31 insertions(+), 38 deletions(-) diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 5ec6be58f26..27fc5b0fb9b 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -141,7 +141,7 @@ - + diff --git a/addons/hr_payroll/report/report_payslip.rml b/addons/hr_payroll/report/report_payslip.rml index 894be44d5fd..9e833c72f83 100644 --- a/addons/hr_payroll/report/report_payslip.rml +++ b/addons/hr_payroll/report/report_payslip.rml @@ -126,15 +126,14 @@ - + - - - - - - - + + + + + + @@ -177,20 +176,20 @@ - Name + Name - [[o.employee_id.name]] + [[o.employee_id.name]] - Designation + Designation [[ o.employee_id.job_id.name or '' ]] - + @@ -205,7 +204,7 @@ - Email + Email [[ o.employee_id.work_email or '' ]] @@ -220,26 +219,26 @@ - + - Reference + Reference [[ o.number or '' ]] - Bank Account + Bank Account [[ o.employee_id.otherid or '' ]] - + - Date From + Date From [[ o.date_from or '']] @@ -258,31 +257,28 @@ - + - Code + Code - Name + Name - Quantity/Rate + Quantity/Rate - Amount + Amount - Total + Total - - -
[[repeatIn(get_payslip_lines(o.line_ids),'p') ]] - + [[ p.code ]] @@ -301,14 +297,11 @@ - - -
- + - + @@ -325,16 +318,16 @@ - + - + - + - Authorized Signature + Authorized Signature From 90ecd793ef6d342e48b9ee377e9745fc25c5579b Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Fri, 3 Jun 2011 16:02:38 +0530 Subject: [PATCH 8/8] [IMP] hr_payroll: Used formatLang in reports bzr revid: psi@tinyerp.co.in-20110603103238-41triu06bx5vworm --- addons/hr_payroll/report/report_payslip.rml | 6 +++--- addons/hr_payroll/report/report_payslip_details.rml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/hr_payroll/report/report_payslip.rml b/addons/hr_payroll/report/report_payslip.rml index 9e833c72f83..ab509072c63 100644 --- a/addons/hr_payroll/report/report_payslip.rml +++ b/addons/hr_payroll/report/report_payslip.rml @@ -287,13 +287,13 @@ [[ p.name ]] - [[ p.quantity or '0.0']] + [[ formatLang(p.quantity) ]] - [[ p.amount or '0.0' ]] + [[ formatLang(p.amount) ]] - [[ p.total or '0.0']] [[o.company_id and o.company_id.currency_id.symbol or '']] + [[ formatLang(p.total) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] diff --git a/addons/hr_payroll/report/report_payslip_details.rml b/addons/hr_payroll/report/report_payslip_details.rml index 395654151f5..55714b39863 100644 --- a/addons/hr_payroll/report/report_payslip_details.rml +++ b/addons/hr_payroll/report/report_payslip_details.rml @@ -340,7 +340,7 @@ [[ h['name'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]] - [[ h['total'] or '0.0' ]] [[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') ]] + [[ formatLang(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') ]] @@ -391,13 +391,13 @@ [[ r['name'] ]] - [[ r['quantity'] or '0.0' ]] + [[ formatLang(r['quantity']) ]] - [[ r['amount'] or '0.0' ]] + [[ formatLang(r['amount']) ]] - [[ r['total'] or '0.0']] [[ o.company_id and o.company_id.currency_id.symbol or '']][[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]] + [[ formatLang(r['total']) ]] [[ o.company_id and o.company_id.currency_id.symbol or '']][[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]