Author: jleroux
Date: Thu Jan 1 14:34:03 2009
New Revision: 730620
URL: http://svn.apache.org/viewvc?rev=730620&view=rev
Log:
<find-by-and(.*)list-name= => <find-by-and$1list=
Modified:
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/order/OrderReturnServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
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=730620&r1=730619&r2=730620&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:34:03 2009
@@ -109,13 +109,13 @@
<if-not-empty field="parameters.locationSeqId">
<set from-field="parameters.locationSeqId"
field="lookupFieldMap.locationSeqId"/>
</if-not-empty>
- <find-by-and entity-name="InventoryItem" map="lookupFieldMap"
list-name="primaryInventoryItemList" order-by-list="orderByList"/>
+ <find-by-and entity-name="InventoryItem" map="lookupFieldMap"
list="primaryInventoryItemList" order-by-list="orderByList"/>
<set from-field="primaryInventoryItemList"
field="inventoryItemList"/>
<!-- if secondaryLocationSeqId is also passed, then also the
inventory items in the secondary location are considered, after the ones in the
main location -->
<if-not-empty field="parameters.locationSeqId">
<if-not-empty field="parameters.secondaryLocationSeqId">
<set from-field="parameters.secondaryLocationSeqId"
field="lookupFieldMap.locationSeqId"/>
- <find-by-and entity-name="InventoryItem"
map="lookupFieldMap" list-name="secondaryInventoryItemList"
order-by-list="orderByList"/>
+ <find-by-and entity-name="InventoryItem"
map="lookupFieldMap" list="secondaryInventoryItemList"
order-by-list="orderByList"/>
<list-to-list list-name="secondaryInventoryItemList"
to-list-name="inventoryItemList"/>
</if-not-empty>
</if-not-empty>
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=730620&r1=730619&r2=730620&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:34:03 2009
@@ -111,7 +111,7 @@
<set from-field="routing.workEffortId"
field="lookupTasks.workEffortIdFrom"/>
<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"/>
+ <find-by-and entity-name="WorkEffortAssoc" list="tasks"
map="lookupTasks" order-by-list="tasksOrder"/>
<filter-list-by-date list="tasks"/>
</if-not-empty>
@@ -122,7 +122,7 @@
<set from-field="parameters.workEffortId"
field="lookupTasks.workEffortIdFrom"/>
<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"/>
+ <find-by-and entity-name="WorkEffortAssoc" list="routingTaskAssocs"
map="lookupTasks" order-by-list="tasksOrder"/>
<filter-list-by-date list="routingTaskAssocs"/>
<field-to-result field="routingTaskAssocs"/>
</simple-method>
Modified:
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=730620&r1=730619&r2=730620&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
(original)
+++
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
Thu Jan 1 14:34:03 2009
@@ -383,7 +383,7 @@
<set from-field="parameters.returnId" field="newEntity.returnId"/>
<set from-field="parameters.returnId" field="lookupMap.returnId"/>
<string-to-list string="-returnItemSeqId" list-name="orderBy"/>
- <find-by-and entity-name="ReturnItem" list-name="currentItems"
map="lookupMap" order-by-list="orderBy"></find-by-and>
+ <find-by-and entity-name="ReturnItem" list="currentItems"
map="lookupMap" order-by-list="orderBy"></find-by-and>
<if-empty field="currentItems">
<set value="1" field="newEntity.returnItemSeqId"/>
<else>
Modified:
ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=730620&r1=730619&r2=730620&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
(original)
+++
ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
Thu Jan 1 14:34:03 2009
@@ -286,7 +286,7 @@
<string-to-list string="-custRequestDate" list-name="orderByList"/>
<string-to-list string="-createdDate" list-name="orderByList"/>
- <find-by-and entity-name="CustRequestAndRole"
list-name="custRequestAndRoles" map="lookupMap" order-by-list="orderByList"/>
+ <find-by-and entity-name="CustRequestAndRole"
list="custRequestAndRoles" map="lookupMap" order-by-list="orderByList"/>
<field-to-result field="custRequestAndRoles"
result-name="custRequestAndRoles"/>
</simple-method>
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=730620&r1=730619&r2=730620&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:34:03 2009
@@ -132,7 +132,7 @@
<field-to-list list="orderByStringList" field="orderByString"/>
<set field="productCategoryRollUpContext.parentProductCategoryId"
from-field="parameters.parentProductCategoryId" />
<!--set field="categories" from-field="parameters.categories" / -->
- <find-by-and entity-name="ProductCategoryRollup" list-name="rollups"
map="productCategoryRollUpContext" order-by-list="orderByStringList"/>
+ <find-by-and entity-name="ProductCategoryRollup" list="rollups"
map="productCategoryRollUpContext" order-by-list="orderByStringList"/>
<if-not-empty field="parameters.categories">
<list-to-list list-name="parameters.categories"
to-list-name="categories"/>
</if-not-empty>
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=730620&r1=730619&r2=730620&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:34:03 2009
@@ -131,7 +131,7 @@
<clear-field field="costsAndMap"/>
<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"/>
+ <find-by-and entity-name="SupplierProduct" map="costsAndMap"
list="priceCosts" order-by-list="orderByList"/>
<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">
@@ -144,7 +144,7 @@
<clear-field field="costsAndMap"/>
<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"/>
+ <find-by-and entity-name="SupplierProduct" map="costsAndMap"
list="priceCosts" order-by-list="orderByList"/>
<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">
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml?rev=730620&r1=730619&r2=730620&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml
(original)
+++
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml
Thu Jan 1 14:34:03 2009
@@ -111,7 +111,7 @@
<field-to-list field="orderByString" list="orderByList"/>
<set field="lookupFieldMap.productId"
from-field="orderItem.productId" />
<set field="lookupFieldMap.facilityId"
from-field="orderHeader.originFacilityId" />
- <find-by-and entity-name="InventoryItem" map="lookupFieldMap"
list-name="inventoryItemList" order-by-list="orderByList"/>
+ <find-by-and entity-name="InventoryItem" map="lookupFieldMap"
list="inventoryItemList" order-by-list="orderByList"/>
<set field="parameters.quantityNotIssued"
from-field="orderItem.quantity" />
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=730620&r1=730619&r2=730620&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:34:03 2009
@@ -1066,7 +1066,7 @@
<set from-field="parameters.quantity"
field="quantityNotTransferred"/>
<!-- first transfer InventoryItems in FLT_PICKLOC type
locations, then FLT_BULK locations, then InventoryItems with no locations -->
- <find-by-and entity-name="InventoryItemAndLocation"
map="lookupFieldMap" list-name="inventoryItemAndLocations" use-iterator="true"
order-by-list="orderByList"/>
+ <find-by-and entity-name="InventoryItemAndLocation"
map="lookupFieldMap" list="inventoryItemAndLocations" use-iterator="true"
order-by-list="orderByList"/>
<iterate entry="inventoryItemAndLocation"
list="inventoryItemAndLocations">
<if>
<condition>
@@ -1104,7 +1104,7 @@
<!-- still some left? try the FLT_BULK locations -->
<if-compare field="quantityNotTransferred" operator="greater"
value="0" type="Double">
- <find-by-and entity-name="InventoryItemAndLocation"
map="lookupFieldMap" list-name="inventoryItemAndLocations" use-iterator="true"
order-by-list="orderByList"/>
+ <find-by-and entity-name="InventoryItemAndLocation"
map="lookupFieldMap" list="inventoryItemAndLocations" use-iterator="true"
order-by-list="orderByList"/>
<iterate entry="inventoryItemAndLocation"
list="inventoryItemAndLocations">
<if>
<condition>
@@ -1143,7 +1143,7 @@
<!-- last of all transfer InventoryItems that have no
locationSeqId, ie are not in any particular location -->
<if-compare field="quantityNotTransferred" operator="greater"
value="0" type="Double">
- <find-by-and entity-name="InventoryItem"
map="lookupFieldMap" list-name="inventoryItems" use-iterator="true"
order-by-list="orderByList"/>
+ <find-by-and entity-name="InventoryItem"
map="lookupFieldMap" list="inventoryItems" use-iterator="true"
order-by-list="orderByList"/>
<iterate entry="inventoryItem" list="inventoryItems">
<if>
<condition>
