[MERGE] forward port of branch 8.0 up to 33a8989

1 files changed, 3 insertions, 3 deletions

diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py
index 76f917ae398..3b1b2e1d803 100644
--- a/addons/website_crm/controllers/main.py
+++ b/addons/website_crm/controllers/main.py
@@ -60,6 +60,9 @@ class contactus(http.Controller):
         post_description = []  # Info to add after the message
         values = {}
 
+        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')
+
         for field_name, field_value in kwargs.items():
             if hasattr(field_value, 'filename'):
                 post_file.append(field_value)
@@ -77,9 +80,6 @@ class contactus(http.Controller):
             values = dict(values, error=error, kwargs=kwargs.items())
             return request.website.render(kwargs.get("view_from", "website.contactus"), values)
 
-        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:
             values['description'] += dict_to_str(_("Custom Fields: "), post_description)