From 8131e1062d0f177c1b6814975c984f4fe5bffed3 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 8 Aug 2012 12:49:52 +0530 Subject: [PATCH 1/3] [IMP]l10n_in_hr_payroll:improved employees details in report bzr revid: kbh@tinyerp.com-20120808071952-38uom3wvlkgwa1i7 --- .../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 3a9412d7008..b4c9f43d661 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 @@ -276,19 +276,19 @@ Employee Code - [[ o.ssnid ]] + [[ o.identification_id ]] Department - [[ o.company_id and o.company_id.name or '' ]] + [[ o.department_id and o.department_id.name or '' ]] Bank - [[ o.otherid or '' ]] + [[ o.bank_account_id and o.bank_account_id.name or '' ]] From 55f9a34a1e0992c708dcc2fb0f01499e76de6d48 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 8 Aug 2012 14:14:40 +0530 Subject: [PATCH 2/3] [IMP]l10n_in_hr_payroll:changed bank and designation of employee in report bzr revid: kbh@tinyerp.com-20120808084440-uwyxden2svma5fak --- .../report/report_hr_yearly_salary_detail.rml | 4 ++-- 1 file changed, 2 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 b4c9f43d661..e97f3c96f46 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 @@ -288,7 +288,7 @@ Bank - [[ o.bank_account_id and o.bank_account_id.name or '' ]] + [[ o.bank_account_id.bank.name or '' ]] @@ -320,7 +320,7 @@ Designation - [[ o.contract_ids and o.contract_ids[0].job_id.name or '' ]] + [[ o.job_id and o.job_id.name or '' ]] Phone No. From c5c07ee51764c8c9b97b4ea2005a6abdc177b1e8 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 8 Aug 2012 14:17:59 +0530 Subject: [PATCH 3/3] [IMP]l10n_in_hr_payroll:update for bank in rml bzr revid: kbh@tinyerp.com-20120808084759-wiyd4hglrpc8ln57 --- .../report/report_hr_yearly_salary_detail.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e97f3c96f46..e1fcf7251f6 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 @@ -288,7 +288,7 @@ Bank - [[ o.bank_account_id.bank.name or '' ]] + [[ o.bank_account_id and o.bank_account_id.bank.name or '' ]]