You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/01/11 19:41:53 UTC
svn commit: r1650949 - in /ofbiz/trunk/applications:
accounting/config/AccountingEntityLabels.xml
accounting/data/AccountingTypeData.xml accounting/data/DemoGlSetupData.xml
order/data/OrderTypeData.xml
Author: jleroux
Date: Sun Jan 11 18:41:53 2015
New Revision: 1650949
URL: http://svn.apache.org/r1650949
Log:
A patch from Bob Morley for "Data seeding to support ability to return products of type RAW_MATERIAL" https://issues.apache.org/jira/browse/OFBIZ-3669
This patch contains data seeding that supports the ability to have return items that contain products of type RAW_MATERIAL. This allows an enterprise to return raw materials back to suppliers as well as customers returning them (if the enterprise sells raw materials to customers). There is no code in this patch, just the data model wiring to map the raw material product types to the proper return types / accounting types.
Modified:
ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml
ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml
ofbiz/trunk/applications/order/data/OrderTypeData.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml?rev=1650949&r1=1650948&r2=1650949&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml Sun Jan 11 18:41:53 2015
@@ -2515,6 +2515,9 @@
<value xml:lang="zh">éè´§çå¶æå/æ°å产åæç»</value>
<value xml:lang="zh-TW">é貨ç製æå/æ¸åç¢åç´°é
</value>
</property>
+ <property key="InvoiceItemType.description.CRT_RPROD_ITEM">
+ <value xml:lang="en">Return Raw Material Good Item</value>
+ </property>
<property key="InvoiceItemType.description.CRT_FEE_ADJ">
<value xml:lang="de">Retourengebühr</value>
<value xml:lang="en">Return Fee</value>
@@ -4163,6 +4166,9 @@
<value xml:lang="zh">æå/æ°åååéè´§</value>
<value xml:lang="zh-TW">æå/æ¸åååé貨</value>
</property>
+ <property key="InvoiceItemType.description.SRT_RPROD_ITEM">
+ <value xml:lang="en">Return Raw Material Good Item</value>
+ </property>
<property key="InvoiceItemType.description.SRT_FEE_ADJ">
<value xml:lang="de">Retourengebühr</value>
<value xml:lang="en">Return Fee</value>
Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=1650949&r1=1650948&r2=1650949&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Sun Jan 11 18:41:53 2015
@@ -477,6 +477,7 @@ under the License.
<InvoiceItemType description="Return Finished Good Item" hasTable="N" invoiceItemTypeId="CRT_FPROD_ITEM" parentTypeId="CRT_PROD_ITEM"/>
<InvoiceItemType description="Return Digital Good Item" hasTable="N" invoiceItemTypeId="CRT_DPROD_ITEM" parentTypeId="CRT_PROD_ITEM"/>
<InvoiceItemType description="Return Finished/Digital Good Item" hasTable="N" invoiceItemTypeId="CRT_FDPROD_ITEM" parentTypeId="CRT_PROD_ITEM"/>
+ <InvoiceItemType description="Return Raw Material Good Item" hasTable="N" invoiceItemTypeId="CRT_RPROD_ITEM" parentTypeId="CRT_PROD_ITEM"/>
<InvoiceItemType description="Return Product-Feature Item" hasTable="N" invoiceItemTypeId="CRT_PROD_FEATR_ITEM" parentTypeId="CRT_PROD_ITEM"/>
<InvoiceItemType description="Return Service Product Item" hasTable="N" invoiceItemTypeId="CRT_SPROD_ITEM" parentTypeId="CRT_PROD_ITEM"/>
@@ -503,6 +504,7 @@ under the License.
<InvoiceItemType description="Return Finished Good Item" hasTable="N" invoiceItemTypeId="SRT_FPROD_ITEM" parentTypeId="SRT_PROD_ITEM"/>
<InvoiceItemType description="Return Digital Good Item" hasTable="N" invoiceItemTypeId="SRT_DPROD_ITEM" parentTypeId="SRT_PROD_ITEM"/>
<InvoiceItemType description="Return Finished/Digital Good Item" hasTable="N" invoiceItemTypeId="SRT_FDPROD_ITEM" parentTypeId="SRT_PROD_ITEM"/>
+ <InvoiceItemType description="Return Raw Material Good Item" hasTable="N" invoiceItemTypeId="SRT_RPROD_ITEM" parentTypeId="SRT_PROD_ITEM"/>
<InvoiceItemType description="Return Product-Feature Item" hasTable="N" invoiceItemTypeId="SRT_PROD_FEATR_ITEM" parentTypeId="SRT_PROD_ITEM"/>
<InvoiceItemType description="Return Service Product Item" hasTable="N" invoiceItemTypeId="SRT_SPROD_ITEM" parentTypeId="SRT_PROD_ITEM"/>
@@ -585,6 +587,7 @@ under the License.
<InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_FPROD_ITEM" invoiceItemTypeId="CRT_FPROD_ITEM"/>
<InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_DPROD_ITEM" invoiceItemTypeId="CRT_DPROD_ITEM"/>
<InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_FDPROD_ITEM" invoiceItemTypeId="CRT_FDPROD_ITEM"/>
+ <InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_RPROD_ITEM" invoiceItemTypeId="CRT_RPROD_ITEM"/>
<InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_PROMOTION_ADJ" invoiceItemTypeId="CRT_PROMOTION_ADJ"/>
<InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_REPLACE_ADJ" invoiceItemTypeId="CRT_REPLACE_ADJ"/>
<InvoiceItemTypeMap invoiceTypeId="CUST_RTN_INVOICE" invoiceItemMapKey="RET_DISCOUNT_ADJ" invoiceItemTypeId="CRT_DISCOUNT_ADJ"/>
@@ -603,6 +606,7 @@ under the License.
<InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_FPROD_ITEM" invoiceItemTypeId="SRT_FPROD_ITEM"/>
<InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_DPROD_ITEM" invoiceItemTypeId="SRT_DPROD_ITEM"/>
<InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_FDPROD_ITEM" invoiceItemTypeId="SRT_FDPROD_ITEM"/>
+ <InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_RPROD_ITEM" invoiceItemTypeId="SRT_RPROD_ITEM"/>
<InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_PROMOTION_ADJ" invoiceItemTypeId="SRT_PROMOTION_ADJ"/>
<InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_REPLACE_ADJ" invoiceItemTypeId="SRT_REPLACE_ADJ"/>
<InvoiceItemTypeMap invoiceTypeId="PURC_RTN_INVOICE" invoiceItemMapKey="RET_DISCOUNT_ADJ" invoiceItemTypeId="SRT_DISCOUNT_ADJ"/>
Modified: ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml?rev=1650949&r1=1650948&r2=1650949&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml Sun Jan 11 18:41:53 2015
@@ -100,6 +100,7 @@ under the License.
<InvoiceItemType invoiceItemTypeId="CRT_FPROD_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_DPROD_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_FDPROD_ITEM" defaultGlAccountId="421000"/>
+ <InvoiceItemType invoiceItemTypeId="CRT_RPROD_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_PROD_FEATR_ITEM" defaultGlAccountId="421000"/>
<InvoiceItemType invoiceItemTypeId="CRT_SPROD_ITEM" defaultGlAccountId="421000"/>
@@ -124,6 +125,7 @@ under the License.
<InvoiceItemType invoiceItemTypeId="SRT_FPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_DPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_FDPROD_ITEM" defaultGlAccountId="401000"/>
+ <InvoiceItemType invoiceItemTypeId="SRT_RPROD_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_PROD_FEATR_ITEM" defaultGlAccountId="401000"/>
<InvoiceItemType invoiceItemTypeId="SRT_SPROD_ITEM" defaultGlAccountId="401000"/>
Modified: ofbiz/trunk/applications/order/data/OrderTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderTypeData.xml?rev=1650949&r1=1650948&r2=1650949&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/data/OrderTypeData.xml (original)
+++ ofbiz/trunk/applications/order/data/OrderTypeData.xml Sun Jan 11 18:41:53 2015
@@ -296,6 +296,7 @@ under the License.
<ReturnItemType description="Return Finished Good Item" returnItemTypeId="RET_FPROD_ITEM" parentTypeId="RET_PROD_ITEM"/>
<ReturnItemType description="Return Digital Good Item" returnItemTypeId="RET_DPROD_ITEM" parentTypeId="RET_PROD_ITEM"/>
<ReturnItemType description="Return Finished/Digital Good Item" returnItemTypeId="RET_FDPROD_ITEM" parentTypeId="RET_PROD_ITEM"/>
+ <ReturnItemType description="Return Raw Material Good Item" returnItemTypeId="RET_RPROD_ITEM" parentTypeId="RET_PROD_ITEM"/>
<ReturnItemType description="Return Product-Feature Item" returnItemTypeId="RET_PROD_FEATR_ITEM" parentTypeId="RET_PROD_ITEM"/>
<ReturnItemType description="Return Service Product Item" returnItemTypeId="RET_SPROD_ITEM" parentTypeId="RET_PROD_ITEM"/>
@@ -312,6 +313,7 @@ under the License.
<ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN" returnItemMapKey="AGGREGATED_CONF" returnItemTypeId="RET_FPROD_ITEM"/>
<ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN" returnItemMapKey="DIGITAL_GOOD" returnItemTypeId="RET_DPROD_ITEM"/>
<ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN" returnItemMapKey="FINDIG_GOOD" returnItemTypeId="RET_FDPROD_ITEM"/>
+ <ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN" returnItemMapKey="RAW_MATERIAL" returnItemTypeId="RET_RPROD_ITEM"/>
<ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN" returnItemMapKey="PROMOTION_ADJUSTMENT" returnItemTypeId="RET_PROMOTION_ADJ"/>
<ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN" returnItemMapKey="REPLACE_ADJUSTMENT" returnItemTypeId="RET_REPLACE_ADJ"/>
<ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN" returnItemMapKey="DISCOUNT_ADJUSTMENT" returnItemTypeId="RET_DISCOUNT_ADJ"/>
@@ -334,6 +336,7 @@ under the License.
<ReturnItemTypeMap returnHeaderTypeId="VENDOR_RETURN" returnItemMapKey="AGGREGATED_CONF" returnItemTypeId="RET_FPROD_ITEM"/>
<ReturnItemTypeMap returnHeaderTypeId="VENDOR_RETURN" returnItemMapKey="DIGITAL_GOOD" returnItemTypeId="RET_DPROD_ITEM"/>
<ReturnItemTypeMap returnHeaderTypeId="VENDOR_RETURN" returnItemMapKey="FINDIG_GOOD" returnItemTypeId="RET_FDPROD_ITEM"/>
+ <ReturnItemTypeMap returnHeaderTypeId="VENDOR_RETURN" returnItemMapKey="RAW_MATERIAL" returnItemTypeId="RET_RPROD_ITEM"/>
<ReturnItemTypeMap returnHeaderTypeId="VENDOR_RETURN" returnItemMapKey="PROMOTION_ADJUSTMENT" returnItemTypeId="RET_PROMOTION_ADJ"/>
<ReturnItemTypeMap returnHeaderTypeId="VENDOR_RETURN" returnItemMapKey="REPLACE_ADJUSTMENT" returnItemTypeId="RET_REPLACE_ADJ"/>
<ReturnItemTypeMap returnHeaderTypeId="VENDOR_RETURN" returnItemMapKey="DISCOUNT_ADJUSTMENT" returnItemTypeId="RET_DISCOUNT_ADJ"/>