svn commit: r1746790 - /ofbiz/branches/release14.12/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl

[ashish-18]

Author: ashish
Date: Sat Jun  4 08:51:11 2016
New Revision: 1746790

URL: http://svn.apache.org/viewvc?rev=1746790&view=rev
Log:
Applied bug fix from trunk revision - 1746785.
====================================================
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/branches/release14.12/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl

Modified: ofbiz/branches/release14.12/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl?rev=1746790&r1=1746789&r2=1746790&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl (original)
+++ ofbiz/branches/release14.12/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl Sat Jun  4 08:51:11 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>