svn commit: r609235 [3/4] - in /ofbiz/trunk/applications/prod
Locked
 
|
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl Sat Jan 5 15:17:57 2008 @@ -25,380 +25,396 @@ <#assign forceComplete = "true"> <#assign showInput = "Y"> </#if> - -<div class="screenlet"> - <span class="head1">${uiLabelMap.ProductPackOrder}</span><span class='head2'> in ${facility.facilityName?if_exists} [<a href="<@ofbizUrl>/EditFacility?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${facilityId?if_exists}</a>]</div> - <#if shipmentId?has_content> - <div class="tabletext"> - ${uiLabelMap.CommonView} <a href="<@ofbizUrl>/PackingSlip.pdf?shipmentId=${shipmentId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductPackingSlip}</a> ${uiLabelMap.CommonOr} - ${uiLabelMap.CommonView} <a href="<@ofbizUrl>/ShipmentBarCode.pdf?shipmentId=${shipmentId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductBarcode}</a> ${uiLabelMap.CommonFor} ${uiLabelMap.ProductShipmentId} <a href="<@ofbizUrl>/ViewShipment?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext">${shipmentId}</a> - </div> - <#if invoiceIds?exists && invoiceIds?has_content> - <div class="tabletext"> - <p>${uiLabelMap.AccountingInvoices}:</p> - <ul> - <#list invoiceIds as invoiceId> - <li> - #<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">${invoiceId}</a> - (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">PDF</a>) - </li> - </#list> - </ul> - </div> - </#if> - </#if> - <br/> - - <!-- select order form --> - <form name="selectOrderForm" method="post" action="<@ofbizUrl>PackOrder</@ofbizUrl>"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"> - <table border='0' cellpadding='2' cellspacing='0'> - <tr> - <td width="25%" align='right'><div class="tabletext">${uiLabelMap.ProductOrderId} #</div></td> - <td width="1"> </td> - <td width="25%"> - <input type="text" name="orderId" size="20" maxlength="20" value="${orderId?if_exists}"/> - / - <input type="text" name="shipGroupSeqId" size="6" maxlength="6" value="${shipGroupSeqId?default("00001")}"/> - </td> - <td>${uiLabelMap.ProductHideGrid}: <input type="checkbox" name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if>></td> - <td> </td> - </tr> - <tr> - <td colspan="2"> </td> - <td colspan="2"> - <input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onClick="javascript:document.selectOrderForm.submit();"> - <a href="javascript:document.selectOrderForm.submit();" class="buttontext">${uiLabelMap.ProductPackOrder}</a> - </td> - </tr> - </table> - </form> - <br/> - - <!-- select picklist bin form --> - <form name="selectPicklistBinForm" method="post" action="<@ofbizUrl>PackOrder</@ofbizUrl>" style="margin: 0;"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"> - <table border='0' cellpadding='2' cellspacing='0'> - <tr> - <td width="25%" align='right'><div class="tabletext">${uiLabelMap.FormFieldTitle_picklistBinId} #</div></td> - <td width="1"> </td> - <td width="25%"> - <input type="text" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId?if_exists}"/> - </td> - <td>${uiLabelMap.ProductHideGrid}: <input type="checkbox" name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if>></td> - <td> </td> - </tr> - <tr> - <td colspan="2"> </td> - <td colspan="1"> - <input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onClick="javascript:document.selectPicklistBinForm.submit();"> - <a href="javascript:document.selectPicklistBinForm.submit();" class="buttontext">${uiLabelMap.ProductPackOrder}</a> - </td> - </tr> - </table> - </form> - - <form name="clearPackForm" method="post" action="<@ofbizUrl>ClearPackAll</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> - </form> - <form name="incPkgSeq" method="post" action="<@ofbizUrl>SetNextPackageSeq</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> - </form> - - <#if showInput != "N" && ((orderHeader?exists && orderHeader?has_content))> - <hr/> - <div class='head2'>${uiLabelMap.ProductOrderId} #<a href="/ordermgr/control/orderview?orderId=${orderId}" class="buttontext">${orderId}</a> / ${uiLabelMap.ProductOrderShipGroupId} #${shipGroupSeqId}</div> - <br/> - <#if orderItemShipGroup?has_content> - <#assign postalAddress = orderItemShipGroup.getRelatedOne("PostalAddress")> - <#assign carrier = orderItemShipGroup.carrierPartyId?default("N/A")> - <table border='0' cellpadding='4' cellspacing='4' width="100%"> - <tr> - <td valign="top"> - <${uiLabelMap.ProductShipToAddress}:<br/> - <b>${uiLabelMap.CommonTo}: </b>${postalAddress.toName?default("")}<br/> - <#if postalAddress.attnName?has_content> - <b>${uiLabelMap.CommonAttn}: </b>${postalAddress.attnName}<br/> - </#if> - ${postalAddress.address1}<br/> - <#if postalAddress.address2?has_content> - ${postalAddress.address2}<br/> - </#if> - ${postalAddress.city?if_exists}, ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists}<br/> - ${postalAddress.countryGeoId}<br/> - </td> - <td> </td> - <td valign="top"> - ${uiLabelMap.ProductCarrierShipmentMethod}:<br/> - <#if carrier == "USPS"> - <#assign color = "red"> - <#elseif carrier == "UPS"> - <#assign color = "green"> - <#else> - <#assign color = "black"> - </#if> - <#if carrier != "_NA_"> - <font color="${color}">${carrier}</font> - - </#if> - ${orderItemShipGroup.shipmentMethodTypeId?default("??")} - <br/> - ${uiLabelMap.ProductEstimatedShipCostForShipGroup}:<br/> - <#if shipmentCostEstimateForShipGroup?exists> - <@ofbizCurrency amount=shipmentCostEstimateForShipGroup isoCode=orderReadHelper.getCurrency()?if_exists/><br/> - </#if> - </td> - <td> </td> - <td valign="top"> - ${uiLabelMap.OrderShipping} ${uiLabelMap.ProductInstruction}:<br/> - ${orderItemShipGroup.shippingInstructions?default("(none)")} - </td> - </tr> - </table> - <br/> - </#if> - - <!-- manual per item form --> - <#if showInput != "N"> - <hr/> - <br/> - <form name="singlePackForm" method="post" action="<@ofbizUrl>ProcessPackOrder</@ofbizUrl>"> - <input type="hidden" name="packageSeq" value="${packingSession.getCurrentPackageSeq()}"/> - <input type="hidden" name="orderId" value="${orderId}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId}"/> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> - <input type="hidden" name="hideGrid" value="${hideGrid}"/> - <table border='0' cellpadding='2' cellspacing='0' width="100%"> - <tr> - <td><div class="tabletext">${uiLabelMap.ProductProduct} #</div></td> - <td width="1"> </td> - <td> - <input type="text" name="productId" size="20" maxlength="20" value=""/> - @ - <input type="text" name="quantity" size="6" maxlength="6" value="1"/> - </td> - <td><div class='tabletext'> </div></td> - <td align="right"> - ${uiLabelMap.CommonCurrent} ${uiLabelMap.ProductPackage} ${uiLabelMap.CommonSequence}: <b>${packingSession.getCurrentPackageSeq()}</b> - <input type="button" value="${uiLabelMap.CommonNext} ${uiLabelMap.ProductPackage}" onclick="javascript:document.incPkgSeq.submit();"> - </td> - </tr> - <tr> - <td colspan="2"> </td> - <td valign="top"> - <input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onClick="javascript:document.singlePackForm.submit();"> - <a href="javascript:document.singlePackForm.submit();" class="buttontext">${uiLabelMap.ProductPackItem}</a> - </td> - <td> </td> - </tr> - </table> - </form> - <br/> - </#if> - - <!-- auto grid form --> - <#assign itemInfos = packingSession.getItemInfos()?if_exists> - <#if showInput != "N" && hideGrid != "Y" && itemInfos?has_content> - <hr/> - <br/> - <form name="multiPackForm" method="post" action="<@ofbizUrl>ProcessBulkPackOrder</@ofbizUrl>"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"> - <input type="hidden" name="originFacilityId" value="${facilityId?if_exists}"> - <input type="hidden" name="hideGrid" value="${hideGrid}"/> - - <table class="basic-table" cellspacing='0'> - <tr class="header-row"> - <td> </td> - <td>${uiLabelMap.ProductItem} #</td> - <td>${uiLabelMap.ProductProductId}</td> - <td>${uiLabelMap.ProductDescription}</td> - <td align="right">${uiLabelMap.ProductOrderedQuantity}</td> - <td align="right">${uiLabelMap.ProductQuantityShipped}</td> - <td align="right">${uiLabelMap.ProductPackedQty}</td> - <td> </td> - <td align="center">${uiLabelMap.ProductPackQty}</td> - <#--td align="center">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval})</td--> - <td align="center">${uiLabelMap.ProductPackage}</td> - </tr> - - <#if (itemInfos?has_content)> - <#assign rowKey = 1> - <#list itemInfos as itemInfo> - <#-- <#list itemInfos as orderItem> --> - <#assign orderItem = itemInfo.orderItem/> - <#assign shippedQuantity = orderReadHelper.getItemShippedQuantity(orderItem)?if_exists> - <#assign orderItemQuantity = itemInfo.quantity/> - <#assign orderProduct = orderItem.getRelatedOne("Product")?if_exists/> - <#assign product = Static["org.ofbiz.product.product.ProductWorker"].findProduct(delegator, itemInfo.productId)?if_exists/> - <#-- - <#if orderItem.cancelQuantity?exists> - <#assign orderItemQuantity = orderItem.quantity - orderItem.cancelQuantity> - <#else> - <#assign orderItemQuantity = orderItem.quantity> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ProductPackOrder} in ${facility.facilityName?if_exists} [${facilityId?if_exists}]</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <#if shipmentId?has_content> + <div> + ${uiLabelMap.CommonView} <a href="<@ofbizUrl>/PackingSlip.pdf?shipmentId=${shipmentId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductPackingSlip}</a> ${uiLabelMap.CommonOr} + ${uiLabelMap.CommonView} <a href="<@ofbizUrl>/ShipmentBarCode.pdf?shipmentId=${shipmentId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductBarcode}</a> ${uiLabelMap.CommonFor} ${uiLabelMap.ProductShipmentId} <a href="<@ofbizUrl>/ViewShipment?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext">${shipmentId}</a> + </div> + <#if invoiceIds?exists && invoiceIds?has_content> + <div> + <p>${uiLabelMap.AccountingInvoices}:</p> + <ul> + <#list invoiceIds as invoiceId> + <li> + #<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">${invoiceId}</a> + (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">PDF</a>) + </li> + </#list> + </ul> + </div> </#if> - --> + </#if> + <br/> - <#assign inputQty = (orderItemQuantity - shippedQuantity - packingSession.getPackedQuantity(orderId, orderItem.orderItemSeqId, shipGroupSeqId, itemInfo.productId))> + <!-- select order form --> + <form name="selectOrderForm" method="post" action="<@ofbizUrl>PackOrder</@ofbizUrl>"> + <input type="hidden" name="facilityId" value="${facilityId?if_exists}"> + <table cellspacing="0" class="basic-table"> <tr> - <td><input type="checkbox" name="sel_${rowKey}" value="Y" <#if (inputQty >0)>checked=""</#if>/></td> - <td>${orderItem.orderItemSeqId}</td> - <td> - ${orderProduct.productId?default("N/A")} - <#if orderProduct.productId != product.productId> - ${product.productId?default("N/A")} - </#if> + <td width="25%" align="right"><span class="label">${uiLabelMap.ProductOrderId} #</span></td> + <td width="1"> </td> + <td width="25%"> + <input type="text" name="orderId" size="20" maxlength="20" value="${orderId?if_exists}"/> + / + <input type="text" name="shipGroupSeqId" size="6" maxlength="6" value="${shipGroupSeqId?default("00001")}"/> </td> - <td> - <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${externalKeyParam}" class="linktext" target="_blank">${(orderProduct.internalName)?if_exists}</a> - <#if orderProduct.productId != product.productId> - [<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${externalKeyParam}" class="linktext" target="_blank">${(product.internalName)?if_exists}</a>] - </#if> - </td> - <td align="right">${orderItemQuantity}</td> - <td align="right">${shippedQuantity?default(0)}</td> - <td align="right">${packingSession.getPackedQuantity(orderId, orderItem.orderItemSeqId, shipGroupSeqId, itemInfo.productId)}</td> + <td><span class="label">${uiLabelMap.ProductHideGrid}</span> <input type="checkbox" name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if>></td> <td> </td> - <td align="center"> - <input type="text" size="7" name="qty_${rowKey}" value="${inputQty}"> + </tr> + <tr> + <td colspan="2"> </td> + <td colspan="2"> + <input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onClick="javascript:document.selectOrderForm.submit();"> + <a href="javascript:document.selectOrderForm.submit();" class="buttontext">${uiLabelMap.ProductPackOrder}</a> </td> - <#--td align="center"> - <input type="text" size="7" name="wgt_${rowKey}" value=""> - </td--> - <td align="center"> - <select name="pkg_${rowKey}"> - <option value="1">${uiLabelMap.ProductPackage} 1</option> - <option value="2">${uiLabelMap.ProductPackage} 2</option> - <option value="3">${uiLabelMap.ProductPackage} 3</option> - <option value="4">${uiLabelMap.ProductPackage} 4</option> - <option value="5">${uiLabelMap.ProductPackage} 5</option> - </select> + </tr> + </table> + </form> + <br/> + + <!-- select picklist bin form --> + <form name="selectPicklistBinForm" method="post" action="<@ofbizUrl>PackOrder</@ofbizUrl>" style="margin: 0;"> + <input type="hidden" name="facilityId" value="${facilityId?if_exists}"> + <table cellspacing="0" class="basic-table"> + <tr> + <td width="25%" align='right'><span class="label">${uiLabelMap.FormFieldTitle_picklistBinId} #</span></td> + <td width="1"> </td> + <td width="25%"> + <input type="text" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId?if_exists}"/> </td> - <input type="hidden" name="prd_${rowKey}" value="${itemInfo.productId?if_exists}"/> - <input type="hidden" name="ite_${rowKey}" value="${orderItem.orderItemSeqId}"/> + <td><span class="label">${uiLabelMap.ProductHideGrid}</span> <input type="checkbox" name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if>></td> + <td> </td> </tr> - <#assign rowKey = rowKey + 1> - </#list> - </#if> - <tr><td colspan="10"> </td></tr> - <tr> - <td colspan="10" align="right"> - <input type="submit" value="${uiLabelMap.ProductPackItem}"> - - <input type="button" value="${uiLabelMap.CommonClear}" onclick="javascript:document.clearPackForm.submit();"/> - </td> - </tr> - </table> - </form> - <br/> - </#if> + <tr> + <td colspan="2"> </td> + <td colspan="1"> + <input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onClick="javascript:document.selectPicklistBinForm.submit();"> + <a href="javascript:document.selectPicklistBinForm.submit();" class="buttontext">${uiLabelMap.ProductPackOrder}</a> + </td> + </tr> + </table> + </form> + <form name="clearPackForm" method="post" action="<@ofbizUrl>ClearPackAll</@ofbizUrl>"> + <input type="hidden" name="orderId" value="${orderId?if_exists}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> + <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> + </form> + <form name="incPkgSeq" method="post" action="<@ofbizUrl>SetNextPackageSeq</@ofbizUrl>"> + <input type="hidden" name="orderId" value="${orderId?if_exists}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> + <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> + </form> + </div> + </div> + + <#if showInput != "N" && ((orderHeader?exists && orderHeader?has_content))> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ProductOrderId} #<a href="/ordermgr/control/orderview?orderId=${orderId}">${orderId}</a> / ${uiLabelMap.ProductOrderShipGroupId} #${shipGroupSeqId}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <#if orderItemShipGroup?has_content> + <#assign postalAddress = orderItemShipGroup.getRelatedOne("PostalAddress")> + <#assign carrier = orderItemShipGroup.carrierPartyId?default("N/A")> + <table cellpadding="4" cellspacing="4" class="basic-table"> + <tr> + <td valign="top"> + <span class="label">${uiLabelMap.ProductShipToAddress}</span> + <br/> + ${uiLabelMap.CommonTo}: ${postalAddress.toName?default("")} + <br/> + <#if postalAddress.attnName?has_content> + ${uiLabelMap.CommonAttn}: ${postalAddress.attnName} + <br/> + </#if> + ${postalAddress.address1} + <br/> + <#if postalAddress.address2?has_content> + ${postalAddress.address2} + <br/> + </#if> + ${postalAddress.city?if_exists}, ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists} + <br/> + ${postalAddress.countryGeoId} + <br/> + </td> + <td> </td> + <td valign="top"> + <span class="label">${uiLabelMap.ProductCarrierShipmentMethod}</span> + <br/> + <#if carrier == "USPS"> + <#assign color = "red"> + <#elseif carrier == "UPS"> + <#assign color = "green"> + <#else> + <#assign color = "black"> + </#if> + <#if carrier != "_NA_"> + <font color="${color}">${carrier}</font> + + </#if> + ${orderItemShipGroup.shipmentMethodTypeId?default("??")} + <br/> + <span class="label">${uiLabelMap.ProductEstimatedShipCostForShipGroup}</span> + <br/> + <#if shipmentCostEstimateForShipGroup?exists> + <@ofbizCurrency amount=shipmentCostEstimateForShipGroup isoCode=orderReadHelper.getCurrency()?if_exists/> + <br/> + </#if> + </td> + <td> </td> + <td valign="top"> + <span class="label">${uiLabelMap.OrderShipping} ${uiLabelMap.ProductInstruction}</span> + <br/> + ${orderItemShipGroup.shippingInstructions?default("(none)")} + </td> + </tr> + </table> + </#if> - <!-- complete form --> - <#if showInput != "N"> - <form name="completePackForm" method="post" action="<@ofbizUrl>CompletePack</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> - <input type="hidden" name="forceComplete" value="${forceComplete?default('false')}"/> - <input type="hidden" name="weightUomId" value="${defaultWeightUomId}"/> - <input type="hidden" name="showInput" value="N"/> - <hr class="sepbar"> - <br/> - <table border='0' cellpadding='2' cellspacing='0' width="100%"> - <tr> - <#assign packageSeqIds = packingSession.getPackageSeqIds()/> - <#if packageSeqIds?has_content> - <td> - ${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}):<br/> - <#list packageSeqIds as packageSeqId> - ${uiLabelMap.ProductPackage} ${packageSeqId} <input type="text" size="7" name="packageWeight_${packageSeqId}" value="${packingSession.getPackageWeight(packageSeqId?int)?if_exists}"><br/> - </#list> - <#if orderItemShipGroup?has_content> - <input type="hidden" name="shippingContactMechId" value="${orderItemShipGroup.contactMechId?if_exists}"/> - <input type="hidden" name="shipmentMethodTypeId" value="${orderItemShipGroup.shipmentMethodTypeId?if_exists}"/> - <input type="hidden" name="carrierPartyId" value="${orderItemShipGroup.carrierPartyId?if_exists}"/> - <input type="hidden" name="carrierRoleTypeId" value="${orderItemShipGroup.carrierRoleTypeId?if_exists}"/> - <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/> + <!-- manual per item form --> + <#if showInput != "N"> + <hr/> + <form name="singlePackForm" method="post" action="<@ofbizUrl>ProcessPackOrder</@ofbizUrl>"> + <input type="hidden" name="packageSeq" value="${packingSession.getCurrentPackageSeq()}"/> + <input type="hidden" name="orderId" value="${orderId}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId}"/> + <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> + <input type="hidden" name="hideGrid" value="${hideGrid}"/> + <table cellpadding="2" cellspacing="0" class="basic-table"> + <tr> + <td> + <div> + <span class="label">${uiLabelMap.ProductProduct} #</span> + <input type="text" name="productId" size="20" maxlength="20" value=""/> + @ + <input type="text" name="quantity" size="6" maxlength="6" value="1"/> + <a href="javascript:document.singlePackForm.submit();" class="buttontext">${uiLabelMap.ProductPackItem}</a> + </div> + </td> + <td> + <span class="label">${uiLabelMap.CommonCurrent} ${uiLabelMap.ProductPackage} ${uiLabelMap.CommonSequence}</span> + ${packingSession.getCurrentPackageSeq()} + <input type="button" value="${uiLabelMap.CommonNext} ${uiLabelMap.ProductPackage}" onclick="javascript:document.incPkgSeq.submit();"> + </td> + </tr> + </table> + </form> + </#if> + + <!-- auto grid form --> + <#assign itemInfos = packingSession.getItemInfos()?if_exists> + <#if showInput != "N" && hideGrid != "Y" && itemInfos?has_content> + <br/> + <form name="multiPackForm" method="post" action="<@ofbizUrl>ProcessBulkPackOrder</@ofbizUrl>"> + <input type="hidden" name="facilityId" value="${facilityId?if_exists}"> + <input type="hidden" name="orderId" value="${orderId?if_exists}"> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"> + <input type="hidden" name="originFacilityId" value="${facilityId?if_exists}"> + <input type="hidden" name="hideGrid" value="${hideGrid}"/> + + <table class="basic-table" cellspacing='0'> + <tr class="header-row"> + <td> </td> + <td>${uiLabelMap.ProductItem} #</td> + <td>${uiLabelMap.ProductProductId}</td> + <td>${uiLabelMap.ProductDescription}</td> + <td align="right">${uiLabelMap.ProductOrderedQuantity}</td> + <td align="right">${uiLabelMap.ProductQuantityShipped}</td> + <td align="right">${uiLabelMap.ProductPackedQty}</td> + <td> </td> + <td align="center">${uiLabelMap.ProductPackQty}</td> + <#--td align="center">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval})</td--> + <td align="center">${uiLabelMap.ProductPackage}</td> + </tr> + + <#if (itemInfos?has_content)> + <#assign rowKey = 1> + <#list itemInfos as itemInfo> + <#-- <#list itemInfos as orderItem> --> + <#assign orderItem = itemInfo.orderItem/> + <#assign shippedQuantity = orderReadHelper.getItemShippedQuantity(orderItem)?if_exists> + <#assign orderItemQuantity = itemInfo.quantity/> + <#assign orderProduct = orderItem.getRelatedOne("Product")?if_exists/> + <#assign product = Static["org.ofbiz.product.product.ProductWorker"].findProduct(delegator, itemInfo.productId)?if_exists/> + <#-- + <#if orderItem.cancelQuantity?exists> + <#assign orderItemQuantity = orderItem.quantity - orderItem.cancelQuantity> + <#else> + <#assign orderItemQuantity = orderItem.quantity> + </#if> + --> + + <#assign inputQty = (orderItemQuantity - shippedQuantity - packingSession.getPackedQuantity(orderId, orderItem.orderItemSeqId, shipGroupSeqId, itemInfo.productId))> + <tr> + <td><input type="checkbox" name="sel_${rowKey}" value="Y" <#if (inputQty >0)>checked=""</#if>/></td> + <td>${orderItem.orderItemSeqId}</td> + <td> + ${orderProduct.productId?default("N/A")} + <#if orderProduct.productId != product.productId> + ${product.productId?default("N/A")} + </#if> + </td> + <td> + <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(orderProduct.internalName)?if_exists}</a> + <#if orderProduct.productId != product.productId> + [<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>] + </#if> + </td> + <td align="right">${orderItemQuantity}</td> + <td align="right">${shippedQuantity?default(0)}</td> + <td align="right">${packingSession.getPackedQuantity(orderId, orderItem.orderItemSeqId, shipGroupSeqId, itemInfo.productId)}</td> + <td> </td> + <td align="center"> + <input type="text" size="7" name="qty_${rowKey}" value="${inputQty}"> + </td> + <#--td align="center"> + <input type="text" size="7" name="wgt_${rowKey}" value=""> + </td--> + <td align="center"> + <select name="pkg_${rowKey}"> + <option value="1">${uiLabelMap.ProductPackage} 1</option> + <option value="2">${uiLabelMap.ProductPackage} 2</option> + <option value="3">${uiLabelMap.ProductPackage} 3</option> + <option value="4">${uiLabelMap.ProductPackage} 4</option> + <option value="5">${uiLabelMap.ProductPackage} 5</option> + </select> + </td> + <input type="hidden" name="prd_${rowKey}" value="${itemInfo.productId?if_exists}"/> + <input type="hidden" name="ite_${rowKey}" value="${orderItem.orderItemSeqId}"/> + </tr> + <#assign rowKey = rowKey + 1> + </#list> + </#if> + <tr><td colspan="10"> </td></tr> + <tr> + <td colspan="10" align="right"> + <input type="submit" value="${uiLabelMap.ProductPackItem}"> + + <input type="button" value="${uiLabelMap.CommonClear}" onclick="javascript:document.clearPackForm.submit();"/> + </td> + </tr> + </table> + </form> + <br/> + </#if> + + <!-- complete form --> + <#if showInput != "N"> + <form name="completePackForm" method="post" action="<@ofbizUrl>CompletePack</@ofbizUrl>"> + <input type="hidden" name="orderId" value="${orderId?if_exists}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> + <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> + <input type="hidden" name="forceComplete" value="${forceComplete?default('false')}"/> + <input type="hidden" name="weightUomId" value="${defaultWeightUomId}"/> + <input type="hidden" name="showInput" value="N"/> + <hr> + <table class="basic-table" cellpadding="2" cellspacing='0'> + <tr> + <#assign packageSeqIds = packingSession.getPackageSeqIds()/> + <#if packageSeqIds?has_content> + <td> + <span class="label">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}):</span> + <br/> + <#list packageSeqIds as packageSeqId> + ${uiLabelMap.ProductPackage} ${packageSeqId} + <input type="text" size="7" name="packageWeight_${packageSeqId}" value="${packingSession.getPackageWeight(packageSeqId?int)?if_exists}"> + <br/> + </#list> + <#if orderItemShipGroup?has_content> + <input type="hidden" name="shippingContactMechId" value="${orderItemShipGroup.contactMechId?if_exists}"/> + <input type="hidden" name="shipmentMethodTypeId" value="${orderItemShipGroup.shipmentMethodTypeId?if_exists}"/> + <input type="hidden" name="carrierPartyId" value="${orderItemShipGroup.carrierPartyId?if_exists}"/> + <input type="hidden" name="carrierRoleTypeId" value="${orderItemShipGroup.carrierRoleTypeId?if_exists}"/> + <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/> + </#if> + </td> + </#if> + <td nowrap="nowrap"> + <span class="label">${uiLabelMap.ProductAdditionalShippingCharge}:</span> + <br/> + <input type="text" name="additionalShippingCharge" value="${packingSession.getAdditionalShippingCharge()?if_exists}" size="20"/> + <#if packageSeqIds?has_content> + <a href="javascript:document.completePackForm.action='<@ofbizUrl>calcPackSessionAdditionalShippingCharge</@ofbizUrl>';document.completePackForm.submit();" class="buttontext">${uiLabelMap.ProductEstimateShipCost}</a> + <br/> </#if> - </td> - </#if> - <td nowrap="nowrap"> - ${uiLabelMap.ProductAdditionalShippingCharge}:<br/> - <input type="text" name="additionalShippingCharge" value="${packingSession.getAdditionalShippingCharge()?if_exists}" size="20"/> - <#if packageSeqIds?has_content> - <a href="javascript:document.completePackForm.action='<@ofbizUrl>calcPackSessionAdditionalShippingCharge</@ofbizUrl>';document.completePackForm.submit();" class="buttontext">${uiLabelMap.ProductEstimateShipCost}</a> + </td> + <td> + <span class="label">${uiLabelMap.ProductHandlingInstructions}:</span> <br/> - </#if> - </td> - <td> - ${uiLabelMap.ProductHandlingInstructions}:<br/v> - <textarea name="handlingInstructions" rows="2" cols="30">${packingSession.getHandlingInstructions()?if_exists}</textarea> - </td> - <td align="right"> - <div> - <#assign buttonName = "${uiLabelMap.ProductComplete}"> - <#if forceComplete?default("false") == "true"> - <#assign buttonName = "${uiLabelMap.ProductCompleteForce}"> - </#if> - <input type="button" value="${buttonName}" onclick="javascript:document.completePackForm.submit();"/> - </div> - </td> - </tr> - </table> - <br/> - </form> - </#if> + <textarea name="handlingInstructions" rows="2" cols="30">${packingSession.getHandlingInstructions()?if_exists}</textarea> + </td> + <td align="right"> + <div> + <#assign buttonName = "${uiLabelMap.ProductComplete}"> + <#if forceComplete?default("false") == "true"> + <#assign buttonName = "${uiLabelMap.ProductCompleteForce}"> + </#if> + <input type="button" value="${buttonName}" onclick="javascript:document.completePackForm.submit();"/> + </div> + </td> + </tr> + </table> + <br/> + </form> + </#if> - <!-- packed items display --> - <#assign packedLines = packingSession.getLines()?if_exists> - <#if packedLines?has_content> - <hr/> - <br/> - <table class="basic-table" cellspacing='0'> - <tr class="header-row"> - <td>${uiLabelMap.ProductItem} #</td> - <td>${uiLabelMap.ProductProductId}</td> - <td>${uiLabelMap.ProductDescription}</td> - <td>${uiLabelMap.ProductInventoryItem} #</td> - <td align="right">${uiLabelMap.ProductPackedQty}</td> - <#--td align="right"><div class="tableheadtext">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval})</td--> - <td align="right">${uiLabelMap.ProductPackage} #</td> - <td> </td> - </tr> - <#list packedLines as line> - <#assign product = Static["org.ofbiz.product.product.ProductWorker"].findProduct(delegator, line.getProductId())/> - <tr> - <td>${line.getOrderItemSeqId()}</td> - <td>${line.getProductId()?default("N/A")}</td> - <td> - <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${externalKeyParam}" class="linktext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a> - </td> - <td>${line.getInventoryItemId()}</td> - <td align="right">${line.getQuantity()}</td> - <#--td align="right"><div class="tabletext">${line.getWeight()}</td--> - <td align="right">${line.getPackageSeq()}</td> - <td align="right"><a href="<@ofbizUrl>ClearPackLine?facilityId=${facilityId}&orderId=${line.getOrderId()}&orderItemSeqId=${line.getOrderItemSeqId()}&shipGroupSeqId=${line.getShipGroupSeqId()}&productId=${line.getProductId()?default("")}&inventoryItemId=${line.getInventoryItemId()}&packageSeqId=${line.getPackageSeq()}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClear}</a></td> - </tr> - </#list> - </table> - </#if> - </#if> + <!-- packed items display --> + <#assign packedLines = packingSession.getLines()?if_exists> + <#if packedLines?has_content> + <br/> + <table class="basic-table" cellspacing='0'> + <tr class="header-row"> + <td>${uiLabelMap.ProductItem} #</td> + <td>${uiLabelMap.ProductProductId}</td> + <td>${uiLabelMap.ProductDescription}</td> + <td>${uiLabelMap.ProductInventoryItem} #</td> + <td align="right">${uiLabelMap.ProductPackedQty}</td> + <#--td align="right">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval})</td--> + <td align="right">${uiLabelMap.ProductPackage} #</td> + <td> </td> + </tr> + <#list packedLines as line> + <#assign product = Static["org.ofbiz.product.product.ProductWorker"].findProduct(delegator, line.getProductId())/> + <tr> + <td>${line.getOrderItemSeqId()}</td> + <td>${line.getProductId()?default("N/A")}</td> + <td> + <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a> + </td> + <td>${line.getInventoryItemId()}</td> + <td align="right">${line.getQuantity()}</td> + <#--td align="right">${line.getWeight()}</td--> + <td align="right">${line.getPackageSeq()}</td> + <td align="right"><a href="<@ofbizUrl>ClearPackLine?facilityId=${facilityId}&orderId=${line.getOrderId()}&orderItemSeqId=${line.getOrderItemSeqId()}&shipGroupSeqId=${line.getShipGroupSeqId()}&productId=${line.getProductId()?default("")}&inventoryItemId=${line.getInventoryItemId()}&packageSeqId=${line.getPackageSeq()}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClear}</a></td> + </tr> + </#list> + </table> + </#if> + </#if> - <#if orderId?has_content> - <script language="javascript"> - document.singlePackForm.productId.focus(); - </script> - <#else> - <script language="javascript"> - document.selectOrderForm.orderId.focus(); - </script> - </#if> + <#if orderId?has_content> + <script language="javascript"> + document.singlePackForm.productId.focus(); + </script> + <#else> + <script language="javascript"> + document.selectOrderForm.orderId.focus(); + </script> + </#if> + </div> + </div> <#else> - <h3>${uiLabelMap.ProductFacilityViewPermissionError}</h3> -</#if> -</div> + <h3>${uiLabelMap.ProductFacilityViewPermissionError}</h3> +</#if> \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml Sat Jan 5 15:17:57 2008 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -20,8 +20,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="EditShipment" type="single" target="updateShipment" title="" default-map-name="shipment"> - + <form name="EditShipment" type="single" target="updateShipment" title="" default-map-name="shipment" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="shipment==null" target="createShipment"/> <auto-fields-service service-name="updateShipment"/> @@ -125,7 +125,8 @@ <!-- Shipment Plan Forms --> <!-- ******************* --> <!-- List for Shipment Plan --> - <form name="listShipmentPlan" type="list" target="" title="" list-name="shipmentPlan"> + <form name="listShipmentPlan" type="list" target="" title="" list-name="shipmentPlan" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="shipmentItemSeqId" title="${uiLabelMap.ProductShipmentItemSeqId}"><display/></field> <field name="orderId" title="${uiLabelMap.ProductOrderId}"><display/></field> <field name="orderItemSeqId" title="${uiLabelMap.ProductOrderItem}"><display/></field> @@ -153,7 +154,8 @@ </field> </form> <!-- Add entries to Shipment Plan --> - <form name="addToShipmentPlan" type="multi" target="addToShipmentPlan" title="" list-name="shipmentPlan"> + <form name="addToShipmentPlan" type="multi" target="addToShipmentPlan" title="" list-name="shipmentPlan" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="shipmentId"><hidden/></field> <field name="orderId"><hidden/></field> <field name="orderItemSeqId"><hidden/></field> @@ -177,7 +179,8 @@ </form> <!-- Search by Order Id --> - <form name="findOrderItems" type="single" target="EditShipmentPlan" title=""> + <form name="findOrderItems" type="single" target="EditShipmentPlan" title="" + header-row-style="header-row" default-table-style="basic-table"> <field name="action"><hidden value="search"/></field> <field name="shipmentId"><hidden/></field> <field name="shipGroupSeqId"><hidden/></field> @@ -188,7 +191,8 @@ <submit button-type="button"/> </field> </form> - <form name="shipmentPlanToOrderItems" type="single" target="AddItemsFromOrder" title=""> + <form name="shipmentPlanToOrderItems" type="single" target="AddItemsFromOrder" title="" + header-row-style="header-row" default-table-style="basic-table"> <field name="selectFromShipmentPlan"><hidden value="true"/></field> <field name="shipmentId"><hidden/></field> <field name="submitButton" title="${uiLabelMap.ProductShipmentPlanToOrderItems}"> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl Sat Jan 5 15:17:57 2008 @@ -19,27 +19,28 @@ <#if requestAttributes.uiLabelMap?exists> <#assign uiLabelMap = requestAttributes.uiLabelMap> </#if> -<#assign unselectedClassName = "tabButton"> -<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}> - +<#assign selected = tabButtonItem?default("void")> <#if shipmentId?has_content> - <div class='tabContainer'> - <a href="<@ofbizUrl>ViewShipment?shipmentId=${shipmentId}</@ofbizUrl>" class="${selectedClassMap.ViewShipment?default(unselectedClassName)}">${uiLabelMap.CommonView}</a> - <a href="<@ofbizUrl>EditShipment?shipmentId=${shipmentId}</@ofbizUrl>" class="${selectedClassMap.EditShipment?default(unselectedClassName)}">${uiLabelMap.CommonEdit}</a> - <#if shipment.shipmentTypeId?exists && shipment.shipmentTypeId='SALES_SHIPMENT'> - <a href="<@ofbizUrl>EditShipmentPlan?shipmentId=${shipmentId}</@ofbizUrl>" class="${selectedClassMap.EditShipmentPlan?default(unselectedClassName)}">${uiLabelMap.ProductShipmentPlan}</a> - </#if> - <a href="<@ofbizUrl>AddItemsFromOrder?shipmentId=${shipmentId}</@ofbizUrl>" class="${selectedClassMap.AddItemsFromOrder?default(unselectedClassName)}">${uiLabelMap.ProductOrderItems}</a> - <#if shipment.shipmentTypeId?exists && shipment.shipmentTypeId='PURCHASE_SHIPMENT' && shipment.destinationFacilityId?exists> - <a href="<@ofbizUrl>ReceiveInventory?shipmentId=${shipmentId}&facilityId=${shipment.destinationFacilityId?if_exists}<#if shipment.primaryOrderId?exists>&purchaseOrderId=${shipment.primaryOrderId}</#if></@ofbizUrl>" class="${selectedClassMap.ReceiveInventory?default(unselectedClassName)}">${uiLabelMap.ProductReceiveInventory}</a> - </#if> - <#if shipment.shipmentTypeId?exists && shipment.shipmentTypeId='PURCHASE_SHIPMENT' && shipment.destinationFacilityId?exists && shipment.primaryOrderId?exists> - <a href="<@ofbizUrl>ReceiveInventoryAgainstPurchaseOrder?shipmentId=${shipmentId?if_exists}&purchaseOrderId=${shipment.primaryOrderId?if_exists}</@ofbizUrl>" class="${selectedClassMap.ProductReceiveInventoryAgainstPurchaseOrder?default(unselectedClassName)}">${uiLabelMap.ProductReceiveInventoryAgainstPO}</a> - </#if> - <#if shipment.shipmentTypeId?exists && shipment.shipmentTypeId='SALES_SHIPMENT'> - <a href="<@ofbizUrl>EditShipmentItems?shipmentId=${shipmentId}</@ofbizUrl>" class="${selectedClassMap.EditShipmentItems?default(unselectedClassName)}">${uiLabelMap.ProductItems}</a> - <a href="<@ofbizUrl>EditShipmentPackages?shipmentId=${shipmentId}</@ofbizUrl>" class="${selectedClassMap.EditShipmentPackages?default(unselectedClassName)}">${uiLabelMap.ProductPackages}</a> - <a href="<@ofbizUrl>EditShipmentRouteSegments?shipmentId=${shipmentId}</@ofbizUrl>" class="${selectedClassMap.EditShipmentRouteSegments?default(unselectedClassName)}">${uiLabelMap.ProductRouteSegments}</a> - </#if> - </div> + <div class="button-bar tab-bar"> + <ul> + <li<#if selected="ViewShipment"> class="selected"</#if>><a href="<@ofbizUrl>ViewShipment?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.CommonView}</a></li> + <li<#if selected="EditShipment"> class="selected"</#if>><a href="<@ofbizUrl>EditShipment?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a></li> + <#if shipment.shipmentTypeId?exists && shipment.shipmentTypeId='SALES_SHIPMENT'> + <li<#if selected="EditShipmentPlan"> class="selected"</#if>><a href="<@ofbizUrl>EditShipmentPlan?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductShipmentPlan}</a></li> + </#if> + <li<#if selected="AddItemsFromOrder"> class="selected"</#if>><a href="<@ofbizUrl>AddItemsFromOrder?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductOrderItems}</a></li> + <#if shipment.shipmentTypeId?exists && shipment.shipmentTypeId='PURCHASE_SHIPMENT' && shipment.destinationFacilityId?exists> + <li<#if selected="ReceiveInventory"> class="selected"</#if>><a href="<@ofbizUrl>ReceiveInventory?shipmentId=${shipmentId}&facilityId=${shipment.destinationFacilityId?if_exists}<#if shipment.primaryOrderId?exists>&purchaseOrderId=${shipment.primaryOrderId}</#if></@ofbizUrl>">${uiLabelMap.ProductReceiveInventory}</a></li> + </#if> + <#if shipment.shipmentTypeId?exists && shipment.shipmentTypeId='PURCHASE_SHIPMENT' && shipment.destinationFacilityId?exists && shipment.primaryOrderId?exists> + <li<#if selected="ReceiveInventoryAgainstPurchaseOrder"> class="selected"</#if>><a href="<@ofbizUrl>ReceiveInventoryAgainstPurchaseOrder?shipmentId=${shipmentId?if_exists}&purchaseOrderId=${shipment.primaryOrderId?if_exists}</@ofbizUrl>">${uiLabelMap.ProductReceiveInventoryAgainstPO}</a></li> + </#if> + <#if shipment.shipmentTypeId?exists && shipment.shipmentTypeId='SALES_SHIPMENT'> + <li<#if selected="EditShipmentItems"> class="selected"</#if>><a href="<@ofbizUrl>EditShipmentItems?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductItems}</a></li> + <li<#if selected="EditShipmentPackages"> class="selected"</#if>><a href="<@ofbizUrl>EditShipmentPackages?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductPackages}</a></li> + <li<#if selected="EditShipmentRouteSegments"> class="selected"</#if>><a href="<@ofbizUrl>EditShipmentRouteSegments?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductRouteSegments}</a></li> + </#if> + </ul> + <br/> + </div> </#if> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl Sat Jan 5 15:17:57 2008 @@ -16,115 +16,109 @@ specific language governing permissions and limitations under the License. --> - <#if shipment?exists> - <table border="0" cellpadding="2" cellspacing="0"> - <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductShipmentId}</span></td> - <td><span class="tabletext"> </span></td> - <td width="80%" align="left"><span class="tabletext">${shipment.shipmentId}</span></td> - </tr> - <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductShipmentType}</span></td> - <td><span class="tabletext"> </span></td> - <td width="80%" align="left"><span class="tabletext">${(shipmentType.get("description",locale))?default(shipment.shipmentTypeId?if_exists)}</span></td> - </tr> - <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductStatus}</span></td> - <td><span class="tabletext"> </span></td> - <td width="80%" align="left"><span class="tabletext">${(statusItem.get("description",locale))?default(shipment.statusId?if_exists)}</span></td> - </tr> - <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductPrimaryOrderId}</span></td> - <td><span class="tabletext"> </span></td> - <td width="80%" align="left"><span class="tabletext"><#if shipment.primaryOrderId?exists><a href="/ordermgr/control/orderview?orderId=${shipment.primaryOrderId}" class="buttontext">${shipment.primaryOrderId}</a></#if></span></td> - </tr> - <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductPrimaryShipGroupSeqId}</span></td> - <td><span class="tabletext"> </span></td> - <td width="80%" align="left"><span class="tabletext">${shipment.primaryShipGroupSeqId?if_exists}</span></td> - </tr> - <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductEstimatedDates}</span></td> - <td><span class="tabletext"> </span></td> - <td width="80%" align="left"> - <span class="tabletext"> - <span class="tableheadtext">${uiLabelMap.CommonReady}: </span>${(shipment.estimatedReadyDate.toString())?if_exists} - <span class="tableheadtext">${uiLabelMap.ProductEstimatedShipDate}: </span>${(shipment.estimatedShipDate.toString())?if_exists} - <span class="tableheadtext">${uiLabelMap.ProductArrival}: </span>${(shipment.estimatedArrivalDate.toString())?if_exists} - </span> - </td> - </tr> - <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductLatestCancelDate}</span></td> - <td><span class="tabletext"> </span></td> - <td width="80%" align="left"><span class="tabletext">${(shipment.latestCancelDate.toString())?if_exists}</span></td> - </tr> - <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductEstimatedShipCost}</span></td> - <td><span class="tabletext"> </span></td> - <td width="80%" align="left"><span class="tabletext">${(shipment.estimatedShipCost)?if_exists}</span></td> - </tr> - <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductAdditionalShippingCharge}</span></td> - <td><span class="tabletext"> </span></td> - <td width="80%" align="left"> - <#if shipment.additionalShippingCharge?exists> - <span class="tabletext"><@ofbizCurrency amount=shipment.additionalShippingCharge isoCode=shipment.currencyUomId?if_exists /></span> - </#if> - </td> - </tr> - <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductHandlingInstructions}</span></td> - <td><span class="tabletext"> </span></td> - <td width="80%" align="left"><span class="tabletext">${shipment.handlingInstructions?if_exists}</span></td> - </tr> - <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductFacilities}</span></td> - <td><span class="tabletext"> </span></td> - <td width="80%" align="left"> - <div class="tabletext"><span class="tableheadtext">${uiLabelMap.ProductOrigin}: </span>${(originFacility.facilityName)?if_exists} [${(shipment.originFacilityId?if_exists)}]</div> - <div class="tabletext"><span class="tableheadtext">${uiLabelMap.ProductDestination}: </span>${(destinationFacility.facilityName)?if_exists} [${(shipment.destinationFacilityId?if_exists)}]</div> - </td> - </tr> - <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.PartyParties}</span></td> - <td><span class="tabletext"> </span></td> - <td width="80%" align="left"> - <span class="tabletext"> - <span class="tableheadtext">${uiLabelMap.CommonTo}: </span>${(toPerson.firstName)?if_exists} ${(toPerson.middleName)?if_exists} ${(toPerson.lastName)?if_exists} ${(toPartyGroup.groupName)?if_exists} [${shipment.partyIdTo?if_exists}] - <span class="tableheadtext">${uiLabelMap.CommonFrom}: </span>${(fromPerson.firstName)?if_exists} ${(fromPerson.middleName)?if_exists} ${(fromPerson.lastName)?if_exists} ${(fromPartyGroup.groupName)?if_exists} [${shipment.partyIdFrom?if_exists}] - </span> - </td> - </tr> - <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductAddresses}</span></td> - <td><span class="tabletext"> </span></td> - <td width="80%" align="left"> - <div class="tabletext"><span class="tableheadtext">${uiLabelMap.ProductOrigin}: </span>${shipment.originContactMechId?if_exists} <#if originPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${originPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${originPostalAddress.attnName?if_exists}, ${originPostalAddress.address1?if_exists}, ${originPostalAddress.address2?if_exists}, ${originPostalAddress.city?if_exists}, ${originPostalAddress.stateProvinceGeoId?if_exists}, ${originPostalAddress.postalCode?if_exists}, ${originPostalAddress.countryGeoId?if_exists}]</#if></div> - <div class="tabletext"><span class="tableheadtext">${uiLabelMap.ProductDestination}: </span>${shipment.destinationContactMechId?if_exists} <#if destinationPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${destinationPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${destinationPostalAddress.attnName?if_exists}, ${destinationPostalAddress.address1?if_exists}, ${destinationPostalAddress.address2?if_exists}, ${destinationPostalAddress.city?if_exists}, ${destinationPostalAddress.stateProvinceGeoId?if_exists}, ${destinationPostalAddress.postalCode?if_exists}, ${destinationPostalAddress.countryGeoId?if_exists}]</#if></div> - </td> - </tr> - <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductPhoneNumbers}</span></td> - <td><span class="tabletext"> </span></td> - <td width="80%" align="left"> - <div class="tabletext"><span class="tableheadtext">${uiLabelMap.ProductOrigin}: </span>${shipment.originTelecomNumberId?if_exists} <#if originTelecomNumber?has_content>[${originTelecomNumber.countryCode?if_exists} ${originTelecomNumber.areaCode?if_exists} ${originTelecomNumber.contactNumber?if_exists}]</#if></div> - <div class="tabletext"><span class="tableheadtext">${uiLabelMap.ProductDestination}: </span>${shipment.destinationTelecomNumberId?if_exists} <#if destinationTelecomNumber?has_content>[${destinationTelecomNumber.countryCode?if_exists} ${destinationTelecomNumber.areaCode?if_exists} ${destinationTelecomNumber.contactNumber?if_exists}]</#if></div> - </td> - </tr> - <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.CommonCreated}</span></td> - <td><span class="tabletext"> </span></td> - <td width="80%" align="left"> - <div class="tabletext">${uiLabelMap.CommonBy} [${shipment.createdByUserLogin?if_exists}] ${uiLabelMap.CommonOn} ${(shipment.createdDate.toString())?if_exists}</div> - </td> - </tr> - <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.CommonLastUpdated}</span></td> - <td><span class="tabletext"> </span></td> - <td width="80%" align="left"> - <div class="tabletext">${uiLabelMap.CommonBy} [${shipment.lastModifiedByUserLogin?if_exists}] ${uiLabelMap.CommonOn} ${(shipment.lastModifiedDate.toString())?if_exists}</div> - </td> - </tr> - </table> - </#if> +<#if shipment?exists> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.PageTitleViewShipment}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <table border="0" cellpadding="2" cellspacing="0" class="basic-table"> + <tr> + <td width="20%" align="right" class="label">${uiLabelMap.ProductShipmentId}</td> + <td width="80%" align="left">${shipment.shipmentId}</td> + </tr> + <tr> + <td width="20%" align="right" class="label">${uiLabelMap.ProductShipmentType}</td> + <td width="80%" align="left">${(shipmentType.get("description",locale))?default(shipment.shipmentTypeId?if_exists)}</td> + </tr> + <tr> + <td width="20%" align="right" class="label">${uiLabelMap.ProductStatus}</td> + <td width="80%" align="left">${(statusItem.get("description",locale))?default(shipment.statusId?if_exists)}</td> + </tr> + <tr> + <td width="20%" align="right" class="label">${uiLabelMap.ProductPrimaryOrderId}</td> + <td width="80%" align="left"><#if shipment.primaryOrderId?exists><a href="/ordermgr/control/orderview?orderId=${shipment.primaryOrderId}" class="buttontext">${shipment.primaryOrderId}</a></#if></td> + </tr> + <tr> + <td width="20%" align="right" class="label">${uiLabelMap.ProductPrimaryShipGroupSeqId}</td> + <td width="80%" align="left">${shipment.primaryShipGroupSeqId?if_exists}</td> + </tr> + <tr> + <td width="20%" align="right" class="label">${uiLabelMap.ProductEstimatedDates}</td> + <td width="80%" align="left"> + <span> + <span>${uiLabelMap.CommonReady}: </span>${(shipment.estimatedReadyDate.toString())?if_exists} + <span>${uiLabelMap.ProductEstimatedShipDate}: </span>${(shipment.estimatedShipDate.toString())?if_exists} + <span>${uiLabelMap.ProductArrival}: </span>${(shipment.estimatedArrivalDate.toString())?if_exists} + </span> + </td> + </tr> + <tr> + <td width="20%" align="right" class="label">${uiLabelMap.ProductLatestCancelDate}</td> + <td width="80%" align="left">${(shipment.latestCancelDate.toString())?if_exists}</td> + </tr> + <tr> + <td width="20%" align="right" class="label">${uiLabelMap.ProductEstimatedShipCost}</td> + <td width="80%" align="left">${(shipment.estimatedShipCost)?if_exists}</td> + </tr> + <tr> + <td width="20%" align="right" class="label">${uiLabelMap.ProductAdditionalShippingCharge}</td> + <td width="80%" align="left"> + <#if shipment.additionalShippingCharge?exists> + <@ofbizCurrency amount=shipment.additionalShippingCharge isoCode=shipment.currencyUomId?if_exists /> + </#if> + </td> + </tr> + <tr> + <td width="20%" align="right" class="label">${uiLabelMap.ProductHandlingInstructions}</td> + <td width="80%" align="left">${shipment.handlingInstructions?if_exists}</td> + </tr> + <tr> + <td width="20%" align="right" class="label">${uiLabelMap.ProductFacilities}</td> + <td width="80%" align="left"> + <div>${uiLabelMap.ProductOrigin}: ${(originFacility.facilityName)?if_exists} [${(shipment.originFacilityId?if_exists)}]</div> + <div>${uiLabelMap.ProductDestination}: ${(destinationFacility.facilityName)?if_exists} [${(shipment.destinationFacilityId?if_exists)}]</div> + </td> + </tr> + <tr> + <td width="20%" align="right" class="label">${uiLabelMap.PartyParties}</td> + <td width="80%" align="left"> + <span> + <span>${uiLabelMap.CommonTo}: ${(toPerson.firstName)?if_exists} ${(toPerson.middleName)?if_exists} ${(toPerson.lastName)?if_exists} ${(toPartyGroup.groupName)?if_exists} [${shipment.partyIdTo?if_exists}] + <span>${uiLabelMap.CommonFrom}: ${(fromPerson.firstName)?if_exists} ${(fromPerson.middleName)?if_exists} ${(fromPerson.lastName)?if_exists} ${(fromPartyGroup.groupName)?if_exists} [${shipment.partyIdFrom?if_exists}] + </span> + </td> + </tr> + <tr> + <td width="20%" align="right" class="label">${uiLabelMap.ProductAddresses}</td> + <td width="80%" align="left"> + <div>${uiLabelMap.ProductOrigin}: ${shipment.originContactMechId?if_exists} <#if originPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${originPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${originPostalAddress.attnName?if_exists}, ${originPostalAddress.address1?if_exists}, ${originPostalAddress.address2?if_exists}, ${originPostalAddress.city?if_exists}, ${originPostalAddress.stateProvinceGeoId?if_exists}, ${originPostalAddress.postalCode?if_exists}, ${originPostalAddress.countryGeoId?if_exists}]</#if></div> + <div>${uiLabelMap.ProductDestination}: ${shipment.destinationContactMechId?if_exists} <#if destinationPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${destinationPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${destinationPostalAddress.attnName?if_exists}, ${destinationPostalAddress.address1?if_exists}, ${destinationPostalAddress.address2?if_exists}, ${destinationPostalAddress.city?if_exists}, ${destinationPostalAddress.stateProvinceGeoId?if_exists}, ${destinationPostalAddress.postalCode?if_exists}, ${destinationPostalAddress.countryGeoId?if_exists}]</#if></div> + </td> + </tr> + <tr> + <td width="20%" align="right" class="label">${uiLabelMap.ProductPhoneNumbers}</td> + <td width="80%" align="left"> + <div>${uiLabelMap.ProductOrigin}: ${shipment.originTelecomNumberId?if_exists} <#if originTelecomNumber?has_content>[${originTelecomNumber.countryCode?if_exists} ${originTelecomNumber.areaCode?if_exists} ${originTelecomNumber.contactNumber?if_exists}]</#if></div> + <div>${uiLabelMap.ProductDestination}: ${shipment.destinationTelecomNumberId?if_exists} <#if destinationTelecomNumber?has_content>[${destinationTelecomNumber.countryCode?if_exists} ${destinationTelecomNumber.areaCode?if_exists} ${destinationTelecomNumber.contactNumber?if_exists}]</#if></div> + </td> + </tr> + <tr> + <td width="20%" align="right" class="label">${uiLabelMap.CommonCreated}</td> + <td width="80%" align="left"> + <div>${uiLabelMap.CommonBy} [${shipment.createdByUserLogin?if_exists}] ${uiLabelMap.CommonOn} ${(shipment.createdDate.toString())?if_exists}</div> + </td> + </tr> + <tr> + <td width="20%" align="right" class="label">${uiLabelMap.CommonLastUpdated}</td> + <td width="80%" align="left"> + <div>${uiLabelMap.CommonBy} [${shipment.lastModifiedByUserLogin?if_exists}] ${uiLabelMap.CommonOn} ${(shipment.lastModifiedDate.toString())?if_exists}</div> + </td> + </tr> + </table> + </div> +</div> +</#if> \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl Sat Jan 5 15:17:57 2008 @@ -17,56 +17,68 @@ under the License. --> <#if shipmentItemDatas?has_content> - <br/> - <table width="100%" cellspacing="0" cellpadding="2" border="1"> - <tr> - <td><div class="tableheadtext">${uiLabelMap.ProductItem}</div></td> - <td><div class="tableheadtext"> </div></td> - <td><div class="tableheadtext"> </div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductQuantity}</div></td> - <td><div class="tableheadtext"> </div></td> - <td><div class="tableheadtext"> </div></td> - </tr> - <#list shipmentItemDatas as shipmentItemData> - <#assign shipmentItem = shipmentItemData.shipmentItem> - <#assign itemIssuances = shipmentItemData.itemIssuances> - <#assign orderShipments = shipmentItemData.orderShipments> - <#assign shipmentPackageContents = shipmentItemData.shipmentPackageContents> - <#assign product = shipmentItemData.product?if_exists> - <tr> - <td><div class="tabletext">${shipmentItem.shipmentItemSeqId}</div></td> - <td colspan="2"><div class="tabletext">${(product.internalName)?if_exists} [<a href="/catalog/control/EditProduct?productId=${shipmentItem.productId?if_exists}" class="buttontext">${shipmentItem.productId?if_exists}</a>]</div></td> - <td><div class="tabletext">${shipmentItem.quantity?default(" ")}</div></td> - <td colspan="2"><div class="tabletext">${shipmentItem.shipmentContentDescription?default(" ")}</div></td> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.PageTitleViewShipmentItemInfo}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <table cellspacing="0" cellpadding="2" class="basic-table"> + <tr class="header-row"> + <td>${uiLabelMap.ProductItem}</td> + <td> </td> + <td> </td> + <td>${uiLabelMap.ProductQuantity}</td> + <td> </td> + <td> </td> </tr> - <#list orderShipments as orderShipment> - <tr> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext">${uiLabelMap.ProductOrderItem} :<a href="/ordermgr/control/orderview?orderId=${orderShipment.orderId?if_exists}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${orderShipment.orderId?if_exists}</a>:${orderShipment.orderItemSeqId?if_exists}</div></td> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext">${orderShipment.quantity?if_exists}</div></td> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext"> </div></td> + <#assign alt_row = false> + <#list shipmentItemDatas as shipmentItemData> + <#assign shipmentItem = shipmentItemData.shipmentItem> + <#assign itemIssuances = shipmentItemData.itemIssuances> + <#assign orderShipments = shipmentItemData.orderShipments> + <#assign shipmentPackageContents = shipmentItemData.shipmentPackageContents> + <#assign product = shipmentItemData.product?if_exists> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td>${shipmentItem.shipmentItemSeqId}</td> + <td colspan="2">${(product.internalName)?if_exists} <a href="/catalog/control/EditProduct?productId=${shipmentItem.productId?if_exists}" class="buttontext">${shipmentItem.productId?if_exists}</a></td> + <td>${shipmentItem.quantity?default(" ")}</td> + <td colspan="2">${shipmentItem.shipmentContentDescription?default(" ")}</td> </tr> + <#list orderShipments as orderShipment> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td> </td> + <td><span class="label">${uiLabelMap.ProductOrderItem}</span> <a href="/ordermgr/control/orderview?orderId=${orderShipment.orderId?if_exists}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${orderShipment.orderId?if_exists}</a>${orderShipment.orderItemSeqId?if_exists}</td> + <td> </td> + <td>${orderShipment.quantity?if_exists}</td> + <td> </td> + <td> </td> + </tr> + </#list> + <#list itemIssuances as itemIssuance> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td> </td> + <td><span class="label">${uiLabelMap.ProductOrderItem}</span> <a href="/ordermgr/control/orderview?orderId=${itemIssuance.orderId?if_exists}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${itemIssuance.orderId?if_exists}</a>${itemIssuance.orderItemSeqId?if_exists}</td> + <td><span class="label">${uiLabelMap.ProductInventory}</span> <a href="<@ofbizUrl>EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId?if_exists}</@ofbizUrl>" class="buttontext">${itemIssuance.inventoryItemId?if_exists}</a></td> + <td>${itemIssuance.quantity?if_exists}</td> + <td>${itemIssuance.issuedDateTime?if_exists}</td> + <td class="label">${uiLabelMap.ProductFuturePartyRoleList}</td> + </tr> + </#list> + <#list shipmentPackageContents as shipmentPackageContent> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td> </td> + <td colspan="2"><span class="label">${uiLabelMap.ProductPackage}</span> ${shipmentPackageContent.shipmentPackageSeqId}</td> + <td>${shipmentPackageContent.quantity?if_exists}</td> + <td colspan="2"> </td> + </tr> + </#list> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> </#list> - <#list itemIssuances as itemIssuance> - <tr> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext">${uiLabelMap.ProductOrderItem} :<a href="/ordermgr/control/orderview?orderId=${itemIssuance.orderId?if_exists}&externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${itemIssuance.orderId?if_exists}</a>:${itemIssuance.orderItemSeqId?if_exists}</div></td> - <td><div class="tabletext">${uiLabelMap.ProductInventory} :<a href="<@ofbizUrl>EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId?if_exists}</@ofbizUrl>" class="buttontext">${itemIssuance.inventoryItemId?if_exists}</a></div></td> - <td><div class="tabletext">${itemIssuance.quantity?if_exists}</div></td> - <td><div class="tabletext">${itemIssuance.issuedDateTime?if_exists}</div></td> - <td><div class="tabletext">${uiLabelMap.ProductFuturePartyRoleList}</div></td> - </tr> - </#list> - <#list shipmentPackageContents as shipmentPackageContent> - <tr> - <td><div class="tabletext"> </div></td> - <td colspan="2"><div class="tabletext">${uiLabelMap.ProductPackage} :${shipmentPackageContent.shipmentPackageSeqId}</div></td> - <td><div class="tabletext">${shipmentPackageContent.quantity?if_exists}</div></td> - <td colspan="2"><div class="tabletext"> </div></td> - </tr> - </#list> - </#list> - </table> -</#if> + </table> + </div> +</div> +</#if> \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl Sat Jan 5 15:17:57 2008 @@ -17,41 +17,53 @@ under the License. --> <#if shipmentPackageDatas?has_content> - <br/> - <table width="100%" cellspacing="0" cellpadding="2" border="1"> - <tr> - <td><div class="tableheadtext">${uiLabelMap.ProductPackage}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonCreated}</div></td> - <td><div class="tableheadtext"> </div></td> - <td><div class="tableheadtext"> </div></td> - </tr> - <#list shipmentPackageDatas as shipmentPackageData> - <#assign shipmentPackage = shipmentPackageData.shipmentPackage> - <#assign shipmentPackageContents = shipmentPackageData.shipmentPackageContents?if_exists> - <#assign shipmentPackageRouteSegs = shipmentPackageData.shipmentPackageRouteSegs?if_exists> - <#assign weightUom = shipmentPackageData.weightUom?if_exists> - <tr> - <td><div class="tabletext">${shipmentPackage.shipmentPackageSeqId}</div></td> - <td><div class="tabletext">${(shipmentPackage.dateCreated.toString())?if_exists}</div></td> - <td><span class="tabletext">${uiLabelMap.ProductWeight} : ${shipmentPackage.weight?if_exists}</span></td> - <td><span class="tabletext">${uiLabelMap.ProductWeightUnit} : <#if weightUom?has_content>${weightUom.get("description",locale)}<#else>${shipmentPackage.weightUomId?if_exists}</#if></span></td> - </tr> - <#list shipmentPackageContents as shipmentPackageContent> - <tr> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext">${uiLabelMap.ProductItem} :${shipmentPackageContent.shipmentItemSeqId}</div></td> - <td><div class="tabletext">${uiLabelMap.ProductQuantity} :${shipmentPackageContent.quantity?if_exists}</div></td> - <td><div class="tabletext"> </div></td> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.PageTitleViewShipmentPackageInfo}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <table cellspacing="0" cellpadding="2" class="basic-table"> + <tr class="header-row"> + <td>${uiLabelMap.ProductPackage}</td> + <td>${uiLabelMap.CommonCreated}</td> + <td> </td> + <td> </td> </tr> - </#list> - <#list shipmentPackageRouteSegs as shipmentPackageRouteSeg> - <tr> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext">${uiLabelMap.ProductRouteSegment} :${shipmentPackageRouteSeg.shipmentRouteSegmentId}</div></td> - <td><span class="tabletext">${uiLabelMap.ProductTracking} : ${shipmentPackageRouteSeg.trackingCode?if_exists}</span></td> - <td><span class="tabletext">${uiLabelMap.ProductBox} : ${shipmentPackageRouteSeg.boxNumber?if_exists}</span></td> - </tr> - </#list> - </#list> - </table> -</#if> + <#assign alt_row = false> + <#list shipmentPackageDatas as shipmentPackageData> + <#assign shipmentPackage = shipmentPackageData.shipmentPackage> + <#assign shipmentPackageContents = shipmentPackageData.shipmentPackageContents?if_exists> + <#assign shipmentPackageRouteSegs = shipmentPackageData.shipmentPackageRouteSegs?if_exists> + <#assign weightUom = shipmentPackageData.weightUom?if_exists> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td>${shipmentPackage.shipmentPackageSeqId}</td> + <td>${(shipmentPackage.dateCreated.toString())?if_exists}</td> + <td><span class="label">${uiLabelMap.ProductWeight}</span> ${shipmentPackage.weight?if_exists}</td> + <td><span class="label">${uiLabelMap.ProductWeightUnit}</span> <#if weightUom?has_content>${weightUom.get("description",locale)}<#else>${shipmentPackage.weightUomId?if_exists}</#if></td> + </tr> + <#list shipmentPackageContents as shipmentPackageContent> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td> </td> + <td><span class="label">${uiLabelMap.ProductItem}</span> ${shipmentPackageContent.shipmentItemSeqId}</td> + <td><span class="label">${uiLabelMap.ProductQuantity}</span> ${shipmentPackageContent.quantity?if_exists}</div></td> + <td> </td> + </tr> + </#list> + <#list shipmentPackageRouteSegs as shipmentPackageRouteSeg> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td> </td> + <td><span class="label">${uiLabelMap.ProductRouteSegment}</span> ${shipmentPackageRouteSeg.shipmentRouteSegmentId}</div></td> + <td><span class="label">${uiLabelMap.ProductTracking}</span> ${shipmentPackageRouteSeg.trackingCode?if_exists}</span></td> + <td><span class="label">${uiLabelMap.ProductBox}</span> ${shipmentPackageRouteSeg.boxNumber?if_exists}</span></td> + </tr> + </#list> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + </div> +</div> +</#if> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |