|
Author: apatel
Date: Wed Oct 27 17:59:26 2010 New Revision: 1028053 URL: http://svn.apache.org/viewvc?rev=1028053&view=rev Log: Fix issue with classification of returns. Returns are of debit type transactions. Added contra revenue class and applied the fix to demo CoA. Financial reports will have to be fixed up. Will do that soon. Thanks Jacopo for review and help. Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=1028053&r1=1028052&r2=1028053&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml (original) +++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Wed Oct 27 17:59:26 2010 @@ -283,6 +283,7 @@ under the License. <GlAccountClass description="Return of Capital" glAccountClassId="RETURN_OF_CAPITAL" parentClassId="DISTRIBUTION"/> <GlAccountClass description="Dividends" glAccountClassId="DIVIDEND" parentClassId="DISTRIBUTION"/> <GlAccountClass description="Revenue" glAccountClassId="REVENUE" parentClassId="CREDIT"/> + <GlAccountClass description="Contra Revenue" glAccountClassId="CONTRA_REVENUE" parentClassId="DEBIT"/> <GlAccountClass description="Income" glAccountClassId="INCOME" parentClassId="CREDIT"/> <GlAccountClass description="Cash Income" glAccountClassId="CASH_INCOME" parentClassId="INCOME"/> <GlAccountClass description="Non-Cash Income" glAccountClassId="NON_CASH_INCOME" parentClassId="INCOME"/> Modified: ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml?rev=1028053&r1=1028052&r2=1028053&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml (original) +++ ofbiz/trunk/applications/accounting/data/DemoGeneralChartOfAccounts.xml Wed Oct 27 17:59:26 2010 @@ -724,19 +724,19 @@ according to which type of entity. accountName="DISCOUNTS ON SALES" description="" postedBalance="0.0"/> <GlAccount parentGlAccountId="400000" glAccountId="420000" accountCode="420000" - glAccountClassId="REVENUE" glAccountTypeId="" glResourceTypeId="MONEY" + glAccountClassId="CONTRA_REVENUE" glAccountTypeId="" glResourceTypeId="MONEY" accountName="CUSTOMER RETURNS" description="" postedBalance="0.0"/> <GlAccount parentGlAccountId="420000" glAccountId="421000" accountCode="421000" - glAccountClassId="REVENUE" glAccountTypeId="" glResourceTypeId="MONEY" + glAccountClassId="CONTRA_REVENUE" glAccountTypeId="" glResourceTypeId="MONEY" accountName="CUSTOMER RETURNS - PRODUCTS" description="" postedBalance="0.0"/> <GlAccount parentGlAccountId="420000" glAccountId="422000" accountCode="422000" - glAccountClassId="REVENUE" glAccountTypeId="" glResourceTypeId="MONEY" + glAccountClassId="CONTRA_REVENUE" glAccountTypeId="" glResourceTypeId="MONEY" accountName="CUSTOMER RETURNS - PROMOTIONS" description="" postedBalance="0.0"/> <GlAccount parentGlAccountId="420000" glAccountId="423000" accountCode="423000" - glAccountClassId="REVENUE" glAccountTypeId="" glResourceTypeId="MONEY" + glAccountClassId="CONTRA_REVENUE" glAccountTypeId="" glResourceTypeId="MONEY" accountName="CUSTOMER RETURNS - ADJUSTMENTS" description="" postedBalance="0.0"/> <GlAccount parentGlAccountId="420000" glAccountId="424000" accountCode="424000" - glAccountClassId="REVENUE" glAccountTypeId="" glResourceTypeId="MONEY" + glAccountClassId="CONTRA_REVENUE" glAccountTypeId="" glResourceTypeId="MONEY" accountName="CUSTOMER RETURNS - WORK OR TIME ENTRY" description="" postedBalance="0.0"/> <!-- COST OF GOODS SOLD --> |
| Free forum by Nabble | Edit this page |
