diff --git a/addons/hr_attendance/report/attendance_by_month.py b/addons/hr_attendance/report/attendance_by_month.py index 69ce9511ac2..d4ce9cb148a 100644 --- a/addons/hr_attendance/report/attendance_by_month.py +++ b/addons/hr_attendance/report/attendance_by_month.py @@ -23,7 +23,6 @@ from datetime import datetime, timedelta from dateutil.relativedelta import relativedelta import time -from openerp import netsvc, pooler from openerp.report import report_sxw from openerp.report.interface import report_rml from openerp.report.interface import toxml @@ -46,7 +45,8 @@ def lengthmonth(year, month): class report_custom(report_rml): def create_xml(self, cr, uid, ids, datas, context=None): - obj_emp = pooler.get_pool(cr.dbname).get('hr.employee') + registry = openerp.registry(cr.dbname) + obj_emp = registry['hr.employee'] if context is None: context = {} month = datetime(datas['form']['year'], datas['form']['month'], 1) @@ -102,14 +102,14 @@ class report_custom(report_rml): days_xml.append(today_xml) user_xml.append(user_repr % '\n'.join(days_xml)) - rpt_obj = pooler.get_pool(cr.dbname).get('hr.employee') + rpt_obj = obj_emp rml_obj=report_sxw.rml_parse(cr, uid, rpt_obj._name,context) header_xml = '''
%s %s
- ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),to_xml(pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid).company_id.name)) + ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),to_xml(registry['res.users'].browse(cr,uid,uid).company_id.name)) first_date = str(month) som = datetime.strptime(first_date, '%Y-%m-%d %H:%M:%S') diff --git a/addons/hr_attendance/report/attendance_errors.py b/addons/hr_attendance/report/attendance_errors.py index 411a1139def..811f4d8d906 100644 --- a/addons/hr_attendance/report/attendance_errors.py +++ b/addons/hr_attendance/report/attendance_errors.py @@ -22,7 +22,6 @@ import datetime import time -from openerp import pooler from openerp.report import report_sxw class attendance_print(report_sxw.rml_parse): diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py index 321bb6bacc9..42dd686eba3 100644 --- a/addons/hr_attendance/report/timesheet.py +++ b/addons/hr_attendance/report/timesheet.py @@ -24,7 +24,8 @@ from datetime import datetime from dateutil.relativedelta import relativedelta import time -from openerp import pooler, tools +import openerp +from openerp import tools from openerp.report import report_sxw from openerp.report.interface import report_rml, toxml from openerp.tools.translate import _ @@ -38,7 +39,8 @@ def to_hour(h): class report_custom(report_rml): def create_xml(self, cr, uid, ids, datas, context=None): - obj_emp = pooler.get_pool(cr.dbname).get('hr.employee') + registry = openerp.registry(cr.dbname) + obj_emp = registry['hr.employee'] emp_ids = datas['active_ids'] start_date = datetime.strptime(datas['form']['init_date'], '%Y-%m-%d') @@ -49,14 +51,14 @@ class report_custom(report_rml): if last_monday < first_monday: first_monday, last_monday = last_monday, first_monday - rpt_obj = pooler.get_pool(cr.dbname).get('hr.employee') + rpt_obj = obj_emp rml_obj=report_sxw.rml_parse(cr, uid, rpt_obj._name,context) header_xml = '''
%s %s
- ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid).company_id.name) + ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),registry['res.users'].browse(cr,uid,uid).company_id.name) user_xml = [] for employee_id in emp_ids: emp = obj_emp.read(cr, uid, [employee_id], ['id', 'name'])[0]