Merge lp:~zaber/openobject-addons/timesheet-tz into lp:openobject-addons/6.1

[Don Kirkby]

This fixes bug lp:943091 in 6.1. There were several timezone problems, so I tried to fix each one in a separate commit.
There could still be problems if two users from different timezones edit the same timesheet, but the current 6.1 timesheet modules are unusable because of timezone problems, so I think this is a big improvement.

[lp:~zaber/openobject-addons/timesheet-tz]

7122. By Don Kirkby on 2013-01-07

[FIX] Use time zone for signing in and out of timesheets as part of bug lp:943091. Change hr_attendance.day field to use local date instead of UTC date.

7123. By Don Kirkby on 2013-01-07

[FIX] Use local time in total attendance calculation on timesheet as part of bug lp:943091.

7124. By Don Kirkby on 2013-01-07

[FIX] Store hours on hr_attendance because doing the timezone calculation in SQL was messy. Fixes timesheet by day view.

Unmerged revisions

7125. By Don Kirkby on 2013-01-03

[FIX] Use timezone in Sign in / sign out by project feature as part of bug lp:943091.

7124. By Don Kirkby on 2013-01-07

[FIX] Store hours on hr_attendance because doing the timezone calculation in SQL was messy. Fixes timesheet by day view.

7123. By Don Kirkby on 2013-01-07

[FIX] Use local time in total attendance calculation on timesheet as part of bug lp:943091.

7122. By Don Kirkby on 2013-01-07

[FIX] Use time zone for signing in and out of timesheets as part of bug lp:943091. Change hr_attendance.day field to use local date instead of UTC date.

7121. By Don Kirkby on 2013-01-02

[FIX] fix today button to use time zone as part of bug lp:943091.

=== modified file 'hr_attendance/hr_attendance.py'
--- hr_attendance/hr_attendance.py	2012-01-31 13:36:57 +0000
+++ hr_attendance/hr_attendance.py	2013-01-03 23:59:21 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import time
+from datetime import datetime
 
 from osv import fields, osv
 from tools.translate import _
@@ -48,7 +49,12 @@
     def _day_compute(self, cr, uid, ids, fieldnames, args, context=None):
         res = dict.fromkeys(ids, '')
         for obj in self.browse(cr, uid, ids, context=context):
-            res[obj.id] = time.strftime('%Y-%m-%d', time.strptime(obj.name, '%Y-%m-%d %H:%M:%S'))
+            timestamp = datetime.strptime(obj.name, '%Y-%m-%d %H:%M:%S')
+            res[obj.id] = fields.date.context_today(self, 
+                                                    cr, 
+                                                    uid, 
+                                                    context=context, 
+                                                    timestamp=timestamp)
         return res
 
     _columns = {

=== modified file 'hr_attendance/wizard/hr_attendance_sign_in_out.py'
--- hr_attendance/wizard/hr_attendance_sign_in_out.py	2011-11-09 18:12:56 +0000
+++ hr_attendance/wizard/hr_attendance_sign_in_out.py	2013-01-03 23:59:21 +0000
@@ -162,7 +162,7 @@
             self.pool.get('hr.attendance').create(cr, uid, {'name': data['last_time'], 'action': 'sign_out',
                 'employee_id': emp_id}, context=context)
         try:
-            self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_in')
+            self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_in', context=context)
         except:
             raise osv.except_osv(_('UserError'), _('A sign-in must be right after a sign-out !'))
         return {'type': 'ir.actions.act_window_close'} # To do: Return Success message
@@ -174,7 +174,7 @@
                 raise osv.except_osv(_('UserError'), _('The Sign-in date must be in the past'))
             self.pool.get('hr.attendance').create(cr, uid, {'name':data['last_time'], 'action':'sign_in',  'employee_id':emp_id}, context=context)
         try:
-            self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_out')
+            self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_out', context=context)
         except:
             raise osv.except_osv(_('UserError'), _('A sign-out must be right after a sign-in !'))
         return {'type': 'ir.actions.act_window_close'} # To do: Return Success message

=== modified file 'hr_timesheet/wizard/hr_timesheet_sign_in_out.py'
--- hr_timesheet/wizard/hr_timesheet_sign_in_out.py	2011-12-21 10:52:14 +0000
+++ hr_timesheet/wizard/hr_timesheet_sign_in_out.py	2013-01-03 23:59:21 +0000
@@ -91,7 +91,7 @@
         emp_obj = self.pool.get('hr.employee')
         for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
-            emp_obj.attendance_action_change(cr, uid, [emp_id], type='sign_out', dt=data.date)
+            emp_obj.attendance_action_change(cr, uid, [emp_id], type='sign_out', dt=data.date, context=context)
             self._write(cr, uid, data, emp_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
@@ -99,7 +99,7 @@
         emp_obj = self.pool.get('hr.employee')
         for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
-            emp_obj.attendance_action_change(cr, uid, [emp_id], type='action', dt=data.date)
+            emp_obj.attendance_action_change(cr, uid, [emp_id], type='action', dt=data.date, context=context)
             self._write(cr, uid, data, emp_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
@@ -156,7 +156,7 @@
         emp_obj = self.pool.get('hr.employee')
         for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
-            emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data.date or False)
+            emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' , context=context, dt=data.date or False)
         return {'type': 'ir.actions.act_window_close'}
 
     def default_get(self, cr, uid, fields_list, context=None):

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py	2012-08-31 10:45:03 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py	2013-01-03 23:59:21 +0000
@@ -46,8 +46,8 @@
                     dom.insert(0 ,'|')
                 dom.append('&')
                 dom.append('&')
-                dom.append(('name', '>=', res6[id]))
-                dom.append(('name', '<=', res6[id]))
+                dom.append(('day', '>=', res6[id]))
+                dom.append(('day', '<=', res6[id]))
                 dom.append(('sheet_id', '=', id))
 
         ids2 = obj.pool.get(self._obj).search(cr, user, dom, limit=self._limit)
@@ -118,6 +118,10 @@
         """
         context = context or {}
         attendance_obj = self.pool.get('hr.attendance')
+        now = fields.datetime.context_timestamp(cr, 
+                                                uid,
+                                                datetime.now(), 
+                                                context=context)
         res = {}
         for sheet_id in ids:
             sheet = self.browse(cr, uid, sheet_id, context=context)
@@ -129,25 +133,17 @@
             total_attendance = {}
             for attendance in [att for att in attendances
                                if att.action in ('sign_in', 'sign_out')]:
-                day = attendance.name[:10]
+                day = attendance.day
                 if not total_attendance.get(day, False):
                     total_attendance[day] = timedelta(seconds=0)
 
-                attendance_in_time = datetime.strptime(attendance.name, '%Y-%m-%d %H:%M:%S')
-                attendance_interval = timedelta(hours=attendance_in_time.hour,
-                                                minutes=attendance_in_time.minute,
-                                                seconds=attendance_in_time.second)
-                if attendance.action == 'sign_in':
-                    total_attendance[day] -= attendance_interval
-                else:
-                    total_attendance[day] += attendance_interval
+                total_attendance[day] += timedelta(hours=attendance.daily_hours)
 
                 # if the delta is negative, it means that a sign out is missing
                 # in a such case, we want to have the time to the end of the day
                 # for a past date, and the time to now for the current date
                 if total_attendance[day] < timedelta(0):
                     if day == date_current:
-                        now = datetime.now()
                         total_attendance[day] += timedelta(hours=now.hour,
                                                            minutes=now.minute,
                                                            seconds=now.second)
@@ -275,13 +271,15 @@
         return True
 
     def date_today(self, cr, uid, ids, context=None):
+        today = fields.date.context_today(self, cr, uid, context=context)
+        
         for sheet in self.browse(cr, uid, ids, context=context):
-            if datetime.today() <= datetime.strptime(sheet.date_from, '%Y-%m-%d'):
-                self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from,}, context=context)
-            elif datetime.now() >= datetime.strptime(sheet.date_to, '%Y-%m-%d'):
-                self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}, context=context)
+            if today <= sheet.date_from:
+                self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from}, context=context)
+            elif today >= sheet.date_to:
+                self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to}, context=context)
             else:
-                self.write(cr, uid, [sheet.id], {'date_current': time.strftime('%Y-%m-%d')}, context=context)
+                self.write(cr, uid, [sheet.id], {'date_current': today}, context=context)
         return True
 
     def date_previous(self, cr, uid, ids, context=None):
@@ -314,7 +312,8 @@
 
     def check_sign(self, cr, uid, ids, typ, context=None):
         sheet = self.browse(cr, uid, ids, context=context)[0]
-        if not sheet.date_current == time.strftime('%Y-%m-%d'):
+        today = fields.date.context_today(self, cr, uid, context=context)
+        if not sheet.date_current == today:
             raise osv.except_osv(_('Error !'), _('You cannot sign in/sign out from an other date than today'))
         return True
 
@@ -477,7 +476,7 @@
             context = {}
         if 'date' in context:
             return context['date']
-        return time.strftime('%Y-%m-%d')
+        return fields.date.context_today(self, cr, uid, context=context)
 
     def _sheet(self, cursor, user, ids, name, args, context=None):
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
@@ -519,7 +518,7 @@
             store={
                     'hr_timesheet_sheet.sheet': (_get_hr_timesheet_sheet, ['employee_id', 'date_from', 'date_to'], 10),
                     'account.analytic.line': (_get_account_analytic_line, ['user_id', 'date'], 10),
-                    'hr.analytic.timesheet': (lambda self,cr,uid,ids,context=None: ids, ['line_id'], 10),
+                    'hr.analytic.timesheet': (lambda self,cr,uid,ids,context=None: ids, None, 10),
                   },
             ),
     }
@@ -573,8 +572,8 @@
                                INNER JOIN resource_resource r
                                        ON (e.resource_id = r.id)
                             ON (a.employee_id = e.id)
-                        WHERE %(date_to)s >= date_trunc('day', a.name)
-                              AND %(date_from)s <= a.name
+                        WHERE %(date_to)s >= a.day
+                              AND %(date_from)s <= a.day
                               AND %(user_id)s = r.user_id
                          GROUP BY a.id""", {'date_from': ts.date_from,
                                             'date_to': ts.date_to,
@@ -586,16 +585,38 @@
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
         res = {}.fromkeys(ids, False)
         for attendance in self.browse(cursor, user, ids, context=context):
-            date_to = datetime.strftime(datetime.strptime(attendance.name[0:10], '%Y-%m-%d'), '%Y-%m-%d %H:%M:%S')
+            timestamp = datetime.strptime(attendance.name, '%Y-%m-%d %H:%M:%S')
+            day = fields.date.context_today(self, 
+                                            cursor, 
+                                            user, 
+                                            context=context, 
+                                            timestamp=timestamp)
             sheet_ids = sheet_obj.search(cursor, user,
-                [('date_to', '>=', date_to), ('date_from', '<=', attendance.name),
+                [('date_to', '>=', day), ('date_from', '<=', day),
                  ('employee_id', '=', attendance.employee_id.id)],
                 context=context)
             if sheet_ids:
                 # [0] because only one sheet possible for an employee between 2 dates
                 res[attendance.id] = sheet_obj.name_get(cursor, user, sheet_ids, context=context)[0]
         return res
-
+    
+    def _daily_hours(self, cr, uid, ids, name, args, context=None):
+        res = {}.fromkeys(ids, False)
+        for attendance in self.browse(cr, uid, ids, context=context):
+            day = attendance.day
+            attendance_in_time = fields.datetime.context_timestamp(
+                cr,
+                uid,
+                datetime.strptime(attendance.name, '%Y-%m-%d %H:%M:%S'),
+                context=context)
+            hours = (attendance_in_time.hour + 
+                     attendance_in_time.minute / 60.0 +
+                     attendance_in_time.second / 3600.0)
+            if attendance.action == 'sign_in':
+                hours *= -1
+            res[attendance.id] = hours
+        return res
+    
     _columns = {
         'sheet_id': fields.function(_sheet, string='Sheet',
             type='many2one', relation='hr_timesheet_sheet.sheet',
@@ -603,7 +624,12 @@
                       'hr_timesheet_sheet.sheet': (_get_hr_timesheet_sheet, ['employee_id', 'date_from', 'date_to'], 10),
                       'hr.attendance': (lambda self,cr,uid,ids,context=None: ids, ['employee_id', 'name', 'day'], 10),
                   },
-            )
+            ),
+        'daily_hours': fields.function(_daily_hours, 
+                                       type='float', 
+                                       string='Daily Hours',
+                                       digits=(16,2),
+                                       store=True)
     }
     _defaults = {
         'name': _get_default_date,
@@ -709,10 +735,10 @@
                         ) union (
                             select
                                 -min(a.id) as id,
-                                a.name::date as name,
+                                a.day::date as name,
                                 s.id as sheet_id,
                                 0.0 as total_timesheet,
-                                SUM(((EXTRACT(hour FROM a.name) * 60) + EXTRACT(minute FROM a.name)) * (CASE WHEN a.action = 'sign_in' THEN -1 ELSE 1 END)) as total_attendance
+                                SUM(a.daily_hours)*60 as total_attendance
                             from
                                 hr_attendance a
                                 LEFT JOIN (hr_timesheet_sheet_sheet s
@@ -721,10 +747,10 @@
                                         ON (e.resource_id = r.id)
                                     ON (s.user_id = r.user_id))
                                 ON (a.employee_id = e.id
-                                    AND s.date_to >= date_trunc('day',a.name)
-                                    AND s.date_from <= a.name)
+                                    AND s.date_to >= a.day::date
+                                    AND s.date_from <= a.day::date)
                             WHERE action in ('sign_in', 'sign_out')
-                            group by a.name::date, s.id
+                            group by a.day::date, s.id
                         )) AS foo
                         GROUP BY name, sheet_id
                 )) AS bar""")