Author: arunpatidar
Date: Wed Jun 1 13:32:33 2016
New Revision: 1746461
URL: http://svn.apache.org/viewvc?rev=1746461&view=rev
Log:
Applied fix from trunk for revision: 1746459
===
[OFBIZ-7147] Fixed invoiceType data. Added new InvoiceType 'INVOICE' and set it
as parent type for SALES_INVOICE, PURCHASE_INVOICE and TEMPLATE.
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/applications/accounting/data/AccountingTypeData.xml
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 1 13:32:33 2016
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,1746422
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,1746422,
1746459
Modified:
ofbiz/branches/release15.12/applications/accounting/data/AccountingTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/data/AccountingTypeData.xml?rev=1746461&r1=1746460&r2=1746461&view=diff
==============================================================================
---
ofbiz/branches/release15.12/applications/accounting/data/AccountingTypeData.xml
(original)
+++
ofbiz/branches/release15.12/applications/accounting/data/AccountingTypeData.xml
Wed Jun 1 13:32:33 2016
@@ -531,13 +531,14 @@ under the License.
<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="INVOICE_ADJ"/>
- <InvoiceType description="Purchase Invoice" hasTable="N"
invoiceTypeId="PURCHASE_INVOICE" parentTypeId="PURCHASE_INVOICE"/>
- <InvoiceType description="Sales Invoice" hasTable="N"
invoiceTypeId="SALES_INVOICE" parentTypeId="SALES_INVOICE"/>
+ <InvoiceType description="Invoice" hasTable="N" invoiceTypeId="INVOICE"/>
+ <InvoiceType description="Purchase Invoice" hasTable="N"
invoiceTypeId="PURCHASE_INVOICE" parentTypeId="INVOICE"/>
+ <InvoiceType description="Sales Invoice" hasTable="N"
invoiceTypeId="SALES_INVOICE" parentTypeId="INVOICE"/>
<InvoiceType description="Customer Return" hasTable="N"
invoiceTypeId="CUST_RTN_INVOICE" parentTypeId="PURCHASE_INVOICE"/>
<InvoiceType description="Purchase Return" hasTable="N"
invoiceTypeId="PURC_RTN_INVOICE" parentTypeId="SALES_INVOICE"/>
<InvoiceType description="Commission" hasTable="N"
invoiceTypeId="COMMISSION_INVOICE" parentTypeId="PURCHASE_INVOICE"/>
<InvoiceType description="Interest" hasTable="N"
invoiceTypeId="INTEREST_INVOICE" parentTypeId="SALES_INVOICE"/>
- <InvoiceType description="Invoice Template" hasTable="N"
invoiceTypeId="TEMPLATE"/>
+ <InvoiceType description="Invoice Template" hasTable="N"
invoiceTypeId="TEMPLATE" parentTypeId="INVOICE"/>
<InvoiceType description="Sales Invoice Template" hasTable="N"
invoiceTypeId="SALES_INV_TEMPLATE" parentTypeId="TEMPLATE"/>
<InvoiceType description="Purchase Invoice Template" hasTable="N"
invoiceTypeId="PUR_INV_TEMPLATE" parentTypeId="TEMPLATE"/>
