[OFBiz] SVN: r7736 - in trunk/applications: order/entitydef party/entitydef product/entitydef

[jacopo@svn.ofbiz.org]

Author: jacopo
Date: 2006-06-03 08:34:27 -0500 (Sat, 03 Jun 2006)
New Revision: 7736

Modified:
   trunk/applications/order/entitydef/entitygroup.xml
   trunk/applications/order/entitydef/entitymodel_view.xml
   trunk/applications/party/entitydef/entitygroup.xml
   trunk/applications/party/entitydef/entitymodel.xml
   trunk/applications/product/entitydef/entitygroup.xml
   trunk/applications/product/entitydef/entitymodel.xml
Log:
Moved CommunicationEventAndOrder and CommunicationEventAndProduct view definitions from the party to the order and product components.

Modified: trunk/applications/order/entitydef/entitygroup.xml
===================================================================
--- trunk/applications/order/entitydef/entitygroup.xml	2006-06-02 18:33:10 UTC (rev 7735)
+++ trunk/applications/order/entitydef/entitygroup.xml	2006-06-03 13:34:27 UTC (rev 7736)
@@ -30,8 +30,9 @@
 
 	
     <entity-group group="org.ofbiz" entity="CommunicationEventOrder" />
+    <entity-group group="org.ofbiz" entity="CommunicationEventAndOrder" />
 
-	<entity-group group="org.ofbiz" entity="OldOrderItemInventoryRes" />
+    <entity-group group="org.ofbiz" entity="OldOrderItemInventoryRes" />
     <entity-group group="org.ofbiz" entity="OldOrderShipmentPreference" />
     <entity-group group="org.ofbiz" entity="OrderAdjustment" />
     <entity-group group="org.ofbiz" entity="OrderAdjustmentAttribute" />

Modified: trunk/applications/order/entitydef/entitymodel_view.xml
===================================================================
--- trunk/applications/order/entitydef/entitymodel_view.xml	2006-06-02 18:33:10 UTC (rev 7735)
+++ trunk/applications/order/entitydef/entitymodel_view.xml	2006-06-03 13:34:27 UTC (rev 7736)
@@ -1259,6 +1259,17 @@
         <key-map field-name="customTimePeriodId"/>
       </view-link>
     </view-entity>
+    <view-entity entity-name="CommunicationEventAndOrder"
+                 package-name="org.ofbiz.order.communication"
+                 title="Communication Event And Order View Entity">
+      <member-entity entity-alias="CO" entity-name="CommunicationEventOrder"/>
+      <member-entity entity-alias="CE" entity-name="CommunicationEvent"/>
+      <alias-all entity-alias="CO"/>
+      <alias-all entity-alias="CE"/>
+      <view-link entity-alias="CO" rel-entity-alias="CE">
+        <key-map field-name="communicationEventId"/>
+      </view-link>
+    </view-entity>
 
 </entitymodel>
 

Modified: trunk/applications/party/entitydef/entitygroup.xml
===================================================================
--- trunk/applications/party/entitydef/entitygroup.xml	2006-06-02 18:33:10 UTC (rev 7735)
+++ trunk/applications/party/entitydef/entitygroup.xml	2006-06-03 13:34:27 UTC (rev 7736)
@@ -61,8 +61,6 @@
     <entity-group group="org.ofbiz" entity="CommunicationEventRole" />
     <entity-group group="org.ofbiz" entity="CommunicationEventType" />
     <entity-group group="org.ofbiz" entity="CommunicationEventAndRole" />
-    <entity-group group="org.ofbiz" entity="CommunicationEventAndProduct" />
-    <entity-group group="org.ofbiz" entity="CommunicationEventAndOrder" />
 
   <!-- ========================================================= -->
   <!-- org.ofbiz.party.contact -->

Modified: trunk/applications/party/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/party/entitydef/entitymodel.xml	2006-06-02 18:33:10 UTC (rev 7735)
+++ trunk/applications/party/entitydef/entitymodel.xml	2006-06-03 13:34:27 UTC (rev 7736)
@@ -680,28 +680,6 @@
         <key-map field-name="parentTypeId" rel-field-name="communicationEventTypeId"/>
       </relation>
     </entity>
-    <view-entity entity-name="CommunicationEventAndProduct"
-                 package-name="org.ofbiz.party.communication"
-                 title="Communication Event And Product View Entity">
-      <member-entity entity-alias="CP" entity-name="CommunicationEventProduct"/>
-      <member-entity entity-alias="CE" entity-name="CommunicationEvent"/>
-      <alias-all entity-alias="CP"/>
-      <alias-all entity-alias="CE"/>
-      <view-link entity-alias="CP" rel-entity-alias="CE">
-        <key-map field-name="communicationEventId"/>
-      </view-link>
-    </view-entity>
-    <view-entity entity-name="CommunicationEventAndOrder"
-                 package-name="org.ofbiz.party.communication"
-                 title="Communication Event And Order View Entity">
-      <member-entity entity-alias="CO" entity-name="CommunicationEventOrder"/>
-      <member-entity entity-alias="CE" entity-name="CommunicationEvent"/>
-      <alias-all entity-alias="CO"/>
-      <alias-all entity-alias="CE"/>
-      <view-link entity-alias="CO" rel-entity-alias="CE">
-        <key-map field-name="communicationEventId"/>
-      </view-link>
-    </view-entity>
 
   <!-- ========================================================= -->
   <!-- org.ofbiz.party.contact -->

Modified: trunk/applications/product/entitydef/entitygroup.xml
===================================================================
--- trunk/applications/product/entitydef/entitygroup.xml	2006-06-02 18:33:10 UTC (rev 7735)
+++ trunk/applications/product/entitydef/entitygroup.xml	2006-06-03 13:34:27 UTC (rev 7736)
@@ -147,6 +147,7 @@
   <!-- ========================================================= -->
 
     <entity-group group="org.ofbiz" entity="CommunicationEventProduct" />
+    <entity-group group="org.ofbiz" entity="CommunicationEventAndProduct" />
     <entity-group group="org.ofbiz" entity="GoodIdentification" />
     <entity-group group="org.ofbiz" entity="GoodIdentificationAndProduct" />
     <entity-group group="org.ofbiz" entity="GoodIdentificationType" />

Modified: trunk/applications/product/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/product/entitydef/entitymodel.xml	2006-06-02 18:33:10 UTC (rev 7735)
+++ trunk/applications/product/entitydef/entitymodel.xml	2006-06-03 13:34:27 UTC (rev 7736)
@@ -1703,6 +1703,17 @@
         <key-map field-name="communicationEventId"/>
       </relation>
     </entity>
+    <view-entity entity-name="CommunicationEventAndProduct"
+                 package-name="org.ofbiz.party.communication"
+                 title="Communication Event And Product View Entity">
+      <member-entity entity-alias="CP" entity-name="CommunicationEventProduct"/>
+      <member-entity entity-alias="CE" entity-name="CommunicationEvent"/>
+      <alias-all entity-alias="CP"/>
+      <alias-all entity-alias="CE"/>
+      <view-link entity-alias="CP" rel-entity-alias="CE">
+        <key-map field-name="communicationEventId"/>
+      </view-link>
+    </view-entity>
 
     <entity entity-name="GoodIdentification"
             package-name="org.ofbiz.product.product"