Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 27 Aug 2013 14:10:50 +0200
changeset 21029 ff012afdf452
parent 21019 327ce5aac264 (diff)
parent 21028 d215bdedc1fc (current diff)
child 21038 ea140535a56f
Merge back from main
src-db/database/sourcedata/AD_MODULE.xml
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js	Tue Aug 27 12:02:43 2013 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js	Tue Aug 27 14:10:50 2013 +0200
@@ -49,9 +49,18 @@
   selectDefaultItem: function () {},
 
   showPickList: function () {
-    var ret = this.Super('showPickList', arguments);
-
-    this.selectItemFromValue(this.getValue());
+    var ret = this.Super('showPickList', arguments),
+        value, i;
+    //remove double equals symbol used for filtering purposes, so that the appropriate item is selected.
+    value = this.getValue();
+    if (value && value.length > 0) {
+      for (i = 0; i < value.length; i++) {
+        if (value[i].indexOf("==") === 0) {
+          value[i] = value[i].substring(2, value[i].length);
+        }
+      }
+    }
+    this.selectItemFromValue(value);
   },
 
   // note: can't override changed as it is used by the filter editor 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js	Tue Aug 27 12:02:43 2013 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js	Tue Aug 27 14:10:50 2013 +0200
@@ -66,12 +66,19 @@
 
   // is overridden to keep track that a value has been explicitly picked
   pickValue: function (value) {
+    var i;
     this._pickedValue = true;
     // force the update of the list
     // if the user has entered with the keyboard the exact content of a list option,
     // its callout would not be called because the change would not be detected
     // see issue https://issues.openbravo.com/view.php?id=21491
     this._value = (this.value) ? this._value.concat(Math.random()) : Math.random();
+    //adding double equals to filter the exact value and not all matching sub strings. Refer issue https://issues.openbravo.com/view.php?id=24574.
+    if (value) {
+      for (i = 0; i < value.length; i++) {
+        value[i] = "==" + value[i];
+      }
+    }
     this.Super('pickValue', arguments);
     delete this._pickedValue;
     if (this.moveFocusOnPickValue && this.form.focusInNextItem) {
--- a/src-db/database/sourcedata/AD_MODULE.xml	Tue Aug 27 12:02:43 2013 +0000
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Tue Aug 27 14:10:50 2013 +0200
@@ -22,7 +22,7 @@
 <!--0-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--0-->  <REFERENCEDATAINFO><![CDATA[Standard document types for orders, invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--0-->  <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
 <!--0-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0--></AD_MODULE>
--- a/src/org/openbravo/base/model/domaintype/BigDecimalDomainType.java	Tue Aug 27 12:02:43 2013 +0000
+++ b/src/org/openbravo/base/model/domaintype/BigDecimalDomainType.java	Tue Aug 27 14:10:50 2013 +0200
@@ -50,7 +50,7 @@
 
   public static class Number extends BigDecimalDomainType {
     public String getFormatId() {
-      return "euro";
+      return "generalQty";
     }
   }