From d0317628aade90d1d8015cae782440683b862e21 Mon Sep 17 00:00:00 2001 From: "Jay (OpenERP)" Date: Sat, 9 Oct 2010 02:47:00 +0530 Subject: [PATCH] [FIX] Regression : changes from mx to datetime caused trouble for tasks by month bzr revid: jvo@tinyerp.com-20101008211700-oa4037dd8mlmw37i --- addons/project_timesheet/report/task_report.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/project_timesheet/report/task_report.py b/addons/project_timesheet/report/task_report.py index 261f4e17c64..623d4e4a5cd 100644 --- a/addons/project_timesheet/report/task_report.py +++ b/addons/project_timesheet/report/task_report.py @@ -32,8 +32,8 @@ class report_timesheet_task_user(osv.osv): def _get_task_hours(self, cr, uid, ids, name,args,context): result = {} for record in self.browse(cr, uid, ids,context): - last_date = datetime(record.name, '%Y-%m-%d') + relativedelta(months=1) - 1 - task_obj=self.pool.get('project.task.work') + last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - relativedelta(days=1) + task_obj = self.pool.get('project.task.work') task_ids = task_obj.search(cr, uid, [('user_id','=',record.user_id.id),('date','>=',record.name),('date','<=',last_date.strftime('%Y-%m-%d'))]) tsk_hrs = task_obj.read(cr, uid, task_ids, ['hours','date','user_id']) total = 0.0 @@ -46,8 +46,8 @@ class report_timesheet_task_user(osv.osv): result = {} sum = 0.0 for record in self.browse(cr, uid, ids, context): - last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - 1 - obj=self.pool.get('hr_timesheet_sheet.sheet.day') + last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - relativedelta(days=1) + obj = self.pool.get('hr_timesheet_sheet.sheet.day') sheet_ids = obj.search(cr, uid, [('sheet_id.user_id','=',record.user_id.id),('name','>=',record.name),('name','<=',last_date.strftime('%Y-%m-%d'))]) data_days = obj.read(cr, uid, sheet_ids, ['name','sheet_id.user_id','total_attendance']) total = 0.0