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

[sichen@svn.ofbiz.org]

Author: sichen
Date: 2006-02-21 19:39:03 -0600 (Tue, 21 Feb 2006)
New Revision: 6817

Modified:
   trunk/applications/order/entitydef/entitymodel.xml
   trunk/applications/order/entitydef/entitymodel_view.xml
Log:
Fixed SalesForecast and SalesForecastHistory relations issue. When organizationPartyId was added, no title was specified to distinguish it from the relation for internalPartyId. This commit contains titles for both, which resolves the issue. Also, excluded a field from the SalesForecastAndCustomTimePeriod view which was casusing a minor warning.

Modified: trunk/applications/order/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/order/entitydef/entitymodel.xml	2006-02-22 01:33:22 UTC (rev 6816)
+++ trunk/applications/order/entitydef/entitymodel.xml	2006-02-22 01:39:03 UTC (rev 6817)
@@ -2548,10 +2548,10 @@
         <relation type="one" fk-name="SALES4C_PARENT" title="Parent" rel-entity-name="SalesForecast">
             <key-map field-name="parentSalesForecastId" rel-field-name="salesForecastId"/>
         </relation>
-        <relation type="one" fk-name="SALES4C_ORG_PARTY" rel-entity-name="Party">
+        <relation type="one" fk-name="SALES4C_ORG_PARTY" title="Organization" rel-entity-name="Party">
             <key-map field-name="organizationPartyId" rel-field-name="partyId"/>
         </relation>
-        <relation type="one" fk-name="SALES4C_INT_PARTY" rel-entity-name="Party">
+        <relation type="one" fk-name="SALES4C_INT_PARTY" title="Internal" rel-entity-name="Party">
             <key-map field-name="internalPartyId" rel-field-name="partyId"/>
         </relation>
         <relation type="one" fk-name="SALES4C_TIME_PER" rel-entity-name="CustomTimePeriod">
@@ -2593,10 +2593,10 @@
         <relation type="one" fk-name="SALES4CH_SALES4C" rel-entity-name="SalesForecast">
             <key-map field-name="salesForecastId"/>
         </relation>
-        <relation type="one" fk-name="SALES4CH_ORG_PARTY" rel-entity-name="Party">
+        <relation type="one" fk-name="SALES4CH_ORG_PARTY" title="Organization" rel-entity-name="Party">
             <key-map field-name="organizationPartyId" rel-field-name="partyId"/>
         </relation>
-        <relation type="one" fk-name="SALES4CH_INT_PARTY" rel-entity-name="Party">
+        <relation type="one" fk-name="SALES4CH_INT_PARTY" title="Internal" rel-entity-name="Party">
             <key-map field-name="internalPartyId" rel-field-name="partyId"/>
         </relation>
         <relation type="one" fk-name="SALES4CH_TIME_PER" rel-entity-name="CustomTimePeriod">

Modified: trunk/applications/order/entitydef/entitymodel_view.xml
===================================================================
--- trunk/applications/order/entitydef/entitymodel_view.xml	2006-02-22 01:33:22 UTC (rev 6816)
+++ trunk/applications/order/entitydef/entitymodel_view.xml	2006-02-22 01:39:03 UTC (rev 6817)
@@ -1164,7 +1164,9 @@
       <member-entity entity-alias="SF" entity-name="SalesForecast"/>
       <member-entity entity-alias="CTP" entity-name="CustomTimePeriod"/>
       <alias-all entity-alias="SF"/>
-      <alias-all entity-alias="CTP"/>
+      <alias-all entity-alias="CTP">
+          <exclude field="organizationPartyId"/>
+      </alias-all>
       <view-link entity-alias="SF" rel-entity-alias="CTP">
         <key-map field-name="customTimePeriodId"/>
       </view-link>