diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:59:39 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-06-15 12:59:39 +0200 |
| commit | dda0d3d62d23cae3013db32bcb6322a2574f0162 (patch) | |
| tree | 0988c2ec35a0ac435f7faf51f69e762ecd93414e /addons/anonymization/ir.model.fields.anonymization.csv | |
| parent | dcc13079b7fd02d156ffc982cddfccfe684113bc (diff) | |
| parent | baf494c67ba7ecba331b24bcfa5eed9bde8a16da (diff) | |
[MERGE] forward port of branch saas-10 up to baf494c
# Conflicts:
# addons/hr_timesheet/project_timesheet.py
# addons/sale_layout/i18n/es_PE.po
# addons/sale_layout/i18n/hu.po
# addons/sale_layout/i18n/lo.po
# addons/sale_layout/i18n/pl.po
# addons/sale_service/i18n/es_MX.po
# addons/sale_service/i18n/es_PE.po
# addons/sale_service/i18n/lo.po
# addons/stock/stock.py
# addons/stock/stock_view.xml
# addons/warning/i18n/es_PE.po
# addons/warning/i18n/lo.po
# addons/warning/i18n/ru.po
# addons/web/i18n/cs.po
# addons/web/i18n/ja.po
# addons/web/i18n/lo.po
# addons/web/i18n/th.po
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 |