svn commit: r886138 - /ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml

[jacopoc]

Author: jacopoc
Date: Wed Dec  2 13:32:23 2009
New Revision: 886138

URL: http://svn.apache.org/viewvc?rev=886138&view=rev
Log:
Fixed warning messages reported by Scott Gray in the dev list.
Added two fields to the acctg trans entry totals view entity, that will be used to compute balances in the upcoming improved script for the income statement.


Modified:
    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml

Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=886138&r1=886137&r2=886138&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Wed Dec  2 13:32:23 2009
@@ -1842,9 +1842,11 @@
       <member-entity entity-alias="GLA" entity-name="GlAccount"/>
       <alias entity-alias="ATE" name="glAccountId" group-by="true"/>
       <alias entity-alias="GLA" name="glAccountTypeId" group-by="true"/>
+      <alias entity-alias="GLA" name="glAccountClassId" group-by="true"/>
       <alias entity-alias="GLA" name="accountName" group-by="true"/>
       <alias entity-alias="GLA" name="accountCode" group-by="true"/>
       <alias entity-alias="ACT" name="glFiscalTypeId" group-by="true"/>
+      <alias entity-alias="ACT" name="acctgTransTypeId" group-by="false"/>
       <alias entity-alias="ATE" name="debitCreditFlag" group-by="true"/>
       <alias entity-alias="ATE" name="amount" function="sum"/>
       <alias entity-alias="ATE" name="organizationPartyId" group-by="false"/>
@@ -2045,10 +2047,10 @@
       <view-link entity-alias="GLA" rel-entity-alias="GLAH">
         <key-map field-name="glAccountId"/>
       </view-link>
-      <relation type="one" fk-name="GLAAH_GLACT" rel-entity-name="GlAccount">
+      <relation type="one" fk-name="GLAAHT_GLACT" rel-entity-name="GlAccount">
         <key-map field-name="glAccountId"/>
       </relation>
-      <relation type="one" fk-name="GLAAH_GLAH" rel-entity-name="GlAccountHistory">
+      <relation type="one" fk-name="GLAAHT_GLAH" rel-entity-name="GlAccountHistory">
         <key-map field-name="glAccountId"/>
         <key-map field-name="organizationPartyId"/>
         <key-map field-name="customTimePeriodId"/>