You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2016/06/04 08:40:26 UTC
svn commit: r1746785 -
/ofbiz/trunk/applications/accounting/template/period/EditCustomTimePeriod.ftl
Author: ashish
Date: Sat Jun 4 08:40:25 2016
New Revision: 1746785
URL: http://svn.apache.org/viewvc?rev=1746785&view=rev
Log:
Applied patch from jira issue - OFBIZ-7156 - Free marker template error on Edit Custom Time Periods for Child Periods.
Thanks Ravi for the contribution.
Modified:
ofbiz/trunk/applications/accounting/template/period/EditCustomTimePeriod.ftl
Modified: ofbiz/trunk/applications/accounting/template/period/EditCustomTimePeriod.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/template/period/EditCustomTimePeriod.ftl?rev=1746785&r1=1746784&r2=1746785&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/template/period/EditCustomTimePeriod.ftl (original)
+++ ofbiz/trunk/applications/accounting/template/period/EditCustomTimePeriod.ftl Sat Jun 4 08:40:25 2016
@@ -108,7 +108,7 @@ under the License.
<td><input type="text" size='10' name="periodName" value="${currentCustomTimePeriod.periodName!}" /></td>
<td>
<#assign hasntStarted = false>
- <#assign compareDate = currentCustomTimePeriod.getDate("fromDate")>
+ <#assign compareDate = currentCustomTimePeriod.getTimestamp("fromDate")>
<#if compareDate?has_content>
<#if nowTimestamp.before(compareDate)><#assign hasntStarted = true></#if>
</#if>
@@ -116,7 +116,7 @@ under the License.
</td>
<td>
<#assign hasExpired = false>
- <#assign compareDate = currentCustomTimePeriod.getDate("thruDate")>
+ <#assign compareDate = currentCustomTimePeriod.getTimestamp("thruDate")>
<#if compareDate?has_content>
<#if nowTimestamp.after(compareDate)><#assign hasExpired = true></#if>
</#if>
@@ -200,7 +200,7 @@ under the License.
<td><input type="text" size='10' name="periodName" value="${customTimePeriod.periodName!}" /></td>
<td>
<#assign hasntStarted = false>
- <#assign compareDate = customTimePeriod.getDate("fromDate")>
+ <#assign compareDate = customTimePeriod.getTimestamp("fromDate")>
<#if compareDate?has_content>
<#if nowTimestamp.before(compareDate)><#assign hasntStarted = true></#if>
</#if>
@@ -208,7 +208,7 @@ under the License.
</td>
<td>
<#assign hasExpired = false>
- <#assign compareDate = customTimePeriod.getDate("thruDate")>
+ <#assign compareDate = customTimePeriod.getTimestamp("thruDate")>
<#if compareDate?has_content>
<#if nowTimestamp.after(compareDate)><#assign hasExpired = true></#if>
</#if>