Fixes Issue 12216: Some tables do not contain USER1_ID, USER2_ID, C_PROJECT_ID and C_CAMPAIGN_ID
authorSathiyan Sivaprakasam <sathiyan.sivaprakasam@openbravo.com>
Fri, 26 Feb 2010 20:33:46 +0530
changeset 6518 4b33212d14a2
parent 6517 50061f759f44
child 6519 fd7dd0f300b7
Fixes Issue 12216: Some tables do not contain USER1_ID, USER2_ID, C_PROJECT_ID and C_CAMPAIGN_ID
src-db/database/model/tables/GL_JOURNAL.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_FIELD.xml
src/org/openbravo/erpCommon/ad_forms/DocGLJournal_data.xsql
--- a/src-db/database/model/tables/GL_JOURNAL.xml	Fri Feb 26 13:52:52 2010 +0100
+++ b/src-db/database/model/tables/GL_JOURNAL.xml	Fri Feb 26 20:33:46 2010 +0530
@@ -33,6 +33,22 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="USER1_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="USER2_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
         <default/>
         <onCreateDefault/>
@@ -141,12 +157,18 @@
       <foreign-key foreignTable="AD_ORG" name="GL_JOURNAL_AD_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_CAMPAIGN" name="GL_JOURNAL_C_CAMPAIGN">
+        <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_CURRENCY" name="GL_JOURNAL_C_CURRENCY">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_DOCTYPE" name="GL_JOURNAL_C_DOCTYPE">
         <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_PROJECT" name="GL_JOURNAL_C_PROJECT">
+        <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="GL_CATEGORY" name="GL_JOURNAL_GL_CATEGORY">
         <reference local="GL_CATEGORY_ID" foreign="GL_CATEGORY_ID"/>
       </foreign-key>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Fri Feb 26 13:52:52 2010 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Fri Feb 26 20:33:46 2010 +0530
@@ -23503,7 +23503,7 @@
 <!--1625-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1625-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1625-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1625-->  <POSITION><![CDATA[10]]></POSITION>
+<!--1625-->  <POSITION><![CDATA[14]]></POSITION>
 <!--1625-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1625--></AD_COLUMN>
 
@@ -23534,7 +23534,7 @@
 <!--1626-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1626-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1626-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1626-->  <POSITION><![CDATA[11]]></POSITION>
+<!--1626-->  <POSITION><![CDATA[15]]></POSITION>
 <!--1626-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1626--></AD_COLUMN>
 
@@ -23566,7 +23566,7 @@
 <!--1627-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1627-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1627-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1627-->  <POSITION><![CDATA[12]]></POSITION>
+<!--1627-->  <POSITION><![CDATA[16]]></POSITION>
 <!--1627-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1627--></AD_COLUMN>
 
@@ -23597,7 +23597,7 @@
 <!--1628-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1628-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--1628-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1628-->  <POSITION><![CDATA[15]]></POSITION>
+<!--1628-->  <POSITION><![CDATA[19]]></POSITION>
 <!--1628-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1628--></AD_COLUMN>
 
@@ -23629,7 +23629,7 @@
 <!--1629-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1629-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1629-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1629-->  <POSITION><![CDATA[31]]></POSITION>
+<!--1629-->  <POSITION><![CDATA[35]]></POSITION>
 <!--1629-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1629--></AD_COLUMN>
 
@@ -23660,7 +23660,7 @@
 <!--1630-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1630-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1630-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1630-->  <POSITION><![CDATA[16]]></POSITION>
+<!--1630-->  <POSITION><![CDATA[20]]></POSITION>
 <!--1630-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1630--></AD_COLUMN>
 
@@ -23693,7 +23693,7 @@
 <!--1631-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1631-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1631-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1631-->  <POSITION><![CDATA[17]]></POSITION>
+<!--1631-->  <POSITION><![CDATA[21]]></POSITION>
 <!--1631-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1631--></AD_COLUMN>
 
@@ -23725,7 +23725,7 @@
 <!--1632-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1632-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1632-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1632-->  <POSITION><![CDATA[9]]></POSITION>
+<!--1632-->  <POSITION><![CDATA[13]]></POSITION>
 <!--1632-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1632--></AD_COLUMN>
 
@@ -23758,7 +23758,7 @@
 <!--1633-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1633-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1633-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1633-->  <POSITION><![CDATA[18]]></POSITION>
+<!--1633-->  <POSITION><![CDATA[22]]></POSITION>
 <!--1633-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1633--></AD_COLUMN>
 
@@ -23792,7 +23792,7 @@
 <!--1634-->  <AD_CALLOUT_ID><![CDATA[134]]></AD_CALLOUT_ID>
 <!--1634-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1634-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1634-->  <POSITION><![CDATA[19]]></POSITION>
+<!--1634-->  <POSITION><![CDATA[23]]></POSITION>
 <!--1634-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1634--></AD_COLUMN>
 
@@ -23826,7 +23826,7 @@
 <!--1635-->  <AD_CALLOUT_ID><![CDATA[134]]></AD_CALLOUT_ID>
 <!--1635-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1635-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1635-->  <POSITION><![CDATA[20]]></POSITION>
+<!--1635-->  <POSITION><![CDATA[24]]></POSITION>
 <!--1635-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1635--></AD_COLUMN>
 
@@ -23861,7 +23861,7 @@
 <!--1636-->  <AD_CALLOUT_ID><![CDATA[134]]></AD_CALLOUT_ID>
 <!--1636-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1636-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1636-->  <POSITION><![CDATA[21]]></POSITION>
+<!--1636-->  <POSITION><![CDATA[25]]></POSITION>
 <!--1636-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1636--></AD_COLUMN>
 
@@ -23892,7 +23892,7 @@
 <!--1637-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1637-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1637-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1637-->  <POSITION><![CDATA[22]]></POSITION>
+<!--1637-->  <POSITION><![CDATA[26]]></POSITION>
 <!--1637-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1637--></AD_COLUMN>
 
@@ -23922,7 +23922,7 @@
 <!--1638-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1638-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1638-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1638-->  <POSITION><![CDATA[25]]></POSITION>
+<!--1638-->  <POSITION><![CDATA[29]]></POSITION>
 <!--1638-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1638--></AD_COLUMN>
 
@@ -23953,7 +23953,7 @@
 <!--1639-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1639-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1639-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1639-->  <POSITION><![CDATA[26]]></POSITION>
+<!--1639-->  <POSITION><![CDATA[30]]></POSITION>
 <!--1639-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1639--></AD_COLUMN>
 
@@ -23984,7 +23984,7 @@
 <!--1640-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1640-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1640-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1640-->  <POSITION><![CDATA[27]]></POSITION>
+<!--1640-->  <POSITION><![CDATA[31]]></POSITION>
 <!--1640-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1640--></AD_COLUMN>
 
@@ -25725,7 +25725,7 @@
 <!--1789-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1789-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1789-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1789-->  <POSITION><![CDATA[13]]></POSITION>
+<!--1789-->  <POSITION><![CDATA[17]]></POSITION>
 <!--1789-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1789--></AD_COLUMN>
 
@@ -25756,7 +25756,7 @@
 <!--1790-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1790-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1790-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1790-->  <POSITION><![CDATA[14]]></POSITION>
+<!--1790-->  <POSITION><![CDATA[18]]></POSITION>
 <!--1790-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1790--></AD_COLUMN>
 
@@ -25789,7 +25789,7 @@
 <!--1791-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1791-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1791-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1791-->  <POSITION><![CDATA[23]]></POSITION>
+<!--1791-->  <POSITION><![CDATA[27]]></POSITION>
 <!--1791-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1791--></AD_COLUMN>
 
@@ -25821,7 +25821,7 @@
 <!--1792-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1792-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1792-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1792-->  <POSITION><![CDATA[24]]></POSITION>
+<!--1792-->  <POSITION><![CDATA[28]]></POSITION>
 <!--1792-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1792--></AD_COLUMN>
 
@@ -93641,7 +93641,7 @@
 <!--5952-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--5952-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--5952-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--5952-->  <POSITION><![CDATA[28]]></POSITION>
+<!--5952-->  <POSITION><![CDATA[32]]></POSITION>
 <!--5952-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--5952--></AD_COLUMN>
 
@@ -93672,7 +93672,7 @@
 <!--5953-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--5953-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--5953-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--5953-->  <POSITION><![CDATA[30]]></POSITION>
+<!--5953-->  <POSITION><![CDATA[34]]></POSITION>
 <!--5953-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--5953--></AD_COLUMN>
 
@@ -93703,7 +93703,7 @@
 <!--5954-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--5954-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--5954-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--5954-->  <POSITION><![CDATA[29]]></POSITION>
+<!--5954-->  <POSITION><![CDATA[33]]></POSITION>
 <!--5954-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--5954--></AD_COLUMN>
 
@@ -247559,6 +247559,37 @@
 <!--112E72136642484B95A9CD0EB79ED7F3-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--112E72136642484B95A9CD0EB79ED7F3--></AD_COLUMN>
 
+<!--11D5E322E2EC45E884C876155BCE29AA--><AD_COLUMN>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <AD_COLUMN_ID><![CDATA[11D5E322E2EC45E884C876155BCE29AA]]></AD_COLUMN_ID>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <NAME><![CDATA[2nd Dimension]]></NAME>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <COLUMNNAME><![CDATA[User2_ID]]></COLUMNNAME>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <AD_TABLE_ID><![CDATA[224]]></AD_TABLE_ID>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <SEQNO><![CDATA[31]]></SEQNO>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <AD_ELEMENT_ID><![CDATA[614]]></AD_ELEMENT_ID>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <POSITION><![CDATA[10]]></POSITION>
+<!--11D5E322E2EC45E884C876155BCE29AA-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--11D5E322E2EC45E884C876155BCE29AA--></AD_COLUMN>
+
 <!--14814F507BF440C1A7A3A64D9066C49F--><AD_COLUMN>
 <!--14814F507BF440C1A7A3A64D9066C49F-->  <AD_COLUMN_ID><![CDATA[14814F507BF440C1A7A3A64D9066C49F]]></AD_COLUMN_ID>
 <!--14814F507BF440C1A7A3A64D9066C49F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -248828,6 +248859,37 @@
 <!--2B5F702BA50F4C2ABB8E14B77F8BE893-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--2B5F702BA50F4C2ABB8E14B77F8BE893--></AD_COLUMN>
 
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A--><AD_COLUMN>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <AD_COLUMN_ID><![CDATA[2F1DF5F2C6654FA9BC8CD5D94EBCA48A]]></AD_COLUMN_ID>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <NAME><![CDATA[Project]]></NAME>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <DESCRIPTION><![CDATA[Identifier of a project defined within the Project & Service Management module.]]></DESCRIPTION>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <HELP><![CDATA[Identifier of a project defined within the Project & Service Management module.]]></HELP>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <COLUMNNAME><![CDATA[C_Project_ID]]></COLUMNNAME>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <AD_TABLE_ID><![CDATA[224]]></AD_TABLE_ID>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <SEQNO><![CDATA[51]]></SEQNO>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <AD_ELEMENT_ID><![CDATA[208]]></AD_ELEMENT_ID>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <POSITION><![CDATA[12]]></POSITION>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A--></AD_COLUMN>
+
 <!--2FD790AF217148AE8D7628ECC9F3D7C3--><AD_COLUMN>
 <!--2FD790AF217148AE8D7628ECC9F3D7C3-->  <AD_COLUMN_ID><![CDATA[2FD790AF217148AE8D7628ECC9F3D7C3]]></AD_COLUMN_ID>
 <!--2FD790AF217148AE8D7628ECC9F3D7C3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -257767,7 +257829,7 @@
 <!--58488161BB7D7382E040007F01002D6A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--58488161BB7D7382E040007F01002D6A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--58488161BB7D7382E040007F01002D6A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--58488161BB7D7382E040007F01002D6A-->  <POSITION><![CDATA[32]]></POSITION>
+<!--58488161BB7D7382E040007F01002D6A-->  <POSITION><![CDATA[36]]></POSITION>
 <!--58488161BB7D7382E040007F01002D6A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--58488161BB7D7382E040007F01002D6A--></AD_COLUMN>
 
@@ -276208,6 +276270,37 @@
 <!--9F3ADE0CE0734BE2BD059AAEFCF1D51C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--9F3ADE0CE0734BE2BD059AAEFCF1D51C--></AD_COLUMN>
 
+<!--9F8B521AF2A246B9A0C1938767966C1F--><AD_COLUMN>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <AD_COLUMN_ID><![CDATA[9F8B521AF2A246B9A0C1938767966C1F]]></AD_COLUMN_ID>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <NAME><![CDATA[Sales Campaign]]></NAME>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <DESCRIPTION><![CDATA[An advertising effort aimed at increasing sales.]]></DESCRIPTION>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <HELP><![CDATA[The Campaign defines a unique marketing program.  Projects can be associated with a pre defined Marketing Campaign.  You can then report based on a specific Campaign.]]></HELP>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <COLUMNNAME><![CDATA[C_Campaign_ID]]></COLUMNNAME>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <AD_TABLE_ID><![CDATA[224]]></AD_TABLE_ID>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <SEQNO><![CDATA[41]]></SEQNO>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <AD_ELEMENT_ID><![CDATA[550]]></AD_ELEMENT_ID>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <POSITION><![CDATA[11]]></POSITION>
+<!--9F8B521AF2A246B9A0C1938767966C1F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9F8B521AF2A246B9A0C1938767966C1F--></AD_COLUMN>
+
 <!--A03A83F49B5011DDBB0200014A62838F--><AD_COLUMN>
 <!--A03A83F49B5011DDBB0200014A62838F-->  <AD_COLUMN_ID><![CDATA[A03A83F49B5011DDBB0200014A62838F]]></AD_COLUMN_ID>
 <!--A03A83F49B5011DDBB0200014A62838F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -277261,6 +277354,37 @@
 <!--C53D8B83AFAC4045B8CCDCCAE2CCF4F6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--C53D8B83AFAC4045B8CCDCCAE2CCF4F6--></AD_COLUMN>
 
+<!--C83C1EB5414D4A528EDB166768B22C84--><AD_COLUMN>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <AD_COLUMN_ID><![CDATA[C83C1EB5414D4A528EDB166768B22C84]]></AD_COLUMN_ID>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <NAME><![CDATA[1st Dimension]]></NAME>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <COLUMNNAME><![CDATA[User1_ID]]></COLUMNNAME>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <AD_TABLE_ID><![CDATA[224]]></AD_TABLE_ID>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <SEQNO><![CDATA[21]]></SEQNO>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <AD_ELEMENT_ID><![CDATA[613]]></AD_ELEMENT_ID>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <POSITION><![CDATA[9]]></POSITION>
+<!--C83C1EB5414D4A528EDB166768B22C84-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C83C1EB5414D4A528EDB166768B22C84--></AD_COLUMN>
+
 <!--CA49F473D15C4B778B338AE9ECB5DEA7--><AD_COLUMN>
 <!--CA49F473D15C4B778B338AE9ECB5DEA7-->  <AD_COLUMN_ID><![CDATA[CA49F473D15C4B778B338AE9ECB5DEA7]]></AD_COLUMN_ID>
 <!--CA49F473D15C4B778B338AE9ECB5DEA7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Fri Feb 26 13:52:52 2010 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Fri Feb 26 20:33:46 2010 +0530
@@ -9574,7 +9574,7 @@
 <!--699-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--699-->  <DISPLAYLENGTH><![CDATA[21]]></DISPLAYLENGTH>
 <!--699-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--699-->  <SEQNO><![CDATA[220]]></SEQNO>
+<!--699-->  <SEQNO><![CDATA[260]]></SEQNO>
 <!--699-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--699-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--699-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -9621,7 +9621,7 @@
 <!--701-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @#ShowAcct@='Y']]></DISPLAYLOGIC>
 <!--701-->  <DISPLAYLENGTH><![CDATA[23]]></DISPLAYLENGTH>
 <!--701-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--701-->  <SEQNO><![CDATA[240]]></SEQNO>
+<!--701-->  <SEQNO><![CDATA[280]]></SEQNO>
 <!--701-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--701-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--701-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -9851,7 +9851,7 @@
 <!--711-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--711-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--711-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--711-->  <SEQNO><![CDATA[200]]></SEQNO>
+<!--711-->  <SEQNO><![CDATA[240]]></SEQNO>
 <!--711-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--711-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--711-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -9875,7 +9875,7 @@
 <!--712-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--712-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--712-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--712-->  <SEQNO><![CDATA[210]]></SEQNO>
+<!--712-->  <SEQNO><![CDATA[250]]></SEQNO>
 <!--712-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--712-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--712-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -10508,7 +10508,7 @@
 <!--880-->  <DISPLAYLOGIC><![CDATA[@DocStatus@!'CL']]></DISPLAYLOGIC>
 <!--880-->  <DISPLAYLENGTH><![CDATA[23]]></DISPLAYLENGTH>
 <!--880-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--880-->  <SEQNO><![CDATA[230]]></SEQNO>
+<!--880-->  <SEQNO><![CDATA[270]]></SEQNO>
 <!--880-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--880-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--880-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -57366,7 +57366,7 @@
 <!--4721-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--4721-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--4721-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--4721-->  <SEQNO><![CDATA[190]]></SEQNO>
+<!--4721-->  <SEQNO><![CDATA[230]]></SEQNO>
 <!--4721-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4721-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4721-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -182302,6 +182302,30 @@
 <!--26291BB6BF9F11DD9334001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--26291BB6BF9F11DD9334001B388C61A4--></AD_FIELD>
 
+<!--2828AC0401C54F0FBE5B4E8CFC799B76--><AD_FIELD>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <AD_FIELD_ID><![CDATA[2828AC0401C54F0FBE5B4E8CFC799B76]]></AD_FIELD_ID>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <NAME><![CDATA[2nd Dimension]]></NAME>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <AD_TAB_ID><![CDATA[160]]></AD_TAB_ID>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <AD_COLUMN_ID><![CDATA[11D5E322E2EC45E884C876155BCE29AA]]></AD_COLUMN_ID>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <DISPLAYLOGIC><![CDATA[@$Element_U2@='Y']]></DISPLAYLOGIC>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <DISPLAYLENGTH><![CDATA[22]]></DISPLAYLENGTH>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <SEQNO><![CDATA[210]]></SEQNO>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2828AC0401C54F0FBE5B4E8CFC799B76--></AD_FIELD>
+
 <!--2C54884FAC954FB3BB1D10D880DF95AA--><AD_FIELD>
 <!--2C54884FAC954FB3BB1D10D880DF95AA-->  <AD_FIELD_ID><![CDATA[2C54884FAC954FB3BB1D10D880DF95AA]]></AD_FIELD_ID>
 <!--2C54884FAC954FB3BB1D10D880DF95AA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -182349,6 +182373,31 @@
 <!--2CD5548FF8284700BBA81B2AA589E8AD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2CD5548FF8284700BBA81B2AA589E8AD--></AD_FIELD>
 
+<!--2DFC15C032E841C9A8261D197A44AA86--><AD_FIELD>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <AD_FIELD_ID><![CDATA[2DFC15C032E841C9A8261D197A44AA86]]></AD_FIELD_ID>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <NAME><![CDATA[Project]]></NAME>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <DESCRIPTION><![CDATA[Identifier of a project defined within the Project & Service Management module.]]></DESCRIPTION>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <HELP><![CDATA[Identifier of a project defined within the Project & Service Management module.]]></HELP>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <AD_TAB_ID><![CDATA[160]]></AD_TAB_ID>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <AD_COLUMN_ID><![CDATA[2F1DF5F2C6654FA9BC8CD5D94EBCA48A]]></AD_COLUMN_ID>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <AD_FIELDGROUP_ID><![CDATA[104]]></AD_FIELDGROUP_ID>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <DISPLAYLOGIC><![CDATA[@$Element_PJ@='Y']]></DISPLAYLOGIC>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <SEQNO><![CDATA[180]]></SEQNO>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--2DFC15C032E841C9A8261D197A44AA86-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2DFC15C032E841C9A8261D197A44AA86--></AD_FIELD>
+
 <!--30840F3648BD40BA8CF3EA7AA2CC7667--><AD_FIELD>
 <!--30840F3648BD40BA8CF3EA7AA2CC7667-->  <AD_FIELD_ID><![CDATA[30840F3648BD40BA8CF3EA7AA2CC7667]]></AD_FIELD_ID>
 <!--30840F3648BD40BA8CF3EA7AA2CC7667-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -188396,6 +188445,30 @@
 <!--5882BBA9814FEBACE040007F0101256F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5882BBA9814FEBACE040007F0101256F--></AD_FIELD>
 
+<!--588575F8962A49A6918F086167E2CD56--><AD_FIELD>
+<!--588575F8962A49A6918F086167E2CD56-->  <AD_FIELD_ID><![CDATA[588575F8962A49A6918F086167E2CD56]]></AD_FIELD_ID>
+<!--588575F8962A49A6918F086167E2CD56-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--588575F8962A49A6918F086167E2CD56-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--588575F8962A49A6918F086167E2CD56-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--588575F8962A49A6918F086167E2CD56-->  <NAME><![CDATA[1st Dimension]]></NAME>
+<!--588575F8962A49A6918F086167E2CD56-->  <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
+<!--588575F8962A49A6918F086167E2CD56-->  <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
+<!--588575F8962A49A6918F086167E2CD56-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--588575F8962A49A6918F086167E2CD56-->  <AD_TAB_ID><![CDATA[160]]></AD_TAB_ID>
+<!--588575F8962A49A6918F086167E2CD56-->  <AD_COLUMN_ID><![CDATA[C83C1EB5414D4A528EDB166768B22C84]]></AD_COLUMN_ID>
+<!--588575F8962A49A6918F086167E2CD56-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--588575F8962A49A6918F086167E2CD56-->  <DISPLAYLOGIC><![CDATA[@$Element_U1@='Y']]></DISPLAYLOGIC>
+<!--588575F8962A49A6918F086167E2CD56-->  <DISPLAYLENGTH><![CDATA[22]]></DISPLAYLENGTH>
+<!--588575F8962A49A6918F086167E2CD56-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--588575F8962A49A6918F086167E2CD56-->  <SEQNO><![CDATA[200]]></SEQNO>
+<!--588575F8962A49A6918F086167E2CD56-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--588575F8962A49A6918F086167E2CD56-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--588575F8962A49A6918F086167E2CD56-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--588575F8962A49A6918F086167E2CD56-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--588575F8962A49A6918F086167E2CD56-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--588575F8962A49A6918F086167E2CD56-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--588575F8962A49A6918F086167E2CD56--></AD_FIELD>
+
 <!--5886701678ECFA5EE040007F01014095--><AD_FIELD>
 <!--5886701678ECFA5EE040007F01014095-->  <AD_FIELD_ID><![CDATA[5886701678ECFA5EE040007F01014095]]></AD_FIELD_ID>
 <!--5886701678ECFA5EE040007F01014095-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -191507,6 +191580,30 @@
 <!--61F239DF0C68FB81E040007F010172C7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--61F239DF0C68FB81E040007F010172C7--></AD_FIELD>
 
+<!--6235E45B2B854C1BA1A3235A8A1BA783--><AD_FIELD>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <AD_FIELD_ID><![CDATA[6235E45B2B854C1BA1A3235A8A1BA783]]></AD_FIELD_ID>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <NAME><![CDATA[Sales Campaign]]></NAME>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <DESCRIPTION><![CDATA[An advertising effort aimed at increasing sales.]]></DESCRIPTION>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <HELP><![CDATA[The Campaign defines a unique marketing program.  Projects can be associated with a pre defined Marketing Campaign.  You can then report based on a specific Campaign.]]></HELP>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <AD_TAB_ID><![CDATA[160]]></AD_TAB_ID>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <AD_COLUMN_ID><![CDATA[9F8B521AF2A246B9A0C1938767966C1F]]></AD_COLUMN_ID>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <DISPLAYLOGIC><![CDATA[@$Element_MC@='Y']]></DISPLAYLOGIC>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <SEQNO><![CDATA[190]]></SEQNO>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--6235E45B2B854C1BA1A3235A8A1BA783-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6235E45B2B854C1BA1A3235A8A1BA783--></AD_FIELD>
+
 <!--623FEEB84688C86EE040007F0101639E--><AD_FIELD>
 <!--623FEEB84688C86EE040007F0101639E-->  <AD_FIELD_ID><![CDATA[623FEEB84688C86EE040007F0101639E]]></AD_FIELD_ID>
 <!--623FEEB84688C86EE040007F0101639E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -192576,7 +192673,7 @@
 <!--739F4C68F44B11DD9B7A0016D4EE9DB3-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--739F4C68F44B11DD9B7A0016D4EE9DB3-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--739F4C68F44B11DD9B7A0016D4EE9DB3-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--739F4C68F44B11DD9B7A0016D4EE9DB3-->  <SEQNO><![CDATA[180]]></SEQNO>
+<!--739F4C68F44B11DD9B7A0016D4EE9DB3-->  <SEQNO><![CDATA[220]]></SEQNO>
 <!--739F4C68F44B11DD9B7A0016D4EE9DB3-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--739F4C68F44B11DD9B7A0016D4EE9DB3-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--739F4C68F44B11DD9B7A0016D4EE9DB3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
--- a/src/org/openbravo/erpCommon/ad_forms/DocGLJournal_data.xsql	Fri Feb 26 13:52:52 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocGLJournal_data.xsql	Fri Feb 26 20:33:46 2010 +0530
@@ -27,7 +27,8 @@
     <Sql>
       <![CDATA[
         SELECT G.AD_CLIENT_ID, G.AD_ORG_ID, G.DOCUMENTNO, G.DATEACCT, G.DATEDOC,
-        G.C_CURRENCY_ID, G.C_DOCTYPE_ID, G.POSTED, G.POSTINGTYPE, G.ISOPENING
+        G.C_CURRENCY_ID, G.C_DOCTYPE_ID, G.POSTED, G.POSTINGTYPE, G.ISOPENING,
+        G.C_CAMPAIGN_ID, G.C_PROJECT_ID, G.USER1_ID, G.USER2_ID
         FROM GL_JOURNAL G
         WHERE AD_CLIENT_ID=?
         AND GL_JOURNAL_ID=?