diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml index 1988d932ce2..28ebe20d007 100644 --- a/addons/hr_payroll/report/report_employees_detail.rml +++ b/addons/hr_payroll/report/report_employees_detail.rml @@ -86,33 +86,19 @@ - - - - - - - - - - - - - - @@ -122,20 +108,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -144,20 +130,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -166,24 +152,38 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -292,10 +292,10 @@ [[ o.name ]] - Other Id + PAN No. - [[ o.otherid or '' ]] + [[ o.pan_no or ' ']] Address @@ -332,7 +332,7 @@
[[ repeatIn(get_periods(data['form']),'m') ]] - + Title @@ -378,13 +378,7 @@ - - -
- - - @@ -393,56 +387,53 @@
- [[ repeatIn(get_allow(),'e1') ]] - + [[ repeatIn(get_allow(),'e1') ]] + [[ e1[0] ]] - [[ formatLang(e1[1]) ]] + [[ formatLang(e1[1]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[2]) ]] + [[ formatLang(e1[2]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[3]) ]] + [[ formatLang(e1[3]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[4]) ]] + [[ formatLang(e1[4]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[5]) ]] + [[ formatLang(e1[5]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[6]) ]] + [[ formatLang(e1[6]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[7]) ]] + [[ formatLang(e1[7]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[8]) ]] + [[ formatLang(e1[8]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[9]) ]] + [[ formatLang(e1[9]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[10]) ]] + [[ formatLang(e1[10]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[11]) ]] + [[ formatLang(e1[11]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[12]) ]] + [[ formatLang(e1[12]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[13]) ]] + [[ formatLang(e1[13]) ]] [[ company.currency_id.symbol ]] - - -
@@ -452,56 +443,53 @@
- [[ repeatIn(get_deduct(),'e2') ]] - + [[ repeatIn(get_deduct(),'e2') ]] + [[ e2[0] ]] - [[ formatLang(e2[1]) ]] + [[ formatLang(e2[1]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[2]) ]] + [[ formatLang(e2[2]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[3]) ]] + [[ formatLang(e2[3]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[4]) ]] + [[ formatLang(e2[4]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[5]) ]] + [[ formatLang(e2[5]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[6]) ]] + [[ formatLang(e2[6]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[7]) ]] + [[ formatLang(e2[7]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[8]) ]] + [[ formatLang(e2[8]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[9]) ]] + [[ formatLang(e2[9]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[10]) ]] + [[ formatLang(e2[10]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[11]) ]] + [[ formatLang(e2[11]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[12]) ]] + [[ formatLang(e2[12]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[13]) ]] + [[ formatLang(e2[13]) ]] [[ company.currency_id.symbol ]] - - -
@@ -511,107 +499,98 @@
- [[ repeatIn(get_other(),'e3') ]] - + [[ repeatIn(get_other(),'e3') ]] + [[ e3[0] ]] - [[ formatLang(e3[1]) ]] + [[ formatLang(e3[1]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[2]) ]] + [[ formatLang(e3[2]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[3]) ]] + [[ formatLang(e3[3]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[4]) ]] + [[ formatLang(e3[4]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[5]) ]] + [[ formatLang(e3[5]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[6]) ]] + [[ formatLang(e3[6]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[7]) ]] + [[ formatLang(e3[7]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[8]) ]] + [[ formatLang(e3[8]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[9]) ]] + [[ formatLang(e3[9]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[10]) ]] + [[ formatLang(e3[10]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[11]) ]] + [[ formatLang(e3[11]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[12]) ]] + [[ formatLang(e3[12]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[13]) ]] + [[ formatLang(e3[13]) ]] [[ company.currency_id.symbol ]] - - -
- - -
- - - [[ get_monthly_total()[0] ]] - [[ formatLang(get_monthly_total()[1]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[1]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[2]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[2]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[3]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[3]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[4]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[4]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[5]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[5]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[6]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[6]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[7]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[7]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[8]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[8]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[9]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[9]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[10]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[10]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[11]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[11]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[12]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[12]) ]] [[ company.currency_id.symbol ]] - [[ formatLang(get_total()) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_total()) ]] [[ company.currency_id.symbol ]] @@ -619,11 +598,8 @@
- - - - + \ No newline at end of file