svn commit: r1856592 - in /ofbiz/ofbiz-framework/trunk/applications/datamodel: data/seed/OrderSeedData.xml entitydef/order-entitymodel.xml

[surajk]

Author: surajk
Date: Sat Mar 30 04:39:13 2019
New Revision: 1856592

URL: http://svn.apache.org/viewvc?rev=1856592&view=rev
Log:
Improved: Extended ReturnType entity with parentTypeId and hasTable fields to make it consistent with other type entities.
(OFBIZ-10868)

Modified:
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/OrderSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/OrderSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/OrderSeedData.xml?rev=1856592&r1=1856591&r2=1856592&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/OrderSeedData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/OrderSeedData.xml Sat Mar 30 04:39:13 2019
@@ -361,15 +361,15 @@ under the License.
     <ReturnReason sequenceId="06" returnReasonId="RTN_SIZE_EXCHANGE" description="Size Exchange"/>
     <ReturnReason sequenceId="07" returnReasonId="RTN_NORMAL_RETURN" description="Normal Return"/>
     <!-- Return Types -->
-    <ReturnType sequenceId="01" returnTypeId="RTN_CREDIT" description="Store Credit"/>
-    <ReturnType sequenceId="02" returnTypeId="RTN_REFUND" description="Refund"/>
-    <ReturnType sequenceId="03" returnTypeId="RTN_REPLACE" description="Wait Replacement"/>
-    <ReturnType sequenceId="04" returnTypeId="RTN_CSREPLACE" description="Cross-Ship Replacement"/>
-    <ReturnType sequenceId="05" returnTypeId="RTN_REPAIR_REPLACE" description="Repair Replacement"/>
-    <ReturnType sequenceId="06" returnTypeId="RTN_WAIT_REPLACE_RES" description="Wait Replacement Reserved"/>
-    <ReturnType sequenceId="07" returnTypeId="RTN_REPLACE_IMMEDIAT" description="Replace Immediately"/>
-    <ReturnType sequenceId="08" returnTypeId="RTN_REFUND_IMMEDIATE" description="Refund immediately"/>
-    <ReturnType sequenceId="09" returnTypeId="RTN_RENTAL" description="Rental"/>
+    <ReturnType sequenceId="01" returnTypeId="RTN_CREDIT" description="Store Credit" hasTable="N"/>
+    <ReturnType sequenceId="02" returnTypeId="RTN_REFUND" description="Refund" hasTable="N"/>
+    <ReturnType sequenceId="03" returnTypeId="RTN_REPLACE" description="Wait Replacement" hasTable="N"/>
+    <ReturnType sequenceId="04" returnTypeId="RTN_CSREPLACE" description="Cross-Ship Replacement" hasTable="N"/>
+    <ReturnType sequenceId="05" returnTypeId="RTN_REPAIR_REPLACE" description="Repair Replacement" hasTable="N"/>
+    <ReturnType sequenceId="06" returnTypeId="RTN_WAIT_REPLACE_RES" description="Wait Replacement Reserved" hasTable="N"/>
+    <ReturnType sequenceId="07" returnTypeId="RTN_REPLACE_IMMEDIAT" description="Replace Immediately" hasTable="N"/>
+    <ReturnType sequenceId="08" returnTypeId="RTN_REFUND_IMMEDIATE" description="Refund immediately" hasTable="N"/>
+    <ReturnType sequenceId="09" returnTypeId="RTN_RENTAL" description="Rental" hasTable="N"/>
 
     <WorkReqFulfType description="Implements" workReqFulfTypeId="WRF_IMPLEMENTS"/>
     <WorkReqFulfType description="Fixes" workReqFulfTypeId="WRF_FIXES"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml?rev=1856592&r1=1856591&r2=1856592&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/order-entitymodel.xml Sat Mar 30 04:39:13 2019
@@ -2705,6 +2705,8 @@ under the License.
             default-resource-name="OrderEntityLabels"
             title="Return Type">
         <field name="returnTypeId" type="id"></field>
+        <field name="parentTypeId" type="id"></field>
+        <field name="hasTable" type="indicator"></field>
         <field name="description" type="description"></field>
         <field name="sequenceId" type="id"></field>
         <prim-key field="returnTypeId"/>