diff options
| author | Parth Choksi <pch@odoo.com> | 2019-07-30 09:42:17 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2019-08-21 12:12:33 +0000 |
| commit | ebaa132d5d1e93e122a645bcf9a8eeff1b478b0a (patch) | |
| tree | e2fe0b22a6089a06fa0daa9526b7c591b048a6f9 /addons/phone_validation | |
| parent | 1576c91c9a3f0e56fcb1c953c396eac22b4d9754 (diff) | |
[IMP] various: Clean settings UX (back2basics)
TaskID: 2028958
closes odoo/odoo#35551
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/phone_validation')
| -rw-r--r-- | addons/phone_validation/models/__init__.py | 1 | ||||
| -rw-r--r-- | addons/phone_validation/models/phone_validation_mixin.py | 8 | ||||
| -rw-r--r-- | addons/phone_validation/models/res_company.py | 17 |
3 files changed, 1 insertions, 25 deletions
diff --git a/addons/phone_validation/models/__init__.py b/addons/phone_validation/models/__init__.py index dfe42e557e3..ba75abd0ddb 100644 --- a/addons/phone_validation/models/__init__.py +++ b/addons/phone_validation/models/__init__.py @@ -4,4 +4,3 @@ from . import phone_blacklist from . import phone_validation_mixin from . import mail_thread_phone -from . import res_company diff --git a/addons/phone_validation/models/phone_validation_mixin.py b/addons/phone_validation/models/phone_validation_mixin.py index 0e7ab1c2aaa..10eccb9b307 100644 --- a/addons/phone_validation/models/phone_validation_mixin.py +++ b/addons/phone_validation/models/phone_validation_mixin.py @@ -19,21 +19,15 @@ class PhoneValidationMixin(models.AbstractModel): return self.country_id return self.env.company.country_id - def _phone_get_always_international(self): - if 'company_id' in self and self.company_id: - return self.company_id.phone_international_format == 'prefix' - return self.env.company.phone_international_format == 'prefix' - def phone_format(self, number, country=None, company=None): country = country or self._phone_get_country() if not country: return number - always_international = company.phone_international_format == 'prefix' if company else self._phone_get_always_international() return phone_validation.phone_format( number, country.code if country else None, country.phone_code if country else None, - force_format='INTERNATIONAL' if always_international else 'NATIONAL', + force_format='INTERNATIONAL', raise_exception=False ) diff --git a/addons/phone_validation/models/res_company.py b/addons/phone_validation/models/res_company.py deleted file mode 100644 index df53ca6196b..00000000000 --- a/addons/phone_validation/models/res_company.py +++ /dev/null @@ -1,17 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from odoo import fields, models - - -class ResCompany(models.Model): - _inherit = 'res.company' - - phone_international_format = fields.Selection([ - ('no_prefix', 'No prefix'), - ('prefix', 'Add international prefix'), - ], string="Local Numbers", default="prefix", - help="Always encode phone numbers using international format. Otherwise " - "numbers coming from the company's country are nationally formatted. " - "International numbers are always using international format." - ) |