svn commit: r815898 - in /ofbiz/trunk/applications/party: script/org/ofbiz/party/party/PartyServices.xml servicedef/services.xml

[doogie-3]

Author: doogie
Date: Wed Sep 16 17:26:00 2009
New Revision: 815898

URL: http://svn.apache.org/viewvc?rev=815898&view=rev
Log:
Apply patch from OFBIZ-2949, so that getPartyTelephone returns
contactMechId.

Modified:
    ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
    ofbiz/trunk/applications/party/servicedef/services.xml

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=815898&r1=815897&r2=815898&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Wed Sep 16 17:26:00 2009
@@ -731,6 +731,7 @@
                     <if-empty field="found">
                         <if-compare-field field="telephone.contactMechPurposeTypeId" to-field="type" operator="equals">
                             <set field="found" value="notImportant"/>
+                            <field-to-result field="telephone.contactMechId" result-name="contactMechId"/>
                             <if-not-empty field="telephone.countryCode">
                                 <field-to-result field="telephone.countryCode" result-name="countryCode"/>
                             </if-not-empty>
@@ -752,6 +753,7 @@
                 <find-by-and entity-name="PartyAndContactMech" map="findMap" list="telephoneAll1"/>
                 <filter-list-by-date list="telephoneAll1" to-list="telephoneAll2"/>
                 <first-from-list entry="telephone" list="telephoneAll2"/>
+                <field-to-result field="telephone.contactMechId" result-name="contactMechId"/>                
                 <if-not-empty field="telephone.tnCountryCode">
                     <field-to-result field="telephone.tnCountryCode" result-name="countryCode"/>
                 </if-not-empty>

Modified: ofbiz/trunk/applications/party/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/servicedef/services.xml?rev=815898&r1=815897&r2=815898&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/party/servicedef/services.xml Wed Sep 16 17:26:00 2009
@@ -980,6 +980,7 @@
     <service name="getPartyTelephone" engine="simple"
         location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="getPartyTelephone" auth="false">
         <description>Get the party Email Telephone</description>
+        <attribute name="contactMechId" type="String" mode="OUT" optional="true"/>
         <attribute name="partyId" type="String" mode="IN" optional="false"/>
         <attribute name="contactMechPurposeTypeId" type="String" mode="INOUT" optional="true"/>
         <attribute name="countryCode" type="String" mode="OUT" optional="true"/>