Merge lp:~openerp-dev/openobject-addons/6.1-opw-575797-odo into lp:openobject-addons/6.1

[Olivier Dony (Odoo)]

[FIX] OPW 575797: resource,project: fix erroneous scheduling due to timezone issues

The phases and tasks scheduling is based on the
working time specification, which only contains
days of week and start-stop hours. It only makes
sense when taken in the timezone of the user,
not the server-side timezone (always UTC).
The scheduling is more intuitive if we avoid
to compute it on UTC-converted hours (which
would give very strange working hours in some
places, like 23PM-8AM). Therefore to avoid
more mistakes we convert the constraint timestamps
to the user timezone before scheduling tasks
and phases, and then back to UTC when storing
the computed result

[Olivier Dony (Odoo) (odo-openerp)]

See also related bug 932584

Unmerged revisions

6851. By Olivier Dony (Odoo) on 2012-06-19

[FIX] OPW 575797: resource,project: fix erroneous scheduling due to timezone issues

The phases and tasks scheduling is based on the
working time specification, which only contains
days of week and start-stop hours. It only makes
sense when taken in the timezone of the user,
not the server-side timezone (always UTC).
The scheduling is more intuitive if we avoid
to compute it on UTC-converted hours (which
would give very strange working hours in some
places, like 23PM-8AM). Therefore to avoid
more mistakes we convert the constraint timestamps
to the user timezone before scheduling tasks
and phases, and then back to UTC when storing
the computed result

=== modified file 'project/project.py'
--- project/project.py	2012-08-29 10:56:45 +0000
+++ project/project.py	2012-12-07 13:55:25 +0000
@@ -20,12 +20,14 @@
 ##############################################################################
 
 from lxml import etree
+import logging
 import time
 from datetime import datetime, date
 
 from tools.translate import _
 from osv import fields, osv
 from openerp.addons.resource.faces import task as Task
+from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT as DTFMT
 
 # I think we can remove this in v6.1 since VMT's improvements in the framework ?
 #class project_project(osv.osv):
@@ -436,9 +438,14 @@
 
                 p = getattr(project_gantt, 'Task_%d' % (task.id,))
 
+                # /!\ Project scheduling is computed based on user timezone, hence we must convert
+                #     back to UTC when saving
+                resource = self.pool.get('resource.resource')
+                start_tstamp = resource._user_tstamp_to_resource_tstamp(cr, uid, p.start.strftime(DTFMT), context=context)
+                end_tstamp = resource._user_tstamp_to_resource_tstamp(cr, uid, p.end.strftime(DTFMT), context=context)
                 self.pool.get('project.task').write(cr, uid, [task.id], {
-                    'date_start': p.start.strftime('%Y-%m-%d %H:%M:%S'),
-                    'date_end': p.end.strftime('%Y-%m-%d %H:%M:%S')
+                    'date_start': start_tstamp,
+                    'date_end': end_tstamp
                 }, context=context)
                 if (not task.user_id) and (p.booked_resource):
                     self.pool.get('project.task').write(cr, uid, [task.id], {

=== modified file 'project_long_term/project_long_term.py'
--- project_long_term/project_long_term.py	2012-01-31 13:36:57 +0000
+++ project_long_term/project_long_term.py	2012-12-07 13:55:25 +0000
@@ -23,6 +23,7 @@
 from tools.translate import _
 from osv import fields, osv
 from openerp.addons.resource.faces import task as Task
+from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT as DTFMT
 
 class project_phase(osv.osv):
     _name = "project.phase"
@@ -181,7 +182,12 @@
         effort = \"%s\"''' % (phase.id, duration)
             start = []
             if phase.constraint_date_start:
-                start.append('datetime.datetime.strptime("'+str(phase.constraint_date_start)+'", "%Y-%m-%d %H:%M:%S")')
+                # /!\ Project scheduling is based on working time expressed in user timezone, so we must convert
+                #     timestamps before computing
+                start_tstamp = self.pool.get('resource.resource')._resource_tstamp_to_user_tstamp(cr, uid,
+                                                                                                  phase.constraint_date_start,
+                                                                                                  context=context)
+                start.append('datetime.datetime.strptime(%r, %r)' % (start_tstamp, DTFMT))
             for previous_phase in phase.previous_phase_ids:
                 start.append("up.Phase_%s.end" % (previous_phase.id,))
             if start:
@@ -218,6 +224,7 @@
     _columns = {
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
     }
+
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}
         if type(ids) in (long, int,):
@@ -245,16 +252,21 @@
                     context=context
                 )
 
+                # /!\ Project scheduling is computed based on user timezone, hence we must convert
+                #     back to UTC when saving
+                resource = self.pool.get('resource.resource')
+                start_tstamp = resource._user_tstamp_to_resource_tstamp(cr, uid, p.start.strftime(DTFMT), context=context)
+                end_tstamp = resource._user_tstamp_to_resource_tstamp(cr, uid, p.end.strftime(DTFMT), context=context)
                 for r in p.booked_resource:
                     self.pool.get('project.user.allocation').create(cr, uid, {
                         'user_id': int(r.name[5:]),
                         'phase_id': phase.id,
-                        'date_start': p.start.strftime('%Y-%m-%d %H:%M:%S'),
-                        'date_end': p.end.strftime('%Y-%m-%d %H:%M:%S')
+                        'date_start': start_tstamp,
+                        'date_end': end_tstamp,
                     }, context=context)
                 self.pool.get('project.phase').write(cr, uid, [phase.id], {
-                    'date_start': p.start.strftime('%Y-%m-%d %H:%M:%S'),
-                    'date_end': p.end.strftime('%Y-%m-%d %H:%M:%S')
+                    'date_start': start_tstamp,
+                    'date_end': end_tstamp,
                 }, context=context)
         return True
 project()

=== modified file 'resource/resource.py'
--- resource/resource.py	2012-10-30 19:38:23 +0000
+++ resource/resource.py	2012-12-07 13:55:25 +0000
@@ -21,7 +21,11 @@
 
 import pytz
 from datetime import datetime, timedelta
+<<<<<<< TREE
 from dateutil import rrule
+=======
+import logging
+>>>>>>> MERGE-SOURCE
 import math
 from faces import *
 from osv import fields, osv
@@ -29,7 +33,13 @@
 
 from itertools import groupby
 from operator import itemgetter
-
+from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT as DTFMT
+
+<<<<<<< TREE
+=======
+_logger = logging.getLogger(__name__)
+
+>>>>>>> MERGE-SOURCE
 class resource_calendar(osv.osv):
     _name = "resource.calendar"
     _description = "Resource Calendar"
@@ -397,6 +407,25 @@
                         resource_objs[user.id]['vacation'] += list(leaves)
         return resource_objs
 
+    def _resource_tstamp_to_user_tstamp(self, cr, uid, timestamp, context=None):
+        if isinstance(timestamp, basestring):
+            timestamp = datetime.strptime(timestamp, DTFMT)
+        timestamp = fields.datetime.context_timestamp(cr, uid, timestamp, context=context)
+        return datetime.strftime(timestamp, DTFMT)
+
+    def _user_tstamp_to_resource_tstamp(self, cr, uid, timestamp, context=None):
+        if isinstance(timestamp, basestring):
+            timestamp = datetime.strptime(timestamp, DTFMT)
+        if context and context.get('tz'):
+            try:
+                import pytz
+                user_tz = pytz.timezone(context['tz'])
+                user_tstamp = user_tz.localize(timestamp, is_dst=True)
+                timestamp = user_tstamp.astimezone(pytz.utc)
+            except Exception:
+                _logger.debug("failed to convert context/client-specific timestamp to UTC", exc_info=True)
+        return datetime.strftime(timestamp, DTFMT)
+
     def compute_vacation(self, cr, uid, calendar_id, resource_id=False, resource_calendar=False, context=None):
         """
         Compute the vacation from the working calendar of the resource.
@@ -418,8 +447,13 @@
                                                                       ], context=context)
         leaves = resource_calendar_leaves_pool.read(cr, uid, leave_ids, ['date_from', 'date_to'], context=context)
         for i in range(len(leaves)):
-            dt_start = datetime.strptime(leaves[i]['date_from'], '%Y-%m-%d %H:%M:%S')
-            dt_end = datetime.strptime(leaves[i]['date_to'], '%Y-%m-%d %H:%M:%S')
+            # /!\ Vacations are returned as a list of leave dates, and 
+            # because these are to be used during resource scheduling and compared
+            # with working times, they must be converted to the user timezone first
+            dt_start = self._resource_tstamp_to_user_tstamp(cr, uid, leaves[i]['date_from'], context=context)
+            dt_end = self._resource_tstamp_to_user_tstamp(cr, uid, leaves[i]['date_to'], context=context)
+            dt_start = datetime.strptime(dt_start, DTFMT)
+            dt_end = datetime.strptime(dt_end, DTFMT)
             no = dt_end - dt_start
             [leave_list.append((dt_start + timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
             leave_list.sort()