Author: sichen
Date: Thu Dec 14 15:00:17 2006
New Revision: 487381
URL: http://svn.apache.org/viewvc?view=rev&rev=487381
Log:
New GL accounts and account types for supporting sales commissions on the
general ledger
Modified:
incubator/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
incubator/ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml
Modified:
incubator/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?view=diff&rev=487381&r1=487380&r2=487381
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
(original)
+++ incubator/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
Thu Dec 14 15:00:17 2006
@@ -326,7 +326,8 @@
<InvoiceItemType description="Return Manual Adjustment" hasTable="N"
invoiceItemTypeId="CRT_MAN_ADJ" parentTypeId=""/>
<!-- invoice item types for commission invoices -->
- <InvoiceItemType description="Commission Item" hasTable="N"
invoiceItemTypeId="COMM_INV_ITEM" parentTypeId=""/>
+ <InvoiceItemType description="Commission Invoice Line Item" hasTable="N"
invoiceItemTypeId="COMM_INV_ITEM" parentTypeId=""/>
+ <InvoiceItemType description="Commission Invoice Adjustment" hasTable="N"
invoiceItemTypeId="COMM_INV_ADJ" parentTypeId=""/>
<InvoiceType description="Purchase Invoice" hasTable="N"
invoiceTypeId="PURCHASE_INVOICE" parentTypeId=""/>
<InvoiceType description="Sales Invoice" hasTable="N"
invoiceTypeId="SALES_INVOICE" parentTypeId=""/>
@@ -388,7 +389,10 @@
<InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE"
invoiceItemMapKey="RET_MAN_ADJ" invoiceItemTypeId="CRT_MAN_ADJ"/>
<InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE"
invoiceItemMapKey="RET_MKTG_PKG_ADJ" invoiceItemTypeId="CRT_MKTG_PKG_ADJ"/>
-
+ <!-- items for commission invoices -->
+ <InvoiceItemTypeMap invoiceTypeId="COMMISSION_INVOICE"
invoiceItemMapKey="COM_COMM_ITEM" invoiceItemTypeId="COMM_INV_ITEM"/>
+ <InvoiceItemTypeMap invoiceTypeId="COMMISSION_INVOICE"
invoiceItemMapKey="COM_COMM_ITEM" invoiceItemTypeId="COMM_INV_ADJ"/>
+
<PaymentMethodType description="Credit Card"
paymentMethodTypeId="CREDIT_CARD"/>
<PaymentMethodType description="Gift Card"
paymentMethodTypeId="GIFT_CARD"/>
<PaymentMethodType description="Gift Certificate"
paymentMethodTypeId="GIFT_CERTIFICATE"/>
@@ -409,6 +413,7 @@
<PaymentType description="Customer Refund" hasTable="N"
parentTypeId="DISBURSEMENT" paymentTypeId="CUSTOMER_REFUND"/> <!-- a refund TO
the customer -->
<PaymentType description="Vendor Payment" hasTable="N"
parentTypeId="DISBURSEMENT" paymentTypeId="VENDOR_PAYMENT"/>
<PaymentType description="Vendor Prepayment" hasTable="N"
parentTypeId="DISBURSEMENT" paymentTypeId="VENDOR_PREPAY"/>
+ <PaymentType description="Commission Payment" hasTable="N"
parentTypeId="DISBURSEMENT" paymentTypeId="COMMISSION_PAYMENT"/>
<PaymentType description="Pay Check" hasTable="N"
parentTypeId="DISBURSEMENT" paymentTypeId="PAY_CHECK"/>
<PaymentType description="Tax Payment" hasTable="N"
parentTypeId="DISBURSEMENT" paymentTypeId="TAX_PAYMENT"/>
<PaymentType description="Sales Tax Payment" hasTable="N"
parentTypeId="TAX_PAYMENT" paymentTypeId="SALES_TAX_PAYMENT"/>
Modified:
incubator/ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml?view=diff&rev=487381&r1=487380&r2=487381
==============================================================================
---
incubator/ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml
(original)
+++
incubator/ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml
Thu Dec 14 15:00:17 2006
@@ -838,6 +838,13 @@
<GlAccount parentGlAccountId="601000" glAccountId="601200"
accountCode="601200"
glAccountClassId="SGA_EXPENSE" glAccountTypeId="" glResourceTypeId="MONEY"
accountName="WAGES - OWNERS" description="" postedBalance="0.0"/>
+ <GlAccount parentGlAccountId="601000" glAccountId="601300"
accountCode="601300"
+ glAccountClassId="SGA_EXPENSE" glAccountTypeId="" glResourceTypeId="MONEY"
+ accountName="SALES COMMISSIONS" description="" postedBalance="0.0"/>
+ <GlAccount parentGlAccountId="601000" glAccountId="601400"
accountCode="601400"
+ glAccountClassId="SGA_EXPENSE" glAccountTypeId="" glResourceTypeId="MONEY"
+ accountName="SALES COMMISSION ADJUSTMENTS" description=""
postedBalance="0.0"/>
+
<GlAccount parentGlAccountId="600000" glAccountId="602000"
accountCode="602000"
glAccountClassId="SGA_EXPENSE" glAccountTypeId="" glResourceTypeId="MONEY"
