From 2f3dcb89472f79503ec5ff78188ecc79a50d55fd Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Wed, 2 Sep 2020 08:57:39 +0000
Subject: [PATCH] [IMP] base,website*: do not store country flags.

1) Avoid the storage of all country flags as ir_attachment (230+
ir_attachment in a new db) to reduce the filestore of databases.

The country flags are nearly static and not expected to be modified on
Odoo instances.

This change is based on the new "image_url" widget logic (see previous commits).

2) Extend the flag coverage for countries

Add the missing country flags & specify a mapping to provide flags
for overseas administrated countries/territories.
---
 addons/website/models/website_visitor.py      |   2 +-
 addons/website/tests/test_performance.py      |   2 -
 .../website/views/website_visitor_views.xml   |  18 +-
 .../models/event_sponsor.py                   |   4 +-
 addons/website_forum/views/website_forum.xml  |   2 +-
 odoo/addons/base/data/res_country_data.xml    | 235 ------------------
 odoo/addons/base/models/res_country.py        |  32 ++-
 .../base/static/img/country_flags/eh.png      | Bin 0 -> 5121 bytes
 .../base/static/img/country_flags/ps.png      | Bin 0 -> 2932 bytes
 .../base/static/img/country_flags/tw.png      | Bin 0 -> 6529 bytes
 .../base/static/img/country_flags/wf.png      | Bin 0 -> 3836 bytes
 .../base/views/ir_qweb_widget_templates.xml   |   4 +-
 odoo/addons/base/views/res_country_views.xml  |   2 +-
 13 files changed, 49 insertions(+), 252 deletions(-)
 create mode 100644 odoo/addons/base/static/img/country_flags/eh.png
 create mode 100644 odoo/addons/base/static/img/country_flags/ps.png
 create mode 100644 odoo/addons/base/static/img/country_flags/tw.png
 create mode 100644 odoo/addons/base/static/img/country_flags/wf.png

diff --git a/addons/website/models/website_visitor.py b/addons/website/models/website_visitor.py
index ca54d20d883..b4eccd5264e 100644
--- a/addons/website/models/website_visitor.py
+++ b/addons/website/models/website_visitor.py
@@ -38,7 +38,7 @@ class WebsiteVisitor(models.Model):
 
     # localisation and info
     country_id = fields.Many2one('res.country', 'Country', readonly=True)
-    country_flag = fields.Binary(related="country_id.image", string="Country Flag")
+    country_flag = fields.Char(related="country_id.image_url", string="Country Flag")
     lang_id = fields.Many2one('res.lang', string='Language', help="Language from the website when visitor has been created")
     timezone = fields.Selection(_tz_get, string='Timezone')
     email = fields.Char(string='Email', compute='_compute_email_phone')
diff --git a/addons/website/tests/test_performance.py b/addons/website/tests/test_performance.py
index 466167b436f..48763dc75b9 100644
--- a/addons/website/tests/test_performance.py
+++ b/addons/website/tests/test_performance.py
@@ -33,8 +33,6 @@ class UtilPerf(HttpCase):
 class TestStandardPerformance(UtilPerf):
     def test_10_perf_sql_img_controller(self):
         self.authenticate('demo', 'demo')
-        url = '/web/image/res.country/4/image'
-        self.assertEqual(self._get_url_hot_query(url), 4)
         url = '/web/image/res.users/2/image_256'
         self.assertEqual(self._get_url_hot_query(url), 8)
 
diff --git a/addons/website/views/website_visitor_views.xml b/addons/website/views/website_visitor_views.xml
index 9ec67f4503f..6a07151fd66 100644
--- a/addons/website/views/website_visitor_views.xml
+++ b/addons/website/views/website_visitor_views.xml
@@ -82,6 +82,7 @@
             <kanban class="o_wvisitor_kanban" sample="1">
                 <field name="id"/>
                 <field name="country_id"/>
+                <field name="country_flag"/>
                 <field name="email"/>
                 <field name="is_connected"/>
                 <field name="display_name"/>
@@ -109,10 +110,10 @@
                                             <span class="fa fa-circle text-success" t-if="record.is_connected.raw_value" aria-label="Online" title="Online"/>
                                             <span class="fa fa-circle text-danger" t-else="" aria-label="Offline" title="Offline"/>
                                         </div>
-                                        <div>
-                                            <img t-if="record.country_id.raw_value"
-                                             t-att-src="kanban_image('res.country', 'image', record.country_id.raw_value)"
-                                             class="o_country_flag" alt="Country"/>
+                                        <!-- Double check is necessary for sample view (or error image are shown) -->
+                                        <div t-if="record.country_id.raw_value and record.country_flag.raw_value">
+                                            <img t-att-src="record.country_flag.raw_value"
+                                               class="o_country_flag" alt="Country"/>
                                         </div>
                                     </div>
                                 </div>
@@ -147,7 +148,8 @@
                                 </div>
                                 <strong>
                                     <img t-if="record.country_id.raw_value"
-                                         t-att-src="kanban_image('res.country', 'image', record.country_id.raw_value)" class="o_country_flag" alt="Country"/>
+                                       t-att-src="record.country_flag.raw_value"
+                                       class="o_country_flag" alt="Country"/>
                                     <field name="display_name"/>
                                 </strong>
                                 <div class="mb-2">Active <field name="time_since_last_action"/></div>
@@ -196,7 +198,9 @@
                             <field name="visitor_page_count" widget="statinfo" string="Page views"/>
                         </button>
                     </div>
-                    <div class="float-right" attrs="{'invisible': [('country_id', '=', False)]}"><field name="country_flag" widget="image" options='{"size": [32, 32]}'/></div>
+                    <div class="float-right" attrs="{'invisible': [('country_id', '=', False)]}">
+                        <field name="country_flag" widget="image_url" options='{"size": [32, 32]}'/>
+                    </div>
                     <div class="oe_title">
                         <h1><field name="display_name"/></h1>
                     </div>
@@ -227,7 +231,7 @@
         <field name="arch" type="xml">
             <tree string="Web Visitors" decoration-success="is_connected" decoration-danger="not is_connected" sample="1">
                 <!--TODO DBE : Handle no_label in treeview-->
-                <field name="country_flag" widget="image" options='{"size": [20, 20]}' string=" "/>
+                <field name="country_flag" widget="image_url" options='{"size": [20, 20]}' string=" "/>
                 <field name="display_name"/>
                 <field name="create_date"/>
                 <field name="last_connection_datetime"/>
diff --git a/addons/website_event_track_exhibitor/models/event_sponsor.py b/addons/website_event_track_exhibitor/models/event_sponsor.py
index 4f812034e3e..878938f739a 100644
--- a/addons/website_event_track_exhibitor/models/event_sponsor.py
+++ b/addons/website_event_track_exhibitor/models/event_sponsor.py
@@ -92,11 +92,11 @@ class EventSponsor(models.Model):
 
                 sponsor.is_in_opening_hours = opening_from <= now_tz < opening_to
 
-    @api.depends('partner_id.country_id.image')
+    @api.depends('partner_id.country_id.image_url')
     def _compute_country_flag_url(self):
         for sponsor in self:
             if sponsor.partner_id.country_id:
-                sponsor.country_flag_url = self.env['website'].image_url(sponsor.partner_id.country_id, 'image', size=256)
+                sponsor.country_flag_url = sponsor.partner_id.country_id.image_url
             else:
                 sponsor.country_flag_url = False
 
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index d24ea064a5f..3e8e8aea253 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -1641,7 +1641,7 @@
                                                 <div class="custom-control custom-checkbox">
                                                     <input type="checkbox" class="custom-control-input" t-attf-id="country_#{country.id}" t-att-value="country.id"/>
                                                     <label class="custom-control-label" t-attf-for="country_#{country.id}">
-                                                        <span t-field="country.image" t-options='{"widget": "image", "class": "country_flag"}' class="mr-2"/>
+                                                        <span t-field="country.image_url" t-options='{"widget": "image_url", "class": "country_flag"}' class="mr-2"/>
                                                         <span t-esc="country.name"/>
                                                     </label>
                                                 </div>
diff --git a/odoo/addons/base/data/res_country_data.xml b/odoo/addons/base/data/res_country_data.xml
index 2f35c017426..d436eb684d2 100644
--- a/odoo/addons/base/data/res_country_data.xml
+++ b/odoo/addons/base/data/res_country_data.xml
@@ -5,49 +5,42 @@
         <record id="ad" model="res.country">
             <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" />
             <field eval="376" name="phone_code" />
         </record>
         <record id="ae" model="res.country">
             <field name="name">United Arab Emirates</field>
             <field name="code">ae</field>
-            <field file="base/static/img/country_flags/ae.png" name="image" type="base64" />
             <field name="currency_id" ref="AED" />
             <field eval="971" name="phone_code" />
         </record>
         <record id="af" model="res.country">
             <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" />
             <field eval="93" name="phone_code" />
         </record>
         <record id="ag" model="res.country">
             <field name="name">Antigua and Barbuda</field>
             <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="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="1264" name="phone_code" />
         </record>
         <record id="al" model="res.country">
             <field name="name">Albania</field>
             <field name="code">al</field>
-            <field file="base/static/img/country_flags/al.png" name="image" type="base64" />
             <field name="currency_id" ref="ALL" />
             <field eval="355" name="phone_code" />
         </record>
         <record id="am" model="res.country">
             <field name="name">Armenia</field>
             <field name="code">am</field>
-            <field file="base/static/img/country_flags/am.png" name="image" type="base64" />
             <field name="currency_id" ref="AMD" />
             <field eval="374" name="phone_code" />
         </record>
@@ -55,7 +48,6 @@
             <field name="name">Angola</field>
             <field name="code">ao</field>
             <field name='zip_required'>0</field>
-            <field file="base/static/img/country_flags/ao.png" name="image" type="base64" />
             <field name="currency_id" ref="AOA" />
             <field eval="244" name="phone_code" />
         </record>
@@ -69,7 +61,6 @@
             <field name="name">Argentina</field>
             <field name="code">ar</field>
             <field name='state_required'>1</field>
-            <field file="base/static/img/country_flags/ar.png" name="image" type="base64" />
             <field name="currency_id" ref="ARS" />
             <field eval="54" name="phone_code" />
             <field name="vat_label">CUIT</field>
@@ -78,14 +69,12 @@
         <record id="as" model="res.country">
             <field name="name">American Samoa</field>
             <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="1684" name="phone_code" />
         </record>
         <record id="at" model="res.country">
             <field name="name">Austria</field>
             <field name="code">at</field>
-            <field file="base/static/img/country_flags/at.png" name="image" type="base64" />
             <field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="EUR" />
             <field eval="43" name="phone_code" />
@@ -95,7 +84,6 @@
             <field name="name">Australia</field>
             <field name="code">au</field>
             <field name='state_required'>1</field>
-            <field file="base/static/img/country_flags/au.png" name="image" type="base64" />
             <field eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="AUD" />
             <field eval="61" name="phone_code" />
@@ -103,49 +91,42 @@
         <record id="aw" model="res.country">
             <field name="name">Aruba</field>
             <field name="code">aw</field>
-            <field file="base/static/img/country_flags/aw.png" name="image" type="base64" />
             <field name="currency_id" ref="AWG" />
             <field eval="297" name="phone_code" />
         </record>
         <record id="ax" model="res.country">
             <field name="name">Åland Islands</field>
             <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="358" name="phone_code" />
         </record>
         <record id="az" model="res.country">
             <field name="name">Azerbaijan</field>
             <field name="code">az</field>
-            <field file="base/static/img/country_flags/az.png" name="image" type="base64" />
             <field name="currency_id" ref="AZN" />
             <field eval="994" name="phone_code" />
         </record>
         <record id="ba" model="res.country">
             <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" />
             <field eval="387" name="phone_code" />
         </record>
         <record id="bb" model="res.country">
             <field name="name">Barbados</field>
             <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="1246" name="phone_code" />
         </record>
         <record id="bd" model="res.country">
             <field name="name">Bangladesh</field>
             <field name="code">bd</field>
-            <field file="base/static/img/country_flags/bd.png" name="image" type="base64" />
             <field name="currency_id" ref="BDT" />
             <field eval="880" name="phone_code" />
         </record>
         <record id="be" model="res.country">
             <field name="name">Belgium</field>
             <field name="code">be</field>
-            <field file="base/static/img/country_flags/be.png" name="image" type="base64" />
             <field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="EUR" />
             <field eval="32" name="phone_code" />
@@ -154,14 +135,12 @@
         <record id="bf" model="res.country">
             <field name="name">Burkina Faso</field>
             <field name="code">bf</field>
-            <field file="base/static/img/country_flags/bf.png" name="image" type="base64" />
             <field name="currency_id" ref="XOF" />
             <field eval="226" name="phone_code" />
         </record>
         <record id="bg" model="res.country">
             <field name="name">Bulgaria</field>
             <field name="code">bg</field>
-            <field file="base/static/img/country_flags/bg.png" name="image" type="base64" />
             <field name="currency_id" ref="BGN" />
             <field eval="359" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -169,14 +148,12 @@
         <record id="bh" model="res.country">
             <field name="name">Bahrain</field>
             <field name="code">bh</field>
-            <field file="base/static/img/country_flags/bh.png" name="image" type="base64" />
             <field name="currency_id" ref="BHD" />
             <field eval="973" name="phone_code" />
         </record>
         <record id="bi" model="res.country">
             <field name="name">Burundi</field>
             <field name="code">bi</field>
-            <field file="base/static/img/country_flags/bi.png" name="image" type="base64" />
             <field name="currency_id" ref="BIF" />
             <field eval="257" name="phone_code" />
         </record>
@@ -184,35 +161,30 @@
             <field name="name">Benin</field>
             <field name="code">bj</field>
             <field name='zip_required'>0</field>
-            <field file="base/static/img/country_flags/bj.png" name="image" type="base64" />
             <field name="currency_id" ref="XOF" />
             <field eval="229" name="phone_code" />
         </record>
         <record id="bl" model="res.country">
             <field name="name">Saint Barthélémy</field>
             <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="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="1441" name="phone_code" />
         </record>
         <record id="bn" model="res.country">
             <field name="name">Brunei Darussalam</field>
             <field name="code">bn</field>
-            <field file="base/static/img/country_flags/bn.png" name="image" type="base64" />
             <field name="currency_id" ref="BND" />
             <field eval="673" name="phone_code" />
         </record>
         <record id="bo" model="res.country">
             <field name="name">Bolivia</field>
             <field name="code">bo</field>
-            <field file="base/static/img/country_flags/bo.png" name="image" type="base64" />
             <field name="currency_id" ref="BOB" />
             <field eval="591" name="phone_code" />
         </record>
@@ -225,7 +197,6 @@
         <record id="br" model="res.country">
             <field name="name">Brazil</field>
             <field name="code">br</field>
-            <field file="base/static/img/country_flags/br.png" name="image" type="base64" />
             <field eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s\n%(zip)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="BRL" />
             <field eval="55" name="phone_code" />
@@ -233,14 +204,12 @@
         <record id="bs" model="res.country">
             <field name="name">Bahamas</field>
             <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="1242" name="phone_code" />
         </record>
         <record id="bt" model="res.country">
             <field name="name">Bhutan</field>
             <field name="code">bt</field>
-            <field file="base/static/img/country_flags/bt.png" name="image" type="base64" />
             <field name="currency_id" ref="BTN" />
             <field eval="975" name="phone_code" />
         </record>
@@ -253,14 +222,12 @@
         <record id="bw" model="res.country">
             <field name="name">Botswana</field>
             <field name="code">bw</field>
-            <field file="base/static/img/country_flags/bw.png" name="image" type="base64" />
             <field name="currency_id" ref="BWP" />
             <field eval="267" name="phone_code" />
         </record>
         <record id="by" model="res.country">
             <field name="name">Belarus</field>
             <field name="code">by</field>
-            <field file="base/static/img/country_flags/by.png" name="image" type="base64" />
             <field name="currency_id" ref="BYN" />
             <field eval="375" name="phone_code" />
         </record>
@@ -268,7 +235,6 @@
             <field name="name">Belize</field>
             <field name="code">bz</field>
             <field name='zip_required'>0</field>
-            <field file="base/static/img/country_flags/bz.png" name="image" type="base64" />
             <field name="currency_id" ref="BZD" />
             <field eval="501" name="phone_code" />
         </record>
@@ -276,7 +242,6 @@
             <field name="name">Canada</field>
             <field name="code">ca</field>
             <field name='state_required'>1</field>
-            <field file="base/static/img/country_flags/ca.png" name="image" type="base64" />
             <field eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="CAD" />
             <field eval="1" name="phone_code" />
@@ -285,35 +250,30 @@
         <record id="cc" model="res.country">
             <field name="name">Cocos (Keeling) Islands</field>
             <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="61" name="phone_code" />
         </record>
         <record id="cf" model="res.country">
             <field name="name">Central African Republic</field>
             <field name="code">cf</field>
-            <field file="base/static/img/country_flags/cf.png" name="image" type="base64" />
             <field name="currency_id" ref="XAF" />
             <field eval="236" name="phone_code" />
         </record>
         <record id="cd" model="res.country">
             <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" />
             <field eval="242" name="phone_code" />
         </record>
         <record id="cg" model="res.country">
             <field name="name">Congo</field>
             <field name="code">cg</field>
-            <field file="base/static/img/country_flags/cg.png" name="image" type="base64" />
             <field name="currency_id" ref="XAF" />
             <field eval="243" name="phone_code" />
         </record>
         <record id="ch" model="res.country">
             <field name="name">Switzerland</field>
             <field name="code">ch</field>
-            <field file="base/static/img/country_flags/ch.png" name="image" type="base64" />
             <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
             <field name="currency_id" ref="CHF" />
             <field eval="41" name="phone_code" />
@@ -321,35 +281,30 @@
         <record id="ci" model="res.country">
             <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" />
             <field eval="225" name="phone_code" />
         </record>
         <record id="ck" model="res.country">
             <field name="name">Cook Islands</field>
             <field name="code">ck</field>
-            <field file="base/static/img/country_flags/ck.png" name="image" type="base64" />
             <field name="currency_id" ref="NZD" />
             <field eval="682" name="phone_code" />
         </record>
         <record id="cl" model="res.country">
             <field name="name">Chile</field>
             <field name="code">cl</field>
-            <field file="base/static/img/country_flags/cl.png" name="image" type="base64" />
             <field name="currency_id" ref="CLP" />
             <field eval="56" name="phone_code" />
         </record>
         <record id="cm" model="res.country">
             <field name="name">Cameroon</field>
             <field name="code">cm</field>
-            <field file="base/static/img/country_flags/cm.png" name="image" type="base64" />
             <field name="currency_id" ref="XAF" />
             <field eval="237" name="phone_code" />
         </record>
         <record id="cn" model="res.country">
             <field name="name">China</field>
             <field name="code">cn</field>
-            <field file="base/static/img/country_flags/cn.png" name="image" type="base64" />
             <field eval="'%(country_name)s, %(zip)s\n%(state_name)s %(city)s %(street)s %(street2)s'" name="address_format" />
             <field name="currency_id" ref="CNY" />
             <field eval="86" name="phone_code" />
@@ -358,7 +313,6 @@
             <field name="name">Colombia</field>
             <field name="code">co</field>
             <field name="vat_label">NIT</field>
-            <field file="base/static/img/country_flags/co.png" name="image" type="base64" />
             <field name="currency_id" ref="COP" />
             <field eval="57" name="phone_code" />
             <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_name)s %(zip)s\n%(country_name)s'" />
@@ -366,42 +320,36 @@
         <record id="cr" model="res.country">
             <field name="name">Costa Rica</field>
             <field name="code">cr</field>
-            <field file="base/static/img/country_flags/cr.png" name="image" type="base64" />
             <field name="currency_id" ref="CRC" />
             <field eval="506" name="phone_code" />
         </record>
         <record id="cu" model="res.country">
             <field name="name">Cuba</field>
             <field name="code">cu</field>
-            <field file="base/static/img/country_flags/cu.png" name="image" type="base64" />
             <field name="currency_id" ref="CUP" />
             <field eval="53" name="phone_code" />
         </record>
         <record id="cv" model="res.country">
             <field name="name">Cape Verde</field>
             <field name="code">cv</field>
-            <field file="base/static/img/country_flags/cv.png" name="image" type="base64" />
             <field name="currency_id" ref="CVE" />
             <field eval="238" name="phone_code" />
         </record>
         <record id="cw" model="res.country">
             <field name="name">Curaçao</field>
             <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="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="61" name="phone_code" />
         </record>
         <record id="cy" model="res.country">
             <field name="name">Cyprus</field>
             <field name="code">cy</field>
-            <field file="base/static/img/country_flags/cy.png" name="image" type="base64" />
             <field name="currency_id" ref="CYP" />
             <field eval="357" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -409,7 +357,6 @@
         <record id="cz" model="res.country">
             <field name="name">Czech Republic</field>
             <field name="code">cz</field>
-            <field file="base/static/img/country_flags/cz.png" name="image" type="base64" />
             <field name="currency_id" ref="CZK" />
             <field eval="420" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -417,7 +364,6 @@
         <record id="de" model="res.country">
             <field name="name">Germany</field>
             <field name="code">de</field>
-            <field file="base/static/img/country_flags/de.png" name="image" type="base64" />
             <field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="EUR" />
             <field eval="49" name="phone_code" />
@@ -426,14 +372,12 @@
         <record id="dj" model="res.country">
             <field name="name">Djibouti</field>
             <field name="code">dj</field>
-            <field file="base/static/img/country_flags/dj.png" name="image" type="base64" />
             <field name="currency_id" ref="DJF" />
             <field eval="253" name="phone_code" />
         </record>
         <record id="dk" model="res.country">
             <field name="name">Denmark</field>
             <field name="code">dk</field>
-            <field file="base/static/img/country_flags/dk.png" name="image" type="base64" />
             <field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="DKK" />
             <field eval="45" name="phone_code" />
@@ -442,14 +386,12 @@
         <record id="dm" model="res.country">
             <field name="name">Dominica</field>
             <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="1767" name="phone_code" />
         </record>
         <record id="do" model="res.country">
             <field name="name">Dominican Republic</field>
             <field name="code">do</field>
-            <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="1849" name="phone_code" />
@@ -458,21 +400,18 @@
         <record id="dz" model="res.country">
             <field name="name">Algeria</field>
             <field name="code">dz</field>
-            <field file="base/static/img/country_flags/dz.png" name="image" type="base64" />
             <field name="currency_id" ref="DZD" />
             <field eval="213" name="phone_code" />
         </record>
         <record id="ec" model="res.country">
             <field name="name">Ecuador</field>
             <field name="code">ec</field>
-            <field file="base/static/img/country_flags/ec.png" name="image" type="base64" />
             <field name="currency_id" ref="USD" />
             <field eval="593" name="phone_code" />
         </record>
         <record id="ee" model="res.country">
             <field name="name">Estonia</field>
             <field name="code">ee</field>
-            <field file="base/static/img/country_flags/ee.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="372" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -480,7 +419,6 @@
         <record id="eg" model="res.country">
             <field name="name">Egypt</field>
             <field name="code">eg</field>
-            <field file="base/static/img/country_flags/eg.png" name="image" type="base64" />
             <field name="currency_id" ref="EGP" />
             <field eval="20" name="phone_code" />
         </record>
@@ -493,14 +431,12 @@
         <record id="er" model="res.country">
             <field name="name">Eritrea</field>
             <field name="code">er</field>
-            <field file="base/static/img/country_flags/er.png" name="image" type="base64" />
             <field name="currency_id" ref="ERN" />
             <field eval="291" name="phone_code" />
         </record>
         <record id="es" model="res.country">
             <field name="name">Spain</field>
             <field name="code">es</field>
-            <field file="base/static/img/country_flags/es.png" name="image" type="base64" />
             <field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="EUR" />
             <field eval="34" name="phone_code" />
@@ -509,14 +445,12 @@
         <record id="et" model="res.country">
             <field name="name">Ethiopia</field>
             <field name="code">et</field>
-            <field file="base/static/img/country_flags/et.png" name="image" type="base64" />
             <field name="currency_id" ref="ETB" />
             <field eval="251" name="phone_code" />
         </record>
         <record id="fi" model="res.country">
             <field name="name">Finland</field>
             <field name="code">fi</field>
-            <field file="base/static/img/country_flags/fi.png" name="image" type="base64" />
             <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
             <field name="currency_id" ref="EUR" />
             <field eval="358" name="phone_code" />
@@ -525,35 +459,30 @@
         <record id="fj" model="res.country">
             <field name="name">Fiji</field>
             <field name="code">fj</field>
-            <field file="base/static/img/country_flags/fj.png" name="image" type="base64" />
             <field name="currency_id" ref="FJD" />
             <field eval="679" name="phone_code" />
         </record>
         <record id="fk" model="res.country">
             <field name="name">Falkland Islands</field>
             <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="500" name="phone_code" />
         </record>
         <record id="fm" model="res.country">
             <field name="name">Micronesia</field>
             <field name="code">fm</field>
-            <field file="base/static/img/country_flags/fm.png" name="image" type="base64" />
             <field name="currency_id" ref="USD" />
             <field eval="691" name="phone_code" />
         </record>
         <record id="fo" model="res.country">
             <field name="name">Faroe Islands</field>
             <field name="code">fo</field>
-            <field file="base/static/img/country_flags/fo.png" name="image" type="base64" />
             <field name="currency_id" ref="DKK" />
             <field eval="298" name="phone_code" />
         </record>
         <record id="fr" model="res.country">
             <field name="name">France</field>
             <field name="code">fr</field>
-            <field file="base/static/img/country_flags/fr.png" name="image" type="base64" />
             <field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="EUR" />
             <field eval="33" name="phone_code" />
@@ -562,21 +491,18 @@
         <record id="ga" model="res.country">
             <field name="name">Gabon</field>
             <field name="code">ga</field>
-            <field file="base/static/img/country_flags/ga.png" name="image" type="base64" />
             <field name="currency_id" ref="XAF" />
             <field eval="241" name="phone_code" />
         </record>
         <record id="gd" model="res.country">
             <field name="name">Grenada</field>
             <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="1473" name="phone_code" />
         </record>
         <record id="ge" model="res.country">
             <field name="name">Georgia</field>
             <field name="code">ge</field>
-            <field file="base/static/img/country_flags/ge.png" name="image" type="base64" />
             <field name="currency_id" ref="GEL" />
             <field eval="995" name="phone_code" />
         </record>
@@ -589,42 +515,36 @@
         <record id="gh" model="res.country">
             <field name="name">Ghana</field>
             <field name="code">gh</field>
-            <field file="base/static/img/country_flags/gh.png" name="image" type="base64" />
             <field name="currency_id" ref="GHS" />
             <field eval="233" name="phone_code" />
         </record>
         <record id="gi" model="res.country">
             <field name="name">Gibraltar</field>
             <field name="code">gi</field>
-            <field file="base/static/img/country_flags/gi.png" name="image" type="base64" />
             <field name="currency_id" ref="GIP" />
             <field eval="350" name="phone_code" />
         </record>
         <record id="gg" model="res.country">
             <field name="name">Guernsey</field>
             <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="44" name="phone_code" />
         </record>
         <record id="gl" model="res.country">
             <field name="name">Greenland</field>
             <field name="code">gl</field>
-            <field file="base/static/img/country_flags/gl.png" name="image" type="base64" />
             <field name="currency_id" ref="DKK" />
             <field eval="299" name="phone_code" />
         </record>
         <record id="gm" model="res.country">
             <field name="name">Gambia</field>
             <field name="code">gm</field>
-            <field file="base/static/img/country_flags/gm.png" name="image" type="base64" />
             <field name="currency_id" ref="GMD" />
             <field eval="220" name="phone_code" />
         </record>
         <record id="gn" model="res.country">
             <field name="name">Guinea</field>
             <field name="code">gn</field>
-            <field file="base/static/img/country_flags/gn.png" name="image" type="base64" />
             <field name="currency_id" ref="GNF" />
             <field eval="224" name="phone_code" />
         </record>
@@ -637,14 +557,12 @@
         <record id="gq" model="res.country">
             <field name="name">Equatorial Guinea</field>
             <field name="code">gq</field>
-            <field file="base/static/img/country_flags/gq.png" name="image" type="base64" />
             <field name="currency_id" ref="XAF" />
             <field eval="240" name="phone_code" />
         </record>
         <record id="gr" model="res.country">
             <field name="name">Greece</field>
             <field name="code">gr</field>
-            <field file="base/static/img/country_flags/gr.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="30" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -652,14 +570,12 @@
         <record id="gs" model="res.country">
             <field name="name">South Georgia and the South Sandwich Islands</field>
             <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="500" name="phone_code" />
         </record>
         <record id="gt" model="res.country">
             <field name="name">Guatemala</field>
             <field name="code">gt</field>
-            <field file="base/static/img/country_flags/gt.png" name="image" type="base64" />
             <field name="currency_id" ref="GTQ" />
             <field eval="502" name="phone_code" />
             <field name="vat_label">NIT</field>
@@ -667,21 +583,18 @@
         <record id="gu" model="res.country">
             <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="1671" name="phone_code" />
         </record>
         <record id="gw" model="res.country">
             <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" />
             <field eval="245" name="phone_code" />
         </record>
         <record id="gy" model="res.country">
             <field name="name">Guyana</field>
             <field name="code">gy</field>
-            <field file="base/static/img/country_flags/gy.png" name="image" type="base64" />
             <field name="currency_id" ref="GYD" />
             <field eval="592" name="phone_code" />
         </record>
@@ -689,7 +602,6 @@
             <field name="name">Hong Kong</field>
             <field name="code">hk</field>
             <field name='zip_required'>0</field>
-            <field file="base/static/img/country_flags/hk.png" name="image" type="base64" />
             <field name="currency_id" ref="HKD" />
             <field eval="852" name="phone_code" />
         </record>
@@ -702,14 +614,12 @@
         <record id="hn" model="res.country">
             <field name="name">Honduras</field>
             <field name="code">hn</field>
-            <field file="base/static/img/country_flags/hn.png" name="image" type="base64" />
             <field name="currency_id" ref="HNL" />
             <field eval="504" name="phone_code" />
         </record>
         <record id="hr" model="res.country">
             <field name="name">Croatia</field>
             <field name="code">hr</field>
-            <field file="base/static/img/country_flags/hr.png" name="image" type="base64" />
             <field name="currency_id" ref="HRK" />
             <field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s \n%(country_name)s'" name="address_format" />
             <field eval="385" name="phone_code" />
@@ -718,14 +628,12 @@
         <record id="ht" model="res.country">
             <field name="name">Haiti</field>
             <field name="code">ht</field>
-            <field file="base/static/img/country_flags/ht.png" name="image" type="base64" />
             <field name="currency_id" ref="HTG" />
             <field eval="509" name="phone_code" />
         </record>
         <record id="hu" model="res.country">
             <field name="name">Hungary</field>
             <field name="code">hu</field>
-            <field file="base/static/img/country_flags/hu.png" name="image" type="base64" />
             <field name="currency_id" ref="HUF" />
             <field eval="36" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -734,7 +642,6 @@
             <field name="name">Indonesia</field>
             <field name="code">id</field>
             <field name='state_required'>1</field>
-            <field file="base/static/img/country_flags/id.png" name="image" type="base64" />
             <field name="currency_id" ref="IDR" />
             <field eval="62" name="phone_code" />
             <field name="vat_label">NPWP</field>
@@ -743,7 +650,6 @@
             <field name="name">Ireland</field>
             <field name="code">ie</field>
             <field name='zip_required'>0</field>
-            <field file="base/static/img/country_flags/ie.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="353" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -751,14 +657,12 @@
         <record id="il" model="res.country">
             <field name="name">Israel</field>
             <field name="code">il</field>
-            <field file="base/static/img/country_flags/il.png" name="image" type="base64" />
             <field name="currency_id" ref="ILS" />
             <field eval="972" name="phone_code" />
         </record>
         <record id="im" model="res.country">
             <field name="name">Isle of Man</field>
             <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="44" name="phone_code" />
         </record>
@@ -766,7 +670,6 @@
             <field name="name">India</field>
             <field name="code">in</field>
             <field name='state_required'>1</field>
-            <field file="base/static/img/country_flags/in.png" name="image" type="base64" />
             <field eval="'%(street)s\n%(street2)s\n%(city)s %(zip)s\n%(state_name)s %(state_code)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="INR" />
             <field eval="91" name="phone_code" />
@@ -775,28 +678,24 @@
         <record id="io" model="res.country">
             <field name="name">British Indian Ocean Territory</field>
             <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="246" name="phone_code" />
         </record>
         <record id="iq" model="res.country">
             <field name="name">Iraq</field>
             <field name="code">iq</field>
-            <field file="base/static/img/country_flags/iq.png" name="image" type="base64" />
             <field name="currency_id" ref="IQD" />
             <field eval="964" name="phone_code" />
         </record>
         <record id="ir" model="res.country">
             <field name="name">Iran</field>
             <field name="code">ir</field>
-            <field file="base/static/img/country_flags/ir.png" name="image" type="base64" />
             <field name="currency_id" ref="IRR" />
             <field eval="98" name="phone_code" />
         </record>
         <record id="is" model="res.country">
             <field name="name">Iceland</field>
             <field name="code">is</field>
-            <field file="base/static/img/country_flags/is.png" name="image" type="base64" />
             <field name="currency_id" ref="ISK" />
             <field eval="354" name="phone_code" />
         </record>
@@ -804,7 +703,6 @@
             <field name="name">Italy</field>
             <field name="code">it</field>
             <field name='state_required'>1</field>
-            <field file="base/static/img/country_flags/it.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="39" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -812,21 +710,18 @@
         <record id="je" model="res.country">
             <field name="name">Jersey</field>
             <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="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="1876" name="phone_code" />
         </record>
         <record id="jo" model="res.country">
             <field name="name">Jordan</field>
             <field name="code">jo</field>
-            <field file="base/static/img/country_flags/jo.png" name="image" type="base64" />
             <field name="currency_id" ref="JOD" />
             <field eval="962" name="phone_code" />
         </record>
@@ -834,7 +729,6 @@
             <field name="name">Japan</field>
             <field name="code">jp</field>
             <field name='state_required'>1</field>
-            <field file="base/static/img/country_flags/jp.png" name="image" type="base64" />
             <field name="currency_id" ref="JPY" />
             <field name="address_format" eval="'%(zip)s\n%(state_name)s %(city)s\n%(street)s\n%(street2)s\n%(country_name)s'"/>
             <field name="name_position">after</field>
@@ -843,105 +737,90 @@
         <record id="ke" model="res.country">
             <field name="name">Kenya</field>
             <field name="code">ke</field>
-            <field file="base/static/img/country_flags/ke.png" name="image" type="base64" />
             <field name="currency_id" ref="KES" />
             <field eval="254" name="phone_code" />
         </record>
         <record id="kg" model="res.country">
             <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</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" />
             <field eval="855" name="phone_code" />
         </record>
         <record id="ki" model="res.country">
             <field name="name">Kiribati</field>
             <field name="code">ki</field>
-            <field file="base/static/img/country_flags/ki.png" name="image" type="base64" />
             <field name="currency_id" ref="AUD" />
             <field eval="686" name="phone_code" />
         </record>
         <record id="km" model="res.country">
             <field name="name">Comoros</field>
             <field name="code">km</field>
-            <field file="base/static/img/country_flags/km.png" name="image" type="base64" />
             <field name="currency_id" ref="KMF" />
             <field eval="269" name="phone_code" />
         </record>
         <record id="kn" model="res.country">
             <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" />
             <field eval="1869" name="phone_code" />
         </record>
         <record id="kp" model="res.country">
             <field name="name">North Korea</field>
             <field name="code">kp</field>
-            <field file="base/static/img/country_flags/kp.png" name="image" type="base64" />
             <field name="currency_id" ref="KPW" />
             <field eval="850" name="phone_code" />
         </record>
         <record id="kr" model="res.country">
             <field name="name">South Korea</field>
             <field name="code">kr</field>
-            <field file="base/static/img/country_flags/kr.png" name="image" type="base64" />
             <field name="currency_id" ref="KRW" />
             <field eval="82" name="phone_code" />
         </record>
         <record id="kw" model="res.country">
             <field name="name">Kuwait</field>
             <field name="code">kw</field>
-            <field file="base/static/img/country_flags/kw.png" name="image" type="base64" />
             <field name="currency_id" ref="KWD" />
             <field eval="965" name="phone_code" />
         </record>
         <record id="ky" model="res.country">
             <field name="name">Cayman Islands</field>
             <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="1345" name="phone_code" />
         </record>
         <record id="kz" model="res.country">
             <field name="name">Kazakhstan</field>
             <field name="code">kz</field>
-            <field file="base/static/img/country_flags/kz.png" name="image" type="base64" />
             <field name="currency_id" ref="KZT" />
             <field eval="7" name="phone_code" />
         </record>
         <record id="la" model="res.country">
             <field name="name">Laos</field>
             <field name="code">la</field>
-            <field file="base/static/img/country_flags/la.png" name="image" type="base64" />
             <field name="currency_id" ref="LAK" />
             <field eval="856" name="phone_code" />
         </record>
         <record id="lb" model="res.country">
             <field name="name">Lebanon</field>
             <field name="code">lb</field>
-            <field file="base/static/img/country_flags/lb.png" name="image" type="base64" />
             <field name="currency_id" ref="LBP" />
             <field eval="961" name="phone_code" />
         </record>
         <record id="lc" model="res.country">
             <field name="name">Saint Lucia</field>
             <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="1758" name="phone_code" />
         </record>
         <record id="li" model="res.country">
             <field name="name">Liechtenstein</field>
             <field name="code">li</field>
-            <field file="base/static/img/country_flags/li.png" name="image" type="base64" />
             <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
             <field name="currency_id" ref="CHF" />
             <field eval="423" name="phone_code" />
@@ -949,28 +828,24 @@
         <record id="lk" model="res.country">
             <field name="name">Sri Lanka</field>
             <field name="code">lk</field>
-            <field file="base/static/img/country_flags/lk.png" name="image" type="base64" />
             <field name="currency_id" ref="LKR" />
             <field eval="94" name="phone_code" />
         </record>
         <record id="lr" model="res.country">
             <field name="name">Liberia</field>
             <field name="code">lr</field>
-            <field file="base/static/img/country_flags/lr.png" name="image" type="base64" />
             <field name="currency_id" ref="LRD" />
             <field eval="231" name="phone_code" />
         </record>
         <record id="ls" model="res.country">
             <field name="name">Lesotho</field>
             <field name="code">ls</field>
-            <field file="base/static/img/country_flags/ls.png" name="image" type="base64" />
             <field name="currency_id" ref="LSL" />
             <field eval="266" name="phone_code" />
         </record>
         <record id="lt" model="res.country">
             <field name="name">Lithuania</field>
             <field name="code">lt</field>
-            <field file="base/static/img/country_flags/lt.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR"/>
             <field eval="370" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -978,7 +853,6 @@
         <record id="lu" model="res.country">
             <field name="name">Luxembourg</field>
             <field name="code">lu</field>
-            <field file="base/static/img/country_flags/lu.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="352" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -986,7 +860,6 @@
         <record id="lv" model="res.country">
             <field name="name">Latvia</field>
             <field name="code">lv</field>
-            <field file="base/static/img/country_flags/lv.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR"/>
             <field eval="371" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -994,14 +867,12 @@
         <record id="ly" model="res.country">
             <field name="name">Libya</field>
             <field name="code">ly</field>
-            <field file="base/static/img/country_flags/ly.png" name="image" type="base64" />
             <field name="currency_id" ref="LYD" />
             <field eval="218" name="phone_code" />
         </record>
         <record id="ma" model="res.country">
             <field name="name">Morocco</field>
             <field name="code">ma</field>
-            <field file="base/static/img/country_flags/ma.png" name="image" type="base64" />
             <field name="currency_id" ref="MAD" />
             <field eval="212" name="phone_code" />
         </record>
@@ -1009,20 +880,17 @@
             <field name="name">Monaco</field>
             <field name="currency_id" ref="EUR" />
             <field name="code">mc</field>
-            <field file="base/static/img/country_flags/mc.png" name="image" type="base64" />
             <field eval="377" name="phone_code" />
         </record>
         <record id="md" model="res.country">
             <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" />
             <field eval="373" name="phone_code" />
         </record>
         <record id="me" model="res.country">
             <field name="name">Montenegro</field>
             <field name="code">me</field>
-            <field file="base/static/img/country_flags/me.png" name="image" type="base64" />
             <field name="currency_id" ref="LYD" />
             <field eval="382" name="phone_code" />
         </record>
@@ -1035,42 +903,36 @@
         <record id="mg" model="res.country">
             <field name="name">Madagascar</field>
             <field name="code">mg</field>
-            <field file="base/static/img/country_flags/mg.png" name="image" type="base64" />
             <field name="currency_id" ref="MGA" />
             <field eval="261" name="phone_code" />
         </record>
         <record id="mh" model="res.country">
             <field name="name">Marshall Islands</field>
             <field name="code">mh</field>
-            <field file="base/static/img/country_flags/mh.png" name="image" type="base64" />
             <field name="currency_id" ref="USD" />
             <field eval="692" name="phone_code" />
         </record>
         <record id="mk" model="res.country">
             <field name="name">North Macedonia</field>
             <field name="code">mk</field>
-            <field file="base/static/img/country_flags/mk.png" name="image" type="base64" />
             <field name="currency_id" ref="MKD" />
             <field eval="389" name="phone_code" />
         </record>
         <record id="ml" model="res.country">
             <field name="name">Mali</field>
             <field name="code">ml</field>
-            <field file="base/static/img/country_flags/ml.png" name="image" type="base64" />
             <field name="currency_id" ref="XOF" />
             <field eval="223" name="phone_code" />
         </record>
         <record id="mm" model="res.country">
             <field name="name">Myanmar</field>
             <field name="code">mm</field>
-            <field file="base/static/img/country_flags/mm.png" name="image" type="base64" />
             <field name="currency_id" ref="MMK" />
             <field eval="95" name="phone_code" />
         </record>
         <record id="mn" model="res.country">
             <field name="name">Mongolia</field>
             <field name="code">mn</field>
-            <field file="base/static/img/country_flags/mn.png" name="image" type="base64" />
             <field name="currency_id" ref="MNT" />
             <field eval="976" name="phone_code" />
         </record>
@@ -1078,42 +940,36 @@
             <field name="name">Macau</field>
             <field name="code">mo</field>
             <field name='zip_required'>0</field>
-            <field file="base/static/img/country_flags/mo.png" name="image" type="base64" />
             <field name="currency_id" ref="MOP" />
             <field eval="853" name="phone_code" />
         </record>
         <record id="mp" model="res.country">
             <field name="name">Northern Mariana Islands</field>
             <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="1670" name="phone_code" />
         </record>
         <record id="mq" model="res.country">
             <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" />
             <field eval="596" name="phone_code" />
         </record>
         <record id="mr" model="res.country">
             <field name="name">Mauritania</field>
             <field name="code">mr</field>
-            <field file="base/static/img/country_flags/mr.png" name="image" type="base64" />
             <field name="currency_id" ref="MRU" />
             <field eval="222" name="phone_code" />
         </record>
         <record id="ms" model="res.country">
             <field name="name">Montserrat</field>
             <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="1664" name="phone_code" />
         </record>
         <record id="mt" model="res.country">
             <field name="name">Malta</field>
             <field name="code">mt</field>
-            <field file="base/static/img/country_flags/mt.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="356" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -1121,7 +977,6 @@
         <record id="mu" model="res.country">
             <field name="name">Mauritius</field>
             <field name="code">mu</field>
-            <field file="base/static/img/country_flags/mu.png" name="image" type="base64" />
             <field name="currency_id" ref="MUR" />
             <field eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" name="address_format" />
             <field eval="230" name="phone_code" />
@@ -1129,14 +984,12 @@
         <record id="mv" model="res.country">
             <field name="name">Maldives</field>
             <field name="code">mv</field>
-            <field file="base/static/img/country_flags/mv.png" name="image" type="base64" />
             <field name="currency_id" ref="MVR" />
             <field eval="960" name="phone_code" />
         </record>
         <record id="mw" model="res.country">
             <field name="name">Malawi</field>
             <field name="code">mw</field>
-            <field file="base/static/img/country_flags/mw.png" name="image" type="base64" />
             <field name="currency_id" ref="MWK" />
             <field eval="265" name="phone_code" />
         </record>
@@ -1144,7 +997,6 @@
             <field name="name">Mexico</field>
             <field name="code">mx</field>
             <field name='state_required'>1</field>
-            <field file="base/static/img/country_flags/mx.png" name="image" type="base64" />
             <field name="currency_id" ref="MXN" />
             <field eval="52" name="phone_code" />
             <field name="vat_label">RFC</field>
@@ -1153,63 +1005,54 @@
         <record id="my" model="res.country">
             <field name="name">Malaysia</field>
             <field name="code">my</field>
-            <field file="base/static/img/country_flags/my.png" name="image" type="base64" />
             <field name="currency_id" ref="MYR" />
             <field eval="60" name="phone_code" />
         </record>
         <record id="mz" model="res.country">
             <field name="name">Mozambique</field>
             <field name="code">mz</field>
-            <field file="base/static/img/country_flags/mz.png" name="image" type="base64" />
             <field name="currency_id" ref="MZN" />
             <field eval="258" name="phone_code" />
         </record>
         <record id="na" model="res.country">
             <field name="name">Namibia</field>
             <field name="code">na</field>
-            <field file="base/static/img/country_flags/na.png" name="image" type="base64" />
             <field name="currency_id" ref="NAD" />
             <field eval="264" name="phone_code" />
         </record>
         <record id="nc" model="res.country">
             <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" />
             <field eval="687" name="phone_code" />
         </record>
         <record id="ne" model="res.country">
             <field name="name">Niger</field>
             <field name="code">ne</field>
-            <field file="base/static/img/country_flags/ne.png" name="image" type="base64" />
             <field name="currency_id" ref="XOF" />
             <field eval="227" name="phone_code" />
         </record>
         <record id="nf" model="res.country">
             <field name="name">Norfolk Island</field>
             <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="672" name="phone_code" />
         </record>
         <record id="ng" model="res.country">
             <field name="name">Nigeria</field>
             <field name="code">ng</field>
-            <field file="base/static/img/country_flags/ng.png" name="image" type="base64" />
             <field name="currency_id" ref="NGN" />
             <field eval="234" name="phone_code" />
         </record>
         <record id="ni" model="res.country">
             <field name="name">Nicaragua</field>
             <field name="code">ni</field>
-            <field file="base/static/img/country_flags/ni.png" name="image" type="base64" />
             <field name="currency_id" ref="NIO" />
             <field eval="505" name="phone_code" />
         </record>
         <record id="nl" model="res.country">
             <field name="name">Netherlands</field>
             <field name="code">nl</field>
-            <field file="base/static/img/country_flags/nl.png" name="image" type="base64" />
             <field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="EUR" />
             <field eval="31" name="phone_code" />
@@ -1218,7 +1061,6 @@
         <record id="no" model="res.country">
             <field name="name">Norway</field>
             <field name="code">no</field>
-            <field file="base/static/img/country_flags/no.png" name="image" type="base64" />
             <field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="NOK" />
             <field eval="47" name="phone_code" />
@@ -1226,42 +1068,36 @@
         <record id="np" model="res.country">
             <field name="name">Nepal</field>
             <field name="code">np</field>
-            <field file="base/static/img/country_flags/np.png" name="image" type="base64" />
             <field name="currency_id" ref="NPR" />
             <field eval="977" name="phone_code" />
         </record>
         <record id="nr" model="res.country">
             <field name="name">Nauru</field>
             <field name="code">nr</field>
-            <field file="base/static/img/country_flags/nr.png" name="image" type="base64" />
             <field name="currency_id" ref="AUD" />
             <field eval="674" name="phone_code" />
         </record>
         <record id="nu" model="res.country">
             <field name="name">Niue</field>
             <field name="code">nu</field>
-            <field file="base/static/img/country_flags/nu.png" name="image" type="base64" />
             <field name="currency_id" ref="NZD" />
             <field eval="683" name="phone_code" />
         </record>
         <record id="nz" model="res.country">
             <field name="name">New Zealand</field>
             <field name="code">nz</field>
-            <field file="base/static/img/country_flags/nz.png" name="image" type="base64" />
             <field name="currency_id" ref="NZD" />
             <field eval="64" name="phone_code" />
         </record>
         <record id="om" model="res.country">
             <field name="name">Oman</field>
             <field name="code">om</field>
-            <field file="base/static/img/country_flags/om.png" name="image" type="base64" />
             <field name="currency_id" ref="OMR" />
             <field eval="968" name="phone_code" />
         </record>
         <record id="pa" model="res.country">
             <field name="name">Panama</field>
             <field name="code">pa</field>
-            <field file="base/static/img/country_flags/pa.png" name="image" type="base64" />
             <field name="currency_id" ref="PAB" />
             <field eval="507" name="phone_code" />
             <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_name)s %(zip)s\n%(country_name)s'" />
@@ -1269,42 +1105,36 @@
         <record id="pe" model="res.country">
             <field name="name">Peru</field>
             <field name="code">pe</field>
-            <field file="base/static/img/country_flags/pe.png" name="image" type="base64" />
             <field name="currency_id" ref="PEN" />
             <field eval="51" name="phone_code" />
         </record>
         <record id="pf" model="res.country">
             <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" />
             <field eval="689" name="phone_code" />
         </record>
         <record id="pg" model="res.country">
             <field name="name">Papua New Guinea</field>
             <field name="code">pg</field>
-            <field file="base/static/img/country_flags/pg.png" name="image" type="base64" />
             <field name="currency_id" ref="PGK" />
             <field eval="675" name="phone_code" />
         </record>
         <record id="ph" model="res.country">
             <field name="name">Philippines</field>
             <field name="code">ph</field>
-            <field file="base/static/img/country_flags/ph.png" name="image" type="base64" />
             <field name="currency_id" ref="PHP" />
             <field eval="63" name="phone_code" />
         </record>
         <record id="pk" model="res.country">
             <field name="name">Pakistan</field>
             <field name="code">pk</field>
-            <field file="base/static/img/country_flags/pk.png" name="image" type="base64" />
             <field name="currency_id" ref="PKR" />
             <field eval="92" name="phone_code" />
         </record>
         <record id="pl" model="res.country">
             <field name="name">Poland</field>
             <field name="code">pl</field>
-            <field file="base/static/img/country_flags/pl.png" name="image" type="base64" />
             <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
             <field name="currency_id" ref="PLN" />
             <field eval="48" name="phone_code" />
@@ -1313,21 +1143,18 @@
         <record id="pm" model="res.country">
             <field name="name">Saint Pierre and Miquelon</field>
             <field name="code">pm</field>
-            <field file="base/static/img/country_flags/pm.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="508" name="phone_code" />
         </record>
         <record id="pn" model="res.country">
             <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" />
             <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="1939" name="phone_code" />
         </record>
@@ -1340,7 +1167,6 @@
         <record id="pt" model="res.country">
             <field name="name">Portugal</field>
             <field name="code">pt</field>
-            <field file="base/static/img/country_flags/pt.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="351" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -1348,21 +1174,18 @@
         <record id="pw" model="res.country">
             <field name="name">Palau</field>
             <field name="code">pw</field>
-            <field file="base/static/img/country_flags/pw.png" name="image" type="base64" />
             <field name="currency_id" ref="USD" />
             <field eval="680" name="phone_code" />
         </record>
         <record id="py" model="res.country">
             <field name="name">Paraguay</field>
             <field name="code">py</field>
-            <field file="base/static/img/country_flags/py.png" name="image" type="base64" />
             <field name="currency_id" ref="PYG" />
             <field eval="595" name="phone_code" />
         </record>
         <record id="qa" model="res.country">
             <field name="name">Qatar</field>
             <field name="code">qa</field>
-            <field file="base/static/img/country_flags/qa.png" name="image" type="base64" />
             <field name="currency_id" ref="QAR" />
             <field eval="974" name="phone_code" />
         </record>
@@ -1375,7 +1198,6 @@
         <record id="ro" model="res.country">
             <field name="name">Romania</field>
             <field name="code">ro</field>
-            <field file="base/static/img/country_flags/ro.png" name="image" type="base64" />
             <field name="currency_id" ref="RON" />
             <field eval="40" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -1383,56 +1205,48 @@
         <record id="rs" model="res.country">
             <field name="name">Serbia</field>
             <field name="code">rs</field>
-            <field file="base/static/img/country_flags/rs.png" name="image" type="base64" />
             <field name="currency_id" ref="RSD" />
             <field eval="381" name="phone_code" />
         </record>
         <record id="ru" model="res.country">
             <field name="name">Russian Federation</field>
             <field name="code">ru</field>
-            <field file="base/static/img/country_flags/ru.png" name="image" type="base64" />
             <field name="currency_id" ref="RUB" />
             <field eval="7" name="phone_code" />
         </record>
         <record id="rw" model="res.country">
             <field name="name">Rwanda</field>
             <field name="code">rw</field>
-            <field file="base/static/img/country_flags/rw.png" name="image" type="base64" />
             <field name="currency_id" ref="RWF" />
             <field eval="250" name="phone_code" />
         </record>
         <record id="sa" model="res.country">
             <field name="name">Saudi Arabia</field>
             <field name="code">sa</field>
-            <field file="base/static/img/country_flags/sa.png" name="image" type="base64" />
             <field name="currency_id" ref="SAR" />
             <field eval="966" name="phone_code" />
         </record>
         <record id="sb" model="res.country">
             <field name="name">Solomon Islands</field>
             <field name="code">sb</field>
-            <field file="base/static/img/country_flags/sb.png" name="image" type="base64" />
             <field name="currency_id" ref="SBD" />
             <field eval="677" name="phone_code" />
         </record>
         <record id="sc" model="res.country">
             <field name="name">Seychelles</field>
             <field name="code">sc</field>
-            <field file="base/static/img/country_flags/sc.png" name="image" type="base64" />
             <field name="currency_id" ref="SCR" />
             <field eval="248" name="phone_code" />
         </record>
         <record id="sd" model="res.country">
             <field name="name">Sudan</field>
             <field name="code">sd</field>
-            <field file="base/static/img/country_flags/sd.png" name="image" type="base64" />
             <field name="currency_id" ref="SDG" />
             <field eval="249" name="phone_code" />
         </record>
         <record id="se" model="res.country">
             <field name="name">Sweden</field>
             <field name="code">se</field>
-            <field file="base/static/img/country_flags/se.png" name="image" type="base64" />
             <field name="currency_id" ref="SEK" />
             <field eval="46" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -1440,7 +1254,6 @@
         <record id="sg" model="res.country">
             <field name="name">Singapore</field>
             <field name="code">sg</field>
-            <field file="base/static/img/country_flags/sg.png" name="image" type="base64" />
             <field name="currency_id" ref="SGD" />
             <field eval="65" name="phone_code" />
             <field name="vat_label">GST No.</field>
@@ -1448,14 +1261,12 @@
         <record id="sh" model="res.country">
             <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" />
             <field eval="290" name="phone_code" />
         </record>
         <record id="si" model="res.country">
             <field name="name">Slovenia</field>
             <field name="code">si</field>
-            <field file="base/static/img/country_flags/si.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="386" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -1469,7 +1280,6 @@
         <record id="sk" model="res.country">
             <field name="name">Slovakia</field>
             <field name="code">sk</field>
-            <field file="base/static/img/country_flags/sk.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="421" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -1477,161 +1287,138 @@
         <record id="sl" model="res.country">
             <field name="name">Sierra Leone</field>
             <field name="code">sl</field>
-            <field file="base/static/img/country_flags/sl.png" name="image" type="base64" />
             <field name="currency_id" ref="SLL" />
             <field eval="232" name="phone_code" />
         </record>
         <record id="sm" model="res.country">
             <field name="name">San Marino</field>
             <field name="code">sm</field>
-            <field file="base/static/img/country_flags/sm.png" name="image" type="base64" />
             <field name="currency_id" ref="ITL" />
             <field eval="378" name="phone_code" />
         </record>
         <record id="sn" model="res.country">
             <field name="name">Senegal</field>
             <field name="code">sn</field>
-            <field file="base/static/img/country_flags/sn.png" name="image" type="base64" />
             <field name="currency_id" ref="XOF" />
             <field eval="221" name="phone_code" />
         </record>
         <record id="so" model="res.country">
             <field name="name">Somalia</field>
             <field name="code">so</field>
-            <field file="base/static/img/country_flags/so.png" name="image" type="base64" />
             <field name="currency_id" ref="SOD" />
             <field eval="252" name="phone_code" />
         </record>
         <record id="sr" model="res.country">
             <field name="name">Suriname</field>
             <field name="code">sr</field>
-            <field file="base/static/img/country_flags/sr.png" name="image" type="base64" />
             <field name="currency_id" ref="SRD" />
             <field eval="597" name="phone_code" />
         </record>
         <record id="ss" model="res.country">
             <field name="name">South Sudan</field>
             <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="211" name="phone_code" />
         </record>
         <record id="st" model="res.country">
             <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" />
             <field eval="239" name="phone_code" />
         </record>
         <record id="sv" model="res.country">
             <field name="name">El Salvador</field>
             <field name="code">sv</field>
-            <field file="base/static/img/country_flags/sv.png" name="image" type="base64" />
             <field name="currency_id" ref="SVC" />
             <field eval="503" name="phone_code" />
         </record>
         <record id="sx" model="res.country">
             <field name="name">Sint Maarten (Dutch part)</field>
             <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="1721" name="phone_code" />
         </record>
         <record id="sy" model="res.country">
             <field name="name">Syria</field>
             <field name="code">sy</field>
-            <field file="base/static/img/country_flags/sy.png" name="image" type="base64" />
             <field name="currency_id" ref="SYP" />
             <field eval="963" name="phone_code" />
         </record>
         <record id="sz" model="res.country">
             <field name="name">Swaziland</field>
             <field name="code">sz</field>
-            <field file="base/static/img/country_flags/sz.png" name="image" type="base64" />
             <field name="currency_id" ref="SZL" />
             <field eval="268" name="phone_code" />
         </record>
         <record id="tc" model="res.country">
             <field name="name">Turks and Caicos Islands</field>
             <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="1649" name="phone_code" />
         </record>
         <record id="td" model="res.country">
             <field name="name">Chad</field>
             <field name="code">td</field>
-            <field file="base/static/img/country_flags/td.png" name="image" type="base64" />
             <field name="currency_id" ref="XAF" />
             <field eval="235" name="phone_code" />
         </record>
         <record id="tf" model="res.country">
             <field name="name">French Southern Territories</field>
             <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="262" name="phone_code" />
         </record>
         <record id="tg" model="res.country">
             <field name="name">Togo</field>
             <field name="code">tg</field>
-            <field file="base/static/img/country_flags/tg.png" name="image" type="base64" />
             <field name="currency_id" ref="XOF" />
             <field eval="228" name="phone_code" />
         </record>
         <record id="th" model="res.country">
             <field name="name">Thailand</field>
             <field name="code">th</field>
-            <field file="base/static/img/country_flags/th.png" name="image" type="base64" />
             <field name="currency_id" ref="THB" />
             <field eval="66" name="phone_code" />
         </record>
         <record id="tj" model="res.country">
             <field name="name">Tajikistan</field>
             <field name="code">tj</field>
-            <field file="base/static/img/country_flags/tj.png" name="image" type="base64" />
             <field name="currency_id" ref="TJS" />
             <field eval="992" name="phone_code" />
         </record>
         <record id="tk" model="res.country">
             <field name="name">Tokelau</field>
             <field name="code">tk</field>
-            <field file="base/static/img/country_flags/tk.png" name="image" type="base64" />
             <field name="currency_id" ref="NZD" />
             <field eval="690" name="phone_code" />
         </record>
         <record id="tm" model="res.country">
             <field name="name">Turkmenistan</field>
             <field name="code">tm</field>
-            <field file="base/static/img/country_flags/tm.png" name="image" type="base64" />
             <field name="currency_id" ref="TMT" />
             <field eval="993" name="phone_code" />
         </record>
         <record id="tn" model="res.country">
             <field name="name">Tunisia</field>
             <field name="code">tn</field>
-            <field file="base/static/img/country_flags/tn.png" name="image" type="base64" />
             <field name="currency_id" ref="TND" />
             <field eval="216" name="phone_code" />
         </record>
         <record id="to" model="res.country">
             <field name="name">Tonga</field>
             <field name="code">to</field>
-            <field file="base/static/img/country_flags/to.png" name="image" type="base64" />
             <field name="currency_id" ref="TOP" />
             <field eval="676" name="phone_code" />
         </record>
         <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="670" name="phone_code" />
         </record>
         <record id="tr" model="res.country">
             <field name="name">Turkey</field>
             <field name="code">tr</field>
-            <field file="base/static/img/country_flags/tr.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="TRY" />
             <field eval="90" name="phone_code" />
@@ -1639,14 +1426,12 @@
         <record id="tt" model="res.country">
             <field name="name">Trinidad and Tobago</field>
             <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="1868" name="phone_code" />
         </record>
         <record id="tv" model="res.country">
             <field name="name">Tuvalu</field>
             <field name="code">tv</field>
-            <field file="base/static/img/country_flags/tv.png" name="image" type="base64" />
             <field name="currency_id" ref="AUD" />
             <field eval="688" name="phone_code" />
         </record>
@@ -1659,21 +1444,18 @@
         <record id="tz" model="res.country">
             <field name="name">Tanzania</field>
             <field name="code">tz</field>
-            <field file="base/static/img/country_flags/tz.png" name="image" type="base64" />
             <field name="currency_id" ref="TZS" />
             <field eval="255" name="phone_code" />
         </record>
         <record id="ua" model="res.country">
             <field name="name">Ukraine</field>
             <field name="code">ua</field>
-            <field file="base/static/img/country_flags/ua.png" name="image" type="base64" />
             <field name="currency_id" ref="UAH" />
             <field eval="380" name="phone_code" />
         </record>
         <record id="ug" model="res.country">
             <field name="name">Uganda</field>
             <field name="code">ug</field>
-            <field file="base/static/img/country_flags/ug.png" name="image" type="base64" />
             <field name="currency_id" ref="UGX" />
             <field eval="256" name="phone_code" />
         </record>
@@ -1681,7 +1463,6 @@
             <field name="name">United Kingdom</field>
             <field eval="'%(street)s\n%(street2)s\n%(city)s\n%(state_name)s\n%(zip)s\n%(country_name)s'" name="address_format" />
             <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="44" name="phone_code" />
             <field name="vat_label">VAT</field>
@@ -1696,7 +1477,6 @@
             <field name="name">United States</field>
             <field name="code">us</field>
             <field name='state_required'>1</field>
-            <field file="base/static/img/country_flags/us.png" name="image" type="base64" />
             <field eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="USD" />
             <field eval="1" name="phone_code" />
@@ -1705,56 +1485,48 @@
         <record id="uy" model="res.country">
             <field name="name">Uruguay</field>
             <field name="code">uy</field>
-            <field file="base/static/img/country_flags/uy.png" name="image" type="base64" />
             <field name="currency_id" ref="UYU" />
             <field eval="598" name="phone_code" />
         </record>
         <record id="uz" model="res.country">
             <field name="name">Uzbekistan</field>
             <field name="code">uz</field>
-            <field file="base/static/img/country_flags/uz.png" name="image" type="base64" />
             <field name="currency_id" ref="UZS" />
             <field eval="998" name="phone_code" />
         </record>
         <record id="va" model="res.country">
             <field name="name">Holy See (Vatican City State)</field>
             <field name="code">va</field>
-            <field file="base/static/img/country_flags/va.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="379" name="phone_code" />
         </record>
         <record id="vc" model="res.country">
             <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" />
             <field eval="1784" name="phone_code" />
         </record>
         <record id="ve" model="res.country">
             <field name="name">Venezuela</field>
             <field name="code">ve</field>
-            <field file="base/static/img/country_flags/ve.png" name="image" type="base64" />
             <field name="currency_id" ref="VEF" />
             <field eval="58" name="phone_code" />
         </record>
         <record id="vg" model="res.country">
             <field name="name">Virgin Islands (British)</field>
             <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="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="1340" name="phone_code" />
         </record>
         <record id="vn" model="res.country">
             <field name="name">Vietnam</field>
             <field name="code">vn</field>
-            <field file="base/static/img/country_flags/vn.png" name="image" type="base64" />
             <field name="currency_id" ref="VND" />
             <field eval="84" name="phone_code" />
             <field eval="'%(street)s\n%(street2)s\n%(city)s\n%(state_name)s %(country_name)s'" name="address_format" />
@@ -1762,7 +1534,6 @@
         <record id="vu" model="res.country">
             <field name="name">Vanuatu</field>
             <field name="code">vu</field>
-            <field file="base/static/img/country_flags/vu.png" name="image" type="base64" />
             <field name="currency_id" ref="VUV" />
             <field eval="678" name="phone_code" />
         </record>
@@ -1775,14 +1546,12 @@
         <record id="ws" model="res.country">
             <field name="name">Samoa</field>
             <field name="code">ws</field>
-            <field file="base/static/img/country_flags/ws.png" name="image" type="base64" />
             <field name="currency_id" ref="WST" />
             <field eval="685" name="phone_code" />
         </record>
         <record id="ye" model="res.country">
             <field name="name">Yemen</field>
             <field name="code">ye</field>
-            <field file="base/static/img/country_flags/ye.png" name="image" type="base64" />
             <field name="currency_id" ref="YER" />
             <field eval="967" name="phone_code" />
         </record>
@@ -1795,28 +1564,24 @@
         <record id="za" model="res.country">
             <field name="name">South Africa</field>
             <field name="code">za</field>
-            <field file="base/static/img/country_flags/za.png" name="image" type="base64" />
             <field name="currency_id" ref="ZAR" />
             <field eval="27" name="phone_code" />
         </record>
         <record id="zm" model="res.country">
             <field name="name">Zambia</field>
             <field name="code">zm</field>
-            <field file="base/static/img/country_flags/zm.png" name="image" type="base64" />
             <field name="currency_id" ref="ZMW" />
             <field eval="260" name="phone_code" />
         </record>
         <record id="zw" model="res.country">
             <field name="name">Zimbabwe</field>
             <field name="code">zw</field>
-            <field file="base/static/img/country_flags/zw.png" name="image" type="base64" />
             <field name="currency_id" ref="ZWL" />
             <field eval="263" name="phone_code" />
         </record>
         <record id="xk" model="res.country">
             <field name="name">Kosovo</field>
             <field name="code">xk</field>
-            <field file="base/static/img/country_flags/xk.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="383" name="phone_code" />
         </record>
diff --git a/odoo/addons/base/models/res_country.py b/odoo/addons/base/models/res_country.py
index ad53687d981..dfcf758bdbd 100644
--- a/odoo/addons/base/models/res_country.py
+++ b/odoo/addons/base/models/res_country.py
@@ -10,6 +10,24 @@ from odoo.tools.translate import _
 _logger = logging.getLogger(__name__)
 
 
+FLAG_MAPPING = {
+    "GF": "fr",
+    "BV": "no",
+    "BQ": "nl",
+    "GP": "fr",
+    "HM": "au",
+    "YT": "fr",
+    "RE": "fr",
+    "MF": "fr",
+    "UM": "us",
+}
+
+NO_FLAG_COUNTRIES = [
+    "AQ", #Antarctica
+    "SJ", #Svalbard + Jan Mayen : separate jurisdictions : no dedicated flag
+]
+
+
 class Country(models.Model):
     _name = 'res.country'
     _description = 'Country'
@@ -37,7 +55,10 @@ class Country(models.Model):
              "(in reports for example), while this field is used to modify the input form for "
              "addresses.")
     currency_id = fields.Many2one('res.currency', string='Currency')
-    image = fields.Binary(attachment=True)
+    image_url = fields.Char(
+        compute="_compute_image_url", string="Flag",
+        help="Url of static flag image",
+    )
     phone_code = fields.Integer(string='Country Calling Code')
     country_group_ids = fields.Many2many('res.country.group', 'res_country_res_country_group_rel',
                          'res_country_id', 'res_country_group_id', string='Country Groups')
@@ -90,6 +111,15 @@ class Country(models.Model):
         self.ensure_one()
         return re.findall(r'\((.+?)\)', self.address_format)
 
+    @api.depends('code')
+    def _compute_image_url(self):
+        for country in self:
+            if not country.code or country.code in NO_FLAG_COUNTRIES:
+                country.image_url = False
+            else:
+                code = FLAG_MAPPING.get(country.code, country.code.lower())
+                country.image_url = "/base/static/img/country_flags/%s.png" % code
+
 
 class CountryGroup(models.Model):
     _description = "Country Group"
diff --git a/odoo/addons/base/static/img/country_flags/eh.png b/odoo/addons/base/static/img/country_flags/eh.png
new file mode 100644
index 0000000000000000000000000000000000000000..85a25c02920cffd89721f2381d47903fd53d81d0
GIT binary patch
literal 5121
zcmV+c6#napP)<h;3K|Lk000e1NJLTq008;`004am1^@s6i&=hM000JidQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+KrZJlI6G!g#YstJ^~kjB#y%cjPMP7e1DW)^;C8A
z*dxW0^tb|vOn|}v^Y0V>#g$r?AliDhS|gX3SRQ=z_+Iur)ALSm(;1(>^s_y*{b|oX
zJHFm&{A`!cCTae*&{s$9zb%yCSGgPTo#g%BJ{F}y>-UAeKC1N=<*$zJ?|ZMW1<U&z
z{3_39C7$hR$$^)aJGp*9Y1jVG<U2Lfn=E~Ae{3xGWBeK)J`-5KJb?TOr<i}X{{p=H
z)&4B>1^BP4KC7o^*YvIJe}Er;NB{qU|G4!H%RJt%K=Y4|KBIm&?wsAv@n?Vxsc@}+
zSoG!myAT5>c3dYESLC@1-|v?`cLmY~P21-_adKN+DaDgAcM5#mtE8G%YP=<lq)%I?
zzw>W%pXV-!A!o@sc^1YyZT^}P<bwL{+n$}BoqKc!35!Yce|Cp|I`B{TIhU=t*RMsd
zMzJg3xZuqV`+YKu&a^&o=7)qS{`qQwRTS7>uGV*Q(a(5&TX|lfe_!OCBQGf7f{HPz
zstMLIr2>6M7zI2v8%QTDtld(RnO3&^%hvP>zs3~)*4VGzZUFk1qnTBospVmx(3@V~
zg&(GVrl;Fk^TP#&7tFqYYQ{c?53!YuZRuRPUfr!&UW+co7vNY9iay#0R?Jdn9jawn
zUdv7$EVE=BUp3RHX`epMux@eZV56~vrJ<shy3JnM?uc|%J}dMqRd>#ZiE<_@PHT{w
z?4#u9Hua3IJJiNDq$#cH?0@P!)?z_mUXE!zJ+7f`bSt$x)<~DSi`3?$41iZ<Qc0oD
zWUbC#x~}Ys!E*90tJiEg>t(vWg+bqJD}R25C|c~Mj;*_mg4Htng`y^5_iEWo9eMSg
zM^2}x><Mn*K{Tq{6d9&vgp%etR<-PN?&7w`xh9fh5o1Y5rC8ppnGuG#r8s#yPUts1
zn(RKLc{1vnt%3&(ZN#~1oTys&DuiktszpBDTJ5!;>`sHXi5c^PdM4W-@L442QW>p|
zL~UGm>wcPfcRg;!)i(}|(Q#)qg#mr->r39lT1rQJm+H_YEN0?Nq`zof2Ih1a2%Mf3
z)wE10Mj+Mpwf)9Zbey@b-P>bX2YXK-Hl9Fjh}5$)yQSVzm$sIxv?|j_wKPfKGpBjU
z2c&Ke=+~^Jb}Y*br5x|tCJOA`EvXwN?}DVp3SIC*6U!&tb;FaBKtKflg}rs^Tvr6)
zl!TsfDx)BkO1<?)eACHw*1BiCXARp|w@zWuZG@oVjxEVrHvq;V8A6tPNeEU1$#LeV
z^Rw?d+!yJ2=~yJ3F*NJoaw(%%&jWo~Fq>5d5GqZpcgUQ#Be9V($c}SiW@Bw)MKcsF
zW`hK=@DoioYpwNoLfM-Y%bF9IaNPF=7W!yiQ}_AN6@Oa0JCewGx8^;3XIc5R{#_pB
zKLu0g)l$)>(2F8u^&mw`O<(Kas?C*EQGbaj7|cc~5nj%=$M!u?4G|>j+I-Gp2>LjH
z2t2gtY%mtWK{f|)Nwqgb6M<A%#cM_%57!mtLQ-bU!W<P8Xa}Gc0$YTQZ6f^F;thI-
zR{$~*K&n>&1#D9y{~$~8HS2A;QGow_V3-p)r<zsK(;3=`$LIl-xs%`FAb%I!$eGk-
zb1(scH?L$SWJ1sZv92A9q+?`DC753E#dVd?JQrv%L9h;}t1dVDoHHSLiKHQHfIC8^
zn$mht8-c97#Yj$C0PW0XGi0O-C-Xfw+z3B}r>vdc51>im5a~%5C4taqQoomG_3{D;
z{APcWM9U#r#(|FgO2QzndGsA?<193^&cUhHc;Ud7tL;cKU*yNpZl<h@!wRw<D>$*B
zj<Q!2ujyvSMiO93S_p@8mFV1=1PR}I74({@@dP|tKX444!W9c3OA_GFW1_?c>#+H!
zM@WUd9btivtq2*biF#fGN+h~~bq5Z0qZ6+-J9T}Molwm8f4MnnK_}JAZw_1#cEWzN
z>fa(B(C-fdG$JCm7?Souo77BAAT$3kGXDH`ij82m&K1XJYVxh~7CT1|0KtMqI;sc;
z12NL>d9aes3Ppq>MyB^|D1%&j0y$g&5yBbuU={}g+gEPhMqP#4LFME`OJP8Q5TbFa
zP3@k)GN(@SJo8Qdc@AQI?aMa<w5;zDo{I6DxclEdDTi1e!+!yc<73xs2?W0Y000DY
zLP=Bz2nYy#2xN!=01YuoL_t(|obBCtaFpc%2Jq)Q_TEi)HwlSkAs~>5pj1HcF5Xlv
zZN;N?sxz&fY6oILJ5mqO@#<l%_gJ)A2d3ITI@1|PYw0DYR2@c6g&>F;0t>|KZnC?{
z9^cnLHk)M0MUvh9j(vXrD7)<DU1px|d%kzy_lt19%cs5`Z%2!g0uh;$xX|jv11=wC
z$ySJ3kA{c}LKFealC4<f@?(+B1&1JLJtiW`v!0W9wJ2eUqZ~^d<){`VEyqMed6v`G
z9fE*GHWya8{H*dsCekm<tnx(WGw4a1Ri4N^hHU4o@<iq^Y<9C%{vlR*BEvf6lk_-N
zc_PCaQ5)~A@?2m;WF#ZbYNpEDI4e(NAfrAhXJ_S?vdR<b-k93ALlE$7R(T@b8*?^U
z<%#q!ZzthuQNmJIc_LlPYumQ7$`k2Q-m}OmPozHuJLz(*Jdu7Bv|V$74Us++JbSG2
zMA|FbNtO$2h_qAGHr>0xhTC3=imB*X;~i{>ichnXDi_!g6_2Lv*`8D7ZLIP{1)_Pj
zdaJyTRi3CoG!J@Kw#svX4N?B-Cg?z>%JXKFMER$?EOAzzDF1X9^eoQG6XlO?gAQ<3
zo+w{*pB>K16OEnjgPz4IPc(Xl2|B<#*bt4D;j+SQuS6qfxS(fofeq2AGi=a-z6)%8
zoRudUg5k5#Tje<`Pc#_A2R(~7qa+%fX@U;)y%{AJ*bwz4Z1&ZvS`VTSf=U{1J1mIK
zI|riEsr7J(G$m_2fI_JjCHzFRqH<C_0?Qj=3ycSN{Z1vyv}g1zL6YE^HwSeOu7GFW
zTnG}c->LLSKX#Noto0xYN>$O-d>G-4TOc_da5PMVXt8KLDx#t?{TaP4$>~JZP1hrE
zcOz_pTCImu9EyT;ERIw-j8r%bwX+KVAlmJ)RF8wj@8cy+2`H(c1AVIe11sQ}Z_+BS
zsz|oAq2uG72yfhij*qvatK|sNk#-0c3tVTO0q<oC;Je~d*iWBi&VK{SQF1}gvIS}p
zSiTfhH!p@{qFMRmiB`0}{VtCE<*$hC`4s6`3{X`_E+@(_xd_!i{60MM&xOV3<(a&M
zlx)y}?ka!tVg!~iHGGv<lPQEZZ9((XFCg;KHmHe2<_ST7YkC7}f4&6%g;zrIxV0T9
zX`-Zq4w$3Lr=w9EeQhlczwienkDusyT##k>uf76xD_6iVZ7R>;CCvP@?!)PsmER1>
z=``G|e7d~@U;XY`9DeR4q{ES(#|2qN)s5F<@)HlkK5@c;Ay*R#2!hB1KnY;byQL%T
zh-}`9<gw#$&6p0ktW4`64NK|l#NlUOM9WKmgwomB`-CW>a?!Pz{Mag3$5jpdVpT=!
zJL@3($|1Q~=gp4G!TU(ZVhFBz15H0|MCAPspr+GW4{30Uf)jsx3oWZ(%?&vK&pESD
zw{it6Rh5IjJQax`xaQC3*s-h7BPAVR&`+YK(}?`<Lp0ra7lLcvKsp-JdPoC`?c0y$
z-@kx#dq>XWve%0VzgPx)-Nd0^zqbh;AMZeD{YHHs&?qk$^g(nrAI71TkK)kEN6^)L
zSnJ{BP!b6odF4-tAN)M`2|+-`qH9pT;G&_gyHyq8^_!3iM-X}c1EjugE9`(ta}4?r
z(y<tVYu`lE9gT==)lZd=?%IRacm4sWxnG!ADl1TZ>klB>Y(u_26^S6UeiNXo=sb7`
z(LJ9Qa=4@e4EiwCbQ+PZAEN0FeN=f>QPBF<-;q4g+V8pY3+BT$WBRb~5!<^Tv3*Sd
zG6%EJ`i+31<bAB99}M~_>Z$Upw5{@~)~|cc#(fDE3w&2!0nu(B`VCYS;SC#+%6=86
zs+n&aLg509nDoH3`_T&_Gb{flVtbo3TVNAEa1fnee9`Z5i{A(Lth14h#(HMqg}&G6
z-T$9%Z%5mIH|88D;-4Krbo)+t&YcZF00eaZSLptu0Ej~7l7Qd28xn&)LcLYK5rMlK
zi@sJqwr@Yu9npS|TWiO|T2qbA0|(Lk%!`O0IGFnvx&x{vljuBY5--)>frBenLay*<
z4h~`_<k`hEqRWBGMc1Kn@pm9vtp)pRR5%R!D0Llf!J(CpBD(vN;;ofeRdjxSXu#`f
z+i5kBTrRj~o{7NnCHV4JPoeEU>!Bu-r}Vz@0|$YV4-Noqwc}CS_%l>o_brCpz<7;5
z20aUG?kLUz8&y@28ekF*0A!yRf-C`|2-jING4=VU5LmVZvd=fFpC!mL$}heU^{>2$
zn%i&VW*CEG(8nmVz~&=-@#wFSXgN~gAErXd?n*m}V72C4KU*sNm~hWsnEK3b;hcWP
zh_0>W@-mFS^LEs)ehy{loomRAK9q~qeT*`@-{zw3!FypHe_DZmm@sI4RuhTL1Y4g#
z3sx&Cu3HGlv?=)NH&3DU-GB9NUmfKAo%Pc&;ofENUvu@a-^Y`2Fz90-xtyrF`33}*
zEh)-1x*&*<D=P+kF4-1>no2{kiYLDa&NJ#U>5)~4?c0yo-ljp{UvfH7x9XShFT9eo
z>n6jXkCH7=i@@DWG47_t#k+6305~R30z|Rjgj}NK2-2}AWUF_;mnMQiB!b6=e0wF{
ziLS4j8FCZiHTnn%l7zDJ=c9i0bEv-cmZJZ12uDNxfZIwFEk}?z5*+wNs*3QYEl7oj
zUKFD$3PS5QL5X(``S-|p81xa4TuxNqb_?oXeja7#&(~y<$}wd!?34QMOiO<KH9EHM
z9Pl;i_6~&J+XN`Ri)18^8@?+q>o>0u-MKq+Rwq+o&`*&qP>V^Ati<F;SHf01UbAt?
z6@GXZT->i-tH~7F*8RKR-gF?d@-6o1-pn5a0gkCtFy+Z7(D3R@s9&9X&`KOTj>t#b
z3jR5$xES<d<W%+BieJ_Hji>wWF$3LHBE0njM0bCZ`=F{Kyy<-;+d>enR#aTO5Dl-r
zgsL093(4(5`Gx19{^jRU^P^iKx!q7xDTLnJF!by^84hnHH3Z4!#JF2-#^fg+hU?7f
z5JY_(7v%~+y1s1gcXt>i9tQw;Fa0J2IWy0ijz-b^^z%^SG1M+wii!8#)9)T~a+wF^
z7o87Vpcb)D_aSlgDE!wfgzPOZ-iM-sV$cU+3)Eub1NWk~@lIGO{8|quhagF?*G)ut
z!{&ZBjp+Ka8LpXU!ZBqsAP9)>+mFbH+fet=eVMcPAdN(@Sm2s59cAa8i}?NnuvS&V
z*)XjbABT#7K|hHgNhmvS9;Q6`IQ-XKrQ1a#7QYWtSsB8cwm|Lbt=URvCpter1n(sm
zLiTx~CX?`Abvax!XF!mKX(WOGYfUx07hed$Vu7`)l3%r%1cTm3PgQ^XA-HDfr>YOA
zds0nJrO>f$JJeLF=cz>S7?MYWD8FDntf$pL@_4$po}L=X<;>hYmLWF{2EAKuRUdfu
zncfJp4EHzAhMG*GW9M$D$?mXs??y`=I}Xp>*^t~WZ3jx4EBT=JR`tgWxxQPpTH%>H
z2eQY5=$=oYWN&q)D2VNCLj1D>aLt&WnP=b`x@47f(Dgd2K2oC90{84$aL+mmi6cjm
zJQ~bwnN<|T4;(~f%T`EkH|%v240j--{3zL=+XA(ic)vbp)ki}RMc60R!FT25u-8pQ
zDilU46oQ&eB6*?}q4zc*x^p)qrvtLz56RBkLY0z|`z4Egx0QP48S|Ga4og*$Y73!b
z$1a36Y(~fS9q4LqK{^tFV6nh?Mm>C&UkdN#3*eY~x;g(1C`U;JU2-{5b<<)5mN&u{
z&~6!PQK>4@u{ctp5K`fA&xRGr;ecga6)b*#<{oimY9$l&%(l`-RNZuaQE%o*qz9(o
zkKS9=SHLrG4r?lvBvS`na5_+V<M$A_yAih9@lXIj(Z{b<A}S`+20iGO@%BZhA$qm|
z@%`7d9uASFOc!)T0Cv^b@$!5>cGUpNXIr%%5|QRi74*18#JYMn*3R}K=r+|yBN`La
zq#@{*v1Yax>l!@hl=*cLQD24+dTv#>Lt(~=`Z09S;}!wy>OHLLM8hy_I)ZK)YiE10
zuECACY|PClM8#sbptGtIjhvx^&Z<r{I)+J0PgSpXBW__;CmIRe2c1=&XzX+ybXIku
z{LpQBvI}7T$*N8?X1WVHt2$Bs=_=@~>O_U1n>2A&ov3g$54s`%J8SHCg;kxXU^ERn
zx0MnVhi2*Ot?C}cEj*1A6;jcIo}E=+J>QSrtm;HXQPiNbsuO9WXlV<&Wvrd!#ky&n
zRVOO8f(M-oV2HF=(4cbx43Rz*EPb3+C(@6+2c1=&NPqGgbXIjDeac%JS=EX3Ys^7s
zRVUKFF$JAfoyZtQolb5mB{Gf?2c1=&$aqE+bXIjDV>;!ua#o$lxP}cnt2&YK4H<M+
zbs}>ZG`*ZvCo+$IL1$GbGM}8FXRG>}*<KuDRVOlyo;0(n6PcHs7J%KX>O`g{uWRt&
j^*KJYl(DK4nbrRRg%D*E|E&Ne00000NkvXXu0mjfKrPqN

literal 0
HcmV?d00001

diff --git a/odoo/addons/base/static/img/country_flags/ps.png b/odoo/addons/base/static/img/country_flags/ps.png
new file mode 100644
index 0000000000000000000000000000000000000000..1899b5a3d0ac1a3ff3718b19b0c8c16861faa3de
GIT binary patch
literal 2932
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

literal 0
HcmV?d00001

diff --git a/odoo/addons/base/static/img/country_flags/tw.png b/odoo/addons/base/static/img/country_flags/tw.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c6b7d2a69b4bd65551c6f779f7a3c00d31c0a85
GIT binary patch
literal 6529
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

literal 0
HcmV?d00001

diff --git a/odoo/addons/base/static/img/country_flags/wf.png b/odoo/addons/base/static/img/country_flags/wf.png
new file mode 100644
index 0000000000000000000000000000000000000000..497467d14b01a777eb2cd2f8df1b53bf89352b6b
GIT binary patch
literal 3836
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

literal 0
HcmV?d00001

diff --git a/odoo/addons/base/views/ir_qweb_widget_templates.xml b/odoo/addons/base/views/ir_qweb_widget_templates.xml
index 0671c8a04a3..19dc914372b 100644
--- a/odoo/addons/base/views/ir_qweb_widget_templates.xml
+++ b/odoo/addons/base/views/ir_qweb_widget_templates.xml
@@ -7,8 +7,8 @@
         <t t-if="not object.name and object.parent_name">
             <span itemprop="name" t-esc="object.parent_name"/>
         </t>
-        <t t-if="options.get('country_image') and 'country_id' in fields and object.country_id and object.country_id.image">
-            <span t-field="object.country_id.image" t-options='{"widget": "image", "class": "country_flag"}'/>
+        <t t-if="options.get('country_image') and 'country_id' in fields and object.country_id and object.country_id.image_url">
+            <span t-field="object.country_id.image_url" t-options='{"widget": "image_url", "class": "country_flag"}'/>
         </t>
     </div>
 </template>
diff --git a/odoo/addons/base/views/res_country_views.xml b/odoo/addons/base/views/res_country_views.xml
index 02bd9c78d5e..4b9673a797b 100644
--- a/odoo/addons/base/views/res_country_views.xml
+++ b/odoo/addons/base/views/res_country_views.xml
@@ -23,7 +23,7 @@
                     <sheet>
                         <div class="oe_button_box">
                         </div>
-                        <field name="image" widget="image" class="oe_avatar"/>
+                        <field name="image_url" widget="image_url" class="oe_avatar"/>
                         <group name="main_group">
                             <group name="country_details">
                                 <field name="name"/>