[MERGE] forward port of branch saas-5 up to 9363bc9

diff --cc addons/base_action_rule/__openerp__.py
index 4ecf6d0,d1bed2f..f285f1c
--- 1/addons/base_action_rule/__openerp__.py
--- 2/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@@ -34,12 -34,12 +34,12 @@@ sales team, or an opportunity which sti
  trigger an automatic reminder email.
      """,
      'author': 'OpenERP SA',
 -    'website': 'http://www.openerp.com',
 +    'website': 'https://www.odoo.com',
      'depends': ['base', 'resource', 'mail'],
      'data': [
+         'base_action_rule_data.xml',
          'base_action_rule_view.xml',
          'security/ir.model.access.csv',
-         'base_action_rule_data.xml'
      ],
      'demo': [],
      'installable': True,

diff --cc addons/base_action_rule/base_action_rule.py
index d8fbec0,e74e719..864d283
--- 1/addons/base_action_rule/base_action_rule.py
--- 2/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@@ -232,14 -221,21 +232,23 @@@ class base_action_rule(osv.osv)
              model = action_rule.model_id.model
              model_obj = self.pool[model]
              if not hasattr(model_obj, 'base_action_ruled'):
 -                model_obj.create = self._wrap_create(model_obj.create, model)
 -                model_obj.write = self._wrap_write(model_obj.write, model)
 +                # monkey-patch methods create and write
 +                model_obj._patch_method('create', make_create())
 +                model_obj._patch_method('write', make_write())
                  model_obj.base_action_ruled = True
                  updated = True
 +
          return updated
  
+     def _update_cron(self, cr, uid, context=None):
+         try:
+             cron = self.pool['ir.model.data'].get_object(
+                 cr, uid, 'base_action_rule', 'ir_cron_crm_action', context=context)
+         except ValueError:
+             return False
+ 
+         return cron.toggle(model=self._name, domain=[('kind', '=', 'on_time')])
+ 
      def create(self, cr, uid, vals, context=None):
          res_id = super(base_action_rule, self).create(cr, uid, vals, context=context)
          if self._register_hook(cr, [res_id]):

diff --cc addons/calendar/__openerp__.py
index abb29c6,a7e947b..74dab47
--- 1/addons/calendar/__openerp__.py
--- 2/addons/calendar/__openerp__.py
+++ b/addons/calendar/__openerp__.py
@@@ -37,9 -37,10 +37,10 @@@ If you need to manage your meetings, yo
      """,
      'author': 'OpenERP SA',
      'category': 'Hidden/Dependency',
 -    'website': 'http://www.openerp.com',
 +    'website': 'https://www.odoo.com/page/crm',
      'demo': ['calendar_demo.xml'],
      'data': [
+         'calendar_cron.xml',
          'security/ir.model.access.csv',
          'security/calendar_security.xml',
          'calendar_view.xml',

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

diff --cc addons/crm_partner_assign/crm_portal_view.xml
Simple merge

diff --cc addons/fetchmail/__openerp__.py
index e27c601,082d53d..78bf093
--- 1/addons/fetchmail/__openerp__.py
--- 2/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@@ -54,10 -54,10 +54,10 @@@ same *conversation* document
  For more specific needs, you may also assign custom-defined actions
  (technically: Server Actions) to be triggered for each incoming mail.
      """,
 -    'website': 'http://www.openerp.com',
 +    'website': 'https://www.odoo.com/page/mailing',
      'data': [
-         'fetchmail_view.xml',
          'fetchmail_data.xml',
+         'fetchmail_view.xml',
          'security/ir.model.access.csv',
          'fetchmail_installer_view.xml'
      ],

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

diff --cc addons/sale/sale.py
index f59e8e9,25f3995..6400bf5
--- 1/addons/sale/sale.py
--- 2/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@@ -594,23 -596,9 +594,9 @@@ class sale_order(osv.osv)
  
      def action_button_confirm(self, cr, uid, ids, context=None):
          assert len(ids) == 1, 'This option should only be used for a single id at a time.'
 -        self.signal_order_confirm(cr, uid, ids)
 +        self.signal_workflow(cr, uid, ids, 'order_confirm')
- 
-         # redisplay the record as a sales order
-         view_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'sale', 'view_order_form')
-         view_id = view_ref and view_ref[1] or False,
-         return {
-             'type': 'ir.actions.act_window',
-             'name': _('Sales Order'),
-             'res_model': 'sale.order',
-             'res_id': ids[0],
-             'view_type': 'form',
-             'view_mode': 'form',
-             'view_id': view_id,
-             'target': 'current',
-             'nodestroy': True,
-         }
- 
+         return True
+         
      def action_wait(self, cr, uid, ids, context=None):
          context = context or {}
          for o in self.browse(cr, uid, ids):

diff --cc addons/web/static/src/js/views.js
Simple merge

diff --cc openerp/addons/base/ir/ir_cron.py
Simple merge