Author: adrianc
Date: Tue Jan 21 21:35:27 2014
New Revision: 1560204
URL:
http://svn.apache.org/r1560204Log:
Merged revision(s) 1560203 from ofbiz/trunk:
Fixed a FreeMarker exception.
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/product/webapp/facility/facility/EditContactMech.ftl
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1560203
Modified: ofbiz/branches/release13.07/applications/product/webapp/facility/facility/EditContactMech.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/facility/facility/EditContactMech.ftl?rev=1560204&r1=1560203&r2=1560204&view=diff==============================================================================
--- ofbiz/branches/release13.07/applications/product/webapp/facility/facility/EditContactMech.ftl (original)
+++ ofbiz/branches/release13.07/applications/product/webapp/facility/facility/EditContactMech.ftl Tue Jan 21 21:35:27 2014
@@ -19,7 +19,7 @@ under the License.
<#if !mechMap.facilityContactMech?exists && mechMap.contactMech?exists>
<p><h3>${uiLabelMap.PartyContactInfoNotBelongToYou}.</h3></p>
- <a href="<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>" class="buttontext">${uiLabelMapCommon.Back}</a>
+ <a href="<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a>
<#else>
<#if !mechMap.contactMech?exists>
<#-- When creating a new contact mech, first select the type, then actually create -->