From a351bbd3d36dc51fd7e0843e552cc1fcd46651dd Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 27 Jul 2010 17:26:37 +0200 Subject: [PATCH] [IMP] mail_gateway: display message history timestamp according to user's timezone bzr revid: odo@openerp.com-20100727152637-yalmhqg6goufxk2x --- addons/mail_gateway/mail_gateway.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py index d05df8cfcaf..a595b4bf600 100644 --- a/addons/mail_gateway/mail_gateway.py +++ b/addons/mail_gateway/mail_gateway.py @@ -140,19 +140,28 @@ class mailgate_thread(osv.osv): return True mailgate_thread() +def format_date_tz(date, tz=None): + if not date: + return 'n/a' + format = tools.DEFAULT_SERVER_DATETIME_FORMAT + return tools.server_to_local_timestamp(date, format, format, tz) + class mailgate_message(osv.osv): ''' Mailgateway Message ''' def _get_display_text(self, cr, uid, ids, name, arg, context=None): + if context is None: + context = {} + tz = context.get('tz') result = {} for message in self.browse(cr, uid, ids, context=context): msg_txt = '' if message.history: - msg_txt += (message.email_from or '/') + ' wrote on ' + message.date + ':\n\t' + msg_txt += (message.email_from or '/') + ' wrote on ' + format_date_tz(message.date, tz) + ':\n\t' msg_txt += '\n\t'.join(message.description.split('\n')[:3]) + '...' else: - msg_txt = (message.user_id.name or '/') + ' on ' + message.date + ':\n\t' + msg_txt = (message.user_id.name or '/') + ' on ' + format_date_tz(message.date, tz) + ':\n\t' if message.name == 'Opportunity': msg_txt += "Converted to Opportunity" else: