diff options
| author | qdp-odoo <qdp@odoo.com> | 2017-07-12 17:48:14 +0200 |
|---|---|---|
| committer | qdp-odoo <qdp@odoo.com> | 2017-07-12 17:48:43 +0200 |
| commit | 8bea502f33eda213243eb09e571cb5d9c9274d2e (patch) | |
| tree | e53f70dea3a84dd686f81d502599659d921740d2 | |
| parent | 9d1df81af553b797ada8990e83a43854ddea4011 (diff) | |
[REM] *: removal of fax field on res.partner object
Deprecated technologuy that doesn't deserve its dedicated field anymore. RIP faxes
31 files changed, 52 insertions, 85 deletions
diff --git a/addons/anonymization/data/ir.model.fields.anonymization.csv b/addons/anonymization/data/ir.model.fields.anonymization.csv index 96fb10ed770..0852a6ee929 100644 --- a/addons/anonymization/data/ir.model.fields.anonymization.csv +++ b/addons/anonymization/data/ir.model.fields.anonymization.csv @@ -7,7 +7,6 @@ anonymization_field_res_partner_street,res.partner,street anonymization_field_res_partner_street2,res.partner,street2 anonymization_field_res_partner_zip,res.partner,zip anonymization_field_res_partner_phone,res.partner,phone -anonymization_field_res_partner_fax,res.partner,fax anonymization_field_res_partner_mobile,res.partner,mobile anonymization_field_res_partner_email,res.partner,email anonymization_field_account_invoice_amount_untaxed,account.invoice,amount_untaxed diff --git a/addons/crm/models/crm_lead.py b/addons/crm/models/crm_lead.py index 7f2c0ae77df..040ddd097d3 100644 --- a/addons/crm/models/crm_lead.py +++ b/addons/crm/models/crm_lead.py @@ -30,7 +30,6 @@ CRM_LEAD_FIELDS_TO_MERGE = [ 'city', 'contact_name', 'description', - 'fax', 'mobile', 'partner_name', 'phone', @@ -125,7 +124,6 @@ class Lead(models.Model): state_id = fields.Many2one("res.country.state", string='State') country_id = fields.Many2one('res.country', string='Country') phone = fields.Char('Phone') - fax = fields.Char('Fax') mobile = fields.Char('Mobile') function = fields.Char('Job Position') title = fields.Many2one('res.partner.title') @@ -225,7 +223,6 @@ class Lead(models.Model): 'email_from': partner.email, 'phone': partner.phone, 'mobile': partner.mobile, - 'fax': partner.fax, 'zip': partner.zip, 'function': partner.function, 'website': partner.website, @@ -751,7 +748,6 @@ class Lead(models.Model): 'phone': self.phone, 'mobile': self.mobile, 'email': email_split[0] if email_split else False, - 'fax': self.fax, 'title': self.title.id, 'function': self.function, 'street': self.street, diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml index 34db5f24c72..b45602fd4b0 100644 --- a/addons/crm/views/crm_lead_views.xml +++ b/addons/crm/views/crm_lead_views.xml @@ -61,7 +61,7 @@ <group> <!-- Preload all the partner's information --> <field name="partner_id" string="Customer" - context="{'default_name': contact_name, 'default_street': street, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_function': function, 'default_phone': phone, 'default_mobile': mobile, 'default_fax': fax, 'default_email': email_from, 'default_user_id': user_id, 'default_team_id': team_id, 'default_website': website}" groups="base.group_no_one"/> + context="{'default_name': contact_name, 'default_street': street, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_function': function, 'default_phone': phone, 'default_mobile': mobile, 'default_email': email_from, 'default_user_id': user_id, 'default_team_id': team_id, 'default_website': website}" groups="base.group_no_one"/> <field name="partner_name" string="Company Name"/> <label for="street" string="Address"/> <div class="o_address_format"> @@ -84,7 +84,6 @@ <field name="function"/> <field name="phone" widget="phone"/> <field name="mobile"/> - <field name="fax"/> </group> <group> <field name="user_id" domain="[('share', '=', False)]" @@ -469,7 +468,7 @@ 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_function': function, 'default_phone': phone, 'default_mobile': mobile, - 'default_fax': fax, 'default_email': email_from, + 'default_email': email_from, 'default_user_id': user_id, 'default_team_id': team_id, 'default_website': website}"/> <field name="email_from" string="Email" widget="email"/> <field name="phone" widget="phone"/> @@ -519,7 +518,6 @@ </div> <field name="function"/> <field name="mobile"/> - <field name="fax"/> <field name="opt_out"/> </group> <group string="Marketing"> diff --git a/addons/crm_phone_validation/models/crm_lead.py b/addons/crm_phone_validation/models/crm_lead.py index c3ad534664c..a652f1bd5ca 100644 --- a/addons/crm_phone_validation/models/crm_lead.py +++ b/addons/crm_phone_validation/models/crm_lead.py @@ -18,7 +18,3 @@ class Lead(models.Model): if self.mobile: self.mobile = self.phone_format(self.mobile) - @api.onchange('fax', 'country_id') - def _onchange_fax_validation(self): - if self.fax: - self.fax = self.phone_format(self.fax) diff --git a/addons/crm_phone_validation/models/res_partner.py b/addons/crm_phone_validation/models/res_partner.py index 5714974ad6a..97f5eaf891d 100644 --- a/addons/crm_phone_validation/models/res_partner.py +++ b/addons/crm_phone_validation/models/res_partner.py @@ -17,8 +17,3 @@ class Contact(models.Model): def _onchange_mobile_validation(self): if self.mobile: self.mobile = self.phone_format(self.mobile) - - @api.onchange('fax', 'country_id') - def _onchange_fax_validation(self): - if self.fax: - self.fax = self.phone_format(self.fax) diff --git a/addons/hr_payroll/views/report_payslip_templates.xml b/addons/hr_payroll/views/report_payslip_templates.xml index 5c4683eeac5..fcbab99353a 100644 --- a/addons/hr_payroll/views/report_payslip_templates.xml +++ b/addons/hr_payroll/views/report_payslip_templates.xml @@ -19,7 +19,7 @@ <td><strong>Address</strong></td> <td colspan="3"> <div t-field="o.employee_id.address_home_id" - t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/> + t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/> </td> </tr> <tr> diff --git a/addons/hr_payroll/views/report_payslipdetails_templates.xml b/addons/hr_payroll/views/report_payslipdetails_templates.xml index aa047632b21..cb050691e1f 100644 --- a/addons/hr_payroll/views/report_payslipdetails_templates.xml +++ b/addons/hr_payroll/views/report_payslipdetails_templates.xml @@ -19,7 +19,7 @@ <td><strong>Address</strong></td> <td colspan="3"> <div t-field="o.employee_id.address_home_id" - t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/> + t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/> </td> </tr> <tr> diff --git a/addons/l10n_hu/data/res.bank.csv b/addons/l10n_hu/data/res.bank.csv index f1f8703f66c..987cb67a3d7 100644 --- a/addons/l10n_hu/data/res.bank.csv +++ b/addons/l10n_hu/data/res.bank.csv @@ -1,22 +1,22 @@ -"id","name","bic","country/id","zip","city","street","email","phone","fax" -"BKCHHUHBXXX","Bank of China (Hungária) Hitelintézet Rt.","BKCHHUHBXXX","base.hu",1051,"Budapest","József Nádor tér 7.","service_hu@bank-of-china.com","+3614299200","+3614299201" -"BNPAHUHX","BNP Paribas Hungária Bank Rt.","BNPAHUHX","base.hu",1051,"Budapest","Széchenyi István tér 7-8.",,"+3613746300", -"BUDAHUHB","Budapest Hitel- és Fejlesztési Bank Rt.","BUDAHUHB","base.hu",1138,"Budapest","Váci út 188."," info@budapestbank.hu","+3614506060","+3614506062" -"CIBHHUHB","CIB Közép-Európai Nemzetközi Bank Zrt.","CIBHHUHB","base.hu",1027,"Budapest","Medve utca 4-14.","cib@cib.hu","+3614231000", -"CITIHUHX","Citibank Rt.","CITIHUHX","base.hu",1051,"Budapest","Szabadság tér 7.",,"+3613745000","+3613745100" -"COBAHUHX","Commerzbank Zártkörűen Működő Rt.","COBAHUHX","base.hu",1054,"Budapest","Széchenyi rakpart 8.","info.budapest@commerzbank.com","+3613748100","+3612694574" -"DEUTHU2B","Deutsche Bank Zártkörűen Működő Rt.","DEUTHU2B","base.hu",1054,"Budapest","Hold utca 27.","db.hungary@db.com","+3613013700","+3612693239" -"GIBAHUHB","ERSTE Bank Hungary Zrt.","GIBAHUHB","base.hu",1138,"Budapest","Népfürdő u. 24-26.","erste@erstebank.hu","+3640222221","+3612194766" -"FHKBHUHB","FHB Kereskedelmi Bank Zrt.","FHKBHUHB","base.hu",1082,"Budapest","Üllői út 48."," info@fhb.hu","+3614529100","+3614529200" -"GNBAHUHB","Gránit Bank Zrt.","GNBAHUHB","base.hu",1095,"Budapest","Lechner Ödön fasor 8.","info@granitbank.hu","+3640100777","+3612355906" -"INCNHUHB","IC Bank Rt.","INCNHUHB","base.hu",1088,"Budapest","Rákóczi út 1-3."," level@bancopopolare.hu ","+3640200515","+3612666815" -"INGBHUHB","ING Bank N.V. Magyarországi Fióktelepe","INGBHUHB","base.hu",1068,"Budapest","Dózsa György út 84.","communications.hu@ingbank.com","+362680140","+362680159" -"OKHBHUHB","K&H Bank Zrt.","OKHBHUHB","base.hu",1095,"Budapest","Lechner Ödön fasor 9."," bank@kh.hu ","+3613289000","+3613289696" -"HBWEHUHB","MagNet Magyar Közösségi Bank Zrt.","HBWEHUHB","base.hu",1062,"Budapest","Andrássy utca 98.","info@magnetbank.hu","+3614288888","+3614288889" -"MANEHUHB","Magyar Nemzeti Bank","MANEHUHB","base.hu",1054,"Budapest","Szabadság tér 8-9.","info@mnb.hu","+3614282600","+3614298000" -"MKKBHUHB","MKB Bank Zrt.","MKKBHUHB","base.hu",1056,"Budapest","Váci utca 38.","telebankar@mkb.hu","+3613278600","+3613278700" -"OTPVHUHB","OTP Bank Nyrt.","OTPVHUHB","base.hu",1051,"Budapest","Nádor utca 16.",,"+3614735000","+3614735955" -"UBRTHUHB","RAIFFEISEN Bank Zrt.","UBRTHUHB","base.hu",1054,"Budapest","Akadémia utca 6.",,"+3640484848", -"MAVOHUHB","Sberbank Magyarország Zrt.","MAVOHUHB","base.hu",1088,"Budapest","Rákóczi út 7.","info@sberbank.hu","+3614114200","+3613286660" -"TAKBHUHB","TakarékBank Zrt.","TAKBHUHB","base.hu",1122,"Budapest","Pethényi köz 10.","info@tbank.hu","+3612023777", -"BACXHUHB","UniCredit Bank Hungary Zrt.","BACXHUHB","base.hu",1054,"Budapest","Szabadság tér 5-6.","info@unicreditgroup.hu","+3613011271","+3613534959" +"id","name","bic","country/id","zip","city","street","email","phone" +"BKCHHUHBXXX","Bank of China (Hungária) Hitelintézet Rt.","BKCHHUHBXXX","base.hu",1051,"Budapest","József Nádor tér 7.","service_hu@bank-of-china.com","+3614299200" +"BNPAHUHX","BNP Paribas Hungária Bank Rt.","BNPAHUHX","base.hu",1051,"Budapest","Széchenyi István tér 7-8.", +"BUDAHUHB","Budapest Hitel- és Fejlesztési Bank Rt.","BUDAHUHB","base.hu",1138,"Budapest","Váci út 188."," info@budapestbank.hu","+3614506060" +"CIBHHUHB","CIB Közép-Európai Nemzetközi Bank Zrt.","CIBHHUHB","base.hu",1027,"Budapest","Medve utca 4-14.","cib@cib.hu","+3614231000" +"CITIHUHX","Citibank Rt.","CITIHUHX","base.hu",1051,"Budapest","Szabadság tér 7.",,"+3613745000" +"COBAHUHX","Commerzbank Zártkörűen Működő Rt.","COBAHUHX","base.hu",1054,"Budapest","Széchenyi rakpart 8.","info.budapest@commerzbank.com","+3613748100" +"DEUTHU2B","Deutsche Bank Zártkörűen Működő Rt.","DEUTHU2B","base.hu",1054,"Budapest","Hold utca 27.","db.hungary@db.com","+3613013700" +"GIBAHUHB","ERSTE Bank Hungary Zrt.","GIBAHUHB","base.hu",1138,"Budapest","Népfürdő u. 24-26.","erste@erstebank.hu","+3640222221", +"FHKBHUHB","FHB Kereskedelmi Bank Zrt.","FHKBHUHB","base.hu",1082,"Budapest","Üllői út 48."," info@fhb.hu","+3614529100" +"GNBAHUHB","Gránit Bank Zrt.","GNBAHUHB","base.hu",1095,"Budapest","Lechner Ödön fasor 8.","info@granitbank.hu","+3640100777" +"INCNHUHB","IC Bank Rt.","INCNHUHB","base.hu",1088,"Budapest","Rákóczi út 1-3."," level@bancopopolare.hu ","+3640200515", +"INGBHUHB","ING Bank N.V. Magyarországi Fióktelepe","INGBHUHB","base.hu",1068,"Budapest","Dózsa György út 84.","communications.hu@ingbank.com","+362680140" +"OKHBHUHB","K&H Bank Zrt.","OKHBHUHB","base.hu",1095,"Budapest","Lechner Ödön fasor 9."," bank@kh.hu ","+3613289000" +"HBWEHUHB","MagNet Magyar Közösségi Bank Zrt.","HBWEHUHB","base.hu",1062,"Budapest","Andrássy utca 98.","info@magnetbank.hu","+3614288888" +"MANEHUHB","Magyar Nemzeti Bank","MANEHUHB","base.hu",1054,"Budapest","Szabadság tér 8-9.","info@mnb.hu","+3614282600" +"MKKBHUHB","MKB Bank Zrt.","MKKBHUHB","base.hu",1056,"Budapest","Váci utca 38.","telebankar@mkb.hu","+3613278600" +"OTPVHUHB","OTP Bank Nyrt.","OTPVHUHB","base.hu",1051,"Budapest","Nádor utca 16.",,"+3614735000" +"UBRTHUHB","RAIFFEISEN Bank Zrt.","UBRTHUHB","base.hu",1054,"Budapest","Akadémia utca 6.","+3640484848", +"MAVOHUHB","Sberbank Magyarország Zrt.","MAVOHUHB","base.hu",1088,"Budapest","Rákóczi út 7.","info@sberbank.hu","+3614114200" +"TAKBHUHB","TakarékBank Zrt.","TAKBHUHB","base.hu",1122,"Budapest","Pethényi köz 10.","info@tbank.hu" +"BACXHUHB","UniCredit Bank Hungary Zrt.","BACXHUHB","base.hu",1054,"Budapest","Szabadság tér 5-6.","info@unicreditgroup.hu","+3613011271" diff --git a/addons/l10n_in_hr_payroll/views/report_payslip_details_template.xml b/addons/l10n_in_hr_payroll/views/report_payslip_details_template.xml index 0a2f77d6319..72bc16378ab 100644 --- a/addons/l10n_in_hr_payroll/views/report_payslip_details_template.xml +++ b/addons/l10n_in_hr_payroll/views/report_payslip_details_template.xml @@ -19,7 +19,7 @@ <td><strong>Address</strong></td> <td colspan="3"> <div t-field="o.employee_id.address_home_id" - t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/> + t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/> </td> </tr> <tr> diff --git a/addons/l10n_uk/demo/l10n_uk_demo.xml b/addons/l10n_uk/demo/l10n_uk_demo.xml index 4b4f565b86f..b25c0cb93f6 100644 --- a/addons/l10n_uk/demo/l10n_uk_demo.xml +++ b/addons/l10n_uk/demo/l10n_uk_demo.xml @@ -9,7 +9,6 @@ <field name="city">Ruislip</field> <field name="country_id" ref="base.uk"/> <field name="phone">+44 845 643 4548</field> - <field name="fax">08455274653</field> <field name="website">http://www.smartmode.co.uk</field> <field name="email">smartmode@yourcompany.example.com</field> </record> diff --git a/addons/mrp_repair/report/mrp_repair_templates_repair_order.xml b/addons/mrp_repair/report/mrp_repair_templates_repair_order.xml index 17aff3815cf..54dca87b277 100644 --- a/addons/mrp_repair/report/mrp_repair_templates_repair_order.xml +++ b/addons/mrp_repair/report/mrp_repair_templates_repair_order.xml @@ -14,13 +14,13 @@ <div t-if="o.partner_invoice_id"> <strong t-if="o.address_id != o.partner_invoice_id">Invoice address: </strong> <div t-field="o.partner_invoice_id" - t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/> + t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/> <p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p> </div> <div t-if="o.address_id != o.partner_invoice_id"> <strong>Shipping address :</strong> <div t-field="o.address_id" - t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/> + t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/> <p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p> </div> </div> diff --git a/addons/purchase/report/purchase_order_templates.xml b/addons/purchase/report/purchase_order_templates.xml index 25bcb68cba6..7ca0c433b33 100644 --- a/addons/purchase/report/purchase_order_templates.xml +++ b/addons/purchase/report/purchase_order_templates.xml @@ -10,18 +10,18 @@ <strong>Shipping address:</strong> <div t-if="o.dest_address_id"> <div t-field="o.dest_address_id" - t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/> + t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/> </div> <div t-if="not o.dest_address_id and o.picking_type_id and o.picking_type_id.warehouse_id"> <span t-field="o.picking_type_id.warehouse_id.name"/> <div t-field="o.picking_type_id.warehouse_id.partner_id" - t-options='{"widget": "contact", "fields": ["address", "phone", "fax"], "no_marker": True, "phone_icons": True}'/> + t-options='{"widget": "contact", "fields": ["address", "phone"], "no_marker": True, "phone_icons": True}'/> </div> </div> <div class="col-xs-5 col-xs-offset-1"> <div t-field="o.partner_id" - t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/> + t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/> <p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p> </div> </div> diff --git a/addons/purchase/report/purchase_quotation_templates.xml b/addons/purchase/report/purchase_quotation_templates.xml index 0bfe07a0383..c14f3229b72 100644 --- a/addons/purchase/report/purchase_quotation_templates.xml +++ b/addons/purchase/report/purchase_quotation_templates.xml @@ -11,17 +11,17 @@ <strong>Shipping address:</strong> <div t-if="o.dest_address_id"> <div t-field="o.dest_address_id" - t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/> + t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/> </div> <div t-if="not o.dest_address_id and o.picking_type_id.warehouse_id"> <span t-field="o.picking_type_id.warehouse_id.name"/> <div t-field="o.picking_type_id.warehouse_id.partner_id" - t-options='{"widget": "contact", "fields": ["address", "phone", "fax"], "no_marker": True, "phone_icons": True}'/> + t-options='{"widget": "contact", "fields": ["address", "phone"], "no_marker": True, "phone_icons": True}'/> </div> </div> <div class="col-xs-5 col-xs-offset-1"> <div t-field="o.partner_id" - t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/> + t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/> <p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p> </div> </div> diff --git a/addons/sale/report/sale_report_templates.xml b/addons/sale/report/sale_report_templates.xml index 7fe2693ef60..e6b1f982a4e 100644 --- a/addons/sale/report/sale_report_templates.xml +++ b/addons/sale/report/sale_report_templates.xml @@ -13,11 +13,11 @@ <strong t-if="doc.partner_shipping_id == doc.partner_invoice_id">Invoicing and shipping address:</strong> <strong t-if="doc.partner_shipping_id != doc.partner_invoice_id">Invoicing address:</strong> <div t-field="doc.partner_invoice_id" - t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/> + t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/> <div t-if="doc.partner_shipping_id != doc.partner_invoice_id" class="mt8"> <strong>Shipping address:</strong> <div t-field="doc.partner_shipping_id" - t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/> + t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/> </div> </t> </div> diff --git a/addons/stock/report/report_deliveryslip.xml b/addons/stock/report/report_deliveryslip.xml index f64d2318b2a..8f38a88a6fe 100644 --- a/addons/stock/report/report_deliveryslip.xml +++ b/addons/stock/report/report_deliveryslip.xml @@ -13,11 +13,11 @@ </div> <div t-if="o.move_lines and o.move_lines[0].partner_id" name="partner_header"> <div t-field="o.move_lines[0].partner_id" - t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True}'/> + t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True}'/> </div> <div t-if="not (o.move_lines and o.move_lines[0].partner_id) and o.partner_id" name="partner_header"> <div t-field="o.partner_id" - t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True}'/> + t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True}'/> </div> </div> </div> diff --git a/addons/stock/report/report_stockpicking_operations.xml b/addons/stock/report/report_stockpicking_operations.xml index d99bbb20ebc..ba8cd025246 100644 --- a/addons/stock/report/report_stockpicking_operations.xml +++ b/addons/stock/report/report_stockpicking_operations.xml @@ -12,12 +12,12 @@ <div t-if="o.move_lines and o.move_lines[0].partner_id and o.move_lines[0].partner_id.id != o.partner_id.id"> <span><strong>Delivery Address:</strong></span> <div t-field="o.move_lines[0].partner_id" - t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/> + t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/> </div> <div t-if="o.picking_type_id.code != 'internal' and (not o.move_lines or not o.move_lines[0].partner_id) and o.picking_type_id.warehouse_id.partner_id"> <span><strong>Warehouse Address:</strong></span> <div t-field="o.picking_type_id.warehouse_id.partner_id" - t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/> + t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/> </div> </div> <div class="col-xs-5 col-xs-offset-1"> diff --git a/addons/web/views/report_templates.xml b/addons/web/views/report_templates.xml index e939b23bf86..de44696eeea 100644 --- a/addons/web/views/report_templates.xml +++ b/addons/web/views/report_templates.xml @@ -147,7 +147,6 @@ <div class="text-center"> <ul class="list-inline"> <li t-if="company.phone"><i class="fa fa-phone"/> <span t-field="company.phone"/></li> - <li t-if="company.fax"><i class="fa fa-fax"/> <span t-field="company.fax"/></li> <li t-if="company.email"><i class="fa fa-at"/> <span t-field="company.email"/></li> <li t-if="company.website"><i class="fa fa-globe"/> <span t-field="company.website"/></li> <li t-if="company.vat"><i class="fa fa-building-o"/> VAT: <span t-field="company.vat"/></li> @@ -187,7 +186,6 @@ <div class="text-center"> <ul class="list-inline"> <li t-if="company.phone">Tel: <span t-field="company.phone"/></li> - <li t-if="company.fax">Fax: <span t-field="company.fax"/></li> <li t-if="company.email">Mail: <span t-field="company.email"/></li> <li t-if="company.website">Web: <span t-field="company.website"/></li> <li t-if="company.vat">VAT: <span t-field="company.vat"/></li> @@ -211,7 +209,6 @@ <strong><li t-if="company.name"><span t-field="company.name"/></li></strong> <li t-if="company.vat">VAT: <span t-field="company.vat"/></li> <li t-if="company.phone">Tel: <span t-field="company.phone"/></li> - <li t-if="company.fax">Fax: <span t-field="company.fax"/></li> <li t-if="company.email"><span t-field="company.email"/></li> <li t-if="company.website"><span t-field="company.website"/></li> </ul> @@ -274,7 +271,6 @@ <div class="text-center" style="border-top: 1px solid black;"> <ul class="list-inline mb4"> <li t-if="company.phone">Phone: <span t-field="company.phone"/></li> - <li t-if="company.fax">Fax: <span t-field="company.fax"/></li> <li t-if="company.email">Email: <span t-field="company.email"/></li> <li t-if="company.website">Web: <span t-field="company.website"/></li> <li t-if="company.vat">VAT: <span t-field="company.vat"/></li> diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index c8f686379be..cf5ba00df04 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -840,7 +840,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml <!-- TODO widget contact must add itemprop attributes --> <div t-field="res_company.partner_id" t-options='{ "widget": "contact", - "fields": ["name", "address", "phone", "mobile", "fax", "email"]}'/> + "fields": ["name", "address", "phone", "mobile", "email"]}'/> <t t-if="not res_company.google_map_img()"> <span class="fa fa-map-marker fa-fw mt16"/> <a t-att-href="res_company.google_map_link()" target="_BLANK"> Google Maps</a> </t> diff --git a/addons/website_crm_phone_validation/__manifest__.py b/addons/website_crm_phone_validation/__manifest__.py index 2462a69b455..d4ecaf98711 100644 --- a/addons/website_crm_phone_validation/__manifest__.py +++ b/addons/website_crm_phone_validation/__manifest__.py @@ -9,7 +9,7 @@ Contact Number Validation on Website ==================================== -Validate contact (phone,mobile,fax) numbers and normalize them on leads and contacts: +Validate contact (phone,mobile) numbers and normalize them on leads and contacts: - use the national format for your company country - use the international format for all others """, diff --git a/addons/website_crm_phone_validation/controllers/website_form.py b/addons/website_crm_phone_validation/controllers/website_form.py index 73dd2ebff57..3713fe86f9e 100644 --- a/addons/website_crm_phone_validation/controllers/website_form.py +++ b/addons/website_crm_phone_validation/controllers/website_form.py @@ -16,7 +16,7 @@ class WebsiteForm(WebsiteForm): return request.env['res.country'] def _get_phone_fields_to_validate(self): - return ['phone', 'mobile', 'fax'] + return ['phone', 'mobile'] @route('/website_form/<string:model_name>', type='http', auth="public", methods=['POST'], website=True) def website_form(self, model_name, **kwargs): diff --git a/addons/website_customer/views/website_customer_templates.xml b/addons/website_customer/views/website_customer_templates.xml index 4380180277d..c5a4825db76 100644 --- a/addons/website_customer/views/website_customer_templates.xml +++ b/addons/website_customer/views/website_customer_templates.xml @@ -209,7 +209,7 @@ <address class="well text-left"> <div t-field="partner.assigned_partner_id" t-options='{ "widget": "contact", - "fields": ["address", "website", "phone", "fax", "email"] + "fields": ["address", "website", "phone", "email"] }'/> </address> </div> diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml index 51346d24171..a819d647df6 100644 --- a/addons/website_event/views/event_templates.xml +++ b/addons/website_event/views/event_templates.xml @@ -249,7 +249,7 @@ <h4 class="text-center text-muted" t-field="event.address_id" t-options='{ "widget": "contact", - "fields": ["name", "address", "phone", "mobile", "fax"] + "fields": ["name", "address", "phone", "mobile"] }'/> </t> </template> @@ -351,7 +351,7 @@ </t> <div itemprop="location" class="mt16 mb8" t-field="event.address_id" t-options='{ "widget": "contact", - "fields": ["name", "address", "phone", "mobile", "fax", "email"] + "fields": ["name", "address", "phone", "mobile", "email"] }'/> </div> </div> @@ -373,7 +373,7 @@ </div> <div class="panel-body" t-field="event.organizer_id" t-options='{ "widget": "contact", - "fields": ["name", "phone", "mobile", "fax", "email"] + "fields": ["name", "phone", "mobile", "email"] }'/> </div> @@ -595,7 +595,7 @@ <i class="fa fa-clock-o"></i> <span itemprop="startDate" t-esc="event.date_begin_located"> </span> <i>to</i> <span itemprop="endDate" t-esc="event.date_end_located"> </span> <div itemprop="location" class="mt16 mb8" t-field="event.address_id" t-options='{ "widget": "contact", - "fields": ["name", "address", "phone", "mobile", "fax", "email"] + "fields": ["name", "address", "phone", "mobile", "email"] }'/> </div> <div class="col-md-3 mt16"> diff --git a/addons/website_partner/views/website_partner_templates.xml b/addons/website_partner/views/website_partner_templates.xml index 91179c77745..884cc08b744 100644 --- a/addons/website_partner/views/website_partner_templates.xml +++ b/addons/website_partner/views/website_partner_templates.xml @@ -25,7 +25,7 @@ <address class="well"> <div t-field="partner.self" t-options='{ "widget": "contact", - "fields": ["address", "website", "phone", "fax", "email"] + "fields": ["address", "website", "phone", "email"] }'/> </address> <t t-raw="left_column or ''"/> diff --git a/odoo/addons/base/ir/ir_qweb.xml b/odoo/addons/base/ir/ir_qweb.xml index a749e30705a..a1ae831980e 100644 --- a/odoo/addons/base/ir/ir_qweb.xml +++ b/odoo/addons/base/ir/ir_qweb.xml @@ -14,7 +14,7 @@ </template> <template id="contact"> <address t-ignore="true" class="mb0" itemscope="itemscope" itemtype="http://schema.org/Organization"> - <div t-if="not (('name' in fields) or (address and 'address' in fields) or (city and 'city' in fields) or (mobile and 'mobile' in fields) or (fax and 'fax' in fields) or (website and 'website' in fields) or (email and 'email' in fields))" class="css_non_editable_mode_hidden"> + <div t-if="not (('name' in fields) or (address and 'address' in fields) or (city and 'city' in fields) or (mobile and 'mobile' in fields) or (website and 'website' in fields) or (email and 'email' in fields))" class="css_non_editable_mode_hidden"> --<span class="text-muted" t-esc="name"/>-- </div> <t t-if="object.country_id.name_position != 'after'"> diff --git a/odoo/addons/base/ir/ir_qweb/fields.py b/odoo/addons/base/ir/ir_qweb/fields.py index ff26933c76b..6b9b0536b1a 100644 --- a/odoo/addons/base/ir/ir_qweb/fields.py +++ b/odoo/addons/base/ir/ir_qweb/fields.py @@ -444,7 +444,7 @@ class Contact(models.AbstractModel): if not value.exists(): return False - opf = options and options.get('fields') or ["name", "address", "phone", "mobile", "fax", "email"] + opf = options and options.get('fields') or ["name", "address", "phone", "mobile", "email"] value = value.sudo().with_context(show_address=True) name_get = value.name_get()[0][1] @@ -453,7 +453,6 @@ class Contact(models.AbstractModel): 'address': escape("\n".join(name_get.split("\n")[1:])).strip(), 'phone': value.phone, 'mobile': value.mobile, - 'fax': value.fax, 'city': value.city, 'country_id': value.country_id.display_name, 'website': value.website, diff --git a/odoo/addons/base/res/res_bank.py b/odoo/addons/base/res/res_bank.py index a4f972f912d..e1f9bb85f00 100644 --- a/odoo/addons/base/res/res_bank.py +++ b/odoo/addons/base/res/res_bank.py @@ -26,7 +26,6 @@ class Bank(models.Model): country = fields.Many2one('res.country') email = fields.Char() phone = fields.Char() - fax = fields.Char() active = fields.Boolean(default=True) bic = fields.Char('Bank Identifier Code', index=True, help="Sometimes called BIC or Swift.") diff --git a/odoo/addons/base/res/res_bank_view.xml b/odoo/addons/base/res/res_bank_view.xml index 31e88ad1350..8453b2f5e84 100644 --- a/odoo/addons/base/res/res_bank_view.xml +++ b/odoo/addons/base/res/res_bank_view.xml @@ -25,7 +25,6 @@ </group> <group string="Communication"> <field name="phone"/> - <field name="fax"/> <field name="email" widget="email"/> <field name="active"/> </group> diff --git a/odoo/addons/base/res/res_company.py b/odoo/addons/base/res/res_company.py index 27276b7733e..387ba1afe1c 100644 --- a/odoo/addons/base/res/res_company.py +++ b/odoo/addons/base/res/res_company.py @@ -62,7 +62,6 @@ class Company(models.Model): country_id = fields.Many2one('res.country', compute='_compute_address', inverse='_inverse_country', string="Country") email = fields.Char(related='partner_id.email', store=True) phone = fields.Char(related='partner_id.phone', store=True) - fax = fields.Char(compute='_compute_address', inverse='_inverse_fax') website = fields.Char(related='partner_id.website') vat = fields.Char(related='partner_id.vat', string="TIN") company_registry = fields.Char() @@ -96,7 +95,6 @@ class Company(models.Model): 'zip' : partner.zip, 'state_id' : partner.state_id, 'country_id' : partner.country_id, - 'fax' : partner.fax } # TODO @api.depends(): currently now way to formulate the dependency on the @@ -132,10 +130,6 @@ class Company(models.Model): for company in self: company.partner_id.country_id = company.country_id - def _inverse_fax(self): - for company in self: - company.partner_id.fax = company.fax - @api.depends('partner_id', 'partner_id.image') def _compute_logo_web(self): for company in self: diff --git a/odoo/addons/base/res/res_company_view.xml b/odoo/addons/base/res/res_company_view.xml index a3a692ce499..0e481931a2e 100644 --- a/odoo/addons/base/res/res_company_view.xml +++ b/odoo/addons/base/res/res_company_view.xml @@ -34,7 +34,6 @@ </group> <group> <field name="phone"/> - <field name="fax"/> <field name="email"/> <field name="vat"/> <field name="company_registry"/> diff --git a/odoo/addons/base/res/res_partner.py b/odoo/addons/base/res/res_partner.py index f40d217d939..5b73d6848cd 100644 --- a/odoo/addons/base/res/res_partner.py +++ b/odoo/addons/base/res/res_partner.py @@ -194,7 +194,6 @@ class Partner(models.Model): 'Formatted Email', compute='_compute_email_formatted', help='Format email address "Name <email@domain>"') phone = fields.Char() - fax = fields.Char() mobile = fields.Char() is_company = fields.Boolean(string='Is a Company', default=False, help="Check if the contact is a company, otherwise it is a person") diff --git a/odoo/addons/base/res/res_users_view.xml b/odoo/addons/base/res/res_users_view.xml index 65c27c740e6..d2795da23b7 100644 --- a/odoo/addons/base/res/res_users_view.xml +++ b/odoo/addons/base/res/res_users_view.xml @@ -159,7 +159,6 @@ </div> <field name="phone" widget="phone"/> <field name="mobile" widget="phone"/> - <field name="fax"/> </group> </sheet> </form> |
