Fixes issue 29612: Adds grid configuration to disable fk filter dropdown
authorAugusto Mauch <augusto.mauch@openbravo.com>
Mon, 11 May 2015 13:45:43 +0200
changeset 27071 e65e148f179c
parent 27070 e684c73bb502
child 27072 5a4a2606f285
Fixes issue 29612: Adds grid configuration to disable fk filter dropdown

Sometime the cost of populating a foreign key filter dropdown is much higher than filtering its column using its identifier, like a standard text column. This changeset adds a grid configuration to allow disabling the dropdown of foreign key filters.

If the configuration is activated the use will not be able to open the dropdown, not even using keyboard shortcuts. Saved views created before enabling this configuration will keep working after activating it.
modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_FIELD.xml
modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml
modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
--- a/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_FIELD.xml	Mon May 11 13:18:57 2015 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_FIELD.xml	Mon May 11 13:45:43 2015 +0200
@@ -69,6 +69,10 @@
         <default><![CDATA[D]]></default>
         <onCreateDefault/>
       </column>
+      <column name="DISABLEFKCOMBO" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[D]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_GC_FIELD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- a/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml	Mon May 11 13:18:57 2015 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml	Mon May 11 13:45:43 2015 +0200
@@ -65,6 +65,10 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault/>
       </column>
+      <column name="DISABLEFKCOMBO" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_GC_SYSTEM_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -74,6 +78,7 @@
       <unique name="OBUIAPP_GC_SYS_UNIQUE_CLIENT">
         <unique-column name="AD_CLIENT_ID"/>
       </unique>
+      <check name="OBUIAPP_GC_SYS_DISCOMBO_CHK"><![CDATA[DISABLEFKCOMBO IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_GC_SYS_ISFILT_CHK"><![CDATA[ISFILTERABLE IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_GC_SYS_ISLAZY_CHK"><![CDATA[ISLAZYFILTERING IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_GC_SYS_ISSORT_CHK"><![CDATA[ISSORTABLE IN ('Y', 'N')]]></check>
--- a/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml	Mon May 11 13:18:57 2015 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml	Mon May 11 13:45:43 2015 +0200
@@ -69,6 +69,10 @@
         <default><![CDATA[D]]></default>
         <onCreateDefault/>
       </column>
+      <column name="DISABLEFKCOMBO" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[D]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_GC_TAB_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Mon May 11 13:18:57 2015 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Mon May 11 13:45:43 2015 +0200
@@ -180,6 +180,42 @@
 <!--01F2D2DBBDA14758982AA7386FA8FF72-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--01F2D2DBBDA14758982AA7386FA8FF72--></AD_COLUMN>
 
+<!--02CB84907EA844568D4CE3597E1D6C69--><AD_COLUMN>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <AD_COLUMN_ID><![CDATA[02CB84907EA844568D4CE3597E1D6C69]]></AD_COLUMN_ID>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <NAME><![CDATA[DisableFkCombo]]></NAME>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <DESCRIPTION><![CDATA[If this flag is checked, the foreign key combo will be disabled and the column will be filtered like a standard text column]]></DESCRIPTION>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <HELP><![CDATA[If this flag is checked, the foreign key combo will be disabled and the column will be filtered like a standard text column]]></HELP>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <COLUMNNAME><![CDATA[Disablefkcombo]]></COLUMNNAME>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <AD_TABLE_ID><![CDATA[5D50320222DD4865ADFD50364C84291D]]></AD_TABLE_ID>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <SEQNO><![CDATA[170]]></SEQNO>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <AD_ELEMENT_ID><![CDATA[1185A82966EA40ABA990B5DDBD9B8FBA]]></AD_ELEMENT_ID>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <POSITION><![CDATA[17]]></POSITION>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--02CB84907EA844568D4CE3597E1D6C69-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--02CB84907EA844568D4CE3597E1D6C69--></AD_COLUMN>
+
 <!--03BD4945FDC64CF5AB4CD37BE6A74F81--><AD_COLUMN>
 <!--03BD4945FDC64CF5AB4CD37BE6A74F81-->  <AD_COLUMN_ID><![CDATA[03BD4945FDC64CF5AB4CD37BE6A74F81]]></AD_COLUMN_ID>
 <!--03BD4945FDC64CF5AB4CD37BE6A74F81-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3263,6 +3299,43 @@
 <!--59E3FEE1ADB04DE9B889A4957BFB0438-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--59E3FEE1ADB04DE9B889A4957BFB0438--></AD_COLUMN>
 
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED--><AD_COLUMN>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <AD_COLUMN_ID><![CDATA[5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED]]></AD_COLUMN_ID>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <NAME><![CDATA[DisableFkCombo]]></NAME>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <DESCRIPTION><![CDATA[If this flag is checked, the foreign key combo will be disabled and the column will be filtered like a standard text column]]></DESCRIPTION>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <HELP><![CDATA[If this flag is checked, the foreign key combo will be disabled and the column will be filtered like a standard text column]]></HELP>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <COLUMNNAME><![CDATA[Disablefkcombo]]></COLUMNNAME>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <AD_TABLE_ID><![CDATA[8A16662B37184121A1EDAA89890E160C]]></AD_TABLE_ID>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <AD_REFERENCE_VALUE_ID><![CDATA[892231CFE03848758D74B0209B801C14]]></AD_REFERENCE_VALUE_ID>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <DEFAULTVALUE><![CDATA[D]]></DEFAULTVALUE>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <SEQNO><![CDATA[190]]></SEQNO>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <AD_ELEMENT_ID><![CDATA[1185A82966EA40ABA990B5DDBD9B8FBA]]></AD_ELEMENT_ID>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <POSITION><![CDATA[18]]></POSITION>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED--></AD_COLUMN>
+
 <!--5A92EE4131964B91857B07942228E4A5--><AD_COLUMN>
 <!--5A92EE4131964B91857B07942228E4A5-->  <AD_COLUMN_ID><![CDATA[5A92EE4131964B91857B07942228E4A5]]></AD_COLUMN_ID>
 <!--5A92EE4131964B91857B07942228E4A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3688,6 +3761,43 @@
 <!--6544F25DBDE74A9CB66C8E27F909556E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--6544F25DBDE74A9CB66C8E27F909556E--></AD_COLUMN>
 
+<!--669F7189A86E4EBEB78165527CC81658--><AD_COLUMN>
+<!--669F7189A86E4EBEB78165527CC81658-->  <AD_COLUMN_ID><![CDATA[669F7189A86E4EBEB78165527CC81658]]></AD_COLUMN_ID>
+<!--669F7189A86E4EBEB78165527CC81658-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--669F7189A86E4EBEB78165527CC81658-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--669F7189A86E4EBEB78165527CC81658-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--669F7189A86E4EBEB78165527CC81658-->  <NAME><![CDATA[DisableFkCombo]]></NAME>
+<!--669F7189A86E4EBEB78165527CC81658-->  <DESCRIPTION><![CDATA[If this flag is checked, the foreign key combo will be disabled and the column will be filtered like a standard text column]]></DESCRIPTION>
+<!--669F7189A86E4EBEB78165527CC81658-->  <HELP><![CDATA[If this flag is checked, the foreign key combo will be disabled and the column will be filtered like a standard text column]]></HELP>
+<!--669F7189A86E4EBEB78165527CC81658-->  <COLUMNNAME><![CDATA[Disablefkcombo]]></COLUMNNAME>
+<!--669F7189A86E4EBEB78165527CC81658-->  <AD_TABLE_ID><![CDATA[F167EB822B8A4284AC37D5B40B785D51]]></AD_TABLE_ID>
+<!--669F7189A86E4EBEB78165527CC81658-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--669F7189A86E4EBEB78165527CC81658-->  <AD_REFERENCE_VALUE_ID><![CDATA[892231CFE03848758D74B0209B801C14]]></AD_REFERENCE_VALUE_ID>
+<!--669F7189A86E4EBEB78165527CC81658-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--669F7189A86E4EBEB78165527CC81658-->  <DEFAULTVALUE><![CDATA[D]]></DEFAULTVALUE>
+<!--669F7189A86E4EBEB78165527CC81658-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--669F7189A86E4EBEB78165527CC81658-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--669F7189A86E4EBEB78165527CC81658-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--669F7189A86E4EBEB78165527CC81658-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--669F7189A86E4EBEB78165527CC81658-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--669F7189A86E4EBEB78165527CC81658-->  <SEQNO><![CDATA[200]]></SEQNO>
+<!--669F7189A86E4EBEB78165527CC81658-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--669F7189A86E4EBEB78165527CC81658-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--669F7189A86E4EBEB78165527CC81658-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--669F7189A86E4EBEB78165527CC81658-->  <AD_ELEMENT_ID><![CDATA[1185A82966EA40ABA990B5DDBD9B8FBA]]></AD_ELEMENT_ID>
+<!--669F7189A86E4EBEB78165527CC81658-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--669F7189A86E4EBEB78165527CC81658-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--669F7189A86E4EBEB78165527CC81658-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--669F7189A86E4EBEB78165527CC81658-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--669F7189A86E4EBEB78165527CC81658-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--669F7189A86E4EBEB78165527CC81658-->  <POSITION><![CDATA[18]]></POSITION>
+<!--669F7189A86E4EBEB78165527CC81658-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--669F7189A86E4EBEB78165527CC81658-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--669F7189A86E4EBEB78165527CC81658-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--669F7189A86E4EBEB78165527CC81658-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--669F7189A86E4EBEB78165527CC81658-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--669F7189A86E4EBEB78165527CC81658--></AD_COLUMN>
+
 <!--6ABD7441749B401D9C0504DDDF8FB7CA--><AD_COLUMN>
 <!--6ABD7441749B401D9C0504DDDF8FB7CA-->  <AD_COLUMN_ID><![CDATA[6ABD7441749B401D9C0504DDDF8FB7CA]]></AD_COLUMN_ID>
 <!--6ABD7441749B401D9C0504DDDF8FB7CA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Mon May 11 13:18:57 2015 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Mon May 11 13:45:43 2015 +0200
@@ -94,6 +94,20 @@
 <!--10922048465547F48765035389E22977-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--10922048465547F48765035389E22977--></AD_ELEMENT>
 
+<!--1185A82966EA40ABA990B5DDBD9B8FBA--><AD_ELEMENT>
+<!--1185A82966EA40ABA990B5DDBD9B8FBA-->  <AD_ELEMENT_ID><![CDATA[1185A82966EA40ABA990B5DDBD9B8FBA]]></AD_ELEMENT_ID>
+<!--1185A82966EA40ABA990B5DDBD9B8FBA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1185A82966EA40ABA990B5DDBD9B8FBA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1185A82966EA40ABA990B5DDBD9B8FBA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1185A82966EA40ABA990B5DDBD9B8FBA-->  <COLUMNNAME><![CDATA[Disablefkcombo]]></COLUMNNAME>
+<!--1185A82966EA40ABA990B5DDBD9B8FBA-->  <NAME><![CDATA[Disable Foreign Key Filter Combo]]></NAME>
+<!--1185A82966EA40ABA990B5DDBD9B8FBA-->  <PRINTNAME><![CDATA[Disable Foreign Key Filter Combo]]></PRINTNAME>
+<!--1185A82966EA40ABA990B5DDBD9B8FBA-->  <DESCRIPTION><![CDATA[If this flag is checked, the foreign key combo will be disabled and the column will be filtered like a standard text column]]></DESCRIPTION>
+<!--1185A82966EA40ABA990B5DDBD9B8FBA-->  <HELP><![CDATA[If this flag is checked, the foreign key combo will be disabled and the column will be filtered like a standard text column]]></HELP>
+<!--1185A82966EA40ABA990B5DDBD9B8FBA-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--1185A82966EA40ABA990B5DDBD9B8FBA-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--1185A82966EA40ABA990B5DDBD9B8FBA--></AD_ELEMENT>
+
 <!--18EA6EC150C545AE8C5E0A3BD4BD4871--><AD_ELEMENT>
 <!--18EA6EC150C545AE8C5E0A3BD4BD4871-->  <AD_ELEMENT_ID><![CDATA[18EA6EC150C545AE8C5E0A3BD4BD4871]]></AD_ELEMENT_ID>
 <!--18EA6EC150C545AE8C5E0A3BD4BD4871-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Mon May 11 13:18:57 2015 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Mon May 11 13:45:43 2015 +0200
@@ -1361,6 +1361,34 @@
 <!--27E751EB37C841EC930FD493AB2CF64B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--27E751EB37C841EC930FD493AB2CF64B--></AD_FIELD>
 
+<!--287DDC4447C24C03BCE538328EC5BACE--><AD_FIELD>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <AD_FIELD_ID><![CDATA[287DDC4447C24C03BCE538328EC5BACE]]></AD_FIELD_ID>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <NAME><![CDATA[Disable Foreign Key Filter Combo]]></NAME>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <DESCRIPTION><![CDATA[If this flag is checked, the foreign key combo will be disabled and the column will be filtered like a standard text column]]></DESCRIPTION>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <HELP><![CDATA[If this flag is checked, the foreign key combo will be disabled and the column will be filtered like a standard text column]]></HELP>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <AD_TAB_ID><![CDATA[13FE911F7F684A47801DF55525BAD4A1]]></AD_TAB_ID>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <AD_COLUMN_ID><![CDATA[02CB84907EA844568D4CE3597E1D6C69]]></AD_COLUMN_ID>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--287DDC4447C24C03BCE538328EC5BACE-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--287DDC4447C24C03BCE538328EC5BACE--></AD_FIELD>
+
 <!--2C3B28510C0544BC8BDA4461AE88C486--><AD_FIELD>
 <!--2C3B28510C0544BC8BDA4461AE88C486-->  <AD_FIELD_ID><![CDATA[2C3B28510C0544BC8BDA4461AE88C486]]></AD_FIELD_ID>
 <!--2C3B28510C0544BC8BDA4461AE88C486-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1454,6 +1482,34 @@
 <!--2FF944B417B544C8A8F8757F1C9F3E35-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--2FF944B417B544C8A8F8757F1C9F3E35--></AD_FIELD>
 
+<!--30F306CF2BCC4E11AFB3E6B8AD901289--><AD_FIELD>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <AD_FIELD_ID><![CDATA[30F306CF2BCC4E11AFB3E6B8AD901289]]></AD_FIELD_ID>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <NAME><![CDATA[Disable Foreign Key Filter Combo]]></NAME>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <DESCRIPTION><![CDATA[If this flag is checked, the foreign key combo will be disabled and the column will be filtered like a standard text column]]></DESCRIPTION>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <HELP><![CDATA[If this flag is checked, the foreign key combo will be disabled and the column will be filtered like a standard text column]]></HELP>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <AD_TAB_ID><![CDATA[49B33DC2EDFD45A48EECE139AD5E9AC9]]></AD_TAB_ID>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <AD_COLUMN_ID><![CDATA[5A8AC3A0A48C49A7A7CFD4AEF1E2C3ED]]></AD_COLUMN_ID>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--30F306CF2BCC4E11AFB3E6B8AD901289--></AD_FIELD>
+
 <!--312B596239AF498EBAF36C1B9A54D2A8--><AD_FIELD>
 <!--312B596239AF498EBAF36C1B9A54D2A8-->  <AD_FIELD_ID><![CDATA[312B596239AF498EBAF36C1B9A54D2A8]]></AD_FIELD_ID>
 <!--312B596239AF498EBAF36C1B9A54D2A8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3356,11 +3412,11 @@
 <!--90A8FCE2F0674325863B3F793AB79601-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--90A8FCE2F0674325863B3F793AB79601-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
 <!--90A8FCE2F0674325863B3F793AB79601-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--90A8FCE2F0674325863B3F793AB79601-->  <SEQNO><![CDATA[510]]></SEQNO>
+<!--90A8FCE2F0674325863B3F793AB79601-->  <SEQNO><![CDATA[130]]></SEQNO>
 <!--90A8FCE2F0674325863B3F793AB79601-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--90A8FCE2F0674325863B3F793AB79601-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--90A8FCE2F0674325863B3F793AB79601-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--90A8FCE2F0674325863B3F793AB79601-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--90A8FCE2F0674325863B3F793AB79601-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--90A8FCE2F0674325863B3F793AB79601-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--90A8FCE2F0674325863B3F793AB79601-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--90A8FCE2F0674325863B3F793AB79601-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -4705,11 +4761,11 @@
 <!--D8A9991BA87645D987BA8B8C9B1C956F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--D8A9991BA87645D987BA8B8C9B1C956F-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--D8A9991BA87645D987BA8B8C9B1C956F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--D8A9991BA87645D987BA8B8C9B1C956F-->  <SEQNO><![CDATA[510]]></SEQNO>
+<!--D8A9991BA87645D987BA8B8C9B1C956F-->  <SEQNO><![CDATA[110]]></SEQNO>
 <!--D8A9991BA87645D987BA8B8C9B1C956F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--D8A9991BA87645D987BA8B8C9B1C956F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--D8A9991BA87645D987BA8B8C9B1C956F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--D8A9991BA87645D987BA8B8C9B1C956F-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--D8A9991BA87645D987BA8B8C9B1C956F-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--D8A9991BA87645D987BA8B8C9B1C956F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--D8A9991BA87645D987BA8B8C9B1C956F-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--D8A9991BA87645D987BA8B8C9B1C956F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -5004,6 +5060,34 @@
 <!--E471F143087943A198BA43A95636E996-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--E471F143087943A198BA43A95636E996--></AD_FIELD>
 
+<!--E649C05D297F48C3B55C8F93991AE2C5--><AD_FIELD>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <AD_FIELD_ID><![CDATA[E649C05D297F48C3B55C8F93991AE2C5]]></AD_FIELD_ID>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <NAME><![CDATA[Disable Foreign Key Filter Combo]]></NAME>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <DESCRIPTION><![CDATA[If this flag is checked, the foreign key combo will be disabled and the column will be filtered like a standard text column]]></DESCRIPTION>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <HELP><![CDATA[If this flag is checked, the foreign key combo will be disabled and the column will be filtered like a standard text column]]></HELP>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <AD_TAB_ID><![CDATA[D26230D6D21546C6970E79FF1C51165E]]></AD_TAB_ID>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <AD_COLUMN_ID><![CDATA[669F7189A86E4EBEB78165527CC81658]]></AD_COLUMN_ID>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--E649C05D297F48C3B55C8F93991AE2C5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--E649C05D297F48C3B55C8F93991AE2C5--></AD_FIELD>
+
 <!--E78C1117FDE742F8A566278AD2E0591C--><AD_FIELD>
 <!--E78C1117FDE742F8A566278AD2E0591C-->  <AD_FIELD_ID><![CDATA[E78C1117FDE742F8A566278AD2E0591C]]></AD_FIELD_ID>
 <!--E78C1117FDE742F8A566278AD2E0591C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5250,11 +5334,11 @@
 <!--F71536CBC10F40BAAC048E466C2E8916-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--F71536CBC10F40BAAC048E466C2E8916-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
 <!--F71536CBC10F40BAAC048E466C2E8916-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--F71536CBC10F40BAAC048E466C2E8916-->  <SEQNO><![CDATA[510]]></SEQNO>
+<!--F71536CBC10F40BAAC048E466C2E8916-->  <SEQNO><![CDATA[120]]></SEQNO>
 <!--F71536CBC10F40BAAC048E466C2E8916-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--F71536CBC10F40BAAC048E466C2E8916-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--F71536CBC10F40BAAC048E466C2E8916-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--F71536CBC10F40BAAC048E466C2E8916-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--F71536CBC10F40BAAC048E466C2E8916-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--F71536CBC10F40BAAC048E466C2E8916-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--F71536CBC10F40BAAC048E466C2E8916-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--F71536CBC10F40BAAC048E466C2E8916-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java	Mon May 11 13:18:57 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java	Mon May 11 13:45:43 2015 +0200
@@ -178,13 +178,15 @@
     Boolean lazyFiltering = null;
     Boolean allowFkFilterByIdentifier = null;
     Boolean showFkDropdownUnfiltered = null;
+    Boolean disableFkDropdown = null;
     String operator = null;
     Long thresholdToFilter = null;
     JSONObject result = new JSONObject();
 
     if (field != null && field.getId() != null) {
       if (canSort == null || canFilter == null || operator == null || filterOnChange == null
-          || thresholdToFilter == null || allowFkFilterByIdentifier == null) {
+          || thresholdToFilter == null || allowFkFilterByIdentifier == null
+          || showFkDropdownUnfiltered == null || disableFkDropdown == null) {
         List<Object> fieldParams = new ArrayList<Object>();
         String fieldConfsHql = " as p where p.field.id = ? ";
         fieldParams.add(field.getId());
@@ -233,6 +235,13 @@
               showFkDropdownUnfiltered = false;
             }
           }
+          if (disableFkDropdown == null) {
+            if ("Y".equals(fieldConfs.get(0).getDisableFkCombo())) {
+              disableFkDropdown = true;
+            } else if ("N".equals(fieldConfs.get(0).getDisableFkCombo())) {
+              disableFkDropdown = false;
+            }
+          }
           if (thresholdToFilter == null) {
             thresholdToFilter = fieldConfs.get(0).getThresholdToFilter();
           }
@@ -298,6 +307,13 @@
             showFkDropdownUnfiltered = false;
           }
         }
+        if (disableFkDropdown == null) {
+          if ("Y".equals(tabConfs.get(0).getDisableFkCombo())) {
+            disableFkDropdown = true;
+          } else if ("N".equals(tabConfs.get(0).getDisableFkCombo())) {
+            disableFkDropdown = false;
+          }
+        }
         if (thresholdToFilter == null) {
           thresholdToFilter = tabConfs.get(0).getThresholdToFilter();
         }
@@ -333,6 +349,9 @@
         if (showFkDropdownUnfiltered == null) {
           showFkDropdownUnfiltered = sysConfs.get(0).isFkDropDownUnfiltered();
         }
+        if (disableFkDropdown == null) {
+          disableFkDropdown = sysConfs.get(0).isDisableFkCombo();
+        }
       }
     }
 
@@ -378,6 +397,9 @@
       if (showFkDropdownUnfiltered != null) {
         result.put("showFkDropdownUnfiltered", showFkDropdownUnfiltered);
       }
+      if (disableFkDropdown != null) {
+        result.put("disableFkDropdown", disableFkDropdown);
+      }
     } catch (JSONException e) {
       log.error("Couldn't get field property value");
     }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js	Mon May 11 13:18:57 2015 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js	Mon May 11 13:45:43 2015 +0200
@@ -76,97 +76,102 @@
 
     }
 
-    this.pickListProperties = {
-      // 'showOverAsSelected' and 'bodyKeyPress' defined here until issue 28475 be fixed.
-      // After the fix the following two lines must be removed, since it will be inherited from
-      // OBListFilterItem  as usual
-      showOverAsSelected: this.pickListProperties.showOverAsSelected,
-      bodyKeyPress: this.pickListProperties.bodyKeyPress,
+    if (this.disableFkDropdown) {
+      this.showPickerIcon = false;
+      this.showPickListOnKeypress = false;
+    } else {
+      this.pickListProperties = {
+        // 'showOverAsSelected' and 'bodyKeyPress' defined here until issue 28475 be fixed.
+        // After the fix the following two lines must be removed, since it will be inherited from
+        // OBListFilterItem  as usual
+        showOverAsSelected: this.pickListProperties.showOverAsSelected,
+        bodyKeyPress: this.pickListProperties.bodyKeyPress,
 
-      // make sure that we send the same parameters as the grid
-      onFetchData: function (criteria, requestProperties) {
-        var gridView = grid.view;
-        requestProperties = requestProperties || {};
-        requestProperties.params = grid.getFetchRequestParams(requestProperties.params) || {};
-        if (gridView) {
-          requestProperties.params.tabId = gridView.tabId || (grid.viewProperties && grid.viewProperties.tabId) || (gridView.sourceView && gridView.sourceView.tabId);
-          if (gridView.buttonOwnerView && gridView.buttonOwnerView.tabId) {
-            requestProperties.params.buttonOwnerViewTabId = gridView.buttonOwnerView.tabId;
+        // make sure that we send the same parameters as the grid
+        onFetchData: function (criteria, requestProperties) {
+          var gridView = grid.view;
+          requestProperties = requestProperties || {};
+          requestProperties.params = grid.getFetchRequestParams(requestProperties.params) || {};
+          if (gridView) {
+            requestProperties.params.tabId = gridView.tabId || (grid.viewProperties && grid.viewProperties.tabId) || (gridView.sourceView && gridView.sourceView.tabId);
+            if (gridView.buttonOwnerView && gridView.buttonOwnerView.tabId) {
+              requestProperties.params.buttonOwnerViewTabId = gridView.buttonOwnerView.tabId;
+            }
           }
-        }
-        // send the display field in request params to add it to the list of fields to be fetched in DefaultJsonDataService.
-        // used for displaying table references properly. Refer issue https://issues.openbravo.com/view.php?id=26696
-        if (this.formItem && this.formItem.displayProperty) {
-          requestProperties.params.displayProperty = this.formItem.displayProperty;
-        }
-        delete me.forceReload;
-      },
+          // send the display field in request params to add it to the list of fields to be fetched in DefaultJsonDataService.
+          // used for displaying table references properly. Refer issue https://issues.openbravo.com/view.php?id=26696
+          if (this.formItem && this.formItem.displayProperty) {
+            requestProperties.params.displayProperty = this.formItem.displayProperty;
+          }
+          delete me.forceReload;
+        },
 
-      // drawAllMaxCells is set to 0 to prevent extra reads of data
-      // Smartclient will try to read until drawAllMaxCells has been reached
-      drawAllMaxCells: 0,
+        // drawAllMaxCells is set to 0 to prevent extra reads of data
+        // Smartclient will try to read until drawAllMaxCells has been reached
+        drawAllMaxCells: 0,
 
-      fetchDelay: 400,
-      // prevent aggressive local filtering by smartclient
-      filterLocally: false,
-      multipleValueSeparator: ' or ',
-      dataProperties: {
-        useClientFiltering: false
-      },
+        fetchDelay: 400,
+        // prevent aggressive local filtering by smartclient
+        filterLocally: false,
+        multipleValueSeparator: ' or ',
+        dataProperties: {
+          useClientFiltering: false
+        },
 
-      isSelected: function (record) {
-        var i, values = this.formItem.getValue();
-        if (values.length) {
-          for (i = 0; i < values.length; i++) {
-            if (record[me.displayField] === values[i]) {
-              return true;
+        isSelected: function (record) {
+          var i, values = this.formItem.getValue();
+          if (values.length) {
+            for (i = 0; i < values.length; i++) {
+              if (record[me.displayField] === values[i]) {
+                return true;
+              }
+            }
+          }
+          return record[me.displayField] === values;
+        },
+
+        // override data arrived to prevent the first entry from being
+        // selected
+        // this to handle the picklist in foreign key filter item. When a user
+        // types a partial value maybe he/she wants to filter by this partial
+        // value
+        // auto-selecting the first value makes this impossible.
+        // Therefore this option to prevent this.
+        // There are maybe nicer points to do this overriding but this was the
+        // place after the first item was selected.
+        // This first selection happens in ScrollingMenu.dataChanged
+        dataArrived: function (startRow, endRow) {
+          var record, rowNum, i, values = this.formItem.getValue(),
+              fixedValues = [],
+              value;
+          this.Super('dataArrived', arguments);
+          if (values) {
+            if (!isc.isA.Array(values)) {
+              values = [values];
+            }
+
+            // fix selected values before checking them in the data to re-select them
+            for (i = 0; i < values.length; i++) {
+              value = values[i];
+              if (isc.isAn.Array(value)) {
+                value = value[0];
+              }
+              fixedValues.push(value.startsWith('==') ? value.substring(2) : value);
+            }
+
+            for (rowNum = startRow; rowNum < (endRow + 1); rowNum++) {
+              record = this.getRecord(rowNum);
+              if (record && fixedValues.contains(record[me.displayField])) {
+                // selectRecord asynchronously invokes handleChanged, this should be
+                // managed as when the value is picked from the list by pickValue
+                this.formItem._pickingArrivedValue = true;
+                this.selectRecord(record, true);
+              }
             }
           }
         }
-        return record[me.displayField] === values;
-      },
-
-      // override data arrived to prevent the first entry from being
-      // selected
-      // this to handle the picklist in foreign key filter item. When a user
-      // types a partial value maybe he/she wants to filter by this partial
-      // value
-      // auto-selecting the first value makes this impossible.
-      // Therefore this option to prevent this.
-      // There are maybe nicer points to do this overriding but this was the
-      // place after the first item was selected.
-      // This first selection happens in ScrollingMenu.dataChanged
-      dataArrived: function (startRow, endRow) {
-        var record, rowNum, i, values = this.formItem.getValue(),
-            fixedValues = [],
-            value;
-        this.Super('dataArrived', arguments);
-        if (values) {
-          if (!isc.isA.Array(values)) {
-            values = [values];
-          }
-
-          // fix selected values before checking them in the data to re-select them
-          for (i = 0; i < values.length; i++) {
-            value = values[i];
-            if (isc.isAn.Array(value)) {
-              value = value[0];
-            }
-            fixedValues.push(value.startsWith('==') ? value.substring(2) : value);
-          }
-
-          for (rowNum = startRow; rowNum < (endRow + 1); rowNum++) {
-            record = this.getRecord(rowNum);
-            if (record && fixedValues.contains(record[me.displayField])) {
-              // selectRecord asynchronously invokes handleChanged, this should be
-              // managed as when the value is picked from the list by pickValue
-              this.formItem._pickingArrivedValue = true;
-              this.selectRecord(record, true);
-            }
-          }
-        }
-      }
-    };
+      };
+    }
     dataSource = OB.Datasource.create({
       dataURL: grid.getDataSource().dataURL,
       requestProperties: {
@@ -181,7 +186,7 @@
       dataSource.requestProperties.params.tabId = grid.view.tabId;
     }
     if (this.showFkDropdownUnfiltered) {
-        dataSource.requestProperties.params._showFkDropdownUnfiltered = true;
+      dataSource.requestProperties.params._showFkDropdownUnfiltered = true;
     }
     this.setOptionDataSource(dataSource);
 
@@ -560,6 +565,9 @@
   },
 
   refreshPickList: function () {
+    if (this.disableFkDropdown) {
+      return;
+    }
     if (this.valueIsExpression()) {
       return;
     }
@@ -693,5 +701,12 @@
       recordIdentifier = this.filterAuxCache.find(OB.Constants.ID, id)[OB.Constants.IDENTIFIER];
     }
     return recordIdentifier;
+  },
+
+  showPickList: function () {
+    if (this.disableFkDropdown) {
+      return;
+    }
+    this.Super('showPickList', arguments);
   }
 });
\ No newline at end of file
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java	Mon May 11 13:18:57 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java	Mon May 11 13:45:43 2015 +0200
@@ -73,6 +73,11 @@
       append = append + ", showFkDropdownUnfiltered: " + showFkDropdownUnfiltered.toString();
     }
 
+    Boolean disableFkDropdown = (Boolean) readGridConfigurationSetting("disableFkDropdown");
+    if (Boolean.TRUE.equals(disableFkDropdown)) {
+      append = append + ", disableFkDropdown: " + disableFkDropdown.toString();
+    }
+
     return super.getFilterEditorPropertiesProperty(field) + append;
   }