From 5f91b11c1c152b78af0bfa3d0718b66755747c45 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 18 Jul 2012 18:45:02 +0530 Subject: [PATCH] [ADD]l10n_in_hr_payroll:added report for salary rule by months bzr revid: kbh@tinyerp.com-20120718131502-csfajf5yeqjsby07 --- .../report/report_payslip_details.py | 1 - addons/l10n_in_hr_payroll/__init__.py | 1 + addons/l10n_in_hr_payroll/__openerp__.py | 3 +- .../l10n_in_hr_payroll_report.xml | 9 +- addons/l10n_in_hr_payroll/report/__init__.py | 1 + .../report/report_payroll_advice.rml | 4 +- .../report/report_payslip_details.py | 1 + .../report/report_salary_rule_bymonth.py | 127 ++++++++ .../report/report_salary_rule_bymonth.rml | 302 ++++++++++++++++++ addons/l10n_in_hr_payroll/wizard/__init__.py | 24 ++ .../wizard/salary_rule_bymonth.py | 66 ++++ .../wizard/salary_rule_bymonth.xml | 55 ++++ 12 files changed, 589 insertions(+), 5 deletions(-) create mode 100644 addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.py create mode 100644 addons/l10n_in_hr_payroll/report/report_salary_rule_bymonth.rml create mode 100644 addons/l10n_in_hr_payroll/wizard/__init__.py create mode 100644 addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.py create mode 100644 addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml diff --git a/addons/hr_payroll/report/report_payslip_details.py b/addons/hr_payroll/report/report_payslip_details.py index 1e9839eaa6f..13867322a1d 100644 --- a/addons/hr_payroll/report/report_payslip_details.py +++ b/addons/hr_payroll/report/report_payslip_details.py @@ -37,7 +37,6 @@ class payslip_details_report(report_sxw.rml_parse): def get_details_by_rule_category(self, obj): payslip_line = self.pool.get('hr.payslip.line') rule_cate_obj = self.pool.get('hr.salary.rule.category') - def get_recursive_parent(rule_categories): if not rule_categories: return [] diff --git a/addons/l10n_in_hr_payroll/__init__.py b/addons/l10n_in_hr_payroll/__init__.py index 9f1b6af533c..9631ccf0317 100644 --- a/addons/l10n_in_hr_payroll/__init__.py +++ b/addons/l10n_in_hr_payroll/__init__.py @@ -21,5 +21,6 @@ import l10n_in_hr_payroll import report +import wizard # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py index 8eb4e3a500f..a7ce421fdcb 100644 --- a/addons/l10n_in_hr_payroll/__openerp__.py +++ b/addons/l10n_in_hr_payroll/__openerp__.py @@ -49,7 +49,8 @@ Indian Payroll Salary Rules. 'data/hr.salary.rule.csv', 'security/ir.model.access.csv', 'l10n_in_hr_payroll_report.xml', - 'l10n_in_hr_payroll_sequence.xml' + 'l10n_in_hr_payroll_sequence.xml', + 'wizard/salary_rule_bymonth.xml' ], 'demo_xml': ['l10n_in_hr_payroll_demo.xml'], 'installable': True 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 b6392871434..dceadc53a1e 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 @@ -17,6 +17,13 @@ name="payroll.advice" rml="l10n_in_hr_payroll/report/report_payroll_advice.rml" string="Print Advice" /> - + + diff --git a/addons/l10n_in_hr_payroll/report/__init__.py b/addons/l10n_in_hr_payroll/report/__init__.py index 5768ce50d05..70de220986a 100644 --- a/addons/l10n_in_hr_payroll/report/__init__.py +++ b/addons/l10n_in_hr_payroll/report/__init__.py @@ -24,5 +24,6 @@ import report_payslip_details import report_payroll_advice +import report_salary_rule_bymonth # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml index 55014e3b1ee..dafcc41130d 100644 --- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml +++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml @@ -1,8 +1,8 @@ -