From bfbaaa7d1319d109018b4e77ff930dadb8211cee Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@odoo.com>
Date: Thu, 3 Aug 2017 17:16:33 +0200
Subject: [PATCH] [IMP] base: countries/territories list cleaning

The world changes and some country names too :
- Anguilla is not a part of Saint Kitts and Nevis anymore (1980)
- East Timor is now called Timor-Leste and has a new ISO code (2002)
- Netherlands Antilles have been split in CW, SX, BQ (2010)
- Neutral Zone between Irak and Saudi Arabia does not exist anymore
  (1991)
- The U.N. now use "State of Palestine" for West Bank and Gaza (2012)
- Yugoslavia has been split (1992) then some remaining parts renamed as
  "Serbia and Montenegro" (2003)
- Zaire is now called Democratic Republic of the Congo (1997)

We also fixed/simplified names of other countries/territories when
there is a more vernacular name that is not ambiguous or simply a typo

source: https://www.iso.org/obp/ui/en/#search

(We also fix a test that count countries beginning by Z, and there is
no Zaire anymore)
---
 odoo/addons/base/res/res_country_data.xml     |  83 ++++++------------
 .../base/static/img/country_flags/tp.png      | Bin 5186 -> 0 bytes
 odoo/addons/base/tests/test_expression.py     |   2 +-
 3 files changed, 30 insertions(+), 55 deletions(-)
 delete mode 100644 odoo/addons/base/static/img/country_flags/tp.png

diff --git a/odoo/addons/base/res/res_country_data.xml b/odoo/addons/base/res/res_country_data.xml
index 86978437404..95b83a5fa52 100644
--- a/odoo/addons/base/res/res_country_data.xml
+++ b/odoo/addons/base/res/res_country_data.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
 
         <record id="ad" model="res.country">
-            <field name="name">Andorra, Principality of</field>
+            <field name="name">Andorra</field>
             <field name="code">ad</field>
             <field file="base/static/img/country_flags/ad.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
@@ -17,7 +17,7 @@
             <field eval="971" name="phone_code" />
         </record>
         <record id="af" model="res.country">
-            <field name="name">Afghanistan, Islamic State of</field>
+            <field name="name">Afghanistan</field>
             <field name="code">af</field>
             <field file="base/static/img/country_flags/af.png" name="image" type="base64" />
             <field name="currency_id" ref="AFN" />
@@ -51,13 +51,6 @@
             <field name="currency_id" ref="AMD" />
             <field eval="374" name="phone_code" />
         </record>
-        <record id="an" model="res.country">
-            <field name="name">Netherlands Antilles</field>
-            <field name="code">an</field>
-            <field file="base/static/img/country_flags/an.png" name="image" type="base64" />
-            <field name="currency_id" ref="NOK" />
-            <field eval="599" name="phone_code" />
-        </record>
         <record id="ao" model="res.country">
             <field name="name">Angola</field>
             <field name="code">ao</field>
@@ -122,7 +115,7 @@
             <field eval="994" name="phone_code" />
         </record>
         <record id="ba" model="res.country">
-            <field name="name">Bosnia-Herzegovina</field>
+            <field name="name">Bosnia and Herzegovina</field>
             <field name="code">ba</field>
             <field file="base/static/img/country_flags/ba.png" name="image" type="base64" />
             <field name="currency_id" ref="BAM" />
@@ -291,7 +284,7 @@
             <field eval="236" name="phone_code" />
         </record>
         <record id="cd" model="res.country">
-            <field name="name">Congo, Democratic Republic of the</field>
+            <field name="name">Democratic Republic of the Congo</field>
             <field name="code">cd</field>
             <field file="base/static/img/country_flags/cd.png" name="image" type="base64" />
             <field name="currency_id" ref="CDF" />
@@ -313,7 +306,7 @@
             <field eval="41" name="phone_code" />
         </record>
         <record id="ci" model="res.country">
-            <field name="name">Ivory Coast (Cote D'Ivoire)</field>
+            <field name="name">Côte d'Ivoire</field>
             <field name="code">ci</field>
             <field file="base/static/img/country_flags/ci.png" name="image" type="base64" />
             <field name="currency_id" ref="XOF" />
@@ -564,7 +557,7 @@
             <field eval="995" name="phone_code" />
         </record>
         <record id="gf" model="res.country">
-            <field name="name">French Guyana</field>
+            <field name="name">French Guiana</field>
             <field name="code">gf</field>
             <field name="currency_id" ref="EUR" />
             <field eval="594" name="phone_code" />
@@ -612,7 +605,7 @@
             <field eval="224" name="phone_code" />
         </record>
         <record id="gp" model="res.country">
-            <field name="name">Guadeloupe (French)</field>
+            <field name="name">Guadeloupe</field>
             <field name="code">gp</field>
             <field name="currency_id" ref="EUR" />
             <field eval="590" name="phone_code" />
@@ -646,14 +639,14 @@
             <field eval="502" name="phone_code" />
         </record>
         <record id="gu" model="res.country">
-            <field name="name">Guam (USA)</field>
+            <field name="name">Guam</field>
             <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" />
         </record>
         <record id="gw" model="res.country">
-            <field name="name">Guinea Bissau</field>
+            <field name="name">Guinea-Bissau</field>
             <field name="code">gw</field>
             <field file="base/static/img/country_flags/gw.png" name="image" type="base64" />
             <field name="currency_id" ref="XOF" />
@@ -674,7 +667,7 @@
             <field eval="852" name="phone_code" />
         </record>
         <record id="hm" model="res.country">
-            <field name="name">Heard and McDonald Islands</field>
+            <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" />
@@ -816,14 +809,14 @@
             <field eval="254" name="phone_code" />
         </record>
         <record id="kg" model="res.country">
-            <field name="name">Kyrgyz Republic (Kyrgyzstan)</field>
+            <field name="name">Kyrgyzstan</field>
             <field name="code">kg</field>
             <field file="base/static/img/country_flags/kg.png" name="image" type="base64" />
             <field name="currency_id" ref="KGS" />
             <field eval="996" name="phone_code" />
         </record>
         <record id="kh" model="res.country">
-            <field name="name">Cambodia, Kingdom of</field>
+            <field name="name">Cambodia</field>
             <field name="code">kh</field>
             <field file="base/static/img/country_flags/kh.png" name="image" type="base64" />
             <field name="currency_id" ref="KHR" />
@@ -844,7 +837,7 @@
             <field eval="269" name="phone_code" />
         </record>
         <record id="kn" model="res.country">
-            <field name="name">Saint Kitts &amp; Nevis Anguilla</field>
+            <field name="name">Saint Kitts and Nevis</field>
             <field name="code">kn</field>
             <field file="base/static/img/country_flags/kn.png" name="image" type="base64" />
             <field name="currency_id" ref="XCD" />
@@ -978,7 +971,7 @@
             <field eval="377" name="phone_code" />
         </record>
         <record id="md" model="res.country">
-            <field name="name">Moldavia</field>
+            <field name="name">Moldova</field>
             <field name="code">md</field>
             <field file="base/static/img/country_flags/md.png" name="image" type="base64" />
             <field name="currency_id" ref="MDL" />
@@ -1054,7 +1047,7 @@
             <field eval="0" name="phone_code" />
         </record>
         <record id="mq" model="res.country">
-            <field name="name">Martinique (French)</field>
+            <field name="name">Martinique</field>
             <field name="code">mq</field>
             <field file="base/static/img/country_flags/mq.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
@@ -1131,7 +1124,7 @@
             <field eval="264" name="phone_code" />
         </record>
         <record id="nc" model="res.country">
-            <field name="name">New Caledonia (French)</field>
+            <field name="name">New Caledonia</field>
             <field name="code">nc</field>
             <field file="base/static/img/country_flags/nc.png" name="image" type="base64" />
             <field name="currency_id" ref="XPF" />
@@ -1194,12 +1187,6 @@
             <field name="currency_id" ref="AUD" />
             <field eval="674" name="phone_code" />
         </record>
-        <record id="nt" model="res.country">
-            <field name="name">Neutral Zone</field>
-            <field name="code">nt</field>
-            <field name="currency_id" ref="IQD" />
-            <field eval="0" name="phone_code" />
-        </record>
         <record id="nu" model="res.country">
             <field name="name">Niue</field>
             <field name="code">nu</field>
@@ -1236,7 +1223,7 @@
             <field eval="51" name="phone_code" />
         </record>
         <record id="pf" model="res.country">
-            <field name="name">Polynesia (French)</field>
+            <field name="name">French Polynesia</field>
             <field name="code">pf</field>
             <field file="base/static/img/country_flags/pf.png" name="image" type="base64" />
             <field name="currency_id" ref="XPF" />
@@ -1279,7 +1266,7 @@
             <field eval="508" name="phone_code" />
         </record>
         <record id="pn" model="res.country">
-            <field name="name">Pitcairn Island</field>
+            <field name="name">Pitcairn Islands</field>
             <field name="code">pn</field>
             <field file="base/static/img/country_flags/pn.png" name="image" type="base64" />
             <field name="currency_id" ref="NZD" />
@@ -1293,7 +1280,7 @@
             <field eval="0" name="phone_code" />
         </record>
         <record id="ps" model="res.country">
-            <field name="name">Palestinian Territory, Occupied</field>
+            <field name="name">State of Palestine</field>
             <field name="code">ps</field>
             <field name="currency_id" ref="ILS" />
             <field eval="0" name="phone_code" />
@@ -1327,7 +1314,7 @@
             <field eval="974" name="phone_code" />
         </record>
         <record id="re" model="res.country">
-            <field name="name">Reunion (French)</field>
+            <field name="name">Réunion</field>
             <field name="code">re</field>
             <field name="currency_id" ref="EUR" />
             <field eval="262" name="phone_code" />
@@ -1403,7 +1390,7 @@
             <field eval="65" name="phone_code" />
         </record>
         <record id="sh" model="res.country">
-            <field name="name">Saint Helena</field>
+            <field name="name">Saint Helena, Ascension and Tristan da Cunha</field>
             <field name="code">sh</field>
             <field file="base/static/img/country_flags/sh.png" name="image" type="base64" />
             <field name="currency_id" ref="SHP" />
@@ -1417,7 +1404,7 @@
             <field eval="386" name="phone_code" />
         </record>
         <record id="sj" model="res.country">
-            <field name="name">Svalbard and Jan Mayen Islands</field>
+            <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" />
@@ -1472,7 +1459,7 @@
             <field eval="0" name="phone_code" />
         </record>
         <record id="st" model="res.country">
-            <field name="name">Saint Tome (Sao Tome) and Principe</field>
+            <field name="name">São Tomé and Príncipe</field>
             <field name="code">st</field>
             <field file="base/static/img/country_flags/st.png" name="image" type="base64" />
             <field name="currency_id" ref="STD" />
@@ -1576,10 +1563,10 @@
             <field name="currency_id" ref="TOP" />
             <field eval="676" name="phone_code" />
         </record>
-        <record id="tp" model="res.country">
-            <field name="name">East Timor</field>
-            <field name="code">tp</field>
-            <field file="base/static/img/country_flags/tp.png" name="image" type="base64" />
+        <record id="tl" model="res.country">
+            <field name="name">Timor-Leste</field>
+            <field name="code">tl</field>
+            <field file="base/static/img/country_flags/tl.png" name="image" type="base64" />
             <field name="currency_id" ref="USD" />
             <field eval="0" name="phone_code" />
         </record>
@@ -1676,7 +1663,7 @@
             <field eval="379" name="phone_code" />
         </record>
         <record id="vc" model="res.country">
-            <field name="name">Saint Vincent &amp; Grenadines</field>
+            <field name="name">Saint Vincent and the Grenadines</field>
             <field name="code">vc</field>
             <field file="base/static/img/country_flags/vc.png" name="image" type="base64" />
             <field name="currency_id" ref="XCD" />
@@ -1718,7 +1705,7 @@
             <field eval="678" name="phone_code" />
         </record>
         <record id="wf" model="res.country">
-            <field name="name">Wallis and Futuna Islands</field>
+            <field name="name">Wallis and Futuna</field>
             <field name="code">wf</field>
             <field name="currency_id" ref="XPF" />
             <field eval="681" name="phone_code" />
@@ -1743,12 +1730,6 @@
             <field name="currency_id" ref="EUR" />
             <field eval="262" name="phone_code" />
         </record>
-        <record id="yu" model="res.country">
-            <field name="name">Yugoslavia</field>
-            <field name="code">yu</field>
-            <field name="currency_id" ref="YUM" />
-            <field eval="0" name="phone_code" />
-        </record>
         <record id="za" model="res.country">
             <field name="name">South Africa</field>
             <field name="code">za</field>
@@ -1763,12 +1744,6 @@
             <field name="currency_id" ref="ZMK" />
             <field eval="260" name="phone_code" />
         </record>
-        <record id="zr" model="res.country">
-            <field name="name">Zaire</field>
-            <field name="code">zr</field>
-            <field name="currency_id" ref="ZRZ" />
-            <field eval="0" name="phone_code" />
-        </record>
         <record id="zw" model="res.country">
             <field name="name">Zimbabwe</field>
             <field name="code">zw</field>
diff --git a/odoo/addons/base/static/img/country_flags/tp.png b/odoo/addons/base/static/img/country_flags/tp.png
deleted file mode 100644
index 2ec85c15394f08f327944322b8f2a1631527ec05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5186
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
EA8DQ@EdT%j

diff --git a/odoo/addons/base/tests/test_expression.py b/odoo/addons/base/tests/test_expression.py
index 07a087d0842..2ee7429f90a 100644
--- a/odoo/addons/base/tests/test_expression.py
+++ b/odoo/addons/base/tests/test_expression.py
@@ -537,7 +537,7 @@ class TestExpression(TransactionCase):
         countries = Country.search([('name', '=like', 'Ind__')])
         self.assertTrue(len(countries) == 1, "Must match India only")
         countries = Country.search([('name', '=ilike', 'z%')])
-        self.assertTrue(len(countries) == 3, "Must match only countries with names starting with Z (currently 3)")
+        self.assertTrue(len(countries) == 2, "Must match only countries with names starting with Z (currently 2)")
 
     def test_translate_search(self):
         Country = self.env['res.country']