diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py index 07ba77306f0..f8693fb9587 100644 --- a/addons/hr_payroll/__openerp__.py +++ b/addons/hr_payroll/__openerp__.py @@ -52,6 +52,7 @@ 'hr_payroll_data.xml', 'wizard/hr_payroll_create_analytic.xml', 'wizard/hr_payroll_employees_detail.xml', + 'wizard/hr_payroll_year_salary.xml', 'hr_payroll_wizard.xml' ], 'demo_xml': [ diff --git a/addons/hr_payroll/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py index 1866ef795b6..66cf05db601 100755 --- a/addons/hr_payroll/report/report_year_salary.py +++ b/addons/hr_payroll/report/report_year_salary.py @@ -64,7 +64,7 @@ class year_salary_report(rml_parse.rml_parse): periods = [] tol_mnths=['Total',0,0,0,0,0,0,0,0,0,0,0,0] emp = pooler.get_pool(self.cr.dbname).get('hr.employee') - emp_ids = form['employee_ids'][0][2] + emp_ids = form['employee_ids'] empll = emp.browse(self.cr,self.uid, emp_ids) fiscalyear_obj = pooler.get_pool(self.cr.dbname).get('account.fiscalyear').browse(self.cr, self.uid, form['fiscalyear_id']) period_ids_l = fiscalyear_obj.period_ids diff --git a/addons/hr_payroll/wizard/__init__.py b/addons/hr_payroll/wizard/__init__.py index 0918085e334..3f80055c621 100755 --- a/addons/hr_payroll/wizard/__init__.py +++ b/addons/hr_payroll/wizard/__init__.py @@ -1,3 +1,3 @@ import hr_payroll_employees_detail -import wizard_employees_detail import hr_payroll_create_analytic +import hr_payroll_year_salary diff --git a/addons/hr_payroll/wizard/hr_payroll_create_analytic.xml b/addons/hr_payroll/wizard/hr_payroll_create_analytic.xml index 88a3746e272..927ae3e408c 100644 --- a/addons/hr_payroll/wizard/hr_payroll_create_analytic.xml +++ b/addons/hr_payroll/wizard/hr_payroll_create_analytic.xml @@ -27,7 +27,7 @@ form new - +