Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml Sat Nov 5 12:41:35 2016 @@ -242,7 +242,7 @@ under the License. <set field="workEffortId" from-field="parameters.workEffortId"/> <entity-one entity-name="WorkEffort" value-field="routingTask"/> <entity-and entity-name="WorkEffortAssoc" list="allRoutings"> - <field-map from-field="workEffortId" field-name="workEffortIdTo"/> + <field-map field-name="workEffortIdTo" from-field="workEffortId"/> </entity-and> </actions> <widgets> @@ -267,7 +267,7 @@ under the License. <entity-one entity-name="WorkEffort" value-field="routingTask"/> <entity-and entity-name="WorkEffortGoodStandard" list="allProducts"> <field-map field-name="workEffortGoodStdTypeId" value="PRUNT_PROD_DELIV"/> - <field-map from-field="workEffortId" field-name="workEffortId"/> + <field-map field-name="workEffortId" from-field="workEffortId"/> </entity-and> </actions> <widgets> @@ -293,7 +293,7 @@ under the License. <set field="workEffortId" from-field="parameters.workEffortId"/> <entity-and entity-name="WorkEffortGoodStandard" list="allRoutingProductLinks"> - <field-map from-field="workEffortId" field-name="workEffortId"/> + <field-map field-name="workEffortId" from-field="workEffortId"/> <field-map field-name="workEffortGoodStdTypeId" value="PRUNT_PROD_DELIV"/> </entity-and> <entity-one entity-name="WorkEffortGoodStandard" value-field="routingProductLink" auto-field-map="true"/> @@ -319,8 +319,8 @@ under the License. <set field="workEffortId" from-field="parameters.workEffortId"/> <set field="workEffortAssocTypeId" value="ROUTING_COMPONENT"/> <entity-and entity-name="WorkEffortAssocView" list="allRoutingTasks"> - <field-map from-field="workEffortId" field-name="workEffortIdFrom"/> - <field-map from-field="workEffortAssocTypeId" field-name="workEffortAssocTypeId"/> + <field-map field-name="workEffortIdFrom" from-field="workEffortId"/> + <field-map field-name="workEffortAssocTypeId" from-field="workEffortAssocTypeId"/> <order-by field-name="sequenceNum"/> <order-by field-name="fromDate"/> </entity-and> @@ -353,8 +353,8 @@ under the License. <set field="workEffortId" from-field="parameters.workEffortId"/> <!--<entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>--> <entity-and entity-name="WorkEffortGoodStandard" list="allRoutingProductLinks"> - <field-map from-field="workEffortId" field-name="workEffortId"/> - <field-map from-field="workEffortGoodStdTypeId" field-name="workEffortGoodStdTypeId"/> + <field-map field-name="workEffortId" from-field="workEffortId"/> + <field-map field-name="workEffortGoodStdTypeId" from-field="workEffortGoodStdTypeId"/> </entity-and> <entity-one entity-name="WorkEffortGoodStandard" value-field="routingProductLink" auto-field-map="true"/> <!--<script location="component://manufacturing/groovyScripts/routing/EditRoutingProductLink.groovy"/>-->
Modified: ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListEvents.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListEvents.xml (original) +++ ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListEvents.xml Sat Nov 5 12:41:35 2016 @@ -40,7 +40,7 @@ under the License. <set field="partyId" value="${groovy:parameterMap["partyId" + suffix]}"/> <!-- get exist contact list party --> - <entity-and list="existContactListParties" entity-name="ContactListParty" filter-by-date="true"> + <entity-and entity-name="ContactListParty" list="existContactListParties" filter-by-date="true"> <field-map field-name="partyId" from-field="partyId"/> <field-map field-name="contactListId" from-field="parameters.contactListId"/> </entity-and> Modified: ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml (original) +++ ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml Sat Nov 5 12:41:35 2016 @@ -161,7 +161,7 @@ under the License. </simple-method> <simple-method method-name="updateContactListPartyNoUserLogin" short-description="Update Add Party To ContactList No User Login" login-required="false"> <entity-one value-field="contactList" entity-name="ContactList"/> - <entity-and list="contactListPartyStatusList" entity-name="ContactListPartyStatus"> + <entity-and entity-name="ContactListPartyStatus" list="contactListPartyStatusList"> <field-map field-name="contactListId" from-field="parameters.contactListId"/> <field-map field-name="partyId" from-field="parameters.partyId"/> <field-map field-name="optInVerifyCode" from-field="parameters.optInVerifyCode"/> @@ -197,7 +197,7 @@ under the License. <if-empty field="parameters.partyId"> <set field="parameters.partyId" value="_NA_"/> </if-empty> - <entity-and list="partyContactWithPurposes" entity-name="PartyContactWithPurpose"> + <entity-and entity-name="PartyContactWithPurpose" list="partyContactWithPurposes"> <field-map field-name="partyId" from-field="parameters.partyId"/> <field-map field-name="infoString" from-field="parameters.email"/> <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/> @@ -215,7 +215,7 @@ under the License. <set field="updateContactListPartyMap.baseLocation" from-field="parameters.baseLocation"/> <call-service service-name="updateContactListParty" in-map-name="updateContactListPartyMap"/> <else> - <entity-and list="partyContactWithPurposes" entity-name="PartyContactWithPurpose"> + <entity-and entity-name="PartyContactWithPurpose" list="partyContactWithPurposes"> <field-map field-name="infoString" from-field="parameters.email"/> <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/> </entity-and> @@ -238,7 +238,7 @@ under the License. </if-not-empty> </simple-method> <simple-method method-name="unsubscribeContactListPartyContachMech" short-description="Find email by contactMechId then call unsubscribeContactListParty service"> - <entity-and list="partyContactWithPurposes" entity-name="PartyContactWithPurpose"> + <entity-and entity-name="PartyContactWithPurpose" list="partyContactWithPurposes"> <field-map field-name="contactMechId" from-field="parameters.preferredContactMechId"/> <field-map field-name="partyId" from-field="parameters.partyId"/> <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/> @@ -252,7 +252,7 @@ under the License. <simple-method method-name="updatePartyEmailContactListParty" short-description="Update ContactList Party Contact Mech"> <set field="lookupMap.preferredContactMechId" from-field="parameters.oldContactMechId"/> <find-by-and entity-name="ContactListParty" map="lookupMap" list="ContactListParties"/> - <iterate entry="contactlistparty" list="ContactListParties"> + <iterate list="ContactListParties" entry="contactlistparty"> <set field="contactlistparty.preferredContactMechId" from-field="parameters.contactMechId"/> <log level="info" message="Replacing preferredContactMechId: ${parameters.oldContactMechId} of the ContactList: ${contactlistparty.contactListId} with new preferredContactMechId: ${parameters.contactMechId}"/> <store-value value-field="contactlistparty"/> @@ -395,7 +395,7 @@ under the License. </if> </simple-method> <simple-method method-name="createWebSiteContactList" short-description="Add WebSite ContactList"> - <entity-and list="webSiteContactList" entity-name="WebSiteContactList"> + <entity-and entity-name="WebSiteContactList" list="webSiteContactList"> <field-map field-name="webSiteId" from-field="parameters.webSiteId"/> <field-map field-name="contactListId" from-field="parameters.contactListId"/> <field-map field-name="fromDate" from-field="parameters.fromDate"/> @@ -403,7 +403,7 @@ under the License. <if-empty field="webSiteContactList"> <make-value value-field="webSiteContactList" entity-name="WebSiteContactList"/> <set-pk-fields value-field="webSiteContactList" map="parameters"/> - <set-nonpk-fields value-field="webSiteContactList" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="webSiteContactList"/> <create-value value-field="webSiteContactList"/> <return/> </if-empty> @@ -411,18 +411,18 @@ under the License. <field-to-result field="message" result-name="errorMessage"></field-to-result> </simple-method> <simple-method method-name="updateWebSiteContactList" short-description="Update WebSite ContactList"> - <entity-and list="webSiteContactList" entity-name="WebSiteContactList"> + <entity-and entity-name="WebSiteContactList" list="webSiteContactList"> <field-map field-name="webSiteId" from-field="parameters.webSiteId"/> <field-map field-name="contactListId" from-field="parameters.contactListId"/> <field-map field-name="fromDate" from-field="parameters.fromDate"/> </entity-and> <first-from-list entry="entryWebSiteContactList" list="webSiteContactList"/> <set-pk-fields value-field="entryWebSiteContactList" map="parameters"/> - <set-nonpk-fields value-field="entryWebSiteContactList" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="entryWebSiteContactList"/> <store-value value-field="entryWebSiteContactList"/> </simple-method> <simple-method method-name="deleteWebSiteContactList" short-description="Delete WebSite ContactList"> - <entity-and list="webSiteContactList" entity-name="WebSiteContactList"> + <entity-and entity-name="WebSiteContactList" list="webSiteContactList"> <field-map field-name="webSiteId" from-field="parameters.webSiteId"/> <field-map field-name="contactListId" from-field="parameters.contactListId"/> <field-map field-name="fromDate" from-field="parameters.fromDate"/> @@ -444,13 +444,13 @@ under the License. </condition> <then> <now-timestamp field="nowTimestamp"/> - <entity-and list="contactListPartyList" entity-name="ContactListParty"> + <entity-and entity-name="ContactListParty" list="contactListPartyList"> <field-map field-name="contactListId" from-field="commEvent.contactListId"/> <field-map field-name="preferredContactMechId" from-field="commEvent.contactMechIdTo"/> <field-map field-name="partyId" from-field="commEvent.partyIdTo"/> </entity-and> <filter-list-by-date list="contactListPartyList"/> - <iterate entry="contactListParty" list="contactListPartyList"> + <iterate list="contactListPartyList" entry="contactListParty"> <set field="contactListParty.thruDate" from-field="nowTimestamp"/> <store-value value-field="contactListParty"/> </iterate> @@ -478,12 +478,12 @@ under the License. <simple-method method-name="updateCommStatusFromCommEvent" short-description="Update ContactList Comm Status from CommunicationEvent"> <entity-one entity-name="CommunicationEvent" value-field="commEvent"/> <if-not-empty field="commEvent"> - <entity-and list="clcs" entity-name="ContactListCommStatus"> + <entity-and entity-name="ContactListCommStatus" list="clcs"> <field-map field-name="communicationEventId" from-field="commEvent.parentCommEventId"/> <field-map field-name="partyId" from-field="commEvent.partyIdTo"/> <field-map field-name="contactMechId" from-field="commEvent.contactMechIdTo"/> </entity-and> - <iterate entry="commStatus" list="clcs"> + <iterate list="clcs" entry="commStatus"> <set-service-fields service-name="updateContactListCommStatus" to-map="updateStatusCtx" map="commStatus"/> <set field="updateStatusCtx.statusId" from-field="parameters.statusId"/> <call-service service-name="updateContactListCommStatus" in-map-name="updateStatusCtx"/> Modified: ofbiz/trunk/applications/marketing/widget/ContactListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListForms.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/ContactListForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/ContactListForms.xml Sat Nov 5 12:41:35 2016 @@ -515,7 +515,7 @@ under the License. odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list="listIt" result-map="result" service-name="performFind"> - <field-map from-field="parameters" field-name="inputFields"/> + <field-map field-name="inputFields" from-field="parameters"/> <field-map value="ContactList" field-name="entityName"/> <field-map field-name="viewIndex" from-field="viewIndex"/> <field-map field-name="viewSize" from-field="viewSize"/> @@ -562,8 +562,8 @@ under the License. odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list="listIt" result-map="result" service-name="performFind"> - <field-map from-field="parameters" field-name="inputFields"/> - <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="inputFields" from-field="parameters"/> + <field-map field-name="entityName" from-field="entityName"/> <field-map field-name="viewIndex" from-field="viewIndex"/> <field-map field-name="viewSize" from-field="viewSize"/> </service> Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Sat Nov 5 12:41:35 2016 @@ -467,7 +467,7 @@ under the License. <actions> <service service-name="optOutOfListFromCommEvent" result-map="optOutResult"/> <entity-one value-field="contactList" entity-name="ContactList"> - <field-map from-field="optOutResult.contactListId" field-name="contactListId"/> + <field-map field-name="contactListId" from-field="optOutResult.contactListId"/> </entity-one> <set field="contactListId" from-field="contactList.contactListId"/> <set field="screenName" from-field="contactList.optOutScreen" default-value="component://marketing/widget/ContactListScreens.xml#DefaultOptOutScreen"/> @@ -483,7 +483,7 @@ under the License. <set field="titleProperty" value="MarketingWebSiteContactList"/> <set field="contactListTabButtonItem" value="WebSiteContactList"/> <entity-one value-field="contactList" entity-name="ContactList"/> - <entity-and list="webSiteContactLists" entity-name="WebSiteContactList"> + <entity-and entity-name="WebSiteContactList" list="webSiteContactLists"> <field-map field-name="contactListId" from-field="contactList.contactListId"/> <order-by field-name="-fromDate"/> </entity-and> @@ -492,10 +492,10 @@ under the License. <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.MarketingWebSiteContactListCreate}"> - <include-form location="component://marketing/widget/ContactListForms.xml" name="CreateWebSiteContactList"/> + <include-form name="CreateWebSiteContactList" location="component://marketing/widget/ContactListForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.MarketingWebSiteContactListView} of contactListId[${parameters.contactListId}]"> - <include-form location="component://marketing/widget/ContactListForms.xml" name="ViewWebSiteContactList"/> + <include-form name="ViewWebSiteContactList" location="component://marketing/widget/ContactListForms.xml"/> </screenlet> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/marketing/widget/DataSourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/DataSourceForms.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/DataSourceForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/DataSourceForms.xml Sat Nov 5 12:41:35 2016 @@ -123,8 +123,8 @@ under the License. odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list="listIt" result-map="result" service-name="performFind"> - <field-map from-field="parameters" field-name="inputFields"/> - <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="inputFields" from-field="parameters"/> + <field-map field-name="entityName" from-field="entityName"/> <field-map field-name="viewIndex" from-field="viewIndex"/> <field-map field-name="viewSize" from-field="viewSize"/> </service> @@ -146,8 +146,8 @@ under the License. odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list="listIt" result-map="result" service-name="performFind"> - <field-map from-field="parameters" field-name="inputFields"/> - <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="inputFields" from-field="parameters"/> + <field-map field-name="entityName" from-field="entityName"/> <field-map field-name="viewIndex" from-field="viewIndex"/> <field-map field-name="viewSize" from-field="viewSize"/> </service> Modified: ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml Sat Nov 5 12:41:35 2016 @@ -184,8 +184,8 @@ under the License. odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list="listIt" result-map="result" service-name="performFind"> - <field-map from-field="requestParameters" field-name="inputFields"/> - <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="inputFields" from-field="requestParameters"/> + <field-map field-name="entityName" from-field="entityName"/> <field-map field-name="orderBy" value="-fromDate"/> <field-map field-name="viewIndex" from-field="viewIndex"/> <field-map field-name="viewSize" from-field="viewSize"/> @@ -234,8 +234,8 @@ under the License. odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list="listIt" result-map="result" service-name="performFind"> - <field-map from-field="parameters" field-name="inputFields"/> - <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="inputFields" from-field="parameters"/> + <field-map field-name="entityName" from-field="entityName"/> <field-map field-name="viewIndex" from-field="viewIndex"/> <field-map field-name="viewSize" from-field="viewSize"/> </service> @@ -261,8 +261,8 @@ under the License. odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list="listIt" result-map="result" service-name="performFind"> - <field-map from-field="parameters" field-name="inputFields"/> - <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="inputFields" from-field="parameters"/> + <field-map field-name="entityName" from-field="entityName"/> <field-map field-name="viewIndex" from-field="viewIndex"/> <field-map field-name="viewSize" from-field="viewSize"/> </service> @@ -328,8 +328,8 @@ under the License. odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list="listIt" result-map="result" service-name="performFind"> - <field-map from-field="parameters" field-name="inputFields"/> - <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="inputFields" from-field="parameters"/> + <field-map field-name="entityName" from-field="entityName"/> <field-map field-name="viewIndex" from-field="viewIndex"/> <field-map field-name="viewSize" from-field="viewSize"/> </service> Modified: ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml Sat Nov 5 12:41:35 2016 @@ -138,7 +138,7 @@ under the License. <condition-expr field-name="partyId" operator="equals" value="${partyId}"/> <order-by field-name="-entryDate"/> </entity-condition> - <entity-and list="contacts" entity-name="PartyRelationship" filter-by-date="true"> + <entity-and entity-name="PartyRelationship" list="contacts" filter-by-date="true"> <field-map field-name="partyIdFrom" from-field="partyId"/> <field-map field-name="roleTypeIdFrom" value="ACCOUNT"/> <field-map field-name="roleTypeIdTo" value="CONTACT"/> @@ -151,7 +151,7 @@ under the License. <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="CommEventTabBar"/> <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="CommSubTabBar"/> <screenlet title="${uiLabelMap.PageTitleListCommunications} ${partyId}"> - <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListCommEvents"/> + <include-form name="ListCommEvents" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/order/minilang/UpgradeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/UpgradeServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/UpgradeServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/UpgradeServices.xml Sat Nov 5 12:41:35 2016 @@ -83,13 +83,13 @@ under the License. </calculate> <store-value value-field="orderShipment"/> <get-related value-field="itemIssuance" relation-name="ItemIssuanceRole" list="itemIssuanceRoles"/> - <iterate entry="itemIssuanceRole" list="itemIssuanceRoles"> + <iterate list="itemIssuanceRoles" entry="itemIssuanceRole"> <remove-value value-field="itemIssuanceRole"/> </iterate> <entity-condition entity-name="InventoryItemDetail" list="inventoryItemDetails"> <condition-expr field-name="itemIssuanceId" operator="equals" from-field="itemIssuance.itemIssuanceId"/> </entity-condition> - <iterate entry="inventoryItemDetail" list="inventoryItemDetails"> + <iterate list="inventoryItemDetails" entry="inventoryItemDetail"> <set field="inventoryItemDetail.itemIssuanceId" from-field="nullField"/> <store-value value-field="inventoryItemDetail"/> </iterate> Modified: ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml Sat Nov 5 12:41:35 2016 @@ -44,7 +44,7 @@ This file contains basic services for Sa <call-simple-method method-name="saveSalesForecastHistory"/> <!-- return the ID --> - <field-to-result result-name="salesForecastId" field="salesForecastId"/> + <field-to-result field="salesForecastId" result-name="salesForecastId"/> </simple-method> <simple-method method-name="updateSalesForecast" short-description="Updates a sales forecast and stores a copy in sales forecast history."> @@ -68,7 +68,7 @@ This file contains basic services for Sa <make-value value-field="salesForecastHistory" entity-name="SalesForecastHistory"/> <sequenced-id sequence-name="SalesForecastHistory" field="salesForecastHistoryId"/> <set field="salesForecastHistory.salesForecastHistoryId" from-field="salesForecastHistoryId"/> - <set-nonpk-fields value-field="salesForecastHistory" map="salesForecast"/> + <set-nonpk-fields map="salesForecast" value-field="salesForecastHistory"/> <!-- get the change note from the parameters --> <set field="salesForecastHistory.changeNote" from-field="parameters.changeNote"/> @@ -92,16 +92,16 @@ This file contains basic services for Sa </call-class-method> </if-empty> </if-compare> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="createSalesOpportunityAccountRole" short-description="Create Sales Opportunity Account Role"> - <entity-and list="salesOpportunityRoles" entity-name="SalesOpportunityRole"> + <entity-and entity-name="SalesOpportunityRole" list="salesOpportunityRoles"> <field-map field-name="salesOpportunityId" from-field="parameters.salesOpportunityId"/> <field-map field-name="roleTypeId" value="ACCOUNT"/> </entity-and> <first-from-list entry="lookedUpValue" list="salesOpportunityRoles"/> - <if-compare-field operator="not-equals" field="lookedUpValue.partyId" to-field="parameters.accountPartyId"> + <if-compare-field field="lookedUpValue.partyId" operator="not-equals" to-field="parameters.accountPartyId"> <if-not-empty field="lookedUpValue"> <remove-value value-field="lookedUpValue"/> </if-not-empty> @@ -116,12 +116,12 @@ This file contains basic services for Sa </if-compare-field> </simple-method> <simple-method method-name="createSalesOpportunityLeadRole" short-description="Create Sales Opportunity Lead Role"> - <entity-and list="salesOpportunityRoles" entity-name="SalesOpportunityRole"> + <entity-and entity-name="SalesOpportunityRole" list="salesOpportunityRoles"> <field-map field-name="salesOpportunityId" from-field="parameters.salesOpportunityId"/> <field-map field-name="roleTypeId" value="LEAD"/> </entity-and> <first-from-list entry="lookedUpValue" list="salesOpportunityRoles"/> - <if-compare-field operator="not-equals" field="lookedUpValue.partyId" to-field="parameters.leadPartyId"> + <if-compare-field field="lookedUpValue.partyId" operator="not-equals" to-field="parameters.leadPartyId"> <if-not-empty field="lookedUpValue"> <remove-value value-field="lookedUpValue"/> </if-not-empty> @@ -134,7 +134,7 @@ This file contains basic services for Sa </if-compare-field> </simple-method> <simple-method method-name="findPartyInSalesOpportunityRole" short-description="find party in role specified by in parameter"> - <entity-and list="salesOpportunityRoles" entity-name="SalesOpportunityRole"> + <entity-and entity-name="SalesOpportunityRole" list="salesOpportunityRoles"> <field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/> <field-map field-name="salesOpportunityId" from-field="parameters.salesOpportunityId"/> </entity-and> Modified: ofbiz/trunk/applications/order/minilang/order/OrderDeliveryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/OrderDeliveryServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/order/OrderDeliveryServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/order/OrderDeliveryServices.xml Sat Nov 5 12:41:35 2016 @@ -34,7 +34,7 @@ under the License. </if-empty> <!-- only set statusId if hasScheduleAdminRelatedPermission --> - <set-nonpk-fields value-field="schedule" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="schedule"/> <if-has-permission permission="ORDERMGR" action="_${checkAction}"> <else> <!-- no permission, set to initial --> @@ -58,7 +58,7 @@ under the License. <!-- only set statusId if hasScheduleAdminRelatedPermission --> <set from-field="schedule.statusId" field="saveStatusId"/> - <set-nonpk-fields value-field="schedule" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="schedule"/> <if-has-permission permission="ORDERMGR" action="_${checkAction}"> <else> <!-- no permission, restore saved status --> @@ -93,7 +93,7 @@ under the License. <!-- find email addresses of all parties in SHIPMENT_CLERK roleTypeId, set as sendTo --> <set value="SHIPMENT_CLERK" field="shipmentClerkFindMap.roleTypeId"/> <find-by-and entity-name="PartyRole" map="shipmentClerkFindMap" list="shipmentClerkRoles"/> - <iterate entry="shipmentClerkRole" list="shipmentClerkRoles"> + <iterate list="shipmentClerkRoles" entry="shipmentClerkRole"> <set field="sendToPartyIdMap[shipmentClerkRole.partyId]" from-field="shipmentClerkRole.partyId"/> </iterate> @@ -102,7 +102,7 @@ under the License. <set field="sendToPartyPcmFindMap.partyId" from-field="sendToPartyId"/> <set field="sendToPartyPcmFindMap.contactMechTypeId" value="EMAIL_ADDRESS"/> <find-by-and entity-name="PartyAndContactMech" map="sendToPartyPcmFindMap" list="sendToPartyPartyAndContactMechs"/> - <iterate entry="sendToPartyPartyAndContactMech" list="sendToPartyPartyAndContactMechs"> + <iterate list="sendToPartyPartyAndContactMechs" entry="sendToPartyPartyAndContactMech"> <string-append field="sendEmailMap.sendTo" string="${sendToPartyPartyAndContactMech.infoString}" prefix=","/> </iterate> </iterate-map> Modified: ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml Sat Nov 5 12:41:35 2016 @@ -150,10 +150,10 @@ under the License. <entity-condition entity-name="ReturnAdjustment" list="returnAdjustments" distinct="true"> <condition-expr field-name="returnId" operator="equals" from-field="returnHeader.returnId"/> </entity-condition> - <iterate entry="returnItem" list="returnItems"> + <iterate list="returnItems" entry="returnItem"> <log level="verbose" message="item: ${returnItem.returnItemSeqId} ${returnItem.returnItemTypeId} [${returnItem.description}] ${returnItem.productId} ${returnItem.returnQuantity} ${returnItem.returnPrice}"/> </iterate> - <iterate entry="returnAdjustment" list="returnAdjustments"> + <iterate list="returnAdjustments" entry="returnAdjustment"> <log level="verbose" message="adjustment: ${returnAdjustment.returnItemSeqId} ${returnAdjustment.returnAdjustmentTypeId} [${returnAdjustment.description}] ${returnAdjustment.amount}"/> </iterate> --> @@ -163,7 +163,7 @@ under the License. <calculate field="returnTotalAmount"><number value="0.0"/></calculate> <!-- check them all to make sure that the return total does not exceed order total. --> - <iterate entry="returnItem" list="returnItems"> + <iterate list="returnItems" entry="returnItem"> <!-- check, for cross-ship returns, if a payment method is set to guarantee the cross-shipped item(s).. --> <if> <condition> @@ -233,7 +233,7 @@ under the License. <entity-and entity-name="ReturnAdjustment" list="returnAdjustments"> <field-map field-name="returnId" from-field="returnHeader.returnId"/> </entity-and> - <iterate entry="returnAdjustment" list="returnAdjustments"> + <iterate list="returnAdjustments" entry="returnAdjustment"> <calculate field="returnTotalAmount"> <calcop field="returnTotalAmount" operator="add"> <calcop operator="get" field="returnAdjustment.amount"/> @@ -397,7 +397,7 @@ under the License. <!-- create return adjustments for all adjustments associated with the order item --> <if-not-empty field="orderItem"> <get-related value-field="orderItem" relation-name="OrderAdjustment" list="orderAdjustments"/> - <iterate entry="orderAdjustment" list="orderAdjustments"> + <iterate list="orderAdjustments" entry="orderAdjustment"> <clear-field field="returnAdjCtx"/> <set field="returnAdjCtx.returnId" from-field="parameters.returnId"/> <set field="returnAdjCtx.returnItemSeqId" from-field="newEntity.returnItemSeqId"/> @@ -428,7 +428,7 @@ under the License. <field-map field-name="returnId" from-field="returnItem.returnId"/> <field-map field-name="returnItemSeqId" from-field="returnItem.returnItemSeqId"/> </entity-and> - <iterate entry="returnAdjustment" list="returnAdjustments"> + <iterate list="returnAdjustments" entry="returnAdjustment"> <log level="info" message="updating returnAdjustment with Id:[${returnAdjustment.returnAdjustmentId}]"/> <set-service-fields service-name="updateReturnAdjustment" map="returnAdjustment" to-map="ctx"/> <set field="ctx.originalReturnPrice" from-field="originalReturnPrice"/> @@ -441,7 +441,7 @@ under the License. <simple-method method-name="updateReturnItemsStatus" short-description="Update Return Items Status"> <set from-field="parameters.returnId" field="lookupPKMap.returnId"/> <find-by-and entity-name="ReturnItem" map="lookupPKMap" list="returnItems"/> - <iterate entry="item" list="returnItems"> + <iterate list="returnItems" entry="item"> <set field="item.statusId" from-field="parameters.statusId"/> <set-service-fields service-name="updateReturnItem" map="item" to-map="serviceInMap"/> <call-service service-name="updateReturnItem" in-map-name="serviceInMap"/> @@ -471,7 +471,7 @@ under the License. <field-map field-name="returnItemSeqId" from-field="returnItem.returnItemSeqId"/> <field-map field-name="returnId" from-field="returnItem.returnId"/> </entity-and> - <iterate entry="returnAdjustment" list="returnAdjustments"> + <iterate list="returnAdjustments" entry="returnAdjustment"> <set field="removeCtx.returnAdjustmentId" from-field="returnAdjustment.returnAdjustmentId"/> <call-service service-name="removeReturnAdjustment" in-map-name="removeCtx"/> </iterate> @@ -589,7 +589,7 @@ under the License. <!-- get primary information from the order header --> <entity-one entity-name="OrderHeader" value-field="orderHeader"> - <field-map from-field="parameters.orderId" field-name="orderId"/> + <field-map field-name="orderId" from-field="parameters.orderId"/> </entity-one> <set field="returnHeaderTypeId" from-field="parameters.returnHeaderTypeId"/> <if-compare field="returnHeaderTypeId" operator="equals" value="CUSTOMER_RETURN"> @@ -648,7 +648,7 @@ under the License. </if-empty> <!-- create the return items --> - <iterate entry="orderItem" list="orderItems"> + <iterate list="orderItems" entry="orderItem"> <set from-field="returnId" field="newItemCtx.returnId"/> <set from-field="parameters.returnReasonId" field="newItemCtx.returnReasonId"/> <set from-field="parameters.returnTypeId" field="newItemCtx.returnTypeId"/> @@ -678,15 +678,15 @@ under the License. <select-field field-name="productTypeId"/> </entity-one> <entity-one entity-name="ReturnItemTypeMap" value-field="returnItemTypeMapping"> - <field-map from-field="product.productTypeId" field-name="returnItemMapKey"/> - <field-map from-field="returnHeaderTypeId" field-name="returnHeaderTypeId"/> + <field-map field-name="returnItemMapKey" from-field="product.productTypeId"/> + <field-map field-name="returnHeaderTypeId" from-field="returnHeaderTypeId"/> </entity-one> <else> <!-- if not, try the ReturnItemTypeMap, but this may not actually work, so log a warning --> <log level="warning" message="Trying to find returnItemtype from ReturnItemTypeMap with orderItemtypeId [${orderItem.orderItemTypeId}] for order item [${orderItem}]"/> <entity-one entity-name="ReturnItemTypeMap" value-field="returnItemTypeMapping"> - <field-map from-field="orderItemTypeId" field-name="returnItemMapKey"/> - <field-map from-field="returnHeaderTypeId" field-name="returnHeaderTypeId"/> + <field-map field-name="returnItemMapKey" from-field="orderItemTypeId"/> + <field-map field-name="returnHeaderTypeId" from-field="returnHeaderTypeId"/> </entity-one> </else> </if-compare> @@ -722,7 +722,7 @@ under the License. <condition-expr field-name="orderItemSeqId" operator="equals" value="_NA_"/> </condition-list> </entity-condition> - <iterate entry="orderAdjustment" list="orderAdjustments"> + <iterate list="orderAdjustments" entry="orderAdjustment"> <clear-field field="returnAdjCtx"/> <set from-field="orderAdjustment.orderAdjustmentId" field="returnAdjCtx.orderAdjustmentId"/> <set from-field="returnId" field="returnAdjCtx.returnId"/> @@ -806,7 +806,7 @@ under the License. <entity-condition entity-name="ReturnItem" list="returnItems" distinct="true"> <condition-expr field-name="returnId" operator="equals" from-field="parameters.returnId"/> </entity-condition> - <iterate entry="returnItem" list="returnItems"> + <iterate list="returnItems" entry="returnItem"> <set field="returnItemMap.returnId" from-field="parameters.returnId"/> <set field="returnItemMap.returnItemSeqId" from-field="returnItem.returnItemSeqId"/> <set field="returnItemMap.statusId" value="RETURN_CANCELLED"/> @@ -1101,7 +1101,7 @@ under the License. <find-by-and entity-name="ReturnContactMech" map="createReturnContactMechMap" list="returnContactMechList"/> <!-- If returnContactMechList value is null then create new entry in ReturnContactMech entity--> <if-empty field="returnContactMechList"> - <if-compare value="SHIPPING_LOCATION" field="parameters.contactMechPurposeTypeId" operator="equals"> + <if-compare field="parameters.contactMechPurposeTypeId" operator="equals" value="SHIPPING_LOCATION"> <set field="returnHeader.originContactMechId" from-field="createReturnContactMechMap.contactMechId"/> <store-value value-field="returnHeader"/> </if-compare> @@ -1159,7 +1159,7 @@ under the License. <condition-expr field-name="productTypeId" operator="equals" value="ASSET_USAGE_OUT_IN"/> </condition-list> </entity-condition> - <iterate entry="orderItem" list="orderItems"> + <iterate list="orderItems" entry="orderItem"> <set field="createReturnCtx.productId" from-field="orderItem.productId"/> <set field="createReturnCtx.orderItemSeqId" from-field="orderItem.orderItemSeqId"/> <set field="createReturnCtx.description" from-field="orderItem.itemDescription"/> Modified: ofbiz/trunk/applications/order/minilang/order/OrderServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/OrderServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/order/OrderServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/order/OrderServices.xml Sat Nov 5 12:41:35 2016 @@ -114,8 +114,8 @@ under the License. <simple-method method-name="getProductFacilityAndQuantities" short-description="finds ProductFacility and QOH, ATP inventory for an inventoryItem"> <!-- Get the ProductFacility for the minimum stock level --> <entity-one entity-name="ProductFacility" value-field="productFacility"> - <field-map from-field="inventoryItem.productId" field-name="productId"/> - <field-map from-field="inventoryItem.facilityId" field-name="facilityId"/> + <field-map field-name="productId" from-field="inventoryItem.productId"/> + <field-map field-name="facilityId" from-field="inventoryItem.facilityId"/> </entity-one> <!-- Get the product's total quantityOnHand in the facility --> @@ -146,7 +146,7 @@ under the License. </condition> <then> <entity-one entity-name="ProductStore" value-field="productStore"> - <field-map from-field="order.productStoreId" field-name="productStoreId"/> + <field-map field-name="productStoreId" from-field="order.productStoreId"/> </entity-one> <set from-field="productStore.requirementMethodEnumId" field="requirementMethodId"/> </then> @@ -180,7 +180,7 @@ under the License. <if-not-empty field="parameters.itemIssuanceId"> <entity-one entity-name="ItemIssuance" auto-field-map="true" value-field="itemIssuance"/> <entity-one entity-name="InventoryItem" value-field="inventoryItem"> - <field-map from-field="itemIssuance.inventoryItemId" field-name="inventoryItemId"/> + <field-map field-name="inventoryItemId" from-field="itemIssuance.inventoryItemId"/> </entity-one> <else> <entity-one entity-name="InventoryItem" auto-field-map="true" value-field="inventoryItem"/> @@ -325,7 +325,7 @@ under the License. <condition-expr field-name="statusId" operator="not-equals" value="REQ_REJECTED"/> </condition-list> </entity-condition> - <iterate entry="requirement" list="requirements"> + <iterate list="requirements" entry="requirement"> <calculate field="existingRequirementTotal"> <calcop operator="get" field="existingRequirementTotal"/> <calcop operator="get" field="requirement.quantity"/> @@ -356,7 +356,7 @@ under the License. <check-errors/> <entity-and entity-name="ProductFacility" list="products"> - <field-map from-field="parameters.facilityId" field-name="facilityId"/> + <field-map field-name="facilityId" from-field="parameters.facilityId"/> </entity-and> <iterate list="products" entry="productFacility"> @@ -545,7 +545,7 @@ under the License. </add-error> </if-empty> <check-errors/> - <set-nonpk-fields value-field="orderHeader" map="parameters" set-if-null="false"/> + <set-nonpk-fields map="parameters" value-field="orderHeader"/> set-if-null="false"/> <store-value value-field="orderHeader"/> </simple-method> @@ -684,8 +684,8 @@ under the License. <set from-field="parameters.orderId" field="inputMap.orderId"/> <set from-field="parameters.contactMechPurposeTypeId" field="inputMap.contactMechPurposeTypeId"/> <set from-field="parameters.contactMechId" field="inputMap.contactMechId"/> - <if-compare value="SHIPPING_LOCATION" field="parameters.contactMechPurposeTypeId" operator="equals"> - <if-compare value="parameters.oldContactMechId" field="parameters.contactMechId" operator="not-equals"> + <if-compare field="parameters.contactMechPurposeTypeId" operator="equals" value="SHIPPING_LOCATION"> + <if-compare field="parameters.contactMechId" operator="not-equals" value="parameters.oldContactMechId"> <set field="orderItemShipGroupMap.orderId" from-field="parameters.orderId"/> <set field="orderItemShipGroupMap.contactMechId" from-field="parameters.oldContactMechId"/> <find-by-and entity-name="OrderItemShipGroup" list="shipGroupList" map="orderItemShipGroupMap"/> @@ -782,7 +782,7 @@ under the License. </check-permission> <check-errors/> <entity-one entity-name="OrderHeaderNote" value-field="orderHeaderNote"/> - <set-nonpk-fields value-field="orderHeaderNote" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="orderHeaderNote"/> <store-value value-field="orderHeaderNote"/> </simple-method> @@ -1023,7 +1023,7 @@ under the License. <if-compare field="keepAddressBook" operator="equals" value="Y"> <make-value entity-name="PostalAddress" value-field="newValue"/> <set-pk-fields value-field="newValue" map="billToAddressCtx"/> - <set-nonpk-fields value-field="newValue" map="billToAddressCtx"/> + <set-nonpk-fields map="billToAddressCtx" value-field="newValue"/> <entity-one entity-name="PostalAddress" value-field="oldValue" auto-field-map="false"> <field-map field-name="contactMechId" from-field="billToAddressCtx.contactMechId"/> </entity-one> @@ -1119,11 +1119,11 @@ under the License. </entity-and> <first-from-list list="orderSuppliers" entry="orderSupplier"/> <entity-and list="supplierProducts" entity-name="SupplierProduct"> - <field-map from-field="parameters.productId" field-name="productId"/> - <field-map from-field="orderSupplier.partyId" field-name="partyId"/> - <field-map from-field="nullField" field-name="availableThruDate"/> + <field-map field-name="productId" from-field="parameters.productId"/> + <field-map field-name="partyId" from-field="orderSupplier.partyId"/> + <field-map field-name="availableThruDate" from-field="nullField"/> </entity-and> - <iterate entry="supplierProduct" list="supplierProducts"> + <iterate list="supplierProducts" entry="supplierProduct"> <now-timestamp field="nowTimestamp"/> <if-not-empty field="parameters.orderCurrencyUnitPrice"> <if-compare-field field="parameters.orderCurrencyUnitPrice" operator="not-equals" to-field="supplierProduct.lastPrice" type="BigDecimal"> @@ -1159,7 +1159,7 @@ under the License. <entity-and entity-name="OrderItem" list="orderItems"> <field-map field-name="orderId" from-field="parameters.orderId"/> </entity-and> - <iterate entry="orderItem" list="orderItems"> + <iterate list="orderItems" entry="orderItem"> <iterate-map key="orderItemSeqId" value="unitPrice" map="parameters.itemPriceMap"> <if> <condition> @@ -1174,11 +1174,11 @@ under the License. <then> <set field="orderItem.unitPrice" from-field="unitPrice" type="BigDecimal"/> <entity-and list="supplierProducts" entity-name="SupplierProduct"> - <field-map from-field="orderItem.productId" field-name="productId"/> - <field-map from-field="parameters.supplierPartyId" field-name="partyId"/> - <field-map from-field="nullField" field-name="availableThruDate"/> + <field-map field-name="productId" from-field="orderItem.productId"/> + <field-map field-name="partyId" from-field="parameters.supplierPartyId"/> + <field-map field-name="availableThruDate" from-field="nullField"/> </entity-and> - <iterate entry="supplierProduct" list="supplierProducts"> + <iterate list="supplierProducts" entry="supplierProduct"> <now-timestamp field="nowTimestamp"/> <if> <condition> @@ -1206,9 +1206,9 @@ under the License. <else> <iterate entry="orderItem" list="parameters.orderItems"> <entity-and list="supplierProducts" entity-name="SupplierProduct"> - <field-map from-field="orderItem.productId" field-name="productId"/> - <field-map from-field="parameters.supplierPartyId" field-name="partyId"/> - <field-map from-field="nullField" field-name="availableThruDate"/> + <field-map field-name="productId" from-field="orderItem.productId"/> + <field-map field-name="partyId" from-field="parameters.supplierPartyId"/> + <field-map field-name="availableThruDate" from-field="nullField"/> </entity-and> <iterate entry="supplierProduct" list="supplierProducts"> <now-timestamp field="nowTimestamp"/> @@ -1243,11 +1243,11 @@ under the License. <condition-expr field-name="statusId" operator="not-equals" value="ORDER_COMPLETED"/> </condition-list> </entity-condition> - <iterate entry="currentOrder" list="orders"> + <iterate list="orders" entry="currentOrder"> <entity-and list="orderItems" entity-name="OrderItem"> <field-map field-name="orderId" from-field="currentOrder.orderId"/> </entity-and> - <iterate entry="currentOrderItem" list="orderItems"> + <iterate list="orderItems" entry="currentOrderItem"> <set field="backOrderDate" from-field="currentOrderItem.cancelBackOrderDate" type="Timestamp"/> <if> <condition> @@ -1320,7 +1320,7 @@ under the License. <simple-method method-name="productAvailabalityByFacility" short-description="Calculate ATP and Qoh According For each facility"> <set field="facilityMap.ownerPartyId" from-field="parameters.ownerPartyId"/> <find-by-and map="facilityMap" list="facilityList" entity-name="Facility"/> - <iterate entry="facility" list="facilityList"> + <iterate list="facilityList" entry="facility"> <set field="getInventoryAvailableByFacilityMap.facilityId" from-field="facility.facilityId"/> <set field="getInventoryAvailableByFacilityMap.productId" from-field="parameters.productId"/> <call-service service-name="getInventoryAvailableByFacility" in-map-name="getInventoryAvailableByFacilityMap"> @@ -1343,7 +1343,7 @@ under the License. <entity-one value-field="orderPaymentPreMap" entity-name="OrderPaymentPreference"> <field-map field-name="orderPaymentPreferenceId" from-field="paymentMap.paymentPreferenceId"/> </entity-one> - <entity-and list="orderItemBilList" entity-name="OrderItemBilling"> + <entity-and entity-name="OrderItemBilling" list="orderItemBilList"> <field-map field-name="orderId" from-field="orderPaymentPreMap.orderId"/> <order-by field-name="invoiceId"/> </entity-and> Modified: ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml Sat Nov 5 12:41:35 2016 @@ -428,7 +428,7 @@ under the License. <fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunRemoveQuoteItem"/> </check-permission> <check-errors/> - <entity-and list="quoteTermList" entity-name="QuoteTerm"> + <entity-and entity-name="QuoteTerm" list="quoteTermList"> <field-map field-name="quoteId" from-field="parameters.quoteId"/> <field-map field-name="quoteItemSeqId" from-field="parameters.quoteItemSeqId"/> </entity-and> @@ -604,7 +604,7 @@ under the License. <make-value value-field="lookupRequestRole" entity-name="CustRequestParty"/> <set from-field="parameters.custRequestId" field="lookupRequestRole.custRequestId"/> <find-by-and entity-name="CustRequestParty" map="lookupRequestRole" list="roles"/> - <iterate entry="role" list="roles"> + <iterate list="roles" entry="role"> <clear-field field="cqrContext"/> <set from-field="quoteId" field="cqrContext.quoteId"/> <set from-field="role.partyId" field="cqrContext.partyId"/> Modified: ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml (original) +++ ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml Sat Nov 5 12:41:35 2016 @@ -55,7 +55,7 @@ </if-not-empty> <set field="count1" value="-1"/> - <iterate entry="saleschannel" list="saleschannels"> + <iterate list="saleschannels" entry="saleschannel"> <calculate field="count1"> <calcop field="count1" operator="add"> <number value="1"/> @@ -66,7 +66,7 @@ </iterate> <set field="count2" value="0"/> - <iterate entry="countdate" list="countdates"> + <iterate list="countdates" entry="countdate"> <set field="checksalesChannel1" from-field="salesChannelMap.salesChannelList[count2]"/> <if-compare-field field="countdate.salesChannelEnumId" to-field="checksalesChannel1" operator="equals"> <calculate field="countdateMap.countsalesChannel[count2]"> @@ -91,7 +91,7 @@ <set field="count3" value="-1"/> <set field="count4" value="0"/> - <iterate entry="starschema" list="starschemas"> + <iterate list="starschemas" entry="starschema"> <calculate field="count3"> <calcop field="count3" operator="add"> <number value="1"/> Modified: ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml Sat Nov 5 12:41:35 2016 @@ -134,7 +134,7 @@ under the License. <!-- check for related workefforts ...and when no time recorded cancel these too --> <get-related value-field="custRequest" relation-name="CustRequestWorkEffort" list="workEfforts"/> <if-not-empty field="workEfforts"> - <iterate entry="workEffort" list="workEfforts"> + <iterate list="workEfforts" entry="workEffort"> <entity-one entity-name="WorkEffort" value-field="lowInfo"> <field-map field-name="workEffortId" from-field="workEffort.workEffortId"/> </entity-one> @@ -171,7 +171,7 @@ under the License. <!-- if story is provided update the first item of the customer request --> <if-not-empty field="parameters.story"> - <entity-and list="custRequestItems" entity-name="CustRequestItem"> + <entity-and entity-name="CustRequestItem" list="custRequestItems"> <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> </entity-and> <if-not-empty field="custRequestItems"> @@ -312,8 +312,8 @@ under the License. <simple-method method-name="updateCustRequestNote" short-description="Update CustRequest Note"> <entity-one entity-name="CustRequestNote" value-field="lookedUpValue"/> <entity-one entity-name="NoteData" value-field="lookedUpValueForNoteData"/> - <set-nonpk-fields value-field="lookedUpValueForNoteData" map="parameters"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValueForNoteData"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> <store-value value-field="lookedUpValue"/> <store-value value-field="lookedUpValueForNoteData"/> <call-simple-method method-name="updateCustRequestLastModifiedDate"/> @@ -477,12 +477,12 @@ under the License. <if-compare operator="not-equals" value="CRQ_DRAFT" field="parameters.statusId"> <if-empty field="custRequest.fromPartyId"> <add-error> - <fail-property property="OrderCustRequestShouldHaveFromPartyIdIfNotDraft" resource="OrderUiLabels"/> + <fail-property resource="OrderUiLabels" property="OrderCustRequestShouldHaveFromPartyIdIfNotDraft"/> </add-error> </if-empty> <if-empty field="custRequest.custRequestName"> <add-error> - <fail-property property="OrderCustRequestShouldHaveCustRequestNameIfNotDraft" resource="OrderUiLabels"/> + <fail-property resource="OrderUiLabels" property="OrderCustRequestShouldHaveCustRequestNameIfNotDraft"/> </add-error> </if-empty> </if-compare> @@ -541,7 +541,7 @@ under the License. <entity-and entity-name="CommEventContentAssoc" list="custRequestContents"> <field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/> </entity-and> - <iterate entry="custRequestContent" list="custRequestContents"> + <iterate list="custRequestContents" entry="custRequestContent"> <set field="reqContent.custRequestId" from-field="parameters.custRequestId"/> <set field="reqContent.contentId" from-field="custRequestContent.contentId"/> <call-service service-name="createCustRequestContent" in-map-name="reqContent"/> Modified: ofbiz/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml (original) +++ ofbiz/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml Sat Nov 5 12:41:35 2016 @@ -114,7 +114,7 @@ under the License. </simple-method> <simple-method method-name="createShoppingListItem" short-description="Create a ShoppingList Item" login-required="false"> - <entity-and list="shoppingListItems" entity-name="ShoppingListItem"> + <entity-and entity-name="ShoppingListItem" list="shoppingListItems"> <field-map field-name="productId" from-field="parameters.productId"></field-map> <field-map field-name="shoppingListId" from-field="parameters.shoppingListId"></field-map> </entity-and> @@ -138,7 +138,7 @@ under the License. <entity-one entity-name="Product" value-field="product"/> <if-empty field="product"> - <add-error> <fail-property property="ProductErrorProductNotFound" resource="ProductUiLabels"/> </add-error> + <add-error> <fail-property resource="ProductUiLabels" property="ProductErrorProductNotFound"/> </add-error> <check-errors/> </if-empty> <make-value value-field="newEntity" entity-name="ShoppingListItem"/> @@ -237,7 +237,7 @@ under the License. </entity-and> <set field="totalPrice" type="BigDecimal" value="0.0"/> - <iterate entry="shoppingListItem" list="shoppingListItems"> + <iterate list="shoppingListItems" entry="shoppingListItem"> <entity-one entity-name="Product" value-field="product" use-cache="true" auto-field-map="false"> <field-map field-name="productId" from-field="shoppingListItem.productId"/> </entity-one> @@ -265,7 +265,7 @@ under the License. <field-map field-name="parentShoppingListId" from-field="parameters.shoppingListId"/> <field-map field-name="partyId" from-field="userLogin.partyId"/> </entity-and> - <iterate entry="childshoppingList" list="childshoppingLists"> + <iterate list="childshoppingLists" entry="childshoppingList"> <map-to-map map="calcPriceInBaseMap" to-map="calcChildPriceInMap"/> <set from-field="childshoppingList.shoppingListId" field="calcChildPriceInMap.shoppingListId"/> <call-service service-name="calculateShoppingListDeepTotalPrice" in-map-name="calcChildPriceInMap"> Modified: ofbiz/trunk/applications/order/minilang/test/QuoteTests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/test/QuoteTests.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/minilang/test/QuoteTests.xml (original) +++ ofbiz/trunk/applications/order/minilang/test/QuoteTests.xml Sat Nov 5 12:41:35 2016 @@ -109,7 +109,7 @@ under the License. </and> </assert> <!-- Confirm that a matching WorkEffort was created --> - <entity-and list="workEfforts" entity-name="WorkEffort"> + <entity-and entity-name="WorkEffort" list="workEfforts"> <field-map field-name="workEffortId" from-field="serviceResult.workEffortId"/> <field-map field-name="currentStatusId" from-field="serviceCtx.currentStatusId"/> <field-map field-name="workEffortName" from-field="serviceCtx.workEffortName"/> @@ -140,7 +140,7 @@ under the License. <results-to-map map-name="serviceResult"/> </call-service> <!-- Confirm that a matching Quoteterm was created --> - <entity-and list="quoteTermList" entity-name="QuoteTerm"> + <entity-and entity-name="QuoteTerm" list="quoteTermList"> <field-map field-name="termTypeId" from-field="serviceCtx.termTypeId"/> <field-map field-name="quoteId" from-field="serviceCtx.quoteId"/> <field-map field-name="quoteItemSeqId" from-field="serviceCtx.quoteItemSeqId"/> Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml Sat Nov 5 12:41:35 2016 @@ -78,16 +78,16 @@ under the License. <get-related-one value-field="custRequest" relation-name="CurrencyUom" to-value-field="currency"/> <get-related-one value-field="custRequest" relation-name="ProductStore" to-value-field="store"/> <get-related-one value-field="custRequest" relation-name="FulfillContactMech" to-value-field="fulfillContactMech"/> - <entity-and list="requestWorkEfforts" entity-name="CustRequestAndWorkEffort"> + <entity-and entity-name="CustRequestAndWorkEffort" list="requestWorkEfforts"> <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> </entity-and> <get-related value-field="custRequest" relation-name="CustRequestParty" list="requestParties"/> <set field="orderBy[]" value="sequenceNum"/> <get-related value-field="custRequest" relation-name="CustRequestItem" list="custRequestItems" order-by-list="orderBy"/> - <entity-and list="commEvents" entity-name="CommunicationEventAndCustRequest"> + <entity-and entity-name="CommunicationEventAndCustRequest" list="commEvents"> <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> </entity-and> - <entity-and list="notes" entity-name="CustRequestItemNoteView"> + <entity-and entity-name="CustRequestItemNoteView" list="notes"> <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> <order-by field-name="custRequestItemSeqId"/> </entity-and> @@ -225,7 +225,7 @@ under the License. <set field="custRequestId" from-field="parameters.custRequestId"/> <entity-one entity-name="CustRequest" value-field="custRequest"/> <entity-and entity-name="CustRequestParty" list="custRequestParties"> - <field-map from-field="custRequestId" field-name="custRequestId"/> + <field-map field-name="custRequestId" from-field="custRequestId"/> </entity-and> </actions> <widgets> @@ -252,7 +252,7 @@ under the License. <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <entity-one entity-name="CustRequest" value-field="custRequest"/> <entity-and entity-name="CustRequestItem" list="custRequestItems"> - <field-map from-field="custRequestId" field-name="custRequestId"/> + <field-map field-name="custRequestId" from-field="custRequestId"/> <order-by field-name="sequenceNum"/> <order-by field-name="custRequestItemSeqId"/> </entity-and> @@ -343,8 +343,8 @@ under the License. <entity-one entity-name="CustRequest" value-field="custRequest"/> <entity-one entity-name="CustRequestItem" value-field="custRequestItem"/> <entity-and entity-name="RequirementCustRequestView" list="custRequestRequirements"> - <field-map from-field="custRequestItem.custRequestId" field-name="custRequestId"/> - <field-map from-field="custRequestItem.custRequestItemSeqId" field-name="custRequestItemSeqId"/> + <field-map field-name="custRequestId" from-field="custRequestItem.custRequestId"/> + <field-map field-name="custRequestItemSeqId" from-field="custRequestItem.custRequestItemSeqId"/> </entity-and> </actions> <widgets> @@ -375,8 +375,8 @@ under the License. <entity-one entity-name="CustRequest" value-field="custRequest"/> <entity-one entity-name="CustRequestItem" value-field="custRequestItem"/> <entity-and entity-name="QuoteItem" list="quotes"> - <field-map from-field="custRequestItem.custRequestId" field-name="custRequestId"/> - <field-map from-field="custRequestItem.custRequestItemSeqId" field-name="custRequestItemSeqId"/> + <field-map field-name="custRequestId" from-field="custRequestItem.custRequestId"/> + <field-map field-name="custRequestItemSeqId" from-field="custRequestItem.custRequestItemSeqId"/> </entity-and> <script location="component://order/groovyScripts/request/SetRequestQuote.groovy"/> </actions> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml Sat Nov 5 12:41:35 2016 @@ -122,7 +122,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleShoppingList}"/> <set field="partyId" from-field="requestParameters.partyId"/> <entity-and entity-name="ShoppingList" list="customershoppinglists"> - <field-map from-field="partyId" field-name="partyId"/> + <field-map field-name="partyId" from-field="partyId"/> </entity-and> </actions> <widgets> @@ -142,7 +142,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleShoppingListItem}"/> <set field="shoppingListId" from-field="requestParameters.shoppingListId"/> <entity-and entity-name="ShoppingListItem" list="shoppinglistitems"> - <field-map from-field="shoppingListId" field-name="shoppingListId"/> + <field-map field-name="shoppingListId" from-field="shoppingListId"/> </entity-and> </actions> <widgets> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml Sat Nov 5 12:41:35 2016 @@ -191,7 +191,7 @@ under the License. </condition> <widgets> <screenlet id="ReturnStatusHistoryPanel" title="${uiLabelMap.OrderOrderReturn} ${uiLabelMap.CommonStatusHistory}" collapsible="true"> - <include-form location="component://order/widget/ordermgr/ReturnForms.xml" name="ReturnStatusHistory"/> + <include-form name="ReturnStatusHistory" location="component://order/widget/ordermgr/ReturnForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -219,7 +219,7 @@ under the License. </condition> <widgets> <screenlet id="ReturnTypeHistoryPanel" title="${uiLabelMap.OrderReturnTypeHistory}" collapsible="true"> - <include-form location="component://order/widget/ordermgr/ReturnForms.xml" name="ReturnTypeHistory"/> + <include-form name="ReturnTypeHistory" location="component://order/widget/ordermgr/ReturnForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -247,7 +247,7 @@ under the License. </condition> <widgets> <screenlet id="ReturnReasonHistoryPanel" title="${uiLabelMap.OrderReturnReasonHistory}" collapsible="true"> - <include-form location="component://order/widget/ordermgr/ReturnForms.xml" name="ReturnReasonHistory"/> + <include-form name="ReturnReasonHistory" location="component://order/widget/ordermgr/ReturnForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -275,7 +275,7 @@ under the License. </condition> <widgets> <screenlet id="ReturnQuantityHistoryPanel" title="${uiLabelMap.OrderReturnQtyHistory}" collapsible="true"> - <include-form location="component://order/widget/ordermgr/ReturnForms.xml" name="ReturnAndReceivedQuantityHistory"/> + <include-form name="ReturnAndReceivedQuantityHistory" location="component://order/widget/ordermgr/ReturnForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -303,7 +303,7 @@ under the License. </condition> <widgets> <screenlet id="ReceivedQuantityHistoryPanel" title="${uiLabelMap.OrderReceivedQtyHistory}" collapsible="true"> - <include-form location="component://order/widget/ordermgr/ReturnForms.xml" name="ReturnAndReceivedQuantityHistory"/> + <include-form name="ReturnAndReceivedQuantityHistory" location="component://order/widget/ordermgr/ReturnForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -331,7 +331,7 @@ under the License. </condition> <widgets> <screenlet id="ReturnPriceHistoryPanel" title="${uiLabelMap.OrderReturnPriceHistory}" collapsible="true"> - <include-form location="component://order/widget/ordermgr/ReturnForms.xml" name="ReturnPriceHistory"/> + <include-form name="ReturnPriceHistory" location="component://order/widget/ordermgr/ReturnForms.xml"/> </screenlet> </widgets> <fail-widgets> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Sat Nov 5 12:41:35 2016 @@ -489,7 +489,7 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.OrderShipmentMethodHistory}"> - <include-form location="component://order/widget/ordermgr/OrderForms.xml" name="OrderShipmentMethodHistory"/> + <include-form name="OrderShipmentMethodHistory" location="component://order/widget/ordermgr/OrderForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -509,7 +509,7 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.OrderUnitPriceHistory}"> - <include-form location="component://order/widget/ordermgr/OrderForms.xml" name="OrderUnitPriceHistory"/> + <include-form name="OrderUnitPriceHistory" location="component://order/widget/ordermgr/OrderForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -529,7 +529,7 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.OrderQuantityHistory}"> - <include-form location="component://order/widget/ordermgr/OrderForms.xml" name="OrderQuantityHistory"/> + <include-form name="OrderQuantityHistory" location="component://order/widget/ordermgr/OrderForms.xml"/> </screenlet> </widgets> <fail-widgets> Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Sat Nov 5 12:41:35 2016 @@ -249,7 +249,7 @@ under the License. <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> <entity-and entity-name="QuoteRole" list="quoteRoles"> - <field-map from-field="quote.quoteId" field-name="quoteId"/> + <field-map field-name="quoteId" from-field="quote.quoteId"/> </entity-and> </actions> @@ -308,7 +308,7 @@ under the License. <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> <entity-and entity-name="QuoteItem" list="quoteItems"> - <field-map from-field="quote.quoteId" field-name="quoteId"/> + <field-map field-name="quoteId" from-field="quote.quoteId"/> <order-by field-name="quoteItemSeqId"/> </entity-and> @@ -377,7 +377,7 @@ under the License. <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> <entity-and entity-name="QuoteAttribute" list="quoteAttributes"> - <field-map from-field="quote.quoteId" field-name="quoteId"/> + <field-map field-name="quoteId" from-field="quote.quoteId"/> </entity-and> </actions> <widgets> @@ -432,7 +432,7 @@ under the License. <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> <entity-and entity-name="QuoteCoefficient" list="quoteCoefficients"> - <field-map from-field="quote.quoteId" field-name="quoteId"/> + <field-map field-name="quoteId" from-field="quote.quoteId"/> </entity-and> </actions> <widgets> @@ -490,13 +490,13 @@ under the License. <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> <entity-and entity-name="QuoteItem" list="quoteItems"> - <field-map from-field="quote.quoteId" field-name="quoteId"/> + <field-map field-name="quoteId" from-field="quote.quoteId"/> <order-by field-name="custRequestId"/> <order-by field-name="custRequestItemSeqId"/> <order-by field-name="quoteItemSeqId"/> </entity-and> <entity-and entity-name="QuoteCoefficient" list="quoteCoefficients"> - <field-map from-field="quote.quoteId" field-name="quoteId"/> + <field-map field-name="quoteId" from-field="quote.quoteId"/> </entity-and> <set from-field="quote.quoteId" field="quoteId"/> @@ -533,7 +533,7 @@ under the License. <set field="quoteId" from-field="parameters.quoteId"/> <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> <entity-and entity-name="QuoteAdjustment" list="quoteAdjustments"> - <field-map from-field="quote.quoteId" field-name="quoteId"/> + <field-map field-name="quoteId" from-field="quote.quoteId"/> </entity-and> </actions> <widgets> @@ -594,13 +594,13 @@ under the License. <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/> <entity-and entity-name="QuoteItem" list="quoteItems"> - <field-map from-field="quote.quoteId" field-name="quoteId"/> + <field-map field-name="quoteId" from-field="quote.quoteId"/> <order-by field-name="custRequestId"/> <order-by field-name="custRequestItemSeqId"/> <order-by field-name="quoteItemSeqId"/> </entity-and> <entity-and entity-name="QuoteCoefficient" list="quoteCoefficients"> - <field-map from-field="quote.quoteId" field-name="quoteId"/> + <field-map field-name="quoteId" from-field="quote.quoteId"/> </entity-and> <set from-field="quote.quoteId" field="quoteId"/> @@ -745,7 +745,7 @@ under the License. <not><if-empty field="quoteItems"/></not> </condition> <actions> - <entity-and list="quoteItemList" entity-name="QuoteItem"> + <entity-and entity-name="QuoteItem" list="quoteItemList"> <field-map field-name="quoteId" from-field="parameters.quoteId"/> </entity-and> <entity-one value-field="quote" entity-name="Quote">
