diff --git a/odoo/addons/base/data/res_country_data.xml b/odoo/addons/base/data/res_country_data.xml
index d924f2ee042..872b14c0775 100644
--- a/odoo/addons/base/data/res_country_data.xml
+++ b/odoo/addons/base/data/res_country_data.xml
@@ -28,14 +28,14 @@
             <field name="code">ag</field>
             <field file="base/static/img/country_flags/ag.png" name="image" type="base64" />
             <field name="currency_id" ref="XCD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1268" name="phone_code" />
         </record>
         <record id="ai" model="res.country">
             <field name="name">Anguilla</field>
             <field name="code">ai</field>
             <field file="base/static/img/country_flags/ai.png" name="image" type="base64" />
             <field name="currency_id" ref="XCD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1264" name="phone_code" />
         </record>
         <record id="al" model="res.country">
             <field name="name">Albania</field>
@@ -62,7 +62,7 @@
             <field name="name">Antarctica</field>
             <field name="code">aq</field>
             <field name="currency_id" ref="XCD" />
-            <field eval="0" name="phone_code" />
+            <field eval="672" name="phone_code" />
         </record>
         <record id="ar" model="res.country">
             <field name="name">Argentina</field>
@@ -76,7 +76,7 @@
             <field name="code">as</field>
             <field file="base/static/img/country_flags/as.png" name="image" type="base64" />
             <field name="currency_id" ref="USD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1684" name="phone_code" />
         </record>
         <record id="at" model="res.country">
             <field name="name">Austria</field>
@@ -106,7 +106,7 @@
             <field name="code">ax</field>
             <field file="base/static/img/country_flags/ax.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
-            <field eval="0" name="phone_code" />
+            <field eval="358" name="phone_code" />
         </record>
         <record id="az" model="res.country">
             <field name="name">Azerbaijan</field>
@@ -127,7 +127,7 @@
             <field name="code">bb</field>
             <field file="base/static/img/country_flags/bb.png" name="image" type="base64" />
             <field name="currency_id" ref="BBD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1246" name="phone_code" />
         </record>
         <record id="bd" model="res.country">
             <field name="name">Bangladesh</field>
@@ -186,14 +186,14 @@
             <field name="code">bl</field>
             <field file="base/static/img/country_flags/bl.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
-            <field eval="0" name="phone_code" />
+            <field eval="590" name="phone_code" />
         </record>
         <record id="bm" model="res.country">
             <field name="name">Bermuda</field>
             <field name="code">bm</field>
             <field file="base/static/img/country_flags/bm.png" name="image" type="base64" />
             <field name="currency_id" ref="BMD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1441" name="phone_code" />
         </record>
         <record id="bn" model="res.country">
             <field name="name">Brunei Darussalam</field>
@@ -213,7 +213,7 @@
             <field name="name">Bonaire, Sint Eustatius and Saba</field>
             <field name="code">bq</field>
             <field name="currency_id" ref="USD" />
-            <field eval="0" name="phone_code" />
+            <field eval="599" name="phone_code" />
         </record>
         <record id="br" model="res.country">
             <field name="name">Brazil</field>
@@ -228,7 +228,7 @@
             <field name="code">bs</field>
             <field file="base/static/img/country_flags/bs.png" name="image" type="base64" />
             <field name="currency_id" ref="BSD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1242" name="phone_code" />
         </record>
         <record id="bt" model="res.country">
             <field name="name">Bhutan</field>
@@ -241,7 +241,7 @@
             <field name="name">Bouvet Island</field>
             <field name="code">bv</field>
             <field name="currency_id" ref="NOK" />
-            <field eval="0" name="phone_code" />
+            <field eval="55" name="phone_code" />
         </record>
         <record id="bw" model="res.country">
             <field name="name">Botswana</field>
@@ -278,7 +278,7 @@
             <field name="code">cc</field>
             <field file="base/static/img/country_flags/cc.png" name="image" type="base64" />
             <field name="currency_id" ref="AUD" />
-            <field eval="0" name="phone_code" />
+            <field eval="61" name="phone_code" />
         </record>
         <record id="cf" model="res.country">
             <field name="name">Central African Republic</field>
@@ -380,14 +380,14 @@
             <field name="code">cw</field>
             <field file="base/static/img/country_flags/cw.png" name="image" type="base64" />
             <field name="currency_id" ref="ANG" />
-            <field eval="0" name="phone_code" />
+            <field eval="599" name="phone_code" />
         </record>
         <record id="cx" model="res.country">
             <field name="name">Christmas Island</field>
             <field name="code">cx</field>
             <field file="base/static/img/country_flags/cx.png" name="image" type="base64" />
             <field name="currency_id" ref="AUD" />
-            <field eval="0" name="phone_code" />
+            <field eval="61" name="phone_code" />
         </record>
         <record id="cy" model="res.country">
             <field name="name">Cyprus</field>
@@ -435,7 +435,7 @@
             <field name="code">dm</field>
             <field file="base/static/img/country_flags/dm.png" name="image" type="base64" />
             <field name="currency_id" ref="XCD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1767" name="phone_code" />
         </record>
         <record id="do" model="res.country">
             <field name="name">Dominican Republic</field>
@@ -443,7 +443,7 @@
             <field file="base/static/img/country_flags/do.png" name="image" type="base64" />
             <field eval="'%(street)s\n%(street2)s\n%(city)s %(state_name)s %(zip)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="DOP" />
-            <field eval="1" name="phone_code" />
+            <field eval="1849" name="phone_code" />
             <field name="vat_label">RNC</field>
         </record>
         <record id="dz" model="res.country">
@@ -479,7 +479,7 @@
             <field name="name">Western Sahara</field>
             <field name="code">eh</field>
             <field name="currency_id" ref="MAD" />
-            <field eval="0" name="phone_code" />
+            <field eval="212" name="phone_code" />
         </record>
         <record id="er" model="res.country">
             <field name="name">Eritrea</field>
@@ -525,7 +525,7 @@
             <field name="code">fk</field>
             <field file="base/static/img/country_flags/fk.png" name="image" type="base64" />
             <field name="currency_id" ref="FKP" />
-            <field eval="0" name="phone_code" />
+            <field eval="500" name="phone_code" />
         </record>
         <record id="fm" model="res.country">
             <field name="name">Micronesia</field>
@@ -562,7 +562,7 @@
             <field name="code">gd</field>
             <field file="base/static/img/country_flags/gd.png" name="image" type="base64" />
             <field name="currency_id" ref="XCD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1473" name="phone_code" />
         </record>
         <record id="ge" model="res.country">
             <field name="name">Georgia</field>
@@ -596,7 +596,7 @@
             <field name="code">gg</field>
             <field file="base/static/img/country_flags/gg.png" name="image" type="base64" />
             <field name="currency_id" ref="GBP" />
-            <field eval="0" name="phone_code" />
+            <field eval="44" name="phone_code" />
         </record>
         <record id="gl" model="res.country">
             <field name="name">Greenland</field>
@@ -645,7 +645,7 @@
             <field name="code">gs</field>
             <field file="base/static/img/country_flags/gs.png" name="image" type="base64" />
             <field name="currency_id" ref="GBP" />
-            <field eval="0" name="phone_code" />
+            <field eval="500" name="phone_code" />
         </record>
         <record id="gt" model="res.country">
             <field name="name">Guatemala</field>
@@ -660,7 +660,7 @@
             <field name="code">gu</field>
             <field file="base/static/img/country_flags/gu.png" name="image" type="base64" />
             <field name="currency_id" ref="USD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1671" name="phone_code" />
         </record>
         <record id="gw" model="res.country">
             <field name="name">Guinea-Bissau</field>
@@ -687,7 +687,7 @@
             <field name="name">Heard Island and McDonald Islands</field>
             <field name="code">hm</field>
             <field name="currency_id" ref="AUD" />
-            <field eval="0" name="phone_code" />
+            <field eval="672" name="phone_code" />
         </record>
         <record id="hn" model="res.country">
             <field name="name">Honduras</field>
@@ -746,7 +746,7 @@
             <field name="code">im</field>
             <field file="base/static/img/country_flags/im.png" name="image" type="base64" />
             <field name="currency_id" ref="GBP" />
-            <field eval="0" name="phone_code" />
+            <field eval="44" name="phone_code" />
         </record>
         <record id="in" model="res.country">
             <field name="name">India</field>
@@ -762,7 +762,7 @@
             <field name="code">io</field>
             <field file="base/static/img/country_flags/io.png" name="image" type="base64" />
             <field name="currency_id" ref="USD" />
-            <field eval="0" name="phone_code" />
+            <field eval="246" name="phone_code" />
         </record>
         <record id="iq" model="res.country">
             <field name="name">Iraq</field>
@@ -798,14 +798,14 @@
             <field name="code">je</field>
             <field file="base/static/img/country_flags/je.png" name="image" type="base64" />
             <field name="currency_id" ref="GBP" />
-            <field eval="0" name="phone_code" />
+            <field eval="44" name="phone_code" />
         </record>
         <record id="jm" model="res.country">
             <field name="name">Jamaica</field>
             <field name="code">jm</field>
             <field file="base/static/img/country_flags/jm.png" name="image" type="base64" />
             <field name="currency_id" ref="JMD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1876" name="phone_code" />
         </record>
         <record id="jo" model="res.country">
             <field name="name">Jordan</field>
@@ -863,7 +863,7 @@
             <field name="code">kn</field>
             <field file="base/static/img/country_flags/kn.png" name="image" type="base64" />
             <field name="currency_id" ref="XCD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1869" name="phone_code" />
         </record>
         <record id="kp" model="res.country">
             <field name="name">North Korea</field>
@@ -891,7 +891,7 @@
             <field name="code">ky</field>
             <field file="base/static/img/country_flags/ky.png" name="image" type="base64" />
             <field name="currency_id" ref="KYD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1345" name="phone_code" />
         </record>
         <record id="kz" model="res.country">
             <field name="name">Kazakhstan</field>
@@ -919,7 +919,7 @@
             <field name="code">lc</field>
             <field file="base/static/img/country_flags/lc.png" name="image" type="base64" />
             <field name="currency_id" ref="XCD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1758" name="phone_code" />
         </record>
         <record id="li" model="res.country">
             <field name="name">Liechtenstein</field>
@@ -1013,7 +1013,7 @@
             <field name="name">Saint Martin (French part)</field>
             <field name="code">mf</field>
             <field name="currency_id" ref="EUR" />
-            <field eval="0" name="phone_code" />
+            <field eval="590" name="phone_code" />
         </record>
         <record id="mg" model="res.country">
             <field name="name">Madagascar</field>
@@ -1069,7 +1069,7 @@
             <field name="code">mp</field>
             <field file="base/static/img/country_flags/mp.png" name="image" type="base64" />
             <field name="currency_id" ref="USD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1670" name="phone_code" />
         </record>
         <record id="mq" model="res.country">
             <field name="name">Martinique</field>
@@ -1090,7 +1090,7 @@
             <field name="code">ms</field>
             <field file="base/static/img/country_flags/ms.png" name="image" type="base64" />
             <field name="currency_id" ref="XCD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1664" name="phone_code" />
         </record>
         <record id="mt" model="res.country">
             <field name="name">Malta</field>
@@ -1170,7 +1170,7 @@
             <field name="code">nf</field>
             <field file="base/static/img/country_flags/nf.png" name="image" type="base64" />
             <field name="currency_id" ref="AUD" />
-            <field eval="0" name="phone_code" />
+            <field eval="672" name="phone_code" />
         </record>
         <record id="ng" model="res.country">
             <field name="name">Nigeria</field>
@@ -1301,20 +1301,20 @@
             <field name="code">pn</field>
             <field file="base/static/img/country_flags/pn.png" name="image" type="base64" />
             <field name="currency_id" ref="NZD" />
-            <field eval="0" name="phone_code" />
+            <field eval="64" name="phone_code" />
         </record>
         <record id="pr" model="res.country">
             <field name="name">Puerto Rico</field>
             <field name="code">pr</field>
             <field file="base/static/img/country_flags/pr.png" name="image" type="base64" />
             <field name="currency_id" ref="USD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1939" name="phone_code" />
         </record>
         <record id="ps" model="res.country">
             <field name="name">State of Palestine</field>
             <field name="code">ps</field>
             <field name="currency_id" ref="ILS" />
-            <field eval="0" name="phone_code" />
+            <field eval="970" name="phone_code" />
         </record>
         <record id="pt" model="res.country">
             <field name="name">Portugal</field>
@@ -1429,7 +1429,7 @@
             <field name="code">sh</field>
             <field file="base/static/img/country_flags/sh.png" name="image" type="base64" />
             <field name="currency_id" ref="SHP" />
-            <field eval="0" name="phone_code" />
+            <field eval="290" name="phone_code" />
         </record>
         <record id="si" model="res.country">
             <field name="name">Slovenia</field>
@@ -1443,7 +1443,7 @@
             <field name="name">Svalbard and Jan Mayen</field>
             <field name="code">sj</field>
             <field name="currency_id" ref="NOK" />
-            <field eval="0" name="phone_code" />
+            <field eval="47" name="phone_code" />
         </record>
         <record id="sk" model="res.country">
             <field name="name">Slovakia</field>
@@ -1493,7 +1493,7 @@
             <field name="code">ss</field>
             <field file="base/static/img/country_flags/ss.png" name="image" type="base64" />
             <field name="currency_id" ref="SSP" />
-            <field eval="0" name="phone_code" />
+            <field eval="211" name="phone_code" />
         </record>
         <record id="st" model="res.country">
             <field name="name">São Tomé and Príncipe</field>
@@ -1514,7 +1514,7 @@
             <field name="code">sx</field>
             <field file="base/static/img/country_flags/sx.png" name="image" type="base64" />
             <field name="currency_id" ref="ANG" />
-            <field eval="0" name="phone_code" />
+            <field eval="1721" name="phone_code" />
         </record>
         <record id="sy" model="res.country">
             <field name="name">Syria</field>
@@ -1535,7 +1535,7 @@
             <field name="code">tc</field>
             <field file="base/static/img/country_flags/tc.png" name="image" type="base64" />
             <field name="currency_id" ref="USD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1649" name="phone_code" />
         </record>
         <record id="td" model="res.country">
             <field name="name">Chad</field>
@@ -1549,7 +1549,7 @@
             <field name="code">tf</field>
             <field file="base/static/img/country_flags/tf.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
-            <field eval="0" name="phone_code" />
+            <field eval="262" name="phone_code" />
         </record>
         <record id="tg" model="res.country">
             <field name="name">Togo</field>
@@ -1620,7 +1620,7 @@
             <field name="code">tt</field>
             <field file="base/static/img/country_flags/tt.png" name="image" type="base64" />
             <field name="currency_id" ref="TTD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1868" name="phone_code" />
         </record>
         <record id="tv" model="res.country">
             <field name="name">Tuvalu</field>
@@ -1662,14 +1662,14 @@
             <field name="code">gb</field>
             <field file="base/static/img/country_flags/gb.png" name="image" type="base64" />
             <field name="currency_id" ref="GBP" />
-            <field eval="0" name="phone_code" />
+            <field eval="44" name="phone_code" />
             <field name="vat_label">VAT</field>
         </record>
         <record id="um" model="res.country">
             <field name="name">USA Minor Outlying Islands</field>
             <field name="code">um</field>
             <field name="currency_id" ref="USD" />
-            <field eval="0" name="phone_code" />
+            <field eval="699" name="phone_code" />
         </record>
         <record id="us" model="res.country">
             <field name="name">United States</field>
@@ -1705,7 +1705,7 @@
             <field name="code">vc</field>
             <field file="base/static/img/country_flags/vc.png" name="image" type="base64" />
             <field name="currency_id" ref="XCD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1784" name="phone_code" />
         </record>
         <record id="ve" model="res.country">
             <field name="name">Venezuela</field>
@@ -1719,14 +1719,14 @@
             <field name="code">vg</field>
             <field file="base/static/img/country_flags/vg.png" name="image" type="base64" />
             <field name="currency_id" ref="USD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1284" name="phone_code" />
         </record>
         <record id="vi" model="res.country">
             <field name="name">Virgin Islands (USA)</field>
             <field name="code">vi</field>
             <field file="base/static/img/country_flags/vi.png" name="image" type="base64" />
             <field name="currency_id" ref="USD" />
-            <field eval="0" name="phone_code" />
+            <field eval="1340" name="phone_code" />
         </record>
         <record id="vn" model="res.country">
             <field name="name">Vietnam</field>