You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2009/05/28 10:59:44 UTC
svn commit: r779491 - in /ofbiz/trunk/applications/product:
config/ProductUiLabels.xml webapp/facility/facility/PicklistOptions.ftl
Author: mor
Date: Thu May 28 08:59:44 2009
New Revision: 779491
URL: http://svn.apache.org/viewvc?rev=779491&view=rev
Log:
On find orders to pick screen in facility, added grouping methods in separate columns. Earlier all of them were coming up in a single column. Patch from Parimal Gain.
Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=779491&r1=779490&r2=779491&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Thu May 28 08:59:44 2009
@@ -13766,6 +13766,9 @@
<value xml:lang="fr">nombre</value>
<value xml:lang="it">numero</value>
</property>
+ <property key="ProductNumberOfOrderItems">
+ <value xml:lang="en">Number of Order Items</value>
+ </property>
<property key="ProductNumberQuantity">
<value xml:lang="de">Nummer / Menge</value>
<value xml:lang="en">Number / Quantity</value>
@@ -19936,6 +19939,9 @@
<value xml:lang="th">Void UPS Shipment Confirmation</value>
<value xml:lang="zh">空UPSè´§è¿ç¡®è®¤</value>
</property>
+ <property key="ProductWareHouseArea">
+ <value xml:lang="en">WareHouse Area</value>
+ </property>
<property key="ProductWarningOrderStatus">
<value xml:lang="de">ACHTUNG: Auftragsstatus ist</value>
<value xml:lang="en">WARNING: Order Status is</value>
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?rev=779491&r1=779490&r2=779491&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl Thu May 28 08:59:44 2009
@@ -54,7 +54,9 @@
</div>
<table cellspacing="0" class="basic-table">
<tr class="header-row">
- <td>${uiLabelMap.FacilityGroupName}</td>
+ <td>${uiLabelMap.ProductShipmentMethod}</td>
+ <td>${uiLabelMap.ProductWareHouseArea}</td>
+ <td>${uiLabelMap.ProductNumberOfOrderItems}</td>
<td>${uiLabelMap.ProductReadyToPick}</td>
<td>${uiLabelMap.ProductNeedStockMove}</td>
<td> </td>
@@ -100,28 +102,28 @@
<#assign orderReadyToPickInfoListSizeTotal = orderReadyToPickInfoListSizeTotal + orderReadyToPickInfoListSize>
<#assign orderNeedsStockMoveInfoListSizeTotal = orderNeedsStockMoveInfoListSizeTotal + orderNeedsStockMoveInfoListSize>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
- <td>
- <form name="viewGroupDetail_${pickMoveInfo_index}" action="<@o...@ofbizUrl>" method="post">
- <input type ="hidden" name="viewDetail" value= "${groupName?if_exists}"/>
- <input type="hidden" name="groupByShippingMethod" value="${requestParameters.groupByShippingMethod?if_exists}"/>
- <input type="hidden" name="groupByWarehouseArea" value="${requestParameters.groupByWarehouseArea?if_exists}"/>
- <input type="hidden" name="groupByNoOfOrderItems" value="${requestParameters.groupByNoOfOrderItems?if_exists}"/>
- <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
- <table>
- <tr>
- <#if groupName1?has_content>
- <td><a href="javascript:document.viewGroupDetail_${pickMoveInfo_index}.submit()" class="buttontext">${groupName1}</a></td>
- </#if>
- <#if groupName2?has_content>
- <td><a href="javascript:document.viewGroupDetail_${pickMoveInfo_index}.submit()" class="buttontext">${groupName2}</a></td>
- </#if>
- <#if groupName3?has_content>
- <td><a href="javascript:document.viewGroupDetail_${pickMoveInfo_index}.submit()" class="buttontext">${groupName3}</a></td>
- </#if>
- </tr>
- </table>
- </form>
- </td>
+ <form name="viewGroupDetail_${pickMoveInfo_index}" action="<@o...@ofbizUrl>" method="post">
+ <input type ="hidden" name="viewDetail" value= "${groupName?if_exists}"/>
+ <input type="hidden" name="groupByShippingMethod" value="${requestParameters.groupByShippingMethod?if_exists}"/>
+ <input type="hidden" name="groupByWarehouseArea" value="${requestParameters.groupByWarehouseArea?if_exists}"/>
+ <input type="hidden" name="groupByNoOfOrderItems" value="${requestParameters.groupByNoOfOrderItems?if_exists}"/>
+ <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
+ <td>
+ <#if groupName1?has_content>
+ <a href="javascript:document.viewGroupDetail_${pickMoveInfo_index}.submit()" class="buttontext">${groupName1}</a>
+ </#if>
+ </td>
+ <td>
+ <#if groupName2?has_content>
+ <a href="javascript:document.viewGroupDetail_${pickMoveInfo_index}.submit()" class="buttontext">${groupName2}</a>
+ </#if>
+ </td>
+ <td>
+ <#if groupName3?has_content>
+ <a href="javascript:document.viewGroupDetail_${pickMoveInfo_index}.submit()" class="buttontext">${groupName3}</a></td>
+ </#if>
+ </td>
+ </form>
<td>${orderReadyToPickInfoListSize}</td>
<td>${orderNeedsStockMoveInfoListSize}</td>
<td>
@@ -166,6 +168,8 @@
</#list>
<tr>
<th>${uiLabelMap.CommonAllMethods}</div></th>
+ <td> </td>
+ <td> </td>
<th>${orderReadyToPickInfoListSizeTotal}</div></th>
<th>${orderNeedsStockMoveInfoListSizeTotal}</div></th>
<td>