svn commit: r609235 [1/4] - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: mrisaliti
Date: Sat Jan 5 15:17:57 2008 New Revision: 609235 URL: http://svn.apache.org/viewvc?rev=609235&view=rev Log: Shipment forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1556) Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml ofbiz/trunk/applications/product/webapp/facility/facility/FacilityScheduleTabBar.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Sat Jan 5 15:17:57 2008 @@ -86,6 +86,7 @@ PageTitleAddProductSubscriptionResources=Add Product Subscription Resources PageTitleAddProductSupplier=Add Product Supplier PageTitleAddProductWorkEffort=Add Product Work Effort +PageTitleAddShipmentRouteSegment=Add Shipment Route Segment PageTitleAddSubscriptionAttributes=Add Subscription Attributes PageTitleAddSubscriptionCommEvent=Add Subscription Comm Event PageTitleAddSubscriptionResourceProducts=Add Subscription Resource Products @@ -249,6 +250,9 @@ PageTitleViewProductAgreements=View Product Agreements PageTitleViewProductManufacturing=View Product Manufacturing PageTitleViewShipment=View Shipment +PageTitleViewShipmentItemInfo=View Shipment Item Info +PageTitleViewShipmentPackageInfo=View Shipment Package Info +PageTitleViewShipmentRouteInfo=View Shipment Route Info PartyAddPurpose=Add Purpose PartyAddressLine1=Address Line 1 PartyAddressLine2=Address Line 2 @@ -854,6 +858,7 @@ ProductMaxWeight=Max Weight ProductMaxWt=Max Wt ProductMediumImage=Medium Image +ProductMessageQoh=By default, only movements affecting the qoh are shown; remove the 0 here to get also the movements related to reservations. ProductMeters=Meters ProductMethod=Method ProductMethodType=Method Type @@ -1334,6 +1339,8 @@ ProductShipmentNotFoundId=The Shipment was not found with ID ProductShipmentPackageNotFound=shipmentPackageSeqId [${shipmentPackageSeqId}] was not found in shipment with ID [${shipmentId}] ProductShipmentPlan=Shipment Plan +ProductShipmentPlanAdd=Add To Shipment Plan +ProductShipmentPlanList=List for Shipment Plan ProductShipmentPlanToOrderItems=Shipment Plan --> Order Items ProductShipmentReceiptsFor=Shipment Receipts for ProductShipmentQuickComplete=Quick Complete Drop Shipment @@ -2015,4 +2022,7 @@ FormFieldTitle_quantityRejected=Quantity Rejected FormFieldTitle_inventoryItemLabelId=Inventory Item Label Id FormFieldTitle_inventoryItemLabelTypeId=Inventory Item Label Type Id -FormFieldTitle_parentTypeId=Parent Type Id \ No newline at end of file +FormFieldTitle_parentTypeId=Parent Type Id +FormFieldTitle_reportType=Report Type +FormFieldTitle_availableToPromiseTotal=Available To Promise Total +FormFieldTitle_addtlShippingChargeDesc=Addtl Shipping Charge Desc \ No newline at end of file Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Sat Jan 5 15:17:57 2008 @@ -84,6 +84,7 @@ PageTitleAddProductSubscriptionResources=Aggiungi Risorse Abbonamento Prodotto PageTitleAddProductSupplier=Aggiungi Prodotto del Fornitore PageTitleAddProductWorkEffort=Aggiungi Impegno di Lavoro Prodotto +PageTitleAddShipmentRouteSegment=Aggiungi Segmento Percorso Spedizione PageTitleAddSubscriptionAttributes=Aggiungi Attributi Abbonamento PageTitleAddSubscriptionCommEvent=Aggiungi Evento Comunicazioni Abbonamento PageTitleAddSubscriptionResourceProducts=Aggiungi Risorse Prodotti Abbonamento @@ -247,6 +248,9 @@ PageTitleViewProductAgreements=Mostra Accordi Prodotto PageTitleViewProductManufacturing=Mostra Produzione Prodotti PageTitleViewShipment=Mostra Spedizione +PageTitleViewShipmentItemInfo=Mostra Righe Spedizione +PageTitleViewShipmentPackageInfo=Mostra Pacchi Spedizione +PageTitleViewShipmentRouteInfo=Mostra Percorso Spedizione PartyAddPurpose=Aggiungi Funzione PartyAddressLine1=Riga Indirizzo 1 PartyAddressLine2=Riga Indirizzo 2 @@ -340,7 +344,7 @@ ProductAddFeatureToResults=Aggiungi Caratteristica ai Risultati ProductAddToCategory=Aggiungi alla Categoria ProductAddToPackage=Aggiungi al Pacchetto -ProductAdditionalShippingCharge=Ricarico Spedizione Aggiuntivo +ProductAdditionalShippingCharge=Ricarico Aggiuntivo Spedizione ProductAddresses=Indirizzi ProductAdvancedSearch=Ricerca Avanzata ProductAdvancedSearchIn=Ricerca Avanzata in @@ -412,12 +416,12 @@ ProductBrowseCategories=Mostra Categorie ProductBulkItem=Riga Bulk ProductByDate=Per Data -ProductByInventoryItem=Per Inventory Item +ProductByInventoryItem=Per Riga Inventario ProductByProduct=Per Prodotto ProductCarrier=Corriere ProductCarrierServiceCode=Codice Servizio Corriere -ProductCarrierShipmentMethod=Metodo di Spedizione Corriere -ProductCarrierShipmentMethods=Metodi di Spedizione Corrieri +ProductCarrierShipmentMethod=Corriere Metodo di Spedizione +ProductCarrierShipmentMethods=Corriere Metodi di Spedizione ProductCarrierStatus=Stato Corriere ProductCatalog=Catalogo ProductCatalogAdministrationMainPage=Pagina Principale Amministrazione Cataloghi @@ -844,6 +848,7 @@ ProductMaxWeight=Max Peso ProductMaxWt=Peso Massimo ProductMediumImage=Immagine Media +ProductMessageQoh=Di default, solo i movimenti che corrispondono alla quantit\u00e0 disponibile saranno visualizzati; rimuovendo lo 0 qui otterrai anche i movimenti relativi alle riservazioni. ProductMeters=Contatori ProductMethod=Metodo ProductMethodType=Tipo Metodo @@ -1320,11 +1325,14 @@ ProductShipmentNotFoundId=La Spedizione non \u00e8 stata trovata con Codice ProductShipmentPackageNotFound=Pacco spedizione [${shipmentPackageSeqId}] non trovato per la spedizione [${shipmentId}] ProductShipmentPlan=Piano di Spedizione +ProductShipmentPlanAdd=Aggiungi al Piano di Spedizione +ProductShipmentPlanList=Lista del Piano di Spedizione ProductShipmentPlanToOrderItems=Piano di Spedizione --> Righe Ordine ProductShipmentReceiptsFor=Ricevute di Spedizione per ProductShipmentQuickComplete=Quick Complete Drop Shipment ProductShipmentThirdPartyAccountNumber=Numero Conto Soggetto Terzo -ProductShipmentThirdPartyAddress=Conto Indirizzo Soggetto Terzo +ProductShipmentThirdPartyPostalCode=C.A.P. Soggetto Terzo +ProductShipmentThirdPartyCountryCode=Paese Soggetto Terzo ProductShipmentTotalWeight=Totale Peso ProductShipmentTotalVolume=Totale Volume ProductShipmentType=Tipo Spedizione @@ -1994,4 +2002,7 @@ FormFieldTitle_quantityRejected=Quantit\u00e0 Rifiutata FormFieldTitle_inventoryItemLabelId=Codice Etichetta Riga Inventario FormFieldTitle_inventoryItemLabelTypeId=Tipo Etichetta Riga -FormFieldTitle_parentTypeId=Tipo Padre \ No newline at end of file +FormFieldTitle_parentTypeId=Tipo Padre +FormFieldTitle_reportType=Tipo Report +FormFieldTitle_availableToPromiseTotal=Totale Disponibilit\u00e0 Promessa +FormFieldTitle_addtlShippingChargeDesc=Descrizione Ricarico Aggiuntivo Spedizione \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Sat Jan 5 15:17:57 2008 @@ -152,7 +152,7 @@ </field> <!-- the content of the softIdentifier field is converted from hex to int if it starts with "0x"; this is a nice example of using JavaScript in a form widget definition --> - <field name="quantityOnHandDiff" tooltip="By default, only movements affecting the qoh are shown; remove the 0 here to get also the movements related to reservations."><text-find default-value="0" default-option="notEqual" ignore-case="false"/></field> + <field name="quantityOnHandDiff" tooltip="${uiLabelMap.ProductMessageQoh}"><text-find default-value="0" default-option="notEqual" ignore-case="false"/></field> <field name="reportType"> <drop-down allow-empty="false"> <option key="BY_ITEM" description="${uiLabelMap.ProductByInventoryItem}"/> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FacilityScheduleTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityScheduleTabBar.ftl?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityScheduleTabBar.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityScheduleTabBar.ftl Sat Jan 5 15:17:57 2008 @@ -16,12 +16,15 @@ specific language governing permissions and limitations under the License. --> -<#assign unselectedClassName = "buttontext"> -<#assign selectedClassMap = {page.scheduleTabButtonItem?default("void") : "buttontext"}> +<#assign selected = scheduleTabButtonItem?default("void")> <#if facilityId?has_content> - <div class='tabContainer'> - <a href="<@ofbizUrl>ScheduleShipmentRouteSegment?facilityId=${facilityId}</@ofbizUrl>" class="${selectedClassMap.ScheduleTabButton?default(unselectedClassName)}">${uiLabelMap.ProductSchedule}</a> - <a href="<@ofbizUrl>Labels?facilityId=${facilityId}</@ofbizUrl>" class="${selectedClassMap.LabelsTabButton?default(unselectedClassName)}">${uiLabelMap.ProductLabels}</a> - </div> -</#if> + <br/> + <div class="button-bar tab-bar"> + <ul> + <li<#if selected="ScheduleTabButton"> class="selected"</#if>><a href="<@ofbizUrl>ScheduleShipmentRouteSegment?facilityId=${facilityId}</@ofbizUrl>">${uiLabelMap.ProductSchedule}</a></li> + <li<#if selected="LabelsTabButton"> class="selected"</#if>><a href="<@ofbizUrl>Labels?facilityId=${facilityId}</@ofbizUrl>">${uiLabelMap.ProductLabels}</a></li> + </ul> + <br/> + </div> +</#if> \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl Sat Jan 5 15:17:57 2008 @@ -17,196 +17,231 @@ under the License. --> <#if shipment?exists> - -<form name="additemsfromorder" action="<@ofbizUrl>AddItemsFromOrder</@ofbizUrl>"> - <input type="hidden" name="shipmentId" value="${shipmentId}"/> - <div class="tabletext"> - ${uiLabelMap.ProductOrderId} : <input type="text" class='inputBox' size="20" name="orderId" value="${orderId?if_exists}"/> - <span class='tabletext'> - <a href="javascript:call_fieldlookup2(document.additemsfromorder.orderId,'LookupOrderHeaderAndShipInfo');"> - <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'> - </a> - </span> - ${uiLabelMap.ProductOrderShipGroupId} : <input type="text" class='inputBox' size="20" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> - <input type="submit" value="${uiLabelMap.CommonSelect}" class="smallSubmit"/> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.PageTitleAddItemsFromOrder}</li> + </ul> + <br class="clear"/> </div> -</form> - -<h2>${uiLabelMap.ProductAddItemsShipment}: [${shipmentId?if_exists}]; ${uiLabelMap.OrderFromOrder}: [${orderId?if_exists}], ${uiLabelMap.OrderShipGroup}: [${shipGroupSeqId?if_exists}]</h2> -<#if orderId?has_content && !orderHeader?exists> - <h3 style="color: red;"><#assign uiLabelWithVar=uiLabelMap.ProductErrorOrderIdNotFound?interpret><@uiLabelWithVar/>.</h3> -</#if> -<#if orderHeader?exists> - <#if orderHeader.orderTypeId == "SALES_ORDER" && shipment.shipmentTypeId?if_exists != "SALES_SHIPMENT"> - <h3 style="color: red;">${uiLabelMap.ProductWarningOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId?if_exists)}, ${uiLabelMap.ProductNotSalesShipment}.</h3> - <#elseif orderHeader.orderTypeId == "PURCHASE_ORDER" && shipment.shipmentTypeId?if_exists != "PURCHASE_SHIPMENT" && shipment.shipmentTypeId?if_exists != "DROP_SHIPMENT"> - <h3 style="color: red;">${uiLabelMap.ProductWarningOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId?if_exists)}, ${uiLabelMap.ProductNotPurchaseShipment}.</h3> - <#else> - <h3>${uiLabelMap.ProductNoteOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId?if_exists)}.</h3> - <h3>${uiLabelMap.ProductShipmentType}: ${shipment.shipmentTypeId?if_exists}.</h3> - </#if> - <#if shipment.shipmentTypeId?if_exists == "SALES_SHIPMENT"> - <h3>${uiLabelMap.ProductOriginFacilityIs}: <#if originFacility?exists>${originFacility.facilityName?if_exists} [${originFacility.facilityId}]<#else><span style="color: red;">${uiLabelMap.ProductNotSet}</span></#if></h3> - <#elseif shipment.shipmentTypeId?if_exists == "PURCHASE_SHIPMENT"> - <h3>${uiLabelMap.ProductDestinationFacilityIs}: <#if destinationFacility?exists>${destinationFacility.facilityName?if_exists} [${destinationFacility.facilityId}]<#else><span style="color: red;">${uiLabelMap.ProductNotSet}</span></#if></h3> - </#if> - <#if "ORDER_APPROVED" == orderHeader.statusId || "ORDER_BACKORDERED" == orderHeader.statusId> - <h3>${uiLabelMap.ProductNoteOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId?if_exists)}.</h3> - <#elseif "ORDER_COMPLETED" == orderHeader.statusId> - <h3>${uiLabelMap.ProductNoteOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId?if_exists)}, ${uiLabelMap.ProductNoItemsLeft}.</h3> - <#else> - <h3 style="color: red;">${uiLabelMap.ProductWarningOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId?if_exists)}; ${uiLabelMap.ProductApprovedBeforeShipping}.</h3> + <div class="screenlet-body"> + <form name="additemsfromorder" action="<@ofbizUrl>AddItemsFromOrder</@ofbizUrl>"> + <input type="hidden" name="shipmentId" value="${shipmentId}"/> + <div class="tabletext"> + <span class="label">${uiLabelMap.ProductOrderId}</span> + <input type="text" size="20" name="orderId" value="${orderId?if_exists}"/> + <span> + <a href="javascript:call_fieldlookup2(document.additemsfromorder.orderId,'LookupOrderHeaderAndShipInfo');"> + <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'> + </a> + </span> + <span class="label">${uiLabelMap.ProductOrderShipGroupId}</span> + <input type="text" size="20" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> + <input type="submit" value="${uiLabelMap.CommonSelect}" class="smallSubmit"/> + </div> + </form> + </div> +</div> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ProductAddItemsShipment}: [${shipmentId?if_exists}]; ${uiLabelMap.OrderFromOrder}: [${orderId?if_exists}], ${uiLabelMap.OrderShipGroup}: [${shipGroupSeqId?if_exists}]</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <#if orderId?has_content && !orderHeader?exists> + <h3 style="color: red;"><#assign uiLabelWithVar=uiLabelMap.ProductErrorOrderIdNotFound?interpret><@uiLabelWithVar/>.</h3> </#if> -</#if> -<#if orderItemDatas?exists> - <#assign rowCount = 0> - <#if isSalesOrder> - <form action="<@ofbizUrl>issueOrderItemShipGrpInvResToShipment</@ofbizUrl>" method="post" name="selectAllForm"> - <#else> - <form action="<@ofbizUrl>issueOrderItemToShipment</@ofbizUrl>" method="post" name="selectAllForm"> + <#if orderHeader?exists> + <#if orderHeader.orderTypeId == "SALES_ORDER" && shipment.shipmentTypeId?if_exists != "SALES_SHIPMENT"> + <h3 style="color: red;">${uiLabelMap.ProductWarningOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId?if_exists)}, ${uiLabelMap.ProductNotSalesShipment}.</h3> + <#elseif orderHeader.orderTypeId == "PURCHASE_ORDER" && shipment.shipmentTypeId?if_exists != "PURCHASE_SHIPMENT" && shipment.shipmentTypeId?if_exists != "DROP_SHIPMENT"> + <h3 style="color: red;">${uiLabelMap.ProductWarningOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId?if_exists)}, ${uiLabelMap.ProductNotPurchaseShipment}.</h3> + <#else> + <h3>${uiLabelMap.ProductNoteOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId?if_exists)}.</h3> + <h3>${uiLabelMap.ProductShipmentType}: ${shipment.shipmentTypeId?if_exists}.</h3> + </#if> + <#if shipment.shipmentTypeId?if_exists == "SALES_SHIPMENT"> + <h3>${uiLabelMap.ProductOriginFacilityIs}: <#if originFacility?exists>${originFacility.facilityName?if_exists} [${originFacility.facilityId}]<#else><span style="color: red;">${uiLabelMap.ProductNotSet}</span></#if></h3> + <#elseif shipment.shipmentTypeId?if_exists == "PURCHASE_SHIPMENT"> + <h3>${uiLabelMap.ProductDestinationFacilityIs}: <#if destinationFacility?exists>${destinationFacility.facilityName?if_exists} [${destinationFacility.facilityId}]<#else><span style="color: red;">${uiLabelMap.ProductNotSet}</span></#if></h3> + </#if> + <#if "ORDER_APPROVED" == orderHeader.statusId || "ORDER_BACKORDERED" == orderHeader.statusId> + <h3>${uiLabelMap.ProductNoteOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId?if_exists)}.</h3> + <#elseif "ORDER_COMPLETED" == orderHeader.statusId> + <h3>${uiLabelMap.ProductNoteOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId?if_exists)}, ${uiLabelMap.ProductNoItemsLeft}.</h3> + <#else> + <h3 style="color: red;">${uiLabelMap.ProductWarningOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId?if_exists)}; ${uiLabelMap.ProductApprovedBeforeShipping}.</h3> + </#if> </#if> - <input type="hidden" name="shipmentId" value="${shipmentId}"> - <input type="hidden" name="_useRowSubmit" value="Y"> - <table width="100%" cellpadding="2" cellspacing="0" border="1"> - <tr> - <td><div class="tableheadtext">${uiLabelMap.ProductOrderId}/${uiLabelMap.ProductOrderShipGroupId}/${uiLabelMap.ProductOrderItem}</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductProduct}</div></td> - <#if isSalesOrder> - <td><div class="tableheadtext">${uiLabelMap.ProductItemsIssuedReserved}</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductIssuedReservedTotalOrdered}</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductReserved}</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductNotAvailable}</div></td> - <#else> - <td><div class="tableheadtext">${uiLabelMap.ProductItemsIssued}</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductIssedOrdered}</div></td> - </#if> - <td><div class="tableheadtext">${uiLabelMap.ProductIssue}</div></td> - <td align="right"> - <div class="tableheadtext">${uiLabelMap.CommonSubmit} ?</div> - <div class="tableheadtext">${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');"></div> - </td> - </tr> - <#list orderItemDatas?if_exists as orderItemData> - <#assign orderItemAndShipGroupAssoc = orderItemData.orderItemAndShipGroupAssoc> - <#assign product = orderItemData.product?if_exists> - <#assign itemIssuances = orderItemData.itemIssuances> - <#assign totalQuantityIssued = orderItemData.totalQuantityIssued> - <#assign orderItemShipGrpInvResDatas = orderItemData.orderItemShipGrpInvResDatas?if_exists> - <#assign totalQuantityReserved = orderItemData.totalQuantityReserved?if_exists> - <#assign totalQuantityIssuedAndReserved = orderItemData.totalQuantityIssuedAndReserved?if_exists> - <tr> - <td><div class="tabletext">${orderItemAndShipGroupAssoc.orderId} / ${orderItemAndShipGroupAssoc.shipGroupSeqId} / ${orderItemAndShipGroupAssoc.orderItemSeqId}</div></td> - <td><div class="tabletext">${(product.internalName)?if_exists} [${orderItemAndShipGroupAssoc.productId?default("N/A")}]</div></td> - <td> - <#if itemIssuances?has_content> - <#list itemIssuances as itemIssuance> - <div class="tabletext"><b>[${itemIssuance.quantity?if_exists}]</b>${itemIssuance.shipmentId?if_exists}:${itemIssuance.shipmentItemSeqId?if_exists} ${uiLabelMap.CommonOn} [${(itemIssuance.issuedDateTime.toString())?if_exists}] ${uiLabelMap.CommonBy} [${(itemIssuance.issuedByUserLoginId)?if_exists}]</div> - </#list> - <#else> - <div class="tabletext"> </div> - </#if> - </td> - <td> - <div class="tabletext"> - <#if isSalesOrder> - <#if (totalQuantityIssuedAndReserved != orderItemAndShipGroupAssoc.quantity)><span style="color: red;"><#else><span></#if> - [${totalQuantityIssued} + ${totalQuantityReserved} = ${totalQuantityIssuedAndReserved}] - <b> - <#if (totalQuantityIssuedAndReserved > orderItemAndShipGroupAssoc.quantity)>><#else><#if (totalQuantityIssuedAndReserved < orderItemAndShipGroupAssoc.quantity)><<#else>=</#if></#if> - ${orderItemAndShipGroupAssoc.quantity} - </b> - </span> - <#else> - <#if (totalQuantityIssued > orderItemAndShipGroupAssoc.quantity)><span style="color: red;"><#else><span></#if> - ${totalQuantityIssued} - <b> - <#if (totalQuantityIssued > orderItemAndShipGroupAssoc.quantity)>><#else><#if (totalQuantityIssued < orderItemAndShipGroupAssoc.quantity)><<#else>=</#if></#if> - ${orderItemAndShipGroupAssoc.quantity} - </b> - </span> - </#if> - </div> - </td> + <br/> + <#if orderItemDatas?exists> + <#assign rowCount = 0> + <#if isSalesOrder> + <form action="<@ofbizUrl>issueOrderItemShipGrpInvResToShipment</@ofbizUrl>" method="post" name="selectAllForm"> + <#else> + <form action="<@ofbizUrl>issueOrderItemToShipment</@ofbizUrl>" method="post" name="selectAllForm"> + </#if> + <input type="hidden" name="shipmentId" value="${shipmentId}"> + <input type="hidden" name="_useRowSubmit" value="Y"> + <table cellspacing="0" cellpadding="2" class="basic-table hover-bar"> + <tr class="header-row"> + <td>${uiLabelMap.ProductOrderId}<br/>${uiLabelMap.ProductOrderShipGroupId}<br/>${uiLabelMap.ProductOrderItem}</td> + <td>${uiLabelMap.ProductProduct}</td> <#if isSalesOrder> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext"> </div></td> + <td>${uiLabelMap.ProductItemsIssuedReserved}</td> + <td>${uiLabelMap.ProductIssuedReservedTotalOrdered}</td> + <td>${uiLabelMap.ProductReserved}</td> + <td>${uiLabelMap.ProductNotAvailable}</td> <#else> - <#assign quantityNotIssued = orderItemAndShipGroupAssoc.quantity - totalQuantityIssued> - <#if (quantityNotIssued > 0)> - <td> - <input type="hidden" name="shipmentId_o_${rowCount}" value="${shipmentId}"/> - <input type="hidden" name="orderId_o_${rowCount}" value="${orderItemAndShipGroupAssoc.orderId}"/> - <input type="hidden" name="shipGroupSeqId_o_${rowCount}" value="${orderItemAndShipGroupAssoc.shipGroupSeqId}"/> - <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItemAndShipGroupAssoc.orderItemSeqId}"/> - <input type="text" class='inputBox' size="5" name="quantity_o_${rowCount}" value="${quantityNotIssued}"/> - </td> - <td align="right"> - <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');"> - </td> - <#assign rowCount = rowCount + 1> - <#else> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext"> </div></td> - </#if> + <td>${uiLabelMap.ProductItemsIssued}</td> + <td>${uiLabelMap.ProductIssedOrdered}</td> </#if> + <td>${uiLabelMap.ProductIssue}</td> + <td align="right"> + <div>${uiLabelMap.CommonSubmit} ?</div> + <div>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');"></div> + </td> </tr> - <#if isSalesOrder> - <#list orderItemShipGrpInvResDatas as orderItemShipGrpInvResData> - <#assign orderItemShipGrpInvRes = orderItemShipGrpInvResData.orderItemShipGrpInvRes> - <#assign inventoryItem = orderItemShipGrpInvResData.inventoryItem> - <#assign inventoryItemFacility = orderItemShipGrpInvResData.inventoryItemFacility> - <#assign availableQuantity = orderItemShipGrpInvRes.quantity - (orderItemShipGrpInvRes.quantityNotAvailable?default(0))> - <#if availableQuantity < 0> - <#assign availableQuantity = 0> - </#if> - <tr> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext"> </div></td> - <td> - <div class="tabletext"> - ${orderItemShipGrpInvRes.inventoryItemId} - <#if inventoryItem.facilityId?has_content> - <span<#if originFacility?exists && originFacility.facilityId != inventoryItem.facilityId> style="color: red;"</#if>>[${(inventoryItemFacility.facilityName)?default(inventoryItem.facilityId)}]</span> + <#assign alt_row = false> + <#list orderItemDatas?if_exists as orderItemData> + <#assign orderItemAndShipGroupAssoc = orderItemData.orderItemAndShipGroupAssoc> + <#assign product = orderItemData.product?if_exists> + <#assign itemIssuances = orderItemData.itemIssuances> + <#assign totalQuantityIssued = orderItemData.totalQuantityIssued> + <#assign orderItemShipGrpInvResDatas = orderItemData.orderItemShipGrpInvResDatas?if_exists> + <#assign totalQuantityReserved = orderItemData.totalQuantityReserved?if_exists> + <#assign totalQuantityIssuedAndReserved = orderItemData.totalQuantityIssuedAndReserved?if_exists> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td><div>${orderItemAndShipGroupAssoc.orderId} / ${orderItemAndShipGroupAssoc.shipGroupSeqId} / ${orderItemAndShipGroupAssoc.orderItemSeqId}</div></td> + <td><div>${(product.internalName)?if_exists} [${orderItemAndShipGroupAssoc.productId?default("N/A")}]</div></td> + <td> + <#if itemIssuances?has_content> + <#list itemIssuances as itemIssuance> + <div><b>[${itemIssuance.quantity?if_exists}]</b>${itemIssuance.shipmentId?if_exists}:${itemIssuance.shipmentItemSeqId?if_exists} ${uiLabelMap.CommonOn} [${(itemIssuance.issuedDateTime.toString())?if_exists}] ${uiLabelMap.CommonBy} [${(itemIssuance.issuedByUserLoginId)?if_exists}]</div> + </#list> + <#else> + <div> </div> + </#if> + </td> + <td> + <div> + <#if isSalesOrder> + <#if (totalQuantityIssuedAndReserved != orderItemAndShipGroupAssoc.quantity)> + <span style="color: red;"> + <#else> + <span> + </#if> + [${totalQuantityIssued} + ${totalQuantityReserved} = ${totalQuantityIssuedAndReserved}] + <b> + <#if (totalQuantityIssuedAndReserved > orderItemAndShipGroupAssoc.quantity)>><#else><#if (totalQuantityIssuedAndReserved < orderItemAndShipGroupAssoc.quantity)><<#else>=</#if></#if> + ${orderItemAndShipGroupAssoc.quantity} + </b> + </span> + <#else> + <#if (totalQuantityIssued > orderItemAndShipGroupAssoc.quantity)> + <span style="color: red;"> <#else> - <span style="color: red;">[${uiLabelMap.ProductNoFacility}]</span> + <span> </#if> - </div> - </td> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext">${orderItemShipGrpInvRes.quantity}</div></td> - <td><div class="tabletext">${orderItemShipGrpInvRes.quantityNotAvailable?default(" ")}</div></td> - <#if originFacility?exists && originFacility.facilityId == inventoryItem.facilityId?if_exists> + ${totalQuantityIssued} + <b> + <#if (totalQuantityIssued > orderItemAndShipGroupAssoc.quantity)>><#else><#if (totalQuantityIssued < orderItemAndShipGroupAssoc.quantity)><<#else>=</#if></#if> + ${orderItemAndShipGroupAssoc.quantity} + </b> + </span> + </#if> + </div> + </td> + <#if isSalesOrder> + <td> </td> + <td> </td> + <td> </td> + <td> </td> + <#else> + <#assign quantityNotIssued = orderItemAndShipGroupAssoc.quantity - totalQuantityIssued> + <#if (quantityNotIssued > 0)> <td> <input type="hidden" name="shipmentId_o_${rowCount}" value="${shipmentId}"/> - <input type="hidden" name="orderId_o_${rowCount}" value="${orderItemShipGrpInvRes.orderId}"/> - <input type="hidden" name="shipGroupSeqId_o_${rowCount}" value="${orderItemShipGrpInvRes.shipGroupSeqId}"/> - <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItemShipGrpInvRes.orderItemSeqId}"/> - <input type="hidden" name="inventoryItemId_o_${rowCount}" value="${orderItemShipGrpInvRes.inventoryItemId}"/> - <input type="text" class='inputBox' size="5" name="quantity_o_${rowCount}" value="${(orderItemShipGrpInvResData.shipmentPlanQuantity)?default(availableQuantity)}"/> + <input type="hidden" name="orderId_o_${rowCount}" value="${orderItemAndShipGroupAssoc.orderId}"/> + <input type="hidden" name="shipGroupSeqId_o_${rowCount}" value="${orderItemAndShipGroupAssoc.shipGroupSeqId}"/> + <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItemAndShipGroupAssoc.orderItemSeqId}"/> + <input type="text" size="5" name="quantity_o_${rowCount}" value="${quantityNotIssued}"/> </td> <td align="right"> <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');"> </td> <#assign rowCount = rowCount + 1> <#else> - <td><div class="tabletext">${uiLabelMap.ProductNotOriginFacility}</div></td> - <td><div class="tabletext"> </div></td> + <td> </td> + <td> </td> + </#if> + </#if> + </tr> + <#if isSalesOrder> + <#list orderItemShipGrpInvResDatas as orderItemShipGrpInvResData> + <#assign orderItemShipGrpInvRes = orderItemShipGrpInvResData.orderItemShipGrpInvRes> + <#assign inventoryItem = orderItemShipGrpInvResData.inventoryItem> + <#assign inventoryItemFacility = orderItemShipGrpInvResData.inventoryItemFacility> + <#assign availableQuantity = orderItemShipGrpInvRes.quantity - (orderItemShipGrpInvRes.quantityNotAvailable?default(0))> + <#if availableQuantity < 0> + <#assign availableQuantity = 0> </#if> - </tr> - </#list> - </#if> - </#list> - <tr> - <td colspan="8" align="right"><input type="submit" class="smallSubmit" value="${uiLabelMap.ProductIssueAll}"/></td> - </tr> - </table> - <input type="hidden" name="_rowCount" value="${rowCount}"> - </form> - <script language="JavaScript" type="text/javascript">selectAll('selectAllForm');</script> -</#if> - + <tr> + <td> </td> + <td> </td> + <td> + <div> + ${orderItemShipGrpInvRes.inventoryItemId} + <#if inventoryItem.facilityId?has_content> + <span<#if originFacility?exists && originFacility.facilityId != inventoryItem.facilityId> style="color: red;"</#if>>[${(inventoryItemFacility.facilityName)?default(inventoryItem.facilityId)}]</span> + <#else> + <span style="color: red;">[${uiLabelMap.ProductNoFacility}]</span> + </#if> + </div> + </td> + <td> </td> + <td>${orderItemShipGrpInvRes.quantity}</td> + <td>${orderItemShipGrpInvRes.quantityNotAvailable?default(" ")}</td> + <#if originFacility?exists && originFacility.facilityId == inventoryItem.facilityId?if_exists> + <td> + <input type="hidden" name="shipmentId_o_${rowCount}" value="${shipmentId}"/> + <input type="hidden" name="orderId_o_${rowCount}" value="${orderItemShipGrpInvRes.orderId}"/> + <input type="hidden" name="shipGroupSeqId_o_${rowCount}" value="${orderItemShipGrpInvRes.shipGroupSeqId}"/> + <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItemShipGrpInvRes.orderItemSeqId}"/> + <input type="hidden" name="inventoryItemId_o_${rowCount}" value="${orderItemShipGrpInvRes.inventoryItemId}"/> + <input type="text" size="5" name="quantity_o_${rowCount}" value="${(orderItemShipGrpInvResData.shipmentPlanQuantity)?default(availableQuantity)}"/> + </td> + <td align="right"> + <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');"> + </td> + <#assign rowCount = rowCount + 1> + <#else> + <td>${uiLabelMap.ProductNotOriginFacility}</td> + <td> </td> + </#if> + </tr> + </#list> + </#if> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + <div align="right"><input type="submit" class="smallSubmit" value="${uiLabelMap.ProductIssueAll}"/></div> + <input type="hidden" name="_rowCount" value="${rowCount}"> + </form> + <script language="JavaScript" type="text/javascript">selectAll('selectAllForm');</script> + </#if> + </div> +</div> <#else> - <h3>${uiLabelMap.ProductShipmentNotFoundId}: [${shipmentId?if_exists}]</h3> -</#if> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ProductShipmentNotFoundId}: [${shipmentId?if_exists}]</li> + </ul> + <br class="clear"/> + </div> +</div> +</#if> \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl Sat Jan 5 15:17:57 2008 @@ -25,5 +25,14 @@ <#if shipmentId?has_content> <div><a href="<@ofbizUrl>ShipmentManifest.pdf?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext" target="_blank">${uiLabelMap.ProductGenerateShipmentManifestReport}</a></div> </#if> - -${editShipmentWrapper.renderFormString(context)} +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ProductEditShipment}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + ${editShipmentWrapper.renderFormString(context)} + </div> +</div> \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl Sat Jan 5 15:17:57 2008 @@ -18,106 +18,126 @@ --> <#if shipment?exists> -<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> - <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> - <#assign totalQuantityPackaged = shipmentItemData.totalQuantityPackaged> - <#assign totalQuantityToPackage = shipmentItemData.totalQuantityToPackage> - <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> - <td><div class="tabletext"><a href="<@ofbizUrl>deleteShipmentItem?shipmentId=${shipmentId}&shipmentItemSeqId=${shipmentItem.shipmentItemSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></div></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}" 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> - <td><div class="tabletext"> <#-- don't allow a delete, need to implement a cancel issuance <a href="<@ofbizUrl>deleteShipmentItemIssuance?shipmentId=${shipmentId}&itemIssuanceId=${itemIssuance.itemIssuanceId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> --></div></td> - </tr> - </#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}" 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> - <td><div class="tabletext"> <#-- don't allow a delete, need to implement a cancel issuance <a href="<@ofbizUrl>deleteShipmentItemIssuance?shipmentId=${shipmentId}&itemIssuanceId=${itemIssuance.itemIssuanceId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> --></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> - <#if shipmentPackageContent.subProductId?has_content> - <td><div class="tabletext">${uiLabelMap.ProductSubProduct} :${shipmentPackageContent.subProductId}</div></td> - <td><div class="tabletext">${shipmentPackageContent.subProductQuantity?if_exists}</div></td> - <#else> - <td colspan="2"><div class="tabletext"> </div></td> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.PageTitleEditShipmentItems}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <table cellspacing="0" class="basic-table"> + <tr class="header-row"> + <td>${uiLabelMap.ProductItem}</td> + <td> </td> + <td> </td> + <td>${uiLabelMap.ProductQuantity}</td> + <td> </td> + <td> </td> + <td> </td> + </tr> + <#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> + <#assign totalQuantityPackaged = shipmentItemData.totalQuantityPackaged> + <#assign totalQuantityToPackage = shipmentItemData.totalQuantityToPackage> + <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> + <td><a href="<@ofbizUrl>deleteShipmentItem?shipmentId=${shipmentId}&shipmentItemSeqId=${shipmentItem.shipmentItemSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></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}" class="buttontext">${orderShipment.orderId?if_exists}</a> ${orderShipment.orderItemSeqId?if_exists}</td> + <td> </td> + <td>${orderShipment.quantity?if_exists}</td> + <td> </td> + <td> </td> + <td> <#-- don't allow a delete, need to implement a cancel issuance <a href="<@ofbizUrl>deleteShipmentItemIssuance?shipmentId=${shipmentId}&itemIssuanceId=${itemIssuance.itemIssuanceId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> --></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}" 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> + <td> <#-- don't allow a delete, need to implement a cancel issuance <a href="<@ofbizUrl>deleteShipmentItemIssuance?shipmentId=${shipmentId}&itemIssuanceId=${itemIssuance.itemIssuanceId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> --></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> + <#if shipmentPackageContent.subProductId?has_content> + <td><span class="label">${uiLabelMap.ProductSubProduct}</span> ${shipmentPackageContent.subProductId}</td> + <td>${shipmentPackageContent.subProductQuantity?if_exists}</td> + <#else> + <td colspan="2"> </td> + </#if> + <td><a href="<@ofbizUrl>deleteShipmentItemPackageContent?shipmentId=${shipmentId}&shipmentItemSeqId=${shipmentPackageContent.shipmentItemSeqId}&shipmentPackageSeqId=${shipmentPackageContent.shipmentPackageSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></td> + </tr> + </#list> + <#if (totalQuantityToPackage > 0)> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <form action="<@ofbizUrl>createShipmentItemPackageContent</@ofbizUrl>" name="createShipmentPackageContentForm${shipmentItemData_index}"> + <input type="hidden" name="shipmentId" value="${shipmentId}"/> + <input type="hidden" name="shipmentItemSeqId" value="${shipmentItem.shipmentItemSeqId}"/> + <td> </td> + <td colspan="2"> + <div><span class="label">${uiLabelMap.ProductAddToPackage}</span> + <select name="shipmentPackageSeqId"> + <#list shipmentPackages as shipmentPackage> + <option>${shipmentPackage.shipmentPackageSeqId}</option> + </#list> + <option value="New">${uiLabelMap.CommonNew}</option><!-- Warning: the "New" value cannot be translated because it is used in secas --> + </select> + </div> + </td> + <td> + <div> + <input name="quantity" size="5" value="${totalQuantityToPackage}"/> + <a href="javascript:document.createShipmentPackageContentForm${shipmentItemData_index}.submit()" class="buttontext">${uiLabelMap.CommonAdd}</a> + </div> + </td> + <td colspan="2"> </td> + <td> </td> + </form> + </tr> </#if> - <td><div class="tabletext"><a href="<@ofbizUrl>deleteShipmentItemPackageContent?shipmentId=${shipmentId}&shipmentItemSeqId=${shipmentPackageContent.shipmentItemSeqId}&shipmentPackageSeqId=${shipmentPackageContent.shipmentPackageSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></div></td> - </tr> - </#list> - <#if (totalQuantityToPackage > 0)> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> <tr> - <form action="<@ofbizUrl>createShipmentItemPackageContent</@ofbizUrl>" name="createShipmentPackageContentForm${shipmentItemData_index}"> - <input type="hidden" name="shipmentId" value="${shipmentId}"/> - <input type="hidden" name="shipmentItemSeqId" value="${shipmentItem.shipmentItemSeqId}"/> - <td><div class="tabletext"> </div></td> - <td colspan="2"> - <div class="tabletext">${uiLabelMap.ProductAddToPackage} : - <select name="shipmentPackageSeqId" class="selectBox"> - <#list shipmentPackages as shipmentPackage> - <option>${shipmentPackage.shipmentPackageSeqId}</option> - </#list> - <option value="New">${uiLabelMap.CommonNew}</option><!-- Warning: the "New" value cannot be translated because it is used in secas --> - </select> - </div> - </td> - <td> - <div class="tabletext"> - <input name="quantity" size="5" value="${totalQuantityToPackage}" class="inputBox"/> - <a href="javascript:document.createShipmentPackageContentForm${shipmentItemData_index}.submit()" class="buttontext">${uiLabelMap.CommonAdd}</a> - </div> - </td> - <td colspan="2"><div class="tabletext"> </div></td> - <td> </td> + <form action="<@ofbizUrl>createShipmentItem</@ofbizUrl>" name="createShipmentItemForm"> + <input type="hidden" name="shipmentId" value="${shipmentId}"/> + <td><span class="label">${uiLabelMap.ProductNewItem}</span></td> + <td colspan="2"><span class="label">${uiLabelMap.ProductProductId}</span> <input type="text" name="productId" size="15" maxlength="20"/></td> + <td><input type="text" name="quantity" size="5" value="0"/></td> + <td colspan="2"><span class="label">${uiLabelMap.ProductDescription}</span> <input name="shipmentContentDescription" size="30" maxlength="255"/></td> + <td><a href="javascript:document.createShipmentItemForm.submit()" class="buttontext">${uiLabelMap.CommonCreate}</a></td> </form> </tr> - </#if> -</#list> -<tr> - <form action="<@ofbizUrl>createShipmentItem</@ofbizUrl>" name="createShipmentItemForm"> - <input type="hidden" name="shipmentId" value="${shipmentId}"/> - <td><div class="tabletext">${uiLabelMap.ProductNewItem} :</div></td> - <td colspan="2"><div class="tabletext">${uiLabelMap.ProductProductId} :<input name="productId" size="15" maxlength="20" class="inputBox"/></div></td> - <td><div class="tabletext"><input name="quantity" size="5" value="0" class="inputBox"/></div></td> - <td colspan="2"><div class="tabletext">${uiLabelMap.ProductDescription} :<input name="shipmentContentDescription" size="30" maxlength="255" class="inputBox"/></div></td> - <td><a href="javascript:document.createShipmentItemForm.submit()" class="buttontext">${uiLabelMap.CommonCreate}</a></td> - </form> -</tr> -</table> + </table> + </div> +</div> <#else> - <h3>${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId?if_exists}]</h3> -</#if> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId?if_exists}]</li> + </ul> + <br class="clear"/> + </div> +</div> +</#if> \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl Sat Jan 5 15:17:57 2008 @@ -18,142 +18,182 @@ --> <#if shipment?exists> -<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> - <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> - <form action="<@ofbizUrl>updateShipmentPackage</@ofbizUrl>" name="updateShipmentPackageForm${shipmentPackageData_index}"> - <input type="hidden" name="shipmentId" value="${shipmentId}"/> - <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackage.shipmentPackageSeqId}"/> - <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}:</span><input type="text" size="5" name="weight" value="${shipmentPackage.weight?if_exists}" class="inputBox"/></td> - <td><span class="tabletext">${uiLabelMap.ProductWeightUnit}:</span> - <select name="weightUomId" class="selectBox"> - <#if weightUom?has_content> - <option value="${weightUom.uomId}">${weightUom.get("description",locale)}</option> - <option value="${weightUom.uomId}">---</option> - <#else> - <option value=""> </option> - </#if> - <#list weightUoms as weightUomOption> - <option value="${weightUomOption.uomId}">${weightUomOption.get("description",locale)} [${weightUomOption.abbreviation}]</option> - </#list> - </select> - <span class="tabletext">${uiLabelMap.ProductShipmentBoxType}:</span> - <select name="shipmentBoxTypeId" class="selectBox"> - <option value=""> </option> - <#list boxTypes as boxType> - <option value="${boxType.shipmentBoxTypeId}" <#if shipmentPackage.shipmentBoxTypeId?exists && shipmentPackage.shipmentBoxTypeId == boxType.shipmentBoxTypeId>selected</#if>>${boxType.get("description",locale)}</option> - </#list> - </select> - <br /> - <span class="tabletext">${uiLabelMap.ProductShipmentInsuredValuePackage}:</span> - <input type="text" size="5" name="insuredValue" value="${shipmentPackage.insuredValue?if_exists}" class="inputBox"/> - </td> - <td><a href="javascript:document.updateShipmentPackageForm${shipmentPackageData_index}.submit();" class="buttontext">${uiLabelMap.CommonUpdate}</a></td> - <td><div class="tabletext"><a href="<@ofbizUrl>deleteShipmentPackage?shipmentId=${shipmentId}&shipmentPackageSeqId=${shipmentPackage.shipmentPackageSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></div></td> - </tr> - </form> - <#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> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext"><a href="<@ofbizUrl>deleteShipmentPackageContent?shipmentId=${shipmentId}&shipmentPackageSeqId=${shipmentPackageContent.shipmentPackageSeqId}&shipmentItemSeqId=${shipmentPackageContent.shipmentItemSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></div></td> - </tr> - </#list> - <tr> - <form action="<@ofbizUrl>createShipmentPackageContent</@ofbizUrl>" name="createShipmentPackageContentForm${shipmentPackageData_index}"> - <input type="hidden" name="shipmentId" value="${shipmentId}"/> - <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackage.shipmentPackageSeqId}"/> - <td><div class="tabletext"> </div></td> - <td> - <div class="tabletext">${uiLabelMap.ProductAddFromItem} : - <select name="shipmentItemSeqId" class="selectBox"> - <#list shipmentItems as shipmentItem> - <option>${shipmentItem.shipmentItemSeqId}</option> - </#list> - </select> - </div> - </td> - <td><div class="tabletext">${uiLabelMap.ProductQuantity} :<input name="quantity" size="5" value="0" class="inputBox"/></div></td> - <td><div class="tabletext"> </div></td> - <td><a href="javascript:document.createShipmentPackageContentForm${shipmentPackageData_index}.submit()" class="buttontext">${uiLabelMap.CommonAdd}</a></td> - <td><div class="tabletext"> </div></td> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.PageTitleEditShipmentPackages}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <table cellspacing="0" class="basic-table"> + <tr class="header-row"> + <td>${uiLabelMap.ProductPackage}</td> + <td>${uiLabelMap.CommonCreated}</td> + <td> </td> + <td> </td> + <td> </td> + <td> </td> + </tr> + <#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> + <form action="<@ofbizUrl>updateShipmentPackage</@ofbizUrl>" name="updateShipmentPackageForm${shipmentPackageData_index}"> + <input type="hidden" name="shipmentId" value="${shipmentId}"/> + <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackage.shipmentPackageSeqId}"/> + <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> + <input type="text" size="5" name="weight" value="${shipmentPackage.weight?if_exists}"/> + <span class="label">${uiLabelMap.ProductWeightUnit}</span> + <select name="weightUomId"> + <#if weightUom?has_content> + <option value="${weightUom.uomId}">${weightUom.get("description",locale)}</option> + <option value="${weightUom.uomId}">---</option> + <#else> + <option value=""> </option> + </#if> + <#list weightUoms as weightUomOption> + <option value="${weightUomOption.uomId}">${weightUomOption.get("description",locale)} [${weightUomOption.abbreviation}]</option> + </#list> + </select> + </td> + <td> + <span class="label">${uiLabelMap.ProductShipmentBoxType}</span> + <select name="shipmentBoxTypeId" class="selectBox"> + <option value=""> </option> + <#list boxTypes as boxType> + <option value="${boxType.shipmentBoxTypeId}" <#if shipmentPackage.shipmentBoxTypeId?exists && shipmentPackage.shipmentBoxTypeId == boxType.shipmentBoxTypeId>selected</#if>>${boxType.get("description",locale)}</option> + </#list> + </select> + <span class="label">${uiLabelMap.ProductShipmentInsuredValuePackage}</span> + <input type="text" size="5" name="insuredValue" value="${shipmentPackage.insuredValue?if_exists}"/> + </td> + <td><a href="javascript:document.updateShipmentPackageForm${shipmentPackageData_index}.submit();" class="buttontext">${uiLabelMap.CommonUpdate}</a></td> + <td><a href="<@ofbizUrl>deleteShipmentPackage?shipmentId=${shipmentId}&shipmentPackageSeqId=${shipmentPackage.shipmentPackageSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></td> + </tr> + </form> + <#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 colspan="2"> + <div> + <span class="label">${uiLabelMap.ProductQuantity}</span> + ${shipmentPackageContent.quantity?if_exists} + <a href="<@ofbizUrl>deleteShipmentPackageContent?shipmentId=${shipmentId}&shipmentPackageSeqId=${shipmentPackageContent.shipmentPackageSeqId}&shipmentItemSeqId=${shipmentPackageContent.shipmentItemSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> + </div> + </td> + <td> </td> + <td> </td> + </tr> + </#list> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <form action="<@ofbizUrl>createShipmentPackageContent</@ofbizUrl>" name="createShipmentPackageContentForm${shipmentPackageData_index}"> + <input type="hidden" name="shipmentId" value="${shipmentId}"/> + <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackage.shipmentPackageSeqId}"/> + <td> </td> + <td> + <div> + <span class="label">${uiLabelMap.ProductAddFromItem}</span> + <select name="shipmentItemSeqId"> + <#list shipmentItems as shipmentItem> + <option>${shipmentItem.shipmentItemSeqId}</option> + </#list> + </select> + </div> + </td> + <td colspan="2"> + <div> + <span class="label">${uiLabelMap.ProductQuantity}</span> + <input type="text" name="quantity" size="5" value="0"/> + <a href="javascript:document.createShipmentPackageContentForm${shipmentPackageData_index}.submit()" class="buttontext">${uiLabelMap.CommonAdd}</a> + </div> + </td> + <td> </td> + <td> </td> + </form> + </tr> + <#list shipmentPackageRouteSegs as shipmentPackageRouteSeg> + <form action="<@ofbizUrl>updateShipmentPackageRouteSeg</@ofbizUrl>" name="updateShipmentPackageRouteSegForm${shipmentPackageData_index}${shipmentPackageRouteSeg_index}"> + <input type="hidden" name="shipmentId" value="${shipmentId}"/> + <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentPackageRouteSeg.shipmentRouteSegmentId}"/> + <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackageRouteSeg.shipmentPackageSeqId}"/> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td> </td> + <td><span class="label">${uiLabelMap.ProductRouteSegment}</span> ${shipmentPackageRouteSeg.shipmentRouteSegmentId}</td> + <td><span class="label">${uiLabelMap.ProductTrack}</span> <input type="text" size="22" name="trackingCode" value="${shipmentPackageRouteSeg.trackingCode?if_exists}"/></td> + <td colspan="2"> + <div> + <span class="label">${uiLabelMap.ProductBox}</span> + <input type="text" size="5" name="boxNumber" value="${shipmentPackageRouteSeg.boxNumber?if_exists}"/> + <a href="javascript:document.updateShipmentPackageRouteSegForm${shipmentPackageData_index}${shipmentPackageRouteSeg_index}.submit();" class="buttontext">${uiLabelMap.CommonUpdate}</a> + <a href="<@ofbizUrl>deleteShipmentPackageRouteSeg?shipmentId=${shipmentId}&shipmentPackageSeqId=${shipmentPackageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentId=${shipmentPackageRouteSeg.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> + </div> + </td> + <td> </td> + </tr> + </form> + </#list> + <#-- + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <form action="<@ofbizUrl>createShipmentPackageRouteSeg</@ofbizUrl>" name="createShipmentPackageRouteSegForm${shipmentPackageData_index}"> + <input type="hidden" name="shipmentId" value="${shipmentId}"/> + <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackage.shipmentPackageSeqId}"/> + <td> </td> + <td> + <div><span class="label">${uiLabelMap.ProductAddRouteSegmentInfo}</span> + <select name="shipmentRouteSegmentId"> + <#list shipmentRouteSegments as shipmentRouteSegment> + <option>${shipmentRouteSegment.shipmentRouteSegmentId}</option> + </#list> + </select> + </div> + </td> + <td><span class="label">Track#</span><input type="text" size="22" name="trackingCode"/></td> + <td><span class="label">Box#</span><input type="text" size="5" name="boxNumber"/></td> + <td><a href="javascript:document.createShipmentPackageRouteSegForm${shipmentPackageData_index}.submit()" class="buttontext">${uiLabelMap.CommonAdd}</a></td> + <td> </td> + </form> + </tr> + --> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + <#-- + <form action="<@ofbizUrl>createShipmentPackage</@ofbizUrl>" name="createShipmentPackageForm"> + <input type="hidden" name="shipmentId" value="${shipmentId}"/> + <tr> + <td><span class="label">${uiLabelMap.ProductNewPackage}</span></td> + <td> </td> + <td><span class="label">${uiLabelMap.ProductWeight}</span> <input type="text" size="5" name="weight"/></td> + <td><span class="label">${uiLabelMap.ProductWeightUnit}</span> + <select name="weightUomId"> + <#list weightUoms as weightUomOption> + <option value="${weightUomOption.uomId}">${weightUomOption.get("description",locale)} [${weightUomOption.abbreviation}]</option> + </#list> + </select> + </td> + <td><a href="javascript:document.createShipmentPackageForm.submit();" class="buttontext">${uiLabelMap.CommonCreate}</a></td> + <td> </td> + </tr> </form> - </tr> - <#list shipmentPackageRouteSegs as shipmentPackageRouteSeg> - <form action="<@ofbizUrl>updateShipmentPackageRouteSeg</@ofbizUrl>" name="updateShipmentPackageRouteSegForm${shipmentPackageData_index}${shipmentPackageRouteSeg_index}"> - <input type="hidden" name="shipmentId" value="${shipmentId}"/> - <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentPackageRouteSeg.shipmentRouteSegmentId}"/> - <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackageRouteSeg.shipmentPackageSeqId}"/> - <tr> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext">${uiLabelMap.ProductRouteSegment} :${shipmentPackageRouteSeg.shipmentRouteSegmentId}</div></td> - <td><span class="tabletext">${uiLabelMap.ProductTrack} :</span><input type="text" size="22" name="trackingCode" value="${shipmentPackageRouteSeg.trackingCode?if_exists}" class="inputBox"/></td> - <td><span class="tabletext">${uiLabelMap.ProductBox} :</span><input type="text" size="5" name="boxNumber" value="${shipmentPackageRouteSeg.boxNumber?if_exists}" class="inputBox"/></td> - <td><a href="javascript:document.updateShipmentPackageRouteSegForm${shipmentPackageData_index}${shipmentPackageRouteSeg_index}.submit();" class="buttontext">${uiLabelMap.CommonUpdate}</a></td> - <td><div class="tabletext"><a href="<@ofbizUrl>deleteShipmentPackageRouteSeg?shipmentId=${shipmentId}&shipmentPackageSeqId=${shipmentPackageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentId=${shipmentPackageRouteSeg.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></div></td> - </tr> - </form> - </#list> - <#-- - <tr> - <form action="<@ofbizUrl>createShipmentPackageRouteSeg</@ofbizUrl>" name="createShipmentPackageRouteSegForm${shipmentPackageData_index}"> - <input type="hidden" name="shipmentId" value="${shipmentId}"/> - <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackage.shipmentPackageSeqId}"/> - <td><div class="tabletext"> </div></td> - <td> - <div class="tabletext">${uiLabelMap.ProductAddRouteSegmentInfo}: - <select name="shipmentRouteSegmentId" class="selectBox"> - <#list shipmentRouteSegments as shipmentRouteSegment> - <option>${shipmentRouteSegment.shipmentRouteSegmentId}</option> - </#list> - </select> - </div> - </td> - <td><span class="tabletext">Track#:</span><input type="text" size="22" name="trackingCode" class="inputBox"/></td> - <td><span class="tabletext">Box#:</span><input type="text" size="5" name="boxNumber" class="inputBox"/></td> - <td><a href="javascript:document.createShipmentPackageRouteSegForm${shipmentPackageData_index}.submit()" class="buttontext">${uiLabelMap.CommonAdd}</a></td> - <td><div class="tabletext"> </div></td> - </form> - </tr> - --> -</#list> -<#-- -<form action="<@ofbizUrl>createShipmentPackage</@ofbizUrl>" name="createShipmentPackageForm"> - <input type="hidden" name="shipmentId" value="${shipmentId}"/> - <tr> - <td><div class="tabletext">${uiLabelMap.ProductNewPackage} :</div></td> - <td><div class="tabletext"> </div></td> - <td><span class="tabletext">${uiLabelMap.ProductWeight} :</span><input type="text" size="5" name="weight" class="inputBox"/></td> - <td><span class="tabletext">${uiLabelMap.ProductWeightUnit} :</span> - <select name="weightUomId" class="selectBox"> - <#list weightUoms as weightUomOption> - <option value="${weightUomOption.uomId}">${weightUomOption.get("description",locale)} [${weightUomOption.abbreviation}]</option> - </#list> - </select> - </td> - <td><a href="javascript:document.createShipmentPackageForm.submit();" class="buttontext">${uiLabelMap.CommonCreate}</a></td> - <td> </td> - </tr> -</form> ---> -</table> + --> + </table> + </div> +</div> <#else> - <h3>${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId?if_exists}]</h3> -</#if> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId?if_exists}]</li> + </ul> + <br class="clear"/> + </div> +</div> +</#if> \ No newline at end of file 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?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl Sat Jan 5 15:17:57 2008 @@ -17,36 +17,73 @@ under the License. --> <#if shipment?exists> - <h1>${uiLabelMap.ProductShipmentPlan}</h1> - ${findOrderItemsForm.renderFormString(context)} - <br/> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ProductShipmentPlan}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + ${findOrderItemsForm.renderFormString(context)} + </div> +</div> <#if addToShipmentPlanRows?has_content> - ${addToShipmentPlanForm.renderFormString(context)} -<script language="javascript"> - function submitRows(rowCount) { - var rowCountElement = document.createElement("input"); - rowCountElement.setAttribute("name", "_rowCount"); - rowCountElement.setAttribute("type", "hidden"); - rowCountElement.setAttribute("value", rowCount); - document.forms.addToShipmentPlan.appendChild(rowCountElement); - - var shipmentIdElement = document.createElement("input"); - shipmentIdElement.setAttribute("name", "shipmentId"); - shipmentIdElement.setAttribute("type", "hidden"); - shipmentIdElement.setAttribute("value", ${shipmentId}); - document.forms.addToShipmentPlan.appendChild(shipmentIdElement); - - document.forms.addToShipmentPlan.submit(); - } -</script> -<form><input type="submit" onClick="submitRows('${rowCount?if_exists}');return false;" name="submitButton" value="${uiLabelMap.CommonAdd}"/></form> - <hr/> - <br/> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ProductShipmentPlanAdd}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + ${addToShipmentPlanForm.renderFormString(context)} + <script language="javascript"> + function submitRows(rowCount) { + var rowCountElement = document.createElement("input"); + rowCountElement.setAttribute("name", "_rowCount"); + rowCountElement.setAttribute("type", "hidden"); + rowCountElement.setAttribute("value", rowCount); + document.forms.addToShipmentPlan.appendChild(rowCountElement); + + var shipmentIdElement = document.createElement("input"); + shipmentIdElement.setAttribute("name", "shipmentId"); + shipmentIdElement.setAttribute("type", "hidden"); + shipmentIdElement.setAttribute("value", ${shipmentId}); + document.forms.addToShipmentPlan.appendChild(shipmentIdElement); + + document.forms.addToShipmentPlan.submit(); + } + </script> + <form> + <input type="submit" onClick="submitRows('${rowCount?if_exists}');return false;" name="submitButton" value="${uiLabelMap.CommonAdd}"/> + </form> + </div> + </div> </#if> - ${listShipmentPlanForm.renderFormString(context)} - <h2>${uiLabelMap.ProductShipmentTotalWeight}: ${totWeight}</h2> - <h2>${uiLabelMap.ProductShipmentTotalVolume}: ${totVolume}</h2> - ${shipmentPlanToOrderItemsForm.renderFormString(context)} + <div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ProductShipmentPlanList}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + ${listShipmentPlanForm.renderFormString(context)} + <br/> + <div> + <div align="right"><h2>${uiLabelMap.ProductShipmentTotalWeight}: ${totWeight} ${uiLabelMap.ProductShipmentTotalVolume}: ${totVolume}</h2></div> + <div align="left">${shipmentPlanToOrderItemsForm.renderFormString(context)}</div> + </div> + </div> + </div> <#else> - <h3>${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId?if_exists}]</h3> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId?if_exists}]</li> + </ul> + <br class="clear"/> + </div> +</div> </#if> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |