[MERGE] forward port of branch 8.0 up to 0aab81c

1 files changed, 4 insertions, 6 deletions

diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py
index 02e700ae5bc..76f917ae398 100644
--- a/addons/website_crm/controllers/main.py
+++ b/addons/website_crm/controllers/main.py
@@ -28,7 +28,8 @@ class contactus(http.Controller):
 
     def create_lead(self, request, values, kwargs):
         """ Allow to be overrided """
-        return request.registry['crm.lead'].create(request.cr, SUPERUSER_ID, values, request.context)
+        cr, context = request.cr, request.context
+        return request.registry['crm.lead'].create(cr, SUPERUSER_ID, values, context=dict(context, mail_create_nosubscribe=True))
 
     def preRenderThanks(self, values, kwargs):
         """ Allow to be overrided """
@@ -76,11 +77,8 @@ class contactus(http.Controller):
             values = dict(values, error=error, kwargs=kwargs.items())
             return request.website.render(kwargs.get("view_from", "website.contactus"), values)
 
-        try:
-            values['medium_id'] = request.registry['ir.model.data'].get_object_reference(request.cr, SUPERUSER_ID, 'crm', 'crm_tracking_medium_website')[1]
-            values['team_id'] = request.registry['ir.model.data'].xmlid_to_res_id(request.cr, SUPERUSER_ID, 'website.salesteam_website_sales')
-        except ValueError:
-            pass
+        values['medium_id']  = request.registry['ir.model.data'].xmlid_to_res_id(request.cr, SUPERUSER_ID, 'crm.crm_medium_website')
+        values['team_id'] = request.registry['ir.model.data'].xmlid_to_res_id(request.cr, SUPERUSER_ID, 'website.salesteam_website_sales')
 
         # description is required, so it is always already initialized
         if post_description: