[MERGE] forward port of branch saas-3 up to a35aec2

diff --cc addons/account_analytic_analysis/account_analytic_analysis.py
Simple merge

diff --cc addons/email_template/email_template.py
Simple merge

diff --cc addons/event/event.py
index 8021cce,d76c57e..a80312e
--- 1/addons/event/event.py
--- 2/addons/event/event.py
+++ b/addons/event/event.py
@@@ -171,26 -140,15 +171,26 @@@ class event_event(osv.osv)
          '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)]}),
          'type': fields.many2one('event.type', 'Type of Event', readonly=False, states={'done': [('readonly', True)]}),
-         'seats_max': fields.integer('Maximum Avalaible Seats', oldname='register_max', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
+         'seats_max': fields.integer('Maximum Available Seats', oldname='register_max', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
          'seats_min': fields.integer('Minimum Reserved Seats', oldname='register_min', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
 -        'seats_reserved': fields.function(_get_seats, oldname='register_current', string='Reserved Seats', type='integer', multi='seats_reserved'),
 -        'seats_available': fields.function(_get_seats, oldname='register_avail', string='Available Seats', type='integer', multi='seats_reserved'),
 -        'seats_unconfirmed': fields.function(_get_seats, oldname='register_prospect', string='Unconfirmed Seat Reservations', type='integer', multi='seats_reserved'),
 -        'seats_used': fields.function(_get_seats, oldname='register_attended', string='Number of Participations', type='integer', multi='seats_reserved'),
 +        'seats_reserved': fields.function(_get_seats, oldname='register_current', string='Reserved Seats', type='integer', multi='seats_reserved',
 +            store={'event.registration': (_get_events_from_registrations, ['state'], 10),
 +                   'event.event': (lambda  self, cr, uid, ids, c = {}: ids, ['seats_max', 'registration_ids'], 20)}),
 +        'seats_available': fields.function(_get_seats, oldname='register_avail', string='Available Seats', type='integer', multi='seats_reserved',
 +            store={'event.registration': (_get_events_from_registrations, ['state'], 10),
 +                   'event.event': (lambda  self, cr, uid, ids, c = {}: ids, ['seats_max', 'registration_ids'], 20)}),
 +        'seats_unconfirmed': fields.function(_get_seats, oldname='register_prospect', string='Unconfirmed Seat Reservations', type='integer', multi='seats_reserved',
 +            store={'event.registration': (_get_events_from_registrations, ['state'], 10),
 +                   'event.event': (lambda  self, cr, uid, ids, c = {}: ids, ['seats_max', 'registration_ids'], 20)}),
 +        'seats_used': fields.function(_get_seats, oldname='register_attended', string='Number of Participations', type='integer', multi='seats_reserved',
 +            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'),

diff --cc addons/event_sale/event_sale.py
Simple merge

diff --cc addons/mail/mail_alias.py
Simple merge

diff --cc addons/website_partner/models/res_partner.py
index e762455,57bb2ed..c165a50
--- 1/addons/website_partner/models/res_partner.py
--- 2/addons/website_partner/models/res_partner.py
+++ b/addons/website_partner/models/res_partner.py
@@@ -17,12 -14,9 +17,12 @@@ class WebsiteResPartner(osv.Model)
              'Website Partner Full Description'
          ),
          'website_short_description': fields.text(
-             'Website artner Short Description'
+             'Website Partner Short Description'
          ),
 +        # hack to allow using plain browse record in qweb views
 +        'self': fields.function(_get_ids, type='many2one', relation=_name),
      }
 +
      _defaults = {
          'website_published': False
      }

diff --cc openerp/osv/orm.py
Simple merge

diff --cc openerp/tools/config.py
index 6b21bda,49862a3..588c2de
--- 1/openerp/tools/config.py
--- 2/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@@ -152,8 -141,9 +152,8 @@@ class configmanager(object)
          parser.add_option_group(group)
  
          # WEB
 -        # TODO move to web addons after MetaOption merge
          group = optparse.OptionGroup(parser, "Web interface Configuration")
-         group.add_option("--db-filter", dest="dbfilter", default='.*',
+         group.add_option("--db-filter", dest="dbfilter", my_default='.*',
                           help="Filter listed database", metavar="REGEXP")
          parser.add_option_group(group)