Author: jonesde
Date: Sun Mar 25 03:15:22 2007
New Revision: 522187
URL: http://svn.apache.org/viewvc?view=rev&rev=522187
Log:
Added FinAccountTypeGlAccount entity, postToGlAccountId field on the FinAccount
entity, and demo data for these for the Company party; note that this required
moving the Company Party data to the accounting component from the ecommerce
component, so the DemoMerchant.xml file is gone and the data from there is now
in the DemoOrganizationData.xml file
Removed:
ofbiz/trunk/applications/ecommerce/data/DemoMerchant.xml
Modified:
ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml
ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml
ofbiz/trunk/applications/accounting/entitydef/entitygroup.xml
ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
ofbiz/trunk/applications/ecommerce/ofbiz-component.xml
Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?view=diff&rev=522187&r1=522186&r2=522187
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Sun Mar 25
03:15:22 2007
@@ -69,10 +69,11 @@
<FinAccountTransType description="Withdraw"
finAccountTransTypeId="WITHDRAWAL" hasTable="N" parentTypeId=""/>
<FinAccountTransType description="Adjustment"
finAccountTransTypeId="ADJUSTMENT" hasTable="N" parentTypeId=""/>
- <FinAccountType description="Bank" finAccountTypeId="BANK_ACCOUNT"
hasTable="N" parentTypeId=""/>
<FinAccountType description="Gift Certificate"
finAccountTypeId="GIFTCERT_ACCOUNT" hasTable="N" parentTypeId=""/>
- <FinAccountType description="Investment"
finAccountTypeId="INVESTMENT_ACCOUNT" hasTable="N" parentTypeId=""/>
-
+ <FinAccountType description="Deposit Account"
finAccountTypeId="DEPOSIT_ACCOUNT" hasTable="N" parentTypeId=""/>
+ <FinAccountType description="Bank Account" finAccountTypeId="BANK_ACCOUNT"
hasTable="N" parentTypeId="DEPOSIT_ACCOUNT"/>
+ <FinAccountType description="Investment Account"
finAccountTypeId="INVESTMENT_ACCOUNT" hasTable="N"
parentTypeId="DEPOSIT_ACCOUNT"/>
+
<FixedAssetType description="Equipment" fixedAssetTypeId="EQUIPMENT"
hasTable="N" parentTypeId=""/>
<FixedAssetType description="The fixed asset used in the operation-routing
definition" fixedAssetTypeId="PRODUCTION_EQUIPMENT" hasTable="N"
parentTypeId=""/>
<FixedAssetType description="Group of machines, used for task and routing
definition" fixedAssetTypeId="GROUP_EQUIPMENT" hasTable="N" parentTypeId=""/>
Modified:
ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml?view=diff&rev=522187&r1=522186&r2=522187
==============================================================================
--- ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml
(original)
+++ ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml Sun
Mar 25 03:15:22 2007
@@ -29,7 +29,7 @@
<GlAccount parentGlAccountId="" glAccountId="100000" accountCode="100000"
glAccountClassId="ASSET" glAccountTypeId="" glResourceTypeId="MONEY"
accountName="ASSETS" description="" postedBalance="0.0"/>
-
+
<GlAccount parentGlAccountId="100000" glAccountId="110000"
accountCode="110000"
glAccountClassId="CASH_EQUIVALENT" glAccountTypeId="CURRENT_ASSET"
glResourceTypeId="MONEY"
accountName="CASH" description="" postedBalance="0.0"/>
@@ -304,25 +304,30 @@
glAccountClassId="CURRENT_LIABILITY" glAccountTypeId="ACCOUNTS_PAYABLE"
glResourceTypeId="MONEY"
accountName="ACCOUNTS PAYABLE - OPERATING" description=""
postedBalance="0.0"/>
- <GlAccount parentGlAccountId="210000" glAccountId="213000"
accountCode="213000"
- glAccountClassId="CURRENT_LIABILITY" glAccountTypeId="CUSTOMER_CREDIT"
glResourceTypeId="MONEY"
- accountName="CUSTOMER CREDITS" description="" postedBalance="0.0"/>
- <GlAccount parentGlAccountId="213000" glAccountId="213100"
accountCode="213100"
- glAccountClassId="CURRENT_LIABILITY" glAccountTypeId="CUSTOMER_CREDIT"
glResourceTypeId="MONEY"
- accountName="MERCHANDISE CREDITS UNREDEEMED" description=""
postedBalance="0.0"/>
- <GlAccount parentGlAccountId="213000" glAccountId="213200"
accountCode="213200"
- glAccountClassId="CURRENT_LIABILITY" glAccountTypeId="CUSTOMER_CREDIT"
glResourceTypeId="MONEY"
- accountName="GIFT CERTIFICATES UNREDEEMED" description=""
postedBalance="0.0"/>
- <GlAccount parentGlAccountId="213000" glAccountId="213300"
accountCode="213300"
- glAccountClassId="CURRENT_LIABILITY" glAccountTypeId="CUSTOMER_DEPOSIT"
glResourceTypeId="MONEY"
- accountName="SPECIAL ORDER DEPOSITS" description="" postedBalance="0.0"/>
- <GlAccount parentGlAccountId="213000" glAccountId="213400"
accountCode="213400"
- glAccountClassId="CURRENT_LIABILITY" glAccountTypeId="CUSTOMER_DEPOSIT"
glResourceTypeId="MONEY"
- accountName="MAIL ORDER DEPOSITS" description="" postedBalance="0.0"/>
- <GlAccount parentGlAccountId="210000" glAccountId="214000"
accountCode="214000"
- glAccountClassId="CURRENT_LIABILITY" glAccountTypeId="CURRENT_LIABILITY"
glResourceTypeId="MONEY"
- accountName="UNINVOICED ITEM RECEIPTS" description="" postedBalance="0.0"/>
-
+ <GlAccount parentGlAccountId="210000" glAccountId="213000"
accountCode="213000"
+ glAccountClassId="CURRENT_LIABILITY" glAccountTypeId="CUSTOMER_CREDIT"
glResourceTypeId="MONEY"
+ accountName="CUSTOMER CREDITS" description="" postedBalance="0.0"/>
+
+ <GlAccount parentGlAccountId="213000" glAccountId="213100"
accountCode="213100"
+ glAccountClassId="CURRENT_LIABILITY" glAccountTypeId="CUSTOMER_CREDIT"
glResourceTypeId="MONEY"
+ accountName="MERCHANDISE CREDITS UNREDEEMED" description=""
postedBalance="0.0"/>
+ <GlAccount parentGlAccountId="213000" glAccountId="213200"
accountCode="213200"
+ glAccountClassId="CURRENT_LIABILITY" glAccountTypeId="CUSTOMER_CREDIT"
glResourceTypeId="MONEY"
+ accountName="GIFT CERTIFICATES UNREDEEMED" description=""
postedBalance="0.0"/>
+ <GlAccount parentGlAccountId="213000" glAccountId="213300"
accountCode="213300"
+ glAccountClassId="CURRENT_LIABILITY"
glAccountTypeId="CUSTOMER_DEPOSIT" glResourceTypeId="MONEY"
+ accountName="SPECIAL ORDER DEPOSITS" description=""
postedBalance="0.0"/>
+ <GlAccount parentGlAccountId="213000" glAccountId="213400"
accountCode="213400"
+ glAccountClassId="CURRENT_LIABILITY"
glAccountTypeId="CUSTOMER_DEPOSIT" glResourceTypeId="MONEY"
+ accountName="MAIL ORDER DEPOSITS" description="" postedBalance="0.0"/>
+ <GlAccount parentGlAccountId="213000" glAccountId="213500"
accountCode="213500"
+ glAccountClassId="CURRENT_LIABILITY"
glAccountTypeId="CUSTOMER_DEPOSIT" glResourceTypeId="MONEY"
+ accountName="CUSTOMER DEPOSIT ACCOUNTS" description=""
postedBalance="0.0"/>
+
+ <GlAccount parentGlAccountId="210000" glAccountId="214000"
accountCode="214000"
+ glAccountClassId="CURRENT_LIABILITY"
glAccountTypeId="CURRENT_LIABILITY" glResourceTypeId="MONEY"
+ accountName="UNINVOICED ITEM RECEIPTS" description=""
postedBalance="0.0"/>
+
<GlAccount parentGlAccountId="210000" glAccountId="215000"
accountCode="215000"
glAccountClassId="CURRENT_LIABILITY" glAccountTypeId="INVENTORY_XFER_IN"
glResourceTypeId="MONEY"
accountName="PAYABLE FOR INVENTORY TRANSFERRED IN" description=""
postedBalance="0.0"/>
Modified: ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml?view=diff&rev=522187&r1=522186&r2=522187
==============================================================================
--- ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml Sun Mar
25 03:15:22 2007
@@ -18,7 +18,22 @@
under the License.
-->
<entity-engine-xml>
-
+ <!-- The main Company Internal Organization -->
+ <Party partyId="Company" partyTypeId="PARTY_GROUP"/>
+ <PartyGroup partyId="Company" groupName="Your Company Name Here"
logoImageUrl="http://www.ofbiz.org/images/ofbiz_logo.jpg"/>
+ <PartyRole partyId="Company" roleTypeId="BILL_FROM_VENDOR"/>
+ <PartyRole partyId="Company" roleTypeId="BILL_TO_CUSTOMER"/>
+ <PartyRole partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="Company" roleTypeId="_NA_"/>
+ <ContactMech contactMechId="9000" contactMechTypeId="POSTAL_ADDRESS"/>
+ <PartyContactMech partyId="Company" contactMechId="9000"
fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/>
+ <PostalAddress contactMechId="9000" toName="Company XYZ" address1="2003
Open Blvd" city="Open City" postalCode="999999" countryGeoId="USA"
stateProvinceGeoId="CA"/>
+ <PartyContactMechPurpose partyId="Company" contactMechId="9000"
contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
+ <PartyContactMechPurpose partyId="Company" contactMechId="9000"
contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
+ <PartyContactMechPurpose partyId="Company" contactMechId="9000"
contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
+ <PartyAcctgPreference partyId="Company" taxFormId="US_IRS_1120"
cogsMethodId="COGS_AVG_COST" baseCurrencyUomId="USD"/>
+
+ <!-- Sub-Organizations -->
<Party partyId="MARKETING" partyTypeId="PARTY_GROUP"
createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin"
lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"
lastUpdatedStamp="2004-03-27 09:37:41.016" lastUpdatedTxStamp="2004-03-27
09:37:41.016" createdStamp="2004-03-27 09:37:41.016" createdTxStamp="2004-03-27
09:37:41.016"/>
<PartyGroup partyId="MARKETING" groupName="Marketing department"/>
<PartyRole partyId="MARKETING" roleTypeId="INTERNAL_ORGANIZATIO"
lastUpdatedStamp="2004-03-27 09:37:41.142" lastUpdatedTxStamp="2004-03-27
09:37:41.142" createdStamp="2004-03-27 09:37:41.142" createdTxStamp="2004-03-27
09:37:41.142"/>
@@ -38,7 +53,32 @@
<Party partyId="TESTING" partyTypeId="PARTY_GROUP" createdDate="2004-03-27
09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27
09:37:40.989" lastModifiedByUserLogin="admin" lastUpdatedStamp="2004-03-27
09:37:41.016" lastUpdatedTxStamp="2004-03-27 09:37:41.016"
createdStamp="2004-03-27 09:37:41.016" createdTxStamp="2004-03-27
09:37:41.016"/>
<PartyGroup partyId="TESTING" groupName="Testing department"/>
<PartyRole partyId="TESTING" roleTypeId="INTERNAL_ORGANIZATIO"
lastUpdatedStamp="2004-03-27 09:37:41.142" lastUpdatedTxStamp="2004-03-27
09:37:41.142" createdStamp="2004-03-27 09:37:41.142" createdTxStamp="2004-03-27
09:37:41.142"/>
-
-
+
+ <!-- Some Sample Time Periods, a Year with Quarters and Months -->
+ <CustomTimePeriod organizationPartyId="Company" periodTypeId="FISCAL_YEAR"
fromDate="2007-01-01" thruDate="2008-01-01" isClosed="N" periodNum="2007"
periodName="Fiscal Year"/>
+ <CustomTimePeriod organizationPartyId="Company"
periodTypeId="FISCAL_QUARTER" fromDate="2007-01-01" thruDate="2007-04-01"
isClosed="N" periodNum="1" periodName="Quarter"/>
+ <CustomTimePeriod organizationPartyId="Company"
periodTypeId="FISCAL_QUARTER" fromDate="2007-04-01" thruDate="2007-07-01"
isClosed="N" periodNum="2" periodName="Quarter"/>
+ <CustomTimePeriod organizationPartyId="Company"
periodTypeId="FISCAL_QUARTER" fromDate="2007-07-01" thruDate="2007-10-01"
isClosed="N" periodNum="3" periodName="Quarter"/>
+ <CustomTimePeriod organizationPartyId="Company"
periodTypeId="FISCAL_QUARTER" fromDate="2007-10-01" thruDate="2008-01-01"
isClosed="N" periodNum="4" periodName="Quarter"/>
+ <CustomTimePeriod organizationPartyId="Company"
periodTypeId="FISCAL_MONTH" fromDate="2007-01-01" thruDate="2007-02-01"
isClosed="N" periodNum="1" periodName="Month"/>
+ <CustomTimePeriod organizationPartyId="Company"
periodTypeId="FISCAL_MONTH" fromDate="2007-02-01" thruDate="2007-03-01"
isClosed="N" periodNum="2" periodName="Month"/>
+ <CustomTimePeriod organizationPartyId="Company"
periodTypeId="FISCAL_MONTH" fromDate="2007-03-01" thruDate="2007-04-01"
isClosed="N" periodNum="3" periodName="Month"/>
+ <CustomTimePeriod organizationPartyId="Company"
periodTypeId="FISCAL_MONTH" fromDate="2007-04-01" thruDate="2007-05-01"
isClosed="N" periodNum="4" periodName="Month"/>
+ <CustomTimePeriod organizationPartyId="Company"
periodTypeId="FISCAL_MONTH" fromDate="2007-05-01" thruDate="2007-06-01"
isClosed="N" periodNum="5" periodName="Month"/>
+ <CustomTimePeriod organizationPartyId="Company"
periodTypeId="FISCAL_MONTH" fromDate="2007-06-01" thruDate="2007-07-01"
isClosed="N" periodNum="6" periodName="Month"/>
+ <CustomTimePeriod organizationPartyId="Company"
periodTypeId="FISCAL_MONTH" fromDate="2007-07-01" thruDate="2007-08-01"
isClosed="N" periodNum="7" periodName="Month"/>
+ <CustomTimePeriod organizationPartyId="Company"
periodTypeId="FISCAL_MONTH" fromDate="2007-08-01" thruDate="2007-09-01"
isClosed="N" periodNum="8" periodName="Month"/>
+ <CustomTimePeriod organizationPartyId="Company"
periodTypeId="FISCAL_MONTH" fromDate="2007-09-01" thruDate="2007-10-01"
isClosed="N" periodNum="9" periodName="Month"/>
+ <CustomTimePeriod organizationPartyId="Company"
periodTypeId="FISCAL_MONTH" fromDate="2007-10-01" thruDate="2007-11-01"
isClosed="N" periodNum="10" periodName="Month"/>
+ <CustomTimePeriod organizationPartyId="Company"
periodTypeId="FISCAL_MONTH" fromDate="2007-11-01" thruDate="2007-12-01"
isClosed="N" periodNum="11" periodName="Month"/>
+ <CustomTimePeriod organizationPartyId="Company"
periodTypeId="FISCAL_MONTH" fromDate="2007-12-01" thruDate="2008-01-01"
isClosed="N" periodNum="12" periodName="Month"/>
+
+ <!-- FinAccountTypeGlAccount Entries for Company -->
+ <FinAccountTypeGlAccount finAccountTypeId="GIFTCERT_ACCOUNT"
organizationPartyId="Company" glAccountId="213200"/>
+ <FinAccountTypeGlAccount finAccountTypeId="DEPOSIT_ACCOUNT"
organizationPartyId="Company" glAccountId="213500"/>
+ <FinAccountTypeGlAccount finAccountTypeId="BANK_ACCOUNT"
organizationPartyId="Company" glAccountId="213500"/>
+ <FinAccountTypeGlAccount finAccountTypeId="INVESTMENT_ACCOUNT"
organizationPartyId="Company" glAccountId="213500"/>
+
+ <!-- TODO: The LONG Section: GlAccountOrganization Records for Company -->
+ <GlAccountOrganization glAccountId="100000" organizationPartyId="Company"
fromDate="2001-05-13 12:00:00.0"/>
</entity-engine-xml>
-
Modified: ofbiz/trunk/applications/accounting/entitydef/entitygroup.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitygroup.xml?view=diff&rev=522187&r1=522186&r2=522187
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitygroup.xml Sun Mar 25
03:15:22 2007
@@ -20,9 +20,9 @@
<entitygroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/entitygroup.xsd";>
- <!-- ========================================================= -->
- <!-- org.ofbiz.accounting.budget -->
- <!-- ========================================================= -->
+ <!-- ========================================================= -->
+ <!-- org.ofbiz.accounting.budget -->
+ <!-- ========================================================= -->
<entity-group group="org.ofbiz" entity="Budget" />
<entity-group group="org.ofbiz" entity="BudgetAttribute" />
@@ -42,9 +42,27 @@
<entity-group group="org.ofbiz" entity="BudgetType" />
<entity-group group="org.ofbiz" entity="BudgetTypeAttr" />
- <!-- ========================================================= -->
- <!-- org.ofbiz.accounting.fixedasset -->
- <!-- ========================================================= -->
+ <!-- ========================================================= -->
+ <!-- org.ofbiz.accounting.finaccount -->
+ <!-- ========================================================= -->
+
+ <entity-group group="org.ofbiz" entity="FinAccount" />
+ <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="FinAccountTypeGlAccount" />
+ <entity-group group="org.ofbiz" entity="FinAccountTransSum" />
+ <entity-group group="org.ofbiz" entity="FinAccountAuthSum" />
+
+ <!-- ========================================================= -->
+ <!-- org.ofbiz.accounting.fixedasset -->
+ <!-- ========================================================= -->
<entity-group group="org.ofbiz" entity="DepreciationMethod" />
<entity-group group="org.ofbiz" entity="FixedAsset" />
@@ -64,9 +82,9 @@
<entity-group group="org.ofbiz" entity="FixedAssetTypeAttr" />
<entity-group group="org.ofbiz" entity="PartyFixedAssetAssignment" />
- <!-- ========================================================= -->
- <!-- org.ofbiz.accounting.invoice -->
- <!-- ========================================================= -->
+ <!-- ========================================================= -->
+ <!-- org.ofbiz.accounting.invoice -->
+ <!-- ========================================================= -->
<entity-group group="org.ofbiz" entity="Invoice" />
<entity-group group="org.ofbiz" entity="InvoiceAttribute" />
@@ -84,9 +102,9 @@
<entity-group group="org.ofbiz" entity="InvoiceType" />
<entity-group group="org.ofbiz" entity="InvoiceTypeAttr" />
- <!-- ========================================================= -->
- <!-- org.ofbiz.accounting.ledger -->
- <!-- ========================================================= -->
+ <!-- ========================================================= -->
+ <!-- org.ofbiz.accounting.ledger -->
+ <!-- ========================================================= -->
<entity-group group="org.ofbiz" entity="AcctgTrans" />
<entity-group group="org.ofbiz" entity="AcctgTransAttribute" />
@@ -122,9 +140,9 @@
<entity-group group="org.ofbiz" entity="CostComponentCalc" />
<entity-group group="org.ofbiz" entity="WorkEffortCostCalc" />
- <!-- ========================================================= -->
- <!-- org.ofbiz.accounting.payment -->
- <!-- ========================================================= -->
+ <!-- ========================================================= -->
+ <!-- org.ofbiz.accounting.payment -->
+ <!-- ========================================================= -->
<entity-group group="org.ofbiz" entity="BillingAccount" />
<entity-group group="org.ofbiz" entity="BillingAccountAndRole" />
@@ -137,18 +155,6 @@
<entity-group group="org.ofbiz" entity="Deduction" />
<entity-group group="org.ofbiz" entity="DeductionType" />
<entity-group group="org.ofbiz" entity="EftAccount" />
- <entity-group group="org.ofbiz" entity="FinAccount" />
- <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="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: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?view=diff&rev=522187&r1=522186&r2=522187
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Sun Mar 25
03:15:22 2007
@@ -331,16 +331,20 @@
<field name="finAccountTypeId" type="id"></field>
<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>
+ <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>
+ <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"/>
</relation>
+ <relation type="one" fk-name="FINACCT_GLAC"
rel-entity-name="GlAccount">
+ <key-map field-name="postToGlAccountId"
rel-field-name="glAccountId"/>
+ </relation>
<relation type="many" rel-entity-name="FinAccountTypeAttr">
<key-map field-name="finAccountTypeId"/>
</relation>
@@ -480,6 +484,7 @@
<entity entity-name="FinAccountTypeAttr"
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>
+ <field name="attrValue" type="long-varchar"></field>
<prim-key field="finAccountTypeId"/>
<prim-key field="attrName"/>
<relation type="one" fk-name="FINACCT_TYPE_ATTR"
rel-entity-name="FinAccountType">
@@ -490,6 +495,22 @@
</relation>
<relation type="many" rel-entity-name="FinAccount">
<key-map field-name="finAccountTypeId"/>
+ </relation>
+ </entity>
+ <entity entity-name="FinAccountTypeGlAccount"
package-name="org.ofbiz.accounting.finaccount" title="Financial Account Type GL
Account Entity">
+ <field name="finAccountTypeId" type="id-ne"></field>
+ <field name="organizationPartyId" type="id-ne"></field>
+ <field name="glAccountId" type="id"></field>
+ <prim-key field="finAccountTypeId"/>
+ <prim-key field="organizationPartyId"/>
+ <relation type="one" fk-name="FINACCT_TGA_PMT"
rel-entity-name="FinAccountType">
+ <key-map field-name="finAccountTypeId"/>
+ </relation>
+ <relation type="one" fk-name="FINACCT_TGA_OPTY" title="Organization"
rel-entity-name="Party">
+ <key-map field-name="organizationPartyId"
rel-field-name="partyId"/>
+ </relation>
+ <relation type="one" fk-name="FINACCT_TGA_GLAC"
rel-entity-name="GlAccount">
+ <key-map field-name="glAccountId"/>
</relation>
</entity>
<view-entity entity-name="FinAccountTransSum"
package-name="org.ofbiz.accounting.finaccount" title="Financial Account
Transactio Sum">
Modified: ofbiz/trunk/applications/ecommerce/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/ofbiz-component.xml?view=diff&rev=522187&r1=522186&r2=522187
==============================================================================
--- ofbiz/trunk/applications/ecommerce/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/ecommerce/ofbiz-component.xml Sun Mar 25 03:15:22
2007
@@ -25,7 +25,6 @@
<classpath type="jar" location="build/lib/*"/>
<classpath type="dir" location="config"/>
<classpath type="dir" location="script"/>
- <entity-resource type="data" reader-name="demo" loader="main"
location="data/DemoMerchant.xml"/>
<entity-resource type="data" reader-name="demo" loader="main"
location="data/DemoProduct.xml"/>
<entity-resource type="data" reader-name="demo" loader="main"
location="data/DemoProductImages.xml"/>
<entity-resource type="data" reader-name="demo" loader="main"
location="data/DemoSurvey.xml"/>
![http://www.ofbiz.org/images/ofbiz_logo.jpg"/](http://www.ofbiz.org/images/ofbiz_logo.jpg"/){kind=link}