svn commit: r1806279 - in /ofbiz/ofbiz-framework/trunk/applications: datamodel/data/seed/WorkEffortSeedData.xml workeffort/data/WorkEffortTypeData.xml

[rishi]

Author: rishi
Date: Sat Aug 26 09:27:33 2017
New Revision: 1806279

URL: http://svn.apache.org/viewvc?rev=1806279&view=rev
Log:
Improvement: Move all data in applications to the datamodel component. (OFBIZ-9501)
Move parent type to data model component and childs back to workeffort as it seems to be related to project plugin. This will fix the issue of data loading.
Thanks Aditya Sharma for reporting the problem.

Modified:
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/WorkEffortSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortTypeData.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/WorkEffortSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/WorkEffortSeedData.xml?rev=1806279&r1=1806278&r2=1806279&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/WorkEffortSeedData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/WorkEffortSeedData.xml Sat Aug 26 09:27:33 2017
@@ -54,12 +54,7 @@ under the License.
     <WorkEffortType description="Production Run Header" hasTable="N" parentTypeId="" workEffortTypeId="PROD_ORDER_HEADER"/>
     <WorkEffortType description="Production Run Task" hasTable="N" parentTypeId="" workEffortTypeId="PROD_ORDER_TASK"/>
     <WorkEffortType description="Fixed Asset Usage (rental)" hasTable="N" parentTypeId="" workEffortTypeId="ASSET_USAGE"/>
-
-    <WorkEffortType description="Business Travel" hasTable="N" parentTypeId="EVENT" workEffortTypeId="BUSINESS_TRAVEL"/>
-    <WorkEffortType description="Meeting" hasTable="N" parentTypeId="EVENT" workEffortTypeId="MEETING"/>
-    <WorkEffortType description="Training" hasTable="N" parentTypeId="EVENT" workEffortTypeId="TRAINING"/>
-    <WorkEffortType description="Personal Time Off" hasTable="N" parentTypeId="EVENT" workEffortTypeId="PERSONAL_TIMEOFF"/>
-    <WorkEffortType description="Publish Properties" hasTable="N" workEffortTypeId="PUBLISH_PROPS"/>
+    <WorkEffortType description="Event" hasTable="N" parentTypeId="" workEffortTypeId="EVENT"/>
 
     <WorkEffortType description="Inbound Shipment" hasTable="N" parentTypeId="EVENT" workEffortTypeId="SHIPMENT_INBOUND"/>
     <WorkEffortType description="Outbound Shipment" hasTable="N" parentTypeId="EVENT" workEffortTypeId="SHIPMENT_OUTBOUND"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortTypeData.xml?rev=1806279&r1=1806278&r2=1806279&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortTypeData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortTypeData.xml Sat Aug 26 09:27:33 2017
@@ -139,12 +139,17 @@ under the License.
     <WorkEffortType description="Workflow Activity" hasTable="N" parentTypeId="" workEffortTypeId="ACTIVITY"/>
     <WorkEffortType description="Task" hasTable="N" parentTypeId="" workEffortTypeId="TASK"/>
     <WorkEffortType description="Milestone" hasTable="N" parentTypeId="" workEffortTypeId="MILESTONE"/>
-    <WorkEffortType description="Event" hasTable="N" parentTypeId="" workEffortTypeId="EVENT"/>
     <WorkEffortType description="Available" hasTable="N" parentTypeId="" workEffortTypeId="AVAILABLE"/>
     <WorkEffortType description="Program" hasTable="N" parentTypeId="" workEffortTypeId="PROGRAM"/>
     <WorkEffortType description="Project" hasTable="N" parentTypeId="" workEffortTypeId="PROJECT"/>
     <WorkEffortType description="Project Phase" hasTable="N" parentTypeId="" workEffortTypeId="PHASE"/>
 
+    <WorkEffortType description="Business Travel" hasTable="N" parentTypeId="EVENT" workEffortTypeId="BUSINESS_TRAVEL"/>
+    <WorkEffortType description="Meeting" hasTable="N" parentTypeId="EVENT" workEffortTypeId="MEETING"/>
+    <WorkEffortType description="Training" hasTable="N" parentTypeId="EVENT" workEffortTypeId="TRAINING"/>
+    <WorkEffortType description="Personal Time Off" hasTable="N" parentTypeId="EVENT" workEffortTypeId="PERSONAL_TIMEOFF"/>
+    <WorkEffortType description="Publish Properties" hasTable="N" workEffortTypeId="PUBLISH_PROPS"/>
+
     <!-- Routing status, (workEffort Template) -->
     <StatusType description="Manufacturing Task and Routing status" hasTable="N" parentTypeId="WORK_EFFORT_STATUS" statusTypeId="ROUTING_STATUS"/>