Author: jonesde
Date: Mon Mar 26 03:51:28 2007
New Revision: 522476
URL:
http://svn.apache.org/viewvc?view=rev&rev=522476Log:
Added actualBalance and availableBalance fields to FinAccount, amount field to FinAccountTrans - not sure where that last one was to have come from, perhaps just the Payment total, but that doesn't work for adding to an account by purchasing a Product as part of a larger order
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?view=diff&rev=522476&r1=522475&r2=522476==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Mon Mar 26 03:51:28 2007
@@ -332,12 +332,10 @@
<field name="finAccountName" type="name"></field>
<field name="finAccountCode" type="long-varchar" encrypt="true"></field>
<field name="postToGlAccountId" type="id"></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>
+ <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>
+ <field name="actualBalance" type="currency-amount"><description>Calculated as the sum of FinAccountTrans.amount</description></field>
+ <field name="availableBalance" type="currency-amount"><description>Calculated as actualBalance minus sum of outstanding FinAccountAuth.amount</description></field>
<prim-key field="finAccountId"/>
<relation type="one" fk-name="FINACCT_TYPE" rel-entity-name="FinAccountType">
<key-map field-name="finAccountTypeId"/>
@@ -393,6 +391,7 @@
<field name="partyId" type="id"></field>
<field name="transactionDate" type="date-time"></field>
<field name="entryDate" type="date-time"></field>
+ <field name="amount" type="currency-amount"></field>
<field name="paymentId" type="id-ne"></field>
<field name="orderId" type="id"></field>
<field name="orderItemSeqId" type="id"><description>To be used along with orderId to point to an OrderItem that represents the purchase of a product to add money to the account.</description></field>