[Merge] Merged with main branch.

bzr revid: mdi@tinyerp.com-20140417064501-cf2rp86sukob7v1a

25 files changed, 48 insertions, 49 deletions

diff --git a/addons/base_import/i18n/ar.po b/addons/base_import/i18n/ar.po
index 732700d2b38..7551e0835cd 100644
--- a/addons/base_import/i18n/ar.po
+++ b/addons/base_import/i18n/ar.po
@@ -14,8 +14,8 @@ 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-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/bs.po b/addons/base_import/i18n/bs.po
index 7f8e46dd11d..47ed24e2fdb 100644
--- a/addons/base_import/i18n/bs.po
+++ b/addons/base_import/i18n/bs.po
@@ -14,8 +14,8 @@ 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-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/cs.po b/addons/base_import/i18n/cs.po
index 6a1adf771d3..a19fddb3ffe 100644
--- a/addons/base_import/i18n/cs.po
+++ b/addons/base_import/i18n/cs.po
@@ -14,8 +14,8 @@ 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-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/de.po b/addons/base_import/i18n/de.po
index 27011afa58f..7170ae4f388 100644
--- a/addons/base_import/i18n/de.po
+++ b/addons/base_import/i18n/de.po
@@ -15,8 +15,8 @@ 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-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/es.po b/addons/base_import/i18n/es.po
index cc157de709a..b30633cd29d 100644
--- a/addons/base_import/i18n/es.po
+++ b/addons/base_import/i18n/es.po
@@ -14,8 +14,8 @@ 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-27 07:33+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/et.po b/addons/base_import/i18n/et.po
index f57f322feae..8011114ecd9 100644
--- a/addons/base_import/i18n/et.po
+++ b/addons/base_import/i18n/et.po
@@ -14,8 +14,8 @@ 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-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/fr.po b/addons/base_import/i18n/fr.po
index acddd167613..89bfa3b4603 100644
--- a/addons/base_import/i18n/fr.po
+++ b/addons/base_import/i18n/fr.po
@@ -14,8 +14,8 @@ 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-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/hr.po b/addons/base_import/i18n/hr.po
index eca1bc526a2..9f4997eb090 100644
--- a/addons/base_import/i18n/hr.po
+++ b/addons/base_import/i18n/hr.po
@@ -14,8 +14,8 @@ 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-27 07:33+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/hu.po b/addons/base_import/i18n/hu.po
index 189761052b2..f721cd5d225 100644
--- a/addons/base_import/i18n/hu.po
+++ b/addons/base_import/i18n/hu.po
@@ -14,8 +14,8 @@ 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-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/it.po b/addons/base_import/i18n/it.po
index cbdf34971a0..8679772a76f 100644
--- a/addons/base_import/i18n/it.po
+++ b/addons/base_import/i18n/it.po
@@ -14,8 +14,8 @@ 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-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/mk.po b/addons/base_import/i18n/mk.po
index ab414db7590..94d8bef3dcf 100644
--- a/addons/base_import/i18n/mk.po
+++ b/addons/base_import/i18n/mk.po
@@ -14,8 +14,8 @@ 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-27 07:33+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/mn.po b/addons/base_import/i18n/mn.po
index 313b600727b..f62e7da6b19 100644
--- a/addons/base_import/i18n/mn.po
+++ b/addons/base_import/i18n/mn.po
@@ -14,8 +14,8 @@ 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-27 07:33+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/nb.po b/addons/base_import/i18n/nb.po
index d1f0b68fbab..ca4b85fd3de 100644
--- a/addons/base_import/i18n/nb.po
+++ b/addons/base_import/i18n/nb.po
@@ -14,8 +14,8 @@ 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-27 07:33+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/nl.po b/addons/base_import/i18n/nl.po
index be5f895911a..0bc4e8b74bc 100644
--- a/addons/base_import/i18n/nl.po
+++ b/addons/base_import/i18n/nl.po
@@ -14,8 +14,8 @@ 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-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/pl.po b/addons/base_import/i18n/pl.po
index 1eb5a625b93..ad7f6c0b03f 100644
--- a/addons/base_import/i18n/pl.po
+++ b/addons/base_import/i18n/pl.po
@@ -14,8 +14,8 @@ 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-27 07:33+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/pt.po b/addons/base_import/i18n/pt.po
index b8b126f5811..a076f24f5ec 100644
--- a/addons/base_import/i18n/pt.po
+++ b/addons/base_import/i18n/pt.po
@@ -14,8 +14,8 @@ 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-27 07:33+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/pt_BR.po b/addons/base_import/i18n/pt_BR.po
index d350d07fd4e..1fe7ac0e012 100644
--- a/addons/base_import/i18n/pt_BR.po
+++ b/addons/base_import/i18n/pt_BR.po
@@ -15,8 +15,8 @@ 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-27 07:33+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:29+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/ro.po b/addons/base_import/i18n/ro.po
index c6881de6f09..41846d25a10 100644
--- a/addons/base_import/i18n/ro.po
+++ b/addons/base_import/i18n/ro.po
@@ -14,8 +14,8 @@ 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-27 07:33+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/ru.po b/addons/base_import/i18n/ru.po
index fd5ccd8418f..d7a49da1524 100644
--- a/addons/base_import/i18n/ru.po
+++ b/addons/base_import/i18n/ru.po
@@ -14,8 +14,8 @@ 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-27 07:33+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/sl.po b/addons/base_import/i18n/sl.po
index cb6325ac7fe..6e5ed0d3904 100644
--- a/addons/base_import/i18n/sl.po
+++ b/addons/base_import/i18n/sl.po
@@ -14,8 +14,8 @@ 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-27 07:33+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/sv.po b/addons/base_import/i18n/sv.po
index 7c609d7fc84..84cb64dae97 100644
--- a/addons/base_import/i18n/sv.po
+++ b/addons/base_import/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-01 05:39+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:29+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/tr.po b/addons/base_import/i18n/tr.po
index b2e02d85a70..ad2d95a2672 100644
--- a/addons/base_import/i18n/tr.po
+++ b/addons/base_import/i18n/tr.po
@@ -14,8 +14,8 @@ 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-27 07:33+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:29+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/zh_CN.po b/addons/base_import/i18n/zh_CN.po
index ca2a3a750f9..6cc2397ac80 100644
--- a/addons/base_import/i18n/zh_CN.po
+++ b/addons/base_import/i18n/zh_CN.po
@@ -14,8 +14,8 @@ 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-27 07:33+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:29+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 1238bc9570f..78cb09001a9 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -285,7 +285,7 @@ openerp.base_import = function (instance) {
 
                     callback(item_finder(default_value));
                 },
-
+                placeholder: _t('Don\'t import'),
                 width: 'resolve',
                 dropdownCssClass: 'oe_import_selector'
             });
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index 97bf3e66f7a..8d7155912e6 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -347,8 +347,7 @@
         <tr class="oe_import_fields">
             <!-- Iterate on first row to ensure we have all columns -->
             <td t-foreach="preview[0]" t-as="column">
-                <input placeholder="Don't Import"
-                       class="oe_import_match_field"/>
+                <input class="oe_import_match_field"/>
             </td>
         </tr>
         <tr t-foreach="preview" t-as="row" class="oe_import_grid-row">