svn commit: r730090 [1/2] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r730090 [1/2] - in /ofbiz/trunk: applications/accounting/script
 
|
Author: jleroux
Date: Tue Dec 30 03:06:31 2008 New Revision: 730090 URL: http://svn.apache.org/viewvc?rev=730090&view=rev Log: <iterate entry-name => <iterate entry Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMethodServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.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/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.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/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/feature/ProductFeatureServices.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/inventory/StockMoveServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.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/shipment/picklist/PicklistServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.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/timesheet/TimesheetServices.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=730090&r1=730089&r2=730090&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Tue Dec 30 03:06:31 2008 @@ -284,7 +284,7 @@ <condition-expr field-name="finAccountId" env-name="finAccountId"/> </entity-condition> <set field="actualBalanceSum" value="0" type="BigDecimal"/> - <iterate entry-name="finAccountTrans" list-name="finAccountTransList"> + <iterate entry="finAccountTrans" list-name="finAccountTransList"> <if> <condition><if-compare field="finAccountTrans.finAccountTransTypeId" operator="equals" value="DEPOSIT"/></condition> <then><set field="amountForCalc" from-field="finAccountTrans.amount"/></then> @@ -309,7 +309,7 @@ <entity-condition entity-name="FinAccountAuth" list-name="finAccountAuthList" filter-by-date="true"> <condition-expr field-name="finAccountId" env-name="finAccountId"/> </entity-condition> - <iterate entry-name="finAccountAuth" list-name="finAccountAuthList"> + <iterate entry="finAccountAuth" list-name="finAccountAuthList"> <calculate field-name="availableBalanceSum" type="BigDecimal" decimal-scale="${roundingDecimals}" rounding-mode="${roundingMode}"> <calcop operator="add" field-name="availableBalanceSum"> <calcop operator="negative" field-name="finAccountAuth.amount"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=730090&r1=730089&r2=730090&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Tue Dec 30 03:06:31 2008 @@ -182,7 +182,7 @@ </call-service> <field-to-result field-name="invoiceId" result-name="invoiceId"/> <field-to-request field-name="invoiceId" request-name="invoiceId"/> - <iterate entry-name="invoiceItem" list-name="invoiceItems"> + <iterate entry="invoiceItem" list-name="invoiceItems"> <set-service-fields service-name="createInvoiceItem" map-name="invoiceItem" to-map-name="createInvoiceItem"/> <set field="createInvoiceItem.invoiceId" from-field="invoiceId"/> <call-service service-name="createInvoiceItem" in-map-name="createInvoiceItem"/> @@ -489,7 +489,7 @@ <entity-and entity-name="TimeEntry" list-name="entries"> <field-map field-name="invoiceId" env-name="parameters.invoiceId"/> </entity-and> - <iterate entry-name="entry" list-name="entries"> + <iterate entry="entry" list-name="entries"> <clear-field field-name="entry.invoiceId"/> <clear-field field-name="entry.invoiceItemSeqId"/> <store-value value-name="entry"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml?rev=730090&r1=730089&r2=730090&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml Tue Dec 30 03:06:31 2008 @@ -31,7 +31,7 @@ <field-map field-name="partyRelationshipTypeId" value="SALES_AFFILIATE"/><!-- this constraint could be optional if not being set in company data --> </entity-and> - <iterate entry-name="affiliatePartyRelationship" list-name="affiliatePartyRelationshipList"> + <iterate entry="affiliatePartyRelationship" list-name="affiliatePartyRelationshipList"> <!-- calculate a commission for each commission partner, identified by affiliatePartyRelationship.partyIdTo --> <if> <condition><if-compare field="affiliatePartyRelationship.roleTypeIdTo" operator="equals" value="AFFILIATE"/></condition> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml?rev=730090&r1=730089&r2=730090&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml Tue Dec 30 03:06:31 2008 @@ -158,7 +158,7 @@ </entity-condition> <calculate field-name="debitTotal" type="BigDecimal"><number value="0"/></calculate> <calculate field-name="creditTotal" type="BigDecimal"><number value="0"/></calculate> - <iterate entry-name="acctgTransEntry" list-name="acctgTransEntryList"> + <iterate entry="acctgTransEntry" list-name="acctgTransEntryList"> <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D"> <calculate field-name="debitTotal" type="BigDecimal" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}"> <calcop operator="add"> @@ -241,7 +241,7 @@ <!-- get current period(s) and check if closed --> <!-- also check if the glAccountId, amount, currencyUomId fields are all set --> - <iterate entry-name="acctgTransEntry" list-name="acctgTransEntryList"> + <iterate entry="acctgTransEntry" list-name="acctgTransEntryList"> <!-- we want to do this for each organizationPartyId, so only do this if we haven't already found the list for the current org --> <if-empty field="customTimePeriodListByOrganizationPartyIdMap.${acctgTransEntry.organizationPartyId}"> <clear-field field-name="findCustomTimePeriodCallMap"/> @@ -260,7 +260,7 @@ <add-error><fail-message message="Could not find a CustomTimePeriod (fiscal period) for the Transaction Date [${acctgTrans.transactionDate}] (is for Organization Party with ID [${acctgTransEntry.organizationPartyId}])"/></add-error> </if-empty> <!-- now do the actual isClose check --> - <iterate entry-name="customTimePeriod" list-name="customTimePeriodList"> + <iterate entry="customTimePeriod" list-name="customTimePeriodList"> <if-compare field="customTimePeriod.isClosed" operator="equals" value="Y"> <add-error><fail-message message="CustomTimePeriod (fiscal period) [${customTimePeriod.customTimePeriodId}] is CLOSED, cannot post to it (is for the Transaction Date [${acctgTrans.transactionDate}] and Organization Party with ID [${acctgTransEntry.organizationPartyId}])"/></add-error> </if-compare> @@ -312,7 +312,7 @@ </iterate> </if-not-empty> <!-- TODO: for each entry: lookup GlAccount, update posted balance --> - <iterate entry-name="acctgTransEntry" list-name="acctgTransEntryList"> + <iterate entry="acctgTransEntry" list-name="acctgTransEntryList"> <!-- Get all data to operate on: GlAccount, GlAccountOrganization, GlAccountHistory --> <clear-field field-name="glAccount"/> <clear-field field-name="glAccountOrganization"/> @@ -383,7 +383,7 @@ <!-- assemble the glAccountHistoryList, we will update all of these --> <set from-field="customTimePeriodListByOrganizationPartyIdMap.${acctgTransEntry.organizationPartyId}" field="customTimePeriodList"/> - <iterate entry-name="customTimePeriod" list-name="customTimePeriodList"> + <iterate entry="customTimePeriod" list-name="customTimePeriodList"> <entity-one entity-name="GlAccountHistory" value-name="glAccountHistory"> <field-map field-name="glAccountId" env-name="acctgTransEntry.glAccountId"/> <field-map field-name="organizationPartyId" env-name="acctgTransEntry.organizationPartyId"/> 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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -27,7 +27,7 @@ <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" /> - <iterate entry-name="orderHeaderAndPaymentPref" list-name="orderHeaderAndPaymentPrefs" > + <iterate entry="orderHeaderAndPaymentPref" list-name="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"> <result-to-field map-name="captureResult" result-name="responseMessage" /> @@ -79,7 +79,7 @@ <set field="lookupMap.contactMechId" from-field="parameters.oldContactMechId"/> <find-by-and entity-name="CreditCard" map-name="lookupMap" list-name="creditCards"/> - <iterate entry-name="creditCard" list-name="creditCards"> + <iterate entry="creditCard" list-name="creditCards"> <call-class-method class-name="org.ofbiz.base.util.UtilValidate" method-name="isDateAfterToday" ret-field-name="isNotExpired"> <field field-name="creditCard.expireDate"/> </call-class-method> @@ -93,7 +93,7 @@ </iterate> <find-by-and entity-name="EftAccount" map-name="lookupMap" list-name="eftAccounts"/> - <iterate entry-name="eftAccount" list-name="eftAccounts"> + <iterate entry="eftAccount" list-name="eftAccounts"> <set-service-fields service-name="updateEftAccount" map-name="eftAccount" to-map-name="ueaMap"/> <set field="ueaMap.contactMechId" from-field="parameters.contactMechId"/> <set field="ueaMap.partyId" from-field="parameters.partyId"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml?rev=730090&r1=730089&r2=730090&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml Tue Dec 30 03:06:31 2008 @@ -353,7 +353,7 @@ <!-- migrate service --> <simple-method method-name="migrateRateFactor" short-description="migrate the several entities which were change in the rate refactor activity"> <entity-condition entity-name="OldEmplPositionTypeRate" list-name="posRates"/> - <iterate entry-name="posRate" list-name="posRates"> + <iterate entry="posRate" list-name="posRates"> <make-value value-name="emplPositionTypeRate" entity-name="EmplPositionTypeRate"/> <set-pk-fields value-name="posRate" map-name="emplPositionTypeRate"/> <set-nonpk-fields value-name="posRate" map-name="emplPositionTypeRate"/> @@ -367,7 +367,7 @@ <create-value value-name="rateAmount"/> </iterate> <entity-condition entity-name="OldPartyRate" list-name="partyRates"/> - <iterate entry-name="oldPartyRate" list-name="oldPartyRates"> + <iterate entry="oldPartyRate" list-name="oldPartyRates"> <make-value value-name="partyRate" entity-name="PartyRate"/> <set-pk-fields value-name="oldPartyRate" map-name="partyRate"/> <set-nonpk-fields value-name="oldPartyRate" map-name="partyRate"/> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml?rev=730090&r1=730089&r2=730090&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml Tue Dec 30 03:06:31 2008 @@ -179,7 +179,7 @@ <set field="mapIn.targetOperationList[]" value="CONTENT_VIEW"/> <set field="mapIn.targetOperationList[]" value="CONTENT_UPDATE"/> <set field="blogList[]"/> - <iterate entry-name="view" list-name="unfilteredList"> + <iterate entry="view" list-name="unfilteredList"> <make-value entity-name="Content" value-name="content"/> <set-nonpk-fields value-name="content" map-name="view"/> <set-pk-fields value-name="content" map-name="view"/> 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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -165,7 +165,7 @@ <entity-and entity-name="ContentAssoc" list-name="assocs"> <field-map field-name="contentId" env-name="parameters.contentId"/> </entity-and> - <iterate entry-name="assoc" list-name="assocs"> + <iterate entry="assoc" list-name="assocs"> <set field="assoc.contentId" from-field="newContentId"/> <set-service-fields service-name="createContentAssoc" map-name="assoc" to-map-name="assocS"/> <call-service service-name="createContentAssoc" in-map-name="assocS"/> @@ -174,7 +174,7 @@ <entity-and entity-name="ContentAssoc" list-name="assocsTo"> <field-map field-name="contentIdTo" env-name="parameters.contentId"/> </entity-and> - <iterate entry-name="assocTo" list-name="assocsTo"> + <iterate entry="assocTo" list-name="assocsTo"> <set field="assocTo.contentIdTo" from-field="newContentId"/> <set-service-fields service-name="createContentAssoc" map-name="assocTo" to-map-name="assocTos"/> <call-service service-name="createContentAssoc" in-map-name="assocTos"/> @@ -282,7 +282,7 @@ <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"/> - <iterate entry-name="contentRoleMap" list-name="roleList"> + <iterate entry="contentRoleMap" list-name="roleList"> <make-value entity-name="ContentRole" value-name="role" map-name="contentRoleMap"/> <now-timestamp-to-env env-name="role.thruDate"/> <store-value value-name="role"/> @@ -560,11 +560,11 @@ <set from-field="parameters.contentId" field="queryMap.contentId"/> <set field="mapKeys" from-field="parameters.mapKeys" /> <field-to-list field-name="mapKey" list-name="mapKeys"/> - <iterate entry-name="mapKey" list-name="mapKeys"> + <iterate entry="mapKey" list-name="mapKeys"> <set from-field="mapKey" field="queryMap.mapKey"/> <find-by-and list-name="resultMap" entity-name="ContentAssoc" map-name="queryMap"/> <filter-list-by-date list-name="resultMap" to-list-name="validContent"/> - <iterate entry-name="contentAssoc" list-name="validContent"> + <iterate entry="contentAssoc" list-name="validContent"> <field-to-list field-name="contentAssoc" list-name="result"/> </iterate> </iterate> @@ -1161,7 +1161,7 @@ </condition-list> </entity-condition> - <iterate entry-name="view" list-name="viewList"> + <iterate entry="view" list-name="viewList"> <set field="hasPermission" value="true" type="Boolean"/> <if> <condition> @@ -1200,7 +1200,7 @@ <result-to-field result-name="subContentList"/> </call-service> - <iterate entry-name="view" list-name="subContentList"> + <iterate entry="view" list-name="subContentList"> <entity-condition list-name="viewList" entity-name="ContentAssocViewTo" filter-by-date="true" use-cache="${useCache}"> <condition-list combine="and"> <condition-expr field-name="contentIdStart" env-name="view.caContentIdTo"/> 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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -464,7 +464,7 @@ <call-simple-method method-name="findAllContentPurposes"/> <!-- find defined purpose/operation mappings --> - <iterate entry-name="currentPurpose" list-name="contentPurposes"> + <iterate entry="currentPurpose" list-name="contentPurposes"> <entity-condition entity-name="ContentPurposeOperation" list-name="currentOperations"> <condition-list combine="and"> <condition-expr field-name="contentPurposeTypeId" operator="equals" env-name="currentPurpose.contentPurposeTypeId"/> @@ -507,7 +507,7 @@ <call-simple-method method-name="findAllAssociatedPartyIds"/> <!-- check each operation security --> - <iterate entry-name="operation" list-name="operations"> + <iterate entry="operation" list-name="operations"> <if-compare field="hasPermission" value="false" type="Boolean" operator="equals"> <!-- reset the checkId if needed --> <if> @@ -543,7 +543,7 @@ <log level="verbose" message="Passed status check; now checking role(s)"/> <!-- first check passed; now we test for the role membership(s) --> - <iterate entry-name="thisPartyId" list-name="partyIdList"> + <iterate entry="thisPartyId" list-name="partyIdList"> <if-compare field="hasPermission" value="false" type="Boolean" operator="equals"> <set field="checkRoleTypeId" from-field="operation.roleTypeId"/> <set field="checkPartyId" from-field="thisPartyId"/> @@ -639,7 +639,7 @@ <set field="checkRoleTypeId" value="OWNER"/> <!-- check to see if any of the parties are owner of the content --> - <iterate entry-name="thisPartyId" list-name="partyIdList"> + <iterate entry="thisPartyId" list-name="partyIdList"> <if> <condition> <not> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml?rev=730090&r1=730089&r2=730090&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml Tue Dec 30 03:06:31 2008 @@ -173,7 +173,7 @@ <else> <!-- multi-checked --> - <iterate entry-name="thisType" list-name="parameters.webSiteContentTypeId"> + <iterate entry="thisType" list-name="parameters.webSiteContentTypeId"> <entity-one entity-name="WebSiteContentType" value-name="wct"> <field-map field-name="webSiteContentTypeId" env-name="thisType"/> </entity-one> 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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -123,7 +123,7 @@ <set from-field="estimatedQuantity" field="parameters.quantityNotIssued"/> <set field="parameters.useReservedItems" value="N"/> - <iterate entry-name="inventoryItem" list-name="inventoryItemList"> + <iterate entry="inventoryItem" list-name="inventoryItemList"> <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names --> <call-simple-method method-name="issueProductionRunTaskComponentInline"/> </iterate> @@ -137,7 +137,7 @@ </condition> <then> <set field="parameters.useReservedItems" value="Y"/> - <iterate entry-name="inventoryItem" list-name="inventoryItemList"> + <iterate entry="inventoryItem" list-name="inventoryItemList"> <if-compare field="parameters.quantityNotIssued" operator="greater" value="0" type="Double"> <refresh-value value-name="inventoryItem"/> <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names --> 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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -145,7 +145,7 @@ <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"/> - <iterate entry-name="contactlistparty" list-name="ContactListParties"> + <iterate entry="contactlistparty" list-name="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}"/> <store-value value-name="contactlistparty"/> 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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -93,7 +93,7 @@ <!-- 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"/> - <iterate entry-name="shipmentClerkRole" list-name="shipmentClerkRoles"> + <iterate entry="shipmentClerkRole" list-name="shipmentClerkRoles"> <set field="sendToPartyIdMap.${shipmentClerkRole.partyId}" from-field="shipmentClerkRole.partyId"/> </iterate> @@ -102,7 +102,7 @@ <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"/> - <iterate entry-name="sendToPartyPartyAndContactMech" list-name="sendToPartyPartyAndContactMechs"> + <iterate entry="sendToPartyPartyAndContactMech" list-name="sendToPartyPartyAndContactMechs"> <string-append field-name="sendEmailMap.sendTo" string="${sendToPartyPartyAndContactMech.infoString}" prefix=","/> </iterate> </iterate-map> 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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -149,10 +149,10 @@ <entity-condition entity-name="ReturnAdjustment" list-name="returnAdjustments" distinct="true"> <condition-expr field-name="returnId" operator="equals" env-name="returnHeader.returnId"/> </entity-condition> - <iterate entry-name="returnItem" list-name="returnItems"> + <iterate entry="returnItem" list-name="returnItems"> <log level="verbose" message="item: ${returnItem.returnItemSeqId} ${returnItem.returnItemTypeId} [${returnItem.description}] ${returnItem.productId} ${returnItem.returnQuantity} ${returnItem.returnPrice}"/> </iterate> - <iterate entry-name="returnAdjustment" list-name="returnAdjustments"> + <iterate entry="returnAdjustment" list-name="returnAdjustments"> <log level="verbose" message="adjustment: ${returnAdjustment.returnItemSeqId} ${returnAdjustment.returnAdjustmentTypeId} [${returnAdjustment.description}] ${returnAdjustment.amount}"/> </iterate> --> @@ -162,7 +162,7 @@ <calculate field-name="returnTotalAmount"><number value="0.0"/></calculate> <!-- check them all to make sure that the return total does not exceed order total. --> - <iterate entry-name="returnItem" list-name="returnItems"> + <iterate entry="returnItem" list-name="returnItems"> <!-- check, for cross-ship returns, if a payment method is set to guarantee the cross-shipped item(s).. --> <if> <condition> @@ -232,7 +232,7 @@ <entity-and entity-name="ReturnAdjustment" list-name="returnAdjustments"> <field-map field-name="returnId" env-name="returnHeader.returnId"/> </entity-and> - <iterate entry-name="returnAdjustment" list-name="returnAdjustments"> + <iterate entry="returnAdjustment" list-name="returnAdjustments"> <calculate field-name="returnTotalAmount"> <calcop field-name="returnTotalAmount" operator="add"> <calcop operator="get" field-name="amount" map-name="returnAdjustment"/> @@ -415,7 +415,7 @@ <!-- create return adjustments for all adjustments associated with the order item --> <if-not-empty field="orderItem"> <get-related value-name="orderItem" relation-name="OrderAdjustment" list-name="orderAdjustments"/> - <iterate entry-name="orderAdjustment" list-name="orderAdjustments"> + <iterate entry="orderAdjustment" list-name="orderAdjustments"> <clear-field field-name="returnAdjCtx"/> <set field="returnAdjCtx.returnId" from-field="parameters.returnId"/> <set field="returnAdjCtx.returnItemSeqId" from-field="newEntity.returnItemSeqId"/> @@ -447,7 +447,7 @@ <field-map field-name="returnId" env-name="returnItem.returnId"/> <field-map field-name="returnItemSeqId" env-name="returnItem.returnItemSeqId"/> </entity-and> - <iterate entry-name="returnAdjustment" list-name="returnAdjustments"> + <iterate entry="returnAdjustment" list-name="returnAdjustments"> <log level="info" message="updating returnAdjustment with Id:[${returnAdjustment.returnAdjustmentId}]"/> <set-service-fields service-name="updateReturnAdjustment" map-name="returnAdjustment" to-map-name="ctx"/> <set field="ctx.originalReturnPrice" from-field="originalReturnPrice"/> @@ -463,7 +463,7 @@ <set from-field="parameters.returnId" field="lookupPKMap.returnId"/> <find-by-and entity-name="ReturnItem" map-name="lookupPKMap" list-name="returnItems"/> - <iterate entry-name="item" list-name="returnItems"> + <iterate entry="item" list-name="returnItems"> <set field="item.statusId" from-field="parameters.statusId"/> </iterate> <store-list list-name="returnItems"/> @@ -493,7 +493,7 @@ <field-map field-name="returnItemSeqId" env-name="returnItem.returnItemSeqId"/> <field-map field-name="returnId" env-name="returnItem.returnId"/> </entity-and> - <iterate entry-name="returnAdjustment" list-name="returnAdjustments"> + <iterate entry="returnAdjustment" list-name="returnAdjustments"> <set field="removeCtx.returnAdjustmentId" from-field="returnAdjustment.returnAdjustmentId"/> <call-service service-name="removeReturnAdjustment" in-map-name="removeCtx"/> </iterate> @@ -710,7 +710,7 @@ </if-empty> <!-- create the return items --> - <iterate entry-name="orderItem" list-name="orderItems"> + <iterate entry="orderItem" list-name="orderItems"> <set from-field="returnId" field="newItemCtx.returnId"/> <set from-field="parameters.returnReasonId" field="newItemCtx.returnReasonId"/> <set from-field="parameters.returnTypeId" field="newItemCtx.returnTypeId"/> @@ -782,7 +782,7 @@ <condition-expr field-name="orderItemSeqId" operator="equals" value="_NA_"/> </condition-list> </entity-condition> - <iterate entry-name="orderAdjustment" list-name="orderAdjustments"> + <iterate entry="orderAdjustment" list-name="orderAdjustments"> <clear-field field-name="returnAdjCtx"/> <set from-field="orderAdjustment.orderAdjustmentId" field="returnAdjCtx.orderAdjustmentId"/> <set from-field="returnId" field="returnAdjCtx.returnId"/> @@ -875,7 +875,7 @@ <entity-condition entity-name="ReturnItem" list-name="returnItems" distinct="true"> <condition-expr field-name="returnId" operator="equals" env-name="parameters.returnId"/> </entity-condition> - <iterate entry-name="returnItem" list-name="returnItems"> + <iterate entry="returnItem" list-name="returnItems"> <set field="returnItemMap.returnId" from-field="parameters.returnId"/> <set field="returnItemMap.returnItemSeqId" from-field="returnItem.returnItemSeqId"/> <set field="returnItemMap.statusId" value="RETURN_CANCELLED" /> 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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -365,7 +365,7 @@ <condition-expr field-name="statusId" operator="not-equals" value="REQ_REJECTED"/> </condition-list> </entity-condition> - <iterate entry-name="requirement" list-name="requirements"> + <iterate entry="requirement" list-name="requirements"> <calculate field-name="existingRequirementTotal" type="Double"> <calcop operator="add" field-name="existingRequirementTotal"> <calcop operator="get" field-name="requirement.quantity"/> 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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -530,7 +530,7 @@ <make-value value-name="lookupRequestRole" entity-name="CustRequestParty"/> <set from-field="parameters.custRequestId" field="lookupRequestRole.custRequestId"/> <find-by-and entity-name="CustRequestParty" map-name="lookupRequestRole" list-name="roles"/> - <iterate entry-name="role" list-name="roles"> + <iterate entry="role" list-name="roles"> <clear-field field-name="cqrContext"/> <set from-field="quoteId" field="cqrContext.quoteId"/> <set from-field="role.partyId" field="cqrContext.partyId"/> 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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -134,7 +134,7 @@ <!-- check for related workefforts ...and when no time recorded cancel these too --> <get-related value-name="custRequest" relation-name="CustRequestWorkEffort" list-name="workEfforts"/> <if-not-empty field="workEfforts"> - <iterate entry-name="workEffort" list-name="workEfforts"> + <iterate entry="workEffort" list-name="workEfforts"> <entity-one entity-name="WorkEffort" value-name="lowInfo"> <field-map field-name="workEffortId" env-name="workEffort.workEffortId"/> </entity-one> @@ -456,7 +456,7 @@ <entity-and entity-name="CommEventContentAssoc" list-name="custRequestContents"> <field-map field-name="communicationEventId" env-name="parameters.communicationEventId"/> </entity-and> - <iterate entry-name="custRequestContent" list-name="custRequestContents"> + <iterate entry="custRequestContent" list-name="custRequestContents"> <set field="reqContent.custRequestId" from-field="parameters.custRequestId"/> <set field="reqContent.contentId" from-field="custRequestContent.contentId"/> <call-service service-name="createCustRequestContent" in-map-name="reqContent"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=730090&r1=730089&r2=730090&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Tue Dec 30 03:06:31 2008 @@ -216,7 +216,7 @@ </entity-and> <set field="totalPrice" type="Double" value="0.0"/> - <iterate entry-name="shoppingListItem" list-name="shoppingListItems"> + <iterate entry="shoppingListItem" list-name="shoppingListItems"> <entity-one entity-name="Product" value-name="product" use-cache="true" auto-field-map="false"> <field-map field-name="productId" env-name="shoppingListItem.productId"/> </entity-one> @@ -241,7 +241,7 @@ <field-map field-name="parentShoppingListId" env-name="parameters.shoppingListId"/> <field-map field-name="partyId" env-name="userLogin.partyId"/> </entity-and> - <iterate entry-name="childshoppingList" list-name="childshoppingLists"> + <iterate entry="childshoppingList" list-name="childshoppingLists"> <map-to-map map-name="calcPriceInBaseMap" to-map-name="calcChildPriceInMap"/> <set from-field="childshoppingList.shoppingListId" field="calcChildPriceInMap.shoppingListId"/> <call-service service-name="calculateShoppingListDeepTotalPrice" in-map-name="calcChildPriceInMap"> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=730090&r1=730089&r2=730090&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Tue Dec 30 03:06:31 2008 @@ -199,13 +199,13 @@ <!-- remove related links to content --> <get-related value-name="event" relation-name="CommEventContentAssoc" list-name="contentAssocs"/> <if-not-empty field="contentAssocs"> - <iterate entry-name="contentAssoc" list-name="contentAssocs"> + <iterate entry="contentAssoc" list-name="contentAssocs"> <remove-value value-name="contentAssoc"/> <!-- delete content and dataresource too if requested --> <if-compare field="parameters.delContentDataResource" value="Y" operator="equals"> <get-related value-name="contentAssoc" relation-name="FromContent" list-name="contents"/> <if-not-empty field="contents"> - <iterate entry-name="content" list-name="contents"> + <iterate entry="content" list-name="contents"> <remove-related value-name="content" relation-name="ContentRole"/> <remove-value value-name="content"/> <get-related-one value-name="content" relation-name="DataResource" to-value-name="dataResource"/> @@ -236,7 +236,7 @@ <!-- remove related workeffort when this is the only communicationevent connected to it --> <get-related value-name="event" relation-name="CommunicationEventWorkEff" list-name="workEffortComs"/> <if-not-empty field="workEffortComs"> - <iterate entry-name="workEffortCom" list-name="workEffortComs"> + <iterate entry="workEffortCom" list-name="workEffortComs"> <remove-value value-name="workEffortCom"/> <get-related-one value-name="workEffortCom" relation-name="WorkEffort" to-value-name="workEffort"/> <get-related value-name="workEffort" relation-name="CommunicationEventWorkEff" list-name="otherComs"/> @@ -356,7 +356,7 @@ </condition-list> </condition-list> </entity-condition> - <iterate entry-name="communicationEvent" list-name="communicationEvents"> + <iterate entry="communicationEvent" list-name="communicationEvents"> <set-service-fields service-name="sendCommEventAsEmail" map-name="communicationEvent" to-map-name="inMap"/> <call-service service-name="sendCommEventAsEmail" in-map-name="inMap" require-new-transaction="true"/> </iterate> @@ -447,7 +447,7 @@ <!-- if complete, set all role status fields to 'complete' (intentionally ignoring the status change checking)--> <if-compare operator="equals" value="COM_COMPLETE" field="parameters.statusId"> <get-related value-name="communicationEvent" relation-name="CommunicationEventRole" list-name="updRoles"/> - <iterate entry-name="updRole" list-name="updRoles"> + <iterate entry="updRole" list-name="updRoles"> <set field="updRole.statusId" value="COM_ROLE_COMPLETED"/> <store-value value-name="updRole"/> </iterate> 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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -31,7 +31,7 @@ <entity-and list="partyAndContactMechs" entity-name="PartyAndContactMech" filter-by-date="true"> <field-map field-name="partyId" env-name="parameters.partyId"/> </entity-and> - <iterate entry-name="partyAndContactMech" list-name="partyAndContactMechs"> + <iterate entry="partyAndContactMech" list-name="partyAndContactMechs"> <entity-one entity-name="ContactMechType" value-name="contactMechType"> <field-map field-name="contactMechTypeId" env-name="partyAndContactMech.contactMechTypeId"/> </entity-one> @@ -110,7 +110,7 @@ <if-compare-field to-field="newPartyContactMech.contactMechId" field="parameters.contactMechId" operator="not-equals"> <get-related value-name="partyContactMech" relation-name="PartyContactMechPurpose" list-name="partyContactMechPurposes"/> - <iterate entry-name="partyContactMechPurposeOld" list-name="partyContactMechPurposes"> + <iterate entry="partyContactMechPurposeOld" list-name="partyContactMechPurposes"> <clone-value value-name="partyContactMechPurposeOld" new-value-name="partyContactMechPurpose"/> <now-timestamp-to-env env-name="partyContactMechPurposeOld.thruDate"/> <store-value value-name="partyContactMechPurposeOld"/> 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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -101,7 +101,7 @@ <set field="parameters.compareDate" from-field="nowTimestamp"/> </if-empty> <!-- go through the list which is sorted by most recent first and find the oldest (last) one with the changeDate greater than the compareDate --> - <iterate entry-name="partyNameHistory" list-name="partyNameHistoryList"> + <iterate entry="partyNameHistory" list-name="partyNameHistoryList"> <if-compare-field field="partyNameHistory.changeDate" to-field="parameters.compareDate" operator="greater"> <set field="partyNameHistoryCurrent" from-field="partyNameHistory"/> </if-compare-field> @@ -528,7 +528,7 @@ <simple-method method-name="followPartyRelationshipsInlineRecurse" short-description="followPartyRelationshipsInlineRecurse"> <clear-field field-name="_inline_NewRelatedPartyIdList"/> - <iterate entry-name="relatedPartyId" list-name="relatedPartyIdList"> + <iterate entry="relatedPartyId" list-name="relatedPartyIdList"> <if> <condition><not><if-compare-field field="_inline_relatedPartyIdAlreadySearchedList" to-field="relatedPartyId" operator="contains"/></not></condition> <then> @@ -552,7 +552,7 @@ <!-- get the newest (highest date) first --> <order-by field-name="-fromDate"/> </entity-condition> - <iterate entry-name="_inline_PartyRelationship" list-name="_inline_PartyRelationshipList"> + <iterate entry="_inline_PartyRelationship" list-name="_inline_PartyRelationshipList"> <if> <condition> <and> @@ -585,7 +585,7 @@ <!-- get the newest (highest date) first --> <order-by field-name="-fromDate"/> </entity-condition> - <iterate entry-name="_inline_PartyRelationship" list-name="_inline_PartyRelationshipList"> + <iterate entry="_inline_PartyRelationship" list-name="_inline_PartyRelationshipList"> <if> <condition> <and> @@ -622,7 +622,7 @@ <simple-method method-name="getChildRoleTypesInline" short-description="getChildRoleTypes"> <clear-field field-name="_inline_NewRoleTypeIdList"/> - <iterate entry-name="roleTypeId" list-name="${roleTypeIdListName}"> + <iterate entry="roleTypeId" list-name="${roleTypeIdListName}"> <if> <condition><not><if-compare-field field="_inline_roleTypeIdAlreadySearchedList" to-field="roleTypeId" operator="contains"/></not></condition> <then> @@ -632,7 +632,7 @@ <entity-condition entity-name="RoleType" list-name="_inline_RoleTypeList" use-cache="true"> <condition-expr field-name="parentTypeId" operator="equals" env-name="roleTypeId"/> </entity-condition> - <iterate entry-name="newRoleType" list-name="_inline_RoleTypeList"> + <iterate entry="newRoleType" list-name="_inline_RoleTypeList"> <if> <condition> <and> @@ -692,8 +692,8 @@ <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"> - <iterate entry-name="type" list-name="types"> - <iterate entry-name="telephone" list-name="telephoneAll3"> + <iterate entry="type" list-name="types"> + <iterate entry="telephone" list-name="telephoneAll3"> <if-empty field="found"> <if-compare-field field="telephone.contactMechPurposeTypeId" to-field="type" operator="equals"> <set field="found" value="notImportant"/> @@ -752,7 +752,7 @@ <entity-condition entity-name="AddressMatchMap" list-name="addrs"> <use-iterator/> </entity-condition> - <iterate entry-name="addr" list-name="addrs"> + <iterate entry="addr" list-name="addrs"> <remove-value value-name="addr"/> </iterate> </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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -294,7 +294,7 @@ <find-by-and entity-name="ProductAssoc" map-name="virtualProductContext" list-name="variantProducts"/> <filter-list-by-date list-name="variantProducts"/> <if-not-empty field="variantProducts"> - <iterate entry-name="variantProduct" list-name="variantProducts"> + <iterate entry="variantProduct" list-name="variantProducts"> <!-- log level="info" message = "Variant product =====${variantProduct.productIdTo}"/ --> <set field="variantProductContext.productId" from-field="variantProduct.productIdTo"/> <call-service service-name="checkImageUrlForProduct" in-map-name="variantProductContext"> 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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -65,7 +65,7 @@ <field-map field-name="partyId" env-name="userLogin.partyId"/> <field-map field-name="roleTypeId" value="LTD_ADMIN"/> </entity-and> - <iterate entry-name="productCategoryRole" list-name="productCategoryRoles"> + <iterate entry="productCategoryRole" list-name="productCategoryRoles"> <!-- add this new product to the category --> <make-value value-name="newLimitRollup" entity-name="ProductCategoryRollup"/> <set field="newLimitRollup.productCategoryId" from-field="newEntity.productCategoryId"/> @@ -128,7 +128,7 @@ <simple-method method-name="addProductToCategories" short-description="Add Product to Multiple Categories"> <if-instance-of field-name="parameters.categories" class="java.util.List"> - <iterate entry-name="category" list-name="parameters.categories"> + <iterate entry="category" list-name="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 --> <!-- @@ -280,7 +280,7 @@ </simple-method> <simple-method method-name="addProductCategoryToCategories" short-description="Add ProductCategory to Categories"> <if-instance-of field-name="parameters.categories" class="java.util.List"> - <iterate entry-name="category" list-name="parameters.categories"> + <iterate entry="category" list-name="parameters.categories"> <set field="callingMethodName" value="addProductCategoryToCategories"/> <set field="checkAction" value="CREATE"/> <!-- note the the user must be associated with the parent category with the role limited permission --> @@ -370,7 +370,7 @@ </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 --> - <iterate entry-name="productCategoryMember" list-name="productCategoryMembers"> + <iterate entry="productCategoryMember" list-name="productCategoryMembers"> <clone-value value-name="productCategoryMember" new-value-name="newProductCategoryMember"/> <set field="newProductCategoryMember.productCategoryId" from-field="parameters.productCategoryIdTo"/> <field-to-list field-name="newProductCategoryMember" list-name="pcmsToStore"/> @@ -386,7 +386,7 @@ <filter-list-by-date list-name="productCategoryRollups" valid-date-name="validDate"/> </if-not-empty> - <iterate entry-name="productCategoryRollup" list-name="productCategoryRollups"> + <iterate entry="productCategoryRollup" list-name="productCategoryRollups"> <set field="callServiceMap.productCategoryId" from-field="productCategoryRollup.productCategoryId"/> <set field="callServiceMap.productCategoryIdTo" from-field="parameters.productCategoryIdTo"/> <set field="callServiceMap.validDate" from-field="parameters.validDate"/> @@ -422,7 +422,7 @@ </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 --> - <iterate entry-name="categoryEntity" list-name="categoryEntities"> + <iterate entry="categoryEntity" list-name="categoryEntities"> <clone-value value-name="categoryEntity" new-value-name="newCategoryEntity"/> <set field="newCategoryEntity.productCategoryId" from-field="productCategoryIdTo"/> <field-to-list field-name="newCategoryEntity" list-name="entitiesToStore"/> @@ -447,7 +447,7 @@ <field-map field-name="productCategoryId" env-name="parameters.productCategoryId"/> </entity-and> - <iterate entry-name="productCategoryMember" list-name="productCategoryMembers"> + <iterate entry="productCategoryMember" list-name="productCategoryMembers"> <set field="productCategoryMember.thruDate" from-field="expireTimestamp"/> <store-value value-name="productCategoryMember"/> </iterate> @@ -469,7 +469,7 @@ <field-map field-name="productCategoryId" env-name="parameters.productCategoryId"/> </entity-and> - <iterate entry-name="productCategoryMember" list-name="productCategoryMembers"> + <iterate entry="productCategoryMember" list-name="productCategoryMembers"> <if-compare-field field="productCategoryMember.thruDate" to-field="expireTimestamp" operator="less" type="Timestamp"> <remove-value value-name="productCategoryMember"/> </if-compare-field> @@ -602,7 +602,7 @@ requires a new find-by map --> <if-not-empty field="parameters.duplicateParentRollup"> <find-by-and entity-name="ProductCategoryRollup" map-name="categoryFindContext" list-name="foundValues"/> - <iterate entry-name="foundValue" list-name="foundValues"> + <iterate entry="foundValue" list-name="foundValues"> <clone-value value-name="foundValue" new-value-name="newTempValue"/> <set field="newTempValue.productCategoryId" from-field="parameters.productCategoryId"/> <create-value value-name="newTempValue"/> @@ -612,7 +612,7 @@ <entity-and entity-name="ProductCategoryRollup" list-name="foundValues"> <field-map field-name="parentProductCategoryId" env-name="parameters.oldProductCategoryId"/> </entity-and> - <iterate entry-name="foundValue" list-name="foundValues"> + <iterate entry="foundValue" list-name="foundValues"> <clone-value value-name="foundValue" new-value-name="newTempValue"/> <set field="newTempValue.parentProductCategoryId" from-field="parameters.productCategoryId"/> <create-value value-name="newTempValue"/> @@ -802,7 +802,7 @@ </condition-list> </condition-list> </entity-condition> - <iterate entry-name="prodCatalogCategory" list-name="prodCatalogCategoryList"> + <iterate entry="prodCatalogCategory" list-name="prodCatalogCategoryList"> <!-- Do not do a permission check unless the ProdCatalog requires it --> <entity-one entity-name="ProdCatalog" value-name="prodCatalog" auto-field-map="false"> <field-map field-name="prodCatalogId" env-name="prodCatalogCategory.prodCatalogId"/> 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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -252,7 +252,7 @@ <result-to-field result-name="componentsMap"/> </call-service> <if-not-empty field="componentsMap"> - <iterate entry-name="componentMap" list-name="componentsMap"> + <iterate entry="componentMap" list-name="componentsMap"> <clear-field field-name="inputMap"/> <set field="product" from-field="componentMap.product"/> <set field="inputMap.productId" from-field="product.productId"/> @@ -288,7 +288,7 @@ <result-to-field result-name="tasks"/> <result-to-field result-name="routing"/> </call-service> - <iterate entry-name="task" list-name="tasks"> + <iterate entry="task" list-name="tasks"> <clear-field field-name="callSvcMap"/> <set from-field="task.workEffortIdTo" field="callSvcMap.workEffortId"/> <set from-field="parameters.currencyUomId" field="callSvcMap.currencyUomId"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml?rev=730090&r1=730089&r2=730090&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml Tue Dec 30 03:06:31 2008 @@ -120,7 +120,7 @@ <field-map field-name="idCode" env-name="parameters.idCode"/> </entity-and> - <iterate entry-name="productFeature" list-name="productFeatures"> + <iterate entry="productFeature" list-name="productFeatures"> <set-service-fields service-name="applyFeatureToProduct" map-name="parameters" to-map-name="applyFeatureContext"/> <set field="applyFeatureContext.productFeatureId" from-field="productFeature.productFeatureId"/> 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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -115,7 +115,7 @@ <set field="parameters.quantityNotIssued" from-field="orderItem.quantity" /> - <iterate entry-name="inventoryItem" list-name="inventoryItemList"> + <iterate entry="inventoryItem" list-name="inventoryItemList"> <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names --> <call-simple-method method-name="issueImmediateForInventoryItemInline"/> </iterate> 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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -91,7 +91,7 @@ </condition-list> <order-by field-name="${orderByString}"/> </entity-condition> - <iterate entry-name="inventoryItemAndLocation" list-name="inventoryItemAndLocations"> + <iterate entry="inventoryItemAndLocation" list-name="inventoryItemAndLocations"> <if-compare field="parameters.quantityNotReserved" operator="greater" value="0" type="Double"> <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names --> <make-value entity-name="InventoryItem" map-name="inventoryItemAndLocation" value-name="inventoryItem"/> @@ -111,7 +111,7 @@ </condition-list> <order-by field-name="${orderByString}"/> </entity-condition> - <iterate entry-name="inventoryItemAndLocation" list-name="inventoryItemAndLocations"> + <iterate entry="inventoryItemAndLocation" list-name="inventoryItemAndLocations"> <if-compare field="parameters.quantityNotReserved" operator="greater" value="0" type="Double"> <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names --> <make-value entity-name="InventoryItem" map-name="inventoryItemAndLocation" value-name="inventoryItem"/> @@ -132,7 +132,7 @@ </condition-list> <order-by field-name="${orderByString}"/> </entity-condition> - <iterate entry-name="inventoryItem" list-name="inventoryItems"> + <iterate entry="inventoryItem" list-name="inventoryItems"> <if> <condition> <and> @@ -534,7 +534,7 @@ <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"/> - <iterate entry-name="oisgir" list-name="oisgirList"> + <iterate entry="oisgir" list-name="oisgirList"> <set from-field="oisgir.orderId" field="cancelOisgirMap.orderId"/> <set from-field="oisgir.orderItemSeqId" field="cancelOisgirMap.orderItemSeqId"/> <set from-field="oisgir.shipGroupSeqId" field="cancelOisgirMap.shipGroupSeqId"/> @@ -563,7 +563,7 @@ <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"/> - <iterate entry-name="oisgir" list-name="oisgirList"> + <iterate entry="oisgir" list-name="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"> <set from-field="toCancelAmount" field="cancelOisgirMap.cancelQuantity"/> 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=730090&r1=730089&r2=730090&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 03:06:31 2008 @@ -615,7 +615,7 @@ <set field="parameters.availableToPromiseTotal" value="0" type="Double"/> <set field="parameters.quantityOnHandTotal" value="0" type="Double"/> - <iterate entry-name="inventoryItem" list-name="inventoryItems"> + <iterate entry="inventoryItem" list-name="inventoryItems"> <if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM"> <if> <condition> @@ -1067,7 +1067,7 @@ <!-- 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"/> - <iterate entry-name="inventoryItemAndLocation" list-name="inventoryItemAndLocations"> + <iterate entry="inventoryItemAndLocation" list-name="inventoryItemAndLocations"> <if> <condition> <and> @@ -1105,7 +1105,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"/> - <iterate entry-name="inventoryItemAndLocation" list-name="inventoryItemAndLocations"> + <iterate entry="inventoryItemAndLocation" list-name="inventoryItemAndLocations"> <if> <condition> <and> @@ -1144,7 +1144,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"/> - <iterate entry-name="inventoryItem" list-name="inventoryItems"> + <iterate entry="inventoryItem" list-name="inventoryItems"> <if> <condition> <and> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml?rev=730090&r1=730089&r2=730090&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml Tue Dec 30 03:06:31 2008 @@ -53,7 +53,7 @@ - orderItemShipGrpInvResInfoList (to be done later if we need it) --> <!-- start by making a Map where the locationSeqId is the key and the value is a List of orderItemShipGrpInvResAndItemLocation --> - <iterate entry-name="orderItemShipGrpInvResAndItemLocation" list-name="orderItemShipGrpInvResAndItemLocationList"> + <iterate entry="orderItemShipGrpInvResAndItemLocation" list-name="orderItemShipGrpInvResAndItemLocationList"> <field-to-list field-name="orderItemShipGrpInvResAndItemLocation" list-name="oiirailByLocMap.${orderItemShipGrpInvResAndItemLocation.locationSeqId}"/> </iterate> @@ -61,7 +61,7 @@ <iterate-map key-name="locationSeqId" value-name="perLocationOiirailList" map-name="oiirailByLocMap"> <!-- now for more fun, split up by productId; this should generally not happen, but we'll make sure here --> <clear-field field-name="oiirailByProdMap"/> - <iterate entry-name="orderItemShipGrpInvResAndItemLocation" list-name="perLocationOiirailList"> + <iterate entry="orderItemShipGrpInvResAndItemLocation" list-name="perLocationOiirailList"> <field-to-list field-name="orderItemShipGrpInvResAndItemLocation" list-name="oiirailByProdMap[orderItemShipGrpInvResAndItemLocation.productId]"/> </iterate> @@ -94,7 +94,7 @@ <!-- get totalQuantity: iterate through perProductOiirailList and add up quantity (from OrderItemShipGrpInvRes) --> <calculate field-name="moveInfo.totalQuantity" type="Double"><number value="0"/></calculate> - <iterate entry-name="perProductOiirail" list-name="perProductOiirailList"> + <iterate entry="perProductOiirail" list-name="perProductOiirailList"> <calculate field-name="moveInfo.totalQuantity" type="Double"> <calcop field-name="moveInfo.totalQuantity" operator="add"><calcop field-name="perProductOiirail.quantity" operator="get"/></calcop> </calculate> @@ -109,7 +109,7 @@ <calculate field-name="totalQuantityOnHand" type="Double"><number value="0"/></calculate> <calculate field-name="totalAvailableToPromise" type="Double"><number value="0"/></calculate> - <iterate entry-name="inventoryItem" list-name="inventoryItemList"> + <iterate entry="inventoryItem" list-name="inventoryItemList"> <calculate field-name="totalQuantityOnHand" type="Double"> <calcop field-name="totalQuantityOnHand" operator="add"><calcop field-name="inventoryItem.quantityOnHandTotal" operator="get"/></calcop> </calculate> @@ -130,7 +130,7 @@ <get-related value-name="moveInfo.targetProductFacilityLocation" relation-name="InventoryItem" list-name="targetInventoryItemList"/> <calculate field-name="targetTotalAvailableToPromise" type="Double"><number value="0"/></calculate> <calculate field-name="targetTotalQuantityOnHand" type="Double"><number value="0"/></calculate> - <iterate entry-name="inventoryItem" list-name="targetInventoryItemList"> + <iterate entry="inventoryItem" list-name="targetInventoryItemList"> <calculate field-name="targetTotalAvailableToPromise" type="Double"> <calcop field-name="targetTotalAvailableToPromise" operator="add"><calcop field-name="inventoryItem.availableToPromiseTotal" operator="get"/></calcop> </calculate> @@ -221,7 +221,7 @@ <order-by field-name="productId"/> </entity-and> - <iterate entry-name="productFacilityLocationQuantityTest" list-name="productFacilityLocationQuantityTestList"> + <iterate entry="productFacilityLocationQuantityTest" list-name="productFacilityLocationQuantityTestList"> <!-- TODO: this comparison could be done by the database and be more efficient, but since we don't have field to field comparisons in the entity engine or EntityCondition operations in simple-methods, some work needs to be done before that can happen --> <if> <condition> @@ -269,7 +269,7 @@ <set from-field="productFacilityLocationQuantityTest.moveQuantity" field="targetLocationMoveQuantity"/> <!-- start by making a Map where the locationSeqId is the key and the value is a List of InventoryItemAndLocation --> <clear-field field-name="InventoryItemAndLocationByLocMap"/> - <iterate entry-name="InventoryItemAndLocation" list-name="inventoryItemAndLocationList"> + <iterate entry="InventoryItemAndLocation" list-name="inventoryItemAndLocationList"> <field-to-list field-name="InventoryItemAndLocation" list-name="InventoryItemAndLocationByLocMap.${InventoryItemAndLocation.locationSeqId}"/> </iterate> <clear-field field-name="locationSeqId"/> @@ -278,7 +278,7 @@ <if-empty field="fromLocationTotalAvailableToPromise.${locationSeqId}"> <calculate field-name="totalQuantityOnHand" type="Double"><number value="0"/></calculate> <calculate field-name="totalAvailableToPromise" type="Double"><number value="0"/></calculate> - <iterate entry-name="inventoryItem" list-name="perLocationInventoryItemAndLocList"> + <iterate entry="inventoryItem" list-name="perLocationInventoryItemAndLocList"> <calculate field-name="totalQuantityOnHand" type="Double"> <calcop field-name="totalQuantityOnHand" operator="add"><calcop field-name="inventoryItem.quantityOnHandTotal" operator="get"/></calcop> </calculate> @@ -376,7 +376,7 @@ <order-by field-name="datetimeReceived"/> </entity-and> - <iterate entry-name="inventoryItem" list-name="inventoryItemList"> + <iterate entry="inventoryItem" list-name="inventoryItemList"> <!-- for each inventoryItem only process if quantityLeftToProcess > 0 and inventoryItem.availableToPromiseTotal > 0 --> <if-compare field="quantityLeftToProcess" operator="greater" value="0" type="Double"> <if-compare field="inventoryItem.availableToPromiseTotal" operator="greater" value="0" type="Double"> @@ -440,7 +440,7 @@ <clear-field field-name="oiirailByInvItemMap"/> <log level="info" message="In processOisgirMoveByStatusInline orderItemShipGrpInvResAndItemLocationList=${orderItemShipGrpInvResAndItemLocationList}"/> - <iterate entry-name="orderItemShipGrpInvResAndItemLocation" list-name="orderItemShipGrpInvResAndItemLocationList"> + <iterate entry="orderItemShipGrpInvResAndItemLocation" list-name="orderItemShipGrpInvResAndItemLocationList"> <field-to-list field-name="orderItemShipGrpInvResAndItemLocation" list-name="oiirailByInvItemMap.${orderItemShipGrpInvResAndItemLocation.inventoryItemId}"/> </iterate> @@ -479,7 +479,7 @@ sure to stay within quantityOnHand --> <set from-field="inventoryItem.quantityOnHandTotal" field="remainingQuantityOnHand"/> - <iterate entry-name="orderItemShipGrpInvResAndItemLocation" list-name="orderItemShipGrpInvResAndItemLocationList"> + <iterate entry="orderItemShipGrpInvResAndItemLocation" list-name="orderItemShipGrpInvResAndItemLocationList"> <get-related-one value-name="orderItemShipGrpInvResAndItemLocation" relation-name="OrderItemShipGrpInvRes" to-value-name="orderItemShipGrpInvRes"/> <!-- see if there is enough physically moved over to move this reservation --> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml?rev=730090&r1=730089&r2=730090&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml Tue Dec 30 03:06:31 2008 @@ -122,7 +122,7 @@ <check-errors/> <!-- keep the product around, just expire SupplierProduct and ProductCategoryMember records --> - <iterate entry-name="supplierProduct" list-name="supplierProductList"> + <iterate entry="supplierProduct" list-name="supplierProductList"> <set field="supplierProduct.availableThruDate" from-field="nowTimestamp"/> <store-value value-name="supplierProduct"/> </iterate> @@ -130,7 +130,7 @@ <entity-and entity-name="ProductCategoryMember" list-name="productCategoryMemberList"> <field-map field-name="productId"/> </entity-and> - <iterate entry-name="productCategoryMember" list-name="productCategoryMemberList"> + <iterate entry="productCategoryMember" list-name="productCategoryMemberList"> <set field="productCategoryMember.thruDate" from-field="nowTimestamp"/> <store-value value-name="productCategoryMember"/> </iterate> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |