Author: jacopoc
Date: Wed Feb 11 06:42:33 2015 New Revision: 1658884 URL: http://svn.apache.org/r1658884 Log: Applied fix from trunk for revision: 1657507 === Fixed wrong classifications (Liability<-->Asset) for the unapplied payments accounts demo data. Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/accounting/data/DemoGeneralChartOfAccounts.xml Propchange: ofbiz/branches/release14.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 11 06:42:33 2015 @@ -8,4 +8,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506,1657714,1657790,1658364,1658662 +/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657714,1657790,1658364,1658662 Modified: ofbiz/branches/release14.12/applications/accounting/data/DemoGeneralChartOfAccounts.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/data/DemoGeneralChartOfAccounts.xml?rev=1658884&r1=1658883&r2=1658884&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/accounting/data/DemoGeneralChartOfAccounts.xml (original) +++ ofbiz/branches/release14.12/applications/accounting/data/DemoGeneralChartOfAccounts.xml Wed Feb 11 06:42:33 2015 @@ -134,10 +134,6 @@ under the License. glAccountClassId="CURRENT_ASSET" glAccountTypeId="INVENTORY_XFER_OUT" glResourceTypeId="MONEY" accountName="RECEIVABLE FROM INVENTORY TRANSFERRED OUT" description=""/> - <GlAccount parentGlAccountId="120000" glAccountId="126000" accountCode="126000" - glAccountClassId="CURRENT_ASSET" glAccountTypeId="ACCREC_UNAPPLIED" glResourceTypeId="MONEY" - accountName="ACCOUNTS RECEIVABLE - UNAPPLIED PAYMENTS" description=""/> - <GlAccount parentGlAccountId="120000" glAccountId="129000" accountCode="129000" glAccountClassId="CURRENT_ASSET" glAccountTypeId="CURRENT_ASSET" glResourceTypeId="MONEY" accountName="A/R MISCELLANEOUS" description=""/> @@ -336,9 +332,12 @@ under the License. glAccountClassId="CURRENT_LIABILITY" glAccountTypeId="INVENTORY_XFER_IN" glResourceTypeId="MONEY" accountName="PAYABLE FOR INVENTORY TRANSFERRED IN" description=""/> - <GlAccount parentGlAccountId="210000" glAccountId="216000" accountCode="216000" - glAccountClassId="CURRENT_LIABILITY" glAccountTypeId="ACCPAYABLE_UNAPPLIED" glResourceTypeId="MONEY" + <GlAccount parentGlAccountId="100000" glAccountId="216000" accountCode="216000" + glAccountClassId="CURRENT_ASSET" glAccountTypeId="ACCPAYABLE_UNAPPLIED" glResourceTypeId="MONEY" accountName="ACCOUNTS PAYABLE - UNAPPLIED PAYMENTS" description=""/> + <GlAccount parentGlAccountId="200000" glAccountId="126000" accountCode="126000" + glAccountClassId="CURRENT_LIABILITY" glAccountTypeId="ACCREC_UNAPPLIED" glResourceTypeId="MONEY" + accountName="ACCOUNTS RECEIVABLE - UNAPPLIED PAYMENTS" description=""/> <GlAccount parentGlAccountId="200000" glAccountId="220000" accountCode="220000" glAccountClassId="CURRENT_LIABILITY" glAccountTypeId="CURRENT_LIABILITY" glResourceTypeId="MONEY" |
Free forum by Nabble | Edit this page |