[MERGE] forward port of branch 8.0 up to 591e329

6 files changed, 503 insertions, 2 deletions

diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py
index f163ee20a03..02e700ae5bc 100644
--- 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:
diff --git a/addons/website_crm/i18n/cs.po b/addons/website_crm/i18n/cs.po
new file mode 100644
index 00000000000..2a2fb704060
--- /dev/null
+++ b/addons/website_crm/i18n/cs.po
@@ -0,0 +1,100 @@
+# Czech translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-23 16:28+0000\n"
+"PO-Revision-Date: 2014-11-18 12:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech <cs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-11-19 06:44+0000\n"
+"X-Generator: Launchpad (build 17252)\n"
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "&times;"
+msgstr ""
+
+#. module: website_crm
+#: code:addons/website_crm/controllers/main.py:84
+#, python-format
+msgid "Custom Fields: "
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Email"
+msgstr ""
+
+#. module: website_crm
+#: code:addons/website_crm/controllers/main.py:93
+#, python-format
+msgid "Environ Fields: "
+msgstr ""
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "If you have an emergency, do not hesitate to contact us by phone:"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Phone Number"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Send"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Subject"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "Thanks!"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "We will get back to you shortly."
+msgstr ""
+
+#. module: website_crm
+#: model:ir.actions.act_url,name:website_crm.action_open_website
+msgid "Website Contact Form"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Your Company"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Your Name"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Your Question"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "Your message has been sent successfully."
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "e.g. (+32).81.81.37.00"
+msgstr ""
diff --git a/addons/website_crm/i18n/mk.po b/addons/website_crm/i18n/mk.po
new file mode 100644
index 00000000000..65952b6af1a
--- /dev/null
+++ b/addons/website_crm/i18n/mk.po
@@ -0,0 +1,101 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-23 16:28+0000\n"
+"PO-Revision-Date: 2014-10-22 07:47+0000\n"
+"Last-Translator: Tome Barbov <tome.barbov@eskon.com.mk>\n"
+"Language-Team: Macedonian <mk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-10-23 07:52+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "&times;"
+msgstr "&times;"
+
+#. module: website_crm
+#: code:addons/website_crm/controllers/main.py:84
+#, python-format
+msgid "Custom Fields: "
+msgstr "Персонализирани полиња: "
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Email"
+msgstr "Е-маил"
+
+#. module: website_crm
+#: code:addons/website_crm/controllers/main.py:93
+#, python-format
+msgid "Environ Fields: "
+msgstr ""
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "If you have an emergency, do not hesitate to contact us by phone:"
+msgstr ""
+"Ако имате итен случај, не се колебајте да не контактирате преку телефон:"
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Phone Number"
+msgstr "Телефонски број"
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Send"
+msgstr "Испрати"
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Subject"
+msgstr "Наслов"
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "Thanks!"
+msgstr "Благодариме!"
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "We will get back to you shortly."
+msgstr "Ќе Ве контактираме наскоро."
+
+#. module: website_crm
+#: model:ir.actions.act_url,name:website_crm.action_open_website
+msgid "Website Contact Form"
+msgstr "Веб контакт формулар"
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Your Company"
+msgstr "Вашата компанија"
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Your Name"
+msgstr "Вашето име"
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Your Question"
+msgstr "Вашето прашање"
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "Your message has been sent successfully."
+msgstr "Вашата порака е успешно испратена."
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "e.g. (+32).81.81.37.00"
+msgstr "пр. (+32).81.81.37.00"
diff --git a/addons/website_crm/i18n/ro.po b/addons/website_crm/i18n/ro.po
new file mode 100644
index 00000000000..1b9425e412d
--- /dev/null
+++ b/addons/website_crm/i18n/ro.po
@@ -0,0 +1,100 @@
+# Romanian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-23 16:28+0000\n"
+"PO-Revision-Date: 2014-10-16 04:15+0000\n"
+"Last-Translator: Dorin <dhongu@gmail.com>\n"
+"Language-Team: Romanian <ro@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-10-17 06:28+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "&times;"
+msgstr "&times;"
+
+#. module: website_crm
+#: code:addons/website_crm/controllers/main.py:84
+#, python-format
+msgid "Custom Fields: "
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Email"
+msgstr "Email"
+
+#. module: website_crm
+#: code:addons/website_crm/controllers/main.py:93
+#, python-format
+msgid "Environ Fields: "
+msgstr ""
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "If you have an emergency, do not hesitate to contact us by phone:"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Phone Number"
+msgstr "Număr telefon"
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Send"
+msgstr "Trimite"
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Subject"
+msgstr "Subiect"
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "Thanks!"
+msgstr "Mulțumesc!"
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "We will get back to you shortly."
+msgstr ""
+
+#. module: website_crm
+#: model:ir.actions.act_url,name:website_crm.action_open_website
+msgid "Website Contact Form"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Your Company"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Your Name"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Your Question"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "Your message has been sent successfully."
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "e.g. (+32).81.81.37.00"
+msgstr ""
diff --git a/addons/website_crm/i18n/sk.po b/addons/website_crm/i18n/sk.po
new file mode 100644
index 00000000000..1d8528583d6
--- /dev/null
+++ b/addons/website_crm/i18n/sk.po
@@ -0,0 +1,100 @@
+# Slovak translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-23 16:28+0000\n"
+"PO-Revision-Date: 2014-10-28 18:59+0000\n"
+"Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
+"Language-Team: Slovak <sk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-10-29 07:52+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "&times;"
+msgstr ""
+
+#. module: website_crm
+#: code:addons/website_crm/controllers/main.py:84
+#, python-format
+msgid "Custom Fields: "
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Email"
+msgstr ""
+
+#. module: website_crm
+#: code:addons/website_crm/controllers/main.py:93
+#, python-format
+msgid "Environ Fields: "
+msgstr ""
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "If you have an emergency, do not hesitate to contact us by phone:"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Phone Number"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Send"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Subject"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "Thanks!"
+msgstr "Ďakujeme!"
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "We will get back to you shortly."
+msgstr ""
+
+#. module: website_crm
+#: model:ir.actions.act_url,name:website_crm.action_open_website
+msgid "Website Contact Form"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Your Company"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Your Name"
+msgstr "Vaše meno"
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Your Question"
+msgstr ""
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "Your message has been sent successfully."
+msgstr ""
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "e.g. (+32).81.81.37.00"
+msgstr ""
diff --git a/addons/website_crm/i18n/tr.po b/addons/website_crm/i18n/tr.po
new file mode 100644
index 00000000000..03d9d704cfd
--- /dev/null
+++ b/addons/website_crm/i18n/tr.po
@@ -0,0 +1,101 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-23 16:28+0000\n"
+"PO-Revision-Date: 2014-11-15 19:27+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"Language-Team: Turkish <tr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 17241)\n"
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "&times;"
+msgstr "& zaman;"
+
+#. module: website_crm
+#: code:addons/website_crm/controllers/main.py:84
+#, python-format
+msgid "Custom Fields: "
+msgstr "Özel Alanlar: "
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Email"
+msgstr "E-mail"
+
+#. module: website_crm
+#: code:addons/website_crm/controllers/main.py:93
+#, python-format
+msgid "Environ Fields: "
+msgstr "Çevre Alanları: "
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "If you have an emergency, do not hesitate to contact us by phone:"
+msgstr ""
+"Aciliyetiniz varsa, bizimle telefon ile iletişim kurmaktan çekinmeyin:"
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Phone Number"
+msgstr "Telefon Numarası"
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Send"
+msgstr "Gönder"
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Subject"
+msgstr "Konu"
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "Thanks!"
+msgstr "Teşekkürler!"
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "We will get back to you shortly."
+msgstr "Size en kısa sürede göneceğiz."
+
+#. module: website_crm
+#: model:ir.actions.act_url,name:website_crm.action_open_website
+msgid "Website Contact Form"
+msgstr "Web Sitesi İletişim Formu"
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Your Company"
+msgstr "Firmanız"
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Your Name"
+msgstr "Adınız"
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "Your Question"
+msgstr "Sorunuz"
+
+#. module: website_crm
+#: view:website:website_crm.contactus_thanks
+msgid "Your message has been sent successfully."
+msgstr "Mesajınız başarıyla gönderildi."
+
+#. module: website_crm
+#: view:website:website.contactus
+msgid "e.g. (+32).81.81.37.00"
+msgstr "örn. (+32).81.81.37.00"