diff --git a/openerp/addons/base/res/res_country.py b/openerp/addons/base/res/res_country.py
index df68d211a97..df507dcbac9 100644
--- a/openerp/addons/base/res/res_country.py
+++ b/openerp/addons/base/res/res_country.py
@@ -56,6 +56,7 @@ addresses belonging to this country.\n\nYou can use the python-style string pate
\n%(country_name)s: the name of the country
\n%(country_code)s: the code of the country"""),
'currency_id': fields.many2one('res.currency', 'Currency'),
+ 'image': fields.binary("Image"),
}
_sql_constraints = [
('name_uniq', 'unique (name)',
diff --git a/openerp/addons/base/res/res_country_data.xml b/openerp/addons/base/res/res_country_data.xml
index 13c1025cf6b..eff97fb0aac 100644
--- a/openerp/addons/base/res/res_country_data.xml
+++ b/openerp/addons/base/res/res_country_data.xml
@@ -5,46 +5,55 @@
Andorra, Principality of
ad
+
United Arab Emirates
ae
+
Afghanistan, Islamic State of
af
+
Antigua and Barbuda
ag
+
Anguilla
ai
+
Albania
al
+
Armenia
am
+
Netherlands Antilles
an
+
Angola
ao
+
@@ -55,103 +64,123 @@
Argentina
ar
+
American Samoa
as
+
Austria
at
+
Australia
au
+
Aruba
aw
+
Åland Islands
ax
+
Azerbaijan
az
+
Bosnia-Herzegovina
ba
+
Barbados
bb
+
Bangladesh
bd
+
Belgium
be
+
Burkina Faso
bf
+
Bulgaria
bg
+
Bahrain
bh
+
Burundi
bi
+
Benin
bj
+
Saint Barthélémy
bl
+
Bermuda
bm
+
Brunei Darussalam
bn
+
Bolivia
bo
+
@@ -162,17 +191,20 @@
Brazil
br
+
Bahamas
bs
+
Bhutan
bt
+
@@ -183,158 +215,189 @@
Botswana
bw
+
Belarus
by
+
Belize
bz
+
Canada
ca
+
Cocos (Keeling) Islands
cc
+
Central African Republic
cf
+
Congo, Democratic Republic of the
cd
+
Congo
cg
+
Switzerland
ch
+
Ivory Coast (Cote D'Ivoire)
ci
+
Cook Islands
ck
+
Chile
cl
+
Cameroon
cm
+
China
cn
+
Colombia
co
+
Costa Rica
cr
+
Cuba
cu
+
Cape Verde
cv
+
Curaçao
cw
+
Christmas Island
cx
+
Cyprus
cy
+
Czech Republic
cz
+
Germany
de
+
Djibouti
dj
+
Denmark
dk
+
Dominica
dm
+
Dominican Republic
do
+
Algeria
dz
+
Ecuador
ec
+
Estonia
ee
+
Egypt
eg
+
@@ -345,63 +408,75 @@
Eritrea
er
+
Spain
es
+
Ethiopia
et
+
Finland
fi
+
Fiji
fj
+
Falkland Islands
fk
+
Micronesia
fm
+
Faroe Islands
fo
+
France
fr
+
Gabon
ga
+
Grenada
gd
+
Georgia
ge
+
@@ -412,31 +487,37 @@
Ghana
gh
+
Gibraltar
gi
+
Guernsey
gg
+
Greenland
gl
+
Gambia
gm
+
Guinea
gn
+
@@ -447,41 +528,49 @@
Equatorial Guinea
gq
+
Greece
gr
+
South Georgia and the South Sandwich Islands
gs
+
Guatemala
gt
+
Guam (USA)
gu
+
Guinea Bissau
gw
+
Guyana
gy
+
Hong Kong
hk
+
@@ -492,222 +581,266 @@
Honduras
hn
+
Croatia
hr
+
Haiti
ht
+
Hungary
hu
+
Indonesia
id
+
Ireland
ie
+
Israel
il
+
Isle of Man
im
+
India
in
+
British Indian Ocean Territory
io
+
Iraq
iq
+
Iran
ir
+
Iceland
is
+
Italy
it
+
Jersey
je
+
Jamaica
jm
+
Jordan
jo
+
Japan
jp
+
Kenya
ke
+
Kyrgyz Republic (Kyrgyzstan)
kg
+
Cambodia, Kingdom of
kh
+
Kiribati
ki
+
Comoros
km
+
Saint Kitts & Nevis Anguilla
kn
+
North Korea
kp
+
South Korea
kr
+
Kuwait
kw
+
Cayman Islands
ky
+
Kazakhstan
kz
+
Laos
la
+
Lebanon
lb
+
Saint Lucia
lc
+
Liechtenstein
li
+
Sri Lanka
lk
+
Liberia
lr
+
Lesotho
ls
+
Lithuania
lt
+
Luxembourg
lu
+
Latvia
lv
+
Libya
ly
+
Morocco
ma
+
Monaco
mc
+
Moldavia
md
+
Montenegro
me
+
@@ -718,142 +851,170 @@
Madagascar
mg
+
Marshall Islands
mh
+
Macedonia, the former Yugoslav Republic of
mk
+
Mali
ml
+
Myanmar
mm
+
Mongolia
mn
+
Macau
mo
+
Northern Mariana Islands
mp
+
Martinique (French)
mq
+
Mauritania
mr
+
Montserrat
ms
+
Malta
mt
+
Mauritius
mu
+
Maldives
mv
+
Malawi
mw
+
Mexico
mx
+
Malaysia
my
+
Mozambique
mz
+
Namibia
na
+
New Caledonia (French)
nc
+
Niger
ne
+
Norfolk Island
nf
+
Nigeria
ng
+
Nicaragua
ni
+
Netherlands
nl
+
Norway
no
+
Nepal
np
+
Nauru
nr
+
@@ -864,66 +1025,79 @@
Niue
nu
+
New Zealand
nz
+
Oman
om
+
Panama
pa
+
Peru
pe
+
Polynesia (French)
pf
+
Papua New Guinea
pg
+
Philippines
ph
+
Pakistan
pk
+
Poland
pl
+
Saint Pierre and Miquelon
pm
+
Pitcairn Island
pn
+
Puerto Rico
pr
+
@@ -934,21 +1108,25 @@
Portugal
pt
+
Palau
pw
+
Paraguay
py
+
Qatar
qa
+
@@ -959,61 +1137,73 @@
Romania
ro
+
Serbia
rs
+
Russian Federation
ru
+
Rwanda
rw
+
Saudi Arabia
sa
+
Solomon Islands
sb
+
Seychelles
sc
+
Sudan
sd
+
Sweden
se
+
Singapore
sg
+
Saint Helena
sh
+
Slovenia
si
+
@@ -1024,131 +1214,157 @@
Slovakia
sk
+
Sierra Leone
sl
+
San Marino
sm
+
Senegal
sn
+
Somalia
so
+
Suriname
sr
+
South Sudan
ss
+
Saint Tome (Sao Tome) and Principe
st
+
El Salvador
sv
+
Sint Maarten (Dutch part)
sx
+
Syria
sy
+
Swaziland
sz
+
Turks and Caicos Islands
tc
+
Chad
td
+
French Southern Territories
tf
+
Togo
tg
+
Thailand
th
+
Tajikistan
tj
+
Tokelau
tk
+
Turkmenistan
tm
+
Tunisia
tn
+
Tonga
to
+
East Timor
tp
+
Turkey
tr
+
Trinidad and Tobago
tt
+
Tuvalu
tv
+
@@ -1159,23 +1375,27 @@
Tanzania
tz
+
Ukraine
ua
+
Uganda
ug
+
United Kingdom
gb
+
@@ -1186,52 +1406,62 @@
United States
us
+
Uruguay
uy
+
Uzbekistan
uz
+
Holy See (Vatican City State)
va
+
Saint Vincent & Grenadines
vc
+
Venezuela
ve
+
Virgin Islands (British)
vg
+
Virgin Islands (USA)
vi
+
Vietnam
vn
+
Vanuatu
vu
+
@@ -1242,11 +1472,13 @@
Samoa
ws
+
Yemen
ye
+
@@ -1262,11 +1494,13 @@
South Africa
za
+
Zambia
zm
+
@@ -1279,6 +1513,7 @@
Zimbabwe
zw
+
diff --git a/openerp/addons/base/res/res_country_view.xml b/openerp/addons/base/res/res_country_view.xml
index 8f64d330440..e4784c3d9ca 100644
--- a/openerp/addons/base/res/res_country_view.xml
+++ b/openerp/addons/base/res/res_country_view.xml
@@ -22,6 +22,7 @@
res.country