Project:
| View Issue Details[ Jump to Notes ] | [ Issue History ] [ Print ] | |||||||
| ID | ||||||||
| 0015757 | ||||||||
| Type | Category | Severity | Reproducibility | Date Submitted | Last Update | |||
| feature request | [Openbravo ERP] 05. Production management | minor | always | 2011-01-24 18:18 | 2020-10-06 17:21 | |||
| Reporter | maite | View Status | public | |||||
| Assigned To | Triage Omni OMS | |||||||
| Priority | high | Resolution | fixed | Fixed in Version | ||||
| Status | closed | Fix in branch | Fixed in SCM revision | 54f33703c708 | ||||
| Projection | none | ETA | none | Target Version | ||||
| OS | Any | Database | Any | Java version | ||||
| OS Version | Database version | Ant version | ||||||
| Product Version | 2.50MP25 | SCM revision | ||||||
| Merge Request Status | ||||||||
| Review Assigned To | ||||||||
| OBNetwork customer | OBPS | |||||||
| Web browser | ||||||||
| Modules | Core | |||||||
| Support ticket | ||||||||
| Regression level | ||||||||
| Regression date | ||||||||
| Regression introduced in release | ||||||||
| Regression introduced by commit | ||||||||
| Triggers an Emergency Pack | No | |||||||
| Summary | 0015757: Be able to post Internal Consumptions | |||||||
| Description | It would be nice to be able to post Internal Consumptions | |||||||
| Tags | No tags attached. | |||||||
| Attached Files |  postintcons.1.diff [^] (90,402 bytes) 2014-05-08 17:45 [Show Content] [Hide Content]diff --git a/src-db/database/model/tables/M_INTERNAL_CONSUMPTION.xml b/src-db/database/model/tables/M_INTERNAL_CONSUMPTION.xml
--- a/src-db/database/model/tables/M_INTERNAL_CONSUMPTION.xml
+++ b/src-db/database/model/tables/M_INTERNAL_CONSUMPTION.xml
@@ -61,12 +61,61 @@
<default><![CDATA[DR]]></default>
<onCreateDefault><![CDATA[CASE PROCESSED WHEN 'N' THEN 'DR' ELSE 'CO' END]]></onCreateDefault>
</column>
+ <column name="AD_ORGTRX_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_CAMPAIGN_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <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_COSTCENTER_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="AD_CLIENT_MINTERNALCONSUMPTION">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
<foreign-key foreignTable="AD_ORG" name="AD_ORG_MINTERNAL_CONSUMPTION">
<reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
</foreign-key>
+ <foreign-key foreignTable="AD_ORG" name="AD_ORGTRX_MINTERNALCONSUMPTION">
+ <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="C_ACTIVITY" name="C_ACTIVITYMINTERNALCONSUMPTION">
+ <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="C_CAMPAIGN" name="C_CAMPAIGNMINTERNALCONSUMPTION">
+ <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="C_COSTCENTER" name="C_COSTCNTRMINTERNALCONSUMPTION">
+ <reference local="C_COSTCENTER_ID" foreign="C_COSTCENTER_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="C_PROJECT" name="C_PROJECT_MINTERNALCONSUMPTION">
+ <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="USER1" name="USER1_M_INTERNALCONSUMPTION">
+ <reference local="USER1_ID" foreign="USER1_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="USER2" name="USER2_M_INTERNALCONSUMPTION">
+ <reference local="USER2_ID" foreign="USER2_ID"/>
+ </foreign-key>
<check name="M_INTERNAL_CONSUMPTION_ISA_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
<check name="M_INTERNAL_PROCESSED_CHECK"><![CDATA[PROCESSED IN ('Y', 'N')]]></check>
</table>
diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -174863,7 +174863,7 @@
<!--802759--> <HELP><![CDATA[An accounting status button that indicates if the transaction has already been posted to the general ledger or not. When doing the accounting manually this button can be used to post or unpost the transaction from the general ledger by hand.]]></HELP>
<!--802759--> <COLUMNNAME><![CDATA[Posted]]></COLUMNNAME>
<!--802759--> <AD_TABLE_ID><![CDATA[800168]]></AD_TABLE_ID>
-<!--802759--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--802759--> <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
<!--802759--> <AD_REFERENCE_VALUE_ID><![CDATA[234]]></AD_REFERENCE_VALUE_ID>
<!--802759--> <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
<!--802759--> <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
@@ -225115,6 +225115,42 @@
<!--1D362A68B15E4805B518D642AB906F70--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--1D362A68B15E4805B518D642AB906F70--></AD_COLUMN>
+<!--1D7D9FDD6B1B431AAE967818804F9095--><AD_COLUMN>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <AD_COLUMN_ID><![CDATA[1D7D9FDD6B1B431AAE967818804F9095]]></AD_COLUMN_ID>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <NAME><![CDATA[Cost Center]]></NAME>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <DESCRIPTION><![CDATA[Division that adds to the cost of an organization]]></DESCRIPTION>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <HELP><![CDATA[Division that adds to the cost of an organization. Internal structure for cost allocation.]]></HELP>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <COLUMNNAME><![CDATA[C_Costcenter_ID]]></COLUMNNAME>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <AD_TABLE_ID><![CDATA[800168]]></AD_TABLE_ID>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <AD_REFERENCE_VALUE_ID><![CDATA[DEE6B917B36D4648B2DA729FC2872CF4]]></AD_REFERENCE_VALUE_ID>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <SEQNO><![CDATA[220]]></SEQNO>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <AD_ELEMENT_ID><![CDATA[BB1B0593596A4F63B2553183B11B0D28]]></AD_ELEMENT_ID>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <POSITION><![CDATA[23]]></POSITION>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--1D7D9FDD6B1B431AAE967818804F9095--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--1D7D9FDD6B1B431AAE967818804F9095--></AD_COLUMN>
+
<!--1DA3007A3E1547AA95A420E351CB9759--><AD_COLUMN>
<!--1DA3007A3E1547AA95A420E351CB9759--> <AD_COLUMN_ID><![CDATA[1DA3007A3E1547AA95A420E351CB9759]]></AD_COLUMN_ID>
<!--1DA3007A3E1547AA95A420E351CB9759--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -229715,6 +229751,42 @@
<!--340AEEBA6CC14670882470DDBDC11B7D--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--340AEEBA6CC14670882470DDBDC11B7D--></AD_COLUMN>
+<!--3494D6FD839840C885B01A9D5103A8E2--><AD_COLUMN>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <AD_COLUMN_ID><![CDATA[3494D6FD839840C885B01A9D5103A8E2]]></AD_COLUMN_ID>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <NAME><![CDATA[1st Dimension]]></NAME>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <COLUMNNAME><![CDATA[User1_ID]]></COLUMNNAME>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <AD_TABLE_ID><![CDATA[800168]]></AD_TABLE_ID>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <AD_REFERENCE_VALUE_ID><![CDATA[0E0D1661E18E4E05A118785A7CF146B8]]></AD_REFERENCE_VALUE_ID>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <SEQNO><![CDATA[200]]></SEQNO>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <AD_ELEMENT_ID><![CDATA[5491745132934260A5F00EF178EBC04B]]></AD_ELEMENT_ID>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <POSITION><![CDATA[21]]></POSITION>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--3494D6FD839840C885B01A9D5103A8E2--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--3494D6FD839840C885B01A9D5103A8E2--></AD_COLUMN>
+
<!--34E193A45220401C9DA9E8A4EC6B40F8--><AD_COLUMN>
<!--34E193A45220401C9DA9E8A4EC6B40F8--> <AD_COLUMN_ID><![CDATA[34E193A45220401C9DA9E8A4EC6B40F8]]></AD_COLUMN_ID>
<!--34E193A45220401C9DA9E8A4EC6B40F8--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -231257,6 +231329,43 @@
<!--3C07F9D36CC241C38B072A698CD60517--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--3C07F9D36CC241C38B072A698CD60517--></AD_COLUMN>
+<!--3C32DB97D29C46678D24E0A0706B35B8--><AD_COLUMN>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <AD_COLUMN_ID><![CDATA[3C32DB97D29C46678D24E0A0706B35B8]]></AD_COLUMN_ID>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <NAME><![CDATA[Project]]></NAME>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <DESCRIPTION><![CDATA[Identifier of a project defined within the Project & Service Management module.]]></DESCRIPTION>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <HELP><![CDATA[Identifier of a project defined within the Project & Service Management module.]]></HELP>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <COLUMNNAME><![CDATA[C_Project_ID]]></COLUMNNAME>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <AD_TABLE_ID><![CDATA[800168]]></AD_TABLE_ID>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <AD_REFERENCE_VALUE_ID><![CDATA[800061]]></AD_REFERENCE_VALUE_ID>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <READONLYLOGIC><![CDATA[@Posted@='Y']]></READONLYLOGIC>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <SEQNO><![CDATA[170]]></SEQNO>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <AD_ELEMENT_ID><![CDATA[208]]></AD_ELEMENT_ID>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <POSITION><![CDATA[18]]></POSITION>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--3C32DB97D29C46678D24E0A0706B35B8--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--3C32DB97D29C46678D24E0A0706B35B8--></AD_COLUMN>
+
<!--3C606B6113A24FFBA0D08E98A15C2DF7--><AD_COLUMN>
<!--3C606B6113A24FFBA0D08E98A15C2DF7--> <AD_COLUMN_ID><![CDATA[3C606B6113A24FFBA0D08E98A15C2DF7]]></AD_COLUMN_ID>
<!--3C606B6113A24FFBA0D08E98A15C2DF7--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -231719,6 +231828,42 @@
<!--3EA01D1013234BAF88B7CBAB150E3D71--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--3EA01D1013234BAF88B7CBAB150E3D71--></AD_COLUMN>
+<!--3ED46EA7767C4504B4DB3683587BE293--><AD_COLUMN>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <AD_COLUMN_ID><![CDATA[3ED46EA7767C4504B4DB3683587BE293]]></AD_COLUMN_ID>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <NAME><![CDATA[2nd Dimension]]></NAME>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <COLUMNNAME><![CDATA[User2_ID]]></COLUMNNAME>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <AD_TABLE_ID><![CDATA[800168]]></AD_TABLE_ID>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <AD_REFERENCE_VALUE_ID><![CDATA[1850A5390D97470EBB35A3A5F43AB533]]></AD_REFERENCE_VALUE_ID>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <SEQNO><![CDATA[210]]></SEQNO>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <AD_ELEMENT_ID><![CDATA[614]]></AD_ELEMENT_ID>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <POSITION><![CDATA[22]]></POSITION>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--3ED46EA7767C4504B4DB3683587BE293--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--3ED46EA7767C4504B4DB3683587BE293--></AD_COLUMN>
+
<!--3EE5C3FA006A425AAA45B703B30A516B--><AD_COLUMN>
<!--3EE5C3FA006A425AAA45B703B30A516B--> <AD_COLUMN_ID><![CDATA[3EE5C3FA006A425AAA45B703B30A516B]]></AD_COLUMN_ID>
<!--3EE5C3FA006A425AAA45B703B30A516B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -231791,6 +231936,42 @@
<!--3FE2EA6C9F474DE79421734AD8174FBA--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--3FE2EA6C9F474DE79421734AD8174FBA--></AD_COLUMN>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--><AD_COLUMN>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <AD_COLUMN_ID><![CDATA[3FE35ACCEC86476BB11EEC0C162B51B5]]></AD_COLUMN_ID>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <NAME><![CDATA[Trx Organization]]></NAME>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <DESCRIPTION><![CDATA[The organization which performs or initiates the transaction.]]></DESCRIPTION>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <HELP><![CDATA[The organization which performs or initiates this transaction (for another organization). The owning Organization may not be the transaction organization in a service bureau environment, with centralized services, and inter-organization transactions.]]></HELP>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <COLUMNNAME><![CDATA[AD_Orgtrx_ID]]></COLUMNNAME>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <AD_TABLE_ID><![CDATA[800168]]></AD_TABLE_ID>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <AD_REFERENCE_VALUE_ID><![CDATA[130]]></AD_REFERENCE_VALUE_ID>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <SEQNO><![CDATA[160]]></SEQNO>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <AD_ELEMENT_ID><![CDATA[112]]></AD_ELEMENT_ID>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <POSITION><![CDATA[17]]></POSITION>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--3FE35ACCEC86476BB11EEC0C162B51B5--></AD_COLUMN>
+
<!--400ADD1C63FD4F57B16BF9D8198F9D9A--><AD_COLUMN>
<!--400ADD1C63FD4F57B16BF9D8198F9D9A--> <AD_COLUMN_ID><![CDATA[400ADD1C63FD4F57B16BF9D8198F9D9A]]></AD_COLUMN_ID>
<!--400ADD1C63FD4F57B16BF9D8198F9D9A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -265869,6 +266050,41 @@
<!--7C10EF630525456698F15ECAAF7BC1DA--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--7C10EF630525456698F15ECAAF7BC1DA--></AD_COLUMN>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--><AD_COLUMN>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <AD_COLUMN_ID><![CDATA[7C32A7CD52BE427EB18FF2D7893D5FDF]]></AD_COLUMN_ID>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <NAME><![CDATA[Sales Campaign]]></NAME>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <DESCRIPTION><![CDATA[An advertising effort aimed at increasing sales.]]></DESCRIPTION>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <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>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <COLUMNNAME><![CDATA[C_Campaign_ID]]></COLUMNNAME>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <AD_TABLE_ID><![CDATA[800168]]></AD_TABLE_ID>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <SEQNO><![CDATA[180]]></SEQNO>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <AD_ELEMENT_ID><![CDATA[550]]></AD_ELEMENT_ID>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <POSITION><![CDATA[19]]></POSITION>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--7C32A7CD52BE427EB18FF2D7893D5FDF--></AD_COLUMN>
+
<!--7C4AEC0BF04F4588A2D26D46E1EE0E7B--><AD_COLUMN>
<!--7C4AEC0BF04F4588A2D26D46E1EE0E7B--> <AD_COLUMN_ID><![CDATA[7C4AEC0BF04F4588A2D26D46E1EE0E7B]]></AD_COLUMN_ID>
<!--7C4AEC0BF04F4588A2D26D46E1EE0E7B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -317938,6 +318154,41 @@
<!--DDEFF6832ABE4477AB7C33CF71344334--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--DDEFF6832ABE4477AB7C33CF71344334--></AD_COLUMN>
+<!--DE48632B1879433090FEE7CA890611C0--><AD_COLUMN>
+<!--DE48632B1879433090FEE7CA890611C0--> <AD_COLUMN_ID><![CDATA[DE48632B1879433090FEE7CA890611C0]]></AD_COLUMN_ID>
+<!--DE48632B1879433090FEE7CA890611C0--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DE48632B1879433090FEE7CA890611C0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DE48632B1879433090FEE7CA890611C0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DE48632B1879433090FEE7CA890611C0--> <NAME><![CDATA[Activity]]></NAME>
+<!--DE48632B1879433090FEE7CA890611C0--> <DESCRIPTION><![CDATA[A distinct activity defined and used in activity based management.]]></DESCRIPTION>
+<!--DE48632B1879433090FEE7CA890611C0--> <HELP><![CDATA[Activities indicate tasks that are performed and used to utilize Activity based Costing]]></HELP>
+<!--DE48632B1879433090FEE7CA890611C0--> <COLUMNNAME><![CDATA[C_Activity_ID]]></COLUMNNAME>
+<!--DE48632B1879433090FEE7CA890611C0--> <AD_TABLE_ID><![CDATA[800168]]></AD_TABLE_ID>
+<!--DE48632B1879433090FEE7CA890611C0--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--DE48632B1879433090FEE7CA890611C0--> <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
+<!--DE48632B1879433090FEE7CA890611C0--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--DE48632B1879433090FEE7CA890611C0--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--DE48632B1879433090FEE7CA890611C0--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--DE48632B1879433090FEE7CA890611C0--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--DE48632B1879433090FEE7CA890611C0--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--DE48632B1879433090FEE7CA890611C0--> <SEQNO><![CDATA[190]]></SEQNO>
+<!--DE48632B1879433090FEE7CA890611C0--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--DE48632B1879433090FEE7CA890611C0--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--DE48632B1879433090FEE7CA890611C0--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--DE48632B1879433090FEE7CA890611C0--> <AD_ELEMENT_ID><![CDATA[1005]]></AD_ELEMENT_ID>
+<!--DE48632B1879433090FEE7CA890611C0--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--DE48632B1879433090FEE7CA890611C0--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--DE48632B1879433090FEE7CA890611C0--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--DE48632B1879433090FEE7CA890611C0--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--DE48632B1879433090FEE7CA890611C0--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DE48632B1879433090FEE7CA890611C0--> <POSITION><![CDATA[20]]></POSITION>
+<!--DE48632B1879433090FEE7CA890611C0--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--DE48632B1879433090FEE7CA890611C0--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--DE48632B1879433090FEE7CA890611C0--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--DE48632B1879433090FEE7CA890611C0--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--DE48632B1879433090FEE7CA890611C0--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--DE48632B1879433090FEE7CA890611C0--></AD_COLUMN>
+
<!--DE684B7F563E49E198807C2E8F5DCA3E--><AD_COLUMN>
<!--DE684B7F563E49E198807C2E8F5DCA3E--> <AD_COLUMN_ID><![CDATA[DE684B7F563E49E198807C2E8F5DCA3E]]></AD_COLUMN_ID>
<!--DE684B7F563E49E198807C2E8F5DCA3E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml b/src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml
--- a/src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml
+++ b/src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml
@@ -169,6 +169,19 @@
<!--04E653BAB3FA4672A1CB72A4F2E714B7--> <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
<!--04E653BAB3FA4672A1CB72A4F2E714B7--></AD_DIMENSION_MAPPING>
+<!--058F6658263B4F82AE576606AA92165F--><AD_DIMENSION_MAPPING>
+<!--058F6658263B4F82AE576606AA92165F--> <AD_DIMENSION_MAPPING_ID><![CDATA[058F6658263B4F82AE576606AA92165F]]></AD_DIMENSION_MAPPING_ID>
+<!--058F6658263B4F82AE576606AA92165F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--058F6658263B4F82AE576606AA92165F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--058F6658263B4F82AE576606AA92165F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--058F6658263B4F82AE576606AA92165F--> <DIMENSION><![CDATA[U2]]></DIMENSION>
+<!--058F6658263B4F82AE576606AA92165F--> <DOCBASETYPE><![CDATA[MIC]]></DOCBASETYPE>
+<!--058F6658263B4F82AE576606AA92165F--> <AD_TABLE_ID><![CDATA[800168]]></AD_TABLE_ID>
+<!--058F6658263B4F82AE576606AA92165F--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--058F6658263B4F82AE576606AA92165F--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--058F6658263B4F82AE576606AA92165F--> <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
+<!--058F6658263B4F82AE576606AA92165F--></AD_DIMENSION_MAPPING>
+
<!--05D98BA6BEEE41D487A3F9AAF6D7B91B--><AD_DIMENSION_MAPPING>
<!--05D98BA6BEEE41D487A3F9AAF6D7B91B--> <AD_DIMENSION_MAPPING_ID><![CDATA[05D98BA6BEEE41D487A3F9AAF6D7B91B]]></AD_DIMENSION_MAPPING_ID>
<!--05D98BA6BEEE41D487A3F9AAF6D7B91B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -624,6 +637,19 @@
<!--26D763C522F34C10B5C0216FD46AC677--> <DOCUMENTLEVEL><![CDATA[BD]]></DOCUMENTLEVEL>
<!--26D763C522F34C10B5C0216FD46AC677--></AD_DIMENSION_MAPPING>
+<!--2982DB95CFB24A8DA4420D6FC204E04F--><AD_DIMENSION_MAPPING>
+<!--2982DB95CFB24A8DA4420D6FC204E04F--> <AD_DIMENSION_MAPPING_ID><![CDATA[2982DB95CFB24A8DA4420D6FC204E04F]]></AD_DIMENSION_MAPPING_ID>
+<!--2982DB95CFB24A8DA4420D6FC204E04F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2982DB95CFB24A8DA4420D6FC204E04F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2982DB95CFB24A8DA4420D6FC204E04F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2982DB95CFB24A8DA4420D6FC204E04F--> <DIMENSION><![CDATA[U1]]></DIMENSION>
+<!--2982DB95CFB24A8DA4420D6FC204E04F--> <DOCBASETYPE><![CDATA[MIC]]></DOCBASETYPE>
+<!--2982DB95CFB24A8DA4420D6FC204E04F--> <AD_TABLE_ID><![CDATA[800168]]></AD_TABLE_ID>
+<!--2982DB95CFB24A8DA4420D6FC204E04F--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2982DB95CFB24A8DA4420D6FC204E04F--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--2982DB95CFB24A8DA4420D6FC204E04F--> <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
+<!--2982DB95CFB24A8DA4420D6FC204E04F--></AD_DIMENSION_MAPPING>
+
<!--2A1BD2AA8C564EB0BAAC5F9D47791E13--><AD_DIMENSION_MAPPING>
<!--2A1BD2AA8C564EB0BAAC5F9D47791E13--> <AD_DIMENSION_MAPPING_ID><![CDATA[2A1BD2AA8C564EB0BAAC5F9D47791E13]]></AD_DIMENSION_MAPPING_ID>
<!--2A1BD2AA8C564EB0BAAC5F9D47791E13--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1300,6 +1326,19 @@
<!--546A9EC858074C3A85671E56CA6F6045--> <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
<!--546A9EC858074C3A85671E56CA6F6045--></AD_DIMENSION_MAPPING>
+<!--54CB6C16941746DD9527A96A05216B27--><AD_DIMENSION_MAPPING>
+<!--54CB6C16941746DD9527A96A05216B27--> <AD_DIMENSION_MAPPING_ID><![CDATA[54CB6C16941746DD9527A96A05216B27]]></AD_DIMENSION_MAPPING_ID>
+<!--54CB6C16941746DD9527A96A05216B27--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--54CB6C16941746DD9527A96A05216B27--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--54CB6C16941746DD9527A96A05216B27--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--54CB6C16941746DD9527A96A05216B27--> <DIMENSION><![CDATA[CC]]></DIMENSION>
+<!--54CB6C16941746DD9527A96A05216B27--> <DOCBASETYPE><![CDATA[MIC]]></DOCBASETYPE>
+<!--54CB6C16941746DD9527A96A05216B27--> <AD_TABLE_ID><![CDATA[800168]]></AD_TABLE_ID>
+<!--54CB6C16941746DD9527A96A05216B27--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--54CB6C16941746DD9527A96A05216B27--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--54CB6C16941746DD9527A96A05216B27--> <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
+<!--54CB6C16941746DD9527A96A05216B27--></AD_DIMENSION_MAPPING>
+
<!--5519EC039D2B4CBBA7D8301EC67897E7--><AD_DIMENSION_MAPPING>
<!--5519EC039D2B4CBBA7D8301EC67897E7--> <AD_DIMENSION_MAPPING_ID><![CDATA[5519EC039D2B4CBBA7D8301EC67897E7]]></AD_DIMENSION_MAPPING_ID>
<!--5519EC039D2B4CBBA7D8301EC67897E7--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1625,6 +1664,19 @@
<!--65BF47E65C6344BF8F4D40ACF773A066--> <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
<!--65BF47E65C6344BF8F4D40ACF773A066--></AD_DIMENSION_MAPPING>
+<!--67520A3BD1B9408FB97EC1FF79A2364A--><AD_DIMENSION_MAPPING>
+<!--67520A3BD1B9408FB97EC1FF79A2364A--> <AD_DIMENSION_MAPPING_ID><![CDATA[67520A3BD1B9408FB97EC1FF79A2364A]]></AD_DIMENSION_MAPPING_ID>
+<!--67520A3BD1B9408FB97EC1FF79A2364A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--67520A3BD1B9408FB97EC1FF79A2364A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--67520A3BD1B9408FB97EC1FF79A2364A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--67520A3BD1B9408FB97EC1FF79A2364A--> <DIMENSION><![CDATA[OO]]></DIMENSION>
+<!--67520A3BD1B9408FB97EC1FF79A2364A--> <DOCBASETYPE><![CDATA[MIC]]></DOCBASETYPE>
+<!--67520A3BD1B9408FB97EC1FF79A2364A--> <AD_TABLE_ID><![CDATA[800169]]></AD_TABLE_ID>
+<!--67520A3BD1B9408FB97EC1FF79A2364A--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--67520A3BD1B9408FB97EC1FF79A2364A--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--67520A3BD1B9408FB97EC1FF79A2364A--> <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--67520A3BD1B9408FB97EC1FF79A2364A--></AD_DIMENSION_MAPPING>
+
<!--67937D1ACA60401384F9C566B6FB1EDE--><AD_DIMENSION_MAPPING>
<!--67937D1ACA60401384F9C566B6FB1EDE--> <AD_DIMENSION_MAPPING_ID><![CDATA[67937D1ACA60401384F9C566B6FB1EDE]]></AD_DIMENSION_MAPPING_ID>
<!--67937D1ACA60401384F9C566B6FB1EDE--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3185,6 +3237,19 @@
<!--BC74B8F4D5F04DA8BAB9F45373FE4C78--> <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
<!--BC74B8F4D5F04DA8BAB9F45373FE4C78--></AD_DIMENSION_MAPPING>
+<!--BE2EAD152EC8470DAEDED8B74DE1D445--><AD_DIMENSION_MAPPING>
+<!--BE2EAD152EC8470DAEDED8B74DE1D445--> <AD_DIMENSION_MAPPING_ID><![CDATA[BE2EAD152EC8470DAEDED8B74DE1D445]]></AD_DIMENSION_MAPPING_ID>
+<!--BE2EAD152EC8470DAEDED8B74DE1D445--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BE2EAD152EC8470DAEDED8B74DE1D445--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BE2EAD152EC8470DAEDED8B74DE1D445--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BE2EAD152EC8470DAEDED8B74DE1D445--> <DIMENSION><![CDATA[PR]]></DIMENSION>
+<!--BE2EAD152EC8470DAEDED8B74DE1D445--> <DOCBASETYPE><![CDATA[MIC]]></DOCBASETYPE>
+<!--BE2EAD152EC8470DAEDED8B74DE1D445--> <AD_TABLE_ID><![CDATA[800169]]></AD_TABLE_ID>
+<!--BE2EAD152EC8470DAEDED8B74DE1D445--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BE2EAD152EC8470DAEDED8B74DE1D445--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--BE2EAD152EC8470DAEDED8B74DE1D445--> <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--BE2EAD152EC8470DAEDED8B74DE1D445--></AD_DIMENSION_MAPPING>
+
<!--BE3239BDC02848A3B7F23DE06A352584--><AD_DIMENSION_MAPPING>
<!--BE3239BDC02848A3B7F23DE06A352584--> <AD_DIMENSION_MAPPING_ID><![CDATA[BE3239BDC02848A3B7F23DE06A352584]]></AD_DIMENSION_MAPPING_ID>
<!--BE3239BDC02848A3B7F23DE06A352584--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3458,6 +3523,19 @@
<!--D66890ECA2D94456B25F1BFD47E67E36--> <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
<!--D66890ECA2D94456B25F1BFD47E67E36--></AD_DIMENSION_MAPPING>
+<!--D92C60957DBF4398A7628A92861BEEF8--><AD_DIMENSION_MAPPING>
+<!--D92C60957DBF4398A7628A92861BEEF8--> <AD_DIMENSION_MAPPING_ID><![CDATA[D92C60957DBF4398A7628A92861BEEF8]]></AD_DIMENSION_MAPPING_ID>
+<!--D92C60957DBF4398A7628A92861BEEF8--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D92C60957DBF4398A7628A92861BEEF8--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D92C60957DBF4398A7628A92861BEEF8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D92C60957DBF4398A7628A92861BEEF8--> <DIMENSION><![CDATA[PJ]]></DIMENSION>
+<!--D92C60957DBF4398A7628A92861BEEF8--> <DOCBASETYPE><![CDATA[MIC]]></DOCBASETYPE>
+<!--D92C60957DBF4398A7628A92861BEEF8--> <AD_TABLE_ID><![CDATA[800168]]></AD_TABLE_ID>
+<!--D92C60957DBF4398A7628A92861BEEF8--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D92C60957DBF4398A7628A92861BEEF8--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--D92C60957DBF4398A7628A92861BEEF8--> <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
+<!--D92C60957DBF4398A7628A92861BEEF8--></AD_DIMENSION_MAPPING>
+
<!--D962173C76454EAA90021672F1AA67F4--><AD_DIMENSION_MAPPING>
<!--D962173C76454EAA90021672F1AA67F4--> <AD_DIMENSION_MAPPING_ID><![CDATA[D962173C76454EAA90021672F1AA67F4]]></AD_DIMENSION_MAPPING_ID>
<!--D962173C76454EAA90021672F1AA67F4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml
+++ b/src-db/database/sourcedata/AD_FIELD.xml
@@ -140688,8 +140688,9 @@
<!--803069--> <AD_TAB_ID><![CDATA[800202]]></AD_TAB_ID>
<!--803069--> <AD_COLUMN_ID><![CDATA[802759]]></AD_COLUMN_ID>
<!--803069--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--803069--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--803069--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--803069--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--803069--> <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @#ShowAcct@='Y']]></DISPLAYLOGIC>
+<!--803069--> <DISPLAYLENGTH><![CDATA[23]]></DISPLAYLENGTH>
<!--803069--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--803069--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--803069--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -182513,6 +182514,36 @@
<!--1B00F87604D04B9E9822AD69992A289E--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--1B00F87604D04B9E9822AD69992A289E--></AD_FIELD>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--><AD_FIELD>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <AD_FIELD_ID><![CDATA[1B062AF23A744D1A8047E33D0DDAD7A6]]></AD_FIELD_ID>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <NAME><![CDATA[Activity]]></NAME>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <DESCRIPTION><![CDATA[A distinct activity defined and used in activity based management.]]></DESCRIPTION>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <HELP><![CDATA[Activities indicate tasks that are performed and used to utilize Activity based Costing]]></HELP>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <AD_TAB_ID><![CDATA[800202]]></AD_TAB_ID>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <AD_COLUMN_ID><![CDATA[DE48632B1879433090FEE7CA890611C0]]></AD_COLUMN_ID>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <DISPLAYLOGIC><![CDATA[@$Element_AY@='Y']]></DISPLAYLOGIC>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <SEQNO><![CDATA[80]]></SEQNO>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--1B062AF23A744D1A8047E33D0DDAD7A6--></AD_FIELD>
+
<!--1B064A94E8E8499F8EA9CE68E8BDCAFB--><AD_FIELD>
<!--1B064A94E8E8499F8EA9CE68E8BDCAFB--> <AD_FIELD_ID><![CDATA[1B064A94E8E8499F8EA9CE68E8BDCAFB]]></AD_FIELD_ID>
<!--1B064A94E8E8499F8EA9CE68E8BDCAFB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -192657,6 +192688,36 @@
<!--3DE09F050A624C9D9E5477D0A94491A1--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--3DE09F050A624C9D9E5477D0A94491A1--></AD_FIELD>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--><AD_FIELD>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <AD_FIELD_ID><![CDATA[3E3F9F4144804AEB99FE43DA3FA20B52]]></AD_FIELD_ID>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <NAME><![CDATA[Sales Campaign]]></NAME>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <DESCRIPTION><![CDATA[An advertising effort aimed at increasing sales.]]></DESCRIPTION>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <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>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <AD_TAB_ID><![CDATA[800202]]></AD_TAB_ID>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <AD_COLUMN_ID><![CDATA[7C32A7CD52BE427EB18FF2D7893D5FDF]]></AD_COLUMN_ID>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <DISPLAYLOGIC><![CDATA[@$Element_MC@='Y']]></DISPLAYLOGIC>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <SEQNO><![CDATA[70]]></SEQNO>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--3E3F9F4144804AEB99FE43DA3FA20B52--></AD_FIELD>
+
<!--3E4741567DA14D638DCD3AA008D18EC3--><AD_FIELD>
<!--3E4741567DA14D638DCD3AA008D18EC3--> <AD_FIELD_ID><![CDATA[3E4741567DA14D638DCD3AA008D18EC3]]></AD_FIELD_ID>
<!--3E4741567DA14D638DCD3AA008D18EC3--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -192968,6 +193029,36 @@
<!--3F3D678D33614E1C8F6DB9F2F34228A9--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--3F3D678D33614E1C8F6DB9F2F34228A9--></AD_FIELD>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--><AD_FIELD>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <AD_FIELD_ID><![CDATA[3F589A2CACC14A3B8C06DEABF65B2533]]></AD_FIELD_ID>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <NAME><![CDATA[1st Dimension]]></NAME>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <AD_TAB_ID><![CDATA[800202]]></AD_TAB_ID>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <AD_COLUMN_ID><![CDATA[3494D6FD839840C885B01A9D5103A8E2]]></AD_COLUMN_ID>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <SEQNO><![CDATA[90]]></SEQNO>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--3F589A2CACC14A3B8C06DEABF65B2533--></AD_FIELD>
+
<!--3F78A04EB1D7458EBA761596DA309E71--><AD_FIELD>
<!--3F78A04EB1D7458EBA761596DA309E71--> <AD_FIELD_ID><![CDATA[3F78A04EB1D7458EBA761596DA309E71]]></AD_FIELD_ID>
<!--3F78A04EB1D7458EBA761596DA309E71--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -195853,6 +195944,36 @@
<!--49897E95D61F486699D64087F2897D42--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--49897E95D61F486699D64087F2897D42--></AD_FIELD>
+<!--499784A3437C454B84F9F506F95D294E--><AD_FIELD>
+<!--499784A3437C454B84F9F506F95D294E--> <AD_FIELD_ID><![CDATA[499784A3437C454B84F9F506F95D294E]]></AD_FIELD_ID>
+<!--499784A3437C454B84F9F506F95D294E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--499784A3437C454B84F9F506F95D294E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--499784A3437C454B84F9F506F95D294E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--499784A3437C454B84F9F506F95D294E--> <NAME><![CDATA[Project]]></NAME>
+<!--499784A3437C454B84F9F506F95D294E--> <DESCRIPTION><![CDATA[Identifier of a project defined within the Project & Service Management module.]]></DESCRIPTION>
+<!--499784A3437C454B84F9F506F95D294E--> <HELP><![CDATA[Identifier of a project defined within the Project & Service Management module.]]></HELP>
+<!--499784A3437C454B84F9F506F95D294E--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--499784A3437C454B84F9F506F95D294E--> <AD_TAB_ID><![CDATA[800202]]></AD_TAB_ID>
+<!--499784A3437C454B84F9F506F95D294E--> <AD_COLUMN_ID><![CDATA[3C32DB97D29C46678D24E0A0706B35B8]]></AD_COLUMN_ID>
+<!--499784A3437C454B84F9F506F95D294E--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--499784A3437C454B84F9F506F95D294E--> <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--499784A3437C454B84F9F506F95D294E--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--499784A3437C454B84F9F506F95D294E--> <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--499784A3437C454B84F9F506F95D294E--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
+<!--499784A3437C454B84F9F506F95D294E--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--499784A3437C454B84F9F506F95D294E--> <SEQNO><![CDATA[60]]></SEQNO>
+<!--499784A3437C454B84F9F506F95D294E--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--499784A3437C454B84F9F506F95D294E--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--499784A3437C454B84F9F506F95D294E--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--499784A3437C454B84F9F506F95D294E--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--499784A3437C454B84F9F506F95D294E--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--499784A3437C454B84F9F506F95D294E--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--499784A3437C454B84F9F506F95D294E--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--499784A3437C454B84F9F506F95D294E--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--499784A3437C454B84F9F506F95D294E--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--499784A3437C454B84F9F506F95D294E--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--499784A3437C454B84F9F506F95D294E--></AD_FIELD>
+
<!--49CE293BE96646EA9C02D5D0B5F3EDAA--><AD_FIELD>
<!--49CE293BE96646EA9C02D5D0B5F3EDAA--> <AD_FIELD_ID><![CDATA[49CE293BE96646EA9C02D5D0B5F3EDAA]]></AD_FIELD_ID>
<!--49CE293BE96646EA9C02D5D0B5F3EDAA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -200397,6 +200518,36 @@
<!--5550CDBF77924CDEB2058BCF2B287184--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--5550CDBF77924CDEB2058BCF2B287184--></AD_FIELD>
+<!--555EC6B0F2274EE592D4B823D250C5C8--><AD_FIELD>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <AD_FIELD_ID><![CDATA[555EC6B0F2274EE592D4B823D250C5C8]]></AD_FIELD_ID>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <NAME><![CDATA[2nd Dimension]]></NAME>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <DESCRIPTION><![CDATA[A display of optional elements that are previously defined for this account combination.]]></DESCRIPTION>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <HELP><![CDATA[The user defined element displays the optional elements that have been defined for this account combination.]]></HELP>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <AD_TAB_ID><![CDATA[800202]]></AD_TAB_ID>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <AD_COLUMN_ID><![CDATA[3ED46EA7767C4504B4DB3683587BE293]]></AD_COLUMN_ID>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <SEQNO><![CDATA[100]]></SEQNO>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--555EC6B0F2274EE592D4B823D250C5C8--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--555EC6B0F2274EE592D4B823D250C5C8--></AD_FIELD>
+
<!--55690C7A57E041689429725E59294A37--><AD_FIELD>
<!--55690C7A57E041689429725E59294A37--> <AD_FIELD_ID><![CDATA[55690C7A57E041689429725E59294A37]]></AD_FIELD_ID>
<!--55690C7A57E041689429725E59294A37--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -257736,6 +257887,35 @@
<!--BD821C3B1EF54B67A33F9716A461A931--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--BD821C3B1EF54B67A33F9716A461A931--></AD_FIELD>
+<!--BD9576ADE03E46549F3C16A96446F985--><AD_FIELD>
+<!--BD9576ADE03E46549F3C16A96446F985--> <AD_FIELD_ID><![CDATA[BD9576ADE03E46549F3C16A96446F985]]></AD_FIELD_ID>
+<!--BD9576ADE03E46549F3C16A96446F985--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BD9576ADE03E46549F3C16A96446F985--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BD9576ADE03E46549F3C16A96446F985--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BD9576ADE03E46549F3C16A96446F985--> <NAME><![CDATA[Trx Organization]]></NAME>
+<!--BD9576ADE03E46549F3C16A96446F985--> <DESCRIPTION><![CDATA[The organization which performs or initiates the transaction.]]></DESCRIPTION>
+<!--BD9576ADE03E46549F3C16A96446F985--> <HELP><![CDATA[The organization which performs or initiates this transaction (for another organization). The owning Organization may not be the transaction organization in a service bureau environment, with centralized services, and inter-organization transactions.]]></HELP>
+<!--BD9576ADE03E46549F3C16A96446F985--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--BD9576ADE03E46549F3C16A96446F985--> <AD_TAB_ID><![CDATA[800202]]></AD_TAB_ID>
+<!--BD9576ADE03E46549F3C16A96446F985--> <AD_COLUMN_ID><![CDATA[3FE35ACCEC86476BB11EEC0C162B51B5]]></AD_COLUMN_ID>
+<!--BD9576ADE03E46549F3C16A96446F985--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--BD9576ADE03E46549F3C16A96446F985--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--BD9576ADE03E46549F3C16A96446F985--> <DISPLAYLOGIC><![CDATA[@$Element_OT@='Y']]></DISPLAYLOGIC>
+<!--BD9576ADE03E46549F3C16A96446F985--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
+<!--BD9576ADE03E46549F3C16A96446F985--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--BD9576ADE03E46549F3C16A96446F985--> <SEQNO><![CDATA[50]]></SEQNO>
+<!--BD9576ADE03E46549F3C16A96446F985--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--BD9576ADE03E46549F3C16A96446F985--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--BD9576ADE03E46549F3C16A96446F985--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BD9576ADE03E46549F3C16A96446F985--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--BD9576ADE03E46549F3C16A96446F985--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--BD9576ADE03E46549F3C16A96446F985--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BD9576ADE03E46549F3C16A96446F985--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--BD9576ADE03E46549F3C16A96446F985--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--BD9576ADE03E46549F3C16A96446F985--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--BD9576ADE03E46549F3C16A96446F985--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--BD9576ADE03E46549F3C16A96446F985--></AD_FIELD>
+
<!--BDA19525D5A742F6BB30E0B0BC51C9C2--><AD_FIELD>
<!--BDA19525D5A742F6BB30E0B0BC51C9C2--> <AD_FIELD_ID><![CDATA[BDA19525D5A742F6BB30E0B0BC51C9C2]]></AD_FIELD_ID>
<!--BDA19525D5A742F6BB30E0B0BC51C9C2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -276501,6 +276681,36 @@
<!--EC8BB2FC6EA6442B9D489E4C0671D428--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--EC8BB2FC6EA6442B9D489E4C0671D428--></AD_FIELD>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--><AD_FIELD>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <AD_FIELD_ID><![CDATA[EC8D15D4DABE409EB7C34CD45917ACA7]]></AD_FIELD_ID>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <NAME><![CDATA[Cost Center]]></NAME>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <DESCRIPTION><![CDATA[Division that adds to the cost of an organization]]></DESCRIPTION>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <HELP><![CDATA[Division that adds to the cost of an organization. Internal structure for cost allocation.]]></HELP>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <AD_TAB_ID><![CDATA[800202]]></AD_TAB_ID>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <AD_COLUMN_ID><![CDATA[1D7D9FDD6B1B431AAE967818804F9095]]></AD_COLUMN_ID>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <SEQNO><![CDATA[110]]></SEQNO>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--EC8D15D4DABE409EB7C34CD45917ACA7--></AD_FIELD>
+
<!--ECB95BA0DE8111DD80EA001B388C05F0--><AD_FIELD>
<!--ECB95BA0DE8111DD80EA001B388C05F0--> <AD_FIELD_ID><![CDATA[ECB95BA0DE8111DD80EA001B388C05F0]]></AD_FIELD_ID>
<!--ECB95BA0DE8111DD80EA001B388C05F0--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -16018,6 +16018,18 @@
<!--090396763E4C41C99BEFF7BB82D03A41--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
<!--090396763E4C41C99BEFF7BB82D03A41--></AD_MESSAGE>
+<!--090D5DC8A4434705AA8572AF28FA4733--><AD_MESSAGE>
+<!--090D5DC8A4434705AA8572AF28FA4733--> <AD_MESSAGE_ID><![CDATA[090D5DC8A4434705AA8572AF28FA4733]]></AD_MESSAGE_ID>
+<!--090D5DC8A4434705AA8572AF28FA4733--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--090D5DC8A4434705AA8572AF28FA4733--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--090D5DC8A4434705AA8572AF28FA4733--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--090D5DC8A4434705AA8572AF28FA4733--> <VALUE><![CDATA[InternalConsumptionWithZeroQty]]></VALUE>
+<!--090D5DC8A4434705AA8572AF28FA4733--> <MSGTEXT><![CDATA[It is not possible to save because the line has value zero in movement quantity. Please insert a different value from zero.]]></MSGTEXT>
+<!--090D5DC8A4434705AA8572AF28FA4733--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--090D5DC8A4434705AA8572AF28FA4733--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--090D5DC8A4434705AA8572AF28FA4733--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--090D5DC8A4434705AA8572AF28FA4733--></AD_MESSAGE>
+
<!--09E0CFCE33BA42D1A29CFF9F6E1A0146--><AD_MESSAGE>
<!--09E0CFCE33BA42D1A29CFF9F6E1A0146--> <AD_MESSAGE_ID><![CDATA[09E0CFCE33BA42D1A29CFF9F6E1A0146]]></AD_MESSAGE_ID>
<!--09E0CFCE33BA42D1A29CFF9F6E1A0146--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_REF_LIST.xml b/src-db/database/sourcedata/AD_REF_LIST.xml
--- a/src-db/database/sourcedata/AD_REF_LIST.xml
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml
@@ -8449,6 +8449,17 @@
<!--200F26704B9F4613996364978BC475C8--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--200F26704B9F4613996364978BC475C8--></AD_REF_LIST>
+<!--20E1D6D3951840C386D643459DD433D1--><AD_REF_LIST>
+<!--20E1D6D3951840C386D643459DD433D1--> <AD_REF_LIST_ID><![CDATA[20E1D6D3951840C386D643459DD433D1]]></AD_REF_LIST_ID>
+<!--20E1D6D3951840C386D643459DD433D1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--20E1D6D3951840C386D643459DD433D1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--20E1D6D3951840C386D643459DD433D1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--20E1D6D3951840C386D643459DD433D1--> <VALUE><![CDATA[MIC]]></VALUE>
+<!--20E1D6D3951840C386D643459DD433D1--> <NAME><![CDATA[Material Internal Consumption]]></NAME>
+<!--20E1D6D3951840C386D643459DD433D1--> <AD_REFERENCE_ID><![CDATA[183]]></AD_REFERENCE_ID>
+<!--20E1D6D3951840C386D643459DD433D1--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--20E1D6D3951840C386D643459DD433D1--></AD_REF_LIST>
+
<!--213984A2876942898DFB901820B3D2AB--><AD_REF_LIST>
<!--213984A2876942898DFB901820B3D2AB--> <AD_REF_LIST_ID><![CDATA[213984A2876942898DFB901820B3D2AB]]></AD_REF_LIST_ID>
<!--213984A2876942898DFB901820B3D2AB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9611,6 +9622,17 @@
<!--6D58DF036C134A799BB7229004F8163F--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--6D58DF036C134A799BB7229004F8163F--></AD_REF_LIST>
+<!--6F9DD304FD564F60B6C703A0E0E5E6E5--><AD_REF_LIST>
+<!--6F9DD304FD564F60B6C703A0E0E5E6E5--> <AD_REF_LIST_ID><![CDATA[6F9DD304FD564F60B6C703A0E0E5E6E5]]></AD_REF_LIST_ID>
+<!--6F9DD304FD564F60B6C703A0E0E5E6E5--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6F9DD304FD564F60B6C703A0E0E5E6E5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6F9DD304FD564F60B6C703A0E0E5E6E5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6F9DD304FD564F60B6C703A0E0E5E6E5--> <VALUE><![CDATA[MIC]]></VALUE>
+<!--6F9DD304FD564F60B6C703A0E0E5E6E5--> <NAME><![CDATA[Material Internal Consumption]]></NAME>
+<!--6F9DD304FD564F60B6C703A0E0E5E6E5--> <AD_REFERENCE_ID><![CDATA[FBC599C796664DD49AD002C61DAFF813]]></AD_REFERENCE_ID>
+<!--6F9DD304FD564F60B6C703A0E0E5E6E5--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6F9DD304FD564F60B6C703A0E0E5E6E5--></AD_REF_LIST>
+
<!--6FA37FCB15CF4653BED8A897301EA0C5--><AD_REF_LIST>
<!--6FA37FCB15CF4653BED8A897301EA0C5--> <AD_REF_LIST_ID><![CDATA[6FA37FCB15CF4653BED8A897301EA0C5]]></AD_REF_LIST_ID>
<!--6FA37FCB15CF4653BED8A897301EA0C5--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java
@@ -250,6 +250,8 @@
public static final String DOCTYPE_MatMovement = "MMM";
/** Material Production */
public static final String DOCTYPE_MatProduction = "MMP";
+ /** Material Internal Consumption */
+ public static final String DOCTYPE_MatInternalConsumption = "MIC";
/** Match Invoice */
public static final String DOCTYPE_MatMatchInv = "MXI";
@@ -468,7 +470,7 @@
|| AD_Table_ID.equals("407") || AD_Table_ID.equals("392") || AD_Table_ID.equals("259")
|| AD_Table_ID.equals("800019") || AD_Table_ID.equals("319") || AD_Table_ID.equals("321")
|| AD_Table_ID.equals("323") || AD_Table_ID.equals("325") || AD_Table_ID.equals("224")
- || AD_Table_ID.equals("472")) {
+ || AD_Table_ID.equals("472") || AD_Table_ID.equals("800168")) {
switch (Integer.parseInt(AD_Table_ID)) {
case 318:
acct = new DocInvoice(AD_Client_ID, AD_Org_ID, connectionProvider);
@@ -571,6 +573,13 @@
acct.AD_Table_ID = "472";
acct.reloadAcctSchemaArray();
break;
+ case 800168:
+ acct = new DocInternalConsumption(AD_Client_ID, AD_Org_ID, connectionProvider);
+ acct.tableName = "M_Internal_Consumption";
+ acct.strDateColumn = "MovementDate";
+ acct.AD_Table_ID = "800168";
+ acct.reloadAcctSchemaArray();
+ break;
// case 473: acct = new
// DocMatchPO (AD_Client_ID); acct.strDateColumn = "MovementDate";
// acct.reloadAcctSchemaArray(); break; case DocProjectIssue.AD_TABLE_ID: acct = new
diff --git a/src/org/openbravo/erpCommon/ad_forms/DocInternalConsumption.java b/src/org/openbravo/erpCommon/ad_forms/DocInternalConsumption.java
new file mode 100644
--- /dev/null
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInternalConsumption.java
@@ -0,0 +1,310 @@
+/*
+ ******************************************************************************
+ * The contents of this file are subject to the Compiere License Version 1.1
+ * ("License"); You may not use this file except in compliance with the License
+ * You may obtain a copy of the License at http://www.compiere.org/license.html
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is Compiere ERP & CRM Business Solution
+ * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc.
+ * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
+ * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved.
+ * Contributor(s): Openbravo SLU
+ * Contributions are Copyright (C) 2014 Openbravo S.L.U.
+ ******************************************************************************
+ */
+package org.openbravo.erpCommon.ad_forms;
+
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+
+import org.apache.log4j.Logger;
+import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.costing.CostingStatus;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.data.FieldProvider;
+import org.openbravo.database.ConnectionProvider;
+import org.openbravo.erpCommon.utility.SequenceIdData;
+import org.openbravo.financial.FinancialUtils;
+import org.openbravo.model.ad.system.Client;
+import org.openbravo.model.common.currency.Currency;
+import org.openbravo.model.common.enterprise.Organization;
+import org.openbravo.model.common.plm.Product;
+import org.openbravo.model.materialmgmt.transaction.InternalConsumptionLine;
+
+public class DocInternalConsumption extends AcctServer {
+ private static final long serialVersionUID = 1L;
+ private static Logger log4jDocInternalConsumption = Logger
+ .getLogger(DocInternalConsumption.class);
+
+ private String SeqNo = "0";
+
+ /**
+ * Constructor
+ *
+ * @param AD_Client_ID
+ * client
+ */
+ public DocInternalConsumption(String AD_Client_ID, String AD_Org_ID,
+ ConnectionProvider connectionProvider) {
+ super(AD_Client_ID, AD_Org_ID, connectionProvider);
+ }
+
+ @Override
+ public void loadObjectFieldProvider(ConnectionProvider conn, String AD_Client_ID, String Id)
+ throws ServletException {
+ setObjectFieldProvider(DocInternalConsumptionData.select(conn, AD_Client_ID, Id));
+ }
+
+ /**
+ * Load Document Details
+ *
+ * @return true if loadDocumentType was set
+ */
+ @Override
+ public boolean loadDocumentDetails(FieldProvider[] data, ConnectionProvider conn) {
+ DocumentType = AcctServer.DOCTYPE_MatInternalConsumption;
+ C_Currency_ID = NO_CURRENCY;
+ DateDoc = data[0].getField("MovementDate");
+ loadDocumentType(); // lines require doc type
+ // Contained Objects
+ p_lines = loadLines(conn);
+ log4jDocInternalConsumption.debug("Lines=" + p_lines.length);
+ return true;
+ } // loadDocumentDetails
+
+ /**
+ * Load Internal Consumption Line
+ *
+ * @return DocLine Array
+ */
+ private DocLine[] loadLines(ConnectionProvider conn) {
+ ArrayList<Object> list = new ArrayList<Object>();
+ DocLineInternalConsumptionData[] data = null;
+ OBContext.setAdminMode(false);
+ try {
+ data = DocLineInternalConsumptionData.select(conn, Record_ID);
+ for (int i = 0; data != null && i < data.length; i++) {
+ String Line_ID = data[i].getField("mInternalConsumptionlineId");
+ DocLine_Material docLine = new DocLine_Material(DocumentType, Record_ID, Line_ID);
+ docLine.loadAttributes(data[i], this);
+ log4jDocInternalConsumption.debug("MovementQty = " + data[i].getField("movementqty"));
+ BigDecimal MovementQty = new BigDecimal(data[i].getField("movementqty"));
+ docLine.setQty(MovementQty.toString(), conn);
+ docLine.m_M_Locator_ID = data[i].getField("mLocatorId");
+
+ // Get related M_Transaction_ID
+ InternalConsumptionLine intConsLine = OBDal.getInstance().get(
+ InternalConsumptionLine.class, Line_ID);
+ if (intConsLine.getMaterialMgmtMaterialTransactionList().size() > 0) {
+ docLine.setTransaction(intConsLine.getMaterialMgmtMaterialTransactionList().get(0));
+ }
+ DocInternalConsumptionData[] data1 = null;
+ try {
+ data1 = DocInternalConsumptionData.selectWarehouse(conn, docLine.m_M_Locator_ID);
+ } catch (ServletException e) {
+ log4jDocInternalConsumption.warn(e);
+ }
+ if (data1 != null && data1.length > 0)
+ this.M_Warehouse_ID = data1[0].mWarehouseId;
+ list.add(docLine);
+ }
+ } catch (ServletException e) {
+ log4jDocInternalConsumption.warn(e);
+ } finally {
+ OBContext.restorePreviousMode();
+ }
+ // Return Array
+ DocLine[] dl = new DocLine[list.size()];
+ list.toArray(dl);
+ return dl;
+ } // loadLines
+
+ /**
+ * Get Balance
+ *
+ * @return Zero (always balanced)
+ */
+ @Override
+ public BigDecimal getBalance() {
+ BigDecimal retValue = ZERO;
+ return retValue;
+ } // getBalance
+
+ /**
+ * Create Facts (the accounting logic) for MIC.
+ *
+ * <pre>
+ * Internal Consumption
+ * CoGS DR
+ * Inventory CR
+ * </pre>
+ *
+ * @param as
+ * account schema
+ * @return Fact
+ */
+ @Override
+ public Fact createFact(AcctSchema as, ConnectionProvider conn, Connection con,
+ VariablesSecureApp vars) throws ServletException {
+ // Select specific definition
+ String strClassname = AcctServerData
+ .selectTemplateDoc(conn, as.m_C_AcctSchema_ID, DocumentType);
+ if (strClassname.equals(""))
+ strClassname = AcctServerData.selectTemplate(conn, as.m_C_AcctSchema_ID, AD_Table_ID);
+ if (!strClassname.equals("")) {
+ try {
+ DocInternalConsumptionTemplate newTemplate = (DocInternalConsumptionTemplate) Class
+ .forName(strClassname).newInstance();
+ return newTemplate.createFact(this, as, conn, con, vars);
+ } catch (Exception e) {
+ log4j.error("Error while creating new instance for DocInternalConsumptionTemplate - " + e);
+ }
+ }
+
+ C_Currency_ID = as.getC_Currency_ID();
+ // create Fact Header
+ Fact fact = new Fact(this, as, Fact.POST_Actual);
+ String Fact_Acct_Group_ID = SequenceIdData.getUUID();
+ // Line pointers
+ FactLine dr = null;
+ FactLine cr = null;
+ log4jDocInternalConsumption.debug("CreateFact - before loop");
+ for (int i = 0; i < p_lines.length; i++) {
+ DocLine_Material line = (DocLine_Material) p_lines[i];
+
+ Currency costCurrency = FinancialUtils.getLegalEntityCurrency(OBDal.getInstance().get(
+ Organization.class, line.m_AD_Org_ID));
+ if (!CostingStatus.getInstance().isMigrated()) {
+ costCurrency = OBDal.getInstance().get(Client.class, AD_Client_ID).getCurrency();
+ } else if (line.transaction != null && line.transaction.getCurrency() != null) {
+ costCurrency = line.transaction.getCurrency();
+ }
+ if (CostingStatus.getInstance().isMigrated() && line.transaction != null
+ && !line.transaction.isCostCalculated()) {
+ Map<String, String> parameters = getNotCalculatedCostParameters(line.transaction);
+ setMessageResult(conn, STATUS_NotCalculatedCost, "error", parameters);
+ throw new IllegalStateException();
+ }
+ String costs = line.getProductCosts(DateAcct, as, conn, con);
+ log4jDocInternalConsumption.debug("CreateFact - before DR - Costs: " + costs);
+ BigDecimal b_Costs = new BigDecimal(costs);
+ String strCosts = b_Costs.toString();
+ Account cogsAccount = line.getAccount(ProductInfo.ACCTTYPE_P_Cogs, as, conn);
+ Product product = OBDal.getInstance().get(Product.class, line.m_M_Product_ID);
+ if (cogsAccount == null) {
+ org.openbravo.model.financialmgmt.accounting.coa.AcctSchema schema = OBDal.getInstance()
+ .get(org.openbravo.model.financialmgmt.accounting.coa.AcctSchema.class,
+ as.m_C_AcctSchema_ID);
+ log4j.error("No Account COGS for product: " + product.getName() + " in accounting schema: "
+ + schema.getName());
+ }
+ Account assetAccount = line.getAccount(ProductInfo.ACCTTYPE_P_Asset, as, conn);
+ if (assetAccount == null) {
+ org.openbravo.model.financialmgmt.accounting.coa.AcctSchema schema = OBDal.getInstance()
+ .get(org.openbravo.model.financialmgmt.accounting.coa.AcctSchema.class,
+ as.m_C_AcctSchema_ID);
+ log4j.error("No Account Asset for product: " + product.getName()
+ + " in accounting schema: " + schema.getName());
+ }
+ if (b_Costs.compareTo(BigDecimal.ZERO) == 0 && !CostingStatus.getInstance().isMigrated()
+ && DocInOutData.existsCost(conn, DateAcct, line.m_M_Product_ID).equals("0")) {
+ Map<String, String> parameters = getInvalidCostParameters(
+ OBDal.getInstance().get(Product.class, line.m_M_Product_ID).getIdentifier(), DateAcct);
+ setMessageResult(conn, STATUS_InvalidCost, "error", parameters);
+ throw new IllegalStateException();
+ }
+ dr = fact.createLine(line, cogsAccount, costCurrency.getId(), strCosts, "",
+ Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
+ if (dr != null) {
+ dr.setM_Locator_ID(line.m_M_Locator_ID);
+ dr.setLocationFromLocator(line.m_M_Locator_ID, true, conn); // from
+ dr.setLocationFromBPartner(C_BPartner_Location_ID, false, conn); // to
+ }
+ log4jDocInternalConsumption.debug("CreateFact - before CR");
+ cr = fact.createLine(line, assetAccount, costCurrency.getId(), "", strCosts,
+ Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
+ if (cr != null) {
+ cr.setM_Locator_ID(line.m_M_Locator_ID);
+ cr.setLocationFromLocator(line.m_M_Locator_ID, true, conn); // from
+ cr.setLocationFromBPartner(C_BPartner_Location_ID, false, conn); // to
+ }
+ }
+ log4jDocInternalConsumption.debug("CreateFact - after loop");
+ SeqNo = "0";
+ return fact;
+ } // createFact
+
+ /**
+ * Get Document Confirmation
+ *
+ * not used
+ */
+ @Override
+ public boolean getDocumentConfirmation(ConnectionProvider conn, String strRecordId) {
+ return true;
+ }
+
+ /**
+ * @return the log4jDocInternalConsumption
+ */
+ public static Logger getLog4jDocInternalConsumption() {
+ return log4jDocInternalConsumption;
+ }
+
+ /**
+ * @param log4jDocInternalConsumption
+ * the log4jDocInternalConsumption to set
+ */
+ public static void setLog4jDocInternalConsumption(Logger log4jDocInternalConsumption) {
+ DocInternalConsumption.log4jDocInternalConsumption = log4jDocInternalConsumption;
+ }
+
+ /**
+ * @return the seqNo
+ */
+ public String getSeqNo() {
+ return SeqNo;
+ }
+
+ /**
+ * @param seqNo
+ * the seqNo to set
+ */
+ public void setSeqNo(String seqNo) {
+ SeqNo = seqNo;
+ }
+
+ /**
+ * @param oldSeqNo
+ * old sequence number
+ * @return the next sequence number
+ */
+ public String nextSeqNo(String oldSeqNo) {
+ log4jDocInternalConsumption.debug("DocInventory - oldSeqNo = " + oldSeqNo);
+ BigDecimal seqNo = new BigDecimal(oldSeqNo);
+ SeqNo = (seqNo.add(new BigDecimal("10"))).toString();
+ log4jDocInternalConsumption.debug("DocInventory - nextSeqNo = " + SeqNo);
+ return SeqNo;
+ }
+
+ /**
+ * @return the serialVersionUID
+ */
+ public static long getSerialVersionUID() {
+ return serialVersionUID;
+ }
+
+ /**
+ * @return the servlet information
+ */
+ public String getServletInfo() {
+ return "Servlet for the internal consumption accounting";
+ }
+}
diff --git a/src/org/openbravo/erpCommon/ad_forms/DocInternalConsumptionTemplate.java b/src/org/openbravo/erpCommon/ad_forms/DocInternalConsumptionTemplate.java
new file mode 100644
--- /dev/null
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInternalConsumptionTemplate.java
@@ -0,0 +1,59 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.1 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2014 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ************************************************************************
+ */
+package org.openbravo.erpCommon.ad_forms;
+
+import java.sql.Connection;
+
+import javax.servlet.ServletException;
+
+import org.apache.log4j.Logger;
+import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.database.ConnectionProvider;
+
+public abstract class DocInternalConsumptionTemplate {
+ private static final long serialVersionUID = 1L;
+ static Logger log4jDocInternalConsumption = Logger.getLogger(DocInternalConsumption.class);
+
+ /**
+ * Constructor
+ *
+ */
+ public DocInternalConsumptionTemplate() {
+ }
+
+ /**
+ * Create Facts (the accounting logic) for MIC.
+ *
+ * <pre>
+ * Internal Consumption
+ * CoGS DR
+ * Inventory CR
+ * </pre>
+ *
+ * @param as
+ * account schema
+ * @return Fact
+ */
+ public abstract Fact createFact(DocInternalConsumption docInternalConsumption, AcctSchema as,
+ ConnectionProvider conn, Connection con, VariablesSecureApp vars) throws ServletException;
+
+ public String getServletInfo() {
+ return "Servlet for the accounting";
+ } // end of getServletInfo() method
+}
diff --git a/src/org/openbravo/erpCommon/ad_forms/DocInternalConsumption_data.xsql b/src/org/openbravo/erpCommon/ad_forms/DocInternalConsumption_data.xsql
new file mode 100644
--- /dev/null
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInternalConsumption_data.xsql
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ******************************************************************************
+ * The contents of this file are subject to the Compiere License Version 1.1
+ * ("License"); You may not use this file except in compliance with the License
+ * You may obtain a copy of the License at http://www.compiere.org/license.html
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is Compiere ERP & CRM Business Solution
+ * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc.
+ * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
+ * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved.
+ * Contributor(s): Openbravo SLU
+ * Contributions are Copyright (C) 2014 Openbravo S.L.U.
+ ******************************************************************************
+-->
+
+
+
+<SqlClass name="DocInternalConsumptionData" package="org.openbravo.erpCommon.ad_forms">
+ <SqlClassComment></SqlClassComment>
+ <SqlMethod name="select" type="preparedStatement" return="multiple">
+ <SqlMethodComment></SqlMethodComment>
+ <Sql>
+ <![CDATA[
+ SELECT I.AD_CLIENT_ID, I.AD_ORG_ID, I.AD_ORGTRX_ID, I.C_PROJECT_ID, I.C_CAMPAIGN_ID,
+ I.C_ACTIVITY_ID, I.USER1_ID, I.USER2_ID, I.C_COSTCENTER_ID, I.NAME, I.POSTED,
+ I.MOVEMENTDATE, '' AS M_WAREHOUSE_ID
+ FROM M_INTERNAL_CONSUMPTION I
+ WHERE AD_CLIENT_ID=?
+ AND M_INTERNAL_CONSUMPTION_ID=?
+ ]]>
+ </Sql>
+ <Parameter name="client"/>
+ <Parameter name="id"/>
+ </SqlMethod>
+ <SqlMethod name="selectWarehouse" type="preparedStatement" return="multiple">
+ <SqlMethodComment></SqlMethodComment>
+ <Sql>
+ <![CDATA[
+ SELECT M_WAREHOUSE_ID FROM M_LOCATOR
+ WHERE M_LOCATOR_ID = ?
+ ]]>
+ </Sql>
+ <Parameter name="M_LOCATOR_ID"/>
+ </SqlMethod>
+</SqlClass>
\ No newline at end of file
diff --git a/src/org/openbravo/erpCommon/ad_forms/DocLineInternalConsumption_data.xsql b/src/org/openbravo/erpCommon/ad_forms/DocLineInternalConsumption_data.xsql
new file mode 100644
--- /dev/null
+++ b/src/org/openbravo/erpCommon/ad_forms/DocLineInternalConsumption_data.xsql
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ******************************************************************************
+ * The contents of this file are subject to the Compiere License Version 1.1
+ * ("License"); You may not use this file except in compliance with the License
+ * You may obtain a copy of the License at http://www.compiere.org/license.html
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is Compiere ERP & CRM Business Solution
+ * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc.
+ * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
+ * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved.
+ * Contributor(s): Openbravo SLU
+ * Contributions are Copyright (C) 2014 Openbravo S.L.U.
+ ******************************************************************************
+-->
+
+
+
+
+
+<SqlClass name="DocLineInternalConsumptionData" package="org.openbravo.erpCommon.ad_forms">
+ <SqlClassComment></SqlClassComment>
+ <SqlMethod name="select" type="preparedStatement" return="multiple">
+ <SqlMethodComment></SqlMethodComment>
+ <Sql>
+ <![CDATA[
+ SELECT IL.AD_ORG_ID, IL.M_PRODUCT_ID, IL.LINE, IL.DESCRIPTION,
+ IL.C_UOM_ID, IL.M_INTERNAL_CONSUMPTIONLINE_ID, IL.MOVEMENTQTY, IL.M_LOCATOR_ID
+ FROM M_Internal_ConsumptionLine IL WHERE M_Internal_Consumption_ID=? ORDER BY Line
+ ]]>
+ </Sql>
+ <Parameter name="M_Internal_Consumption_ID"/>
+ </SqlMethod>
+ </SqlClass>
\ No newline at end of file
diff --git a/src/org/openbravo/event/MInternalConsumptionLineEventHandler.java b/src/org/openbravo/event/MInternalConsumptionLineEventHandler.java
new file mode 100644
--- /dev/null
+++ b/src/org/openbravo/event/MInternalConsumptionLineEventHandler.java
@@ -0,0 +1,73 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.0 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2014 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ *************************************************************************
+ */
+package org.openbravo.event;
+
+import javax.enterprise.event.Observes;
+
+import org.apache.log4j.Logger;
+import org.openbravo.base.exception.OBException;
+import org.openbravo.base.model.Entity;
+import org.openbravo.base.model.ModelProvider;
+import org.openbravo.client.kernel.event.EntityNewEvent;
+import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
+import org.openbravo.client.kernel.event.EntityUpdateEvent;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.database.ConnectionProvider;
+import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.model.materialmgmt.transaction.InternalConsumptionLine;
+import org.openbravo.service.db.DalConnectionProvider;
+
+public class MInternalConsumptionLineEventHandler extends EntityPersistenceEventObserver {
+ private static Entity[] entities = { ModelProvider.getInstance().getEntity(
+ InternalConsumptionLine.ENTITY_NAME) };
+ protected Logger logger = Logger.getLogger(this.getClass());
+
+ @Override
+ protected Entity[] getObservedEntities() {
+ return entities;
+ }
+
+ public void onSave(@Observes EntityNewEvent event) {
+ if (!isValidEvent(event)) {
+ return;
+ }
+ final InternalConsumptionLine internalConsumptionLine = (InternalConsumptionLine) event
+ .getTargetInstance();
+ if (internalConsumptionLine.getMovementQuantity().doubleValue() == 0) {
+ showErrorMessage("InternalConsumptionWithZeroQty");
+ }
+ }
+
+ public void onUpdate(@Observes EntityUpdateEvent event) {
+ if (!isValidEvent(event)) {
+ return;
+ }
+ final InternalConsumptionLine internalConsumptionLine = (InternalConsumptionLine) event
+ .getTargetInstance();
+ if (internalConsumptionLine.getMovementQuantity().doubleValue() == 0) {
+ showErrorMessage("InternalConsumptionWithZeroQty");
+ }
+ }
+
+ private void showErrorMessage(String message) {
+ String language = OBContext.getOBContext().getLanguage().getLanguage();
+ ConnectionProvider conn = new DalConnectionProvider(false);
+ throw new OBException(Utility.messageBD(conn, message, language));
+ }
+}
| |||||||
 Relationships [ Relation Graph ]
[ Dependency Graph ]
|
|||||||||||||||
|
|||||||||||||||
 Relationships |
|
Notes |
|
|
(0070624) hgbot (developer) 2014-10-01 18:33 |
Repository: erp/devel/pi Changeset: 54f33703c708e333a919daa49b583fd13af24693 Author: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> Date: Tue Aug 19 12:17:48 2014 +0200 URL: http://code.openbravo.com/erp/devel/pi/rev/54f33703c708e333a919daa49b583fd13af24693 [^] Fixed issue 15757.Add Internal Consumption post process. --- M src-db/database/model/tables/M_INTERNAL_CONSUMPTION.xml M src-db/database/model/triggers/M_INTERNAL_CONSUMPTIONLINE_TRG.xml M src-db/database/sourcedata/AD_COLUMN.xml M src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml M src-db/database/sourcedata/AD_FIELD.xml M src-db/database/sourcedata/AD_MESSAGE.xml M src-db/database/sourcedata/AD_REF_LIST.xml M src/org/openbravo/erpCommon/ad_forms/AcctServer.java A src/org/openbravo/erpCommon/ad_forms/AcctServer.java.orig A src/org/openbravo/erpCommon/ad_forms/DocInternalConsumption.java A src/org/openbravo/erpCommon/ad_forms/DocInternalConsumptionTemplate.java A src/org/openbravo/erpCommon/ad_forms/DocInternalConsumption_data.xsql A src/org/openbravo/erpCommon/ad_forms/DocLineInternalConsumption_data.xsql --- |
|
(0123578) dmiguelez (viewer) 2020-10-06 17:21 |
Issue reopened by mistake |
|
Notes |
|
Issue History |
|||
| Date Modified | Username | Field | Change |
| 2011-01-24 18:18 | maite | New Issue | |
| 2011-01-24 18:18 | maite | Assigned To | => adrianromero |
| 2011-01-24 18:18 | maite | Modules | => Core |
| 2011-01-24 18:18 | maite | OBNetwork customer | => Yes |
| 2011-06-03 10:58 | dalsasua | Assigned To | adrianromero => dalsasua |
| 2011-07-20 18:13 | dalsasua | Assigned To | dalsasua => jonalegriaesarte |
| 2013-04-23 16:49 | ngarcia | Relationship added | has duplicate 0021113 |
| 2014-05-08 17:45 | jonalegriaesarte | File Added: postintcons.1.diff | |
| 2014-10-01 18:33 | hgbot | Checkin | |
| 2014-10-01 18:33 | hgbot | Note Added: 0070624 | |
| 2014-10-01 18:33 | hgbot | Status | new => resolved |
| 2014-10-01 18:33 | hgbot | Resolution | open => fixed |
| 2014-10-01 18:33 | hgbot | Fixed in SCM revision | => http://code.openbravo.com/erp/devel/pi/rev/54f33703c708e333a919daa49b583fd13af24693 [^] |
| 2019-10-17 07:17 | ngarcia | Assigned To | jonalegriaesarte => Triage Finance |
| 2019-10-17 14:15 | maite | Relationship added | related to 0042057 |
| 2020-10-06 17:21 | dmiguelez | Note Added: 0123578 | |
| 2020-10-06 17:21 | dmiguelez | Status | resolved => closed |
|
Issue History |
| Copyright © 2000 - 2009 MantisBT Group |
 |