[OFBiz] SVN: r6935 - trunk/applications/order/entitydef

[sichen@svn.ofbiz.org]

Author: sichen
Date: 2006-03-06 20:31:39 -0600 (Mon, 06 Mar 2006)
New Revision: 6935

Modified:
   trunk/applications/order/entitydef/entitymodel.xml
Log:
Removed duplicate relationship from ReturnItem to ShipmentReceipt.  Also gave an FK-name to ReturnItem to OrderItemShipGrpInvRes relationship

Modified: trunk/applications/order/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/order/entitydef/entitymodel.xml	2006-03-07 02:29:27 UTC (rev 6934)
+++ trunk/applications/order/entitydef/entitymodel.xml	2006-03-07 02:31:39 UTC (rev 6935)
@@ -2138,11 +2138,7 @@
         <relation type="one" fk-name="RTN_ITEM_PROD" rel-entity-name="Product">
             <key-map field-name="productId"/>
         </relation>
-        <relation type="many" rel-entity-name="ShipmentReceipt">
-            <key-map field-name="returnId"/>
-            <key-map field-name="returnItemSeqId"/>
-        </relation>
-        <relation type="many" rel-entity-name="OrderItemShipGrpInvRes">
+        <relation type="many" fk-name="RTN_ITEM_OISGIR" rel-entity-name="OrderItemShipGrpInvRes">
             <key-map field-name="orderId"/>
             <key-map field-name="orderItemSeqId"/>
         </relation>