svn commit: r1004527 - in /ofbiz/trunk: applications/workeffort/entitydef/entitymodel_view.xml specialpurpose/assetmaint/entitydef/entitymodel.xml

[hansbak-2]

Author: hansbak
Date: Tue Oct  5 05:36:03 2010
New Revision: 1004527

URL: http://svn.apache.org/viewvc?rev=1004527&view=rev
Log:
move the WorkEffortAndTimeEntry from asset maint to workeffort because can be used in other specialized components

Modified:
    ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml
    ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml

Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml?rev=1004527&r1=1004526&r2=1004527&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel_view.xml Tue Oct  5 05:36:03 2010
@@ -941,5 +941,19 @@ under the License.
           <key-map field-name="contactMechId"/>
       </view-link>
     </view-entity>
+    
+    <view-entity entity-name="WorkEffortAndTimeEntry" package-name="org.ofbiz.workeffort.workeffort"
+        title="WorkEffort and TimeEntry View Entity">
+        <member-entity entity-alias="WE" entity-name="WorkEffort"/>
+        <member-entity entity-alias="TE" entity-name="TimeEntry"/>
+        <alias-all entity-alias="WE"/>
+        <alias-all entity-alias="TE"/>
+        <view-link entity-alias="WE" rel-entity-alias="TE">
+            <key-map field-name="workEffortId"/>
+        </view-link>
+        <relation type="many" rel-entity-name="WorkEffortSkillStandard">
+            <key-map field-name="workEffortId"/>
+        </relation>
+    </view-entity>
 
 </entitymodel>

Modified: ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml?rev=1004527&r1=1004526&r2=1004527&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml Tue Oct  5 05:36:03 2010
@@ -55,19 +55,6 @@
             <key-map field-name="scheduleWorkEffortId" rel-field-name="workEffortId"/>
         </view-link>
     </view-entity>
-    <view-entity entity-name="WorkEffortAndTimeEntry" package-name="org.ofbiz.specialpurpose.assetmaint"
-        title="WorkEffort and TimeEntry View Entity">
-        <member-entity entity-alias="WE" entity-name="WorkEffort"/>
-        <member-entity entity-alias="TE" entity-name="TimeEntry"/>
-        <alias-all entity-alias="WE"/>
-        <alias-all entity-alias="TE"/>
-        <view-link entity-alias="WE" rel-entity-alias="TE">
-            <key-map field-name="workEffortId"/>
-        </view-link>
-        <relation type="many" rel-entity-name="WorkEffortSkillStandard">
-            <key-map field-name="workEffortId"/>
-        </relation>
-    </view-entity>
     <view-entity entity-name="FixedAssetMaintWorkEffortAndPartyAssignment"
         package-name="org.ofbiz.specialpurpose.assetmaint"
         title="View of FixedAssetMaint and WorkEffort and WorkEffortPartyAssignment">