svn commit: r603172 - /ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r603172 - /ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml

jacopoc
Author: jacopoc
Date: Tue Dec 11 00:16:24 2007
New Revision: 603172

URL: http://svn.apache.org/viewvc?rev=603172&view=rev
Log:
Added a bunch of demo settings/mappings for the GL accounting setup.
WARNING: most of the glAccountId set in this file are probably not correct from an Accounting point of view; they will need to be seriously reviewed and corrected (by persons with a better accounting knowledge than me); but they are good to test the new and upcoming automatic transaction services.


Modified:
    ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml

Modified: ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml?rev=603172&r1=603171&r2=603172&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml Tue Dec 11 00:16:24 2007
@@ -18,7 +18,130 @@
 under the License.
 -->
 <entity-engine-xml>
-    <!-- General Ledger Setup for the "Company" organization for Company -->
+    <!-- Global defaults (for all the organizations) -->
+
+    <!-- Invoice Item Types to Gl Account Ids mappings -->
+
+    <!-- for sales invoice items -->
+    <InvoiceItemType invoiceItemTypeId="INVOICE_ADJ" defaultGlAccountId="410000"/>
+    <InvoiceItemType invoiceItemTypeId="INV_PROMOTION_ADJ" defaultGlAccountId="410000"/>
+    <InvoiceItemType invoiceItemTypeId="INV_DISCOUNT_ADJ" defaultGlAccountId="410000"/>
+    <InvoiceItemType invoiceItemTypeId="FEE" defaultGlAccountId="804000"/>
+    <InvoiceItemType invoiceItemTypeId="INV_MISC_CHARGE" defaultGlAccountId="409000"/>
+    <!-- <InvoiceItemType invoiceItemTypeId="INV_SALES_TAX" defaultGlAccountId=""/> --> <!-- Use InvoiceItem.overrideGlAccountId -->
+    <InvoiceItemType invoiceItemTypeId="INV_SHIPPING_CHARGES" defaultGlAccountId="409000"/>
+    <InvoiceItemType invoiceItemTypeId="INV_SURCHARGE_ADJ" defaultGlAccountId="409000"/>
+    <InvoiceItemType invoiceItemTypeId="INV_ADD_FEATURE" defaultGlAccountId="409000"/>
+    <InvoiceItemType invoiceItemTypeId="INV_WARRANTY_ADJ" defaultGlAccountId="409000"/>
+    <InvoiceItemType invoiceItemTypeId="INV_INTRST_CHRG" defaultGlAccountId="810000"/>
+
+    <InvoiceItemType invoiceItemTypeId="INVOICE_ITM_ADJ" defaultGlAccountId="410000"/>
+    <InvoiceItemType invoiceItemTypeId="ITM_PROMOTION_ADJ" defaultGlAccountId="410000"/>
+    <InvoiceItemType invoiceItemTypeId="ITM_REPLACE_ADJ" defaultGlAccountId="410000"/>
+    <InvoiceItemType invoiceItemTypeId="ITM_DISCOUNT_ADJ" defaultGlAccountId="410000"/>
+    <InvoiceItemType invoiceItemTypeId="ITM_FEE" defaultGlAccountId="804000"/>
+    <InvoiceItemType invoiceItemTypeId="ITM_MISC_CHARGE" defaultGlAccountId="409000"/>
+    <InvoiceItemType invoiceItemTypeId="ITM_SALES_TAX" defaultGlAccountId="224100"/>
+    <InvoiceItemType invoiceItemTypeId="ITM_SHIPPING_CHARGES" defaultGlAccountId="409000"/>
+    <InvoiceItemType invoiceItemTypeId="ITM_SURCHARGE_ADJ" defaultGlAccountId="409000"/>
+    <InvoiceItemType invoiceItemTypeId="ITM_ADD_FEATURE" defaultGlAccountId="409000"/>
+    <InvoiceItemType invoiceItemTypeId="ITM_WARRANTY_ADJ" defaultGlAccountId="409000"/>
+
+    <InvoiceItemType invoiceItemTypeId="INV_PROD_ITEM" defaultGlAccountId="401000"/>
+    <InvoiceItemType invoiceItemTypeId="INV_FPROD_ITEM" defaultGlAccountId="401000"/>
+    <InvoiceItemType invoiceItemTypeId="INV_DPROD_ITEM" defaultGlAccountId="401000"/>
+    <InvoiceItemType invoiceItemTypeId="INV_FDPROD_ITEM" defaultGlAccountId="401000"/>
+    <InvoiceItemType invoiceItemTypeId="INV_PROD_FEATR_ITEM" defaultGlAccountId="401000"/>
+    <InvoiceItemType invoiceItemTypeId="INV_SPROD_ITEM" defaultGlAccountId="401000"/>
+
+    <InvoiceItemType invoiceItemTypeId="INV_WE_ITEM" defaultGlAccountId="401000"/>
+    <InvoiceItemType invoiceItemTypeId="INV_TE_ITEM" defaultGlAccountId="401000"/>
+
+    <!-- invoice item types for purchase (AP) invoices -->
+    <InvoiceItemType invoiceItemTypeId="PINVOICE_ADJ" defaultGlAccountId="516100"/>
+    <InvoiceItemType invoiceItemTypeId="PINV_PROMOTION_ADJ" defaultGlAccountId="516100"/>
+    <InvoiceItemType invoiceItemTypeId="PINV_DISCOUNT_ADJ" defaultGlAccountId="516100"/>
+    <InvoiceItemType invoiceItemTypeId="P_FEE" defaultGlAccountId="516100"/>
+    <InvoiceItemType invoiceItemTypeId="PINV_MISC_CHARGE" defaultGlAccountId="516100"/>
+    <InvoiceItemType invoiceItemTypeId="PINV_SALES_TAX" defaultGlAccountId="516100"/>
+    <InvoiceItemType invoiceItemTypeId="PINV_SHIP_CHARGES" defaultGlAccountId="510000"/>
+    <InvoiceItemType invoiceItemTypeId="PINV_SURCHARGE_ADJ" defaultGlAccountId="516100"/>
+    <InvoiceItemType invoiceItemTypeId="PINV_ADD_FEATURE" defaultGlAccountId="516100"/>
+    <InvoiceItemType invoiceItemTypeId="PINV_WARRANTY_ADJ" defaultGlAccountId="516100"/>
+
+    <InvoiceItemType invoiceItemTypeId="PINVOICE_ITM_ADJ" defaultGlAccountId="516100"/>
+    <InvoiceItemType invoiceItemTypeId="PITM_PROMOTION_ADJ" defaultGlAccountId="516100"/>
+    <InvoiceItemType invoiceItemTypeId="PITM_REPLACE_ADJ" defaultGlAccountId="516100"/>
+    <InvoiceItemType invoiceItemTypeId="PITM_DISCOUNT_ADJ" defaultGlAccountId="516100"/>
+    <InvoiceItemType invoiceItemTypeId="PITM_FEE" defaultGlAccountId="516100"/>
+    <InvoiceItemType invoiceItemTypeId="PITM_MISC_CHARGE" defaultGlAccountId="516100"/>
+    <InvoiceItemType invoiceItemTypeId="PITM_SALES_TAX" defaultGlAccountId="516100"/>
+    <InvoiceItemType invoiceItemTypeId="PITM_SHIP_CHARGES" defaultGlAccountId="510000"/>
+    <InvoiceItemType invoiceItemTypeId="PITM_SURCHARGE_ADJ" defaultGlAccountId="516100"/>
+    <InvoiceItemType invoiceItemTypeId="PITM_ADD_FEATURE" defaultGlAccountId="516100"/>
+    <InvoiceItemType invoiceItemTypeId="PITM_WARRANTY_ADJ" defaultGlAccountId="516100"/>
+
+    <InvoiceItemType invoiceItemTypeId="PINV_PROD_ITEM" defaultGlAccountId="140000"/>
+    <InvoiceItemType invoiceItemTypeId="PINV_FPROD_ITEM" defaultGlAccountId="140000"/>
+    <InvoiceItemType invoiceItemTypeId="PINV_DPROD_ITEM" defaultGlAccountId="140000"/>
+    <InvoiceItemType invoiceItemTypeId="PINV_FDPROD_ITEM" defaultGlAccountId="140000"/>
+    <InvoiceItemType invoiceItemTypeId="PINV_PROD_FEATR_ITEM" defaultGlAccountId="140000"/>
+    <InvoiceItemType invoiceItemTypeId="PINV_SPROD_ITEM" defaultGlAccountId="140000"/>
+
+    <InvoiceItemType invoiceItemTypeId="PINV_INVPRD_ITEM" defaultGlAccountId="650000"/>
+    <InvoiceItemType invoiceItemTypeId="PINV_SUPLPRD_ITEM" defaultGlAccountId="650000"/>
+    <InvoiceItemType invoiceItemTypeId="PINV_FXASTPRD_ITEM" defaultGlAccountId="650000"/>
+
+    <InvoiceItemType invoiceItemTypeId="PINV_WE_ITEM" defaultGlAccountId="140000"/>
+    <InvoiceItemType invoiceItemTypeId="PINV_TE_ITEM" defaultGlAccountId="140000"/>
+
+    <!-- invoice items for customer returns -->
+    <InvoiceItemType invoiceItemTypeId="CRT_PROD_ITEM" defaultGlAccountId="421000"/>
+    <InvoiceItemType invoiceItemTypeId="CRT_FPROD_ITEM" defaultGlAccountId="421000"/>
+    <InvoiceItemType invoiceItemTypeId="CRT_DPROD_ITEM" defaultGlAccountId="421000"/>
+    <InvoiceItemType invoiceItemTypeId="CRT_FDPROD_ITEM" defaultGlAccountId="421000"/>
+    <InvoiceItemType invoiceItemTypeId="CRT_PROD_FEATR_ITEM" defaultGlAccountId="421000"/>
+    <InvoiceItemType invoiceItemTypeId="CRT_SPROD_ITEM" defaultGlAccountId="421000"/>
+
+    <InvoiceItemType invoiceItemTypeId="CRT_WE_ITEM" defaultGlAccountId="424000"/>
+    <InvoiceItemType invoiceItemTypeId="CRT_TE_ITEM" defaultGlAccountId="424000"/>
+
+    <InvoiceItemType invoiceItemTypeId="CRT_PROMOTION_ADJ" defaultGlAccountId="422000"/>
+    <InvoiceItemType invoiceItemTypeId="CRT_REPLACE_ADJ" defaultGlAccountId="423000"/>
+    <InvoiceItemType invoiceItemTypeId="CRT_DISCOUNT_ADJ" defaultGlAccountId="423000"/>
+    <InvoiceItemType invoiceItemTypeId="CRT_FEE_ADJ" defaultGlAccountId="423000"/>
+    <InvoiceItemType invoiceItemTypeId="CRT_MISC_ADJ" defaultGlAccountId="423000"/>
+    <!-- <InvoiceItemType invoiceItemTypeId="CRT_SALES_TAX_ADJ" defaultGlAccountId=""/> --> <!-- Use InvoiceItem.overrideGlAccountId -->
+    <InvoiceItemType invoiceItemTypeId="CRT_SHIPPING_ADJ" defaultGlAccountId="423000"/>
+    <InvoiceItemType invoiceItemTypeId="CRT_SURCHARGE_ADJ" defaultGlAccountId="423000"/>
+    <InvoiceItemType invoiceItemTypeId="CRT_ADD_FEATURE_ADJ" defaultGlAccountId="423000"/>
+    <InvoiceItemType invoiceItemTypeId="CRT_WARRANTY_ADJ" defaultGlAccountId="423000"/>
+    <InvoiceItemType invoiceItemTypeId="CRT_MKTG_PKG_ADJ" defaultGlAccountId="423000"/>
+    <InvoiceItemType invoiceItemTypeId="CRT_MAN_ADJ" defaultGlAccountId="423000"/>
+
+    <!-- invoice item types for commission invoices -->
+    <InvoiceItemType invoiceItemTypeId="COMM_INV_ITEM" defaultGlAccountId="601300"/>
+    <InvoiceItemType invoiceItemTypeId="COMM_INV_ADJ" defaultGlAccountId="601400"/>
+
+    <PaymentMethodType paymentMethodTypeId="CREDIT_CARD" glAccountId="122000"/>
+    <PaymentMethodType paymentMethodTypeId="GIFT_CARD" glAccountId="122000"/>
+    <PaymentMethodType paymentMethodTypeId="GIFT_CERTIFICATE" glAccountId="122000"/>
+    <PaymentMethodType paymentMethodTypeId="CASH" glAccountId="122000"/>
+    <PaymentMethodType paymentMethodTypeId="EFT_ACCOUNT" glAccountId="122000"/>
+    <PaymentMethodType paymentMethodTypeId="FIN_ACCOUNT" glAccountId="122000"/>
+    <PaymentMethodType paymentMethodTypeId="PERSONAL_CHECK" glAccountId="122000"/>
+    <PaymentMethodType paymentMethodTypeId="COMPANY_CHECK" glAccountId="122000"/>
+    <PaymentMethodType paymentMethodTypeId="CERTIFIED_CHECK" glAccountId="122000"/>
+    <PaymentMethodType paymentMethodTypeId="MONEY_ORDER" glAccountId="122000"/>
+    <PaymentMethodType paymentMethodTypeId="COMPANY_ACCOUNT" glAccountId="122000"/>
+    <PaymentMethodType paymentMethodTypeId="EXT_BILLACT" glAccountId="122000"/>
+    <PaymentMethodType paymentMethodTypeId="EXT_COD" glAccountId="122000"/>
+    <PaymentMethodType paymentMethodTypeId="EXT_EBAY" glAccountId="122000"/>
+    <PaymentMethodType paymentMethodTypeId="EXT_OFFLINE" glAccountId="122000"/>
+    <PaymentMethodType paymentMethodTypeId="EXT_PAYPAL" glAccountId="122000"/>
+    <PaymentMethodType paymentMethodTypeId="EXT_WORLDPAY" glAccountId="122000"/>
+
+    <!-- General Ledger Setup for the "Company" organization for "Company" -->
     
     <!-- GL journal for suspended transactions (failed post) -->
     <GlJournal organizationPartyId="Company" glJournalId="ERROR_JOURNAL" glJournalName="Suspense transactions"/>
@@ -31,20 +154,115 @@
 
     <!-- Chart Of Accounts -->
     <GlAccountOrganization organizationPartyId="Company" glAccountId="100000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="111100" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="112000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="120000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="121800" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="122000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="122100" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="122200" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="122300" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="122500" fromDate="2001-01-01 00:00:00.0"/>
     <GlAccountOrganization organizationPartyId="Company" glAccountId="140000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="210000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="213000" fromDate="2001-01-01 00:00:00.0"/>
     <GlAccountOrganization organizationPartyId="Company" glAccountId="213200" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="213300" fromDate="2001-01-01 00:00:00.0"/>
     <GlAccountOrganization organizationPartyId="Company" glAccountId="213500" fromDate="2001-01-01 00:00:00.0"/>
     <GlAccountOrganization organizationPartyId="Company" glAccountId="214000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="221100" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="224100" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="400000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="401000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="409000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="410000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="421000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="422000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="423000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="424000" fromDate="2001-01-01 00:00:00.0"/>
     <GlAccountOrganization organizationPartyId="Company" glAccountId="500000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="510000" fromDate="2001-01-01 00:00:00.0"/>
     <GlAccountOrganization organizationPartyId="Company" glAccountId="514000" fromDate="2001-01-01 00:00:00.0"/>
     <GlAccountOrganization organizationPartyId="Company" glAccountId="515000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="516100" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="601300" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="601400" fromDate="2001-01-01 00:00:00.0"/>
     <GlAccountOrganization organizationPartyId="Company" glAccountId="625000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="650000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="804000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="810000" fromDate="2001-01-01 00:00:00.0"/>
+    <GlAccountOrganization organizationPartyId="Company" glAccountId="900000" fromDate="2001-01-01 00:00:00.0"/>
     
     <!-- Default mapping between account types and account ids -->
-    <GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="INVENTORY_ACCOUNT" glAccountId="140000" />
+    <GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="ACCOUNTS_RECEIVABLE" glAccountId="120000"/>
+    <GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="INTRSTINC_RECEIVABLE" glAccountId="121800"/>
+    <GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="INVENTORY_ACCOUNT" glAccountId="140000"/>
+    <GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="PREPAID_EXPENSES" glAccountId="150000"/>
+    <GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="ACCOUNTS_PAYABLE" glAccountId="210000"/>
     <GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="UNINVOICED_SHIP_RCPT" glAccountId="214000"/>
+    <GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="CUSTOMER_CREDIT" glAccountId="213000"/>
+    <GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="CUSTOMER_DEPOSIT" glAccountId="213300"/>
+    <GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="COMMISSIONS_PAYABLE" glAccountId="221100"/>
+    <GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="SALES_ACCOUNT" glAccountId="400000"/>
     <GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="COGS_ACCOUNT" glAccountId="500000"/>
     <GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="INV_ADJ_VAL" glAccountId="515000"/>
+    <GlAccountTypeDefault organizationPartyId="Company" glAccountTypeId="TAX_ACCOUNT" glAccountId="900000"/>
+
+    <!-- mappings for payments -->
+    <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="CUSTOMER_REFUND" glAccountTypeId="CUSTOMER_CREDIT"/>
+    <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="VENDOR_PAYMENT" glAccountTypeId="ACCOUNTS_PAYABLE"/>
+    <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="VENDOR_PREPAY" glAccountTypeId="PREPAID_EXPENSES"/>
+    <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="COMMISSION_PAYMENT" glAccountTypeId="COMMISSIONS_PAYABLE"/>
+    <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="PAY_CHECK" glAccountTypeId="CUSTOMER_CREDIT"/>
+    <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="GC_WITHDRAWAL" glAccountTypeId="CUSTOMER_CREDIT"/>
+    <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="SALES_TAX_PAYMENT" glAccountTypeId="TAX_ACCOUNT"/>
+    <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="PAYROLL_TAX_PAYMENT" glAccountTypeId="TAX_ACCOUNT"/>
+    <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="INCOME_TAX_PAYMENT" glAccountTypeId="TAX_ACCOUNT"/>
+
+    <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="CUSTOMER_PAYMENT" glAccountTypeId="ACCOUNTS_RECEIVABLE"/>
+    <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="CUSTOMER_DEPOSIT" glAccountTypeId="CUSTOMER_DEPOSIT"/>
+    <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="INTEREST_RECEIPT" glAccountTypeId="INTRSTINC_RECEIVABLE"/>
+    <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="GC_DEPOSIT" glAccountTypeId="CUSTOMER_DEPOSIT"/>
+
+    <!--
+    No need to load these if they are set with the 122000 account (the same set as a global value for the payment type)
+    <PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="CREDIT_CARD" glAccountId="122000"/>
+    <PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="GIFT_CARD" glAccountId="122000"/>
+    -->
+    <PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="GIFT_CERTIFICATE" glAccountId="120000"/>
+    <PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="CASH" glAccountId="112000"/>
+    <PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EFT_ACCOUNT" glAccountId="111100"/>
+    <PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="FIN_ACCOUNT" glAccountId="111100"/>
+    <PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="PERSONAL_CHECK" glAccountId="112000"/>
+    <PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="COMPANY_CHECK" glAccountId="112000"/>
+    <PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="CERTIFIED_CHECK" glAccountId="112000"/>
+    <PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="MONEY_ORDER" glAccountId="112000"/>
+    <PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="COMPANY_ACCOUNT" glAccountId="111100"/>
+    <PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_BILLACT" glAccountId="213000"/>
+    <PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_COD" glAccountId="112000"/>
+    <PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_EBAY" glAccountId="112000"/>
+    <PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_OFFLINE" glAccountId="112000"/>
+    <PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_PAYPAL" glAccountId="122500"/>
+    <PaymentMethodTypeGlAccount organizationPartyId="Company" paymentMethodTypeId="EXT_WORLDPAY" glAccountId="122500"/>
+    <CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_VISA" glAccountId="122300"/>
+    <CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_MASTERCARD" glAccountId="122300"/>
+    <CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_AMERICANEXPRESS" glAccountId="122100"/>
+    <CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_DINERSCLUB" glAccountId="122100"/>
+    <CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_DISCOVER" glAccountId="122200"/>
+    <!--
+    No need to load these if they are set with the 122000 account (the default for the CREDIT_CARD payment method type)
+    <CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_ENROUTE" glAccountId="122000"/>
+    <CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_CARTEBLANCHE" glAccountId="122000"/>
+    <CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_JCB" glAccountId="122000"/>
+    <CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_SOLO" glAccountId="122000"/>
+    <CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_SWITCH" glAccountId="122000"/>
+    <CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_VISAELECTRON" glAccountId="122000"/>
+    <CreditCardTypeGlAccount organizationPartyId="Company" cardType="CCT_UATP" glAccountId="122000"/>
+    -->
+    <FinAccountTypeGlAccount organizationPartyId="Company" finAccountTypeId="GIFTCERT_ACCOUNT" glAccountId="213200"/>
+    <FinAccountTypeGlAccount organizationPartyId="Company" finAccountTypeId="DEPOSIT_ACCOUNT" glAccountId="213500"/>
+    <FinAccountTypeGlAccount organizationPartyId="Company" finAccountTypeId="BANK_ACCOUNT" glAccountId="213500"/>
+    <FinAccountTypeGlAccount organizationPartyId="Company" finAccountTypeId="INVESTMENT_ACCOUNT" glAccountId="213500"/>
 
     <VarianceReasonGlAccount organizationPartyId="Company" varianceReasonId="VAR_LOST" glAccountId="514000"/>
     <VarianceReasonGlAccount organizationPartyId="Company" varianceReasonId="VAR_STOLEN" glAccountId="514000"/>
@@ -52,11 +270,5 @@
     <VarianceReasonGlAccount organizationPartyId="Company" varianceReasonId="VAR_DAMAGED" glAccountId="514000"/>
     <VarianceReasonGlAccount organizationPartyId="Company" varianceReasonId="VAR_INTEGR" glAccountId="514000"/>
     <VarianceReasonGlAccount organizationPartyId="Company" varianceReasonId="VAR_SAMPLE" glAccountId="625000"/>
-
-    <!-- Specific mapping between financial account types and account ids -->
-    <FinAccountTypeGlAccount organizationPartyId="Company" finAccountTypeId="GIFTCERT_ACCOUNT" glAccountId="213200"/>
-    <FinAccountTypeGlAccount organizationPartyId="Company" finAccountTypeId="DEPOSIT_ACCOUNT" glAccountId="213500"/>
-    <FinAccountTypeGlAccount organizationPartyId="Company" finAccountTypeId="BANK_ACCOUNT" glAccountId="213500"/>
-    <FinAccountTypeGlAccount organizationPartyId="Company" finAccountTypeId="INVESTMENT_ACCOUNT" glAccountId="213500"/>
 
 </entity-engine-xml>