svn commit: r1292331 - in /ofbiz/trunk/applications: order/widget/ordermgr/LookupScreens.xml product/webapp/facility/inventory/receiveInventory.ftl

[jacopoc]

Author: jacopoc
Date: Wed Feb 22 15:01:21 2012
New Revision: 1292331

URL: http://svn.apache.org/viewvc?rev=1292331&view=rev
Log:
OFBIZ-4710 Applied modified patch from Deepak Dixit to fix the following issues:
* if the user attempts to receive a cancelled order then receive inventory page showing a stack trace
* in the first step of the receiving screen, the autocompletor for lookup purchase order displaying duplicated order ids

Modified:
    ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml
    ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl

Modified: ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml?rev=1292331&r1=1292330&r2=1292331&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml Wed Feb 22 15:01:21 2012
@@ -89,6 +89,7 @@ under the License.
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
                 <set field="entityName" value="OrderHeaderAndShipGroups"/>
                 <set field="searchFields" value="[orderId, orderName, toName]"/>
+                <set field="andCondition" value="${groovy: return org.ofbiz.entity.condition.EntityCondition.makeCondition(org.ofbiz.base.util.UtilMisc.toMap('orderTypeId', 'PURCHASE_ORDER', 'roleTypeId', 'SHIP_FROM_VENDOR'))}"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">

Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1292331&r1=1292330&r2=1292331&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Wed Feb 22 15:01:21 2012
@@ -92,8 +92,8 @@ under the License.
                 <td width="6%">&nbsp;</td>
                 <td width="74%">
                   <b>${purchaseOrder.orderId}</b>&nbsp;/&nbsp;<b>${firstOrderItem.orderItemSeqId}</b>
-                  <#if 1 < purchaseOrderItemsSize>
-                    (${uiLabelMap.ProductMultipleOrderItemsProduct} - ${purchaseOrderItemsSize}:1 ${uiLabelMap.ProductItemProduct})
+                  <#if 1 < purchaseOrderItems.size()>
+                    (${uiLabelMap.ProductMultipleOrderItemsProduct} - ${purchaseOrderItems.size()}:1 ${uiLabelMap.ProductItemProduct})
                   <#else>
                     (${uiLabelMap.ProductSingleOrderItemProduct} - 1:1 ${uiLabelMap.ProductItemProduct})
                   </#if>
@@ -332,7 +332,7 @@ under the License.
             <input type="hidden" name="_useRowSubmit" value="Y"/>
             <#assign rowCount = 0/>
             <table class="basic-table" cellspacing="0">
-              <#if !purchaseOrderItems?exists || purchaseOrderItemsSize == 0>
+              <#if !purchaseOrderItems?exists || purchaseOrderItems.size() == 0>
                 <tr>
                   <td colspan="2">${uiLabelMap.ProductNoItemsPoReceive}.</td>
                 </tr>