svn commit: r1618336 [18/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
Locked
svn commit: r1618336 [18/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
 
|
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl Sat Aug 16 11:34:57 2014 @@ -34,10 +34,10 @@ under the License. <#assign orderId = order.orderId> <#assign orderDate = order.orderDate> <#list orderInfoList as orderInfo> - <#if orderInfo.get("${orderId}")?exists> + <#if orderInfo.get("${orderId}")??> <#assign orderDetail = orderInfo.get("${orderId}")> <#assign orderDate = orderDetail.orderDate> - <#if orderDetail.billingAddress?exists> + <#if orderDetail.billingAddress??> <#assign billAddress = orderDetail.billingAddress> </#if> <#assign shipAddress = orderDetail.shippingAddress> @@ -73,12 +73,12 @@ under the License. <fo:table-row> <fo:table-cell> <fo:block font-weight="bold">${uiLabelMap.OrderShipToParty}:</fo:block> - <fo:block>${shipAddress.toName?if_exists}</fo:block> - <fo:block> ${shipAddress.address1?if_exists}</fo:block> - <fo:block> ${shipAddress.city?if_exists}</fo:block> - <fo:block> ${shipAddress.countryGeoId?if_exists}</fo:block> - <fo:block> ${shipAddress.postalCode?if_exists}</fo:block> - <fo:block> ${shipAddress.stateProvinceGeoId?if_exists}</fo:block> + <fo:block>${shipAddress.toName!}</fo:block> + <fo:block> ${shipAddress.address1!}</fo:block> + <fo:block> ${shipAddress.city!}</fo:block> + <fo:block> ${shipAddress.countryGeoId!}</fo:block> + <fo:block> ${shipAddress.postalCode!}</fo:block> + <fo:block> ${shipAddress.stateProvinceGeoId!}</fo:block> </fo:table-cell> <fo:table-cell> <fo:table> @@ -88,12 +88,12 @@ under the License. <fo:table-cell> <#if billAddress?has_content> <fo:block font-weight="bold">${uiLabelMap.OrderOrderBillToParty}:</fo:block> - <fo:block> ${billAddress.toName?if_exists}</fo:block> - <fo:block> ${billAddress.address1?if_exists}</fo:block> - <fo:block> ${billAddress.city?if_exists}</fo:block> - <fo:block> ${billAddress.countryGeoId?if_exists}</fo:block> - <fo:block> ${billAddress.postalCode?if_exists}</fo:block> - <fo:block> ${billAddress.stateProvinceGeoId?if_exists}</fo:block> + <fo:block> ${billAddress.toName!}</fo:block> + <fo:block> ${billAddress.address1!}</fo:block> + <fo:block> ${billAddress.city!}</fo:block> + <fo:block> ${billAddress.countryGeoId!}</fo:block> + <fo:block> ${billAddress.postalCode!}</fo:block> + <fo:block> ${billAddress.stateProvinceGeoId!}</fo:block> </#if> </fo:table-cell> </fo:table-row> @@ -125,7 +125,7 @@ under the License. <fo:block>${uiLabelMap.ProductShipmentMethod}:</fo:block> </fo:table-cell> <fo:table-cell> - <fo:block font-weight="bold">${carrierPartyId?if_exists}-${shipmentMethodType?if_exists}</fo:block> + <fo:block font-weight="bold">${carrierPartyId!}-${shipmentMethodType!}</fo:block> </fo:table-cell> </fo:table-row> </fo:table-body> @@ -157,17 +157,17 @@ under the License. <#assign totalQty = 0> <#assign rowColor = "#D4D0C8"/> <#list itemInfoList as itemInfo> - <#if itemInfo.get("${orderId}")?exists > + <#if itemInfo.get("${orderId}")?? > <#assign infoItems = itemInfo.get("${orderId}")> <#list infoItems as infoItem> <#assign orderItemShipGrpInvRes = infoItem.orderItemShipGrpInvRes> <#assign quantityToPick = Static["java.lang.Integer"].parseInt("${orderItemShipGrpInvRes.quantity}") > - <#if orderItemShipGrpInvRes.quantityNotAvailable?exists > + <#if orderItemShipGrpInvRes.quantityNotAvailable?? > <#assign quantityToPick = quantityToPick - Static["java.lang.Integer"].parseInt("${orderItemShipGrpInvRes.quantityNotAvailable}")> </#if> <#assign orderItem = orderItemShipGrpInvRes.getRelatedOne("OrderItem", false)> <#assign product = orderItem.getRelatedOne("Product", false)> - <#assign supplierProduct = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(product.getRelated("SupplierProduct", null, null, false))?if_exists> + <#assign supplierProduct = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(product.getRelated("SupplierProduct", null, null, false))!> <#assign inventoryItem = infoItem.inventoryItem> <#if (quantityToPick > 0)> <fo:table-row background-color="${rowColor}"> @@ -178,14 +178,14 @@ under the License. <fo:table-cell><fo:block font-size="10pt">_NA_</fo:block></fo:table-cell> </#if> <fo:table-cell><fo:block font-size="10pt">${product.productId} </fo:block></fo:table-cell> - <fo:table-cell><fo:block font-size="10pt">${product.internalName?if_exists} </fo:block></fo:table-cell> + <fo:table-cell><fo:block font-size="10pt">${product.internalName!} </fo:block></fo:table-cell> <#if supplierProduct?has_content > - <fo:table-cell><fo:block font-size="10pt">${supplierProduct.supplierProductId?if_exists} </fo:block></fo:table-cell> + <fo:table-cell><fo:block font-size="10pt">${supplierProduct.supplierProductId!} </fo:block></fo:table-cell> <#else> <fo:table-cell><fo:block font-size="10pt"> </fo:block></fo:table-cell> </#if> <#assign totalQty = totalQty + quantityToPick> - <fo:table-cell><fo:block font-size="10pt">${quantityToPick?if_exists} </fo:block></fo:table-cell> + <fo:table-cell><fo:block font-size="10pt">${quantityToPick!} </fo:block></fo:table-cell> <fo:table-cell><fo:block font-size="10pt"><@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/></fo:block></fo:table-cell> </fo:table-row> </#if> @@ -212,7 +212,7 @@ under the License. <#assign product = inventoryItem.getRelatedOne("Product", false)/> <fo:table-row background-color="${rowColor}"> <#-- bin location --> - <fo:table-cell ><fo:block font-size="10pt"><#if inventoryItem?exists>${inventoryItem.locationSeqId?default("_NA_")}</#if></fo:block></fo:table-cell> + <fo:table-cell ><fo:block font-size="10pt"><#if inventoryItem??>${inventoryItem.locationSeqId?default("_NA_")}</#if></fo:block></fo:table-cell> <#-- product ID --> <#if product?has_content> @@ -230,13 +230,13 @@ under the License. <#-- supplier --> <#if vendor?has_content > - <fo:table-cell><fo:block font-size="10pt">${vendor.supplierProductId?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block font-size="10pt">${vendor.supplierProductId!}</fo:block></fo:table-cell> <#else> <fo:table-cell><fo:block font-size="10pt"> </fo:block></fo:table-cell> </#if> <#-- quantity --> - <fo:table-cell><fo:block font-size="10pt">${workEffortInventoryAssign.quantity?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block font-size="10pt">${workEffortInventoryAssign.quantity!}</fo:block></fo:table-cell> <#-- unit price --> <fo:table-cell ><fo:block></fo:block></fo:table-cell> @@ -276,7 +276,7 @@ under the License. </#if> </#list> <#list orderChargeList as orderCharge> - <#if orderCharge.get("${orderId}")?exists > + <#if orderCharge.get("${orderId}")?? > <#assign charges = orderCharge.get("${orderId}")> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.OrderSubTotal}:</fo:block></fo:table-cell> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/ReviewOrdersNotPickedOrPacked.ftl Sat Aug 16 11:34:57 2014 @@ -33,8 +33,8 @@ under the License. <#if orders?has_content> <#list orders?sort_by("pickSheetPrintedDate") as order> <tr> - <td><a href="/ordermgr/control/orderview?orderId=${order.orderId?if_exists}" class="buttontext" target="_blank">${order.orderId?if_exists}</a></td> - <td>${order.pickSheetPrintedDate?if_exists}</td> + <td><a href="/ordermgr/control/orderview?orderId=${order.orderId!}" class="buttontext" target="_blank">${order.orderId!}</a></td> + <td>${order.pickSheetPrintedDate!}</td> <td><#if "Y" == order.isVerified>${uiLabelMap.CommonY}</#if></td> </tr> </#list> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl Sat Aug 16 11:34:57 2014 @@ -45,14 +45,14 @@ under the License. <#assign postalAddress = contactMechMap.postalAddress> <#if postalAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br /></#if> <#if postalAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${postalAddress.attnName}<br /></#if> - ${postalAddress.address1?if_exists}<br /> - <#if postalAddress.address2?has_content>${postalAddress.address2?if_exists}<br /></#if> - ${postalAddress.city?if_exists}, - ${postalAddress.stateProvinceGeoId?if_exists} - ${postalAddress.postalCode?if_exists} + ${postalAddress.address1!}<br /> + <#if postalAddress.address2?has_content>${postalAddress.address2!}<br /></#if> + ${postalAddress.city!}, + ${postalAddress.stateProvinceGeoId!} + ${postalAddress.postalCode!} <#if postalAddress.countryGeoId?has_content><br />${postalAddress.countryGeoId}</#if> <#if (postalAddress?has_content && !postalAddress.countryGeoId?has_content) || postalAddress.countryGeoId = "USA"> - <#assign addr1 = postalAddress.address1?if_exists> + <#assign addr1 = postalAddress.address1!> <#if (addr1.indexOf(" ") > 0)> <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))> <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)> @@ -63,27 +63,27 @@ under the License. <#if contactMechPurposeType?has_content> <#assign popUptitle = contactMechPurposeType.get("description",locale) + uiLabelMap.CommonGeoLocation> </#if> - <br /><a href="javascript:popUp('<@ofbizUrl>geoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>', '${popUptitle?if_exists}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a> + <br /><a href="javascript:popUp('<@ofbizUrl>geoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>', '${popUptitle!}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a> </#if> <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId> <#assign telecomNumber = contactMechMap.telecomNumber> - ${telecomNumber.countryCode?if_exists} - <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber?if_exists} + ${telecomNumber.countryCode!} + <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber!} <#if facilityContactMech.extension?has_content>${uiLabelMap.CommonExt} ${facilityContactMech.extension}</#if> <#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011"> <br /><a target='_blank' href='${uiLabelMap.CommonLookupAnywhoLink}' class='buttontext'>${uiLabelMap.CommonLookupAnywho}</a> <a target='_blank' href='${uiLabelMap.CommonLookupWhitepagesTelNumberLink}' class='buttontext'>${uiLabelMap.CommonLookupWhitepages}</a> </#if> <#elseif "EMAIL_ADDRESS" = contactMech.contactMechTypeId> - ${contactMech.infoString?if_exists} - <a href='mailto:${contactMech.infoString?if_exists}' class='buttontext'>${uiLabelMap.CommonSendEmail}</a> + ${contactMech.infoString!} + <a href='mailto:${contactMech.infoString!}' class='buttontext'>${uiLabelMap.CommonSendEmail}</a> <#elseif "WEB_ADDRESS" = contactMech.contactMechTypeId> - ${contactMech.infoString?if_exists} + ${contactMech.infoString!} <#assign openAddress = contactMech.infoString?default("")> <#if !openAddress?starts_with("http") && !openAddress?starts_with("HTTP")><#assign openAddress = "http://" + openAddress></#if> <a target='_blank' href='${openAddress}' class='buttontext'>((${uiLabelMap.CommonOpenPageNewWindow})</a> <#else> - ${contactMech.infoString?if_exists} + ${contactMech.infoString!} </#if> <br />(${uiLabelMap.CommonUpdated}: ${facilityContactMech.fromDate.toString()}) <#if facilityContactMech.thruDate?has_content><br /><b>${uiLabelMap.CommonUpdatedEffectiveThru}: ${facilityContactMech.thruDate.toString()}</b></#if> @@ -95,8 +95,8 @@ under the License. </#if> <#if security.hasEntityPermission("FACILITY", "_DELETE", session)> <form action="<@ofbizUrl>deleteContactMech/ViewContactMechs</@ofbizUrl>" name="deleteContactForm_${contactMechMap_index}" method="post"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> - <input type="hidden" name="contactMechId" value="${contactMech.contactMechId?if_exists}"/> + <input type="hidden" name="facilityId" value="${facilityId!}"/> + <input type="hidden" name="contactMechId" value="${contactMech.contactMechId!}"/> </form> <a href="javascript:document.deleteContactForm_${contactMechMap_index}.submit()">${uiLabelMap.CommonExpire}</a> </#if> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/searchInventoryItemsByLabelsForm.ftl Sat Aug 16 11:34:57 2014 @@ -27,12 +27,12 @@ under the License. <tr> <td> <div> - <span class="label">${labelType.description?if_exists} [${labelType.inventoryItemLabelTypeId}]</span> + <span class="label">${labelType.description!} [${labelType.inventoryItemLabelTypeId}]</span> <select name="inventoryItemLabelId_${index}"> <option></option> <#list labels as label> - <option value="${label.inventoryItemLabelId}" <#if parameters["inventoryItemLabelId_" + index]?has_content && parameters["inventoryItemLabelId_" + index] == label.inventoryItemLabelId>selected="selected"</#if>>${label.description?if_exists} [${label.inventoryItemLabelId}]</option> + <option value="${label.inventoryItemLabelId}" <#if parameters["inventoryItemLabelId_" + index]?has_content && parameters["inventoryItemLabelId_" + index] == label.inventoryItemLabelId>selected="selected"</#if>>${label.description!} [${label.inventoryItemLabelId}]</option> </#list> </select> </div> Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl Sat Aug 16 11:34:57 2014 @@ -17,14 +17,14 @@ specific language governing permissions under the License. --> <h1>${title}</h1> - <#if illegalInventoryItem?exists> + <#if illegalInventoryItem??> <div class="errorMessage">${illegalInventoryItem}</div> </#if> <div class="button-bar"> <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a> - <a href="<@ofbizUrl>PickMoveStockSimple?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrint}</a> + <a href="<@ofbizUrl>PickMoveStockSimple?facilityId=${facilityId!}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrint}</a> </div> - <#if !(inventoryItem?exists)> + <#if !(inventoryItem??)> <form method="post" action="<@ofbizUrl>TransferInventoryItem</@ofbizUrl>"> <input type="hidden" name="facilityId" value="${facilityId}" /> <table cellspacing="0" class="basic-table"> @@ -38,11 +38,11 @@ under the License. </table> </form> <#else> - <#if !(inventoryTransfer?exists)> + <#if !(inventoryTransfer??)> <form method="post" action="<@ofbizUrl>CreateInventoryTransfer</@ofbizUrl>" name="transferform" style="margin: 0;"> <#else> <form method="post" action="<@ofbizUrl>UpdateInventoryTransfer</@ofbizUrl>" name="transferform" style="margin: 0;"> - <input type="hidden" name="inventoryTransferId" value="${inventoryTransferId?if_exists}" /> + <input type="hidden" name="inventoryTransferId" value="${inventoryTransferId!}" /> </#if> <script language="JavaScript" type="text/javascript"> @@ -50,9 +50,9 @@ under the License. </script> <table cellspacing="0" class="basic-table"> - <input type="hidden" name="inventoryItemId" value="${inventoryItemId?if_exists}" /> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}" /> - <input type="hidden" name="locationSeqId" value="${(inventoryItem.locationSeqId)?if_exists}" /> + <input type="hidden" name="inventoryItemId" value="${inventoryItemId!}" /> + <input type="hidden" name="facilityId" value="${facilityId!}" /> + <input type="hidden" name="locationSeqId" value="${(inventoryItem.locationSeqId)!}" /> <tr> <td width="14%"> </td> <td width="6%"align="right"><span class="label">${uiLabelMap.ProductInventoryItemId}</span></td> @@ -64,8 +64,8 @@ under the License. <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductInventoryItemTypeId}</td> <td width="6%"> </td> <td width="74%"> - <#if inventoryItemType?exists> - ${(inventoryItemType.get("description",locale))?if_exists} + <#if inventoryItemType??> + ${(inventoryItemType.get("description",locale))!} </#if> </td> </tr> @@ -74,8 +74,8 @@ under the License. <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductProductId}</span></td> <td width="6%"> </td> <td width="74%"> - <#if inventoryItem?exists && (inventoryItem.productId)?exists> - <a href="/catalog/control/EditProduct?productId=${(inventoryItem.productId)?if_exists}" class="buttontext">${(inventoryItem.productId)?if_exists}</a> + <#if inventoryItem?? && (inventoryItem.productId)??> + <a href="/catalog/control/EditProduct?productId=${(inventoryItem.productId)!}" class="buttontext">${(inventoryItem.productId)!}</a> </#if> </td> </tr> @@ -97,15 +97,15 @@ under the License. <td width="14%"> </td> <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductSerialAtpQoh}</span></td> <td width="6%"> </td> - <#if inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("NON_SERIAL_INV_ITEM")> + <#if inventoryItem?? && inventoryItem.inventoryItemTypeId.equals("NON_SERIAL_INV_ITEM")> <td width="74%"> - ${(inventoryItem.availableToPromiseTotal)?if_exists} - / ${(inventoryItem.quantityOnHandTotal)?if_exists} + ${(inventoryItem.availableToPromiseTotal)!} + / ${(inventoryItem.quantityOnHandTotal)!} </td> - <#elseif inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("SERIALIZED_INV_ITEM")> - <td width="74%">${(inventoryItem.serialNumber)?if_exists}</td> - <#elseif inventoryItem?exists> - <td class="alert" width="74%">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)?if_exists} ${uiLabelMap.ProductUnknownSpecifyType}.</td> + <#elseif inventoryItem?? && inventoryItem.inventoryItemTypeId.equals("SERIALIZED_INV_ITEM")> + <td width="74%">${(inventoryItem.serialNumber)!}</td> + <#elseif inventoryItem??> + <td class="alert" width="74%">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)!} ${uiLabelMap.ProductUnknownSpecifyType}.</td> </#if> </tr> <tr> @@ -118,12 +118,12 @@ under the License. <td width="6%"> </td> <td width="74%"> <select name="statusId"> - <#if (inventoryTransfer.statusId)?exists> + <#if (inventoryTransfer.statusId)??> <#assign curStatusItem = inventoryTransfer.getRelatedOne("StatusItem", true)> - <option value="${(inventoryTransfer.statusId)?if_exists}">${(curStatusItem.get("description",locale))?if_exists}</option> + <option value="${(inventoryTransfer.statusId)!}">${(curStatusItem.get("description",locale))!}</option> </#if> <#list statusItems as statusItem> - <option value="${(statusItem.statusId)?if_exists}">${(statusItem.get("description",locale))?if_exists}</option> + <option value="${(statusItem.statusId)!}">${(statusItem.get("description",locale))!}</option> </#list> </select> </td> @@ -133,11 +133,11 @@ under the License. <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductTransferSendDate}</span></td> <td width="6%"> </td> <td width="74%"> - <input type="text" name="sendDate" value="${(inventoryTransfer.sendDate)?if_exists}" size="22" /> + <input type="text" name="sendDate" value="${(inventoryTransfer.sendDate)!}" size="22" /> <a href="#" onclick="setNow('sendDate')" class="buttontext">${uiLabelMap.CommonNow}</a> </td> </tr> - <#if !(inventoryTransfer?exists)> + <#if !(inventoryTransfer??)> <tr> <td width="14%"> </td> <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductToFacilityContainer}</span></td> @@ -146,12 +146,12 @@ under the License. <div> <select name="facilityIdTo"> <#list facilities as nextFacility> - <option value="${(nextFacility.facilityId)?if_exists}">${(nextFacility.facilityName)?if_exists} [${(nextFacility.facilityId)?if_exists}]</option> + <option value="${(nextFacility.facilityId)!}">${(nextFacility.facilityName)!} [${(nextFacility.facilityId)!}]</option> </#list> </select> <span class="tooltip">${uiLabelMap.ProductSelectFacility}</span> <br /> - <input type="text" name="containerIdTo" value="${(inventoryTransfer.containerIdTo)?if_exists}" size="20" maxlength="20" /> + <input type="text" name="containerIdTo" value="${(inventoryTransfer.containerIdTo)!}" size="20" maxlength="20" /> <span class="tooltip">${uiLabelMap.ProductOrEnterContainerId}</span> </div> </td> @@ -161,7 +161,7 @@ under the License. <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductToLocation}</span></td> <td width="6%"> </td> <td width="74%"> - <@htmlTemplate.lookupField value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" formName="transferform" name="locationSeqIdTo" id="locationSeqIdTo" fieldFormName="LookupFacilityLocation"/> + <@htmlTemplate.lookupField value="${(inventoryTransfer.locationSeqIdTo)!}" formName="transferform" name="locationSeqIdTo" id="locationSeqIdTo" fieldFormName="LookupFacilityLocation"/> </td> </tr> <tr> @@ -177,13 +177,13 @@ under the License. <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductQuantityToTransfer}</span></td> <td width="6%"> </td> <td width="74%"> - <#if inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("NON_SERIAL_INV_ITEM")> - <input type="text" size="5" name="xferQty" value="${(inventoryItem.availableToPromiseTotal)?if_exists}" /> - <#elseif inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("SERIALIZED_INV_ITEM")> + <#if inventoryItem?? && inventoryItem.inventoryItemTypeId.equals("NON_SERIAL_INV_ITEM")> + <input type="text" size="5" name="xferQty" value="${(inventoryItem.availableToPromiseTotal)!}" /> + <#elseif inventoryItem?? && inventoryItem.inventoryItemTypeId.equals("SERIALIZED_INV_ITEM")> <input type="hidden" name="xferQty" value="1" /> 1 - <#elseif inventoryItem?exists> - <span class="alert">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)?if_exists} ${uiLabelMap.ProductUnknownSpecifyType}.</span> + <#elseif inventoryItem??> + <span class="alert">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)!} ${uiLabelMap.ProductUnknownSpecifyType}.</span> </#if> </td> </tr> @@ -193,7 +193,7 @@ under the License. <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductTransferReceiveDate}</span></td> <td width="6%"> </td> <td width="74%"> - <input type="text" name="receiveDate" value="${(inventoryTransfer.receiveDate)?if_exists}" size="22" /> + <input type="text" name="receiveDate" value="${(inventoryTransfer.receiveDate)!}" size="22" /> <a href="#" onclick="setNow('receiveDate')" class="buttontext">${uiLabelMap.CommonNow}</a> </td> </tr> @@ -209,7 +209,7 @@ under the License. <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductToLocation}</span></td> <td width="6%"> </td> <td width="74%"> - <@htmlTemplate.lookupField value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" formName="transferform" name="locationSeqIdTo" id="locationSeqIdTo" fieldFormName="LookupFacilityLocation?facilityId=${inventoryTransfer.facilityIdTo}"/> + <@htmlTemplate.lookupField value="${(inventoryTransfer.locationSeqIdTo)!}" formName="transferform" name="locationSeqIdTo" id="locationSeqIdTo" fieldFormName="LookupFacilityLocation?facilityId=${inventoryTransfer.facilityIdTo}"/> </td> </tr> <tr> @@ -217,13 +217,13 @@ under the License. <td width="6%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.ProductComments}</span></td> <td width="6%"> </td> <td width="74%"> - <input type="text" name="comments" value="${(inventoryTransfer.comments)?if_exists}" size="60" maxlength="250" /> + <input type="text" name="comments" value="${(inventoryTransfer.comments)!}" size="60" maxlength="250" /> </td> </tr> </#if> <tr> <td colspan="2"> </td> - <#if !(inventoryTransfer?exists)> + <#if !(inventoryTransfer??)> <td colspan="1"><input type="submit" value="${uiLabelMap.ProductTransfer}" /></td> <#else> <td colspan="1"><input type="submit" value="${uiLabelMap.CommonUpdate}" /></td> Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Sat Aug 16 11:34:57 2014 @@ -20,7 +20,7 @@ under the License. function setNow(field) { eval('document.selectAllForm.' + field + '.value="${nowTimestamp}"'); } </script> <div class="page-title">${title}</div> - <#if invalidProductId?exists> + <#if invalidProductId??> <div class="errorMessage">${invalidProductId}</div> </#if> <div class="button-bar button-style-1"> @@ -46,11 +46,11 @@ under the License. </tr> <#list receivedItems as item> <form name="cancelReceivedItemsForm_${item_index}" method="post" action="<@ofbizUrl>cancelReceivedItems</@ofbizUrl>"> - <input type="hidden" name="receiptId" value ="${(item.receiptId)?if_exists}"/> - <input type="hidden" name="purchaseOrderId" value ="${(item.orderId)?if_exists}"/> - <input type="hidden" name="facilityId" value ="${facilityId?if_exists}"/> + <input type="hidden" name="receiptId" value ="${(item.receiptId)!}"/> + <input type="hidden" name="purchaseOrderId" value ="${(item.orderId)!}"/> + <input type="hidden" name="facilityId" value ="${facilityId!}"/> <tr> - <td><a href="<@ofbizUrl>ViewShipment?shipmentId=${item.shipmentId?if_exists}</@ofbizUrl>" class="buttontext">${item.shipmentId?if_exists} ${item.shipmentItemSeqId?if_exists}</a></td> + <td><a href="<@ofbizUrl>ViewShipment?shipmentId=${item.shipmentId!}</@ofbizUrl>" class="buttontext">${item.shipmentId!} ${item.shipmentItemSeqId!}</a></td> <td>${item.receiptId}</td> <td>${item.getString("datetimeReceived").toString()}</td> <td><a href="/ordermgr/control/orderview?orderId=${item.orderId}" class="buttontext">${item.orderId}</a></td> @@ -74,14 +74,14 @@ under the License. </#if> <#-- Single Product Receiving --> - <#if requestParameters.initialSelected?exists && product?has_content> + <#if requestParameters.initialSelected?? && product?has_content> <form method="post" action="<@ofbizUrl>receiveSingleInventoryProduct</@ofbizUrl>" name="selectAllForm"> <table class="basic-table" cellspacing="0"> <#-- general request fields --> - <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/> - <input type="hidden" name="purchaseOrderId" value="${requestParameters.purchaseOrderId?if_exists}"/> + <input type="hidden" name="facilityId" value="${requestParameters.facilityId!}"/> + <input type="hidden" name="purchaseOrderId" value="${requestParameters.purchaseOrderId!}"/> <#-- special service fields --> - <input type="hidden" name="productId" value="${requestParameters.productId?if_exists}"/> + <input type="hidden" name="productId" value="${requestParameters.productId!}"/> <#if purchaseOrder?has_content> <#assign unitCost = firstOrderItem.unitPrice?default(standardCosts.get(firstOrderItem.productId)?default(0))/> <input type="hidden" name="orderId" value="${purchaseOrder.orderId}"/> @@ -105,7 +105,7 @@ under the License. <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductProductId}</td> <td width="6%"> </td> <td width="74%"> - <b>${requestParameters.productId?if_exists}</b> + <b>${requestParameters.productId!}</b> </td> </tr> <tr> @@ -113,7 +113,7 @@ under the License. <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductProductName}</td> <td width="6%"> </td> <td width="74%"> - <a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam?if_exists}" target="catalog" class="buttontext">${product.internalName?if_exists}</a> + <a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam!}" target="catalog" class="buttontext">${product.internalName!}</a> </td> </tr> <tr> @@ -121,7 +121,7 @@ under the License. <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductProductDescription}</td> <td width="6%"> </td> <td width="74%"> - ${product.description?if_exists} + ${product.description!} </td> </tr> <tr> @@ -168,7 +168,7 @@ under the License. <option value=""></option> <#if supplierPartyIds?has_content> <#list supplierPartyIds as supplierPartyId> - <option value="${supplierPartyId}" <#if supplierPartyId == parameters.partyId?if_exists> selected="selected"</#if>> + <option value="${supplierPartyId}" <#if supplierPartyId == parameters.partyId!> selected="selected"</#if>> [${supplierPartyId}] ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, supplierPartyId, true)} </option> </#list> @@ -197,7 +197,7 @@ under the License. </tr> <#-- facility location(s) --> - <#assign facilityLocations = (product.getRelated("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId), null, false))?if_exists/> + <#assign facilityLocations = (product.getRelated("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId), null, false))!/> <tr> <td width="14%"> </td> <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductFacilityLocation}</td> @@ -207,14 +207,14 @@ under the License. <select name="locationSeqId"> <#list facilityLocations as productFacilityLocation> <#assign facility = productFacilityLocation.getRelatedOne("Facility", true)/> - <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation", false)?if_exists/> - <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOne("TypeEnumeration", true))?if_exists/> - <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option> + <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation", false)!/> + <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOne("TypeEnumeration", true))!/> + <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation??>${facilityLocation.areaId!}:${facilityLocation.aisleId!}:${facilityLocation.sectionId!}:${facilityLocation.levelId!}:${facilityLocation.positionId!}</#if><#if facilityLocationTypeEnum??>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option> </#list> <option value="">${uiLabelMap.ProductNoLocation}</option> </select> <#else> - <#if parameters.facilityId?exists> + <#if parameters.facilityId??> <#assign LookupFacilityLocationView="LookupFacilityLocation?facilityId=${facilityId}"> <#else> <#assign LookupFacilityLocationView="LookupFacilityLocation"> @@ -258,7 +258,7 @@ under the License. <td width="6%"> </td> <td width="74%"> <#-- get the default unit cost --> - <#if (!unitCost?exists || unitCost == 0.0)><#assign unitCost = standardCosts.get(product.productId)?default(0)/></#if> + <#if (!unitCost?? || unitCost == 0.0)><#assign unitCost = standardCosts.get(product.productId)?default(0)/></#if> <input type="text" name="unitCost" size="10" value="${unitCost}"/> </td> </tr> @@ -273,21 +273,21 @@ under the License. </form> <#-- Select Shipment Screen --> - <#elseif requestParameters.initialSelected?exists && !requestParameters.shipmentId?exists> + <#elseif requestParameters.initialSelected?? && !requestParameters.shipmentId??> <h3>${uiLabelMap.ProductSelectShipmentReceive}</h3> <form method="post" action="<@ofbizUrl>ReceiveInventory</@ofbizUrl>" name="selectAllForm"> <#-- general request fields --> - <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/> - <input type="hidden" name="purchaseOrderId" value="${requestParameters.purchaseOrderId?if_exists}"/> + <input type="hidden" name="facilityId" value="${requestParameters.facilityId!}"/> + <input type="hidden" name="purchaseOrderId" value="${requestParameters.purchaseOrderId!}"/> <input type="hidden" name="initialSelected" value="Y"/> - <input type="hidden" name="partialReceive" value="${partialReceive?if_exists}"/> + <input type="hidden" name="partialReceive" value="${partialReceive!}"/> <table class="basic-table" cellspacing="0"> - <#list shipments?if_exists as shipment> - <#assign originFacility = shipment.getRelatedOne("OriginFacility", true)?if_exists/> - <#assign destinationFacility = shipment.getRelatedOne("DestinationFacility", true)?if_exists/> + <#list shipments! as shipment> + <#assign originFacility = shipment.getRelatedOne("OriginFacility", true)!/> + <#assign destinationFacility = shipment.getRelatedOne("DestinationFacility", true)!/> <#assign statusItem = shipment.getRelatedOne("StatusItem", true)/> <#assign shipmentType = shipment.getRelatedOne("ShipmentType", true)/> - <#assign shipmentDate = shipment.estimatedArrivalDate?if_exists/> + <#assign shipmentDate = shipment.estimatedArrivalDate!/> <tr> <td><hr /></td> </tr> @@ -299,9 +299,9 @@ under the License. <td width="5%" nowrap="nowrap">${shipment.shipmentId}</td> <td>${shipmentType.get("description",locale)?default(shipmentType.shipmentTypeId?default(""))}</td> <td>${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</td> - <td>${(originFacility.facilityName)?if_exists} [${shipment.originFacilityId?if_exists}]</td> - <td>${(destinationFacility.facilityName)?if_exists} [${shipment.destinationFacilityId?if_exists}]</td> - <td style="white-space: nowrap;">${(shipment.estimatedArrivalDate.toString())?if_exists}</td> + <td>${(originFacility.facilityName)!} [${shipment.originFacilityId!}]</td> + <td>${(destinationFacility.facilityName)!} [${shipment.destinationFacilityId!}]</td> + <td style="white-space: nowrap;">${(shipment.estimatedArrivalDate.toString())!}</td> </tr> </table> </td> @@ -328,13 +328,13 @@ under the License. </form> <#-- Multi-Item PO Receiving --> - <#elseif requestParameters.initialSelected?exists && purchaseOrder?has_content> + <#elseif requestParameters.initialSelected?? && purchaseOrder?has_content> <input type="hidden" id="getConvertedPrice" value="<@ofbizUrl secure="${request.isSecure()?string}">getConvertedPrice"</@ofbizUrl> /> <input type="hidden" id="alertMessage" value="${uiLabelMap.ProductChangePerUnitPrice}" /> <form method="post" action="<@ofbizUrl>receiveInventoryProduct</@ofbizUrl>" name="selectAllForm"> <#-- general request fields --> - <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/> - <input type="hidden" name="purchaseOrderId" value="${requestParameters.purchaseOrderId?if_exists}"/> + <input type="hidden" name="facilityId" value="${requestParameters.facilityId!}"/> + <input type="hidden" name="purchaseOrderId" value="${requestParameters.purchaseOrderId!}"/> <input type="hidden" name="initialSelected" value="Y"/> <#if shipment?has_content> <input type="hidden" name="shipmentIdReceived" value="${shipment.shipmentId}"/> @@ -342,7 +342,7 @@ under the License. <input type="hidden" name="_useRowSubmit" value="Y"/> <#assign rowCount = 0/> <table class="basic-table" cellspacing="0"> - <#if !purchaseOrderItems?exists || purchaseOrderItems.size() == 0> + <#if !purchaseOrderItems?? || purchaseOrderItems.size() == 0> <tr> <td colspan="2">${uiLabelMap.ProductNoItemsPoReceive}.</td> </tr> @@ -364,9 +364,9 @@ under the License. <#list purchaseOrderItems as orderItem> <#assign defaultQuantity = orderItem.quantity - receivedQuantities[orderItem.orderItemSeqId]?double/> <#assign itemCost = orderItem.unitPrice?default(0)/> - <#assign salesOrderItem = salesOrderItems[orderItem.orderItemSeqId]?if_exists/> + <#assign salesOrderItem = salesOrderItems[orderItem.orderItemSeqId]!/> <#if shipment?has_content> - <#if shippedQuantities[orderItem.orderItemSeqId]?exists> + <#if shippedQuantities[orderItem.orderItemSeqId]??> <#assign defaultQuantity = shippedQuantities[orderItem.orderItemSeqId]?double - receivedQuantities[orderItem.orderItemSeqId]?double/> <#else> <#assign defaultQuantity = 0/> @@ -376,9 +376,9 @@ under the License. <#assign orderItemType = orderItem.getRelatedOne("OrderItemType", false)/> <input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/> <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/> - <input type="hidden" name="facilityId_o_${rowCount}" value="${requestParameters.facilityId?if_exists}"/> + <input type="hidden" name="facilityId_o_${rowCount}" value="${requestParameters.facilityId!}"/> <input type="hidden" name="datetimeReceived_o_${rowCount}" value="${nowTimestamp}"/> - <#if shipment?exists && shipment.shipmentId?has_content> + <#if shipment?? && shipment.shipmentId?has_content> <input type="hidden" name="shipmentId_o_${rowCount}" value="${shipment.shipmentId}"/> </#if> <#if salesOrderItem?has_content> @@ -393,15 +393,15 @@ under the License. <td> <table class="basic-table" cellspacing="0"> <tr> - <#if orderItem.productId?exists> + <#if orderItem.productId??> <#assign product = orderItem.getRelatedOne("Product", true)/> <input type="hidden" name="productId_o_${rowCount}" value="${product.productId}"/> <td width="45%"> - ${orderItem.orderItemSeqId}: <a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam?if_exists}" target="catalog" class="buttontext">${product.productId} - ${orderItem.itemDescription?if_exists}</a> : ${product.description?if_exists} + ${orderItem.orderItemSeqId}: <a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam!}" target="catalog" class="buttontext">${product.productId} - ${orderItem.itemDescription!}</a> : ${product.description!} </td> <#else> <td width="45%"> - <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists} + <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription!} <input type="text" size="12" name="productId_o_${rowCount}"/> <a href="/catalog/control/EditProduct?${StringUtil.wrapString(externalKeyParam)}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a> </td> @@ -409,19 +409,19 @@ under the License. <td align="right">${uiLabelMap.ProductLocation}:</td> <#-- location(s) --> <td align="right"> - <#assign facilityLocations = (orderItem.getRelated("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId), null, false))?if_exists/> + <#assign facilityLocations = (orderItem.getRelated("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId), null, false))!/> <#if facilityLocations?has_content> <select name="locationSeqId_o_${rowCount}"> <#list facilityLocations as productFacilityLocation> <#assign facility = productFacilityLocation.getRelatedOne("Facility", true)/> - <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation", false)?if_exists/> - <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOne("TypeEnumeration", true))?if_exists/> - <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option> + <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation", false)!/> + <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOne("TypeEnumeration", true))!/> + <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation??>${facilityLocation.areaId!}:${facilityLocation.aisleId!}:${facilityLocation.sectionId!}:${facilityLocation.levelId!}:${facilityLocation.positionId!}</#if><#if facilityLocationTypeEnum??>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option> </#list> <option value="">${uiLabelMap.ProductNoLocation}</option> </select> <#else> - <#if parameters.facilityId?exists> + <#if parameters.facilityId??> <#assign LookupFacilityLocationView="LookupFacilityLocation?facilityId=${facilityId}"> <#else> <#assign LookupFacilityLocationView="LookupFacilityLocation"> @@ -431,7 +431,7 @@ under the License. </td> <td align="right">${uiLabelMap.ProductQtyReceived} :</td> <td align="right"> - <input type="text" name="quantityAccepted_o_${rowCount}" size="6" value=<#if partialReceive?exists>"0"<#else>"${defaultQuantity?string.number}"</#if>/> + <input type="text" name="quantityAccepted_o_${rowCount}" size="6" value=<#if partialReceive??>"0"<#else>"${defaultQuantity?string.number}"</#if>/> </td> </tr> <tr> @@ -484,22 +484,22 @@ under the License. <#if currencyUomId?default('') != orderCurrencyUomId?default('')> <td>${uiLabelMap.ProductPerUnitPriceOrder}:</td> <td> - <input type="hidden" name="orderCurrencyUomId_o_${rowCount}" value="${orderCurrencyUomId?if_exists}" /> + <input type="hidden" name="orderCurrencyUomId_o_${rowCount}" value="${orderCurrencyUomId!}" /> <input type="text" id="orderCurrencyUnitPrice_${rowCount}" name="orderCurrencyUnitPrice_o_${rowCount}" value="${orderCurrencyUnitPriceMap[orderItem.orderItemSeqId]}" onchange="javascript:getConvertedPrice(orderCurrencyUnitPrice_${rowCount}, '${orderCurrencyUomId}', '${currencyUomId}', '${rowCount}', '${orderCurrencyUnitPriceMap[orderItem.orderItemSeqId]}', '${itemCost}');" size="6" maxlength="20" /> - ${orderCurrencyUomId?if_exists} + ${orderCurrencyUomId!} </td> <td>${uiLabelMap.ProductPerUnitPriceFacility}:</td> <td> - <input type="hidden" name="currencyUomId_o_${rowCount}" value="${currencyUomId?if_exists}" /> + <input type="hidden" name="currencyUomId_o_${rowCount}" value="${currencyUomId!}" /> <input type="text" id="unitCost_${rowCount}" name="unitCost_o_${rowCount}" value="${itemCost}" readonly="readonly" size="6" maxlength="20" /> - ${currencyUomId?if_exists} + ${currencyUomId!} </td> <#else> <td align="right">${uiLabelMap.ProductPerUnitPrice}:</td> <td align="right"> - <input type="hidden" name="currencyUomId_o_${rowCount}" value="${currencyUomId?if_exists}" /> + <input type="hidden" name="currencyUomId_o_${rowCount}" value="${currencyUomId!}" /> <input type="text" name="unitCost_o_${rowCount}" value="${itemCost}" size="6" maxlength="20" /> - ${currencyUomId?if_exists} + ${currencyUomId!} </td> </#if> </tr> @@ -523,7 +523,7 @@ under the License. </tr> <tr> <td colspan="2" align="right"> - <a href="<@ofbizUrl>ReceiveInventory?facilityId=${requestParameters.facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReturnToReceiving}</a> + <a href="<@ofbizUrl>ReceiveInventory?facilityId=${requestParameters.facilityId!}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReturnToReceiving}</a> </td> </tr> <#else> @@ -543,20 +543,20 @@ under the License. <#else> <h2>${uiLabelMap.ProductReceiveItem}</h2> <form name="selectAllForm" method="post" action="<@ofbizUrl>ReceiveInventory</@ofbizUrl>"> - <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/> + <input type="hidden" name="facilityId" value="${requestParameters.facilityId!}"/> <input type="hidden" name="initialSelected" value="Y"/> <table class="basic-table" cellspacing="0"> <tr> <td class="label">${uiLabelMap.ProductPurchaseOrderNumber}</td> <td> - <@htmlTemplate.lookupField value="${requestParameters.purchaseOrderId?if_exists}" formName="selectAllForm" name="purchaseOrderId" id="purchaseOrderId" fieldFormName="LookupPurchaseOrderHeaderAndShipInfo"/> + <@htmlTemplate.lookupField value="${requestParameters.purchaseOrderId!}" formName="selectAllForm" name="purchaseOrderId" id="purchaseOrderId" fieldFormName="LookupPurchaseOrderHeaderAndShipInfo"/> <span class="tooltip">${uiLabelMap.ProductLeaveSingleProductReceiving}</span> </td> </tr> <tr> <td class="label">${uiLabelMap.ProductProductId}</td> <td> - <@htmlTemplate.lookupField value="${requestParameters.productId?if_exists}" formName="selectAllForm" name="productId" id="productId" fieldFormName="LookupProduct"/> + <@htmlTemplate.lookupField value="${requestParameters.productId!}" formName="selectAllForm" name="productId" id="productId" fieldFormName="LookupProduct"/> <span class="tooltip">${uiLabelMap.ProductLeaveEntirePoReceiving}</span> </td> </tr> Modified: ofbiz/trunk/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl Sat Aug 16 11:34:57 2014 @@ -27,47 +27,47 @@ under the License. <td>${uiLabelMap.FormFieldTitle_unitCost}</td> </tr> <tr><td colspan="6"><hr /></td></tr> - <#if (inventoryItemsForPo?exists && inventoryItemsForPo?has_content)> + <#if (inventoryItemsForPo?? && inventoryItemsForPo?has_content)> <tr class="header-row-2"><td colspan="6"><span class="label"> ${uiLabelMap.ProductInventoryItemsFor} ${uiLabelMap.ProductPurchaseOrder} - ${orderId}</span></td></tr> <#list inventoryItemsForPo as inventoryItem> <tr> <td><a class="buttontext" href="javascript:set_value('${inventoryItem.inventoryItemId}')">${inventoryItem.inventoryItemId}</a></td> - <td>${inventoryItem.facilityId?if_exists}</td> - <td>${inventoryItem.locationSeqId?if_exists}</td> - <td>${inventoryItem.quantityOnHandTotal?if_exists}</td> - <td>${inventoryItem.availableToPromiseTotal?if_exists}</td> - <td>${inventoryItem.unitCost?if_exists}</td> + <td>${inventoryItem.facilityId!}</td> + <td>${inventoryItem.locationSeqId!}</td> + <td>${inventoryItem.quantityOnHandTotal!}</td> + <td>${inventoryItem.availableToPromiseTotal!}</td> + <td>${inventoryItem.unitCost!}</td> </tr> </#list> </#if> - <#if (inventoryItemsForSupplier?exists && inventoryItemsForSupplier?has_content)> + <#if (inventoryItemsForSupplier?? && inventoryItemsForSupplier?has_content)> <tr class="header-row-2"><td colspan="6"><span class="label centered"> ${uiLabelMap.ProductInventoryItemsFor} ${uiLabelMap.ProductSupplier} - ${partyId}</span></td></tr> <#list inventoryItemsForSupplier as inventoryItem> <tr> <td><a class="buttontext" href="javascript:set_value('${inventoryItem.inventoryItemId}')">${inventoryItem.inventoryItemId}</a></td> - <td>${inventoryItem.facilityId?if_exists}</td> - <td>${inventoryItem.locationSeqId?if_exists}</td> - <td>${inventoryItem.quantityOnHandTotal?if_exists}</td> - <td>${inventoryItem.availableToPromiseTotal?if_exists}</td> - <td>${inventoryItem.unitCost?if_exists}</td> + <td>${inventoryItem.facilityId!}</td> + <td>${inventoryItem.locationSeqId!}</td> + <td>${inventoryItem.quantityOnHandTotal!}</td> + <td>${inventoryItem.availableToPromiseTotal!}</td> + <td>${inventoryItem.unitCost!}</td> </tr> </#list> </#if> - <#if (inventoryItemsForProduct?exists && inventoryItemsForProduct?has_content)> - <tr class="header-row-2"><td colspan="6"><span class="label"> ${uiLabelMap.ProductInventoryItemsFor} ${uiLabelMap.ProductProduct} - ${internalName?if_exists} [${productId}]</span></td></tr> + <#if (inventoryItemsForProduct?? && inventoryItemsForProduct?has_content)> + <tr class="header-row-2"><td colspan="6"><span class="label"> ${uiLabelMap.ProductInventoryItemsFor} ${uiLabelMap.ProductProduct} - ${internalName!} [${productId}]</span></td></tr> <#list inventoryItemsForProduct as inventoryItem> <tr> <td><a class="buttontext" href="javascript:set_value('${inventoryItem.inventoryItemId}')">${inventoryItem.inventoryItemId}</a></td> - <td>${inventoryItem.facilityId?if_exists}</td> - <td>${inventoryItem.locationSeqId?if_exists}</td> - <td>${inventoryItem.quantityOnHandTotal?if_exists}</td> - <td>${inventoryItem.availableToPromiseTotal?if_exists}</td> - <td>${inventoryItem.unitCost?if_exists}</td> + <td>${inventoryItem.facilityId!}</td> + <td>${inventoryItem.locationSeqId!}</td> + <td>${inventoryItem.quantityOnHandTotal!}</td> + <td>${inventoryItem.availableToPromiseTotal!}</td> + <td>${inventoryItem.unitCost!}</td> </tr> </#list> <tr> </#if> - <#if !(inventoryItemsForPo?exists && inventoryItemsForPo?has_content) && !(inventoryItemsForSupplier?exists && inventoryItemsForSupplier?has_content) && !(inventoryItemsForProduct?exists && inventoryItemsForProduct?has_content)> + <#if !(inventoryItemsForPo?? && inventoryItemsForPo?has_content) && !(inventoryItemsForSupplier?? && inventoryItemsForSupplier?has_content) && !(inventoryItemsForProduct?? && inventoryItemsForProduct?has_content)> <tr><td><span class="label">${uiLabelMap.CommonNo} ${uiLabelMap.ProductInventoryItems} ${uiLabelMap.ProductAvailable}.</span></td></tr> </#if> </table> Modified: ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl Sat Aug 16 11:34:57 2014 @@ -18,13 +18,13 @@ under the License. --> <div class="screenlet"> <div class="screenlet-title-bar"> - <h3>${uiLabelMap.ProductReceiveReturn} ${uiLabelMap.CommonInto} <#if facility?has_content>"${facility.facilityName?default("Not Defined")}"</#if> [${uiLabelMap.CommonId}:${facility.facilityId?if_exists}]</h3> + <h3>${uiLabelMap.ProductReceiveReturn} ${uiLabelMap.CommonInto} <#if facility?has_content>"${facility.facilityName?default("Not Defined")}"</#if> [${uiLabelMap.CommonId}:${facility.facilityId!}]</h3> </div> <div class="screenlet-body"> <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a> <#-- Receiving Results --> <#if receivedItems?has_content> - <h3>${uiLabelMap.ProductReceiptForReturn} ${uiLabelMap.CommonNbr}<a href="/ordermgr/control/returnMain?returnId=${returnHeader.returnId}${externalKeyParam?if_exists}" class="buttontext">${returnHeader.returnId}</a></h3> + <h3>${uiLabelMap.ProductReceiptForReturn} ${uiLabelMap.CommonNbr}<a href="/ordermgr/control/returnMain?returnId=${returnHeader.returnId}${externalKeyParam!}" class="buttontext">${returnHeader.returnId}</a></h3> <#if "RETURN_RECEIVED" == returnHeader.getString("statusId")> <h3>${uiLabelMap.ProductReturnCompletelyReceived}</h3> </#if> @@ -58,13 +58,13 @@ under the License. <#if returnHeader?has_content> <form method="post" action="<@ofbizUrl>receiveReturnedProduct</@ofbizUrl>" name='selectAllForm'> <#-- general request fields --> - <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}" /> - <input type="hidden" name="returnId" value="${requestParameters.returnId?if_exists}" /> + <input type="hidden" name="facilityId" value="${requestParameters.facilityId!}" /> + <input type="hidden" name="returnId" value="${requestParameters.returnId!}" /> <input type="hidden" name="_useRowSubmit" value="Y" /> <#assign now = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()> <#assign rowCount = 0> <table cellspacing="0" class="basic-table"> - <#if !returnItems?exists || returnItems?size == 0> + <#if !returnItems?? || returnItems?size == 0> <tr> <td colspan="2" class="label">${uiLabelMap.ProductNoItemsToReceive}</td> </tr> @@ -72,7 +72,7 @@ under the License. <tr> <td> <h3> - ${uiLabelMap.ProductReceiveReturn} <a href="/ordermgr/control/returnMain?returnId=${returnHeader.returnId}${externalKeyParam?if_exists}" class="buttontext">#${returnHeader.returnId}</a> + ${uiLabelMap.ProductReceiveReturn} <a href="/ordermgr/control/returnMain?returnId=${returnHeader.returnId}${externalKeyParam!}" class="buttontext">#${returnHeader.returnId}</a> <#if parameters.shipmentId?has_content>${uiLabelMap.ProductShipmentId} <a href="<@ofbizUrl>ViewShipment?shipmentId=${parameters.shipmentId}</@ofbizUrl>" class="buttontext">${parameters.shipmentId}</a></#if> </h3> </td> @@ -84,13 +84,13 @@ under the License. <#list returnItems as returnItem> <#assign defaultQuantity = returnItem.returnQuantity - receivedQuantities[returnItem.returnItemSeqId]?double> - <#assign orderItem = returnItem.getRelatedOne("OrderItem", false)?if_exists> + <#assign orderItem = returnItem.getRelatedOne("OrderItem", false)!> <#if (orderItem?has_content && 0 < defaultQuantity)> - <#assign orderItemType = (orderItem.getRelatedOne("OrderItemType", false))?if_exists> + <#assign orderItemType = (orderItem.getRelatedOne("OrderItemType", false))!> <input type="hidden" name="returnId_o_${rowCount}" value="${returnItem.returnId}" /> <input type="hidden" name="returnItemSeqId_o_${rowCount}" value="${returnItem.returnItemSeqId}" /> - <input type="hidden" name="shipmentId_o_${rowCount}" value="${parameters.shipmentId?if_exists}" /> - <input type="hidden" name="facilityId_o_${rowCount}" value="${requestParameters.facilityId?if_exists}" /> + <input type="hidden" name="shipmentId_o_${rowCount}" value="${parameters.shipmentId!}" /> + <input type="hidden" name="facilityId_o_${rowCount}" value="${requestParameters.facilityId!}" /> <input type="hidden" name="datetimeReceived_o_${rowCount}" value="${now}" /> <input type="hidden" name="quantityRejected_o_${rowCount}" value="0" /> <input type="hidden" name="comments_o_${rowCount}" value="${uiLabelMap.OrderReturnedItemRaNumber} ${returnItem.returnId}" /> @@ -104,21 +104,21 @@ under the License. <table cellspacing="0" class="basic-table"> <tr> <#assign productId = ""> - <#if orderItem.productId?exists> + <#if orderItem.productId??> <#assign product = orderItem.getRelatedOne("Product", false)> <#assign productId = product.productId> <#assign serializedInv = product.getRelated("InventoryItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("inventoryItemTypeId", "SERIALIZED_INV_ITEM"), null, false)> <input type="hidden" name="productId_o_${rowCount}" value="${product.productId}" /> <td width="45%"> <div> - ${returnItem.returnItemSeqId}: <a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam?if_exists}" target="catalog" class="buttontext">${product.productId} - ${product.internalName?if_exists}</a> : ${product.description?if_exists} + ${returnItem.returnItemSeqId}: <a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam!}" target="catalog" class="buttontext">${product.productId} - ${product.internalName!}</a> : ${product.description!} <#if serializedInv?has_content><font color='red'>**${uiLabelMap.ProductSerializedInventoryFound}**</font></#if> </div> </td> <#elseif orderItem?has_content> <td width="45%"> <div> - ${returnItem.returnItemSeqId}: <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists} + ${returnItem.returnItemSeqId}: <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription!} <input type="text" size="12" name="productId_o_${rowCount}" /> <a href="/catalog/control/EditProduct?${StringUtil.wrapString(externalKeyParam)}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a> </div> @@ -126,7 +126,7 @@ under the License. <#else> <td width="45%"> <div> - ${returnItem.returnItemSeqId}: ${returnItem.get("description",locale)?if_exists} + ${returnItem.returnItemSeqId}: ${returnItem.get("description",locale)!} </div> </td> </#if> @@ -137,20 +137,20 @@ under the License. <div class="label">${uiLabelMap.ProductLocation}</div> </td> <td align="right"> - <#assign facilityLocations = (product.getRelated("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId), null, false))?if_exists> + <#assign facilityLocations = (product.getRelated("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId), null, false))!> <#if facilityLocations?has_content> <select name="locationSeqId_o_${rowCount}"> <#list facilityLocations as productFacilityLocation> <#assign facility = productFacilityLocation.getRelatedOne("Facility", true)> - <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation", false)?if_exists> - <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOne("TypeEnumeration", true))?if_exists> - <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option> + <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation", false)!> + <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOne("TypeEnumeration", true))!> + <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation??>${facilityLocation.areaId!}:${facilityLocation.aisleId!}:${facilityLocation.sectionId!}:${facilityLocation.levelId!}:${facilityLocation.positionId!}</#if><#if facilityLocationTypeEnum??>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option> </#list> <option value="">${uiLabelMap.ProductNoLocation}</option> </select> <#else> <span> - <#if parameters.facilityId?exists> + <#if parameters.facilityId??> <#assign LookupFacilityLocationView="LookupFacilityLocation?facilityId=${facilityId}"> <#else> <#assign LookupFacilityLocationView="LookupFacilityLocation"> @@ -222,7 +222,7 @@ under the License. </tr> <tr> <td colspan="2" align="right"> - <a href="<@ofbizUrl>ReceiveReturn?facilityId=${requestParameters.facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReturnToReceiving}</a> + <a href="<@ofbizUrl>ReceiveReturn?facilityId=${requestParameters.facilityId!}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReturnToReceiving}</a> </td> </tr> <#else> @@ -241,7 +241,7 @@ under the License. <#-- Initial Screen --> <#else> <form name="selectAllForm" method="post" action="<@ofbizUrl>ReceiveReturn</@ofbizUrl>"> - <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}" /> + <input type="hidden" name="facilityId" value="${requestParameters.facilityId!}" /> <input type="hidden" name="initialSelected" value="Y" /> <table cellspacing="0" class="basic-table"> <tr><td colspan="4"><h3>${uiLabelMap.ProductReceiveReturn}</h3></td></tr> @@ -249,7 +249,7 @@ under the License. <td width="15%" align='right' class="label">${uiLabelMap.ProductReturnNumber}</td> <td> </td> <td width="90%"> - <input type="text" name="returnId" size="20" maxlength="20" value="${requestParameters.returnId?if_exists}" /> + <input type="text" name="returnId" size="20" maxlength="20" value="${requestParameters.returnId!}" /> </td> <td> </td> </tr> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl Sat Aug 16 11:34:57 2014 @@ -20,7 +20,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductIssueInventoryItemsToShipment}: [${shipmentId?if_exists}]</li> + <li class="h3">${uiLabelMap.ProductIssueInventoryItemsToShipment}: [${shipmentId!}]</li> </ul> </div> <div class="screenlet-body"> @@ -38,7 +38,7 @@ under the License. <#list items as item> <tr> <td><a href="/ordermgr/control/returnMain?returnId=${item.returnId}" class="buttontext">${item.returnId}</a> [${item.returnItemSeqId}]</td> - <td><a href="/catalog/control/EditProductInventoryItems?productId=${item.productId}" class="buttontext">${item.productId}</a> ${item.internalName?if_exists}</td> + <td><a href="/catalog/control/EditProductInventoryItems?productId=${item.productId}" class="buttontext">${item.productId}</a> ${item.internalName!}</td> <td>${item.returnQuantity}</td> <td>${item.shipmentItemQty}</td> <td>${item.totalQtyIssued}</td> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |