svn commit: r641640 - in /ofbiz/trunk/applications: content/entitydef/entitymodel.xml order/entitydef/entitygroup.xml order/entitydef/entitymodel.xml product/entitydef/entitymodel.xml

[jonesde]

Author: jonesde
Date: Wed Mar 26 16:27:48 2008
New Revision: 641640

URL: http://svn.apache.org/viewvc?rev=641640&view=rev
Log:
Some data model cleanups/fixes

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

Modified: ofbiz/trunk/applications/content/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/entitydef/entitymodel.xml?rev=641640&r1=641639&r2=641640&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/content/entitydef/entitymodel.xml Wed Mar 26 16:27:48 2008
@@ -763,7 +763,9 @@
       <field name="localeString" type="very-short"></field>
       <field name="mimeTypeId" type="id-long"></field>      
       <field name="characterSetId" type="id-long"></field>
-      <field name="objectInfo" type="long-varchar"><description>For Short Text the text goes here. For Survey or SurveyResponse the Id goes here.</description></field>
+      <field name="objectInfo" type="long-varchar"><description>For Short Text the text goes here.</description></field>
+      <field name="surveyId" type="id"></field>
+      <field name="surveyResponseId" type="id"></field>
       <field name="relatedDetailId" type="id"><description>Depending on the dataResourceTypeId this can point to other entities, like: Survey, SurveyResponse, etc.</description></field>
       <field name="isPublic" type="indicator"><description>If this is set to Y then anyone can download it, otherwise the download is restricted.</description></field>
       <field name="createdDate" type="date-time"></field>
@@ -802,11 +804,11 @@
       <relation type="one" fk-name="DATA_REC_LMB_ULGN" title="LastModifiedBy" rel-entity-name="UserLogin">
         <key-map field-name="lastModifiedByUserLogin" rel-field-name="userLoginId"/>
       </relation>
-        <relation type="one-nofk" rel-entity-name="Survey">
-            <key-map field-name="objectInfo" rel-field-name="surveyId"/>
+        <relation type="one" rel-entity-name="Survey">
+            <key-map field-name="surveyId"/>
         </relation>
-        <relation type="one-nofk" rel-entity-name="SurveyResponse">
-            <key-map field-name="objectInfo" rel-field-name="surveyResponseId"/>
+        <relation type="one" rel-entity-name="SurveyResponse">
+            <key-map field-name="surveyResponseId"/>
         </relation>
     </entity>
     <entity entity-name="DataResourceAttribute"

Modified: ofbiz/trunk/applications/order/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitygroup.xml?rev=641640&r1=641639&r2=641640&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitygroup.xml Wed Mar 26 16:27:48 2008
@@ -204,7 +204,7 @@
     <entity-group group="org.ofbiz" entity="SalesOpportunityStage" />
     <entity-group group="org.ofbiz" entity="SalesOpportunityWorkEffort" />
     <entity-group group="org.ofbiz" entity="SalesOpportunityQuote" />
-    <entity-group group="org.ofbiz" entity="SalesOpportunityTrackingCode" />
+    <entity-group group="org.ofbiz" entity="SalesOpportunityTrckCode" />
     <entity-group group="org.ofbiz" entity="SalesForecast" />
     <entity-group group="org.ofbiz" entity="SalesForecastHistory" />
     <entity-group group="org.ofbiz" entity="SalesForecastAndCustomTimePeriod" />

Modified: ofbiz/trunk/applications/order/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel.xml?rev=641640&r1=641639&r2=641640&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel.xml Wed Mar 26 16:27:48 2008
@@ -1617,7 +1617,7 @@
       <relation type="one" fk-name="CUST_REQ_FRMPTY" title="From" rel-entity-name="Party">
         <key-map field-name="fromPartyId" rel-field-name="partyId"/>
       </relation>
-      <relation type="one" fk-name="CUST_REQ_AUOM" rel-entity-name="Uom">
+      <relation type="one" fk-name="CUST_REQ_AUOM" title="MaximumAmount" rel-entity-name="Uom">
         <key-map field-name="maximumAmountUomId" rel-field-name="uomId"/>
       </relation>
       <relation type="one" fk-name="CUST_REQ_PRDS" rel-entity-name="ProductStore">
@@ -1632,7 +1632,7 @@
       <relation type="one" fk-name="CUST_REQ_FULCM" title="Fulfill" rel-entity-name="ContactMech">
           <key-map field-name="fulfillContactMechId" rel-field-name="contactMechId"/>
       </relation>
-      <relation type="one" fk-name="CUST_REQ_CUOM" rel-entity-name="Uom">
+      <relation type="one" fk-name="CUST_REQ_CUOM" title="Currency" rel-entity-name="Uom">
         <key-map field-name="currencyUomId" rel-field-name="uomId"/>
       </relation>
     </entity>
@@ -2900,7 +2900,7 @@
             <key-map field-name="salesOpportunityId"/>
         </relation>
     </entity>
-    <entity entity-name="SalesOpportunityTrackingCode"
+    <entity entity-name="SalesOpportunityTrckCode"
             package-name="org.ofbiz.order.opportunity"
             title="Sales opportunity traking code">
         <field name="salesOpportunityId" type="id-ne"></field>    
@@ -2912,5 +2912,4 @@
             <key-map field-name="salesOpportunityId"/>
         </relation>
     </entity>
-
 </entitymodel>

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=641640&r1=641639&r2=641640&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Wed Mar 26 16:27:48 2008
@@ -1671,7 +1671,9 @@
         <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"/>
+        <alias-all entity-alias="IID">
+            <exclude field="unitCost"/>
+        </alias-all>
         <view-link entity-alias="II" rel-entity-alias="IID">
             <key-map field-name="inventoryItemId"/>
         </view-link>