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

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

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

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

diff --cc addons/website/controllers/main.py
Simple merge

diff --cc addons/website/models/ir_http.py
Simple merge

diff --cc openerp/tools/translate.py
index b795405,c378695..10584e4
--- 1/openerp/tools/translate.py
--- 2/openerp/tools/translate.py
+++ b/openerp/tools/translate.py
@@@ -788,16 -812,9 +788,16 @@@ def trans_generate(lang, modules, cr)
      for bin_path in ['osv', 'report' ]:
          path_list.append(os.path.join(config.config['root_path'], bin_path))
  
-     _logger.debug("Scanning modules at paths: ", path_list)
+     _logger.debug("Scanning modules at paths: %s", path_list)
  
 -    mod_paths = []
 +    mod_paths = list(path_list)
 +
 +    def get_module_from_path(path):
 +        for mp in mod_paths:
 +            if path.startswith(mp) and (os.path.dirname(path) != mp):
 +                path = path[len(mp)+1:]
 +                return path.split(os.path.sep)[0]
 +        return 'base'   # files that are not in a module are considered as being in 'base' module
  
      def verified_module_filepaths(fname, path, root):
          fabsolutepath = join(root, fname)