Merge lp:~openerp-dev/openobject-addons/7.0-opw-602404-jam into lp:openobject-addons/7.0

[Jigar A.]

Fixed The Incorrect Date on Timesheets Bog [Ticket#602404]

Test Case Steps: (IMP: Time Zone used PST, -8 from UTC)
1. Go to Projects, then Tasks
2. Click any task and hit the Edit button
3. Under Work Summary, click the Add An Item link
4. Enter a work summary, a time
5. For date, put a time that is later in the day, such as 8 PM. Check that the date i.e., 12/20/13
6. Hit the Save button.
7. Go to Human Resources, then My Timesheet
8. Hit the Edit button, then enter in a new line item in the Details tab (this refreshes the list to grab the entry you just made from the project task).
9. Hit Save.
10. Go to the Summary tab.
11. The item you entered into the task will show up for next day (i.e., 12/21/13).

This is issue is cause of datetime to date conversion, the Fix try to preserver the date in user timezone instaed fo coveretd to UTC, every time when we go to Datetime to date / date to datetime, we have to be careful about date.

Kindly review the fix.
--
PS: Earlier we have fixed similler issue for date to datetime.[Bug #1153107]

[lp:~openerp-dev/openobject-addons/7.0-opw-602404-jam]

9709. By Jigar A. on 2014-01-07

[FIX] datetime to date when creating the project task timehseet line

9710. By Jigar A. on 2014-01-07

[MERGE] Parent Sync

Unmerged revisions

9710. By Jigar A. on 2014-01-07

[MERGE] Parent Sync

9709. By Jigar A. on 2014-01-07

[FIX] datetime to date when creating the project task timehseet line

9708. By Jigar A. on 2013-12-21

[FIX] Ticket 602404 : Incorrect Date on Timesheets with timezones

9707. By Jigar A. on 2013-12-21

[MERGE] Sync lp:openobject-addons/7.0

=== modified file 'project_timesheet/project_timesheet.py'
--- project_timesheet/project_timesheet.py	2013-06-07 11:38:29 +0000
+++ project_timesheet/project_timesheet.py	2014-01-07 21:24:36 +0000
@@ -20,11 +20,12 @@
 ##############################################################################
 import time
 import datetime
-
+import pytz
 from openerp.osv import fields, osv
 from openerp import pooler
 from openerp import tools
 from openerp.tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP
 
 class project_project(osv.osv):
     _inherit = 'project.project'
@@ -105,6 +106,26 @@
         res['product_uom_id'] = emp.product_id.uom_id.id
         return res
 
+    def datetime_to_date(self, cr, uid, userdate, context=None):
+        """ Convert datetime values expressed in UTC timezone to
+        server-side UTC date while keeping date in user time zone only.
+        Preserves the date from datetime, Time has to be ingonred here.
+        :param str userdate: datetime string in in utc timezone
+        :return: UTC date string for server-side use
+        """
+        user_date = datetime.datetime.strptime(userdate, DEFAULT_SERVER_DATETIME_FORMAT)
+        if context and context.get('tz'):
+            tz_name = context['tz']
+        else:
+            tz_name = self.pool.get('res.users').read(cr, SUPERUSER_ID, uid, ['tz'])['tz']
+        if tz_name:
+            utc = pytz.timezone('UTC')
+            context_tz = pytz.timezone(tz_name)
+            local_timestamp = user_date.replace(tzinfo=utc)
+            local_timestamp = local_timestamp.astimezone(context_tz)
+            return local_timestamp.strftime(DEFAULT_SERVER_DATE_FORMAT)
+        return user_date.strftime(DEFAULT_SERVER_DATE_FORMAT)
+
     def create(self, cr, uid, vals, *args, **kwargs):
         timesheet_obj = self.pool.get('hr.analytic.timesheet')
         task_obj = self.pool.get('project.task')
@@ -118,7 +139,7 @@
             vals_line['name'] = '%s: %s' % (tools.ustr(task_obj.name), tools.ustr(vals['name'] or '/'))
             vals_line['user_id'] = vals['user_id']
             vals_line['product_id'] = result['product_id']
-            vals_line['date'] = vals['date'][:10]
+            vals_line['date'] = self.datetime_to_date(cr, uid, vals['date'],context=context)
 
             # Calculate quantity based on employee's product's uom
             vals_line['unit_amount'] = vals['hours']
@@ -176,7 +197,7 @@
             if 'user_id' in vals:
                 vals_line['user_id'] = vals['user_id']
             if 'date' in vals:
-                vals_line['date'] = vals['date'][:10]
+                vals_line['date'] = self.datetime_to_date(cr, uid, vals['date'],context=context)
             if 'hours' in vals:
                 vals_line['unit_amount'] = vals['hours']
                 prod_id = vals_line.get('product_id', line_id.product_id.id) # False may be set