Author: jleroux
Date: Fri Jul 25 01:52:50 2008
New Revision: 679710
URL: http://svn.apache.org/viewvc?rev=679710&view=rev
Log:
Applied fix from trunk for revision: 679704
Modified:
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
Modified:
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl?rev=679710&r1=679709&r2=679710&view=diff
==============================================================================
---
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
(original)
+++
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
Fri Jul 25 01:52:50 2008
@@ -80,7 +80,7 @@
<#if
postalAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b>
${postalAddress.attnName}<br/></#if>
${postalAddress.address1}<br/>
<#if
postalAddress.address2?has_content>${postalAddress.address2}<br/></#if>
- ${postalAddress.city}<#if
postalAddress.stateProvinceGeoId?has_content>,
${postalAddress.stateProvinceGeoId} </#if>
+ ${postalAddress.city?if_exists}<#if
postalAddress.stateProvinceGeoId?has_content>,
${postalAddress.stateProvinceGeoId} </#if>
${postalAddress.postalCode?if_exists}<br/>
${postalAddress.countryGeoId?if_exists}<br/>
<#if !postalAddress.countryGeoId?exists ||
postalAddress.countryGeoId == "USA">
