diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml index 20bdae2442e..2a5c2a0210f 100644 --- a/addons/hr_payroll/report/report_emp_salary_structure.rml +++ b/addons/hr_payroll/report/report_emp_salary_structure.rml @@ -318,7 +318,7 @@ Designation - [[ employee.contract_id and employee.contract_id.job_id and employee.contract_id.job_id.name or '' ]] + [[ employee.contract_id.job_id and employee.contract_id.job_id.name or '' ]] Phone No. @@ -356,19 +356,19 @@ Start Date - [[ employee.contract_id and formatLang(employee.contract_id.date_start,date=True) or '' ]] + [[ formatLang(employee.contract_id.date_start,date=True) or '' ]] End Date - [[ employee.contract_id and formatLang(employee.contract_id.date_end,date=True) or removeParentNode('para') ]] + [[ formatLang(employee.contract_id.date_end,date=True) or removeParentNode('para') ]] Type - [[ employee.contract_id and get_type(employee.contract_id.wage_type_id.type) or '' ]] + [[ get_type(employee.contract_id.wage_type_id.type) or '' ]] @@ -378,13 +378,13 @@ Salary - [[ employee.contract_id and formatLang(employee.contract_id.wage) or '' ]] [[ employee.company_id.currency_id.symbol]] + [[ formatLang(employee.contract_id.wage) or '' ]] [[ employee.company_id.currency_id.symbol]] Notes: - [[ employee.contract_id and employee.contract_id.notes or '' ]] + [[ employee.contract_id.notes or '' ]] @@ -463,7 +463,7 @@
- [[repeatIn(employee.contract_id and employee.contract_id.struct_id and employee.contract_id.struct_id.line_ids or [],'line')]] + [[repeatIn(employee.contract_id.struct_id and employee.contract_id.struct_id.line_ids or [],'line')]] @@ -473,7 +473,7 @@ [[ line.name ]] - [[ line.amount or '']] [[ get_line_amount_symbol(line.amount_type) ]] + [[ line.amount_type =='per' and (line.amount*100) or line.amount]] [[ get_line_amount_symbol(line.amount_type) ]] [[ get_line_amount_type(line.amount_type) ]] @@ -536,7 +536,7 @@ [[ line1.name ]] - [[ line1.amount ]] [[ get_line_amount_symbol(line1.amount_type) ]] + [[ line1.amount_type =='per' and (line1.amount*100) or line1.amount ]] [[ get_line_amount_symbol(line1.amount_type) ]] [[ get_line_amount_type(line1.amount_type) ]]