svn commit: r1618336 [21/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/agreement/ accounting/webapp/accounting/common/ accounting/webapp/accounting/finaccounttrans/ accounting/webapp/accounting/invoice/ accounting/webapp/accounting/p...

[ashish-18]

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl Sat Aug 16 11:34:57 2014
@@ -22,7 +22,7 @@ under the License.
     <div class="screenlet">
       <div class="screenlet-title-bar">
         <ul>
-          <li class="h3">${uiLabelMap.ProductWeighPackageOnly}&nbsp;in&nbsp;${facility.facilityName?if_exists} [${(facility.facilityId)?if_exists}]</li>
+          <li class="h3">${uiLabelMap.ProductWeighPackageOnly}&nbsp;in&nbsp;${facility.facilityName!} [${(facility.facilityId)!}]</li>
         </ul>
         <br class="clear"/>
       </div>
@@ -32,7 +32,7 @@ under the License.
             ${uiLabelMap.CommonView} <a href="<@ofbizUrl>/PackingSlip.pdf?shipmentId=${shipmentId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductPackingSlip}</a> ${uiLabelMap.CommonOr}
             ${uiLabelMap.CommonView} <a href="<@ofbizUrl>/ShipmentBarCode.pdf?shipmentId=${shipmentId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductBarcode}</a> ${uiLabelMap.CommonFor} ${uiLabelMap.ProductShipmentId} <a href="<@ofbizUrl>/ViewShipment?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext">${shipmentId}</a>
           </div>
-          <#if invoiceIds?exists && invoiceIds?has_content>
+          <#if invoiceIds?? && invoiceIds?has_content>
             <div>
               <p>${uiLabelMap.AccountingInvoices}:</p>
               <ul>
@@ -46,15 +46,15 @@ under the License.
             </div>
           </#if>
         </#if>
-        <#if shipmentPackageRouteSegList?exists && shipmentPackageRouteSegList?has_content>
+        <#if shipmentPackageRouteSegList?? && shipmentPackageRouteSegList?has_content>
           <#list shipmentPackageRouteSegList as shipmentPackageRouteSeg>
             <form name="viewShipmentPackageRouteSegLabelImageForm_${shipmentPackageRouteSeg_index}" method="post" action="<@ofbizUrl>viewShipmentPackageRouteSegLabelImage</@ofbizUrl>">
-              <input type="hidden" name="shipmentId" value ="${(shipmentPackageRouteSeg.shipmentId)?if_exists}"/>
-              <input type="hidden" name ="shipmentPackageSeqId" value = "${(shipmentPackageRouteSeg.shipmentPackageSeqId)?if_exists}"/>
-              <input type="hidden" name="shipmentRouteSegmentId" value ="${(shipmentPackageRouteSeg.shipmentRouteSegmentId)?if_exists}"/>
+              <input type="hidden" name="shipmentId" value ="${(shipmentPackageRouteSeg.shipmentId)!}"/>
+              <input type="hidden" name ="shipmentPackageSeqId" value = "${(shipmentPackageRouteSeg.shipmentPackageSeqId)!}"/>
+              <input type="hidden" name="shipmentRouteSegmentId" value ="${(shipmentPackageRouteSeg.shipmentRouteSegmentId)!}"/>
               <div>
-                <span class="label">${uiLabelMap.ProductPackage}</span> ${(shipmentPackageRouteSeg.shipmentPackageSeqId)?if_exists}
-                <#if shipmentPackageRouteSeg.labelImage?exists>
+                <span class="label">${uiLabelMap.ProductPackage}</span> ${(shipmentPackageRouteSeg.shipmentPackageSeqId)!}
+                <#if shipmentPackageRouteSeg.labelImage??>
                   <a href="javascript:document.viewShipmentPackageRouteSegLabelImageForm_${shipmentPackageRouteSeg_index}.submit();" class="buttontext">${uiLabelMap.ProductViewLabelImage}</a>
                 </#if>
               </div>
@@ -64,13 +64,13 @@ under the License.
         <br />
         <#if !(orderId?has_content)>
           <form name="selectOrderForm" method="post" action="<@ofbizUrl>WeightPackageOnly</@ofbizUrl>">
-            <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}" />
+            <input type="hidden" name="facilityId" value="${(facility.facilityId)!}" />
             <table cellspacing="0" class="basic-table">
               <tr>
                 <td width="25%" align="right"><span class="label">${uiLabelMap.ProductOrderId}</span></td>
                 <td width="1">&nbsp;</td>
                 <td width="25%">
-                  <input type="text" name="orderId" size="20" maxlength="20" value="${primaryOrderId?if_exists}"/>
+                  <input type="text" name="orderId" size="20" maxlength="20" value="${primaryOrderId!}"/>
                   /
                   <input type="text" name="shipGroupSeqId" size="6" maxlength="6" value="${shipGroupSeqId?default("00001")}"/>
                 </td>
@@ -88,13 +88,13 @@ under the License.
           <br />
           <!-- select picklist bin form -->
           <form name="selectPicklistBinForm" method="post" action="<@ofbizUrl>WeightPackageOnly</@ofbizUrl>" style="margin: 0;">
-            <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}" />
+            <input type="hidden" name="facilityId" value="${(facility.facilityId)!}" />
             <table cellspacing="0" class="basic-table">
               <tr>
                 <td width="25%" align='right'><span class="label">${uiLabelMap.FormFieldTitle_picklistBinId}</span></td>
                 <td width="1">&nbsp;</td>
                 <td width="25%">
-                  <input type="text" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId?if_exists}"/>
+                  <input type="text" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId!}"/>
                 </td>
                 <td>&nbsp;</td>
               </tr>
@@ -125,25 +125,25 @@ under the License.
                 </tr>
                 <#list packedLines as packedLine>
                   <form name="updateWeightPackageForm_${packedLine.getWeightPackageSeqId()}" method="post" action="<@ofbizUrl>updatePackedLine</@ofbizUrl>">
-                    <input type="hidden" name="orderId" value ="${orderId?if_exists}"/>
-                    <input type="hidden" name = "facilityId" value = "${(facility.facilityId)?if_exists}"/>
+                    <input type="hidden" name="orderId" value ="${orderId!}"/>
+                    <input type="hidden" name = "facilityId" value = "${(facility.facilityId)!}"/>
                     <input type="hidden" name="weightPackageSeqId" value ="${packedLine.getWeightPackageSeqId()}"/>
                     <tr>
                       <td>
                         <span class="label">
                           ${uiLabelMap.ProductPackage} ${packedLine.getWeightPackageSeqId()}
-                          <input type="text" size="7" name="packageWeight" value="${(packedLine.getPackageWeight())?if_exists}" />
+                          <input type="text" size="7" name="packageWeight" value="${(packedLine.getPackageWeight())!}" />
                         </span>
                       </td>
                       <td>
-                        <span class="label">${uiLabelMap.CommonLength}<input type="text" name="packageLength" value="${(packedLine.getPackageLength())?if_exists}" size="5"/></span>
-                        <span class="label">${uiLabelMap.ProductWidth}<input type="text" name="packageWidth" value="${(packedLine.getPackageWidth())?if_exists}" size="5"/></span>
-                        <span class="label">${uiLabelMap.PartyHeight}<input type="text" name="packageHeight" value="${(packedLine.getPackageHeight())?if_exists}" size="5"/></span>
+                        <span class="label">${uiLabelMap.CommonLength}<input type="text" name="packageLength" value="${(packedLine.getPackageLength())!}" size="5"/></span>
+                        <span class="label">${uiLabelMap.ProductWidth}<input type="text" name="packageWidth" value="${(packedLine.getPackageWidth())!}" size="5"/></span>
+                        <span class="label">${uiLabelMap.PartyHeight}<input type="text" name="packageHeight" value="${(packedLine.getPackageHeight())!}" size="5"/></span>
                       </td>
                       <td>
                         <select name="shipmentBoxTypeId">
                           <#if shipmentBoxTypes?has_content>
-                            <#assign shipmentBoxTypeId = "${(packedLine.getShipmentBoxTypeId())?if_exists}"/>
+                            <#assign shipmentBoxTypeId = "${(packedLine.getShipmentBoxTypeId())!}"/>
                             <#list shipmentBoxTypes as shipmentBoxType>
                               <#if shipmentBoxTypeId == "${shipmentBoxType.shipmentBoxTypeId}">
                                 <option value="${shipmentBoxType.shipmentBoxTypeId}">${shipmentBoxType.description}</option>
@@ -166,23 +166,23 @@ under the License.
                 <a href="javascript:document.completePackageForm.submit()" class="buttontext">${uiLabelMap.ProductComplete}</a>
               </div>
               <form name="completePackageForm" method ="post" action="<@ofbizUrl>completePackage</@ofbizUrl>">
-                <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
-                <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/>
-                <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"/>
+                <input type="hidden" name="orderId" value="${orderId!}"/>
+                <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/>
+                <input type="hidden" name="facilityId" value="${(facility.facilityId)!}"/>
                 <input type="hidden" name="weightUomId" value="${defaultWeightUomId}"/>
                 <input type="hidden" name="dimensionUomId" value="${defaultDimensionUomId}"/>
-                <input type="hidden" name="shipmentId" value="${(shipment.shipmentId)?if_exists}"/>
-                <input type="hidden" name="invoiceId" value="${(invoice.invoiceId)?if_exists}"/>
-                <input type="hidden" name="estimatedShippingCost" value="${estimatedShippingCost?if_exists}"/>
-                <input type="hidden" name="newEstimatedShippingCost" value="${newEstimatedShippingCost?if_exists}"/>
+                <input type="hidden" name="shipmentId" value="${(shipment.shipmentId)!}"/>
+                <input type="hidden" name="invoiceId" value="${(invoice.invoiceId)!}"/>
+                <input type="hidden" name="estimatedShippingCost" value="${estimatedShippingCost!}"/>
+                <input type="hidden" name="newEstimatedShippingCost" value="${newEstimatedShippingCost!}"/>
               </form>
             </#if>
             <#if (orderedQuantity > packedLines.size())>
             <table class="basic-table" cellpadding="2" cellspacing='0'>
               <form name="weightPackageForm" method ="post" action="<@ofbizUrl>setPackageInfo</@ofbizUrl>">
-                <input type="hidden" name = "shipGroupSeqId" value = "${shipGroupSeqId?if_exists}"/>
-                <input type="hidden" name = "facilityId" value = "${(facility.facilityId)?if_exists}"/>
-                <input type="hidden" name = "orderId" value = "${orderId?if_exists}"/>
+                <input type="hidden" name = "shipGroupSeqId" value = "${shipGroupSeqId!}"/>
+                <input type="hidden" name = "facilityId" value = "${(facility.facilityId)!}"/>
+                <input type="hidden" name = "orderId" value = "${orderId!}"/>
                 <#assign packedLines = weightPackageSession.getPackedLines(orderId)/>
                 <#if packedLines?has_content>
                   <hr/>
@@ -233,29 +233,29 @@ under the License.
                </th>
               </tr>
               <form name="completePackForm" method="post" action="<@ofbizUrl>shipNow</@ofbizUrl>">
-                <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
-                <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/>
-                <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"/>
-                <input type="hidden" name="shipmentId" value="${(shipment.shipmentId)?if_exists}"/>
-                <input type="hidden" name="invoiceId" value="${(invoice.invoiceId)?if_exists}"/>
+                <input type="hidden" name="orderId" value="${orderId!}"/>
+                <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/>
+                <input type="hidden" name="facilityId" value="${(facility.facilityId)!}"/>
+                <input type="hidden" name="shipmentId" value="${(shipment.shipmentId)!}"/>
+                <input type="hidden" name="invoiceId" value="${(invoice.invoiceId)!}"/>
                 <#list shipmentPackages?sort_by("shipmentPackageSeqId") as shipmentPackage>
                   <tr>
                     <td>
                       <span class="label">
                         ${uiLabelMap.ProductPackage} ${(shipmentPackage_index + 1)}
-                        <input type="text" size="7" readonly="readonly" name="packageWeight" value="${(shipmentPackage.weight)?if_exists}" />
+                        <input type="text" size="7" readonly="readonly" name="packageWeight" value="${(shipmentPackage.weight)!}" />
                       </span>
                     </td>
                     <td>
-                      <span class="label">${uiLabelMap.CommonLength}<input type="text" readonly="readonly" name="packageLength" value="${(shipmentPackage.boxLength)?if_exists}" size="5"/></span>
-                      <span class="label">${uiLabelMap.ProductWidth}<input type="text" readonly="readonly" name="packageWidth" value="${(shipmentPackage.boxWidth)?if_exists}" size="5"/></span>
-                      <span class="label">${uiLabelMap.PartyHeight}<input type="text" readonly="readonly" name="packageHeight" value="${(shipmentPackage.boxHeight)?if_exists}" size="5"/></span>
+                      <span class="label">${uiLabelMap.CommonLength}<input type="text" readonly="readonly" name="packageLength" value="${(shipmentPackage.boxLength)!}" size="5"/></span>
+                      <span class="label">${uiLabelMap.ProductWidth}<input type="text" readonly="readonly" name="packageWidth" value="${(shipmentPackage.boxWidth)!}" size="5"/></span>
+                      <span class="label">${uiLabelMap.PartyHeight}<input type="text" readonly="readonly" name="packageHeight" value="${(shipmentPackage.boxHeight)!}" size="5"/></span>
                     </td>
                     <td>
                       <#if (shipmentPackage.shipmentBoxTypeId)?has_content>
                         <#assign shipmentBoxType = delegator.findOne("ShipmentBoxType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentBoxTypeId", shipmentPackage.shipmentBoxTypeId), true)>
                       </#if>
-                      <input type="text" readonly="readonly" name="shipmentBoxTypeId" value="${(shipmentBoxType.description)?if_exists}" size="50"/>
+                      <input type="text" readonly="readonly" name="shipmentBoxTypeId" value="${(shipmentBoxType.description)!}" size="50"/>
                     </td>
                   </tr>
                 </#list>
@@ -278,18 +278,18 @@ under the License.
       </div>
       <div class="screenlet-body">
         <div>
-          <h3>${uiLabelMap.FacilityWarningMessageThereIsMuchDifferenceInShippingCharges}&nbsp;[${uiLabelMap.FacilityEstimatedShippingCharges} = <@ofbizCurrency amount=estimatedShippingCost?if_exists isoCode=shipment.currencyUomId?if_exists/>, ${uiLabelMap.FacilityActualShippingCharges} = <@ofbizCurrency amount=newEstimatedShippingCost?if_exists isoCode=shipment.currencyUomId?if_exists/>]</h3>
+          <h3>${uiLabelMap.FacilityWarningMessageThereIsMuchDifferenceInShippingCharges}&nbsp;[${uiLabelMap.FacilityEstimatedShippingCharges} = <@ofbizCurrency amount=estimatedShippingCost! isoCode=shipment.currencyUomId!/>, ${uiLabelMap.FacilityActualShippingCharges} = <@ofbizCurrency amount=newEstimatedShippingCost! isoCode=shipment.currencyUomId!/>]</h3>
         </div>
         <form name="shipNowForm" method="post" action="<@ofbizUrl>shipNow</@ofbizUrl>">
-          <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
-          <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/>
-          <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"/>
-          <input type="hidden" name="shipmentId" value="${(shipment.shipmentId)?if_exists}"/>
+          <input type="hidden" name="orderId" value="${orderId!}"/>
+          <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/>
+          <input type="hidden" name="facilityId" value="${(facility.facilityId)!}"/>
+          <input type="hidden" name="shipmentId" value="${(shipment.shipmentId)!}"/>
         </form>
         <form name="holdShipmentForm" method="post" action="<@ofbizUrl>HoldShipment</@ofbizUrl>">
-          <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
-          <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/>
-          <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"/>
+          <input type="hidden" name="orderId" value="${orderId!}"/>
+          <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/>
+          <input type="hidden" name="facilityId" value="${(facility.facilityId)!}"/>
         </form>
         <div>
           <a href="javascript:document.shipNowForm.submit()" class="buttontext">${uiLabelMap.FacilityShip} ${uiLabelMap.CommonNow}</a>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl Sat Aug 16 11:34:57 2014
@@ -25,7 +25,7 @@ under the License.
   <#if workOrderItemFulfillments?has_content>
     <#list workOrderItemFulfillments as workOrderItemFulfillment>
       <br/>${uiLabelMap.OrderOrderId}: <a href="/ordermgr/control/orderview?orderId=${workOrderItemFulfillment.orderId}" class="event">${workOrderItemFulfillment.orderId} / ${workOrderItemFulfillment.orderItemSeqId}</a>
-      <#assign orderItemAndShipGroupAssocs = delegator.findByAnd("OrderHeaderItemAndShipGroup", {"orderId", workOrderItemFulfillment.orderId, "orderItemSeqId", workOrderItemFulfillment.orderItemSeqId}, null, false)?if_exists/>
+      <#assign orderItemAndShipGroupAssocs = delegator.findByAnd("OrderHeaderItemAndShipGroup", {"orderId", workOrderItemFulfillment.orderId, "orderItemSeqId", workOrderItemFulfillment.orderItemSeqId}, null, false)!/>
       <#list orderItemAndShipGroupAssocs as orderItemAndShipGroupAssoc>
         <#if orderItemAndShipGroupAssoc.shipByDate?has_content>
           ${uiLabelMap.OrderShipBeforeDate}: ${orderItemAndShipGroupAssoc.shipByDate}
@@ -37,11 +37,11 @@ under the License.
   <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortParentId}" class="event">
     ${workEffort.workEffortParentId} / ${workEffort.workEffortId}
   </a>
-  &nbsp;${workEffort.workEffortName?default("Undefined")}<#if workEffort.reservPersons?exists>&nbsp;Persons:${workEffort.reservPersons}</#if>
+  &nbsp;${workEffort.workEffortName?default("Undefined")}<#if workEffort.reservPersons??>&nbsp;Persons:${workEffort.reservPersons}</#if>
   <#if parentWorkOrderItemFulfillments?has_content>
     <#list parentWorkOrderItemFulfillments as parentWorkOrderItemFulfillment>
       <br/>${uiLabelMap.OrderOrderId}: <a href="/ordermgr/control/orderview?orderId=${parentWorkOrderItemFulfillment.orderId}" class="event">${parentWorkOrderItemFulfillment.orderId} / ${parentWorkOrderItemFulfillment.orderItemSeqId}</a>
-      <#assign orderItemAndShipGroupAssocs = delegator.findByAnd("OrderHeaderItemAndShipGroup", {"orderId", parentWorkOrderItemFulfillment.orderId, "orderItemSeqId", parentWorkOrderItemFulfillment.orderItemSeqId}, null, false)?if_exists/>
+      <#assign orderItemAndShipGroupAssocs = delegator.findByAnd("OrderHeaderItemAndShipGroup", {"orderId", parentWorkOrderItemFulfillment.orderId, "orderItemSeqId", parentWorkOrderItemFulfillment.orderItemSeqId}, null, false)!/>
       <#list orderItemAndShipGroupAssocs as orderItemAndShipGroupAssoc>
         <#if orderItemAndShipGroupAssoc.shipByDate?has_content>
           ${uiLabelMap.OrderShipBeforeDate}: ${orderItemAndShipGroupAssoc.shipByDate}
@@ -51,10 +51,10 @@ under the License.
   </#if>
 <#else>
   <#-- Allow containing screens to specify the URL for editing an event -->
-  <#if !editCalEventUrl?exists>
+  <#if !editCalEventUrl??>
     <#assign editCalEventUrl = parameters._LAST_VIEW_NAME_>
   </#if>
-  <a href="<@ofbizUrl>${editCalEventUrl}?form=edit&amp;parentTypeId=${parentTypeId?if_exists}&amp;period=${periodType?if_exists}&amp;start=${parameters.start?if_exists}&amp;workEffortId=${workEffort.workEffortId}${addlParam?if_exists}${urlParam?if_exists}</@ofbizUrl>" class="event">
+  <a href="<@ofbizUrl>${editCalEventUrl}?form=edit&amp;parentTypeId=${parentTypeId!}&amp;period=${periodType!}&amp;start=${parameters.start!}&amp;workEffortId=${workEffort.workEffortId}${addlParam!}${urlParam!}</@ofbizUrl>" class="event">
     ${workEffort.workEffortId}
   </a>
   &nbsp;${workEffort.workEffortName?default("")}

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl Sat Aug 16 11:34:57 2014
@@ -18,7 +18,7 @@ under the License.
 -->
 <#if periods?has_content>
   <#-- Allow containing screens to specify the URL for creating a new event -->
-  <#if !newCalEventUrl?exists>
+  <#if !newCalEventUrl??>
     <#assign newCalEventUrl = parameters._LAST_VIEW_NAME_>
   </#if>
   <#if (maxConcurrentEntries < 2)>
@@ -37,19 +37,19 @@ under the License.
   <tr<#if currentPeriod> class="current-period"<#else><#if (period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
     <td class="label">
       ${period.start?time?string.short}<br />
-      <a href="<@ofbizUrl>${newCalEventUrl}?period=day&amp;form=edit&amp;parentTypeId=${parentTypeId?if_exists}&amp;start=${parameters.start?if_exists}&amp;currentStatusId=CAL_TENTATIVE&amp;estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&amp;estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
+      <a href="<@ofbizUrl>${newCalEventUrl}?period=day&amp;form=edit&amp;parentTypeId=${parentTypeId!}&amp;start=${parameters.start!}&amp;currentStatusId=CAL_TENTATIVE&amp;estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&amp;estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${urlParam!}${addlParam!}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
     </td>
       <#list period.calendarEntries as calEntry>
-        <#if calEntry.workEffort.actualStartDate?exists>
+        <#if calEntry.workEffort.actualStartDate??>
             <#assign startDate = calEntry.workEffort.actualStartDate>
           <#else>
-            <#assign startDate = calEntry.workEffort.estimatedStartDate?if_exists>
+            <#assign startDate = calEntry.workEffort.estimatedStartDate!>
         </#if>
 
-        <#if calEntry.workEffort.actualCompletionDate?exists>
+        <#if calEntry.workEffort.actualCompletionDate??>
             <#assign completionDate = calEntry.workEffort.actualCompletionDate>
           <#else>
-            <#assign completionDate = calEntry.workEffort.estimatedCompletionDate?if_exists>
+            <#assign completionDate = calEntry.workEffort.estimatedCompletionDate!>
         </#if>
 
         <#if !completionDate?has_content && calEntry.workEffort.actualMilliSeconds?has_content>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl Sat Aug 16 11:34:57 2014
@@ -21,7 +21,7 @@ under the License.
   
 <#if periods?has_content>
   <#-- Allow containing screens to specify the URL for creating a new event -->
-  <#if !newCalEventUrl?exists>
+  <#if !newCalEventUrl??>
     <#assign newCalEventUrl = parameters._LAST_VIEW_NAME_>
   </#if>
 <table cellspacing="0" class="basic-table calendar">
@@ -39,12 +39,12 @@ under the License.
     <#if indexMod7 = 0>
       <tr>
         <td class="label" ${styleTd}>
-          <a href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=week&amp;start=${period.start.time?string("#")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>'>${uiLabelMap.CommonWeek} ${period.start?date?string("w")}</a>
+          <a href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=week&amp;start=${period.start.time?string("#")}${urlParam!}${addlParam!}</@ofbizUrl>'>${uiLabelMap.CommonWeek} ${period.start?date?string("w")}</a>
         </td>
     </#if>
     <td ${styleTd} <#if currentPeriod> class="current-period"<#else><#if (period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
-      <span class="h1"><a href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&amp;start=${period.start.time?string("#")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>'>${period.start?date?string("d")?cap_first}</a></span>
-      <a class="add-new" href='<@ofbizUrl>${newCalEventUrl}?period=month&amp;form=edit&amp;start=${parameters.start?if_exists}&amp;parentTypeId=${parentTypeId?if_exists}&amp;currentStatusId=CAL_TENTATIVE&amp;estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&amp;estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>'>${uiLabelMap.CommonAddNew}</a>
+      <span class="h1"><a href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&amp;start=${period.start.time?string("#")}${urlParam!}${addlParam!}</@ofbizUrl>'>${period.start?date?string("d")?cap_first}</a></span>
+      <a class="add-new" href='<@ofbizUrl>${newCalEventUrl}?period=month&amp;form=edit&amp;start=${parameters.start!}&amp;parentTypeId=${parentTypeId!}&amp;currentStatusId=CAL_TENTATIVE&amp;estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&amp;estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${urlParam!}${addlParam!}</@ofbizUrl>'>${uiLabelMap.CommonAddNew}</a>
       <br class="clear"/>
 
       <#assign maxNumberOfPersons = 0/>
@@ -71,16 +71,16 @@ under the License.
       </#if>
       <#if parameters.hideEvents?default("") != "Y">
       <#list period.calendarEntries as calEntry>
-        <#if calEntry.workEffort.actualStartDate?exists>
+        <#if calEntry.workEffort.actualStartDate??>
             <#assign startDate = calEntry.workEffort.actualStartDate>
           <#else>
-            <#assign startDate = calEntry.workEffort.estimatedStartDate?if_exists>
+            <#assign startDate = calEntry.workEffort.estimatedStartDate!>
         </#if>
 
-        <#if calEntry.workEffort.actualCompletionDate?exists>
+        <#if calEntry.workEffort.actualCompletionDate??>
             <#assign completionDate = calEntry.workEffort.actualCompletionDate>
           <#else>
-            <#assign completionDate = calEntry.workEffort.estimatedCompletionDate?if_exists>
+            <#assign completionDate = calEntry.workEffort.estimatedCompletionDate!>
         </#if>
 
         <#if !completionDate?has_content && calEntry.workEffort.actualMilliSeconds?has_content>
@@ -114,8 +114,8 @@ under the License.
     <td valign="top">
       <table width="100%" cellspacing="0" cellpadding="0" border="0">
         <tr>
-          <td nowrap="nowrap" class="monthdaynumber"><a href='<@ofbizUrl>day?start=${period.start.time?string("#")}<#if eventsParam?has_content>&amp;${eventsParam}</#if>${addlParam?if_exists}</@ofbizUrl>' class="monthdaynumber">${period.start?date?string("d")?cap_first}</a></td>
-          <td align="right"><a href='<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT&amp;currentStatusId=CAL_TENTATIVE&amp;estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&amp;estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${addlParam?if_exists}</@ofbizUrl>' class="add">${uiLabelMap.CommonAddNew}</a>&nbsp;&nbsp;</td>
+          <td nowrap="nowrap" class="monthdaynumber"><a href='<@ofbizUrl>day?start=${period.start.time?string("#")}<#if eventsParam?has_content>&amp;${eventsParam}</#if>${addlParam!}</@ofbizUrl>' class="monthdaynumber">${period.start?date?string("d")?cap_first}</a></td>
+          <td align="right"><a href='<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT&amp;currentStatusId=CAL_TENTATIVE&amp;estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&amp;estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${addlParam!}</@ofbizUrl>' class="add">${uiLabelMap.CommonAddNew}</a>&nbsp;&nbsp;</td>
         </tr>
       </table>
       <#list period.calendarEntries as calEntry>
@@ -132,7 +132,7 @@ under the License.
               ${calEntry.workEffort.estimatedStartDate?time?string.short}-${calEntry.workEffort.estimatedCompletionDate?time?string.short}
             </#if>
             <br />
-            <a href="<@ofbizUrl>WorkEffortSummary?workEffortId=${calEntry.workEffort.workEffortId}${addlParam?if_exists}</@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a>&nbsp;
+            <a href="<@ofbizUrl>WorkEffortSummary?workEffortId=${calEntry.workEffort.workEffortId}${addlParam!}</@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a>&nbsp;
           </td>
         </tr>
       </table>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl Sat Aug 16 11:34:57 2014
@@ -33,10 +33,10 @@ under the License.
           <#list workEfforts as calendarEntry>
             <#assign workEffort = calendarEntry.workEffort>
             <tr<#if alt_row> class="alternate-row"</#if>>
-              <td><#if workEffort.actualStartDate?exists>${workEffort.actualStartDate}<#else>${workEffort.estimatedStartDate}</#if></td>
-              <td><#if workEffort.actualCompletionDate?exists>${workEffort.actualCompletionDate}<#else>${workEffort.estimatedCompletionDate}</#if></td>
+              <td><#if workEffort.actualStartDate??>${workEffort.actualStartDate}<#else>${workEffort.estimatedStartDate}</#if></td>
+              <td><#if workEffort.actualCompletionDate??>${workEffort.actualCompletionDate}<#else>${workEffort.estimatedCompletionDate}</#if></td>
               <td>${workEffort.getRelatedOne("WorkEffortType", false).get("description",locale)}</td>
-              <td class="button-col"><a href="<@ofbizUrl>EditWorkEffort?workEffortId=${workEffort.workEffortId}${addlParam?if_exists}</@ofbizUrl>">${workEffort.workEffortName}</a></td>
+              <td class="button-col"><a href="<@ofbizUrl>EditWorkEffort?workEffortId=${workEffort.workEffortId}${addlParam!}</@ofbizUrl>">${workEffort.workEffortName}</a></td>
             </tr>
             <#assign alt_row = !alt_row>
           </#list>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl Sat Aug 16 11:34:57 2014
@@ -18,7 +18,7 @@ under the License.
 -->
 <#if periods?has_content>
   <#-- Allow containing screens to specify the URL for creating a new event -->
-  <#if !newCalEventUrl?exists>
+  <#if !newCalEventUrl??>
     <#assign newCalEventUrl = parameters._LAST_VIEW_NAME_>
   </#if>
   <#if (maxConcurrentEntries < 2)>
@@ -36,20 +36,20 @@ under the License.
     <#if (nowTimestamp >= period.start) && (nowTimestamp <= period.end)><#assign currentPeriod = true/></#if>
   <tr<#if currentPeriod> class="current-period"<#else><#if (period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
     <td class="centered" width="1%">
-      <a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&amp;start=${period.start.time?string("#")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>">${period.start?date?string("EEEE")?cap_first}&nbsp;${period.start?date?string.short}</a><br />
-      <a href="<@ofbizUrl>${newCalEventUrl}?period=week&amp;form=edit&amp;start=${parameters.start?if_exists}&amp;parentTypeId=${parentTypeId?if_exists}&amp;currentStatusId=CAL_TENTATIVE&amp;estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&amp;estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${addlParam?if_exists}${urlParam?if_exists}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
+      <a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&amp;start=${period.start.time?string("#")}${urlParam!}${addlParam!}</@ofbizUrl>">${period.start?date?string("EEEE")?cap_first}&nbsp;${period.start?date?string.short}</a><br />
+      <a href="<@ofbizUrl>${newCalEventUrl}?period=week&amp;form=edit&amp;start=${parameters.start!}&amp;parentTypeId=${parentTypeId!}&amp;currentStatusId=CAL_TENTATIVE&amp;estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&amp;estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${addlParam!}${urlParam!}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
     </td>
     <#list period.calendarEntries as calEntry>
-        <#if calEntry.workEffort.actualStartDate?exists>
+        <#if calEntry.workEffort.actualStartDate??>
             <#assign startDate = calEntry.workEffort.actualStartDate>
           <#else>
-            <#assign startDate = calEntry.workEffort.estimatedStartDate?if_exists>
+            <#assign startDate = calEntry.workEffort.estimatedStartDate!>
         </#if>
 
-        <#if calEntry.workEffort.actualCompletionDate?exists>
+        <#if calEntry.workEffort.actualCompletionDate??>
             <#assign completionDate = calEntry.workEffort.actualCompletionDate>
           <#else>
-            <#assign completionDate = calEntry.workEffort.estimatedCompletionDate?if_exists>
+            <#assign completionDate = calEntry.workEffort.estimatedCompletionDate!>
         </#if>
 
         <#if !completionDate?has_content && calEntry.workEffort.actualMilliSeconds?has_content>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl Sat Aug 16 11:34:57 2014
@@ -28,7 +28,7 @@ under the License.
           <td align="right" valign="middle" class="label">${uiLabelMap.WorkEffortKeywords}</td>
           <td valign="middle">
             <div>
-              <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}"/>&nbsp;
+              <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING!}"/>&nbsp;
               ${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked="checked"</#if>/>
               ${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked="checked"</#if>/>
             </div>
@@ -38,7 +38,7 @@ under the License.
           <td align="right" valign="middle" class="label">${uiLabelMap.WorkEffortReviews}</td>
           <td valign="middle">
             <div>
-              <input type="text" name="SEARCH_STRING_REVIEW_TEXT" size="40" value="${requestParameters.SEARCH_STRING_REVIEW_TEXT?if_exists}"/>&nbsp;
+              <input type="text" name="SEARCH_STRING_REVIEW_TEXT" size="40" value="${requestParameters.SEARCH_STRING_REVIEW_TEXT!}"/>&nbsp;
             </div>
           </td>
         </tr>
@@ -46,7 +46,7 @@ under the License.
           <td align="right" valign="middle" class="label">${uiLabelMap.FormFieldTitle_workEffortId}</td>
           <td valign="middle">
             <div>
-              <@htmlTemplate.lookupField value="${requestParameters.SEARCH_WORK_EFFORT_ID?if_exists}" formName="advToKeyWordSearchForm" name="SEARCH_WORK_EFFORT_ID" id="SEARCH_WORK_EFFORT_ID" fieldFormName="LookupWorkEffort"/>
+              <@htmlTemplate.lookupField value="${requestParameters.SEARCH_WORK_EFFORT_ID!}" formName="advToKeyWordSearchForm" name="SEARCH_WORK_EFFORT_ID" id="SEARCH_WORK_EFFORT_ID" fieldFormName="LookupWorkEffort"/>
             </div>
           </td>
         </tr>
@@ -70,7 +70,7 @@ under the License.
           <td align="right" valign="middle" class="label">${uiLabelMap.PartyPartyId}</td>
           <td valign="middle">
             <div>
-              <@htmlTemplate.lookupField value="${requestParameters.partyId?if_exists}" formName="advToKeyWordSearchForm" name="partyId" id="partyId" fieldFormName="LookupPartyName"/>
+              <@htmlTemplate.lookupField value="${requestParameters.partyId!}" formName="advToKeyWordSearchForm" name="partyId" id="partyId" fieldFormName="LookupPartyName"/>
             </div>
           </td>
         </tr>
@@ -91,7 +91,7 @@ under the License.
           <td align="right" valign="middle" class="label">${uiLabelMap.WorkEffortProductId1}</td>
           <td valign="middle">
             <div>
-              <@htmlTemplate.lookupField value="${requestParameters.productId_1?if_exists}" formName="advToKeyWordSearchForm" name="productId_1" id="productId_1" fieldFormName="LookupProduct"/>
+              <@htmlTemplate.lookupField value="${requestParameters.productId_1!}" formName="advToKeyWordSearchForm" name="productId_1" id="productId_1" fieldFormName="LookupProduct"/>
             </div>
           </td>
         </tr>
@@ -99,7 +99,7 @@ under the License.
           <td align="right" valign="middle" class="label">${uiLabelMap.WorkEffortProductId2}</td>
           <td valign="middle">
             <div>
-              <@htmlTemplate.lookupField value="${requestParameters.productId_2?if_exists}" formName="advToKeyWordSearchForm" name="productId_2" id="productId_2" fieldFormName="LookupProduct"/>
+              <@htmlTemplate.lookupField value="${requestParameters.productId_2!}" formName="advToKeyWordSearchForm" name="productId_2" id="productId_2" fieldFormName="LookupProduct"/>
             </div>
           </td>
         </tr>
@@ -109,13 +109,13 @@ under the License.
             <table class="basic-table" cellspacing="0">
                <tr>
                   <td nowrap="nowrap">
-                    <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.fromDate?if_exists}" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                    <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.fromDate!}" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
                     <span>${uiLabelMap.CommonFrom}</span>
                   </td>
                </tr>
                <tr>
                   <td nowrap="nowrap">
-                    <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.thruDate?if_exists}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                    <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.thruDate!}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
                     <span>${uiLabelMap.CommonThru}</span>
                   </td>
                </tr>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl Sat Aug 16 11:34:57 2014
@@ -58,7 +58,7 @@ under the License.
           <#assign workEffort = delegator.findOne("WorkEffort", Static["org.ofbiz.base.util.UtilMisc"].toMap("workEffortId", workEffortId), false)>
           <tr>
             <td>
-              <a href="<@ofbizUrl>EditWorkEffort?workEffortId=${workEffortId}</@ofbizUrl>" class="buttontext">${workEffortId} ${(workEffort.workEffortName)?if_exists}</a>
+              <a href="<@ofbizUrl>EditWorkEffort?workEffortId=${workEffortId}</@ofbizUrl>" class="buttontext">${workEffortId} ${(workEffort.workEffortName)!}</a>
             </td>
           </tr>
         </#list>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/main.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/main.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/main.ftl Sat Aug 16 11:34:57 2014
@@ -16,7 +16,7 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<#if (requestAttributes.uiLabelMap)?exists>
+<#if (requestAttributes.uiLabelMap)??>
     <#assign uiLabelMap = requestAttributes.uiLabelMap>
 </#if>
 

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl Sat Aug 16 11:34:57 2014
@@ -32,10 +32,10 @@ under the License.
     <#assign alt_row = false>
     <#list tasks as workEffort>
       <tr<#if alt_row> class="alternate-row"</#if>>
-        <td>${(workEffort.estimatedStartDate)?if_exists}</td>
+        <td>${(workEffort.estimatedStartDate)!}</td>
         <td><a href="<@ofbizUrl>WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${workEffort.workEffortName}</a></td>
-        <td>${workEffort.priority?if_exists}</td>
-        <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}</td>
+        <td>${workEffort.priority!}</td>
+        <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!}</td>
       </tr>
       <#assign alt_row = !alt_row>
     </#list>
@@ -57,10 +57,10 @@ under the License.
       <#assign alt_row = false>
       <#list activities as workEffort>
         <tr<#if alt_row> class="alternate-row"</#if>>
-          <td>${(workEffort.estimatedStartDate)?if_exists}</td>
-          <td>${workEffort.priority?if_exists}</td>
-          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}</td>
-          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))?if_exists}</td>
+          <td>${(workEffort.estimatedStartDate)!}</td>
+          <td>${workEffort.priority!}</td>
+          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!}</td>
+          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))!}</td>
           <#-- <td>${workEffort.partyId}</td> -->
           <td>${workEffort.roleTypeId}</td>
           <td><a href="<@ofbizUrl>WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${workEffort.workEffortName}</a></td>
@@ -87,10 +87,10 @@ under the License.
       <#assign alt_row = false>
       <#list roleActivities as workEffort>
         <tr<#if alt_row> class="alternate-row"</#if>>
-          <td>${(workEffort.estimatedStartDate)?if_exists}</td>
-          <td>${workEffort.priority?if_exists}</td>
-          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}</td>
-          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))?if_exists}</td>
+          <td>${(workEffort.estimatedStartDate)!}</td>
+          <td>${workEffort.priority!}</td>
+          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!}</td>
+          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))!}</td>
           <#-- <td>${workEffort.partyId}</td> -->
           <td>${workEffort.roleTypeId}</td>
           <td><a href="<@ofbizUrl>WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${workEffort.workEffortName}</a></td>
@@ -117,10 +117,10 @@ under the License.
       <#assign alt_row = false>
       <#list groupActivities as workEffort>
         <tr<#if alt_row> class="alternate-row"</#if>>
-          <td>${(workEffort.estimatedStartDate)?if_exists}</td>
-          <td>${workEffort.priority?if_exists}</td>
-          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}</td>
-          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))?if_exists}</td>
+          <td>${(workEffort.estimatedStartDate)!}</td>
+          <td>${workEffort.priority!}</td>
+          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!}</td>
+          <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))!}</td>
           <td>${workEffort.groupPartyId}</td>
           <#-- <td>${workEffort.roleTypeId}</td> -->
           <td><a href="<@ofbizUrl>WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${workEffort.workEffortName}</a></td>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl Sat Aug 16 11:34:57 2014
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 -->
         <form action="<@ofbizUrl>DuplicateWorkEffort</@ofbizUrl>" method="post">
-            <input type="hidden" name="oldWorkEffortId" value="${workEffortId?if_exists}"/>
+            <input type="hidden" name="oldWorkEffortId" value="${workEffortId!}"/>
             <div>
                 <span class="label">${uiLabelMap.ProductDuplicateRemoveSelectedWithNewId}</span>
                 <input type="text" size="20" maxlength="20" name="workEffortId"/>&nbsp;<input type="submit" class="smallSubmit" value="${uiLabelMap.CommonDuplicate}!"/>

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl Sat Aug 16 11:34:57 2014
@@ -63,7 +63,7 @@ under the License.
         <tbody>
           <#list partyAssignments as wepa>
             <tr>
-              <td>${wepa.groupName?if_exists}${wepa.firstName?if_exists} ${wepa.lastName?if_exists}</td>
+              <td>${wepa.groupName!}${wepa.firstName!} ${wepa.lastName!}</td>
               <td>${(wepa.getRelatedOne("RoleType", false).description)?default("&nbsp;")}</td>
               <td>${wepa.fromDate?default("&nbsp;")}</td>
               <td>${wepa.thruDate?default("&nbsp;")}</td>