From 13baea56b949365f2df76704f346350d9e2ba5e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Rahir?= <rar@odoo.com>
Date: Tue, 9 Jan 2018 14:59:51 +0100
Subject: [PATCH] [FIX] phone_valdation: fix default behaviour for numbers
 formatting

before this commit, the selection on res.company was by default hiding the country prefix. THe option was not available on res.company view.

We fix the default behaviour and add the option in the res.company view in debug mode.
---
 addons/phone_validation/__manifest__.py         |  1 +
 addons/phone_validation/models/res_company.py   |  2 +-
 .../phone_validation/views/res_company_view.xml | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 addons/phone_validation/views/res_company_view.xml

diff --git a/addons/phone_validation/__manifest__.py b/addons/phone_validation/__manifest__.py
index dc21476150f..2ebc99f3ead 100644
--- a/addons/phone_validation/__manifest__.py
+++ b/addons/phone_validation/__manifest__.py
@@ -16,6 +16,7 @@ formatting.
 
 This module applies this feature to Leads and Contacts.""",
     'data': [
+        'views/res_company_view.xml'
     ],
     'depends': ['base'],
 }
diff --git a/addons/phone_validation/models/res_company.py b/addons/phone_validation/models/res_company.py
index 66d68225246..2ee2c18d7bd 100644
--- a/addons/phone_validation/models/res_company.py
+++ b/addons/phone_validation/models/res_company.py
@@ -10,7 +10,7 @@ class ResCompany(models.Model):
     phone_international_format = fields.Selection([
         ('no_prefix', 'No prefix'),
         ('prefix', 'Add international prefix'),
-    ],string="Local Numbers", default="no_prefix",
+    ], string="Local Numbers", default="prefix",
         help="Always encode phone numbers using international format. Otherwise "
              "numbers coming from the company's country are nationaly formatted. "
              "International numbers are always using international format."
diff --git a/addons/phone_validation/views/res_company_view.xml b/addons/phone_validation/views/res_company_view.xml
new file mode 100644
index 00000000000..d788e5aa7fe
--- /dev/null
+++ b/addons/phone_validation/views/res_company_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+  The purpose of this view is to move the VAT field at the top of the 
+  company form. That way, the user will fill it first
+-->
+<odoo>
+    <record id="res_company_view_form_phone_validation" model="ir.ui.view">
+        <field name="name">res.company.view.form.phone_validation</field>
+        <field name="model">res.company</field>
+        <field name="inherit_id" ref="base.view_company_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='phone']" position="after">
+                <field name="phone_international_format" groups="base.group_no_one"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>