svn commit: r541871 - /ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl

[jacopoc]

Author: jacopoc
Date: Sat May 26 01:05:55 2007
New Revision: 541871

URL: http://svn.apache.org/viewvc?view=rev&rev=541871
Log:
Applied (slightly modified) patch from Marco Risaliti with misc ui improvement and support for mkt pkg to the 'picklist option' screen.

Modified:
    ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl?view=diff&rev=541871&r1=541870&r2=541871
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl Sat May 26 01:05:55 2007
@@ -126,38 +126,46 @@
 <#if toPickList?has_content>
 <div class="screenlet">
     <div class="screenlet-header">
-        <div class="boxhead">${shipmentMethodType.description?if_exists} Detail</div>
+        <div class="boxhead">${shipmentMethodType.description?if_exists} ${uiLabelMap.ProductPickingDetail}</div>
     </div>
     <div class="screenlet-body">
         <table class="basic-table">
             <tr>
-                <th>Order ID</th>
-                <th>Order Date</th>
-                <th>Channel</th>
-                <th>Order Item Id</th>
-                <th>Description</th>
-                <th>Ship Grp Id</th>
-                <th>Quantity</th>
+                <th>${uiLabelMap.ProductOrderId}</th>
+                <th>${uiLabelMap.FormFieldTitle_orderDate}</th>
+                <th>${uiLabelMap.ProductChannel}</th>
+                <th>${uiLabelMap.ProductOrderItem}</th>
+                <th>${uiLabelMap.ProductDescription}</th>
+                <th>${uiLabelMap.OrderShipGroup}</th>
+                <th>${uiLabelMap.ProductQuantity}</th>
+                <th>${uiLabelMap.ProductQuantityNotAvailable}</th>
             </tr>
             <#list toPickList as toPick>
-                <#assign oiasgal = toPick.orderItemAndShipGroupAssocList>
+                <#assign oiasgal = toPick.orderItemShipGrpInvResList>
                 <#assign header = toPick.orderHeader>
                 <#assign channel = header.getRelatedOne("SalesChannelEnumeration")?if_exists>
 
                 <#list oiasgal as oiasga>
-                    <#assign product = oiasga.getRelatedOne("Product")?if_exists>
+                    <#assign orderProduct = oiasga.getRelatedOne("OrderItem").getRelatedOne("Product")?if_exists>
+                    <#assign product = oiasga.getRelatedOne("InventoryItem").getRelatedOne("Product")?if_exists>
                     <tr>
                         <td><a href="/ordermgr/control/orderview?orderId=${oiasga.orderId}${externalKeyParam}" class="linktext" target="_blank">${oiasga.orderId}</a></td>
                         <td>${header.orderDate?string}</td>
                         <td>${(channel.description)?if_exists}</td>
                         <td>${oiasga.orderItemSeqId}</td>
-                        <td><a href="/catalog/control/EditProduct?productId=${oiasga.productId?if_exists}${externalKeyParam}" class="linktext" target="_blank">${(product.internalName)?if_exists}</a></td>
+                        <td>
+                            <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${externalKeyParam}" class="linktext" target="_blank">${(orderProduct.internalName)?if_exists}</a>
+                            <#if orderProduct.productId != product.productId>
+                                &nbsp;[<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${externalKeyParam}" class="linktext" target="_blank">${(product.internalName)?if_exists}</a>]
+                            </#if>
+                        </td>
                         <td>${oiasga.shipGroupSeqId}</td>
                         <td>${oiasga.quantity}</td>
+                        <td>${oiasga.quantityNotAvailable?if_exists}</td>
                     </tr>
                 </#list>
                 <tr>
-                    <td colspan="7"><hr/></td>
+                    <td colspan="8"><hr/></td>
                 </tr>
             </#list>
         </table>