You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 22:29:25 UTC
svn commit: r730245 [1/2] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/payment/
applications/accounting/script/org/ofbiz/accounting/tax/
applications/content/script/org/ofbiz/content/content/
applications/content/script/org/of...
Author: jleroux
Date: Tue Dec 30 13:29:24 2008
New Revision: 730245
URL: http://svn.apache.org/viewvc?rev=730245&view=rev
Log:
<find-by-and(.*)list-name => <find-by-and$1list
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.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/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.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/InventoryIssueServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.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/issuance/IssuanceServices.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/framework/common/script/org/ofbiz/common/LookupServices.xml
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml?rev=730245&r1=730244&r2=730245&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml Tue Dec 30 13:29:24 2008
@@ -26,7 +26,7 @@
<field-to-field field-name="orderStatusId" map-name="parameters" to-map-name="orderLookup" />
<field-to-field field-name="currency" map-name="parameters" to-map-name="captureParams" />
<string-to-field string="PAYMENT_AUTHORIZED" field-name="paymentStatusId" map-name="orderLookup" />
- <find-by-and entity-name="OrderHeaderAndPaymentPref" map-name="orderLookup" list-name="orderHeaderAndPaymentPrefs" />
+ <find-by-and entity-name="OrderHeaderAndPaymentPref" map="orderLookup" list="orderHeaderAndPaymentPrefs" />
<iterate entry="orderHeaderAndPaymentPref" list="orderHeaderAndPaymentPrefs" >
<field-to-field map-name="orderHeaderAndPaymentPref" field-name="orderId" to-map-name="captureParams" />
<call-service service-name="capturePayment" in-map-name="captureParams" error-code="ignore-error">
@@ -78,7 +78,7 @@
through the updateCreditCard or updateEftAccount services to use the new contactMechId -->
<set field="lookupMap.contactMechId" from-field="parameters.oldContactMechId"/>
- <find-by-and entity-name="CreditCard" map-name="lookupMap" list-name="creditCards"/>
+ <find-by-and entity-name="CreditCard" map="lookupMap" list="creditCards"/>
<iterate entry="creditCard" list="creditCards">
<call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDateAfterToday" ret-field="isNotExpired">
<field field="creditCard.expireDate"/>
@@ -92,7 +92,7 @@
</if-compare>
</iterate>
- <find-by-and entity-name="EftAccount" map-name="lookupMap" list-name="eftAccounts"/>
+ <find-by-and entity-name="EftAccount" map="lookupMap" list="eftAccounts"/>
<iterate entry="eftAccount" list="eftAccounts">
<set-service-fields service-name="updateEftAccount" map="eftAccount" to-map="ueaMap"/>
<set field="ueaMap.contactMechId" from-field="parameters.contactMechId"/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml?rev=730245&r1=730244&r2=730245&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml Tue Dec 30 13:29:24 2008
@@ -108,7 +108,7 @@
<set field="taxAuthorityRateProductMap.taxAuthGeoId" from-field="parameters.taxAuthGeoId"/>
<set field="taxAuthorityRateProductMap.taxAuthPartyId" from-field="parameters.taxAuthPartyId"/>
<set field="taxAuthorityRateProductMap.productCategoryId" from-field="parameters.productCategoryId"/>
- <find-by-and entity-name="TaxAuthorityRateProduct" map-name="taxAuthorityRateProductMap" list-name="taxAuthorityRateProductList"/>
+ <find-by-and entity-name="TaxAuthorityRateProduct" map="taxAuthorityRateProductMap" list="taxAuthorityRateProductList"/>
<if-empty field="taxAuthorityRateProductList">
<entity-one entity-name="TaxAuthorityCategory" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
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=730245&r1=730244&r2=730245&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 Tue Dec 30 13:29:24 2008
@@ -281,7 +281,7 @@
<set from-field="parameters.contentId" field="lookupKeyValue.contentId"/>
<set from-field="parameters.partyId" field="lookupKeyValue.partyId"/>
<set from-field="parameters.roleTypeId" field="lookupKeyValue.roleTypeId"/>
- <find-by-and entity-name="ContentRole" map-name="lookupKeyValue" list-name="roleList"/>
+ <find-by-and entity-name="ContentRole" map="lookupKeyValue" list="roleList"/>
<iterate entry="contentRoleMap" list="roleList">
<make-value entity-name="ContentRole" value-field="role" map-name="contentRoleMap"/>
<now-timestamp field="role.thruDate"/>
@@ -562,7 +562,7 @@
<field-to-list field-name="mapKey" list-name="mapKeys"/>
<iterate entry="mapKey" list="mapKeys">
<set from-field="mapKey" field="queryMap.mapKey"/>
- <find-by-and list-name="resultMap" entity-name="ContentAssoc" map-name="queryMap"/>
+ <find-by-and list="resultMap" entity-name="ContentAssoc" map="queryMap"/>
<filter-list-by-date list-name="resultMap" to-list-name="validContent"/>
<iterate entry="contentAssoc" list="validContent">
<field-to-list field-name="contentAssoc" list-name="result"/>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=730245&r1=730244&r2=730245&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Tue Dec 30 13:29:24 2008
@@ -686,7 +686,7 @@
<log level="info" message="[attachLocalFileToDataResource] - Found Subdir : ${uploadPath}"/>
<set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
- <find-by-and entity-name="FileExtension" map-name="extenLookup" list-name="extensions"/>
+ <find-by-and entity-name="FileExtension" map="extenLookup" list="extensions"/>
<first-from-list entry="extension" list="extensions"/>
<set from-field="parameters._uploadedFile_fileName" field="dataResource.dataResourceName"/>
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml?rev=730245&r1=730244&r2=730245&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml Tue Dec 30 13:29:24 2008
@@ -712,7 +712,7 @@
<set field="lookup.${roleEntityField}" from-field="checkId"/>
<set field="lookup.roleTypeId" from-field="checkRoleTypeId"/>
<set field="lookup.partyId" from-field="checkPartyId"/>
- <find-by-and entity-name="${roleEntity}" map-name="lookup" list-name="foundRoles"/>
+ <find-by-and entity-name="${roleEntity}" map="lookup" list="foundRoles"/>
<!--
<entity-and entity-name="${roleEntity}" list="foundRoles">
<field-map from-field="${roleEntityField}"/>
@@ -726,7 +726,7 @@
<!-- looking up any role -->
<set field="lookup.${roleEntityField}" from-field="checkId"/>
<set field="lookup.partyId" from-field="checkPartyId"/>
- <find-by-and entity-name="${roleEntity}" map-name="lookup" list-name="foundRoles"/>
+ <find-by-and entity-name="${roleEntity}" map="lookup" list="foundRoles"/>
<!--
<entity-and entity-name="${roleEntity}" list="foundRoles">
<field-map from-field="${roleEntityField}"/>
@@ -762,7 +762,7 @@
<check-errors/>
<set field="purposeLookup.contentId" from-field="checkId"/>
- <find-by-and entity-name="ContentPurpose" map-name="purposeLookup" list-name="contentPurposes"/>
+ <find-by-and entity-name="ContentPurpose" map="purposeLookup" list="contentPurposes"/>
</simple-method>
<!-- method to get user's party associations -->
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=730245&r1=730244&r2=730245&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 Tue Dec 30 13:29:24 2008
@@ -37,7 +37,7 @@
<set value="WEGS_CREATED" field="lookupComponentsMap.statusId"/>
<set field="lookupComponentsMap.workEffortGoodStdTypeId" value="PRUNT_PROD_NEEDED"/>
- <find-by-and entity-name="WorkEffortGoodStandard" list-name="components" map-name="lookupComponentsMap"/>
+ <find-by-and entity-name="WorkEffortGoodStandard" list="components" map="lookupComponentsMap"/>
<filter-list-by-date list-name="components"/>
<!-- now go through each work effort good standard and call a service to issue the inventory -->
<iterate list="components" entry="component">
@@ -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-name="lookupFieldMap" list-name="primaryInventoryItemList" order-by-list-name="orderByList"/>
+ <find-by-and entity-name="InventoryItem" map="lookupFieldMap" list-name="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-name="lookupFieldMap" list-name="secondaryInventoryItemList" order-by-list-name="orderByList"/>
+ <find-by-and entity-name="InventoryItem" map="lookupFieldMap" list-name="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=730245&r1=730244&r2=730245&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 Tue Dec 30 13:29:24 2008
@@ -34,7 +34,7 @@
<!-- If a workEffortId has been passed, use it to look up the desired routing-->
<if-not-empty field="parameters.workEffortId">
<set from-field="parameters.workEffortId" field="lookupRouting.workEffortId"/>
- <find-by-and entity-name="WorkEffortGoodStandard" list-name="routings" map-name="lookupRouting"/>
+ <find-by-and entity-name="WorkEffortGoodStandard" list="routings" map="lookupRouting"/>
<filter-list-by-date list-name="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
@@ -49,7 +49,7 @@
<first-from-list list="virtualProductAssocList" entry="virtualProductAssoc"/>
<if-not-empty field="virtualProductAssoc">
<set from-field="virtualProductAssoc.productId" field="lookupRouting.productId"/>
- <find-by-and entity-name="WorkEffortGoodStandard" list-name="routings" map-name="lookupRouting"/>
+ <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"/>
<first-from-list list="routings" entry="routingGS"/>
@@ -57,7 +57,7 @@
</if-empty>
<!-- No workEffortId has been passed, so retrieve the first routing found for this product-->
<else>
- <find-by-and entity-name="WorkEffortGoodStandard" list-name="routings" map-name="lookupRouting"/>
+ <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"/>
<!-- TODO: we should consider the quantity to select the best routing -->
@@ -76,7 +76,7 @@
<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-name="routings" map-name="lookupRouting"/>
+ <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"/>
<!-- TODO: we should consider the quantity to select the best routing -->
@@ -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-name="lookupTasks" order-by-list-name="tasksOrder"/>
+ <find-by-and entity-name="WorkEffortAssoc" list-name="tasks" map="lookupTasks" order-by-list="tasksOrder"/>
<filter-list-by-date list-name="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-name="lookupTasks" order-by-list-name="tasksOrder"/>
+ <find-by-and entity-name="WorkEffortAssoc" list-name="routingTaskAssocs" map="lookupTasks" order-by-list="tasksOrder"/>
<filter-list-by-date list-name="routingTaskAssocs"/>
<field-to-result field="routingTaskAssocs"/>
</simple-method>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=730245&r1=730244&r2=730245&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Tue Dec 30 13:29:24 2008
@@ -144,7 +144,7 @@
</simple-method>
<simple-method method-name="updatePartyEmailContactListParty" short-description="Update ContactList Party Contact Mech">
<set field="lookupMap.preferredContactMechId" from-field="parameters.oldContactMechId"/>
- <find-by-and entity-name="ContactListParty" map-name="lookupMap" list-name="ContactListParties"/>
+ <find-by-and entity-name="ContactListParty" map="lookupMap" list="ContactListParties"/>
<iterate entry="contactlistparty" list="ContactListParties">
<set field="contactlistparty.preferredContactMechId" from-field="parameters.contactMechId"/>
<log level="info" message="Replacing preferredContactMechId: ${parameters.oldContactMechId} of the ContactList: ${contactlistparty.contactListId} with new preferredContactMechId: ${parameters.contactMechId}"/>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml?rev=730245&r1=730244&r2=730245&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml Tue Dec 30 13:29:24 2008
@@ -154,7 +154,7 @@
<!-- set field="trackingCodeOrderFindContext.trackingCodeTypeId" value="PARTNER_MGD"/-->
<!-- get the siteId ,trackingCodeId from TrackingCodeOrder -->
<log level="info" message="Find Tracking Code Order For ${trackingCodeOrderFindContext}"/>
- <find-by-and entity-name="TrackingCodeOrder" list-name="trackingCodeOrders" map-name="trackingCodeOrderFindContext"/>
+ <find-by-and entity-name="TrackingCodeOrder" list="trackingCodeOrders" map="trackingCodeOrderFindContext"/>
<set field="trackingCodeOrder" from-field="trackingCodeOrders[0]"/>
<log level="info" message="Create Tracking Code Order Return For ${trackingCodeOrder}"/>
<if-not-empty field="trackingCodeOrder">
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml?rev=730245&r1=730244&r2=730245&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml Tue Dec 30 13:29:24 2008
@@ -86,13 +86,13 @@
<!-- find email address for currently logged in user, set as sendFrom -->
<set field="curUserPcmFindMap.partyId" from-field="userLogin.partyId"/>
<set field="curUserPcmFindMap.contactMechTypeId" value="EMAIL_ADDRESS"/>
- <find-by-and entity-name="PartyAndContactMech" map-name="curUserPcmFindMap" list-name="curUserPartyAndContactMechs"/>
+ <find-by-and entity-name="PartyAndContactMech" map="curUserPcmFindMap" list="curUserPartyAndContactMechs"/>
<first-from-list entry="curUserPartyAndContactMech" list="curUserPartyAndContactMechs"/>
<string-append field-name="sendEmailMap.sendFrom" string="${curUserPartyAndContactMech.infoString}" prefix=","/>
<!-- find email addresses of all parties in SHIPMENT_CLERK roleTypeId, set as sendTo -->
<set value="SHIPMENT_CLERK" field="shipmentClerkFindMap.roleTypeId"/>
- <find-by-and entity-name="PartyRole" map-name="shipmentClerkFindMap" list-name="shipmentClerkRoles"/>
+ <find-by-and entity-name="PartyRole" map="shipmentClerkFindMap" list="shipmentClerkRoles"/>
<iterate entry="shipmentClerkRole" list="shipmentClerkRoles">
<set field="sendToPartyIdMap.${shipmentClerkRole.partyId}" from-field="shipmentClerkRole.partyId"/>
</iterate>
@@ -101,7 +101,7 @@
<iterate-map key="sendToPartyId" value="sendToPartyIdValue" map="sendToPartyIdMap">
<set field="sendToPartyPcmFindMap.partyId" from-field="sendToPartyId"/>
<set field="sendToPartyPcmFindMap.contactMechTypeId" value="EMAIL_ADDRESS"/>
- <find-by-and entity-name="PartyAndContactMech" map-name="sendToPartyPcmFindMap" list-name="sendToPartyPartyAndContactMechs"/>
+ <find-by-and entity-name="PartyAndContactMech" map="sendToPartyPcmFindMap" list="sendToPartyPartyAndContactMechs"/>
<iterate entry="sendToPartyPartyAndContactMech" list="sendToPartyPartyAndContactMechs">
<string-append field-name="sendEmailMap.sendTo" string="${sendToPartyPartyAndContactMech.infoString}" prefix=","/>
</iterate>
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=730245&r1=730244&r2=730245&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 Tue Dec 30 13:29:24 2008
@@ -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-name="lookupMap" order-by-list-name="orderBy"></find-by-and>
+ <find-by-and entity-name="ReturnItem" list-name="currentItems" map="lookupMap" order-by-list="orderBy"></find-by-and>
<if-empty field="currentItems">
<set value="1" field="newEntity.returnItemSeqId"/>
<else>
@@ -462,7 +462,7 @@
<check-errors/>
<set from-field="parameters.returnId" field="lookupPKMap.returnId"/>
- <find-by-and entity-name="ReturnItem" map-name="lookupPKMap" list-name="returnItems"/>
+ <find-by-and entity-name="ReturnItem" map="lookupPKMap" list="returnItems"/>
<iterate entry="item" list="returnItems">
<set field="item.statusId" from-field="parameters.statusId"/>
</iterate>
@@ -536,7 +536,7 @@
<set from-field="parameters.returnId" field="lookupPKMap.returnId"/>
<find-by-primary-key entity-name="ReturnHeader" map="lookupPKMap" value-field="returnHeader"/>
- <find-by-and entity-name="ShipmentReceipt" map-name="lookupPKMap" list-name="shipmentReceipts"/>
+ <find-by-and entity-name="ShipmentReceipt" map="lookupPKMap" list="shipmentReceipts"/>
<iterate list="shipmentReceipts" entry="receipt">
<if-empty field="totalsMap.${receipt.returnItemSeqId}">
<calculate field="${receipt.returnItemSeqId}" map-name="totalsMap">
@@ -581,7 +581,7 @@
<!-- check to see if all items have been received -->
<set field="allReceived" value="true"/>
- <find-by-and entity-name="ReturnItem" map-name="lookupPKMap" list-name="allReturnItems"/>
+ <find-by-and entity-name="ReturnItem" map="lookupPKMap" list="allReturnItems"/>
<iterate list="allReturnItems" entry="item">
<if-compare field="item.statusId" operator="not-equals" value="RETURN_RECEIVED">
<if-not-empty field="item.orderItemSeqId">
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=730245&r1=730244&r2=730245&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Tue Dec 30 13:29:24 2008
@@ -689,7 +689,7 @@
<if-compare value="parameters.oldContactMechId" field="parameters.contactMechId" operator="not-equals">
<set field="orderItemShipGroupMap.orderId" from-field="parameters.orderId"/>
<set field="orderItemShipGroupMap.contactMechId" from-field="parameters.oldContactMechId"/>
- <find-by-and entity-name="OrderItemShipGroup" list-name="shipGroupList" map-name="orderItemShipGroupMap"/>
+ <find-by-and entity-name="OrderItemShipGroup" list="shipGroupList" map="orderItemShipGroupMap"/>
<if-not-empty field="shipGroupList">
<iterate list="shipGroupList" entry="shipGroup">
<set field="inputMap.shipGroupSeqId" from-field="shipGroup.shipGroupSeqId"/>
@@ -701,7 +701,7 @@
</if-not-empty>
</if-compare>
<else>
- <find-by-and entity-name="OrderContactMech" map-name="inputMap" list-name="orderContactMechList"/>
+ <find-by-and entity-name="OrderContactMech" map="inputMap" list="orderContactMechList"/>
<!-- If orderContactMechList value is null then create new entry in OrderContactMech entity-->
<if-empty field="orderContactMechList">
<set-service-fields service-name="createOrderContactMech" map="parameters" to-map="createOrderContactMechMap"/>
@@ -741,7 +741,7 @@
<set from-field="parameters.orderId" field="inputMap.orderId"/>
<set from-field="parameters.contactMechPurposeTypeId" field="inputMap.contactMechPurposeTypeId"/>
<set from-field="parameters.contactMechId" field="inputMap.contactMechId"/>
- <find-by-and entity-name="OrderContactMech" map-name="inputMap" list-name="orderContactMechList"/>
+ <find-by-and entity-name="OrderContactMech" map="inputMap" list="orderContactMechList"/>
<!-- If orderContactMechList value is null then create new entry in OrderContactMech entity-->
<if-empty field="orderContactMechList">
<set-service-fields service-name="createOrderContactMech" map="parameters" to-map="createOrderContactMechMap"/>
@@ -751,12 +751,12 @@
<!-- Remove the old values from OrderContactMech entity with the help of oldContactMechId -->
<set from-field="parameters.orderId" field="shipGroupLookupMap.orderId"/>
<set from-field="parameters.oldContactMechId" field="shipGroupLookupMap.contactMechId"/>
- <find-by-and entity-name="OrderItemShipGroup" map-name="shipGroupLookupMap" list-name="orderItemShipGroupList"/>
+ <find-by-and entity-name="OrderItemShipGroup" map="shipGroupLookupMap" list="orderItemShipGroupList"/>
<if-empty field="orderItemShipGroupList">
<set from-field="parameters.orderId" field="inputMap.orderId"/>
<set from-field="parameters.contactMechPurposeTypeId" field="inputMap.contactMechPurposeTypeId"/>
<set from-field="parameters.oldContactMechId" field="inputMap.contactMechId"/>
- <find-by-and entity-name="OrderContactMech" map-name="inputMap" list-name="orderContactMechList"/>
+ <find-by-and entity-name="OrderContactMech" map="inputMap" list="orderContactMechList"/>
<set-service-fields service-name="createOrderContactMech" map="inputMap" to-map="removeOrderContactMechMap"/>
<call-service service-name="removeOrderContactMech" in-map-name="removeOrderContactMechMap" include-user-login="true"/>
</if-empty>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=730245&r1=730244&r2=730245&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Tue Dec 30 13:29:24 2008
@@ -529,7 +529,7 @@
<!-- copy the roles from the request to the quote-->
<make-value value-field="lookupRequestRole" entity-name="CustRequestParty"/>
<set from-field="parameters.custRequestId" field="lookupRequestRole.custRequestId"/>
- <find-by-and entity-name="CustRequestParty" map-name="lookupRequestRole" list-name="roles"/>
+ <find-by-and entity-name="CustRequestParty" map="lookupRequestRole" list="roles"/>
<iterate entry="role" list="roles">
<clear-field field="cqrContext"/>
<set from-field="quoteId" field="cqrContext.quoteId"/>
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=730245&r1=730244&r2=730245&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 Tue Dec 30 13:29:24 2008
@@ -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-name="lookupMap" order-by-list-name="orderByList"/>
+ <find-by-and entity-name="CustRequestAndRole" list-name="custRequestAndRoles" map="lookupMap" order-by-list="orderByList"/>
<field-to-result field="custRequestAndRoles" result-name="custRequestAndRoles"/>
</simple-method>
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=730245&r1=730244&r2=730245&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 Tue Dec 30 13:29:24 2008
@@ -77,7 +77,7 @@
<!-- Find old value -->
<make-value entity-name="PartyContactMech" value-field="partyContactMechMap"/>
<set-pk-fields value-field="partyContactMechMap" map="parameters"/>
- <find-by-and entity-name="PartyContactMech" list-name="partyContactMechs" map-name="partyContactMechMap"/>
+ <find-by-and entity-name="PartyContactMech" list="partyContactMechs" map="partyContactMechMap"/>
<filter-list-by-date list-name="partyContactMechs" to-list-name="validPartyContactMechs"/>
<first-from-list entry="partyContactMech" list="validPartyContactMechs"/>
<if-empty field="partyContactMech">
@@ -119,7 +119,7 @@
<set field="purposeMap.partyId" from-field="partyContactMechPurpose.partyId"/>
<set field="purposeMap.contactMechPurposeTypeId" from-field="partyContactMechPurpose.contactMechPurposeTypeId"/>
<set field="purposeMap.contactMechId" from-field="partyContactMechPurpose.contactMechId"/>
- <find-by-and entity-name="PartyContactMechPurpose" list-name="purposeResult" map-name="purposeMap"/>
+ <find-by-and entity-name="PartyContactMechPurpose" list="purposeResult" map="purposeMap"/>
<if-empty field="purposeResult">
<create-value value-field="partyContactMechPurpose"/>
@@ -140,7 +140,7 @@
<make-value entity-name="PartyContactMech" value-field="partyContactMechMap"/>
<set-pk-fields value-field="partyContactMechMap" map="parameters"/>
- <find-by-and entity-name="PartyContactMech" list-name="partyContactMechs" map-name="partyContactMechMap"/>
+ <find-by-and entity-name="PartyContactMech" list="partyContactMechs" map="partyContactMechMap"/>
<filter-list-by-date list-name="partyContactMechs" to-list-name="validPartyContactMechs"/>
<first-from-list entry="partyContactMech" list="validPartyContactMechs"/>
<if-empty field="partyContactMech">
@@ -253,7 +253,7 @@
<set field="parameters.partyId" from-field="userLogin.partyId"/>
</if-empty>
- <if-validate-method field-name="parameters.emailAddress" method="isEmail">
+ <if-validate-method field="parameters.emailAddress" method="isEmail">
<else><add-error><fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/></add-error></else>
</if-validate-method>
<check-errors/>
@@ -273,7 +273,7 @@
<set field="parameters.partyId" from-field="userLogin.partyId"/>
</if-empty>
- <if-validate-method field-name="parameters.emailAddress" method="isEmail">
+ <if-validate-method field="parameters.emailAddress" method="isEmail">
<else><add-error><fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/></add-error></else>
</if-validate-method>
<check-errors/>
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=730245&r1=730244&r2=730245&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 Tue Dec 30 13:29:24 2008
@@ -185,7 +185,7 @@
<simple-method method-name="getPostalAddressBoundary" short-description="Get Postal Address Boundary">
<make-value entity-name="PostalAddressBoundary" value-field="postalAddressBoundaryLookupMap"/>
<set field="postalAddressBoundaryLookupMap.geoId" from-field="parameters.geoId"/>
- <find-by-and entity-name="PostalAddressBoundary" map-name="postalAddressBoundaryLookupMap" list-name="postalAddressBoundaries"/>
+ <find-by-and entity-name="PostalAddressBoundary" map="postalAddressBoundaryLookupMap" list="postalAddressBoundaries"/>
<iterate list="postalAddressBoundaries" entry="postalAddressBoundary">
<get-related-one value-name="postalAddressBoundary" to-value-field="geo" relation-name="Geo"/>
<field-to-list field-name="geo" list="geos"/>
@@ -310,7 +310,7 @@
<log level="always" message="[createPartyContent] - Found Subdir : ${uploadPath}"/>
<!-- locate the file extension to use based on mime-type -->
<set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
- <find-by-and entity-name="FileExtension" map-name="extenLookup" list-name="extensions"/>
+ <find-by-and entity-name="FileExtension" map="extenLookup" list="extensions"/>
<first-from-list entry="extension" list="extensions"/>
<set-service-fields service-name="createDataResource" map="parameters" to-map="dataResource"/>
<!-- create the data resource object -->
@@ -347,7 +347,7 @@
<!-- check party role -->
<make-value value-field="partyRole" entity-name="PartyRole"/>
<set-pk-fields value-field="partyRole" map="contentRole"/>
- <find-by-and entity-name="PartyRole" map-name="partyRole" list-name="pRoles"/>
+ <find-by-and entity-name="PartyRole" map="partyRole" list="pRoles"/>
<if-empty field="pRoles">
<set-service-fields service-name="createPartyRole" map="contentRole" to-map="partyRole"/>
<call-service service-name="createPartyRole" in-map-name="partyRole" break-on-error="false" />
@@ -400,7 +400,7 @@
<log level="always" message="[createPartyContent] - Found Subdir : ${uploadPath}"/>
<!-- locate the file extension to use based on mime-type -->
<set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
- <find-by-and entity-name="FileExtension" map-name="extenLookup" list-name="extensions"/>
+ <find-by-and entity-name="FileExtension" map="extenLookup" list="extensions"/>
<first-from-list entry="extension" list="extensions"/>
<set-service-fields service-name="createDataResource" map="parameters" to-map="dataResource"/>
<!-- create the data resource object -->
@@ -448,7 +448,7 @@
<set from-field="parameters.priorityTypeId" field="lookupMap.priorityTypeId"/>
<set from-field="parameters.partyRelationshipTypeId" field="lookupMap.partyRelationshipTypeId"/>
- <find-by-and entity-name="PartyRelationship" map-name="lookupMap" list-name="partyRelationships"/>
+ <find-by-and entity-name="PartyRelationship" map="lookupMap" list="partyRelationships"/>
<iterate list="partyRelationships" entry="partyRelationship">
<get-related-one value-name="partyRelationship" relation-name="ToParty" to-value-field="party"/>
<field-to-list field-name="party" list="parties"/>
@@ -660,10 +660,10 @@
<simple-method method-name="getPartyEmail" short-description="Get the email of the party">
<set field="findMap.partyId" from-field="parameters.partyId"/>
<set field="findMap.contactMechTypeId" value="EMAIL_ADDRESS"/>
- <find-by-and entity-name="PartyAndContactMech" map-name="findMap" list-name="emailAddressesAll"/>
+ <find-by-and entity-name="PartyAndContactMech" map="findMap" list="emailAddressesAll"/>
<if-empty field="emailAddressesAll">
<set field="findMap.contactMechTypeId" value="ELECTRONIC_ADDRESS"/>
- <find-by-and entity-name="PartyAndContactMech" map-name="findMap" list-name="emailAddressesAll"/>
+ <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"/>
@@ -688,7 +688,7 @@
</else>
</if-empty>
<set field="findMap.contactMechTypeId" value="TELECOM_NUMBER"/>
- <find-by-and entity-name="PartyContactDetailByPurpose" map-name="findMap" list-name="telephoneAll1"></find-by-and>
+ <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"/>
<if-not-empty field="telephoneAll3">
@@ -715,7 +715,7 @@
</iterate>
</iterate>
<else>
- <find-by-and entity-name="PartyAndContactMech" map-name="findMap" list-name="telephoneAll1"/>
+ <find-by-and entity-name="PartyAndContactMech" map="findMap" list="telephoneAll1"/>
<filter-list-by-date list-name="telephoneAll1" to-list-name="telephoneAll2"/>
<first-from-list entry="telephone" list="telephoneAll2"/>
<if-not-empty field="telephone.tnCountryCode">
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=730245&r1=730244&r2=730245&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 Tue Dec 30 13:29:24 2008
@@ -284,7 +284,7 @@
1. If credit card information is changed than a new PaymentMethod, CreditCard record is created else no change.
-->
<set field="serviceCtx.partyId" value="DemoCustomer"/>
- <find-by-and entity-name="PaymentMethodAndCreditCard" map-name="serviceCtx" list-name="paymentMethodAndCreditCards"/>
+ <find-by-and entity-name="PaymentMethodAndCreditCard" map="serviceCtx" list="paymentMethodAndCreditCards"/>
<filter-list-by-date list-name="paymentMethodAndCreditCards"/>
<first-from-list list="paymentMethodAndCreditCards" entry="paymentMethodAndCreditCard"/>
<!-- first try with just updating without changing the credit card information -->
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=730245&r1=730244&r2=730245&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 Tue Dec 30 13:29:24 2008
@@ -132,7 +132,7 @@
<field-to-list list-name="orderByStringList" field-name="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-name="productCategoryRollUpContext" order-by-list-name="orderByStringList"/>
+ <find-by-and entity-name="ProductCategoryRollup" list-name="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>
@@ -291,7 +291,7 @@
<!-- log level="info" message = "Virtual product =====${productCategoryMember.productId}"/ -->
<set field="virtualProductContext.productId" from-field="product.productId"/>
<set field="virtualProductContext.productAssocTypeId" value="PRODUCT_VARIANT"/>
- <find-by-and entity-name="ProductAssoc" map-name="virtualProductContext" list-name="variantProducts"/>
+ <find-by-and entity-name="ProductAssoc" map="virtualProductContext" list="variantProducts"/>
<filter-list-by-date list-name="variantProducts"/>
<if-not-empty field="variantProducts">
<iterate entry="variantProduct" list="variantProducts">
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=730245&r1=730244&r2=730245&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 Tue Dec 30 13:29:24 2008
@@ -380,7 +380,7 @@
<if-compare field="parameters.recurse" operator="equals" value="Y">
<!-- call this service for each sub-category in the rollup with the same productCategoryIdTo -->
<set field="lookupChildrenMap.parentProductCategoryId" from-field="parameters.productCategoryId"/>
- <find-by-and entity-name="ProductCategoryRollup" map-name="lookupChildrenMap" list-name="productCategoryRollups"/>
+ <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"/>
@@ -601,7 +601,7 @@
child roll up is where oldProductCategoryId = ProductCategoryRollup.parentProductCategoryId and hence
requires a new find-by map -->
<if-not-empty field="parameters.duplicateParentRollup">
- <find-by-and entity-name="ProductCategoryRollup" map-name="categoryFindContext" list-name="foundValues"/>
+ <find-by-and entity-name="ProductCategoryRollup" map="categoryFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set field="newTempValue.productCategoryId" from-field="parameters.productCategoryId"/>
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=730245&r1=730244&r2=730245&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 Tue Dec 30 13:29:24 2008
@@ -45,7 +45,7 @@
<set from-field="parameters.productId" field="costsAndMap.productId"/>
<set from-field="parameters.costUomId" field="costsAndMap.costUomId"/>
<set from-field="parameters.costComponentTypeId" field="costsAndMap.costComponentTypeId"/>
- <find-by-and entity-name="CostComponent" map-name="costsAndMap" list-name="existingCosts"/>
+ <find-by-and entity-name="CostComponent" map="costsAndMap" list="existingCosts"/>
<filter-list-by-date list-name="existingCosts"/>
<iterate list="existingCosts" entry="existingCost">
<now-timestamp field="existingCost.thruDate"/>
@@ -57,7 +57,7 @@
<set from-field="parameters.productId" field="costsAndMap.productId"/>
<set from-field="parameters.costUomId" field="costsAndMap.costUomId"/>
<set from-field="parameters.costComponentTypeId" field="costsAndMap.costComponentTypeId"/>
- <find-by-and entity-name="CostComponent" map-name="costsAndMap" list-name="existingCosts"/>
+ <find-by-and entity-name="CostComponent" map="costsAndMap" list="existingCosts"/>
<filter-list-by-date list-name="existingCosts"/>
<iterate list="existingCosts" entry="existingCost">
<now-timestamp field="existingCost.thruDate"/>
@@ -80,22 +80,22 @@
<set from-field="parameters.currencyUomId" field="costsAndMap.costUomId"/>
<!-- Route costs -->
<set value="${parameters.costComponentTypePrefix}_ROUTE_COST" field="costsAndMap.costComponentTypeId"/>
- <find-by-and entity-name="CostComponent" map-name="costsAndMap" list-name="routeCosts"/>
+ <find-by-and entity-name="CostComponent" map="costsAndMap" list="routeCosts"/>
<filter-list-by-date list-name="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-name="costsAndMap" list-name="laborCosts"/>
+ <find-by-and entity-name="CostComponent" map="costsAndMap" list="laborCosts"/>
<filter-list-by-date list-name="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-name="costsAndMap" list-name="materialsCosts"/>
+ <find-by-and entity-name="CostComponent" map="costsAndMap" list="materialsCosts"/>
<filter-list-by-date list-name="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-name="costsAndMap" list-name="otherCosts"/>
+ <find-by-and entity-name="CostComponent" map="costsAndMap" list="otherCosts"/>
<filter-list-by-date list-name="otherCosts"/>
<first-from-list list="otherCosts" entry="otherCost"/>
@@ -112,7 +112,7 @@
<entity-one entity-name="Product" value-field="product"/>
<set from-field="product.productId" field="assocAndMap.productIdTo"/>
<set value="PRODUCT_VARIANT" field="assocAndMap.productAssocTypeId"/>
- <find-by-and entity-name="ProductAssoc" map-name="assocAndMap" list-name="virtualAssocs"/>
+ <find-by-and entity-name="ProductAssoc" map="assocAndMap" list="virtualAssocs"/>
<filter-list-by-date list-name="virtualAssocs"/>
<first-from-list list="virtualAssocs" entry="virtualAssoc"/>
<if-not-empty field="virtualAssoc">
@@ -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-name="costsAndMap" list-name="priceCosts" order-by-list-name="orderByList"/>
+ <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"/>
<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-name="costsAndMap" list-name="priceCosts" order-by-list-name="orderByList"/>
+ <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"/>
<first-from-list list="priceCosts" entry="priceCost"/>
<if-not-empty field="priceCost.lastPrice">
@@ -165,7 +165,7 @@
<set from-field="parameters.productId" field="costsAndMap.productId"/>
<set from-field="parameters.currencyUomId" field="costsAndMap.currencyUomId"/>
<set from-field="parameters.productPriceTypeId" field="costsAndMap.productPriceTypeId"/>
- <find-by-and entity-name="ProductPrice" map-name="costsAndMap" list-name="priceCosts"/>
+ <find-by-and entity-name="ProductPrice" map="costsAndMap" list="priceCosts"/>
<filter-list-by-date list-name="priceCosts"/>
<first-from-list list="priceCosts" entry="priceCost"/>
<if-not-empty field="priceCost.price">
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=730245&r1=730244&r2=730245&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 Tue Dec 30 13:29:24 2008
@@ -111,7 +111,7 @@
<field-to-list field-name="orderByString" list-name="orderByList"/>
<set field="lookupFieldMap.productId" from-field="orderItem.productId" />
<set field="lookupFieldMap.facilityId" from-field="orderHeader.originFacilityId" />
- <find-by-and entity-name="InventoryItem" map-name="lookupFieldMap" list-name="inventoryItemList" order-by-list-name="orderByList"/>
+ <find-by-and entity-name="InventoryItem" map="lookupFieldMap" list-name="inventoryItemList" order-by-list="orderByList"/>
<set field="parameters.quantityNotIssued" from-field="orderItem.quantity" />
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml?rev=730245&r1=730244&r2=730245&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml Tue Dec 30 13:29:24 2008
@@ -326,7 +326,7 @@
</if-empty>
<!--Step 2 Check if its reserved for other order -->
<set field="inventoryReservationLookUp.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
- <find-by-and map-name="inventoryReservationLookUp" list-name="invReservations" entity-name="OrderItemShipGrpInvRes"/>
+ <find-by-and map="inventoryReservationLookUp" list="invReservations" entity-name="OrderItemShipGrpInvRes"/>
<first-from-list entry="inventoryItemReservation" list="invReservations"/>
<if-not-empty field="inventoryItemReservation">
<set-service-fields map="inventoryItemReservation" to-map="cancelOrderItemShipGrpInvResMap" service-name="cancelOrderItemShipGrpInvRes"/>
@@ -533,7 +533,7 @@
<set from-field="parameters.shipGroupSeqId" field="oisgirListLookupMap.shipGroupSeqId"/>
<log level="verbose" message="OISGIR Cancel for single item : ${oisgirListLookupMap}"/>
</if-not-empty>
- <find-by-and entity-name="OrderItemShipGrpInvRes" map-name="oisgirListLookupMap" list-name="oisgirList" use-cache="false"/>
+ <find-by-and entity-name="OrderItemShipGrpInvRes" map="oisgirListLookupMap" list="oisgirList" use-cache="false"/>
<iterate entry="oisgir" list="oisgirList">
<set from-field="oisgir.orderId" field="cancelOisgirMap.orderId"/>
<set from-field="oisgir.orderItemSeqId" field="cancelOisgirMap.orderItemSeqId"/>
@@ -562,7 +562,7 @@
<set from-field="parameters.orderId" field="oisgirListLookupMap.orderId"/>
<set from-field="parameters.orderItemSeqId" field="oisgirListLookupMap.orderItemSeqId"/>
<set from-field="parameters.shipGroupSeqId" field="oisgirListLookupMap.shipGroupSeqId"/>
- <find-by-and entity-name="OrderItemShipGrpInvRes" map-name="oisgirListLookupMap" list-name="oisgirList" use-cache="false"/>
+ <find-by-and entity-name="OrderItemShipGrpInvRes" map="oisgirListLookupMap" list="oisgirList" use-cache="false"/>
<iterate entry="oisgir" list="oisgirList">
<if-compare field="toCancelAmount" operator="greater" value="0" type="Double">
<if-compare-field field="oisgir.quantity" to-field="toCancelAmount" operator="greater-equals" type="Double">
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=730245&r1=730244&r2=730245&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 Tue Dec 30 13:29:24 2008
@@ -415,7 +415,7 @@
<!-- retrieve related virtual product because also to be used later -->
<set field="getAssoc.productIdTo" from-field="product.productId"/>
<set field="getAssoc.productAssocTypeId" value="PRODUCT_VARIANT"/>
- <find-by-and entity-name="ProductAssoc" map-name="getAssoc" list-name="assocs"/>
+ <find-by-and entity-name="ProductAssoc" map="getAssoc" list="assocs"/>
<filter-list-by-date list-name="assocs" to-list-name="assocsDate"/>
<first-from-list entry="assoc" list="assocsDate"/>
<get-related-one value-name="assoc" relation-name="MainProduct" to-value-field="virtProduct"/>
@@ -452,7 +452,7 @@
<if-compare field="virtProduct.salesDiscWhenNotAvail" operator="equals" value="Y">
<set field="getFromAssoc.productId" from-field="virtProduct.productId"/>
<set field="getFromAssoc.productAssocTypeId" value="PRODUCT_VARIANT"/>
- <find-by-and entity-name="ProductAssoc" map-name="getFromAssoc" list-name="assocs"/>
+ <find-by-and entity-name="ProductAssoc" map="getFromAssoc" list="assocs"/>
<filter-list-by-date list-name="assocs" to-list-name="assocsDate"/>
<if-empty field="assocsDate">
<set from-field="virtProduct.productId" field="discontinueProductSalesMap.productId"/>
@@ -607,9 +607,9 @@
<!-- we might get away with a cache here since real serious errors will occur during the reservation service... but only if we need the speed -->
<if-compare field="parameters.useCache" operator="equals" value="true" type="Boolean">
- <find-by-and entity-name="InventoryItem" map-name="lookupFieldMap" list-name="inventoryItems" use-iterator="true" use-cache="true"/>
+ <find-by-and entity-name="InventoryItem" map="lookupFieldMap" list="inventoryItems" use-iterator="true" use-cache="true"/>
<else>
- <find-by-and entity-name="InventoryItem" map-name="lookupFieldMap" list-name="inventoryItems" use-iterator="true" use-cache="false"/>
+ <find-by-and entity-name="InventoryItem" map="lookupFieldMap" list="inventoryItems" use-iterator="true" use-cache="false"/>
</else>
</if-compare>
@@ -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-name="lookupFieldMap" list-name="inventoryItemAndLocations" use-iterator="true" order-by-list-name="orderByList"/>
+ <find-by-and entity-name="InventoryItemAndLocation" map="lookupFieldMap" list-name="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-name="lookupFieldMap" list-name="inventoryItemAndLocations" use-iterator="true" order-by-list-name="orderByList"/>
+ <find-by-and entity-name="InventoryItemAndLocation" map="lookupFieldMap" list-name="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-name="lookupFieldMap" list-name="inventoryItems" use-iterator="true" order-by-list-name="orderByList"/>
+ <find-by-and entity-name="InventoryItem" map="lookupFieldMap" list-name="inventoryItems" use-iterator="true" order-by-list="orderByList"/>
<iterate entry="inventoryItem" list="inventoryItems">
<if>
<condition>
@@ -1263,7 +1263,7 @@
<if-not-empty field="orderHeader">
<set field="orderRoleAndMap.orderId" from-field="orderHeader.orderId"/>
<set field="orderRoleAndMap.roleTypeId" value="END_USER_CUSTOMER"/>
- <find-by-and entity-name="OrderRole" list-name="orderRoles" map-name="orderRoleAndMap"/>
+ <find-by-and entity-name="OrderRole" list="orderRoles" map="orderRoleAndMap"/>
<first-from-list list="orderRoles" entry="orderRole"/>
<entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="false">
<field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=730245&r1=730244&r2=730245&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml Tue Dec 30 13:29:24 2008
@@ -140,7 +140,7 @@
<set value="PRODUCT_VARIANT" field="variantProductAssocMap.productAssocTypeId"/>
<!-- get all productAssocs, then get the actual product to update -->
- <find-by-and entity-name="ProductAssoc" map-name="variantProductAssocMap" list-name="variantProductAssocs"/>
+ <find-by-and entity-name="ProductAssoc" map="variantProductAssocMap" list="variantProductAssocs"/>
<filter-list-by-date list-name="variantProductAssocs"/>
<iterate entry="variantProductAssoc" list="variantProductAssocs">
<clear-field field="variantProduct"/>
@@ -201,7 +201,7 @@
<!-- if requested, duplicate related data as well -->
<if-not-empty field="parameters.duplicatePrices">
- <find-by-and entity-name="ProductPrice" map-name="productFindContext" list-name="foundValues"/>
+ <find-by-and entity-name="ProductPrice" map="productFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.productId" field="newTempValue.productId"/>
@@ -209,7 +209,7 @@
</iterate>
</if-not-empty>
<if-not-empty field="parameters.duplicateIDs">
- <find-by-and entity-name="GoodIdentification" map-name="productFindContext" list-name="foundValues"/>
+ <find-by-and entity-name="GoodIdentification" map="productFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.productId" field="newTempValue.productId"/>
@@ -217,7 +217,7 @@
</iterate>
</if-not-empty>
<if-not-empty field="parameters.duplicateContent">
- <find-by-and entity-name="ProductContent" map-name="productFindContext" list-name="foundValues"/>
+ <find-by-and entity-name="ProductContent" map="productFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.productId" field="newTempValue.productId"/>
@@ -225,7 +225,7 @@
</iterate>
</if-not-empty>
<if-not-empty field="parameters.duplicateCategoryMembers">
- <find-by-and entity-name="ProductCategoryMember" map-name="productFindContext" list-name="foundValues"/>
+ <find-by-and entity-name="ProductCategoryMember" map="productFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.productId" field="newTempValue.productId"/>
@@ -233,7 +233,7 @@
</iterate>
</if-not-empty>
<if-not-empty field="parameters.duplicateAssocs">
- <find-by-and entity-name="ProductAssoc" map-name="productFindContext" list-name="foundValues"/>
+ <find-by-and entity-name="ProductAssoc" map="productFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.productId" field="newTempValue.productId"/>
@@ -251,7 +251,7 @@
</iterate>
</if-not-empty>
<if-not-empty field="parameters.duplicateAttributes">
- <find-by-and entity-name="ProductAttribute" map-name="productFindContext" list-name="foundValues"/>
+ <find-by-and entity-name="ProductAttribute" map="productFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.productId" field="newTempValue.productId"/>
@@ -259,7 +259,7 @@
</iterate>
</if-not-empty>
<if-not-empty field="parameters.duplicateFeatureAppls">
- <find-by-and entity-name="ProductFeatureAppl" map-name="productFindContext" list-name="foundValues"/>
+ <find-by-and entity-name="ProductFeatureAppl" map="productFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.productId" field="newTempValue.productId"/>
@@ -267,7 +267,7 @@
</iterate>
</if-not-empty>
<if-not-empty field="parameters.duplicateInventoryItems">
- <find-by-and entity-name="InventoryItem" map-name="productFindContext" list-name="foundValues"/>
+ <find-by-and entity-name="InventoryItem" map="productFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
<!--
NOTE: new inventory items should always be created calling the
@@ -611,19 +611,19 @@
<set from-field="parameters.virtualProductId" field="variantsFindContext.productId"/>
<set value="PRODUCT_VARIANT" field="variantsFindContext.productAssocTypeId"/>
- <find-by-and entity-name="ProductAssoc" map-name="variantsFindContext" list-name="variants"/>
+ <find-by-and entity-name="ProductAssoc" map="variantsFindContext" list="variants"/>
<filter-list-by-date list-name="variants"/>
<iterate entry="newProduct" list="variants">
<set from-field="newProduct.productIdTo" field="productVariantContext.productId"/>
<!-- if requested, duplicate related data -->
<if-not-empty field="parameters.duplicatePrices">
<if-not-empty field="parameters.removeBefore">
- <find-by-and entity-name="ProductPrice" map-name="productVariantContext" list-name="foundVariantValues"/>
+ <find-by-and entity-name="ProductPrice" map="productVariantContext" list="foundVariantValues"/>
<iterate entry="foundVariantValue" list="foundVariantValues">
<remove-value value-field="foundVariantValue"/>
</iterate>
</if-not-empty>
- <find-by-and entity-name="ProductPrice" map-name="productFindContext" list-name="foundValues"/>
+ <find-by-and entity-name="ProductPrice" map="productFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
@@ -632,12 +632,12 @@
</if-not-empty>
<if-not-empty field="parameters.duplicateIDs">
<if-not-empty field="parameters.removeBefore">
- <find-by-and entity-name="GoodIdentification" map-name="productVariantContext" list-name="foundVariantValues"/>
+ <find-by-and entity-name="GoodIdentification" map="productVariantContext" list="foundVariantValues"/>
<iterate entry="foundVariantValue" list="foundVariantValues">
<remove-value value-field="foundVariantValue"/>
</iterate>
</if-not-empty>
- <find-by-and entity-name="GoodIdentification" map-name="productFindContext" list-name="foundValues"/>
+ <find-by-and entity-name="GoodIdentification" map="productFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
@@ -646,12 +646,12 @@
</if-not-empty>
<if-not-empty field="parameters.duplicateContent">
<if-not-empty field="parameters.removeBefore">
- <find-by-and entity-name="ProductContent" map-name="productVariantContext" list-name="foundVariantValues"/>
+ <find-by-and entity-name="ProductContent" map="productVariantContext" list="foundVariantValues"/>
<iterate entry="foundVariantValue" list="foundVariantValues">
<remove-value value-field="foundVariantValue"/>
</iterate>
</if-not-empty>
- <find-by-and entity-name="ProductContent" map-name="productFindContext" list-name="foundValues"/>
+ <find-by-and entity-name="ProductContent" map="productFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
@@ -660,12 +660,12 @@
</if-not-empty>
<if-not-empty field="parameters.duplicateCategoryMembers">
<if-not-empty field="parameters.removeBefore">
- <find-by-and entity-name="ProductCategoryMember" map-name="productVariantContext" list-name="foundVariantValues"/>
+ <find-by-and entity-name="ProductCategoryMember" map="productVariantContext" list="foundVariantValues"/>
<iterate entry="foundVariantValue" list="foundVariantValues">
<remove-value value-field="foundVariantValue"/>
</iterate>
</if-not-empty>
- <find-by-and entity-name="ProductCategoryMember" map-name="productFindContext" list-name="foundValues"/>
+ <find-by-and entity-name="ProductCategoryMember" map="productFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
@@ -674,12 +674,12 @@
</if-not-empty>
<if-not-empty field="parameters.duplicateAttributes">
<if-not-empty field="parameters.removeBefore">
- <find-by-and entity-name="ProductAttribute" map-name="productVariantContext" list-name="foundVariantValues"/>
+ <find-by-and entity-name="ProductAttribute" map="productVariantContext" list="foundVariantValues"/>
<iterate entry="foundVariantValue" list="foundVariantValues">
<remove-value value-field="foundVariantValue"/>
</iterate>
</if-not-empty>
- <find-by-and entity-name="ProductAttribute" map-name="productFindContext" list-name="foundValues"/>
+ <find-by-and entity-name="ProductAttribute" map="productFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
@@ -688,12 +688,12 @@
</if-not-empty>
<if-not-empty field="parameters.duplicateFacilities">
<if-not-empty field="parameters.removeBefore">
- <find-by-and entity-name="ProductFacility" map-name="productVariantContext" list-name="foundVariantValues"/>
+ <find-by-and entity-name="ProductFacility" map="productVariantContext" list="foundVariantValues"/>
<iterate entry="foundVariantValue" list="foundVariantValues">
<remove-value value-field="foundVariantValue"/>
</iterate>
</if-not-empty>
- <find-by-and entity-name="ProductFacility" map-name="productFindContext" list-name="foundValues"/>
+ <find-by-and entity-name="ProductFacility" map="productFindContext" list="foundValues"/>
<iterate entry="foundValue" list="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
@@ -702,12 +702,12 @@
</if-not-empty>
<if-not-empty field="parameters.duplicateLocations">
<if-not-empty field="parameters.removeBefore">
- <find-by-and entity-name="ProductFacilityLocation" map-name="productVariantContext" list-name="foundVariantValues"/>
+ <find-by-and entity-name="ProductFacilityLocation" map="productVariantContext" list="foundVariantValues"/>
<iterate entry="foundVariantValue" list="foundVariantValues">
<remove-value value-field="foundVariantValue"/>
</iterate>
</if-not-empty>
- <find-by-and entity-name="ProductFacilityLocation" map-name="productFindContext" list-name="foundValues"/>
+ <find-by-and entity-name="ProductFacilityLocation" map="productFindContext" list="foundValues"/>
<iterate list="foundValues" entry="foundValue">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
@@ -855,7 +855,7 @@
<set from-field="parameters.productId" field="lookupRoleCategoriesMap.productId"/>
<set from-field="userLogin.partyId" field="lookupRoleCategoriesMap.partyId"/>
<set value="LTD_ADMIN" field="lookupRoleCategoriesMap.roleTypeId"/>
- <find-by-and entity-name="ProductCategoryMemberAndRole" map-name="lookupRoleCategoriesMap" list-name="roleCategories"/>
+ <find-by-and entity-name="ProductCategoryMemberAndRole" map="lookupRoleCategoriesMap" list="roleCategories"/>
<filter-list-by-date list-name="roleCategories"/>
<filter-list-by-date list-name="roleCategories" from-field-name="roleFromDate" thru-field-name="roleThruDate"/>
</then>
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=730245&r1=730244&r2=730245&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 Tue Dec 30 13:29:24 2008
@@ -59,7 +59,7 @@
<make-value entity-name="FacilityContactMech" value-field="facilityContactMechMap"/>
<set-pk-fields value-field="facilityContactMechMap" map="parameters"/>
- <find-by-and entity-name="FacilityContactMech" list-name="facilityContactMechs" map-name="facilityContactMechMap"/>
+ <find-by-and entity-name="FacilityContactMech" list="facilityContactMechs" map="facilityContactMechMap"/>
<filter-list-by-date list-name="facilityContactMechs" to-list-name="validFacilityContactMechs"/>
<first-from-list entry="facilityContactMech" list="validFacilityContactMechs"/>
<if-empty field="facilityContactMech">
@@ -105,7 +105,7 @@
<set field="purposeMap.facilityId" from-field="facilityContactMechPurpose.facilityId"/>
<set field="purposeMap.contactMechPurposeTypeId" from-field="facilityContactMechPurpose.contactMechPurposeTypeId"/>
<set field="purposeMap.contactMechId" from-field="facilityContactMechPurpose.contactMechId"/>
- <find-by-and entity-name="FacilityContactMechPurpose" list-name="purposeResult" map-name="purposeMap"/>
+ <find-by-and entity-name="FacilityContactMechPurpose" list="purposeResult" map="purposeMap"/>
<if-empty field="purposeResult">
@@ -126,7 +126,7 @@
<make-value entity-name="FacilityContactMech" value-field="facilityContactMechMap"/>
<set-pk-fields value-field="facilityContactMechMap" map="parameters"/>
- <find-by-and entity-name="FacilityContactMech" list-name="facilityContactMechs" map-name="facilityContactMechMap"/>
+ <find-by-and entity-name="FacilityContactMech" list="facilityContactMechs" map="facilityContactMechMap"/>
<filter-list-by-date list-name="facilityContactMechs" to-list-name="validFacilityContactMechs"/>
<first-from-list entry="facilityContactMech" list="validFacilityContactMechs"/>
@@ -242,7 +242,7 @@
<check-permission permission="FACILITY" action="_UPDATE"><fail-message message="You do not have permission to perform this operation for this facility."/></check-permission>
<check-errors/>
- <if-validate-method field-name="parameters.emailAddress" method="isEmail">
+ <if-validate-method field="parameters.emailAddress" method="isEmail">
<else><add-error><fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/></add-error></else>
</if-validate-method>
<check-errors/>
@@ -262,7 +262,7 @@
<check-permission permission="FACILITY" action="_UPDATE"><fail-message message="You do not have permission to perform this operation for this facility."/></check-permission>
<check-errors/>
- <if-validate-method field-name="parameters.emailAddress" method="isEmail">
+ <if-validate-method field="parameters.emailAddress" method="isEmail">
<else><add-error><fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/></add-error></else>
</if-validate-method>
<check-errors/>
@@ -286,7 +286,7 @@
<set field="lookUpMap.facilityId" from-field="parameters.facilityId" />
<set field="lookUpMap.contactMechId" from-field="parameters.contactMechId" />
<set field="lookUpMap.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId" />
- <find-by-and entity-name="FacilityContactMechPurpose" map-name="lookUpMap" list-name="purposeList"/>
+ <find-by-and entity-name="FacilityContactMechPurpose" map="lookUpMap" list="purposeList"/>
<filter-list-by-date list-name="purposeList"/>
<if-not-empty field="purposeList">
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=730245&r1=730244&r2=730245&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 Tue Dec 30 13:29:24 2008
@@ -81,7 +81,7 @@
<if-compare field="store.oneInventoryFacility" operator="equals" value="Y">
<!-- expire all the facilities -->
<set from-field="store.productStoreId" field="lookupPFMap.productStoreId"/>
- <find-by-and entity-name="ProductStoreFacility" map-name="lookupPFMap" list-name="storeFacilities"/>
+ <find-by-and entity-name="ProductStoreFacility" map="lookupPFMap" list="storeFacilities"/>
<filter-list-by-date list-name="storeFacilities"/>
<iterate list="storeFacilities" entry="facility">
<set from-field="nowTimestamp" field="facility.thruDate"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=730245&r1=730244&r2=730245&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Tue Dec 30 13:29:24 2008
@@ -184,7 +184,7 @@
<!-- get orderShipment -->
<make-value entity-name="OrderShipment" value-field="orderShipmentLookupPk"/>
<set-pk-fields value-field="orderShipmentLookupPk" map="parameters"/>
- <find-by-and entity-name="OrderShipment" map-name="orderShipmentLookupPk" list-name="orderShipments"/>
+ <find-by-and entity-name="OrderShipment" map="orderShipmentLookupPk" list="orderShipments"/>
<first-from-list entry="orderShipment" list="orderShipments"/>
<!-- qtyForShipmentItem is the quantity we will add to the ShipmentItem -->
<!-- OrderShipment.quantity stores the OrderItem.quantity planned in the shipment -->