svn commit: r560814 [2/2] - in /ofbiz/trunk/applications: party/webapp/partymgr/visit/ product/webapp/facility/facili
Locked
 
|
Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?view=diff&rev=560814&r1=560813&r2=560814 ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Sun Jul 29 13:52:05 2007 @@ -21,53 +21,54 @@ <div class="errorMessage">${invalidProductId}</div> </#if> -<h1>${uiLabelMap.ProductReceiveInventory} <span class="head2">${uiLabelMap.CommonInto} <#if facility?has_content>"${facility.facilityName?default("Not Defined")}"</#if> [${uiLabelMap.CommonId} :${facility.facilityId?if_exists}]</span></h1> -<a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductNewFacility}]</a> +<span class="head1">${uiLabelMap.ProductReceiveInventory}</span> <span class="head2">${uiLabelMap.CommonInto} <#if facility?has_content>"${facility.facilityName?default("Not Defined")}"</#if> [${uiLabelMap.CommonId} :${facility.facilityId?if_exists}]</span> +<div class="button-bar"> + <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a> +</div> <script language="JavaScript"> function setNow(field) { eval('document.selectAllForm.' + field + '.value="${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}"'); } </script> -<div> </div> +<br/> <#-- Receiving Results --> <#if receivedItems?has_content> - <table width="100%" border="0" cellpadding="2" cellspacing="0"> - <tr><td colspan="9"><h3>${uiLabelMap.ProductReceiptPurchaseOrder} #${purchaseOrder.orderId}</h3></td></tr> - <tr><td colspan="9"><hr class="sepbar"></td></tr> - <tr> - <td><div class="tableheadtext">${uiLabelMap.ProductShipmentId}#</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductReceipt}#</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonDate}</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductPo} #</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductLine} #</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductProductId}</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductPerUnitPrice}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonRejected}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonAccepted}</div></td> + <h3>${uiLabelMap.ProductReceiptPurchaseOrder} #${purchaseOrder.orderId}</h3> + <hr/> + <table class="basic-table" cellspacing="0"> + <tr class="header-row"> + <td>${uiLabelMap.ProductShipmentId}#</td> + <td>${uiLabelMap.ProductReceipt}#</td> + <td>${uiLabelMap.CommonDate}</td> + <td>${uiLabelMap.ProductPo} #</td> + <td>${uiLabelMap.ProductLine} #</td> + <td>${uiLabelMap.ProductProductId}</td> + <td>${uiLabelMap.ProductPerUnitPrice}</td> + <td>${uiLabelMap.CommonRejected}</td> + <td>${uiLabelMap.CommonAccepted}</td> </tr> - <tr><td colspan="9"><hr class="sepbar"></td></tr> <#list receivedItems as item> <tr> - <td><div class="tabletext"><a href="<@ofbizUrl>ViewShipment?shipmentId=${item.shipmentId?if_exists}</@ofbizUrl>" class="buttontext">${item.shipmentId?if_exists}</a></div></td> - <td><div class="tabletext">${item.receiptId}</div></td> - <td><div class="tabletext">${item.getString("datetimeReceived").toString()}</div></td> - <td><div class="tabletext"><a href="/ordermgr/control/orderview?orderId=${item.orderId}" class="buttontext">${item.orderId}</a></div></td> - <td><div class="tabletext">${item.orderItemSeqId}</div></td> - <td><div class="tabletext">${item.productId?default("Not Found")}</div></td> - <td><div class="tabletext">${item.unitCost?default(0)?string("##0.00")}</td> - <td><div class="tabletext">${item.quantityRejected?default(0)?string.number}</div></td> - <td><div class="tabletext">${item.quantityAccepted?string.number}</div></td> + <td><a href="<@ofbizUrl>ViewShipment?shipmentId=${item.shipmentId?if_exists}</@ofbizUrl>" class="buttontext">${item.shipmentId?if_exists}</a></td> + <td>${item.receiptId}</td> + <td>${item.getString("datetimeReceived").toString()}</td> + <td><a href="/ordermgr/control/orderview?orderId=${item.orderId}" class="buttontext">${item.orderId}</a></td> + <td>${item.orderItemSeqId}</td> + <td>${item.productId?default("Not Found")}</td> + <td>${item.unitCost?default(0)?string("##0.00")}</td> + <td>${item.quantityRejected?default(0)?string.number}</td> + <td>${item.quantityAccepted?string.number}</td> </tr> </#list> - <tr><td colspan="9"><hr class="sepbar"></td></tr> + <tr><td colspan="9"><hr/></td></tr> </table> <br/> </#if> <#-- Single Product Receiving --> <#if requestParameters.initialSelected?exists && product?has_content> - <form method="post" action="<@ofbizUrl>receiveSingleInventoryProduct</@ofbizUrl>" name="selectAllForm" style="margin: 0;"> + <form method="post" action="<@ofbizUrl>receiveSingleInventoryProduct</@ofbizUrl>" name="selectAllForm"> <table border="0" cellpadding="2" cellspacing="0"> <#-- general request fields --> <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/> @@ -80,21 +81,21 @@ <input type="hidden" name="orderItemSeqId" value="${firstOrderItem.orderItemSeqId}"/> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductPurchaseOrder}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductPurchaseOrder}</td> <td width="6%"> </td> <td width="74%"> <b>${purchaseOrder.orderId}</b> / <b>${firstOrderItem.orderItemSeqId}</b> <#if 1 < purchaseOrderItemsSize> - <span class="tabletext">(${uiLabelMap.ProductMultipleOrderItemsProduct} - ${purchaseOrderItemsSize}:1 ${uiLabelMap.ProductItemProduct})</span> + (${uiLabelMap.ProductMultipleOrderItemsProduct} - ${purchaseOrderItemsSize}:1 ${uiLabelMap.ProductItemProduct}) <#else> - <span class="tabletext">(${uiLabelMap.ProductSingleOrderItemProduct} - 1:1 ${uiLabelMap.ProductItemProduct})<span> + (${uiLabelMap.ProductSingleOrderItemProduct} - 1:1 ${uiLabelMap.ProductItemProduct}) </#if> </td> </tr> </#if> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductProductId}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductProductId}</td> <td width="6%"> </td> <td width="74%"> <b>${requestParameters.productId?if_exists}</b> @@ -102,38 +103,38 @@ </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductProductName}</div></td> + <td width="6%" align="right" nowrap>>${uiLabelMap.ProductProductName}</td> <td width="6%"> </td> <td width="74%"> - <div class="tabletext"><a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam?if_exists}" target="catalog" class="buttontext">${product.internalName?if_exists}</a></div> + <a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam?if_exists}" target="catalog" class="buttontext">${product.internalName?if_exists}</a> </td> </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductProductDescription}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductProductDescription}</td> <td width="6%"> </td> <td width="74%"> - <div class="tabletext">${product.description?if_exists}</div> + ${product.description?if_exists} </td> </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductItemDescription}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductItemDescription}</td> <td width="6%"> </td> <td width="74%"> - <input type="text" name="itemDescription" size="30" maxlength="60" class="inputBox"/> + <input type="text" name="itemDescription" size="30" maxlength="60"/> </td> </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductInventoryItemType} </div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductInventoryItemType}</td> <td width="6%"> </td> <td width="74%"> - <select name="inventoryItemTypeId" size="1" class="selectBox"> + <select name="inventoryItemTypeId" size="1"> <#list inventoryItemTypes as nextInventoryItemType> <option value="${nextInventoryItemType.inventoryItemTypeId}" <#if (facility.defaultInventoryItemTypeId?has_content) && (nextInventoryItemType.inventoryItemTypeId == facility.defaultInventoryItemTypeId)> - SELECTED + selected="selected" </#if> >${nextInventoryItemType.get("description",locale)?default(nextInventoryItemType.inventoryItemTypeId)}</option> </#list> @@ -145,19 +146,19 @@ </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductFacilityOwner}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductFacilityOwner}</td> <td width="6%"> </td> <td width="74%"> - <input type="text" name="ownerPartyId" value="" size="20" maxlength="20" class="inputBox"> + <input type="text" name="ownerPartyId" value="" size="20" maxlength="20"> <a href="javascript:call_fieldlookup2(document.selectAllForm.ownerPartyId, 'LookupPartyName');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Lookup"/></a> </td> </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductDateReceived}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductDateReceived}</td> <td width="6%"> </td> <td width="74%"> - <input type="text" name="datetimeReceived" size="24" value="${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}" class="inputBox"> + <input type="text" name="datetimeReceived" size="24" value="${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}"> <#-- <a href="#" onclick="setNow("datetimeReceived")" class="buttontext">[Now]</a> --> </td> </tr> @@ -166,11 +167,11 @@ <#assign facilityLocations = (product.getRelatedByAnd("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId)))?if_exists/> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductFacilityLocation}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductFacilityLocation}</td> <td width="6%"> </td> <td width="74%"> <#if facilityLocations?has_content> - <select name="locationSeqId" class="selectBox"> + <select name="locationSeqId"> <#list facilityLocations as productFacilityLocation> <#assign facility = productFacilityLocation.getRelatedOneCache("Facility")/> <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation")?if_exists/> @@ -180,21 +181,19 @@ <option value="">${uiLabelMap.ProductNoLocation}</option> </select> <#else> - <input type="text" name="locationSeqId" size="20" maxlength="20" class="inputBox"/> - <span class="tabletext"> + <input type="text" name="locationSeqId" size="20" maxlength="20"/> <a href="javascript:call_fieldlookup2(document.selectAllForm.locationSeqId,'LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>');"> <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/> </a> - </span> </#if> </td> </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductRejectedReason}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductRejectedReason}</td> <td width="6%"> </td> <td width="74%"> - <select name="rejectionId" size="1" class="selectBox"> + <select name="rejectionId" size="1"> <option></option> <#list rejectReasons as nextRejection> <option value="${nextRejection.rejectionId}">${nextRejection.get("description",locale)?default(nextRejection.rejectionId)}</option> @@ -204,28 +203,28 @@ </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductQuantityRejected}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductQuantityRejected}/td> <td width="6%"> </td> <td width="74%"> - <input type="text" name="quantityRejected" size="5" value="0" class="inputBox"/> + <input type="text" name="quantityRejected" size="5" value="0" /> </td> </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductQuantityAccepted}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductQuantityAccepted}</td> <td width="6%"> </td> <td width="74%"> - <input type="text" name="quantityAccepted" size="5" value="${defaultQuantity?default(1)?string.number}" class="inputBox"/> + <input type="text" name="quantityAccepted" size="5" value="${defaultQuantity?default(1)?string.number}"/> </td> </tr> <tr> <td width="14%"> </td> - <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductPerUnitPrice}</div></td> + <td width="6%" align="right" nowrap>${uiLabelMap.ProductPerUnitPrice}</td> <td width="6%"> </td> <td width="74%"> <#-- get the default unit cost --> <#if (!unitCost?exists || unitCost == 0.0)><#assign unitCost = standardCosts.get(product.productId)?default(0)/></#if> - <input type="text" name="unitCost" size="10" value="${unitCost}" class="inputBox"/> + <input type="text" name="unitCost" size="10" value="${unitCost}"/> </td> </tr> <tr> @@ -240,17 +239,13 @@ <#-- Select Shipment Screen --> <#elseif requestParameters.initialSelected?exists && !requestParameters.shipmentId?exists> - <form method="post" action="<@ofbizUrl>ReceiveInventory</@ofbizUrl>" name="selectAllForm" style="margin: 0;"> + <h3>${uiLabelMap.ProductSelectShipmentReceive}</h3> + <form method="post" action="<@ofbizUrl>ReceiveInventory</@ofbizUrl>" name="selectAllForm"> <#-- general request fields --> <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/> <input type="hidden" name="purchaseOrderId" value="${requestParameters.purchaseOrderId?if_exists}"/> <input type="hidden" name="initialSelected" value="Y"/> <table width="100%" border="0" cellpadding="2" cellspacing="0"> - <tr> - <td> - <h3>${uiLabelMap.ProductSelectShipmentReceive}</h3> - </td> - </tr> <#list shipments?if_exists as shipment> <#assign originFacility = shipment.getRelatedOneCache("OriginFacility")?if_exists/> <#assign destinationFacility = shipment.getRelatedOneCache("DestinationFacility")?if_exists/> @@ -258,33 +253,33 @@ <#assign shipmentType = shipment.getRelatedOneCache("ShipmentType")/> <#assign shipmentDate = shipment.estimatedArrivalDate?if_exists/> <tr> - <td><hr class="sepbar"></td> + <td><hr/></td> </tr> <tr> <td> <table width="100%" border="0" cellpadding="2" cellspacing="0"> <tr> <td width="5%" nowrap><input type="radio" name="shipmentId" value="${shipment.shipmentId}"></td> - <td width="5%" nowrap><div class="tabletext">${shipment.shipmentId}</div></td> - <td><div class="tabletext">${shipmentType.get("description",locale)?default(shipmentType.shipmentTypeId?default(""))}</div></td> - <td><div class="tabletext">${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</div></td> - <td><div class="tabletext">${(originFacility.facilityName)?if_exists} [${shipment.originFacilityId?if_exists}]</div></td> - <td><div class="tabletext">${(destinationFacility.facilityName)?if_exists} [${shipment.destinationFacilityId?if_exists}]</div></td> - <td><div class="tabletext"><span style="white-space: nowrap;">${(shipment.estimatedArrivalDate.toString())?if_exists}</span></div></td> + <td width="5%" nowrap>${shipment.shipmentId}</td> + <td>${shipmentType.get("description",locale)?default(shipmentType.shipmentTypeId?default(""))}</td> + <td>${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</td> + <td>${(originFacility.facilityName)?if_exists} [${shipment.originFacilityId?if_exists}]</td> + <td>${(destinationFacility.facilityName)?if_exists} [${shipment.destinationFacilityId?if_exists}]</td> + <td style="white-space: nowrap;">${(shipment.estimatedArrivalDate.toString())?if_exists}</td> </tr> </table> </td> </tr> </#list> <tr> - <td><hr class="sepbar"></td> + <td><hr/></td> </tr> <tr> <td> <table width="100%" border="0" cellpadding="2" cellspacing="0"> <tr> <td width="5%" nowrap><input type="radio" name="shipmentId" value="_NA_"></td> - <td width="5%" nowrap><div class="tabletext">${uiLabelMap.ProductNoSpecificShipment}</div></td> + <td width="5%" nowrap>${uiLabelMap.ProductNoSpecificShipment}</td> <td colspan="5"></td> </tr> </table> @@ -298,7 +293,7 @@ <#-- Multi-Item PO Receiving --> <#elseif requestParameters.initialSelected?exists && purchaseOrder?has_content> - <form method="post" action="<@ofbizUrl>receiveInventoryProduct</@ofbizUrl>" name="selectAllForm" style="margin: 0;"> + <form method="post" action="<@ofbizUrl>receiveInventoryProduct</@ofbizUrl>" name="selectAllForm"> <#-- general request fields --> <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/> <input type="hidden" name="purchaseOrderId" value="${requestParameters.purchaseOrderId?if_exists}"/> @@ -309,7 +304,7 @@ <table width="100%" border="0" cellpadding="2" cellspacing="0"> <#if !purchaseOrderItems?exists || purchaseOrderItemsSize == 0> <tr> - <td colspan="2"><div class="tableheadtext">${uiLabelMap.ProductNoItemsPoReceive}.</div></td> + <td colspan="2">${uiLabelMap.ProductNoItemsPoReceive}.</td> </tr> <#else/> <tr> @@ -320,8 +315,8 @@ </#if> </td> <td align="right"> - <span class="tableheadtext">${uiLabelMap.CommonSelectAll}</span> - <input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');"/> + ${uiLabelMap.CommonSelectAll} + <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'selectAllForm');"/> </td> </tr> <#list purchaseOrderItems as orderItem> @@ -346,7 +341,7 @@ </#if> <tr> - <td colspan="2"><hr class="sepbar"></td> + <td colspan="2"><hr/></td> </tr> <tr> <td> @@ -356,27 +351,21 @@ <#assign product = orderItem.getRelatedOneCache("Product")/> <input type="hidden" name="productId_o_${rowCount}" value="${product.productId}"/> <td width="45%"> - <div class="tabletext"> ${orderItem.orderItemSeqId}: <a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam?if_exists}" target="catalog" class="buttontext">${product.productId} - ${orderItem.itemDescription?if_exists}</a> : ${product.description?if_exists} - </div> </td> <#else> <td width="45%"> - <div class="tabletext"> <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists} - <input type="text" class="inputBox" size="12" name="productId_o_${rowCount}"/> + <input type="text" size="12" name="productId_o_${rowCount}"/> <a href="/catalog/control/EditProduct?externalLoginKey=${externalLoginKey}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a> - </div> </td> </#if> - <td align="right"> - <div class="tableheadtext">${uiLabelMap.ProductLocation}:</div> - </td> + <td align="right">${uiLabelMap.ProductLocation}:</td> <#-- location(s) --> <td align="right"> <#assign facilityLocations = (orderItem.getRelatedByAnd("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId)))?if_exists/> <#if facilityLocations?has_content> - <select name="locationSeqId_o_${rowCount}" class="selectBox"> + <select name="locationSeqId_o_${rowCount}"> <#list facilityLocations as productFacilityLocation> <#assign facility = productFacilityLocation.getRelatedOneCache("Facility")/> <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation")?if_exists/> @@ -386,63 +375,53 @@ <option value="">${uiLabelMap.ProductNoLocation}</option> </select> <#else> - <input type="text" class="inputBox" name="locationSeqId_o_${rowCount}" size="12"/> - <span class="tabletext"> + <input type="text" name="locationSeqId_o_${rowCount}" size="12"/> <a href="javascript:call_fieldlookup2(document.selectAllForm.locationSeqId_o_${rowCount},'LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>');"> <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/> </a> - </span> </#if> </td> + <td align="right">${uiLabelMap.ProductQtyReceived} :</td> <td align="right"> - <div class="tableheadtext">${uiLabelMap.ProductQtyReceived} :</div> - </td> - <td align="right"> - <input type="text" class="inputBox" name="quantityAccepted_o_${rowCount}" size="6" value="${defaultQuantity?string.number}"/> + <input type="text" name="quantityAccepted_o_${rowCount}" size="6" value="${defaultQuantity?string.number}"/> </td> </tr> <tr> <td width="45%"> - <span class="tableheadtext">${uiLabelMap.ProductInventoryItemType} :</span> - <select name="inventoryItemTypeId_o_${rowCount}" size="1" class="selectBox"> + ${uiLabelMap.ProductInventoryItemType} : + <select name="inventoryItemTypeId_o_${rowCount}" size="1"> <#list inventoryItemTypes as nextInventoryItemType> <option value="${nextInventoryItemType.inventoryItemTypeId}" <#if (facility.defaultInventoryItemTypeId?has_content) && (nextInventoryItemType.inventoryItemTypeId == facility.defaultInventoryItemTypeId)> - SELECTED + selected="selected" </#if> >${nextInventoryItemType.get("description",locale)?default(nextInventoryItemType.inventoryItemTypeId)}</option> </#list> </select> </td> + <td align="right">${uiLabelMap.ProductRejectionReason} :</td> <td align="right"> - <div class="tableheadtext">${uiLabelMap.ProductRejectionReason} :</div> - </td> - <td align="right"> - <select name="rejectionId_o_${rowCount}" size="1" class="selectBox"> + <select name="rejectionId_o_${rowCount}" size="1"> <option></option> <#list rejectReasons as nextRejection> <option value="${nextRejection.rejectionId}">${nextRejection.get("description",locale)?default(nextRejection.rejectionId)}</option> </#list> </select> </td> + <td align="right">${uiLabelMap.ProductQtyRejected} :</td> <td align="right"> - <div class="tableheadtext">${uiLabelMap.ProductQtyRejected} :</div> - </td> - <td align="right"> - <input type="text" class="inputBox" name="quantityRejected_o_${rowCount}" value="0" size="6"/> + <input type="text" name="quantityRejected_o_${rowCount}" value="0" size="6"/> </td> </tr> <tr> <td> </td> - <td align="right"><span class="tableheadtext">${uiLabelMap.ProductFacilityOwner}:</span></td> - <td align="right"><input type="text" class="inputBox" name="ownerPartyId_o_${rowCount}" size="20" maxlength="20" value="${facility.ownerPartyId}"/></td> - <td align="right"> - <div class="tableheadtext">${uiLabelMap.ProductPerUnitPrice} :</div> - </td> + <td align="right">${uiLabelMap.ProductFacilityOwner}:</td> + <td align="right"><input type="text" name="ownerPartyId_o_${rowCount}" size="20" maxlength="20" value="${facility.ownerPartyId}"/></td> + <td align="right">${uiLabelMap.ProductPerUnitPrice} :</td> <td align="right"> <input type="hidden" name="currencyUomId_o_${rowCount}" value="${currencyUomId?if_exists}"/> - <input type="text" class="inputBox" name="unitCost_o_${rowCount}" value="${itemCost}" size="6" maxlength="20"/> - <span class="tabletext">${currencyUomId?if_exists}</span> + <input type="text" name="unitCost_o_${rowCount}" value="${itemCost}" size="6" maxlength="20"/> + ${currencyUomId?if_exists} </td> </tr> </table> @@ -456,14 +435,12 @@ </#list> <tr> <td colspan="2"> - <hr class="sepbar"> + <hr/> </td> </tr> <#if rowCount == 0> <tr> - <td colspan="2"> - <div class="tabletext">${uiLabelMap.ProductNoItemsPo} #${purchaseOrder.orderId} ${uiLabelMap.ProductToReceive}.</div> - </td> + <td colspan="2">${uiLabelMap.ProductNoItemsPo} #${purchaseOrder.orderId} ${uiLabelMap.ProductToReceive}.</td> </tr> <tr> <td colspan="2" align="right"> @@ -485,36 +462,32 @@ <#-- Initial Screen --> <#else> - <form name="selectAllForm" method="post" action="<@ofbizUrl>ReceiveInventory</@ofbizUrl>" style="margin: 0;"> + <form name="selectAllForm" method="post" action="<@ofbizUrl>ReceiveInventory</@ofbizUrl>"> <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/> <input type="hidden" name="initialSelected" value="Y"/> <table border="0" cellpadding="2" cellspacing="0"> <tr><td colspan="4"><h3>${uiLabelMap.ProductReceiveItem}</h3></td></tr> <tr> - <td width="25%" align="right"><div class="tabletext">${uiLabelMap.ProductPurchaseOrderNumber}</div></td> + <td width="25%" align="right">${uiLabelMap.ProductPurchaseOrderNumber}</td> <td> </td> <td width="25%"> - <input type="text" class="inputBox" name="purchaseOrderId" size="20" maxlength="20" value="${requestParameters.purchaseOrderId?if_exists}"> - <span class="tabletext"> + <input type="text" name="purchaseOrderId" size="20" maxlength="20" value="${requestParameters.purchaseOrderId?if_exists}"> <a href="javascript:call_fieldlookup2(document.selectAllForm.purchaseOrderId,'LookupPurchaseOrderHeaderAndShipInfo');"> <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/> </a> - </span> </td> - <td><div class="tabletext"> (${uiLabelMap.ProductLeaveSingleProductReceiving})</div></td> + <td>(${uiLabelMap.ProductLeaveSingleProductReceiving})</td> </tr> <tr> - <td width="25%" align="right"><div class="tabletext">${uiLabelMap.ProductProductId}</div></td> + <td width="25%" align="right">${uiLabelMap.ProductProductId}</td> <td> </td> <td width="25%"> - <input type="text" class="inputBox" name="productId" size="20" maxlength="20" value="${requestParameters.productId?if_exists}"/> - <span class="tabletext"> + <input type="text" name="productId" size="20" maxlength="20" value="${requestParameters.productId?if_exists}"/> <a href="javascript:call_fieldlookup2(document.selectAllForm.productId,'LookupProduct');"> <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/> </a> - </span> </td> - <td><div class="tabletext"> (${uiLabelMap.ProductLeaveEntirePoReceiving})</div></td> + <td>(${uiLabelMap.ProductLeaveEntirePoReceiving})</td> </tr> <tr> <td colspan="2"> </td> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl?view=diff&rev=560814&r1=560813&r2=560814 ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl Sun Jul 29 13:52:05 2007 @@ -17,7 +17,7 @@ under the License. --> <#if shipment?exists> - <div class="head1">${uiLabelMap.ProductShipmentPlan}</div> + <h1>${uiLabelMap.ProductShipmentPlan}</h1> ${findOrderItemsForm.renderFormString(context)} <br/> <#if addToShipmentPlanRows?has_content> @@ -39,8 +39,8 @@ document.forms.addToShipmentPlan.submit(); } </script> -<form><input type="submit" class="smallSubmit" onClick="submitRows('${rowCount?if_exists}');return false;" name="submitButton" value="${uiLabelMap.CommonAdd}"/></form> - <hr class="sepbar"/> +<form><input type="submit" onClick="submitRows('${rowCount?if_exists}');return false;" name="submitButton" value="${uiLabelMap.CommonAdd}"/></form> + <hr/> <br/> </#if> ${listShipmentPlanForm.renderFormString(context)} 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?view=diff&rev=560814&r1=560813&r2=560814 ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl Sun Jul 29 13:52:05 2007 @@ -27,7 +27,7 @@ </#if> <div class="screenlet"> - <div class="head1">${uiLabelMap.ProductPackOrder}<span class='head2'> in ${facility.facilityName?if_exists} [<a href="<@ofbizUrl>/EditFacility?facilityId=${facilityId?if_exists}</@ofbizUrl>" class="buttontext">${facilityId?if_exists}</a>]</div> + <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} @@ -47,22 +47,22 @@ </div> </#if> </#if> - <div> </div> + <br/> <!-- select order form --> - <form name="selectOrderForm" method="post" action="<@ofbizUrl>PackOrder</@ofbizUrl>" style='margin: 0;'> + <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" class="inputBox" name="orderId" size="20" maxlength="20" value="${orderId?if_exists}"/> - <span class="tabletext">/</span> - <input type="text" class="inputBox" name="shipGroupSeqId" size="6" maxlength="6" value="${shipGroupSeqId?default("00001")}"/> + <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><div class="tabletext">${uiLabelMap.ProductHideGrid}: <input type="checkbox" name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if>></div></td> - <td><div class='tabletext'> </div></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> @@ -83,10 +83,10 @@ <td width="25%" align='right'><div class="tabletext">${uiLabelMap.FormFieldTitle_picklistBinId} #</div></td> <td width="1"> </td> <td width="25%"> - <input type="text" class="inputBox" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId?if_exists}"/> + <input type="text" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId?if_exists}"/> </td> - <td><div class="tabletext">${uiLabelMap.ProductHideGrid}: <input type="checkbox" name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if>></div></td> - <td><div class='tabletext'> </div></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> @@ -98,79 +98,75 @@ </table> </form> - <form name="clearPackForm" method="post" action="<@ofbizUrl>ClearPackAll</@ofbizUrl>" style='margin: 0;'> + <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>" style='margin: 0;'> + <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 class="sepbar"/> + <hr/> <div class='head2'>${uiLabelMap.ProductOrderId} #<a href="/ordermgr/control/orderview?orderId=${orderId}" class="buttontext">${orderId}</a> / ${uiLabelMap.ProductOrderShipGroupId} #${shipGroupSeqId}</div> - <div> </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"> - <div class="tableheadtext">${uiLabelMap.ProductShipToAddress}:</div> - <div class="tabletext"> - <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} - </div> + <${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> </td> <td valign="top"> - <div class="tableheadtext">${uiLabelMap.ProductCarrierShipmentMethod}:</div> - <div class="tabletext"> - <#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("??")} - </div> - <div> </div> - <div class="tableheadtext">${uiLabelMap.ProductEstimatedShipCostForShipGroup}:</div> + ${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> - <div class="tabletext"><@ofbizCurrency amount=shipmentCostEstimateForShipGroup isoCode=orderReadHelper.getCurrency()?if_exists/></div> + <@ofbizCurrency amount=shipmentCostEstimateForShipGroup isoCode=orderReadHelper.getCurrency()?if_exists/><br/> </#if> </td> - <td> </td> + <td> </td> <td valign="top"> - <div class="tableheadtext">${uiLabelMap.OrderShipping} ${uiLabelMap.ProductInstruction}:</div> - <div class="tabletext">${orderItemShipGroup.shippingInstructions?default("(none)")}</div> + ${uiLabelMap.OrderShipping} ${uiLabelMap.ProductInstruction}:<br/> + ${orderItemShipGroup.shippingInstructions?default("(none)")} </td> </tr> </table> - <div> </div> + <br/> </#if> <!-- manual per item form --> <#if showInput != "N"> - <hr class="sepbar"/> - <div> </div> - <form name="singlePackForm" method="post" action="<@ofbizUrl>ProcessPackOrder</@ofbizUrl>" style='margin: 0;'> + <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}"/> @@ -181,16 +177,14 @@ <td><div class="tabletext">${uiLabelMap.ProductProduct} #</div></td> <td width="1"> </td> <td> - <input type="text" class="inputBox" name="productId" size="20" maxlength="20" value=""/> - <span class="tabletext">@</span> - <input type="text" class="inputBox" name="quantity" size="6" maxlength="6" value="1"/> + <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"> - <div class="tabletext"> ${uiLabelMap.CommonCurrent} ${uiLabelMap.ProductPackage} ${uiLabelMap.CommonSequence}: <b>${packingSession.getCurrentPackageSeq()}</b> <input type="button" value="${uiLabelMap.CommonNext} ${uiLabelMap.ProductPackage}" onclick="javascript:document.incPkgSeq.submit();"> - </div> </td> </tr> <tr> @@ -203,39 +197,34 @@ </tr> </table> </form> - <div> </div> + <br/> </#if> <!-- auto grid form --> <#assign itemInfos = packingSession.getItemInfos()?if_exists> <#if showInput != "N" && hideGrid != "Y" && itemInfos?has_content> - <hr class="sepbar"/> - <div> </div> - <form name="multiPackForm" method="post" action="<@ofbizUrl>ProcessBulkPackOrder</@ofbizUrl>" style='margin: 0;'> + <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 border='0' width="100%" cellpadding='2' cellspacing='0'> - <tr> + <table class="basic-table" cellspacing='0'> + <tr class="header-row"> <td> </td> - <td><div class="tableheadtext">${uiLabelMap.ProductItem} #</td> - <td><div class="tableheadtext">${uiLabelMap.ProductProductId}</td> - <td><div class="tableheadtext">${uiLabelMap.ProductDescription}</td> - <td align="right"><div class="tableheadtext">${uiLabelMap.ProductOrderedQuantity}</td> - <td align="right"><div class="tableheadtext">${uiLabelMap.ProductQuantityShipped}</td> - <td align="right"><div class="tableheadtext">${uiLabelMap.ProductPackedQty}</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"><div class="tableheadtext">${uiLabelMap.ProductPackQty}</td> - <#--td align="center"><div class="tableheadtext">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval})</td--> - <td align="center"><div class="tableheadtext">${uiLabelMap.ProductPackage}</td> - </tr> - <tr> - <td colspan="10"> - <hr class="sepbar"/> - </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)> @@ -258,32 +247,28 @@ <#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><div class="tabletext">${orderItem.orderItemSeqId}</td> + <td>${orderItem.orderItemSeqId}</td> <td> - <div class="tabletext"> ${orderProduct.productId?default("N/A")} <#if orderProduct.productId != product.productId> ${product.productId?default("N/A")} </#if> - </div> </td> <td> - <div class="tabletext"> <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> - </div> </td> - <td align="right"><div class="tabletext">${orderItemQuantity}</td> - <td align="right"><div class="tabletext">${shippedQuantity?default(0)}</td> - <td align="right"><div class="tabletext">${packingSession.getPackedQuantity(orderId, orderItem.orderItemSeqId, shipGroupSeqId, itemInfo.productId)}</td> - <td> </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" class="inputBox" size="7" name="qty_${rowKey}" value="${inputQty}"> + <input type="text" size="7" name="qty_${rowKey}" value="${inputQty}"> </td> <#--td align="center"> - <input type="text" class="inputBox" size="7" name="wgt_${rowKey}" value=""> + <input type="text" size="7" name="wgt_${rowKey}" value=""> </td--> <td align="center"> <select name="pkg_${rowKey}"> @@ -310,12 +295,12 @@ </tr> </table> </form> - <div> </div> + <br/> </#if> <!-- complete form --> <#if showInput != "N"> - <form name="completePackForm" method="post" action="<@ofbizUrl>CompletePack</@ofbizUrl>" style='margin: 0;'> + <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}"/> @@ -323,16 +308,15 @@ <input type="hidden" name="weightUomId" value="${defaultWeightUomId}"/> <input type="hidden" name="showInput" value="N"/> <hr class="sepbar"> - <div> </div> + <br/> <table border='0' cellpadding='2' cellspacing='0' width="100%"> <tr> <#assign packageSeqIds = packingSession.getPackageSeqIds()/> <#if packageSeqIds?has_content> <td> - <div class="tableheadtext">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}):</div> - <div> + ${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}):<br/> <#list packageSeqIds as packageSeqId> - ${uiLabelMap.ProductPackage} ${packageSeqId} <input type="text" class="inputBox" size="7" name="packageWeight_${packageSeqId}" value="${packingSession.getPackageWeight(packageSeqId?int)?if_exists}"><br/> + ${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}"/> @@ -341,26 +325,19 @@ <input type="hidden" name="carrierRoleTypeId" value="${orderItemShipGroup.carrierRoleTypeId?if_exists}"/> <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/> </#if> - </div> </td> </#if> <td nowrap="nowrap"> - <div class="tableheadtext">${uiLabelMap.ProductAdditionalShippingCharge}:</div> - <div> - <input type="text" class="inputBox" name="additionalShippingCharge" value="${packingSession.getAdditionalShippingCharge()?if_exists}" size="20"/> - </div> + ${uiLabelMap.ProductAdditionalShippingCharge}:<br/> + <input type="text" name="additionalShippingCharge" value="${packingSession.getAdditionalShippingCharge()?if_exists}" size="20"/> <#if packageSeqIds?has_content> - <div> - <a href="javascript:document.completePackForm.action='<@ofbizUrl>calcPackSessionAdditionalShippingCharge</@ofbizUrl>';document.completePackForm.submit();" class="buttontext">${uiLabelMap.ProductEstimateShipCost}</a> - </div> - <div> </div> + <a href="javascript:document.completePackForm.action='<@ofbizUrl>calcPackSessionAdditionalShippingCharge</@ofbizUrl>';document.completePackForm.submit();" class="buttontext">${uiLabelMap.ProductEstimateShipCost}</a> + <br/> </#if> </td> <td> - <div class="tableheadtext">${uiLabelMap.ProductHandlingInstructions}:</div> - <div> - <textarea name="handlingInstructions" class="inputBox" rows="2" cols="30">${packingSession.getHandlingInstructions()?if_exists}</textarea> - </div> + ${uiLabelMap.ProductHandlingInstructions}:<br/v> + <textarea name="handlingInstructions" rows="2" cols="30">${packingSession.getHandlingInstructions()?if_exists}</textarea> </td> <td align="right"> <div> @@ -373,45 +350,38 @@ </td> </tr> </table> - <div> </div> + <br/> </form> </#if> <!-- packed items display --> <#assign packedLines = packingSession.getLines()?if_exists> <#if packedLines?has_content> - <hr class="sepbar"/> - <div> </div> - <table border='0' width="100%" cellpadding='2' cellspacing='0'> - <tr> - <td><div class="tableheadtext">${uiLabelMap.ProductItem} #</td> - <td><div class="tableheadtext">${uiLabelMap.ProductProductId}</td> - <td><div class="tableheadtext">${uiLabelMap.ProductDescription}</td> - <td><div class="tableheadtext">${uiLabelMap.ProductInventoryItem} #</td> - <td align="right"><div class="tableheadtext">${uiLabelMap.ProductPackedQty}</td> + <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"><div class="tableheadtext">${uiLabelMap.ProductPackage} #</td> + <td align="right">${uiLabelMap.ProductPackage} #</td> <td> </td> </tr> - <tr> - <td colspan="7"> - <hr class="sepbar"/> - </td> - </tr> <#list packedLines as line> <#assign product = Static["org.ofbiz.product.product.ProductWorker"].findProduct(delegator, line.getProductId())/> <tr> - <td><div class="tabletext">${line.getOrderItemSeqId()}</td> - <td><div class="tabletext">${line.getProductId()?default("N/A")}</td> + <td>${line.getOrderItemSeqId()}</td> + <td>${line.getProductId()?default("N/A")}</td> <td> - <div class="tabletext"> - <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${externalKeyParam}" class="linktext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a> - </div> + <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><div class="tabletext">${line.getInventoryItemId()}</td> - <td align="right"><div class="tabletext">${line.getQuantity()}</td> + <td>${line.getInventoryItemId()}</td> + <td align="right">${line.getQuantity()}</td> <#--td align="right"><div class="tabletext">${line.getWeight()}</td--> - <td align="right"><div class="tabletext">${line.getPackageSeq()}</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> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl?view=diff&rev=560814&r1=560813&r2=560814 ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl Sun Jul 29 13:52:05 2007 @@ -24,12 +24,13 @@ </script> <#if security.hasEntityPermission("FACILITY", "_VIEW", session)> - <div class="head1">${uiLabelMap.ProductQuickShipOrderFrom}<span class='head2'>${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span></div> - <a href="<@ofbizUrl>quickShipOrder?facilityId=${facilityId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductNextShipment}]</a> - <#if shipment?has_content> - <a href="<@ofbizUrl>EditShipment?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductEditShipment}]</a> - </#if> - <br/><br/> + <span class="head1">${uiLabelMap.ProductQuickShipOrderFrom}</span><span class='head2'>${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span> + <div class="button-bar"> + <a href="<@ofbizUrl>quickShipOrder?facilityId=${facilityId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNextShipment}</a> + <#if shipment?has_content> + <a href="<@ofbizUrl>EditShipment?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductEditShipment}</a> + </#if> + </div> <#if shipment?exists> <#if 1 < shipmentPackages.size()> @@ -45,7 +46,7 @@ <#-- multiple routes --> <div class="tabletext"><font color="red">${uiLabelMap.ProductMoreRouteSegmentFound}.</font></div> <#elseif !requestParameters.shipmentRouteSegmentId?exists || requestAttributes._ERROR_MESSAGE_?exists> - <form name="routeForm" method="post" action="<@ofbizUrl>setQuickRouteInfo</@ofbizUrl>" style='margin: 0;'> + <form name="routeForm" method="post" action="<@ofbizUrl>setQuickRouteInfo</@ofbizUrl>"> <#assign shipmentRoute = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentRoutes))?if_exists> <#assign carrierPerson = (shipmentRoute.getRelatedOne("CarrierPerson"))?if_exists> <#assign carrierPartyGroup = (shipmentRoute.getRelatedOne("CarrierPartyGroup"))?if_exists> @@ -55,10 +56,10 @@ <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRoute.shipmentRouteSegmentId}"/> <table border="0" cellpadding="2" cellspacing="0"> <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductCarrier}</span></td> - <td><span class="tabletext"> </span></td> + <td width="20%" align="right"><b>${uiLabelMap.ProductCarrier}</b></td> + <td> </td> <td width="1%" align="left" nowrap> - <select name="carrierPartyId" class="selectBox"> + <select name="carrierPartyId"> <#if shipmentRoute.carrierPartyId?has_content> <option value="${shipmentRoute.carrierPartyId}">${(carrierPerson.firstName)?if_exists} ${(carrierPerson.middleName)?if_exists} ${(carrierPerson.lastName)?if_exists} ${(carrierPartyGroup.groupName)?if_exists} [${shipmentRoute.carrierPartyId}]</option> <option value="${shipmentRoute.carrierPartyId}">---</option> @@ -70,16 +71,16 @@ </#list> </select> </td> - <td><span class="tabletext"> </span></td> + <td> </td> <td width="80%"> <a href="javascript:document.routeForm.submit();" class="buttontext">${uiLabelMap.ProductConfirmShipmentUps}</a> </td> </tr> <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductShipMethod}</span></td> - <td><span class="tabletext"> </span></td> + <td width="20%" align="right"><b>${uiLabelMap.ProductShipMethod}</b></td> + <td> </td> <td width="1%" align="left" nowrap> - <select name="shipmentMethodTypeId" class="selectBox"> + <select name="shipmentMethodTypeId"> <#if shipmentMethodType?has_content> <option value="${shipmentMethodType.shipmentMethodTypeId}">${shipmentMethodType.get("description",locale)}</option> <option value="${shipmentMethodType.shipmentMethodTypeId}">---</option> @@ -91,18 +92,18 @@ </#list> </select> </td> - <td><span class="tabletext"> </span></td> + <td> </td> <td width="80%"> - <a href="<@ofbizUrl>quickShipOrder?facilityId=${facilityId}&shipmentId=${shipmentId}&reweigh=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReWeighPackage}</a> + <a href="<@ofbizUrl>quickShipOrder?facilityId=${facilityId}&shipmentId=${shipmentId}&reweigh=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReWeighPackage}</a> </td> </tr> <tr> - <td width="20%" align="right"><span class="tableheadtext"> </span></td> - <td><span class="tabletext"> </span></td> + <td width="20%" align="right"> </td> + <td> </td> <td width="1%" align="left" nowrap> </td> - <td><span class="tabletext"> </span></td> + <td> </td> <td width="80%"> <input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onClick="javascript:document.routeForm.submit();"> </td> @@ -110,9 +111,7 @@ </table> </form> <script language="JavaScript" type="text/javascript"> - <!-- // document.routeForm.carrierPartyId.focus(); - // --> </script> <#else> <#-- display the links for label/packing slip --> @@ -123,17 +122,17 @@ </center> </#if> <#else> - <form name="weightForm" method="post" action="<@ofbizUrl>setQuickPackageWeight</@ofbizUrl>" style='margin: 0;'> + <form name="weightForm" method="post" action="<@ofbizUrl>setQuickPackageWeight</@ofbizUrl>"> <#assign weightUom = shipmentPackage.getRelatedOne("WeightUom")?if_exists> <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> <input type="hidden" name="shipmentId" value="${shipmentPackage.shipmentId}"/> <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackage.shipmentPackageSeqId}"/> <table border="0" cellpadding="2" cellspacing="0"> <tr> - <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductPackage} ${shipmentPackage.shipmentPackageSeqId} ${uiLabelMap.ProductWeight}</span></td> - <td><span class="tabletext"> </span></td> + <td width="20%" align="right"><b>${uiLabelMap.ProductPackage} ${shipmentPackage.shipmentPackageSeqId} ${uiLabelMap.ProductWeight}</b></td> + <td> </td> <td width="80%" align="left"> - <input type="text" class="inputBox" name="weight"> + <input type="text" name="weight"> <select name="weightUomId" class="selectBox"> <#if weightUom?has_content> <option value="${weightUom.uomId}">${weightUom.get("description",locale)}</option> @@ -155,9 +154,7 @@ </table> </form> <script language="JavaScript" type="text/javascript"> - <!-- // document.weightForm.weight.focus(); - // --> </script> <#-- todo embed the applet <applet code="ShipmentScaleApplet.class" codebase="/images/" name="Package Weight Reader" width="0" height="0" MAYSCRIPT> @@ -167,9 +164,9 @@ --> </#if> <#else> - <div class="tabletext"><font color="red">${uiLabelMap.ProductErrorNoPackagesFoundForShipment} !</font></div> + <div class="alert">${uiLabelMap.ProductErrorNoPackagesFoundForShipment} !</div> </#if> - <hr class="sepbar"> + <hr/> ${pages.get("/shipment/ViewShipmentInfo.ftl")} <br/>${pages.get("/shipment/ViewShipmentItemInfo.ftl")} <br/>${pages.get("/shipment/ViewShipmentPackageInfo.ftl")} @@ -178,18 +175,18 @@ </#if> </#if> <#else> - <form name="selectOrderForm" method="post" action="<@ofbizUrl>createQuickShipment</@ofbizUrl>" style='margin: 0;'> + <form name="selectOrderForm" method="post" action="<@ofbizUrl>createQuickShipment</@ofbizUrl>"> <input type="hidden" name="facilityId" value="${facilityId?if_exists}"> <input type="hidden" name="originFacilityId" value="${facilityId?if_exists}"> <input type="hidden" name="setPackedOnly" value="Y"> <table border='0' cellpadding='2' cellspacing='0'> <tr> - <td width="25%" align='right'><div class="tabletext">${uiLabelMap.ProductOrderNumber}</div></td> + <td width="25%" align='right'>${uiLabelMap.ProductOrderNumber}</td> <td width="1"> </td> <td width="25%"> - <input type="text" class="inputBox" name="orderId" size="20" maxlength="20" value="${requestParameters.orderId?if_exists}"> + <input type="text" name="orderId" size="20" maxlength="20" value="${requestParameters.orderId?if_exists}"> </td> - <td><div class='tabletext'> </div></td> + <td> </td> </tr> <tr> <td colspan="2"> </td> Modified: ofbiz/trunk/applications/product/widget/facility/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/Menus.xml?view=diff&rev=560814&r1=560813&r2=560814 ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/Menus.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/Menus.xml Sun Jul 29 13:52:05 2007 @@ -21,7 +21,8 @@ <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> - <menu name="FacilityTabBar" default-menu-item-name="EditFacility"> + <menu name="FacilityTabBar" default-menu-item-name="EditFacility" default-selected-style="selected" + menu-container-style="button-bar tab-bar">> <menu-item name="EditFacility" title="${uiLabelMap.ProductFacility}"> <link target="EditFacility?facilityId=${facilityId}"/> </menu-item> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |