You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/04/18 23:38:59 UTC
svn commit: r530168 - in /ofbiz/trunk/applications/product:
config/ProductUiLabels.properties webapp/facility/facility/Picklist.fo.ftl
webapp/facility/facility/PicklistOptions.ftl
Author: jacopoc
Date: Wed Apr 18 14:38:58 2007
New Revision: 530168
URL: http://svn.apache.org/viewvc?view=rev&rev=530168
Log:
Misc layout cleanups to the picking option screen.
Small enhancements to the packing report to better display qty available and not available into two separate columns.
Also fixed the value of the qty available.
Issue OFBIZ-312
Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.properties
ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?view=diff&rev=530168&r1=530167&r2=530168
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Wed Apr 18 14:38:58 2007
@@ -662,6 +662,8 @@
ProductInternalName=Internal Name
ProductInventory=Inventory
ProductInventoryAvailNotAvail=Inventory Avail: Not Avail:
+ProductInventoryAvail=Avail
+ProductInventoryNotAvail=Not Avail
ProductInventoryByProduct=Inventory By Product
ProductInventoryDetails=Inventory Details
ProductInventoryFacility=Inventory Facility
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl?view=diff&rev=530168&r1=530167&r2=530168
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl Wed Apr 18 14:38:58 2007
@@ -217,13 +217,17 @@
<fo:table-column column-width="60pt"/>
<fo:table-column column-width="180pt"/>
<fo:table-column column-width="50pt"/>
- <fo:table-column column-width="150pt"/>
+ <fo:table-column column-width="70pt"/>
+ <fo:table-column column-width="40pt"/>
+ <fo:table-column column-width="40pt"/>
<fo:table-header>
<fo:table-row font-weight="bold">
<fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.OrderOrderItem}</fo:block></fo:table-cell>
<fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductProductId}</fo:block></fo:table-cell>
<fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductToPack}</fo:block></fo:table-cell>
- <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductInventoryAvailNotAvail}</fo:block></fo:table-cell>
+ <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductInventoryItem}</fo:block></fo:table-cell>
+ <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductInventoryAvail}</fo:block></fo:table-cell>
+ <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductInventoryNotAvail}</fo:block></fo:table-cell>
</fo:table-row>
</fo:table-header>
<fo:table-body>
@@ -246,13 +250,22 @@
<fo:table-cell padding="2pt" background-color="${rowColor}">
<fo:block>${picklistItem.quantity}</fo:block>
</fo:table-cell>
- <fo:table-cell padding="2pt" background-color="${rowColor}">
- <#if orderItemShipGrpInvRes?has_content>
- <fo:block>${orderItemShipGrpInvRes.inventoryItemId}:${orderItemShipGrpInvRes.quantity}:${orderItemShipGrpInvRes.quantityNotAvailable?if_exists}</fo:block>
- <#else>
+ <#if orderItemShipGrpInvRes?has_content>
+ <#assign quantityAvailable = orderItemShipGrpInvRes.quantity?default(0) - orderItemShipGrpInvRes.quantityNotAvailable?default(0)>
+ <fo:table-cell padding="2pt" background-color="${rowColor}">
+ <fo:block>${orderItemShipGrpInvRes.inventoryItemId}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt" background-color="${rowColor}">
+ <fo:block>${quantityAvailable}</fo:block>
+ </fo:table-cell>
+ <fo:table-cell padding="2pt" background-color="${rowColor}">
+ <fo:block>${orderItemShipGrpInvRes.quantityNotAvailable?default(0)}</fo:block>
+ </fo:table-cell>
+ <#else>
+ <fo:table-cell padding="2pt" background-color="${rowColor}" number-columns-spanned="3">
<fo:block>${uiLabelMap.ProductNoInventoryReservation}</fo:block>
- </#if>
- </fo:table-cell>
+ </fo:table-cell>
+ </#if>
</fo:table-row>
<#-- toggle the row color -->
<#if rowColor == "white">
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=530168&r1=530167&r2=530168
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl Wed Apr 18 14:38:58 2007
@@ -22,12 +22,12 @@
<div class="boxhead">${uiLabelMap.ProductFindOrdersToPick}</div>
</div>
<div class="screenlet-body">
- <table border="1" cellspacing="0" cellpadding="2">
+ <table class="basic-table">
<tr>
- <td><div class="tableheadtext">${uiLabelMap.ProductShipmentMethod}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.ProductReadyToPick}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.ProductNeedStockMove}</div></td>
- <td><div class="tableheadtext"> </div></td>
+ <th>${uiLabelMap.ProductShipmentMethod}</th>
+ <th>${uiLabelMap.ProductReadyToPick}</th>
+ <th>${uiLabelMap.ProductNeedStockMove}</th>
+ <th> </th>
</tr>
<#if rushOrderInfo?has_content>
<#assign orderReadyToPickInfoList = rushOrderInfo.orderReadyToPickInfoList?if_exists>
@@ -35,22 +35,20 @@
<#assign orderReadyToPickInfoListSize = (orderReadyToPickInfoList.size())?default(0)>
<#assign orderNeedsStockMoveInfoListSize = (orderNeedsStockMoveInfoList.size())?default(0)>
<tr>
- <td><div class="tabletext">[Rush Orders, all Methods]</div></td>
- <td><div class="tabletext">${orderReadyToPickInfoListSize}</div></td>
- <td><div class="tabletext">${orderNeedsStockMoveInfoListSize}</div></td>
+ <td>[Rush Orders, all Methods]</td>
+ <td>${orderReadyToPickInfoListSize}</td>
+ <td>${orderNeedsStockMoveInfoListSize}</td>
<td>
- <div class="tabletext">
- <#if orderReadyToPickInfoList?has_content>
- <form method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="facilityId" value="${facilityId}"/>
- <input type="hidden" name="isRushOrder" value="Y"/>
- ${uiLabelMap.ProductPickFirst}:<input type="text" size="4" name="maxNumberOfOrders" value="20" class="inputBox"/>
- <input type="submit" value="${uiLabelMap.ProductCreatePicklist}" class="smallSubmit"/>
- </form>
- <#else>
-
- </#if>
- </div>
+ <#if orderReadyToPickInfoList?has_content>
+ <form method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="facilityId" value="${facilityId}"/>
+ <input type="hidden" name="isRushOrder" value="Y"/>
+ ${uiLabelMap.ProductPickFirst}:<input type="text" size="4" name="maxNumberOfOrders" value="20"/>
+ <input type="submit" value="${uiLabelMap.ProductCreatePicklist}"/>
+ </form>
+ <#else>
+
+ </#if>
</td>
</tr>
</#if>
@@ -67,48 +65,44 @@
<#assign orderNeedsStockMoveInfoListSizeTotal = orderNeedsStockMoveInfoListSizeTotal + orderNeedsStockMoveInfoListSize>
<tr>
<td><a href="<@o...@ofbizUrl>" class="linktext"><#if shipmentMethodType?exists && shipmentMethodType?has_content>${shipmentMethodType.description}<#else>${groupName?if_exists}</#if></a></td>
- <td><div class="tabletext">${orderReadyToPickInfoListSize}</div></td>
- <td><div class="tabletext">${orderNeedsStockMoveInfoListSize}</div></td>
+ <td>${orderReadyToPickInfoListSize}</td>
+ <td>${orderNeedsStockMoveInfoListSize}</td>
<td>
- <div class="tabletext">
- <#if orderReadyToPickInfoList?has_content>
- <form method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="facilityId" value="${facilityId}"/>
- <#if shipmentMethodType?exists && shipmentMethodType?has_content>
- <input type="hidden" name="shipmentMethodTypeId" value="${shipmentMethodType.shipmentMethodTypeId}"/>
- <#else>
- <input type="hidden" name="orderIdList" value=""/>
- <#assign orderIdsForPickList = orderReadyToPickInfoList?if_exists>
- <#list orderIdsForPickList as orderIdForPickList>
- <input type="hidden" name="orderIdList" value="${orderIdForPickList.orderHeader.orderId}"/>
- </#list>
- </#if>
- ${uiLabelMap.ProductPickFirst}:<input type="text" size="4" name="maxNumberOfOrders" value="20" class="inputBox"/>
- <input type="submit" value="${uiLabelMap.ProductCreatePicklist}" class="smallSubmit"/>
- </form>
- <#else>
-
- </#if>
- </div>
+ <#if orderReadyToPickInfoList?has_content>
+ <form method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="facilityId" value="${facilityId}"/>
+ <#if shipmentMethodType?exists && shipmentMethodType?has_content>
+ <input type="hidden" name="shipmentMethodTypeId" value="${shipmentMethodType.shipmentMethodTypeId}"/>
+ <#else>
+ <input type="hidden" name="orderIdList" value=""/>
+ <#assign orderIdsForPickList = orderReadyToPickInfoList?if_exists>
+ <#list orderIdsForPickList as orderIdForPickList>
+ <input type="hidden" name="orderIdList" value="${orderIdForPickList.orderHeader.orderId}"/>
+ </#list>
+ </#if>
+ ${uiLabelMap.ProductPickFirst}:<input type="text" size="4" name="maxNumberOfOrders" value="20"/>
+ <input type="submit" value="${uiLabelMap.ProductCreatePicklist}"/>
+ </form>
+ <#else>
+ CIAO
+ </#if>
</td>
</tr>
</#list>
<tr>
- <td><div class="tableheadtext">${uiLabelMap.CommonAllMethods}</div></td>
- <td><div class="tableheadtext">${orderReadyToPickInfoListSizeTotal}</div></td>
- <td><div class="tableheadtext">${orderNeedsStockMoveInfoListSizeTotal}</div></td>
+ <th>${uiLabelMap.CommonAllMethods}</div></th>
+ <th>${orderReadyToPickInfoListSizeTotal}</div></th>
+ <th>${orderNeedsStockMoveInfoListSizeTotal}</div></th>
<td>
- <div class="tabletext">
- <#if (orderReadyToPickInfoListSizeTotal > 0)>
- <form method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="facilityId" value="${facilityId}"/>
- ${uiLabelMap.ProductPickFirst}:<input type="text" size="4" name="maxNumberOfOrders" value="20" class="inputBox"/>
- <input type="submit" value="${uiLabelMap.ProductCreatePicklist}" class="smallSubmit"/>
- </form>
- <#else>
-
- </#if>
- </div>
+ <#if (orderReadyToPickInfoListSizeTotal > 0)>
+ <form method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="facilityId" value="${facilityId}"/>
+ ${uiLabelMap.ProductPickFirst}:<input type="text" size="4" name="maxNumberOfOrders" value="20"/>
+ <input type="submit" value="${uiLabelMap.ProductCreatePicklist}"/>
+ </form>
+ <#else>
+
+ </#if>
</td>
</tr>
<#else>
@@ -135,16 +129,15 @@
<div class="boxhead">${shipmentMethodType.description?if_exists} Detail</div>
</div>
<div class="screenlet-body">
- <table border="1" cellspacing="0" cellpadding="2">
+ <table class="basic-table">
<tr>
- <#-- todo: internationalize -->
- <td><div class="tableheadtext">Order ID</div></td>
- <td><div class="tableheadtext">Order Date</div></td>
- <td><div class="tableheadtext">Channel</div></td>
- <td><div class="tableheadtext">Order Item ID</div></td>
- <td><div class="tableheadtext">Description</div></td>
- <td><div class="tableheadtext">Ship Grp ID</div></td>
- <td><div class="tableheadtext">Quantity</div></td>
+ <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>
</tr>
<#list toPickList as toPick>
<#assign oiasgal = toPick.orderItemAndShipGroupAssocList>
@@ -155,16 +148,16 @@
<#assign product = oiasga.getRelatedOne("Product")?if_exists>
<tr>
<td><a href="/ordermgr/control/orderview?orderId=${oiasga.orderId}${externalKeyParam}" class="linktext" target="_blank">${oiasga.orderId}</a></td>
- <td><div class="tabletext">${header.orderDate?string}</div></td>
- <td><div class="tabletext">${(channel.description)?if_exists}</div></td>
- <td><div class="tabletext">${oiasga.orderItemSeqId}</div></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><div class="tabletext">${oiasga.shipGroupSeqId}</div></td>
- <td><div class="tabletext">${oiasga.quantity}</div></td>
+ <td>${oiasga.shipGroupSeqId}</td>
+ <td>${oiasga.quantity}</td>
</tr>
</#list>
<tr>
- <td colspan="7" bgcolor="#CCCCCC"> </td>
+ <td colspan="7"><hr/></td>
</tr>
</#list>
</table>