svn commit: r778279 - in /ofbiz/branches/release09.04: ./ applications/party/script/org/ofbiz/party/party/PartyServices.xml

[hansbak-2]

Author: hansbak
Date: Mon May 25 05:02:09 2009
New Revision: 778279

URL: http://svn.apache.org/viewvc?rev=778279&view=rev
Log:
mergefrom trunk 778278: get party email problem corrected

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/party/script/org/ofbiz/party/party/PartyServices.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 25 05:02:09 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777947
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777947,778278

Modified: ofbiz/branches/release09.04/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=778279&r1=778278&r2=778279&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/branches/release09.04/applications/party/script/org/ofbiz/party/party/PartyServices.xml Mon May 25 05:02:09 2009
@@ -659,10 +659,12 @@
 
     <simple-method method-name="getPartyEmail" short-description="Get the email of the party">
         <!-- first try to find primary email Address when not found get other email -->
-        <entity-and entity-name="PartyContactMechPurpose" list="emailAddresses" filter-by-date="true">
+        <entity-and entity-name="PartyContactWithPurpose" list="emailAddressesPurposes">
             <field-map field-name="partyId" from-field="parameters.partyId"/>
             <field-map field-name="contactMechPurposeTypeId" from-field="PRIMARY_EMAIL"/>
         </entity-and>
+        <filter-list-by-date list="emailAddressesPurposes" to-list="emailAddressesPurposes1" from-field-name="purposeFromDate" thru-field-name="purposeThruDate"/>
+        <filter-list-by-date list="emailAddressesPurposes1" to-list="emailAddresses" from-field-name="contactFromDate" thru-field-name="contactThruDate"/>
         <!-- any other email -->
         <if-empty field="emailAddresses">
             <entity-and entity-name="PartyAndContactMech" list="emailAddresses" filter-by-date="true">