svn commit: r441292 - /incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml

[sichen]

Author: sichen
Date: Thu Sep  7 16:07:19 2006
New Revision: 441292

URL: http://svn.apache.org/viewvc?view=rev&rev=441292
Log:
Fixed bug where accepted shipment route segments would show up on list of shipments to be scheduled

Modified:
    incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml

Modified: incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?view=diff&rev=441292&r1=441291&r2=441292
==============================================================================
--- incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Thu Sep  7 16:07:19 2006
@@ -546,6 +546,7 @@
                     <condition-list combine="and">
                         <condition-expr field-name="facilityId" operator="equals" env-name="parameters.facilityId"/>
                         <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PICKED"/>
+                        <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PACKED"/>
                         <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_CANCELLED"/>
                     </condition-list>
                     <order-by field-name="picklistDate"/>
@@ -577,14 +578,17 @@
                 <entity-condition entity-name="PartyRoleAndPartyDetail" list-name="partyRoleAndPartyDetailList" use-cache="true">
                     <condition-expr field-name="roleTypeId" value="PICKER"/>
                 </entity-condition>
+                <!--
                 <entity-condition entity-name="Picklist" list-name="picklistActiveList">
                     <condition-list combine="and">
                         <condition-expr field-name="facilityId" operator="equals" env-name="parameters.facilityId"/>
                         <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PICKED"/>
+                        <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PACKED"/>
                         <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_CANCELLED"/>
                     </condition-list>
                     <order-by field-name="picklistDate"/>
                 </entity-condition>
+                -->
             </actions>
             <widgets>
                 <decorator-screen name="CommonFacilityDecorator">
@@ -720,6 +724,7 @@
                         <condition-expr field-name="originFacilityId" operator="equals" env-name="parameters.facilityId"/>
                         <condition-expr field-name="statusId" operator="equals" value="SHIPMENT_PACKED"/>
                         <condition-expr field-name="carrierServiceStatusId" operator="not-equals" value="SHRSCS_CONFIRMED"/>
+                        <condition-expr field-name="carrierServiceStatusId" operator="not-equals" value="SHRSCS_ACCEPTED"/>
                     </condition-list>
                     <order-by field-name="shipmentId DESC"/>
                 </entity-condition>