diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-15 13:10:45 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-15 13:10:45 +0200 |
| commit | 9fe4cf5f728ffc3ad2bb387841aa1b57c1ba16dd (patch) | |
| tree | 8dc9257aba7132a65fa9ac02fd847db290d95d30 /addons/anonymization/ir.model.fields.anonymization.csv | |
| parent | b2220945896bb9f343840d19b8d2821467e22d48 (diff) | |
| parent | dda0d3d62d23cae3013db32bcb6322a2574f0162 (diff) | |
[MERGE] forward port of branch saas-11 up to dda0d3d
# Conflicts:
# addons/product_uos/i18n/lo.po
# addons/sales_team/models/__init__.py
# addons/website_payment/views/website_payment_templates.xml
# addons/website_portal_sale/views/templates.xml
# openerp/addons/base/ir/ir_qweb.py
Diffstat (limited to 'addons/anonymization/ir.model.fields.anonymization.csv')
| -rw-r--r-- | addons/anonymization/ir.model.fields.anonymization.csv | 8 |
1 files changed, 1 insertions, 7 deletions
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 |