svn commit: r739999 - in /ofbiz/trunk/applications: manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml order/script/org/ofbiz/order/requirement/RequirementServices.xml product/script/org/ofbiz/product/category/CategoryServices.xml

Author: jleroux
Date: Mon Feb  2 15:21:02 2009
New Revision: 739999

URL: http://svn.apache.org/viewvc?rev=739999&view=rev
Log:
<if-instance-of field-name => <if-instance-of field
<filter-list-by-date(.*)valid-date-name => <filter-list-by-date $1valid-date

Modified:
    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/product/script/org/ofbiz/product/category/CategoryServices.xml

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=739999&r1=739998&r2=739999&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 Mon Feb  2 15:21:02 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="routings" valid-date-name="filterDate"/>
+            <filter-list-by-date list="routings" valid-date="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="routings" valid-date-name="filterDate"/>
+                    <filter-list-by-date list="routings" valid-date="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="routings" valid-date-name="filterDate"/>
+                <filter-list-by-date list="routings" valid-date="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="virtualProductAssocList" valid-date-name="filterDate"/>
+                    <filter-list-by-date list="virtualProductAssocList" valid-date="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="routings" valid-date-name="filterDate"/>
+                        <filter-list-by-date list="routings" valid-date="filterDate"/>
                         <!-- TODO: we should consider the quantity to select the best routing -->
                         <first-from-list list="routings" entry="routingGS"/>
                     </if-not-empty>

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=739999&r1=739998&r2=739999&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 Mon Feb  2 15:21:02 2009
@@ -78,7 +78,7 @@
                     <order-by field-name="lastPrice"/>
                     <order-by field-name="supplierPrefOrderId"/>
                 </entity-condition>
-                <filter-list-by-date list="supplierProducts" valid-date-name="requirement.requiredByDate" from-field-name="availableFromDate" thru-field-name="availableThruDate"/>
+                <filter-list-by-date list="supplierProducts" valid-date="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/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=739999&r1=739998&r2=739999&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 Mon Feb  2 15:21:02 2009
@@ -127,7 +127,7 @@
     </simple-method>
 
     <simple-method method-name="addProductToCategories" short-description="Add Product to Multiple Categories">
-        <if-instance-of field-name="parameters.categories" class="java.util.List">
+        <if-instance-of field="parameters.categories" class="java.util.List">
             <iterate entry="category" list="parameters.categories">
                 <!-- note that the security semantics require the user to have the general admin permission,
                     or the role limited permission and association with the category, not the product -->
@@ -279,7 +279,7 @@
         <create-value value-field="newEntity"/>
     </simple-method>
     <simple-method method-name="addProductCategoryToCategories" short-description="Add ProductCategory to Categories">
-        <if-instance-of field-name="parameters.categories" class="java.util.List">
+        <if-instance-of field="parameters.categories" class="java.util.List">
             <iterate entry="category" list="parameters.categories">
                 <set field="callingMethodName" value="addProductCategoryToCategories"/>
                 <set field="checkAction" value="CREATE"/>
@@ -366,7 +366,7 @@
 
         <set field="validDate" from-field="parameters.validDate"/>
         <if-not-empty field="validDate">
-            <filter-list-by-date list="productCategoryMembers" valid-date-name="validDate"/>
+            <filter-list-by-date list="productCategoryMembers" valid-date="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="productCategoryRollups" valid-date-name="validDate"/>
+                <filter-list-by-date list="productCategoryRollups" valid-date="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="categoryEntities" valid-date-name="validDate"/>
+            <filter-list-by-date list="categoryEntities" valid-date="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 -->