[OFBiz] SVN: r7154 - trunk/applications/accounting/entitydef
sichen@svn.ofbiz.org
sichen at svn.ofbiz.org
Fri Mar 31 19:02:46 CST 2006
Author: sichen
Date: 2006-03-31 19:02:42 -0600 (Fri, 31 Mar 2006)
New Revision: 7154
Modified:
trunk/applications/accounting/entitydef/entitygroup.xml
trunk/applications/accounting/entitydef/entitymodel.xml
Log:
Added new entities FinAccountAuth for fin account authorizations, FinAccountContactMechPurpose, CommunicationEventfinAcct to tract communications of fin accounts, two view-entities for summing up fin account balances and authorizations
Modified: trunk/applications/accounting/entitydef/entitygroup.xml
===================================================================
--- trunk/applications/accounting/entitydef/entitygroup.xml 2006-04-01 00:48:30 UTC (rev 7153)
+++ trunk/applications/accounting/entitydef/entitygroup.xml 2006-04-01 01:02:42 UTC (rev 7154)
@@ -142,11 +142,16 @@
<entity-group group="org.ofbiz" entity="FinAccountAttribute" />
<entity-group group="org.ofbiz" entity="FinAccountRole" />
<entity-group group="org.ofbiz" entity="FinAccountTrans" />
+ <entity-group group="org.ofbiz" entity="FinAccountAuth" />
<entity-group group="org.ofbiz" entity="FinAccountTransAttribute" />
<entity-group group="org.ofbiz" entity="FinAccountTransType" />
<entity-group group="org.ofbiz" entity="FinAccountTransTypeAttr" />
<entity-group group="org.ofbiz" entity="FinAccountType" />
<entity-group group="org.ofbiz" entity="FinAccountTypeAttr" />
+ <entity-group group="org.ofbiz" entity="CommunicationEventFinAcct" />
+ <entity-group group="org.ofbiz" entity="FinAcctContactMechPurpose" />
+ <entity-group group="org.ofbiz" entity="FinAccountTransSum" />
+ <entity-group group="org.ofbiz" entity="FinAccountAuthSum" />
<entity-group group="org.ofbiz" entity="GiftCard" />
<entity-group group="org.ofbiz" entity="GiftCardFulfillment" />
<entity-group group="org.ofbiz" entity="OldValueLinkFulfillment" />
Modified: trunk/applications/accounting/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/accounting/entitydef/entitymodel.xml 2006-04-01 00:48:30 UTC (rev 7153)
+++ trunk/applications/accounting/entitydef/entitymodel.xml 2006-04-01 01:02:42 UTC (rev 7154)
@@ -741,6 +741,9 @@
<field name="inventoryItemId" type="id"></field>
<field name="productId" type="id"></field>
<field name="productFeatureId" type="id"></field>
+ <field name="finAccountId" type="id">
+ <description>For cases where an invoice item is for purchasing additional value on a FinAccount (ie, gift certificate or calling card)</description>
+ </field>
<field name="uomId" type="id"></field>
<field name="taxableFlag" type="indicator"></field>
<field name="quantity" type="floating-point"></field>
@@ -768,6 +771,9 @@
<relation type="one" fk-name="INVCE_ITM_PRDFT" rel-entity-name="ProductFeature">
<key-map field-name="productFeatureId"/>
</relation>
+ <relation type="one" fk-name="INVCE_ITM_FINACT" rel-entity-name="FinAccount">
+ <key-map field-name="finAccountId"/>
+ </relation>
<relation type="one" fk-name="INVCE_ITM_UOM" rel-entity-name="Uom">
<key-map field-name="uomId"/>
</relation>
@@ -1885,13 +1891,21 @@
<key-map field-name="contactMechId"/>
</relation>
</entity>
+
+ <!-- financial account entities for gift certificates, calling cards, or customer accounts -->
<entity entity-name="FinAccount"
- package-name="org.ofbiz.accounting.payment"
+ package-name="org.ofbiz.accounting.finaccount"
title="Financial Account Entity">
<field name="finAccountId" type="id-ne"></field>
<field name="finAccountTypeId" type="id"></field>
<field name="finAccountName" type="name"></field>
<field name="finAccountCode" type="long-varchar" encrypt="true"></field>
+ <field name="fromDate" type="date-time">
+ <description>Describes when account will be valid. If null, valid immediately.</description>
+ </field>
+ <field name="thruDate" type="date-time">
+ <description>Expiration date of the account. If null, will never expire.</description>
+ </field>
<prim-key field="finAccountId"/>
<relation type="one" fk-name="FINACCT_TYPE" rel-entity-name="FinAccountType">
<key-map field-name="finAccountTypeId"/>
@@ -1901,7 +1915,7 @@
</relation>
</entity>
<entity entity-name="FinAccountAttribute"
- package-name="org.ofbiz.accounting.payment"
+ package-name="org.ofbiz.accounting.finaccount"
title="Financial Account Attribute Entity">
<field name="finAccountId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
@@ -1916,7 +1930,7 @@
</relation>
</entity>
<entity entity-name="FinAccountRole"
- package-name="org.ofbiz.accounting.payment"
+ package-name="org.ofbiz.accounting.finaccount"
title="Financial Account Role Entity">
<field name="finAccountId" type="id-ne"></field>
<field name="partyId" type="id-ne"></field>
@@ -1942,7 +1956,7 @@
</relation>
</entity>
<entity entity-name="FinAccountTrans"
- package-name="org.ofbiz.accounting.payment"
+ package-name="org.ofbiz.accounting.finacount"
title="Financial Account Transaction Entity">
<field name="finAccountTransId" type="id-ne"></field>
<field name="finAccountTransTypeId" type="id-ne"></field>
@@ -1951,6 +1965,10 @@
<field name="transactionDate" type="date-time"></field>
<field name="entryDate" type="date-time"></field>
<field name="paymentId" type="id-ne"></field>
+ <field name="amount" type="currency-amount">
+ <description>If the Payment is for several FinAccount transactions, it is important to track the amount of each one.</description>
+ </field>
+ <field name="currencyUomId" type="id-ne"/>
<prim-key field="finAccountTransId"/>
<relation type="one" fk-name="FINACCT_TX_TYPE" rel-entity-name="FinAccountTransType">
<key-map field-name="finAccountTransTypeId"/>
@@ -1967,9 +1985,30 @@
<relation type="one" fk-name="FIN_ACT_TX_PMT" rel-entity-name="Payment">
<key-map field-name="paymentId"/>
</relation>
+ <relation type="one" fk-name="FIN_ACT_TX_CURNCY" title="Currency" rel-entity-name="Uom">
+ <key-map field-name="currencyUomId" rel-field-name="uomId"/>
+ </relation>
</entity>
+ <entity entity-name="FinAccountAuth"
+ package-name="org.ofbiz.accounting.finaccount"
+ title="Financial Account Authorizations record">
+ <field name="finAccountAuthId" type="id-ne"/>
+ <field name="finAccountId" type="id-ne"/>
+ <field name="amount" type="currency-amount"/>
+ <field name="currencyUomId" type="id-ne"/>
+ <field name="authorizationDate" type="date-time"/>
+ <field name="fromDate" type="date-time"/>
+ <field name="thruDate" type="date-time"/>
+ <prim-key field="finAccountAuthId"/>
+ <relation type="one" fk-name="FINACT_AUTH_FINACT" rel-entity-name="FinAccount">
+ <key-map field-name="finAccountId"/>
+ </relation>
+ <relation type="one" fk-name="FINACT_AUTH_CURNCY" title="Currency" rel-entity-name="Uom">
+ <key-map field-name="currencyUomId" rel-field-name="uomId"/>
+ </relation>
+ </entity>
<entity entity-name="FinAccountTransAttribute"
- package-name="org.ofbiz.accounting.payment"
+ package-name="org.ofbiz.accounting.finaccount"
title="Financial Account Transaction Attribute Entity">
<field name="finAccountTransId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
@@ -1984,7 +2023,7 @@
</relation>
</entity>
<entity entity-name="FinAccountTransType"
- package-name="org.ofbiz.accounting.payment"
+ package-name="org.ofbiz.accounting.finaccount"
title="Financial Account Transaction Type Entity">
<field name="finAccountTransTypeId" type="id-ne"></field>
<field name="parentTypeId" type="id-ne"></field>
@@ -1996,7 +2035,7 @@
</relation>
</entity>
<entity entity-name="FinAccountTransTypeAttr"
- package-name="org.ofbiz.accounting.payment"
+ package-name="org.ofbiz.accounting.finaccount"
title="Financial Account Transaction Type Attribute Entity">
<field name="finAccountTransTypeId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
@@ -2013,7 +2052,7 @@
</relation>
</entity>
<entity entity-name="FinAccountType"
- package-name="org.ofbiz.accounting.payment"
+ package-name="org.ofbiz.accounting.finaccount"
title="Financial Account Type Entity">
<field name="finAccountTypeId" type="id-ne"></field>
<field name="parentTypeId" type="id-ne"></field>
@@ -2025,7 +2064,7 @@
</relation>
</entity>
<entity entity-name="FinAccountTypeAttr"
- package-name="org.ofbiz.accounting.payment"
+ package-name="org.ofbiz.accounting.finaccount"
title="Financial Account Type Attribute Entity">
<field name="finAccountTypeId" type="id-ne"></field>
<field name="attrName" type="id-long-ne"></field>
@@ -2041,6 +2080,73 @@
<key-map field-name="finAccountTypeId"/>
</relation>
</entity>
+ <entity entity-name="CommunicationEventFinAcct"
+ package-name="org.ofbiz.accounting.finaccount"
+ title="Communication Events related to a Financial Account">
+ <field name="finAccountId" type="id-ne"></field>
+ <field name="communicationEventId" type="id-ne"></field>
+ <prim-key field="finAccountId"/>
+ <prim-key field="communicationEventId"/>
+ <relation type="one" fk-name="COMEVFINACT_FINACT" rel-entity-name="FinAccount">
+ <key-map field-name="finAccountId"/>
+ </relation>
+ <relation type="one" fk-name="COMEVFINACT_CMEV" rel-entity-name="CommunicationEvent">
+ <key-map field-name="communicationEventId"/>
+ </relation>
+ </entity>
+ <entity entity-name="FinAcctContactMechPurpose"
+ package-name="org.ofbiz.accounting.finaccount"
+ title="Contact mechs (emails) for a FinAccount">
+ <field name="finAccountId" type="id-ne"></field>
+ <field name="contactMechId" type="id-ne"></field>
+ <field name="contactMechPurposeTypeId" type="id-ne"></field>
+ <field name="fromDate" type="date-time"></field>
+ <field name="thruDate" type="date-time"></field>
+ <prim-key field="finAccountId"/>
+ <prim-key field="contactMechId"/>
+ <prim-key field="contactMechPurposeTypeId"/>
+ <prim-key field="fromDate"/>
+ <relation type="one" fk-name="FINACT_CMPRP_TYPE" rel-entity-name="ContactMechPurposeType">
+ <key-map field-name="contactMechPurposeTypeId"/>
+ </relation>
+ <relation type="one" fk-name="FINACT_CMPRP_PARTY" rel-entity-name="FinAccount">
+ <key-map field-name="finAccountId"/>
+ </relation>
+ <relation type="one" fk-name="FINACT_CMPRP_CMECH" rel-entity-name="ContactMech">
+ <key-map field-name="contactMechId"/>
+ </relation>
+ <relation type="one-nofk" rel-entity-name="PostalAddress">
+ <key-map field-name="contactMechId"/>
+ </relation>
+ <relation type="one-nofk" rel-entity-name="TelecomNumber">
+ <key-map field-name="contactMechId"/>
+ </relation>
+ </entity>
+ <view-entity entity-name="FinAccountTransSum"
+ package-name="org.ofbiz.accounting.finaccount"
+ title="View entity to help calculate total of financial account transactions by doing a query for the sum of all amounts
+ on a range of transactionDates for a given finAccountId, finAccountTransTypeId">
+ <member-entity entity-alias="FAT" entity-name="FinAccountTrans"/>
+ <alias entity-alias="FAT" name="finAccountId" group-by="true"/>
+ <alias entity-alias="FAT" name="finAccountTransTypeId" group-by="true"/>
+ <alias entity-alias="FAT" name="transactionDate" group-by="false"/>
+ <alias entity-alias="FAT" name="amount" function="sum"/>
+ <alias entity-alias="FAT" name="currencyUomId" group-by="true"/>
+ </view-entity>
+ <view-entity entity-name="FinAccountAuthSum"
+ package-name="org.ofbiz.accounting.finaccount"
+ title="View entity to help calculate total of financial account authorizations by doing a query for the sum of all amounts
+ on a range of transactionDates for a given finAccountId. Note there is no auth type to consider here, but authorizations do
+ have from and thru dates">
+ <member-entity entity-alias="FAA" entity-name="FinAccountAuth"/>
+ <alias entity-alias="FAA" name="finAccountId" group-by="true"/>
+ <alias entity-alias="FAA" name="authorizationDate" group-by="false"/>
+ <alias entity-alias="FAA" name="fromDate" group-by="false"/>
+ <alias entity-alias="FAA" name="thruDate" group-by="false"/>
+ <alias entity-alias="FAA" name="amount" function="sum"/>
+ <alias entity-alias="FAA" name="currencyUomId" group-by="true"/>
+ </view-entity>
+
<entity entity-name="GiftCard"
package-name="org.ofbiz.accounting.payment"
title="Gift Card Information Entity">
@@ -2095,7 +2201,8 @@
<key-map field-name="surveyResponseId"/>
</relation>
</entity>
- <entity entity-name="Payment"
+
+ <entity entity-name="Payment"
package-name="org.ofbiz.accounting.payment"
title="Payment Entity">
<field name="paymentId" type="id-ne"></field>
More information about the Svn
mailing list