[MERGE] from master

[odoo/odoo.git] / addons / website_crm / controllers / main.py

diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py
index f163ee2..02e700a 100644 (file)
--- a/addons/website_crm/controllers/main.py
+++ b/addons/website_crm/controllers/main.py
@@ -72,9 +72,8 @@ class contactus(http.Controller):
         # fields validation : Check that required field from model crm_lead exists
         error = set(field for field in _REQUIRED if not values.get(field))
 
-        values = dict(values, error=error)
         if error:
-            values.update(kwargs=kwargs.items())
+            values = dict(values, error=error, kwargs=kwargs.items())
             return request.website.render(kwargs.get("view_from", "website.contactus"), values)
 
         try: