svn commit: r1768219 [7/18] - in /ofbiz/trunk: applications/accounting/minilang/ applications/accounting/minilang/admin/ applications/accounting/minilang/agreement/ applications/accounting/minilang/budget/ applications/accounting/minilang/finaccount/ a...

[diveshdutta]

Modified: ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/quote/QuoteServices.xml Sat Nov  5 14:14:04 2016
@@ -121,7 +121,7 @@ under the License.
         <!-- create a non existing ID; if we have a productStoreId do it for the payToPartyId of that ProductStore according to PartyAcctgPreferences, otherwise get from standard sequence -->
         <entity-one entity-name="ProductStore" value-field="productStore"/>
         <if-not-empty field="productStore.payToPartyId">
-            <set-service-fields service-name="getNextQuoteId" to-map="getNextQuoteIdContext" map="parameters"/>
+            <set-service-fields service-name="getNextQuoteId" map="parameters" to-map="getNextQuoteIdContext"/>/>
             <set field="getNextQuoteIdContext.partyId" from-field="productStore.payToPartyId"/>
             <call-service service-name="getNextQuoteId" in-map-name="getNextQuoteIdContext">
                 <result-to-field result-name="quoteId" field="newEntity.quoteId"/>
@@ -197,7 +197,7 @@ under the License.
         <check-errors/>
         <entity-one entity-name="Quote" value-field="quote" auto-field-map="true"/>
         <check-errors/>
-        <set-service-fields service-name="createQuote" to-map="createQuoteInMap" map="quote"/>
+        <set-service-fields service-name="createQuote" map="quote" to-map="createQuoteInMap"/>/>
         <clear-field field="createQuoteInMap.statusId"/>
         <call-service service-name="createQuote" in-map-name="createQuoteInMap">
             <result-to-field result-name="quoteId" field="quoteIdTo"/>
@@ -207,7 +207,7 @@ under the License.
             <get-related value-field="quote" relation-name="QuoteItem" list="quoteItems"/>
             <iterate list="quoteItems" entry="quoteItem">
                 <clear-field field="createQuoteItemInMap"/>
-                <set-service-fields service-name="createQuoteItem" to-map="createQuoteItemInMap" map="quoteItem"/>
+                <set-service-fields service-name="createQuoteItem" map="quoteItem" to-map="createQuoteItemInMap"/>/>
                 <set from-field="quoteIdTo" field="createQuoteItemInMap.quoteIdTo"/>
                 <set from-field="parameters.copyQuoteAdjustments" field="createQuoteItemInMap.copyQuoteAdjustments"/>
                 <call-service service-name="copyQuoteItem" in-map-name="createQuoteItemInMap"/>
@@ -219,7 +219,7 @@ under the License.
             <iterate list="quoteAdjustments" entry="quoteAdjustment">
                 <if-empty field="quoteAdjustment.quoteItemSeqId">
                     <clear-field field="createQuoteAdjustmentInMap"/>
-                    <set-service-fields service-name="createQuoteAdjustment" to-map="createQuoteAdjustmentInMap" map="quoteAdjustment"/>
+                    <set-service-fields service-name="createQuoteAdjustment" map="quoteAdjustment" to-map="createQuoteAdjustmentInMap"/>/>
                     <set from-field="quoteIdTo" field="createQuoteAdjustmentInMap.quoteId"/>
                     <call-service service-name="createQuoteAdjustment" in-map-name="createQuoteAdjustmentInMap"/>
                 </if-empty>
@@ -231,7 +231,7 @@ under the License.
             <iterate list="quoteRoles" entry="quoteRole">
                 <if-compare field="quoteRole.roleTypeId" value="REQ_TAKER" operator="not-equals">
                     <clear-field field="createQuoteRoleInMap"/>
-                    <set-service-fields service-name="createQuoteRole" to-map="createQuoteRoleInMap" map="quoteRole"/>
+                    <set-service-fields service-name="createQuoteRole" map="quoteRole" to-map="createQuoteRoleInMap"/>/>
                     <set from-field="quoteIdTo" field="createQuoteRoleInMap.quoteId"/>
                     <call-service service-name="createQuoteRole" in-map-name="createQuoteRoleInMap"/>
                 </if-compare>
@@ -242,7 +242,7 @@ under the License.
             <get-related value-field="quote" relation-name="QuoteAttribute" list="quoteAttributes"/>
             <iterate list="quoteAttributes" entry="quoteAttribute">
                 <clear-field field="createQuoteAttributeInMap"/>
-                <set-service-fields service-name="createQuoteAttribute" to-map="createQuoteAttributeInMap" map="quoteAttribute"/>
+                <set-service-fields service-name="createQuoteAttribute" map="quoteAttribute" to-map="createQuoteAttributeInMap"/>/>
                 <set from-field="quoteIdTo" field="createQuoteAttributeInMap.quoteId"/>
                 <call-service service-name="createQuoteAttribute" in-map-name="createQuoteAttributeInMap"/>
             </iterate>
@@ -252,7 +252,7 @@ under the License.
             <get-related value-field="quote" relation-name="QuoteCoefficient" list="quoteCoefficients"/>
             <iterate list="quoteCoefficients" entry="quoteCoefficient">
                 <clear-field field="createQuoteCoefficientInMap"/>
-                <set-service-fields service-name="createQuoteCoefficient" to-map="createQuoteCoefficientInMap" map="quoteCoefficient"/>
+                <set-service-fields service-name="createQuoteCoefficient" map="quoteCoefficient" to-map="createQuoteCoefficientInMap"/>/>
                 <set from-field="quoteIdTo" field="createQuoteCoefficientInMap.quoteId"/>
                 <call-service service-name="createQuoteCoefficient" in-map-name="createQuoteCoefficientInMap"/>
             </iterate>
@@ -261,7 +261,7 @@ under the License.
             <get-related value-field="quote" relation-name="QuoteTerm" list="quoteTerms"/>
             <iterate list="quoteTerms" entry="quoteTerm">
                 <clear-field field="createQuoteTermInMap"/>
-                <set-service-fields service-name="createQuoteTerm" to-map="createQuoteTermInMap" map="quoteTerm"/>
+                <set-service-fields service-name="createQuoteTerm" map="quoteTerm" to-map="createQuoteTermInMap"/>/>
                 <set from-field="quoteIdTo" field="createQuoteTermInMap.quoteId"/>
                 <call-service service-name="createQuoteTerm" in-map-name="createQuoteTermInMap"/>
             </iterate>
@@ -450,7 +450,7 @@ under the License.
         <entity-one entity-name="QuoteItem" value-field="quoteItem" auto-field-map="true"/>
         <check-errors/>
 
-        <set-service-fields service-name="createQuoteItem" to-map="createQuoteItemInMap" map="quoteItem"/>
+        <set-service-fields service-name="createQuoteItem" map="quoteItem" to-map="createQuoteItemInMap"/>/>
         <set from-field="parameters.quoteIdTo" field="createQuoteItemInMap.quoteId"/>
         <set from-field="parameters.quoteItemSeqId" field="createQuoteItemInMap.quoteItemSeqId"/>
         <if-empty field="parameters.quoteIdTo">
@@ -470,7 +470,7 @@ under the License.
             <get-related value-field="quoteItem" relation-name="QuoteAdjustment" list="quoteAdjustments"/>
             <iterate list="quoteAdjustments" entry="quoteAdjustment">
                 <clear-field field="createQuoteAdjustmentInMap"/>
-                <set-service-fields service-name="createQuoteAdjustment" to-map="createQuoteAdjustmentInMap" map="quoteAdjustment"/>
+                <set-service-fields service-name="createQuoteAdjustment" map="quoteAdjustment" to-map="createQuoteAdjustmentInMap"/>/>
                 <set from-field="quoteIdTo" field="createQuoteAdjustmentInMap.quoteId"/>
                 <set from-field="quoteItemSeqId" field="createQuoteAdjustmentInMap.quoteItemSeqId"/>
                 <call-service service-name="createQuoteAdjustment" in-map-name="createQuoteAdjustmentInMap"/>
@@ -651,7 +651,7 @@ under the License.
         <iterate list="quoteItems" entry="quoteItem">
             <if-compare field="quoteItem.isPromo" value="Y" operator="equals">
                 <clear-field field="removeQuoteItemInMap"/>
-                <set-service-fields service-name="removeQuoteItem" to-map="removeQuoteItemInMap" map="parameters"/>
+                <set-service-fields service-name="removeQuoteItem" map="parameters" to-map="removeQuoteItemInMap"/>/>
                 <set from-field="quoteItem.quoteItemSeqId" field="removeQuoteItemInMap.quoteItemSeqId"/>
                 <call-service service-name="removeQuoteItem" in-map-name="removeQuoteItemInMap"/>
             </if-compare>
@@ -662,12 +662,12 @@ under the License.
             <!-- make sure this is not a manual adjustments -->
             <if-not-empty field="quoteAdjustment.productPromoId">
                 <clear-field field="removeQuoteAdjustmentInMap"/>
-                <set-service-fields service-name="removeQuoteAdjustment" to-map="removeQuoteAdjustmentInMap" map="parameters"/>
+                <set-service-fields service-name="removeQuoteAdjustment" map="parameters" to-map="removeQuoteAdjustmentInMap"/>/>
                 <set from-field="quoteAdjustment.quoteAdjustmentId" field="removeQuoteAdjustmentInMap.quoteAdjustmentId"/>
                 <call-service service-name="removeQuoteAdjustment" in-map-name="removeQuoteAdjustmentInMap"/>
             </if-not-empty>
         </iterate>
-        <set-service-fields service-name="loadCartFromQuote" to-map="loadCartFromQuoteInMap" map="parameters"/>
+        <set-service-fields service-name="loadCartFromQuote" map="parameters" to-map="loadCartFromQuoteInMap"/>/>
         <set value="false" field="loadCartFromQuoteInMap.applyQuoteAdjustments"/>
         <call-service service-name="loadCartFromQuote" in-map-name="loadCartFromQuoteInMap">
             <result-to-field result-name="shoppingCart" field="cart"/>
@@ -680,7 +680,7 @@ under the License.
                 <!-- this is a new (promo) item -->
                 <!-- a new quote item is created -->
                 <clear-field field="createQuoteItemInMap"/>
-                <set-service-fields service-name="createQuoteItem" to-map="createQuoteItemInMap" map="parameters"/>
+                <set-service-fields service-name="createQuoteItem" map="parameters" to-map="createQuoteItemInMap"/>/>
                 <call-object-method obj-field="item" method-name="getProductId" ret-field="createQuoteItemInMap.productId"/>
                 <call-object-method obj-field="item" method-name="getQuantity" ret-field="createQuoteItemInMap.quantity"/>
                 <set value="Y" field="createQuoteItemInMap.isPromo"/>
@@ -915,7 +915,7 @@ under the License.
         </call-service>
         <check-errors/>
 
-        <entity-condition list="custRequestItems" entity-name="CustRequestItem">
+        <entity-condition entity-name="CustRequestItem" list="custRequestItems">
             <condition-list combine="and">
                 <condition-expr field-name="custRequestId" operator="equals" from-field="custRequest.custRequestId"/>
                 <condition-expr field-name="statusId" operator="not-equals" value="CRQ_CANCELLED"/>

Modified: ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadEvent.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadEvent.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadEvent.xml (original)
+++ ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadEvent.xml Sat Nov  5 14:14:04 2016
@@ -27,7 +27,7 @@
             <set field="DateMonth" value="12"/>
             <set field="mount1" from-field="DateMonth" type="Integer"/>
             <calculate field="mount2" type="Integer">
-                <calcop field="mount1" operator="subtract">
+                <calcop operator="subtract" field="mount1">
                     <number value="1"/>
                 </calcop>
             </calculate>

Modified: ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml (original)
+++ ofbiz/trunk/applications/order/minilang/reports/NetBeforeOverheadMonthlyEvent.xml Sat Nov  5 14:14:04 2016
@@ -57,7 +57,7 @@
         <set field="count1" value="-1"/>
         <iterate list="saleschannels" entry="saleschannel">
             <calculate field="count1">
-                <calcop field="count1" operator="add">
+                <calcop operator="add" field="count1">
                     <number value="1"/>
                 </calcop>
             </calculate>
@@ -77,7 +77,7 @@
             </if-compare-field>
             <if-compare-field field="countdate.salesChannelEnumId" to-field="checksalesChannel1" operator="not-equals">
                 <calculate field="count2">
-                    <calcop field="count2" operator="add">
+                    <calcop operator="add" field="count2">
                         <number value="1"/>
                     </calcop>
                 </calculate>
@@ -93,12 +93,12 @@
         <set field="count4" value="0"/>
         <iterate list="starschemas" entry="starschema">
             <calculate field="count3">
-                <calcop field="count3" operator="add">
+                <calcop operator="add" field="count3">
                     <number value="1"/>
                 </calcop>
             </calculate>
             <calculate field="count4">
-                <calcop field="count4" operator="add">
+                <calcop operator="add" field="count4">
                     <number value="1"/>
                 </calcop>
             </calculate>

Modified: ofbiz/trunk/applications/order/minilang/reports/ProductDemandReportEvent.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/reports/ProductDemandReportEvent.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/reports/ProductDemandReportEvent.xml (original)
+++ ofbiz/trunk/applications/order/minilang/reports/ProductDemandReportEvent.xml Sat Nov  5 14:14:04 2016
@@ -26,17 +26,17 @@
             <set field="year" from-field="Year" type="Integer"/>
             <set field="week1" from-field="Week" type="Integer"/>
             <calculate field="week2" type="Integer">
-                <calcop field="week1" operator="subtract">
+                <calcop operator="subtract" field="week1">
                     <number value="1"/>
                 </calcop>
             </calculate>
             <calculate field="week3" type="Integer">
-                <calcop field="week1" operator="subtract">
+                <calcop operator="subtract" field="week1">
                     <number value="2"/>
                 </calcop>
             </calculate>
             <calculate field="week4" type="Integer">
-                <calcop field="week1" operator="subtract">
+                <calcop operator="subtract" field="week1">
                     <number value="3"/>
                 </calcop>
             </calculate>

Modified: ofbiz/trunk/applications/order/minilang/reports/SalesReportEvent.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/reports/SalesReportEvent.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/reports/SalesReportEvent.xml (original)
+++ ofbiz/trunk/applications/order/minilang/reports/SalesReportEvent.xml Sat Nov  5 14:14:04 2016
@@ -61,7 +61,7 @@
             <if-not-empty field="thruWeek">
                 <if-compare field="thruWeek" operator="less-equals" value="3" type="Integer">
                     <calculate field="lastYear">
-                        <calcop field="thisYear" operator="subtract">
+                        <calcop operator="subtract" field="thisYear">
                             <number value="1"/>
                         </calcop>
                     </calculate>
@@ -93,7 +93,7 @@
                     </entity-condition>
                 <else>
                     <calculate field="fromWeek">
-                        <calcop field="thruWeek" operator="subtract">
+                        <calcop operator="subtract" field="thruWeek">
                             <number value="3"/>
                         </calcop>
                     </calculate>
@@ -132,7 +132,7 @@
             <if-not-empty field="thruMonth">
                 <if-compare field="thruMonth" operator="less-equals" value="3" type="Integer">
                     <calculate field="lastYear">
-                        <calcop field="thisYear" operator="subtract">
+                        <calcop operator="subtract" field="thisYear">
                             <number value="1"/>
                         </calcop>
                     </calculate>
@@ -244,7 +244,7 @@
                     </if-compare>
                 <else>
                     <calculate field="fromMonth">
-                        <calcop field="thruMonth" operator="subtract">
+                        <calcop operator="subtract" field="thruMonth">
                             <number value="3"/>
                         </calcop>
                     </calculate>

Modified: ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/request/CustRequestServices.xml Sat Nov  5 14:14:04 2016
@@ -106,7 +106,7 @@ under the License.
     </simple-method>
 
     <simple-method method-name="deleteCustRequest" short-description="Delete a draft Customer Request with no relations yet">
-        <entity-one value-field="custRequest" entity-name="CustRequest"/>
+        <entity-one entity-name="CustRequest" value-field="custRequest"/>
         <if-compare operator="not-equals" value="CRQ_DRAFT" field="custRequest.statusId">
             <add-error ><fail-property resource="OrderErrorUiLabels" property="OrderCheckCustRequestDraftStatusForDelete"/></add-error>
         </if-compare>
@@ -175,7 +175,7 @@ under the License.
                 <field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
             </entity-and>
             <if-not-empty field="custRequestItems">
-                <first-from-list entry="custRequestItem" list="custRequestItems"/>
+                <first-from-list list="custRequestItems" entry="custRequestItem"/>
                 <set-service-fields service-name="updateCustRequestItem" to-map="updateItem" map="custRequestItem"/>
                 <set field="updateItem.story" from-field="parameters.story"/>
                 <call-service service-name="updateCustRequestItem" in-map-name="updateItem"/>
@@ -420,7 +420,7 @@ under the License.
         <entity-one entity-name="CustRequestItem" value-field="custRequestItem" auto-field-map="true"/>
         <check-errors/>
 
-        <set-service-fields service-name="createCustRequestItem" to-map="createCustRequestItemInMap" map="custRequestItem"/>
+        <set-service-fields service-name="createCustRequestItem" map="custRequestItem" to-map="createCustRequestItemInMap"/>/>
         <set field="createCustRequestItemInMap.custRequestId" from-field="parameters.custRequestIdTo"/>
         <set field="createCustRequestItemInMap.custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/>
         <if-empty field="parameters.custRequestIdTo">
@@ -440,7 +440,7 @@ under the License.
             <get-related value-field="custRequestItem" relation-name="QuoteItem" list="quoteItems"/>
             <iterate list="quoteItems" entry="quoteItem">
                 <clear-field field="createQuoteItemInMap"/>
-                <set-service-fields service-name="createQuoteItem" to-map="createQuoteItemInMap" map="quoteItem"/>
+                <set-service-fields service-name="createQuoteItem" map="quoteItem" to-map="createQuoteItemInMap"/>/>
                 <set field="createQuoteItemInMap.custRequestId" from-field="custRequestIdTo"/>
                 <set field="createQuoteItemInMap.custRequestItemSeqId" from-field="custRequestItemSeqId"/>
                 <clear-field field="createQuoteItemInMap.quoteItemSeqId"/>

Modified: ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/requirement/RequirementServices.xml Sat Nov  5 14:14:04 2016
@@ -168,7 +168,7 @@ under the License.
         <set field="inputMap.quantity" from-field="requirement.quantity"/>
         <set field="inputMap.sendDate" from-field="requirement.requiredByDate"/>
         <call-service service-name="createInventoryTransfersForProduct" in-map-name="inputMap">
-            <result-to-field field="quantityNotTransferred" result-name="quantityNotTransferred"/>
+            <result-to-field result-name="quantityNotTransferred" field="quantityNotTransferred"/>
         </call-service>
         <check-errors/>
         <if-compare field="quantityNotTransferred" value="0.0" operator="greater" type="BigDecimal">

Modified: ofbiz/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/shoppinglist/ShoppingListServices.xml Sat Nov  5 14:14:04 2016
@@ -154,7 +154,7 @@ under the License.
                 <store-value value-field="shoppingList"/>
             </if-compare-field>
         <else>
-            <first-from-list entry="shoppingListItem" list="shoppingListItems"/>
+            <first-from-list list="shoppingListItems" entry="shoppingListItem"/>
             <calculate field="totalquantity" >
                 <calcop operator="add" field="shoppingListItem.quantity">
                     <calcop operator="get" field="parameters.quantity"/>
@@ -252,7 +252,7 @@ under the License.
             </if-not-empty>
             <set field="itemPrice" from-field="shoppingListItem.modifiedPrice" default-value="${calcPriceOutMap.price}"/>
             <calculate field="totalPrice">
-                <calcop field="totalPrice" operator="add"/>
+                <calcop operator="add" field="totalPrice"/>
                 <calcop operator="multiply">
                     <calcop operator="get" field="itemPrice"/>
                     <calcop operator="get" field="shoppingListItem.quantity"/>
@@ -272,8 +272,8 @@ under the License.
                 <result-to-field result-name="totalPrice" field="calcPriceOutMap.totalPrice"/>
             </call-service>
             <calculate field="totalPrice">
-                <calcop field="totalPrice" operator="get"/>
-                <calcop field="calcPriceOutMap.totalPrice" operator="get"/>
+                <calcop operator="get" field="totalPrice"/>
+                <calcop operator="get" field="calcPriceOutMap.totalPrice"/>
             </calculate>
             <clear-field field="calcChildPriceInMap"/>
         </iterate>

Modified: ofbiz/trunk/applications/order/minilang/test/QuoteTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/test/QuoteTests.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/test/QuoteTests.xml (original)
+++ ofbiz/trunk/applications/order/minilang/test/QuoteTests.xml Sat Nov  5 14:14:04 2016
@@ -40,7 +40,7 @@ under the License.
         </assert>
 
         <!-- Confirm the database changes -->
-        <entity-one value-field="quoteWorkEffort" entity-name="QuoteWorkEffort">
+        <entity-one entity-name="QuoteWorkEffort" value-field="quoteWorkEffort">
             <field-map field-name="quoteId" from-field="serviceCtx.quoteId"/>
             <field-map field-name="workEffortId" from-field="serviceCtx.workEffortId"/>
         </entity-one>
@@ -75,7 +75,7 @@ under the License.
         <assert><if-compare field="serviceResult.responseMessage" operator="equals" value="error"/></assert>
 
         <!-- Confirm the database changes, in this case nothing should have changed -->
-        <entity-condition list="quoteWorkEfforts" entity-name="QuoteWorkEffort">
+        <entity-condition entity-name="QuoteWorkEffort" list="quoteWorkEfforts">
             <condition-list>
                 <condition-expr field-name="lastUpdatedStamp" operator="greater-equals" from-field="startTime"/>
                 <condition-expr field-name="quoteId" from-field="serviceCtx.quoteId"/>
@@ -118,7 +118,7 @@ under the License.
         <assert>
             <not><if-empty field="workEfforts"/></not>
         </assert>
-        <entity-one value-field="quoteWorkEffort" entity-name="QuoteWorkEffort">
+        <entity-one entity-name="QuoteWorkEffort" value-field="quoteWorkEffort">
             <field-map field-name="quoteId" from-field="serviceCtx.quoteId"/>
             <field-map field-name="workEffortId" from-field="serviceResult.workEffortId"/>
         </entity-one>
@@ -145,7 +145,7 @@ under the License.
             <field-map field-name="quoteId" from-field="serviceCtx.quoteId"/>
             <field-map field-name="quoteItemSeqId" from-field="serviceCtx.quoteItemSeqId"/>
         </entity-and>
-        <first-from-list entry="quoteTerm" list="quoteTermList"/>
+        <first-from-list list="quoteTermList" entry="quoteTerm"/>
         <assert>
            <not><if-empty field="quoteTerm"/></not>
            <if-compare-field operator="equals" to-field="quoteTerm.termTypeId" field="serviceCtx.termTypeId"/>
@@ -174,7 +174,7 @@ under the License.
             <results-to-map map-name="serviceResult"/>
         </call-service>
 <!--         Confirm that a matching Quoteterm was updated -->
-        <entity-one value-field="quoteTerm" entity-name="QuoteTerm">
+        <entity-one entity-name="QuoteTerm" value-field="quoteTerm">
             <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"/>
@@ -202,7 +202,7 @@ under the License.
         <call-service service-name="deleteQuoteTerm" in-map-name="serviceCtx">
             <results-to-map map-name="serviceResult"/>
         </call-service>
-        <entity-one value-field="quoteTerm" entity-name="QuoteTerm">
+        <entity-one entity-name="QuoteTerm" value-field="quoteTerm">
             <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/minilang/test/ShoppingCartTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/test/ShoppingCartTests.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/test/ShoppingCartTests.xml (original)
+++ ofbiz/trunk/applications/order/minilang/test/ShoppingCartTests.xml Sat Nov  5 14:14:04 2016
@@ -618,7 +618,7 @@ under the License.
             <field field="testParams" type="java.util.Map"/>
         </call-object-method>
         
-        <entity-one value-field="userLogin" entity-name="UserLogin">
+        <entity-one entity-name="UserLogin" value-field="userLogin">
             <field-map field-name="userLoginId" value="DemoCustomer"/>
         </entity-one>
         <script>groovy:
@@ -664,11 +664,11 @@ under the License.
             <field field="response" type="javax.servlet.http.HttpServletResponse"/>
         </call-class-method>
         <log level="info" message="===== >>> Event : destroyCart, Response = ${result}"/>
-        <entity-condition list="orderHeaders" entity-name="OrderHeader">
+        <entity-condition entity-name="OrderHeader" list="orderHeaders">
             <condition-expr field-name="orderTypeId" value="SALES_ORDER"/>
             <order-by field-name="-entryDate"/>
         </entity-condition>
-        <first-from-list entry="orderHeader" list="orderHeaders"/>
+        <first-from-list list="orderHeaders" entry="orderHeader"/>
         <set field="orderId" from-field="orderHeader.orderId"/>
         <log level="info" message="======== Test order with id: [${orderId}] has been approved: [${approved}]========"/>
 
@@ -703,7 +703,7 @@ under the License.
             <field-map field-name="orderId" from-field="orderMap.orderId"/>
             <field-map field-name="productId" value="GZ-2644"/>
         </entity-and>
-        <first-from-list entry="orderItem" list="orderItems"/>
+        <first-from-list list="orderItems" entry="orderItem"/>
         
         <set field="map.orderId" from="orderMap.orderId"/>
         <set field="map.contactMechId" value="9015"/>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml Sat Nov  5 14:14:04 2016
@@ -115,7 +115,7 @@ under the License.
         <field name="lastModifiedDate" sort-field="true"><display/></field>
         <!--field name="statusId"><hidden value="CRQ_REJECTED"/></field-->
         <field name="rejectButton">
-            <hyperlink target="setCustRequestStatus" description="${uiLabelMap.FormFieldTitle_rejectButton}">
+            <hyperlink description="${uiLabelMap.FormFieldTitle_rejectButton}" target="setCustRequestStatus">
                 <parameter param-name="custRequestId"/>
                 <parameter param-name="statusId" value="CRQ_REJECTED"/>
             </hyperlink>
@@ -226,7 +226,7 @@ under the License.
     <form name="ViewRequestWorkEfforts" type="list" list-name="requestWorkEfforts"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="workEffortId">
-            <hyperlink target="/workeffort/control/WorkEffortSummary" description="${workEffortName} [${workEffortId}]" target-type="inter-app">
+            <hyperlink description="${workEffortName} [${workEffortId}]" target="/workeffort/control/WorkEffortSummary" target-type="inter-app">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
@@ -552,7 +552,7 @@ under the License.
         <field name="custRequestTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="CustRequestType"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
         <field name="fromPartyId" title="${uiLabelMap.PartyPartyId}">
-            <hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultTo.fullName} [${custRequest.fromPartyId}]">
+            <hyperlink description="${partyNameResultTo.fullName} [${custRequest.fromPartyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="custRequest.fromPartyId"/>
             </hyperlink>
         </field>
@@ -641,7 +641,7 @@ under the License.
         <field name="mimeTypeId"><display/></field>
         <field name="fromDate"><display/></field>
         <field name="deleteLink" title=" " widget-style="buttontext" use-when="tabButtonItem!=void&amp;&amp;tabButtonItem.equals(&quot;custRequestContent&quot;)">
-           <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteCustRequestContent">
+           <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteCustRequestContent" also-hidden="false">
                 <parameter param-name="custRequestId"/>
                 <parameter param-name="contentId"/>
                 <parameter param-name="fromDate"/>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml Sat Nov  5 14:14:04 2016
@@ -534,7 +534,7 @@ under the License.
             <actions>
                 <set field="custRequestSortField" from-field="parameters.custRequestSortField" default-value="-custRequestDate"/>
                 <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
-                <entity-condition list="custRequests" entity-name="CustReqAndTypeAndPartyRel">
+                <entity-condition entity-name="CustReqAndTypeAndPartyRel" list="custRequests">
                     <condition-list combine="and">
                         <condition-expr field-name="statusId" operator="equals" value="CRQ_SUBMITTED"/>
                         <condition-list combine="and">
@@ -586,7 +586,7 @@ under the License.
                     </condition>
                     <actions>
                         <set field="screenletTitle" from-field="uiLabelMap.OrderOpenMyCustomerRequests"/>
-                        <entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
+                        <entity-condition entity-name="CustRequestInfoAndWorkEffortAndPartyRel" list="custRequests">
                             <condition-list combine="and">
                                 <condition-expr field-name="partyIdFrom" operator="equals" from-field="myCompanyId" ignore-if-empty="true"/>
                                 <condition-expr field-name="fromPartyId" operator="equals" from-field="fromPartyId" ignore-if-empty="true"/>
@@ -609,7 +609,7 @@ under the License.
                     </condition>
                     <actions>
                         <set field="screenletTitle" from-field="uiLabelMap.OrderCompletedMyCustomerRequests"/>
-                        <entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
+                        <entity-condition entity-name="CustRequestInfoAndWorkEffortAndPartyRel" list="custRequests">
                             <condition-list combine="and">
                                 <condition-expr field-name="partyIdFrom" operator="equals" from-field="myCompanyId" ignore-if-empty="true"/>
                                 <condition-expr field-name="fromPartyId" operator="equals" from-field="fromPartyId" ignore-if-empty="true"/>
@@ -627,7 +627,7 @@ under the License.
                     </condition>
                     <actions>
                         <set field="screenletTitle" from-field="uiLabelMap.OrderCancelledMyCustomerRequests"/>
-                        <entity-condition list="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
+                        <entity-condition entity-name="CustRequestInfoAndWorkEffortAndPartyRel" list="custRequests">
                             <condition-list combine="and">
                                 <condition-expr field-name="partyIdFrom" operator="equals" from-field="myCompanyId" ignore-if-null="true"/>
                                 <condition-expr field-name="fromPartyId" operator="equals" from-field="fromPartyId" ignore-if-empty="true"/>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml Sat Nov  5 14:14:04 2016
@@ -100,14 +100,14 @@ under the License.
         <field name="postalCode"><text-find/></field>
         <field name="countryGeoId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Geo" description="${geoName}" key-field-name="geoId">
+                <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}">
                     <entity-constraint name="geoTypeId" value="COUNTRY"/>
                 </entity-options>
              </drop-down>
         </field>
         <field name="stateProvinceGeoId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Geo" description="${geoName}" key-field-name="geoId">
+                <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}">
                     <entity-constraint name="geoTypeId" value="STATE"/>
                 </entity-options>
              </drop-down>
@@ -129,7 +129,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="OrderHeaderAndShipGroups" default-field-type="hidden"/>
         <field name="orderId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${orderId}" target="javascript:set_value('${orderId}')"/>
+            <hyperlink description="${orderId}" target="javascript:set_value('${orderId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="orderTypeId"><display-entity entity-name="OrderType"/></field>
         <field name="partyId"><display/></field>
@@ -167,14 +167,14 @@ under the License.
         <field name="postalCode"><text-find/></field>
         <field name="countryGeoId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Geo" description="${geoName}" key-field-name="geoId">
+                <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}">
                     <entity-constraint name="geoTypeId" value="COUNTRY"/>
                 </entity-options>
              </drop-down>
         </field>
         <field name="stateProvinceGeoId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Geo" description="${geoName}" key-field-name="geoId">
+                <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}">
                     <entity-constraint name="geoTypeId" value="STATE"/>
                 </entity-options>
              </drop-down>
@@ -245,7 +245,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="CustRequest" default-field-type="hidden"/>
         <field name="custRequestId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${custRequestId}" target="javascript:set_value('${custRequestId}')"/>
+            <hyperlink description="${custRequestId}" target="javascript:set_value('${custRequestId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="custRequestName"><display/></field>
         <field name="priority"><display/></field>
@@ -291,7 +291,7 @@ under the License.
         <auto-fields-entity entity-name="CustRequestItem" default-field-type="hidden"/>
         <field name="custRequestId"><display/></field>
         <field name="custRequestItemSeqId" widget-style="buttontext" >
-            <hyperlink also-hidden="false" target-type="plain" description="${custRequestItemSeqId}" target="javascript:set_value('${custRequestItemSeqId}')"/>
+            <hyperlink description="${custRequestItemSeqId}" target="javascript:set_value('${custRequestItemSeqId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="priority"><display/></field>
         <field name="custRequestResolutionId"><display-entity also-hidden="false" entity-name="CustRequestResolution"/></field>
@@ -351,7 +351,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="Quote" default-field-type="display"/>
         <field name="quoteId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${quoteId}" target="javascript:set_value('${quoteId}')"/>
+            <hyperlink description="${quoteId}" target="javascript:set_value('${quoteId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="quoteTypeId" title="${uiLabelMap.OrderOrderQuoteTypeId}"><display-entity entity-name="QuoteType"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity also-hidden="false" entity-name="StatusItem"/></field>
@@ -418,15 +418,15 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="QuoteItem" default-field-type="display"/>
         <field name="quoteId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${quoteId}" target="javascript:set_value('${quoteId}')"/>
+            <hyperlink description="${quoteId}" target="javascript:set_value('${quoteId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="quoteId"><hidden/></field>
         <field name="quoteItemSeqId"><hidden/></field>
         <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${groovy:isPromo==null}">
-            <hyperlink also-hidden="false" target-type="plain" description="${quoteItemSeqId}" target="javascript:set_value('${quoteItemSeqId}')"/>
+            <hyperlink description="${quoteItemSeqId}" target="javascript:set_value('${quoteItemSeqId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${groovy: 'N'.equals(isPromo)}">
-            <hyperlink also-hidden="false" target-type="plain" description="${quoteItemSeqId}" target="javascript:set_value('${quoteItemSeqId}')"/>
+            <hyperlink description="${quoteItemSeqId}" target="javascript:set_value('${quoteItemSeqId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" use-when="${groovy: 'Y'.equals(isPromo)}"><display/></field>
         <field name="productId">

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml Sat Nov  5 14:14:04 2016
@@ -89,7 +89,7 @@ under the License.
         <auto-fields-entity entity-name="Quote" default-field-type="display"/>
 
         <field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${quoteId}" target="loadCartFromQuote">
+            <hyperlink description="${quoteId}" target="loadCartFromQuote" also-hidden="false">
                 <parameter param-name="quoteId"/>
             </hyperlink>
         </field>
@@ -112,12 +112,12 @@ under the License.
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
         <field name="addFromList" title=" " widget-style="buttontext">
-            <hyperlink target="addFromShoppingList" description="${uiLabelMap.OrderToAddSelectedItemsToShoppingList}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.OrderToAddSelectedItemsToShoppingList}" target="addFromShoppingList" also-hidden="false">
                 <parameter param-name="shoppingListId"/>
             </hyperlink>
         </field>
         <field name="addAllFromList" title=" " widget-style="buttontext">
-            <hyperlink target="addAllFromShoppingList" description="${uiLabelMap.OrderQuickAdd}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.OrderQuickAdd}" target="addAllFromShoppingList" also-hidden="false">
                 <parameter param-name="shoppingListId"/>
             </hyperlink>
         </field>
@@ -129,7 +129,7 @@ under the License.
             <display-entity entity-name="Product" description="${productId} - ${description}"/>
         </field>
         <field name="addToCart" title=" " widget-style="buttontext">
-            <hyperlink target="additem/editShoppingList" description="${uiLabelMap.CommonAdd} ${quantity} ${uiLabelMap.OrderAddQntToOrder}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonAdd} ${quantity} ${uiLabelMap.OrderAddQntToOrder}" target="additem/editShoppingList" also-hidden="false">
                 <parameter param-name="shoppingListId"/>
                 <parameter param-name="shoppingListItemSeqId"/>
                 <parameter param-name="add_product_id" from-field="productId"/>
@@ -140,12 +140,12 @@ under the License.
     </form>
     <form name="AddFromShoppingListAll" type="single" target="">
         <field name="addAllFromList" title=" " widget-style="buttontext">
-            <hyperlink target="addAllFromShoppingList" description="${uiLabelMap.OrderQuickAdd}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.OrderQuickAdd}" target="addAllFromShoppingList" also-hidden="false">
                 <parameter param-name="shoppingListId"/>
             </hyperlink>
         </field>
         <field name="returnToOrderEntry" title=" " widget-style="buttontext">
-            <hyperlink target="orderentry" description="${uiLabelMap.OrderOrderReturn}" also-hidden="false"/>
+            <hyperlink description="${uiLabelMap.OrderOrderReturn}" target="orderentry" also-hidden="false"/>
         </field>
     </form>
 

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml Sat Nov  5 14:14:04 2016
@@ -88,7 +88,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="OrderHeader" default-field-type="display"/>
         <field name="orderId" widget-style="buttontext">
-            <hyperlink target="EditOrderHeader" description="[${orderId}]">
+            <hyperlink description="[${orderId}]" target="EditOrderHeader">
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
@@ -103,7 +103,7 @@ under the License.
         <field name="orderItemSeqId"><display/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeOrderTerm" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeOrderTerm" also-hidden="false">
                 <parameter param-name="orderId"/>
                 <parameter param-name="termTypeId"/>
                 <parameter param-name="orderItemSeqId"/>
@@ -240,7 +240,7 @@ under the License.
             <display-entity entity-name="OrderType"/>
         </field>
         <field name="orderId" title="${uiLabelMap.OrderOrderId}">
-            <hyperlink target="orderview" description="${orderId}">
+            <hyperlink description="${orderId}" target="orderview">
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml Sat Nov  5 14:14:04 2016
@@ -110,7 +110,7 @@ under the License.
             <actions>
                 <set field="titleProperty" value="PageTitleReturnList"/>
                 <set field="headerItem" value="return"/>
-                <entity-condition list="returnList" entity-name="ReturnHeader"/>
+                <entity-condition entity-name="ReturnHeader" list="returnList"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonOrderReturnDecorator" location="${parameters.orderReturnDecoratorLocation}">

Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteForms.xml Sat Nov  5 14:14:04 2016
@@ -85,7 +85,7 @@ under the License.
           </actions>
         <auto-fields-entity entity-name="Quote" default-field-type="display"/>
         <field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${quoteId}" target="ViewQuote">
+            <hyperlink description="${quoteId}" target="ViewQuote" also-hidden="false">
                 <parameter param-name="quoteId"/>
             </hyperlink>
         </field>
@@ -165,7 +165,7 @@ under the License.
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}"><display-entity also-hidden="false" entity-name="RoleType"/></field>
         <field name="quoteId"><hidden/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeQuoteRole" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeQuoteRole" also-hidden="false">
                 <parameter param-name="partyId"/>
                 <parameter param-name="roleTypeId"/>
                 <parameter param-name="quoteId"/>
@@ -193,13 +193,13 @@ under the License.
         <field name="quoteId"><hidden/></field>
         <field name="quoteItemSeqId"><hidden/></field>
         <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${groovy:isPromo==null}">
-            <hyperlink also-hidden="false" description="${quoteItemSeqId}" target="EditQuoteItem">
+            <hyperlink description="${quoteItemSeqId}" target="EditQuoteItem" also-hidden="false">
                 <parameter param-name="quoteId"/>
                 <parameter param-name="quoteItemSeqId"/>
             </hyperlink>
         </field>
         <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext" use-when="${groovy: 'N'.equals(isPromo)}">
-            <hyperlink also-hidden="false" description="${quoteItemSeqId}" target="EditQuoteItem">
+            <hyperlink description="${quoteItemSeqId}" target="EditQuoteItem" also-hidden="false">
                 <parameter param-name="quoteId"/>
                 <parameter param-name="quoteItemSeqId"/>
             </hyperlink>
@@ -220,14 +220,14 @@ under the License.
         <field name="uomId"><hidden/></field>
         <!--<field name="custRequestId"><display description="${custRequestId} - ${custRequestItemSeqId}"/></field>-->
         <field name="custRequestId" title="${uiLabelMap.CommonViewRequest}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${custRequestId}-${custRequestItemSeqId}" target="requestitem">
+            <hyperlink description="${custRequestId}-${custRequestItemSeqId}" target="requestitem" also-hidden="false">
                 <parameter param-name="custRequestId"/>
                 <parameter param-name="custRequestItemSeqId"/>
             </hyperlink>
         </field>
         <field name="custRequestItemSeqId"><hidden/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeQuoteItem" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeQuoteItem" also-hidden="false">
                 <parameter param-name="quoteItemSeqId"/>
                 <parameter param-name="quoteId"/>
             </hyperlink>
@@ -284,7 +284,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="ListQuoteAttributes">
         <auto-fields-entity entity-name="QuoteAttribute" default-field-type="display"/>
         <field name="attrName" title="${uiLabelMap.OrderOrderQuoteAttributeName}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${attrName}" target="EditQuoteAttribute">
+            <hyperlink description="${attrName}" target="EditQuoteAttribute" also-hidden="false">
                 <parameter param-name="quoteId"/>
                 <parameter param-name="attrName"/>
             </hyperlink>
@@ -292,7 +292,7 @@ under the License.
         <field name="attrValue" title="${uiLabelMap.OrderOrderQuoteAttributeValue}"></field>
         <field name="quoteId"><hidden/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeQuoteAttribute" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeQuoteAttribute" also-hidden="false">
                 <parameter param-name="attrName"/>
                 <parameter param-name="quoteId"/>
             </hyperlink>
@@ -313,7 +313,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="ListQuoteCoefficients">
         <auto-fields-entity entity-name="QuoteCoefficient" default-field-type="display"/>
         <field name="coeffName" title="${uiLabelMap.OrderOrderQuoteCoeffName}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${coeffName}" target="EditQuoteCoefficient">
+            <hyperlink description="${coeffName}" target="EditQuoteCoefficient" also-hidden="false">
                 <parameter param-name="quoteId"/>
                 <parameter param-name="coeffName"/>
             </hyperlink>
@@ -321,7 +321,7 @@ under the License.
         <field name="coeffValue" title="${uiLabelMap.OrderOrderQuoteCoeffValue}"></field>
         <field name="quoteId"><hidden/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeQuoteCoefficient" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeQuoteCoefficient" also-hidden="false">
                 <parameter param-name="coeffName"/>
                 <parameter param-name="quoteId"/>
             </hyperlink>
@@ -348,7 +348,7 @@ under the License.
         <field name="custRequestItemSeqId"><hidden/></field>
         <field name="quoteId"><hidden/></field>
         <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext">
-            <hyperlink also-hidden="true" description="${quoteItemSeqId}" target="EditQuoteItem">
+            <hyperlink description="${quoteItemSeqId}" target="EditQuoteItem" also-hidden="true">
                 <parameter param-name="quoteId"/>
                 <parameter param-name="quoteItemSeqId"/>
             </hyperlink>
@@ -382,7 +382,7 @@ under the License.
         <field name="createdDate"><hidden/></field>
         <field name="createdByUserLogin"><hidden/></field>
         <field name="quoteAdjustmentId" title="${uiLabelMap.OrderOrderQuoteAdjustmentId}" widget-style="buttontext" use-when="${groovy:productPromoId==null}">
-            <hyperlink also-hidden="false" description="${quoteAdjustmentId}" target="EditQuoteAdjustment">
+            <hyperlink description="${quoteAdjustmentId}" target="EditQuoteAdjustment" also-hidden="false">
                 <parameter param-name="quoteId"/>
                 <parameter param-name="quoteAdjustmentId"/>
             </hyperlink>
@@ -392,7 +392,7 @@ under the License.
             <display-entity entity-name="OrderAdjustmentType" key-field-name="orderAdjustmentTypeId"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeQuoteAdjustment" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeQuoteAdjustment" also-hidden="false">
                 <parameter param-name="quoteAdjustmentId"/>
                 <parameter param-name="quoteId"/>
             </hyperlink>
@@ -437,7 +437,7 @@ under the License.
         <field name="custRequestItemSeqId"><hidden/></field>
         <field name="quoteId"><hidden/></field>
         <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}" widget-style="buttontext">
-            <hyperlink also-hidden="true" description="${quoteItemSeqId}" target="EditQuoteItem">
+            <hyperlink description="${quoteItemSeqId}" target="EditQuoteItem" also-hidden="true">
                 <parameter param-name="quoteId"/>
                 <parameter param-name="quoteItemSeqId"/>
             </hyperlink>
@@ -470,7 +470,7 @@ under the License.
             <display-entity entity-name="Uom" key-field-name="uomId"/>
         </field>
         <field name="editLink" title=" " widget-style="buttontext">
-            <hyperlink target="EditQuoteTerm" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditQuoteTerm" also-hidden="false">
                 <parameter param-name="termTypeId"/>
                 <parameter param-name="quoteItemSeqId"/>
                 <parameter param-name="quoteId"/>
@@ -479,7 +479,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteQuoteTerm" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteQuoteTerm" also-hidden="false">
                 <parameter param-name="termTypeId"/>
                 <parameter param-name="quoteItemSeqId"/>
                 <parameter param-name="quoteId"/>
@@ -488,7 +488,7 @@ under the License.
     </form>
     <form name="ListQuoteTermItem" extends="ListQuoteTerms">
         <field name="editLink" title=" " widget-style="buttontext">
-            <hyperlink target="EditQuoteTermItem" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditQuoteTermItem" also-hidden="false">
                 <parameter param-name="termTypeId"/>
                 <parameter param-name="quoteItemSeqId"/>
                 <parameter param-name="quoteId"/>
@@ -497,7 +497,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteQuoteTermFromItem" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteQuoteTermFromItem" also-hidden="false">
                 <parameter param-name="termTypeId"/>
                 <parameter param-name="quoteItemSeqId"/>
                 <parameter param-name="quoteId"/>
@@ -555,7 +555,7 @@ under the License.
         <field name="quoteId"><hidden/></field>
         <field name="noteId"><hidden/></field>
         <field name="editLink" title=" " widget-style="buttontext">
-            <hyperlink target="EditQuoteNote" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditQuoteNote" also-hidden="false">
                 <parameter param-name="quoteId"/>
                 <parameter param-name="noteId"/>
             </hyperlink>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Sat Nov  5 14:14:04 2016
@@ -748,7 +748,7 @@ under the License.
                 <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">
+                <entity-one entity-name="Quote" value-field="quote">
                     <field-map field-name="quoteId" from-field="parameters.quoteId"/>
                 </entity-one>
                 <set field="quoteStatusId" from-field="quote.statusId"/>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml Sat Nov  5 14:14:04 2016
@@ -28,7 +28,7 @@ under the License.
         </actions>
         <field name="quoteId"><hidden/></field>
         <field name="workEffortId" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${workEffortName} [${workEffortId}]" target="EditQuoteWorkEffort">
+            <hyperlink description="${workEffortName} [${workEffortId}]" target="EditQuoteWorkEffort" also-hidden="false">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="quoteId"/>
             </hyperlink>
@@ -40,7 +40,7 @@ under the License.
         <field name="actualStartDate"><display/></field>
         <field name="actualEndDate"><display/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteQuoteWorkEffort">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteQuoteWorkEffort" also-hidden="false">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="quoteId"/>
             </hyperlink>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml Sat Nov  5 14:14:04 2016
@@ -131,7 +131,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="OpenOrderItemsReport">
         <field name="orderDate" title="${uiLabelMap.OrderDate}"><display/></field>
         <field name="orderId" title="${uiLabelMap.OrderOrderId}" widget-style="buttontext">
-            <hyperlink target="orderview" description="${orderId}">
+            <hyperlink description="${orderId}" target="orderview">
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
@@ -169,14 +169,14 @@ under the License.
         header-row-style="header-row" default-table-style="basic-table" target-window="_BLANK">
         <field name="fromPartyId" title="${uiLabelMap.AccountingFromParty}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PartyRoleAndPartyDetail" description="${groupName} ${firstName} ${lastName} [${partyId}]" key-field-name="partyId">
+                <entity-options entity-name="PartyRoleAndPartyDetail" key-field-name="partyId" description="${groupName} ${firstName} ${lastName} [${partyId}]">
                     <entity-constraint name="roleTypeId" operator="equals" value="SUPPLIER"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="toPartyId" title="${uiLabelMap.AccountingToPartyId}">
             <check all-checked="false">
-                <entity-options entity-name="PartyAcctgPrefAndGroup" description="${groupName} ${firstName} ${lastName} [${partyId}]" key-field-name="partyId"/>
+                <entity-options entity-name="PartyAcctgPrefAndGroup" key-field-name="partyId" description="${groupName} ${firstName} ${lastName} [${partyId}]"/>
             </check>
         </field>
         <field name="orderStatusId">

Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequirementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequirementForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequirementForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequirementForms.xml Sat Nov  5 14:14:04 2016
@@ -236,7 +236,7 @@ under the License.
     <form name="ApproveRequirements" type="multi" use-row-submit="true" target="approveRequirements" title="" list-name="requirements"
         paginate-target="ApproveRequirements" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="requirementId" widget-style="buttontext">
-            <hyperlink also-hidden="true" description="${requirementId}" target="EditRequirement">
+            <hyperlink description="${requirementId}" target="EditRequirement" also-hidden="true">
                 <parameter param-name="requirementId"/>
             </hyperlink>
         </field>
@@ -300,12 +300,12 @@ under the License.
             </service>
         </actions>
         <field name="requirementId" widget-style="buttontext">
-            <hyperlink also-hidden="true" description="${requirementId}" target="EditRequirement">
+            <hyperlink description="${requirementId}" target="EditRequirement" also-hidden="true">
                 <parameter param-name="requirementId"/>
             </hyperlink>
         </field>
         <field name="productId" widget-style="buttontext">
-            <hyperlink also-hidden="true" target-type="inter-app" description="${productId}" target="/catalog/control/EditProductInventoryItems" target-window="top">
+            <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" target-window="top" also-hidden="true" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -319,7 +319,7 @@ under the License.
             </display-entity>
         </field>
         <field name="supplierProductId" title="${uiLabelMap.ProductSupplierProductId}">
-            <hyperlink target="/catalog/control/EditProductSuppliers?productId=${productId}" description="${supplierProductId}" target-type="inter-app"/>
+            <hyperlink description="${supplierProductId}" target="/catalog/control/EditProductSuppliers?productId=${productId}" target-type="inter-app"/>
         </field>
         <field name="idValue" title="${uiLabelMap.ProductUPCA}"><display/></field>
         <field name="minimumOrderQuantity" widget-area-style="align-text"><display/></field>
@@ -334,12 +334,12 @@ under the License.
         <field name="billToCustomerPartyId"><hidden value="${parameters.billToCustomerPartyId}"/></field>
         <field name="supplierPartyId"><hidden value="${parameters.partyId}"/></field>
         <field name="requirementId" widget-style="buttontext">
-            <hyperlink also-hidden="true" description="${requirementId}" target="EditRequirement">
+            <hyperlink description="${requirementId}" target="EditRequirement" also-hidden="true">
                 <parameter param-name="requirementId"/>
             </hyperlink>
         </field>
         <field name="productId" widget-style="buttontext">
-            <hyperlink also-hidden="true" target-type="inter-app" description="${productId}" target="/catalog/control/EditProductInventoryItems" target-window="top">
+            <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" target-window="top" also-hidden="true" target-type="inter-app">
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
@@ -367,7 +367,7 @@ under the License.
         header-row-style="header-row" default-table-style="basic-table">
         <field name="orderId" id-name="orderId_o_0"><text/></field>
         <field name="submitButton" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.OrderInputQuickPurchaseOrder}" target="javascript:document.ApprovedProductRequirements.orderId_o_0.value=document.ApprovedProductRequirementsSubmit.orderId_o_0.value;document.ApprovedProductRequirements.submit()"/>
+            <hyperlink description="${uiLabelMap.OrderInputQuickPurchaseOrder}" target="javascript:document.ApprovedProductRequirements.orderId_o_0.value=document.ApprovedProductRequirementsSubmit.orderId_o_0.value;document.ApprovedProductRequirements.submit()" also-hidden="false" target-type="plain"/>
         </field>
     </form>
     <form name="ApprovedProductRequirementsSummary" type="single" default-map-name="quantityReport" target="ApprovedProductRequirements"
@@ -391,7 +391,7 @@ under the License.
         <field name="productId" title="${uiLabelMap.OrderVendorRequirementCount}" widget-area-style="align-text"><display also-hidden="false"/></field>
         <field name="billToCustomerPartyId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${lastName} ${groupName} (${partyId})" key-field-name="partyId">
+                <entity-options entity-name="PartyRoleAndPartyDetail" key-field-name="partyId" description="${firstName} ${lastName} ${groupName} (${partyId})">
                     <entity-constraint name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
                     <entity-order-by field-name="firstName"/>
                     <entity-order-by field-name="lastName"/>
@@ -402,7 +402,7 @@ under the License.
         <field name="prepareFind"><hidden value="Y"/></field>
         <field name="facilityId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Facility" description="${facilityName} (${facilityId})" key-field-name="facilityId">
+                <entity-options entity-name="Facility" key-field-name="facilityId" description="${facilityName} (${facilityId})">
                     <entity-order-by field-name="facilityName"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/party/minilang/communication/CommunicationEventServices.xml Sat Nov  5 14:14:04 2016
@@ -135,7 +135,7 @@ under the License.
                         <field-map field-name="contactMechId" from-field="newEntity.contactMechIdFrom"/>
                         <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
                     </entity-and>
-                    <first-from-list entry="partyContactMech" list="partyContactMechs"/>
+                    <first-from-list list="partyContactMechs" entry="partyContactMech"/>
                     <set field="newEntity.partyIdFrom" from-field="partyContactMech.partyId"/>
                 </if-not-empty>
             </if-empty>
@@ -157,7 +157,7 @@ under the License.
                         <field-map field-name="contactMechId" from-field="newEntity.contactMechIdTo"/>
                         <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
                     </entity-and>
-                    <first-from-list entry="partyContactMech" list="partyContactMechs"/>
+                    <first-from-list list="partyContactMechs" entry="partyContactMech"/>
                     <set field="newEntity.partyIdTo" from-field="partyContactMech.partyId"/>
                 </if-not-empty>
             </if-empty>
@@ -261,7 +261,7 @@ under the License.
                     <field-map field-name="contactMechId" from-field="parameters.contactMechIdTo"/>
                     <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
                 </entity-and>
-                <first-from-list entry="partyContactMech" list="partyContactMechs"/>
+                <first-from-list list="partyContactMechs" entry="partyContactMech"/>
                 <set field="parameters.partyIdTo" from-field="partyContactMech.partyId"/>
             </if-not-empty>
         </if-empty>
@@ -443,7 +443,7 @@ under the License.
                         <field-map field-name="contactMechTypeId" from-field="communicationEventType.contactMechTypeId"/>
                         <order-by field-name="-fromDate"/>
                     </entity-and>
-                    <first-from-list entry="contactMech" list="contactMechs"/>
+                    <first-from-list list="contactMechs" entry="contactMech"/>
                     <set field="newEntity.contactMechId" from-field="contactMech.contactMechId"/>
                 </if-not-empty>
             </if-empty>
@@ -451,7 +451,7 @@ under the License.
         </if-empty>
     </simple-method>
     <simple-method method-name="updateCommunicationEventRole" short-description="Create a CommunicationEventRole">
-        <entity-one value-field="eventRole" entity-name="CommunicationEventRole"/>
+        <entity-one entity-name="CommunicationEventRole" value-field="eventRole"/>
         <if-not-empty field="eventRole">
             <set-nonpk-fields map="parameters" value-field="eventRole"/>
             <store-value value-field="eventRole"/>
@@ -558,7 +558,7 @@ under the License.
                                 </entity-one>
                                 <if-not-empty field="communicationEventRole">
                                     <if-compare operator="not-equals" value="COM_ROLE_COMPLETED" field="comunnicationEventRole.statusId">
-                                        <set-service-fields service-name="updateCommunicationEventRole" to-map="updateRole" map="communicationEventRole"/>
+                                        <set-service-fields service-name="updateCommunicationEventRole" map="communicationEventRole" to-map="updateRole"/>/>
                                         <set field="updateRole.statusId" value="COM_ROLE_COMPLETED"/>
                                         
                                         <call-service service-name="updateCommunicationEventRole" in-map-name="updateRole"/>
@@ -580,7 +580,7 @@ under the License.
                 <field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/>
                 <field-map field-name="partyId" from-field="parameters.partyId"/>
             </entity-and>
-            <first-from-list entry="eventRole" list="communicationEventRoles"/>
+            <first-from-list list="communicationEventRoles" entry="eventRole"/>
             <set field="parameters.roleTypeId" from-field="eventRole.roleTypeId"/>
             <else>
                 <entity-one entity-name="CommunicationEventRole" value-field="eventRole"/>

Modified: ofbiz/trunk/applications/party/minilang/contact/PartyContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/contact/PartyContactMechServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/minilang/contact/PartyContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/minilang/contact/PartyContactMechServices.xml Sat Nov  5 14:14:04 2016
@@ -80,7 +80,7 @@ under the License.
         <set-pk-fields value-field="partyContactMechMap" map="parameters"/>
         <find-by-and entity-name="PartyContactMech" list="partyContactMechs" map="partyContactMechMap"/>
         <filter-list-by-date list="partyContactMechs" to-list="validPartyContactMechs"/>
-        <first-from-list entry="partyContactMech" list="validPartyContactMechs"/>
+        <first-from-list list="validPartyContactMechs" entry="partyContactMech"/>
         <if-empty field="partyContactMech">
             <add-error><fail-property resource="PartyUiLabels" property="PartyCannotUpdateContactBecauseNotWithSpecifiedParty"/></add-error>
         </if-empty>
@@ -152,7 +152,7 @@ under the License.
         <set-pk-fields value-field="partyContactMechMap" map="parameters"/>
         <find-by-and entity-name="PartyContactMech" list="partyContactMechs" map="partyContactMechMap"/>
         <filter-list-by-date list="partyContactMechs" to-list="validPartyContactMechs"/>
-        <first-from-list entry="partyContactMech" list="validPartyContactMechs"/>
+        <first-from-list list="validPartyContactMechs" entry="partyContactMech"/>
         <if-empty field="partyContactMech">
             <add-error>
                 <fail-property resource="PartyUiLabels" property="PartyContactMechNotFoundCannotDelete"/>
@@ -269,7 +269,7 @@ under the License.
         <check-errors/>
 
         <!-- if e-mail address already exists simply return -->
-        <entity-condition list="partyAndContactMechs" entity-name="PartyAndContactMech">
+        <entity-condition entity-name="PartyAndContactMech" list="partyAndContactMechs">
             <condition-list combine="and">
                 <condition-expr field-name="partyId" from-field="parameters.partyId"/>
                 <condition-expr field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
@@ -279,7 +279,7 @@ under the License.
         <filter-list-by-date list="partyAndContactMechs"/>
         <if-not-empty field="partyAndContactMechs">
             <log level="info" message="E-mail address: ${parameters.emailAddress} already exists, did not add again.."/>
-            <first-from-list entry="existsPartyAndContactMech" list="partyAndContactMechs"/>
+            <first-from-list list="partyAndContactMechs" entry="existsPartyAndContactMech"/>
             <field-to-result field="existsPartyAndContactMech.contactMechId" result-name="contactMechId"/>
             <field-to-request field="existsPartyAndContactMech.contactMechId" request-name="contactMechId"/>
             <return/>
@@ -419,7 +419,7 @@ under the License.
 
     <simple-method method-name="createPostalAddressAndPurposes" short-description="Create postal address, purposes and set them defaults" login-required="false">
         <if-not-empty field="parameters.roleTypeId">
-            <entity-one value-field="partyRole" entity-name="PartyRole" />
+            <entity-one entity-name="PartyRole" value-field="partyRole" />
             <if-empty field="partyRole">
                 <set field="roleTypeId" from-field="parameters.roleTypeId"/>
                 <add-error><fail-property resource="PartyUiLabels" property="PartyRoleTypeNotFoundForTheParty"/></add-error>
@@ -446,7 +446,7 @@ under the License.
                         <field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
                     </entity-and>
                     <if-not-empty field="pcmpList">
-                        <first-from-list entry="pcmp" list="pcmpList"/>
+                        <first-from-list list="pcmpList" entry="pcmp"/>
                         <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/>
                         <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
                         <clear-field field="serviceInMap"/>
@@ -465,7 +465,7 @@ under the License.
                         <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
                     </entity-and>
                     <if-not-empty field="pcmpList">
-                        <first-from-list entry="pcmp" list="pcmpList"/>
+                        <first-from-list list="pcmpList" entry="pcmp"/>
                         <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/>
                         <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
                     </if-not-empty>

Modified: ofbiz/trunk/applications/party/minilang/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/customer/CustomerEvents.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/minilang/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/party/minilang/customer/CustomerEvents.xml Sat Nov  5 14:14:04 2016
@@ -262,7 +262,7 @@ under the License.
         <!-- the above copy is okay since we checked already that they are the same -->
         <call-service service-name="createPersonAndUserLogin" in-map-name="personUserLoginContext">
             <result-to-field result-name="partyId" field="tempMap.partyId"/>
-            <result-to-field field="createdUserLogin" result-name="newUserLogin"/>
+            <result-to-field result-name="newUserLogin" field="createdUserLogin"/>
         </call-service>
         <set-current-user-login value-field="createdUserLogin"/>
 

Modified: ofbiz/trunk/applications/party/minilang/party/PartyInvitationServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/party/PartyInvitationServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/minilang/party/PartyInvitationServices.xml (original)
+++ ofbiz/trunk/applications/party/minilang/party/PartyInvitationServices.xml Sat Nov  5 14:14:04 2016
@@ -92,7 +92,7 @@ under the License.
         <if-not-empty field="partyInvitationRoleAssocs">
             <set field="createPartyRoleCtx.partyId" from-field="parameters.partyId"/>
             <iterate list="partyInvitationRoleAssocs" entry="partyInvitationRoleAssoc">
-                <entity-one value-field="partyRole" entity-name="PartyRole">
+                <entity-one entity-name="PartyRole" value-field="partyRole">
                     <field-map field-name="roleTypeId" from-field="partyInvitationRoleAssoc.roleTypeId"/>
                 </entity-one>
                 <if-empty field="partyRole">