svn commit: r561358 - in /ofbiz/trunk/applications/orde
Locked
 
|
Author: rayb
Date: Tue Jul 31 08:13:23 2007 New Revision: 561358 URL: http://svn.apache.org/viewvc?view=rev&rev=561358 Log: Clean up of various table structures in order view/edit screens, hopefully no functional changes. One other change included, href link to input submit type, so the gif could be removed from the update adjustment form. Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?view=diff&rev=561358&r1=561357&r2=561358 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Tue Jul 31 08:13:23 2007 @@ -44,9 +44,9 @@ <br class="clear" /> </div> <div class="screenlet-body"> - <#if !orderItemList?has_content> - <span class="alert">${uiLabelMap.checkhelper_sales_order_lines_lookup_failed}</span> - <#else> + <#if !orderItemList?has_content> + <span class="alert">${uiLabelMap.checkhelper_sales_order_lines_lookup_failed}</span> + <#else> <form name="updateItemInfo" method="post" action="<@ofbizUrl>updateOrderItems?${paramString}</@ofbizUrl>"> <table class="basic-table order-items" cellspacing="0"> <tr class="header-row"> @@ -56,172 +56,170 @@ <td width="10%" class="align-text">${uiLabelMap.OrderUnitPrice}</td> <td width="10%" class="align-text">${uiLabelMap.OrderAdjustments}</td> <td width="10%" class="align-text">${uiLabelMap.OrderSubTotal}</td> - <td width="5%"> </td> + <td width="2%"> </td> + <td width="3%"> </td> </tr> <#list orderItemList as orderItem> - <#assign orderItemContentWrapper = Static["org.ofbiz.order.order.OrderContentWrapper"].makeOrderContentWrapper(orderItem, request)> - <tr><td colspan="8"><hr/></td></tr> - <tr> - <#assign orderItemType = orderItem.getRelatedOne("OrderItemType")?if_exists> - <#assign productId = orderItem.productId?if_exists> - <#if productId?exists && productId == "shoppingcart.CommentLine"> - <td colspan="1" valign="top"> - <b> >> ${orderItem.itemDescription}</b> - </td> - <#else> - <td valign="top"> - <div> - <#if orderHeader.statusId = "ORDER_CANCELLED" || orderHeader.statusId = "ORDER_COMPLETED"> - <#if productId?exists> - ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?if_exists} - <#elseif orderItemType?exists> - ${orderItemType.description} - ${orderItem.itemDescription?if_exists} - <#else> - ${orderItem.itemDescription?if_exists} - </#if> - <#else> - <#if productId?exists> - <#assign orderItemName = orderItem.productId?default("N/A")/> - <#elseif orderItemType?exists> - <#assign orderItemName = orderItemType.description/> - </#if> - <p>${uiLabelMap.ProductProduct}: ${orderItemName}</p> - <#if productId?exists> - <#assign product = orderItem.getRelatedOneCache("Product")> - <#if product.salesDiscontinuationDate?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(product.salesDiscontinuationDate)> - <span class="alert">${uiLabelMap.OrderItemDiscontinued}: ${product.salesDiscontinuationDate}</span> + <#assign orderItemContentWrapper = Static["org.ofbiz.order.order.OrderContentWrapper"].makeOrderContentWrapper(orderItem, request)> + <tr><td colspan="8"><hr/></td></tr> + <tr> + <#assign orderItemType = orderItem.getRelatedOne("OrderItemType")?if_exists> + <#assign productId = orderItem.productId?if_exists> + <#if productId?exists && productId == "shoppingcart.CommentLine"> + <td colspan="8" valign="top"> + <b> >> ${orderItem.itemDescription}</b> + </td> + <#else> + <td valign="top"> + <div> + <#if orderHeader.statusId = "ORDER_CANCELLED" || orderHeader.statusId = "ORDER_COMPLETED"> + <#if productId?exists> + ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?if_exists} + <#elseif orderItemType?exists> + ${orderItemType.description} - ${orderItem.itemDescription?if_exists} + <#else> + ${orderItem.itemDescription?if_exists} + </#if> + <#else> + <#if productId?exists> + <#assign orderItemName = orderItem.productId?default("N/A")/> + <#elseif orderItemType?exists> + <#assign orderItemName = orderItemType.description/> + </#if> + <p>${uiLabelMap.ProductProduct}: ${orderItemName}</p> + <#if productId?exists> + <#assign product = orderItem.getRelatedOneCache("Product")> + <#if product.salesDiscontinuationDate?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(product.salesDiscontinuationDate)> + <span class="alert">${uiLabelMap.OrderItemDiscontinued}: ${product.salesDiscontinuationDate}</span> + </#if> + </#if> + ${uiLabelMap.CommonDescription}:<br /> + <input type="text" size="20" name="idm_${orderItem.orderItemSeqId}" value="${orderItem.itemDescription?if_exists}"/> + </#if> + </div> + <#if productId?exists> + <div> + <a href="/catalog/control/EditProduct?productId=${productId}" class="buttontext" target="_blank">${uiLabelMap.ProductCatalog}</a> + <a href="/ecommerce/control/product?product_id=${productId}" class="buttontext" target="_blank">${uiLabelMap.EcommerceEcommerce}</a> + <#if orderItemContentWrapper.get("IMAGE_URL")?has_content> + <a href="<@ofbizUrl>viewimage?orderId=${orderId}&orderItemSeqId=${orderItem.orderItemSeqId}&orderContentTypeId=IMAGE_URL</@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a> + </#if> + </div> + </#if> + </td> + + <#-- now show status details per line item --> + <#assign currentItemStatus = orderItem.getRelatedOne("StatusItem")> + <td> + ${uiLabelMap.CommonCurrent}: ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}<br/> + <#assign orderItemStatuses = orderReadHelper.getOrderItemStatuses(orderItem)> + <#list orderItemStatuses as orderItemStatus> + <#assign loopStatusItem = orderItemStatus.getRelatedOne("StatusItem")> + ${orderItemStatus.statusDatetime.toString()} : ${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)}<br/> + </#list> + <#assign returns = orderItem.getRelated("ReturnItem")?if_exists> + <#if returns?has_content> + <#list returns as returnItem> + <#assign returnHeader = returnItem.getRelatedOne("ReturnHeader")> + <#if returnHeader.statusId != "RETURN_CANCELLED"> + <div class="alert"> + <b>${uiLabelMap.OrderReturned}</b> #<a href="<@ofbizUrl>returnMain?returnId=${returnItem.returnId}</@ofbizUrl>" class="buttontext">${returnItem.returnId}</a> + </div> + </#if> + </#list> + </#if> + </td> + <td class="align-text" valign="top" nowrap="nowrap"> + <#assign remainingQuantity = (orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0))> + ${uiLabelMap.OrderOrdered}: ${orderItem.quantity?default(0)?string.number} <br/> + ${uiLabelMap.OrderCancelled}: ${orderItem.cancelQuantity?default(0)?string.number} <br/> + ${uiLabelMap.OrderRemaining}: ${remainingQuantity} <br/> + </td> + <td class="align-text" valign="top" nowrap="nowrap"> + <input type="text" size="8" name="ipm_${orderItem.orderItemSeqId}" value="<@ofbizAmount amount=orderItem.unitPrice/>"/> + <input type="checkbox" name="opm_${orderItem.orderItemSeqId}" value="Y"/> + </td> + <td class="align-text" valign="top" nowrap="nowrap"> + <@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentsTotal(orderItem, orderAdjustments, true, false, false) isoCode=currencyUomId/> + </td> + <td class="align-text" valign="top" nowrap="nowrap"> + <#if orderItem.statusId != "ITEM_CANCELLED"> + <@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemSubTotal(orderItem, orderAdjustments) isoCode=currencyUomId/> + <#else> + <@ofbizCurrency amount=0.00 isoCode=currencyUomId/> </#if> - </#if> - ${uiLabelMap.CommonDescription}:<br /> - <input type="text" size="20" name="idm_${orderItem.orderItemSeqId}" value="${orderItem.itemDescription?if_exists}"/> - </#if> - </div> - <#if productId?exists> - <div> - <a href="/catalog/control/EditProduct?productId=${productId}" class="buttontext" target="_blank">${uiLabelMap.ProductCatalog}</a> - <a href="/ecommerce/control/product?product_id=${productId}" class="buttontext" target="_blank">${uiLabelMap.EcommerceEcommerce}</a> - <#if orderItemContentWrapper.get("IMAGE_URL")?has_content> - <a href="<@ofbizUrl>viewimage?orderId=${orderId}&orderItemSeqId=${orderItem.orderItemSeqId}&orderContentTypeId=IMAGE_URL</@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a> - </#if> - </div> + </td> + <td> </td> + <td class="button-col"> + <#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED") || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && orderHeader.statusId != "ORDER_SENT")> + <a href="<@ofbizUrl>cancelOrderItem?orderItemSeqId=${orderItem.orderItemSeqId}&${paramString}</@ofbizUrl>">${uiLabelMap.CommonCancelAll}</a> + <#else> + + </#if> + </td> </#if> - </td> + </tr> - <#-- now show status details per line item --> - <#assign currentItemStatus = orderItem.getRelatedOne("StatusItem")> - <td colspan="1"> - ${uiLabelMap.CommonCurrent}: ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}<br/> - <#assign orderItemStatuses = orderReadHelper.getOrderItemStatuses(orderItem)> - <#list orderItemStatuses as orderItemStatus> - <#assign loopStatusItem = orderItemStatus.getRelatedOne("StatusItem")> - ${orderItemStatus.statusDatetime.toString()} : ${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)}<br/> + <#-- now show adjustment details per line item --> + <#assign orderItemAdjustments = Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentList(orderItem, orderAdjustments)> + <#if orderItemAdjustments?exists && orderItemAdjustments?has_content> + <#list orderItemAdjustments as orderItemAdjustment> + <#assign adjustmentType = orderItemAdjustment.getRelatedOneCache("OrderAdjustmentType")> + <tr> + <td class="align-text" colspan="2"> + <b><i>${uiLabelMap.OrderAdjustment}</i>:</b> <b>${adjustmentType.get("description",locale)}</b>: + ${orderItemAdjustment.get("description",locale)?if_exists} (${orderItemAdjustment.comments?default("")}) + + <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX"> + <#if orderItemAdjustment.primaryGeoId?has_content> + <#assign primaryGeo = orderItemAdjustment.getRelatedOneCache("PrimaryGeo")/> + <b>${uiLabelMap.OrderJurisdiction}:</b> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}] + <#if orderItemAdjustment.secondaryGeoId?has_content> + <#assign secondaryGeo = orderItemAdjustment.getRelatedOneCache("SecondaryGeo")/> + (<b>in:</b> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}]) + </#if> + </#if> + <#if orderItemAdjustment.sourcePercentage?exists><b>Rate:</b> ${orderItemAdjustment.sourcePercentage}</#if> + <#if orderItemAdjustment.customerReferenceId?has_content><b>Customer Tax ID:</b> ${orderItemAdjustment.customerReferenceId}</#if> + <#if orderItemAdjustment.exemptAmount?exists><b>Exempt Amount:</b> ${orderItemAdjustment.exemptAmount}</#if> + </#if> + </td> + <td> </td> + <td> </td> + <td class="align-text"> + <@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].calcItemAdjustmentBd(orderItemAdjustment, orderItem) isoCode=currencyUomId/> + </td> + <td colspan="3"> </td> + </tr> </#list> - <#assign returns = orderItem.getRelated("ReturnItem")?if_exists> - <#if returns?has_content> - <#list returns as returnItem> - <#assign returnHeader = returnItem.getRelatedOne("ReturnHeader")> - <#if returnHeader.statusId != "RETURN_CANCELLED"> - <div class="alert"> - <b>${uiLabelMap.OrderReturned}</b> #<a href="<@ofbizUrl>returnMain?returnId=${returnItem.returnId}</@ofbizUrl>" class="buttontext">${returnItem.returnId}</a> - </div> - </#if> + </#if> + + <#-- now show ship group info per line item --> + <#assign orderItemShipGroupAssocs = orderItem.getRelated("OrderItemShipGroupAssoc")?if_exists> + <#if orderItemShipGroupAssocs?has_content> + <tr><td colspan="8"> </td></tr> + <#list orderItemShipGroupAssocs as shipGroupAssoc> + <#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup")> + <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress")?if_exists> + <tr> + <td class="align-text" colspan="2"> + <b><i>${uiLabelMap.OrderShipGroup}</i>:</b> [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("${uiLabelMap.OrderNotShipped}")} + </td> + <td align="center"> + <input type="text" name="iqm_${shipGroupAssoc.orderItemSeqId}:${shipGroupAssoc.shipGroupSeqId}" size="6" value="${shipGroupAssoc.quantity?string.number}"/> + </td> + <td colspan="4"> </td> + <td class="button-col"> + <#assign itemStatusOkay = (orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && (shipGroupAssoc.cancelQuantity?default(0) < shipGroupAssoc.quantity?default(0)))> + <#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && itemStatusOkay) || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && itemStatusOkay && orderHeader.statusId != "ORDER_SENT")> + <a href="<@ofbizUrl>cancelOrderItem?orderItemSeqId=${orderItem.orderItemSeqId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}&${paramString}</@ofbizUrl>">${uiLabelMap.CommonCancel}</a> + <#else> + + </#if> + </td> + </tr> </#list> - </#if> - </td> - <td class="align-text" valign="top" nowrap="nowrap"> - <#assign remainingQuantity = (orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0))> - ${uiLabelMap.OrderOrdered}: ${orderItem.quantity?default(0)?string.number} <br/> - ${uiLabelMap.OrderCancelled}: ${orderItem.cancelQuantity?default(0)?string.number} <br/> - ${uiLabelMap.OrderRemaining}: ${remainingQuantity} <br/> - </td> - <td class="align-text" valign="top" nowrap="nowrap"> - <input type="text" size="8" name="ipm_${orderItem.orderItemSeqId}" value="<@ofbizAmount amount=orderItem.unitPrice/>"/> - <input type="checkbox" name="opm_${orderItem.orderItemSeqId}" value="Y"/> - </td> - <td class="align-text" valign="top" nowrap="nowrap"> - <@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentsTotal(orderItem, orderAdjustments, true, false, false) isoCode=currencyUomId/> - </td> - <td class="align-text" valign="top" nowrap="nowrap"> - <#if orderItem.statusId != "ITEM_CANCELLED"> - <@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemSubTotal(orderItem, orderAdjustments) isoCode=currencyUomId/> - <#else> - <@ofbizCurrency amount=0.00 isoCode=currencyUomId/> - </#if> - </td> - <td> </td> - <td class="button-col"> - <#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED") || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && orderHeader.statusId != "ORDER_SENT")> - <a href="<@ofbizUrl>cancelOrderItem?orderItemSeqId=${orderItem.orderItemSeqId}&${paramString}</@ofbizUrl>">${uiLabelMap.CommonCancelAll}</a> - <#else> - - </#if> - </td> </#if> - </tr> - - <#-- now show adjustment details per line item --> - <#assign orderItemAdjustments = Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentList(orderItem, orderAdjustments)> - <#if orderItemAdjustments?exists && orderItemAdjustments?has_content> - <#list orderItemAdjustments as orderItemAdjustment> - <#assign adjustmentType = orderItemAdjustment.getRelatedOneCache("OrderAdjustmentType")> - <tr> - <td class="align-text" colspan="2"> - <b><i>${uiLabelMap.OrderAdjustment}</i>:</b> <b>${adjustmentType.get("description",locale)}</b>: - ${orderItemAdjustment.get("description",locale)?if_exists} (${orderItemAdjustment.comments?default("")}) - - <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX"> - <#if orderItemAdjustment.primaryGeoId?has_content> - <#assign primaryGeo = orderItemAdjustment.getRelatedOneCache("PrimaryGeo")/> - <b>${uiLabelMap.OrderJurisdiction}:</b> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}] - <#if orderItemAdjustment.secondaryGeoId?has_content> - <#assign secondaryGeo = orderItemAdjustment.getRelatedOneCache("SecondaryGeo")/> - (<b>in:</b> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}]) - </#if> - </#if> - <#if orderItemAdjustment.sourcePercentage?exists><b>Rate:</b> ${orderItemAdjustment.sourcePercentage}</#if> - <#if orderItemAdjustment.customerReferenceId?has_content><b>Customer Tax ID:</b> ${orderItemAdjustment.customerReferenceId}</#if> - <#if orderItemAdjustment.exemptAmount?exists><b>Exempt Amount:</b> ${orderItemAdjustment.exemptAmount}</#if> - </#if> - </td> - <td> </td> - <td> </td> - <td class="align-text"> - <@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].calcItemAdjustmentBd(orderItemAdjustment, orderItem) isoCode=currencyUomId/> - </td> - <td colspan="3"> </td> - </tr> - </#list> - </#if> - - <#-- now show ship group info per line item --> - <#assign orderItemShipGroupAssocs = orderItem.getRelated("OrderItemShipGroupAssoc")?if_exists> - <#if orderItemShipGroupAssocs?has_content> - <tr><td> </td></tr> - <#list orderItemShipGroupAssocs as shipGroupAssoc> - <#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup")> - <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress")?if_exists> - <tr> - <td class="align-text" colspan="2"> - <b><i>${uiLabelMap.OrderShipGroup}</i>:</b> [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("${uiLabelMap.OrderNotShipped}")} - </td> - <td align="center"> - <input type="text" name="iqm_${shipGroupAssoc.orderItemSeqId}:${shipGroupAssoc.shipGroupSeqId}" size="6" value="${shipGroupAssoc.quantity?string.number}"/> - </td> - <td> </td> - <td> </td> - <td> </td> - <td> </td> - <td class="button-col"> - <#assign itemStatusOkay = (orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && (shipGroupAssoc.cancelQuantity?default(0) < shipGroupAssoc.quantity?default(0)))> - <#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && itemStatusOkay) || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && itemStatusOkay && orderHeader.statusId != "ORDER_SENT")> - <a href="<@ofbizUrl>cancelOrderItem?orderItemSeqId=${orderItem.orderItemSeqId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}&${paramString}</@ofbizUrl>">${uiLabelMap.CommonCancel}</a> - <#else> - - </#if> - </td> - </tr> - </#list> - </#if> </#list> <tr> <td colspan="7"> </td> @@ -230,45 +228,40 @@ </td> </tr> <tr><td colspan="8"><hr/></td></tr> - </table> - </form> - </#if> - <#list orderHeaderAdjustments as orderHeaderAdjustment> + </table> + </form> + </#if> + <#list orderHeaderAdjustments as orderHeaderAdjustment> <#assign adjustmentType = orderHeaderAdjustment.getRelatedOne("OrderAdjustmentType")> <#assign adjustmentAmount = Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustmentBd(orderHeaderAdjustment, orderSubTotal)> <#assign orderAdjustmentId = orderHeaderAdjustment.get("orderAdjustmentId")> <#if adjustmentAmount != 0> - <form name="updateOrderAdjustmentForm${orderAdjustmentId}" method="post" action="<@ofbizUrl>updateOrderAdjustment?orderAdjustmentId=${orderAdjustmentId?if_exists}&orderId=${orderId?if_exists}</@ofbizUrl>"> - <table class="basic-table" cellspacing="0"> - <tr> - <td class="align-text" width="50%"> - <b>${adjustmentType.get("description",locale)}</b> ${orderHeaderAdjustment.comments?if_exists} : - </td> - <td nowrap="nowrap" width="25%"> - <input type="text" name="description" value="${orderHeaderAdjustment.get("description")?if_exists}" size="30" maxlength="60"/> - </td> - <td nowrap="nowrap" width="25%"> - <input type="text" name="amount" size="6" value="<@ofbizAmount amount=adjustmentAmount/>"/> - <a href="javascript:document.updateOrderAdjustmentForm${orderAdjustmentId}.submit();" class="buttontext">${uiLabelMap.CommonUpdate}</a><a href="<@ofbizUrl>deleteOrderAdjustment?orderAdjustmentId=${orderAdjustmentId?if_exists}&orderId=${orderId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> - </td> - </tr> - <tr> - <td class="align-text" colspan="3"> - <input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onClick="javascript:document.updateOrderAdjustmentForm${orderAdjustmentId}.submit();"/> - </td> - </tr> - </table> - </form> + <form name="updateOrderAdjustmentForm${orderAdjustmentId}" method="post" action="<@ofbizUrl>updateOrderAdjustment?orderAdjustmentId=${orderAdjustmentId?if_exists}&orderId=${orderId?if_exists}</@ofbizUrl>"> + <table class="basic-table" cellspacing="0"> + <tr> + <td class="align-text" width="55%"> + <b>${adjustmentType.get("description",locale)}</b> ${orderHeaderAdjustment.comments?if_exists} : + </td> + <td nowrap="nowrap" width="30%"> + <input type="text" name="description" value="${orderHeaderAdjustment.get("description")?if_exists}" size="30" maxlength="60"/> + </td> + <td nowrap="nowrap" width="15%"> + <input type="text" name="amount" size="6" value="<@ofbizAmount amount=adjustmentAmount/>"/> + <input class="smallSubmit" type="submit" value="${uiLabelMap.CommonUpdate}"/><a href="<@ofbizUrl>deleteOrderAdjustment?orderAdjustmentId=${orderAdjustmentId?if_exists}&orderId=${orderId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> + </td> + </tr> + </table> + </form> </#if> - </#list> - <#-- add new adjustment --> - <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_REJECTED"> + </#list> + <#-- add new adjustment --> + <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_REJECTED"> <form name="addAdjustmentForm" method="post" action="<@ofbizUrl>createOrderAdjustment?${paramString}</@ofbizUrl>"> - <input type="hidden" name="comments" value="Added manually by [${userLogin.userLoginId}]"/> + <input type="hidden" name="comments" value="Added manually by [${userLogin.userLoginId}]"/> <table class="basic-table" cellspacing="0"> <tr><td colspan="3"><hr/></td></tr> <tr> - <td class="align-text" width="50%"> + <td class="align-text" width="55%"> <b>${uiLabelMap.OrderAdjustment} :</b> <select name="orderAdjustmentTypeId"> <#list orderAdjustmentTypes as type> @@ -282,47 +275,52 @@ </#list> </select> </td> - <td width="25%"><input type="text" name="description" value="" size="30" maxlength="60"/></td> - <td width="25%"> + <td width="30%"><input type="text" name="description" value="" size="30" maxlength="60"/></td> + <td width="15%"> <input type="text" name="amount" size="6" value="<@ofbizAmount amount=0.00/>"/> <input class="smallSubmit" type="submit" value="${uiLabelMap.CommonAdd}"/> </td> </tr> </table> </form> - </#if> - - <#-- subtotal --> - <table class="basic-table" cellspacing="0"> - <tr><td colspan="2"><hr/></td></tr> - <tr class="align-text"> - <td><b>${uiLabelMap.OrderItemsSubTotal} :</b></td> - <td nowrap="nowrap"><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></td> - </tr> - - <#-- other adjustments --> - <tr class="align-text"> - <td><b>${uiLabelMap.OrderTotalOtherOrderAdjustments} :</b></td> - <td nowrap="nowrap"><@ofbizCurrency amount=otherAdjAmount isoCode=currencyUomId/></td> - </tr> - - <#-- shipping adjustments --> - <tr class="align-text"> - <td><b>${uiLabelMap.OrderTotalShippingAndHandling} :</b></td> - <td nowrap="nowrap"><@ofbizCurrency amount=shippingAmount isoCode=currencyUomId/></td> - </tr> - - <#-- tax adjustments --> - <tr class="align-text"> - <td><b>${uiLabelMap.OrderTotalSalesTax} :</b></td> - <td nowrap="nowrap"><@ofbizCurrency amount=taxAmount isoCode=currencyUomId/></td> - </tr> + </#if> - <#-- grand total --> - <tr class="align-text"> - <td><b>${uiLabelMap.OrderTotalDue} :</b></td> - <td nowrap="nowrap"><@ofbizCurrency amount=grandTotal isoCode=currencyUomId/></td> - </tr> + <#-- subtotal --> + <table class="basic-table" cellspacing="0"> + <tr><td colspan="4"><hr/></td></tr> + <tr class="align-text"> + <td width="80%"><b>${uiLabelMap.OrderItemsSubTotal} :</b></td> + <td width="10%" nowrap="nowrap"><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></td> + <td width="10%" colspan="2"> </td> + </tr> + + <#-- other adjustments --> + <tr class="align-text"> + <td><b>${uiLabelMap.OrderTotalOtherOrderAdjustments} :</b></td> + <td nowrap="nowrap"><@ofbizCurrency amount=otherAdjAmount isoCode=currencyUomId/></td> + <td colspan="2"> </td> + </tr> + + <#-- shipping adjustments --> + <tr class="align-text"> + <td><b>${uiLabelMap.OrderTotalShippingAndHandling} :</b></td> + <td nowrap="nowrap"><@ofbizCurrency amount=shippingAmount isoCode=currencyUomId/></td> + <td colspan="2"> </td> + </tr> + + <#-- tax adjustments --> + <tr class="align-text"> + <td><b>${uiLabelMap.OrderTotalSalesTax} :</b></td> + <td nowrap="nowrap"><@ofbizCurrency amount=taxAmount isoCode=currencyUomId/></td> + <td colspan="2"> </td> + </tr> + + <#-- grand total --> + <tr class="align-text"> + <td><b>${uiLabelMap.OrderTotalDue} :</b></td> + <td nowrap="nowrap"><@ofbizCurrency amount=grandTotal isoCode=currencyUomId/></td> + <td colspan="2"> </td> + </tr> </table> </div> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?view=diff&rev=561358&r1=561357&r2=561358 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Tue Jul 31 08:13:23 2007 @@ -31,7 +31,7 @@ --> <li><a href="<@ofbizUrl>editOrderItems?${paramString}</@ofbizUrl>">${uiLabelMap.OrderEditItems}</a></li> </#if> - <li><a href="<@ofbizUrl>loadCartFromOrder?${paramString}&finalizeMode=init</@ofbizUrl>">${uiLabelMap.OrderCreateAsNewOrder}</a></li> + <li><a href="<@ofbizUrl>loadCartFromOrder?${paramString}&finalizeMode=init</@ofbizUrl>">${uiLabelMap.OrderCreateAsNewOrder}</a></li> <#if returnableItems?has_content> <li><a href="<@ofbizUrl>quickreturn?orderId=${orderId}&party_id=${partyId?if_exists}&returnHeaderTypeId=${returnHeaderTypeId}</@ofbizUrl>">${uiLabelMap.OrderCreateReturn}</a></li> </#if> @@ -43,28 +43,28 @@ <div class="screenlet-body"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr align="left" valign=bottom> + <tr align="left" valign="bottom"> <td width="30%" align="left"><div class="tableheadtext">${uiLabelMap.ProductProduct}</div></td> - <td width="30%" align="left"><div class="tableheadtext">${uiLabelMap.CommonStatus}</div></td> + <td width="33%" align="left"><div class="tableheadtext">${uiLabelMap.CommonStatus}</div></td> <td width="5%" align="center"><div class="tableheadtext">${uiLabelMap.OrderQuantity}</div></td> <td width="10%" align="right"><div class="tableheadtext">${uiLabelMap.OrderUnitList}</div></td> <td width="10%" align="right"><div class="tableheadtext">${uiLabelMap.OrderAdjustments}</div></td> <td width="10%" align="right"><div class="tableheadtext">${uiLabelMap.OrderSubTotal}</div></td> - <td width="5%"> </td> + <td width="2%"> </td> </tr> <#if !orderItemList?has_content> - <tr><td><font color="red">${uiLabelMap.checkhelper_sales_order_lines_lookup_failed}</font></td></tr> + <tr><td colspan="7"><font color="red">${uiLabelMap.checkhelper_sales_order_lines_lookup_failed}</font></td></tr> <#else> <#list orderItemList as orderItem> <#assign orderItemContentWrapper = Static["org.ofbiz.order.order.OrderContentWrapper"].makeOrderContentWrapper(orderItem, request)> <#assign orderItemShipGrpInvResList = orderReadHelper.getOrderItemShipGrpInvResList(orderItem)> <#if orderHeader.orderTypeId == "SALES_ORDER"><#assign pickedQty = orderReadHelper.getItemPickedQuantityBd(orderItem)></#if> - <tr><td colspan="8"><hr class="sepbar"/></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <#assign orderItemType = orderItem.getRelatedOne("OrderItemType")?if_exists> <#assign productId = orderItem.productId?if_exists> <#if productId?exists && productId == "shoppingcart.CommentLine"> - <td colspan="1" valign="top"> + <td colspan="7" valign="top"> <b><div class="tabletext"> >> ${orderItem.itemDescription}</div></b> </td> <#else> @@ -205,9 +205,6 @@ </#if> </td> <td> </td> - <td align="right" valign="top"> - - </td> </#if> </tr> @@ -218,7 +215,7 @@ <#assign workEffort = workOrderItemFulfillment.getRelatedOneCache("WorkEffort")> <tr> <td> </td> - <td colspan="9"> + <td colspan="6"> <div class="tabletext"> <#if orderItem.orderItemTypeId != "RENTAL_ORDER_ITEM"> <b><i>${uiLabelMap.ManufacturingProductionRun}</i>:</b> @@ -245,7 +242,7 @@ <#assign linkedOrderItemValueStatus = linkedOrderItemValue.getRelatedOne("StatusItem")> <tr> <td> </td> - <td colspan="9"> + <td colspan="6"> <div class="tabletext"> <b><i>${uiLabelMap.OrderLinkedToOrderItem} (${linkedOrderItem.orderItemAssocTypeId})</i>:</b> <a href="/ordermgr/control/orderview?orderId=${linkedOrderId}" class="buttontext" style="font-size: xx-small;">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description?if_exists} @@ -262,7 +259,7 @@ <#assign linkedOrderItemValueStatus = linkedOrderItemValue.getRelatedOne("StatusItem")> <tr> <td> </td> - <td colspan="9"> + <td colspan="6"> <div class="tabletext"> <b><i>${uiLabelMap.OrderLinkedFromOrderItem} (${linkedOrderItem.orderItemAssocTypeId})</i>:</b> <a href="/ordermgr/control/orderview?orderId=${linkedOrderId}" class="buttontext" style="font-size: xx-small;">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description?if_exists} @@ -279,7 +276,7 @@ <#list linkedRequirements as linkedRequirement> <tr> <td> </td> - <td colspan="9"> + <td colspan="6"> <div class="tabletext"> <b><i>${uiLabelMap.OrderLinkedToRequirement}</i>:</b> <a href="<@ofbizUrl>EditRequirement?requirementId=${linkedRequirement.requirementId}</@ofbizUrl>" class="buttontext" style="font-size: xx-small;">${linkedRequirement.requirementId}</a> @@ -295,7 +292,7 @@ <#if linkedQuote?has_content> <tr> <td> </td> - <td colspan="9"> + <td colspan="6"> <div class="tabletext"> <b><i>${uiLabelMap.OrderLinkedToQuote}</i>:</b> <a href="<@ofbizUrl>EditQuoteItem?quoteId=${linkedQuote.quoteId}&quoteItemSeqId=${linkedQuote.quoteItemSeqId}</@ofbizUrl>" class="buttontext" style="font-size: xx-small;">${linkedQuote.quoteId}-${linkedQuote.quoteItemSeqId}</a> @@ -340,7 +337,7 @@ <@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].calcItemAdjustmentBd(orderItemAdjustment, orderItem) isoCode=currencyUomId/> </div> </td> - <td> </td> + <td colspan="2"> </td> </tr> </#list> </#if> @@ -348,7 +345,7 @@ <#-- now show price info per line item --> <#assign orderItemPriceInfos = orderReadHelper.getOrderItemPriceInfos(orderItem)> <#if orderItemPriceInfos?exists && orderItemPriceInfos?has_content> - <tr><td> </td></tr> + <tr><td colspan="7"> </td></tr> <#list orderItemPriceInfos as orderItemPriceInfo> <tr> <td align="right" colspan="2"> @@ -360,8 +357,7 @@ <@ofbizCurrency amount=orderItemPriceInfo.modifyAmount isoCode=currencyUomId/> </div> </td> - <td> </td> - <td> </td> + <td colspan="3"> </td> </tr> </#list> </#if> @@ -377,10 +373,7 @@ <a href="/content/control/ViewSurveyResponses?surveyResponseId=${survey.surveyResponseId}&surveyId=${survey.surveyId}<#if survey.partyId?exists>&partyId=${survey.partyId}</#if>&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${survey.surveyId}</a> </div> </td> - <td> </td> - <td> </td> - <td> </td> - <td> </td> + <td colspan="5"> </td> </tr> </#list> </#if> @@ -391,6 +384,7 @@ <td align="right" colspan="2"> <div class="tabletext" style="font-size: xx-small;"><b><i>${uiLabelMap.OrderShipAfterDate}</i>:</b> ${orderItem.shipAfterDate?string.short}</div> </td> + <td colspan="5"> </td> </tr> </#if> <#if orderItem.shipBeforeDate?exists> @@ -398,6 +392,7 @@ <td align="right" colspan="2"> <div class="tabletext" style="font-size: xx-small;"><b><i>${uiLabelMap.OrderShipBeforeDate}</i>:</b> ${orderItem.shipBeforeDate?string.short}</div> </td> + <td colspan="5"> </td> </tr> </#if> @@ -414,13 +409,7 @@ <td align="center"> <div class="tabletext" style="font-size: xx-small;">${shipGroupAssoc.quantity?string.number} </div> </td> - <td> </td> - <td> </td> - <td> </td> - <td> </td> - <td align="right" valign="top"> - - </td> + <td colspan="4"> </td> </tr> </#list> </#if> @@ -445,8 +434,7 @@ </#if> </td> - <td> </td> - <td> </td> + <td colspan="3"> </td> </tr> </#list> </#if> @@ -462,11 +450,7 @@ <td align="center"> <div class="tabletext" style="font-size: xx-small;">${orderShipment.quantity?string.number} </div> </td> - <td> </td> - <td> </td> - <td> </td> - <td> </td> - <td> </td> + <td colspan="4"> </td> </tr> </#list> </#if> @@ -489,9 +473,7 @@ <td align="center"> <div class="tabletext" style="font-size: xx-small;">${itemIssuance.quantity?string.number} </div> </td> - <td> </td> - <td> </td> - <td> </td> + <td colspan="4"> </td> </tr> </#list> </#if> @@ -515,15 +497,13 @@ <td align="center"> <div class="tabletext" style="font-size: xx-small;">${itemIssuance.quantity?string.number} </div> </td> - <td> </td> - <td> </td> - <td> </td> + <td colspan="4"> </td> </tr> </#list> </#if> </#list> </#if> - <tr><td colspan="8"><hr class="sepbar"/></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <#list orderHeaderAdjustments as orderHeaderAdjustment> <#assign adjustmentType = orderHeaderAdjustment.getRelatedOne("OrderAdjustmentType")> <#assign adjustmentAmount = Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustmentBd(orderHeaderAdjustment, orderSubTotal)> @@ -541,28 +521,32 @@ </#list> <#-- subtotal --> - <tr><td colspan=1></td><td colspan="8"><hr class="sepbar"/></td></tr> + <tr><td colspan="1"></td><td colspan="6"><hr class="sepbar"/></td></tr> <tr> <td align="right" colspan="5"><div class="tabletext"><b>${uiLabelMap.OrderItemsSubTotal}</b></div></td> <td align="right" nowrap="nowrap"><div class="tabletext"><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></div></td> + <td> </td> </tr> <#-- other adjustments --> <tr> <td align="right" colspan="5"><div class="tabletext"><b>${uiLabelMap.OrderTotalOtherOrderAdjustments}</b></div></td> <td align="right" nowrap="nowrap"><div class="tabletext"><@ofbizCurrency amount=otherAdjAmount isoCode=currencyUomId/></div></td> + <td> </td> </tr> <#-- shipping adjustments --> <tr> <td align="right" colspan="5"><div class="tabletext"><b>${uiLabelMap.OrderTotalShippingAndHandling}</b></div></td> <td align="right" nowrap="nowrap"><div class="tabletext"><@ofbizCurrency amount=shippingAmount isoCode=currencyUomId/></div></td> + <td> </td> </tr> <#-- tax adjustments --> <tr> <td align="right" colspan="5"><div class="tabletext"><b>${uiLabelMap.OrderTotalSalesTax}</b></div></td> <td align="right" nowrap="nowrap"><div class="tabletext"><@ofbizCurrency amount=taxAmount isoCode=currencyUomId/></div></td> + <td> </td> </tr> <#-- grand total --> @@ -571,6 +555,7 @@ <td align="right" nowrap="nowrap"> <div class="tabletext"><@ofbizCurrency amount=grandTotal isoCode=currencyUomId/></div> </td> + <td> </td> </tr> </table> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?view=diff&rev=561358&r1=561357&r2=561358 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Tue Jul 31 08:13:23 2007 @@ -23,13 +23,13 @@ <br class="clear" /> </div> <div class="screenlet-body"> - <table width="100%" border="0" cellpadding="1" cellspacing="0"> + <table width="100%" border="0" cellpadding="1" cellspacing="0"><tbody> <#if orderPaymentPreferences?has_content || billingAccount?has_content || invoices?has_content> <#list orderPaymentPreferences as orderPaymentPreference> <#assign pmBillingAddress = {}> <#assign oppStatusItem = orderPaymentPreference.getRelatedOne("StatusItem")> <#if outputted?default("false") == "true"> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="4"><hr class="sepbar"/></td></tr> </#if> <#assign outputted = "true"> <#-- try the paymentMethod first; if paymentMethodId is specified it overrides paymentMethodTypeId --> @@ -301,13 +301,13 @@ </#if> </#if> <#if pmBillingAddress?has_content> - <tr><td> </td><td> </td><td colspan="5"><hr class="sepbar"/></td></tr> + <tr><td> </td><td> </td><td colspan="2"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> </div> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td colspan="2" align="left" valign="top" width="80%"> <div class="tabletext"> <#if pmBillingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${pmBillingAddress.toName}<br/></#if> <#if pmBillingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${pmBillingAddress.attnName}<br/></#if> @@ -325,7 +325,7 @@ <#-- billing account --> <#if billingAccount?exists> <#if outputted?default("false") == "true"> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="4"><hr class="sepbar"/></td></tr> </#if> <tr> <td align="right" valign="top" width="15%"> @@ -337,19 +337,19 @@ </div> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td colspan="2" align="left" valign="top" width="80%"> <div class="tabletext"> #<a href="/accounting/control/EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}&externalLoginKey=${externalLoginKey}" class="buttontext">${billingAccount.billingAccountId}</a> - ${billingAccount.description?if_exists} </div> </td> </tr> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="4"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderPurchaseOrderNumber}</b></div> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td colspan="2" align="left" valign="top" width="80%"> <div class="tabletext">${customerPoNumber?if_exists}</div> </td> </tr> @@ -357,13 +357,13 @@ <#-- invoices --> <#if invoices?has_content> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="4"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderInvoices}</b></div> </td> <td width="5"> </td> - <td align="left" valign="top" width="80%"> + <td colspan="2" align="left" valign="top" width="80%"> <#list invoices as invoice> <div class="tabletext">${uiLabelMap.OrderNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}&externalLoginKey=${externalLoginKey}" class="buttontext">${invoice}</a> (<a href="/accounting/control/invoice.pdf?invoiceId=${invoice}" class="buttontext">PDF</a>)</div> @@ -373,12 +373,12 @@ </#if> <#else> <tr> - <td colspan="7" align="center" class="tabletext">${uiLabelMap.OrderNoOrderPaymentPreferences}</td> + <td colspan="4" align="center" class="tabletext">${uiLabelMap.OrderNoOrderPaymentPreferences}</td> </tr> </#if> <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED")) && (paymentMethodValueMaps?has_content)> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> - <tr><td colspan="7"> + <tr><td colspan="4"><hr class="sepbar"/></td></tr> + <tr><td colspan="4"> <form name="addPaymentMethodToOrder" method="post" action="<@ofbizUrl>addPaymentMethodToOrder</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderId?if_exists}"/> <table width="100%" border="0" cellpadding="1" cellspacing="0"> @@ -427,6 +427,7 @@ </td></tr> </#if> +</tbody> </table> </div> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?view=diff&rev=561358&r1=561357&r2=561358 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Tue Jul 31 08:13:23 2007 @@ -126,7 +126,7 @@ <table width="100%" border="0" cellpadding="1" cellspacing="0"> <#if shipGroup.supplierPartyId?has_content> <#assign supplier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", shipGroup.supplierPartyId))?if_exists /> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.ProductDropShipment} - ${uiLabelMap.PartySupplier}</b></div> @@ -140,7 +140,7 @@ <#-- tracking number --> <#if shipGroup.trackingNumber?has_content || orderShipmentInfoSummaryList?has_content> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderTrackingNumber}</b></div> @@ -167,7 +167,7 @@ </tr> </#if> <#if shipGroup.maySplit?has_content && noShipment?default("false") != "true"> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderSplittingPreference}</b></div> @@ -188,7 +188,7 @@ </tr> </#if> <#if shipGroup.shippingInstructions?has_content> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.CommonInstructions}</b></div> @@ -200,7 +200,7 @@ </tr> </#if> <#if shipGroup.isGift?has_content && noShipment?default("false") != "true"> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderGift}?</b></div> @@ -214,7 +214,7 @@ </tr> </#if> <#if shipGroup.giftMessage?has_content> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderGiftMessage}</b></div> @@ -226,7 +226,7 @@ </tr> </#if> <#if shipGroup.shipAfterDate?has_content> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderShipAfterDate}</b></div> @@ -238,7 +238,7 @@ </tr> </#if> <#if shipGroup.shipByDate?has_content> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderShipBeforeDate}</b></div> @@ -251,7 +251,7 @@ </#if> <#assign shipGroupShipments = shipGroup.getRelated("PrimaryShipment")> <#if shipGroupShipments?has_content> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.FacilityShipments}</b></div> @@ -270,7 +270,7 @@ <#-- Special shipment options --> <#if security.hasEntityPermission("FACILITY", "_CREATE", session)> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <#if orderHeader.orderTypeId == "PURCHASE_ORDER"><b>${uiLabelMap.ProductDestinationFacility}</b></#if></div> @@ -316,7 +316,7 @@ </#if> <#-- Manual shipment options --> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> </div> @@ -359,7 +359,7 @@ <#-- Refunds/Returns for Sales Orders and Delivery Schedules --> <#if !shipGroup_has_next> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |