[MERGE] upstream

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

diff --cc addons/website_forum_doc/controllers/main.py
index 0ac68cd,f31e417..2b951ee
--- 1/addons/website_forum_doc/controllers/main.py
--- 2/addons/website_forum_doc/controllers/main.py
+++ b/addons/website_forum_doc/controllers/main.py
@@@ -26,7 -26,7 +26,7 @@@ class WebsiteDoc(http.Controller)
          }
          return request.website.render("website_forum_doc.documentation", value)
  
-     @http.route(['''/forum/how-to/<model("forum.documentation.toc"):toc>/<model("forum.post", "[('documentation_toc_id','=',toc)]"):post>'''], type='http', auth="public", website=True)
 -    @http.route(['''/forum/how-to/<model("forum.documentation.toc"):toc>/<model("forum.post", "[('documentation_toc_id','=',toc[0])]"):post>'''], type='http', auth="public", website=True, multilang=True)
++    @http.route(['''/forum/how-to/<model("forum.documentation.toc"):toc>/<model("forum.post", "[('documentation_toc_id','=',toc[0])]"):post>'''], type='http', auth="public", website=True)
      def post(self, toc, post, **kwargs):
          # TODO: implement a redirect instead of crash
          assert post.documentation_toc_id.id == toc.id, "Wrong post!"

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