Merge lp:~unifield-team/unifield-web/web-utp-816 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/static/javascript/m2o.js'
--- addons/openerp/static/javascript/m2o.js	2013-05-28 15:03:21 +0000
+++ addons/openerp/static/javascript/m2o.js	2013-10-03 07:15:00 +0000
@@ -110,7 +110,9 @@
         // clicked outside the box, with some text entered
         // do as if tabbed out
         this.lastKey = null;
-        this.get_matched();
+        if (!jQuery(this.field).hasClass('m2o_search')) {
+            this.get_matched();
+        }
         this.clearResults();
     }
 };
@@ -120,7 +122,12 @@
         return;
     }
     if(!jQuery(this.field).hasClass('readonlyfield')) {
-        this.get_matched();
+        // test added:
+        // on form view: to open only 1 popup when a text is entered and the magnifying glass clicked (the popup is opened by lostFocus).
+        // on search view: lostFocus doesn't open a popup and the m2o can have a value not associated to an id
+        if (!this.text.value  || this.field.value || jQuery(this.field).hasClass('m2o_search')) {
+            this.get_matched();
+        }
     }
 };
 
@@ -337,7 +344,9 @@
     }
 
     //Tab
-    if((evt.which == 9) && this.text.value && !this.field.value) {
+    //if((evt.which == 9) && this.text.value && !this.field.value) {
+    // check with m2o_search added to disable the popup in search view on tab
+    if((evt.which == 9) && this.text.value && !this.field.value && !jQuery(this.field).hasClass('m2o_search')) {
         this.get_matched();
     }
 
@@ -371,14 +380,14 @@
 };
 
 ManyToOne.prototype.get_matched = function() {
-    if (jQuery(this.field).hasClass('m2o_search') &&
+    /* disabled to open the popup in *search view* when a text is entered and the magnifying glass is clicked */
+    /*if (jQuery(this.field).hasClass('m2o_search') &&
             this.delayedRequest == null &&
             this.numResultRows == 0 &&
             this.text.value != '') {
         // Allow substring search (press ESC at the combobox)
         return;
-    }
-
+    }*/
     if(openobject.http.AJAX_COUNT > 0) {
         callLater(0, jQuery.proxy(this, 'get_matched'));
         return;
@@ -423,7 +432,8 @@
                     var id = jQuery(m2o.field).attr('id');
                     // If the text on m2o field is related to any existing ID,
                     // we won't set the text to blank while clicking on search
-                    if (!m2o.field.value) {
+                    // if we are on a search view, don't set to blank
+                    if (!m2o.field.value && !jQuery(m2o.field).hasClass('m2o_search')) {
                         jQuery(idSelector(id + '_text')).val('');
                     }
                     open_search_window(m2o.relation, domain, context, m2o.name, 1, text);