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

[jonesde]

Author: jonesde
Date: Mon Aug 20 12:11:12 2007
New Revision: 567788

URL: http://svn.apache.org/viewvc?rev=567788&view=rev
Log:
Added InventoryItemAndDetail entity with full fields from both

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

Modified: ofbiz/trunk/applications/product/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitygroup.xml?rev=567788&r1=567787&r2=567788&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitygroup.xml Mon Aug 20 12:11:12 2007
@@ -103,6 +103,7 @@
     <entity-group group="org.ofbiz" entity="InventoryItem" />
     <entity-group group="org.ofbiz" entity="InventoryItemAndLocation" />
     <entity-group group="org.ofbiz" entity="InventoryItemAttribute" />
+    <entity-group group="org.ofbiz" entity="InventoryItemAndDetail" />
     <entity-group group="org.ofbiz" entity="InventoryItemDetail" />
     <entity-group group="org.ofbiz" entity="InventoryItemDetailSummary" />
     <entity-group group="org.ofbiz" entity="InventoryItemDetailForSum" />

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=567788&r1=567787&r2=567788&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Mon Aug 20 12:11:12 2007
@@ -1229,6 +1229,15 @@
         <key-map field-name="attrName"/>
       </relation>
     </entity>
+    <view-entity entity-name="InventoryItemAndDetail" package-name="org.ofbiz.product.inventory">
+        <member-entity entity-alias="II" entity-name="InventoryItem"/>
+        <member-entity entity-alias="IID" entity-name="InventoryItemDetail"/>
+        <alias-all entity-alias="II"/>
+        <alias-all entity-alias="IID"/>
+        <view-link entity-alias="II" rel-entity-alias="IID">
+            <key-map field-name="inventoryItemId"/>
+        </view-link>
+    </view-entity>
     <entity entity-name="InventoryItemDetail"
             package-name="org.ofbiz.product.inventory"
             title="Inventory Item Detail Entity">