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 @@
Ruislip
+44 845 643 4548
- 08455274653
http://www.smartmode.co.uk
smartmode@yourcompany.example.com
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 @@
Invoice address:
+ t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
VAT:
Shipping address :
+ t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
VAT:
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 @@
Shipping address:
+ t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
+ t-options='{"widget": "contact", "fields": ["address", "phone"], "no_marker": True, "phone_icons": True}'/>
+ t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
VAT:
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 @@
Shipping address:
+ t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
+ t-options='{"widget": "contact", "fields": ["address", "phone"], "no_marker": True, "phone_icons": True}'/>
+ t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
VAT:
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 @@
Invoicing and shipping address:
Invoicing address:
+ t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
Shipping address:
+ t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
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 @@
+ t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True}'/>
+ t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True}'/>
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 @@
Delivery Address:
+ t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
Warehouse Address:
+ t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
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 @@
-
- -
-
-
- VAT:
@@ -187,7 +186,6 @@
- Tel:
- - Fax:
- Mail:
- Web:
- VAT:
@@ -211,7 +209,6 @@
- VAT:
- Tel:
- - Fax:
@@ -274,7 +271,6 @@
- Phone:
- - Fax:
- Email:
- Web:
- VAT:
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: sitemap.xml
+ "fields": ["name", "address", "phone", "mobile", "email"]}'/>
Google Maps
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/', 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 @@
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 @@
@@ -351,7 +351,7 @@
@@ -373,7 +373,7 @@
@@ -595,7 +595,7 @@
to
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 @@
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 @@
-
+
----
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 @@
-
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 @@
-
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 "')
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 @@
-