Merge lp:~openerp-dev/openobject-addons/6.1-opw-579812-rgo into lp:openobject-addons/6.1

[Ravi Gohil (OpenERP)]

Hello,

This MP contains fix for below issues:

When you create a meeting for all day, time in start date and end date are not set to 00:00:00 or to 12:00:00 AM.

Currently, when the mail is sent by the event reminder scheduler, `Event Date` is set to alarm's trigger date instead of actual event date.

When synchronizing the invitation.ics file with calendar client, the calendar client shows meeting datetime as it received, that is in UTC, meeting datetime should be converted to local timezone.

Kindly review the fix.

Thanks.

[lp:~openerp-dev/openobject-addons/6.1-opw-579812-rgo]

7018. By Xavier ALT on 2012-10-08

[MERGE] OPW 577045: translations: collective fix of missing translation terms in reports

7019. By Launchpad Translations on behalf of openerp on 2012-10-09

Launchpad automatic translations update.

7020. By Xavier ALT on 2012-10-09

[MERGE] OPW 575716: account: force account.financial.report balance of *zero* to be displayed positively

7021. By Xavier ALT on 2012-10-09

[MERGE] OPW 579553: account: fix traceback when modifing existing journal entry line

7022. By Xavier ALT on 2012-10-09

[MERGE] OPW 576019: sale/purchase: when changing SO or PO line product, use product's UoM even if current UoM is of the same category

7023. By Launchpad Translations on behalf of openerp on 2012-10-10

Launchpad automatic translations update.

7024. By Launchpad Translations on behalf of openerp on 2012-10-11

Launchpad automatic translations update.

7025. By Stephane Wirtel (OpenERP) on 2012-10-11

[FIX] point_of_sale: remove unused file

7026. By Xavier ALT on 2012-10-11

[MERGE] OPW 578622: project: duplicating project must reset analytic account code

7027. By Ravi Gohil (OpenERP) on 2012-10-11

[FIX] base_calendar: Synchronizing the invitation.ics file with calendar client shows meeting time in UTC : (Maintenance Case : 579812)

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed(partially) on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

[Naresh(OpenERP) (nch-openerp)]

Trunk MP: https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-579812-port-dhr/+merge/138912

Unmerged revisions

7027. By Ravi Gohil (OpenERP) on 2012-10-11

[FIX] base_calendar: Synchronizing the invitation.ics file with calendar client shows meeting time in UTC : (Maintenance Case : 579812)

=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py	2012-03-05 14:35:54 +0000
+++ base_calendar/base_calendar.py	2012-10-11 09:58:22 +0000
@@ -399,11 +399,12 @@
         @return: .ics file content
         """
         res = None
-        def ics_datetime(idate, short=False):
+        def ics_datetime(idate, short=False, dtfield=False):
             if idate:
                 if short or len(idate)<=10:
                     return date.fromtimestamp(time.mktime(time.strptime(idate, '%Y-%m-%d')))
                 else:
+                    dtfield.params['TZID'] = ['UTC']
                     return datetime.strptime(idate, '%Y-%m-%d %H:%M:%S')
             else:
                 return False
@@ -416,9 +417,12 @@
         event = cal.add('vevent')
         if not event_obj.date_deadline or not event_obj.date:
             raise osv.except_osv(_('Warning !'),_("Couldn't Invite because date is not specified!"))
-        event.add('created').value = ics_datetime(time.strftime('%Y-%m-%d %H:%M:%S'))
-        event.add('dtstart').value = ics_datetime(event_obj.date)
-        event.add('dtend').value = ics_datetime(event_obj.date_deadline)
+        dtfield = event.add('created')
+        dtfield.value = ics_datetime(time.strftime('%Y-%m-%d %H:%M:%S'), dtfield=dtfield)
+        dtfield = event.add('dtstart')
+        dtfield.value = ics_datetime(event_obj.date, dtfield=dtfield)
+        dtfield = event.add('dtend')
+        dtfield.value = ics_datetime(event_obj.date_deadline, dtfield=dtfield)
         event.add('summary').value = event_obj.name
         if  event_obj.description:
             event.add('description').value = event_obj.description
@@ -890,7 +894,7 @@
 ----
 %s
 
-"""  % (alarm.name, alarm.trigger_date, alarm.description, \
+"""  % (alarm.name, alarm.event_date, alarm.description, \
                         alarm.user_id.name, alarm.user_id.signature)
                     mail_to = [alarm.user_id.user_email]
                     for att in alarm.attendee_ids:
@@ -942,16 +946,19 @@
             duration = 1.00
             value['duration'] = duration
 
+        start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S")
         if allday: # For all day event
-            value = {'duration': 24.0}
             duration = 24.0
-            if start_date:
-                start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S")
-                start_date = datetime.strftime(datetime(start.year, start.month, start.day, 0,0,0), "%Y-%m-%d %H:%M:%S")
-                value['date'] = start_date
-
-
-        start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S")
+            value['duration'] = duration
+            # change start_date's time to 00:00:00 in the user's timezone
+            user = self.pool.get('res.users').browse(cr, uid, uid)
+            tz = pytz.timezone(user.context_tz) if user.context_tz else pytz.utc
+            start = pytz.utc.localize(start).astimezone(tz)     # convert start in user's timezone
+            start = start.replace(hour=0, minute=0, second=0)   # change start's time to 00:00:00
+            start = start.astimezone(pytz.utc)                  # convert start back to utc
+            start_date = start.strftime("%Y-%m-%d %H:%M:%S")
+            value['date'] = start_date
+        
         if end_date and not duration:
             end = datetime.strptime(end_date, "%Y-%m-%d %H:%M:%S")
             diff = end - start