Author: sharan
Date: Wed Dec 30 03:10:46 2015
New Revision: 1722265
URL: http://svn.apache.org/viewvc?rev=1722265&view=rev
Log:
Remove mergefromtrunk update for SERVICE PRODUCT Invoice Lineas already defined
Modified:
ofbiz/branches/release13.07/applications/accounting/data/AccountingTypeData.xml
Modified:
ofbiz/branches/release13.07/applications/accounting/data/AccountingTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/accounting/data/AccountingTypeData.xml?rev=1722265&r1=1722264&r2=1722265&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/accounting/data/AccountingTypeData.xml
(original)
+++
ofbiz/branches/release13.07/applications/accounting/data/AccountingTypeData.xml
Wed Dec 30 03:10:46 2015
@@ -543,7 +543,6 @@ under the License.
<!-- maps line items such as order items to invoice item types. separate
mapping for sales and purchase invoices -->
<InvoiceItemTypeMap invoiceTypeId="SALES_INVOICE"
invoiceItemMapKey="FINISHED_GOOD" invoiceItemTypeId="INV_FPROD_ITEM"/>
<InvoiceItemTypeMap invoiceTypeId="SALES_INVOICE"
invoiceItemMapKey="SERVICE_PRODUCT" invoiceItemTypeId="INV_SPROD_ITEM"/>
- <InvoiceItemTypeMap invoiceTypeId="SALES_INVOICE"
invoiceItemMapKey="SERVICE" invoiceItemTypeId="INV_SPROD_ITEM"/>
<InvoiceItemTypeMap invoiceTypeId="SALES_INVOICE"
invoiceItemMapKey="DIGITAL_GOOD" invoiceItemTypeId="INV_DPROD_ITEM"/>
<InvoiceItemTypeMap invoiceTypeId="SALES_INVOICE"
invoiceItemMapKey="FINDIG_GOOD" invoiceItemTypeId="INV_FDPROD_ITEM"/>
<InvoiceItemTypeMap invoiceTypeId="SALES_INVOICE"
invoiceItemMapKey="PROMOTION_ADJUSTMENT" invoiceItemTypeId="ITM_PROMOTION_ADJ"/>
