0030761: product characteristics popup shows all values without filtering out previous filters

diff -r 196b1e774d13 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js	Fri Sep 04 13:43:38 2015 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js	Fri Sep 04 14:15:31 2015 +0200
@@ -562,9 +562,13 @@
   },
 
   showDialog: function () {
-    var criteria = this.removeProductCharacteristicsCriteria(this.parentGrid.getCriteria());
-    this.filterDialog.tree.fetchData(criteria);
-    this.filterDialog.show();
+    if (this.showFkDropdownUnfiltered) {
+      this.filterDialog.show();
+    } else {
+      var criteria = this.removeProductCharacteristicsCriteria(this.parentGrid.getCriteria());
+      this.filterDialog.tree.fetchData(criteria);
+      this.filterDialog.show();
+    }
   },
 
   destroy: function () {
diff -r 196b1e774d13 modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/CharacteristicsUIDefinition.java
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/CharacteristicsUIDefinition.java	Fri Sep 04 13:43:38 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/CharacteristicsUIDefinition.java	Fri Sep 04 14:15:31 2015 +0200
@@ -109,6 +109,16 @@
     }
   }
 
+  @Override
+  public String getFilterEditorPropertiesProperty(Field field) {
+    String append = "";
+    Boolean showFkDropdownUnfiltered = (Boolean) readGridConfigurationSetting("showFkDropdownUnfiltered");
+    if (Boolean.TRUE.equals(showFkDropdownUnfiltered)) {
+      append = append + ", showFkDropdownUnfiltered: " + showFkDropdownUnfiltered.toString();
+    }
+    return super.getFilterEditorPropertiesProperty(field) + append;
+  }
+
   private String getValue(CharacteristicValue characValue) {
     int levels = 0;