svn commit: r680160 - /ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml

[hansbak-2]

Author: hansbak
Date: Sun Jul 27 10:52:08 2008
New Revision: 680160

URL: http://svn.apache.org/viewvc?rev=680160&view=rev
Log:
make the email address optional to allocate a party to an incoming email

Modified:
    ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=680160&r1=680159&r2=680160&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Sun Jul 27 10:52:08 2008
@@ -276,11 +276,11 @@
             <add-error><fail-message message="Communication Event ID: ${parameters.commnicationEventId} not found"/></add-error>
         </if-empty>
 
-        <if-empty field="parameters.emailAddress">
-            <add-error><fail-message message="Email address is required"/></add-error>
-        </if-empty>
-
         <if-empty field="parameters.partyId">
+            <if-empty field="parameters.emailAddress">
+                <add-error><fail-message message="Email address is required"/></add-error>
+            </if-empty>
+
         <if-empty field="parameters.lastName">
             <add-error><fail-message message="Please enter a lastName"/></add-error>
         </if-empty>
@@ -301,18 +301,24 @@
             </call-service>
         </if-empty>
 
-        <!-- allocate email to the party -->        
-        <entity-one entity-name="Party" value-name="party"/>
-        <if-empty field="party">
-            <add-error><fail-message message="Party ID: ${parameters.partyId} not found"/></add-error>
-            <check-errors/>
-        </if-empty>
-        <set field="newEmail.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
-        <set field="newEmail.partyId" from-field="parameters.partyId"/>
-        <set field="newEmail.emailAddress" from-field="parameters.emailAddress"/>
-        <call-service service-name="createPartyEmailAddress" in-map-name="newEmail">
-            <result-to-field result-name="contactMechId" field-name="inCom.contactMechIdFrom"/>
-        </call-service>
+        <!-- allocate email to the party -->
+     <if-not-empty field="parameters.emailAddress">
+        <entity-one entity-name="Party" value-name="party" />
+    <if-empty field="party">
+    <add-error>
+    <fail-message message="Party ID: ${parameters.partyId} not found" />
+    </add-error>
+    <check-errors />
+    </if-empty>
+    <set field="newEmail.contactMechPurposeTypeId" value="PRIMARY_EMAIL" />
+    <set field="newEmail.partyId" from-field="parameters.partyId" />
+    <set field="newEmail.emailAddress" from-field="parameters.emailAddress" />
+    <call-service service-name="createPartyEmailAddress"
+    in-map-name="newEmail">
+ <result-to-field result-name="contactMechId"
+ field-name="inCom.contactMechIdFrom" />
+    </call-service>
+    </if-not-empty>
 
         <!-- update the communication event -->
         <set field="inCom.communicationEventId" from-field="parameters.communicationEventId"/>