[MERGE] forward port of branch saas-1 up to revid 4908 dle@openerp.com-20130918160049...

bzr revid: chs@openerp.com-20130918171816-cxxt3c9ktcq4a8oz

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

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

diff --cc openerp/addons/base/ir/ir_ui_view.py
index 9699545,4994ba9..f46ac13
--- 1/openerp/addons/base/ir/ir_ui_view.py
--- 2/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@@ -127,7 -126,8 +128,7 @@@ class view(osv.osv)
          try:
              fvg = self.pool[view.model].fields_view_get(cr, uid, view_id=view.id, view_type=view.type, context=context)
              return fvg['arch']
-         except:
+         except Exception:
 -            _logger.exception("Can't render view %s for model: %s", view.xml_id, view.model)
              return False
  
      def _check_xml(self, cr, uid, ids, context=None):

diff --cc openerp/addons/base/tests/__init__.py
Simple merge

diff --cc openerp/modules/loading.py
Simple merge

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