You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 13:11:35 UTC
svn commit: r730114 [1/2] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accounting/script/org/ofbiz/accounting/fixedasset/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accou...
Author: jleroux
Date: Tue Dec 30 04:11:33 2008
New Revision: 730114
URL: http://svn.apache.org/viewvc?rev=730114&view=rev
Log:
<entity-and(.*)list-name => <entity-and$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/invoice/InvoiceServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/SampleCommissionServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.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/data/DataServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.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/ContactMechServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.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/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/store/ProductStoreServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.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/shipment/ShipmentServices.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/PortalPageServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml
ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml
ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml
ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -141,7 +141,7 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
<!-- find the most recent status record and set the statusEndDate -->
- <entity-and entity-name="FinAccountStatus" list-name="oldFinAccountStatusList">
+ <entity-and entity-name="FinAccountStatus" list="oldFinAccountStatusList">
<field-map field-name="finAccountId" from-field="parameters.finAccountId"/>
<order-by field-name="-statusDate"/>
</entity-and>
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -484,7 +484,7 @@
<!-- Check if user has not passed in orderItemSeqId then get list of OrderItems from database and default to first item -->
<if-empty field="parameters.orderItemSeqId">
- <entity-and entity-name="OrderItem" list-name="orderItems">
+ <entity-and entity-name="OrderItem" list="orderItems">
<field-map field-name="orderId" from-field="parameters.orderId"/>
</entity-and>
<if-not-empty field="orderItems">
@@ -709,7 +709,7 @@
</calcop>
</calculate>
- <entity-and entity-name="FixedAssetDepMethod" list-name="fixedAssetDepMethods" filter-by-date="true">
+ <entity-and entity-name="FixedAssetDepMethod" list="fixedAssetDepMethods" filter-by-date="true">
<field-map field-name="fixedAssetId" from-field="parameters.fixedAssetId"/>
</entity-and>
<if-not-empty field="fixedAssetDepMethods">
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=730114&r1=730113&r2=730114&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 04:11:33 2008
@@ -486,7 +486,7 @@
<if-compare field="parameters.statusId" operator="equals" value="INVOICE_CANCELLED">
<set field="removePaymentApplicationMap.invoiceId" from-field="parameters.invoiceId"/>
<remove-by-and entity-name="PaymentApplication" map-name="removePaymentApplicationMap"/>
- <entity-and entity-name="TimeEntry" list-name="entries">
+ <entity-and entity-name="TimeEntry" list="entries">
<field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
</entity-and>
<iterate entry="entry" list="entries">
@@ -553,7 +553,7 @@
</simple-method>
<simple-method method-name="autoGenerateInvoiceFromExistingInvoice" short-description="Scheduled service to generate Invoice from an existing Invoice">
- <entity-and entity-name="Invoice" list-name="invoices">
+ <entity-and entity-name="Invoice" list="invoices">
<field-map field-name="recurrenceInfoId" from-field="parameters.recurrenceInfoId"/>
</entity-and>
<iterate list="invoices" entry="invoice">
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=730114&r1=730113&r2=730114&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 04:11:33 2008
@@ -25,7 +25,7 @@
<entity-one entity-name="Payment" value-field="payment"/>
<!-- find affiliate or commission partner for payment.partyIdFrom; will be relationship from CUSTOMER to AFFILIATE, type SALES_AFFILIATE -->
- <entity-and entity-name="PartyRelationship" list-name="affiliatePartyRelationshipList" filter-by-date="true">
+ <entity-and entity-name="PartyRelationship" list="affiliatePartyRelationshipList" filter-by-date="true">
<field-map field-name="partyIdFrom" from-field="payment.partyIdFrom"/>
<field-map field-name="roleTypeIdFrom" value="CUSTOMER"/>
<field-map field-name="partyRelationshipTypeId" value="SALES_AFFILIATE"/><!-- this constraint could be optional if not being set in company data -->
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -44,7 +44,7 @@
</if-empty>
<!-- try to find existing value -->
- <entity-and entity-name="RateAmount" list-name="rateAmounts" filter-by-date="true">
+ <entity-and entity-name="RateAmount" list="rateAmounts" filter-by-date="true">
<field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/>
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
<field-map field-name="rateCurrencyUomId" from-field="parameters.rateCurrencyUomId"/>
@@ -134,7 +134,7 @@
</and>
</condition>
<then>
- <entity-and entity-name="RateAmount" list-name="amounts" filter-by-date="true">
+ <entity-and entity-name="RateAmount" list="amounts" filter-by-date="true">
<field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/>
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
@@ -156,7 +156,7 @@
</and>
</condition>
<then>
- <entity-and entity-name="RateAmount" list-name="amounts" filter-by-date="true">
+ <entity-and entity-name="RateAmount" list="amounts" filter-by-date="true">
<field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/>
<field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-and>
@@ -178,7 +178,7 @@
</and>
</condition>
<then>
- <entity-and entity-name="RateAmount" list-name="amounts" filter-by-date="true">
+ <entity-and entity-name="RateAmount" list="amounts" filter-by-date="true">
<field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/>
<field-map field-name="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/>
</entity-and>
@@ -192,7 +192,7 @@
</if>
<if-empty field="level">
- <entity-and entity-name="RateAmount" list-name="amounts" filter-by-date="true">
+ <entity-and entity-name="RateAmount" list="amounts" filter-by-date="true">
<field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/>
</entity-and>
<set field="level" value="rateType"/>
@@ -203,7 +203,7 @@
<log level="error" message="A valid rate amount could not be found for rateType: ${rateType.description}"/>
</if-empty>
<if-compare field="level" value="workEffort" operator="equals">
- <entity-and entity-name="RateAmount" list-name="amounts" filter-by-date="true">
+ <entity-and entity-name="RateAmount" list="amounts" filter-by-date="true">
<field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/>
<field-map field-name="partyId" from-field="parameters.partyId"/>
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
@@ -223,7 +223,7 @@
</if-compare>
<if-compare field="level" value="party" operator="equals">
- <entity-and entity-name="RateAmount" list-name="amounts" filter-by-date="true">
+ <entity-and entity-name="RateAmount" list="amounts" filter-by-date="true">
<field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/>
<field-map field-name="partyId" from-field="parameters.partyId"/>
<field-map field-name="periodTypeId" from-field="parameters.periodTypeId"/>
@@ -241,7 +241,7 @@
</if-compare>
<if-compare field="level" value="emplPositionType" operator="equals">
- <entity-and entity-name="RateAmount" list-name="amounts" filter-by-date="true">
+ <entity-and entity-name="RateAmount" list="amounts" filter-by-date="true">
<field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/>
<field-map field-name="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/>
<field-map field-name="periodTypeId" from-field="parameters.periodTypeId"/>
@@ -260,7 +260,7 @@
</if-compare>
<if-compare field="level" value="rateType" operator="equals">
- <entity-and entity-name="RateAmount" list-name="amounts" filter-by-date="true">
+ <entity-and entity-name="RateAmount" list="amounts" filter-by-date="true">
<field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/>
<field-map field-name="periodTypeId" from-field="parameters.periodTypeId"/>
<field-map field-name="rateCurrencyUomId" from-field="parameters.rateCurrencyUomId"/>
@@ -297,7 +297,7 @@
<check-errors/>
<!-- check if already exist is so expire current record -->
- <entity-and entity-name="PartyRate" list-name="partyRates" filter-by-date="true">
+ <entity-and entity-name="PartyRate" list="partyRates" filter-by-date="true">
<field-map field-name="partyId" from-field="parameters.partyId"/>
<field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/>
</entity-and>
@@ -325,7 +325,7 @@
<check-permission permission="ACCOUNTING" action="${securityAction}"><fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/></check-permission>
<check-errors/>
<if-compare field="newEntity.defaultRate" value="Y" operator="equals">
- <entity-and entity-name="PartyRate" list-name="rates" filter-by-date="true">
+ <entity-and entity-name="PartyRate" list="rates" filter-by-date="true">
<field-map field-name="partyId" from-field="newEntity.partyId"/>
<field-map field-name="defaultRate" value="Y"/>
</entity-and>
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -587,7 +587,7 @@
</entity-condition>
<set from-field="maxContentApprovalList[0].maxContentRevisionSeqId" field="latestContentRevisionSeqId"/>
<log level="info" message="latestContentRevisionSeqId 0aa: ${latestContentRevisionSeqId}"/>
- <entity-and entity-name="ContentApproval" list-name="templateContentApprovalList">
+ <entity-and entity-name="ContentApproval" list="templateContentApprovalList">
<field-map field-name="contentId" from-field="parameters.contentId"/>
<field-map field-name="contentRevisionSeqId" from-field="latestContentRevisionSeqId"/>
</entity-and>
@@ -641,7 +641,7 @@
</entity-condition>
<set from-field="templateContentRevisionList[0].contentRevisionSeqId" field="latestContentRevisionSeqId"/>
<log level="info" message="latestContentRevisionSeqId 0aa: ${latestContentRevisionSeqId}"/>
- <entity-and entity-name="ContentApproval" list-name="templateContentApprovalList">
+ <entity-and entity-name="ContentApproval" list="templateContentApprovalList">
<field-map field-name="contentId" from-field="rootTemplateContentId"/>
<field-map field-name="contentRevisionSeqId" from-field="latestContentRevisionSeqId"/>
</entity-and>
@@ -733,7 +733,7 @@
</entity-condition>
<set from-field="templateContentRevisionList[0].contentRevisionSeqId" field="latestContentRevisionSeqId"/>
<log level="info" message="latestContentRevisionSeqId 0aa: ${latestContentRevisionSeqId}"/>
- <entity-and entity-name="ContentApproval" list-name="templateContentApprovalList">
+ <entity-and entity-name="ContentApproval" list="templateContentApprovalList">
<field-map field-name="contentId" from-field="rootTemplateContentId"/>
<field-map field-name="contentRevisionSeqId" from-field="latestContentRevisionSeqId"/>
</entity-and>
@@ -820,7 +820,7 @@
</simple-method>
<simple-method method-name="getFinalApprovalStatus" short-description="Check to see if any open approval conditions exist">
<!-- iterate thru most recent ContentApproval list and determine its ending status -->
- <entity-and entity-name="ContentApproval" list-name="contentApprovalList">
+ <entity-and entity-name="ContentApproval" list="contentApprovalList">
<field-map field-name="contentId" from-field="parameters.contentId"/>
<field-map field-name="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId"/>
<order-by field-name="sequenceNum"/>
@@ -876,7 +876,7 @@
</simple-method>
<simple-method method-name="checkForWaitingApprovals" short-description="Check to see if any approval conditions exist for the passed in user">
<set from-field="userLogin.partyId" field="partyId"/>
- <entity-and entity-name="PartyRole" list-name="partyRoleList">
+ <entity-and entity-name="PartyRole" list="partyRoleList">
<field-map field-name="partyId" from-field="partyId"/>
</entity-and>
<log level="info" message="userLogin.partyId: ${partyId}"/>
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -34,7 +34,7 @@
<if-empty field="content.statusId">
<!-- get the first status item -->
- <entity-and entity-name="StatusItem" list-name="contentStatus">
+ <entity-and entity-name="StatusItem" list="contentStatus">
<field-map field-name="statusTypeId" value="CONTENT_STATUS"/>
<order-by field-name="sequenceId"/>
</entity-and>
@@ -162,7 +162,7 @@
<result-to-field result-name="contentId" field-name="newContentId"/>
</call-service>
- <entity-and entity-name="ContentAssoc" list-name="assocs">
+ <entity-and entity-name="ContentAssoc" list="assocs">
<field-map field-name="contentId" from-field="parameters.contentId"/>
</entity-and>
<iterate entry="assoc" list="assocs">
@@ -171,7 +171,7 @@
<call-service service-name="createContentAssoc" in-map-name="assocS"/>
</iterate>
- <entity-and entity-name="ContentAssoc" list-name="assocsTo">
+ <entity-and entity-name="ContentAssoc" list="assocsTo">
<field-map field-name="contentIdTo" from-field="parameters.contentId"/>
</entity-and>
<iterate entry="assocTo" list="assocsTo">
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=730114&r1=730113&r2=730114&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Tue Dec 30 04:11:33 2008
@@ -43,7 +43,7 @@
<if-empty field="content.statusId">
<!-- get the first status item -->
- <entity-and entity-name="StatusItem" list-name="contentStatus">
+ <entity-and entity-name="StatusItem" list="contentStatus">
<field-map field-name="statusTypeId" value="CONTENT_STATUS"/>
<order-by field-name="sequenceId"/>
</entity-and>
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -714,7 +714,7 @@
<set field="lookup.partyId" from-field="checkPartyId"/>
<find-by-and entity-name="${roleEntity}" map-name="lookup" list-name="foundRoles"/>
<!--
- <entity-and entity-name="${roleEntity}" list-name="foundRoles">
+ <entity-and entity-name="${roleEntity}" list="foundRoles">
<field-map from-field="${roleEntityField}"/>
<field-map field-name="roleTypeId" from-field="checkRoleTypeId"/>
<field-map field-name="partyId" from-field="checkPartyId"/>
@@ -728,7 +728,7 @@
<set field="lookup.partyId" from-field="checkPartyId"/>
<find-by-and entity-name="${roleEntity}" map-name="lookup" list-name="foundRoles"/>
<!--
- <entity-and entity-name="${roleEntity}" list-name="foundRoles">
+ <entity-and entity-name="${roleEntity}" list="foundRoles">
<field-map from-field="${roleEntityField}"/>
<field-map field-name="partyId" from-field="checkPartyId"/>
</entity-and>
@@ -783,7 +783,7 @@
</if-empty>
<check-errors/>
- <entity-and entity-name="ContentAssoc" list-name="assocs" filter-by-date="true">
+ <entity-and entity-name="ContentAssoc" list="assocs" filter-by-date="true">
<field-map field-name="contentIdTo" from-field="contentId"/>
</entity-and>
<field-to-result field-name="assocs" result-name="contentAssocList"/>
Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=730114&r1=730113&r2=730114&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original)
+++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Tue Dec 30 04:11:33 2008
@@ -608,7 +608,7 @@
<simple-method method-name="updateEmplPositionTypeRate" short-description="Update/create EmplPositionTypeRate">
<entity-one entity-name="EmplPositionTypeRate" value-field="lookedUpValue"/>
<!-- check if already exist is so expire current record -->
- <entity-and entity-name="EmplPositionTypeRate" list-name="emplPositionTypeRates" filter-by-date="true">
+ <entity-and entity-name="EmplPositionTypeRate" list="emplPositionTypeRates" filter-by-date="true">
<field-map field-name="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/>
<field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/>
</entity-and>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=730114&r1=730113&r2=730114&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml Tue Dec 30 04:11:33 2008
@@ -122,7 +122,7 @@
<set field="createPartyRoleCtx.partyId" from-field="parameters.partyId"/>
<set field="createPartyRoleCtx.roleTypeId" value="CONTACT"/>
<call-service service-name="createPartyRole" in-map-name="createPartyRoleCtx"/>
- <entity-and entity-name="PartyRelationship" list-name="partyRelationships" filter-by-date="true">
+ <entity-and entity-name="PartyRelationship" list="partyRelationships" filter-by-date="true">
<field-map field-name="partyIdTo" from-field="parameters.partyId"/>
<field-map field-name="roleTypeIdTo" value="LEAD"/>
<field-map field-name="roleTypeIdFrom" value="ACCOUNT_LEAD"/>
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -229,7 +229,7 @@
<check-errors/>
</then>
</if>
- <entity-and entity-name="ReturnAdjustment" list-name="returnAdjustments">
+ <entity-and entity-name="ReturnAdjustment" list="returnAdjustments">
<field-map field-name="returnId" from-field="returnHeader.returnId"/>
</entity-and>
<iterate entry="returnAdjustment" list="returnAdjustments">
@@ -443,7 +443,7 @@
<refresh-value value-name="returnItem"/>
<!-- now update all return adjustments associated with this return item -->
- <entity-and entity-name="ReturnAdjustment" list-name="returnAdjustments">
+ <entity-and entity-name="ReturnAdjustment" list="returnAdjustments">
<field-map field-name="returnId" from-field="returnItem.returnId"/>
<field-map field-name="returnItemSeqId" from-field="returnItem.returnItemSeqId"/>
</entity-and>
@@ -489,7 +489,7 @@
<set from-field="parameters.returnItemSeqId" field="lookupPKMap.returnItemSeqId"/>
<find-by-primary-key entity-name="ReturnItem" map="lookupPKMap" value-field="returnItem"/>
<!--remove related adjustments-->
- <entity-and entity-name="ReturnAdjustment" list-name="returnAdjustments">
+ <entity-and entity-name="ReturnAdjustment" list="returnAdjustments">
<field-map field-name="returnItemSeqId" from-field="returnItem.returnItemSeqId"/>
<field-map field-name="returnId" from-field="returnItem.returnId"/>
</entity-and>
@@ -937,12 +937,12 @@
<simple-method method-name="getStatusItemsForReturn" short-description="Get the return status associated with customer vs. vendor return">
<if-compare field="parameters.returnHeaderTypeId" operator="equals" value="CUSTOMER_RETURN">
- <entity-and entity-name="StatusItem" list-name="statusItems">
+ <entity-and entity-name="StatusItem" list="statusItems">
<field-map field-name="statusTypeId" value="ORDER_RETURN_STTS"/>
</entity-and>
<field-to-result field-name="statusItems"/>
<else>
- <entity-and entity-name="StatusItem" list-name="statusItems">
+ <entity-and entity-name="StatusItem" list="statusItems">
<field-map field-name="statusTypeId" value="PORDER_RETURN_STTS"/>
</entity-and>
<field-to-result field-name="statusItems"/>
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -397,7 +397,7 @@
</check-permission>
<check-errors/>
- <entity-and entity-name="ProductFacility" list-name="products">
+ <entity-and entity-name="ProductFacility" list="products">
<field-map from-field="parameters.facilityId" field-name="facilityId"/>
</entity-and>
@@ -922,7 +922,7 @@
<result-to-field result-name="contactMechId" field-name="parameters.shipToContactMechId"/>
</call-service>
</if-compare-field>
- <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpShipList" filter-by-date="true">
+ <entity-and entity-name="PartyContactMechPurpose" list="pcmpShipList" filter-by-date="true">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="contactMechId" from-field="parameters.shipToContactMechId"/>
<field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
@@ -932,7 +932,7 @@
<set-service-fields service-name="createPartyContactMechPurpose" map-name="parameters" to-map-name="serviceContext"/>
<set field="serviceContext.partyId" from-field="userLogin.partyId"/>
- <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true">
+ <entity-and entity-name="PartyContactMechPurpose" list="pcmpList" filter-by-date="true">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
</entity-and>
@@ -964,7 +964,7 @@
<find-by-primary-key entity-name="PostalAddress" map="newValue" value-field="oldValue"/>
<set-nonpk-fields map="shipToAddressCtx" value-field="newValue"/>
<if-compare-field field="oldValue" to-field="newValue" operator="not-equals" type="Object">
- <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true">
+ <entity-and entity-name="PartyContactMechPurpose" list="pcmpList" filter-by-date="true">
<field-map field-name="contactMechId" from-field="shipToAddressCtx.shipToContactMechId"/>
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
@@ -1013,7 +1013,7 @@
<call-service service-name="createPartyContactMechPurpose" in-map-name="serviceInMap"/>
<else>
<if-compare-field field="parameters.shipToContactMechId" operator="not-equals" to-field="parameters.billToContactMechId">
- <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true">
+ <entity-and entity-name="PartyContactMechPurpose" list="pcmpList" filter-by-date="true">
<field-map field-name="contactMechId" from-field="parameters.billToContactMechId"/>
<field-map field-name="partyId" from-field="partyId"/>
<field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
@@ -1066,7 +1066,7 @@
</else>
</if-compare-field>
- <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpBillList" filter-by-date="true">
+ <entity-and entity-name="PartyContactMechPurpose" list="pcmpBillList" filter-by-date="true">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="contactMechId" from-field="parameters.billToContactMechId"/>
<field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
@@ -1076,7 +1076,7 @@
<set-service-fields service-name="createPartyContactMechPurpose" map-name="parameters" to-map-name="serviceContext"/>
<set field="serviceContext.partyId" from-field="userLogin.partyId"/>
- <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true">
+ <entity-and entity-name="PartyContactMechPurpose" list="pcmpList" filter-by-date="true">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
</entity-and>
@@ -1116,7 +1116,7 @@
</call-service>
<else>
<!-- call update Credit Card -->
- <entity-and entity-name="PaymentMethod" list-name="paymentMethodList" filter-by-date="true">
+ <entity-and entity-name="PaymentMethod" list="paymentMethodList" filter-by-date="true">
<field-map field-name="partyId" from-field="partyId"/>
<order-by field-name="-fromDate"/>
</entity-and>
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=730114&r1=730113&r2=730114&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 04:11:33 2008
@@ -134,7 +134,7 @@
</if-empty>
<if-compare-field field="quote.statusId" to-field="parameters.statusId" operator="not-equals">
<!-- check if the status change is a valid change -->
- <entity-and entity-name="StatusValidChange" list-name="validChange">
+ <entity-and entity-name="StatusValidChange" list="validChange">
<field-map field-name="statusId" from-field="quote.statusId"/>
<field-map field-name="statusIdTo" from-field="parameters.statusId"/>
</entity-and>
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=730114&r1=730113&r2=730114&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 04:11:33 2008
@@ -453,7 +453,7 @@
</if-not-empty>
<!-- copy attachements/content -->
- <entity-and entity-name="CommEventContentAssoc" list-name="custRequestContents">
+ <entity-and entity-name="CommEventContentAssoc" list="custRequestContents">
<field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/>
</entity-and>
<iterate entry="custRequestContent" list="custRequestContents">
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -211,7 +211,7 @@
<set from-field="parameters.currencyUomId" field="calcPriceInBaseMap.currencyUomId"/>
<set from-field="parameters.autoUserLogin" field="calcPriceInBaseMap.autoUserLogin"/>
- <entity-and entity-name="ShoppingListItem" list-name="shoppingListItems" use-cache="true">
+ <entity-and entity-name="ShoppingListItem" list="shoppingListItems" use-cache="true">
<field-map field-name="shoppingListId" from-field="parameters.shoppingListId"/>
</entity-and>
@@ -237,7 +237,7 @@
<clear-field field="calcPriceInMap"/>
</iterate>
- <entity-and entity-name="ShoppingList" list-name="childshoppingLists" use-cache="true">
+ <entity-and entity-name="ShoppingList" list="childshoppingLists" use-cache="true">
<field-map field-name="parentShoppingListId" from-field="parameters.shoppingListId"/>
<field-map field-name="partyId" from-field="userLogin.partyId"/>
</entity-and>
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -66,7 +66,7 @@
<!-- if only contactMechId and no partyIdTo is provided for creation email address find the related party -->
<if-empty field="parameters.partyIdTo">
<if-not-empty field="parameters.contactMechIdTo">
- <entity-and entity-name="PartyAndContactMech" list-name="partyContactMechs" filter-by-date="true">
+ <entity-and entity-name="PartyAndContactMech" list="partyContactMechs" filter-by-date="true">
<field-map field-name="contactMechId" from-field="parameters.contactMechIdTo"/>
<field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
</entity-and>
@@ -161,7 +161,7 @@
</if-not-empty>
<if-empty field="parameters.partyIdTo">
<if-not-empty field="parameters.contactMechIdTo">
- <entity-and entity-name="PartyAndContactMech" list-name="partyContactMechs" filter-by-date="true">
+ <entity-and entity-name="PartyAndContactMech" list="partyContactMechs" filter-by-date="true">
<field-map field-name="contactMechId" from-field="parameters.contactMechIdTo"/>
<field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
</entity-and>
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -293,7 +293,7 @@
</if-not-empty>
</simple-method>
<simple-method method-name="verifyEmailAddress" short-description="Verify an Email Address through verifyHash and expireDate" login-required="false">
- <entity-and entity-name="EmailAddressVerification" list-name="emailAddressVerifications">
+ <entity-and entity-name="EmailAddressVerification" list="emailAddressVerifications">
<field-map field-name="verifyHash" from-field="parameters.verifyHash"/>
</entity-and>
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=730114&r1=730113&r2=730114&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 04:11:33 2008
@@ -336,7 +336,7 @@
<set-service-fields service-name="createPartyContactMechPurpose" map-name="parameters" to-map-name="serviceContext"/>
<set field="serviceContext.partyId" from-field="userLogin.partyId"/>
<if-compare field="parameters.setShippingPurpose" operator="equals" value="Y">
- <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true">
+ <entity-and entity-name="PartyContactMechPurpose" list="pcmpList" filter-by-date="true">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
</entity-and>
@@ -355,7 +355,7 @@
<call-service service-name="setPartyProfileDefaults" in-map-name="partyProfileDefaultsCtx"/>
</if-compare>
<if-compare field="parameters.setBillingPurpose" operator="equals" value="Y">
- <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true">
+ <entity-and entity-name="PartyContactMechPurpose" list="pcmpList" filter-by-date="true">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
</entity-and>
@@ -431,7 +431,7 @@
</condition>
<then>
<if-compare field="parameters.setShippingPurpose" operator="equals" value="Y">
- <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpShipList" filter-by-date="true">
+ <entity-and entity-name="PartyContactMechPurpose" list="pcmpShipList" filter-by-date="true">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="contactMechId" from-field="parameters.contactMechId"/>
<field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
@@ -441,7 +441,7 @@
<set-service-fields service-name="createPartyContactMechPurpose" map-name="parameters" to-map-name="serviceContext"/>
<set field="serviceContext.partyId" from-field="userLogin.partyId"/>
- <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true">
+ <entity-and entity-name="PartyContactMechPurpose" list="pcmpList" filter-by-date="true">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
</entity-and>
@@ -463,7 +463,7 @@
<call-service service-name="setPartyProfileDefaults" in-map-name="partyProfileDefaultsCtx"/>
</if-compare>
<if-compare field="parameters.setBillingPurpose" operator="equals" value="Y">
- <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpBillList" filter-by-date="true">
+ <entity-and entity-name="PartyContactMechPurpose" list="pcmpBillList" filter-by-date="true">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="contactMechId" from-field="parameters.contactMechId"/>
<field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
@@ -473,7 +473,7 @@
<set-service-fields service-name="createPartyContactMechPurpose" map-name="parameters" to-map-name="serviceContext"/>
<set field="serviceContext.partyId" from-field="userLogin.partyId"/>
- <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true">
+ <entity-and entity-name="PartyContactMechPurpose" list="pcmpList" filter-by-date="true">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
</entity-and>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml?rev=730114&r1=730113&r2=730114&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml Tue Dec 30 04:11:33 2008
@@ -71,7 +71,7 @@
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="acceptPartyInvitation" short-description="Accept Party Invitation">
- <entity-and entity-name="PartyInvitationGroupAssoc" list-name="partyInvitationGroupAssocs">
+ <entity-and entity-name="PartyInvitationGroupAssoc" list="partyInvitationGroupAssocs">
<field-map field-name="partyInvitationId" from-field="parameters.partyInvitationId"/>
</entity-and>
<if-not-empty field="partyInvitationGroupAssocs">
@@ -82,7 +82,7 @@
<call-service service-name="createPartyRelationship" in-map-name="createPartyRelationshipCtx"/>
</iterate>
</if-not-empty>
- <entity-and entity-name="PartyInvitationRoleAssoc" list-name="partyInvitationRoleAssocs">
+ <entity-and entity-name="PartyInvitationRoleAssoc" list="partyInvitationRoleAssocs">
<field-map field-name="partyInvitationId" from-field="parameters.partyInvitationId"/>
</entity-and>
<if-not-empty field="partyInvitationRoleAssocs">
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -90,7 +90,7 @@
</simple-method>
<simple-method method-name="getPartyNameForDate" short-description="Get Party Name For Date">
- <entity-and entity-name="PartyNameHistory" list-name="partyNameHistoryList">
+ <entity-and entity-name="PartyNameHistory" list="partyNameHistoryList">
<field-map field-name="partyId" from-field="parameters.partyId"/>
<order-by field-name="-changeDate"/>
</entity-and>
@@ -766,7 +766,7 @@
<if-empty field="parameters.fromDate"><now-timestamp-to-env env-name="parameters.fromDate"/></if-empty>
<!-- check if not already exist -->
- <entity-and entity-name="PartyRelationship" list-name="partyRels" filter-by-date="true">
+ <entity-and entity-name="PartyRelationship" list="partyRels" filter-by-date="true">
<field-map field-name="partyIdFrom" from-field="parameters.partyIdFrom"/>
<field-map field-name="roleTypeIdFrom" from-field="parameters.roleTypeIdFrom"/>
<field-map field-name="partyIdTo" from-field="parameters.partyIdTo"/>
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -61,7 +61,7 @@
<!-- if the user has the role limited position, add this category to the limit category/ies -->
<if-has-permission permission="CATALOG_ROLE" action="_CREATE">
- <entity-and entity-name="ProductCategoryRole" list-name="productCategoryRoles" filter-by-date="true">
+ <entity-and entity-name="ProductCategoryRole" list="productCategoryRoles" filter-by-date="true">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="roleTypeId" value="LTD_ADMIN"/>
</entity-and>
@@ -360,7 +360,7 @@
<call-simple-method method-name="checkCategoryRelatedPermission"/>
<check-errors/>
- <entity-and entity-name="ProductCategoryMember" list-name="productCategoryMembers">
+ <entity-and entity-name="ProductCategoryMember" list="productCategoryMembers">
<field-map field-name="productCategoryId" from-field="parameters.productCategoryId"/>
</entity-and>
@@ -413,7 +413,7 @@
<simple-method method-name="copyCategoryEntities" short-description="copies all entities of entityName with a productCategoryId to a new entity with a productCategoryIdTo,
filtering them by a timestamp passed in to validDate if necessary">
- <entity-and entity-name="${entityName}" list-name="categoryEntities">
+ <entity-and entity-name="${entityName}" list="categoryEntities">
<field-map field-name="productCategoryId" from-field="productCategoryId"/>
</entity-and>
@@ -443,7 +443,7 @@
</else>
</if-not-empty>
- <entity-and entity-name="ProductCategoryMember" list-name="productCategoryMembers">
+ <entity-and entity-name="ProductCategoryMember" list="productCategoryMembers">
<field-map field-name="productCategoryId" from-field="parameters.productCategoryId"/>
</entity-and>
@@ -465,7 +465,7 @@
</else>
</if-not-empty>
- <entity-and entity-name="ProductCategoryMember" list-name="productCategoryMembers">
+ <entity-and entity-name="ProductCategoryMember" list="productCategoryMembers">
<field-map field-name="productCategoryId" from-field="parameters.productCategoryId"/>
</entity-and>
@@ -609,7 +609,7 @@
</iterate>
</if-not-empty>
<if-not-empty field="parameters.duplicateChildRollup">
- <entity-and entity-name="ProductCategoryRollup" list-name="foundValues">
+ <entity-and entity-name="ProductCategoryRollup" list="foundValues">
<field-map field-name="parentProductCategoryId" from-field="parameters.oldProductCategoryId"/>
</entity-and>
<iterate entry="foundValue" list="foundValues">
@@ -722,7 +722,7 @@
<not><if-has-permission permission="CATALOG" action="_${checkAction}"/></not>
</condition>
<then>
- <entity-and entity-name="ProductCategoryRollupAndRole" list-name="roleCategories" filter-by-date="true">
+ <entity-and entity-name="ProductCategoryRollupAndRole" list="roleCategories" filter-by-date="true">
<field-map field-name="productCategoryId" from-field="productCategoryIdToCheck"/>
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="roleTypeId" value="LTD_ADMIN"/>
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -115,7 +115,7 @@
<check-errors/>
<!-- find the ProductFeatures by type and id code -->
- <entity-and entity-name="ProductFeature" list-name="productFeatures">
+ <entity-and entity-name="ProductFeature" list="productFeatures">
<field-map field-name="productFeatureTypeId" from-field="parameters.productFeatureTypeId"/>
<field-map field-name="idCode" from-field="parameters.idCode"/>
</entity-and>
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -304,7 +304,7 @@
<!-- Step 1 cancel our reservation, we'll later reserve Inventory we want-->
<call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOrderItemShipGrpInvResMap"/>
<!-- Lets find the inventory to reserve -->
- <entity-and entity-name="InventoryItem" list-name="inventoryItems">
+ <entity-and entity-name="InventoryItem" list="inventoryItems">
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="inventoryItemTypeId" value="SERIALIZED_INV_ITEM"/>
<field-map field-name="serialNumber" from-field="parameters.serialNumber"/>
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -257,7 +257,7 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
<!-- find the most recent InventoryItemStatus record and set the statusEndDatetime -->
- <entity-and entity-name="InventoryItemStatus" list-name="oldInventoryItemStatusList">
+ <entity-and entity-name="InventoryItemStatus" list="oldInventoryItemStatusList">
<field-map field-name="inventoryItemId" from-field="parameters.inventoryItemId"/>
<order-by field-name="-statusDatetime"/>
</entity-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=730114&r1=730113&r2=730114&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 04:11:33 2008
@@ -33,7 +33,7 @@
<check-errors/>
<!-- First find all OrderItemShipGrpInvRes that are in a FLT_BULK location in the current Facility -->
- <entity-and entity-name="OrderItemShipGrpInvResAndItemLocation" list-name="orderItemShipGrpInvResAndItemLocationList">
+ <entity-and entity-name="OrderItemShipGrpInvResAndItemLocation" list="orderItemShipGrpInvResAndItemLocationList">
<field-map field-name="locationTypeEnumId" value="FLT_BULK"/>
<field-map field-name="orderItemStatusId" value="ITEM_APPROVED"/>
<field-map field-name="facilityId" from-field="parameters.facilityId"/>
@@ -78,7 +78,7 @@
</entity-one>
<!-- get facilityLocationTo: a little more tricky, find the first FLT_PICKLOC -->
- <entity-and entity-name="ProductFacilityLocationView" list-name="productFacilityLocationViewList">
+ <entity-and entity-name="ProductFacilityLocationView" list="productFacilityLocationViewList">
<field-map field-name="productId" from-field="productId"/>
<field-map field-name="facilityId" from-field="parameters.facilityId"/>
<field-map field-name="locationTypeEnumId" value="FLT_PICKLOC"/>
@@ -101,7 +101,7 @@
</iterate>
<!-- if moveInfo.totalQuantity is greater than the total quantity in the given location, show an error and do something (hopefully) intelligent -->
- <entity-and entity-name="InventoryItem" list-name="inventoryItemList">
+ <entity-and entity-name="InventoryItem" list="inventoryItemList">
<field-map field-name="productId" from-field="productId"/>
<field-map field-name="facilityId" from-field="parameters.facilityId"/>
<field-map field-name="locationSeqId" from-field="locationSeqId"/>
@@ -215,7 +215,7 @@
- totalQuantity
-->
<!-- start by finding all Xxx where locationTypeEnumId=FLT_PICKLOC and total of InventoryItems in the loc are less than minimumStock (ProductFacilityLocation, FacilityLocation, InventoryItem) -->
- <entity-and entity-name="ProductFacilityLocationQuantityTest" list-name="productFacilityLocationQuantityTestList">
+ <entity-and entity-name="ProductFacilityLocationQuantityTest" list="productFacilityLocationQuantityTestList">
<field-map field-name="locationTypeEnumId" value="FLT_PICKLOC"/>
<field-map field-name="facilityId" from-field="parameters.facilityId"/>
<order-by field-name="productId"/>
@@ -257,7 +257,7 @@
<get-related-one value-name="productFacilityLocationQuantityTest" relation-name="FacilityLocation" to-value-name="targetFacilityLocationSave"/>
<!-- create a moveInfo for each from location with a corresponding quantity -->
- <entity-and entity-name="InventoryItemAndLocation" list-name="inventoryItemAndLocationList">
+ <entity-and entity-name="InventoryItemAndLocation" list="inventoryItemAndLocationList">
<field-map field-name="productId" from-field="productFacilityLocationQuantityTest.productId"/>
<field-map field-name="facilityId" from-field="productFacilityLocationQuantityTest.facilityId"/>
<field-map field-name="locationTypeEnumId" value="FLT_BULK"/>
@@ -369,7 +369,7 @@
<!-- Now for any remaining quantity, do a simple, ie non-OISGIR, stock move -->
<if-compare field="quantityLeftToProcess" operator="greater" value="0" type="Double">
<!-- find InventoryItems in the origin location with some availableToPromise to move -->
- <entity-and entity-name="InventoryItem" list-name="inventoryItemList">
+ <entity-and entity-name="InventoryItem" list="inventoryItemList">
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="facilityId" from-field="parameters.facilityId"/>
<field-map field-name="locationSeqId" from-field="parameters.locationSeqId"/>
@@ -430,7 +430,7 @@
<field-to-result field-name="warningMessageList"/>
</simple-method>
<simple-method method-name="processOisgirMoveByStatusInline" short-description="Inline method to process OISGIR stock move for a specific OrderItem.statusId">
- <entity-and entity-name="OrderItemShipGrpInvResAndItemLocation" list-name="orderItemShipGrpInvResAndItemLocationList">
+ <entity-and entity-name="OrderItemShipGrpInvResAndItemLocation" list="orderItemShipGrpInvResAndItemLocationList">
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="facilityId" from-field="parameters.facilityId"/>
<field-map field-name="locationSeqId" from-field="parameters.locationSeqId"/>
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=730114&r1=730113&r2=730114&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 04:11:33 2008
@@ -95,7 +95,7 @@
<!-- update price -->
<if-not-empty field="parameters.price">
- <entity-and entity-name="ProductPrice" list-name="productPriceList">
+ <entity-and entity-name="ProductPrice" list="productPriceList">
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="productPriceTypeId" value="DEFAULT_PRICE"/>
<field-map field-name="productPricePurposeId" value="PURCHASE"/>
@@ -111,7 +111,7 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
<!-- make sure SupplierProduct exists for userLogin.partyId -->
- <entity-and entity-name="SupplierProduct" list-name="supplierProductList">
+ <entity-and entity-name="SupplierProduct" list="supplierProductList">
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="partyId" from-field="userLogin.partyId"/>
</entity-and>
@@ -127,7 +127,7 @@
<store-value value-name="supplierProduct"/>
</iterate>
- <entity-and entity-name="ProductCategoryMember" list-name="productCategoryMemberList">
+ <entity-and entity-name="ProductCategoryMember" list="productCategoryMemberList">
<field-map field-name="productId"/>
</entity-and>
<iterate entry="productCategoryMember" list="productCategoryMemberList">
@@ -140,7 +140,7 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
<!-- make sure SupplierProduct exists for userLogin.partyId -->
- <entity-and entity-name="SupplierProduct" list-name="supplierProductList">
+ <entity-and entity-name="SupplierProduct" list="supplierProductList">
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="partyId" from-field="userLogin.partyId"/>
</entity-and>
@@ -149,7 +149,7 @@
</if-empty>
<!-- make sure there is a ContentRole for userLogin.partyId and parameters.contentId and roleTypeId=OWNER -->
- <entity-and entity-name="ContentRole" list-name="contentRoleList">
+ <entity-and entity-name="ContentRole" list="contentRoleList">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="contentId" from-field="parameters.contentId"/>
<field-map field-name="roleTypeId" value="OWNER"/>
@@ -171,7 +171,7 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
<!-- make sure SupplierProduct exists for userLogin.partyId -->
- <entity-and entity-name="SupplierProduct" list-name="supplierProductList">
+ <entity-and entity-name="SupplierProduct" list="supplierProductList">
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="partyId" from-field="userLogin.partyId"/>
</entity-and>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=730114&r1=730113&r2=730114&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml Tue Dec 30 04:11:33 2008
@@ -71,7 +71,7 @@
<!-- if the user has the role limited position, add this product to the limit category/ies -->
<if-has-permission permission="CATALOG_ROLE" action="_CREATE">
- <entity-and entity-name="ProductCategoryRole" list-name="productCategoryRoles" filter-by-date="true">
+ <entity-and entity-name="ProductCategoryRole" list="productCategoryRoles" filter-by-date="true">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="roleTypeId" value="LTD_ADMIN"/>
</entity-and>
@@ -241,7 +241,7 @@
</iterate>
<!-- small difference here, also do the reverse assocs... -->
- <entity-and entity-name="ProductAssoc" list-name="foundValues">
+ <entity-and entity-name="ProductAssoc" list="foundValues">
<field-map field-name="productIdTo" from-field="parameters.oldProductId"/>
</entity-and>
<iterate entry="foundValue" list="foundValues">
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=730114&r1=730113&r2=730114&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Tue Dec 30 04:11:33 2008
@@ -433,7 +433,7 @@
</else>
</if-compare>
<else>
- <entity-and entity-name="ProductStoreFacility" list-name="productStoreFacilities" use-cache="true">
+ <entity-and entity-name="ProductStoreFacility" list="productStoreFacilities" use-cache="true">
<field-map from-field="productStore.productStoreId" field-name="productStoreId"/>
<order-by field-name="sequenceNum"/>
</entity-and>
@@ -473,7 +473,7 @@
</else>
</if-compare>
<else>
- <entity-and entity-name="ProductStoreFacility" list-name="productStoreFacilities" use-cache="true">
+ <entity-and entity-name="ProductStoreFacility" list="productStoreFacilities" use-cache="true">
<field-map from-field="productStore.productStoreId" field-name="productStoreId"/>
<field-map from-field="facilityId" field-name="facilityId"/>
<order-by field-name="sequenceNum"/>
@@ -609,7 +609,7 @@
</else>
</if-compare-field>
<else>
- <entity-and entity-name="ProductStoreFacility" list-name="productStoreFacilities" use-cache="true">
+ <entity-and entity-name="ProductStoreFacility" list="productStoreFacilities" use-cache="true">
<field-map from-field="productStore.productStoreId" field-name="productStoreId"/>
<order-by field-name="sequenceNum"/>
</entity-and>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml?rev=730114&r1=730113&r2=730114&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml Tue Dec 30 04:11:33 2008
@@ -33,7 +33,7 @@
<!-- lookup the product subscription resource (if exists) -->
<if-not-empty field="parameters.subscriptionResourceId">
<if-not-empty field="parameters.productId">
- <entity-and entity-name="ProductSubscriptionResource" list-name="resourceList" filter-by-date="true">
+ <entity-and entity-name="ProductSubscriptionResource" list="resourceList" filter-by-date="true">
<field-map field-name="subscriptionResourceId" from-field="parameters.subscriptionResourceId"/>
<field-map field-name="productId" from-field="parameters.productId"/>
<order-by field-name="-fromDate"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml?rev=730114&r1=730113&r2=730114&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml Tue Dec 30 04:11:33 2008
@@ -81,7 +81,7 @@
<remove-value value-name="sprod"/>
</simple-method>
<simple-method method-name="getSupplierProductFeatures" short-description="Get all supplier information for a product feature" login-required="false">
- <entity-and entity-name="SupplierProductFeature" list-name="supplierProductFeatures">
+ <entity-and entity-name="SupplierProductFeature" list="supplierProductFeatures">
<field-map field-name="partyId" from-field="parameters.partyId"/>
<field-map field-name="productFeatureId" from-field="parameters.productFeatureId"/>
</entity-and>
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -509,7 +509,7 @@
<set field="shipmentId" from-field="parameters.shipmentId"/>
<set field="shipmentItemSeqId" from-field="parameters.shipmentItemSeqId"/>
<entity-one entity-name="InventoryItem" value-field="inventoryItem"/>
- <entity-and entity-name="ReturnItemShipment" list-name="returnItemShipments">
+ <entity-and entity-name="ReturnItemShipment" list="returnItemShipments">
<field-map field-name="shipmentId" from-field="parameters.shipmentId"/>
<field-map field-name="shipmentItemSeqId" from-field="parameters.shipmentItemSeqId"/>
</entity-and>
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -87,7 +87,7 @@
<iterate entry="orderHeader" list="orderHeaderList">
<log level="info" message="Checking order #${orderHeader.orderId} to add to picklist"/>
<!-- get all ship groups, and iterate over them for each order -->
- <entity-and entity-name="OrderItemShipGroup" list-name="orderItemShipGroupList">
+ <entity-and entity-name="OrderItemShipGroup" list="orderItemShipGroupList">
<field-map field-name="orderId" from-field="orderHeader.orderId"/>
<order-by field-name="shipGroupSeqId"/>
</entity-and>
@@ -113,11 +113,11 @@
</condition>
<then>
<!-- get only for current OrderItemShipGroup -->
- <entity-and entity-name="OrderItemShipGrpInvRes" list-name="orderItemShipGrpInvResList">
+ <entity-and entity-name="OrderItemShipGrpInvRes" list="orderItemShipGrpInvResList">
<field-map field-name="orderId" from-field="orderItemShipGroup.orderId"/>
<field-map field-name="shipGroupSeqId" from-field="orderItemShipGroup.shipGroupSeqId"/>
</entity-and>
- <entity-and entity-name="OrderItemAndShipGroupAssoc" list-name="orderItemAndShipGroupAssocList">
+ <entity-and entity-name="OrderItemAndShipGroupAssoc" list="orderItemAndShipGroupAssocList">
<field-map field-name="orderId" from-field="orderItemShipGroup.orderId"/>
<field-map field-name="shipGroupSeqId" from-field="orderItemShipGroup.shipGroupSeqId"/>
<order-by field-name="+orderItemSeqId"/>
@@ -1246,7 +1246,7 @@
<find-by-primary-key map="plLookup" value-field="picklist"/>
<!-- find all related picklist items -->
- <entity-and entity-name="PicklistItemAndBin" list-name="picklistItem">
+ <entity-and entity-name="PicklistItemAndBin" list="picklistItem">
<field-map field-name="picklistId" from-field="picklist.picklistId"/>
</entity-and>
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -430,7 +430,7 @@
<!-- partyIdFrom, partyIdTo (vendorPartyId) - NOTE: these work the same for Purchase and Sales Orders... -->
- <entity-and entity-name="OrderRole" list-name="orderRoles">
+ <entity-and entity-name="OrderRole" list="orderRoles">
<field-map field-name="orderId" from-field="shipment.primaryOrderId"/>
</entity-and>
@@ -476,7 +476,7 @@
<clear-field field-name="limitRoleMap"/><clear-field field-name="limitOrderRoles"/><clear-field field="limitOrderRole"/>
</if-empty>
- <entity-and entity-name="OrderContactMech" list-name="orderContactMechs">
+ <entity-and entity-name="OrderContactMech" list="orderContactMechs">
<field-map field-name="orderId" from-field="shipment.primaryOrderId"/>
</entity-and>
<!-- destinationContactMechId -->
@@ -516,7 +516,7 @@
<set from-field="destTelecomOrderContactMech.contactMechId" field="shipment.destinationTelecomNumberId"/>
<else>
<!-- use the first unexpired phone number of the shipment partyIdTo -->
- <entity-and entity-name="PartyAndTelecomNumber" list-name="phoneNumbers" filter-by-date="true">
+ <entity-and entity-name="PartyAndTelecomNumber" list="phoneNumbers" filter-by-date="true">
<field-map field-name="partyId" from-field="shipment.partyIdTo"/>
</entity-and>
<first-from-list entry="phoneNumber" list="phoneNumbers"/>
@@ -688,7 +688,7 @@
<entity-one entity-name="Shipment" value-field="shipment"/>
<!-- find email address for currently logged in user, set as sendFrom -->
- <entity-and entity-name="PartyAndContactMech" list-name="curUserPartyAndContactMechs">
+ <entity-and entity-name="PartyAndContactMech" list="curUserPartyAndContactMechs">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
</entity-and>
@@ -700,7 +700,7 @@
<set from-field="shipment.partyIdFrom" field="sendToPartyIdMap.${shipment.partyIdFrom}"/>
<!-- find email addresses of all parties not equal to partyIdFrom in SUPPLIER_AGENT roleTypeId associated with primary order, set as sendTo -->
- <entity-and entity-name="OrderRole" list-name="supplierAgentOrderRoles">
+ <entity-and entity-name="OrderRole" list="supplierAgentOrderRoles">
<field-map field-name="orderId" from-field="shipment.primaryOrderId"/>
<field-map field-name="roleTypeId" value="SUPPLIER_AGENT"/>
</entity-and>
@@ -711,7 +711,7 @@
<!-- go through all send to parties and get email addresses -->
<iterate-map key="sendToPartyId" value="sendToPartyIdValue" map="sendToPartyIdMap">
- <entity-and entity-name="PartyAndContactMech" list-name="sendToPartyPartyAndContactMechs">
+ <entity-and entity-name="PartyAndContactMech" list="sendToPartyPartyAndContactMechs">
<field-map field-name="partyId" from-field="sendToPartyId"/>
<field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
</entity-and>
@@ -758,7 +758,7 @@
<entity-one entity-name="Shipment" value-field="shipment"/>
<get-related value-name="shipment" relation-name="ItemIssuance" list-name="issuances"/>
<iterate list="issuances" entry="issuance">
- <entity-and entity-name="ShipmentReceipt" list-name="receipts">
+ <entity-and entity-name="ShipmentReceipt" list="receipts">
<field-map field-name="shipmentId" from-field="shipment.shipmentId"/>
<field-map field-name="orderId" from-field="issuance.orderId"/>
<field-map field-name="orderItemSeqId" from-field="issuance.orderItemSeqId"/>
@@ -846,7 +846,7 @@
<!-- split the OrderShipment record(s) as well for the new quantities,
from originalShipmentItem.shipmentItemSeqId to newShipmentItemSeqId -->
- <entity-and entity-name="OrderShipment" list-name="itemOrderShipmentList">
+ <entity-and entity-name="OrderShipment" list="itemOrderShipmentList">
<field-map field-name="shipmentId" from-field="originalShipmentItem.shipmentId"/>
<field-map field-name="shipmentItemSeqId" from-field="originalShipmentItem.shipmentItemSeqId"/>
</entity-and>
@@ -961,7 +961,7 @@
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="ensurePackageRouteSeg" short-description="Ensure ShipmentPackageRouteSeg exists for all RouteSegments for this Package">
- <entity-and entity-name="ShipmentRouteSegment" list-name="shipmentRouteSegments">
+ <entity-and entity-name="ShipmentRouteSegment" list="shipmentRouteSegments">
<field-map field-name="shipmentId" from-field="shipmentId"/>
</entity-and>
@@ -1195,7 +1195,7 @@
<remove-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="ensureRouteSegPackage" short-description="Ensure ShipmentPackageRouteSeg exists for all Packages for this RouteSegment">
- <entity-and entity-name="ShipmentPackage" list-name="shipmentPackages">
+ <entity-and entity-name="ShipmentPackage" list="shipmentPackages">
<field-map field-name="shipmentId" from-field="shipmentId"/>
</entity-and>
<iterate entry="shipmentPackage" list="shipmentPackages">
@@ -1377,7 +1377,7 @@
<field-to-result field-name="shipmentId" result-name="shipmentId"/>
<!-- Iterate through the order items in the ship group -->
- <entity-and entity-name="OrderItemShipGroupAssoc" list-name="orderItemShipGroupAssocs">
+ <entity-and entity-name="OrderItemShipGroupAssoc" list="orderItemShipGroupAssocs">
<field-map field-name="orderId" from-field="parameters.orderId"/>
<field-map field-name="shipGroupSeqId" from-field="parameters.shipGroupSeqId"/>
</entity-and>
@@ -1392,7 +1392,7 @@
<check-errors/>
<!-- Set the status of any linked sales order items to completed as well -->
- <entity-and entity-name="OrderItemAssoc" list-name="orderItemAssocs">
+ <entity-and entity-name="OrderItemAssoc" list="orderItemAssocs">
<field-map field-name="toOrderId" from-field="parameters.orderId"/>
<field-map field-name="toOrderItemSeqId" from-field="orderItem.orderItemSeqId"/>
<field-map field-name="orderItemAssocTypeId" value="DROP_SHIPMENT"/>
@@ -1419,7 +1419,7 @@
short-description="Sub-method used by quickShip methods to get a list of OrderItemAndShipGroupAssoc and a Map of shipGroupId -> OrderItemAndShipGroupAssoc">
<!-- lookup all the approved items, doing by item because the item must be approved before shipping -->
- <entity-and entity-name="OrderItemAndShipGroupAssoc" list-name="orderItemAndShipGroupAssocList">
+ <entity-and entity-name="OrderItemAndShipGroupAssoc" list="orderItemAndShipGroupAssocList">
<field-map field-name="orderId" from-field="orderHeader.orderId"/>
<field-map field-name="statusId" value="ITEM_APPROVED"/>
</entity-and>
@@ -1444,7 +1444,7 @@
<!-- for OrderItemShipGroup need to split all OISGIRs into their ship groups and create a shipment for each -->
<iterate list="orderItemShipGroupList" entry="orderItemShipGroup">
<!-- lookup all the approved items -->
- <entity-and entity-name="OrderItemAndShipGroupAssoc" list-name="orderItems">
+ <entity-and entity-name="OrderItemAndShipGroupAssoc" list="orderItems">
<field-map field-name="orderId" from-field="orderHeader.orderId"/>
<field-map field-name="shipGroupSeqId" from-field="orderItemShipGroup.shipGroupSeqId"/>
<field-map field-name="statusId" value="ITEM_APPROVED"/>
@@ -1509,7 +1509,7 @@
</if>
<!-- place all issued items into a single package -->
- <entity-and entity-name="ItemIssuance" list-name="itemIssuances">
+ <entity-and entity-name="ItemIssuance" list="itemIssuances">
<field-map field-name="orderId" from-field="orderHeader.orderId"/>
<field-map field-name="shipGroupSeqId" from-field="orderItemShipGroup.shipGroupSeqId"/>
<field-map field-name="shipmentId" from-field="shipment.shipmentId"/>
@@ -1988,7 +1988,7 @@
<fail-message message="Security Error: to run ${operationName} you must have the FACILITY_UPDATE or FACILITY_ADMIN permission"/>
</check-permission>
- <entity-and entity-name="OrderShipment" list-name="orderShipmentList">
+ <entity-and entity-name="OrderShipment" list="orderShipmentList">
<field-map field-name="shipmentId" from-field="parameters.shipmentId"/>
</entity-and>
<iterate entry="orderShipment" list="orderShipmentList">