svn commit: r1710178 - in /ofbiz/trunk: applications/accounting/entitydef/entitymodel.xml specialpurpose/assetmaint/entitydef/entitymodel.xml

[Deepak Dixit-5]

Author: deepak
Date: Fri Oct 23 11:35:34 2015
New Revision: 1710178

URL: http://svn.apache.org/viewvc?rev=1710178&view=rev
Log:
(OFBIZ-6687) Moved FixedAssetMaintWorkEffort view entity from specialpurpose/assetmaint to accounting.

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

Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=1710178&r1=1710177&r2=1710178&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Fri Oct 23 11:35:34 2015
@@ -1134,6 +1134,23 @@ under the License.
     <field name="description" type="description"></field>
     <prim-key field="accommodationMapTypeId"/>
   </entity>
+    <view-entity entity-name="FixedAssetMaintWorkEffort" package-name="org.ofbiz.accounting.fixedasset"
+        title="FixedAssetMaint and WorkEffort View Entity">
+        <member-entity entity-alias="FA" entity-name="FixedAsset"/>
+        <member-entity entity-alias="FAM" entity-name="FixedAssetMaint"/>
+        <member-entity entity-alias="WE" entity-name="WorkEffort"/>
+        <alias-all entity-alias="FA"/>
+        <alias-all entity-alias="FAM"/>
+        <alias-all entity-alias="WE">
+            <exclude field="fixedAssetId"/>
+        </alias-all>
+        <view-link entity-alias="FAM" rel-entity-alias="FA">
+            <key-map field-name="fixedAssetId"/>
+        </view-link>
+        <view-link entity-alias="FAM" rel-entity-alias="WE">
+            <key-map field-name="scheduleWorkEffortId" rel-field-name="workEffortId"/>
+        </view-link>
+    </view-entity>
 
   <!-- ========================================================= -->
   <!-- org.ofbiz.accounting.invoice -->

Modified: ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml?rev=1710178&r1=1710177&r2=1710178&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml Fri Oct 23 11:35:34 2015
@@ -38,23 +38,6 @@
             <key-map field-name="fixedAssetId"/>
         </view-link>
     </view-entity>
-    <view-entity entity-name="FixedAssetMaintWorkEffort" package-name="org.ofbiz.specialpurpose.assetmaint"
-        title="FixedAssetMaint and WorkEffort View Entity">
-        <member-entity entity-alias="FA" entity-name="FixedAsset"/>
-        <member-entity entity-alias="FAM" entity-name="FixedAssetMaint"/>
-        <member-entity entity-alias="WE" entity-name="WorkEffort"/>
-        <alias-all entity-alias="FA"/>
-        <alias-all entity-alias="FAM"/>
-        <alias-all entity-alias="WE">
-            <exclude field="fixedAssetId"/>
-        </alias-all>
-        <view-link entity-alias="FAM" rel-entity-alias="FA">
-            <key-map field-name="fixedAssetId"/>
-        </view-link>
-        <view-link entity-alias="FAM" rel-entity-alias="WE">
-            <key-map field-name="scheduleWorkEffortId" rel-field-name="workEffortId"/>
-        </view-link>
-    </view-entity>
     <view-entity entity-name="FixedAssetMaintWorkEffortAndPartyAssignment"
         package-name="org.ofbiz.specialpurpose.assetmaint"
         title="View of FixedAssetMaint and WorkEffort and WorkEffortPartyAssignment">