svn commit: r1176145 - in /ofbiz/trunk: applications/product/entitydef/entitymodel.xml applications/product/entitydef/entitymodel_shipment.xml specialpurpose/assetmaint/entitydef/entitymodel.xml

[hansbak-2]

Author: hansbak
Date: Tue Sep 27 01:07:02 2011
New Revision: 1176145

URL: http://svn.apache.org/viewvc?rev=1176145&view=rev
Log:
comment from deepak, adding a fixedasset field in inventory item cause warning messages in other views: fixed

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

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=1176145&r1=1176144&r2=1176145&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Tue Sep 27 01:07:02 2011
@@ -1978,7 +1978,9 @@ under the License.
         <alias-all entity-alias="II"/>
         <alias-all entity-alias="IID">
             <exclude field="unitCost"/>
+            <exclude field="fixedAssetId"/>
         </alias-all>
+        <alias name="inventoryItemDetailFixedAssetId" field="fixedAssetId" entity-alias="IID"/>
         <view-link entity-alias="II" rel-entity-alias="IID">
             <key-map field-name="inventoryItemId"/>
         </view-link>

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml?rev=1176145&r1=1176144&r2=1176145&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml Tue Sep 27 01:07:02 2011
@@ -92,8 +92,11 @@ under the License.
     <view-entity entity-name="ItemIssuanceAndInventoryItem" package-name="org.ofbiz.shipment.issuance">
         <member-entity entity-alias="IISS" entity-name="ItemIssuance"/>
         <member-entity entity-alias="IITM" entity-name="InventoryItem"/>
-        <alias-all entity-alias="IISS"/>
+        <alias-all entity-alias="IISS">
+            <exclude field="fixedAssetId"/>
+        </alias-all>
         <alias-all entity-alias="IITM"/>
+        <alias name="inventoryItemDetailFixedAssetId" field="fixedAssetId" entity-alias="IISS"/>
         <view-link entity-alias="IISS" rel-entity-alias="IITM">
         <key-map field-name="inventoryItemId"/>
         </view-link>

Modified: ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml?rev=1176145&r1=1176144&r2=1176145&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml Tue Sep 27 01:07:02 2011
@@ -113,7 +113,9 @@
         <member-entity entity-alias="IMIE" entity-name="ItemIssuance"/>
         <member-entity entity-alias="IYIM" entity-name="InventoryItem"/>
         <member-entity entity-alias="PT" entity-name="Product"/>
-        <alias-all entity-alias="IMIE"/>
+        <alias-all entity-alias="IMIE">
+            <exclude field="fixedAssetId"/>
+        </alias-all>
         <alias-all entity-alias="IYIM">
             <exclude field="facilityId"/>
         </alias-all>
@@ -132,6 +134,7 @@
         <alias entity-alias="PT" name="isVariant"/>
         <alias entity-alias="PT" name="createdDate"/>
         <alias entity-alias="PT" name="createdByUserLogin"/>
+        <alias name="inventoryItemDetailFixedAssetId" field="fixedAssetId" entity-alias="IMIE"/>
         <view-link entity-alias="IMIE" rel-entity-alias="IYIM">
             <key-map field-name="inventoryItemId"/>
         </view-link>
@@ -151,7 +154,9 @@
         <member-entity entity-alias="PT" entity-name="Product"/>
         <member-entity entity-alias="IYIM" entity-name="InventoryItem"/>
         <member-entity entity-alias="IMIE" entity-name="ItemIssuance"/>
-        <alias-all entity-alias="IMIE"/>
+        <alias-all entity-alias="IMIE">
+            <exclude field="fixedAssetId"/>
+        </alias-all>
         <alias-all entity-alias="IYIM">
             <exclude field="facilityId"/>
         </alias-all>
@@ -170,6 +175,7 @@
         <alias entity-alias="PT" name="isVariant"/>
         <alias entity-alias="PT" name="createdDate"/>
         <alias entity-alias="PT" name="createdByUserLogin"/>
+        <alias name="inventoryItemDetailFixedAssetId" field="fixedAssetId" entity-alias="IMIE"/>
         <view-link entity-alias="PT" rel-entity-alias="IYIM">
             <key-map field-name="productId"/>
         </view-link>