svn commit: r1618554 [23/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [23/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl Mon Aug 18 07:42:27 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if requestAttributes.uiLabelMap?exists> +<#if requestAttributes.uiLabelMap??> <#assign uiLabelMap = requestAttributes.uiLabelMap> </#if> <#assign selected = tabButtonItem?default("void")> @@ -25,17 +25,17 @@ under the License. <ul> <li<#if selected="ViewShipment"> class="selected"</#if>><a href="<@ofbizUrl>ViewShipment?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.CommonView}</a></li> <li<#if selected="EditShipment"> class="selected"</#if>><a href="<@ofbizUrl>EditShipment?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a></li> - <#if (shipment.shipmentTypeId)?exists && shipment.shipmentTypeId = "PURCHASE_RETURN"> + <#if (shipment.shipmentTypeId)?? && shipment.shipmentTypeId = "PURCHASE_RETURN"> <li<#if selected="AddItemsFromInventory"> class="selected"</#if>><a href="<@ofbizUrl>AddItemsFromInventory?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductOrderItems}</a></li> </#if> - <#if (shipment.shipmentTypeId)?exists && shipment.shipmentTypeId = "SALES_SHIPMENT"> + <#if (shipment.shipmentTypeId)?? && shipment.shipmentTypeId = "SALES_SHIPMENT"> <li<#if selected="EditShipmentPlan"> class="selected"</#if>><a href="<@ofbizUrl>EditShipmentPlan?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductShipmentPlan}</a></li> <li<#if selected="AddItemsFromOrder"> class="selected"</#if>><a href="<@ofbizUrl>AddItemsFromOrder?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductOrderItems}</a></li> <li<#if selected="EditShipmentItems"> class="selected"</#if>><a href="<@ofbizUrl>EditShipmentItems?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductItems}</a></li> <li<#if selected="EditShipmentPackages"> class="selected"</#if>><a href="<@ofbizUrl>EditShipmentPackages?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductPackages}</a></li> <li<#if selected="EditShipmentRouteSegments"> class="selected"</#if>><a href="<@ofbizUrl>EditShipmentRouteSegments?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductRouteSegments}</a></li> </#if> - <#if (shipment.shipmentTypeId)?exists && shipment.shipmentTypeId='PURCHASE_SHIPMENT'> + <#if (shipment.shipmentTypeId)?? && shipment.shipmentTypeId='PURCHASE_SHIPMENT'> <li<#if selected="EditShipmentPlan"> class="selected"</#if>><a href="<@ofbizUrl>EditShipmentPlan?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductOrderItems}</a></li> <li<#if selected="ViewShipmentReceipts"> class="selected"</#if>><a href="<@ofbizUrl>ViewShipmentReceipts?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductShipmentReceipts}</a></li> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/VerifyPick.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/VerifyPick.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/VerifyPick.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/VerifyPick.ftl Mon Aug 18 07:42:27 2014 @@ -22,7 +22,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductVerify} ${uiLabelMap.OrderOrder} ${uiLabelMap.CommonIn} ${facility.facilityName?if_exists} [${facility.facilityId?if_exists}]</li> + <li class="h3">${uiLabelMap.ProductVerify} ${uiLabelMap.OrderOrder} ${uiLabelMap.CommonIn} ${facility.facilityName!} [${facility.facilityId!}]</li> </ul> <br class="clear"/> </div> @@ -33,7 +33,7 @@ under the License. <div> <span class="label">${uiLabelMap.ProductShipmentId}</span><a href="<@ofbizUrl>/ViewShipment?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext">${shipmentId}</a> </div> - <#if invoiceIds?exists && invoiceIds?has_content> + <#if invoiceIds?? && invoiceIds?has_content> <div> <span class="label">${uiLabelMap.AccountingInvoices}:</span> <ul> @@ -50,7 +50,7 @@ under the License. <br /> <div class="screenlet-body"> <form name="selectOrderForm" method="post" action="<@ofbizUrl>VerifyPick</@ofbizUrl>"> - <input type="hidden" name="facilityId" value="${facility.facilityId?if_exists}"/> + <input type="hidden" name="facilityId" value="${facility.facilityId!}"/> <table cellspacing="0" class="basic-table"> <tr> <td width="25%" align="right"><span class="label">${uiLabelMap.ProductOrderId}</span></td> @@ -59,7 +59,7 @@ under the License. <#if shipmentId?has_content> <input type="text" name="orderId" size="20" maxlength="20" value=""/> <#else> - <input type="text" name="orderId" size="20" maxlength="20" value="${orderId?if_exists}"/> + <input type="text" name="orderId" size="20" maxlength="20" value="${orderId!}"/> </#if> / <input type="text" name="shipGroupSeqId" size="6" maxlength="6" value="${shipGroupSeqId?default("00001")}"/> @@ -77,13 +77,13 @@ under the License. <br /> <!-- select picklist bin form --> <form name="selectPicklistBinForm" method="post" action="<@ofbizUrl>VerifyPick</@ofbizUrl>" style="margin: 0;"> - <input type="hidden" name="facilityId" value="${facility.facilityId?if_exists}"/> + <input type="hidden" name="facilityId" value="${facility.facilityId!}"/> <table cellspacing="0" class="basic-table"> <tr> <td width="25%" align='right'><span class="label">${uiLabelMap.FormFieldTitle_picklistBinId}</span></td> <td width="1"> </td> <td width="25%"> - <input type="text" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId?if_exists}"/> + <input type="text" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId!}"/> </td> <td> </td> </tr> @@ -96,13 +96,13 @@ under the License. </table> </form> <form name="clearPickForm" method="post" action="<@ofbizUrl>cancelAllRows</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> - <input type="hidden" name="facilityId" value="${facility.facilityId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> + <input type="hidden" name="facilityId" value="${facility.facilityId!}"/> </form> </div> </div> - <#if showInput != "N" && orderHeader?exists && orderHeader?has_content> + <#if showInput != "N" && orderHeader?? && orderHeader?has_content> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -131,7 +131,7 @@ under the License. ${postalAddress.address2} <br /> </#if> - ${postalAddress.city?if_exists}, ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists} + ${postalAddress.city!}, ${postalAddress.stateProvinceGeoId!} ${postalAddress.postalCode!} <br /> ${postalAddress.countryGeoId} <br /> @@ -164,9 +164,9 @@ under the License. </#if> <hr /> <form name="singlePickForm" method="post" action="<@ofbizUrl>processVerifyPick</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> - <input type="hidden" name="facilityId" value="${facility.facilityId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> + <input type="hidden" name="facilityId" value="${facility.facilityId!}"/> <table cellpadding="2" cellspacing="0" class="basic-table"> <tr> <td> @@ -182,12 +182,12 @@ under the License. </table> </form> <br /> - <#assign orderItems = orderItems?if_exists> + <#assign orderItems = orderItems!> <form name="multiPickForm" method="post" action="<@ofbizUrl>processBulkVerifyPick</@ofbizUrl>"> - <input type="hidden" name="facilityId" value="${facility.facilityId?if_exists}"/> - <input type="hidden" name="userLoginId" value="${userLoginId?if_exists}"/> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> + <input type="hidden" name="facilityId" value="${facility.facilityId!}"/> + <input type="hidden" name="userLoginId" value="${userLoginId!}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> <table class="basic-table" cellspacing='0'> <tr class="header-row"> <td> </td> @@ -204,7 +204,7 @@ under the License. <#assign counter = 1> <#assign isShowVerifyItemButton = "false"> <#list orderItems as orderItem> - <#assign orderItemSeqId = orderItem.orderItemSeqId?if_exists> + <#assign orderItemSeqId = orderItem.orderItemSeqId!> <#assign readyToVerify = verifyPickSession.getReadyToVerifyQuantity(orderId,orderItemSeqId)> <#assign orderItemQuantity = orderItem.getBigDecimal("quantity")> <#assign verifiedQuantity = 0.000000> @@ -223,7 +223,7 @@ under the License. <#assign counter = counter +1> </#if> <#assign orderItemQuantity = orderItemQuantity.subtract(verifiedQuantity)> - <#assign product = orderItem.getRelatedOne("Product", false)?if_exists/> + <#assign product = orderItem.getRelatedOne("Product", false)!/> <tr> <#if (orderItemQuantity.compareTo(readyToVerify) > 0) > <td><input type="checkbox" name="sel_${rowKey}" value="Y" checked=""/></td> @@ -231,35 +231,35 @@ under the License. <#else> <td> </td> </#if> - <td>${orderItemSeqId?if_exists}</td> + <td>${orderItemSeqId!}</td> <td>${product.productId?default("N/A")}</td> <td> - <a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a> + <a href="/catalog/control/EditProduct?productId=${product.productId!}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(product.internalName)!}</a> </td> <td> <select name="geo_${rowKey}"> <#if product.originGeoId?has_content> <#assign originGeoId = product.originGeoId> <#assign geo = delegator.findOne("Geo", Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId", originGeoId), true)> - <option value="${originGeoId}">${geo.geoName?if_exists}</option> + <option value="${originGeoId}">${geo.geoName!}</option> <option value="${originGeoId}">---</option> </#if> <option value=""></option> ${screens.render("component://common/widget/CommonScreens.xml#countries")} </select> </td> - <td align="right">${orderItemQuantity?if_exists}</td> - <td align="right">${readyToVerify?if_exists}</td> + <td align="right">${orderItemQuantity!}</td> + <td align="right">${readyToVerify!}</td> <td align="center"> <#if (orderItemQuantity.compareTo(readyToVerify) > 0)> <#assign qtyToVerify = orderItemQuantity.subtract(readyToVerify) > - <input type="text" size="7" name="qty_${rowKey}" value="${qtyToVerify?if_exists}"/> + <input type="text" size="7" name="qty_${rowKey}" value="${qtyToVerify!}"/> <#else> 0 </#if> </td> - <input type="hidden" name="prd_${rowKey}" value="${(orderItem.productId)?if_exists}"/> - <input type="hidden" name="ite_${rowKey}" value="${(orderItem.orderItemSeqId)?if_exists}"/> + <input type="hidden" name="prd_${rowKey}" value="${(orderItem.productId)!}"/> + <input type="hidden" name="ite_${rowKey}" value="${(orderItem.orderItemSeqId)!}"/> </tr> <#assign workOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)/> <#if workOrderItemFulfillments?has_content> @@ -283,9 +283,9 @@ under the License. <tr> <td colspan="2"></td> <td>${product.productId?default("N/A")}</td> - <td>${product.internalName?if_exists}</td> + <td>${product.internalName!}</td> <td></td> - <td align="right">${workEffortInventoryAssign.quantity?if_exists}</td> + <td align="right">${workEffortInventoryAssign.quantity!}</td> </tr> </#list> <tr><td colspan="8"><hr /></td></tr> @@ -316,18 +316,18 @@ under the License. <br /> </div> </div> - <#assign orderId = orderId?if_exists > - <#assign pickRows = verifyPickSession.getPickRows(orderId)?if_exists> + <#assign orderId = orderId! > + <#assign pickRows = verifyPickSession.getPickRows(orderId)!> <form name="completePickForm" method="post" action="<@ofbizUrl>completeVerifiedPick</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> - <input type="hidden" name="facilityId" value="${facility.facilityId?if_exists}"/> - <input type="hidden" name="userLoginId" value="${userLoginId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> + <input type="hidden" name="facilityId" value="${facility.facilityId!}"/> + <input type="hidden" name="userLoginId" value="${userLoginId!}"/> <#if pickRows?has_content> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductVerified} ${uiLabelMap.OrderItems} : ${pickRows.size()?if_exists}</li> + <li class="h3">${uiLabelMap.ProductVerified} ${uiLabelMap.OrderItems} : ${pickRows.size()!}</li> </ul> <br class="clear"/> </div> @@ -341,12 +341,12 @@ under the License. <td> </td> </tr> <#list pickRows as pickRow> - <#if (pickRow.getOrderId()?if_exists).equals(orderId)> + <#if (pickRow.getOrderId()!).equals(orderId)> <tr> - <td>${pickRow.getOrderItemSeqId()?if_exists}</td> - <td>${pickRow.getProductId()?if_exists}</td> - <td>${pickRow.getInventoryItemId()?if_exists}</td> - <td align="right">${pickRow.getReadyToVerifyQty()?if_exists}</td> + <td>${pickRow.getOrderItemSeqId()!}</td> + <td>${pickRow.getProductId()!}</td> + <td>${pickRow.getInventoryItemId()!}</td> + <td align="right">${pickRow.getReadyToVerifyQty()!}</td> </tr> </#if> </#list> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl Mon Aug 18 07:42:27 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if shipment?exists> +<#if shipment??> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -32,94 +32,94 @@ under the License. </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductShipmentType}</td> - <td width="80%">${(shipmentType.get("description",locale))?default(shipment.shipmentTypeId?if_exists)}</td> + <td width="80%">${(shipmentType.get("description",locale))?default(shipment.shipmentTypeId!)}</td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.CommonStatus}</td> - <td width="80%">${(statusItem.get("description",locale))?default(shipment.statusId?if_exists)}</td> + <td width="80%">${(statusItem.get("description",locale))?default(shipment.statusId!)}</td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductPrimaryOrderId}</td> - <td width="80%"><#if shipment.primaryOrderId?exists><a href="/ordermgr/control/orderview?orderId=${shipment.primaryOrderId}" class="buttontext">${shipment.primaryOrderId}</a></#if></td> + <td width="80%"><#if shipment.primaryOrderId??><a href="/ordermgr/control/orderview?orderId=${shipment.primaryOrderId}" class="buttontext">${shipment.primaryOrderId}</a></#if></td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductPrimaryReturnId}</td> - <td width="80%"><#if shipment.primaryReturnId?exists><a href="/ordermgr/control/returnMain?returnId=${shipment.primaryReturnId}" class="buttontext">${shipment.primaryReturnId}</a></#if></td> + <td width="80%"><#if shipment.primaryReturnId??><a href="/ordermgr/control/returnMain?returnId=${shipment.primaryReturnId}" class="buttontext">${shipment.primaryReturnId}</a></#if></td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductPrimaryShipGroupSeqId}</td> - <td width="80%">${shipment.primaryShipGroupSeqId?if_exists}</td> + <td width="80%">${shipment.primaryShipGroupSeqId!}</td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductEstimatedDates}</td> <td width="80%"> <span> - <span>${uiLabelMap.CommonReady}: </span>${(shipment.estimatedReadyDate.toString())?if_exists} - <span>${uiLabelMap.ProductEstimatedShipDate}: </span>${(shipment.estimatedShipDate.toString())?if_exists} - <span>${uiLabelMap.ProductArrival}: </span>${(shipment.estimatedArrivalDate.toString())?if_exists} + <span>${uiLabelMap.CommonReady}: </span>${(shipment.estimatedReadyDate.toString())!} + <span>${uiLabelMap.ProductEstimatedShipDate}: </span>${(shipment.estimatedShipDate.toString())!} + <span>${uiLabelMap.ProductArrival}: </span>${(shipment.estimatedArrivalDate.toString())!} </span> </td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductLatestCancelDate}</td> - <td width="80%">${(shipment.latestCancelDate.toString())?if_exists}</td> + <td width="80%">${(shipment.latestCancelDate.toString())!}</td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductEstimatedShipCost}</td> - <td width="80%">${(shipment.estimatedShipCost)?if_exists}</td> + <td width="80%">${(shipment.estimatedShipCost)!}</td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductAdditionalShippingCharge}</td> <td width="80%"> - <#if shipment.additionalShippingCharge?exists> - <@ofbizCurrency amount=shipment.additionalShippingCharge isoCode=shipment.currencyUomId?if_exists /> + <#if shipment.additionalShippingCharge??> + <@ofbizCurrency amount=shipment.additionalShippingCharge isoCode=shipment.currencyUomId! /> </#if> </td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductHandlingInstructions}</td> - <td width="80%">${shipment.handlingInstructions?if_exists}</td> + <td width="80%">${shipment.handlingInstructions!}</td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductFacilities}</td> <td width="80%"> - <div>${uiLabelMap.ProductOrigin}: ${(originFacility.facilityName)?if_exists} [${(shipment.originFacilityId?if_exists)}]</div> - <div>${uiLabelMap.ProductDestination}: ${(destinationFacility.facilityName)?if_exists} [${(shipment.destinationFacilityId?if_exists)}]</div> + <div>${uiLabelMap.ProductOrigin}: ${(originFacility.facilityName)!} [${(shipment.originFacilityId!)}]</div> + <div>${uiLabelMap.ProductDestination}: ${(destinationFacility.facilityName)!} [${(shipment.destinationFacilityId!)}]</div> </td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.PartyParties}</td> <td width="80%"> <span> - <span>${uiLabelMap.CommonTo}: ${(toPerson.firstName)?if_exists} ${(toPerson.middleName)?if_exists} ${(toPerson.lastName)?if_exists} ${(toPartyGroup.groupName)?if_exists} [${shipment.partyIdTo?if_exists}]</span> - <span>${uiLabelMap.CommonFrom}: ${(fromPerson.firstName)?if_exists} ${(fromPerson.middleName)?if_exists} ${(fromPerson.lastName)?if_exists} ${(fromPartyGroup.groupName)?if_exists} [${shipment.partyIdFrom?if_exists}]</span> + <span>${uiLabelMap.CommonTo}: ${(toPerson.firstName)!} ${(toPerson.middleName)!} ${(toPerson.lastName)!} ${(toPartyGroup.groupName)!} [${shipment.partyIdTo!}]</span> + <span>${uiLabelMap.CommonFrom}: ${(fromPerson.firstName)!} ${(fromPerson.middleName)!} ${(fromPerson.lastName)!} ${(fromPartyGroup.groupName)!} [${shipment.partyIdFrom!}]</span> </span> </td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductAddresses}</td> <td width="80%"> - <div>${uiLabelMap.ProductOrigin}: ${shipment.originContactMechId?if_exists} <#if originPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${originPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${originPostalAddress.attnName?if_exists}, ${originPostalAddress.address1?if_exists}, ${originPostalAddress.address2?if_exists}, ${originPostalAddress.city?if_exists}, ${originPostalAddress.stateProvinceGeoId?if_exists}, ${originPostalAddress.postalCode?if_exists}, ${originPostalAddress.countryGeoId?if_exists}]</#if></div> - <div>${uiLabelMap.ProductDestination}: ${shipment.destinationContactMechId?if_exists} <#if destinationPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${destinationPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${destinationPostalAddress.attnName?if_exists}, ${destinationPostalAddress.address1?if_exists}, ${destinationPostalAddress.address2?if_exists}, ${destinationPostalAddress.city?if_exists}, ${destinationPostalAddress.stateProvinceGeoId?if_exists}, ${destinationPostalAddress.postalCode?if_exists}, ${destinationPostalAddress.countryGeoId?if_exists}]</#if></div> + <div>${uiLabelMap.ProductOrigin}: ${shipment.originContactMechId!} <#if originPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${originPostalAddress.toName!}, ${uiLabelMap.CommonAttn} : ${originPostalAddress.attnName!}, ${originPostalAddress.address1!}, ${originPostalAddress.address2!}, ${originPostalAddress.city!}, ${originPostalAddress.stateProvinceGeoId!}, ${originPostalAddress.postalCode!}, ${originPostalAddress.countryGeoId!}]</#if></div> + <div>${uiLabelMap.ProductDestination}: ${shipment.destinationContactMechId!} <#if destinationPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${destinationPostalAddress.toName!}, ${uiLabelMap.CommonAttn} : ${destinationPostalAddress.attnName!}, ${destinationPostalAddress.address1!}, ${destinationPostalAddress.address2!}, ${destinationPostalAddress.city!}, ${destinationPostalAddress.stateProvinceGeoId!}, ${destinationPostalAddress.postalCode!}, ${destinationPostalAddress.countryGeoId!}]</#if></div> </td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.ProductPhoneNumbers}</td> <td width="80%"> - <div>${uiLabelMap.ProductOrigin}: ${shipment.originTelecomNumberId?if_exists} <#if originTelecomNumber?has_content>[${originTelecomNumber.countryCode?if_exists} ${originTelecomNumber.areaCode?if_exists} ${originTelecomNumber.contactNumber?if_exists}]</#if></div> - <div>${uiLabelMap.ProductDestination}: ${shipment.destinationTelecomNumberId?if_exists} <#if destinationTelecomNumber?has_content>[${destinationTelecomNumber.countryCode?if_exists} ${destinationTelecomNumber.areaCode?if_exists} ${destinationTelecomNumber.contactNumber?if_exists}]</#if></div> + <div>${uiLabelMap.ProductOrigin}: ${shipment.originTelecomNumberId!} <#if originTelecomNumber?has_content>[${originTelecomNumber.countryCode!} ${originTelecomNumber.areaCode!} ${originTelecomNumber.contactNumber!}]</#if></div> + <div>${uiLabelMap.ProductDestination}: ${shipment.destinationTelecomNumberId!} <#if destinationTelecomNumber?has_content>[${destinationTelecomNumber.countryCode!} ${destinationTelecomNumber.areaCode!} ${destinationTelecomNumber.contactNumber!}]</#if></div> </td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.CommonCreated}</td> <td width="80%"> - <div>${uiLabelMap.CommonBy} [${shipment.createdByUserLogin?if_exists}] ${uiLabelMap.CommonOn} ${(shipment.createdDate.toString())?if_exists}</div> + <div>${uiLabelMap.CommonBy} [${shipment.createdByUserLogin!}] ${uiLabelMap.CommonOn} ${(shipment.createdDate.toString())!}</div> </td> </tr> <tr> <td width="20%" align="right" class="label">${uiLabelMap.CommonLastUpdated}</td> <td width="80%"> - <div>${uiLabelMap.CommonBy} [${shipment.lastModifiedByUserLogin?if_exists}] ${uiLabelMap.CommonOn} ${(shipment.lastModifiedDate.toString())?if_exists}</div> + <div>${uiLabelMap.CommonBy} [${shipment.lastModifiedByUserLogin!}] ${uiLabelMap.CommonOn} ${(shipment.lastModifiedDate.toString())!}</div> </td> </tr> </table> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl Mon Aug 18 07:42:27 2014 @@ -34,19 +34,19 @@ under the License. <#assign itemIssuances = shipmentItemData.itemIssuances> <#assign orderShipments = shipmentItemData.orderShipments> <#assign shipmentPackageContents = shipmentItemData.shipmentPackageContents> - <#assign product = shipmentItemData.product?if_exists> + <#assign product = shipmentItemData.product!> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td>${shipmentItem.shipmentItemSeqId}</td> - <td colspan="2">${(product.internalName)?if_exists} <a href="/catalog/control/EditProduct?productId=${shipmentItem.productId?if_exists}" class="buttontext">${shipmentItem.productId?if_exists}</a></td> + <td colspan="2">${(product.internalName)!} <a href="/catalog/control/EditProduct?productId=${shipmentItem.productId!}" class="buttontext">${shipmentItem.productId!}</a></td> <td>${shipmentItem.quantity?default(" ")}</td> <td colspan="2">${shipmentItem.shipmentContentDescription?default(" ")}</td> </tr> <#list orderShipments as orderShipment> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td> </td> - <td><span class="label">${uiLabelMap.ProductOrderItem}</span> <a href="/ordermgr/control/orderview?orderId=${orderShipment.orderId?if_exists}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${orderShipment.orderId?if_exists}</a>${orderShipment.orderItemSeqId?if_exists}</td> + <td><span class="label">${uiLabelMap.ProductOrderItem}</span> <a href="/ordermgr/control/orderview?orderId=${orderShipment.orderId!}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${orderShipment.orderId!}</a>${orderShipment.orderItemSeqId!}</td> <td> </td> - <td>${orderShipment.quantity?if_exists}</td> + <td>${orderShipment.quantity!}</td> <td> </td> <td> </td> </tr> @@ -54,10 +54,10 @@ under the License. <#list itemIssuances as itemIssuance> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td> </td> - <td><span class="label">${uiLabelMap.ProductOrderItem}</span> <a href="/ordermgr/control/orderview?orderId=${itemIssuance.orderId?if_exists}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${itemIssuance.orderId?if_exists}</a>${itemIssuance.orderItemSeqId?if_exists}</td> - <td><span class="label">${uiLabelMap.ProductInventory}</span> <a href="<@ofbizUrl>EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId?if_exists}</@ofbizUrl>" class="buttontext">${itemIssuance.inventoryItemId?if_exists}</a></td> - <td>${itemIssuance.quantity?if_exists}</td> - <td>${itemIssuance.issuedDateTime?if_exists}</td> + <td><span class="label">${uiLabelMap.ProductOrderItem}</span> <a href="/ordermgr/control/orderview?orderId=${itemIssuance.orderId!}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${itemIssuance.orderId!}</a>${itemIssuance.orderItemSeqId!}</td> + <td><span class="label">${uiLabelMap.ProductInventory}</span> <a href="<@ofbizUrl>EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId!}</@ofbizUrl>" class="buttontext">${itemIssuance.inventoryItemId!}</a></td> + <td>${itemIssuance.quantity!}</td> + <td>${itemIssuance.issuedDateTime!}</td> <td class="label">${uiLabelMap.ProductFuturePartyRoleList}</td> </tr> </#list> @@ -65,7 +65,7 @@ under the License. <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td> </td> <td colspan="2"><span class="label">${uiLabelMap.ProductPackage}</span> ${shipmentPackageContent.shipmentPackageSeqId}</td> - <td>${shipmentPackageContent.quantity?if_exists}</td> + <td>${shipmentPackageContent.quantity!}</td> <td colspan="2"> </td> </tr> </#list> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl Mon Aug 18 07:42:27 2014 @@ -29,20 +29,20 @@ under the License. <#assign alt_row = false> <#list shipmentPackageDatas as shipmentPackageData> <#assign shipmentPackage = shipmentPackageData.shipmentPackage> - <#assign shipmentPackageContents = shipmentPackageData.shipmentPackageContents?if_exists> - <#assign shipmentPackageRouteSegs = shipmentPackageData.shipmentPackageRouteSegs?if_exists> - <#assign weightUom = shipmentPackageData.weightUom?if_exists> + <#assign shipmentPackageContents = shipmentPackageData.shipmentPackageContents!> + <#assign shipmentPackageRouteSegs = shipmentPackageData.shipmentPackageRouteSegs!> + <#assign weightUom = shipmentPackageData.weightUom!> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td>${shipmentPackage.shipmentPackageSeqId}</td> - <td>${(shipmentPackage.dateCreated.toString())?if_exists}</td> - <td><span class="label">${uiLabelMap.ProductWeight}</span> ${shipmentPackage.weight?if_exists}</td> - <td><span class="label">${uiLabelMap.ProductWeightUnit}</span> <#if weightUom?has_content>${weightUom.get("description",locale)}<#else>${shipmentPackage.weightUomId?if_exists}</#if></td> + <td>${(shipmentPackage.dateCreated.toString())!}</td> + <td><span class="label">${uiLabelMap.ProductWeight}</span> ${shipmentPackage.weight!}</td> + <td><span class="label">${uiLabelMap.ProductWeightUnit}</span> <#if weightUom?has_content>${weightUom.get("description",locale)}<#else>${shipmentPackage.weightUomId!}</#if></td> </tr> <#list shipmentPackageContents as shipmentPackageContent> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td> </td> <td><span class="label">${uiLabelMap.ProductItem}</span> ${shipmentPackageContent.shipmentItemSeqId}</td> - <td><span class="label">${uiLabelMap.ProductQuantity}</span> ${shipmentPackageContent.quantity?if_exists}</td> + <td><span class="label">${uiLabelMap.ProductQuantity}</span> ${shipmentPackageContent.quantity!}</td> <td> </td> </tr> </#list> @@ -50,8 +50,8 @@ under the License. <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td> </td> <td><span class="label">${uiLabelMap.ProductRouteSegment}</span> ${shipmentPackageRouteSeg.shipmentRouteSegmentId}</td> - <td><span class="label">${uiLabelMap.ProductTracking}</span> ${shipmentPackageRouteSeg.trackingCode?if_exists}</td> - <td><span class="label">${uiLabelMap.ProductBox}</span> ${shipmentPackageRouteSeg.boxNumber?if_exists}</td> + <td><span class="label">${uiLabelMap.ProductTracking}</span> ${shipmentPackageRouteSeg.trackingCode!}</td> + <td><span class="label">${uiLabelMap.ProductBox}</span> ${shipmentPackageRouteSeg.boxNumber!}</td> </tr> </#list> <#-- toggle the row color --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl Mon Aug 18 07:42:27 2014 @@ -46,53 +46,53 @@ under the License. <#assign alt_row = false> <#list shipmentRouteSegmentDatas as shipmentRouteSegmentData> <#assign shipmentRouteSegment = shipmentRouteSegmentData.shipmentRouteSegment> - <#assign shipmentPackageRouteSegs = shipmentRouteSegmentData.shipmentPackageRouteSegs?if_exists> - <#assign originFacility = shipmentRouteSegmentData.originFacility?if_exists> - <#assign destFacility = shipmentRouteSegmentData.destFacility?if_exists> - <#assign shipmentMethodType = shipmentRouteSegmentData.shipmentMethodType?if_exists> - <#assign carrierPerson = shipmentRouteSegmentData.carrierPerson?if_exists> - <#assign carrierPartyGroup = shipmentRouteSegmentData.carrierPartyGroup?if_exists> - <#assign originPostalAddress = shipmentRouteSegmentData.originPostalAddress?if_exists> - <#assign destPostalAddress = shipmentRouteSegmentData.destPostalAddress?if_exists> - <#assign originTelecomNumber = shipmentRouteSegmentData.originTelecomNumber?if_exists> - <#assign destTelecomNumber = shipmentRouteSegmentData.destTelecomNumber?if_exists> - <#assign carrierServiceStatusItem = shipmentRouteSegmentData.carrierServiceStatusItem?if_exists> - <#assign currencyUom = shipmentRouteSegmentData.currencyUom?if_exists> - <#assign billingWeightUom = shipmentRouteSegmentData.billingWeightUom?if_exists> - <#assign carrierServiceStatusValidChangeToDetails = shipmentRouteSegmentData.carrierServiceStatusValidChangeToDetails?if_exists> + <#assign shipmentPackageRouteSegs = shipmentRouteSegmentData.shipmentPackageRouteSegs!> + <#assign originFacility = shipmentRouteSegmentData.originFacility!> + <#assign destFacility = shipmentRouteSegmentData.destFacility!> + <#assign shipmentMethodType = shipmentRouteSegmentData.shipmentMethodType!> + <#assign carrierPerson = shipmentRouteSegmentData.carrierPerson!> + <#assign carrierPartyGroup = shipmentRouteSegmentData.carrierPartyGroup!> + <#assign originPostalAddress = shipmentRouteSegmentData.originPostalAddress!> + <#assign destPostalAddress = shipmentRouteSegmentData.destPostalAddress!> + <#assign originTelecomNumber = shipmentRouteSegmentData.originTelecomNumber!> + <#assign destTelecomNumber = shipmentRouteSegmentData.destTelecomNumber!> + <#assign carrierServiceStatusItem = shipmentRouteSegmentData.carrierServiceStatusItem!> + <#assign currencyUom = shipmentRouteSegmentData.currencyUom!> + <#assign billingWeightUom = shipmentRouteSegmentData.billingWeightUom!> + <#assign carrierServiceStatusValidChangeToDetails = shipmentRouteSegmentData.carrierServiceStatusValidChangeToDetails!> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td>${shipmentRouteSegment.shipmentRouteSegmentId}</td> <td> - <span>${(carrierPerson.firstName)?if_exists} ${(carrierPerson.middleName)?if_exists} ${(carrierPerson.lastName)?if_exists} ${(carrierPartyGroup.groupName)?if_exists} [${shipmentRouteSegment.carrierPartyId?if_exists}]</span> - <span>${shipmentMethodType.description?default(shipmentRouteSegment.shipmentMethodTypeId?if_exists)}</span> + <span>${(carrierPerson.firstName)!} ${(carrierPerson.middleName)!} ${(carrierPerson.lastName)!} ${(carrierPartyGroup.groupName)!} [${shipmentRouteSegment.carrierPartyId!}]</span> + <span>${shipmentMethodType.description?default(shipmentRouteSegment.shipmentMethodTypeId!)}</span> <br /> <span class="label">${uiLabelMap.ProductOrigin}</span> - <span>${(originFacility.facilityName)?if_exists} [${originFacility.facilityId?if_exists}]</span> + <span>${(originFacility.facilityName)!} [${originFacility.facilityId!}]</span> <br /> <span class="label">${uiLabelMap.ProductDest}</span> - <span>${(destFacility.facilityName)?if_exists} [${destFacility.facilityId?if_exists}]</span> + <span>${(destFacility.facilityName)!} [${destFacility.facilityId!}]</span> <br /> <span class="label">${uiLabelMap.ProductOrigin}</span> - <span><#if originPostalAddress?has_content>${uiLabelMap.CommonTo} : ${originPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${originPostalAddress.attnName?if_exists}, ${originPostalAddress.address1?if_exists}, ${originPostalAddress.address2?if_exists}, ${originPostalAddress.city?if_exists}, ${originPostalAddress.stateProvinceGeoId?if_exists}, ${originPostalAddress.postalCode?if_exists}, ${originPostalAddress.countryGeoId?if_exists}</#if> [${shipmentRouteSegment.originContactMechId?if_exists}]</span> + <span><#if originPostalAddress?has_content>${uiLabelMap.CommonTo} : ${originPostalAddress.toName!}, ${uiLabelMap.CommonAttn} : ${originPostalAddress.attnName!}, ${originPostalAddress.address1!}, ${originPostalAddress.address2!}, ${originPostalAddress.city!}, ${originPostalAddress.stateProvinceGeoId!}, ${originPostalAddress.postalCode!}, ${originPostalAddress.countryGeoId!}</#if> [${shipmentRouteSegment.originContactMechId!}]</span> <br /> <span class="label">${uiLabelMap.ProductDest}</span> - <span><#if destPostalAddress?has_content>${uiLabelMap.CommonTo} : ${destPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${destPostalAddress.attnName?if_exists}, ${destPostalAddress.address1?if_exists}, ${destPostalAddress.address2?if_exists}, ${destPostalAddress.city?if_exists}, ${destPostalAddress.stateProvinceGeoId?if_exists}, ${destPostalAddress.postalCode?if_exists}, ${destPostalAddress.countryGeoId?if_exists}</#if> [${shipmentRouteSegment.destContactMechId?if_exists}]</span> + <span><#if destPostalAddress?has_content>${uiLabelMap.CommonTo} : ${destPostalAddress.toName!}, ${uiLabelMap.CommonAttn} : ${destPostalAddress.attnName!}, ${destPostalAddress.address1!}, ${destPostalAddress.address2!}, ${destPostalAddress.city!}, ${destPostalAddress.stateProvinceGeoId!}, ${destPostalAddress.postalCode!}, ${destPostalAddress.countryGeoId!}</#if> [${shipmentRouteSegment.destContactMechId!}]</span> <br /> <span class="label">${uiLabelMap.ProductOrigin}</span> - <span><#if originTelecomNumber?has_content>${originTelecomNumber.countryCode?if_exists} ${originTelecomNumber.areaCode?if_exists} ${originTelecomNumber.contactNumber?if_exists}</#if> [${shipmentRouteSegment.originTelecomNumberId?if_exists}]</span> + <span><#if originTelecomNumber?has_content>${originTelecomNumber.countryCode!} ${originTelecomNumber.areaCode!} ${originTelecomNumber.contactNumber!}</#if> [${shipmentRouteSegment.originTelecomNumberId!}]</span> <br /> <span class="label">${uiLabelMap.ProductDest}</span> - <span><#if destTelecomNumber?has_content>${destTelecomNumber.countryCode?if_exists} ${destTelecomNumber.areaCode?if_exists} ${destTelecomNumber.contactNumber?if_exists}</#if> [${shipmentRouteSegment.destTelecomNumberId?if_exists}]</span> + <span><#if destTelecomNumber?has_content>${destTelecomNumber.countryCode!} ${destTelecomNumber.areaCode!} ${destTelecomNumber.contactNumber!}</#if> [${shipmentRouteSegment.destTelecomNumberId!}]</span> <br /> </td> <td> <div>${(carrierServiceStatus.description)?default(" ")}</div> <div>${shipmentRouteSegment.trackingIdNumber?default(" ")}</div> - <div>${(shipmentRouteSegment.estimatedStartDate.toString())?if_exists} - ${(shipmentRouteSegment.estimatedArrivalDate.toString())?if_exists}</div> - <div>${(shipmentRouteSegment.actualStartDate.toString())?if_exists} - ${(shipmentRouteSegment.actualArrivalDate.toString())?if_exists}</div> + <div>${(shipmentRouteSegment.estimatedStartDate.toString())!} - ${(shipmentRouteSegment.estimatedArrivalDate.toString())!}</div> + <div>${(shipmentRouteSegment.actualStartDate.toString())!} - ${(shipmentRouteSegment.actualArrivalDate.toString())!}</div> </td> <td> - <div>${shipmentRouteSegment.billingWeight?if_exists} ${(billingWeightUom.get("description",locale))?if_exists} [${(billingWeightUom.abbreviation)?if_exists}]</div> + <div>${shipmentRouteSegment.billingWeight!} ${(billingWeightUom.get("description",locale))!} [${(billingWeightUom.abbreviation)!}]</div> <div>${(currencyUom.get("description",locale))?default(" ")}</div> <div>${(shipmentRouteSegment.actualTransportCost)?default(" ")}</div> <div>${(shipmentRouteSegment.actualServiceCost)?default(" ")}</div> @@ -104,8 +104,8 @@ under the License. <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td> </td> <td><span class="label">${uiLabelMap.ProductPackage}</span> ${shipmentPackageRouteSeg.shipmentPackageSeqId}</td> - <td><span class="label">${uiLabelMap.ProductTracking}</span> ${shipmentPackageRouteSeg.trackingCode?if_exists}</td> - <td><span class="label">${uiLabelMap.ProductBox}</span> ${shipmentPackageRouteSeg.boxNumber?if_exists}</td> + <td><span class="label">${uiLabelMap.ProductTracking}</span> ${shipmentPackageRouteSeg.trackingCode!}</td> + <td><span class="label">${uiLabelMap.ProductBox}</span> ${shipmentPackageRouteSeg.boxNumber!}</td> </tr> </#list> <#-- toggle the row color --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/WeightPackage.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/WeightPackage.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/WeightPackage.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/WeightPackage.ftl Mon Aug 18 07:42:27 2014 @@ -22,7 +22,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductWeighPackageOnly} in ${facility.facilityName?if_exists} [${(facility.facilityId)?if_exists}]</li> + <li class="h3">${uiLabelMap.ProductWeighPackageOnly} in ${facility.facilityName!} [${(facility.facilityId)!}]</li> </ul> <br class="clear"/> </div> @@ -32,7 +32,7 @@ under the License. ${uiLabelMap.CommonView} <a href="<@ofbizUrl>/PackingSlip.pdf?shipmentId=${shipmentId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductPackingSlip}</a> ${uiLabelMap.CommonOr} ${uiLabelMap.CommonView} <a href="<@ofbizUrl>/ShipmentBarCode.pdf?shipmentId=${shipmentId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductBarcode}</a> ${uiLabelMap.CommonFor} ${uiLabelMap.ProductShipmentId} <a href="<@ofbizUrl>/ViewShipment?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext">${shipmentId}</a> </div> - <#if invoiceIds?exists && invoiceIds?has_content> + <#if invoiceIds?? && invoiceIds?has_content> <div> <p>${uiLabelMap.AccountingInvoices}:</p> <ul> @@ -46,15 +46,15 @@ under the License. </div> </#if> </#if> - <#if shipmentPackageRouteSegList?exists && shipmentPackageRouteSegList?has_content> + <#if shipmentPackageRouteSegList?? && shipmentPackageRouteSegList?has_content> <#list shipmentPackageRouteSegList as shipmentPackageRouteSeg> <form name="viewShipmentPackageRouteSegLabelImageForm_${shipmentPackageRouteSeg_index}" method="post" action="<@ofbizUrl>viewShipmentPackageRouteSegLabelImage</@ofbizUrl>"> - <input type="hidden" name="shipmentId" value ="${(shipmentPackageRouteSeg.shipmentId)?if_exists}"/> - <input type="hidden" name ="shipmentPackageSeqId" value = "${(shipmentPackageRouteSeg.shipmentPackageSeqId)?if_exists}"/> - <input type="hidden" name="shipmentRouteSegmentId" value ="${(shipmentPackageRouteSeg.shipmentRouteSegmentId)?if_exists}"/> + <input type="hidden" name="shipmentId" value ="${(shipmentPackageRouteSeg.shipmentId)!}"/> + <input type="hidden" name ="shipmentPackageSeqId" value = "${(shipmentPackageRouteSeg.shipmentPackageSeqId)!}"/> + <input type="hidden" name="shipmentRouteSegmentId" value ="${(shipmentPackageRouteSeg.shipmentRouteSegmentId)!}"/> <div> - <span class="label">${uiLabelMap.ProductPackage}</span> ${(shipmentPackageRouteSeg.shipmentPackageSeqId)?if_exists} - <#if shipmentPackageRouteSeg.labelImage?exists> + <span class="label">${uiLabelMap.ProductPackage}</span> ${(shipmentPackageRouteSeg.shipmentPackageSeqId)!} + <#if shipmentPackageRouteSeg.labelImage??> <a href="javascript:document.viewShipmentPackageRouteSegLabelImageForm_${shipmentPackageRouteSeg_index}.submit();" class="buttontext">${uiLabelMap.ProductViewLabelImage}</a> </#if> </div> @@ -64,13 +64,13 @@ under the License. <br /> <#if !(orderId?has_content)> <form name="selectOrderForm" method="post" action="<@ofbizUrl>WeightPackageOnly</@ofbizUrl>"> - <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}" /> + <input type="hidden" name="facilityId" value="${(facility.facilityId)!}" /> <table cellspacing="0" class="basic-table"> <tr> <td width="25%" align="right"><span class="label">${uiLabelMap.ProductOrderId}</span></td> <td width="1"> </td> <td width="25%"> - <input type="text" name="orderId" size="20" maxlength="20" value="${primaryOrderId?if_exists}"/> + <input type="text" name="orderId" size="20" maxlength="20" value="${primaryOrderId!}"/> / <input type="text" name="shipGroupSeqId" size="6" maxlength="6" value="${shipGroupSeqId?default("00001")}"/> </td> @@ -88,13 +88,13 @@ under the License. <br /> <!-- select picklist bin form --> <form name="selectPicklistBinForm" method="post" action="<@ofbizUrl>WeightPackageOnly</@ofbizUrl>" style="margin: 0;"> - <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}" /> + <input type="hidden" name="facilityId" value="${(facility.facilityId)!}" /> <table cellspacing="0" class="basic-table"> <tr> <td width="25%" align='right'><span class="label">${uiLabelMap.FormFieldTitle_picklistBinId}</span></td> <td width="1"> </td> <td width="25%"> - <input type="text" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId?if_exists}"/> + <input type="text" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId!}"/> </td> <td> </td> </tr> @@ -125,25 +125,25 @@ under the License. </tr> <#list packedLines as packedLine> <form name="updateWeightPackageForm_${packedLine.getWeightPackageSeqId()}" method="post" action="<@ofbizUrl>updatePackedLine</@ofbizUrl>"> - <input type="hidden" name="orderId" value ="${orderId?if_exists}"/> - <input type="hidden" name = "facilityId" value = "${(facility.facilityId)?if_exists}"/> + <input type="hidden" name="orderId" value ="${orderId!}"/> + <input type="hidden" name = "facilityId" value = "${(facility.facilityId)!}"/> <input type="hidden" name="weightPackageSeqId" value ="${packedLine.getWeightPackageSeqId()}"/> <tr> <td> <span class="label"> ${uiLabelMap.ProductPackage} ${packedLine.getWeightPackageSeqId()} - <input type="text" size="7" name="packageWeight" value="${(packedLine.getPackageWeight())?if_exists}" /> + <input type="text" size="7" name="packageWeight" value="${(packedLine.getPackageWeight())!}" /> </span> </td> <td> - <span class="label">${uiLabelMap.CommonLength}<input type="text" name="packageLength" value="${(packedLine.getPackageLength())?if_exists}" size="5"/></span> - <span class="label">${uiLabelMap.ProductWidth}<input type="text" name="packageWidth" value="${(packedLine.getPackageWidth())?if_exists}" size="5"/></span> - <span class="label">${uiLabelMap.PartyHeight}<input type="text" name="packageHeight" value="${(packedLine.getPackageHeight())?if_exists}" size="5"/></span> + <span class="label">${uiLabelMap.CommonLength}<input type="text" name="packageLength" value="${(packedLine.getPackageLength())!}" size="5"/></span> + <span class="label">${uiLabelMap.ProductWidth}<input type="text" name="packageWidth" value="${(packedLine.getPackageWidth())!}" size="5"/></span> + <span class="label">${uiLabelMap.PartyHeight}<input type="text" name="packageHeight" value="${(packedLine.getPackageHeight())!}" size="5"/></span> </td> <td> <select name="shipmentBoxTypeId"> <#if shipmentBoxTypes?has_content> - <#assign shipmentBoxTypeId = "${(packedLine.getShipmentBoxTypeId())?if_exists}"/> + <#assign shipmentBoxTypeId = "${(packedLine.getShipmentBoxTypeId())!}"/> <#list shipmentBoxTypes as shipmentBoxType> <#if shipmentBoxTypeId == "${shipmentBoxType.shipmentBoxTypeId}"> <option value="${shipmentBoxType.shipmentBoxTypeId}">${shipmentBoxType.description}</option> @@ -166,23 +166,23 @@ under the License. <a href="javascript:document.completePackageForm.submit()" class="buttontext">${uiLabelMap.ProductComplete}</a> </div> <form name="completePackageForm" method ="post" action="<@ofbizUrl>completePackage</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> - <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> + <input type="hidden" name="facilityId" value="${(facility.facilityId)!}"/> <input type="hidden" name="weightUomId" value="${defaultWeightUomId}"/> <input type="hidden" name="dimensionUomId" value="${defaultDimensionUomId}"/> - <input type="hidden" name="shipmentId" value="${(shipment.shipmentId)?if_exists}"/> - <input type="hidden" name="invoiceId" value="${(invoice.invoiceId)?if_exists}"/> - <input type="hidden" name="estimatedShippingCost" value="${estimatedShippingCost?if_exists}"/> - <input type="hidden" name="newEstimatedShippingCost" value="${newEstimatedShippingCost?if_exists}"/> + <input type="hidden" name="shipmentId" value="${(shipment.shipmentId)!}"/> + <input type="hidden" name="invoiceId" value="${(invoice.invoiceId)!}"/> + <input type="hidden" name="estimatedShippingCost" value="${estimatedShippingCost!}"/> + <input type="hidden" name="newEstimatedShippingCost" value="${newEstimatedShippingCost!}"/> </form> </#if> <#if (orderedQuantity > packedLines.size())> <table class="basic-table" cellpadding="2" cellspacing='0'> <form name="weightPackageForm" method ="post" action="<@ofbizUrl>setPackageInfo</@ofbizUrl>"> - <input type="hidden" name = "shipGroupSeqId" value = "${shipGroupSeqId?if_exists}"/> - <input type="hidden" name = "facilityId" value = "${(facility.facilityId)?if_exists}"/> - <input type="hidden" name = "orderId" value = "${orderId?if_exists}"/> + <input type="hidden" name = "shipGroupSeqId" value = "${shipGroupSeqId!}"/> + <input type="hidden" name = "facilityId" value = "${(facility.facilityId)!}"/> + <input type="hidden" name = "orderId" value = "${orderId!}"/> <#assign packedLines = weightPackageSession.getPackedLines(orderId)/> <#if packedLines?has_content> <hr/> @@ -233,29 +233,29 @@ under the License. </th> </tr> <form name="completePackForm" method="post" action="<@ofbizUrl>shipNow</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> - <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"/> - <input type="hidden" name="shipmentId" value="${(shipment.shipmentId)?if_exists}"/> - <input type="hidden" name="invoiceId" value="${(invoice.invoiceId)?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> + <input type="hidden" name="facilityId" value="${(facility.facilityId)!}"/> + <input type="hidden" name="shipmentId" value="${(shipment.shipmentId)!}"/> + <input type="hidden" name="invoiceId" value="${(invoice.invoiceId)!}"/> <#list shipmentPackages?sort_by("shipmentPackageSeqId") as shipmentPackage> <tr> <td> <span class="label"> ${uiLabelMap.ProductPackage} ${(shipmentPackage_index + 1)} - <input type="text" size="7" readonly="readonly" name="packageWeight" value="${(shipmentPackage.weight)?if_exists}" /> + <input type="text" size="7" readonly="readonly" name="packageWeight" value="${(shipmentPackage.weight)!}" /> </span> </td> <td> - <span class="label">${uiLabelMap.CommonLength}<input type="text" readonly="readonly" name="packageLength" value="${(shipmentPackage.boxLength)?if_exists}" size="5"/></span> - <span class="label">${uiLabelMap.ProductWidth}<input type="text" readonly="readonly" name="packageWidth" value="${(shipmentPackage.boxWidth)?if_exists}" size="5"/></span> - <span class="label">${uiLabelMap.PartyHeight}<input type="text" readonly="readonly" name="packageHeight" value="${(shipmentPackage.boxHeight)?if_exists}" size="5"/></span> + <span class="label">${uiLabelMap.CommonLength}<input type="text" readonly="readonly" name="packageLength" value="${(shipmentPackage.boxLength)!}" size="5"/></span> + <span class="label">${uiLabelMap.ProductWidth}<input type="text" readonly="readonly" name="packageWidth" value="${(shipmentPackage.boxWidth)!}" size="5"/></span> + <span class="label">${uiLabelMap.PartyHeight}<input type="text" readonly="readonly" name="packageHeight" value="${(shipmentPackage.boxHeight)!}" size="5"/></span> </td> <td> <#if (shipmentPackage.shipmentBoxTypeId)?has_content> <#assign shipmentBoxType = delegator.findOne("ShipmentBoxType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentBoxTypeId", shipmentPackage.shipmentBoxTypeId), true)> </#if> - <input type="text" readonly="readonly" name="shipmentBoxTypeId" value="${(shipmentBoxType.description)?if_exists}" size="50"/> + <input type="text" readonly="readonly" name="shipmentBoxTypeId" value="${(shipmentBoxType.description)!}" size="50"/> </td> </tr> </#list> @@ -278,18 +278,18 @@ under the License. </div> <div class="screenlet-body"> <div> - <h3>${uiLabelMap.FacilityWarningMessageThereIsMuchDifferenceInShippingCharges} [${uiLabelMap.FacilityEstimatedShippingCharges} = <@ofbizCurrency amount=estimatedShippingCost?if_exists isoCode=shipment.currencyUomId?if_exists/>, ${uiLabelMap.FacilityActualShippingCharges} = <@ofbizCurrency amount=newEstimatedShippingCost?if_exists isoCode=shipment.currencyUomId?if_exists/>]</h3> + <h3>${uiLabelMap.FacilityWarningMessageThereIsMuchDifferenceInShippingCharges} [${uiLabelMap.FacilityEstimatedShippingCharges} = <@ofbizCurrency amount=estimatedShippingCost! isoCode=shipment.currencyUomId!/>, ${uiLabelMap.FacilityActualShippingCharges} = <@ofbizCurrency amount=newEstimatedShippingCost! isoCode=shipment.currencyUomId!/>]</h3> </div> <form name="shipNowForm" method="post" action="<@ofbizUrl>shipNow</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> - <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"/> - <input type="hidden" name="shipmentId" value="${(shipment.shipmentId)?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> + <input type="hidden" name="facilityId" value="${(facility.facilityId)!}"/> + <input type="hidden" name="shipmentId" value="${(shipment.shipmentId)!}"/> </form> <form name="holdShipmentForm" method="post" action="<@ofbizUrl>HoldShipment</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> - <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> + <input type="hidden" name="facilityId" value="${(facility.facilityId)!}"/> </form> <div> <a href="javascript:document.shipNowForm.submit()" class="buttontext">${uiLabelMap.FacilityShip} ${uiLabelMap.CommonNow}</a> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/FieldLookupForms.xml?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/FieldLookupForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/FieldLookupForms.xml Mon Aug 18 07:42:27 2014 @@ -338,4 +338,42 @@ under the License. <field name="storeName"><display/></field> <!-- <field name="companyName"><display/></field> --> </form> -</forms> + <form name="lookupCostComponentCalc" target="LookupCostComponentCalc" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> + <field name="costComponentCalcId" title="${uiLabelMap.ProductCostComponentCalcId}"><text-find/></field> + <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field> + <field name="costGlAccountTypeId" title="${uiLabelMap.ProductCostGlAccountTypeId}"> + <drop-down allow-empty="true"> + <entity-options entity-name="GlAccountType" description="${description}" key-field-name="glAccountTypeId"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="offsettingGlAccountTypeId" title="${uiLabelMap.ProductOffsettingGlAccountTypeId}"> + <drop-down allow-empty="true"> + <entity-options entity-name="GlAccountType" description="${description}" key-field-name="glAccountTypeId"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="listLookupCostComponentCalc" list-name="listIt" title="" type="list" paginate-target="LookupCostComponentCalc" + odd-row-style="alternate-row" default-table-style="basic-table" view-size="20"> + <actions> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> + <field-map field-name="entityName" value="CostComponentCalc"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> + </service> + </actions> + <field name="costComponentCalcId" title="${uiLabelMap.ProductCostComponentCalcId}" widget-style="buttontext"> + <hyperlink also-hidden="false" target-type="plain" description="${costComponentCalcId}" target="javascript:set_value('${costComponentCalcId}')"/> + </field> + <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> + <field name="costGlAccountTypeId" title="${uiLabelMap.ProductCostGlAccountTypeId}"><display/></field> + <field name="offsettingGlAccountTypeId" title="${uiLabelMap.ProductOffsettingGlAccountTypeId}"><display/></field> + </form> +</forms> \ No newline at end of file Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/LookupScreens.xml?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/LookupScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/LookupScreens.xml Mon Aug 18 07:42:27 2014 @@ -223,4 +223,31 @@ under the License. </widgets> </section> </screen> -</screens> + <screen name="LookupCostComponentCalc"> + <section> + <condition> + <if-service-permission service-name="catalogPermissionCheck" main-action="VIEW"/> + </condition> + <actions> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <set field="title" value="${uiLabelMap.PageTitleLookupCostComponentCalc}"/> + <set field="queryString" from-field="result.queryString"/> + <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> + <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> + <set field="entityName" value="CostComponentCalc"/> + <set field="searchFields" value="[costComponentCalcId, description, costGlAccountTypeId, offsettingGlAccountTypeId]"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="search-options"> + <include-form name="lookupCostComponentCalc" location="component://product/widget/catalog/FieldLookupForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="listLookupCostComponentCalc" location="component://product/widget/catalog/FieldLookupForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> +</screens> \ No newline at end of file Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml Mon Aug 18 07:42:27 2014 @@ -1313,6 +1313,12 @@ under the License. <field name="productId"><hidden/></field> <field name="costComponentId" use-when="costComponent!=null"><display/></field> <field name="costComponentId" use-when="costComponent==null"><hidden/></field> + <field name="productFeatureId"><lookup target-form-name="LookupProductFeature"/></field> + <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> + <field name="geoId"><lookup target-form-name="LookupGeo"/></field> + <field name="workEffortId"><lookup target-form-name="LookupWorkEffort"/></field> + <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field> + <field name="costComponentCalcId"><lookup target-form-name="LookupCostComponentCalc"/></field> <field name="costComponentTypeId"> <drop-down allow-empty="false"> <entity-options entity-name="CostComponentType" description="${description}"> @@ -2253,4 +2259,4 @@ under the License. <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> - </forms> + </forms> \ No newline at end of file Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/email/default/passwordemail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/email/default/passwordemail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/email/default/passwordemail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/email/default/passwordemail.ftl Mon Aug 18 07:42:27 2014 @@ -21,13 +21,13 @@ under the License. <head> </head> <body> - <div>${uiLabelMap.EcommerceThisEmailIsInResponseToYourRequestToHave} <#if useEncryption>${uiLabelMap.EcommerceANew}<#else>${uiLabelMap.EcommerceYour}</#if> ${uiLabelMap.EcommercePasswordSentToYou}.</div> + <div>${uiLabelMap.SecurityExtThisEmailIsInResponseToYourRequestToHave} <#if useEncryption>${uiLabelMap.SecurityExtANew}<#else>${uiLabelMap.SecurityExtYour}</#if> ${uiLabelMap.SecurityExtPasswordSentToYou}.</div> <br /> <div> <#if useEncryption> - ${uiLabelMap.EcommerceNewPasswordMssgEncryptionOn} + ${uiLabelMap.SecurityExtNewPasswordMssgEncryptionOn} <#else> - ${uiLabelMap.EcommerceNewPasswordMssgEncryptionOff} + ${uiLabelMap.SecurityExtNewPasswordMssgEncryptionOff} </#if> "${password}" </div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/widget/EmailSecurityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/widget/EmailSecurityScreens.xml?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/widget/EmailSecurityScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/widget/EmailSecurityScreens.xml Mon Aug 18 07:42:27 2014 @@ -24,7 +24,7 @@ under the License. <screen name="PasswordEmail"> <section> <actions> - <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="SecurityExtUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> <platform-specific><html><html-template location="component://securityext/email/default/passwordemail.ftl"/></html></platform-specific> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl Mon Aug 18 07:42:27 2014 @@ -25,7 +25,7 @@ under the License. <#if workOrderItemFulfillments?has_content> <#list workOrderItemFulfillments as workOrderItemFulfillment> <br/>${uiLabelMap.OrderOrderId}: <a href="/ordermgr/control/orderview?orderId=${workOrderItemFulfillment.orderId}" class="event">${workOrderItemFulfillment.orderId} / ${workOrderItemFulfillment.orderItemSeqId}</a> - <#assign orderItemAndShipGroupAssocs = delegator.findByAnd("OrderHeaderItemAndShipGroup", {"orderId", workOrderItemFulfillment.orderId, "orderItemSeqId", workOrderItemFulfillment.orderItemSeqId}, null, false)?if_exists/> + <#assign orderItemAndShipGroupAssocs = delegator.findByAnd("OrderHeaderItemAndShipGroup", {"orderId", workOrderItemFulfillment.orderId, "orderItemSeqId", workOrderItemFulfillment.orderItemSeqId}, null, false)!/> <#list orderItemAndShipGroupAssocs as orderItemAndShipGroupAssoc> <#if orderItemAndShipGroupAssoc.shipByDate?has_content> ${uiLabelMap.OrderShipBeforeDate}: ${orderItemAndShipGroupAssoc.shipByDate} @@ -37,11 +37,11 @@ under the License. <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortParentId}" class="event"> ${workEffort.workEffortParentId} / ${workEffort.workEffortId} </a> - ${workEffort.workEffortName?default("Undefined")}<#if workEffort.reservPersons?exists> Persons:${workEffort.reservPersons}</#if> + ${workEffort.workEffortName?default("Undefined")}<#if workEffort.reservPersons??> Persons:${workEffort.reservPersons}</#if> <#if parentWorkOrderItemFulfillments?has_content> <#list parentWorkOrderItemFulfillments as parentWorkOrderItemFulfillment> <br/>${uiLabelMap.OrderOrderId}: <a href="/ordermgr/control/orderview?orderId=${parentWorkOrderItemFulfillment.orderId}" class="event">${parentWorkOrderItemFulfillment.orderId} / ${parentWorkOrderItemFulfillment.orderItemSeqId}</a> - <#assign orderItemAndShipGroupAssocs = delegator.findByAnd("OrderHeaderItemAndShipGroup", {"orderId", parentWorkOrderItemFulfillment.orderId, "orderItemSeqId", parentWorkOrderItemFulfillment.orderItemSeqId}, null, false)?if_exists/> + <#assign orderItemAndShipGroupAssocs = delegator.findByAnd("OrderHeaderItemAndShipGroup", {"orderId", parentWorkOrderItemFulfillment.orderId, "orderItemSeqId", parentWorkOrderItemFulfillment.orderItemSeqId}, null, false)!/> <#list orderItemAndShipGroupAssocs as orderItemAndShipGroupAssoc> <#if orderItemAndShipGroupAssoc.shipByDate?has_content> ${uiLabelMap.OrderShipBeforeDate}: ${orderItemAndShipGroupAssoc.shipByDate} @@ -51,10 +51,10 @@ under the License. </#if> <#else> <#-- Allow containing screens to specify the URL for editing an event --> - <#if !editCalEventUrl?exists> + <#if !editCalEventUrl??> <#assign editCalEventUrl = parameters._LAST_VIEW_NAME_> </#if> - <a href="<@ofbizUrl>${editCalEventUrl}?form=edit&parentTypeId=${parentTypeId?if_exists}&period=${periodType?if_exists}&start=${parameters.start?if_exists}&workEffortId=${workEffort.workEffortId}${addlParam?if_exists}${urlParam?if_exists}</@ofbizUrl>" class="event"> + <a href="<@ofbizUrl>${editCalEventUrl}?form=edit&parentTypeId=${parentTypeId!}&period=${periodType!}&start=${parameters.start!}&workEffortId=${workEffort.workEffortId}${addlParam!}${urlParam!}</@ofbizUrl>" class="event"> ${workEffort.workEffortId} </a> ${workEffort.workEffortName?default("")} Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/day.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/day.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/day.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/webapp/workeffort/calendar/day.ftl Mon Aug 18 07:42:27 2014 @@ -18,7 +18,7 @@ under the License. --> <#if periods?has_content> <#-- Allow containing screens to specify the URL for creating a new event --> - <#if !newCalEventUrl?exists> + <#if !newCalEventUrl??> <#assign newCalEventUrl = parameters._LAST_VIEW_NAME_> </#if> <#if (maxConcurrentEntries < 2)> @@ -37,19 +37,19 @@ under the License. <tr<#if currentPeriod> class="current-period"<#else><#if (period.calendarEntries?size > 0)> class="active-period"</#if></#if>> <td class="label"> ${period.start?time?string.short}<br /> - <a href="<@ofbizUrl>${newCalEventUrl}?period=day&form=edit&parentTypeId=${parentTypeId?if_exists}&start=${parameters.start?if_exists}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a> + <a href="<@ofbizUrl>${newCalEventUrl}?period=day&form=edit&parentTypeId=${parentTypeId!}&start=${parameters.start!}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${urlParam!}${addlParam!}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a> </td> <#list period.calendarEntries as calEntry> - <#if calEntry.workEffort.actualStartDate?exists> + <#if calEntry.workEffort.actualStartDate??> <#assign startDate = calEntry.workEffort.actualStartDate> <#else> - <#assign startDate = calEntry.workEffort.estimatedStartDate?if_exists> + <#assign startDate = calEntry.workEffort.estimatedStartDate!> </#if> - <#if calEntry.workEffort.actualCompletionDate?exists> + <#if calEntry.workEffort.actualCompletionDate??> <#assign completionDate = calEntry.workEffort.actualCompletionDate> <#else> - <#assign completionDate = calEntry.workEffort.estimatedCompletionDate?if_exists> + <#assign completionDate = calEntry.workEffort.estimatedCompletionDate!> </#if> <#if !completionDate?has_content && calEntry.workEffort.actualMilliSeconds?has_content> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |