svn commit: r730118 [1/2] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r730118 [1/2] - in /ofbiz/trunk: applications/accounting/script
 
|
Author: jleroux
Date: Tue Dec 30 04:17:03 2008 New Revision: 730118 URL: http://svn.apache.org/viewvc?rev=730118&view=rev Log: <entity-condition(.*)list-name => <entity-condition$1list Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.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/compdoc/CompDocServices.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/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/segment/SegmentServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/UpgradeServices.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/requirement/RequirementServices.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/ContactMechServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.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/InventoryReserveServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.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/product/script/org/ofbiz/shipment/test/TestServices.xml ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/WebPosServices.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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -280,7 +280,7 @@ <!-- NOTE: finAccountId should always be in place --> <!-- Get all of the records for the account from the database and sum everything up again, make sure we don't have any errors propagated over time --> - <entity-condition entity-name="FinAccountTrans" list-name="finAccountTransList"> + <entity-condition entity-name="FinAccountTrans" list="finAccountTransList"> <condition-expr field-name="finAccountId" env-name="finAccountId"/> </entity-condition> <set field="actualBalanceSum" value="0" type="BigDecimal"/> @@ -306,7 +306,7 @@ <!-- start with the actual balance, and subtract off FinAccountAuth.amount --> <set field="availableBalanceSum" from-field="actualBalanceSum"/> - <entity-condition entity-name="FinAccountAuth" list-name="finAccountAuthList" filter-by-date="true"> + <entity-condition entity-name="FinAccountAuth" list="finAccountAuthList" filter-by-date="true"> <condition-expr field-name="finAccountId" env-name="finAccountId"/> </entity-condition> <iterate entry="finAccountAuth" list="finAccountAuthList"> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml Tue Dec 30 04:17:03 2008 @@ -285,7 +285,7 @@ <set field="updateWorkEffortCtx.actualCompletionDate" from-field="nowTimestamp"/> <call-service service-name="updateWorkEffort" in-map-name="updateWorkEffortCtx"/> <check-errors/> - <entity-condition list-name="wepas" entity-name="WorkEffortPartyAssignment" filter-by-date="true"> + <entity-condition list="wepas" entity-name="WorkEffortPartyAssignment" filter-by-date="true"> <condition-expr field-name="workEffortId" env-name="workEffortId" operator="equals"/> </entity-condition> <iterate list="wepas" entry="wepa"> @@ -339,7 +339,7 @@ </entity-and> <iterate list="productMaintList" entry="productMaintValue"> <set field="repeatCount" from-field="productMaintValue.repeatCount" default-value="0" type="Long"/> - <entity-condition list-name="maintList" entity-name="FixedAssetMaint"> + <entity-condition list="maintList" entity-name="FixedAssetMaint"> <condition-list combine="and"> <condition-expr field-name="fixedAssetId" operator="equals" env-name="fixedAssetValue.fixedAssetId"/> <condition-expr field-name="productMaintTypeId" operator="equals" env-name="productMaintValue.productMaintTypeId"/> @@ -381,14 +381,14 @@ </simple-method> <simple-method method-name="createMaintsFromTimeInterval" short-description="Create Fixed Asset Maintenances From A Product Maint Time Interval"> <now-timestamp-to-env env-name="nowTimestamp"/> - <entity-condition list-name="fixedAssets" entity-name="FixedAsset"> + <entity-condition list="fixedAssets" entity-name="FixedAsset"> <condition-list combine="and"> <condition-expr field-name="instanceOfProductId" operator="not-equals" env-name="null"/> <condition-expr field-name="actualEndOfLife" operator="equals" env-name="null"/> </condition-list> </entity-condition> <iterate list="fixedAssets" entry="fixedAsset"> - <entity-condition list-name="productMaints" entity-name="ProductMaint"> + <entity-condition list="productMaints" entity-name="ProductMaint"> <condition-list combine="and"> <condition-expr field-name="productId" env-name="fixedAsset.instanceOfProductId"/> <condition-expr field-name="intervalUomId" operator="like" value="TF_%"/> @@ -396,7 +396,7 @@ </entity-condition> <iterate list="productMaints" entry="productMaint"> <set field="repeatCount" from-field="productMaint.repeatCount" default-value="0" type="Long"/> - <entity-condition list-name="maintList" entity-name="FixedAssetMaintWorkEffort"> + <entity-condition list="maintList" entity-name="FixedAssetMaintWorkEffort"> <condition-list combine="and"> <condition-expr field-name="fixedAssetId" operator="equals" env-name="fixedAsset.fixedAssetId"/> <condition-expr field-name="productMaintTypeId" operator="equals" env-name="productMaint.productMaintTypeId"/> @@ -454,7 +454,7 @@ </iterate> </simple-method> <simple-method method-name="migrateFixedAssetMaintMeter" short-description="Copy FixedAssetMaintMeter To FixedAssetMeter"> - <entity-condition list-name="maintMeterList" entity-name="FixedAssetMaintMeter"/> + <entity-condition list="maintMeterList" entity-name="FixedAssetMaintMeter"/> <iterate list="maintMeterList" entry="maintMeter"> <make-value value-field="newEntity" entity-name="FixedAssetMeter"/> <set-pk-fields map="maintMeter" value-field="newEntity"/> 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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -152,7 +152,7 @@ <log level="info" message="Using ledger decimals [${ledgerDecimals}] and rounding [${roundingMode}]"/> <!-- get all AcctgTransEntry for this trans, for each if debit add to debits total if credit add to credits total --> - <entity-condition entity-name="AcctgTransEntry" list-name="acctgTransEntryList"> + <entity-condition entity-name="AcctgTransEntry" list="acctgTransEntryList"> <condition-expr field-name="acctgTransId" env-name="parameters.acctgTransId"/> <order-by field-name="acctgTransEntrySeqId"/> </entity-condition> @@ -218,7 +218,7 @@ <add-error><fail-message message="Not posting GL Accounting Transaction with ID [${parameters.acctgTransId}] because the trial balance failed: Debit Total=${trialBalanceResultMap.debitTotal} Credit Total=${trialBalanceResultMap.creditTotal} Debit/Credit Difference=${trialBalanceResultMap.debitCreditDifference}"/></add-error> </if-compare> - <entity-condition entity-name="AcctgTransEntry" list-name="acctgTransEntryList"> + <entity-condition entity-name="AcctgTransEntry" list="acctgTransEntryList"> <condition-expr field-name="acctgTransId" env-name="parameters.acctgTransId"/> <order-by field-name="acctgTransEntrySeqId"/> </entity-condition> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Tue Dec 30 04:17:03 2008 @@ -355,7 +355,7 @@ <field field-name="nowTimestamp" type="Timestamp"/> <field field-name="parameters.daysOffset" type="Long"/> </call-class-method> - <entity-condition entity-name="Invoice" list-name="invoices"> + <entity-condition entity-name="Invoice" list="invoices"> <condition-list combine="and"> <condition-expr field-name="invoiceTypeId" operator="equals" env-name="parameters.invoiceTypeId"/> <condition-expr field-name="partyId" operator="equals" env-name="parameters.partyId" ignore-if-empty="true"/> 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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -352,7 +352,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"/> + <entity-condition entity-name="OldEmplPositionTypeRate" list="posRates"/> <iterate entry="posRate" list="posRates"> <make-value value-field="emplPositionTypeRate" entity-name="EmplPositionTypeRate"/> <set-pk-fields value-field="posRate" map="emplPositionTypeRate"/> @@ -366,7 +366,7 @@ <property-to-field resource="general.properties" property="currency.uom.id.default" field-name="rateAmount.rateCurrencyUomId"/> <create-value value-field="rateAmount"/> </iterate> - <entity-condition entity-name="OldPartyRate" list-name="partyRates"/> + <entity-condition entity-name="OldPartyRate" list="partyRates"/> <iterate entry="oldPartyRate" list="oldPartyRates"> <make-value value-field="partyRate" entity-name="PartyRate"/> <set-pk-fields value-field="oldPartyRate" map="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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -165,7 +165,7 @@ <simple-method method-name="getOwnedOrPublishedBlogEntries" short-description="Get blog entries that the user owns or are published"> <log level="info" message="parameters: ${parameters}"/> - <entity-condition entity-name="ContentAssocViewTo" use-cache="false" list-name="unfilteredList"> + <entity-condition entity-name="ContentAssocViewTo" use-cache="false" list="unfilteredList"> <condition-list combine="and"> <condition-expr field-name="contentIdStart" operator="equals" env-name="parameters.contentId"/> <condition-expr field-name="caContentAssocTypeId" operator="equals" value="PUBLISH_LINK"/> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml Tue Dec 30 04:17:03 2008 @@ -29,7 +29,7 @@ <!-- if not passed in, get latest template contentRevisionSeqId from db --> <if-empty field="parameters.contentRevisionSeqId"> - <entity-condition entity-name="ContentRevision" list-name="contentRevisionList"> + <entity-condition entity-name="ContentRevision" list="contentRevisionList"> <condition-list> <condition-expr field-name="contentId" operator="equals" env-name="parameters.instanceOfContentId"/> </condition-list> @@ -109,7 +109,7 @@ <set from-field="parentInstanceContentId" field="thisInstanceContentId"/> <log message="genInstanceChildCompDocs 0> thisTemplateContentId: ${thisTemplateContentId}" level="info"/> <log message="genInstanceChildCompDocs 1> thisInstanceContentId: ${thisInstanceContentId}" level="info"/> - <entity-condition entity-name="ContentAssoc" list-name="contentAssocList"> + <entity-condition entity-name="ContentAssoc" list="contentAssocList"> <condition-list combine="and"> <condition-expr field-name="contentIdTo" operator="equals" env-name="thisTemplateContentId"/> <condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART"/> @@ -392,7 +392,7 @@ </simple-method> <!-- Methods for ContentRevision and ContentRevisionItem --> <simple-method method-name="persistContentRevisionAndItem" short-description="Update ContentRevision and ContentRevisionItem"> - <entity-condition entity-name="ContentRevision" list-name="contentRevisionList"> + <entity-condition entity-name="ContentRevision" list="contentRevisionList"> <condition-expr field-name="contentId" operator="equals" env-name="parameters.contentId"/> <order-by field-name="contentRevisionSeqId DESC"/> </entity-condition> @@ -443,7 +443,7 @@ <log level="info" message="paddedSeqId: ${paddedSeqId}"/> </simple-method> <simple-method method-name="getRevisionDataResource" short-description="Get version of DataResource that fits overall revision"> - <entity-condition entity-name="ContentRevisionItem" list-name="contentRevisionItems" use-cache="true"> + <entity-condition entity-name="ContentRevisionItem" list="contentRevisionItems" use-cache="true"> <condition-list combine="and"> <condition-expr field-name="contentId" env-name="parameters.contentId" operator="equals"/> <condition-expr field-name="itemContentId" env-name="parameters.itemContentId" operator="equals"/> @@ -528,7 +528,7 @@ if you are not sure what previous contentRevisionSeqId is, then it is necessary to ask. I think it is worth not assuming it is 1 less than the passed in value, just for ruggedness. --> - <entity-condition entity-name="MaxContentApprovalView" list-name="instanceApprovalList" use-cache="false"> + <entity-condition entity-name="MaxContentApprovalView" list="instanceApprovalList" use-cache="false"> <condition-list> <condition-expr field-name="contentId" env-name="parameters.rootContentId" operator="equals"/> <condition-expr field-name="contentRevisionSeqId" env-name="parameters.contentRevisionSeqId" operator="less-equals"/> @@ -545,7 +545,7 @@ <!-- since we don't have a primary key from above, go get one --> <iterate list="instanceApprovalList" entry="maxContentApproval"> <log level="info" message="maxContentApproval: ${maxContentApproval}"/> - <entity-condition entity-name="ContentApproval" list-name="contentApprovalList2" use-cache="false"> + <entity-condition entity-name="ContentApproval" list="contentApprovalList2" use-cache="false"> <condition-list> <condition-expr field-name="contentId" env-name="maxContentApproval.contentId" operator="equals"/> <condition-expr field-name="contentRevisionSeqId" env-name="maxContentApproval.maxContentRevisionSeqId" operator="equals"/> @@ -575,7 +575,7 @@ </simple-method> <simple-method method-name="cloneTemplateContentApprovals" short-description="Bump the previous ContentApproval approvals up to current CDI"> <log level="info" message="cloneTemplateContentApprovals-parameters: ${parameters}"/> - <entity-condition entity-name="MaxContentApprovalView" list-name="maxContentApprovalList"> + <entity-condition entity-name="MaxContentApprovalView" list="maxContentApprovalList"> <condition-list combine="and"> <condition-expr field-name="contentId" operator="equals" env-name="parameters.contentId"/> </condition-list> @@ -613,7 +613,7 @@ <log level="info" message="cloneContentApprovals(0b)- parameters : ${parameters} "/> <now-timestamp-to-env env-name="nowTimestamp"/> <!-- get previous list of ContentApproval --> - <entity-condition entity-name="MaxContentApprovalView" list-name="maxContentApprovalList"> + <entity-condition entity-name="MaxContentApprovalView" list="maxContentApprovalList"> <condition-list combine="and"> <condition-expr field-name="contentId" operator="equals" env-name="thisContentId"/> <condition-expr field-name="contentRevisionSeqId" operator="less" env-name="thisContentRevisionSeqId" ignore-if-null="true"/> @@ -633,7 +633,7 @@ <!-- if an instance track, check to see if there any new or deleted records on the template --> <set from-field="content.instanceOfContentId" field="rootTemplateContentId"/> <log level="info" message="rootTemplateContentId 0aa: ${rootTemplateContentId}"/> - <entity-condition entity-name="ContentRevision" list-name="templateContentRevisionList" use-cache="true"> + <entity-condition entity-name="ContentRevision" list="templateContentRevisionList" use-cache="true"> <condition-list> <condition-expr field-name="contentId" env-name="rootTemplateContentId" operator="equals"/> </condition-list> @@ -725,7 +725,7 @@ <!-- if an instance track, check to see if there any new or deleted records on the template --> <set from-field="content.instanceOfContentId" field="rootTemplateContentId"/> <log level="info" message="rootTemplateContentId 0aa: ${rootTemplateContentId}"/> - <entity-condition entity-name="ContentRevision" list-name="templateContentRevisionList" use-cache="true"> + <entity-condition entity-name="ContentRevision" list="templateContentRevisionList" use-cache="true"> <condition-list> <condition-expr field-name="contentId" env-name="rootTemplateContentId" operator="equals"/> </condition-list> @@ -740,7 +740,7 @@ <log level="info" message="templateContentApprovalList 0aa: ${templateContentApprovalList}"/> <iterate list="templateContentApprovalList" entry="templateContentApproval"> <!-- look for this entity in newly created entities --> - <entity-condition entity-name="ContentApproval" list-name="newContentApprovalList"> + <entity-condition entity-name="ContentApproval" list="newContentApprovalList"> <condition-list combine="and"> <condition-expr field-name="contentId" operator="equals" env-name="thisContentId"/> <condition-expr field-name="contentRevisionSeqId" operator="equals" env-name="thisContentRevisionSeqId"/> @@ -777,7 +777,7 @@ </if-compare> <if-not-empty field="contentApproval.roleTypeId"> <now-timestamp-to-env env-name="nowTimestamp"/> - <entity-condition entity-name="ContentRole" list-name="contentRoleList"> + <entity-condition entity-name="ContentRole" list="contentRoleList"> <condition-list combine="and"> <condition-expr field-name="contentId" env-name="contentId" operator="equals"/> <condition-expr field-name="partyId" env-name="partyId" operator="equals"/> @@ -885,7 +885,7 @@ </iterate> <log level="info" message="roles: ${roles}"/> <!-- find approvals belonging to roles that the user has or to the user --> - <entity-condition entity-name="MaxContentApprovalView" list-name="compdocApprovalList" use-cache="false"> + <entity-condition entity-name="MaxContentApprovalView" list="compdocApprovalList" use-cache="false"> <condition-list> <condition-expr field-name="contentRevisionSeqId" env-name="parameters.contentRevisionSeqId" operator="less-equals" ignore-if-empty="true"/> <condition-expr field-name="contentTypeId" operator="equals" value="COMPDOC_INSTANCE"/> @@ -904,7 +904,7 @@ <!-- above query does not get contentApprovalId. For each row find it --> <iterate list="compdocApprovalList" entry="maxContentApproval"> <log level="info" message="maxContentApproval: ${maxContentApproval}"/> - <entity-condition entity-name="ContentApproval" list-name="contentApprovalList2" use-cache="false"> + <entity-condition entity-name="ContentApproval" list="contentApprovalList2" use-cache="false"> <condition-list> <condition-expr field-name="contentId" env-name="maxContentApproval.contentId" operator="equals"/> <condition-expr field-name="contentRevisionSeqId" env-name="maxContentApproval.maxContentRevisionSeqId" operator="equals"/> @@ -922,7 +922,7 @@ </iterate> <log level="info" message="contentApprovalIdList: ${contentApprovalIdList}"/> <!-- find the entries that match the user's partyId or associated roleTypes --> - <entity-condition entity-name="ContentApproval" list-name="contentApprovalList"> + <entity-condition entity-name="ContentApproval" list="contentApprovalList"> <condition-list combine="and"> <condition-expr field-name="contentApprovalId" operator="in" env-name="contentApprovalIdList"/> <condition-expr field-name="approvalStatusId" operator="equals" value="CNTAP_READY"/> @@ -932,7 +932,7 @@ <field-to-result field="contentApprovalList" result-name="contentApprovalList"/> </simple-method> <simple-method method-name="getMostRecentRevision" short-description="Look for most recent revision for contentId"> - <entity-condition entity-name="ContentRevision" list-name="contentRevisions" use-cache="true"> + <entity-condition entity-name="ContentRevision" list="contentRevisions" use-cache="true"> <condition-list combine="and"> <condition-expr field-name="contentId" env-name="parameters.contentId" operator="equals"/> </condition-list> 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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -1153,7 +1153,7 @@ <set field="filterByDate" from-field="parameters.filterByDate" default-value="true" type="Boolean" /> <set field="useCache" from-field="parameters.useCache" default-value="true" type="Boolean" /> - <entity-condition list-name="viewList" entity-name="ContentAssocViewTo" filter-by-date="${filterByDate}" use-cache="${useCache}"> + <entity-condition list="viewList" entity-name="ContentAssocViewTo" filter-by-date="${filterByDate}" use-cache="${useCache}"> <condition-list combine="and"> <condition-expr field-name="contentIdStart" env-name="parameters.contentId"/> <condition-expr field-name="caContentAssocTypeId" env-name="parameters.contentAssocTypeId" ignore-if-empty="true"/> @@ -1201,7 +1201,7 @@ </call-service> <iterate entry="view" list="subContentList"> - <entity-condition list-name="viewList" entity-name="ContentAssocViewTo" filter-by-date="true" use-cache="${useCache}"> + <entity-condition list="viewList" entity-name="ContentAssocViewTo" filter-by-date="true" use-cache="${useCache}"> <condition-list combine="and"> <condition-expr field-name="contentIdStart" env-name="view.caContentIdTo"/> <condition-expr field-name="caContentAssocTypeId" env-name="parameters.subContentAssocTypeId" ignore-if-empty="true"/> 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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -452,7 +452,7 @@ </condition> <then> <!-- find defined purpose/operation mappings --> - <entity-condition entity-name="ContentPurposeOperation" list-name="operations"> + <entity-condition entity-name="ContentPurposeOperation" list="operations"> <condition-list combine="and"> <condition-expr field-name="contentPurposeTypeId" operator="equals" env-name="contentPurposeTypeId"/> <condition-expr field-name="contentOperationId" operator="equals" env-name="contentOperationId"/> @@ -465,7 +465,7 @@ <!-- find defined purpose/operation mappings --> <iterate entry="currentPurpose" list="contentPurposes"> - <entity-condition entity-name="ContentPurposeOperation" list-name="currentOperations"> + <entity-condition entity-name="ContentPurposeOperation" list="currentOperations"> <condition-list combine="and"> <condition-expr field-name="contentPurposeTypeId" operator="equals" env-name="currentPurpose.contentPurposeTypeId"/> <condition-expr field-name="contentOperationId" operator="equals" env-name="contentOperationId"/> @@ -477,7 +477,7 @@ <!-- check the _NA_ purpose but only if no other purposes were found --> <if-empty field="contentPurposes"> - <entity-condition entity-name="ContentPurposeOperation" list-name="operations"> + <entity-condition entity-name="ContentPurposeOperation" list="operations"> <condition-list combine="and"> <condition-expr field-name="contentPurposeTypeId" operator="equals" value="_NA_"/> <condition-expr field-name="contentOperationId" operator="equals" env-name="contentOperationId"/> 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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -40,7 +40,7 @@ <!-- If the routing is not associated with our product and it's a variant, then check to see if it's virtual product has the routing --> <if-empty field="routingGS"> - <entity-condition entity-name="ProductAssoc" list-name="virtualProductAssocList" filter-by-date="true"> + <entity-condition entity-name="ProductAssoc" list="virtualProductAssocList" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="productIdTo" env-name="parameters.productId" /> <condition-expr field-name="productAssocTypeId" value="PRODUCT_VARIANT" /> @@ -65,7 +65,7 @@ <!-- If there are no routings associated with our product and it's a variant, then check to see if it's virtual product has a routing --> <if-empty field="routingGS"> - <entity-condition entity-name="ProductAssoc" list-name="virtualProductAssocList"> + <entity-condition entity-name="ProductAssoc" list="virtualProductAssocList"> <condition-list combine="and"> <condition-expr field-name="productIdTo" env-name="parameters.productId" /> <condition-expr field-name="productAssocTypeId" value="PRODUCT_VARIANT" /> 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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -189,7 +189,7 @@ <condition><if-compare field="newEntity.statusId" operator="equals" value="CLPT_ACCEPTED"/></condition> <then> <!-- look up the last ContactListPartyStatus with statusId=CLPT_PENDING --> - <entity-condition entity-name="ContactListPartyStatus" list-name="lastContactListPartyStatusList"> + <entity-condition entity-name="ContactListPartyStatus" list="lastContactListPartyStatusList"> <condition-list combine="and"> <condition-expr field-name="contactListId" env-name="parameters.contactListId"/> <condition-expr field-name="partyId" env-name="parameters.partyId"/> @@ -248,7 +248,7 @@ <then> <!-- get the latest pending status --> <!-- look up the last ContactListPartyStatus with statusId=CLPT_PENDING --> - <entity-condition entity-name="ContactListPartyStatus" list-name="lastContactListPartyStatusList"> + <entity-condition entity-name="ContactListPartyStatus" list="lastContactListPartyStatusList"> <condition-list combine="and"> <condition-expr field-name="contactListId" env-name="parameters.contactListId"/> <condition-expr field-name="partyId" env-name="parameters.partyId"/> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml Tue Dec 30 04:17:03 2008 @@ -161,7 +161,7 @@ <check-errors/> <now-timestamp-to-env env-name="nowTimestamp"/> - <entity-condition entity-name="SegmentGroupViewRelatedParties" list-name="segmentGroupViewRelatedPartiesList"> + <entity-condition entity-name="SegmentGroupViewRelatedParties" list="segmentGroupViewRelatedPartiesList"> <condition-list combine="and"> <condition-expr field-name="partyId" env-name="parameters.partyId"/> <condition-expr field-name="roleTypeId" env-name="parameters.roleTypeId" ignore-if-empty="true"/> @@ -170,7 +170,7 @@ </condition-list> </entity-condition> <!-- - <entity-condition entity-name="SegmentGroupViewRelatedPartiesClass" list-name="segmentGroupViewRelatedPartiesClassList"> + <entity-condition entity-name="SegmentGroupViewRelatedPartiesClass" list="segmentGroupViewRelatedPartiesClassList"> <condition-list combine="and"> <condition-expr field-name="partyId" env-name="parameters.partyId"/> <condition-expr field-name="roleTypeId" env-name="parameters.roleTypeId" ignore-if-empty="true"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/UpgradeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/UpgradeServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/UpgradeServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/UpgradeServices.xml Tue Dec 30 04:17:03 2008 @@ -22,7 +22,7 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-method method-name="migrateOrderItemAssociation" short-description="Migrate data from OldOrderItemAssociation to OrderItemAssoc"> - <entity-condition entity-name="OldOrderItemAssociation" list-name="oldOrderItemAssociations"/> + <entity-condition entity-name="OldOrderItemAssociation" list="oldOrderItemAssociations"/> <iterate list="oldOrderItemAssociations" entry="oldOrderItemAssociation"> <make-value entity-name="OrderItemAssoc" value-field="orderItemAssoc"/> <set field="orderItemAssoc.orderId" from-field="oldOrderItemAssociation.salesOrderId"/> @@ -37,7 +37,7 @@ </simple-method> <simple-method method-name="migrateCustRequestRole" short-description="Migrate data from OldCustRequestRole to CustRequestParty"> - <entity-condition entity-name="OldCustRequestRole" list-name="oldCustRequestRoles"/> + <entity-condition entity-name="OldCustRequestRole" list="oldCustRequestRoles"/> <now-timestamp-to-env env-name="fromDate"/> <iterate list="oldCustRequestRoles" entry="oldCustRequestRole"> <make-value entity-name="CustRequestParty" value-field="custRequestParty"/> 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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -139,14 +139,14 @@ <!-- test the total return amount vs the total order amount --> <if-compare field="parameters.statusId" value="RETURN_ACCEPTED" operator="equals"> <!-- get the list of ReturnItems. Note: return may be associated with many different orders --> - <entity-condition entity-name="ReturnItem" list-name="returnItems" distinct="true"> + <entity-condition entity-name="ReturnItem" list="returnItems" distinct="true"> <condition-expr field-name="returnId" env-name="returnHeader.returnId"/> </entity-condition> <!-- this block is for debugging and can be removed later --> <!-- <log level="verbose" message="Items and adjustments for return ${returnHeader.returnId}"/> - <entity-condition entity-name="ReturnAdjustment" list-name="returnAdjustments" distinct="true"> + <entity-condition entity-name="ReturnAdjustment" list="returnAdjustments" distinct="true"> <condition-expr field-name="returnId" operator="equals" env-name="returnHeader.returnId"/> </entity-condition> <iterate entry="returnItem" list="returnItems"> @@ -662,7 +662,7 @@ </if-compare> <!-- find the bill to customer; for return's fromPartyId --> - <entity-condition entity-name="OrderRole" list-name="orderRoles"> + <entity-condition entity-name="OrderRole" list="orderRoles"> <condition-list combine="and"> <condition-expr field-name="orderId" operator="equals" env-name="orderHeader.orderId"/> <condition-expr field-name="roleTypeId" operator="equals" env-name="roleTypeId"/> @@ -695,7 +695,7 @@ </call-service> <!-- get the available to return order items --> - <entity-condition entity-name="OrderItem" list-name="orderItems"> + <entity-condition entity-name="OrderItem" list="orderItems"> <condition-list combine="and"> <condition-expr field-name="orderId" operator="equals" env-name="orderHeader.orderId"/> <condition-expr field-name="statusId" operator="equals" value="ITEM_COMPLETED"/> @@ -776,7 +776,7 @@ </iterate> <!-- create a return adjustment for all order adjustments not attached to a particular orderItem (orderItemSeqId = "_NA_") --> - <entity-condition entity-name="OrderAdjustment" list-name="orderAdjustments"> + <entity-condition entity-name="OrderAdjustment" list="orderAdjustments"> <condition-list combine="and"> <condition-expr field-name="orderId" operator="equals" env-name="orderHeader.orderId"/> <condition-expr field-name="orderItemSeqId" operator="equals" value="_NA_"/> @@ -872,7 +872,7 @@ <simple-method method-name="cancelReturnItems" short-description="Update a ReturnItems"> <check-permission permission="ORDERMGR" action="_UPDATE"><fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCancelReturnItems"/></check-permission> <check-errors/> - <entity-condition entity-name="ReturnItem" list-name="returnItems" distinct="true"> + <entity-condition entity-name="ReturnItem" list="returnItems" distinct="true"> <condition-expr field-name="returnId" operator="equals" env-name="parameters.returnId"/> </entity-condition> <iterate entry="returnItem" list="returnItems"> 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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -55,7 +55,7 @@ <set value="ORDER_COMPLETED" field="parameters.statusId"/> </if-empty> - <entity-condition entity-name="OrderHeaderAndRoleSummary" list-name="orderInfoList"> + <entity-condition entity-name="OrderHeaderAndRoleSummary" list="orderInfoList"> <condition-list combine="and"> <condition-expr field-name="partyId" operator="equals" env-name="parameters.partyId"/> <condition-expr field-name="roleTypeId" operator="equals" env-name="parameters.roleTypeId"/> @@ -356,7 +356,7 @@ <set from-field="inventoryItem.facilityId" field="inputMap.facilityId"/> <!-- Retrieve and total the quantities of existing requirements for the product/facility --> - <entity-condition entity-name="Requirement" list-name="requirements"> + <entity-condition entity-name="Requirement" list="requirements"> <condition-list combine="and"> <condition-expr field-name="productId" operator="equals" env-name="parameters.productId"/> <condition-expr field-name="requirementTypeId" operator="equals" value="PRODUCT_REQUIREMENT"/> @@ -867,7 +867,7 @@ <simple-method method-name="checkOrderIsOnBackOrder" short-description="Check if an Order is on Back Order" login-required="false"> <set field="zeroEnv" value="0" type="Double"/> - <entity-condition entity-name="OrderItemShipGrpInvRes" list-name="orderItemShipGrpInvResList"> + <entity-condition entity-name="OrderItemShipGrpInvRes" list="orderItemShipGrpInvResList"> <condition-list combine="and"> <condition-expr field-name="orderId" env-name="parameters.orderId"/> <condition-expr field-name="quantityNotAvailable" operator="not-equals" env-name="nullField"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Tue Dec 30 04:17:03 2008 @@ -70,7 +70,7 @@ <check-errors/> <if-compare field="requirement.requirementTypeId" operator="equals" value="PRODUCT_REQUIREMENT"> <if-not-empty field="requirement.productId"> - <entity-condition entity-name="SupplierProduct" list-name="supplierProducts"> + <entity-condition entity-name="SupplierProduct" list="supplierProducts"> <condition-list> <condition-expr field-name="productId" env-name="requirement.productId"/> <condition-expr field-name="minimumOrderQuantity" env-name="requirement.quantity" operator="less-equals"/> 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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -182,7 +182,7 @@ <simple-method method-name="addDistinctShoppingListItem" short-description="Adds a shopping list item if one with the same productId does not exist"> - <entity-condition entity-name="ShoppingListItem" list-name="shoppingListItemList"> + <entity-condition entity-name="ShoppingListItem" list="shoppingListItemList"> <condition-expr field-name="shoppingListId" env-name="parameters.shoppingListId" /> </entity-condition> @@ -294,7 +294,7 @@ </entity-one> <if-compare field="productStore.enableAutoSuggestionList" operator="not-equals" value="Y"><return/></if-compare> - <entity-condition entity-name="OrderRole" list-name="orderRoleList"> + <entity-condition entity-name="OrderRole" list="orderRoleList"> <condition-list combine="and"> <condition-expr field-name="orderId" env-name="parameters.orderId" /> <condition-expr field-name="roleTypeId" value="PLACING_CUSTOMER" /> @@ -302,7 +302,7 @@ </entity-condition> <first-from-list list="orderRoleList" entry="orderRole" /> - <entity-condition entity-name="ShoppingList" list-name="shoppingListList"> + <entity-condition entity-name="ShoppingList" list="shoppingListList"> <condition-list combine="and"> <condition-expr field-name="partyId" env-name="orderRole.partyId" /> <condition-expr field-name="listName" value="Auto Suggestions" /> @@ -321,13 +321,13 @@ </else> </if-empty> - <entity-condition entity-name="OrderItem" list-name="orderItemList"> + <entity-condition entity-name="OrderItem" list="orderItemList"> <condition-expr field-name="orderId" env-name="parameters.orderId" /> <order-by field-name="orderItemSeqId" /> </entity-condition> <iterate list="orderItemList" entry="orderItem"> <if-not-empty field="orderItem.productId"> - <entity-condition entity-name="ProductAssoc" list-name="compProductAssocList" filter-by-date="true"> + <entity-condition entity-name="ProductAssoc" list="compProductAssocList" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="productId" env-name="orderItem.productId" /> <condition-expr field-name="productAssocTypeId" value="PRODUCT_COMPLEMENT" /> @@ -344,7 +344,7 @@ <field-map field-name="productId" from-field="orderItem.productId" /> </entity-one> <if-compare field="product.isVariant" operator="equals" value="Y"> - <entity-condition entity-name="ProductAssoc" list-name="virtualProductAssocList" filter-by-date="true"> + <entity-condition entity-name="ProductAssoc" list="virtualProductAssocList" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="productIdTo" env-name="orderItem.productId" /> <condition-expr field-name="productAssocTypeId" value="PRODUCT_VARIANT" /> @@ -352,7 +352,7 @@ </entity-condition> <first-from-list list="virtualProductAssocList" entry="virtualProductAssoc" /> <if-not-empty field="virtualProductAssoc"> - <entity-condition entity-name="ProductAssoc" list-name="compProductAssocList" filter-by-date="true"> + <entity-condition entity-name="ProductAssoc" list="compProductAssocList" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="productId" env-name="virtualProductAssoc.productId" /> <condition-expr field-name="productAssocTypeId" value="PRODUCT_COMPLEMENT" /> 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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -343,7 +343,7 @@ <simple-method method-name="sendEmailDated" short-description="Checks for email communication events with the status COM_IN_PROGRESS and a startdate which is expired, then send the email"> <now-timestamp-to-env env-name="nowDate" /> - <entity-condition entity-name="CommunicationEvent" list-name="communicationEvents"> + <entity-condition entity-name="CommunicationEvent" list="communicationEvents"> <condition-list combine="and"> <condition-list combine="or"> <condition-expr field-name="communicationEventTypeId" operator="equals" value="EMAIL_COMMUNICATION" /> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Tue Dec 30 04:17:03 2008 @@ -265,7 +265,7 @@ </simple-method> <simple-method method-name="sendVerifyEmailAddressNotification" short-description="Send an email to the person for Verification of his Email Address" login-required="false"> - <entity-condition entity-name="ProductStoreEmailSetting" list-name="productStoreEmailSettings"> + <entity-condition entity-name="ProductStoreEmailSetting" list="productStoreEmailSettings"> <condition-list> <condition-expr field-name="emailType" operator="equals" value="PRDS_EMAIL_VERIFY"/> </condition-list> 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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -535,7 +535,7 @@ <field-to-list field-name="relatedPartyId" list-name="_inline_relatedPartyIdAlreadySearchedList"/> <clear-field field="_inline_PartyRelationshipList"/> - <entity-condition entity-name="PartyRelationship" list-name="_inline_PartyRelationshipList" use-cache="${useCache}"> + <entity-condition entity-name="PartyRelationship" list="_inline_PartyRelationshipList" use-cache="${useCache}"> <condition-list combine="and"> <condition-expr field-name="partyIdFrom" env-name="relatedPartyId"/> <condition-expr field-name="roleTypeIdFrom" operator="in" env-name="_inline_roleTypeIdFromList" ignore-if-empty="true"/> @@ -568,7 +568,7 @@ <if-compare field="includeFromToSwitched" operator="equals" value="Y"> <clear-field field="_inline_PartyRelationshipList"/> - <entity-condition entity-name="PartyRelationship" list-name="_inline_PartyRelationshipList" use-cache="${useCache}"> + <entity-condition entity-name="PartyRelationship" list="_inline_PartyRelationshipList" use-cache="${useCache}"> <condition-list combine="and"> <condition-expr field-name="partyIdTo" env-name="relatedPartyId"/> <condition-expr field-name="roleTypeIdTo" operator="in" env-name="_inline_roleTypeIdFromList" ignore-if-empty="true"/> @@ -629,7 +629,7 @@ <field-to-list field-name="roleTypeId" list-name="_inline_roleTypeIdAlreadySearchedList"/> <clear-field field="_inline_RoleTypeList"/> - <entity-condition entity-name="RoleType" list-name="_inline_RoleTypeList" use-cache="true"> + <entity-condition entity-name="RoleType" list="_inline_RoleTypeList" use-cache="true"> <condition-expr field-name="parentTypeId" operator="equals" env-name="roleTypeId"/> </entity-condition> <iterate entry="newRoleType" list="_inline_RoleTypeList"> @@ -749,7 +749,7 @@ <remove-value value-name="fieldMap"/> </simple-method> <simple-method method-name="clearAddressMatchMap" short-description="remove all AddressMatchMap"> - <entity-condition entity-name="AddressMatchMap" list-name="addrs"> + <entity-condition entity-name="AddressMatchMap" list="addrs"> <use-iterator/> </entity-condition> <iterate entry="addr" list="addrs"> @@ -816,7 +816,7 @@ <!-- send party creation email notification --> <simple-method method-name="sendCreatePartyEmailNotification" short-description="Notification email on party creation" login-required="false"> <map-to-map map-name="parameters" to-map-name="bodyParameters"/> - <entity-condition entity-name="ProductStoreEmailSetting" list-name="productStoreEmailSettings"> + <entity-condition entity-name="ProductStoreEmailSetting" list="productStoreEmailSettings"> <condition-list> <condition-expr field-name="emailType" operator="equals" value="PARTY_REGIS_CONFIRM"/> </condition-list> @@ -847,7 +847,7 @@ <!-- send personal information update email notification --> <simple-method method-name="sendUpdatePersonalInfoEmailNotification" short-description="Send the Notification email on personal information updation" login-required="false"> <map-to-map map-name="parameters" to-map-name="bodyParameters"/> - <entity-condition entity-name="ProductStoreEmailSetting" list-name="productStoreEmailSettings"> + <entity-condition entity-name="ProductStoreEmailSetting" list="productStoreEmailSettings"> <condition-list> <condition-expr field-name="emailType" operator="equals" value="UPD_PRSNL_INF_CNFRM"/> </condition-list> @@ -864,7 +864,7 @@ <set field="partyId" from-field="parameters.partyId"/> </else> </if-not-empty> - <entity-condition entity-name="PartyContactDetailByPurpose" list-name="partyContactDetailByPurposes" filter-by-date="true"> + <entity-condition entity-name="PartyContactDetailByPurpose" list="partyContactDetailByPurposes" filter-by-date="true"> <condition-list> <condition-expr field-name="contactMechPurposeTypeId" operator="equals" value="PRIMARY_EMAIL"/> <condition-expr field-name="partyId" operator="equals" env-name="partyId"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml Tue Dec 30 04:17:03 2008 @@ -22,7 +22,7 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-method method-name="migrateFacilityRole" short-description="Migrate Data From OldFacilityRole To FacilityParty"> - <entity-condition entity-name="OldFacilityRole" list-name="oldFacilityRoles"/> + <entity-condition entity-name="OldFacilityRole" list="oldFacilityRoles"/> <now-timestamp-to-env env-name="fromDate"/> <iterate list="oldFacilityRoles" entry="oldFacilityRole"> <make-value entity-name="FacilityParty" value-field="facilityParty"/> 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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -793,7 +793,7 @@ <set field="callingMethodName" from-field="parameters.resourceDescription" default-value="this operation"/> <set field="checkAction" from-field="parameters.mainAction" default-value="UPDATE"/> - <entity-condition list-name="prodCatalogCategoryList" entity-name="ProdCatalogCategory" filter-by-date="true"> + <entity-condition list="prodCatalogCategoryList" entity-name="ProdCatalogCategory" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="productCategoryId" env-name="parameters.productCategoryId"/> <condition-list combine="or"> 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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -228,7 +228,7 @@ <!-- services to automatically generate cost information --> <simple-method method-name="calculateAllProductsCosts" short-description="Calculates estimated costs for all the products"> <!--filter-by-date="true"--> - <entity-condition entity-name="Product" list-name="products"> + <entity-condition entity-name="Product" list="products"> <select-field field-name="productId"/> <order-by field-name="-billOfMaterialLevel"/> </entity-condition> 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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -330,7 +330,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <entity-condition entity-name="ProductFeatureAppl" list-name="productFeatureAppls" filter-by-date="true"> + <entity-condition entity-name="ProductFeatureAppl" list="productFeatureAppls" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="productId" env-name="newEntity.productId"/> <condition-expr field-name="productFeatureId" env-name="newEntity.productFeatureId"/> 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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -81,7 +81,7 @@ <set from-field="parameters.quantity" field="parameters.quantityNotReserved"/> <!-- first reserve against InventoryItems in FLT_PICKLOC type locations, then FLT_BULK locations, then InventoryItems with no locations --> - <entity-condition entity-name="InventoryItemAndLocation" list-name="inventoryItemAndLocations"> + <entity-condition entity-name="InventoryItemAndLocation" list="inventoryItemAndLocations"> <condition-list combine="and"> <condition-expr field-name="productId" env-name="parameters.productId"/> <condition-expr field-name="facilityId" env-name="parameters.facilityId" ignore-if-empty="true" ignore-if-null="true"/> @@ -101,7 +101,7 @@ <!-- still some left? try the FLT_BULK locations --> <if-compare field="parameters.quantityNotReserved" operator="greater" value="0" type="Double"> - <entity-condition entity-name="InventoryItemAndLocation" list-name="inventoryItemAndLocations"> + <entity-condition entity-name="InventoryItemAndLocation" list="inventoryItemAndLocations"> <condition-list combine="and"> <condition-expr field-name="productId" env-name="parameters.productId"/> <condition-expr field-name="facilityId" env-name="parameters.facilityId" ignore-if-empty="true" ignore-if-null="true"/> @@ -122,7 +122,7 @@ <!-- last of all try reserving in InventoryItems that have no locationSeqId, ie are not in any particular location --> <if-compare field="parameters.quantityNotReserved" operator="greater" value="0" type="Double"> - <entity-condition entity-name="InventoryItem" list-name="inventoryItems"> + <entity-condition entity-name="InventoryItem" list="inventoryItems"> <condition-list combine="and"> <condition-expr field-name="productId" env-name="parameters.productId"/> <condition-expr field-name="facilityId" env-name="parameters.facilityId" ignore-if-empty="true" ignore-if-null="true"/> 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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -380,7 +380,7 @@ <simple-method method-name="updateOldInventoryToDetailAll" short-description="Update Old Inventory To Detail All"> <!-- find all InventoryItem records where oldQuantityOnHand or oldAvailableToPromise are not null --> - <entity-condition entity-name="InventoryItem" list-name="inventoryItemList"> + <entity-condition entity-name="InventoryItem" list="inventoryItemList"> <condition-list combine="or"> <condition-expr field-name="oldQuantityOnHand" operator="not-equals" value=""/> <condition-expr field-name="oldAvailableToPromise" operator="not-equals" value=""/> @@ -709,7 +709,7 @@ <entity-one entity-name="InventoryItem" value-field="inventoryItem"/> <!-- find all items which have a negative ATP --> - <entity-condition entity-name="BalanceInventoryItemsView" list-name="inventoryItems"> + <entity-condition entity-name="BalanceInventoryItemsView" list="inventoryItems"> <condition-list combine="or"> <condition-list combine="and"> <condition-expr field-name="productId" operator="equals" env-name="inventoryItem.productId"/> @@ -747,7 +747,7 @@ </and> </condition> <then> - <entity-condition entity-name="PicklistAndBinAndItem" list-name="picklistItemList"> + <entity-condition entity-name="PicklistAndBinAndItem" list="picklistItemList"> <condition-list combine="and"> <condition-expr field-name="orderId" env-name="item.orderId"/> <condition-expr field-name="shipGroupSeqId" env-name="item.shipGroupSeqId"/> @@ -839,7 +839,7 @@ </simple-method> <simple-method method-name="reassignInventoryReservations" short-description="Balances available-to-promise on inventory items"> - <entity-condition entity-name="OrderItemShipGrpInvResAndItem" list-name="relatedRes"> + <entity-condition entity-name="OrderItemShipGrpInvResAndItem" list="relatedRes"> <condition-list combine="and"> <condition-expr field-name="productId" operator="equals" env-name="parameters.productId"/> <condition-expr field-name="facilityId" operator="equals" env-name="parameters.facilityId"/> @@ -860,7 +860,7 @@ </entity-condition> <iterate list="relatedRes" entry="oneRelatedRes"> - <entity-condition entity-name="PicklistAndBinAndItem" list-name="picklistItemList"> + <entity-condition entity-name="PicklistAndBinAndItem" list="picklistItemList"> <condition-list combine="and"> <condition-expr field-name="orderId" env-name="oneRelatedRes.orderId"/> <condition-expr field-name="shipGroupSeqId" env-name="oneRelatedRes.shipGroupSeqId"/> @@ -953,7 +953,7 @@ <entity-one entity-name="OrderHeader" value-field="orderHeader" auto-field-map="true"/> <get-related-one value-name="orderHeader" relation-name="ProductStore" to-value-name="productStore"/> <if-compare field="productStore.balanceResOnOrderCreation" operator="equals" value="Y"> - <entity-condition entity-name="OrderItemAndShipGrpInvResAndItem" list-name="oisgirais"> + <entity-condition entity-name="OrderItemAndShipGrpInvResAndItem" list="oisgirais"> <condition-list combine="and"> <condition-expr field-name="orderId" operator="equals" env-name="parameters.orderId"/> <condition-expr field-name="quantityNotAvailable" operator="greater" value="0"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml Tue Dec 30 04:17:03 2008 @@ -48,7 +48,7 @@ <call-service service-name="storeGenericDimension" in-map-name="inMap"/> </simple-method> <simple-method method-name="loadAllProductsInProductDimension" short-description=""> - <entity-condition entity-name="Product" list-name="products"/> + <entity-condition entity-name="Product" list="products"/> <iterate list="products" entry="product"> <set-service-fields service-name="loadProductInProductDimension" map-name="parameters" to-map-name="inMap"/> <set field="inMap.productId" from-field="product.productId"/> 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=730118&r1=730117&r2=730118&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 04:17:03 2008 @@ -275,7 +275,7 @@ <!-- try to find an existing shipmentItem and attach to it, if none found create a new shipmentItem --> <!-- if there is NO productId on the orderItem, ALWAYS create a new shipmentItem --> <if-not-empty field="orderItem.productId"> - <entity-condition entity-name="ShipmentItem" list-name="shipmentItems"> + <entity-condition entity-name="ShipmentItem" list="shipmentItems"> <condition-list combine="and"> <condition-expr field-name="productId" env-name="orderItem.productId"/> <condition-expr field-name="shipmentId" env-name="parameters.shipmentId"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Tue Dec 30 04:17:03 2008 @@ -68,7 +68,7 @@ <if-empty field="parameters.orderHeaderList"> <log level="info" message="No order header list found in parameters; finding orders to pick."/> - <entity-condition entity-name="OrderHeader" list-name="orderHeaderList"> + <entity-condition entity-name="OrderHeader" list="orderHeaderList"> <condition-list combine="and"> <condition-expr field-name="orderTypeId" value="SALES_ORDER"/> <condition-expr field-name="statusId" value="ORDER_APPROVED"/> @@ -142,7 +142,7 @@ (2) the previous picklist was picked or packed, and there is still an OrderItemShipGrpInvRes, which means that some of the order item must not have shipped yet. (OrderItemShipGrpInvRes is removed when an order item has been fully shipped. We are using entity-condition instead of get-related because we want to exclude some picklists by status --> - <entity-condition entity-name="PicklistAndBinAndItem" list-name="picklistItemList"> + <entity-condition entity-name="PicklistAndBinAndItem" list="picklistItemList"> <condition-list combine="and"> <condition-expr field-name="orderId" env-name="orderItemShipGrpInvRes.orderId"/> <condition-expr field-name="shipGroupSeqId" env-name="orderItemShipGrpInvRes.shipGroupSeqId"/> @@ -298,7 +298,7 @@ </iterate> <!-- find all ShipmentMethodType in order by sequenceNum, for each one get the value from the pickMoveByShipmentMethodInfoMap and add it to the pickMoveByShipmentMethodInfoList --> - <entity-condition entity-name="ShipmentMethodType" list-name="shipmentMethodTypeList"> + <entity-condition entity-name="ShipmentMethodType" list="shipmentMethodTypeList"> <order-by field-name="+sequenceNum"/> </entity-condition> @@ -812,7 +812,7 @@ </check-permission> <check-errors/> - <entity-condition entity-name="Picklist" list-name="picklistList"> + <entity-condition entity-name="Picklist" list="picklistList"> <condition-list combine="and"> <condition-expr field-name="facilityId" operator="equals" env-name="parameters.facilityId"/> <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PICKED"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Tue Dec 30 04:17:03 2008 @@ -209,7 +209,7 @@ </call-service> <log level="info" message="Created new shipment ${shipmentId}"/> - <entity-condition entity-name="ReturnItem" list-name="returnItems"> + <entity-condition entity-name="ReturnItem" list="returnItems"> <condition-expr field-name="returnId" operator="equals" env-name="returnHeader.returnId"/> </entity-condition> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Tue Dec 30 04:17:03 2008 @@ -307,7 +307,7 @@ <check-errors/> <log level="info" message="Created new shipment ${shipmentId}"/> - <entity-condition entity-name="ReturnItem" list-name="returnItems"> + <entity-condition entity-name="ReturnItem" list="returnItems"> <condition-expr field-name="returnId" operator="equals" env-name="parameters.returnId"/> </entity-condition> <iterate entry="returnItem" list="returnItems"> @@ -339,7 +339,7 @@ <check-errors/> <log level="info" message="Created new shipment ${shipmentId}"/> - <entity-condition entity-name="ReturnItem" list-name="returnItems"> + <entity-condition entity-name="ReturnItem" list="returnItems"> <condition-expr field-name="returnId" operator="equals" env-name="parameters.primaryReturnId"/> </entity-condition> <iterate entry="returnItem" list="returnItems"> @@ -1322,7 +1322,7 @@ <check-errors/> <!-- locate shipping facilities associated with order item rez's --> - <entity-condition entity-name="OrderItemAndShipGrpInvResAndItem" list-name="orderItemAndShipGrpInvResAndItemList"> + <entity-condition entity-name="OrderItemAndShipGrpInvResAndItem" list="orderItemAndShipGrpInvResAndItemList"> <condition-list> <condition-expr field-name="orderId" env-name="orderHeader.orderId"/> <condition-expr field-name="statusId" value="ITEM_APPROVED"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml Tue Dec 30 04:17:03 2008 @@ -172,7 +172,7 @@ <entity-one entity-name="InventoryItem" value-field="inventoryItem"/> <get-related value-name="inventoryItem" relation-name="InventoryItemDetail" list-name="inventoryItemDetails"/> - <entity-condition entity-name="ShipmentReceipt" list-name="shipmentReceipts"> + <entity-condition entity-name="ShipmentReceipt" list="shipmentReceipts"> <condition-expr field-name="inventoryItemId" env-name="inventoryItemId"/> <order-by field-name="datetimeReceived"/> </entity-condition> Modified: ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml (original) +++ ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml Tue Dec 30 04:17:03 2008 @@ -36,7 +36,7 @@ <check-errors/> <!-- loads the invoice items in the SalesInvoiceItemFact fact entity --> - <entity-condition entity-name="Invoice" list-name="invoices"> + <entity-condition entity-name="Invoice" list="invoices"> <condition-list> <condition-expr field-name="invoiceTypeId" value="SALES_INVOICE"/> <condition-expr field-name="invoiceDate" operator="greater-equals" env-name="parameters.fromDate"/> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml Tue Dec 30 04:17:03 2008 @@ -40,7 +40,7 @@ <log level="verbose" message="Got result from CDyne service: ${cdyneResultMap}"/> <!-- Now try to find the county based on what was returned --> - <entity-condition entity-name="GeoAssocAndGeoTo" list-name="geoList"> + <entity-condition entity-name="GeoAssocAndGeoTo" list="geoList"> <condition-list combine="and"> <!-- Make sure that we find the county within the proper state to avoid name conflicts --> <!-- In the USA the 2 letter state abbreviation is the geoId --> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml Tue Dec 30 04:17:03 2008 @@ -79,7 +79,7 @@ <!-- if not found, try the dated uom conversion entity --> <if-empty field="uomConversion"> - <entity-condition entity-name="UomConversionDated" list-name="uomConversions" use-cache="true"> + <entity-condition entity-name="UomConversionDated" list="uomConversions" use-cache="true"> <condition-list combine="and"> <condition-expr field-name="uomId" env-name="parameters.uomId"/> <condition-expr field-name="uomIdTo" env-name="parameters.uomIdTo"/> @@ -98,7 +98,7 @@ <!-- if no conversion found with specified purpose, try w/o purpose --> <if-empty field="uomConversion"> <if-not-empty field="parameters.purposeEnumId"> - <entity-condition entity-name="UomConversionDated" list-name="uomConversions" use-cache="true"> + <entity-condition entity-name="UomConversionDated" list="uomConversions" use-cache="true"> <condition-list combine="and"> <condition-expr field-name="uomId" env-name="parameters.uomId"/> <condition-expr field-name="uomIdTo" env-name="parameters.uomIdTo"/> @@ -202,7 +202,7 @@ <check-errors/> </if-empty> <set field="themeResources" from-field="parameters.themeResources"/> - <entity-condition list-name="resourceList" entity-name="VisualThemeResource" use-cache="true"> + <entity-condition list="resourceList" entity-name="VisualThemeResource" use-cache="true"> <condition-expr field-name="visualThemeId" env-name="visualThemeId"/> <order-by field-name="resourceTypeEnumId"/> <order-by field-name="sequenceId"/> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml Tue Dec 30 04:17:03 2008 @@ -151,7 +151,7 @@ </entity-and> <if-empty field="getMainPage"> - <entity-condition entity-name="PortalPage" list-name="PortalPageList"> + <entity-condition entity-name="PortalPage" list="PortalPageList"> <condition-list combine="and"> <condition-list combine="or"> <condition-expr field-name="originalPortalPageId" operator="equals" env-name="parameters.originalPortalPageId"/> @@ -165,7 +165,7 @@ </entity-condition> </if-empty> <if-not-empty field="getMainPage"> - <entity-condition entity-name="PortalPage" list-name="PortalPageList"> + <entity-condition entity-name="PortalPage" list="PortalPageList"> <condition-list combine="and"> <condition-list combine="or"> <condition-expr field-name="originalPortalPageId" operator="equals" env-name="parameters.originalPortalPageId"/> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml?rev=730118&r1=730117&r2=730118&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml Tue Dec 30 04:17:03 2008 @@ -64,7 +64,7 @@ <iterate entry="curOrganizationPartyId" list="parentOrganizationPartyIdList"> <clear-field field="orgTimePeriodList"/> - <entity-condition entity-name="CustomTimePeriod" list-name="orgTimePeriodList"> + <entity-condition entity-name="CustomTimePeriod" list="orgTimePeriodList"> <condition-list combine="and"> <condition-list combine="or"> <condition-expr field-name="organizationPartyId" operator="equals" env-name="curOrganizationPartyId"/> @@ -82,7 +82,7 @@ </if-not-empty> <if-compare field="parameters.excludeNoOrganizationPeriods" operator="not-equals" value="Y"> - <entity-condition entity-name="CustomTimePeriod" list-name="generalCustomTimePeriodList"> + <entity-condition entity-name="CustomTimePeriod" list="generalCustomTimePeriodList"> <condition-list combine="and"> <condition-list combine="or"> <condition-expr field-name="organizationPartyId" operator="equals" env-name="nullField"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |