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

[jonesde@svn.ofbiz.org]

Author: jonesde
Date: 2006-02-06 04:37:11 -0600 (Mon, 06 Feb 2006)
New Revision: 6687

Modified:
   trunk/applications/order/entitydef/entitymodel.xml
Log:
Fixed some issues in entity defs, like conflicting field aliases in view entities and one unnecessary many relationship; for those who created these please take note on what is done and why these warnings should be addressed

Modified: trunk/applications/order/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/order/entitydef/entitymodel.xml	2006-02-06 10:32:46 UTC (rev 6686)
+++ trunk/applications/order/entitydef/entitymodel.xml	2006-02-06 10:37:11 UTC (rev 6687)
@@ -1994,17 +1994,11 @@
         <field name="orderAdjustmentId" type="id"></field>
         <field name="statusId" type="id"></field>
         <field name="expectedItemStatus" type="id"></field>
-        <field name="returnQuantity" type="floating-point">
-            <description>promised by the customer</description>
-        </field>
-        <field name="receivedQuantity" type="floating-point">
-            <description>actually received from the customer</description>
-        </field>
+        <field name="returnQuantity" type="floating-point"><description>promised by the customer</description></field>
+        <field name="receivedQuantity" type="floating-point"><description>actually received from the customer</description></field>
         <field name="returnPrice" type="currency-amount"></field>
         <field name="returnItemResponseId" type="id"></field>
-        <field name="sourcePercentage" type="floating-point">
-            <description> for tax entries this is the tax percentage </description>
-        </field>
+        <field name="sourcePercentage" type="floating-point"><description>for tax entries this is the tax percentage</description></field>
         <field name="primaryGeoId" type="id">
             <description>for tax entries this is the primary jurisdiction Geo (the smallest or most local Geo that this tax is for, usually a state/province, perhaps a county or a city)</description>
         </field>
@@ -2018,7 +2012,6 @@
         <field name="parentItemSeqId" type="id">
             <description>used to track the return item for which the sales tax is recorded</description>
         </field>
-
         <prim-key field="returnId"/>
         <prim-key field="returnItemSeqId"/>
         <relation type="one" fk-name="RTN_ITEM_RTN" rel-entity-name="ReturnHeader">
@@ -2077,10 +2070,6 @@
             <key-map field-name="returnId"/>
             <key-map field-name="parentItemSeqId" rel-field-name="returnItemSeqId"/>
         </relation>
-        <relation type="many" fk-name="RTN_ITEM_CHD" title="Child" rel-entity-name="ReturnItem">
-            <key-map field-name="returnId"/>
-            <key-map field-name="returnItemSeqId"  rel-field-name="parentItemSeqId"/>
-        </relation>
     </entity>
     <entity entity-name="ReturnItemResponse"
             package-name="org.ofbiz.order.return"