[MERGE] forward port of branch saas-9 up to 1d81bb0

# Conflicts:
#	addons/account_extra_reports/i18n/ca.po
#	addons/account_extra_reports/i18n/fi.po
#	addons/account_extra_reports/i18n/pl.po
#	addons/account_extra_reports/i18n/te.po
#	addons/account_extra_reports/i18n/zh_CN.po
#	addons/account_full_reconcile/i18n/hu.po
#	addons/account_full_reconcile/i18n/pl.po
#	addons/crm/crm_lead_menu.xml
#	addons/crm_claim/i18n/es_PE.po
#	addons/crm_claim/i18n/hu.po
#	addons/crm_claim/i18n/ja.po
#	addons/crm_claim/i18n/pl.po
#	addons/delivery/views/delivery_view.xml
#	addons/product/product_view.xml
#	addons/project_timesheet/i18n/es_PE.po
#	addons/stock/stock_view.xml

4 files changed, 10 insertions, 14 deletions

diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py
index 5ad6f8eea42..5179850e7de 100644
--- a/addons/anonymization/anonymization.py
+++ b/addons/anonymization/anonymization.py
@@ -414,6 +414,8 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
                     anonymized_value = 'xxx'+sid
                 elif field_type == 'text':
                     anonymized_value = 'xxx'+sid
+                elif field_type == 'html':
+                    anonymized_value = 'xxx'+sid
                 elif field_type == 'boolean':
                     anonymized_value = random.choice([True, False])
                 elif field_type == 'date':
diff --git a/addons/anonymization/i18n/hu.po b/addons/anonymization/i18n/hu.po
index 324b33c2b55..f5b5fdebf68 100644
--- a/addons/anonymization/i18n/hu.po
+++ b/addons/anonymization/i18n/hu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2016-04-12 10:04+0000\n"
+"PO-Revision-Date: 2016-06-06 19:55+0000\n"
 "Last-Translator: krnkris\n"
 "Language-Team: Hungarian (http://www.transifex.com/odoo/odoo-9/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -220,7 +220,7 @@ msgstr "Utoljára frissítve, által"
 #: model:ir.model.fields,field_description:anonymization.field_ir_model_fields_anonymization_write_date
 #: model:ir.model.fields,field_description:anonymization.field_ir_model_fields_anonymize_wizard_write_date
 msgid "Last Updated on"
-msgstr "Utoljára frissítve ekkor"
+msgstr "Utoljára frissítve "
 
 #. module: anonymization
 #: model:ir.model.fields,field_description:anonymization.field_ir_model_fields_anonymization_history_msg
diff --git a/addons/anonymization/i18n/pl.po b/addons/anonymization/i18n/pl.po
index 4aa0da9a467..17912caa22a 100644
--- a/addons/anonymization/i18n/pl.po
+++ b/addons/anonymization/i18n/pl.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2016-06-04 12:40+0000\n"
+"PO-Revision-Date: 2016-06-08 12:08+0000\n"
 "Last-Translator: Slawomir Adamus <melthalion@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/odoo/odoo-9/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -297,7 +297,7 @@ msgid ""
 "The database anonymization is currently in an unstable state. Some fields "
 "are anonymized, while some fields are not anonymized. You should try to "
 "solve this problem before trying to create, write or delete fields."
-msgstr ""
+msgstr "Anonimizacja bazy danych jest obecnie w niestabilnym stanie. Nie wszystkie pola są anonimizowane. Spróbuj najpierw rozwiązać ten problem zanim zaczniesz dodawać, zapisywać lub usuwać pola."
 
 #. module: anonymization
 #: code:addons/anonymization/anonymization.py:341
@@ -306,7 +306,7 @@ msgid ""
 "The database anonymization is currently in an unstable state. Some fields "
 "are anonymized, while some fields are not anonymized. You should try to "
 "solve this problem before trying to do anything else."
-msgstr ""
+msgstr "Anonimizacja bazy danych jest obecnie w niestabilnym stanie. Nie wszystkie pola są anonimizowane. Spróbuj najpierw rozwiązać ten problem zanim zaczniesz robić cokolwiek innego."
 
 #. module: anonymization
 #: code:addons/anonymization/anonymization.py:374
@@ -316,13 +316,13 @@ msgid ""
 "The database anonymization is currently in an unstable state. Some fields "
 "are anonymized, while some fields are not anonymized. You should try to "
 "solve this problem before trying to do anything."
-msgstr ""
+msgstr "Anonimizacja bazy danych jest obecnie w niestabilnym stanie. Nie wszystkie pola są anonimizowane. Spróbuj najpierw rozwiązać ten problem zanim zaczniesz cokolwiek robić."
 
 #. module: anonymization
 #: code:addons/anonymization/anonymization.py:372
 #, python-format
 msgid "The database is currently anonymized, you cannot anonymize it again."
-msgstr ""
+msgstr "Baza danych jest obecnie zanonimizowana, nie możesz zrobić tego ponownie."
 
 #. module: anonymization
 #: code:addons/anonymization/anonymization.py:72
diff --git a/addons/anonymization/ir.model.fields.anonymization.csv b/addons/anonymization/ir.model.fields.anonymization.csv
index 9c57d38d437..2cfbeb0b223 100644
--- a/addons/anonymization/ir.model.fields.anonymization.csv
+++ b/addons/anonymization/ir.model.fields.anonymization.csv
@@ -1,7 +1,7 @@
 id,model_name,field_name
 anonymization_field_res_partner_name,res.partner,name
 anonymization_field_res_partner_code,res.partner,ref
-anonymization_field_res_partner_name,res.partner,name
+anonymization_field_res_partner_display_name,res.partner,display_name
 anonymization_field_res_partner_city,res.partner,city
 anonymization_field_res_partner_street,res.partner,street
 anonymization_field_res_partner_street2,res.partner,street2
@@ -35,7 +35,6 @@ anonymization_field_purchase_order_line_price_unit,purchase.order.line,price_uni
 anonymization_field_account_invoice_tax_amount,account.invoice.tax,amount
 anonymization_field_account_invoice_tax_base,account.invoice.tax,base
 anonymization_field_product_name,product.template,name
-anonymization_field_res_users_name,res.users,name
 anonymization_field_res_users_signature,res.users,signature
 anonymization_field_res_partner_contact_name,res.partner.contact,name
 anonymization_field_res_partner_contact_first_name,res.partner.contact,first_name
@@ -47,8 +46,3 @@ anonymization_field_res_partner_job_phone,res.partner.job,phone
 anonymization_field_res_partner_job_fax,res.partner.job,fax
 anonymization_field_res_partner_job_other,res.partner.job,other
 anonymization_field_crm_phonecall_partner_phone,crm.phonecall,partner_phone
-anonymization_field_training_participation_stakeholder_request_email,training.participation.stakeholder.request,email
-anonymization_field_training_participation_contact_firstname,training.participation,contact_firstname
-anonymization_field_training_participation_contact_lastname,training.participation,contact_lastname
-anonymization_field_training_subscription_partner_rh_email,training.subscription,partner_rh_email
-anonymization_field_training_subscription_line_job_email,training.subscription.line,job_email