svn commit: r1621363 - /ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl

[adrianc]

Author: adrianc
Date: Fri Aug 29 18:59:02 2014
New Revision: 1621363

URL: http://svn.apache.org/r1621363
Log:
Fix broken contact mechanism screenlet.

Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl?rev=1621363&r1=1621362&r2=1621363&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl Fri Aug 29 18:59:02 2014
@@ -24,9 +24,14 @@ under the License.
     ${postalAddress.city!},
     <#if postalAddress.stateProvinceGeoId?has_content>
       <#assign stateProvince = postalAddress.getRelatedOne("StateProvinceGeo", true)>
-      ${stateProvince.abbreviation?default(stateProvince.geoId)}
+      ${stateProvince.abbreviation?default(stateProvince.geoName)}
+    </#if>
+    <#if postalAddress.postalCodeGeoId?has_content>
+      <#assign postalCodeGeo = postalAddress.getRelatedOne("PostalCodeGeo", true)>
+      ${postalCodeGeo.geoName}
+    <#else>
+      ${postalAddress.postalCode!}
     </#if>
-    ${postalAddress.postalCode!}
     <#if postalAddress.countryGeoId?has_content><br />
       <#assign country = postalAddress.getRelatedOne("CountryGeo", true)>
       ${country.get("geoName", locale)?default(country.geoId)}