diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py
index 4da6706e186..1e1a78944b6 100644
--- a/addons/website_event_track/models/event.py
+++ b/addons/website_event_track/models/event.py
@@ -23,6 +23,8 @@ from openerp.osv import fields, osv
from openerp.tools.translate import _
from openerp.addons.website.models.website import slug
import datetime
+import pytz
+from pytz import timezone
class event_track_tag(osv.osv):
_name = "event.track.tag"
@@ -194,3 +196,17 @@ class event_sponsors(osv.osv):
partner_ids = [sponsor.partner_id.id for sponsor in self.browse(cr, uid, ids, context=context)]
return len(partner_ids) == self.pool.get("res.partner").search(cr, uid, [("id", "in", partner_ids)], count=True, context=context)
+class event_event(osv.osv):
+ _inherit = 'event.event'
+
+ def _tz_get(self,cr,uid, context=None):
+ # put POSIX 'Etc/*' entries at the end to avoid confusing users - see bug 1086728
+ return [(tz,tz) for tz in sorted(pytz.all_timezones, key=lambda tz: tz if not tz.startswith('Etc/') else '_')]
+
+ _columns = {
+ 'timezone_of_event': fields.selection(_tz_get, 'Timezone of Event', size=64),
+ }
+
+ _defaults = {
+ 'timezone_of_event':lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).tz
+ }
\ No newline at end of file
diff --git a/addons/website_event_track/views/event_backend.xml b/addons/website_event_track/views/event_backend.xml
index ad262b6122e..9cf7bc70dc4 100644
--- a/addons/website_event_track/views/event_backend.xml
+++ b/addons/website_event_track/views/event_backend.xml
@@ -162,6 +162,9 @@
+
+
+