diff --git a/addons/hr_payroll/report/report_employees_detail.py b/addons/hr_payroll/report/report_employees_detail.py
index efa4c1ee236..67481dc1a7d 100644
--- a/addons/hr_payroll/report/report_employees_detail.py
+++ b/addons/hr_payroll/report/report_employees_detail.py
@@ -192,8 +192,13 @@ class employees_salary_report(rml_parse.rml_parse):
append_index = len(result) - 1
tot += line.total
else:
- result.append(0.00)
- res[mnth] = 0.00
+ if mnth == 'None':
+ result.append('')
+ res[mnth] = ''
+ self.month_total_list[cnt] = ''
+ else:
+ result.append(0.00)
+ res[mnth] = 0.00
if not res:
result.append(0.00)
res = {}
diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml
index 542e370eb34..6d8e6b18fc8 100644
--- a/addons/hr_payroll/report/report_employees_detail.rml
+++ b/addons/hr_payroll/report/report_employees_detail.rml
@@ -408,40 +408,40 @@
[[ e1[0] ]]
- [[ formatLang(e1[1]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e1[1]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e1[2]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e1[2]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e1[3]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e1[3]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e1[4]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e1[4]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e1[5]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e1[5]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e1[6]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e1[6]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e1[7]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e1[7]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e1[8]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e1[8]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e1[9]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e1[9]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e1[10]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e1[10]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e1[11]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e1[11]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e1[12]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e1[12]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]
|
[[ formatLang(e1[13]) ]] [[ company.currency_id.symbol ]]
@@ -464,40 +464,40 @@
[[ e2[0] ]]
|
- [[ formatLang(e2[1]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e2[1]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e2[2]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e2[2]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e2[3]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e2[3]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e2[4]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e2[4]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e2[5]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e2[5]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e2[6]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e2[6]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e2[7]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e2[7]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e2[8]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e2[8]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e2[9]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e2[9]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e2[10]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e2[10]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e2[11]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e2[11]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e2[12]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e2[12]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
[[ formatLang(e2[13]) ]] [[ company.currency_id.symbol ]]
@@ -520,40 +520,40 @@
[[ e3[0] ]]
|
- [[ formatLang(e3[1]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e3[1]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e3[2]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e3[2]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e3[3]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e3[3]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e3[4]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e3[4]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e3[5]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e3[5]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e3[6]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e3[6]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e3[7]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e3[7]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e3[8]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e3[8]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e3[9]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e3[9]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e3[10]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e3[10]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e3[11]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e3[11]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
- [[ formatLang(e3[12]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e3[12]) or removeParentNode('para')]] [[ company.currency_id.symbol ]]
|
[[ formatLang(e3[13]) ]] [[ company.currency_id.symbol ]]
@@ -568,40 +568,40 @@
[[ get_monthly_total()[0] ]]
|
- [[ formatLang(get_monthly_total()[1]) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(get_monthly_total()[1]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[2]) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(get_monthly_total()[2]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[3]) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(get_monthly_total()[3]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[4]) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(get_monthly_total()[4]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[5]) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(get_monthly_total()[5]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[6]) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(get_monthly_total()[6]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[7]) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(get_monthly_total()[7]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[8]) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(get_monthly_total()[8]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[9]) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(get_monthly_total()[9]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[10]) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(get_monthly_total()[10]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[11]) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(get_monthly_total()[11]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[12]) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(get_monthly_total()[12]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]
|
[[ formatLang(get_total()) ]][[ company.currency_id.symbol ]]
@@ -616,4 +616,4 @@
-
\ No newline at end of file
+
diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml
index 212bb59e7b3..da988e94f7e 100755
--- a/addons/hr_payroll/report/report_year_report.rml
+++ b/addons/hr_payroll/report/report_year_report.rml
@@ -201,40 +201,40 @@
[[ e[0] ]]
|
- [[ formatLang(e[1]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(e[1]) or removeParentNode('para') ]] [[company.currency_id.symbol]]
|
- [[ formatLang(e[2]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(e[2]) or removeParentNode('para') ]] [[company.currency_id.symbol]]
|
- [[ formatLang(e[3]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(e[3]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(e[4]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(e[4]) or removeParentNode('para') ]] [[company.currency_id.symbol]]
|
- [[ formatLang(e[5]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(e[5]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(e[6]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(e[6]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(e[7]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(e[7]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(e[8]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(e[8]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(e[9]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(e[9]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(e[10]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(e[10]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(e[11]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(e[11]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(e[12]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(e[12]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
[[ formatLang(e[13]) ]] [[company.currency_id.symbol]]
@@ -251,40 +251,40 @@
Total
|
- [[ formatLang(t[1]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(t[1]) or removeParentNode('para') ]] [[company.currency_id.symbol]]
|
- [[ formatLang(t[2]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(t[2]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(t[3]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(t[3]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(t[4]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(t[4]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(t[5]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(t[5]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(t[6]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(t[6]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(t[7]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(t[7]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(t[8]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(t[8]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(t[9]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(t[9]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(t[10]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(t[10]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(t[11]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(t[11]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
- [[ formatLang(t[12]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(t[12]) or removeParentNode('para')]] [[company.currency_id.symbol]]
|
[[ formatLang(get_total()) ]] [[company.currency_id.symbol]]
@@ -296,4 +296,4 @@
-
\ No newline at end of file
+
diff --git a/addons/hr_payroll/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py
index 0a7857582d4..2db2d7d7e2d 100755
--- a/addons/hr_payroll/report/report_year_salary.py
+++ b/addons/hr_payroll/report/report_year_salary.py
@@ -67,17 +67,16 @@ class year_salary_report(rml_parse.rml_parse):
query = "select net from hr_payslip where employee_id = "+str(emp_id.id)+" and to_char(date,'mm-yyyy') like '%"+mnth+"%' and state = 'done' "
self.cr.execute(query)
sal = self.cr.fetchall()
+ if sal:
+ ls1.append(sal[0][0])
+ tol += sal[0][0]
+ tol_mnths[cnt] = tol_mnths[cnt] + sal[0][0]
+ else:
+ ls1.append(0.00)
+ tol_mnths[cnt] = 0.0
else:
- sal = [(0.0,)]
- try:
- ls1.append(sal[0][0])
- except:
- ls1.append(0)
- try:
- tol += sal[0][0]
- tol_mnths[cnt] = tol_mnths[cnt] + sal[0][0]
- except:
- tol += 0
+ ls1.append('')
+ tol_mnths[cnt] = ''
cnt = cnt + 1
cnt = 1
ls1.append(tol)
@@ -92,6 +91,8 @@ class year_salary_report(rml_parse.rml_parse):
def get_total(self):
for item in self.mnths_tol:
for count in range(1,len(item)):
+ if item[count] == '':
+ continue
self.total += item[count]
return self.total
|