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 14:18:21 UTC
svn commit: r1618349 -
/ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
Author: apatel
Date: Sat Aug 16 12:18:20 2014
New Revision: 1618349
URL: http://svn.apache.org/r1618349
Log:
[OFBIZ-5655] Check not null before accessing the variable. Thanks Pierre Smits for reporting and ofbiz.us 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=1618349&r1=1618348&r2=1618349&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl Sat Aug 16 12:18:20 2014
@@ -78,7 +78,7 @@ under the License.
<option value='${allCustomTimePeriod.customTimePeriodId}'<#if isDefault> selected="selected"</#if>>
${allCustomTimePeriod.organizationPartyId}
<#if allPeriodType??>${allPeriodType.description}:</#if>
- ${allCustomTimePeriod.periodNum}
+ ${allCustomTimePeriod.periodNum!}
[${allCustomTimePeriod.customTimePeriodId}]
</option>
</#list>
@@ -178,7 +178,7 @@ under the License.
<option value='${allCustomTimePeriod.customTimePeriodId}'<#if isDefault> selected="selected"</#if>>
${allCustomTimePeriod.organizationPartyId}
<#if allPeriodType??> ${allPeriodType.description}: </#if>
- ${allCustomTimePeriod.periodNum}
+ ${allCustomTimePeriod.periodNum!}
[${allCustomTimePeriod.customTimePeriodId}]
</option>
</#list>
@@ -259,7 +259,7 @@ under the License.
${allCustomTimePeriod.organizationPartyId}
<#if (allCustomTimePeriod.parentPeriodId)??>Par:${allCustomTimePeriod.parentPeriodId}</#if>
<#if allPeriodType??> ${allPeriodType.description}:</#if>
- ${allCustomTimePeriod.periodNum}
+ ${allCustomTimePeriod.periodNum!}
[${allCustomTimePeriod.customTimePeriodId}]
</option>
</#list>