Merge lp:~openerp-dev/openobject-addons/7.0-opw-584793-cbi into lp:openobject-addons/7.0

[Chris Biersbach (OpenERP)]

The issue: When using Meetings, no reminders are sent.

The reason: Reminders use the "display" action type, which is not implemented.

The fix: I changed the action type to "email". I also fixed some other small timezone and display bugs in the reminder email as well as in the invitation email. Both invitation and reminder should now correctly contain the meeting start time in the appropriate timezone. The reminder email no longer contains "False" when there is no event description.

In addition, reminders were triggered as soon as the meeting reminder scheduler ran for the next time. This is not correct, because it renders the settings (f.e. 30 minutes before) useless. I changed the behavior to take the settings into account (I test whether or not we are actually inside "30 minutes before").

Unmerged revisions

8682. By Chris Biersbach (OpenERP) on 2013-02-18

[FIX] base_calendar meeting invitations and reminders now work correctly

=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py	2012-12-28 11:18:53 +0000
+++ base_calendar/base_calendar.py	2013-02-18 15:01:12 +0000
@@ -514,7 +514,7 @@
                                  (att2.partner_id and att2.partner_id.name) or \
                                     att2.email) + ' - Status: ' + att2.state.title())
                 #dates and times are gonna be expressed in `tz` time (local timezone of the `uid`)
-                tz = context.get('tz', pytz.timezone('UTC'))
+                tz = context.get('tz', pytz.timezone('UTC')) or 'UTC'
                 #res_obj.date and res_obj.date_deadline are in UTC in database so we use context_timestamp() to transform them in the `tz` timezone
                 date_start = fields.datetime.context_timestamp(cr, uid, datetime.strptime(res_obj.date, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context)
                 date_stop = False
@@ -716,7 +716,7 @@
             self.do_alarm_unlink(cr, uid, [data.id], model)
             if basic_alarm:
                 vals = {
-                    'action': 'display',
+                    'action': 'email',
                     'description': data.description,
                     'name': data.name,
                     'attendee_ids': [(6, 0, map(lambda x:x.id, data.attendee_ids))],
@@ -879,13 +879,15 @@
 
             else:
                 re_dates = [alarm.trigger_date]
-
-            if re_dates:
+            sent = False
+            if re_dates and any([datetime.strptime(date, '%Y-%m-%d %H:%M:%S') <= current_datetime for date in re_dates]):
+                sent = True
+                date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(res_obj.date, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context)
                 if alarm.action == 'email':
                     sub = '[OpenERP Reminder] %s' % (alarm.name)
                     body = """<pre>
 Event: %s
-Event Date: %s
+Event Date: %s (%s)
 Description: %s
 
 From:
@@ -894,7 +896,7 @@
 ----
 %s
 </pre>
-"""  % (alarm.name, alarm.trigger_date, alarm.description, \
+"""  % (alarm.name, date, date.tzname(), alarm.description or '', \
                         alarm.user_id.name, alarm.user_id.signature)
                     mail_to = alarm.user_id.email
                     for att in alarm.attendee_ids:
@@ -905,12 +907,12 @@
                             'subject': sub,
                             'body_html': body,
                             'email_to': mail_to,
-                            'email_from': tools.config.get('email_from', mail_to),
+                            'email_from': alarm.user_id.email or tools.config.get('email_from', mail_to),
                         }
                         self.pool.get('mail.mail').create(cr, uid, vals, context=context)
             if next_trigger_date:
                 update_vals.update({'trigger_date': next_trigger_date})
-            else:
+            elif sent:
                 update_vals.update({'state': 'done'})
             self.write(cr, uid, [alarm.id], update_vals)
         return True