Forward port of branch saas-3 up to 7bcefaf

diff --cc addons/account_budget/report/crossovered_budget_report.py
Simple merge

diff --cc openerp/addons/base/tests/__init__.py
index 2e55989,18e627a..13e7ba0
--- 1/openerp/addons/base/tests/__init__.py
--- 2/openerp/addons/base/tests/__init__.py
+++ b/openerp/addons/base/tests/__init__.py
@@@ -1,21 -1,10 +1,22 @@@
 +import test_acl
  import test_base
 +import test_basecase
 +import test_db_cursor
  import test_expression
 +import test_expression
 +import test_fields
 +import test_func
  import test_ir_actions
  import test_ir_attachment
+ import test_ir_model
 +import test_ir_filters
 +import test_ir_sequence
  import test_ir_values
 +import test_mail
  import test_menu
 +import test_orm
 +import test_osv
 +import test_qweb
  import test_res_config
  import test_res_lang
  import test_search

diff --cc openerp/tools/mail.py
Simple merge