svn commit: r565721 - in /ofbiz/trunk/applications/product/entitydef: entitygroup.xml entitymodel.xml entitymodel_shipment.xml

[jonesde]

Author: jonesde
Date: Tue Aug 14 04:58:46 2007
New Revision: 565721

URL: http://svn.apache.org/viewvc?view=rev&rev=565721
Log:
Added view entity for ItemIssuanceAndInventoryItem, also a couple of cleanups

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

Modified: ofbiz/trunk/applications/product/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitygroup.xml?view=diff&rev=565721&r1=565720&r2=565721
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitygroup.xml Tue Aug 14 04:58:46 2007
@@ -278,6 +278,7 @@
   <!-- ========================================================= -->
 
     <entity-group group="org.ofbiz" entity="ItemIssuance" />
+    <entity-group group="org.ofbiz" entity="ItemIssuanceAndInventoryItem" />
     <entity-group group="org.ofbiz" entity="ItemIssuanceRole" />
 
   <!-- ========================================================= -->

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?view=diff&rev=565721&r1=565720&r2=565721
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Tue Aug 14 04:58:46 2007
@@ -1187,8 +1187,12 @@
       <member-entity entity-alias="II" entity-name="InventoryItem"/>
       <member-entity entity-alias="PR" entity-name="Product"/>
       <member-entity entity-alias="FL" entity-name="FacilityLocation"/>
-      <alias-all entity-alias="II"/>
-      <alias-all entity-alias="PR"/>
+      <alias-all entity-alias="II">
+        <exclude field="comments"/>
+      </alias-all>
+      <alias-all entity-alias="PR">
+        <exclude field="facilityId"/>
+      </alias-all>
       <alias-all entity-alias="FL"/>
       <view-link entity-alias="II" rel-entity-alias="FL" rel-optional="true">
         <key-map field-name="facilityId"/>

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml?view=diff&rev=565721&r1=565720&r2=565721
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml Tue Aug 14 04:58:46 2007
@@ -91,6 +91,15 @@
         <key-map field-name="issuedByUserLoginId" rel-field-name="userLoginId"/>
       </relation>
     </entity>
+    <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="IITM"/>
+        <view-link entity-alias="IISS" rel-entity-alias="IITM">
+        <key-map field-name="inventoryItemId"/>
+        </view-link>
+    </view-entity>
     <entity entity-name="ItemIssuanceRole"
             package-name="org.ofbiz.shipment.issuance"
             title="Item Issuance Role Entity">