svn commit: r613672 [2/4] - in /ofbiz/trunk/applications/orde
Locked
svn commit: r613672 [2/4] - in /ofbiz/trunk/applications/orde
 
|
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=613672&r1=613671&r2=613672&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Sun Jan 20 12:28:45 2008 @@ -37,37 +37,30 @@ <li><a href="<@ofbizUrl>changeOrderStatus?orderId=${orderId}&statusId=ORDER_COMPLETED</@ofbizUrl>">${uiLabelMap.OrderCompleteOrder}</a></li> </#if> </ul> - <br class="clear" /> + <br class="clear"/> </div> <div class="screenlet-body"> - <table width="100%" border="0" cellpadding="1" cellspacing="0"> - <#-- order name --> + <table class="basic-table" cellspacing='0'> <#if orderHeader.orderName?has_content> <tr> - <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.OrderOrderName}</b></div> - </td> - <td width="5"> </td> - <td align="left" valign="top" width="80%"> - <div class="tabletext">${orderHeader.orderName}</div> - </td> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderOrderName}</td> + <td width="5%"> </td> + <td align="left" valign="top" width="80%">${orderHeader.orderName}</td> </tr> - <tr><td colspan="3"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr/></td></tr> </#if> <#-- order status history --> <tr> - <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.OrderStatusHistory}</b></div> - </td> - <td width="5"> </td> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderStatusHistory}</td> + <td width="5%"> </td> <td align="left" valign="top" width="80%"> - <div class="tabletext">${uiLabelMap.OrderCurrentStatus}: ${currentStatus.get("description",locale)}</div> + ${uiLabelMap.OrderCurrentStatus}: ${currentStatus.get("description",locale)} <#if orderHeaderStatuses?has_content> - <hr class="sepbar"/> + <hr/> <#list orderHeaderStatuses as orderHeaderStatus> <#assign loopStatusItem = orderHeaderStatus.getRelatedOne("StatusItem")> <#assign userlogin = orderHeaderStatus.getRelatedOne("UserLogin")> - <div class="tabletext"> + <div> ${loopStatusItem.get("description",locale)} - ${orderHeaderStatus.statusDatetime?default("0000-00-00 00:00:00")?string} ${uiLabelMap.CommonBy} - <#--${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, userlogin.getString("partyId"), true)}--> [${orderHeaderStatus.statusUserLogin}] @@ -76,155 +69,108 @@ </#if> </td> </tr> - <tr><td colspan="3"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr/></td></tr> <tr> - <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.OrderDateOrdered}</b></div> - </td> - <td width="5"> </td> - <td align="left" valign="top" width="80%"> - <div class="tabletext"> - ${orderHeader.orderDate.toString()} - </div> - </td> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderDateOrdered}</td> + <td width="5%"> </td> + <td align="left" valign="top" width="80%">${orderHeader.orderDate.toString()}</td> </tr> - <tr><td colspan="3"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr/></td></tr> <tr> - <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.CommonCurrency}</b></div> - </td> - <td width="5"> </td> - <td align="left" valign="top" width="80%"> - <div class="tabletext"> - ${orderHeader.currencyUom?default("???")} - </div> - </td> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonCurrency}</td> + <td width="5%"> </td> + <td align="left" valign="top" width="80%">${orderHeader.currencyUom?default("???")}</td> </tr> <#if orderHeader.internalCode?has_content> - <tr><td colspan="3"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr/></td></tr> <tr> - <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.OrderInternalCode}</b></div> - </td> - <td width="5"> </td> - <td align="left" valign="top" width="80%"> - <div class="tabletext"> - ${orderHeader.internalCode} - </div> - </td> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderInternalCode}</td> + <td width="5%"> </td> + <td align="left" valign="top" width="80%">${orderHeader.internalCode}</td> </tr> </#if> - <tr><td colspan="3"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr/></td></tr> <tr> - <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.OrderSalesChannel}</b></div> - </td> - <td width="5"> </td> - <td align="left" valign="top" width="80%"> - <div class="tabletext"> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderSalesChannel}</td> + <td width="5%"> </td> + <td align="left" valign="top" width="80%"> <#if orderHeader.salesChannelEnumId?has_content> <#assign channel = orderHeader.getRelatedOne("SalesChannelEnumeration")> ${(channel.get("description",locale))?default("N/A")} <#else> ${uiLabelMap.CommonNA} </#if> - </div> </td> </tr> - <tr><td colspan="3"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr/></td></tr> <tr> - <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.OrderProductStore}</b></div> - </td> - <td width="5"> </td> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderProductStore}</td> + <td width="5%"> </td> <td align="left" valign="top" width="80%"> - <div class="tabletext"> <#if orderHeader.productStoreId?has_content> <a href="/catalog/control/EditProductStore?productStoreId=${orderHeader.productStoreId}${externalKeyParam}" target="catalogmgr" class="buttontext">${orderHeader.productStoreId}</a> <#else> ${uiLabelMap.CommonNA} </#if> - </div> </td> </tr> - <tr><td colspan="3"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr/></td></tr> <tr> - <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.OrderOriginFacility}</b></div> - </td> - <td width="5"> </td> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderOriginFacility}</td> + <td width="5%"> </td> <td align="left" valign="top" width="80%"> - <div class="tabletext"> <#if orderHeader.originFacilityId?has_content> <a href="/facility/control/EditFacility?facilityId=${orderHeader.originFacilityId}${externalKeyParam}" target="facilitymgr" class="buttontext">${orderHeader.originFacilityId}</a> <#else> ${uiLabelMap.CommonNA} </#if> - </div> </td> </tr> - <tr><td colspan="3"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr/></td></tr> <tr> - <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.OrderCreatedBy}</b></div> - </td> - <td width="5"> </td> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderCreatedBy}</td> + <td width="5%"> </td> <td align="left" valign="top" width="80%"> - <div class="tabletext"> <#if orderHeader.createdBy?has_content> <a href="/partymgr/control/viewprofile?userlogin_id=${orderHeader.createdBy}${externalKeyParam}" target="partymgr" class="buttontext">${orderHeader.createdBy}</a> <#else> - [${uiLabelMap.CommonNotSet}] + ${uiLabelMap.CommonNotSet} </#if> - </div> </td> </tr> - <#if distributorId?exists> - <tr><td colspan="3"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr/></td></tr> <tr> - <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.OrderDistributor}</b></div> - </td> - <td width="5"> </td> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderDistributor}</td> + <td width="5%"> </td> <td align="left" valign="top" width="80%"> - <div class="tabletext"> <#assign distPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", distributorId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> ${distPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")} - </div> </td> </tr> </#if> <#if affiliateId?exists> - <tr><td colspan="3"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr/></td></tr> <tr> - <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.OrderAffiliate}</b></div> - </td> - <td width="5"> </td> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderAffiliate}</td> + <td width="5%"> </td> <td align="left" valign="top" width="80%"> - <div class="tabletext"> <#assign affPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", affiliateId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> ${affPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")} </div> </td> </tr> </#if> - <#if orderContentWrapper.get("IMAGE_URL")?has_content> - <tr><td colspan="3"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr/></td></tr> <tr> - <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.OrderImage}</b></div> - </td> - <td width="5"> </td> + <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderImage}</td> + <td width="5%"> </td> <td align="left" valign="top" width="80%"> - <div class="tabletext"> <a href="<@ofbizUrl>viewimage?orderId=${orderId}&orderContentTypeId=IMAGE_URL</@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a> - </div> </td> </tr> </#if> - </table> + </table> </div> -</div> +</div> \ No newline at end of file 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?rev=613672&r1=613671&r2=613672&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Sun Jan 20 12:28:45 2008 @@ -20,35 +20,34 @@ <#if orderHeader?has_content> <div class="screenlet"> <div class="screenlet-title-bar"> - <ul> - <li class="head3"> ${uiLabelMap.OrderOrderItems}</li> - <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) || security.hasRolePermission("ORDERMGR", "_UPDATE", "", "", session)> - <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED"> - <#if orderHeader.statusId != "ORDER_COMPLETED"> - <#-- - <a href="<@ofbizUrl>cancelOrderItem?${paramString}</@ofbizUrl>" class="submenutext">${uiLabelMap.OrderCancelAllItems}</a> - --> - <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> - <#if returnableItems?has_content> - <li><a href="<@ofbizUrl>quickreturn?orderId=${orderId}&party_id=${partyId?if_exists}&returnHeaderTypeId=${returnHeaderTypeId}</@ofbizUrl>">${uiLabelMap.OrderCreateReturn}</a></li> + <ul> + <li class="head3"> ${uiLabelMap.OrderOrderItems}</li> + <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) || security.hasRolePermission("ORDERMGR", "_UPDATE", "", "", session)> + <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED"> + <#if orderHeader.statusId != "ORDER_COMPLETED"> + <#-- + <a href="<@ofbizUrl>cancelOrderItem?${paramString}</@ofbizUrl>">${uiLabelMap.OrderCancelAllItems}</a> + --> + <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> + <#if returnableItems?has_content> + <li><a href="<@ofbizUrl>quickreturn?orderId=${orderId}&party_id=${partyId?if_exists}&returnHeaderTypeId=${returnHeaderTypeId}</@ofbizUrl>">${uiLabelMap.OrderCreateReturn}</a></li> + </#if> + </#if> </#if> - </#if> - </#if> - </ul> - <br class="clear" /> - </div> - + </ul> + <br class="clear"/> + </div> <div class="screenlet-body"> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr align="left" valign="bottom"> - <td width="30%" align="left"><div class="tableheadtext">${uiLabelMap.ProductProduct}</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> + <table class="basic-table" cellspacing='0'> + <tr align="left" valign="bottom" class="header-row"> + <td width="30%" align="left">${uiLabelMap.ProductProduct}</td> + <td width="33%" align="left">${uiLabelMap.CommonStatus}</td> + <td width="5%" align="left">${uiLabelMap.OrderQuantity}</td> + <td width="10%" align="right">${uiLabelMap.OrderUnitList}</td> + <td width="10%" align="right">${uiLabelMap.OrderAdjustments}</td> + <td width="10%" align="right">${uiLabelMap.OrderSubTotal}</td> <td width="2%"> </td> </tr> <#if !orderItemList?has_content> @@ -58,20 +57,17 @@ <#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="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="7" valign="top"> - <b><div class="tabletext"> >> ${orderItem.itemDescription}</div></b> - </td> + <td colspan="7" valign="top" class="label"> >> ${orderItem.itemDescription}</td> <#else> <td valign="top"> <#if productId?has_content> <#assign product = orderItem.getRelatedOneCache("Product")> </#if> - <div class="tabletext"> + <div> <#if productId?exists> ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?if_exists} <#if (product.salesDiscontinuationDate)?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(product.salesDiscontinuationDate)> @@ -84,7 +80,7 @@ </#if> </div> <#if productId?exists> - <div class="tabletext" style="margin-top: 15px; margin-left: 10px;"> + <div style="margin-top: 15px; margin-left: 10px;"> <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> @@ -111,12 +107,12 @@ </td><td> </td></tr> <tr><td align="left">${uiLabelMap.OrderRequiredForSO}</td> <td style="padding-left: 15px; text-align: left;">${requiredQuantity}</td></tr> - <#if availableToPromiseByFacilityMap?exists && quantityOnHandByFacilityMap?exists && quantityOnHandByFacilityMap.get(productId)?exists && availableToPromiseByFacilityMap.get(productId)?exists> + <#if availableToPromiseByFacilityMap?exists && quantityOnHandByFacilityMap?exists && quantityOnHandByFacilityMap.get(productId)?exists && availableToPromiseByFacilityMap.get(productId)?exists> <#assign atpQuantityByFacility = availableToPromiseByFacilityMap.get(productId)?default(0)> <#assign qohQuantityByFacility = quantityOnHandByFacilityMap.get(productId)?default(0)> <tr><td align="left">${uiLabelMap.ProductInInventory} [${facility.facilityName?if_exists}] ${uiLabelMap.ProductQoh}</td> <td style="padding-left: 15px; text-align: left;">${qohQuantityByFacility} (${uiLabelMap.ProductAtp}: ${atpQuantityByFacility})</td></tr> - </#if> + </#if> <tr><td align="left">${uiLabelMap.ProductInInventory} [${uiLabelMap.CommonAll} ${uiLabelMap.ProductFacilities}] ${uiLabelMap.ProductQoh}</td> <td style="padding-left: 15px; text-align: left;">${qohQuantity} (${uiLabelMap.ProductAtp}: ${atpQuantity})</td></tr> <#if (product != null) && (product.productTypeId != null) && (product.productTypeId == "MARKETING_PKG_AUTO" || product.productTypeId == "MARKETING_PKG_PICK")> @@ -132,19 +128,18 @@ </table> </div> </#if> - </#if> </td> <#-- now show status details per line item --> <#assign currentItemStatus = orderItem.getRelatedOne("StatusItem")> <td align="left" colspan="1" valign="top"> - <div class="tabletext">${uiLabelMap.CommonCurrent}: ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}</div> + <div><span class="label">${uiLabelMap.CommonCurrent}</span> ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}</div> <#assign orderItemStatuses = orderReadHelper.getOrderItemStatuses(orderItem)> <#list orderItemStatuses as orderItemStatus> <#assign loopStatusItem = orderItemStatus.getRelatedOne("StatusItem")> - <div class="tabletext"> - ${orderItemStatus.statusDatetime.toString()} : ${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)} + <div> + ${orderItemStatus.statusDatetime.toString()} ${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)} </div> </#list> <#assign returns = orderItem.getRelated("ReturnItem")?if_exists> @@ -152,14 +147,13 @@ <#list returns as returnItem> <#assign returnHeader = returnItem.getRelatedOne("ReturnHeader")> <#if returnHeader.statusId != "RETURN_CANCELLED"> - <div class="tabletext"> - <font color="red"><b>${uiLabelMap.OrderReturned}</b></font> #<a href="<@ofbizUrl>returnMain?returnId=${returnItem.returnId}</@ofbizUrl>" class="buttontext">${returnItem.returnId}</a> + <div> + <font color="red">${uiLabelMap.OrderReturned}</font> #<a href="<@ofbizUrl>returnMain?returnId=${returnItem.returnId}</@ofbizUrl>" class="buttontext">${returnItem.returnId}</a> </div> </#if> </#list> </#if> </td> - <#-- QUANTITY --> <td align="right" valign="top" nowrap="nowrap"> <table> @@ -174,39 +168,38 @@ <#assign shortfalledQuantity = shortfalledQuantity + orderItemShipGrpInvRes.quantityNotAvailable/> </#if> </#list> - <div class="tabletext">${uiLabelMap.OrderOrdered}: ${orderItem.quantity?default(0)?string.number} </div> - <div class="tabletext">${uiLabelMap.OrderCancelled}: ${orderItem.cancelQuantity?default(0)?string.number} </div> - <div class="tabletext">${uiLabelMap.OrderRemaining}: ${remainingQuantity} </div> - <div class="tabletext">${uiLabelMap.OrderShortfalled}: ${shortfalledQuantity} </div> + <div><span class="label">${uiLabelMap.OrderOrdered}</span> ${orderItem.quantity?default(0)?string.number} </div> + <div><span class="label">${uiLabelMap.OrderCancelled}</span> ${orderItem.cancelQuantity?default(0)?string.number} </div> + <div><span class="label">${uiLabelMap.OrderRemaining}</span> ${remainingQuantity} </div> + <div><span class="label">${uiLabelMap.OrderShortfalled}</span> ${shortfalledQuantity} </div> </td> <td> - <div class="tabletext">${uiLabelMap.OrderShipRequest} - : ${orderReadHelper.getItemReservedQuantity(orderItem)} </div> + <div><span class="label">${uiLabelMap.OrderShipRequest}</span> ${orderReadHelper.getItemReservedQuantity(orderItem)} </div> <#if orderHeader.orderTypeId == "SALES_ORDER"> - <div class="tabletext"><#if pickedQty gt 0 && orderHeader.statusId == "ORDER_APPROVED"><font color="red">${uiLabelMap.OrderQtyPicked}: ${pickedQty?default(0)?string.number}</font><#else>${uiLabelMap.OrderQtyPicked}: ${pickedQty?default(0)?string.number}</#if> </div> - </#if> - <div class="tabletext">${uiLabelMap.OrderQtyShipped}: ${shippedQuantity} </div> - <div class="tabletext">${uiLabelMap.OrderOutstanding}: + <div><#if pickedQty gt 0 && orderHeader.statusId == "ORDER_APPROVED"><font color="red"><span class="label">${uiLabelMap.OrderQtyPicked}</span> ${pickedQty?default(0)?string.number}</font><#else><span class="label">${uiLabelMap.OrderQtyPicked}</span> ${pickedQty?default(0)?string.number}</#if> </div> + </#if> + <div><span class="label">${uiLabelMap.OrderQtyShipped}</span> ${shippedQuantity} </div> + <div><span class="label">${uiLabelMap.OrderOutstanding}</span> <#-- Make sure digital goods without shipments don't always remainn "outstanding": if item is completed, it must have no outstanding quantity. --> <#if (orderItem.statusId != null) && (orderItem.statusId == "ITEM_COMPLETED")>0<#else>${orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0) - shippedQuantity}</#if> </div> - <div class="tabletext">${uiLabelMap.OrderInvoiced}: ${orderReadHelper.getOrderItemInvoicedQuantity(orderItem)} </div> - <div class="tabletext">${uiLabelMap.OrderReturned}: ${returnQuantityMap.get(orderItem.orderItemSeqId)?default(0)} </div> + <div><span class="label">${uiLabelMap.OrderInvoiced}</span> ${orderReadHelper.getOrderItemInvoicedQuantity(orderItem)} </div> + <div><span class="label">${uiLabelMap.OrderReturned}</span> ${returnQuantityMap.get(orderItem.orderItemSeqId)?default(0)} </div> </td> </tr> </table> </td> <td align="right" valign="top" nowrap="nowrap"> - <div class="tabletext"><@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/> / <@ofbizCurrency amount=orderItem.unitListPrice isoCode=currencyUomId/></div> + <@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/> / <@ofbizCurrency amount=orderItem.unitListPrice isoCode=currencyUomId/> </td> <td align="right" valign="top" nowrap="nowrap"> - <div class="tabletext"><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentsTotal(orderItem, orderAdjustments, true, false, false) isoCode=currencyUomId/></div> + <@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentsTotal(orderItem, orderAdjustments, true, false, false) isoCode=currencyUomId/> </td> <td align="right" valign="top" nowrap="nowrap"> <#if orderItem.statusId != "ITEM_CANCELLED"> - <div class="tabletext"><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemSubTotal(orderItem, orderAdjustments) isoCode=currencyUomId/></div> + <@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemSubTotal(orderItem, orderAdjustments) isoCode=currencyUomId/> <#else> - <div class="tabletext"><@ofbizCurrency amount=0.00 isoCode=currencyUomId/></div> + <@ofbizCurrency amount=0.00 isoCode=currencyUomId/> </#if> </td> <td> </td> @@ -221,11 +214,11 @@ <tr> <td> </td> <td colspan="6"> - <div class="tabletext"> + <div> <#if orderItem.orderItemTypeId != "RENTAL_ORDER_ITEM"> - <b><i>${uiLabelMap.ManufacturingProductionRun}</i>:</b> - <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${workEffort.workEffortId}</a> - ${uiLabelMap.OrderCurrentStatus}: ${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId"))).get("description",locale))?if_exists} + <span class="label">${uiLabelMap.ManufacturingProductionRun}</span> + <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortId}&externalLoginKey=${externalLoginKey}" class="buttontext">${workEffort.workEffortId}</a> + ${uiLabelMap.OrderCurrentStatus} ${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId"))).get("description",locale))?if_exists} <#else> ${uiLabelMap.CommonFrom}: ${workEffort.estimatedStartDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonTo}: ${workEffort.estimatedCompletionDate?string("yyyy-MM-dd")} ${uiLabelMap.OrderNumberOfPersons}: ${workEffort.reservPersons?default("")} </#if> @@ -250,9 +243,9 @@ <tr> <td> </td> <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} + <div> + <span class="label">${uiLabelMap.OrderLinkedToOrderItem}</span> (${linkedOrderItem.orderItemAssocTypeId}) + <a href="/ordermgr/control/orderview?orderId=${linkedOrderId}" class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description?if_exists} </div> </td> </tr> @@ -267,9 +260,9 @@ <tr> <td> </td> <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} + <div> + <span class="label">${uiLabelMap.OrderLinkedFromOrderItem}</span> ${linkedOrderItem.orderItemAssocTypeId}) + <a href="/ordermgr/control/orderview?orderId=${linkedOrderId}" class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description?if_exists} </div> </td> </tr> @@ -284,9 +277,9 @@ <tr> <td> </td> <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> + <div> + <span class="label">${uiLabelMap.OrderLinkedToRequirement}</span> + <a href="<@ofbizUrl>EditRequirement?requirementId=${linkedRequirement.requirementId}</@ofbizUrl>" class="buttontext">${linkedRequirement.requirementId}</a> </div> </td> </tr> @@ -300,9 +293,9 @@ <tr> <td> </td> <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> + <div> + <span class="label">${uiLabelMap.OrderLinkedToQuote}</span> + <a href="<@ofbizUrl>EditQuoteItem?quoteId=${linkedQuote.quoteId}&quoteItemSeqId=${linkedQuote.quoteItemSeqId}</@ofbizUrl>" class="buttontext">${linkedQuote.quoteId}-${linkedQuote.quoteItemSeqId}</a> </div> </td> </tr> @@ -314,33 +307,33 @@ <#list orderItemAdjustments as orderItemAdjustment> <#assign adjustmentType = orderItemAdjustment.getRelatedOneCache("OrderAdjustmentType")> <tr> - <td align="right" colspan="2"> - <div class="tabletext" style="font-size: xx-small;"> - <b><i>${uiLabelMap.OrderAdjustment}</i>:</b> <b>${adjustmentType.get("description",locale)}</b>: + <td align="right" colspan="2"> + <div> + <span class="label">${uiLabelMap.OrderAdjustment}</span> ${adjustmentType.get("description",locale)} ${orderItemAdjustment.get("description",locale)?if_exists} <#if orderItemAdjustment.comments?has_content>(${orderItemAdjustment.comments?default("")})</#if> <#if orderItemAdjustment.productPromoId?has_content><a href="/catalog/control/EditProductPromo?productPromoId=${orderItemAdjustment.productPromoId}&externalLoginKey=${externalLoginKey}">${orderItemAdjustment.getRelatedOne("ProductPromo").getString("promoName")}</a></#if> <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX"> <#if orderItemAdjustment.primaryGeoId?has_content> <#assign primaryGeo = orderItemAdjustment.getRelatedOneCache("PrimaryGeo")/> - <#if primaryGeo.geoName?has_content> - <b>${uiLabelMap.OrderJurisdiction}:</b> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}] - </#if> + <#if primaryGeo.geoName?has_content> + <span class="label">${uiLabelMap.OrderJurisdiction}</span> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}] + </#if> <#if orderItemAdjustment.secondaryGeoId?has_content> <#assign secondaryGeo = orderItemAdjustment.getRelatedOneCache("SecondaryGeo")/> - (<b>${uiLabelMap.CommonIn}:</b> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}]) + <span class="label">${uiLabelMap.CommonIn}</span> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}]) </#if> </#if> - <#if orderItemAdjustment.sourcePercentage?exists><b>${uiLabelMap.OrderRate}:</b> ${orderItemAdjustment.sourcePercentage?string("0.######")}</#if> - <#if orderItemAdjustment.customerReferenceId?has_content><b>${uiLabelMap.OrderCustomerTaxId}:</b> ${orderItemAdjustment.customerReferenceId}</#if> - <#if orderItemAdjustment.exemptAmount?exists><b>${uiLabelMap.OrderExemptAmount}:</b> ${orderItemAdjustment.exemptAmount}</#if> + <#if orderItemAdjustment.sourcePercentage?exists><span class="label">${uiLabelMap.OrderRate}</span> ${orderItemAdjustment.sourcePercentage?string("0.######")}</#if> + <#if orderItemAdjustment.customerReferenceId?has_content><span class="label">${uiLabelMap.OrderCustomerTaxId}</span> ${orderItemAdjustment.customerReferenceId}</#if> + <#if orderItemAdjustment.exemptAmount?exists><span class="label">${uiLabelMap.OrderExemptAmount}</span> ${orderItemAdjustment.exemptAmount}</#if> </#if> </div> </td> <td> </td> <td> </td> <td align="right"> - <div class="tabletext" style="font-size: xx-small;"> + <div> <@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].calcItemAdjustment(orderItemAdjustment, orderItem) isoCode=currencyUomId/> </div> </td> @@ -356,11 +349,11 @@ <#list orderItemPriceInfos as orderItemPriceInfo> <tr> <td align="right" colspan="2"> - <div class="tabletext" style="font-size: xx-small;"><b><i>${uiLabelMap.ProductPriceRuleNameId}</i>:</b> [${orderItemPriceInfo.productPriceRuleId?if_exists}:${orderItemPriceInfo.productPriceActionSeqId?if_exists}] ${orderItemPriceInfo.description?if_exists}</div> + <div><span class="label">${uiLabelMap.ProductPriceRuleNameId}</span> [${orderItemPriceInfo.productPriceRuleId?if_exists}:${orderItemPriceInfo.productPriceActionSeqId?if_exists}] ${orderItemPriceInfo.description?if_exists}</div> </td> <td> </td> <td align="right"> - <div class="tabletext" style="font-size: xx-small;"> + <div> <@ofbizCurrency amount=orderItemPriceInfo.modifyAmount isoCode=currencyUomId/> </div> </td> @@ -375,9 +368,9 @@ <#list orderItemSurveyResponses as survey> <tr> <td align="right" colspan="2"> - <div class="tabletext" style="font-size: xx-small;"> - <b><i>${uiLabelMap.CommonSurveys}</i>:</b> - <a href="/content/control/ViewSurveyResponses?surveyResponseId=${survey.surveyResponseId}&surveyId=${survey.surveyId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${survey.surveyId}</a> + <div> + <span class="label">${uiLabelMap.CommonSurveys}</span> + <a href="/content/control/ViewSurveyResponses?surveyResponseId=${survey.surveyResponseId}&surveyId=${survey.surveyId}&externalLoginKey=${externalLoginKey}" class="buttontext">${survey.surveyId}</a> </div> </td> <td colspan="5"> </td> @@ -389,7 +382,7 @@ <#if orderItem.shipAfterDate?exists> <tr> <td align="right" colspan="2"> - <div class="tabletext" style="font-size: xx-small;"><b><i>${uiLabelMap.OrderShipAfterDate}</i>:</b> ${orderItem.shipAfterDate?string.short}</div> + <div><span class="label">${uiLabelMap.OrderShipAfterDate}</span> ${orderItem.shipAfterDate?string.short}</div> </td> <td colspan="5"> </td> </tr> @@ -397,7 +390,7 @@ <#if orderItem.shipBeforeDate?exists> <tr> <td align="right" colspan="2"> - <div class="tabletext" style="font-size: xx-small;"><b><i>${uiLabelMap.OrderShipBeforeDate}</i>:</b> ${orderItem.shipBeforeDate?string.short}</div> + <div><span class="label">${uiLabelMap.OrderShipBeforeDate}</span> ${orderItem.shipBeforeDate?string.short}</div> </td> <td colspan="5"> </td> </tr> @@ -411,10 +404,10 @@ <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress")?if_exists> <tr> <td align="right" colspan="2"> - <div class="tabletext" style="font-size: xx-small;"><b><i>${uiLabelMap.OrderShipGroup}</i>:</b> [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("${uiLabelMap.OrderNotShipped}")}</div> + <div><span class="label">${uiLabelMap.OrderShipGroup}</span> [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("${uiLabelMap.OrderNotShipped}")}</div> </td> <td align="center"> - <div class="tabletext" style="font-size: xx-small;">${shipGroupAssoc.quantity?string.number} </div> + <div>${shipGroupAssoc.quantity?string.number} </div> </td> <td colspan="4"> </td> </tr> @@ -426,16 +419,16 @@ <#list orderItemShipGrpInvResList as orderItemShipGrpInvRes> <tr> <td align="right" colspan="2"> - <div class="tabletext" style="font-size: xx-small;"> - <b><i>${uiLabelMap.FacilityInventory}</i>:</b> - <a href="/facility/control/EditInventoryItem?inventoryItemId=${orderItemShipGrpInvRes.inventoryItemId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${orderItemShipGrpInvRes.inventoryItemId}</a> - <b><i>${uiLabelMap.OrderShipGroup}</i>:</b> ${orderItemShipGrpInvRes.shipGroupSeqId} + <div> + <span class="label">${uiLabelMap.FacilityInventory}</span> + <a href="/facility/control/EditInventoryItem?inventoryItemId=${orderItemShipGrpInvRes.inventoryItemId}&externalLoginKey=${externalLoginKey}" class="buttontext">${orderItemShipGrpInvRes.inventoryItemId}</a> + <span class="label">${uiLabelMap.OrderShipGroup}</span> ${orderItemShipGrpInvRes.shipGroupSeqId} </div> </td> <td align="center"> - <div class="tabletext" style="font-size: xx-small;">${orderItemShipGrpInvRes.quantity?string.number} </div> + <div>${orderItemShipGrpInvRes.quantity?string.number} </div> </td> - <td class="tabletext"> + <td> <#if (orderItemShipGrpInvRes.quantityNotAvailable?has_content && orderItemShipGrpInvRes.quantityNotAvailable > 0)> <span style="color: red;">[${orderItemShipGrpInvRes.quantityNotAvailable?string.number} ${uiLabelMap.OrderBackOrdered}]</span> </#if> @@ -452,10 +445,10 @@ <#list orderShipments as orderShipment> <tr> <td align="right" colspan="2"> - <div class="tabletext" style="font-size: xx-small;"><b><i>${uiLabelMap.OrderPlannedInShipment}</i>: </b><a target="facility" href="/facility/control/ViewShipment?shipmentId=${orderShipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${orderShipment.shipmentId}</a>: ${orderShipment.shipmentItemSeqId}</div> + <div><span class="label">${uiLabelMap.OrderPlannedInShipment}</span> <a target="facility" href="/facility/control/ViewShipment?shipmentId=${orderShipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${orderShipment.shipmentId}</a>: ${orderShipment.shipmentItemSeqId}</div> </td> <td align="center"> - <div class="tabletext" style="font-size: xx-small;">${orderShipment.quantity?string.number} </div> + <div>${orderShipment.quantity?string.number} </div> </td> <td colspan="4"> </td> </tr> @@ -468,17 +461,17 @@ <#list itemIssuances as itemIssuance> <tr> <td align="right" colspan="2"> - <div class="tabletext" style="font-size: xx-small;"> + <div> <#if itemIssuance.shipmentId?has_content> - <b><i>${uiLabelMap.OrderIssuedToShipmentItem}</i>:</b> - <a target="facility" href="/facility/control/ViewShipment?shipmentId=${itemIssuance.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${itemIssuance.shipmentId}</a>:${itemIssuance.shipmentItemSeqId?if_exists} + <span class="label">${uiLabelMap.OrderIssuedToShipmentItem}</span> + <a target="facility" href="/facility/control/ViewShipment?shipmentId=${itemIssuance.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${itemIssuance.shipmentId}</a>: ${itemIssuance.shipmentItemSeqId?if_exists} <#else> - <b><i>${uiLabelMap.OrderIssuedWithoutShipment}</i></b> + <span class="label">${uiLabelMap.OrderIssuedWithoutShipment}</span> </#if> </div> </td> <td align="center"> - <div class="tabletext" style="font-size: xx-small;">${itemIssuance.quantity?string.number} </div> + <div>${itemIssuance.quantity?string.number} </div> </td> <td colspan="4"> </td> </tr> @@ -490,19 +483,18 @@ <#list itemIssuances as itemIssuance> <tr> <td align="right" colspan="2"> - <div class="tabletext" style="font-size: xx-small;"> + <div> <#if itemIssuance.inventoryItemId?has_content> <#assign inventoryItem = itemIssuance.getRelatedOne("InventoryItem")/> - <b><i>${uiLabelMap.FacilityInventory}</i>:</b> - <a href="/facility/control/EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${itemIssuance.inventoryItemId}</a> - <b><i>${uiLabelMap.OrderShipGroup}</i>:</b> ${itemIssuance.shipGroupSeqId?if_exists} - <#if (inventoryItem.serialNumber?has_content)><br><b><i>${uiLabelMap.ProductSerialNumber}</li>:</b> ${inventoryItem.serialNumber} </#if> - + <span class="label">${uiLabelMap.FacilityInventory}</span> + <a href="/facility/control/EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId}&externalLoginKey=${externalLoginKey}" class="buttontext">${itemIssuance.inventoryItemId}</a> + <span class="label">${uiLabelMap.OrderShipGroup}</span> ${itemIssuance.shipGroupSeqId?if_exists} + <#if (inventoryItem.serialNumber?has_content)><br><span class="label">${uiLabelMap.ProductSerialNumber}</span> ${inventoryItem.serialNumber} </#if> </#if> </div> </td> <td align="center"> - <div class="tabletext" style="font-size: xx-small;">${itemIssuance.quantity?string.number} </div> + <div>${itemIssuance.quantity?string.number} </div> </td> <td colspan="4"> </td> </tr> @@ -515,18 +507,18 @@ <#list shipmentReceipts as shipmentReceipt> <tr> <td align="right" colspan="2"> - <div class="tabletext" style="font-size: xx-small;"> + <div> <#if shipmentReceipt.shipmentId?has_content> - <b><i>${uiLabelMap.OrderShipmentReceived}</i>:</b> - <a target="facility" href="/facility/control/ViewShipment?shipmentId=${shipmentReceipt.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${shipmentReceipt.shipmentId}</a>:${shipmentReceipt.shipmentItemSeqId?if_exists} + <span class="label">${uiLabelMap.OrderShipmentReceived}</span> + <a target="facility" href="/facility/control/ViewShipment?shipmentId=${shipmentReceipt.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${shipmentReceipt.shipmentId}</a>:${shipmentReceipt.shipmentItemSeqId?if_exists} </#if> ${shipmentReceipt.datetimeReceived} - <b><i>${uiLabelMap.FacilityInventory}</i>:</b> - <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${shipmentReceipt.inventoryItemId}</a> + <span class="label">${uiLabelMap.FacilityInventory}</span> + <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}&externalLoginKey=${externalLoginKey}" class="buttontext">${shipmentReceipt.inventoryItemId}</a> </div> </td> <td align="center"> - <div class="tabletext" style="font-size: xx-small;">${shipmentReceipt.quantityAccepted?string.number} / ${shipmentReceipt.quantityRejected?default(0)?string.number}</div> + <div>${shipmentReceipt.quantityAccepted?string.number} / ${shipmentReceipt.quantityRejected?default(0)?string.number}</div> </td> <td colspan="4"> </td> </tr> @@ -535,17 +527,17 @@ </#list> </#if> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="7"><hr/></td></tr> <#list orderHeaderAdjustments as orderHeaderAdjustment> <#assign adjustmentType = orderHeaderAdjustment.getRelatedOne("OrderAdjustmentType")> <#assign adjustmentAmount = Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(orderHeaderAdjustment, orderSubTotal)> <#if adjustmentAmount != 0> <tr> - <td align="right" colspan="5"> - <div class="tabletext"><b>${adjustmentType.get("description",locale)}</b> ${orderHeaderAdjustment.comments?if_exists} ${orderHeaderAdjustment.get("description")?if_exists} : </div> + <td align="right" colspan="5"> + <div><span class="label">${adjustmentType.get("description",locale)}</span> ${orderHeaderAdjustment.comments?if_exists} ${orderHeaderAdjustment.get("description")?if_exists} : </div> </td> <td align="right" nowrap="nowrap"> - <div class="tabletext"><@ofbizCurrency amount=adjustmentAmount isoCode=currencyUomId/></div> + <div><@ofbizCurrency amount=adjustmentAmount isoCode=currencyUomId/></div> </td> <td> </td> </tr> @@ -553,44 +545,43 @@ </#list> <#-- subtotal --> - <tr><td colspan="1"></td><td colspan="6"><hr class="sepbar"/></td></tr> + <tr><td colspan="1"></td><td colspan="6"><hr/></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 align="right" colspan="5"><div><span class="label">${uiLabelMap.OrderItemsSubTotal}</span></div></td> + <td align="right" nowrap="nowrap"><div><@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 align="right" colspan="5"><div><span class="label">${uiLabelMap.OrderTotalOtherOrderAdjustments}</span></div></td> + <td align="right" nowrap="nowrap"><div><@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 align="right" colspan="5"><div><span class="label">${uiLabelMap.OrderTotalShippingAndHandling}</span></div></td> + <td align="right" nowrap="nowrap"><div><@ofbizCurrency amount=shippingAmount isoCode=currencyUomId/></div></td> <td> </td> </tr> - <#-- tax adjustments --> + <#-- 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 align="right" colspan="5"><div><span class="label">${uiLabelMap.OrderTotalSalesTax}</span></div></td> + <td align="right" nowrap="nowrap"><div><@ofbizCurrency amount=taxAmount isoCode=currencyUomId/></div></td> <td> </td> </tr> <#-- grand total --> <tr> - <td align="right" colspan="5"><div class="tabletext"><b>${uiLabelMap.OrderTotalDue}</b></div></td> + <td align="right" colspan="5"><div><span class="label">${uiLabelMap.OrderTotalDue}</span></div></td> <td align="right" nowrap="nowrap"> - <div class="tabletext"><@ofbizCurrency amount=grandTotal isoCode=currencyUomId/></div> + <div><@ofbizCurrency amount=grandTotal isoCode=currencyUomId/></div> </td> <td> </td> </tr> </table> </div> </div> - -</#if> +</#if> \ No newline at end of file Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl?rev=613672&r1=613671&r2=613672&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl Sun Jan 20 12:28:45 2008 @@ -35,27 +35,22 @@ </script> -<#macro pagination> - <tr> - <td> - <table border="0" width="100%"> - <tr> - <td> - <#if state.hasPrevious()> +<#macro pagination> + <table class="basic-table" cellspacing='0'> + <tr> + <td> + <#if state.hasPrevious()> <a href="<@ofbizUrl>orderlist?viewIndex=${state.getViewIndex() - 1}&viewSize=${state.getViewSize()}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> - </#if> - </td> - <td align="right"> - <#if state.hasNext()> + </#if> + </td> + <td align="right"> + <#if state.hasNext()> <a href="<@ofbizUrl>orderlist?viewIndex=${state.getViewIndex() + 1}&viewSize=${state.getViewSize()}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a> - </#if> - </td> - </tr> - </table> - </td> - </tr> + </#if> + </td> + </tr> + </table> </#macro> - <#-- order list --> <div id="findOrdersList" class="screenlet"> @@ -63,17 +58,17 @@ <ul> <li class="head3">${uiLabelMap.OrderLookupOrder}</li> </ul> - <br class="clear" /> + <br class="clear"/> </div> <div class="screenlet-body"> <form method="post" name="findorder" action="<@ofbizUrl>orderlist</@ofbizUrl>"> <input type="hidden" name="changeStatusAndTypeState" value="Y"> - <table border="0" cellspacing="0" cellpadding="0" class="boxbottom"> + <table class="basic-table" cellspacing='0'> <tr> - <td><div class="tableheadtext">${uiLabelMap.CommonStatus}:</div></td> + <td align="right" class="label">${uiLabelMap.CommonStatus}</td> <td> </td> <td nowrap> - <div class="tabletext"> + <div> <input type="checkbox" name="viewall" value="Y" onclick="javascript:setCheckboxes()" <#if state.hasAllStatus()>checked="checked"</#if> />${uiLabelMap.CommonAll} <input type="checkbox" name="viewcreated" value="Y" <#if state.hasStatus('viewcreated')>checked="checked"</#if> />${uiLabelMap.CommonCreated} <input type="checkbox" name="viewprocessing" value="Y" <#if state.hasStatus('viewprocessing')>checked="checked"</#if> />${uiLabelMap.CommonProcessing} @@ -85,16 +80,12 @@ <input type="checkbox" name="viewcancelled" value="Y" <#if state.hasStatus('viewcancelled')>checked="checked"</#if> />${uiLabelMap.CommonCancelled} </div> </td> - <td rowspan="2"> </td> - <td rowspan="2"> - <a href="javascript:document.findorder.submit()" class="buttontext">${uiLabelMap.CommonSubmit}</a><br/> - </td> </tr> <tr> - <td><div class="tableheadtext">${uiLabelMap.CommonType}:</div></td> + <td align="right" class="label">${uiLabelMap.CommonType}</td> <td> </td> <td nowrap> - <div class="tabletext"> + <div> <input type="checkbox" name="view_SALES_ORDER" value="Y" <#if state.hasType('view_SALES_ORDER')>checked="checked"</#if>/> ${descr_SALES_ORDER} <input type="checkbox" name="view_PURCHASE_ORDER" value="Y" <#if state.hasType('view_PURCHASE_ORDER')>checked="checked"</#if>/> @@ -103,10 +94,10 @@ </td> </tr> <tr> - <td><div class="tableheadtext">${uiLabelMap.CommonFilter}:</div></td> + <td align="right" class="label">${uiLabelMap.CommonFilter}</td> <td> </td> <td nowrap> - <div class="tabletext"> + <div> <input type="checkbox" name="filterInventoryProblems" value="Y" <#if state.hasFilter('filterInventoryProblems')>checked="checked"</#if>/> ${uiLabelMap.OrderFilterInventoryProblems} @@ -117,10 +108,10 @@ </td> </tr> <tr> - <td><div class="tableheadtext">${uiLabelMap.CommonFilter} (${uiLabelMap.OrderFilterPOs}):</div></td> + <td align="right" class="label">${uiLabelMap.CommonFilter} (${uiLabelMap.OrderFilterPOs})</td> <td> </td> <td nowrap> - <div class="tabletext"> + <div> <input type="checkbox" name="filterPartiallyReceivedPOs" value="Y" <#if state.hasFilter('filterPartiallyReceivedPOs')>checked="checked"</#if>/> ${uiLabelMap.OrderFilterPartiallyReceivedPOs} @@ -133,8 +124,17 @@ </div> </td> </tr> + <tr> + <td colspan="3" align="center"> + <br/> + </td> + </tr> + <tr> + <td colspan="3" align="center"> + <a href="javascript:document.findorder.submit()" class="buttontext">${uiLabelMap.CommonFind}</a> + </td> + </tr> </table> - <br/> </form> </div> </div> @@ -144,134 +144,87 @@ <ul> <li class="head3">${uiLabelMap.OrderOrderList}</li> </ul> - <br class="clear" /> + <br class="clear"/> </div> - <div class="screenlet-body"> - <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxbottom"> - <tr> - <td> - <table width="100%" cellpadding="1" cellspacing="0" border="0"> - <tr> - <td width="15%"> - <div class="tabletext"><b>${uiLabelMap.CommonDate}</b></div> - </td> - <td width="10%"> - <div class="tabletext"><b>${uiLabelMap.OrderOrder} #</b></div> - </td> - <td width="10%"> - <div class="tabletext"><b>${uiLabelMap.OrderOrderType}</b></div> - </td> - <td width="15%"> - <div class="tabletext"><b>${uiLabelMap.OrderOrderBillFromParty}</b></div> - </td> - <td width="15%"> - <div class="tabletext"><b>${uiLabelMap.OrderOrderBillToParty}</b></div> - </td> - <td width="10%"> - <div class="tabletext"><b>${uiLabelMap.CommonAmount}</b></div> - </td> - <td width="10%"> - <div class="tabletext"><b>${uiLabelMap.OrderTrackingCode}</b></div> - </td> - <#if state.hasFilter('filterInventoryProblems') || state.hasFilter('filterAuthProblems') || state.hasFilter('filterPOsOpenPastTheirETA') || state.hasFilter('filterPOsWithRejectedItems') || state.hasFilter('filterPartiallyReceivedPOs')> - <td width="10%"> - <div class="tabletext"><b>${uiLabelMap.CommonStatus}</b></div> - </td> - <td width="5%"> - <div class="tabletext"><b>${uiLabelMap.CommonFilter}</b></div> - </td> - <#else> - <td width="15%"> - <div class="tabletext"><b>${uiLabelMap.CommonStatus}</b></div> - </td> - </#if> - </tr> - <#list orderHeaderList as orderHeader> - <#assign status = orderHeader.getRelatedOneCache("StatusItem")> - <#assign orh = Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeader)> - <#assign billToParty = orh.getBillToParty()?if_exists> - <#assign billFromParty = orh.getBillFromParty()?if_exists> - <#if billToParty?has_content> - <#assign billToPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> - <#assign billTo = billToPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")/> - <#-- <#assign billTo = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(billToParty, true)?if_exists> --> - </#if> - <#if billFromParty?has_content> - <#assign billFrom = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(billFromParty, true)?if_exists> - </#if> - <tr><td colspan="9"><hr class="sepbar"/></td></tr> - <tr> - <td> - <div class="tabletext">${orderHeader.orderDate.toString()}</div> - </td> - <td> - <div class="tabletext"><a href="<@ofbizUrl>orderview?orderId=${orderHeader.orderId}</@ofbizUrl>" class="buttontext">${orderHeader.orderId}</a> - </div> - </td> - <td> - <div class="tabletext">${orderHeader.getRelatedOneCache("OrderType").get("description",locale)}</div> - </td> - <td> - <div class="tabletext"> - ${billFrom?if_exists} - </div> - </td> - <td> - <div class="tabletext"> - ${billTo?if_exists} - </div> - </td> - <td> - <div class="tabletext"><@ofbizCurrency amount=orderHeader.grandTotal isoCode=orderHeader.currencyUom/></div> - </td> - <td> - <#assign trackingCodes = orderHeader.getRelated("TrackingCodeOrder")> - <#list trackingCodes as trackingCode> - <div class="tabletext"> - <#if trackingCode?has_content> - <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br/> - </#if> - </div> - </#list> - </td> - <td class="tabletext"> - ${orderHeader.getRelatedOneCache("StatusItem").get("description",locale)} - </td> - <#if state.hasFilter('filterInventoryProblems') || state.hasFilter('filterAuthProblems') || state.hasFilter('filterPOsOpenPastTheirETA') || state.hasFilter('filterPOsWithRejectedItems') || state.hasFilter('filterPartiallyReceivedPOs')> - <td class="tabletext"> - <#if filterInventoryProblems.contains(orderHeader.orderId)> - Inv - </#if> - <#if filterAuthProblems.contains(orderHeader.orderId)> - Aut - </#if> - <#if filterPOsOpenPastTheirETA.contains(orderHeader.orderId)> - ETA - </#if> - <#if filterPOsWithRejectedItems.contains(orderHeader.orderId)> - Rej - </#if> - <#if filterPartiallyReceivedPOs.contains(orderHeader.orderId)> - Part - </#if> - </td> + <div class="screenlet-body"> + <table class="basic-table hover-bar" cellspacing='0'> + <tr class="header-row"> + <td width="15%">${uiLabelMap.CommonDate}</td> + <td width="10%">${uiLabelMap.OrderOrder} #</td> + <td width="10%">${uiLabelMap.OrderOrderType}</td> + <td width="15%">${uiLabelMap.OrderOrderBillFromParty}</td> + <td width="15%">${uiLabelMap.OrderOrderBillToParty}</td> + <td width="10%">${uiLabelMap.CommonAmount}</td> + <td width="10%">${uiLabelMap.OrderTrackingCode}</td> + <#if state.hasFilter('filterInventoryProblems') || state.hasFilter('filterAuthProblems') || state.hasFilter('filterPOsOpenPastTheirETA') || state.hasFilter('filterPOsWithRejectedItems') || state.hasFilter('filterPartiallyReceivedPOs')> + <td width="10%">${uiLabelMap.CommonStatus}</td> + <td width="5%">${uiLabelMap.CommonFilter}</td> + <#else> + <td colspan="2" width="15%">${uiLabelMap.CommonStatus}</td> + </#if> + </tr> + <#list orderHeaderList as orderHeader> + <#assign status = orderHeader.getRelatedOneCache("StatusItem")> + <#assign orh = Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeader)> + <#assign billToParty = orh.getBillToParty()?if_exists> + <#assign billFromParty = orh.getBillFromParty()?if_exists> + <#if billToParty?has_content> + <#assign billToPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> + <#assign billTo = billToPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")/> + <#-- <#assign billTo = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(billToParty, true)?if_exists> --> + </#if> + <#if billFromParty?has_content> + <#assign billFrom = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(billFromParty, true)?if_exists> + </#if> + <tr> + <td>${orderHeader.orderDate.toString()}</td> + <td> + <a href="<@ofbizUrl>orderview?orderId=${orderHeader.orderId}</@ofbizUrl>" class="buttontext">${orderHeader.orderId}</a> + </td> + <td>${orderHeader.getRelatedOneCache("OrderType").get("description",locale)}</td> + <td>${billFrom?if_exists}</td> + <td>${billTo?if_exists}</td> + <td><@ofbizCurrency amount=orderHeader.grandTotal isoCode=orderHeader.currencyUom/></td> + <td> + <#assign trackingCodes = orderHeader.getRelated("TrackingCodeOrder")> + <#list trackingCodes as trackingCode> + <#if trackingCode?has_content> + <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br/> + </#if> + </#list> + </td> + <td>${orderHeader.getRelatedOneCache("StatusItem").get("description",locale)}</td> + <#if state.hasFilter('filterInventoryProblems') || state.hasFilter('filterAuthProblems') || state.hasFilter('filterPOsOpenPastTheirETA') || state.hasFilter('filterPOsWithRejectedItems') || state.hasFilter('filterPartiallyReceivedPOs')> + <td> + <#if filterInventoryProblems.contains(orderHeader.orderId)> + Inv + </#if> + <#if filterAuthProblems.contains(orderHeader.orderId)> + Aut + </#if> + <#if filterPOsOpenPastTheirETA.contains(orderHeader.orderId)> + ETA + </#if> + <#if filterPOsWithRejectedItems.contains(orderHeader.orderId)> + Rej </#if> - </tr> - </#list> - <#if !orderHeaderList?has_content> - <tr><td colspan="8"><h3>${uiLabelMap.OrderNoOrderFound}</h3></td></tr> + <#if filterPartiallyReceivedPOs.contains(orderHeader.orderId)> + Part + </#if> + </td> + <#else> + <td> </td> </#if> - </table> - </td> - </tr> - </table> + </tr> + </#list> + <#if !orderHeaderList?has_content> + <tr><td colspan="9"><h3>${uiLabelMap.OrderNoOrderFound}</h3></td></tr> + </#if> + </table> + <@pagination/> </div> </div> - - <@pagination/> - <#else> -<tr><td><div class="tableheadtext">${uiLabelMap.OrderViewPermissionError}</div></td></tr> +<tr><td>${uiLabelMap.OrderViewPermissionError}</td></tr> </#if> -</table> - +</table> \ No newline at end of file Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl?rev=613672&r1=613671&r2=613672&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordernotes.ftl Sun Jan 20 12:28:45 2008 @@ -27,45 +27,45 @@ <li><a href="<@ofbizUrl>createnewnote?${paramString}</@ofbizUrl>">${uiLabelMap.OrderNotesCreateNew}</a></li> </#if> </ul> - <br class="clear" /> + <br class="clear"/> </div> <div class="screenlet-body"> - <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'> + <table class="basic-table" cellspacing='0'> <tr> <td> <#if orderNotes?has_content> - <table width="100%" border="0" cellpadding="1"> + <table class="basic-table" cellspacing='0'> <#list orderNotes as note> <tr> <td align="left" valign="top" width="35%"> - <div class="tabletext"> <b>${uiLabelMap.CommonBy}: </b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</div> - <div class="tabletext"> <b>${uiLabelMap.CommonAt}: </b>${note.noteDateTime?string?if_exists}</div> + <div> <span class="label">${uiLabelMap.CommonBy}</span> ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</div> + <div> <span class="label">${uiLabelMap.CommonAt}</span> ${note.noteDateTime?string?if_exists}</div> </td> <td align="left" valign="top" width="50%"> - <div class="tabletext">${note.noteInfo?if_exists}</div> + ${note.noteInfo?if_exists} </td> <td align="right" valign="top" width="15%"> <#if note.internalNote?if_exists == "N"> - <div class="tabletext">${uiLabelMap.OrderPrintableNote}</div> - <a href="<@ofbizUrl>updateOrderNote?orderId=${orderId}¬eId=${note.noteId}&internalNote=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a> + ${uiLabelMap.OrderPrintableNote} + <a href="<@ofbizUrl>updateOrderNote?orderId=${orderId}¬eId=${note.noteId}&internalNote=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a> </#if> <#if note.internalNote?if_exists == "Y"> - <div class="tabletext">${uiLabelMap.OrderNotPrintableNote}</div> - <a href="<@ofbizUrl>updateOrderNote?orderId=${orderId}¬eId=${note.noteId}&internalNote=N</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPublic}</a> + ${uiLabelMap.OrderNotPrintableNote} + <a href="<@ofbizUrl>updateOrderNote?orderId=${orderId}¬eId=${note.noteId}&internalNote=N</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPublic}</a> </#if> </td> </tr> <#if note_has_next> - <tr><td colspan="3"><hr class="sepbar"></td></tr> + <tr><td colspan="3"><hr></td></tr> </#if> </#list> </table> <#else> - <div class="tabletext"> ${uiLabelMap.OrderNoNotes}.</div> + <span class="label"> ${uiLabelMap.OrderNoNotes}.</span> </#if> </td> </tr> </table> </div> </div> -</#if> +</#if> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |