[MERGE] Forward-port saas-4 bugfixes up to ad4c6ca

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

diff --cc addons/account/account_move_line.py
Simple merge

diff --cc addons/account/partner.py
Simple merge

diff --cc addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
Simple merge

diff --cc addons/survey/controllers/main.py
index 876f444,ea9af11..638b2ae
--- 1/addons/survey/controllers/main.py
--- 2/addons/survey/controllers/main.py
+++ b/addons/survey/controllers/main.py
@@@ -45,8 -45,8 +45,8 @@@ class WebsiteSurvey(http.Controller)
              return werkzeug.utils.redirect("/survey/")
  
          # In case of auth required, block public user
 -        if survey.auth_required and uid == request.registry['website'].get_public_user(cr, uid, context):
 +        if survey.auth_required and uid == request.website.user_id.id:
-             return request.website.render("website.403")
+             return request.website.render("survey.auth_required", {'survey': survey})
  
          # In case of non open surveys
          if survey.stage_id.closed:

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

diff --cc addons/website_event_track/controllers/event.py
Simple merge

diff --cc openerp/addons/base/ir/ir_qweb.py
index 6e434c2,48cb8af..be4bfe1
--- 1/openerp/addons/base/ir/ir_qweb.py
--- 2/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@@ -16,18 -11,13 +16,18 @@@ from urlparse import urlpars
  
  import babel
  import babel.dates
- import werkzeug
  from PIL import Image
  
 +import openerp.http
  import openerp.tools
 +import openerp.tools.func
 +import openerp.tools.lru
 +from openerp.http import request
 +from openerp.tools.safe_eval import safe_eval as eval
  from openerp.osv import osv, orm, fields
+ from openerp.tools import html_escape as escape
 -from openerp.tools.safe_eval import safe_eval as eval
  from openerp.tools.translate import _
 +from openerp import SUPERUSER_ID
  
  _logger = logging.getLogger(__name__)
  

diff --cc openerp/tools/misc.py
index 2b14a1d,8829e15..e5d8190
--- 1/openerp/tools/misc.py
--- 2/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@@ -1210,11 -1210,12 +1212,19 @@@ def dumpstacks(sig=None, frame=None)
  
      _logger.info("\n".join(code))
  
 +@contextmanager
 +def ignore(*exc):
 +    try:
 +        yield
 +    except exc:
 +        pass
 +
+ # Avoid DeprecationWarning while still remaining compatible with werkzeug pre-0.9
+ if parse_version(getattr(werkzeug, '__version__', '0.0')) < parse_version('0.9.0'):
+     def html_escape(text):
+         return werkzeug.utils.escape(text, quote=True)
+ else:
+     def html_escape(text):
+         return werkzeug.utils.escape(text)
+ 
  # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: