You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2014/08/16 15:50:30 UTC
svn commit: r1618358 -
/ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
Author: apatel
Date: Sat Aug 16 13:50:30 2014
New Revision: 1618358
URL: http://svn.apache.org/r1618358
Log:
[OFBIZ-5654] Applying patch from the ticket. Thanks Pierre Smits for reporting and ofbiz.us team for fix.
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl?rev=1618358&r1=1618357&r2=1618358&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl Sat Aug 16 13:50:30 2014
@@ -160,9 +160,7 @@ under the License.
<#assign periodType = customTimePeriod.getRelatedOne("PeriodType", true)>
<tr>
<form method="post" action='<@o...@ofbizUrl>' name='lineForm${line}'>
- <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId!}" />
- <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId!}" />
- <input type="hidden" name="customTimePeriodId" value="${customTimePeriodId!}" />
+ <input type="hidden" name="customTimePeriodId" value="${customTimePeriod.customTimePeriodId!}" />
<td>${customTimePeriod.customTimePeriodId}</td>
<td>
<select name="parentPeriodId">
@@ -206,7 +204,7 @@ under the License.
<#if compareDate?has_content>
<#if nowTimestamp.before(compareDate)><#assign hasntStarted = true></#if>
</#if>
- <input type="text" size='13' name="fromDate" value="${customTimePeriod.fromDate!}"<#if hasntStarted> class="alert"</#if> />
+ <input type="text" size='13' name="fromDate" value="${customTimePeriod.fromDate?string("yyyy-MM-dd")}"<#if hasntStarted> class="alert"</#if> />
</td>
<td>
<#assign hasExpired = false>
@@ -214,7 +212,7 @@ under the License.
<#if compareDate?has_content>
<#if nowTimestamp.after(compareDate)><#assign hasExpired = true></#if>
</#if>
- <input type="text" size='13' name="thruDate" value="${customTimePeriod.thruDate!}"<#if hasExpired> class="alert"</#if> />
+ <input type="text" size='13' name="thruDate" value="${customTimePeriod.thruDate?string("yyyy-MM-dd")}"<#if hasExpired> class="alert"</#if> />
</td>
<td class="button-col">
<input type="submit" value='${uiLabelMap.CommonUpdate}'/>