diff --git a/debian/control b/debian/control
index 91ff36e34c9..7f7786ee98d 100644
--- a/debian/control
+++ b/debian/control
@@ -35,6 +35,7 @@ Depends:
  python-pydot,
  python-pyparsing,
  python-reportlab,
+ python-requests,
  python-simplejson,
  python-tz,
  python-unittest2,
diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index 57ce6b31e32..3d0d3e4dda4 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -58,6 +58,7 @@ The kernel of OpenERP, needed for all installation.
         'ir/osv_memory_autovacuum.xml',
         'ir/ir_model_report.xml',
         'ir/ir_logging_view.xml',
+        'ir/ir_qweb.xml',
         'workflow/workflow_view.xml',
         'module/module_view.xml',
         'module/module_data.xml',
diff --git a/openerp/addons/base/i18n/ab.po b/openerp/addons/base/i18n/ab.po
index 6b28e22586f..43085686f85 100644
--- a/openerp/addons/base/i18n/ab.po
+++ b/openerp/addons/base/i18n/ab.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:30+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:26+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index 248585cfa4a..8b72134a932 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:30+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:26+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index dce06ee8cd5..8da3ddda48b 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:31+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:27+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 15a0ba086b4..bfec4b6175c 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:31+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:27+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index 87b6fde3494..8ef295ab110 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:32+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:28+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/bn.po b/openerp/addons/base/i18n/bn.po
index 18d9cb25618..31ddf58c503 100644
--- a/openerp/addons/base/i18n/bn.po
+++ b/openerp/addons/base/i18n/bn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:32+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:27+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index 64560df5bfc..0260f5f1721 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:32+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:28+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index 5e9a509e2f8..d3ee26f8aaa 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:32+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:28+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index d5f8a06d703..6f5180c287d 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:33+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:28+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 "X-Poedit-Language: Czech\n"
 
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index 14414eccc68..09df3428d98 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:33+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:28+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 1e0a1c51e4c..e5bd8df5bee 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:35+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:30+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index 2428ce6643d..e3519923b06 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -12,7 +12,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:35+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:30+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index 3ac3d49d9ad..8f9c671d7fd 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:44+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:39+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index 3289f1acd3c..71e1a37e6cb 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:41+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:36+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po
index ff156da38c1..b9fc7e6a6ae 100644
--- a/openerp/addons/base/i18n/es_AR.po
+++ b/openerp/addons/base/i18n/es_AR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:43+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:38+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_BO.po b/openerp/addons/base/i18n/es_BO.po
index 4d8aa3b9f5e..8fbeef6945c 100644
--- a/openerp/addons/base/i18n/es_BO.po
+++ b/openerp/addons/base/i18n/es_BO.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:45+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:39+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index e5fb10c6ca3..ee7a13a95ce 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:44+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:39+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po
index ff0e9053b68..adc1071c93f 100644
--- a/openerp/addons/base/i18n/es_CR.po
+++ b/openerp/addons/base/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:45+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:40+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 "Language: \n"
 
diff --git a/openerp/addons/base/i18n/es_DO.po b/openerp/addons/base/i18n/es_DO.po
index c95ba0fcad8..38db01a388e 100644
--- a/openerp/addons/base/i18n/es_DO.po
+++ b/openerp/addons/base/i18n/es_DO.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:44+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:39+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index 6126d7c2a6f..7254e6a5ff5 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:46+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:41+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_MX.po b/openerp/addons/base/i18n/es_MX.po
index 332d7384c82..c3eb28cb10e 100644
--- a/openerp/addons/base/i18n/es_MX.po
+++ b/openerp/addons/base/i18n/es_MX.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:46+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:40+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_PE.po b/openerp/addons/base/i18n/es_PE.po
index cbdab27c57d..0e551a5aa64 100644
--- a/openerp/addons/base/i18n/es_PE.po
+++ b/openerp/addons/base/i18n/es_PE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:46+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:41+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_VE.po b/openerp/addons/base/i18n/es_VE.po
index 15260ad574a..4ef92878788 100644
--- a/openerp/addons/base/i18n/es_VE.po
+++ b/openerp/addons/base/i18n/es_VE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:43+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:38+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index 1192725aac4..c517ae44f2c 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:33+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:29+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index 6fabc952d95..d16bce3efde 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:31+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:27+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index 1b0e025410e..0bfe683b714 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:39+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:34+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index af0a0e59729..e1d9cdb945a 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:47+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:41+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index 5646cffb9c9..723867d301d 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:34+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:29+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index a7cb0c9fd67..9e75eb74b87 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:34+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:29+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
@@ -9951,7 +9951,7 @@ msgid ""
 msgstr ""
 "\n"
 "Le noyau d'OpenERP, nécessaire pour toute installation.\n"
-"===================================================\n"
+"=======================================================\n"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_server_object_lines
diff --git a/openerp/addons/base/i18n/fr_CA.po b/openerp/addons/base/i18n/fr_CA.po
index c132e8506f3..4a6a61ac48f 100644
--- a/openerp/addons/base/i18n/fr_CA.po
+++ b/openerp/addons/base/i18n/fr_CA.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:44+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:39+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index 68ab1d36f65..48abd8027ae 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:35+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:30+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/gu.po b/openerp/addons/base/i18n/gu.po
index cf0edaaecf7..7022005574f 100644
--- a/openerp/addons/base/i18n/gu.po
+++ b/openerp/addons/base/i18n/gu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:35+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:30+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index 70d012d1998..86276f6bc25 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:35+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:31+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hi.po b/openerp/addons/base/i18n/hi.po
index e790f6b39e1..96d55ee9b36 100644
--- a/openerp/addons/base/i18n/hi.po
+++ b/openerp/addons/base/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:36+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:31+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index 44627278dbc..62ce7012da7 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:40+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:35+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 "Language: hr\n"
 
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index b812e7ee525..043900400b4 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:36+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:31+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index 6275f5896e6..b168e30f2d6 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:31+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:27+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index f69a0ae481d..8f0474dbcb3 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:36+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:31+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index ee314bae98b..3752f2c679f 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:36+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:31+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index d76609aa203..f7a1bfdb4b0 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:36+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:32+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 03850c59478..63d0e0638f3 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:37+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:32+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po
index 837f7516cc2..e227a1eeb17 100644
--- a/openerp/addons/base/i18n/ka.po
+++ b/openerp/addons/base/i18n/ka.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:34+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:29+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po
index 5592883f098..559d5404844 100644
--- a/openerp/addons/base/i18n/kk.po
+++ b/openerp/addons/base/i18n/kk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:37+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:32+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index 50fb6e38537..144f0c87918 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:37+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:33+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index 55518a7b577..4ee73e3cb1c 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:38+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:33+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index f64156a0738..c607e7da1ee 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:37+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:33+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index 46cfd2f956a..7c4972a5415 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:38+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:33+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index 1d69c955339..cee07a00d7d 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:38+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:34+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 066dfdb196a..1bdb6a4586b 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:38+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:34+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index 9950ea883b2..1d54d67f386 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:33+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:28+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index d8e2ab7b023..947ba509118 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:44+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:39+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index bdfe4178bb1..8f0f6678410 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:39+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:34+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index ac1ec23c839..d6556d54c4e 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:39+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:34+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
@@ -5633,7 +5633,7 @@ msgstr "Falta o valor do campo '%s'."
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
-msgstr ""
+msgstr "Permissões de Escrita"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_groups
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index 0d5261a6539..77821aaaefa 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:43+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:38+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index f6afb07778e..2cca4a60e14 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:39+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:35+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index dde0d09a88b..2146841182c 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:40+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:35+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index fa23b9fca86..ee5c82b00fd 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:40+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:36+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index 2ce1102afb6..55c241f3462 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:41+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:36+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index 75418986b60..8814da0bc60 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:30+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:27+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index 61b34a233f5..014ca56f8fb 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:40+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:35+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index 8c9348c3094..86a4bacf873 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:47+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:41+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index a8e01fb7a5d..bb452c8ce35 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:41+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:36+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index db7e38e2fec..2b1b772b964 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:41+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:37+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index afcd43207d9..8d8ffb04643 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:42+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:37+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index 2411e610e83..6021dafeb01 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:42+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:37+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index 5ec02766e6d..12baea4370c 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:42+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:37+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index d18f9aaea23..a616ae2d434 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:42+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:37+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index ae1c01cef12..5f82fc7f1a0 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:43+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:37+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 6ea18ad57c9..a192a6a169e 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:46+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:40+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po
index 700bf5c84c7..f3bc1c1923e 100644
--- a/openerp/addons/base/i18n/zh_HK.po
+++ b/openerp/addons/base/i18n/zh_HK.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:43+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:38+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index 1b7ff7144f5..c57c69227a2 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-20 05:45+0000\n"
+"X-Launchpad-Export-Date: 2014-03-28 05:40+0000\n"
 "X-Generator: Launchpad (build 16967)\n"
 
 #. module: base
diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 7b0681fd661..4cd0492d95c 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -141,12 +141,12 @@ class ir_actions_report_xml(osv.osv):
         'model': fields.char('Model', required=True),
         'report_type': fields.selection([('qweb-pdf', 'PDF'),
                     ('qweb-html', 'HTML'),
-                    ('other', 'Other'),
+                    ('controller', 'Controller'),
                     ('pdf', 'RML pdf (deprecated)'),
                     ('sxw', 'RML sxw (deprecated)'),
                     ('webkit', 'Webkit (deprecated)'),
-                    ], 'Report Type', required=True, help="PDF will use wkhtmltopdf to render html to pdf, HTML will directly show html, Other will force download the controller output keeping the MIME type."),
-        'report_name': fields.char('Controller Name', required=True, help="URL of the report will be /report/<controller name>/<ids>, the default controller also use this field to get the name of the qweb ir.ui.view to render. For RML reports, this is the LocalService name."),
+                    ], 'Report Type', required=True, help="HTML will open the report directly in your browser, PDF will use wkhtmltopdf to render the HTML into a PDF file and let you download it, Controller allows you to define the url of a custom controller outputting any kind of report."),
+        'report_name': fields.char('Template Name', required=True, help="For QWeb reports, name of the template used in the rendering. The method 'render_html' of the model 'report.template_name' will be called (if any) to give the html. For RML reports, this is the LocalService name."),
         'groups_id': fields.many2many('res.groups', 'res_groups_report_rel', 'uid', 'gid', 'Groups'),
 
         # options
@@ -163,7 +163,7 @@ class ir_actions_report_xml(osv.osv):
         'report_xsl': fields.char('XSL Path'),
         'report_xml': fields.char('XML Path'),
 
-        'report_rml': fields.char('Main Report File Path', help="The path to the main report file (depending on Report Type) or NULL if the content is in another data field"),
+        'report_rml': fields.char('Main Report File Path/controller', help="The path to the main report file/controller (depending on Report Type) or NULL if the content is in another data field"),
         'report_file': fields.related('report_rml', type="char", required=False, readonly=False, string='Report File', help="The path to the main report file (depending on Report Type) or NULL if the content is in another field", store=True),
 
         'report_sxw': fields.function(_report_sxw, type='char', string='SXW Path'),
diff --git a/openerp/addons/base/ir/ir_actions.xml b/openerp/addons/base/ir/ir_actions.xml
index 77d7eb23e8c..4eb869daa80 100644
--- a/openerp/addons/base/ir/ir_actions.xml
+++ b/openerp/addons/base/ir/ir_actions.xml
@@ -59,12 +59,13 @@
                             <field name="name"/>
                             <field name="model"/>
                             <field name="report_type"/>
-                            <field name="report_name"/>
+                            <field name="report_name" attrs="{'invisible':[('report_type','=', 'controller')]}"/>
+                            <field name="report_rml" attrs="{'invisible':[('report_type','!=', 'controller')]}"/>
                         </group>
                         <group>
                             <field name="multi"/>
-                            <field name="attachment_use"/>
-                            <field name="attachment"/>
+                            <field name="attachment_use" attrs="{'invisible':[('report_type','=', 'controller')]}"/>
+                            <field name="attachment" attrs="{'invisible':[('report_type','=', 'controller')]}"/>
                         </group>
                     </group>
                     <notebook>
diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index 0b3bf91dc1f..f19a1fa6746 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -808,6 +808,38 @@ class RelativeDatetimeConverter(osv.AbstractModel):
         return babel.dates.format_timedelta(
             value - reference, add_direction=True, locale=locale)
 
+
+class Contact(orm.AbstractModel):
+    _name = 'ir.qweb.field.contact'
+    _inherit = 'ir.qweb.field.many2one'
+
+    def record_to_html(self, cr, uid, field_name, record, column, options=None, context=None):
+        opf = options.get('fields') or ["name", "address", "phone", "mobile", "fax", "email"]
+
+        if not getattr(record, field_name):
+            return None
+
+        id = getattr(record, field_name).id
+        field_browse = self.pool[column._obj].browse(cr, openerp.SUPERUSER_ID, id, context={"show_address": True})
+        value = werkzeug.utils.escape( field_browse.name_get()[0][1] )
+
+        val = {
+            'name': value.split("\n")[0],
+            'address': werkzeug.utils.escape("\n".join(value.split("\n")[1:])),
+            'phone': field_browse.phone,
+            'mobile': field_browse.mobile,
+            'fax': field_browse.fax,
+            'city': field_browse.city,
+            'country_id': field_browse.country_id and field_browse.country_id.name_get()[0][1],
+            'email': field_browse.email,
+            'fields': opf,
+            'options': options
+        }
+
+        html = self.pool["ir.ui.view"].render(cr, uid, "base.contact", val, engine='ir.qweb', context=context).decode('utf8')
+
+        return HTMLSafe(html)
+
 class HTMLSafe(object):
     """ HTMLSafe string wrapper, Werkzeug's escape() has special handling for
     objects with a ``__html__`` methods but AFAIK does not provide any such
diff --git a/openerp/addons/base/ir/ir_qweb.xml b/openerp/addons/base/ir/ir_qweb.xml
new file mode 100644
index 00000000000..25bb4ef8ef9
--- /dev/null
+++ b/openerp/addons/base/ir/ir_qweb.xml
@@ -0,0 +1,21 @@
+<openerp>
+<data>
+<template id="contact">
+    <address t-ignore="true" class="mb0" itemscope="itemscope" itemtype="http://schema.org/Organization">
+        <div t-att-class="'name' not in fields and 'css_non_editable_mode_hidden'"><span itemprop="name" t-esc="name"/></div>
+        <div itemprop="address" itemscope="itemscope" itemtype="http://schema.org/PostalAddress">
+            <div t-if="address and 'address' in fields" class='css_editable_mode_hidden'>
+                <i t-if="not options.get('no_marker')" class='fa fa-map-marker'/> <span itemprop="streetAddress" t-raw="address.replace('\n', options.get('no_tag_br') and ', ' or ('&lt;br/&gt;%s' % ('' if options.get('no_marker') else '&amp;nbsp; &amp;nbsp; ')))"/>
+            </div>
+            <div t-if="city and 'city' in fields" class='css_editable_mode_hidden'>
+                <i t-if="not options.get('no_marker')" class='fa fa-map-marker'/> <span itemprop="addressLocality" t-raw="city"/>, <span itemprop="addressCountry" t-raw="country_id"/>
+            </div>
+            <div t-if="phone and 'phone' in fields" class='css_editable_mode_hidden'><i t-if="not options.get('no_marker')" class='fa fa-phone'/> <span itemprop="telephone" t-esc="phone"/></div>
+            <div t-if="mobile and 'mobile' in fields" class='css_editable_mode_hidden'><i t-if="not options.get('no_marker')" class='fa fa-mobile-phone'/> <span itemprop="telephone" t-esc="mobile"/></div>
+            <div t-if="fax and 'fax' in fields" class='css_editable_mode_hidden'><i t-if="not options.get('no_marker')" class='fa fa-file-text-o'/> <span itemprop="faxNumber" t-esc="fax"/></div>
+            <div t-if="email and 'email' in fields" class='css_editable_mode_hidden'><i t-if="not options.get('no_marker')" class='fa fa-envelope'/> <span itemprop="email" t-esc="email"/></div>
+        </div>
+    </address>
+</template>
+ </data>
+</openerp>
diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index 4fe6ff1989e..5bbd377f29d 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -493,6 +493,10 @@ class res_config_settings(osv.osv_memory, res_config_module_installation_mixin):
         return res
 
     def execute(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        context = dict(context, active_test=False)
         if uid != SUPERUSER_ID and not self.pool['res.users'].has_group(cr, uid, 'base.group_erp_manager'):
             raise openerp.exceptions.AccessError(_("Only administrators can change the settings"))
 
@@ -500,7 +504,7 @@ class res_config_settings(osv.osv_memory, res_config_module_installation_mixin):
         ir_module = self.pool['ir.module.module']
         res_groups = self.pool['res.groups']
 
-        classified = self._get_classified_fields(cr, uid, context)
+        classified = self._get_classified_fields(cr, uid, context=context)
 
         config = self.browse(cr, uid, ids[0], context)
 
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 @@
         <record id="ad" model="res.country">
             <field name="name">Andorra, Principality of</field>
             <field name="code">ad</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ad.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="ae" model="res.country">
             <field name="name">United Arab Emirates</field>
             <field name="code">ae</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ae.png"></field>
             <field name="currency_id" ref="AED"/>
         </record>
         <record id="af" model="res.country">
             <field name="name">Afghanistan, Islamic State of</field>
             <field name="code">af</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/af.png"></field>
             <field name="currency_id" ref="AFN"/>
         </record>
         <record id="ag" model="res.country">
             <field name="name">Antigua and Barbuda</field>
             <field name="code">ag</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ag.png"></field>
             <field name="currency_id" ref="XCD"/>
         </record>
         <record id="ai" model="res.country">
             <field name="name">Anguilla</field>
             <field name="code">ai</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ai.png"></field>
             <field name="currency_id" ref="XCD"/>
         </record>
         <record id="al" model="res.country">
             <field name="name">Albania</field>
             <field name="code">al</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/al.png"></field>
             <field name="currency_id" ref="ALL"/>
         </record>
         <record id="am" model="res.country">
             <field name="name">Armenia</field>
             <field name="code">am</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/am.png"></field>
             <field name="currency_id" ref="AMD"/>
         </record>
         <record id="an" model="res.country">
             <field name="name">Netherlands Antilles</field>
             <field name="code">an</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/an.png"></field>
             <field name="currency_id" ref="NOK"/>
         </record>
         <record id="ao" model="res.country">
             <field name="name">Angola</field>
             <field name="code">ao</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ao.png"></field>
             <field name="currency_id" ref="AOA"/>
         </record>
         <record id="aq" model="res.country">
@@ -55,103 +64,123 @@
         <record id="ar" model="res.country">
             <field name="name">Argentina</field>
             <field name="code">ar</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ar.png"></field>
             <field name="currency_id" ref="ARS"/>
         </record>
         <record id="as" model="res.country">
             <field name="name">American Samoa</field>
             <field name="code">as</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/as.png"></field>
             <field name="currency_id" ref="USD"/>
         </record>
         <record id="at" model="res.country">
             <field name="name">Austria</field>
             <field name="code">at</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/at.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="au" model="res.country">
             <field name="name">Australia</field>
             <field name="code">au</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/au.png"></field>
             <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />
             <field name="currency_id" ref="AUD"/>
         </record>
         <record id="aw" model="res.country">
             <field name="name">Aruba</field>
             <field name="code">aw</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/aw.png"></field>
             <field name="currency_id" ref="AWG"/>
         </record>
         <record id="ax" model="res.country">
             <field name="name">Åland Islands</field>
             <field name="code">ax</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ax.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="az" model="res.country">
             <field name="name">Azerbaijan</field>
             <field name="code">az</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/az.png"></field>
             <field name="currency_id" ref="AZN"/>
         </record>
         <record id="ba" model="res.country">
             <field name="name">Bosnia-Herzegovina</field>
             <field name="code">ba</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ba.png"></field>
             <field name="currency_id" ref="BAM"/>
         </record>
         <record id="bb" model="res.country">
             <field name="name">Barbados</field>
             <field name="code">bb</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/bb.png"></field>
             <field name="currency_id" ref="BBD"/>
         </record>
         <record id="bd" model="res.country">
             <field name="name">Bangladesh</field>
             <field name="code">bd</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/bd.png"></field>
             <field name="currency_id" ref="BDT"/>
         </record>
         <record id="be" model="res.country">
             <field name="name">Belgium</field>
             <field name="code">be</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/be.png"></field>
             <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"/>
         </record>
         <record id="bf" model="res.country">
             <field name="name">Burkina Faso</field>
             <field name="code">bf</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/bf.png"></field>
             <field name="currency_id" ref="XOF"/>
         </record>
         <record id="bg" model="res.country">
             <field name="name">Bulgaria</field>
             <field name="code">bg</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/bg.png"></field>
             <field name="currency_id" ref="BGN"/>
         </record>
         <record id="bh" model="res.country">
             <field name="name">Bahrain</field>
             <field name="code">bh</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/bh.png"></field>
             <field name="currency_id" ref="BHD"/>
         </record>
         <record id="bi" model="res.country">
             <field name="name">Burundi</field>
             <field name="code">bi</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/bi.png"></field>
             <field name="currency_id" ref="BIF"/>
         </record>
         <record id="bj" model="res.country">
             <field name="name">Benin</field>
             <field name="code">bj</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/bj.png"></field>
             <field name="currency_id" ref="XOF"/>
         </record>
         <record id="bl" model="res.country">
             <field name="name">Saint Barthélémy</field>
             <field name="code">bl</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/bl.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="bm" model="res.country">
             <field name="name">Bermuda</field>
             <field name="code">bm</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/bm.png"></field>
             <field name="currency_id" ref="BMD"/>
         </record>
         <record id="bn" model="res.country">
             <field name="name">Brunei Darussalam</field>
             <field name="code">bn</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/bn.png"></field>
             <field name="currency_id" ref="BND"/>
         </record>
         <record id="bo" model="res.country">
             <field name="name">Bolivia</field>
             <field name="code">bo</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/bo.png"></field>
             <field name="currency_id" ref="BOB"/>
         </record>
         <record id="bq" model="res.country">
@@ -162,17 +191,20 @@
         <record id="br" model="res.country">
             <field name="name">Brazil</field>
             <field name="code">br</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/br.png"></field>
             <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s\n%(zip)s\n%(country_name)s'" />
             <field name="currency_id" ref="BRL"/>
         </record>
         <record id="bs" model="res.country">
             <field name="name">Bahamas</field>
             <field name="code">bs</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/bs.png"></field>
             <field name="currency_id" ref="BSD"/>
         </record>
         <record id="bt" model="res.country">
             <field name="name">Bhutan</field>
             <field name="code">bt</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/bt.png"></field>
             <field name="currency_id" ref="BTN"/>
         </record>
         <record id="bv" model="res.country">
@@ -183,158 +215,189 @@
         <record id="bw" model="res.country">
             <field name="name">Botswana</field>
             <field name="code">bw</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/bw.png"></field>
             <field name="currency_id" ref="BWP"/>
         </record>
         <record id="by" model="res.country">
             <field name="name">Belarus</field>
             <field name="code">by</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/by.png"></field>
             <field name="currency_id" ref="BYR"/>
         </record>
         <record id="bz" model="res.country">
             <field name="name">Belize</field>
             <field name="code">bz</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/bz.png"></field>
             <field name="currency_id" ref="BZD"/>
         </record>
         <record id="ca" model="res.country">
             <field name="name">Canada</field>
             <field name="code">ca</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ca.png"></field>
             <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />
             <field name="currency_id" ref="CAD"/>
         </record>
         <record id="cc" model="res.country">
             <field name="name">Cocos (Keeling) Islands</field>
             <field name="code">cc</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/cc.png"></field>
             <field name="currency_id" ref="AUD"/>
         </record>
         <record id="cf" model="res.country">
             <field name="name">Central African Republic</field>
             <field name="code">cf</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/cf.png"></field>
             <field name="currency_id" ref="XAF"/>
         </record>
         <record id="cd" model="res.country">
             <field name="name">Congo, Democratic Republic of the</field>
             <field name="code">cd</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/cd.png"></field>
             <field name="currency_id" ref="CDF"/>
         </record>
         <record id="cg" model="res.country">
             <field name="name">Congo</field>
             <field name="code">cg</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/cg.png"></field>
             <field name="currency_id" ref="XAF"/>
         </record>
         <record id="ch" model="res.country">
             <field name="name">Switzerland</field>
             <field name="code">ch</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ch.png"></field>
             <field name="currency_id" ref="CHF"/>
         </record>
         <record id="ci" model="res.country">
             <field name="name">Ivory Coast (Cote D'Ivoire)</field>
             <field name="code">ci</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ci.png"></field>
             <field name="currency_id" ref="XOF"/>
         </record>
         <record id="ck" model="res.country">
             <field name="name">Cook Islands</field>
             <field name="code">ck</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ck.png"></field>
             <field name="currency_id" ref="NZD"/>
         </record>
         <record id="cl" model="res.country">
             <field name="name">Chile</field>
             <field name="code">cl</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/cl.png"></field>
             <field name="currency_id" ref="AUD"/>
         </record>
         <record id="cm" model="res.country">
             <field name="name">Cameroon</field>
             <field name="code">cm</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/cm.png"></field>
             <field name="currency_id" ref="XAF"/>
         </record>
         <record id="cn" model="res.country">
             <field name="name">China</field>
             <field name="code">cn</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/cn.png"></field>
             <field name="currency_id" ref="CNY"/>
         </record>
         <record id="co" model="res.country">
             <field name="name">Colombia</field>
             <field name="code">co</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/co.png"></field>
             <field name="currency_id" ref="COP"/>
         </record>
         <record id="cr" model="res.country">
             <field name="name">Costa Rica</field>
             <field name="code">cr</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/cr.png"></field>
             <field name="currency_id" ref="CRC"/>
         </record>
         <record id="cu" model="res.country">
             <field name="name">Cuba</field>
             <field name="code">cu</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/cu.png"></field>
             <field name="currency_id" ref="CUP"/>
         </record>
         <record id="cv" model="res.country">
             <field name="name">Cape Verde</field>
             <field name="code">cv</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/cv.png"></field>
             <field name="currency_id" ref="CVE"/>
         </record>
         <record id="cw" model="res.country">
             <field name="name">Curaçao</field>
             <field name="code">cw</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/cw.png"></field>
             <field name="currency_id" ref="ANG"/>
         </record>
         <record id="cx" model="res.country">
             <field name="name">Christmas Island</field>
             <field name="code">cx</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/cx.png"></field>
             <field name="currency_id" ref="AUD"/>
         </record>
         <record id="cy" model="res.country">
             <field name="name">Cyprus</field>
             <field name="code">cy</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/cy.png"></field>
             <field name="currency_id" ref="CYP"/>
         </record>
         <record id="cz" model="res.country">
             <field name="name">Czech Republic</field>
             <field name="code">cz</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/cz.png"></field>
             <field name="currency_id" ref="CZK"/>
         </record>
         <record id="de" model="res.country">
             <field name="name">Germany</field>
             <field name="code">de</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/de.png"></field>
             <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"/>
         </record>
         <record id="dj" model="res.country">
             <field name="name">Djibouti</field>
             <field name="code">dj</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/dj.png"></field>
             <field name="currency_id" ref="DJF"/>
         </record>
         <record id="dk" model="res.country">
             <field name="name">Denmark</field>
             <field name="code">dk</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/dk.png"></field>
             <field name="currency_id" ref="DKK"/>
         </record>
         <record id="dm" model="res.country">
             <field name="name">Dominica</field>
             <field name="code">dm</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/dm.png"></field>
             <field name="currency_id" ref="XCD"/>
         </record>
         <record id="do" model="res.country">
             <field name="name">Dominican Republic</field>
             <field name="code">do</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/do.png"></field>
             <field name="currency_id" ref="DOP"/>
         </record>
         <record id="dz" model="res.country">
             <field name="name">Algeria</field>
             <field name="code">dz</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/dz.png"></field>
             <field name="currency_id" ref="DZD"/>
         </record>
         <record id="ec" model="res.country">
             <field name="name">Ecuador</field>
             <field name="code">ec</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ec.png"></field>
             <field name="currency_id" ref="ECS"/>
         </record>
         <record id="ee" model="res.country">
             <field name="name">Estonia</field>
             <field name="code">ee</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ee.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="eg" model="res.country">
             <field name="name">Egypt</field>
             <field name="code">eg</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/eg.png"></field>
             <field name="currency_id" ref="EGP"/>
         </record>
         <record id="eh" model="res.country">
@@ -345,63 +408,75 @@
         <record id="er" model="res.country">
             <field name="name">Eritrea</field>
             <field name="code">er</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/er.png"></field>
             <field name="currency_id" ref="ERN"/>
         </record>
         <record id="es" model="res.country">
             <field name="name">Spain</field>
             <field name="code">es</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/es.png"></field>
             <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"/>
         </record>
         <record id="et" model="res.country">
             <field name="name">Ethiopia</field>
             <field name="code">et</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/et.png"></field>
             <field name="currency_id" ref="ETB"/>
         </record>
         <record id="fi" model="res.country">
             <field name="name">Finland</field>
             <field name="code">fi</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/fi.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="fj" model="res.country">
             <field name="name">Fiji</field>
             <field name="code">fj</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/fj.png"></field>
             <field name="currency_id" ref="FJD"/>
         </record>
         <record id="fk" model="res.country">
             <field name="name">Falkland Islands</field>
             <field name="code">fk</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/fk.png"></field>
             <field name="currency_id" ref="FKP"/>
         </record>
         <record id="fm" model="res.country">
             <field name="name">Micronesia</field>
             <field name="code">fm</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/fm.png"></field>
             <field name="currency_id" ref="USD"/>
         </record>
         <record id="fo" model="res.country">
             <field name="name">Faroe Islands</field>
             <field name="code">fo</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/fo.png"></field>
             <field name="currency_id" ref="DKK"/>
         </record>
         <record id="fr" model="res.country">
             <field name="name">France</field>
             <field name="code">fr</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/fr.png"></field>
             <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"/>
         </record>
         <record id="ga" model="res.country">
             <field name="name">Gabon</field>
             <field name="code">ga</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ga.png"></field>
             <field name="currency_id" ref="XAF"/>
         </record>
         <record id="gd" model="res.country">
             <field name="name">Grenada</field>
             <field name="code">gd</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/gd.png"></field>
             <field name="currency_id" ref="XCD"/>
         </record>
         <record id="ge" model="res.country">
             <field name="name">Georgia</field>
             <field name="code">ge</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ge.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="gf" model="res.country">
@@ -412,31 +487,37 @@
         <record id="gh" model="res.country">
             <field name="name">Ghana</field>
             <field name="code">gh</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/gh.png"></field>
             <field name="currency_id" ref="GHS"/>
         </record>
         <record id="gi" model="res.country">
             <field name="name">Gibraltar</field>
             <field name="code">gi</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/gi.png"></field>
             <field name="currency_id" ref="GIP"/>
         </record>
         <record id="gg" model="res.country">
             <field name="name">Guernsey</field>
             <field name="code">gg</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/gg.png"></field>
             <field name="currency_id" ref="GBP"/>
         </record>
         <record id="gl" model="res.country">
             <field name="name">Greenland</field>
             <field name="code">gl</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/gl.png"></field>
             <field name="currency_id" ref="DKK"/>
         </record>
         <record id="gm" model="res.country">
             <field name="name">Gambia</field>
             <field name="code">gm</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/gm.png"></field>
             <field name="currency_id" ref="GMD"/>
         </record>
         <record id="gn" model="res.country">
             <field name="name">Guinea</field>
             <field name="code">gn</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/gn.png"></field>
             <field name="currency_id" ref="GNF"/>
         </record>
         <record id="gp" model="res.country">
@@ -447,41 +528,49 @@
         <record id="gq" model="res.country">
             <field name="name">Equatorial Guinea</field>
             <field name="code">gq</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/gq.png"></field>
             <field name="currency_id" ref="XAF"/>
         </record>
         <record id="gr" model="res.country">
             <field name="name">Greece</field>
             <field name="code">gr</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/gr.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="gs" model="res.country">
             <field name="name">South Georgia and the South Sandwich Islands</field>
             <field name="code">gs</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/gs.png"></field>
             <field name="currency_id" ref="GBP"/>
         </record>
         <record id="gt" model="res.country">
             <field name="name">Guatemala</field>
             <field name="code">gt</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/gt.png"></field>
             <field name="currency_id" ref="QTQ"/>
         </record>
         <record id="gu" model="res.country">
             <field name="name">Guam (USA)</field>
             <field name="code">gu</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/gu.png"></field>
             <field name="currency_id" ref="USD"/>
         </record>
         <record id="gw" model="res.country">
             <field name="name">Guinea Bissau</field>
             <field name="code">gw</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/gw.png"></field>
             <field name="currency_id" ref="GWP"/>
         </record>
         <record id="gy" model="res.country">
             <field name="name">Guyana</field>
             <field name="code">gy</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/gy.png"></field>
             <field name="currency_id" ref="GYD"/>
         </record>
         <record id="hk" model="res.country">
             <field name="name">Hong Kong</field>
             <field name="code">hk</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/hk.png"></field>
             <field name="currency_id" ref="HKD"/>
         </record>
         <record id="hm" model="res.country">
@@ -492,222 +581,266 @@
         <record id="hn" model="res.country">
             <field name="name">Honduras</field>
             <field name="code">hn</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/hn.png"></field>
             <field name="currency_id" ref="HNL"/>
         </record>
         <record id="hr" model="res.country">
             <field name="name">Croatia</field>
             <field name="code">hr</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/hr.png"></field>
             <field name="currency_id" ref="HRK"/>
         </record>
         <record id="ht" model="res.country">
             <field name="name">Haiti</field>
             <field name="code">ht</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ht.png"></field>
             <field name="currency_id" ref="HTG"/>
         </record>
         <record id="hu" model="res.country">
             <field name="name">Hungary</field>
             <field name="code">hu</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/hu.png"></field>
             <field name="currency_id" ref="HUF"/>
         </record>
         <record id="id" model="res.country">
             <field name="name">Indonesia</field>
             <field name="code">id</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/id.png"></field>
             <field name="currency_id" ref="IDR"/>
         </record>
         <record id="ie" model="res.country">
             <field name="name">Ireland</field>
             <field name="code">ie</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ie.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="il" model="res.country">
             <field name="name">Israel</field>
             <field name="code">il</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/il.png"></field>
             <field name="currency_id" ref="ILS"/>
         </record>
         <record id="im" model="res.country">
             <field name="name">Isle of Man</field>
             <field name="code">im</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/im.png"></field>
             <field name="currency_id" ref="GBP"/>
         </record>
         <record id="in" model="res.country">
             <field name="name">India</field>
             <field name="code">in</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/in.png"></field>
             <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(zip)s\n%(state_name)s\n%(country_name)s'" />
             <field name="currency_id" ref="INR"/>
         </record>
         <record id="io" model="res.country">
             <field name="name">British Indian Ocean Territory</field>
             <field name="code">io</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/io.png"></field>
             <field name="currency_id" ref="USD"/>
         </record>
         <record id="iq" model="res.country">
             <field name="name">Iraq</field>
             <field name="code">iq</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/iq.png"></field>
             <field name="currency_id" ref="IQD"/>
         </record>
         <record id="ir" model="res.country">
             <field name="name">Iran</field>
             <field name="code">ir</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ir.png"></field>
             <field name="currency_id" ref="IRR"/>
         </record>
         <record id="is" model="res.country">
             <field name="name">Iceland</field>
             <field name="code">is</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/is.png"></field>
             <field name="currency_id" ref="ISK"/>
         </record>
         <record id="it" model="res.country">
             <field name="name">Italy</field>
             <field name="code">it</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/it.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="je" model="res.country">
             <field name="name">Jersey</field>
             <field name="code">je</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/je.png"></field>
             <field name="currency_id" ref="GBP"/>
         </record>
         <record id="jm" model="res.country">
             <field name="name">Jamaica</field>
             <field name="code">jm</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/jm.png"></field>
             <field name="currency_id" ref="JMD"/>
         </record>
         <record id="jo" model="res.country">
             <field name="name">Jordan</field>
             <field name="code">jo</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/jo.png"></field>
             <field name="currency_id" ref="JOD"/>
         </record>
         <record id="jp" model="res.country">
             <field name="name">Japan</field>
             <field name="code">jp</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/jp.png"></field>
             <field name="currency_id" ref="JPY"/>
         </record>
         <record id="ke" model="res.country">
             <field name="name">Kenya</field>
             <field name="code">ke</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ke.png"></field>
             <field name="currency_id" ref="KES"/>
         </record>
         <record id="kg" model="res.country">
             <field name="name">Kyrgyz Republic (Kyrgyzstan)</field>
             <field name="code">kg</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/kg.png"></field>
             <field name="currency_id" ref="KGS"/>
         </record>
         <record id="kh" model="res.country">
             <field name="name">Cambodia, Kingdom of</field>
             <field name="code">kh</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/kh.png"></field>
             <field name="currency_id" ref="KHR"/>
         </record>
         <record id="ki" model="res.country">
             <field name="name">Kiribati</field>
             <field name="code">ki</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ki.png"></field>
             <field name="currency_id" ref="AUD"/>
         </record>
         <record id="km" model="res.country">
             <field name="name">Comoros</field>
             <field name="code">km</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/km.png"></field>
             <field name="currency_id" ref="KMF"/>
         </record>
         <record id="kn" model="res.country">
             <field name="name">Saint Kitts &amp; Nevis Anguilla</field>
             <field name="code">kn</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/kn.png"></field>
             <field name="currency_id" ref="XCD"/>
         </record>
         <record id="kp" model="res.country">
             <field name="name">North Korea</field>
             <field name="code">kp</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/kp.png"></field>
             <field name="currency_id" ref="KPW"/>
         </record>
         <record id="kr" model="res.country">
             <field name="name">South Korea</field>
             <field name="code">kr</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/kr.png"></field>
             <field name="currency_id" ref="KRW"/>
         </record>
         <record id="kw" model="res.country">
             <field name="name">Kuwait</field>
             <field name="code">kw</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/kw.png"></field>
             <field name="currency_id" ref="KWD"/>
         </record>
         <record id="ky" model="res.country">
             <field name="name">Cayman Islands</field>
             <field name="code">ky</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ky.png"></field>
             <field name="currency_id" ref="KYD"/>
         </record>
         <record id="kz" model="res.country">
             <field name="name">Kazakhstan</field>
             <field name="code">kz</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/kz.png"></field>
             <field name="currency_id" ref="KZT"/>
         </record>
         <record id="la" model="res.country">
             <field name="name">Laos</field>
             <field name="code">la</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/la.png"></field>
             <field name="currency_id" ref="LAK"/>
         </record>
         <record id="lb" model="res.country">
             <field name="name">Lebanon</field>
             <field name="code">lb</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/lb.png"></field>
             <field name="currency_id" ref="LBP"/>
         </record>
         <record id="lc" model="res.country">
             <field name="name">Saint Lucia</field>
             <field name="code">lc</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/lc.png"></field>
             <field name="currency_id" ref="XCD"/>
         </record>
         <record id="li" model="res.country">
             <field name="name">Liechtenstein</field>
             <field name="code">li</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/li.png"></field>
             <field name="currency_id" ref="CHF"/>
         </record>
         <record id="lk" model="res.country">
             <field name="name">Sri Lanka</field>
             <field name="code">lk</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/lk.png"></field>
             <field name="currency_id" ref="LKR"/>
         </record>
         <record id="lr" model="res.country">
             <field name="name">Liberia</field>
             <field name="code">lr</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/lr.png"></field>
             <field name="currency_id" ref="LRD"/>
         </record>
         <record id="ls" model="res.country">
             <field name="name">Lesotho</field>
             <field name="code">ls</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ls.png"></field>
             <field name="currency_id" ref="LSL"/>
         </record>
         <record id="lt" model="res.country">
             <field name="name">Lithuania</field>
             <field name="code">lt</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/lt.png"></field>
             <field name="currency_id" ref="LTL"/>
         </record>
         <record id="lu" model="res.country">
             <field name="name">Luxembourg</field>
             <field name="code">lu</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/lu.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="lv" model="res.country">
             <field name="name">Latvia</field>
             <field name="code">lv</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/lv.png"></field>
             <field name="currency_id" ref="LVL"/>
         </record>
         <record id="ly" model="res.country">
             <field name="name">Libya</field>
             <field name="code">ly</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ly.png"></field>
             <field name="currency_id" ref="LYD"/>
         </record>
         <record id="ma" model="res.country">
             <field name="name">Morocco</field>
             <field name="code">ma</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ma.png"></field>
             <field name="currency_id" ref="MAD"/>
         </record>
         <record id="mc" model="res.country">
             <field name="name">Monaco</field>
             <field name="currency_id" ref="EUR"/>
             <field name="code">mc</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/mc.png"></field>
         </record>
         <record id="md" model="res.country">
             <field name="name">Moldavia</field>
             <field name="code">md</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/md.png"></field>
             <field name="currency_id" ref="MDL"/>
         </record>
         <record id="me" model="res.country">
             <field name="name">Montenegro</field>
             <field name="code">me</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/me.png"></field>
             <field name="currency_id" ref="LYD"/>
         </record>
         <record id="mf" model="res.country">
@@ -718,142 +851,170 @@
         <record id="mg" model="res.country">
             <field name="name">Madagascar</field>
             <field name="code">mg</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/mg.png"></field>
             <field name="currency_id" ref="MGA"/>
         </record>
         <record id="mh" model="res.country">
             <field name="name">Marshall Islands</field>
             <field name="code">mh</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/mh.png"></field>
             <field name="currency_id" ref="USD"/>
         </record>
         <record id="mk" model="res.country">
             <field name="name">Macedonia, the former Yugoslav Republic of</field>
             <field name="code">mk</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/mk.png"></field>
             <field name="currency_id" ref="MKD"/>
         </record>
         <record id="ml" model="res.country">
             <field name="name">Mali</field>
             <field name="code">ml</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ml.png"></field>
             <field name="currency_id" ref="XOF"/>
         </record>
         <record id="mm" model="res.country">
             <field name="name">Myanmar</field>
             <field name="code">mm</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/mm.png"></field>
             <field name="currency_id" ref="MMK"/>
         </record>
         <record id="mn" model="res.country">
             <field name="name">Mongolia</field>
             <field name="code">mn</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/mn.png"></field>
             <field name="currency_id" ref="MNT"/>
         </record>
         <record id="mo" model="res.country">
             <field name="name">Macau</field>
             <field name="code">mo</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/mo.png"></field>
             <field name="currency_id" ref="MOP"/>
         </record>
         <record id="mp" model="res.country">
             <field name="name">Northern Mariana Islands</field>
             <field name="code">mp</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/mp.png"></field>
             <field name="currency_id" ref="USD"/>
         </record>
         <record id="mq" model="res.country">
             <field name="name">Martinique (French)</field>
             <field name="code">mq</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/mq.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="mr" model="res.country">
             <field name="name">Mauritania</field>
             <field name="code">mr</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/mr.png"></field>
             <field name="currency_id" ref="MRO"/>
         </record>
         <record id="ms" model="res.country">
             <field name="name">Montserrat</field>
             <field name="code">ms</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ms.png"></field>
             <field name="currency_id" ref="XCD"/>
         </record>
         <record id="mt" model="res.country">
             <field name="name">Malta</field>
             <field name="code">mt</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/mt.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="mu" model="res.country">
             <field name="name">Mauritius</field>
             <field name="code">mu</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/mu.png"></field>
             <field name="currency_id" ref="MUR"/>
         </record>
         <record id="mv" model="res.country">
             <field name="name">Maldives</field>
             <field name="code">mv</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/mv.png"></field>
             <field name="currency_id" ref="MVR"/>
         </record>
         <record id="mw" model="res.country">
             <field name="name">Malawi</field>
             <field name="code">mw</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/mw.png"></field>
             <field name="currency_id" ref="MWK"/>
         </record>
         <record id="mx" model="res.country">
             <field name="name">Mexico</field>
             <field name="code">mx</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/mx.png"></field>
             <field name="currency_id" ref="MXN"/>
         </record>
         <record id="my" model="res.country">
             <field name="name">Malaysia</field>
             <field name="code">my</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/my.png"></field>
             <field name="currency_id" ref="MXN"/>
         </record>
         <record id="mz" model="res.country">
             <field name="name">Mozambique</field>
             <field name="code">mz</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/mz.png"></field>
             <field name="currency_id" ref="MZN"/>
         </record>
         <record id="na" model="res.country">
             <field name="name">Namibia</field>
             <field name="code">na</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/na.png"></field>
             <field name="currency_id" ref="NAD"/>
         </record>
         <record id="nc" model="res.country">
             <field name="name">New Caledonia (French)</field>
             <field name="code">nc</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/nc.png"></field>
             <field name="currency_id" ref="XPF"/>
         </record>
         <record id="ne" model="res.country">
             <field name="name">Niger</field>
             <field name="code">ne</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ne.png"></field>
             <field name="currency_id" ref="XOF"/>
         </record>
         <record id="nf" model="res.country">
             <field name="name">Norfolk Island</field>
             <field name="code">nf</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/nf.png"></field>
             <field name="currency_id" ref="AUD"/>
         </record>
         <record id="ng" model="res.country">
             <field name="name">Nigeria</field>
             <field name="code">ng</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ng.png"></field>
             <field name="currency_id" ref="NGN"/>
         </record>
         <record id="ni" model="res.country">
             <field name="name">Nicaragua</field>
             <field name="code">ni</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ni.png"></field>
             <field name="currency_id" ref="NIO"/>
         </record>
         <record id="nl" model="res.country">
             <field name="name">Netherlands</field>
             <field name="code">nl</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/nl.png"></field>
             <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"/>
         </record>
         <record id="no" model="res.country">
             <field name="name">Norway</field>
             <field name="code">no</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/no.png"></field>
             <field name="currency_id" ref="NOK"/>
         </record>
         <record id="np" model="res.country">
             <field name="name">Nepal</field>
             <field name="code">np</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/np.png"></field>
             <field name="currency_id" ref="NPR"/>
         </record>
         <record id="nr" model="res.country">
             <field name="name">Nauru</field>
             <field name="code">nr</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/nr.png"></field>
             <field name="currency_id" ref="AUD"/>
         </record>
         <record id="nt" model="res.country">
@@ -864,66 +1025,79 @@
         <record id="nu" model="res.country">
             <field name="name">Niue</field>
             <field name="code">nu</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/nu.png"></field>
             <field name="currency_id" ref="NZD"/>
         </record>
         <record id="nz" model="res.country">
             <field name="name">New Zealand</field>
             <field name="code">nz</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/nz.png"></field>
             <field name="currency_id" ref="NZD"/>
         </record>
         <record id="om" model="res.country">
             <field name="name">Oman</field>
             <field name="code">om</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/om.png"></field>
             <field name="currency_id" ref="OMR"/>
         </record>
         <record id="pa" model="res.country">
             <field name="name">Panama</field>
             <field name="code">pa</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/pa.png"></field>
             <field name="currency_id" ref="PAB"/>
         </record>
         <record id="pe" model="res.country">
             <field name="name">Peru</field>
             <field name="code">pe</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/pe.png"></field>
             <field name="currency_id" ref="PEN"/>
         </record>
         <record id="pf" model="res.country">
             <field name="name">Polynesia (French)</field>
             <field name="code">pf</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/pf.png"></field>
             <field name="currency_id" ref="XPF"/>
         </record>
         <record id="pg" model="res.country">
             <field name="name">Papua New Guinea</field>
             <field name="code">pg</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/pg.png"></field>
             <field name="currency_id" ref="PGK"/>
         </record>
         <record id="ph" model="res.country">
             <field name="name">Philippines</field>
             <field name="code">ph</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ph.png"></field>
             <field name="currency_id" ref="PHP"/>
         </record>
         <record id="pk" model="res.country">
             <field name="name">Pakistan</field>
             <field name="code">pk</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/pk.png"></field>
             <field name="currency_id" ref="PKR"/>
         </record>
         <record id="pl" model="res.country">
             <field name="name">Poland</field>
             <field name="code">pl</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/pl.png"></field>
             <field name="currency_id" ref="PLZ"/>
         </record>
         <record id="pm" model="res.country">
             <field name="name">Saint Pierre and Miquelon</field>
             <field name="code">pm</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/pm.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="pn" model="res.country">
             <field name="name">Pitcairn Island</field>
             <field name="code">pn</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/pn.png"></field>
             <field name="currency_id" ref="NZD"/>
         </record>
         <record id="pr" model="res.country">
             <field name="name">Puerto Rico</field>
             <field name="code">pr</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/pr.png"></field>
             <field name="currency_id" ref="USD"/>
         </record>
         <record id="ps" model="res.country">
@@ -934,21 +1108,25 @@
         <record id="pt" model="res.country">
             <field name="name">Portugal</field>
             <field name="code">pt</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/pt.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="pw" model="res.country">
             <field name="name">Palau</field>
             <field name="code">pw</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/pw.png"></field>
             <field name="currency_id" ref="USD"/>
         </record>
         <record id="py" model="res.country">
             <field name="name">Paraguay</field>
             <field name="code">py</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/py.png"></field>
             <field name="currency_id" ref="PYG"/>
         </record>
         <record id="qa" model="res.country">
             <field name="name">Qatar</field>
             <field name="code">qa</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/qa.png"></field>
             <field name="currency_id" ref="QAR"/>
         </record>
         <record id="re" model="res.country">
@@ -959,61 +1137,73 @@
         <record id="ro" model="res.country">
             <field name="name">Romania</field>
             <field name="code">ro</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ro.png"></field>
             <field name="currency_id" ref="ROL"/>
         </record>
         <record id="rs" model="res.country">
             <field name="name">Serbia</field>
             <field name="code">rs</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/rs.png"></field>
             <field name="currency_id" ref="RSD"/>
         </record>
         <record id="ru" model="res.country">
             <field name="name">Russian Federation</field>
             <field name="code">ru</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ru.png"></field>
             <field name="currency_id" ref="RUB"/>
         </record>
         <record id="rw" model="res.country">
             <field name="name">Rwanda</field>
             <field name="code">rw</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/rw.png"></field>
             <field name="currency_id" ref="RWF"/>
         </record>
         <record id="sa" model="res.country">
             <field name="name">Saudi Arabia</field>
             <field name="code">sa</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/sa.png"></field>
             <field name="currency_id" ref="SAR"/>
         </record>
         <record id="sb" model="res.country">
             <field name="name">Solomon Islands</field>
             <field name="code">sb</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/sb.png"></field>
             <field name="currency_id" ref="SBD"/>
         </record>
         <record id="sc" model="res.country">
             <field name="name">Seychelles</field>
             <field name="code">sc</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/sc.png"></field>
             <field name="currency_id" ref="SCR"/>
         </record>
         <record id="sd" model="res.country">
             <field name="name">Sudan</field>
             <field name="code">sd</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/sd.png"></field>
             <field name="currency_id" ref="SDD"/>
         </record>
         <record id="se" model="res.country">
             <field name="name">Sweden</field>
             <field name="code">se</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/se.png"></field>
             <field name="currency_id" ref="SEK"/>
         </record>
         <record id="sg" model="res.country">
             <field name="name">Singapore</field>
             <field name="code">sg</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/sg.png"></field>
             <field name="currency_id" ref="SGD"/>
         </record>
         <record id="sh" model="res.country">
             <field name="name">Saint Helena</field>
             <field name="code">sh</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/sh.png"></field>
             <field name="currency_id" ref="SHP"/>
         </record>
         <record id="si" model="res.country">
             <field name="name">Slovenia</field>
             <field name="code">si</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/si.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="sj" model="res.country">
@@ -1024,131 +1214,157 @@
         <record id="sk" model="res.country">
             <field name="name">Slovakia</field>
             <field name="code">sk</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/sk.png"></field>
             <field name="currency_id" ref="SKK"/>
         </record>
         <record id="sl" model="res.country">
             <field name="name">Sierra Leone</field>
             <field name="code">sl</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/sl.png"></field>
             <field name="currency_id" ref="SLL"/>
         </record>
         <record id="sm" model="res.country">
             <field name="name">San Marino</field>
             <field name="code">sm</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/sm.png"></field>
             <field name="currency_id" ref="ITL"/>
         </record>
         <record id="sn" model="res.country">
             <field name="name">Senegal</field>
             <field name="code">sn</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/sn.png"></field>
             <field name="currency_id" ref="XOF"/>
         </record>
         <record id="so" model="res.country">
             <field name="name">Somalia</field>
             <field name="code">so</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/so.png"></field>
             <field name="currency_id" ref="SOD"/>
         </record>
         <record id="sr" model="res.country">
             <field name="name">Suriname</field>
             <field name="code">sr</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/sr.png"></field>
             <field name="currency_id" ref="SRG"/>
         </record>
         <record id="ss" model="res.country">
             <field name="name">South Sudan</field>
             <field name="code">ss</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ss.png"></field>
             <field name="currency_id" ref="SSP"/>
         </record>
         <record id="st" model="res.country">
             <field name="name">Saint Tome (Sao Tome) and Principe</field>
             <field name="code">st</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/st.png"></field>
             <field name="currency_id" ref="STD"/>
         </record>
         <record id="sv" model="res.country">
             <field name="name">El Salvador</field>
             <field name="code">sv</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/sv.png"></field>
             <field name="currency_id" ref="SVC"/>
         </record>
         <record id="sx" model="res.country">
             <field name="name">Sint Maarten (Dutch part)</field>
             <field name="code">sx</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/sx.png"></field>
             <field name="currency_id" ref="ANG"/>
         </record>
         <record id="sy" model="res.country">
             <field name="name">Syria</field>
             <field name="code">sy</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/sy.png"></field>
             <field name="currency_id" ref="SYP"/>
         </record>
         <record id="sz" model="res.country">
             <field name="name">Swaziland</field>
             <field name="code">sz</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/sz.png"></field>
             <field name="currency_id" ref="SZL"/>
         </record>
         <record id="tc" model="res.country">
             <field name="name">Turks and Caicos Islands</field>
             <field name="code">tc</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/tc.png"></field>
             <field name="currency_id" ref="USD"/>
         </record>
         <record id="td" model="res.country">
             <field name="name">Chad</field>
             <field name="code">td</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/td.png"></field>
             <field name="currency_id" ref="XAF"/>
         </record>
         <record id="tf" model="res.country">
             <field name="name">French Southern Territories</field>
             <field name="code">tf</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/tf.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="tg" model="res.country">
             <field name="name">Togo</field>
             <field name="code">tg</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/tg.png"></field>
             <field name="currency_id" ref="XOF"/>
         </record>
         <record id="th" model="res.country">
             <field name="name">Thailand</field>
             <field name="code">th</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/th.png"></field>
             <field name="currency_id" ref="THB"/>
         </record>
         <record id="tj" model="res.country">
             <field name="name">Tajikistan</field>
             <field name="code">tj</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/tj.png"></field>
             <field name="currency_id" ref="TJR"/>
         </record>
         <record id="tk" model="res.country">
             <field name="name">Tokelau</field>
             <field name="code">tk</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/tk.png"></field>
             <field name="currency_id" ref="NZD"/>
         </record>
         <record id="tm" model="res.country">
             <field name="name">Turkmenistan</field>
             <field name="code">tm</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/tm.png"></field>
             <field name="currency_id" ref="TMM"/>
         </record>
         <record id="tn" model="res.country">
             <field name="name">Tunisia</field>
             <field name="code">tn</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/tn.png"></field>
             <field name="currency_id" ref="TND"/>
         </record>
         <record id="to" model="res.country">
             <field name="name">Tonga</field>
             <field name="code">to</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/to.png"></field>
             <field name="currency_id" ref="TOP"/>
         </record>
         <record id="tp" model="res.country">
             <field name="name">East Timor</field>
             <field name="code">tp</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/tp.png"></field>
             <field name="currency_id" ref="TPE"/>
         </record>
         <record id="tr" model="res.country">
             <field name="name">Turkey</field>
             <field name="code">tr</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/tr.png"></field>
             <field name="currency_id" ref="TRL"/>
         </record>
         <record id="tt" model="res.country">
             <field name="name">Trinidad and Tobago</field>
             <field name="code">tt</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/tt.png"></field>
             <field name="currency_id" ref="TTD"/>
         </record>
         <record id="tv" model="res.country">
             <field name="name">Tuvalu</field>
             <field name="code">tv</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/tv.png"></field>
             <field name="currency_id" ref="AUD"/>
         </record>
         <record id="tw" model="res.country">
@@ -1159,23 +1375,27 @@
         <record id="tz" model="res.country">
             <field name="name">Tanzania</field>
             <field name="code">tz</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/tz.png"></field>
             <field name="currency_id" ref="TZS"/>
         </record>
         <record id="ua" model="res.country">
             <field name="name">Ukraine</field>
             <field name="code">ua</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ua.png"></field>
             <field name="currency_id" ref="UAG"/>
         </record>
         <!-- DEPRECATED, New currency code of Uganda is UGX ! -->
         <record id="ug" model="res.country">
             <field name="name">Uganda</field>
             <field name="code">ug</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ug.png"></field>
             <field name="currency_id" ref="UGX"/>
         </record>
         <record id="uk" model="res.country">
             <field name="name">United Kingdom</field>
             <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s\n%(state_name)s\n%(zip)s\n%(country_name)s'" />
             <field name="code">gb</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/gb.png"></field>
             <field name="currency_id" ref="GBP"/>
         </record>
         <record id="um" model="res.country">
@@ -1186,52 +1406,62 @@
         <record id="us" model="res.country">
             <field name="name">United States</field>
             <field name="code">us</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/us.png"></field>
             <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s, %(state_code)s %(zip)s\n%(country_name)s'" />
             <field name="currency_id" ref="USD"/>
         </record>
         <record id="uy" model="res.country">
             <field name="name">Uruguay</field>
             <field name="code">uy</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/uy.png"></field>
             <field name="currency_id" ref="UYP"/>
         </record>
         <record id="uz" model="res.country">
             <field name="name">Uzbekistan</field>
             <field name="code">uz</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/uz.png"></field>
             <field name="currency_id" ref="UZS"/>
         </record>
         <record id="va" model="res.country">
             <field name="name">Holy See (Vatican City State)</field>
             <field name="code">va</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/va.png"></field>
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="vc" model="res.country">
             <field name="name">Saint Vincent &amp; Grenadines</field>
             <field name="code">vc</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/vc.png"></field>
             <field name="currency_id" ref="XCD"/>
         </record>
         <record id="ve" model="res.country">
             <field name="name">Venezuela</field>
             <field name="code">ve</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ve.png"></field>
             <field name="currency_id" ref="VEF"/>
         </record>
         <record id="vg" model="res.country">
             <field name="name">Virgin Islands (British)</field>
             <field name="code">vg</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/vg.png"></field>
             <field name="currency_id" ref="USD"/>
         </record>
         <record id="vi" model="res.country">
             <field name="name">Virgin Islands (USA)</field>
             <field name="code">vi</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/vi.png"></field>
             <field name="currency_id" ref="USD"/>
         </record>
         <record id="vn" model="res.country">
             <field name="name">Vietnam</field>
             <field name="code">vn</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/vn.png"></field>
             <field name="currency_id" ref="VND"/>
         </record>
         <record id="vu" model="res.country">
             <field name="name">Vanuatu</field>
             <field name="code">vu</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/vu.png"></field>
             <field name="currency_id" ref="VUV"/>
         </record>
         <record id="wf" model="res.country">
@@ -1242,11 +1472,13 @@
         <record id="ws" model="res.country">
             <field name="name">Samoa</field>
             <field name="code">ws</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ws.png"></field>
             <field name="currency_id" ref="WST"/>
         </record>
         <record id="ye" model="res.country">
             <field name="name">Yemen</field>
             <field name="code">ye</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/ye.png"></field>
             <field name="currency_id" ref="YER"/>
         </record>
         <record id="yt" model="res.country">
@@ -1262,11 +1494,13 @@
         <record id="za" model="res.country">
             <field name="name">South Africa</field>
             <field name="code">za</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/za.png"></field>
             <field name="currency_id" ref="ZAR"/>
         </record>
         <record id="zm" model="res.country">
             <field name="name">Zambia</field>
             <field name="code">zm</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/zm.png"></field>
             <field name="currency_id" ref="ZMK"/>
         </record>
 
@@ -1279,6 +1513,7 @@
         <record id="zw" model="res.country">
             <field name="name">Zimbabwe</field>
             <field name="code">zw</field>
+            <field name="image" type="base64" file="base/static/img/country_flags/zw.png"></field>
             <field name="currency_id" ref="ZWD"/>
         </record>
     </data>
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 @@
             <field name="model">res.country</field>
             <field name="arch" type="xml">
                 <form string="Country" version="7.0">
+                    <field name="image" widget="image" class="oe_avatar"/>
                     <group>
                         <group>
                             <field name="name"/>
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 1668cbda3c5..b85c49abf15 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -586,7 +586,7 @@ class groups_implied(osv.osv):
         res = super(groups_implied, self).write(cr, uid, ids, values, context)
         if values.get('users') or values.get('implied_ids'):
             # add all implied groups (to all users of each group)
-            for g in self.browse(cr, uid, ids):
+            for g in self.browse(cr, uid, ids, context=context):
                 gids = map(int, g.trans_implied_ids)
                 vals = {'users': [(4, u.id) for u in g.users]}
                 super(groups_implied, self).write(cr, uid, gids, vals, context)
diff --git a/openerp/addons/base/static/img/country_flags/ad.png b/openerp/addons/base/static/img/country_flags/ad.png
new file mode 100644
index 00000000000..3806c28c6d8
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ad.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ae.png b/openerp/addons/base/static/img/country_flags/ae.png
new file mode 100644
index 00000000000..4d5c0a3a657
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ae.png differ
diff --git a/openerp/addons/base/static/img/country_flags/af.png b/openerp/addons/base/static/img/country_flags/af.png
new file mode 100644
index 00000000000..299482a1fad
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/af.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ag.png b/openerp/addons/base/static/img/country_flags/ag.png
new file mode 100644
index 00000000000..29ec9e8ad1e
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ag.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ai.png b/openerp/addons/base/static/img/country_flags/ai.png
new file mode 100644
index 00000000000..343a6dfc294
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ai.png differ
diff --git a/openerp/addons/base/static/img/country_flags/al.png b/openerp/addons/base/static/img/country_flags/al.png
new file mode 100644
index 00000000000..0d1b5f87cb3
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/al.png differ
diff --git a/openerp/addons/base/static/img/country_flags/am.png b/openerp/addons/base/static/img/country_flags/am.png
new file mode 100644
index 00000000000..8023ad7a4b2
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/am.png differ
diff --git a/openerp/addons/base/static/img/country_flags/an.png b/openerp/addons/base/static/img/country_flags/an.png
new file mode 100644
index 00000000000..701d55fbda9
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/an.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ao.png b/openerp/addons/base/static/img/country_flags/ao.png
new file mode 100644
index 00000000000..b599322efb8
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ao.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ar.png b/openerp/addons/base/static/img/country_flags/ar.png
new file mode 100644
index 00000000000..943ebb2be73
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ar.png differ
diff --git a/openerp/addons/base/static/img/country_flags/as.png b/openerp/addons/base/static/img/country_flags/as.png
new file mode 100644
index 00000000000..068d34174b6
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/as.png differ
diff --git a/openerp/addons/base/static/img/country_flags/at.png b/openerp/addons/base/static/img/country_flags/at.png
new file mode 100644
index 00000000000..758147d4bbb
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/at.png differ
diff --git a/openerp/addons/base/static/img/country_flags/au.png b/openerp/addons/base/static/img/country_flags/au.png
new file mode 100644
index 00000000000..6e864267043
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/au.png differ
diff --git a/openerp/addons/base/static/img/country_flags/aw.png b/openerp/addons/base/static/img/country_flags/aw.png
new file mode 100644
index 00000000000..0f362bbb3fc
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/aw.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ax.png b/openerp/addons/base/static/img/country_flags/ax.png
new file mode 100644
index 00000000000..e546ec92d5b
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ax.png differ
diff --git a/openerp/addons/base/static/img/country_flags/az.png b/openerp/addons/base/static/img/country_flags/az.png
new file mode 100644
index 00000000000..334567372f2
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/az.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ba.png b/openerp/addons/base/static/img/country_flags/ba.png
new file mode 100644
index 00000000000..2abf146fc11
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ba.png differ
diff --git a/openerp/addons/base/static/img/country_flags/bb.png b/openerp/addons/base/static/img/country_flags/bb.png
new file mode 100644
index 00000000000..8fbafd7d12a
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/bb.png differ
diff --git a/openerp/addons/base/static/img/country_flags/bd.png b/openerp/addons/base/static/img/country_flags/bd.png
new file mode 100644
index 00000000000..1754328d655
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/bd.png differ
diff --git a/openerp/addons/base/static/img/country_flags/be.png b/openerp/addons/base/static/img/country_flags/be.png
new file mode 100644
index 00000000000..42e4ff638bc
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/be.png differ
diff --git a/openerp/addons/base/static/img/country_flags/bf.png b/openerp/addons/base/static/img/country_flags/bf.png
new file mode 100644
index 00000000000..bf69a1318e8
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/bf.png differ
diff --git a/openerp/addons/base/static/img/country_flags/bg.png b/openerp/addons/base/static/img/country_flags/bg.png
new file mode 100644
index 00000000000..dbe55253e01
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/bg.png differ
diff --git a/openerp/addons/base/static/img/country_flags/bh.png b/openerp/addons/base/static/img/country_flags/bh.png
new file mode 100644
index 00000000000..50944f1ee6f
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/bh.png differ
diff --git a/openerp/addons/base/static/img/country_flags/bi.png b/openerp/addons/base/static/img/country_flags/bi.png
new file mode 100644
index 00000000000..6a04c66cdbb
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/bi.png differ
diff --git a/openerp/addons/base/static/img/country_flags/bj.png b/openerp/addons/base/static/img/country_flags/bj.png
new file mode 100644
index 00000000000..aac7f881956
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/bj.png differ
diff --git a/openerp/addons/base/static/img/country_flags/bl.png b/openerp/addons/base/static/img/country_flags/bl.png
new file mode 100644
index 00000000000..8fdf4c45717
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/bl.png differ
diff --git a/openerp/addons/base/static/img/country_flags/bm.png b/openerp/addons/base/static/img/country_flags/bm.png
new file mode 100644
index 00000000000..47753a3c677
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/bm.png differ
diff --git a/openerp/addons/base/static/img/country_flags/bn.png b/openerp/addons/base/static/img/country_flags/bn.png
new file mode 100644
index 00000000000..97aa098d88f
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/bn.png differ
diff --git a/openerp/addons/base/static/img/country_flags/bo.png b/openerp/addons/base/static/img/country_flags/bo.png
new file mode 100644
index 00000000000..44a066b1601
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/bo.png differ
diff --git a/openerp/addons/base/static/img/country_flags/br.png b/openerp/addons/base/static/img/country_flags/br.png
new file mode 100644
index 00000000000..7231f543ffb
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/br.png differ
diff --git a/openerp/addons/base/static/img/country_flags/bs.png b/openerp/addons/base/static/img/country_flags/bs.png
new file mode 100644
index 00000000000..d7482884694
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/bs.png differ
diff --git a/openerp/addons/base/static/img/country_flags/bt.png b/openerp/addons/base/static/img/country_flags/bt.png
new file mode 100644
index 00000000000..7f889b3c4b7
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/bt.png differ
diff --git a/openerp/addons/base/static/img/country_flags/bw.png b/openerp/addons/base/static/img/country_flags/bw.png
new file mode 100644
index 00000000000..f3bcf5663ef
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/bw.png differ
diff --git a/openerp/addons/base/static/img/country_flags/by.png b/openerp/addons/base/static/img/country_flags/by.png
new file mode 100644
index 00000000000..fe37c575ac4
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/by.png differ
diff --git a/openerp/addons/base/static/img/country_flags/bz.png b/openerp/addons/base/static/img/country_flags/bz.png
new file mode 100644
index 00000000000..bbb9903a237
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/bz.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ca.png b/openerp/addons/base/static/img/country_flags/ca.png
new file mode 100644
index 00000000000..12807f498ec
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ca.png differ
diff --git a/openerp/addons/base/static/img/country_flags/cc.png b/openerp/addons/base/static/img/country_flags/cc.png
new file mode 100644
index 00000000000..84ccc4ecaeb
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/cc.png differ
diff --git a/openerp/addons/base/static/img/country_flags/cd.png b/openerp/addons/base/static/img/country_flags/cd.png
new file mode 100644
index 00000000000..e96bce99ea7
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/cd.png differ
diff --git a/openerp/addons/base/static/img/country_flags/cf.png b/openerp/addons/base/static/img/country_flags/cf.png
new file mode 100644
index 00000000000..366d4cb55e5
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/cf.png differ
diff --git a/openerp/addons/base/static/img/country_flags/cg.png b/openerp/addons/base/static/img/country_flags/cg.png
new file mode 100644
index 00000000000..e049d47c408
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/cg.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ch.png b/openerp/addons/base/static/img/country_flags/ch.png
new file mode 100644
index 00000000000..815b6664b49
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ch.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ci.png b/openerp/addons/base/static/img/country_flags/ci.png
new file mode 100644
index 00000000000..61e92e63a9d
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ci.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ck.png b/openerp/addons/base/static/img/country_flags/ck.png
new file mode 100644
index 00000000000..fb487762817
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ck.png differ
diff --git a/openerp/addons/base/static/img/country_flags/cl.png b/openerp/addons/base/static/img/country_flags/cl.png
new file mode 100644
index 00000000000..5ad2daaf25c
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/cl.png differ
diff --git a/openerp/addons/base/static/img/country_flags/cm.png b/openerp/addons/base/static/img/country_flags/cm.png
new file mode 100644
index 00000000000..80a639ce7dc
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/cm.png differ
diff --git a/openerp/addons/base/static/img/country_flags/cn.png b/openerp/addons/base/static/img/country_flags/cn.png
new file mode 100644
index 00000000000..5b28787b636
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/cn.png differ
diff --git a/openerp/addons/base/static/img/country_flags/co.png b/openerp/addons/base/static/img/country_flags/co.png
new file mode 100644
index 00000000000..53609723452
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/co.png differ
diff --git a/openerp/addons/base/static/img/country_flags/cr.png b/openerp/addons/base/static/img/country_flags/cr.png
new file mode 100644
index 00000000000..40ee573607b
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/cr.png differ
diff --git a/openerp/addons/base/static/img/country_flags/cu.png b/openerp/addons/base/static/img/country_flags/cu.png
new file mode 100644
index 00000000000..31c2bf7dd0c
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/cu.png differ
diff --git a/openerp/addons/base/static/img/country_flags/cv.png b/openerp/addons/base/static/img/country_flags/cv.png
new file mode 100644
index 00000000000..d4fd1c54552
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/cv.png differ
diff --git a/openerp/addons/base/static/img/country_flags/cw.png b/openerp/addons/base/static/img/country_flags/cw.png
new file mode 100644
index 00000000000..71fb770b24c
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/cw.png differ
diff --git a/openerp/addons/base/static/img/country_flags/cx.png b/openerp/addons/base/static/img/country_flags/cx.png
new file mode 100644
index 00000000000..d093d2e8b3b
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/cx.png differ
diff --git a/openerp/addons/base/static/img/country_flags/cy.png b/openerp/addons/base/static/img/country_flags/cy.png
new file mode 100644
index 00000000000..abbf15ce0e3
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/cy.png differ
diff --git a/openerp/addons/base/static/img/country_flags/cz.png b/openerp/addons/base/static/img/country_flags/cz.png
new file mode 100644
index 00000000000..bd3cacfe4bb
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/cz.png differ
diff --git a/openerp/addons/base/static/img/country_flags/de.png b/openerp/addons/base/static/img/country_flags/de.png
new file mode 100644
index 00000000000..a479fee6662
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/de.png differ
diff --git a/openerp/addons/base/static/img/country_flags/dj.png b/openerp/addons/base/static/img/country_flags/dj.png
new file mode 100644
index 00000000000..9ac6493eff3
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/dj.png differ
diff --git a/openerp/addons/base/static/img/country_flags/dk.png b/openerp/addons/base/static/img/country_flags/dk.png
new file mode 100644
index 00000000000..d2882e82a16
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/dk.png differ
diff --git a/openerp/addons/base/static/img/country_flags/dm.png b/openerp/addons/base/static/img/country_flags/dm.png
new file mode 100644
index 00000000000..f70973854b4
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/dm.png differ
diff --git a/openerp/addons/base/static/img/country_flags/do.png b/openerp/addons/base/static/img/country_flags/do.png
new file mode 100644
index 00000000000..24614878d56
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/do.png differ
diff --git a/openerp/addons/base/static/img/country_flags/dz.png b/openerp/addons/base/static/img/country_flags/dz.png
new file mode 100644
index 00000000000..86c293aebef
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/dz.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ec.png b/openerp/addons/base/static/img/country_flags/ec.png
new file mode 100644
index 00000000000..15ba2c3f2e9
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ec.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ee.png b/openerp/addons/base/static/img/country_flags/ee.png
new file mode 100644
index 00000000000..fbf210ef42e
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ee.png differ
diff --git a/openerp/addons/base/static/img/country_flags/eg.png b/openerp/addons/base/static/img/country_flags/eg.png
new file mode 100644
index 00000000000..0d8132a03a9
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/eg.png differ
diff --git a/openerp/addons/base/static/img/country_flags/er.png b/openerp/addons/base/static/img/country_flags/er.png
new file mode 100644
index 00000000000..c89d5a95644
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/er.png differ
diff --git a/openerp/addons/base/static/img/country_flags/es.png b/openerp/addons/base/static/img/country_flags/es.png
new file mode 100644
index 00000000000..ea384d4d516
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/es.png differ
diff --git a/openerp/addons/base/static/img/country_flags/et.png b/openerp/addons/base/static/img/country_flags/et.png
new file mode 100644
index 00000000000..d2d1e4255ee
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/et.png differ
diff --git a/openerp/addons/base/static/img/country_flags/fi.png b/openerp/addons/base/static/img/country_flags/fi.png
new file mode 100644
index 00000000000..195226a5042
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/fi.png differ
diff --git a/openerp/addons/base/static/img/country_flags/fj.png b/openerp/addons/base/static/img/country_flags/fj.png
new file mode 100644
index 00000000000..daee24a3746
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/fj.png differ
diff --git a/openerp/addons/base/static/img/country_flags/fk.png b/openerp/addons/base/static/img/country_flags/fk.png
new file mode 100644
index 00000000000..f202be3118f
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/fk.png differ
diff --git a/openerp/addons/base/static/img/country_flags/fm.png b/openerp/addons/base/static/img/country_flags/fm.png
new file mode 100644
index 00000000000..c157b518251
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/fm.png differ
diff --git a/openerp/addons/base/static/img/country_flags/fo.png b/openerp/addons/base/static/img/country_flags/fo.png
new file mode 100644
index 00000000000..eceef2d8d73
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/fo.png differ
diff --git a/openerp/addons/base/static/img/country_flags/fr.png b/openerp/addons/base/static/img/country_flags/fr.png
new file mode 100644
index 00000000000..8fdf4c45717
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/fr.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ga.png b/openerp/addons/base/static/img/country_flags/ga.png
new file mode 100644
index 00000000000..d4a2b71f2d5
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ga.png differ
diff --git a/openerp/addons/base/static/img/country_flags/gb.png b/openerp/addons/base/static/img/country_flags/gb.png
new file mode 100644
index 00000000000..bf90e9b8b9c
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/gb.png differ
diff --git a/openerp/addons/base/static/img/country_flags/gd.png b/openerp/addons/base/static/img/country_flags/gd.png
new file mode 100644
index 00000000000..807755f284f
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/gd.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ge.png b/openerp/addons/base/static/img/country_flags/ge.png
new file mode 100644
index 00000000000..6e813b3b310
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ge.png differ
diff --git a/openerp/addons/base/static/img/country_flags/gg.png b/openerp/addons/base/static/img/country_flags/gg.png
new file mode 100644
index 00000000000..20f3b15c0fd
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/gg.png differ
diff --git a/openerp/addons/base/static/img/country_flags/gh.png b/openerp/addons/base/static/img/country_flags/gh.png
new file mode 100644
index 00000000000..5eb077085c7
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/gh.png differ
diff --git a/openerp/addons/base/static/img/country_flags/gi.png b/openerp/addons/base/static/img/country_flags/gi.png
new file mode 100644
index 00000000000..79dbd3333d5
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/gi.png differ
diff --git a/openerp/addons/base/static/img/country_flags/gl.png b/openerp/addons/base/static/img/country_flags/gl.png
new file mode 100644
index 00000000000..f7e82893f1a
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/gl.png differ
diff --git a/openerp/addons/base/static/img/country_flags/gm.png b/openerp/addons/base/static/img/country_flags/gm.png
new file mode 100644
index 00000000000..8c539e2d23c
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/gm.png differ
diff --git a/openerp/addons/base/static/img/country_flags/gn.png b/openerp/addons/base/static/img/country_flags/gn.png
new file mode 100644
index 00000000000..c0d4c72c87a
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/gn.png differ
diff --git a/openerp/addons/base/static/img/country_flags/gq.png b/openerp/addons/base/static/img/country_flags/gq.png
new file mode 100644
index 00000000000..375a7b78f62
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/gq.png differ
diff --git a/openerp/addons/base/static/img/country_flags/gr.png b/openerp/addons/base/static/img/country_flags/gr.png
new file mode 100644
index 00000000000..7c4471b86e2
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/gr.png differ
diff --git a/openerp/addons/base/static/img/country_flags/gs.png b/openerp/addons/base/static/img/country_flags/gs.png
new file mode 100644
index 00000000000..b0269d14acf
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/gs.png differ
diff --git a/openerp/addons/base/static/img/country_flags/gt.png b/openerp/addons/base/static/img/country_flags/gt.png
new file mode 100644
index 00000000000..6d6998c4c6c
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/gt.png differ
diff --git a/openerp/addons/base/static/img/country_flags/gu.png b/openerp/addons/base/static/img/country_flags/gu.png
new file mode 100644
index 00000000000..847d59520f5
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/gu.png differ
diff --git a/openerp/addons/base/static/img/country_flags/gw.png b/openerp/addons/base/static/img/country_flags/gw.png
new file mode 100644
index 00000000000..88ba1d8a531
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/gw.png differ
diff --git a/openerp/addons/base/static/img/country_flags/gy.png b/openerp/addons/base/static/img/country_flags/gy.png
new file mode 100644
index 00000000000..de7bef45285
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/gy.png differ
diff --git a/openerp/addons/base/static/img/country_flags/hk.png b/openerp/addons/base/static/img/country_flags/hk.png
new file mode 100644
index 00000000000..62f6453b8b7
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/hk.png differ
diff --git a/openerp/addons/base/static/img/country_flags/hn.png b/openerp/addons/base/static/img/country_flags/hn.png
new file mode 100644
index 00000000000..e1201738ca7
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/hn.png differ
diff --git a/openerp/addons/base/static/img/country_flags/hr.png b/openerp/addons/base/static/img/country_flags/hr.png
new file mode 100644
index 00000000000..5e24e9a52d4
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/hr.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ht.png b/openerp/addons/base/static/img/country_flags/ht.png
new file mode 100644
index 00000000000..58ec58e41be
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ht.png differ
diff --git a/openerp/addons/base/static/img/country_flags/hu.png b/openerp/addons/base/static/img/country_flags/hu.png
new file mode 100644
index 00000000000..e1f237f802d
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/hu.png differ
diff --git a/openerp/addons/base/static/img/country_flags/id.png b/openerp/addons/base/static/img/country_flags/id.png
new file mode 100644
index 00000000000..1dc8207c288
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/id.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ie.png b/openerp/addons/base/static/img/country_flags/ie.png
new file mode 100644
index 00000000000..fb8cf9382f1
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ie.png differ
diff --git a/openerp/addons/base/static/img/country_flags/il.png b/openerp/addons/base/static/img/country_flags/il.png
new file mode 100644
index 00000000000..c4c4f21e128
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/il.png differ
diff --git a/openerp/addons/base/static/img/country_flags/im.png b/openerp/addons/base/static/img/country_flags/im.png
new file mode 100644
index 00000000000..6befe9efe3a
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/im.png differ
diff --git a/openerp/addons/base/static/img/country_flags/in.png b/openerp/addons/base/static/img/country_flags/in.png
new file mode 100644
index 00000000000..a0daccd9397
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/in.png differ
diff --git a/openerp/addons/base/static/img/country_flags/io.png b/openerp/addons/base/static/img/country_flags/io.png
new file mode 100644
index 00000000000..a112651851b
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/io.png differ
diff --git a/openerp/addons/base/static/img/country_flags/iq.png b/openerp/addons/base/static/img/country_flags/iq.png
new file mode 100644
index 00000000000..1095c9d312a
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/iq.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ir.png b/openerp/addons/base/static/img/country_flags/ir.png
new file mode 100644
index 00000000000..8b9c5fac4d0
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ir.png differ
diff --git a/openerp/addons/base/static/img/country_flags/iran.png b/openerp/addons/base/static/img/country_flags/iran.png
new file mode 100644
index 00000000000..9ca5513ace0
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/iran.png differ
diff --git a/openerp/addons/base/static/img/country_flags/is.png b/openerp/addons/base/static/img/country_flags/is.png
new file mode 100644
index 00000000000..c5d0ffb1ec3
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/is.png differ
diff --git a/openerp/addons/base/static/img/country_flags/it.png b/openerp/addons/base/static/img/country_flags/it.png
new file mode 100644
index 00000000000..1cd74ec0ee0
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/it.png differ
diff --git a/openerp/addons/base/static/img/country_flags/je.png b/openerp/addons/base/static/img/country_flags/je.png
new file mode 100644
index 00000000000..ca62fe471e3
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/je.png differ
diff --git a/openerp/addons/base/static/img/country_flags/jm.png b/openerp/addons/base/static/img/country_flags/jm.png
new file mode 100644
index 00000000000..7458372eea8
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/jm.png differ
diff --git a/openerp/addons/base/static/img/country_flags/jo.png b/openerp/addons/base/static/img/country_flags/jo.png
new file mode 100644
index 00000000000..b5e88a3c251
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/jo.png differ
diff --git a/openerp/addons/base/static/img/country_flags/jp.png b/openerp/addons/base/static/img/country_flags/jp.png
new file mode 100644
index 00000000000..21f38c35847
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/jp.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ke.png b/openerp/addons/base/static/img/country_flags/ke.png
new file mode 100644
index 00000000000..57ef9e3f20b
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ke.png differ
diff --git a/openerp/addons/base/static/img/country_flags/kg.png b/openerp/addons/base/static/img/country_flags/kg.png
new file mode 100644
index 00000000000..1b550f6cfaa
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/kg.png differ
diff --git a/openerp/addons/base/static/img/country_flags/kh.png b/openerp/addons/base/static/img/country_flags/kh.png
new file mode 100644
index 00000000000..299ad93e08e
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/kh.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ki.png b/openerp/addons/base/static/img/country_flags/ki.png
new file mode 100644
index 00000000000..cf730409013
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ki.png differ
diff --git a/openerp/addons/base/static/img/country_flags/km.png b/openerp/addons/base/static/img/country_flags/km.png
new file mode 100644
index 00000000000..df5c343fce5
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/km.png differ
diff --git a/openerp/addons/base/static/img/country_flags/kn.png b/openerp/addons/base/static/img/country_flags/kn.png
new file mode 100644
index 00000000000..9ecfa0ab9c4
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/kn.png differ
diff --git a/openerp/addons/base/static/img/country_flags/kp.png b/openerp/addons/base/static/img/country_flags/kp.png
new file mode 100644
index 00000000000..14db96ff065
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/kp.png differ
diff --git a/openerp/addons/base/static/img/country_flags/kr.png b/openerp/addons/base/static/img/country_flags/kr.png
new file mode 100644
index 00000000000..8b66b25f75d
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/kr.png differ
diff --git a/openerp/addons/base/static/img/country_flags/kw.png b/openerp/addons/base/static/img/country_flags/kw.png
new file mode 100644
index 00000000000..33c04a64f70
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/kw.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ky.png b/openerp/addons/base/static/img/country_flags/ky.png
new file mode 100644
index 00000000000..84279c83bcf
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ky.png differ
diff --git a/openerp/addons/base/static/img/country_flags/kz.png b/openerp/addons/base/static/img/country_flags/kz.png
new file mode 100644
index 00000000000..f756682c74f
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/kz.png differ
diff --git a/openerp/addons/base/static/img/country_flags/la.png b/openerp/addons/base/static/img/country_flags/la.png
new file mode 100644
index 00000000000..27d4e2be994
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/la.png differ
diff --git a/openerp/addons/base/static/img/country_flags/lb.png b/openerp/addons/base/static/img/country_flags/lb.png
new file mode 100644
index 00000000000..8df863b7ca1
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/lb.png differ
diff --git a/openerp/addons/base/static/img/country_flags/lc.png b/openerp/addons/base/static/img/country_flags/lc.png
new file mode 100644
index 00000000000..15af8fee7ff
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/lc.png differ
diff --git a/openerp/addons/base/static/img/country_flags/li.png b/openerp/addons/base/static/img/country_flags/li.png
new file mode 100644
index 00000000000..f86197e9af6
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/li.png differ
diff --git a/openerp/addons/base/static/img/country_flags/lk.png b/openerp/addons/base/static/img/country_flags/lk.png
new file mode 100644
index 00000000000..46bab54aabc
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/lk.png differ
diff --git a/openerp/addons/base/static/img/country_flags/lr.png b/openerp/addons/base/static/img/country_flags/lr.png
new file mode 100644
index 00000000000..3f2cc830120
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/lr.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ls.png b/openerp/addons/base/static/img/country_flags/ls.png
new file mode 100644
index 00000000000..6b6d6b17531
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ls.png differ
diff --git a/openerp/addons/base/static/img/country_flags/lt.png b/openerp/addons/base/static/img/country_flags/lt.png
new file mode 100644
index 00000000000..a25f6a31aae
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/lt.png differ
diff --git a/openerp/addons/base/static/img/country_flags/lu.png b/openerp/addons/base/static/img/country_flags/lu.png
new file mode 100644
index 00000000000..2899c7bbba1
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/lu.png differ
diff --git a/openerp/addons/base/static/img/country_flags/lv.png b/openerp/addons/base/static/img/country_flags/lv.png
new file mode 100644
index 00000000000..674a7c6c9b0
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/lv.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ly.png b/openerp/addons/base/static/img/country_flags/ly.png
new file mode 100644
index 00000000000..0e4eb2a5627
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ly.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ma.png b/openerp/addons/base/static/img/country_flags/ma.png
new file mode 100644
index 00000000000..b43ea8c8597
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ma.png differ
diff --git a/openerp/addons/base/static/img/country_flags/mc.png b/openerp/addons/base/static/img/country_flags/mc.png
new file mode 100644
index 00000000000..119460a5e7f
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/mc.png differ
diff --git a/openerp/addons/base/static/img/country_flags/md.png b/openerp/addons/base/static/img/country_flags/md.png
new file mode 100644
index 00000000000..a05ba191843
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/md.png differ
diff --git a/openerp/addons/base/static/img/country_flags/me.png b/openerp/addons/base/static/img/country_flags/me.png
new file mode 100644
index 00000000000..aead438a92f
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/me.png differ
diff --git a/openerp/addons/base/static/img/country_flags/mg.png b/openerp/addons/base/static/img/country_flags/mg.png
new file mode 100644
index 00000000000..75242401c76
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/mg.png differ
diff --git a/openerp/addons/base/static/img/country_flags/mh.png b/openerp/addons/base/static/img/country_flags/mh.png
new file mode 100644
index 00000000000..4cd0d244a49
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/mh.png differ
diff --git a/openerp/addons/base/static/img/country_flags/mk.png b/openerp/addons/base/static/img/country_flags/mk.png
new file mode 100644
index 00000000000..f313b092e4c
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/mk.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ml.png b/openerp/addons/base/static/img/country_flags/ml.png
new file mode 100644
index 00000000000..eb5579c08d5
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ml.png differ
diff --git a/openerp/addons/base/static/img/country_flags/mm.png b/openerp/addons/base/static/img/country_flags/mm.png
new file mode 100644
index 00000000000..6723bbb3b03
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/mm.png differ
diff --git a/openerp/addons/base/static/img/country_flags/mn.png b/openerp/addons/base/static/img/country_flags/mn.png
new file mode 100644
index 00000000000..607caac7659
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/mn.png differ
diff --git a/openerp/addons/base/static/img/country_flags/mo.png b/openerp/addons/base/static/img/country_flags/mo.png
new file mode 100644
index 00000000000..f64c674be59
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/mo.png differ
diff --git a/openerp/addons/base/static/img/country_flags/mp.png b/openerp/addons/base/static/img/country_flags/mp.png
new file mode 100644
index 00000000000..3453b270cc0
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/mp.png differ
diff --git a/openerp/addons/base/static/img/country_flags/mq.png b/openerp/addons/base/static/img/country_flags/mq.png
new file mode 100644
index 00000000000..54ba3e92b83
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/mq.png differ
diff --git a/openerp/addons/base/static/img/country_flags/mr.png b/openerp/addons/base/static/img/country_flags/mr.png
new file mode 100644
index 00000000000..76b032b47b8
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/mr.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ms.png b/openerp/addons/base/static/img/country_flags/ms.png
new file mode 100644
index 00000000000..4f291816856
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ms.png differ
diff --git a/openerp/addons/base/static/img/country_flags/mt.png b/openerp/addons/base/static/img/country_flags/mt.png
new file mode 100644
index 00000000000..dbdcbf9d503
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/mt.png differ
diff --git a/openerp/addons/base/static/img/country_flags/mu.png b/openerp/addons/base/static/img/country_flags/mu.png
new file mode 100644
index 00000000000..6eae60e796b
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/mu.png differ
diff --git a/openerp/addons/base/static/img/country_flags/mv.png b/openerp/addons/base/static/img/country_flags/mv.png
new file mode 100644
index 00000000000..6d2597d66b1
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/mv.png differ
diff --git a/openerp/addons/base/static/img/country_flags/mw.png b/openerp/addons/base/static/img/country_flags/mw.png
new file mode 100644
index 00000000000..f2f3454334b
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/mw.png differ
diff --git a/openerp/addons/base/static/img/country_flags/mx.png b/openerp/addons/base/static/img/country_flags/mx.png
new file mode 100644
index 00000000000..4c5c32d0589
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/mx.png differ
diff --git a/openerp/addons/base/static/img/country_flags/my.png b/openerp/addons/base/static/img/country_flags/my.png
new file mode 100644
index 00000000000..7ee43cc1925
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/my.png differ
diff --git a/openerp/addons/base/static/img/country_flags/mz.png b/openerp/addons/base/static/img/country_flags/mz.png
new file mode 100644
index 00000000000..4d47b29b02b
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/mz.png differ
diff --git a/openerp/addons/base/static/img/country_flags/na.png b/openerp/addons/base/static/img/country_flags/na.png
new file mode 100644
index 00000000000..0e09fd2f12a
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/na.png differ
diff --git a/openerp/addons/base/static/img/country_flags/nc.png b/openerp/addons/base/static/img/country_flags/nc.png
new file mode 100644
index 00000000000..5e9b0ca9f73
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/nc.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ne.png b/openerp/addons/base/static/img/country_flags/ne.png
new file mode 100644
index 00000000000..e96acdedbc0
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ne.png differ
diff --git a/openerp/addons/base/static/img/country_flags/nf.png b/openerp/addons/base/static/img/country_flags/nf.png
new file mode 100644
index 00000000000..2bb62238166
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/nf.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ng.png b/openerp/addons/base/static/img/country_flags/ng.png
new file mode 100644
index 00000000000..052ec0e9761
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ng.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ni.png b/openerp/addons/base/static/img/country_flags/ni.png
new file mode 100644
index 00000000000..4e455f6777e
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ni.png differ
diff --git a/openerp/addons/base/static/img/country_flags/nl.png b/openerp/addons/base/static/img/country_flags/nl.png
new file mode 100644
index 00000000000..1b5938306f5
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/nl.png differ
diff --git a/openerp/addons/base/static/img/country_flags/no.png b/openerp/addons/base/static/img/country_flags/no.png
new file mode 100644
index 00000000000..bd2840d96c1
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/no.png differ
diff --git a/openerp/addons/base/static/img/country_flags/np.png b/openerp/addons/base/static/img/country_flags/np.png
new file mode 100644
index 00000000000..4c4beda56fe
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/np.png differ
diff --git a/openerp/addons/base/static/img/country_flags/nr.png b/openerp/addons/base/static/img/country_flags/nr.png
new file mode 100644
index 00000000000..923bea03faf
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/nr.png differ
diff --git a/openerp/addons/base/static/img/country_flags/nu.png b/openerp/addons/base/static/img/country_flags/nu.png
new file mode 100644
index 00000000000..1f745218efa
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/nu.png differ
diff --git a/openerp/addons/base/static/img/country_flags/nz.png b/openerp/addons/base/static/img/country_flags/nz.png
new file mode 100644
index 00000000000..6d669ae696e
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/nz.png differ
diff --git a/openerp/addons/base/static/img/country_flags/om.png b/openerp/addons/base/static/img/country_flags/om.png
new file mode 100644
index 00000000000..5c61b15a0a5
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/om.png differ
diff --git a/openerp/addons/base/static/img/country_flags/pa.png b/openerp/addons/base/static/img/country_flags/pa.png
new file mode 100644
index 00000000000..b4857d13574
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/pa.png differ
diff --git a/openerp/addons/base/static/img/country_flags/pe.png b/openerp/addons/base/static/img/country_flags/pe.png
new file mode 100644
index 00000000000..14f7e1c86d3
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/pe.png differ
diff --git a/openerp/addons/base/static/img/country_flags/pf.png b/openerp/addons/base/static/img/country_flags/pf.png
new file mode 100644
index 00000000000..db134fc81c4
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/pf.png differ
diff --git a/openerp/addons/base/static/img/country_flags/pg.png b/openerp/addons/base/static/img/country_flags/pg.png
new file mode 100644
index 00000000000..56e85161956
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/pg.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ph.png b/openerp/addons/base/static/img/country_flags/ph.png
new file mode 100644
index 00000000000..e74d917eb3d
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ph.png differ
diff --git a/openerp/addons/base/static/img/country_flags/pk.png b/openerp/addons/base/static/img/country_flags/pk.png
new file mode 100644
index 00000000000..adea341ccec
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/pk.png differ
diff --git a/openerp/addons/base/static/img/country_flags/pl.png b/openerp/addons/base/static/img/country_flags/pl.png
new file mode 100644
index 00000000000..4d0f9d19f65
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/pl.png differ
diff --git a/openerp/addons/base/static/img/country_flags/pm.png b/openerp/addons/base/static/img/country_flags/pm.png
new file mode 100644
index 00000000000..b34299ce47b
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/pm.png differ
diff --git a/openerp/addons/base/static/img/country_flags/pn.png b/openerp/addons/base/static/img/country_flags/pn.png
new file mode 100644
index 00000000000..890c9593342
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/pn.png differ
diff --git a/openerp/addons/base/static/img/country_flags/pr.png b/openerp/addons/base/static/img/country_flags/pr.png
new file mode 100644
index 00000000000..5e2c7c6078a
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/pr.png differ
diff --git a/openerp/addons/base/static/img/country_flags/pt.png b/openerp/addons/base/static/img/country_flags/pt.png
new file mode 100644
index 00000000000..5fe2ae2cf63
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/pt.png differ
diff --git a/openerp/addons/base/static/img/country_flags/pw.png b/openerp/addons/base/static/img/country_flags/pw.png
new file mode 100644
index 00000000000..fe8ef26d2e6
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/pw.png differ
diff --git a/openerp/addons/base/static/img/country_flags/py.png b/openerp/addons/base/static/img/country_flags/py.png
new file mode 100644
index 00000000000..0a04748f182
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/py.png differ
diff --git a/openerp/addons/base/static/img/country_flags/qa.png b/openerp/addons/base/static/img/country_flags/qa.png
new file mode 100644
index 00000000000..35c44fc076d
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/qa.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ro.png b/openerp/addons/base/static/img/country_flags/ro.png
new file mode 100644
index 00000000000..0cb3f29f11d
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ro.png differ
diff --git a/openerp/addons/base/static/img/country_flags/rs.png b/openerp/addons/base/static/img/country_flags/rs.png
new file mode 100644
index 00000000000..6f7d83de2e5
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/rs.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ru.png b/openerp/addons/base/static/img/country_flags/ru.png
new file mode 100644
index 00000000000..1a99c506234
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ru.png differ
diff --git a/openerp/addons/base/static/img/country_flags/rw.png b/openerp/addons/base/static/img/country_flags/rw.png
new file mode 100644
index 00000000000..2abba014617
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/rw.png differ
diff --git a/openerp/addons/base/static/img/country_flags/sa.png b/openerp/addons/base/static/img/country_flags/sa.png
new file mode 100644
index 00000000000..6c106a540a1
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/sa.png differ
diff --git a/openerp/addons/base/static/img/country_flags/sb.png b/openerp/addons/base/static/img/country_flags/sb.png
new file mode 100644
index 00000000000..a23c5bc58ba
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/sb.png differ
diff --git a/openerp/addons/base/static/img/country_flags/sc.png b/openerp/addons/base/static/img/country_flags/sc.png
new file mode 100644
index 00000000000..d1acc28403e
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/sc.png differ
diff --git a/openerp/addons/base/static/img/country_flags/sd.png b/openerp/addons/base/static/img/country_flags/sd.png
new file mode 100644
index 00000000000..e7694590811
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/sd.png differ
diff --git a/openerp/addons/base/static/img/country_flags/se.png b/openerp/addons/base/static/img/country_flags/se.png
new file mode 100644
index 00000000000..a30498df565
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/se.png differ
diff --git a/openerp/addons/base/static/img/country_flags/sg.png b/openerp/addons/base/static/img/country_flags/sg.png
new file mode 100644
index 00000000000..16bb5445c58
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/sg.png differ
diff --git a/openerp/addons/base/static/img/country_flags/sh.png b/openerp/addons/base/static/img/country_flags/sh.png
new file mode 100644
index 00000000000..cb48a6a2e2f
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/sh.png differ
diff --git a/openerp/addons/base/static/img/country_flags/si.png b/openerp/addons/base/static/img/country_flags/si.png
new file mode 100644
index 00000000000..b749349245d
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/si.png differ
diff --git a/openerp/addons/base/static/img/country_flags/sk.png b/openerp/addons/base/static/img/country_flags/sk.png
new file mode 100644
index 00000000000..1609f2c8d9a
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/sk.png differ
diff --git a/openerp/addons/base/static/img/country_flags/sl.png b/openerp/addons/base/static/img/country_flags/sl.png
new file mode 100644
index 00000000000..ef67f96c22a
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/sl.png differ
diff --git a/openerp/addons/base/static/img/country_flags/sm.png b/openerp/addons/base/static/img/country_flags/sm.png
new file mode 100644
index 00000000000..b515c509030
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/sm.png differ
diff --git a/openerp/addons/base/static/img/country_flags/sn.png b/openerp/addons/base/static/img/country_flags/sn.png
new file mode 100644
index 00000000000..2cb1d0a36c3
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/sn.png differ
diff --git a/openerp/addons/base/static/img/country_flags/so.png b/openerp/addons/base/static/img/country_flags/so.png
new file mode 100644
index 00000000000..d6772bdd702
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/so.png differ
diff --git a/openerp/addons/base/static/img/country_flags/sr.png b/openerp/addons/base/static/img/country_flags/sr.png
new file mode 100644
index 00000000000..9be5dc7b952
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/sr.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ss.png b/openerp/addons/base/static/img/country_flags/ss.png
new file mode 100644
index 00000000000..a07a513e189
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ss.png differ
diff --git a/openerp/addons/base/static/img/country_flags/st.png b/openerp/addons/base/static/img/country_flags/st.png
new file mode 100644
index 00000000000..b3abd9852f3
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/st.png differ
diff --git a/openerp/addons/base/static/img/country_flags/sv.png b/openerp/addons/base/static/img/country_flags/sv.png
new file mode 100644
index 00000000000..4685c62e305
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/sv.png differ
diff --git a/openerp/addons/base/static/img/country_flags/sx.png b/openerp/addons/base/static/img/country_flags/sx.png
new file mode 100644
index 00000000000..d8d40f75924
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/sx.png differ
diff --git a/openerp/addons/base/static/img/country_flags/sy.png b/openerp/addons/base/static/img/country_flags/sy.png
new file mode 100644
index 00000000000..a45853957cc
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/sy.png differ
diff --git a/openerp/addons/base/static/img/country_flags/sz.png b/openerp/addons/base/static/img/country_flags/sz.png
new file mode 100644
index 00000000000..49b2a9360c1
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/sz.png differ
diff --git a/openerp/addons/base/static/img/country_flags/tc.png b/openerp/addons/base/static/img/country_flags/tc.png
new file mode 100644
index 00000000000..078b226810d
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/tc.png differ
diff --git a/openerp/addons/base/static/img/country_flags/td.png b/openerp/addons/base/static/img/country_flags/td.png
new file mode 100644
index 00000000000..2e8603a6012
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/td.png differ
diff --git a/openerp/addons/base/static/img/country_flags/tf.png b/openerp/addons/base/static/img/country_flags/tf.png
new file mode 100644
index 00000000000..945c7afb0b1
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/tf.png differ
diff --git a/openerp/addons/base/static/img/country_flags/tg.png b/openerp/addons/base/static/img/country_flags/tg.png
new file mode 100644
index 00000000000..3154c5cb830
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/tg.png differ
diff --git a/openerp/addons/base/static/img/country_flags/th.png b/openerp/addons/base/static/img/country_flags/th.png
new file mode 100644
index 00000000000..f39ce45eeee
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/th.png differ
diff --git a/openerp/addons/base/static/img/country_flags/tj.png b/openerp/addons/base/static/img/country_flags/tj.png
new file mode 100644
index 00000000000..15d59605186
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/tj.png differ
diff --git a/openerp/addons/base/static/img/country_flags/tk.png b/openerp/addons/base/static/img/country_flags/tk.png
new file mode 100644
index 00000000000..b191458e187
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/tk.png differ
diff --git a/openerp/addons/base/static/img/country_flags/tl.png b/openerp/addons/base/static/img/country_flags/tl.png
new file mode 100644
index 00000000000..0031a4e41f9
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/tl.png differ
diff --git a/openerp/addons/base/static/img/country_flags/tm.png b/openerp/addons/base/static/img/country_flags/tm.png
new file mode 100644
index 00000000000..6699276a8ed
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/tm.png differ
diff --git a/openerp/addons/base/static/img/country_flags/tn.png b/openerp/addons/base/static/img/country_flags/tn.png
new file mode 100644
index 00000000000..04587942bb7
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/tn.png differ
diff --git a/openerp/addons/base/static/img/country_flags/to.png b/openerp/addons/base/static/img/country_flags/to.png
new file mode 100644
index 00000000000..51a1556d5e9
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/to.png differ
diff --git a/openerp/addons/base/static/img/country_flags/tp.png b/openerp/addons/base/static/img/country_flags/tp.png
new file mode 100644
index 00000000000..2ec85c15394
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/tp.png differ
diff --git a/openerp/addons/base/static/img/country_flags/tr.png b/openerp/addons/base/static/img/country_flags/tr.png
new file mode 100644
index 00000000000..ebf2a31e807
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/tr.png differ
diff --git a/openerp/addons/base/static/img/country_flags/tt.png b/openerp/addons/base/static/img/country_flags/tt.png
new file mode 100644
index 00000000000..e49c3682a50
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/tt.png differ
diff --git a/openerp/addons/base/static/img/country_flags/tv.png b/openerp/addons/base/static/img/country_flags/tv.png
new file mode 100644
index 00000000000..ab10c93d5d7
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/tv.png differ
diff --git a/openerp/addons/base/static/img/country_flags/tz.png b/openerp/addons/base/static/img/country_flags/tz.png
new file mode 100644
index 00000000000..d4e99a62df7
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/tz.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ua.png b/openerp/addons/base/static/img/country_flags/ua.png
new file mode 100644
index 00000000000..57cf957010d
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ua.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ug.png b/openerp/addons/base/static/img/country_flags/ug.png
new file mode 100644
index 00000000000..908784213f0
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ug.png differ
diff --git a/openerp/addons/base/static/img/country_flags/us.png b/openerp/addons/base/static/img/country_flags/us.png
new file mode 100644
index 00000000000..801ef4e8abb
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/us.png differ
diff --git a/openerp/addons/base/static/img/country_flags/uy.png b/openerp/addons/base/static/img/country_flags/uy.png
new file mode 100644
index 00000000000..7af80710a3f
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/uy.png differ
diff --git a/openerp/addons/base/static/img/country_flags/uz.png b/openerp/addons/base/static/img/country_flags/uz.png
new file mode 100644
index 00000000000..54840bd935c
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/uz.png differ
diff --git a/openerp/addons/base/static/img/country_flags/va.png b/openerp/addons/base/static/img/country_flags/va.png
new file mode 100644
index 00000000000..28933fb7e04
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/va.png differ
diff --git a/openerp/addons/base/static/img/country_flags/vc.png b/openerp/addons/base/static/img/country_flags/vc.png
new file mode 100644
index 00000000000..62b9091dc9a
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/vc.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ve.png b/openerp/addons/base/static/img/country_flags/ve.png
new file mode 100644
index 00000000000..7ab81205f84
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ve.png differ
diff --git a/openerp/addons/base/static/img/country_flags/vg.png b/openerp/addons/base/static/img/country_flags/vg.png
new file mode 100644
index 00000000000..9a33f8cf9e6
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/vg.png differ
diff --git a/openerp/addons/base/static/img/country_flags/vi.png b/openerp/addons/base/static/img/country_flags/vi.png
new file mode 100644
index 00000000000..b6361f49e57
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/vi.png differ
diff --git a/openerp/addons/base/static/img/country_flags/vn.png b/openerp/addons/base/static/img/country_flags/vn.png
new file mode 100644
index 00000000000..25753977ec5
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/vn.png differ
diff --git a/openerp/addons/base/static/img/country_flags/vu.png b/openerp/addons/base/static/img/country_flags/vu.png
new file mode 100644
index 00000000000..124c7cf7b56
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/vu.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ws.png b/openerp/addons/base/static/img/country_flags/ws.png
new file mode 100644
index 00000000000..787354394c8
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ws.png differ
diff --git a/openerp/addons/base/static/img/country_flags/ye.png b/openerp/addons/base/static/img/country_flags/ye.png
new file mode 100644
index 00000000000..07c4c8ef1fb
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/ye.png differ
diff --git a/openerp/addons/base/static/img/country_flags/za.png b/openerp/addons/base/static/img/country_flags/za.png
new file mode 100644
index 00000000000..dc4fb4df547
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/za.png differ
diff --git a/openerp/addons/base/static/img/country_flags/zm.png b/openerp/addons/base/static/img/country_flags/zm.png
new file mode 100644
index 00000000000..6275c83148e
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/zm.png differ
diff --git a/openerp/addons/base/static/img/country_flags/zw.png b/openerp/addons/base/static/img/country_flags/zw.png
new file mode 100644
index 00000000000..de98aa7f4d8
Binary files /dev/null and b/openerp/addons/base/static/img/country_flags/zw.png differ
diff --git a/openerp/cli/server.py b/openerp/cli/server.py
index 42d920da9aa..e7ba695f19c 100644
--- a/openerp/cli/server.py
+++ b/openerp/cli/server.py
@@ -127,7 +127,6 @@ def main(args):
     check_root_user()
     openerp.tools.config.parse_config(args)
     check_postgres_user()
-    openerp.netsvc.init_logger()
     report_configuration()
 
     config = openerp.tools.config
diff --git a/openerp/http.py b/openerp/http.py
index 5876cdc6a9a..5f37afbc116 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -36,6 +36,7 @@ import werkzeug.wsgi
 
 import openerp
 from openerp.service import security, model as service_model
+from openerp.tools.func import lazy_property
 
 _logger = logging.getLogger(__name__)
 
@@ -286,7 +287,7 @@ class WebRequest(object):
         def checked_call(___dbname, *a, **kw):
             # The decorator can call us more than once if there is an database error. In this
             # case, the request cursor is unusable. Rollback transaction to create a new one.
-            if self._cr:
+            if self._cr and not openerp.tools.config['test_enable']:
                 self._cr.rollback()
             return self.endpoint(*a, **kw)
 
@@ -1077,22 +1078,25 @@ class Root(object):
         path = openerp.tools.config.session_dir
         _logger.debug('HTTP sessions stored in: %s', path)
         self.session_store = werkzeug.contrib.sessions.FilesystemSessionStore(path, session_class=OpenERPSession)
+        self._loaded = False
 
-        # TODO should we move this to ir.http so that only configured modules are served ?
-        _logger.info("HTTP Configuring static files")
-        self.load_addons()
-
+    @lazy_property
+    def nodb_routing_map(self):
         _logger.info("Generating nondb routing")
-        self.nodb_routing_map = routing_map([''] + openerp.conf.server_wide_modules, True)
+        return routing_map([''] + openerp.conf.server_wide_modules, True)
 
     def __call__(self, environ, start_response):
         """ Handle a WSGI request
         """
+        if not self._loaded:
+            self._loaded = True
+            self.load_addons()
         return self.dispatch(environ, start_response)
 
     def load_addons(self):
-        """ Load all addons from addons patch containg static files and
+        """ Load all addons from addons path containing static files and
         controllers and configure them.  """
+        # TODO should we move this to ir.http so that only configured modules are served ?
         statics = {}
 
         for addons_path in openerp.modules.module.ad_paths:
@@ -1106,12 +1110,16 @@ class Root(object):
                         _logger.debug("Loading %s", module)
                         if 'openerp.addons' in sys.modules:
                             m = __import__('openerp.addons.' + module)
+                        else:
+                            m = None
                         addons_module[module] = m
                         addons_manifest[module] = manifest
                         statics['/%s/static' % module] = path_static
 
-        app = werkzeug.wsgi.SharedDataMiddleware(self.dispatch, statics)
-        self.dispatch = DisableCacheMiddleware(app)
+        if statics:
+            _logger.info("HTTP Configuring static files")
+            app = werkzeug.wsgi.SharedDataMiddleware(self.dispatch, statics)
+            self.dispatch = DisableCacheMiddleware(app)
 
     def setup_session(self, httprequest):
         # recover or create session
@@ -1284,11 +1292,8 @@ class CommonController(Controller):
         """ Method used by client APIs to contact OpenERP. """
         return dispatch_rpc(service, method, args)
 
-root = None
-
-def wsgi_postload():
-    global root
-    root = Root()
-    openerp.service.wsgi_server.register_wsgi_handler(root)
+# register main wsgi handler
+root = Root()
+openerp.service.wsgi_server.register_wsgi_handler(root)
 
 # vim:et:ts=4:sw=4:
diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py
index 681d8534c05..5635e42e780 100644
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@ -42,6 +42,7 @@ from openerp import SUPERUSER_ID
 from openerp.tools.translate import _
 from openerp.modules.module import initialize_sys_path, \
     load_openerp_module, init_module_models, adapt_version
+from module import runs_post_install
 
 _logger = logging.getLogger(__name__)
 _test_logger = logging.getLogger('openerp.tests')
@@ -425,8 +426,13 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
         for model in registry.models.values():
             model._register_hook(cr)
 
+        # STEP 9: Run the post-install tests
+        cr.commit()
+        if openerp.tools.config['test_enable']:
+            cr.execute("SELECT name FROM ir_module_module WHERE state='installed'")
+            for module_name in cr.fetchall():
+                report.record_result(openerp.modules.module.run_unit_tests(module_name[0], cr.dbname, position=runs_post_install))
     finally:
         cr.close()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index 8958813baa2..82e86e83ce2 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -169,13 +169,15 @@ def get_module_icon(module):
         return ('/' + module + '/') + '/'.join(iconpath)
     return '/base/'  + '/'.join(iconpath)
 
-def load_information_from_description_file(module):
+def load_information_from_description_file(module, mod_path=None):
     """
     :param module: The name of the module (sale, purchase, ...)
+    :param mod_path: Physical path of module, if not providedThe name of the module (sale, purchase, ...)
     """
 
-    terp_file = get_module_resource(module, '__openerp__.py')
-    mod_path = get_module_path(module)
+    if not mod_path:
+        mod_path = get_module_path(module)
+    terp_file = opj(mod_path, '__openerp__.py')
     if terp_file:
         info = {}
         if os.path.isfile(terp_file):
@@ -356,30 +358,6 @@ class TestStream(object):
 
 current_test = None
 
-def run_unit_tests(module_name, dbname):
-    """
-    :returns: ``True`` if all of ``module_name``'s tests succeeded, ``False``
-              if any of them failed.
-    :rtype: bool
-    """
-    global current_test
-    current_test = module_name
-    mods = get_test_modules(module_name)
-    r = True
-    for m in mods:
-        tests = unwrap_suite(unittest2.TestLoader().loadTestsFromModule(m))
-        suite = unittest2.TestSuite(itertools.ifilter(runs_at_install, tests))
-        _logger.info('running %s tests.', m.__name__)
-
-        result = unittest2.TextTestRunner(verbosity=2, stream=TestStream(m.__name__)).run(suite)
-
-        if not result.wasSuccessful():
-            r = False
-            _logger.error("Module %s: %d failures, %d errors",
-                          module_name, len(result.failures), len(result.errors))
-    current_test = None
-    return r
-
 def runs_at(test, hook, default):
     # by default, tests do not run post install
     test_runs = getattr(test, hook, default)
@@ -396,6 +374,30 @@ def runs_at(test, hook, default):
 runs_at_install = functools.partial(runs_at, hook='at_install', default=True)
 runs_post_install = functools.partial(runs_at, hook='post_install', default=False)
 
+def run_unit_tests(module_name, dbname, position=runs_at_install):
+    """
+    :returns: ``True`` if all of ``module_name``'s tests succeeded, ``False``
+              if any of them failed.
+    :rtype: bool
+    """
+    global current_test
+    current_test = module_name
+    mods = get_test_modules(module_name)
+    r = True
+    for m in mods:
+        tests = unwrap_suite(unittest2.TestLoader().loadTestsFromModule(m))
+        suite = unittest2.TestSuite(itertools.ifilter(position, tests))
+        _logger.info('running %s tests.', m.__name__)
+
+        result = unittest2.TextTestRunner(verbosity=2, stream=TestStream(m.__name__)).run(suite)
+
+        if not result.wasSuccessful():
+            r = False
+            _logger.error("Module %s: %d failures, %d errors",
+                          module_name, len(result.failures), len(result.errors))
+    current_test = None
+    return r
+
 def unwrap_suite(test):
     """
     Attempts to unpack testsuites (holding suites or cases) in order to
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 45dc264c67c..f9ab9f423ef 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1100,7 +1100,7 @@ class BaseModel(object):
             self._rec_name = 'name'
 
 
-    def __export_row(self, cr, uid, row, fields, context=None):
+    def __export_row(self, cr, uid, row, fields, raw_data=False, context=None):
         if context is None:
             context = {}
 
@@ -1193,8 +1193,7 @@ class BaseModel(object):
                             break
 
                         for row2 in r:
-                            lines2 = row2._model.__export_row(cr, uid, row2, fields2,
-                                    context)
+                            lines2 = row2._model.__export_row(cr, uid, row2, fields2, context=context)
                             if first:
                                 for fpos2 in range(len(fields)):
                                     if lines2 and lines2[0][fpos2]:
@@ -1216,14 +1215,22 @@ class BaseModel(object):
                                 lines += lines2
                         break
                     i += 1
+
                 if i == len(f):
                     if isinstance(r, browse_record):
                         r = self.pool[r._table_name].name_get(cr, uid, [r.id], context=context)
                         r = r and r[0] and r[0][1] or ''
-                    data[fpos] = tools.ustr(r or '')
+                    if raw_data and cols and cols._type in ('integer', 'boolean', 'float'):
+                        data[fpos] = r
+                    elif raw_data and cols and cols._type == 'date':
+                        data[fpos] = datetime.datetime.strptime(r, tools.DEFAULT_SERVER_DATE_FORMAT).date()
+                    elif raw_data and cols and cols._type == 'datetime':
+                        data[fpos] = datetime.datetime.strptime(r, tools.DEFAULT_SERVER_DATETIME_FORMAT)
+                    else:
+                        data[fpos] = tools.ustr(r or '')
         return [data] + lines
 
-    def export_data(self, cr, uid, ids, fields_to_export, context=None):
+    def export_data(self, cr, uid, ids, fields_to_export, raw_data=False, context=None):
         """
         Export fields for selected objects
 
@@ -1231,6 +1238,7 @@ class BaseModel(object):
         :param uid: current user id
         :param ids: list of ids
         :param fields_to_export: list of fields
+        :param raw_data: True to return value in fields type, False for string values
         :param context: context arguments, like lang, time zone
         :rtype: dictionary with a *datas* matrix
 
@@ -1245,7 +1253,7 @@ class BaseModel(object):
         fields_to_export = map(fix_import_export_id_paths, fields_to_export)
         datas = []
         for row in self.browse(cr, uid, ids, context):
-            datas += self.__export_row(cr, uid, row, fields_to_export, context)
+            datas += self.__export_row(cr, uid, row, fields_to_export, raw_data=raw_data, context=context)
         return {'datas': datas}
 
     def import_data(self, cr, uid, fields, datas, mode='init', current_module='', noupdate=False, context=None, filename=None):
diff --git a/openerp/service/http_server.py b/openerp/service/http_server.py
deleted file mode 100644
index e25e75dba62..00000000000
--- a/openerp/service/http_server.py
+++ /dev/null
@@ -1,178 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright P. Christeas <p_christ@hol.gr> 2008-2010
-# Copyright 2010 OpenERP SA. (http://www.openerp.com)
-#
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly advised to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-###############################################################################
-
-
-""" This module offers the family of HTTP-based servers. These are not a single
-    class/functionality, but a set of network stack layers, implementing
-    extendable HTTP protocols.
-
-    The OpenERP server defines a single instance of a HTTP server, listening at
-    the standard 8069, 8071 ports (well, it is 2 servers, and ports are 
-    configurable, of course). This "single" server then uses a `MultiHTTPHandler`
-    to dispatch requests to the appropriate channel protocol, like the XML-RPC,
-    static HTTP, DAV or other.
-"""
-
-import base64
-import posixpath
-import urllib
-import os
-import logging
-
-from websrv_lib import *
-import openerp.tools as tools
-
-try:
-    import fcntl
-except ImportError:
-    fcntl = None
-
-try:
-    from ssl import SSLError
-except ImportError:
-    class SSLError(Exception): pass
-
-_logger = logging.getLogger(__name__)
-
-# TODO delete this for 6.2, it is still needed for 6.1.
-class HttpLogHandler:
-    """ helper class for uniform log handling
-    Please define self._logger at each class that is derived from this
-    """
-    _logger = None
-    
-    def log_message(self, format, *args):
-        self._logger.debug(format % args) # todo: perhaps other level
-
-    def log_error(self, format, *args):
-        self._logger.error(format % args)
-        
-    def log_exception(self, format, *args):
-        self._logger.exception(format, *args)
-
-    def log_request(self, code='-', size='-'):
-        self._logger.debug('"%s" %s %s',
-            self.requestline, str(code), str(size))
-
-class StaticHTTPHandler(HttpLogHandler, FixSendError, HttpOptions, HTTPHandler):
-    _logger = logging.getLogger(__name__)
-
-    _HTTP_OPTIONS = { 'Allow': ['OPTIONS', 'GET', 'HEAD'] }
-
-    def __init__(self,request, client_address, server):
-        HTTPHandler.__init__(self,request,client_address,server)
-        document_root = tools.config.get('static_http_document_root', False)
-        assert document_root, "Please specify static_http_document_root in configuration, or disable static-httpd!"
-        self.__basepath = document_root
-
-    def translate_path(self, path):
-        """Translate a /-separated PATH to the local filename syntax.
-
-        Components that mean special things to the local file system
-        (e.g. drive or directory names) are ignored.  (XXX They should
-        probably be diagnosed.)
-
-        """
-        # abandon query parameters
-        path = path.split('?',1)[0]
-        path = path.split('#',1)[0]
-        path = posixpath.normpath(urllib.unquote(path))
-        words = path.split('/')
-        words = filter(None, words)
-        path = self.__basepath
-        for word in words:
-            if word in (os.curdir, os.pardir): continue
-            path = os.path.join(path, word)
-        return path
-
-def init_static_http():
-    if not tools.config.get('static_http_enable', False):
-        return
-    
-    document_root = tools.config.get('static_http_document_root', False)
-    assert document_root, "Document root must be specified explicitly to enable static HTTP service (option --static-http-document-root)"
-    
-    base_path = tools.config.get('static_http_url_prefix', '/')
-    
-    reg_http_service(base_path, StaticHTTPHandler)
-    
-    _logger.info("Registered HTTP dir %s for %s", document_root, base_path)
-
-import security
-
-class OpenERPAuthProvider(AuthProvider):
-    """ Require basic authentication."""
-    def __init__(self,realm='OpenERP User'):
-        self.realm = realm
-        self.auth_creds = {}
-        self.auth_tries = 0
-        self.last_auth = None
-
-    def authenticate(self, db, user, passwd, client_address):
-        try:
-            uid = security.login(db,user,passwd)
-            if uid is False:
-                return False
-            return user, passwd, db, uid
-        except Exception,e:
-            _logger.debug("Fail auth: %s" % e )
-            return False
-
-    def checkRequest(self,handler,path, db=False):        
-        auth_str = handler.headers.get('Authorization',False)
-        try:
-            if not db:
-                db = handler.get_db_from_path(path)
-        except Exception:
-            if path.startswith('/'):
-                path = path[1:]
-            psp= path.split('/')
-            if len(psp)>1:
-                db = psp[0]
-            else:
-                #FIXME!
-                _logger.info("Wrong path: %s, failing auth" %path)
-                raise AuthRejectedExc("Authorization failed. Wrong sub-path.") 
-        if self.auth_creds.get(db):
-            return True 
-        if auth_str and auth_str.startswith('Basic '):
-            auth_str=auth_str[len('Basic '):]
-            (user,passwd) = base64.decodestring(auth_str).split(':')
-            _logger.info("Found user=\"%s\", passwd=\"***\" for db=\"%s\"", user, db)
-            acd = self.authenticate(db,user,passwd,handler.client_address)
-            if acd != False:
-                self.auth_creds[db] = acd
-                self.last_auth = db
-                return True
-        if self.auth_tries > 5:
-            _logger.info("Failing authorization after 5 requests w/o password")
-            raise AuthRejectedExc("Authorization failed.")
-        self.auth_tries += 1
-        raise AuthRequiredExc(atype='Basic', realm=self.realm)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/service/wsgi_server.py b/openerp/service/wsgi_server.py
index b31736ba998..5e72ba570b5 100644
--- a/openerp/service/wsgi_server.py
+++ b/openerp/service/wsgi_server.py
@@ -164,153 +164,6 @@ def wsgi_xmlrpc(environ, start_response):
         params, method = xmlrpclib.loads(data)
         return xmlrpc_return(start_response, service, method, params, string_faultcode)
 
-def wsgi_webdav(environ, start_response):
-    pi = environ['PATH_INFO']
-    if environ['REQUEST_METHOD'] == 'OPTIONS' and pi in ['*','/']:
-        return return_options(environ, start_response)
-    elif pi.startswith('/webdav'):
-        http_dir = websrv_lib.find_http_service(pi)
-        if http_dir:
-            path = pi[len(http_dir.path):]
-            if path.startswith('/'):
-                environ['PATH_INFO'] = path
-            else:
-                environ['PATH_INFO'] = '/' + path
-            return http_to_wsgi(http_dir)(environ, start_response)
-
-def return_options(environ, start_response):
-    # Microsoft specific header, see
-    # http://www.ibm.com/developerworks/rational/library/2089.html
-    if 'Microsoft' in environ.get('User-Agent', ''):
-        options = [('MS-Author-Via', 'DAV')]
-    else:
-        options = []
-    options += [('DAV', '1 2'), ('Allow', 'GET HEAD PROPFIND OPTIONS REPORT')]
-    start_response("200 OK", [('Content-Length', str(0))] + options)
-    return []
-
-def http_to_wsgi(http_dir):
-    """
-    Turn a BaseHTTPRequestHandler into a WSGI entry point.
-
-    Actually the argument is not a bare BaseHTTPRequestHandler but is wrapped
-    (as a class, so it needs to be instanciated) in a HTTPDir.
-
-    This code is adapted from wbsrv_lib.MultiHTTPHandler._handle_one_foreign().
-    It is a temporary solution: the HTTP sub-handlers (in particular the
-    document_webdav addon) have to be WSGIfied.
-    """
-    def wsgi_handler(environ, start_response):
-
-        headers = {}
-        for key, value in environ.items():
-            if key.startswith('HTTP_'):
-                key = key[5:].replace('_', '-').title()
-                headers[key] = value
-            if key == 'CONTENT_LENGTH':
-                key = key.replace('_', '-').title()
-                headers[key] = value
-        if environ.get('Content-Type'):
-            headers['Content-Type'] = environ['Content-Type']
-
-        path = urllib.quote(environ.get('PATH_INFO', ''))
-        if environ.get('QUERY_STRING'):
-            path += '?' + environ['QUERY_STRING']
-
-        request_version = 'HTTP/1.1' # TODO
-        request_line = "%s %s %s\n" % (environ['REQUEST_METHOD'], path, request_version)
-
-        class Dummy(object):
-            pass
-
-        # Let's pretend we have a server to hand to the handler.
-        server = Dummy()
-        server.server_name = environ['SERVER_NAME']
-        server.server_port = int(environ['SERVER_PORT'])
-
-        # Initialize the underlying handler and associated auth. provider.
-        con = openerp.service.websrv_lib.noconnection(environ['wsgi.input'])
-        handler = http_dir.instanciate_handler(con, environ['REMOTE_ADDR'], server)
-
-        # Populate the handler as if it is called by a regular HTTP server
-        # and the request is already parsed.
-        handler.wfile = StringIO.StringIO()
-        handler.rfile = environ['wsgi.input']
-        handler.headers = headers
-        handler.command = environ['REQUEST_METHOD']
-        handler.path = path
-        handler.request_version = request_version
-        handler.close_connection = 1
-        handler.raw_requestline = request_line
-        handler.requestline = request_line
-
-        # Handle authentication if there is an auth. provider associated to
-        # the handler.
-        if hasattr(handler, 'auth_provider'):
-            try:
-                handler.auth_provider.checkRequest(handler, path)
-            except websrv_lib.AuthRequiredExc, ae:
-                # Darwin 9.x.x webdav clients will report "HTTP/1.0" to us, while they support (and need) the
-                # authorisation features of HTTP/1.1
-                if request_version != 'HTTP/1.1' and ('Darwin/9.' not in handler.headers.get('User-Agent', '')):
-                    start_response("403 Forbidden", [])
-                    return []
-                start_response("401 Authorization required", [
-                    ('WWW-Authenticate', '%s realm="%s"' % (ae.atype,ae.realm)),
-                    # ('Connection', 'keep-alive'),
-                    ('Content-Type', 'text/html'),
-                    ('Content-Length', 4), # len(self.auth_required_msg)
-                    ])
-                return ['Blah'] # self.auth_required_msg
-            except websrv_lib.AuthRejectedExc,e:
-                start_response("403 %s" % (e.args[0],), [])
-                return []
-
-        method_name = 'do_' + handler.command
-
-        # Support the OPTIONS method even when not provided directly by the
-        # handler. TODO I would prefer to remove it and fix the handler if
-        # needed.
-        if not hasattr(handler, method_name):
-            if handler.command == 'OPTIONS':
-                return return_options(environ, start_response)
-            start_response("501 Unsupported method (%r)" % handler.command, [])
-            return []
-
-        # Finally, call the handler's method.
-        try:
-            method = getattr(handler, method_name)
-            method()
-            # The DAV handler buffers its output and provides a _flush()
-            # method.
-            getattr(handler, '_flush', lambda: None)()
-            response = parse_http_response(handler.wfile.getvalue())
-            response_headers = response.getheaders()
-            body = response.read()
-            start_response(str(response.status) + ' ' + response.reason, response_headers)
-            return [body]
-        except (websrv_lib.AuthRejectedExc, websrv_lib.AuthRequiredExc):
-            raise
-        except Exception, e:
-            start_response("500 Internal error", [])
-            return []
-
-    return wsgi_handler
-
-def parse_http_response(s):
-    """ Turn a HTTP response string into a httplib.HTTPResponse object."""
-    class DummySocket(StringIO.StringIO):
-        """
-        This is used to provide a StringIO to httplib.HTTPResponse
-        which, instead of taking a file object, expects a socket and
-        uses its makefile() method.
-        """
-        def makefile(self, *args, **kw):
-            return self
-    response = httplib.HTTPResponse(DummySocket(s))
-    response.begin()
-    return response
-
 # WSGI handlers registered through the register_wsgi_handler() function below.
 module_handlers = []
 # RPC endpoints registered through the register_rpc_endpoint() function below.
@@ -342,7 +195,7 @@ def application_unproxied(environ, start_response):
         del threading.current_thread().dbname
 
     # Try all handlers until one returns some result (i.e. not None).
-    wsgi_handlers = [wsgi_xmlrpc, wsgi_webdav]
+    wsgi_handlers = [wsgi_xmlrpc]
     wsgi_handlers += module_handlers
     for handler in wsgi_handlers:
         result = handler(environ, start_response)
diff --git a/openerp/tests/phantomtest.js b/openerp/tests/phantomtest.js
index 63a3b2e33ff..5a6a9696cc0 100644
--- a/openerp/tests/phantomtest.js
+++ b/openerp/tests/phantomtest.js
@@ -6,7 +6,8 @@ function waitFor (ready, callback, timeout, timeoutMessageCallback) {
 
     (function waitLoop() {
         if(new Date - start > timeout) {
-            error(timeoutMessageCallback ? timeoutMessageCallback() : "Timeout after "+timeout+" ms");
+            console.log('error', timeoutMessageCallback ? timeoutMessageCallback() : "Timeout after "+timeout+" ms");
+            phantom.exit(1);
         } else if (ready()) {
             callback();
         } else {
@@ -15,10 +16,6 @@ function waitFor (ready, callback, timeout, timeoutMessageCallback) {
     }());
 }
 
-function error(message) {
-    console.log('error', message);
-    phantom.exit(1);
-}
 function PhantomTest() {
     var self = this;
     this.options = JSON.parse(phantom.args[phantom.args.length-1]);
@@ -49,10 +46,12 @@ function PhantomTest() {
             }));
             msg.push('(leaf frame on top)')
         }
-        error(JSON.stringify(msg.join('\n')));
+        console.log('error', JSON.stringify(msg.join('\n')));
+        phantom.exit(1);
     };
     this.page.onAlert = function(message) {
-        error(message);
+        console.log('error', message);
+        phantom.exit(1);
     };
     this.page.onConsoleMessage = function(message) {
         console.log(message);
@@ -78,7 +77,8 @@ function PhantomTest() {
                 if(!found) {
                     console.log('Injecting', src, 'needed for', need);
                     if(!self.page.injectJs(src)) {
-                        error("Cannot inject " + src);
+                        console.log('error', "Cannot inject " + src);
+                        phantom.exit(1);
                     }
                 }
             }
@@ -88,8 +88,9 @@ function PhantomTest() {
         self.page.evaluate(function () {
             var message = ("Timeout\nhref: " + window.location.href
                 + "\nreferrer: " + document.referrer
-                + "\n\n" + document.body.innerHTML).replace(/[^a-z0-9\s~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, "*");
-            error(message);
+                + "\n\n" + (document.body && document.body.innerHTML)).replace(/[^a-z0-9\s~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, "*");
+            console.log('error', message);
+            phantom.exit(1);
         });
     }, self.timeout);
 
@@ -108,7 +109,8 @@ function PhantomTest() {
         var url = self.origin + url_path;
         self.page.open(url, function(status) {
             if (status !== 'success') {
-                error("failed to load " + url)
+                console.log('error', "failed to load " + url);
+                phantom.exit(1);
             } else {
                 console.log('loaded', url, status);
                 // process ready
@@ -119,7 +121,7 @@ function PhantomTest() {
                         try {
                             console.log("page.evaluate eval expr:", ready);
                             r = !!eval(ready);
-                        } catch(ex) { 
+                        } catch(ex) {
                         }
                         console.log("page.evaluate eval result:", r);
                         return r;
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 899d72f3fe4..6b21bda8b4f 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -152,19 +152,11 @@ class configmanager(object):
         parser.add_option_group(group)
 
         # WEB
-        # TODO move to web addons after MetaOption merge
         group = optparse.OptionGroup(parser, "Web interface Configuration")
         group.add_option("--db-filter", dest="dbfilter", default='.*',
                          help="Filter listed database", metavar="REGEXP")
         parser.add_option_group(group)
 
-        # Static HTTP
-        group = optparse.OptionGroup(parser, "Static HTTP service")
-        group.add_option("--static-http-enable", dest="static_http_enable", action="store_true", my_default=False, help="enable static HTTP service for serving plain HTML files")
-        group.add_option("--static-http-document-root", dest="static_http_document_root", help="specify the directory containing your static HTML files (e.g '/var/www/')")
-        group.add_option("--static-http-url-prefix", dest="static_http_url_prefix", help="specify the URL root prefix where you want web browsers to access your static HTML files (e.g '/')")
-        parser.add_option_group(group)
-
         # Testing Group
         group = optparse.OptionGroup(parser, "Testing Configuration")
         group.add_option("--test-file", dest="test_file", my_default=False,
@@ -313,9 +305,10 @@ class configmanager(object):
                     self.options[option.dest] = option.my_default
                     self.casts[option.dest] = option
 
-        self.parse_config(None, False)
+        # generate default config
+        self._parse_config()
 
-    def parse_config(self, args=None, complete=True):
+    def parse_config(self, args=None):
         """ Parse the configuration file (if any) and the command-line
         arguments.
 
@@ -329,10 +322,12 @@ class configmanager(object):
         Typical usage of this method:
 
             openerp.tools.config.parse_config(sys.argv[1:])
-
-        :param complete: this is a hack used in __init__(), leave it to True.
-
         """
+        self._parse_config(args)
+        openerp.netsvc.init_logger()
+        openerp.modules.module.initialize_sys_path()
+
+    def _parse_config(self, args=None):
         if args is None:
             args = []
         opt, args = self.parser.parse_args(args)
@@ -391,7 +386,6 @@ class configmanager(object):
                 'db_maxconn', 'import_partial', 'addons_path',
                 'xmlrpc', 'syslog', 'without_demo', 'timezone',
                 'xmlrpcs_interface', 'xmlrpcs_port', 'xmlrpcs',
-                'static_http_enable', 'static_http_document_root', 'static_http_url_prefix',
                 'secure_cert_file', 'secure_pkey_file', 'dbfilter', 'log_handler', 'log_level', 'log_db'
                 ]
 
@@ -503,8 +497,6 @@ class configmanager(object):
             openerp.conf.server_wide_modules = map(lambda m: m.strip(), opt.server_wide_modules.split(','))
         else:
             openerp.conf.server_wide_modules = ['web','web_kanban']
-        if complete:
-            openerp.modules.module.initialize_sys_path()
 
     def _generate_pgpassfile(self):
         """
diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index 43ee96660bd..a4231529b8f 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -857,12 +857,12 @@ form: module.record_id""" % (xml_id,)
     def _tag_template(self, cr, el, data_node=None):
         # This helper transforms a <template> element into a <record> and forwards it
         tpl_id = el.get('id', el.get('t-name', '')).encode('ascii')
-        module = self.module
-        if '.' in tpl_id:
-            module, tpl_id = tpl_id.split('.', 1)
+        full_tpl_id = tpl_id
+        if '.' not in full_tpl_id:
+            full_tpl_id = '%s.%s' % (self.module, tpl_id)
         # set the full template name for qweb <module>.<id>
         if not (el.get('inherit_id') or el.get('inherit_option_id')):
-            el.set('t-name', '%s.%s' % (module, tpl_id))
+            el.set('t-name', full_tpl_id)
             el.tag = 't'
         else:
             el.tag = 'data'
@@ -952,8 +952,9 @@ form: module.record_id""" % (xml_id,)
             'url': self._tag_url
         }
 
-def convert_file(cr, module, filename, idref, mode='update', noupdate=False, kind=None, report=None):
-    pathname = os.path.join(module, filename)
+def convert_file(cr, module, filename, idref, mode='update', noupdate=False, kind=None, report=None, pathname=None):
+    if pathname is None:
+        pathname = os.path.join(module, filename)
     fp = misc.file_open(pathname)
     ext = os.path.splitext(filename)[1].lower()
     try:
diff --git a/openerp/tools/func.py b/openerp/tools/func.py
index ca8bba6bd49..89cdf9fb622 100644
--- a/openerp/tools/func.py
+++ b/openerp/tools/func.py
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#    Copyright (C) 2010, 2014 OpenERP s.a. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -20,11 +20,39 @@
 #
 ##############################################################################
 
-__all__ = ['synchronized']
+__all__ = ['synchronized', 'lazy_property']
 
 from functools import wraps
 from inspect import getsourcefile
 
+
+class lazy_property(object):
+    """ Decorator for a lazy property of an object, i.e., an object attribute
+        that is determined by the result of a method call evaluated once. To
+        reevaluate the property, simply delete the attribute on the object, and
+        get it again.
+    """
+    def __init__(self, fget):
+        self.fget = fget
+        self.name = fget.__name__
+
+    def __get__(self, obj, cls):
+        if obj is None:
+            return self
+        value = self.fget(obj)
+        setattr(obj, self.name, value)
+        return value
+
+    @staticmethod
+    def reset_all(obj):
+        """ Reset all lazy properties on the instance `obj`. """
+        cls = type(obj)
+        obj_dict = obj.__dict__
+        for name in obj_dict.keys():
+            if isinstance(getattr(cls, name, None), lazy_property):
+                obj_dict.pop(name)
+
+
 def synchronized(lock_attr='_lock'):
     def decorator(func):
         @wraps(func)
diff --git a/setup.py b/setup.py
index a44e26fd36f..545b02e9bbd 100644
--- a/setup.py
+++ b/setup.py
@@ -140,6 +140,7 @@ setuptools.setup(
           'pyyaml',
           'qrcode',
           'reportlab', # windows binary pypi.python.org/pypi/reportlab
+          'requests',
           'simplejson',
           'unittest2',
           'vatnumber',