Author: sharan
Date: Tue Feb 17 14:48:00 2015
New Revision: 1660395
URL: http://svn.apache.org/r1660395
Log:
Applied fix from trunk for revision: 1660389
===
Applied patch from Anahita for OFBIZ-5641
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/applications/accounting/data/DemoGlSetupData.xml
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 17 14:48:00 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-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1660031,1660053
+/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,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1660031,1660053,1660389
Modified:
ofbiz/branches/release14.12/applications/accounting/data/DemoGlSetupData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/data/DemoGlSetupData.xml?rev=1660395&r1=1660394&r2=1660395&view=diff
==============================================================================
---
ofbiz/branches/release14.12/applications/accounting/data/DemoGlSetupData.xml
(original)
+++
ofbiz/branches/release14.12/applications/accounting/data/DemoGlSetupData.xml
Tue Feb 17 14:48:00 2015
@@ -81,12 +81,12 @@ under the License.
<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_PROD_ITEM"
defaultGlAccountId="214000"/>
+ <InvoiceItemType invoiceItemTypeId="PINV_FPROD_ITEM"
defaultGlAccountId="214000"/>
+ <InvoiceItemType invoiceItemTypeId="PINV_DPROD_ITEM"
defaultGlAccountId="500000"/>
+ <InvoiceItemType invoiceItemTypeId="PINV_FDPROD_ITEM"
defaultGlAccountId="214000"/>
+ <InvoiceItemType invoiceItemTypeId="PINV_PROD_FEATR_ITEM"
defaultGlAccountId="214000"/>
+ <InvoiceItemType invoiceItemTypeId="PINV_SPROD_ITEM"
defaultGlAccountId="500000"/>
<InvoiceItemType invoiceItemTypeId="PINV_INVPRD_ITEM"
defaultGlAccountId="650000"/>
<InvoiceItemType invoiceItemTypeId="PINV_SUPLPRD_ITEM"
defaultGlAccountId="650000"/>
