From d68a21b0f2c3a0f4424f66d0e3fbd62c17d2e97a Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Mon, 13 Aug 2012 12:45:30 +0530 Subject: [PATCH 1/3] [IMP]l10n_in_hr_payroll:category name added in report bzr revid: kbh@tinyerp.com-20120813071530-tsfqlsg08qkjs7s5 --- .../report/report_hr_salary_employee_bymonth.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml index 9d1b4cb0e83..1f0a4b74896 100644 --- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml +++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml @@ -114,7 +114,7 @@ Yearly Salary Details - From [[ formatLang(data['form']['start_date'], date=True) ]] To [[ formatLang(data['form']['end_date'], date=True) ]] + From [[ formatLang(data['form']['start_date'], date=True) ]] To [[ formatLang(data['form']['end_date'], date=True) ]] [[ (data['form']['category_id'][1]) ]] Category From 226e281b554b6298b10c7648c078741af1db57c9 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Mon, 13 Aug 2012 13:06:00 +0530 Subject: [PATCH 2/3] [IMP]l10n_in_hr_payroll:string added bzr revid: kbh@tinyerp.com-20120813073600-g23vkk2h9sviuvr0 --- .../report/report_hr_salary_employee_bymonth.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml index 1f0a4b74896..8293edfafcb 100644 --- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml +++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml @@ -114,7 +114,7 @@ Yearly Salary Details - From [[ formatLang(data['form']['start_date'], date=True) ]] To [[ formatLang(data['form']['end_date'], date=True) ]] [[ (data['form']['category_id'][1]) ]] Category + From [[ formatLang(data['form']['start_date'], date=True) ]] To [[ formatLang(data['form']['end_date'], date=True) ]] of [[ (data['form']['category_id'][1]) ]] Category From e63c4f84e936dbed94a19a659ddc5f47801366de Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Mon, 13 Aug 2012 14:13:17 +0530 Subject: [PATCH 3/3] [FIX]l10n_in_hr_payroll:underline on date and category bzr revid: kbh@tinyerp.com-20120813084317-2eszak00jfmjukz5 --- .../report/report_hr_salary_employee_bymonth.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml index 8293edfafcb..8f2a57d2018 100644 --- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml +++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml @@ -114,7 +114,7 @@ Yearly Salary Details - From [[ formatLang(data['form']['start_date'], date=True) ]] To [[ formatLang(data['form']['end_date'], date=True) ]] of [[ (data['form']['category_id'][1]) ]] Category + From [[ formatLang(data['form']['start_date'], date=True) ]] To [[ formatLang(data['form']['end_date'], date=True) ]] of [[ (data['form']['category_id'][1]) ]] Category