Merge branch 'server-trunk'

Conflicts:
	addons/mass_mailing/controllers/main.py

3 files changed, 3 insertions, 25 deletions

diff --git a/addons/event/email_template.xml b/addons/event/email_template.xml
index d4479bcfc87..d99774acd3c 100644
--- a/addons/event/email_template.xml
+++ b/addons/event/email_template.xml
@@ -9,7 +9,7 @@
         <field name="subject">Your registration at ${object.event_id.name}</field>
         <field name="body_html"><![CDATA[
         <p>Hello ${object.name},</p>
-        <p>The event ${object.event_id.name} that you registered for is confirmed and will be held from ${object.event_id.date_begin_located.strftime('%Y-%m-%d %H:%M:%S (%Z)')} to ${object.event_id.date_end_located.strftime('%Y-%m-%d %H:%M:%S (%Z)')}.
+        <p>The event ${object.event_id.name} that you registered for is confirmed and will be held from ${object.event_id.date_begin} to ${object.event_id.date_end}.
         For any further information please contact our event department.</p>
         <p>Thank you for your participation!</p>
         <p>Best regards</p>]]></field>
diff --git a/addons/event/event.py b/addons/event/event.py
index a31ec00b8c0..5e5d1204a17 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -18,8 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import pytz
-from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
+
 from datetime import datetime, timedelta
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
@@ -157,22 +156,6 @@ class event_event(osv.osv):
             for event in self.browse(cr, uid, ids, context=context)
         }
 
-    def _compute_date_tz(self, cr, uid, ids, fld, arg, context=None):
-        if context is None:
-            context = {}
-        res = {}
-        for event in self.browse(cr, uid, ids, context=context):
-            ctx = dict(context, tz=(event.date_tz or 'UTC'))
-            if fld == 'date_begin_located':
-                date_to_convert = event.date_begin
-            elif fld == 'date_end_located':
-                date_to_convert = event.date_end
-            res[event.id] = fields.datetime.context_timestamp(cr, uid, datetime.strptime(date_to_convert, DEFAULT_SERVER_DATETIME_FORMAT), context=ctx)
-        return res
-
-    def _tz_get(self, cr, uid, context=None):
-        return [(x, x) for x in pytz.all_timezones]
-
     _columns = {
         'name': fields.char('Event Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
         'user_id': fields.many2one('res.users', 'Responsible User', readonly=False, states={'done': [('readonly', True)]}),
@@ -192,11 +175,8 @@ class event_event(osv.osv):
             store={'event.registration': (_get_events_from_registrations, ['state'], 10),
                    'event.event': (lambda  self, cr, uid, ids, c = {}: ids, ['seats_max', 'registration_ids'], 20)}),
         'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
-        'date_tz': fields.selection(_tz_get, string='Timezone'),
         'date_begin': fields.datetime('Start Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date_end': fields.datetime('End Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'date_begin_located': fields.function(_compute_date_tz, string='Start Date Located', type="datetime"),
-        'date_end_located': fields.function(_compute_date_tz, string='End Date Located', type="datetime"),
         'state': fields.selection([
             ('draft', 'Unconfirmed'),
             ('cancel', 'Cancelled'),
@@ -224,8 +204,7 @@ class event_event(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'event.event', context=c),
         'user_id': lambda obj, cr, uid, context: uid,
         'organizer_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, context=c).company_id.partner_id.id,
-        'address_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, context=c).company_id.partner_id.id,
-        'date_tz': lambda self, cr, uid, ctx: ctx.get('tz', "UTC"),
+        'address_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, context=c).company_id.partner_id.id
     }
 
     def _check_seats_limit(self, cr, uid, ids, context=None):
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index baa553babaf..cc6edfbd9bd 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -89,7 +89,6 @@
                                 <field name="type" on_change="onchange_event_type(type,context)" />
                                 <field name="date_begin" on_change="onchange_start_date(date_begin,date_end)"/>
                                 <field name="date_end"/>
-                                <field name="date_tz" />
                             </group>
                         </group>
                         <notebook>