svn commit: r1618336 [4/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
Locked
svn commit: r1618336 [4/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
 
|
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Sat Aug 16 11:34:57 2014 @@ -29,7 +29,7 @@ function lookupBom() { <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.PageTitleEditProductBom} <#if product?exists>${(product.internalName)?if_exists}</#if> [${uiLabelMap.CommonId} ${productId?if_exists}]</li> + <li class="h3">${uiLabelMap.PageTitleEditProductBom} <#if product??>${(product.internalName)!}</#if> [${uiLabelMap.CommonId} ${productId!}]</li> </ul> <br class="clear"/> </div> @@ -50,20 +50,20 @@ function lookupBom() { <select name="productAssocTypeId" size="1"> <#if productAssocTypeId?has_content> <#assign curAssocType = delegator.findOne("ProductAssocType", Static["org.ofbiz.base.util.UtilMisc"].toMap("productAssocTypeId", productAssocTypeId), false)> - <#if curAssocType?exists> - <option selected="selected" value="${(curAssocType.productAssocTypeId)?if_exists}">${(curAssocType.get("description",locale))?if_exists}</option> - <option value="${(curAssocType.productAssocTypeId)?if_exists}"></option> + <#if curAssocType??> + <option selected="selected" value="${(curAssocType.productAssocTypeId)!}">${(curAssocType.get("description",locale))!}</option> + <option value="${(curAssocType.productAssocTypeId)!}"></option> </#if> </#if> <#list assocTypes as assocType> - <option value="${(assocType.productAssocTypeId)?if_exists}">${(assocType.get("description",locale))?if_exists}</option> + <option value="${(assocType.productAssocTypeId)!}">${(assocType.get("description",locale))!}</option> </#list> </select> </td> <td align="right">${uiLabelMap.ProductProductId}</td> <td> </td> <td> - <@htmlTemplate.lookupField value="${productId?if_exists}" formName="searchform" name="productId" id="productId" fieldFormName="LookupProduct"/> + <@htmlTemplate.lookupField value="${productId!}" formName="searchform" name="productId" id="productId" fieldFormName="LookupProduct"/> <span><a href="javascript:document.searchform.submit();" class="buttontext">${uiLabelMap.ManufacturingShowBOMAssocs}</a></span> </td> </tr> @@ -82,7 +82,7 @@ function lookupBom() { </form> <hr /> <form action="<@ofbizUrl>UpdateProductBom</@ofbizUrl>" method="post" name="editProductAssocForm"> - <#if !(productAssoc?exists)> + <#if !(productAssoc??)> <input type="hidden" name="UPDATE_MODE" value="CREATE"/> <table class="basic-table" cellspacing="0"> <tr> @@ -92,13 +92,13 @@ function lookupBom() { <select name="productAssocTypeId" size="1"> <#if productAssocTypeId?has_content> <#assign curAssocType = delegator.findOne("ProductAssocType", Static["org.ofbiz.base.util.UtilMisc"].toMap("productAssocTypeId", productAssocTypeId), false)> - <#if curAssocType?exists> - <option selected="selected" value="${(curAssocType.productAssocTypeId)?if_exists}">${(curAssocType.get("description",locale))?if_exists}</option> - <option value="${(curAssocType.productAssocTypeId)?if_exists}"></option> + <#if curAssocType??> + <option selected="selected" value="${(curAssocType.productAssocTypeId)!}">${(curAssocType.get("description",locale))!}</option> + <option value="${(curAssocType.productAssocTypeId)!}"></option> </#if> </#if> <#list assocTypes as assocType> - <option value="${(assocType.productAssocTypeId)?if_exists}">${(assocType.get("description",locale))?if_exists}</option> + <option value="${(assocType.productAssocTypeId)!}">${(assocType.get("description",locale))!}</option> </#list> </select> </td> @@ -107,14 +107,14 @@ function lookupBom() { <td align="right">${uiLabelMap.ProductProductId}</td> <td> </td> <td> - <@htmlTemplate.lookupField value="${productId?if_exists}" formName="editProductAssocForm" name="productId" id="productId2" fieldFormName="LookupProduct"/> + <@htmlTemplate.lookupField value="${productId!}" formName="editProductAssocForm" name="productId" id="productId2" fieldFormName="LookupProduct"/> </td> </tr> <tr> <td align="right">${uiLabelMap.ManufacturingProductIdTo}</td> <td> </td> <td> - <@htmlTemplate.lookupField value="${productIdTo?if_exists}" formName="editProductAssocForm" name="productIdTo" id="productIdTo" fieldFormName="LookupProduct"/> + <@htmlTemplate.lookupField value="${productIdTo!}" formName="editProductAssocForm" name="productIdTo" id="productIdTo" fieldFormName="LookupProduct"/> </td> </tr> <tr> @@ -128,30 +128,30 @@ function lookupBom() { <#else> <#assign curProductAssocType = productAssoc.getRelatedOne("ProductAssocType", true)> <input type="hidden" name="UPDATE_MODE" value="UPDATE"/> - <input type="hidden" name="productId" value="${productId?if_exists}"/> - <input type="hidden" name="productIdTo" value="${productIdTo?if_exists}"/> - <input type="hidden" name="productAssocTypeId" value="${productAssocTypeId?if_exists}"/> - <input type="hidden" name="fromDate" value="${fromDate?if_exists}"/> + <input type="hidden" name="productId" value="${productId!}"/> + <input type="hidden" name="productIdTo" value="${productIdTo!}"/> + <input type="hidden" name="productAssocTypeId" value="${productAssocTypeId!}"/> + <input type="hidden" name="fromDate" value="${fromDate!}"/> <table class="basic-table" cellspacing="0"> <tr> <td align="right">${uiLabelMap.ProductProductId}</td> <td> </td> - <td>${productId?if_exists}</td> + <td>${productId!}</td> </tr> <tr> <td align="right">${uiLabelMap.ManufacturingProductIdTo}</td> <td> </td> - <td>${productIdTo?if_exists}</td> + <td>${productIdTo!}</td> </tr> <tr> <td align="right">${uiLabelMap.ManufacturingBomType}</td> <td> </td> - <td><#if curProductAssocType?exists>${(curProductAssocType.get("description",locale))?if_exists}<#else> ${productAssocTypeId?if_exists}</#if></td> + <td><#if curProductAssocType??>${(curProductAssocType.get("description",locale))!}<#else> ${productAssocTypeId!}</#if></td> </tr> <tr> <td align="right">${uiLabelMap.CommonFromDate}</td> <td> </td> - <td>${fromDate?if_exists}</td> + <td>${fromDate!}</td> </tr> </#if> <tr> @@ -159,9 +159,9 @@ function lookupBom() { <td> </td> <td width="74%"> <#if useValues> - <#assign value= productAssoc.thruDate?if_exists> + <#assign value= productAssoc.thruDate!> <#else> - <#assign value= request.getParameter("thruDate")?if_exists> + <#assign value= request.getParameter("thruDate")!> </#if> <@htmlTemplate.renderDateTimeField value="${value!''}" name="thruDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="30" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> @@ -169,27 +169,27 @@ function lookupBom() { <tr> <td width="26%" align="right">${uiLabelMap.CommonSequenceNum}</td> <td> </td> - <td width="74%"><input type="text" name="sequenceNum" <#if useValues>value="${(productAssoc.sequenceNum)?if_exists}"<#else>value="${(request.getParameter("sequenceNum"))?if_exists}"</#if> size="5" maxlength="10"/></td> + <td width="74%"><input type="text" name="sequenceNum" <#if useValues>value="${(productAssoc.sequenceNum)!}"<#else>value="${(request.getParameter("sequenceNum"))!}"</#if> size="5" maxlength="10"/></td> </tr> <tr> <td width="26%" align="right">${uiLabelMap.ManufacturingReason}</td> <td> </td> - <td width="74%"><input type="text" name="reason" <#if useValues>value="${(productAssoc.reason)?if_exists}"<#else>value="${(request.getParameter("reason"))?if_exists}"</#if> size="60" maxlength="255"/></td> + <td width="74%"><input type="text" name="reason" <#if useValues>value="${(productAssoc.reason)!}"<#else>value="${(request.getParameter("reason"))!}"</#if> size="60" maxlength="255"/></td> </tr> <tr> <td width="26%" align="right">${uiLabelMap.ManufacturingInstruction}</td> <td> </td> - <td width="74%"><input type="text" name="instruction" <#if useValues>value="${(productAssoc.instruction)?if_exists}"<#else>value="${(request.getParameter("instruction"))?if_exists}"</#if> size="60" maxlength="255"/></td> + <td width="74%"><input type="text" name="instruction" <#if useValues>value="${(productAssoc.instruction)!}"<#else>value="${(request.getParameter("instruction"))!}"</#if> size="60" maxlength="255"/></td> </tr> <tr> <td width="26%" align="right">${uiLabelMap.ManufacturingQuantity}</td> <td> </td> - <td width="74%"><input type="text" name="quantity" <#if useValues>value="${(productAssoc.quantity)?if_exists}"<#else>value="${(request.getParameter("quantity"))?if_exists}"</#if> size="10" maxlength="15"/></td> + <td width="74%"><input type="text" name="quantity" <#if useValues>value="${(productAssoc.quantity)!}"<#else>value="${(request.getParameter("quantity"))!}"</#if> size="10" maxlength="15"/></td> </tr> <tr> <td width="26%" align="right">${uiLabelMap.ManufacturingScrapFactor}</td> <td> </td> - <td width="74%"><input type="text" name="scrapFactor" <#if useValues>value="${(productAssoc.scrapFactor)?if_exists}"<#else>value="${(request.getParameter("scrapFactor"))?if_exists}"</#if> size="10" maxlength="15"/></td> + <td width="74%"><input type="text" name="scrapFactor" <#if useValues>value="${(productAssoc.scrapFactor)!}"<#else>value="${(request.getParameter("scrapFactor"))!}"</#if> size="10" maxlength="15"/></td> </tr> <tr> <td width="26%" align="right">${uiLabelMap.ManufacturingFormula}</td> @@ -199,12 +199,12 @@ function lookupBom() { <option value=""> </option> <#assign selectedFormula = ""> <#if useValues> - <#assign selectedFormula = (productAssoc.estimateCalcMethod)?if_exists> + <#assign selectedFormula = (productAssoc.estimateCalcMethod)!> <#else> - <#assign selectedFormula = (request.getParameter("estimateCalcMethod"))?if_exists> + <#assign selectedFormula = (request.getParameter("estimateCalcMethod"))!> </#if> <#list formulae as formula> - <option value="${formula.customMethodId}" <#if selectedFormula = formula.customMethodId>selected="selected"</#if>>${formula.get("description",locale)?if_exists}</option> + <option value="${formula.customMethodId}" <#if selectedFormula = formula.customMethodId>selected="selected"</#if>>${formula.get("description",locale)!}</option> </#list> </select> </td> @@ -214,9 +214,9 @@ function lookupBom() { <td> </td> <td width="74%"> <#if useValues> - <#assign value = productAssoc.routingWorkEffortId?if_exists> + <#assign value = productAssoc.routingWorkEffortId!> <#else> - <#assign value = request.getParameter("routingWorkEffortId")?if_exists> + <#assign value = request.getParameter("routingWorkEffortId")!> </#if> <#if value?has_content> <@htmlTemplate.lookupField value="${value}" formName="editProductAssocForm" name="routingWorkEffortId" id="routingWorkEffortId" fieldFormName="LookupRoutingTask"/> @@ -227,13 +227,13 @@ function lookupBom() { </tr> <tr> <td colspan="2"> </td> - <td><input type="submit" <#if !(productAssoc?exists)>value="${uiLabelMap.CommonAdd}"<#else>value="${uiLabelMap.CommonEdit}"</#if>/></td> + <td><input type="submit" <#if !(productAssoc??)>value="${uiLabelMap.CommonAdd}"<#else>value="${uiLabelMap.CommonEdit}"</#if>/></td> </tr> </table> </form> </div> </div> -<#if productId?exists && product?exists> +<#if productId?? && product??> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -258,26 +258,26 @@ function lookupBom() { <td> </td> </tr> <#assign alt_row = false> - <#list assocFromProducts?if_exists as assocFromProduct> + <#list assocFromProducts! as assocFromProduct> <#assign listToProduct = assocFromProduct.getRelatedOne("AssocProduct", true)> <#assign curProductAssocType = assocFromProduct.getRelatedOne("ProductAssocType", true)> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> - <td><a href="<@ofbizUrl>EditProductBom?productId=${(assocFromProduct.productIdTo)?if_exists}&productAssocTypeId=${(assocFromProduct.productAssocTypeId)?if_exists}#components</@ofbizUrl>" class="buttontext">${(assocFromProduct.productIdTo)?if_exists}</a></td> - <td><#if listToProduct?exists><a href="<@ofbizUrl>EditProductBom?productId=${(assocFromProduct.productIdTo)?if_exists}&productAssocTypeId=${(assocFromProduct.productAssocTypeId)?if_exists}#components</@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if> </td> - <td<#if (assocFromProduct.getTimestamp("fromDate"))?exists && nowDate.before(assocFromProduct.getTimestamp("fromDate"))> class="alert"</#if>> - ${(assocFromProduct.fromDate)?if_exists} </td> - <td<#if (assocFromProduct.getTimestamp("thruDate"))?exists && nowDate.after(assocFromProduct.getTimestamp("thruDate"))> class="alert"</#if>> - ${(assocFromProduct.thruDate)?if_exists} </td> - <td> ${(assocFromProduct.sequenceNum)?if_exists}</td> - <td> ${(assocFromProduct.quantity)?if_exists}</td> - <td> ${(assocFromProduct.scrapFactor)?if_exists}</td> - <td> ${(assocFromProduct.estimateCalcMethod)?if_exists}</td> - <td> ${(assocFromProduct.routingWorkEffortId)?if_exists}</td> + <td><a href="<@ofbizUrl>EditProductBom?productId=${(assocFromProduct.productIdTo)!}&productAssocTypeId=${(assocFromProduct.productAssocTypeId)!}#components</@ofbizUrl>" class="buttontext">${(assocFromProduct.productIdTo)!}</a></td> + <td><#if listToProduct??><a href="<@ofbizUrl>EditProductBom?productId=${(assocFromProduct.productIdTo)!}&productAssocTypeId=${(assocFromProduct.productAssocTypeId)!}#components</@ofbizUrl>" class="buttontext">${(listToProduct.internalName)!}</a></#if> </td> + <td<#if (assocFromProduct.getTimestamp("fromDate"))?? && nowDate.before(assocFromProduct.getTimestamp("fromDate"))> class="alert"</#if>> + ${(assocFromProduct.fromDate)!} </td> + <td<#if (assocFromProduct.getTimestamp("thruDate"))?? && nowDate.after(assocFromProduct.getTimestamp("thruDate"))> class="alert"</#if>> + ${(assocFromProduct.thruDate)!} </td> + <td> ${(assocFromProduct.sequenceNum)!}</td> + <td> ${(assocFromProduct.quantity)!}</td> + <td> ${(assocFromProduct.scrapFactor)!}</td> + <td> ${(assocFromProduct.estimateCalcMethod)!}</td> + <td> ${(assocFromProduct.routingWorkEffortId)!}</td> <td> - <a href="<@ofbizUrl>UpdateProductBom?UPDATE_MODE=DELETE&productId=${productId}&productIdTo=${(assocFromProduct.productIdTo)?if_exists}&productAssocTypeId=${(assocFromProduct.productAssocTypeId)?if_exists}&fromDate=${(assocFromProduct.fromDate)?if_exists}&useValues=true</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> + <a href="<@ofbizUrl>UpdateProductBom?UPDATE_MODE=DELETE&productId=${productId}&productIdTo=${(assocFromProduct.productIdTo)!}&productAssocTypeId=${(assocFromProduct.productAssocTypeId)!}&fromDate=${(assocFromProduct.fromDate)!}&useValues=true</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> </td> <td> - <a href="<@ofbizUrl>EditProductBom?productId=${productId}&productIdTo=${(assocFromProduct.productIdTo)?if_exists}&productAssocTypeId=${(assocFromProduct.productAssocTypeId)?if_exists}&fromDate=${(assocFromProduct.fromDate)?if_exists}&useValues=true</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a> + <a href="<@ofbizUrl>EditProductBom?productId=${productId}&productIdTo=${(assocFromProduct.productIdTo)!}&productAssocTypeId=${(assocFromProduct.productAssocTypeId)!}&fromDate=${(assocFromProduct.fromDate)!}&useValues=true</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a> </td> </tr> <#-- toggle the row color --> @@ -304,18 +304,18 @@ function lookupBom() { <td> </td> </tr> <#assign alt_row = false> - <#list assocToProducts?if_exists as assocToProduct> + <#list assocToProducts! as assocToProduct> <#assign listToProduct = assocToProduct.getRelatedOne("MainProduct", true)> <#assign curProductAssocType = assocToProduct.getRelatedOne("ProductAssocType", true)> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> - <td><a href="<@ofbizUrl>EditProductBom?productId=${(assocToProduct.productId)?if_exists}&productAssocTypeId=${(assocToProduct.productAssocTypeId)?if_exists}#components</@ofbizUrl>" class="buttontext">${(assocToProduct.productId)?if_exists}</a></td> -<!-- <td><#if listToProduct?exists><a href="<@ofbizUrl>EditProduct?productId=${(assocToProduct.productId)?if_exists}</@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if></td> --> - <td><#if listToProduct?exists><a href="<@ofbizUrl>EditProductBom?productId=${(assocToProduct.productId)?if_exists}&productAssocTypeId=${(assocToProduct.productAssocTypeId)?if_exists}#components</@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if></td> - <td>${(assocToProduct.getTimestamp("fromDate"))?if_exists} </td> - <td>${(assocToProduct.getTimestamp("thruDate"))?if_exists} </td> - <td>${(assocToProduct.quantity)?if_exists} </td> + <td><a href="<@ofbizUrl>EditProductBom?productId=${(assocToProduct.productId)!}&productAssocTypeId=${(assocToProduct.productAssocTypeId)!}#components</@ofbizUrl>" class="buttontext">${(assocToProduct.productId)!}</a></td> +<!-- <td><#if listToProduct??><a href="<@ofbizUrl>EditProduct?productId=${(assocToProduct.productId)!}</@ofbizUrl>" class="buttontext">${(listToProduct.internalName)!}</a></#if></td> --> + <td><#if listToProduct??><a href="<@ofbizUrl>EditProductBom?productId=${(assocToProduct.productId)!}&productAssocTypeId=${(assocToProduct.productAssocTypeId)!}#components</@ofbizUrl>" class="buttontext">${(listToProduct.internalName)!}</a></#if></td> + <td>${(assocToProduct.getTimestamp("fromDate"))!} </td> + <td>${(assocToProduct.getTimestamp("thruDate"))!} </td> + <td>${(assocToProduct.quantity)!} </td> <td> - <a href="<@ofbizUrl>UpdateProductBom?UPDATE_MODE=DELETE&productId=${(assocToProduct.productId)?if_exists}&productIdTo=${(assocToProduct.productIdTo)?if_exists}&productAssocTypeId=${(assocToProduct.productAssocTypeId)?if_exists}&fromDate=${Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(assocToProduct.getTimestamp("fromDate").toString())}&useValues=true</@ofbizUrl>" class="buttontext"> + <a href="<@ofbizUrl>UpdateProductBom?UPDATE_MODE=DELETE&productId=${(assocToProduct.productId)!}&productIdTo=${(assocToProduct.productIdTo)!}&productAssocTypeId=${(assocToProduct.productAssocTypeId)!}&fromDate=${Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(assocToProduct.getTimestamp("fromDate").toString())}&useValues=true</@ofbizUrl>" class="buttontext"> ${uiLabelMap.CommonDelete}</a> </td> </tr> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl Sat Aug 16 11:34:57 2014 @@ -35,7 +35,7 @@ under the License. <fo:page-sequence master-reference="main"> <fo:flow flow-name="xsl-region-body" font-family="Helvetica"> <fo:block font-size="16pt">${uiLabelMap.ManufacturingCuttingList}</fo:block> - <fo:block font-size="12pt">${uiLabelMap.ProductShipmentPlan}: ${shipmentId} ${uiLabelMap.ManufacturingDeliveryDate}: ${shipment.estimatedShipDate?if_exists}</fo:block> + <fo:block font-size="12pt">${uiLabelMap.ProductShipmentPlan}: ${shipmentId} ${uiLabelMap.ManufacturingDeliveryDate}: ${shipment.estimatedShipDate!}</fo:block> <fo:block space-after.optimum="10pt" font-size="10pt"> <fo:table> <fo:table-column column-width="60pt"/> @@ -59,13 +59,13 @@ under the License. <#list cuttingList as dimension> <fo:table-row> <fo:table-cell padding="2pt" background-color="${dimColor}"> - <fo:block>${dimension.width?if_exists}</fo:block> + <fo:block>${dimension.width!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${dimColor}"> - <fo:block>${dimension.height?if_exists}</fo:block> + <fo:block>${dimension.height!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${dimColor}"> - <fo:block>${dimension.quantity?if_exists}</fo:block> + <fo:block>${dimension.quantity!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${dimColor}"> <fo:block></fo:block> @@ -84,13 +84,13 @@ under the License. <fo:block></fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${product.quantity?if_exists}</fo:block> + <fo:block>${product.quantity!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${product.product.productId?if_exists}</fo:block> + <fo:block>${product.product.productId!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${product.product.internalName?if_exists}</fo:block> + <fo:block>${product.product.internalName!}</fo:block> </fo:table-cell> </fo:table-row> </#list> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl Sat Aug 16 11:34:57 2014 @@ -17,6 +17,6 @@ specific language governing permissions under the License. --> -<#if mrpName?exists> - <h1>${uiLabelMap.ManufacturingMrpName} ${mrpName?if_exists}</h1> +<#if mrpName??> + <h1>${uiLabelMap.ManufacturingMrpName} ${mrpName!}</h1> </#if> \ No newline at end of file Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl Sat Aug 16 11:34:57 2014 @@ -21,11 +21,11 @@ under the License. <fo:list-block provisional-distance-between-starts="40mm"> <fo:list-item> <fo:list-item-label><fo:block font-size="12">${uiLabelMap.ManufacturingProductionRunId}</fo:block></fo:list-item-label> - <fo:list-item-body start-indent="body-start()"><fo:block><fo:inline font-size="14" font-weight="bold" space-end="5mm">${productionRunData.workEffortId?if_exists}</fo:inline><#if productionRunData.productionRunName?exists> ${productionRunData.productionRunName}</#if></fo:block></fo:list-item-body> + <fo:list-item-body start-indent="body-start()"><fo:block><fo:inline font-size="14" font-weight="bold" space-end="5mm">${productionRunData.workEffortId!}</fo:inline><#if productionRunData.productionRunName??> ${productionRunData.productionRunName}</#if></fo:block></fo:list-item-body> </fo:list-item> <fo:list-item> <fo:list-item-label><fo:block font-size="12">${uiLabelMap.ProductProductId}</fo:block></fo:list-item-label> - <fo:list-item-body start-indent="body-start()"><fo:block><fo:inline font-size="14" font-weight="bold" space-end="5mm">${productionRunData.productId?if_exists}</fo:inline><#if productionRunData.product.productName?exists> ${productionRunData.product.productName}</#if></fo:block></fo:list-item-body> + <fo:list-item-body start-indent="body-start()"><fo:block><fo:inline font-size="14" font-weight="bold" space-end="5mm">${productionRunData.productId!}</fo:inline><#if productionRunData.product.productName??> ${productionRunData.product.productName}</#if></fo:block></fo:list-item-body> </fo:list-item> </fo:list-block> <fo:block><fo:leader leader-length="100%" leader-pattern="rule" rule-style="solid" rule-thickness="0.1mm" color="black"/></fo:block> @@ -38,19 +38,19 @@ under the License. <fo:list-block provisional-distance-between-starts="50mm"> <fo:list-item> <fo:list-item-label><fo:block>${uiLabelMap.ManufacturingQuantityToProduce}</fo:block></fo:list-item-label> - <fo:list-item-body start-indent="body-start()"><fo:block>${productionRunData.quantityToProduce?if_exists}</fo:block></fo:list-item-body> + <fo:list-item-body start-indent="body-start()"><fo:block>${productionRunData.quantityToProduce!}</fo:block></fo:list-item-body> </fo:list-item> <fo:list-item space-after="5mm"> <fo:list-item-label><fo:block>${uiLabelMap.ManufacturingQuantityRemaining}</fo:block></fo:list-item-label> - <fo:list-item-body start-indent="body-start()"><fo:block>${quantityRemaining?if_exists}</fo:block></fo:list-item-body> + <fo:list-item-body start-indent="body-start()"><fo:block>${quantityRemaining!}</fo:block></fo:list-item-body> </fo:list-item> <fo:list-item> <fo:list-item-label><fo:block>${uiLabelMap.ManufacturingEstimatedStartDate}</fo:block></fo:list-item-label> - <fo:list-item-body start-indent="body-start()"><fo:block><#if productionRunData.estimatedStartDate?exists>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.estimatedStartDate, "dd/MM/yyyy")}</#if></fo:block></fo:list-item-body> + <fo:list-item-body start-indent="body-start()"><fo:block><#if productionRunData.estimatedStartDate??>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.estimatedStartDate, "dd/MM/yyyy")}</#if></fo:block></fo:list-item-body> </fo:list-item> <fo:list-item> <fo:list-item-label><fo:block>${uiLabelMap.ManufacturingEstimatedCompletionDate}</fo:block></fo:list-item-label> - <fo:list-item-body start-indent="body-start()"><fo:block><#if productionRunData.estimatedCompletionDate?exists>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.estimatedCompletionDate, "dd/MM/yyyy")}</#if></fo:block></fo:list-item-body> + <fo:list-item-body start-indent="body-start()"><fo:block><#if productionRunData.estimatedCompletionDate??>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.estimatedCompletionDate, "dd/MM/yyyy")}</#if></fo:block></fo:list-item-body> </fo:list-item> </fo:list-block> </fo:table-cell> @@ -58,19 +58,19 @@ under the License. <fo:list-block provisional-distance-between-starts="50mm"> <fo:list-item> <fo:list-item-label><fo:block>${uiLabelMap.ManufacturingQuantityProduced}</fo:block></fo:list-item-label> - <fo:list-item-body start-indent="body-start()"><fo:block>${productionRunData.quantityProduced?if_exists}</fo:block></fo:list-item-body> + <fo:list-item-body start-indent="body-start()"><fo:block>${productionRunData.quantityProduced!}</fo:block></fo:list-item-body> </fo:list-item> <fo:list-item space-after="5mm"> <fo:list-item-label><fo:block>${uiLabelMap.ManufacturingQuantityRejected}</fo:block></fo:list-item-label> - <fo:list-item-body start-indent="body-start()"><fo:block>${quantityRejected?if_exists}</fo:block></fo:list-item-body> + <fo:list-item-body start-indent="body-start()"><fo:block>${quantityRejected!}</fo:block></fo:list-item-body> </fo:list-item> <fo:list-item> <fo:list-item-label><fo:block>${uiLabelMap.CommonStartDate}</fo:block></fo:list-item-label> - <fo:list-item-body start-indent="body-start()"><fo:block><#if productionRunData.actualStartDate?exists>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.actualStartDate, "dd/MM/yyyy")}</#if></fo:block></fo:list-item-body> + <fo:list-item-body start-indent="body-start()"><fo:block><#if productionRunData.actualStartDate??>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.actualStartDate, "dd/MM/yyyy")}</#if></fo:block></fo:list-item-body> </fo:list-item> <fo:list-item> <fo:list-item-label><fo:block>${uiLabelMap.ManufacturingActualCompletionDate}</fo:block></fo:list-item-label> - <fo:list-item-body start-indent="body-start()"><fo:block><#if productionRunData.actualCompletionDate?exists>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.actualCompletionDate, "dd/MM/yyyy")}</#if></fo:block></fo:list-item-body> + <fo:list-item-body start-indent="body-start()"><fo:block><#if productionRunData.actualCompletionDate??>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.actualCompletionDate, "dd/MM/yyyy")}</#if></fo:block></fo:list-item-body> </fo:list-item> </fo:list-block> </fo:table-cell> @@ -103,19 +103,19 @@ under the License. <fo:table-row> <fo:table-cell> - <fo:block>${productionRunComponentData.productId?if_exists}</fo:block> + <fo:block>${productionRunComponentData.productId!}</fo:block> </fo:table-cell> <fo:table-cell> - <fo:block>${productionRunComponentData.internalName?if_exists}</fo:block> + <fo:block>${productionRunComponentData.internalName!}</fo:block> </fo:table-cell> <fo:table-cell> - <fo:block>${productionRunComponentData.estimatedQuantity?if_exists}</fo:block> + <fo:block>${productionRunComponentData.estimatedQuantity!}</fo:block> </fo:table-cell> <fo:table-cell> - <fo:block>${productionRunComponentData.issuedQuantity?if_exists}</fo:block> + <fo:block>${productionRunComponentData.issuedQuantity!}</fo:block> </fo:table-cell> <fo:table-cell> - <fo:block>${resQuantityComp?if_exists}</fo:block> + <fo:block>${resQuantityComp!}</fo:block> </fo:table-cell> </fo:table-row> </#list> @@ -145,19 +145,19 @@ under the License. <#list productionRunRoutingTasks as productionRunRoutingTask> <fo:table-row> <fo:table-cell> - <fo:block>${productionRunRoutingTask.fixedAssetId?if_exists}</fo:block> + <fo:block>${productionRunRoutingTask.fixedAssetId!}</fo:block> </fo:table-cell> <fo:table-cell> - <fo:block>${productionRunRoutingTask.workEffortName?if_exists}</fo:block> + <fo:block>${productionRunRoutingTask.workEffortName!}</fo:block> </fo:table-cell> <fo:table-cell> - <fo:block>${productionRunRoutingTask.description?if_exists}</fo:block> + <fo:block>${productionRunRoutingTask.description!}</fo:block> </fo:table-cell> <fo:table-cell> - <fo:block>${productionRunRoutingTask.estimatedSetupMillis?if_exists}</fo:block> + <fo:block>${productionRunRoutingTask.estimatedSetupMillis!}</fo:block> </fo:table-cell> <fo:table-cell> - <fo:block>${productionRunRoutingTask.estimatedMilliSeconds?if_exists}</fo:block> + <fo:block>${productionRunRoutingTask.estimatedMilliSeconds!}</fo:block> </fo:table-cell> </fo:table-row> </#list> @@ -181,7 +181,7 @@ under the License. <#list productionRunContents as productionRunContent> <fo:table-row> <fo:table-cell padding="2pt"> - <fo:block>${productionRunContent.contentName?if_exists}</fo:block> + <fo:block>${productionRunContent.contentName!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt"> <fo:block><fo:basic-link background-color="lightblue" external-destination="<@ofbizContentUrl>/content/control/ViewBinaryDataResource?dataResourceId=${productionRunContent.drDataResourceId}</@ofbizContentUrl>">${uiLabelMap.CommonView}</fo:basic-link></fo:block> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl Sat Aug 16 11:34:57 2014 @@ -21,7 +21,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <#assign task = taskCost.task> - <h3>${uiLabelMap.ManufacturingActualCosts} ${task.workEffortName?if_exists} [${task.workEffortId}]</h3> + <h3>${uiLabelMap.ManufacturingActualCosts} ${task.workEffortName!} [${task.workEffortId}]</h3> </div> <div class="screenlet-body"> <#assign costsForm = taskCost.costsForm> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl Sat Aug 16 11:34:57 2014 @@ -22,7 +22,7 @@ under the License. <div class="screenlet-title-bar"> <#assign task = taskInfo.task> <#assign taskForm = taskInfo.taskForm> - <h3>${task.workEffortName?if_exists} [${task.workEffortId}]</h3> + <h3>${task.workEffortName!} [${task.workEffortId}]</h3> </div> <div class="screenlet-body"> ${taskForm.renderFormString(context)} Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl Sat Aug 16 11:34:57 2014 @@ -46,7 +46,7 @@ function lookupInventory() { <#if requestParameters.hideFields?default("N") == "Y"> <a href="<@ofbizUrl>FindInventoryEventPlan?hideFields=N${paramList}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonShowLookupFields}</a> <#else> - <#if inventoryList?exists> + <#if inventoryList??> <a href="<@ofbizUrl>FindInventoryEventPlan?hideFields=Y${paramList}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonHideFields}</a> </#if> </#if> @@ -64,7 +64,7 @@ function lookupInventory() { <td width='5%'> </td> <td> <span> - <@htmlTemplate.lookupField value='${requestParameters.productId?if_exists}' formName="lookupinventory" name="productId" id="productId" fieldFormName="LookupProduct"/> + <@htmlTemplate.lookupField value='${requestParameters.productId!}' formName="lookupinventory" name="productId" id="productId" fieldFormName="LookupProduct"/> </span> </td> </tr> @@ -72,7 +72,7 @@ function lookupInventory() { <td width='20%' align='right' class="label">${uiLabelMap.CommonFromDate}</td> <td width='5%'> </td> <td> - <@htmlTemplate.renderDateTimeField name="eventDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.eventDate?if_exists}" size="25" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="eventDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.eventDate!}" size="25" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> </tr> <tr> @@ -103,7 +103,7 @@ document.lookupinventory.productId.focus <table class="basic-table" cellspacing="0"> <tr> <td width='100%'> - <#if inventoryList?exists> + <#if inventoryList??> <#if 0 < inventoryList?size> <#assign rowClass = "alternate-row"> <table class="basic-table" cellspacing="0"> @@ -149,7 +149,7 @@ document.lookupinventory.productId.focus <#assign productTmp = ""> <#list inventoryList[lowIndex..highIndex-1] as inven> <#assign product = inven.getRelatedOne("Product", false)> - <#if facilityId?exists && facilityId?has_content> + <#if facilityId?? && facilityId?has_content> </#if> <#if ! product.equals( productTmp )> <#assign quantityAvailableAtDate = 0> @@ -166,28 +166,28 @@ document.lookupinventory.productId.focus <#assign quantityAvailableAtDate = initialQohEvent.quantity> </#if> <#if initialQohEvent.facilityId?has_content> - <#assign productFacility = delegator.findOne("ProductFacility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", initialQohEvent.facilityId, "productId", inven.productId), false)?if_exists> + <#assign productFacility = delegator.findOne("ProductFacility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", initialQohEvent.facilityId, "productId", inven.productId), false)!> </#if> <#else> <#assign additionalErrorMessage = "No QOH information found, assuming 0."> </#if> <tr bgcolor="lightblue"> <th> - <b>[${inven.productId}]</b> ${product.internalName?if_exists} + <b>[${inven.productId}]</b> ${product.internalName!} </th> <td> <#if productFacility?has_content> <div> - <b>${uiLabelMap.ProductFacility}:</b> ${productFacility.facilityId?if_exists} + <b>${uiLabelMap.ProductFacility}:</b> ${productFacility.facilityId!} </div> <div> - <b>${uiLabelMap.ProductMinimumStock}:</b> ${productFacility.minimumStock?if_exists} + <b>${uiLabelMap.ProductMinimumStock}:</b> ${productFacility.minimumStock!} </div> <div> - <b>${uiLabelMap.ProductReorderQuantity}:</b> ${productFacility.reorderQuantity?if_exists} + <b>${uiLabelMap.ProductReorderQuantity}:</b> ${productFacility.reorderQuantity!} </div> <div> - <b>${uiLabelMap.ProductDaysToShip}:</b> ${productFacility.daysToShip?if_exists} + <b>${uiLabelMap.ProductDaysToShip}:</b> ${productFacility.daysToShip!} </div> </#if> </td> @@ -202,7 +202,7 @@ document.lookupinventory.productId.focus </#if> <#list errorEvents as errorEvent> <tr> - <th colspan="7"><font color="red">${errorEvent.eventName?if_exists}</font></td> + <th colspan="7"><font color="red">${errorEvent.eventName!}</font></td> </tr> </#list> </#if> @@ -212,11 +212,11 @@ document.lookupinventory.productId.focus <tr class="${rowClass}"> <td>${MrpEventType.get("description",locale)}</td> <td> </td> - <td>${inven.eventName?if_exists}</td> + <td>${inven.eventName!}</td> <td><font <#if inven.isLate?default("N") == "Y">color='red'</#if>>${inven.getString("eventDate")}</font></td> <td> </td> <td align="right">${inven.getString("quantity")}</td> - <td align="right">${quantityAvailableAtDate?if_exists}</td> + <td align="right">${quantityAvailableAtDate!}</td> </tr> <#assign count=count+1> </#list> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl Sat Aug 16 11:34:57 2014 @@ -33,13 +33,13 @@ under the License. <fo:static-content flow-name="xsl-region-before"> <fo:block line-height="10pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always"> <#if showLocation == "Y"> - <#if mrpName?exists> + <#if mrpName??> Doc.F0 <#else> Doc.F2 </#if> <#else> - <#if mrpName?exists> + <#if mrpName??> Doc.F1 <#else> Doc.F3 @@ -68,7 +68,7 @@ under the License. <fo:table-row> <fo:table-cell> <fo:block line-height="13pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start"> - <#if mrpName?exists> + <#if mrpName??> <fo:inline font-size="10pt">${uiLabelMap.ManufacturingPlan}:</fo:inline> <fo:inline font-weight="bold" font-size="10pt">${mrpName}</fo:inline> <#else> @@ -80,7 +80,7 @@ under the License. <fo:table-cell> <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end"> <fo:inline font-size="10pt">${uiLabelMap.ProductProductCategory}:</fo:inline> - <fo:inline font-weight="bold" font-size="10pt"><#if category?exists>${category.description?if_exists}</#if></fo:inline> + <fo:inline font-weight="bold" font-size="10pt"><#if category??>${category.description!}</#if></fo:inline> </fo:block> </fo:table-cell> </fo:table-row> @@ -100,8 +100,8 @@ under the License. </fo:table-cell> <fo:table-cell> <fo:block line-height="13pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end"> - <fo:inline font-size="10pt"><#if featureType?exists>${featureType.get("description",locale)?if_exists}: </#if></fo:inline> - <fo:inline font-weight="bold" font-size="10pt"><#if feature.productFeature?exists>${feature.productFeature.description?if_exists}</#if></fo:inline> + <fo:inline font-size="10pt"><#if featureType??>${featureType.get("description",locale)!}: </#if></fo:inline> + <fo:inline font-weight="bold" font-size="10pt"><#if feature.productFeature??>${feature.productFeature.description!}</#if></fo:inline> </fo:block> </fo:table-cell> </fo:table-row> @@ -115,12 +115,12 @@ under the License. <fo:table-row> <fo:table-cell> <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start"> - <#if mrpName?exists> + <#if mrpName??> <fo:inline font-size="10pt">${uiLabelMap.ManufacturingPickingPeriod} :</fo:inline> - <fo:inline font-weight="bold" font-size="10pt">${mrpName?if_exists}</fo:inline> + <fo:inline font-weight="bold" font-size="10pt">${mrpName!}</fo:inline> <#else> <fo:inline font-size="10pt">${uiLabelMap.ManufacturingPickingDate} :</fo:inline> - <fo:inline font-weight="bold" font-size="10pt">${shipment.estimatedShipDate?if_exists}</fo:inline> + <fo:inline font-weight="bold" font-size="10pt">${shipment.estimatedShipDate!}</fo:inline> </#if> </fo:block> </fo:table-cell> @@ -192,7 +192,7 @@ under the License. </fo:table-cell> <fo:table-cell border-style="solid" border-color="black" border-width="1pt"> <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always"> - ${product.product.internalName?if_exists} + ${product.product.internalName!} </fo:block> </fo:table-cell> <fo:table-cell border-style="solid" border-color="black" border-width="1pt"> @@ -203,9 +203,9 @@ under the License. <fo:table-cell border-style="solid" border-color="black" border-width="1pt"> <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end"> <#if showLocation == "Y"> - ${product.panelQuantity?if_exists} + ${product.panelQuantity!} <#else> - ${product.Location?if_exists} + ${product.Location!} </#if> </fo:block> </fo:table-cell> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl Sat Aug 16 11:34:57 2014 @@ -27,7 +27,7 @@ under the License. </fo:simple-page-master> </fo:layout-master-set> -<#if productionRuns?exists> +<#if productionRuns??> <#list productionRuns as productionRun> <#assign componentList = productionRun.componentList> @@ -187,12 +187,12 @@ under the License. </fo:table-cell> <fo:table-cell border-style="solid" border-color="black" border-width="1pt"> <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always"> - ${product.componentProduct.internalName?if_exists} + ${product.componentProduct.internalName!} </fo:block> </fo:table-cell> <fo:table-cell border-style="solid" border-color="black" border-width="1pt"> <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end"> - ${product.componentProduct.quantityUomId?if_exists} + ${product.componentProduct.quantityUomId!} </fo:block> </fo:table-cell> <fo:table-cell border-style="solid" border-color="black" border-width="1pt"> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsAndOrder.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsAndOrder.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsAndOrder.fo.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsAndOrder.fo.ftl Sat Aug 16 11:34:57 2014 @@ -228,7 +228,7 @@ Doc.D </fo:table-cell> <fo:table-cell> <fo:block line-height="8pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start"> - <fo:inline font-size="8pt">${productionRun.product.brandName?if_exists}</fo:inline> + <fo:inline font-size="8pt">${productionRun.product.brandName!}</fo:inline> </fo:block> </fo:table-cell> <fo:table-cell> @@ -259,7 +259,7 @@ Doc.D </fo:table-cell> <fo:table-cell> <fo:block line-height="12pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start"> - <fo:inline font-size="9pt">${productionRun.product.internalName?if_exists}</fo:inline> + <fo:inline font-size="9pt">${productionRun.product.internalName!}</fo:inline> </fo:block> </fo:table-cell> <fo:table-cell> @@ -311,7 +311,7 @@ Doc.D </fo:table-cell> <fo:table-cell> <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start"> - <fo:inline font-size="12pt">${productionRun.location?if_exists}</fo:inline> + <fo:inline font-size="12pt">${productionRun.location!}</fo:inline> </fo:block> </fo:table-cell> <fo:table-cell> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl Sat Aug 16 11:34:57 2014 @@ -33,7 +33,7 @@ under the License. <fo:static-content flow-name="xsl-region-before"> <fo:block line-height="10pt" font-size="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always"> - <#if shipment?exists> + <#if shipment??> Doc.E1 <#else> Doc.E0 @@ -62,7 +62,7 @@ under the License. <fo:table-row> <fo:table-cell> <fo:block line-height="13pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start"> - <#if shipment?exists> + <#if shipment??> <fo:inline font-size="10pt">${uiLabelMap.ProductShipmentPlan}:</fo:inline> <fo:inline font-weight="bold" font-size="10pt">${shipment.shipmentId}</fo:inline> <#else> @@ -74,7 +74,7 @@ under the License. <fo:table-cell> <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end"> <fo:inline font-size="10pt">${uiLabelMap.ProductProductCategory}:</fo:inline> - <fo:inline font-weight="bold" font-size="10pt"><#if category?exists>${category.description?if_exists}</#if></fo:inline> + <fo:inline font-weight="bold" font-size="10pt"><#if category??>${category.description!}</#if></fo:inline> </fo:block> </fo:table-cell> </fo:table-row> @@ -94,8 +94,8 @@ under the License. </fo:table-cell> <fo:table-cell> <fo:block line-height="13pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end"> - <fo:inline font-size="10pt"><#if featureType?exists>${featureType.get("description",locale)?if_exists}: </#if></fo:inline> - <fo:inline font-weight="bold" font-size="10pt"><#if feature.productFeature?exists>${feature.productFeature.description?if_exists}</#if></fo:inline> + <fo:inline font-size="10pt"><#if featureType??>${featureType.get("description",locale)!}: </#if></fo:inline> + <fo:inline font-weight="bold" font-size="10pt"><#if feature.productFeature??>${feature.productFeature.description!}</#if></fo:inline> </fo:block> </fo:table-cell> </fo:table-row> @@ -109,9 +109,9 @@ under the License. <fo:table-row> <fo:table-cell> <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start"> - <#if shipment?exists> + <#if shipment??> <fo:inline font-size="10pt">${uiLabelMap.ManufacturingEstimatedShipDate} :</fo:inline> - <fo:inline font-weight="bold" font-size="10pt">${shipment.estimatedShipDate?if_exists}</fo:inline> + <fo:inline font-weight="bold" font-size="10pt">${shipment.estimatedShipDate!}</fo:inline> <#else> <fo:inline font-size="10pt">${uiLabelMap.ManufacturingPickingPeriod} :</fo:inline> <fo:inline font-weight="bold" font-size="10pt">${mrpName}</fo:inline> @@ -201,27 +201,27 @@ under the License. </fo:table-cell> <fo:table-cell border-style="solid" border-color="black" border-width="1pt"> <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end"> - ${productionRun.product.productHeight?if_exists} + ${productionRun.product.productHeight!} </fo:block> </fo:table-cell> <fo:table-cell border-style="solid" border-color="black" border-width="1pt"> <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end"> - ${productionRun.product.productWidth?if_exists} + ${productionRun.product.productWidth!} </fo:block> </fo:table-cell> <fo:table-cell border-style="solid" border-color="black" border-width="1pt"> <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always"> - ${productionRun.product.internalName?if_exists} + ${productionRun.product.internalName!} </fo:block> </fo:table-cell> <fo:table-cell border-style="solid" border-color="black" border-width="1pt"> <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end"> - ${productionRun.productionRun.quantityToProduce?if_exists} + ${productionRun.productionRun.quantityToProduce!} </fo:block> </fo:table-cell> <fo:table-cell border-style="solid" border-color="black" border-width="1pt"> <fo:block line-height="12pt" font-size="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always"> - ${productionRun.product.brandName?if_exists} + ${productionRun.product.brandName!} </fo:block> </fo:table-cell> </fo:table-row> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl Sat Aug 16 11:34:57 2014 @@ -254,7 +254,7 @@ under the License. </fo:table-cell> <fo:table-cell> <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start"> - <fo:inline font-size="10pt"><#if productionRun.location?exists>${productionRun.location.locationSeqId?if_exists}</#if></fo:inline> + <fo:inline font-size="10pt"><#if productionRun.location??>${productionRun.location.locationSeqId!}</#if></fo:inline> </fo:block> </fo:table-cell> <fo:table-cell> @@ -266,7 +266,7 @@ under the License. </fo:table-cell> <fo:table-cell> <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start"> - <fo:inline font-size="10pt"><#if productionRun.location?exists>${productionRun.location.locationSeqId?if_exists}</#if></fo:inline> + <fo:inline font-size="10pt"><#if productionRun.location??>${productionRun.location.locationSeqId!}</#if></fo:inline> </fo:block> </fo:table-cell> </fo:table-row> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl Sat Aug 16 11:34:57 2014 @@ -288,7 +288,7 @@ Doc.B </fo:table-cell> <fo:table-cell> <fo:block line-height="10pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start"> - <fo:inline font-size="10pt">${component.orderItem.selectedAmount?if_exists}</fo:inline> + <fo:inline font-size="10pt">${component.orderItem.selectedAmount!}</fo:inline> </fo:block> </fo:table-cell> <fo:table-cell> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl Sat Aug 16 11:34:57 2014 @@ -46,19 +46,19 @@ under the License. <tr> <td width='26%' align='right' valign='top' class="label">${uiLabelMap.ManufacturingCalendarId}</td> <td width="5"> </td> - <td width="74%" valign="top"><span class="label">${techDataCalendar.calendarId?if_exists}</span> <span class="tooltip">(${uiLabelMap.CommonNotModifRecreat})</span></td> + <td width="74%" valign="top"><span class="label">${techDataCalendar.calendarId!}</span> <span class="tooltip">(${uiLabelMap.CommonNotModifRecreat})</span></td> </tr> <#else> <tr> <td width='26%' align='right' valign="top" class="label">${uiLabelMap.ManufacturingCalendarId}</td> <td width="5"> </td> - <td width="74%"><input type="text" size="12" name="calendarId" value="${calendarData.calendarId?if_exists}" /></td> + <td width="74%"><input type="text" size="12" name="calendarId" value="${calendarData.calendarId!}" /></td> </tr> </#if> <tr> <td width='26%' align='right' valign='top' class="label">${uiLabelMap.CommonDescription}</td> <td width="5"> </td> - <td width="74%"><input type="text" size="40" name="description" value="${calendarData.description?if_exists}" /></td> + <td width="74%"><input type="text" size="40" name="description" value="${calendarData.description!}" /></td> </tr> <tr> <td width='26%' align='right' valign='top' class="label">${uiLabelMap.ManufacturingCalendarWeekId}</td> @@ -66,7 +66,7 @@ under the License. <td width="74%"> <select name="calendarWeekId"> <#list calendarWeeks as calendarWeek> - <option value="${calendarWeek.calendarWeekId}" <#if calendarData?has_content && calendarData.calendarWeekId?default("") == calendarWeek.calendarWeekId>SELECTED</#if>>${(calendarWeek.get("description",locale))?if_exists}</option> + <option value="${calendarWeek.calendarWeekId}" <#if calendarData?has_content && calendarData.calendarWeekId?default("") == calendarWeek.calendarWeekId>SELECTED</#if>>${(calendarWeek.get("description",locale))!}</option> </#list> </select> </td> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionDay.ftl Sat Aug 16 11:34:57 2014 @@ -22,7 +22,7 @@ under the License. <div class="screenlet-title-bar"> <h3>${uiLabelMap.ManufacturingEditCalendarExceptionDayFor} <#if (techDataCalendar.description)?has_content>"${(techDataCalendar.get("description",locale))}"</#if> - [${uiLabelMap.CommonId} ${techDataCalendar.calendarId?if_exists}]</h3> + [${uiLabelMap.CommonId} ${techDataCalendar.calendarId!}]</h3> </div> <div class="screenlet-body"> ${listCalendarExceptionDayWrapper.renderFormString(context)} Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendarExceptionWeek.ftl Sat Aug 16 11:34:57 2014 @@ -22,7 +22,7 @@ under the License. <div class="screenlet-title-bar"> <h3>${uiLabelMap.ManufacturingEditCalendarExceptionWeekFor} <#if (techDataCalendar.description)?has_content>"${(techDataCalendar.get("description",locale))}"</#if> - [${uiLabelMap.CommonId} ${techDataCalendar.calendarId?if_exists}]</h3> + [${uiLabelMap.CommonId} ${techDataCalendar.calendarId!}]</h3> </div> <div class="screenlet-body"> ${listCalendarExceptionWeekWrapper.renderFormString(context)} Modified: ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl (original) +++ ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl Sat Aug 16 11:34:57 2014 @@ -23,16 +23,16 @@ under the License. <#if contactInfoList?has_content > <#assign contactInfo1 = contactInfoList[0]/> <#assign contactInfo2 = contactInfoList[1]/> - <input type="hidden" name="partyIdTo" value="${contactInfo1.partyId?if_exists}" /> - <input type="hidden" name="partyId" value="${contactInfo2.partyId?if_exists}" /> + <input type="hidden" name="partyIdTo" value="${contactInfo1.partyId!}" /> + <input type="hidden" name="partyId" value="${contactInfo2.partyId!}" /> - <input type="hidden" name="addrContactMechIdTo" value="${contactInfo1.addrContactMechId?if_exists}" /> - <input type="hidden" name="phoneContactMechIdTo" value="${contactInfo1.phoneContactMechId?if_exists}" /> - <input type="hidden" name="emailContactMechIdTo" value="${contactInfo1.emailContactMechId?if_exists}" /> + <input type="hidden" name="addrContactMechIdTo" value="${contactInfo1.addrContactMechId!}" /> + <input type="hidden" name="phoneContactMechIdTo" value="${contactInfo1.phoneContactMechId!}" /> + <input type="hidden" name="emailContactMechIdTo" value="${contactInfo1.emailContactMechId!}" /> - <input type="hidden" name="addrContactMechId" value="${contactInfo2.addrContactMechId?if_exists}" /> - <input type="hidden" name="phoneContactMechId" value="${contactInfo2.phoneContactMechId?if_exists}" /> - <input type="hidden" name="emailContactMechId" value="${contactInfo2.emailContactMechId?if_exists}" /> + <input type="hidden" name="addrContactMechId" value="${contactInfo2.addrContactMechId!}" /> + <input type="hidden" name="phoneContactMechId" value="${contactInfo2.phoneContactMechId!}" /> + <input type="hidden" name="emailContactMechId" value="${contactInfo2.emailContactMechId!}" /> <table > <tr> @@ -43,14 +43,14 @@ under the License. </tr> <tr> <td width="20%">${uiLabelMap.PartyFirstName}</td> - <td width="30%"><h3>${contactInfo1.firstName?if_exists}</h3></td> - <td width="30%"><h3>${contactInfo2.firstName?if_exists}</h3></td> + <td width="30%"><h3>${contactInfo1.firstName!}</h3></td> + <td width="30%"><h3>${contactInfo2.firstName!}</h3></td> <td width="20%"></td> </tr> <tr> <td width="20%">${uiLabelMap.PartyLastName}</td> - <td width="30%"><h3>${contactInfo1.lastName?if_exists}</h3></td> - <td width="30%"><h3>${contactInfo2.lastName?if_exists}</h3></td> + <td width="30%"><h3>${contactInfo1.lastName!}</h3></td> + <td width="30%"><h3>${contactInfo2.lastName!}</h3></td> <td width="20%"></td> </tr> <tr> @@ -59,65 +59,65 @@ under the License. </tr> <tr> <td width="20%" >${uiLabelMap.PartyAddressLine1}</td> - <td width="30%">${contactInfo1.address1?if_exists}</td> - <td width="30%">${contactInfo2.address1?if_exists}</td> + <td width="30%">${contactInfo1.address1!}</td> + <td width="30%">${contactInfo2.address1!}</td> <td width="20%"><input type="checkbox" name="useAddress2" value="Y"/></td> </tr> <tr> <td width="20%" >${uiLabelMap.PartyAddressLine2}</td> - <td width="30%">${contactInfo1.address2?if_exists}</td> - <td width="30%">${contactInfo2.address2?if_exists}</td> + <td width="30%">${contactInfo1.address2!}</td> + <td width="30%">${contactInfo2.address2!}</td> <td width="20%"></td> </tr> <tr> <td width="20%" >${uiLabelMap.PartyCity}</td> - <td width="30%">${contactInfo1.city?if_exists}</td> - <td width="30%">${contactInfo2.city?if_exists}</td> + <td width="30%">${contactInfo1.city!}</td> + <td width="30%">${contactInfo2.city!}</td> <td width="20%"></td> </tr> <tr> <td width="20%">${uiLabelMap.PartyState}</td> - <td width="30%">${contactInfo1.state?if_exists}</td> - <td width="30%">${contactInfo2.state?if_exists}</td> + <td width="30%">${contactInfo1.state!}</td> + <td width="30%">${contactInfo2.state!}</td> <td width="20%"></td> </tr> <tr> <td width="20%">${uiLabelMap.PartyZipCode}</td> - <td width="30%">${contactInfo1.postalCode?if_exists}</td> - <td width="30%">${contactInfo2.postalCode?if_exists}</td> + <td width="30%">${contactInfo1.postalCode!}</td> + <td width="30%">${contactInfo2.postalCode!}</td> <td width="20%"></td> </tr> <tr> <td width="20%" >${uiLabelMap.CommonCountry}</td> - <td width="30%">${contactInfo1.country?if_exists}</td> - <td width="30%">${contactInfo2.country?if_exists}</td> + <td width="30%">${contactInfo1.country!}</td> + <td width="30%">${contactInfo2.country!}</td> <td width="20%"></td> </tr> <tr><td><br /><h3>${uiLabelMap.PartyPrimaryPhone}</h3></td></tr> <tr> <td width="20%">${uiLabelMap.CommonCountryCode}</td> - <td width="30%">${contactInfo1.countryCode?if_exists}</td> - <td width="30%">${contactInfo2.countryCode?if_exists}</td> + <td width="30%">${contactInfo1.countryCode!}</td> + <td width="30%">${contactInfo2.countryCode!}</td> <td width="10%"><input type="checkbox" name="useContactNum2" value="Y"/></td> </tr> <tr> <td width="20%" >${uiLabelMap.PartyAreaCode}</td> - <td width="30%">${contactInfo1.areaCode?if_exists}</td> - <td width="30%">${contactInfo2.areaCode?if_exists}</td> + <td width="30%">${contactInfo1.areaCode!}</td> + <td width="30%">${contactInfo2.areaCode!}</td> <td width="20%"></td> </tr> <tr> <td width="20%" >${uiLabelMap.PartyPhoneNumber}</td> - <td width="30%">${contactInfo1.contactNumber?if_exists}</td> - <td width="30%">${contactInfo2.contactNumber?if_exists}</td> + <td width="30%">${contactInfo1.contactNumber!}</td> + <td width="30%">${contactInfo2.contactNumber!}</td> <td width="20%"></td> </tr> <tr> <td width="20%" >${uiLabelMap.PartyEmailAddress}</td> - <td width="30%">${contactInfo1.primaryEmail?if_exists}</td> - <td width="30%">${contactInfo2.primaryEmail?if_exists}</td> + <td width="30%">${contactInfo1.primaryEmail!}</td> + <td width="30%">${contactInfo2.primaryEmail!}</td> <td width="10%"><input type="checkbox" name="useEmail2" value="Y"/></td> </tr> <tr> Modified: ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl (original) +++ ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl Sat Aug 16 11:34:57 2014 @@ -27,16 +27,16 @@ under the License. <#if contactInfoList?has_content > <#assign contactInfo1 = contactInfoList[0]/> <#assign contactInfo2 = contactInfoList[1]/> - <input type="hidden" name="partyIdTo" value="${contactInfo1.partyId?if_exists}" /> - <input type="hidden" name="partyId" value="${contactInfo2.partyId?if_exists}" /> + <input type="hidden" name="partyIdTo" value="${contactInfo1.partyId!}" /> + <input type="hidden" name="partyId" value="${contactInfo2.partyId!}" /> - <input type="hidden" name="addrContactMechIdTo" value="${contactInfo1.addrContactMechId?if_exists}" /> - <input type="hidden" name="phoneContactMechIdTo" value="${contactInfo1.phoneContactMechId?if_exists}" /> - <input type="hidden" name="emailContactMechIdTo" value="${contactInfo1.emailContactMechId?if_exists}" /> + <input type="hidden" name="addrContactMechIdTo" value="${contactInfo1.addrContactMechId!}" /> + <input type="hidden" name="phoneContactMechIdTo" value="${contactInfo1.phoneContactMechId!}" /> + <input type="hidden" name="emailContactMechIdTo" value="${contactInfo1.emailContactMechId!}" /> - <input type="hidden" name="addrContactMechId" value="${contactInfo2.addrContactMechId?if_exists}" /> - <input type="hidden" name="phoneContactMechId" value="${contactInfo2.phoneContactMechId?if_exists}" /> - <input type="hidden" name="emailContactMechId" value="${contactInfo2.emailContactMechId?if_exists}" /> + <input type="hidden" name="addrContactMechId" value="${contactInfo2.addrContactMechId!}" /> + <input type="hidden" name="phoneContactMechId" value="${contactInfo2.phoneContactMechId!}" /> + <input type="hidden" name="emailContactMechId" value="${contactInfo2.emailContactMechId!}" /> <table > <tr> @@ -47,14 +47,14 @@ under the License. </tr> <tr> <td width="20%">${uiLabelMap.PartyFirstName}</td> - <td width="30%"><h3>${contactInfo1.firstName?if_exists}</h3></td> - <td width="30%"><h3>${contactInfo2.firstName?if_exists}</h3></td> + <td width="30%"><h3>${contactInfo1.firstName!}</h3></td> + <td width="30%"><h3>${contactInfo2.firstName!}</h3></td> <td width="20%"></td> </tr> <tr> <td width="20%">${uiLabelMap.PartyLastName}</td> - <td width="30%"><h3>${contactInfo1.lastName?if_exists}</h3></td> - <td width="30%"><h3>${contactInfo2.lastName?if_exists}</h3></td> + <td width="30%"><h3>${contactInfo1.lastName!}</h3></td> + <td width="30%"><h3>${contactInfo2.lastName!}</h3></td> <td width="20%"></td> </tr> <tr> @@ -63,65 +63,65 @@ under the License. </tr> <tr> <td width="20%" >${uiLabelMap.PartyAddressLine1}</td> - <td width="30%">${contactInfo1.address1?if_exists}</td> - <td width="30%">${contactInfo2.address1?if_exists}</td> + <td width="30%">${contactInfo1.address1!}</td> + <td width="30%">${contactInfo2.address1!}</td> <td width="20%"><input type="checkbox" name="useAddress2" value="Y"/></td> </tr> <tr> <td width="20%" >${uiLabelMap.PartyAddressLine2}</td> - <td width="30%">${contactInfo1.address2?if_exists}</td> - <td width="30%">${contactInfo2.address2?if_exists}</td> + <td width="30%">${contactInfo1.address2!}</td> + <td width="30%">${contactInfo2.address2!}</td> <td width="20%"></td> </tr> <tr> <td width="20%" >${uiLabelMap.PartyCity}</td> - <td width="30%">${contactInfo1.city?if_exists}</td> - <td width="30%">${contactInfo2.city?if_exists}</td> + <td width="30%">${contactInfo1.city!}</td> + <td width="30%">${contactInfo2.city!}</td> <td width="20%"></td> </tr> <tr> <td width="20%">${uiLabelMap.PartyState}</td> - <td width="30%">${contactInfo1.state?if_exists}</td> - <td width="30%">${contactInfo2.state?if_exists}</td> + <td width="30%">${contactInfo1.state!}</td> + <td width="30%">${contactInfo2.state!}</td> <td width="20%"></td> </tr> <tr> <td width="20%">${uiLabelMap.PartyZipCode}</td> - <td width="30%">${contactInfo1.postalCode?if_exists}</td> - <td width="30%">${contactInfo2.postalCode?if_exists}</td> + <td width="30%">${contactInfo1.postalCode!}</td> + <td width="30%">${contactInfo2.postalCode!}</td> <td width="20%"></td> </tr> <tr> <td width="20%" >${uiLabelMap.CommonCountry}</td> - <td width="30%">${contactInfo1.country?if_exists}</td> - <td width="30%">${contactInfo2.country?if_exists}</td> + <td width="30%">${contactInfo1.country!}</td> + <td width="30%">${contactInfo2.country!}</td> <td width="20%"></td> </tr> <tr><td><br /><h3>${uiLabelMap.PartyPrimaryPhone}</h3></td></tr> <tr> <td width="20%">${uiLabelMap.CommonCountryCode}</td> - <td width="30%">${contactInfo1.countryCode?if_exists}</td> - <td width="30%">${contactInfo2.countryCode?if_exists}</td> + <td width="30%">${contactInfo1.countryCode!}</td> + <td width="30%">${contactInfo2.countryCode!}</td> <td width="10%"><input type="checkbox" name="useContactNum2" value="Y"/></td> </tr> <tr> <td width="20%" >${uiLabelMap.PartyAreaCode}</td> - <td width="30%">${contactInfo1.areaCode?if_exists}</td> - <td width="30%">${contactInfo2.areaCode?if_exists}</td> + <td width="30%">${contactInfo1.areaCode!}</td> + <td width="30%">${contactInfo2.areaCode!}</td> <td width="20%"></td> </tr> <tr> <td width="20%" >${uiLabelMap.PartyPhoneNumber}</td> - <td width="30%">${contactInfo1.contactNumber?if_exists}</td> - <td width="30%">${contactInfo2.contactNumber?if_exists}</td> + <td width="30%">${contactInfo1.contactNumber!}</td> + <td width="30%">${contactInfo2.contactNumber!}</td> <td width="20%"></td> </tr> <tr> <td width="20%" >${uiLabelMap.PartyEmailAddress}</td> - <td width="30%">${contactInfo1.primaryEmail?if_exists}</td> - <td width="30%">${contactInfo2.primaryEmail?if_exists}</td> + <td width="30%">${contactInfo1.primaryEmail!}</td> + <td width="30%">${contactInfo2.primaryEmail!}</td> <td width="10%"><input type="checkbox" name="useEmail2" value="Y"/></td> </tr> <tr> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |