[OFBiz] SVN: r7893 - in trunk/applications/product/webapp/facility: WEB-INF/actions/inventory inventory

[jacopo@svn.ofbiz.org]

Author: jacopo
Date: 2006-06-28 09:26:47 -0500 (Wed, 28 Jun 2006)
New Revision: 7893

Modified:
   trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/receiveInventory.bsh
   trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
Log:
Fixed bug where purchase shipments were filtered in the inventory receive screen: the wrong 'received' status wes checked (the one for sales shipments instead of the one for purchase shipments).


Modified: trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/receiveInventory.bsh
===================================================================
--- trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/receiveInventory.bsh	2006-06-28 13:09:29 UTC (rev 7892)
+++ trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/receiveInventory.bsh	2006-06-28 14:26:47 UTC (rev 7893)
@@ -63,7 +63,7 @@
         while (issueIter.hasNext()) {
             issuance = issueIter.next();
             shipment = issuance.getRelatedOne("Shipment");
-            if (!"SHIPMENT_DELIVERED".equals(shipment.getString("statusId")) &&
+            if (!"PURCH_SHIP_RECEIVED".equals(shipment.getString("statusId")) &&
                 !"SHIPMENT_CANCELLED".equals(shipment.getString("statusId")) &&
                 (shipment.getString("destinationFacilityId") == null || facilityId.equals(shipment.getString("destinationFacilityId")))) {
                 shipments.add(shipment);

Modified: trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
===================================================================
--- trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl	2006-06-28 13:09:29 UTC (rev 7892)
+++ trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl	2006-06-28 14:26:47 UTC (rev 7893)
@@ -239,7 +239,7 @@
   </form>
 
 <#-- Select Shipment Screen -->
-<#elseif requestParameters.initialSelected?exists && !requestParameters.shipmentId?exists && shipments?has_content>
+<#elseif requestParameters.initialSelected?exists && !requestParameters.shipmentId?exists>
   <form method="post" action="<@ofbizUrl>ReceiveInventory</@ofbizUrl>" name="selectAllForm" style="margin: 0;">
     <#-- general request fields -->
     <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/>