Merge remote-tracking branch 'odoo/master'

diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po
index b43baf2..9be9381 100644 (file)
--- a/addons/web/i18n/es.po
+++ b/addons/web/i18n/es.po
@@ -1294,6 +1294,13 @@ msgstr "No se han facilitado datos"
 
 #. module: web
 #. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3399
+#, python-format
+msgid "No results to show..."
+msgstr "No hay resultados para mostrar..."
+
+#. module: web
+#. openerp-web
 #: code:addons/web/static/src/js/view_list.js:345
 #: code:addons/web/static/src/xml/base.xml:1683
 #, python-format

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index f02dc3c..b6d12b3 100644 (file)
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2409,6 +2409,10 @@
 .openerp .oe_form_field_many2one input {
   padding-right: 13px;
 }
+.openerp.ui-autocomplete li.oe_m2o_dropdown_option_no_results_to_show a {
+  font-style: italic;
+  text-align: center; 
+}
 .openerp.ui-autocomplete li.oe_m2o_dropdown_option a {
   font-style: italic;
   padding-left: 2em;

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 4c4ba6f..14cd055 100644 (file)
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3394,6 +3394,12 @@ instance.web.form.CompletionFieldMixin = {
                     classname: 'oe_m2o_dropdown_option'
                 });
             }
+            else if (values.length == 0)
+               values.push({
+                       label: _t("No results to show..."),
+                       action: function() {},
+                       classname: 'oe_m2o_dropdown_option_no_results_to_show'
+               });
 
             return values;
         });