svn commit: r554252 - in /ofbiz/branches/release4.0/applications/party: entitydef/entitymodel.xml src/org/ofbiz/party/communication/CommunicationEventServices.java

Author: jleroux
Date: Sat Jul  7 13:15:34 2007
New Revision: 554252

URL: http://svn.apache.org/viewvc?view=rev&rev=554252
Log:
Applied fix from trunk for revision: 554250

Modified:
    ofbiz/branches/release4.0/applications/party/entitydef/entitymodel.xml
    ofbiz/branches/release4.0/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java

Modified: ofbiz/branches/release4.0/applications/party/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/party/entitydef/entitymodel.xml?view=diff&rev=554252&r1=554251&r2=554252
==============================================================================
--- ofbiz/branches/release4.0/applications/party/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release4.0/applications/party/entitydef/entitymodel.xml Sat Jul  7 13:15:34 2007
@@ -1206,9 +1206,15 @@
         package-name="org.ofbiz.party.contact">
         <member-entity entity-alias="CLP" entity-name="ContactListParty"/>
         <member-entity entity-alias="CM" entity-name="ContactMech"/>
+        <member-entity entity-alias="PCM" entity-name="PartyContactMech"/>        
         <alias-all entity-alias="CLP"/>
         <alias-all entity-alias="CM"/>
+        <alias entity-alias="PCM" name="contactFromDate" field="fromDate"/>
+        <alias entity-alias="PCM" name="contactThruDate" field="thruDate"/>
         <view-link entity-alias="CLP" rel-entity-alias="CM">
+            <key-map field-name="preferredContactMechId" rel-field-name="contactMechId"/>
+        </view-link>
+        <view-link entity-alias="CLP" rel-entity-alias="PCM">
             <key-map field-name="preferredContactMechId" rel-field-name="contactMechId"/>
         </view-link>
         <relation type="one-nofk" rel-entity-name="ContactListParty">

Modified: ofbiz/branches/release4.0/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java?view=diff&rev=554252&r1=554251&r2=554252
==============================================================================
--- ofbiz/branches/release4.0/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java (original)
+++ ofbiz/branches/release4.0/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java Sat Jul  7 13:15:34 2007
@@ -168,7 +168,7 @@
                         new EntityExpr("contactListId", EntityOperator.EQUALS, contactList.get("contactListId")),
                         new EntityExpr("statusId", EntityOperator.EQUALS, "CLPT_ACCEPTED"),
                         new EntityExpr("preferredContactMechId", EntityOperator.NOT_EQUAL, null),
-                        EntityUtil.getFilterByDateExpr()
+                        EntityUtil.getFilterByDateExpr(), EntityUtil.getFilterByDateExpr("contactFromDate", "contactThruDate")
                         );
             EntityConditionList conditions = new EntityConditionList(conditionList, EntityOperator.AND);
             List fieldsToSelect = UtilMisc.toList("infoString");