[OFBiz] SVN: r7013 - trunk/applications/accounting/data

[sichen@svn.ofbiz.org]

Author: sichen
Date: 2006-03-17 22:11:40 -0600 (Fri, 17 Mar 2006)
New Revision: 7013

Modified:
   trunk/applications/accounting/data/AccountingTypeData.xml
   trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml
Log:
Fixed some GL account classifications

Modified: trunk/applications/accounting/data/AccountingTypeData.xml
===================================================================
--- trunk/applications/accounting/data/AccountingTypeData.xml	2006-03-18 02:37:02 UTC (rev 7012)
+++ trunk/applications/accounting/data/AccountingTypeData.xml	2006-03-18 04:11:40 UTC (rev 7013)
@@ -130,6 +130,9 @@
     <!-- a special class for non-cash inventory adjustment expenses to avoid duplicating opearting cash flow adjustments for inventory
          account transactions, which adjust operating cash flows -->
     <GlAccountClass description="Inventory Adjustment" glAccountClassId="INVENTORY_ADJUST" parentClassId="NON_CASH_EXPENSE"/>
+    <!-- same idea: these avoid double counting of depreciaton & amortization -->
+    <GlAccountClass description="Accumulated Depreciation" glAccountClassId="ACCUM_DEPRECIATION" parentClassId="NON_CASH_EXPENSE"/>
+    <GlAccountClass description="Accumulated Amortization" glAccountClassId="ACCUM_AMORTIZATION" parentClassId="NON_CASH_EXPENSE"/>
     <GlAccountClass description="Non-Posting" glAccountClassId="NON_POSTING" parentClassId="DEBIT"/>
 
     <GlAccountType description="Accounts Receivable" glAccountTypeId="ACCOUNTS_RECEIVABLE" hasTable="N" parentTypeId=""/>

Modified: trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml
===================================================================
--- trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml	2006-03-18 02:37:02 UTC (rev 7012)
+++ trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml	2006-03-18 04:11:40 UTC (rev 7013)
@@ -191,31 +191,31 @@
     accountName="VEHICLES" description="" postedBalance="0.0"/>
 
   <GlAccount parentGlAccountId="100000" glAccountId="180000" accountCode="180000" 
-    glAccountClassId="LONGTERM_ASSET" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
+    glAccountClassId="ACCUM_DEPRECIATION" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
     accountName="ACCUMULATED DEPRECIATION" description="" postedBalance="0.0"/>
   <GlAccount parentGlAccountId="180000" glAccountId="181000" accountCode="181000" 
-    glAccountClassId="LONGTERM_ASSET" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
+    glAccountClassId="ACCUM_DEPRECIATION" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
     accountName="ACCUMULATED DEPRECIATION - BUILDING" description="" postedBalance="0.0"/>
   <GlAccount parentGlAccountId="180000" glAccountId="182000" accountCode="182000" 
-    glAccountClassId="LONGTERM_ASSET" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
+    glAccountClassId="ACCUM_DEPRECIATION" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
     accountName="ACCUMULATED DEPRECIATION - LAND IMPROVEMENTS" description="" postedBalance="0.0"/>
   <GlAccount parentGlAccountId="180000" glAccountId="183000" accountCode="183000" 
-    glAccountClassId="LONGTERM_ASSET" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
+    glAccountClassId="ACCUM_DEPRECIATION" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
     accountName="ACCUMULATED DEPRECIATION - BUILDING IMPROVEMENTS" description="" postedBalance="0.0"/>
   <GlAccount parentGlAccountId="180000" glAccountId="184000" accountCode="184000" 
-    glAccountClassId="LONGTERM_ASSET" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
+    glAccountClassId="ACCUM_DEPRECIATION" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
     accountName="ACCUMULATED DEPRECIATION - LEASEHOLD IMPROVEMENTS" description="" postedBalance="0.0"/>
   <GlAccount parentGlAccountId="180000" glAccountId="185000" accountCode="185000" 
-    glAccountClassId="LONGTERM_ASSET" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
+    glAccountClassId="ACCUM_DEPRECIATION" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
     accountName="ACCUMULATED DEPRECIATION - FURNITURE FIXTURES EQUIPMENT" description="" postedBalance="0.0"/>
   <GlAccount parentGlAccountId="180000" glAccountId="186000" accountCode="186000" 
-    glAccountClassId="LONGTERM_ASSET" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
+    glAccountClassId="ACCUM_DEPRECIATION" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
     accountName="ACCUMULATED DEPRECIATION - DATA PROCESSING EQUIP" description="" postedBalance="0.0"/>
   <GlAccount parentGlAccountId="180000" glAccountId="187000" accountCode="187000" 
-    glAccountClassId="LONGTERM_ASSET" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
+    glAccountClassId="ACCUM_DEPRECIATION" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
     accountName="ACCUMULATED DEPRECIATION - DATA PROCESSING SOFTWARE" description="" postedBalance="0.0"/>
   <GlAccount parentGlAccountId="180000" glAccountId="188000" accountCode="188000" 
-    glAccountClassId="LONGTERM_ASSET" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
+    glAccountClassId="ACCUM_DEPRECIATION" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
     accountName="ACCUMULATED DEPRECIATION - VEHICLES" description="" postedBalance="0.0"/>
     
   <GlAccount parentGlAccountId="100000" glAccountId="190000" accountCode="190000" 
@@ -238,7 +238,7 @@
     glAccountClassId="LONGTERM_ASSET" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
     accountName="OTHER INTANGIBLE ASSETS" description="" postedBalance="0.0"/>
   <GlAccount parentGlAccountId="191000" glAccountId="191900" accountCode="191900" 
-    glAccountClassId="LONGTERM_ASSET" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
+    glAccountClassId="ACCUM_AMORTIZATION" glAccountTypeId="FIXED_ASSET" glResourceTypeId="MONEY"
     accountName="ACCUMULATED AMORTIZATION" description="" postedBalance="0.0"/>
     
   <GlAccount parentGlAccountId="190000" glAccountId="192000" accountCode="192000" 
@@ -1285,7 +1285,7 @@
     glAccountClassId="SGA_EXPENSE" glAccountTypeId="" glResourceTypeId="MONEY"  
     accountName="VEHICLE EXPENSE" description="" postedBalance="0.0"/>
   <GlAccount parentGlAccountId="780000" glAccountId="787000" accountCode="787000" 
-    glAccountClassId="SGA_EXPENSE" glAccountTypeId="" glResourceTypeId="MONEY"  
+    glAccountClassId="AMORTIZATION" glAccountTypeId="" glResourceTypeId="MONEY"  
     accountName="AMORTIZATION EXPENSE" description="" postedBalance="0.0"/>
   <GlAccount parentGlAccountId="780000" glAccountId="788000" accountCode="788000" 
     glAccountClassId="SGA_EXPENSE" glAccountTypeId="" glResourceTypeId="MONEY"