svn commit: r792855 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: mor
Date: Fri Jul 10 09:34:48 2009 New Revision: 792855 URL: http://svn.apache.org/viewvc?rev=792855&view=rev Log: Removed the No Grouping checkbox from picking screen as per David comments on dev mailing list. Now the default behavior of this screen is that is no grouping method comes pre-selected and results are displayed on the basis of no grouping. Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml ofbiz/trunk/applications/product/servicedef/services_picklist.xml ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=792855&r1=792854&r2=792855&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Fri Jul 10 09:34:48 2009 @@ -67,7 +67,6 @@ <set field="groupByShippingMethod" from-field="parameters.groupByShippingMethod"/> <set field="groupByNoOfOrderItems" from-field="parameters.groupByNoOfOrderItems"/> <set field="groupByWarehouseArea" from-field="parameters.groupByWarehouseArea"/> - <set field="groupByZero" from-field="parameters.groupByZero"/> <now-timestamp field="nowTimestamp"/> <if-not-empty field="parameters.orderId"> <entity-one entity-name="OrderHeader" value-field="orderHeader"/> @@ -116,31 +115,26 @@ <set field="groupName1"/> <!-- Group by Shipping Method --> <set field="groupName2"/> <!-- Group by Warehouse Area --> <set field="groupName3"/> <!-- Group by Number of Order Items --> - <set field="groupName4"/> <!-- No Grouping --> - <!-- If user selects group by zero method, then there is no need to do the grouping --> - <if-compare field="groupByZero" operator="equals" value="Y"> - <set field="groupName4" from-field="orderHeader.orderId"/> - <set field="groupName" from-field="orderHeader.orderId"/> + <!-- If user does not select any grouping method, then skip the grouping part. This is the default behavior of the picking screen --> + <if> + <condition> + <and> + <if-empty field="groupByShippingMethod"/> + <if-empty field="groupByWarehouseArea"/> + <if-empty field="groupByNoOfOrderItems"/> + </and> + </condition> + <then> + <set field="groupName" from-field="orderHeader.orderId"/> + </then> <else> <iterate list="OrderHeaderAndItemFacilityLocationList" entry="orderHeaderAndItemFacilityLocation"> <!-- set groupName for order according to the options selected by the user --> - <if> - <condition> - <or> - <if-compare field="groupByShippingMethod" operator="equals" value="Y"/> - <and> - <if-empty field="groupByShippingMethod"/> - <if-empty field="groupByWarehouseArea"/> - <if-empty field="groupByNoOfOrderItems"/> - <if-empty field="groupByZero"/> - </and> - </or> - </condition> - <then> - <set field="groupName1" from-field="orderHeaderAndItemFacilityLocation.shipmentMethodTypeId"/> - </then> - </if> + + <if-compare field="groupByShippingMethod" operator="equals" value="Y"> + <set field="groupName1" from-field="orderHeaderAndItemFacilityLocation.shipmentMethodTypeId"/> + </if-compare> <if-compare field="groupByWarehouseArea" operator="equals" value="Y"> <set field="groupName2" from-field="orderHeaderAndItemFacilityLocation.areaId"/> @@ -202,7 +196,7 @@ <clear-field field="locations"/> <clear-field field="locationCount"/> </else> - </if-compare> + </if> <iterate entry="orderItemShipGroup" list="orderItemShipGroupList"> <!-- get the order items and the order item inventory res entries --> @@ -384,7 +378,6 @@ <set field="pickMoveInfoMap[groupName].groupName1" from-field="groupName1"/> <set field="pickMoveInfoMap[groupName].groupName2" from-field="groupName2"/> <set field="pickMoveInfoMap[groupName].groupName3" from-field="noOfOrderItems"/> - <set field="pickMoveInfoMap[groupName].groupName4" from-field="groupName4"/> </then> <else> <log level="info" message="Order #${orderHeader.orderId} was not added to pick list [${numberSoFar} of ${parameters.maxNumberOfOrders}] - ${pickThisOrder} / ${allPickStarted}"/> Modified: ofbiz/trunk/applications/product/servicedef/services_picklist.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_picklist.xml?rev=792855&r1=792854&r2=792855&view=diff ============================================================================== --- ofbiz/trunk/applications/product/servicedef/services_picklist.xml (original) +++ ofbiz/trunk/applications/product/servicedef/services_picklist.xml Fri Jul 10 09:34:48 2009 @@ -45,7 +45,6 @@ <attribute name="groupByNoOfOrderItems" type="String" mode="IN" optional="true"/> <attribute name="groupByWarehouseArea" type="String" mode="IN" optional="true"/> <attribute name="groupByShippingMethod" type="String" mode="IN" optional="true"/> - <attribute name="groupByZero" type="String" mode="IN" optional="true"/> <attribute name="orderId" type="String" mode="IN" optional="true"/> </service> @@ -72,7 +71,6 @@ <attribute name="groupByNoOfOrderItems" type="String" mode="IN" optional="true"/> <attribute name="groupByWarehouseArea" type="String" mode="IN" optional="true"/> <attribute name="groupByShippingMethod" type="String" mode="IN" optional="true"/> - <attribute name="groupByZero" type="String" mode="IN" optional="true"/> <attribute name="pickMoveInfoList" type="List" mode="OUT" optional="true"/> <attribute name="orderId" type="String" mode="IN" optional="true"/> </service> 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=792855&r1=792854&r2=792855&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl Fri Jul 10 09:34:48 2009 @@ -29,16 +29,13 @@ <table class="basic-table" cellspacing='0'> <tr> <td class='label'>${uiLabelMap.FacilityGroupByShippingMethod}</td> - <td><input type="checkbox" name="groupByShippingMethod" id="groupByShippingMethod" value="Y" <#if "${requestParameters.groupByWarehouseArea?if_exists}" != "Y" && "${requestParameters.groupByNoOfOrderItems?if_exists}" != "Y" && "${requestParameters.groupByZero?if_exists}" != "Y" || "${requestParameters.groupByShippingMethod?if_exists}" == "Y">checked</#if>/></td> + <td><input type="checkbox" name="groupByShippingMethod" value="Y" <#if "${requestParameters.groupByShippingMethod?if_exists}" == "Y">checked</#if>/></td> <td class='label'>${uiLabelMap.FacilityGroupByWarehouseArea}</td> - <td><input type="checkbox" name="groupByWarehouseArea" id="groupByWarehouseArea" value="Y" <#if "${requestParameters.groupByWarehouseArea?if_exists}" == "Y">checked</#if>/></td> + <td><input type="checkbox" name="groupByWarehouseArea" value="Y" <#if "${requestParameters.groupByWarehouseArea?if_exists}" == "Y">checked</#if>/></td> <td class='label'>${uiLabelMap.FacilityGroupByNoOfOrderItems}</td> - <td><input type="checkbox" name="groupByNoOfOrderItems" id="groupByNoOfOrderItems" value="Y" <#if "${requestParameters.groupByNoOfOrderItems?if_exists}" == "Y">checked</#if>/></td> - - <td class='label'>${uiLabelMap.FacilityNoGrouping}</td> - <td><input type="checkbox" name="groupByZero" id="groupByZero" value="Y" <#if "${requestParameters.groupByZero?if_exists}" == "Y">checked</#if>/></td> + <td><input type="checkbox" name="groupByNoOfOrderItems" value="Y" <#if "${requestParameters.groupByNoOfOrderItems?if_exists}" == "Y">checked</#if>/></td> </tr> <tr> </tr> </table> @@ -57,8 +54,9 @@ <a class="buttontext" align='right' href="<@ofbizUrl>ReviewOrdersNotPickedOrPacked?facilityId=${facilityId}</@ofbizUrl>">${uiLabelMap.FormFieldTitle_reviewOrdersNotPickedOrPacked}</a> </div> <table cellspacing="0" class="basic-table"> + <#if pickMoveInfoList?has_content> <tr class="header-row"> - <#if requestParameters.groupByZero?exists && requestParameters.groupByZero == "Y"> + <#if !((requestParameters.groupByShippingMethod?exists && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?exists && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?exists && requestParameters.groupByNoOfOrderItems == "Y"))> <td>${uiLabelMap.OrderOrder} #</td> <#else> <td>${uiLabelMap.ProductShipmentMethod}</td> @@ -71,6 +69,7 @@ <td> </td> <td> </td> </tr> + </#if> <#if rushOrderInfo?has_content> <#assign orderReadyToPickInfoList = rushOrderInfo.orderReadyToPickInfoList?if_exists> <#assign orderNeedsStockMoveInfoList = rushOrderInfo.orderNeedsStockMoveInfoList?if_exists> @@ -103,7 +102,6 @@ <#assign groupName1 = pickMoveInfo.groupName1?if_exists> <#assign groupName2 = pickMoveInfo.groupName2?if_exists> <#assign groupName3 = pickMoveInfo.groupName3?if_exists> - <#assign groupName4 = pickMoveInfo.groupName4?if_exists> <#assign orderReadyToPickInfoList = pickMoveInfo.orderReadyToPickInfoList?if_exists> <#assign orderNeedsStockMoveInfoList = pickMoveInfo.orderNeedsStockMoveInfoList?if_exists> <#assign orderReadyToPickInfoListSize = (orderReadyToPickInfoList.size())?default(0)> @@ -116,9 +114,8 @@ <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="groupByZero" value="${requestParameters.groupByZero?if_exists}"/> <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> - <#if !groupName4?has_content> + <#if ((requestParameters.groupByShippingMethod?exists && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?exists && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?exists && requestParameters.groupByNoOfOrderItems == "Y"))> <td> <#if groupName1?has_content> <a href="javascript:document.viewGroupDetail_${pickMoveInfo_index}.submit()" class="buttontext">${groupName1}</a> @@ -136,19 +133,19 @@ </td> <#else> <td> - <a href="javascript:document.viewGroupDetail_${pickMoveInfo_index}.submit()" class="buttontext">${groupName4}</a> + <a href="javascript:document.viewGroupDetail_${pickMoveInfo_index}.submit()" class="buttontext">${groupName?if_exists}</a> </td> </#if> </form> <td> - <#if groupName4?has_content> + <#if !((requestParameters.groupByShippingMethod?exists && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?exists && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?exists && requestParameters.groupByNoOfOrderItems == "Y"))> <#if orderReadyToPickInfoListSize == 0 >${uiLabelMap.CommonN}<#else>${uiLabelMap.CommonY}</#if> <#else> ${orderReadyToPickInfoListSize} </#if> </td> <td> - <#if groupName4?has_content> + <#if !((requestParameters.groupByShippingMethod?exists && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?exists && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?exists && requestParameters.groupByNoOfOrderItems == "Y"))> <#if orderNeedsStockMoveInfoListSize == 0>${uiLabelMap.CommonN}<#else>${uiLabelMap.CommonY}</#if> <#else> ${orderNeedsStockMoveInfoListSize} @@ -161,13 +158,12 @@ <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="groupByZero" value="${requestParameters.groupByZero?if_exists}"/> <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 !groupName4?has_content> + <#if ((requestParameters.groupByShippingMethod?exists && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?exists && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?exists && requestParameters.groupByNoOfOrderItems == "Y"))> <span class="label">${uiLabelMap.ProductPickFirst}</span> <input type="text" size="4" name="maxNumberOfOrders" value="20"/> </#if> @@ -185,10 +181,9 @@ <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="groupByZero" value="${requestParameters.groupByZero?if_exists}"/> - <#if groupName4?has_content> + <#if !((requestParameters.groupByShippingMethod?exists && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?exists && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?exists && requestParameters.groupByNoOfOrderItems == "Y"))> <input type="hidden" name="maxNumberOfOrdersToPrint" value="1"/> - <input type="hidden" name="orderId" value="${groupName4}"/> + <input type="hidden" name="orderId" value="${groupName?if_exists}"/> <#else> <span class="label">${uiLabelMap.FormFieldTitle_printPickSheetFirst}</span> <input type="text" size="4" name="maxNumberOfOrdersToPrint" value="20"/> @@ -203,8 +198,8 @@ <#-- toggle the row color --> <#assign alt_row = !alt_row> </#list> - <#if !groupName4?has_content> - <tr<#if !alt_row> class="alternate-row"</#if>> + <#if ((requestParameters.groupByShippingMethod?exists && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?exists && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?exists && requestParameters.groupByNoOfOrderItems == "Y"))> + <tr<#if alt_row> class="alternate-row"</#if>> <th>${uiLabelMap.CommonAllMethods}</div></th> <td> </td> <td> </td> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=792855&r1=792854&r2=792855&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Fri Jul 10 09:34:48 2009 @@ -1182,13 +1182,11 @@ <set field="groupByShippingMethod" from-field="parameters.groupByShippingMethod"/> <set field="groupByWarehouseArea" from-field="parameters.groupByWarehouseArea"/> <set field="groupByNoOfOrderItems" from-field="parameters.groupByNoOfOrderItems"/> - <set field="groupByZero" from-field="parameters.groupByZero"/> <service service-name="findOrdersToPickMove"> <field-map field-name="facilityId"/> <field-map field-name="groupByShippingMethod"/> <field-map field-name="groupByWarehouseArea"/> <field-map field-name="groupByNoOfOrderItems"/> - <field-map field-name="groupByZero"/> </service> <entity-condition entity-name="Picklist" list="picklistActiveList"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |