Author: ashish
Date: Sat Jul 16 13:21:45 2016
New Revision: 1752958
URL: http://svn.apache.org/viewvc?rev=1752958&view=rev
Log:
Applied patch from trunk r1752955.
==========================================
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/branches/release15.12/applications/marketing/webapp/sfa/WEB-INF/action/MergeContacts.groovy
Modified:
ofbiz/branches/release15.12/applications/marketing/webapp/sfa/WEB-INF/action/MergeContacts.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/marketing/webapp/sfa/WEB-INF/action/MergeContacts.groovy?rev=1752958&r1=1752957&r2=1752958&view=diff
==============================================================================
---
ofbiz/branches/release15.12/applications/marketing/webapp/sfa/WEB-INF/action/MergeContacts.groovy
(original)
+++
ofbiz/branches/release15.12/applications/marketing/webapp/sfa/WEB-INF/action/MergeContacts.groovy
Sat Jul 16 13:21:45 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();
