svn commit: r1752955 - /ofbiz/trunk/applications/marketing/groovyScripts/sfa/MergeContacts.groovy

[ashish]

Author: ashish
Date: Sat Jul 16 13:12:57 2016
New Revision: 1752955

URL: http://svn.apache.org/viewvc?rev=1752955&view=rev
Log:
Applied patch from jira issue - OFBIZ-7849 - Error occurred when we try to 
merge two contacts.
Thanks Ravi and Deepak for the contribution.

Modified:
    ofbiz/trunk/applications/marketing/groovyScripts/sfa/MergeContacts.groovy

Modified: 
ofbiz/trunk/applications/marketing/groovyScripts/sfa/MergeContacts.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/groovyScripts/sfa/MergeContacts.groovy?rev=1752955&r1=1752954&r2=1752955&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/groovyScripts/sfa/MergeContacts.groovy 
(original)
+++ ofbiz/trunk/applications/marketing/groovyScripts/sfa/MergeContacts.groovy 
Sat Jul 16 13:12:57 2016
@@ -42,7 +42,7 @@ if (partyIdFrom && partyIdTo) {
                 if (address2) {
                     contactDetailMap.address2 = address2;
                 }
-                geo = sfrom("Geo").where("geoId", 
postalAddress.stateProvinceGeoId).queryOne();
+                geo = from("Geo").where("geoId", 
postalAddress.stateProvinceGeoId).queryOne();
                 contactDetailMap.state = geo.geoName;
 
                 geo = from("Geo").where("geoId", 
postalAddress.countryGeoId).queryOne();