From abbfcc6634792758210413a2af3e2607cc19fc4d Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Thu, 23 Aug 2012 11:51:20 +0530 Subject: [PATCH 1/3] [FIX]l10n_in_hr_payroll:left-right indent added and table width changed in report bzr revid: kbh@tinyerp.com-20120823062120-p8mu9p3wat1xzdf8 --- .../report/report_hr_yearly_salary_detail.rml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml index e1fcf7251f6..ffd6ab5a559 100644 --- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml +++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml @@ -239,7 +239,7 @@ - + @@ -392,7 +392,7 @@
- + Allowances with Basic: @@ -472,7 +472,7 @@
- + Deductions: From 5f8de6a93d3a61706e9c8c8fc965d10ba4e9413b Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Thu, 23 Aug 2012 12:46:56 +0530 Subject: [PATCH 2/3] [FIX]l10n_in_hr_payroll:basic,gross and net are bold bzr revid: kbh@tinyerp.com-20120823071656-jedj3au7gyv829mq --- .../report/report_hr_yearly_salary_detail.rml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml index ffd6ab5a559..5adb86a7292 100644 --- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml +++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml @@ -404,7 +404,8 @@ - [[ e1[0] ]] + [[ e1[0] in ["Basic","Gross"] and e1[0] ]] + [[ e1[0] not in ["Basic","Gross"] and e1[0] ]] @@ -484,7 +485,8 @@ - [[ e2[0] ]] + [[ e2[0] in ["Net"] and e2[0] ]] + [[ e2[0] not in ["Net"] and e2[0] ]] From e2e266e9add069640deaccbaa1c7e01d4825f49f Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Thu, 23 Aug 2012 14:44:32 +0530 Subject: [PATCH 3/3] [FIX]l10n_in_hr_payroll:basic,gross and net with amount are bold,removed header bzr revid: kbh@tinyerp.com-20120823091432-irrs4yxn9xir0fz2 --- .../report/report_hr_yearly_salary_detail.rml | 76 ++++++++++++------- 1 file changed, 49 insertions(+), 27 deletions(-) diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml index 5adb86a7292..7fa127b0bd3 100644 --- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml +++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml @@ -247,7 +247,6 @@ - @@ -262,8 +261,7 @@ - Employees Salary Details - From [[ formatLang(data['form']['date_from'], date=True) ]] To [[ formatLang(data['form']['date_to'], date=True) ]] + From [[ formatLang(data['form']['date_from'], date=True) ]] To [[ formatLang(data['form']['date_to'], date=True) ]] @@ -409,62 +407,74 @@ - [[ (e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]] + [[ (e1[0] in ["Basic","Gross"] and e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]] + [[ (e1[0] not in ["Basic","Gross"] and e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]] - [[ (e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]] + [[ (e1[0] in ["Basic","Gross"] and e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]] + [[ (e1[0] not in ["Basic","Gross"] and e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]] - [[ (e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]] + [[ (e1[0] in ["Basic","Gross"] and e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]] + [[ (e1[0] not in ["Basic","Gross"] and e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]] - [[ (e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]] + [[ (e1[0] in ["Basic","Gross"] and e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]] + [[ (e1[0] not in ["Basic","Gross"] and e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]] - [[ (e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]] + [[ (e1[0] in ["Basic","Gross"] and e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]] + [[ (e1[0] not in ["Basic","Gross"] and e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]] - [[ (e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]] + [[ (e1[0] in ["Basic","Gross"] and e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]] + [[ (e1[0] not in ["Basic","Gross"] and e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]] - [[ (e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]] + [[ (e1[0] in ["Basic","Gross"] and e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]] + [[ (e1[0] not in ["Basic","Gross"] and e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]] - [[ (e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]] + [[ (e1[0] in ["Basic","Gross"] and e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]] + [[ (e1[0] not in ["Basic","Gross"] and e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]] - [[ (e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]] + [[ (e1[0] in ["Basic","Gross"] and e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]] + [[ (e1[0] not in ["Basic","Gross"] and e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]] - [[ (e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]] + [[ (e1[0] in ["Basic","Gross"] and e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]] + [[ (e1[0] not in ["Basic","Gross"] and e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]] - [[ (e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]] + [[ (e1[0] in ["Basic","Gross"] and e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]] + [[ (e1[0] not in ["Basic","Gross"] and e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]] - [[ (e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]] + [[ (e1[0] in ["Basic","Gross"] and e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]] + [[ (e1[0] not in ["Basic","Gross"] and e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]] @@ -490,62 +500,74 @@ - [[ (e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]] + [[ (e2[0] in ["Net"] and e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]] + [[ (e2[0] not in ["Net"] and e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]] - [[ (e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]] + [[ (e2[0] in ["Net"] and e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]] + [[ (e2[0] not in ["Net"] and e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]] - [[ (e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]] + [[ (e2[0] in ["Net"] and e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]] + [[ (e2[0] not in ["Net"] and e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]] - [[ (e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]] + [[ (e2[0] in ["Net"] and e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]] + [[ (e2[0] not in ["Net"] and e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]] - [[ (e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]] + [[ (e2[0] in ["Net"] and e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]] + [[ (e2[0] not in ["Net"] and e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]] - [[ (e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]] + [[ (e2[0] in ["Net"] and e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]] + [[ (e2[0] not in ["Net"] and e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]] - [[ (e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]] + [[ (e2[0] in ["Net"] and e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]] + [[ (e2[0] not in ["Net"] and e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]] - [[ (e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]] + [[ (e2[0] in ["Net"] and e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]] + [[ (e2[0] not in ["Net"] and e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]] - [[ (e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]] + [[ (e2[0] in ["Net"] and e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]] + [[ (e2[0] not in ["Net"] and e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]] - [[ (e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]] + [[ (e2[0] in ["Net"] and e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]] + [[ (e2[0] not in ["Net"] and e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]] - [[ (e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]] + [[ (e2[0] in ["Net"] and e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]] + [[ (e2[0] not in ["Net"] and e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]] - [[ (e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]] + [[ (e2[0] in ["Net"] and e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]] + [[ (e2[0] not in ["Net"] and e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]