[OBUISEL] Added fields needed when a custom query is used.
authorGorka Ion Damián <gorkaion.damian@openbravo.com>
Fri, 21 Jan 2011 14:31:48 +0100
changeset 10029 eab8e3a0c0b6
parent 10028 96d3e090f851
child 10030 cffb1c608017
[OBUISEL] Added fields needed when a custom query is used.
modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR.xml
modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR_FIELD.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_COLUMN.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_ELEMENT.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_FIELD.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
--- a/modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR.xml	Fri Jan 21 13:08:53 2011 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR.xml	Fri Jan 21 14:31:48 2011 +0100
@@ -101,6 +101,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="CUSTOM_QUERY" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="OBUISEL_S_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -135,6 +139,7 @@
         <unique-column name="NAME"/>
         <unique-column name="AD_REFERENCE_ID"/>
       </unique>
+      <check name="OBUISEL_CUSTOM_QUERY_CHK"><![CDATA[CUSTOM_QUERY IN ('Y', 'N')]]></check>
       <check name="OBUISEL_SEL_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR_FIELD.xml	Fri Jan 21 13:08:53 2011 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/model/tables/OBUISEL_SELECTOR_FIELD.xml	Fri Jan 21 14:31:48 2011 +0100
@@ -97,6 +97,14 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="DISPLAY_EXPRESSION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="CLAUSE_LEFT_PART" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="OBSERDS_DATASOURCE_FIELD" name="OBUISEL_S_OBSERDS_DSF">
         <reference local="OBSERDS_DATASOURCE_FIELD_ID" foreign="OBSERDS_DATASOURCE_FIELD_ID"/>
       </foreign-key>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_COLUMN.xml	Fri Jan 21 13:08:53 2011 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_COLUMN.xml	Fri Jan 21 14:31:48 2011 +0100
@@ -1650,6 +1650,103 @@
 <!--9A4B111315EDCE2CE040007F01007260-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--9A4B111315EDCE2CE040007F01007260--></AD_COLUMN>
 
+<!--9A597DDF9954E963E040007F01002F75--><AD_COLUMN>
+<!--9A597DDF9954E963E040007F01002F75-->  <AD_COLUMN_ID><![CDATA[9A597DDF9954E963E040007F01002F75]]></AD_COLUMN_ID>
+<!--9A597DDF9954E963E040007F01002F75-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9A597DDF9954E963E040007F01002F75-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9A597DDF9954E963E040007F01002F75-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9A597DDF9954E963E040007F01002F75-->  <NAME><![CDATA[Custom Query]]></NAME>
+<!--9A597DDF9954E963E040007F01002F75-->  <HELP><![CDATA[Indicates that a custom query is used to fill out the selector's grid.]]></HELP>
+<!--9A597DDF9954E963E040007F01002F75-->  <COLUMNNAME><![CDATA[Custom_Query]]></COLUMNNAME>
+<!--9A597DDF9954E963E040007F01002F75-->  <AD_TABLE_ID><![CDATA[7E50FCF61A884C9D966D1348705EC17C]]></AD_TABLE_ID>
+<!--9A597DDF9954E963E040007F01002F75-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--9A597DDF9954E963E040007F01002F75-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--9A597DDF9954E963E040007F01002F75-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--9A597DDF9954E963E040007F01002F75-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--9A597DDF9954E963E040007F01002F75-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9A597DDF9954E963E040007F01002F75-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--9A597DDF9954E963E040007F01002F75-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9A597DDF9954E963E040007F01002F75-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9A597DDF9954E963E040007F01002F75-->  <SEQNO><![CDATA[260]]></SEQNO>
+<!--9A597DDF9954E963E040007F01002F75-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9A597DDF9954E963E040007F01002F75-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9A597DDF9954E963E040007F01002F75-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9A597DDF9954E963E040007F01002F75-->  <AD_ELEMENT_ID><![CDATA[9A597DDF9955E963E040007F01002F75]]></AD_ELEMENT_ID>
+<!--9A597DDF9954E963E040007F01002F75-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--9A597DDF9954E963E040007F01002F75-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9A597DDF9954E963E040007F01002F75-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9A597DDF9954E963E040007F01002F75-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9A597DDF9954E963E040007F01002F75-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9A597DDF9954E963E040007F01002F75-->  <POSITION><![CDATA[26]]></POSITION>
+<!--9A597DDF9954E963E040007F01002F75-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9A597DDF9954E963E040007F01002F75-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9A597DDF9954E963E040007F01002F75-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9A597DDF9954E963E040007F01002F75--></AD_COLUMN>
+
+<!--9A597DDF995BE963E040007F01002F75--><AD_COLUMN>
+<!--9A597DDF995BE963E040007F01002F75-->  <AD_COLUMN_ID><![CDATA[9A597DDF995BE963E040007F01002F75]]></AD_COLUMN_ID>
+<!--9A597DDF995BE963E040007F01002F75-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9A597DDF995BE963E040007F01002F75-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9A597DDF995BE963E040007F01002F75-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9A597DDF995BE963E040007F01002F75-->  <NAME><![CDATA[Display Column Alias]]></NAME>
+<!--9A597DDF995BE963E040007F01002F75-->  <HELP><![CDATA[Alias of the HQL query column to be shown]]></HELP>
+<!--9A597DDF995BE963E040007F01002F75-->  <COLUMNNAME><![CDATA[Display_Expression]]></COLUMNNAME>
+<!--9A597DDF995BE963E040007F01002F75-->  <AD_TABLE_ID><![CDATA[A2F880F9981349E2A6A57BD58267EBCE]]></AD_TABLE_ID>
+<!--9A597DDF995BE963E040007F01002F75-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--9A597DDF995BE963E040007F01002F75-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--9A597DDF995BE963E040007F01002F75-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--9A597DDF995BE963E040007F01002F75-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9A597DDF995BE963E040007F01002F75-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--9A597DDF995BE963E040007F01002F75-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9A597DDF995BE963E040007F01002F75-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9A597DDF995BE963E040007F01002F75-->  <SEQNO><![CDATA[260]]></SEQNO>
+<!--9A597DDF995BE963E040007F01002F75-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9A597DDF995BE963E040007F01002F75-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9A597DDF995BE963E040007F01002F75-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9A597DDF995BE963E040007F01002F75-->  <AD_ELEMENT_ID><![CDATA[9A5A29111528107DE040007F01002F6B]]></AD_ELEMENT_ID>
+<!--9A597DDF995BE963E040007F01002F75-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9A597DDF995BE963E040007F01002F75-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9A597DDF995BE963E040007F01002F75-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9A597DDF995BE963E040007F01002F75-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9A597DDF995BE963E040007F01002F75-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9A597DDF995BE963E040007F01002F75-->  <POSITION><![CDATA[25]]></POSITION>
+<!--9A597DDF995BE963E040007F01002F75-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9A597DDF995BE963E040007F01002F75-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9A597DDF995BE963E040007F01002F75-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9A597DDF995BE963E040007F01002F75--></AD_COLUMN>
+
+<!--9A597DDF995CE963E040007F01002F75--><AD_COLUMN>
+<!--9A597DDF995CE963E040007F01002F75-->  <AD_COLUMN_ID><![CDATA[9A597DDF995CE963E040007F01002F75]]></AD_COLUMN_ID>
+<!--9A597DDF995CE963E040007F01002F75-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9A597DDF995CE963E040007F01002F75-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9A597DDF995CE963E040007F01002F75-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9A597DDF995CE963E040007F01002F75-->  <NAME><![CDATA[Clause Left Part]]></NAME>
+<!--9A597DDF995CE963E040007F01002F75-->  <HELP><![CDATA[Left part of a clause to be used on the where or order by clauses of the HQL.]]></HELP>
+<!--9A597DDF995CE963E040007F01002F75-->  <COLUMNNAME><![CDATA[Clause_Left_Part]]></COLUMNNAME>
+<!--9A597DDF995CE963E040007F01002F75-->  <AD_TABLE_ID><![CDATA[A2F880F9981349E2A6A57BD58267EBCE]]></AD_TABLE_ID>
+<!--9A597DDF995CE963E040007F01002F75-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--9A597DDF995CE963E040007F01002F75-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--9A597DDF995CE963E040007F01002F75-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--9A597DDF995CE963E040007F01002F75-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9A597DDF995CE963E040007F01002F75-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--9A597DDF995CE963E040007F01002F75-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9A597DDF995CE963E040007F01002F75-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9A597DDF995CE963E040007F01002F75-->  <SEQNO><![CDATA[270]]></SEQNO>
+<!--9A597DDF995CE963E040007F01002F75-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9A597DDF995CE963E040007F01002F75-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9A597DDF995CE963E040007F01002F75-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9A597DDF995CE963E040007F01002F75-->  <AD_ELEMENT_ID><![CDATA[9A5A29111529107DE040007F01002F6B]]></AD_ELEMENT_ID>
+<!--9A597DDF995CE963E040007F01002F75-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9A597DDF995CE963E040007F01002F75-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9A597DDF995CE963E040007F01002F75-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9A597DDF995CE963E040007F01002F75-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9A597DDF995CE963E040007F01002F75-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9A597DDF995CE963E040007F01002F75-->  <POSITION><![CDATA[26]]></POSITION>
+<!--9A597DDF995CE963E040007F01002F75-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9A597DDF995CE963E040007F01002F75-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9A597DDF995CE963E040007F01002F75-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9A597DDF995CE963E040007F01002F75--></AD_COLUMN>
+
 <!--9CFAD359FF0D433894E34EA05F6207FE--><AD_COLUMN>
 <!--9CFAD359FF0D433894E34EA05F6207FE-->  <AD_COLUMN_ID><![CDATA[9CFAD359FF0D433894E34EA05F6207FE]]></AD_COLUMN_ID>
 <!--9CFAD359FF0D433894E34EA05F6207FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1789,7 +1886,7 @@
 <!--A14F7F5DCF504333B13BFF90BBF1E75C-->  <AD_CALLOUT_ID><![CDATA[B1A343FFF5804FA9ADEF047C91654A12]]></AD_CALLOUT_ID>
 <!--A14F7F5DCF504333B13BFF90BBF1E75C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--A14F7F5DCF504333B13BFF90BBF1E75C-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
-<!--A14F7F5DCF504333B13BFF90BBF1E75C-->  <POSITION><![CDATA[25]]></POSITION>
+<!--A14F7F5DCF504333B13BFF90BBF1E75C-->  <POSITION><![CDATA[24]]></POSITION>
 <!--A14F7F5DCF504333B13BFF90BBF1E75C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--A14F7F5DCF504333B13BFF90BBF1E75C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--A14F7F5DCF504333B13BFF90BBF1E75C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Jan 21 13:08:53 2011 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Jan 21 14:31:48 2011 +0100
@@ -150,6 +150,42 @@
 <!--9A4B09670A04B876E040007F01007259-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--9A4B09670A04B876E040007F01007259--></AD_ELEMENT>
 
+<!--9A597DDF9955E963E040007F01002F75--><AD_ELEMENT>
+<!--9A597DDF9955E963E040007F01002F75-->  <AD_ELEMENT_ID><![CDATA[9A597DDF9955E963E040007F01002F75]]></AD_ELEMENT_ID>
+<!--9A597DDF9955E963E040007F01002F75-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9A597DDF9955E963E040007F01002F75-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9A597DDF9955E963E040007F01002F75-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9A597DDF9955E963E040007F01002F75-->  <COLUMNNAME><![CDATA[Custom_Query]]></COLUMNNAME>
+<!--9A597DDF9955E963E040007F01002F75-->  <NAME><![CDATA[Custom Query]]></NAME>
+<!--9A597DDF9955E963E040007F01002F75-->  <PRINTNAME><![CDATA[Custom Query]]></PRINTNAME>
+<!--9A597DDF9955E963E040007F01002F75-->  <HELP><![CDATA[Indicates that a custom query is used to fill out the selector's grid.]]></HELP>
+<!--9A597DDF9955E963E040007F01002F75-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9A597DDF9955E963E040007F01002F75--></AD_ELEMENT>
+
+<!--9A5A29111528107DE040007F01002F6B--><AD_ELEMENT>
+<!--9A5A29111528107DE040007F01002F6B-->  <AD_ELEMENT_ID><![CDATA[9A5A29111528107DE040007F01002F6B]]></AD_ELEMENT_ID>
+<!--9A5A29111528107DE040007F01002F6B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9A5A29111528107DE040007F01002F6B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9A5A29111528107DE040007F01002F6B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9A5A29111528107DE040007F01002F6B-->  <COLUMNNAME><![CDATA[Display_Expression]]></COLUMNNAME>
+<!--9A5A29111528107DE040007F01002F6B-->  <NAME><![CDATA[Display Column Alias]]></NAME>
+<!--9A5A29111528107DE040007F01002F6B-->  <PRINTNAME><![CDATA[Display Column Alias]]></PRINTNAME>
+<!--9A5A29111528107DE040007F01002F6B-->  <HELP><![CDATA[Alias of the HQL query column to be shown]]></HELP>
+<!--9A5A29111528107DE040007F01002F6B-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9A5A29111528107DE040007F01002F6B--></AD_ELEMENT>
+
+<!--9A5A29111529107DE040007F01002F6B--><AD_ELEMENT>
+<!--9A5A29111529107DE040007F01002F6B-->  <AD_ELEMENT_ID><![CDATA[9A5A29111529107DE040007F01002F6B]]></AD_ELEMENT_ID>
+<!--9A5A29111529107DE040007F01002F6B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9A5A29111529107DE040007F01002F6B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9A5A29111529107DE040007F01002F6B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9A5A29111529107DE040007F01002F6B-->  <COLUMNNAME><![CDATA[Clause_Left_Part]]></COLUMNNAME>
+<!--9A5A29111529107DE040007F01002F6B-->  <NAME><![CDATA[Clause Left Part]]></NAME>
+<!--9A5A29111529107DE040007F01002F6B-->  <PRINTNAME><![CDATA[Clause Left Part]]></PRINTNAME>
+<!--9A5A29111529107DE040007F01002F6B-->  <HELP><![CDATA[Left part of a clause to be used on the where or order by clauses of the HQL.]]></HELP>
+<!--9A5A29111529107DE040007F01002F6B-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9A5A29111529107DE040007F01002F6B--></AD_ELEMENT>
+
 <!--B843BE7E4A984128AA589685C313E709--><AD_ELEMENT>
 <!--B843BE7E4A984128AA589685C313E709-->  <AD_ELEMENT_ID><![CDATA[B843BE7E4A984128AA589685C313E709]]></AD_ELEMENT_ID>
 <!--B843BE7E4A984128AA589685C313E709-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_FIELD.xml	Fri Jan 21 13:08:53 2011 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_FIELD.xml	Fri Jan 21 14:31:48 2011 +0100
@@ -261,7 +261,7 @@
 <!--32AC61DCE5D84F9B94178BED671B79A1-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--32AC61DCE5D84F9B94178BED671B79A1-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--32AC61DCE5D84F9B94178BED671B79A1-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--32AC61DCE5D84F9B94178BED671B79A1-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--32AC61DCE5D84F9B94178BED671B79A1-->  <SEQNO><![CDATA[78]]></SEQNO>
 <!--32AC61DCE5D84F9B94178BED671B79A1-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--32AC61DCE5D84F9B94178BED671B79A1-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--32AC61DCE5D84F9B94178BED671B79A1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -518,6 +518,7 @@
 <!--51D10BDFBF6640A5B74C0A6F3E8CC4FF-->  <AD_TAB_ID><![CDATA[10153E4B83EC4A5E8C558FCE74071FB0]]></AD_TAB_ID>
 <!--51D10BDFBF6640A5B74C0A6F3E8CC4FF-->  <AD_COLUMN_ID><![CDATA[31073A09394242B8BAA98C49CA51F69F]]></AD_COLUMN_ID>
 <!--51D10BDFBF6640A5B74C0A6F3E8CC4FF-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--51D10BDFBF6640A5B74C0A6F3E8CC4FF-->  <DISPLAYLOGIC><![CDATA[@custom_query@='N']]></DISPLAYLOGIC>
 <!--51D10BDFBF6640A5B74C0A6F3E8CC4FF-->  <DISPLAYLENGTH><![CDATA[2000]]></DISPLAYLENGTH>
 <!--51D10BDFBF6640A5B74C0A6F3E8CC4FF-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--51D10BDFBF6640A5B74C0A6F3E8CC4FF-->  <SEQNO><![CDATA[120]]></SEQNO>
@@ -546,7 +547,7 @@
 <!--5436F88B3B194D379E892971A6335349-->  <DISPLAYLOGIC><![CDATA[@Showingrid@='Y']]></DISPLAYLOGIC>
 <!--5436F88B3B194D379E892971A6335349-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--5436F88B3B194D379E892971A6335349-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--5436F88B3B194D379E892971A6335349-->  <SEQNO><![CDATA[160]]></SEQNO>
+<!--5436F88B3B194D379E892971A6335349-->  <SEQNO><![CDATA[156]]></SEQNO>
 <!--5436F88B3B194D379E892971A6335349-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--5436F88B3B194D379E892971A6335349-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5436F88B3B194D379E892971A6335349-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -947,6 +948,7 @@
 <!--9A4B111315EECE2CE040007F01007260-->  <AD_TAB_ID><![CDATA[10153E4B83EC4A5E8C558FCE74071FB0]]></AD_TAB_ID>
 <!--9A4B111315EECE2CE040007F01007260-->  <AD_COLUMN_ID><![CDATA[9A49A966B16D6348E040007F01007184]]></AD_COLUMN_ID>
 <!--9A4B111315EECE2CE040007F01007260-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9A4B111315EECE2CE040007F01007260-->  <DISPLAYLOGIC><![CDATA[@Obserds_Datasource_ID@=''&@custom_query@='Y']]></DISPLAYLOGIC>
 <!--9A4B111315EECE2CE040007F01007260-->  <DISPLAYLENGTH><![CDATA[4000]]></DISPLAYLENGTH>
 <!--9A4B111315EECE2CE040007F01007260-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--9A4B111315EECE2CE040007F01007260-->  <SEQNO><![CDATA[104]]></SEQNO>
@@ -971,6 +973,7 @@
 <!--9A4B111315EFCE2CE040007F01007260-->  <AD_TAB_ID><![CDATA[10153E4B83EC4A5E8C558FCE74071FB0]]></AD_TAB_ID>
 <!--9A4B111315EFCE2CE040007F01007260-->  <AD_COLUMN_ID><![CDATA[9A4B111315EDCE2CE040007F01007260]]></AD_COLUMN_ID>
 <!--9A4B111315EFCE2CE040007F01007260-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9A4B111315EFCE2CE040007F01007260-->  <DISPLAYLOGIC><![CDATA[@Obserds_Datasource_ID@=''&@custom_query@='Y']]></DISPLAYLOGIC>
 <!--9A4B111315EFCE2CE040007F01007260-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
 <!--9A4B111315EFCE2CE040007F01007260-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--9A4B111315EFCE2CE040007F01007260-->  <SEQNO><![CDATA[92]]></SEQNO>
@@ -1009,6 +1012,78 @@
 <!--9A5295F6BA6D4E6ABCB3039D5ABDADE3-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--9A5295F6BA6D4E6ABCB3039D5ABDADE3--></AD_FIELD>
 
+<!--9A59BA6A87C345EAE040007F01002F87--><AD_FIELD>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <AD_FIELD_ID><![CDATA[9A59BA6A87C345EAE040007F01002F87]]></AD_FIELD_ID>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <NAME><![CDATA[Custom Query]]></NAME>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <AD_TAB_ID><![CDATA[10153E4B83EC4A5E8C558FCE74071FB0]]></AD_TAB_ID>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <AD_COLUMN_ID><![CDATA[9A597DDF9954E963E040007F01002F75]]></AD_COLUMN_ID>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <DISPLAYLOGIC><![CDATA[@Obserds_Datasource_ID@='']]></DISPLAYLOGIC>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <SEQNO><![CDATA[81]]></SEQNO>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9A59BA6A87C345EAE040007F01002F87-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9A59BA6A87C345EAE040007F01002F87--></AD_FIELD>
+
+<!--9A5A2911152F107DE040007F01002F6B--><AD_FIELD>
+<!--9A5A2911152F107DE040007F01002F6B-->  <AD_FIELD_ID><![CDATA[9A5A2911152F107DE040007F01002F6B]]></AD_FIELD_ID>
+<!--9A5A2911152F107DE040007F01002F6B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9A5A2911152F107DE040007F01002F6B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9A5A2911152F107DE040007F01002F6B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9A5A2911152F107DE040007F01002F6B-->  <NAME><![CDATA[Display Column Alias]]></NAME>
+<!--9A5A2911152F107DE040007F01002F6B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9A5A2911152F107DE040007F01002F6B-->  <AD_TAB_ID><![CDATA[75FEAE3FF26F49E394BDF833B1B97647]]></AD_TAB_ID>
+<!--9A5A2911152F107DE040007F01002F6B-->  <AD_COLUMN_ID><![CDATA[9A597DDF995BE963E040007F01002F75]]></AD_COLUMN_ID>
+<!--9A5A2911152F107DE040007F01002F6B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9A5A2911152F107DE040007F01002F6B-->  <DISPLAYLOGIC><![CDATA[@AD_Table_ID@!''&@custom_query@='Y']]></DISPLAYLOGIC>
+<!--9A5A2911152F107DE040007F01002F6B-->  <DISPLAYLENGTH><![CDATA[255]]></DISPLAYLENGTH>
+<!--9A5A2911152F107DE040007F01002F6B-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9A5A2911152F107DE040007F01002F6B-->  <SEQNO><![CDATA[62]]></SEQNO>
+<!--9A5A2911152F107DE040007F01002F6B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9A5A2911152F107DE040007F01002F6B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9A5A2911152F107DE040007F01002F6B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9A5A2911152F107DE040007F01002F6B-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--9A5A2911152F107DE040007F01002F6B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9A5A2911152F107DE040007F01002F6B-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9A5A2911152F107DE040007F01002F6B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9A5A2911152F107DE040007F01002F6B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9A5A2911152F107DE040007F01002F6B--></AD_FIELD>
+
+<!--9A5A29111530107DE040007F01002F6B--><AD_FIELD>
+<!--9A5A29111530107DE040007F01002F6B-->  <AD_FIELD_ID><![CDATA[9A5A29111530107DE040007F01002F6B]]></AD_FIELD_ID>
+<!--9A5A29111530107DE040007F01002F6B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9A5A29111530107DE040007F01002F6B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9A5A29111530107DE040007F01002F6B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9A5A29111530107DE040007F01002F6B-->  <NAME><![CDATA[Clause Left Part]]></NAME>
+<!--9A5A29111530107DE040007F01002F6B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9A5A29111530107DE040007F01002F6B-->  <AD_TAB_ID><![CDATA[75FEAE3FF26F49E394BDF833B1B97647]]></AD_TAB_ID>
+<!--9A5A29111530107DE040007F01002F6B-->  <AD_COLUMN_ID><![CDATA[9A597DDF995CE963E040007F01002F75]]></AD_COLUMN_ID>
+<!--9A5A29111530107DE040007F01002F6B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9A5A29111530107DE040007F01002F6B-->  <DISPLAYLOGIC><![CDATA[@showingrid@='Y'&@custom_query@='Y']]></DISPLAYLOGIC>
+<!--9A5A29111530107DE040007F01002F6B-->  <DISPLAYLENGTH><![CDATA[255]]></DISPLAYLENGTH>
+<!--9A5A29111530107DE040007F01002F6B-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9A5A29111530107DE040007F01002F6B-->  <SEQNO><![CDATA[162]]></SEQNO>
+<!--9A5A29111530107DE040007F01002F6B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9A5A29111530107DE040007F01002F6B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9A5A29111530107DE040007F01002F6B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9A5A29111530107DE040007F01002F6B-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--9A5A29111530107DE040007F01002F6B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9A5A29111530107DE040007F01002F6B-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9A5A29111530107DE040007F01002F6B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9A5A29111530107DE040007F01002F6B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9A5A29111530107DE040007F01002F6B--></AD_FIELD>
+
 <!--9FE662DDA6514019926F06FA6363D17E--><AD_FIELD>
 <!--9FE662DDA6514019926F06FA6363D17E-->  <AD_FIELD_ID><![CDATA[9FE662DDA6514019926F06FA6363D17E]]></AD_FIELD_ID>
 <!--9FE662DDA6514019926F06FA6363D17E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1324,10 +1399,10 @@
 <!--DD709D1D4C764DA7953CA55E64607672-->  <AD_TAB_ID><![CDATA[75FEAE3FF26F49E394BDF833B1B97647]]></AD_TAB_ID>
 <!--DD709D1D4C764DA7953CA55E64607672-->  <AD_COLUMN_ID><![CDATA[CF668CB572864FC8851F383B975CA51A]]></AD_COLUMN_ID>
 <!--DD709D1D4C764DA7953CA55E64607672-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--DD709D1D4C764DA7953CA55E64607672-->  <DISPLAYLOGIC><![CDATA[@AD_Table_ID@!'']]></DISPLAYLOGIC>
+<!--DD709D1D4C764DA7953CA55E64607672-->  <DISPLAYLOGIC><![CDATA[@AD_Table_ID@!''&@custom_query@='N']]></DISPLAYLOGIC>
 <!--DD709D1D4C764DA7953CA55E64607672-->  <DISPLAYLENGTH><![CDATA[255]]></DISPLAYLENGTH>
 <!--DD709D1D4C764DA7953CA55E64607672-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--DD709D1D4C764DA7953CA55E64607672-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--DD709D1D4C764DA7953CA55E64607672-->  <SEQNO><![CDATA[56]]></SEQNO>
 <!--DD709D1D4C764DA7953CA55E64607672-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--DD709D1D4C764DA7953CA55E64607672-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--DD709D1D4C764DA7953CA55E64607672-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Fri Jan 21 13:08:53 2011 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Fri Jan 21 14:31:48 2011 +0100
@@ -15,6 +15,7 @@
 <!--387D9FFC48A74054835C5DF6E6FD08F7-->  <DISPLAYFIELD_ID><![CDATA[DD28F69792084E7F8EBBF2FA94F52A5F]]></DISPLAYFIELD_ID>
 <!--387D9FFC48A74054835C5DF6E6FD08F7-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
 <!--387D9FFC48A74054835C5DF6E6FD08F7-->  <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE>
+<!--387D9FFC48A74054835C5DF6E6FD08F7-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
 <!--387D9FFC48A74054835C5DF6E6FD08F7--></OBUISEL_SELECTOR>
 
 <!--E4F389D409DF4EC3B371B69C8A124DA7--><OBUISEL_SELECTOR>
@@ -30,6 +31,7 @@
 <!--E4F389D409DF4EC3B371B69C8A124DA7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E4F389D409DF4EC3B371B69C8A124DA7-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
 <!--E4F389D409DF4EC3B371B69C8A124DA7-->  <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE>
+<!--E4F389D409DF4EC3B371B69C8A124DA7-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
 <!--E4F389D409DF4EC3B371B69C8A124DA7--></OBUISEL_SELECTOR>
 
 </data>