svn commit: r730619 - in /ofbiz/trunk: applications/content/script/org/ofbiz/content/content/ applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ applications/manufacturing/script/org/ofbiz/manufacturing/routing/ applications/order/sc...

Author: jleroux
Date: Thu Jan  1 14:32:47 2009
New Revision: 730619

URL: http://svn.apache.org/viewvc?rev=730619&view=rev
Log:
<filter-list-by-date list-name => <filter-list-by-date list
<filter-list-by-date(.*)to-list-name => <filter-list-by-date$1to-list

Modified:
    ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
    ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
    ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
    ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
    ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml
    ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=730619&r1=730618&r2=730619&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Thu Jan  1 14:32:47 2009
@@ -563,7 +563,7 @@
         <iterate entry="mapKey" list="mapKeys">
             <set from-field="mapKey" field="queryMap.mapKey"/>
             <find-by-and list="resultMap" entity-name="ContentAssoc" map="queryMap"/>
-            <filter-list-by-date list-name="resultMap" to-list-name="validContent"/>
+            <filter-list-by-date list="resultMap" to-list="validContent"/>
             <iterate entry="contentAssoc" list="validContent">
                 <field-to-list field="contentAssoc" list="result"/>
             </iterate>

Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml?rev=730619&r1=730618&r2=730619&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml Thu Jan  1 14:32:47 2009
@@ -38,7 +38,7 @@
                 <set field="lookupComponentsMap.workEffortGoodStdTypeId" value="PRUNT_PROD_NEEDED"/>
 
                 <find-by-and entity-name="WorkEffortGoodStandard" list="components" map="lookupComponentsMap"/>
-                <filter-list-by-date list-name="components"/>
+                <filter-list-by-date list="components"/>
                 <!-- now go through each work effort good standard and call a service to issue the inventory -->
                 <iterate list="components" entry="component">
                     <if-not-empty field="component.productId">

Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml?rev=730619&r1=730618&r2=730619&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml Thu Jan  1 14:32:47 2009
@@ -35,7 +35,7 @@
         <if-not-empty field="parameters.workEffortId">
             <set from-field="parameters.workEffortId" field="lookupRouting.workEffortId"/>
             <find-by-and entity-name="WorkEffortGoodStandard" list="routings" map="lookupRouting"/>
-            <filter-list-by-date list-name="routings" valid-date-name="filterDate"/>
+            <filter-list-by-date list="routings" valid-date-name="filterDate"/>
             <first-from-list list="routings" entry="routingGS"/>
             <!-- If the routing is not associated with our product and it's a variant, then
                  check to see if it's virtual product has the routing -->
@@ -51,7 +51,7 @@
                     <set from-field="virtualProductAssoc.productId" field="lookupRouting.productId"/>
                     <find-by-and entity-name="WorkEffortGoodStandard" list="routings" map="lookupRouting"/>
                     <!-- Consider the validity against a date passed as (optional) parameter -->
-                    <filter-list-by-date list-name="routings" valid-date-name="filterDate"/>
+                    <filter-list-by-date list="routings" valid-date-name="filterDate"/>
                     <first-from-list list="routings" entry="routingGS"/>
                 </if-not-empty>
             </if-empty>
@@ -59,7 +59,7 @@
             <else>
                 <find-by-and entity-name="WorkEffortGoodStandard" list="routings" map="lookupRouting"/>
                 <!-- Consider the validity against a date passed as (optional) parameter -->
-                <filter-list-by-date list-name="routings" valid-date-name="filterDate"/>
+                <filter-list-by-date list="routings" valid-date-name="filterDate"/>
                 <!-- TODO: we should consider the quantity to select the best routing -->
                 <first-from-list list="routings" entry="routingGS"/>
                 <!-- If there are no routings associated with our product and it's a variant, then
@@ -71,14 +71,14 @@
                             <condition-expr field-name="productAssocTypeId" value="PRODUCT_VARIANT" />
                         </condition-list>
                     </entity-condition>
-                    <filter-list-by-date list-name="virtualProductAssocList" valid-date-name="filterDate"/>
+                    <filter-list-by-date list="virtualProductAssocList" valid-date-name="filterDate"/>
                     <first-from-list list="virtualProductAssocList" entry="virtualProductAssoc"/>
                     <if-not-empty field="virtualProductAssoc">
                         <set from-field="virtualProductAssoc.productId" field="lookupRouting.productId"/>
                         <set value="ROU_PROD_TEMPLATE" field="lookupRouting.workEffortGoodStdTypeId"/>
                         <find-by-and entity-name="WorkEffortGoodStandard" list="routings" map="lookupRouting"/>
                         <!-- Consider the validity against a date passed as (optional) parameter -->
-                        <filter-list-by-date list-name="routings" valid-date-name="filterDate"/>
+                        <filter-list-by-date list="routings" valid-date-name="filterDate"/>
                         <!-- TODO: we should consider the quantity to select the best routing -->
                         <first-from-list list="routings" entry="routingGS"/>
                     </if-not-empty>
@@ -112,7 +112,7 @@
             <string-to-list string="sequenceNum" list-name="tasksOrder"/>
             <set value="ROUTING_COMPONENT" field="lookupTasks.workEffortAssocTypeId"/>
             <find-by-and entity-name="WorkEffortAssoc" list-name="tasks" map="lookupTasks" order-by-list="tasksOrder"/>
-            <filter-list-by-date list-name="tasks"/>
+            <filter-list-by-date list="tasks"/>
         </if-not-empty>
 
         <field-to-result field="routing"/>
@@ -123,7 +123,7 @@
         <string-to-list string="sequenceNum" list-name="tasksOrder"/>
         <set value="ROUTING_COMPONENT" field="lookupTasks.workEffortAssocTypeId"/>
         <find-by-and entity-name="WorkEffortAssoc" list-name="routingTaskAssocs" map="lookupTasks" order-by-list="tasksOrder"/>
-        <filter-list-by-date list-name="routingTaskAssocs"/>
+        <filter-list-by-date list="routingTaskAssocs"/>
         <field-to-result field="routingTaskAssocs"/>
     </simple-method>
 

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml?rev=730619&r1=730618&r2=730619&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Thu Jan  1 14:32:47 2009
@@ -78,7 +78,7 @@
                     <order-by field-name="lastPrice"/>
                     <order-by field-name="supplierPrefOrderId"/>
                 </entity-condition>
-                <filter-list-by-date list-name="supplierProducts" valid-date-name="requirement.requiredByDate" from-field-name="availableFromDate" thru-field-name="availableThruDate"/>
+                <filter-list-by-date list="supplierProducts" valid-date-name="requirement.requiredByDate" from-field-name="availableFromDate" thru-field-name="availableThruDate"/>
                 <first-from-list list="supplierProducts" entry="supplierProduct"/>
                 <if-not-empty field="supplierProduct.partyId">
                     <make-value value-field="requirementSupplier" entity-name="RequirementRole"/>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=730619&r1=730618&r2=730619&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Thu Jan  1 14:32:47 2009
@@ -78,7 +78,7 @@
         <make-value entity-name="PartyContactMech" value-field="partyContactMechMap"/>
         <set-pk-fields value-field="partyContactMechMap" map="parameters"/>
         <find-by-and entity-name="PartyContactMech" list="partyContactMechs" map="partyContactMechMap"/>
-        <filter-list-by-date list-name="partyContactMechs" to-list-name="validPartyContactMechs"/>
+        <filter-list-by-date list="partyContactMechs" to-list="validPartyContactMechs"/>
         <first-from-list entry="partyContactMech" list="validPartyContactMechs"/>
         <if-empty field="partyContactMech">
             <add-error><fail-property resource="PartyUiLabels" property="PartyCannotUpdateContactBecauseNotWithSpecifiedParty"/></add-error>
@@ -141,7 +141,7 @@
         <make-value entity-name="PartyContactMech" value-field="partyContactMechMap"/>
         <set-pk-fields value-field="partyContactMechMap" map="parameters"/>
         <find-by-and entity-name="PartyContactMech" list="partyContactMechs" map="partyContactMechMap"/>
-        <filter-list-by-date list-name="partyContactMechs" to-list-name="validPartyContactMechs"/>
+        <filter-list-by-date list="partyContactMechs" to-list="validPartyContactMechs"/>
         <first-from-list entry="partyContactMech" list="validPartyContactMechs"/>
         <if-empty field="partyContactMech">
             <add-error>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=730619&r1=730618&r2=730619&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Thu Jan  1 14:32:47 2009
@@ -666,7 +666,7 @@
             <find-by-and entity-name="PartyAndContactMech" map="findMap" list="emailAddressesAll"/>
         </if-empty>
         <now-date-to-env env-name="fromDate"/>
-        <filter-list-by-date list-name="emailAddressesAll" from-field-name="fromDate" to-list-name="emailAddresses"/>
+        <filter-list-by-date list="emailAddressesAll" from-field-name="fromDate" to-list="emailAddresses"/>
         <first-from-list entry="emailAddress" list="emailAddresses"/>
         <field-to-result field="emailAddress.infoString" result-name="emailAddress"/>
     </simple-method>
@@ -689,8 +689,8 @@
         </if-empty>
         <set field="findMap.contactMechTypeId" value="TELECOM_NUMBER"/>
         <find-by-and entity-name="PartyContactDetailByPurpose" map="findMap" list="telephoneAll1"></find-by-and>
-        <filter-list-by-date list-name="telephoneAll1" to-list-name="telephoneAll2" from-field-name="purposeFromDate" thru-field-name="purposeThruDate"/>
-        <filter-list-by-date list-name="telephoneAll2" to-list-name="telephoneAll3"/>
+        <filter-list-by-date list="telephoneAll1" to-list="telephoneAll2" from-field-name="purposeFromDate" thru-field-name="purposeThruDate"/>
+        <filter-list-by-date list="telephoneAll2" to-list="telephoneAll3"/>
         <if-not-empty field="telephoneAll3">
             <iterate entry="type" list="types">
                 <iterate entry="telephone" list="telephoneAll3">
@@ -716,7 +716,7 @@
             </iterate>
             <else>
                 <find-by-and entity-name="PartyAndContactMech" map="findMap" list="telephoneAll1"/>
-                <filter-list-by-date list-name="telephoneAll1" to-list-name="telephoneAll2"/>
+                <filter-list-by-date list="telephoneAll1" to-list="telephoneAll2"/>
                 <first-from-list entry="telephone" list="telephoneAll2"/>
                 <if-not-empty field="telephone.tnCountryCode">
                     <field-to-result field="telephone.tnCountryCode" result-name="countryCode"/>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml?rev=730619&r1=730618&r2=730619&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml Thu Jan  1 14:32:47 2009
@@ -285,7 +285,7 @@
         -->
         <set field="serviceCtx.partyId" value="DemoCustomer"/>
         <find-by-and entity-name="PaymentMethodAndCreditCard" map="serviceCtx" list="paymentMethodAndCreditCards"/>
-        <filter-list-by-date list-name="paymentMethodAndCreditCards"/>
+        <filter-list-by-date list="paymentMethodAndCreditCards"/>
         <first-from-list list="paymentMethodAndCreditCards" entry="paymentMethodAndCreditCard"/>
         <!-- first try with just updating without changing the credit card information -->
         <set-service-fields service-name="updateCreditCard" map="paymentMethodAndCreditCard" to-map="serviceCtx"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=730619&r1=730618&r2=730619&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Thu Jan  1 14:32:47 2009
@@ -292,7 +292,7 @@
                     <set field="virtualProductContext.productId" from-field="product.productId"/>
                     <set field="virtualProductContext.productAssocTypeId" value="PRODUCT_VARIANT"/>                
                     <find-by-and entity-name="ProductAssoc" map="virtualProductContext" list="variantProducts"/>  
-                    <filter-list-by-date list-name="variantProducts"/>
+                    <filter-list-by-date list="variantProducts"/>
                     <if-not-empty field="variantProducts">
                         <iterate entry="variantProduct" list="variantProducts">
                             <!-- log level="info" message = "Variant product =====${variantProduct.productIdTo}"/ -->

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=730619&r1=730618&r2=730619&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Thu Jan  1 14:32:47 2009
@@ -366,7 +366,7 @@
 
         <set field="validDate" from-field="parameters.validDate"/>
         <if-not-empty field="validDate">
-            <filter-list-by-date list-name="productCategoryMembers" valid-date-name="validDate"/>
+            <filter-list-by-date list="productCategoryMembers" valid-date-name="validDate"/>
         </if-not-empty>
 
         <!-- add each to a list to store and then store all and let the entity engine do inserts or updates as needed; much more reliable/useful -->
@@ -383,7 +383,7 @@
             <find-by-and entity-name="ProductCategoryRollup" map="lookupChildrenMap" list="productCategoryRollups"/>
 
             <if-not-empty field="validDate">
-                <filter-list-by-date list-name="productCategoryRollups" valid-date-name="validDate"/>
+                <filter-list-by-date list="productCategoryRollups" valid-date-name="validDate"/>
             </if-not-empty>
 
             <iterate entry="productCategoryRollup" list="productCategoryRollups">
@@ -418,7 +418,7 @@
         </entity-and>
 
         <if-not-empty field="validDate">
-            <filter-list-by-date list-name="categoryEntities" valid-date-name="validDate"/>
+            <filter-list-by-date list="categoryEntities" valid-date-name="validDate"/>
         </if-not-empty>
         
         <!-- add each to a list to store and then store all and let the entity engine do inserts or updates as needed; much more reliable/useful -->
@@ -727,7 +727,7 @@
                     <field-map field-name="partyId" from-field="userLogin.partyId"/>
                     <field-map field-name="roleTypeId" value="LTD_ADMIN"/>
                 </entity-and>
-                <filter-list-by-date list-name="roleCategories" from-field-name="roleFromDate" thru-field-name="roleThruDate"/>
+                <filter-list-by-date list="roleCategories" from-field-name="roleFromDate" thru-field-name="roleThruDate"/>
             </then>
         </if>
         <log level="info" message="Checking category permission, roleCategories=${roleCategories}"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml?rev=730619&r1=730618&r2=730619&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml Thu Jan  1 14:32:47 2009
@@ -46,7 +46,7 @@
         <set from-field="parameters.costUomId" field="costsAndMap.costUomId"/>
         <set from-field="parameters.costComponentTypeId" field="costsAndMap.costComponentTypeId"/>
         <find-by-and entity-name="CostComponent" map="costsAndMap" list="existingCosts"/>
-        <filter-list-by-date list-name="existingCosts"/>
+        <filter-list-by-date list="existingCosts"/>
         <iterate list="existingCosts" entry="existingCost">
             <now-timestamp field="existingCost.thruDate"/>
             <store-value value-field="existingCost"/>
@@ -58,7 +58,7 @@
         <set from-field="parameters.costUomId" field="costsAndMap.costUomId"/>
         <set from-field="parameters.costComponentTypeId" field="costsAndMap.costComponentTypeId"/>
         <find-by-and entity-name="CostComponent" map="costsAndMap" list="existingCosts"/>
-        <filter-list-by-date list-name="existingCosts"/>
+        <filter-list-by-date list="existingCosts"/>
         <iterate list="existingCosts" entry="existingCost">
             <now-timestamp field="existingCost.thruDate"/>
             <store-value value-field="existingCost"/>
@@ -81,22 +81,22 @@
         <!-- Route costs -->
         <set value="${parameters.costComponentTypePrefix}_ROUTE_COST" field="costsAndMap.costComponentTypeId"/>
         <find-by-and entity-name="CostComponent" map="costsAndMap" list="routeCosts"/>
-        <filter-list-by-date list-name="routeCosts"/>
+        <filter-list-by-date list="routeCosts"/>
         <first-from-list list="routeCosts" entry="routeCost"/>
         <!-- Labor costs -->
         <set value="${parameters.costComponentTypePrefix}_LABOR_COST" field="costsAndMap.costComponentTypeId"/>
         <find-by-and entity-name="CostComponent" map="costsAndMap" list="laborCosts"/>
-        <filter-list-by-date list-name="laborCosts"/>
+        <filter-list-by-date list="laborCosts"/>
         <first-from-list list="laborCosts" entry="laborCost"/>
         <!-- Materials costs -->
         <set value="${parameters.costComponentTypePrefix}_MAT_COST" field="costsAndMap.costComponentTypeId"/>
         <find-by-and entity-name="CostComponent" map="costsAndMap" list="materialsCosts"/>
-        <filter-list-by-date list-name="materialsCosts"/>
+        <filter-list-by-date list="materialsCosts"/>
         <first-from-list list="materialsCosts" entry="materialsCost"/>
         <!-- Other costs -->
         <set value="${parameters.costComponentTypePrefix}_OTHER_COST" field="costsAndMap.costComponentTypeId"/>
         <find-by-and entity-name="CostComponent" map="costsAndMap" list="otherCosts"/>
-        <filter-list-by-date list-name="otherCosts"/>
+        <filter-list-by-date list="otherCosts"/>
         <first-from-list list="otherCosts" entry="otherCost"/>
         
         <set field="productCost" value="0" type="Double" />
@@ -113,7 +113,7 @@
             <set from-field="product.productId" field="assocAndMap.productIdTo"/>
             <set value="PRODUCT_VARIANT" field="assocAndMap.productAssocTypeId"/>
             <find-by-and entity-name="ProductAssoc" map="assocAndMap" list="virtualAssocs"/>
-            <filter-list-by-date list-name="virtualAssocs"/>
+            <filter-list-by-date list="virtualAssocs"/>
             <first-from-list list="virtualAssocs" entry="virtualAssoc"/>
             <if-not-empty field="virtualAssoc">
                 <set from-field="virtualAssoc.productId" field="inputMap.productId"/>
@@ -132,7 +132,7 @@
             <set from-field="parameters.productId" field="costsAndMap.productId"/>
             <set from-field="parameters.currencyUomId" field="costsAndMap.currencyUomId"/>
             <find-by-and entity-name="SupplierProduct" map="costsAndMap" list-name="priceCosts" order-by-list="orderByList"/>
-            <filter-list-by-date list-name="priceCosts" from-field-name="availableFromDate" thru-field-name="availableThruDate"/>
+            <filter-list-by-date list="priceCosts" from-field-name="availableFromDate" thru-field-name="availableThruDate"/>
             <first-from-list list="priceCosts" entry="priceCost"/>
             <if-not-empty field="priceCost.lastPrice">
                 <set from-field="priceCost.lastPrice" field="productCost"/>
@@ -145,7 +145,7 @@
                 <set from-field="parameters.productId" field="costsAndMap.productId"/>
                 <set from-field="parameters.productPriceTypeId" field="costsAndMap.productPriceTypeId"/>
                 <find-by-and entity-name="SupplierProduct" map="costsAndMap" list-name="priceCosts" order-by-list="orderByList"/>
-                <filter-list-by-date list-name="priceCosts" from-field-name="availableFromDate" thru-field-name="availableThruDate"/>
+                <filter-list-by-date list="priceCosts" from-field-name="availableFromDate" thru-field-name="availableThruDate"/>
                 <first-from-list list="priceCosts" entry="priceCost"/>
                 <if-not-empty field="priceCost.lastPrice">
                     <!-- we try to convert the lastPrice to the desired currency -->
@@ -166,7 +166,7 @@
             <set from-field="parameters.currencyUomId" field="costsAndMap.currencyUomId"/>
             <set from-field="parameters.productPriceTypeId" field="costsAndMap.productPriceTypeId"/>
             <find-by-and entity-name="ProductPrice" map="costsAndMap" list="priceCosts"/>
-            <filter-list-by-date list-name="priceCosts"/>
+            <filter-list-by-date list="priceCosts"/>
             <first-from-list list="priceCosts" entry="priceCost"/>
             <if-not-empty field="priceCost.price">
                 <set from-field="priceCost.price" field="productCost"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=730619&r1=730618&r2=730619&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Thu Jan  1 14:32:47 2009
@@ -416,7 +416,7 @@
                 <set field="getAssoc.productIdTo" from-field="product.productId"/>
                 <set field="getAssoc.productAssocTypeId" value="PRODUCT_VARIANT"/>
                 <find-by-and entity-name="ProductAssoc" map="getAssoc" list="assocs"/>
-                <filter-list-by-date list-name="assocs" to-list-name="assocsDate"/>
+                <filter-list-by-date list="assocs" to-list="assocsDate"/>
                 <first-from-list entry="assoc" list="assocsDate"/>
                 <get-related-one value-field="assoc" relation-name="MainProduct" to-value-field="virtProduct"/>
                 <if-empty field="product.salesDiscWhenNotAvail">
@@ -453,7 +453,7 @@
                         <set field="getFromAssoc.productId" from-field="virtProduct.productId"/>
                         <set field="getFromAssoc.productAssocTypeId" value="PRODUCT_VARIANT"/>
                         <find-by-and entity-name="ProductAssoc" map="getFromAssoc" list="assocs"/>
-                        <filter-list-by-date list-name="assocs" to-list-name="assocsDate"/>
+                        <filter-list-by-date list="assocs" to-list="assocsDate"/>
                         <if-empty field="assocsDate">
                             <set from-field="virtProduct.productId" field="discontinueProductSalesMap.productId"/>
                             <call-service service-name="discontinueProductSales" in-map-name="discontinueProductSalesMap"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=730619&r1=730618&r2=730619&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml Thu Jan  1 14:32:47 2009
@@ -60,7 +60,7 @@
         <make-value entity-name="FacilityContactMech" value-field="facilityContactMechMap"/>
         <set-pk-fields value-field="facilityContactMechMap" map="parameters"/>
         <find-by-and entity-name="FacilityContactMech" list="facilityContactMechs" map="facilityContactMechMap"/>
-        <filter-list-by-date list-name="facilityContactMechs" to-list-name="validFacilityContactMechs"/>
+        <filter-list-by-date list="facilityContactMechs" to-list="validFacilityContactMechs"/>
         <first-from-list entry="facilityContactMech" list="validFacilityContactMechs"/>
         <if-empty field="facilityContactMech">
             <add-error><fail-message message="ERROR: Cannot update specified contact info because it does not correspond to the specified facility"/></add-error>
@@ -127,7 +127,7 @@
         <make-value entity-name="FacilityContactMech" value-field="facilityContactMechMap"/>
         <set-pk-fields value-field="facilityContactMechMap" map="parameters"/>
         <find-by-and entity-name="FacilityContactMech" list="facilityContactMechs" map="facilityContactMechMap"/>
-        <filter-list-by-date list-name="facilityContactMechs" to-list-name="validFacilityContactMechs"/>
+        <filter-list-by-date list="facilityContactMechs" to-list="validFacilityContactMechs"/>
 
         <first-from-list entry="facilityContactMech" list="validFacilityContactMechs"/>
         <if-empty field="facilityContactMech">
@@ -287,7 +287,7 @@
         <set field="lookUpMap.contactMechId" from-field="parameters.contactMechId" />
         <set field="lookUpMap.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId" />
         <find-by-and entity-name="FacilityContactMechPurpose" map="lookUpMap" list="purposeList"/>
-        <filter-list-by-date list-name="purposeList"/>
+        <filter-list-by-date list="purposeList"/>
 
         <if-not-empty field="purposeList">
             <add-error><fail-message message="Could not create new purpose, a purpose with that type already exists"/></add-error>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=730619&r1=730618&r2=730619&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Thu Jan  1 14:32:47 2009
@@ -82,7 +82,7 @@
                 <!-- expire all the facilities -->
                 <set from-field="store.productStoreId" field="lookupPFMap.productStoreId"/>
                 <find-by-and entity-name="ProductStoreFacility" map="lookupPFMap" list="storeFacilities"/>
-                <filter-list-by-date list-name="storeFacilities"/>
+                <filter-list-by-date list="storeFacilities"/>
                 <iterate list="storeFacilities" entry="facility">
                     <set from-field="nowTimestamp" field="facility.thruDate"/>
                     <store-value value-field="facility"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=730619&r1=730618&r2=730619&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Thu Jan  1 14:32:47 2009
@@ -202,7 +202,7 @@
                 <set field="assignPartyToWorkEffortShip.workEffortId" from-field="lookedUpValue.estimatedShipWorkEffId"/>
                 <set field="assignPartyToWorkEffortShip.partyId" from-field="parameters.partyIdFrom"/>
                 <find-by-and entity-name="WorkEffortPartyAssignment" list="existingShipWepas" map="assignPartyToWorkEffortShip"/>
-                <filter-list-by-date list-name="existingShipWepas"/>
+                <filter-list-by-date list="existingShipWepas"/>
                 <if-empty field="existingShipWepas">
                     <set field="assignPartyToWorkEffortShip.roleTypeId" value="CAL_ATTENDEE"/>
                     <set field="assignPartyToWorkEffortShip.statusId" value="CAL_SENT"/>
@@ -222,7 +222,7 @@
                 <set field="assignPartyToWorkEffortArrival.workEffortId" from-field="lookedUpValue.estimatedArrivalWorkEffId"/>
                 <set field="assignPartyToWorkEffortArrival.partyId" from-field="parameters.partyIdTo"/>
                 <find-by-and entity-name="WorkEffortPartyAssignment" list="existingArrivalWepas" map="assignPartyToWorkEffortArrival"/>
-                <filter-list-by-date list-name="existingArrivalWepas"/>
+                <filter-list-by-date list="existingArrivalWepas"/>
                 <if-empty field="existingArrivalWepas">
                     <set field="assignPartyToWorkEffortArrival.roleTypeId" value="CAL_ATTENDEE"/>
                     <set field="assignPartyToWorkEffortArrival.statusId" value="CAL_SENT"/>

Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml?rev=730619&r1=730618&r2=730619&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml Thu Jan  1 14:32:47 2009
@@ -139,7 +139,7 @@
                 <log level="always" message="Running find-by-and: ${lookupRoleWorkEffortMap}"/>
                 
                 <find-by-and entity-name="WorkEffortPartyAssignment" map="lookupRoleWorkEffortMap" list="roleParties"/>
-                <filter-list-by-date list-name="roleParties"/>
+                <filter-list-by-date list="roleParties"/>
                 <log level="always" message="Found role parties: ${roleParties}"/>
                 
                 <if-empty field="roleParties">
@@ -147,7 +147,7 @@
                     <set value="CAL_DELEGATE" field="lookupRoleWorkEffortMap.roleTypeId"/>
                     <find-by-and entity-name="WorkEffortPartyAssignment" map="lookupRoleWorkEffortMap" list="roleParties"/>
                 </if-empty>
-                <filter-list-by-date list-name="roleParties"/>
+                <filter-list-by-date list="roleParties"/>
 
                 <if-not-empty field="roleParties">
                     <set field="hasPermission" type="Boolean" value="true"/>
@@ -188,7 +188,7 @@
                 <set from-field="workEffortId" field="lookupRoleWorkEffortMap.workEffortId"/>
                 <set from-field="userLogin.partyId" field="lookupRoleWorkEffortMap.partyId"/>
                 <find-by-and entity-name="WorkEffortPartyAssignment" map="lookupRoleWorkEffortMap" list="roleParties"/>
-                <filter-list-by-date list-name="roleParties"/>
+                <filter-list-by-date list="roleParties"/>
 
                 <if-not-empty field="roleParties">
                     <set field="hasPermission" type="Boolean" value="true"/>
@@ -231,7 +231,7 @@
             <set from-field="workEffortId" field="lookupRoleWorkEffortMap.workEffortId"/>
             <set from-field="userLogin.partyId" field="lookupRoleWorkEffortMap.partyId"/>
             <find-by-and entity-name="WorkEffortPartyAssignByRole" map="lookupRoleWorkEffortMap" list="roleParties"/>                    
-            <filter-list-by-date list-name="roleParties"/>
+            <filter-list-by-date list="roleParties"/>
             <if-empty field="roleParties">
                 <property-to-field resource="WorkEffortUiLabels" property="WorkEffortTimeSheetNotInRolePermissionError" field="failMessage"/>
                 <set field="hasPermission" type="Boolean" value="false"/>
@@ -257,7 +257,7 @@
                 <log level="info" message="Running find-by-and: ${lookupPartyRoleWorkEffortMap}"/>
   
                 <find-by-and entity-name="WorkEffortPartyAssignView" map="lookupPartyRoleWorkEffortMap" list="rolePartyGroups"/>
-                <filter-list-by-date list-name="rolePartyGroups"/>
+                <filter-list-by-date list="rolePartyGroups"/>
                 <log level="always" message="Found role parties Group: ${rolePartyGroups}"/>
                 
                 <if-empty field="rolePartyGroups">
@@ -265,7 +265,7 @@
                     <set value="CAL_DELEGATE" field="lookupRoleWorkEffortMap.roleTypeId"/>
                     <find-by-and entity-name="WorkEffortPartyAssignView" map="lookupRoleWorkEffortMap" list="rolePartyGroups"/>
                 </if-empty>
-                <filter-list-by-date list-name="rolePartyGroups"/>
+                <filter-list-by-date list="rolePartyGroups"/>
                 <if-not-empty field="rolePartyGroups">
                     <!-- Check to see if User is member of any of these Party groups -->
                     <iterate entry="rolePartyGroup" list="rolePartyGroups">

Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=730619&r1=730618&r2=730619&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Thu Jan  1 14:32:47 2009
@@ -838,7 +838,7 @@
         <set from-field="workEffort.workEffortId" field="findMap.workEffortId"/>
         <set from-field="workEffort.fixedAssetId" field="findMap.fixedAssetId"/>
         <find-by-and entity-name="WorkEffortFixedAssetAssign" map="findMap" list="existingAssignments"/>
-        <filter-list-by-date list-name="existingAssignments"/>
+        <filter-list-by-date list="existingAssignments"/>
         <iterate list="existingAssignments" entry="existingAssignment">
             <remove-value value-field="existingAssignment"/>
         </iterate>
@@ -1164,7 +1164,7 @@
         </if-not-empty>
         <if-not-empty field="parameters.duplicateWorkEffortAssignmentRates">
             <find-by-and entity-name="RateAmount" map="workEffortFindContext" list="foundValuesAll"/>
-            <filter-list-by-date list-name="foundValuesAll" to-list-name="foundValues"/>
+            <filter-list-by-date list="foundValuesAll" to-list="foundValues"/>
             <iterate entry="foundValue" list="foundValues">
                 <clone-value value-name="foundValue" new-value-name="newTempValue"/>
                 <set from-field="parameters.workEffortId" field="newTempValue.workEffortId"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=730619&r1=730618&r2=730619&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Thu Jan  1 14:32:47 2009
@@ -538,7 +538,7 @@
         
         <!-- copy assigned parties -->
         <get-related value-field="project" relation-name="WorkEffortPartyAssignment" list="partiesAll"/>
-        <filter-list-by-date list-name="partiesAll" to-list="parties"/>
+        <filter-list-by-date list="partiesAll" to-list="parties"/>
         <if-not-empty field="parties">
             <iterate entry="party" list="parties">
                 <set field="parameters.workEffortId" from-field="newProjectId"/>            
@@ -967,7 +967,7 @@
         <if-compare field="lowInfo.workEffortTypeId" value="TASK" operator="equals">
             <if-compare field="lowInfo.currentStatusId" value="PTS_CREATED" operator="equals">
                 <get-related value-field="lowInfo" relation-name="WorkEffortPartyAssignment" list="assignsAll"/>
-                <filter-list-by-date list-name="assignsAll" to-list="assigns"/>
+                <filter-list-by-date list="assignsAll" to-list="assigns"/>
                 <if-not-empty field="assigns">
                     <set field="lowInfo.currentStatusId" value="PTS_CREATED_AS"/><!-- task is assigned -->
                 </if-not-empty>