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

[jonesde]

Author: jonesde
Date: Mon Mar 26 20:24:40 2007
New Revision: 522726

URL: http://svn.apache.org/viewvc?view=rev&rev=522726
Log:
Moved currencyUomId to FinAccount from FinAccountAuth; the same currency should always be used for a FinAccount, including for FinAccountTrans and FinAccountAuth and this was missing and problematically modelled in the previous model

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=522726&r1=522725&r2=522726
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Mon Mar 26 20:24:40 2007
@@ -331,6 +331,7 @@
         <field name="finAccountTypeId" type="id"></field>
         <field name="finAccountName" type="name"></field>
         <field name="finAccountCode" type="long-varchar" encrypt="true"></field>
+        <field name="currencyUomId" type="id-ne"/>
         <field name="organizationPartyId" type="id"><description>The internal organization Party that owns (or rather, is liable for) the account.</description></field>
         <field name="ownerPartyId" type="id"><description>The customer or third party that owns the account.</description></field>
         <field name="postToGlAccountId" type="id"></field>
@@ -342,6 +343,9 @@
         <relation type="one" fk-name="FINACCT_TYPE" rel-entity-name="FinAccountType">
             <key-map field-name="finAccountTypeId"/>
         </relation>
+        <relation type="one" fk-name="FINACCT_CURUOM" title="Currency" rel-entity-name="Uom">
+            <key-map field-name="currencyUomId" rel-field-name="uomId"/>
+        </relation>
         <relation type="one" fk-name="FINACCT_ORGPTY" title="Organization" rel-entity-name="Party">
             <key-map field-name="organizationPartyId" rel-field-name="partyId"/>
         </relation>
@@ -428,16 +432,12 @@
         <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.finaccount" title="Financial Account Transaction Attribute Entity">