From 620ba23f3606d71bbce30027aa8d95697ffa68c5 Mon Sep 17 00:00:00 2001 From: "apa (OpenERP)" Date: Thu, 16 Dec 2010 15:02:34 +0530 Subject: [PATCH] [FIX]:changed the wizard menu_id with datas ID for multiheader problem. bzr revid: apa@tinyerp.com-20101216093234-xsqxxube70cmj7fm --- addons/hr_payroll/wizard/hr_payroll_employees_detail.py | 4 ++-- addons/hr_payroll/wizard/hr_payroll_year_salary.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py index 2bb36b6f282..7a4c9ff406d 100755 --- a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py +++ b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py @@ -59,10 +59,10 @@ class hr_payroll_employees_detail(osv.osv_memory): if context is None: context = {} datas = {'ids': context.get('active_ids', [])} - res = self.read(cr, uid, ids, ['employee_ids', 'date_from', 'date_to'], context=context) res = res and res[0] or {} datas['form'] = res + datas['ids'] = res['employee_ids'] return { 'type': 'ir.actions.report.xml', 'report_name': 'employees.salary', @@ -71,4 +71,4 @@ class hr_payroll_employees_detail(osv.osv_memory): hr_payroll_employees_detail() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_payroll/wizard/hr_payroll_year_salary.py b/addons/hr_payroll/wizard/hr_payroll_year_salary.py index 41caf5f4109..186ee27be2b 100755 --- a/addons/hr_payroll/wizard/hr_payroll_year_salary.py +++ b/addons/hr_payroll/wizard/hr_payroll_year_salary.py @@ -64,6 +64,7 @@ class hr_payroll_year_salary(osv.osv_memory): res = self.read(cr, uid, ids, ['employee_ids', 'date_from', 'date_to', 'salary_on'], context=context) res = res and res[0] or {} datas['form'] = res + datas['ids'] = res['employee_ids'] return { 'type': 'ir.actions.report.xml', 'report_name': 'year.salary', @@ -72,4 +73,4 @@ class hr_payroll_year_salary(osv.osv_memory): hr_payroll_year_salary() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: