From 2386cb96c98edaa805cdf83af654494abdf4ccb6 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Fri, 3 Aug 2012 14:47:29 +0530 Subject: [PATCH] [FIX]l10n_in_hr_payroll:report name changed,file name changed,rml improved bzr revid: kbh@tinyerp.com-20120803091729-sal3w4dltoxbxu5w --- addons/l10n_in_hr_payroll/__openerp__.py | 2 +- .../l10n_in_hr_payroll_report.xml | 4 +- addons/l10n_in_hr_payroll/report/__init__.py | 2 +- ...l.py => report_hr_yearly_salary_detail.py} | 21 ++++--- ...rml => report_hr_yearly_salary_detail.rml} | 63 ++++++++++--------- addons/l10n_in_hr_payroll/wizard/__init__.py | 2 +- ...y_detail.py => hr_yearly_salary_detail.py} | 0 ...w.xml => hr_yearly_salary_detail_view.xml} | 4 +- 8 files changed, 50 insertions(+), 48 deletions(-) rename addons/l10n_in_hr_payroll/report/{report_yearly_salary_detail.py => report_hr_yearly_salary_detail.py} (94%) rename addons/l10n_in_hr_payroll/report/{report_yearly_salary_detail.rml => report_hr_yearly_salary_detail.rml} (92%) rename addons/l10n_in_hr_payroll/wizard/{yearly_salary_detail.py => hr_yearly_salary_detail.py} (100%) rename addons/l10n_in_hr_payroll/wizard/{yearly_salary_detail_view.xml => hr_yearly_salary_detail_view.xml} (93%) diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py index 4f5a54d8583..199dc0a232c 100644 --- a/addons/l10n_in_hr_payroll/__openerp__.py +++ b/addons/l10n_in_hr_payroll/__openerp__.py @@ -51,7 +51,7 @@ Indian Payroll Salary Rules. 'l10n_in_hr_payroll_report.xml', 'l10n_in_hr_payroll_sequence.xml', 'wizard/hr_salary_employee_bymonth_view.xml', - 'wizard/yearly_salary_detail_view.xml', + 'wizard/hr_yearly_salary_detail_view.xml', 'report/payment_advice_report_view.xml', ], diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml index 0b8df3880dd..4a0c9ded0b9 100644 --- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml +++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml @@ -31,8 +31,8 @@ id="yearly_salary" model="yearly.salary.detail" name="salary.detail.byyear" - rml="l10n_in_hr_payroll/report/report_yearly_salary_detail.rml" - string="Yearly Salary Report" /> + rml="l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml" + string="Payroll Register" /> diff --git a/addons/l10n_in_hr_payroll/report/__init__.py b/addons/l10n_in_hr_payroll/report/__init__.py index b8dfa2eeaaf..5c76aa37e1c 100644 --- a/addons/l10n_in_hr_payroll/report/__init__.py +++ b/addons/l10n_in_hr_payroll/report/__init__.py @@ -26,6 +26,6 @@ import report_payslip_details import report_payroll_advice import report_hr_salary_employee_bymonth import payment_advice_report -import report_yearly_salary_detail +import report_hr_yearly_salary_detail # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py similarity index 94% rename from addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py rename to addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py index 15c7279c477..c642e297de5 100644 --- a/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py +++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py @@ -46,6 +46,7 @@ class employees_yearly_salary_report(report_sxw.rml_parse): self.total = 0.00 def get_periods(self, form): + self.mnths =[] # Get start year-month-date and end year-month-date first_year = int(form['date_from'][0:4]) last_year = int(form['date_to'][0:4]) @@ -86,8 +87,9 @@ class employees_yearly_salary_report(report_sxw.rml_parse): #for Basic Salary res = self.cal_monthly_amt(form, obj.id) basic = res[0] - self.total += basic[0][len(basic[0])-1] - self.allow_list.append(basic[0]) + if basic: + self.total += basic[0][len(basic[0])-1] + self.allow_list.append(basic[0]) #for allowance allow = res[1] @@ -95,8 +97,9 @@ class employees_yearly_salary_report(report_sxw.rml_parse): for i in range(1, len(allow)+1): self.allow_list.append(allow[i-1]) self.total += allow[i-1][len(allow[i-1])-1] - self.total += gross[0][len(gross[0])-1] - self.allow_list.append(gross[0]) + if gross: + self.total += gross[0][len(gross[0])-1] + self.allow_list.append(gross[0]) #for Deduction deduct = res[2] @@ -104,8 +107,9 @@ class employees_yearly_salary_report(report_sxw.rml_parse): for i in range(1, len(deduct)+1): self.deduct_list.append(deduct[i-1]) self.total -= deduct[i-1][len(deduct[i-1])-1] - self.total += net[0][len(net[0])-1] - self.deduct_list.append(net[0]) + if net: + self.total += net[0][len(net[0])-1] + self.deduct_list.append(net[0]) return None def cal_monthly_amt(self, form, emp_id): @@ -185,11 +189,9 @@ class employees_yearly_salary_report(report_sxw.rml_parse): return result def salary_list(self, salaries): - cnt = 0 cat_salary_all = [] for category_name,amount in salaries.items(): cat_salary = [] - cnt += 1 tot = 0.0 cat_salary.append(category_name) for mnth in self.mnths: @@ -205,7 +207,6 @@ class employees_yearly_salary_report(report_sxw.rml_parse): cat_salary.append('') cat_salary.append(tot) cat_salary_all.append(cat_salary) - cnt = 1 return cat_salary_all def get_allow(self): @@ -217,6 +218,6 @@ class employees_yearly_salary_report(report_sxw.rml_parse): def get_total(self): return self.total -report_sxw.report_sxw('report.salary.detail.byyear', 'yearly.salary.detail', 'hr_payroll/report/report_yearly_salary_detail.rml', parser=employees_yearly_salary_report, header='internal landscape') +report_sxw.report_sxw('report.salary.detail.byyear', 'yearly.salary.detail', 'hr_payroll/report/report_hr_yearly_salary_detail.rml', parser=employees_yearly_salary_report, header='internal landscape') # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml similarity index 92% rename from addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.rml rename to addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml index 0f150d56575..3a9412d7008 100644 --- a/addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.rml +++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml @@ -1,6 +1,6 @@ - -