svn commit: r1768209 [6/9] - in /ofbiz/trunk: applications/accounting/minilang/budget/ applications/accounting/minilang/finaccount/ applications/accounting/minilang/fixedasset/ applications/accounting/minilang/invoice/ applications/accounting/minilang/...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1768209 [6/9] - in /ofbiz/trunk: applications/accounting/minilang/budget/ applications/accounting/minilang/finaccount/ applications/accounting/minilang/fixedasset/ applications/accounting/minilang/invoice/ applications/accounting/minilang/...

diveshdutta
Modified: ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml Sat Nov  5 12:41:35 2016
@@ -87,7 +87,7 @@ under the License.
         </if-not-empty>
         <set field="maxNumberOfOrders" type="Long" from-field="parameters.maxNumberOfOrders" set-if-empty="true"/>
         <set field="numberSoFar" type="Long" value="0"/>
-        <iterate entry="orderHeader" list="orderHeaderList">
+        <iterate list="orderHeaderList" entry="orderHeader">
             <log level="info" message="Checking order #${orderHeader.orderId} to add to picklist"/>
             <!-- get all ship groups, and iterate over them for each order -->
             <entity-and entity-name="OrderItemShipGroup" list="orderItemShipGroupList">
@@ -203,7 +203,7 @@ under the License.
             </else>
             </if>
 
-            <iterate entry="orderItemShipGroup" list="orderItemShipGroupList">
+            <iterate list="orderItemShipGroupList" entry="orderItemShipGroup">
                 <!-- get the order items and the order item inventory res entries -->
                 <if>
                     <condition>
@@ -230,7 +230,7 @@ under the License.
                         <set value="N" field="needsStockMove"/>
                         <set value="Y" field="allPickStarted"/>
                         <set value="N" field="hasStockToPick"/>
-                        <iterate entry="orderItemShipGrpInvRes" list="orderItemShipGrpInvResList">
+                        <iterate list="orderItemShipGrpInvResList" entry="orderItemShipGrpInvRes">
                             <get-related-one value-field="orderItemShipGrpInvRes" relation-name="OrderItem" to-value-field="orderItem"/>
                             <if-compare field="orderItem.statusId" value="ITEM_APPROVED" operator="not-equals">
                                 <set value="N" field="pickThisOrder"/>
@@ -466,7 +466,7 @@ under the License.
         <!-- if maxNumberOfOrders is passed, get at most that many orders and go over them -->
         <!-- moved above in findOrdersToPickMove
         <calculate field="numberSoFar" type="Long"><number value="0"/></calculate>
-        <iterate entry="pickMoveInfo" list="pickMoveInfoList">
+        <iterate list="pickMoveInfoList" entry="pickMoveInfo">
             <if>
                 <condition>
                     <or>
@@ -485,15 +485,15 @@ under the License.
         </iterate>
         -->
 
-        <iterate entry="pickMoveInfo" list="pickMoveInfoList">
-            <iterate entry="orderReadyToPickInfo" list="pickMoveInfo.orderReadyToPickInfoList">
-                <iterate entry="orderItemAndShipGroupAssoc" list="orderReadyToPickInfo.orderItemAndShipGroupAssocList">
+        <iterate list="pickMoveInfoList" entry="pickMoveInfo">
+            <iterate list="pickMoveInfo.orderReadyToPickInfoList" entry="orderReadyToPickInfo">
+                <iterate list="orderReadyToPickInfo.orderItemAndShipGroupAssocList" entry="orderItemAndShipGroupAssoc">
                     <if-compare value="ITEM_APPROVED" operator="equals" field="orderItemAndShipGroupAssoc.statusId">
                         <calculate field="reservedQuantity"><number value="0"/></calculate>
 
                         <set from-field="orderItemAndShipGroupAssoc.orderItemSeqId" field="itemFilterMap.orderItemSeqId"/>
                         <filter-list-by-and map="itemFilterMap" list="orderReadyToPickInfo.orderItemShipGrpInvResList" to-list="perItemResList"/>
-                        <iterate entry="orderItemShipGrpInvRes" list="perItemResList">
+                        <iterate list="perItemResList" entry="orderItemShipGrpInvRes">
                             <set from-field="orderItemShipGrpInvRes.inventoryItemId" field="inventoryItemId"/>
                             <!-- update reserved quantity per inventoryItem, keep track of orderItems this came from -->
                             <set from-field="inventoryItems[inventoryItemId]" field="inventoryItem"/>
@@ -542,7 +542,7 @@ under the License.
                         <!-- must include issued items as well, otherwise can't really do an effective check... -->
                         <get-related value-field="orderItemAndShipGroupAssoc" relation-name="ItemIssuance" list="itemIssuances"/>
                         <calculate field="issuedQuantity"><number value="0"/></calculate>
-                        <iterate entry="itemIssuance" list="itemIssuances">
+                        <iterate list="itemIssuances" entry="itemIssuance">
                             <calculate field="issuedQuantity">
                                 <calcop field="issuedQuantity" operator="get"/>
                                 <calcop field="itemIssuance.quantity" operator="get"/>
@@ -637,7 +637,7 @@ under the License.
 
             <!-- iterate over the orderHeaderInfoList and create a PicklistBin for each order and a PicklistItem for each item -->
             <calculate field="binLocationNumber" type="Long"><number value="1"/></calculate>
-            <iterate entry="orderHeaderInfo" list="orderHeaderInfoList">
+            <iterate list="orderHeaderInfoList" entry="orderHeaderInfo">
                 <clear-field field="picklistBinId"/>
                 <clear-field field="createPicklistBinMap"/>
                 <set from-field="picklistId" field="createPicklistBinMap.picklistId"/>
@@ -651,8 +651,8 @@ under the License.
                 <calculate field="binLocationNumber" type="Long"><calcop field="binLocationNumber" operator="add"/><number value="1"/></calculate>
                 <set field="itemsInBin" type="Long" value="0"/>
 
-                <iterate entry="orderItemInfo" list="orderHeaderInfo.orderItemInfoList">
-                    <iterate entry="orderItemShipGrpInvRes" list="orderItemInfo.orderItemShipGrpInvResList">
+                <iterate list="orderHeaderInfo.orderItemInfoList" entry="orderItemInfo">
+                    <iterate list="orderItemInfo.orderItemShipGrpInvResList" entry="orderItemShipGrpInvRes">
                         <log level="info" message="Getting pick quantity : ${orderItemShipGrpInvRes.quantity} - ${orderItemShipGrpInvRes.quantityNotAvailable}"/>
                         <set field="quantityToPick" from-field="orderItemShipGrpInvRes.quantity"/>
                         <!--If a portion of the item is not available, then reduce the quantity to pick.  For example,
@@ -716,12 +716,12 @@ under the License.
     <simple-method method-name="printPickSheets" short-description="Print pick sheets for orders">
         <if-empty field="parameters.maxNumberOfOrdersToPrint">
             <add-error error-list-name="error_list">
-                <fail-property property="ProductNumberOfOrdersMustNotBeEmptyToPrintPickSheet" resource="ProductErrorUiLabels"/>
+                <fail-property resource="ProductErrorUiLabels" property="ProductNumberOfOrdersMustNotBeEmptyToPrintPickSheet"/>
             </add-error>
         <else>
             <if-compare field="parameters.maxNumberOfOrdersToPrint" operator="less-equals" value="0" type="Long">
                 <add-error error-list-name="error_list">
-                    <fail-property property="ProductNumberOfOrdersMustBeGreaterThenZeroToPrintPickSheet" resource="ProductErrorUiLabels"/>
+                    <fail-property resource="ProductErrorUiLabels" property="ProductNumberOfOrdersMustBeGreaterThenZeroToPrintPickSheet"/>
                 </add-error>
             </if-compare>
         </else>
@@ -791,8 +791,8 @@ under the License.
             <if-compare-field field="parameters.statusId" to-field="lookedUpValue.statusId" operator="not-equals">
                 <!-- make sure a StatusValidChange record exists, if not return error -->
                 <entity-one entity-name="StatusValidChange" value-field="checkStatusValidChange" auto-field-map="false">
-                    <field-map from-field="lookedUpValue.statusId" field-name="statusId"/>
-                    <field-map from-field="parameters.statusId" field-name="statusIdTo"/>
+                    <field-map field-name="statusId" from-field="lookedUpValue.statusId"/>
+                    <field-map field-name="statusIdTo" from-field="parameters.statusId"/>
                 </entity-one>
                 <if-empty field="checkStatusValidChange">
                     <set value="ERROR: Changing the status from ${lookedUpValue.statusId} to ${parameters.statusId} is not allowed." field="error_list[]"/>
@@ -874,8 +874,8 @@ under the License.
             <if-compare-field field="parameters.itemStatusId" to-field="lookedUpValue.itemStatusId" operator="not-equals">
                 <!-- make sure a StatusValidChange record exists, if not return error -->
                 <entity-one entity-name="StatusValidChange" value-field="checkStatusValidChange" auto-field-map="false">
-                    <field-map from-field="lookedUpValue.itemStatusId" field-name="statusId"/>
-                    <field-map from-field="parameters.itemStatusId" field-name="statusIdTo"/>
+                    <field-map field-name="statusId" from-field="lookedUpValue.itemStatusId"/>
+                    <field-map field-name="statusIdTo" from-field="parameters.itemStatusId"/>
                 </entity-one>
                 <if-empty field="checkStatusValidChange">
                     <set value="ERROR: Changing the status from ${lookedUpValue.itemStatusId} to ${parameters.itemStatusId} is not allowed." field="error_list[]"/>
@@ -928,7 +928,7 @@ under the License.
         <set value="ko" field="linkProductAndLot"/>
         
         <!-- ... and check if one of the inventoryItems have this productId -->
-        <iterate entry="inventoryItem" list="inventoryItemList">
+        <iterate list="inventoryItemList" entry="inventoryItem">
             <if-compare-field operator="equals" to-field="inventoryItem.productId" field="parameters.productId">
                 <set value="ok" field="linkProductAndLot"/>
             </if-compare-field>
@@ -967,10 +967,10 @@ under the License.
         
            <!-- Retreive the informations about the OrderItemShipGrpInvRes of the edited PicklistItem -->
            <entity-one value-field="oisgir" entity-name="OrderItemShipGrpInvRes">
-               <field-map from-field="parameters.orderId" field-name="orderId"/>
-               <field-map from-field="parameters.shipGroupSeqId" field-name="shipGroupSeqId"/>
-               <field-map from-field="parameters.orderItemSeqId" field-name="orderItemSeqId"/>
-               <field-map from-field="parameters.inventoryItemId" field-name="inventoryItemId"/>
+               <field-map field-name="orderId" from-field="parameters.orderId"/>
+               <field-map field-name="shipGroupSeqId" from-field="parameters.shipGroupSeqId"/>
+               <field-map field-name="orderItemSeqId" from-field="parameters.orderItemSeqId"/>
+               <field-map field-name="inventoryItemId" from-field="parameters.inventoryItemId"/>
            </entity-one>
           
            <!-- We remove the edited PicklistItem ... -->
@@ -997,7 +997,7 @@ under the License.
           
            <!-- If the new OrderItemShipGrpInvRes don't contains all of the item, we recreate OrderItemShipGrpInvRes
                with the previous parameters -->
-           <if-compare-field operator="less" field="parameters.quantity" to-field="picklistItem.quantity" type="Integer">
+           <if-compare-field field="parameters.quantity" operator="less" to-field="picklistItem.quantity" type="Integer">
                <clear-field field="inputMap"/>
               
                <set from-field="parameters.orderId" field="inputMap.orderId"/>
@@ -1045,7 +1045,7 @@ under the License.
            <clear-field field="inputMap"/>
           
            <!-- We create the PicklistItem who correspond at the new(s) OrderItemShipGrpInvRes -->
-           <iterate entry="oisgir" list="oisgirs">
+           <iterate list="oisgirs" entry="oisgir">
               
                <!-- actionOnPli can have 3 values :
                    - new : the picklistItem has never existed and is created by this service
@@ -1065,8 +1065,8 @@ under the License.
                </if-not-empty>
               
                <iterate entry="pli" list="picklistItemList">
-                   <if-compare-field operator="equals" field="pli.inventoryItemId" to-field="oisgir.inventoryItemId">
-                       <if-compare-field operator="equals" field="pli.quantity" to-field="quantity">
+                   <if-compare-field field="pli.inventoryItemId" operator="equals" to-field="oisgir.inventoryItemId">
+                       <if-compare-field field="pli.quantity" operator="equals" to-field="quantity">
                            <set field="actionOnPli" value="none" />
                            <else>
                                <set field="actionOnPli" value="edit" />
@@ -1158,7 +1158,7 @@ under the License.
                 <condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_CANCELLED"/>
             </condition-list>
         </entity-count>
-        <iterate entry="picklist" list="picklistList">
+        <iterate list="picklistList" entry="picklist">
             <call-simple-method method-name="getPicklistSingleInfoInline"/>
             <field-to-list field="picklistInfo" list="picklistInfoList"/>
         </iterate>
@@ -1193,10 +1193,10 @@ under the License.
         <field-to-result field="picklistInfo"/>
 
         <!-- Assemble the information per facility location for the pick sheet -->
-        <iterate entry="picklistBinInfo" list="picklistInfo.picklistBinInfoList">
+        <iterate list="picklistInfo.picklistBinInfoList" entry="picklistBinInfo">
             <set from-field="picklistBinInfo.picklistBin" field="picklistBinByIdMap[picklistBinInfo.picklistBin.picklistBinId]"/>
 
-            <iterate entry="picklistItemInfo" list="picklistBinInfo.picklistItemInfoList">
+            <iterate list="picklistBinInfo.picklistItemInfoList" entry="picklistItemInfo">
                 <!--
                     In this iteration through the items we want 2 things:
                       1. A Map with all FacilityLocation records by locationSeqId, so that we have one unique of each
@@ -1252,13 +1252,13 @@ under the License.
         <order-value-list list="facilityLocationList" order-by-list="facilityLocsOrdLst"/>
 
         <!-- Now we have an ordered list of FacilityLocations, create a facilityLocationInfoList -->
-        <iterate entry="facilityLocation" list="facilityLocationList">
+        <iterate list="facilityLocationList" entry="facilityLocation">
             <clear-field field="facilityLocationInfo"/>
             <set from-field="facilityLocation" field="facilityLocationInfo.facilityLocation"/>
             <set from-field="picklistItemInfoListByLocationSeqIdMap[facilityLocation.locationSeqId]" field="facilityLocationInfo.picklistItemInfoList"/>
 
             <!-- make the pickQuantity and quantityByPicklistBinIdMap -->
-            <iterate entry="picklistItemInfo" list="facilityLocationInfo.picklistItemInfoList">
+            <iterate list="facilityLocationInfo.picklistItemInfoList" entry="picklistItemInfo">
                 <calculate field="facilityLocationInfo.pickQuantity">
                     <calcop field="facilityLocationInfo.pickQuantity" operator="add">
                         <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
@@ -1305,13 +1305,13 @@ under the License.
         <order-value-list list="productList" order-by-list="productsOrdLst"/>
 
         <!-- Now we have an ordered list of Products, create a noLocationProductInfoList -->
-        <iterate entry="product" list="productList">
+        <iterate list="productList" entry="product">
             <clear-field field="productInfo"/>
             <set from-field="product" field="productInfo.product"/>
             <set from-field="picklistItemInfoListByProductIdMap[product.productId]" field="productInfo.picklistItemInfoList"/>
 
             <!-- make the pickQuantity and quantityByPicklistBinIdMap -->
-            <iterate entry="picklistItemInfo" list="productInfo.picklistItemInfoList">
+            <iterate list="productInfo.picklistItemInfoList" entry="picklistItemInfo">
                 <calculate field="productInfo.pickQuantity">
                     <calcop field="productInfo.pickQuantity" operator="add"/>
                     <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
@@ -1359,7 +1359,7 @@ under the License.
         <!-- expects a picklist GenericValue to be in the context, and creates a picklistInfo Map -->
         <clear-field field="picklistRoleInfoList"/>
         <get-related value-field="picklist" relation-name="PicklistRole" list="picklistRoleList"/>
-        <iterate entry="picklistRole" list="picklistRoleList">
+        <iterate list="picklistRoleList" entry="picklistRole">
             <clear-field field="picklistRoleInfo"/>
             <get-related-one value-field="picklistRole" relation-name="PartyNameView" to-value-field="picklistRoleInfo.partyNameView" use-cache="true"/>
             <get-related-one value-field="picklistRole" relation-name="RoleType" to-value-field="picklistRoleInfo.roleType" use-cache="true"/>
@@ -1369,7 +1369,7 @@ under the License.
 
         <clear-field field="picklistStatusHistoryInfoList"/>
         <get-related value-field="picklist" relation-name="PicklistStatusHistory" list="picklistStatusHistoryList"/>
-        <iterate entry="picklistStatusHistory" list="picklistStatusHistoryList">
+        <iterate list="picklistStatusHistoryList" entry="picklistStatusHistory">
             <clear-field field="picklistStatusHistoryInfo"/>
             <get-related-one value-field="picklistStatusHistory" relation-name="StatusItem" to-value-field="picklistStatusHistoryInfo.statusItem" use-cache="true"/>
             <get-related-one value-field="picklistStatusHistory" relation-name="ToStatusItem" to-value-field="picklistStatusHistoryInfo.statusItemTo" use-cache="true"/>
@@ -1382,7 +1382,7 @@ under the License.
 
         <set value="+binLocationNumber" field="picklistBinOrderList[]"/>
         <get-related value-field="picklist" relation-name="PicklistBin" list="picklistBinList" order-by-list="picklistBinOrderList"/>
-        <iterate entry="picklistBin" list="picklistBinList">
+        <iterate list="picklistBinList" entry="picklistBin">
             <clear-field field="picklistBinInfo"/>
             <get-related-one value-field="picklistBin" relation-name="PrimaryOrderHeader" to-value-field="picklistBinInfo.primaryOrderHeader"/>
             <get-related-one value-field="picklistBin" relation-name="PrimaryOrderItemShipGroup" to-value-field="picklistBinInfo.primaryOrderItemShipGroup"/>
@@ -1390,7 +1390,7 @@ under the License.
 
             <clear-field field="picklistItemInfoList"/>
             <get-related value-field="picklistBin" relation-name="PicklistItem" list="picklistItemList" use-cache="true"/>
-            <iterate entry="picklistItem" list="picklistItemList">
+            <iterate list="picklistItemList" entry="picklistItem">
                 <clear-field field="picklistItemInfo"/>
                 <get-related-one value-field="picklistItem" relation-name="OrderItem" to-value-field="picklistItemInfo.orderItem"/>
                 <get-related-one value-field="picklistItemInfo.orderItem" relation-name="Product" to-value-field="picklistItemInfo.product"/>
@@ -1505,14 +1505,14 @@ under the License.
         <order-value-list list="facilityLocations" order-by-list="facilityLocsOrdLst"/>
 
         <!-- for each facility location add an entry to the inventoryItemInfoList -->
-        <iterate entry="facilityLocation" list="facilityLocations">
+        <iterate list="facilityLocations" entry="facilityLocation">
             <!-- facilityLocationInfoList: facilityLocation, productInfoList (product, quantity, inventoryItemList, orderItemList) -->
             <clear-field field="facilityLocationInfo"/>
             <set from-field="facilityLocation" field="facilityLocationInfo.facilityLocation"/>
 
             <!-- inventoryItemInfoList: facilityLocation, inventoryItem, orderItems, quantity, product, statusItems -->
             <set from-field="inventoryItemsByLocation[facilityLocation.locationSeqId]" field="inventoryItemIdList"/>
-            <iterate entry="inventoryItemId" list="inventoryItemIdList">
+            <iterate list="inventoryItemIdList" entry="inventoryItemId">
                 <clear-field field="inventoryItemInfo"/>
                 <set from-field="facilityLocation" field="inventoryItemInfo.facilityLocation"/>
                 <set from-field="inventoryItems[inventoryItemId]" field="inventoryItemInfo.inventoryItem"/>
@@ -1531,7 +1531,7 @@ under the License.
                 </calculate>
                 <set from-field="inventoryItemInfo.inventoryItem" field="productInfoMap.${inventoryItemInfo.product.productId}.inventoryItemList[]"/>
                 <!-- put orderItems in Map by orderId:orderItemSeqId to make sure they are unique -->
-                <iterate entry="orderItem" list="inventoryItemInfo.orderItems">
+                <iterate list="inventoryItemInfo.orderItems" entry="orderItem">
                     <set from-field="orderItem" field="orderItemMap.${orderItem.orderId}:${orderItem.orderItemSeqId}"/>
                 </iterate>
             </iterate>
@@ -1551,7 +1551,7 @@ under the License.
         </iterate>
 
         <!-- add all noLocationInventoryItemIds to inventoryItemInfoList with all entries except facilityLocation -->
-        <iterate entry="inventoryItemId" list="noLocationInventoryItemIds">
+        <iterate list="noLocationInventoryItemIds" entry="inventoryItemId">
             <set from-field="inventoryItems${inventoryItemId}" field="inventoryItemInfo.inventoryItem"/>
             <set from-field="inventoryItemOrderItems[inventoryItemId]" field="inventoryItemInfo.orderItems"/>
             <set from-field="inventoryItemQuantities[inventoryItemId]" field="inventoryItemInfo.quantity"/>
@@ -1584,7 +1584,7 @@ under the License.
         <set field="allCancelled" type="Boolean" value="true"/>
 
         <!-- determine if all the items are completed and/or cancelled -->
-        <iterate entry="item" list="picklistItem">
+        <iterate list="picklistItem" entry="item">
             <log level="info" message="checking status for item: ${item}"/>
             <if-compare field="item.itemStatusId" value="PICKITEM_CANCELLED" operator="not-equals">
                 <log level="info" message="item is not cancelled; all cancelled set to false"/>
@@ -1618,12 +1618,12 @@ under the License.
             <field-map field-name="picklistId" from-field="parameters.picklistId"/>
         </entity-and>
         <if-not-empty field="picklistBinList">
-            <iterate entry="picklistBin" list="picklistBinList">
+            <iterate list="picklistBinList" entry="picklistBin">
                 <entity-and entity-name="PicklistItem" list="itemList">
                     <field-map field-name="picklistBinId" from-field="picklistBin.picklistBinId"/>
                 </entity-and>
                 <if-not-empty field="itemList">
-                    <iterate entry="item" list="itemList">
+                    <iterate list="itemList" entry="item">
                         <set field="item.itemStatusId" value="PICKITEM_CANCELLED"/>
                         <store-value value-field="item"/>
                     </iterate>

Modified: ofbiz/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml Sat Nov  5 12:41:35 2016
@@ -273,7 +273,7 @@ under the License.
                 </entity-count>
                 <set field="nonProductItems" type="Long" value="0"/>
 
-                <iterate entry="returnItem" list="returnItems">
+                <iterate list="returnItems" entry="returnItem">
                     <!-- record this return item on the return shipment as well.  not sure if this is actually necessary... -->
                     <clear-field field="shipItemCtx"/>
                     <set from-field="shipmentId" field="shipItemCtx.shipmentId"/>
@@ -284,7 +284,7 @@ under the License.
                         <result-to-field result-name="shipmentItemSeqId"/>
                     </call-service>
                 </iterate>
-                <iterate entry="returnItem" list="returnItems">
+                <iterate list="returnItems" entry="returnItem">
                     <clear-field field="receiveCtx"/>
 
                     <if-empty field="returnItem.expectedItemStatus">
@@ -411,7 +411,7 @@ under the License.
             <call-simple-method method-name="getTotalIssuedQuantityForOrderItem" xml-resource="component://product/minilang/shipment/issuance/IssuanceServices.xml"/>
             <call-simple-method method-name="getReceivedQuantityForOrderItem"/>
             <set field="receivedQuantity" value="${receivedQuantity$bigDecimal + parameters.quantity$bigDecimal}" type="BigDecimal"/>
-            <entity-and list="orderShipments" entity-name="OrderShipment">
+            <entity-and entity-name="OrderShipment" list="orderShipments">
                 <field-map field-name="orderId" from-field="orderItem.orderId"/>
                 <field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/>
                 <field-map field-name="shipmentId" from-field="shipmentItem.shipmentId"/>
@@ -444,11 +444,11 @@ under the License.
     
     <simple-method method-name="getReceivedQuantityForOrderItem" short-description="Computes the till now received quantity from all ShipmentReceipts">
         <set field="receivedQuantity" type="BigDecimal" value="0"/>
-        <entity-and list="shipmentReceipts" entity-name="ShipmentReceipt">
+        <entity-and entity-name="ShipmentReceipt" list="shipmentReceipts">
             <field-map field-name="orderId" from-field="orderItem.orderId"/>
             <field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/>
         </entity-and>
-        <iterate entry="shipmentReceipt" list="shipmentReceipts">
+        <iterate list="shipmentReceipts" entry="shipmentReceipt">
             <set field="receivedQuantity" value="${receivedQuantity$bigDecimal + shipmentReceipt.quantityAccepted$bigDecimal}" type="BigDecimal"/>
         </iterate>
     </simple-method>
@@ -469,7 +469,7 @@ under the License.
         </if-not-empty>
         <call-simple-method method-name="getReceivedQuantityForOrderItem"/>
         <if-compare-field field="orderItem.quantity" operator="less" to-field="receivedQuantity" type="BigDecimal">
-            <entity-and list="orderItemShipGroupAssocs" entity-name="OrderItemShipGroupAssoc">
+            <entity-and entity-name="OrderItemShipGroupAssoc" list="orderItemShipGroupAssocs">
                 <field-map field-name="orderId" from-field="orderItem.orderId"/>
                 <field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/>
             </entity-and>
@@ -508,7 +508,7 @@ under the License.
                     <set field="shipmentItem.quantity" value="${shipmentItem.quantity$bigDecimal + quantityToAdd$bigDecimal}" type="BigDecimal"/>
                     <store-value value-field="shipmentItem"/>
                     
-                    <entity-and list="orderShipments" entity-name="OrderShipment">
+                    <entity-and entity-name="OrderShipment" list="orderShipments">
                         <field-map field-name="orderId" from-field="parameters.orderId"/>
                         <field-map field-name="orderItemSeqId" from-field="parameters.orderItemSeqId"/>
                         <field-map field-name="shipmentId" from-field="parameters.shipmentId"/>

Modified: ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml Sat Nov  5 12:41:35 2016
@@ -126,8 +126,8 @@ under the License.
             <if-compare-field field="parameters.statusId" to-field="lookedUpValue.statusId" operator="not-equals">
                 <!-- make sure a StatusValidChange record exists, if not return error -->
                 <entity-one entity-name="StatusValidChange" value-field="checkStatusValidChange" auto-field-map="false">
-                    <field-map from-field="lookedUpValue.statusId" field-name="statusId"/>
-                    <field-map from-field="parameters.statusId" field-name="statusIdTo"/>
+                    <field-map field-name="statusId" from-field="lookedUpValue.statusId"/>
+                    <field-map field-name="statusIdTo" from-field="parameters.statusId"/>
                 </entity-one>
                 <if-empty field="checkStatusValidChange">
                     <string-to-list string="ERROR: Changing the status from ${lookedUpValue.statusId} to ${parameters.statusId} is not allowed." list="error_list"/>
@@ -340,7 +340,7 @@ under the License.
 
        <!-- The return shipment is created if the return contains one or more physical products -->
         <set field="isPhysicalProductAvailable" value="false" type="Boolean"/>
-        <iterate entry="returnItem" list="returnItems">
+        <iterate list="returnItems" entry="returnItem">
             <get-related-one value-field="returnItem" relation-name="Product" to-value-field="product"/>
             <if-not-empty field="product">
                 <call-class-method class-name="org.apache.ofbiz.product.product.ProductWorker" method-name="isPhysical" ret-field="isPhysicalProduct">
@@ -360,7 +360,7 @@ under the License.
         <check-errors/>
         <log level="info" message="Created new shipment ${shipmentId}"/>
 
-        <iterate entry="returnItem" list="returnItems">
+        <iterate list="returnItems" entry="returnItem">
 
             <!-- Shipment items are created only for physical products -->
             <set field="isPhysicalProduct" value="false" type="Boolean"/>
@@ -405,7 +405,7 @@ under the License.
         <entity-condition entity-name="ReturnItem" list="returnItems">
             <condition-expr field-name="returnId" operator="equals" from-field="parameters.primaryReturnId"/>
         </entity-condition>
-        <iterate entry="returnItem" list="returnItems">
+        <iterate list="returnItems" entry="returnItem">
             <clear-field field="shipItemCtx"/>
             <set from-field="shipmentId" field="shipItemCtx.shipmentId"/>
             <set from-field="returnItem.productId" field="shipItemCtx.productId"/>
@@ -750,7 +750,7 @@ under the License.
             <field-map field-name="roleTypeId" value="SUPPLIER_AGENT"/>
         </entity-and>
 
-        <iterate entry="supplierAgentOrderRole" list="supplierAgentOrderRoles">
+        <iterate list="supplierAgentOrderRoles" entry="supplierAgentOrderRole">
             <set from-field="supplierAgentOrderRole.partyId" field="sendToPartyIdMap[supplierAgentOrderRole.partyId]"/>
         </iterate>
 
@@ -761,7 +761,7 @@ under the License.
                 <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
             </entity-and>
 
-            <iterate entry="sendToPartyPartyAndContactMech" list="sendToPartyPartyAndContactMechs">
+            <iterate list="sendToPartyPartyAndContactMechs" entry="sendToPartyPartyAndContactMech">
                 <string-append field="sendEmailMap.sendTo" string="${sendToPartyPartyAndContactMech.infoString}" prefix=","/>
             </iterate>
         </iterate-map>
@@ -852,7 +852,7 @@ under the License.
         </entity-and>
         <if-not-empty field="shipmentPackageContents">
             <add-error>
-                <fail-property property="ProductErrorShipmentItemCannotBeDeleted" resource="ProductErrorUiLabels"/>
+                <fail-property resource="ProductErrorUiLabels" property="ProductErrorShipmentItemCannotBeDeleted"/>
             </add-error>
             <check-errors/>
         <else>
@@ -894,7 +894,7 @@ under the License.
         </entity-and>
 
         <set field="orderShipmentQuantityLeft" from-field="parameters.newItemQuantity"/>
-        <iterate entry="itemOrderShipment" list="itemOrderShipmentList">
+        <iterate list="itemOrderShipmentList" entry="itemOrderShipment">
             <if-compare field="orderShipmentQuantityLeft" operator="greater" value="0" type="BigDecimal">
                 <if-compare-field field="itemOrderShipment.quantity" to-field="orderShipmentQuantityLeft" operator="greater" type="BigDecimal">
                     <!-- there is enough in this OrderShipment record, so just adjust it and move on -->
@@ -996,7 +996,7 @@ under the License.
         </entity-and>
         <if-not-empty field="shipmentPackageContents">
             <add-error>
-                <fail-property property="ProductErrorShipmentPackageCannotBeDeleted" resource="ProductErrorUiLabels"/>
+                <fail-property resource="ProductErrorUiLabels" property="ProductErrorShipmentPackageCannotBeDeleted"/>
             </add-error>
             <check-errors/>
         <else>
@@ -1010,7 +1010,7 @@ under the License.
             <field-map field-name="shipmentId" from-field="shipmentId"/>
         </entity-and>
 
-        <iterate entry="shipmentRouteSegment" list="shipmentRouteSegments">
+        <iterate list="shipmentRouteSegments" entry="shipmentRouteSegment">
             <entity-one entity-name="ShipmentPackageRouteSeg" value-field="checkShipmentPackageRouteSeg" auto-field-map="false">
                 <field-map field-name="shipmentId" from-field="shipmentId"/>
                 <field-map field-name="shipmentPackageSeqId" from-field="shipmentPackageSeqId"/>
@@ -1171,7 +1171,7 @@ under the License.
         <entity-and entity-name="ShipmentPackage" list="shipmentPackages">
             <field-map field-name="shipmentId" from-field="shipmentId"/>
         </entity-and>
-        <iterate entry="shipmentPackage" list="shipmentPackages">
+        <iterate list="shipmentPackages" entry="shipmentPackage">
             <entity-one entity-name="ShipmentPackageRouteSeg" value-field="checkShipmentPackageRouteSeg" auto-field-map="false">
                 <field-map field-name="shipmentId" from-field="shipmentId"/>
                 <field-map field-name="shipmentRouteSegmentId" from-field="shipmentRouteSegmentId"/>
@@ -1371,7 +1371,7 @@ under the License.
             <field-map field-name="orderId" from-field="parameters.orderId"/>
             <field-map field-name="shipGroupSeqId" from-field="parameters.shipGroupSeqId"/>
         </entity-and>
-        <iterate entry="orderItemShipGroupAssoc" list="orderItemShipGroupAssocs">
+        <iterate list="orderItemShipGroupAssocs" entry="orderItemShipGroupAssoc">
             <get-related-one relation-name="OrderItem" value-field="orderItemShipGroupAssoc" to-value-field="orderItem"/>
 
             <!-- Set the item status to completed -->
@@ -1388,7 +1388,7 @@ under the License.
                 <field-map field-name="orderItemAssocTypeId" value="DROP_SHIPMENT"/>
             </entity-and>
             <if-not-empty field="orderItemAssocs">
-                <iterate entry="orderItemAssoc" list="orderItemAssocs">
+                <iterate list="orderItemAssocs" entry="orderItemAssoc">
                     <set field="itemStatusContext.orderId" from-field="orderItemAssoc.orderId"/>
                     <set field="itemStatusContext.orderItemSeqId" from-field="orderItemAssoc.orderItemSeqId"/>
                     <call-service service-name="changeOrderItemStatus" in-map-name="itemStatusContext"/>
@@ -1619,7 +1619,7 @@ under the License.
             </call-service>
             <entity-one entity-name="Shipment" value-field="shipment"/>
             <get-related value-field="orderHeader" relation-name="OrderItem" list="orderItems"/>
-            <iterate entry="orderItem" list="orderItems">
+            <iterate list="orderItems" entry="orderItem">
                 <entity-one entity-name="Product" value-field="itemProduct" auto-field-map="false" use-cache="true">
                     <field-map field-name="productId" from-field="orderItem.productId"/>
                 </entity-one>
@@ -1654,7 +1654,7 @@ under the License.
         <set-pk-fields value-field="orderItemShipGrpInvResLookupPk" map="parameters"/>
         <find-by-primary-key entity-name="OrderItemShipGrpInvRes" map="orderItemShipGrpInvResLookupPk" value-field="orderItemShipGrpInvRes"/>
         <get-related-one to-value-field="inventoryItem" relation-name="InventoryItem" value-field="orderItemShipGrpInvRes"/>
-        <if-compare-field operator="not-equals" field="inventoryItem.serialNumber" to-field="parameters.serialNumber">
+        <if-compare-field field="inventoryItem.serialNumber" operator="not-equals" to-field="parameters.serialNumber">
             <!-- The inventory that we have reserved is not what we shipped. Lets reReserve, this time we'll get what we want -->
             <set-service-fields map="parameters" to-map="reserveAnInventoryItemCtx" service-name="reserveAnInventoryItem"/>
             <call-service service-name="reserveAnInventoryItem" in-map-name="reserveAnInventoryItemCtx">
@@ -2009,7 +2009,7 @@ under the License.
         <entity-and entity-name="OrderShipment" list="orderShipmentList">
             <field-map field-name="shipmentId" from-field="parameters.shipmentId"/>
         </entity-and>
-        <iterate entry="orderShipment" list="orderShipmentList">
+        <iterate list="orderShipmentList" entry="orderShipment">
             <clear-field field="deleteOrderShipmentMap"/>
             <set-service-fields service-name="deleteOrderShipment" map="orderShipment" to-map="deleteOrderShipmentMap"/>
             <call-service service-name="deleteOrderShipment" in-map-name="deleteOrderShipmentMap"/>

Modified: ofbiz/trunk/applications/product/minilang/shipment/test/ShipmentTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/test/ShipmentTests.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/shipment/test/ShipmentTests.xml (original)
+++ ofbiz/trunk/applications/product/minilang/shipment/test/ShipmentTests.xml Sat Nov  5 12:41:35 2016
@@ -201,7 +201,7 @@ under the License.
 
     <simple-method method-name="testCreateShipmentRouteSegment" short-description="Test to create Shipment Route Segment" login-required="false">
         <log level="info" message="====================Create a Shipment Route Segment test case=========================================="/>
-        <entity-and list="shipments" entity-name="Shipment">
+        <entity-and entity-name="Shipment" list="shipments">
             <field-map field-name="primaryOrderId" value="DEMO10090"/>
             <field-map field-name="shipmentId" value="9998"/>
         </entity-and>

Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Sat Nov  5 12:41:35 2016
@@ -73,10 +73,10 @@ under the License.
                                 </container>
                             </decorator-section>
                             <decorator-section name="search-options">
-                                <include-form location="component://product/widget/catalog/ConfigForms.xml" name="FindProductConfigItemsFrom"/>
+                                <include-form name="FindProductConfigItemsFrom" location="component://product/widget/catalog/ConfigForms.xml"/>
                             </decorator-section>
                             <decorator-section name="search-results">
-                                <include-form location="component://product/widget/catalog/ConfigForms.xml" name="FindProductConfigItems"/>
+                                <include-form name="FindProductConfigItems" location="component://product/widget/catalog/ConfigForms.xml"/>
                             </decorator-section>
                         </decorator-screen>
                     </decorator-section>

Modified: ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml Sat Nov  5 12:41:35 2016
@@ -61,7 +61,7 @@ under the License.
                             <include-form name="FindProductPriceRules" location="component://product/widget/catalog/PriceForms.xml"/>
                         </screenlet>
                         <screenlet title="${uiLabelMap.ProductAddPriceRule}">
-                            <include-form location="component://product/widget/catalog/PriceForms.xml" name="AddPriceRules"/>
+                            <include-form name="AddPriceRules" location="component://product/widget/catalog/PriceForms.xml"/>
                         </screenlet>
                     </decorator-section>
                 </decorator-screen>

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml Sat Nov  5 12:41:35 2016
@@ -1950,7 +1950,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table" separate-columns="true">
         <actions>
             <entity-and entity-name="WorkEffortGoodStandard" use-cache="true" list="productWorkEfforts">
-                <field-map from-field="productId" field-name="productId"/>
+                <field-map field-name="productId" from-field="productId"/>
             </entity-and>
         </actions>
         <auto-fields-service service-name="updateWorkEffortGoodStandard" default-field-type="edit"/>

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Sat Nov  5 12:41:35 2016
@@ -432,7 +432,7 @@ under the License.
                     <order-by field-name="sequenceNum"/>
                 </entity-and>
                 <entity-and entity-name="ProductAssoc" list="parents">
-                    <field-map from-field="productId" field-name="productIdTo"/>
+                    <field-map field-name="productIdTo" from-field="productId"/>
                     <field-map field-name="productAssocTypeId"/>
                 </entity-and>
                 <entity-and entity-name="WorkEffortGoodStandard" list="routings">

Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Sat Nov  5 12:41:35 2016
@@ -331,7 +331,7 @@ under the License.
                 <set field="parameters.thruDate" type="Timestamp" from-field="parameters.thruDate"/>
                 <entity-one entity-name="ProductPromo" value-field="productPromo"/>
                 <entity-one entity-name="ProductPromoContent" value-field="productPromoContent"/>
-                <entity-and list="productPromoContents" entity-name="ProductPromoContent">
+                <entity-and entity-name="ProductPromoContent" list="productPromoContents">
                     <field-map field-name="productPromoId" from-field="productPromoId"/>
                 </entity-and>
             </actions>

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Sat Nov  5 12:41:35 2016
@@ -1440,7 +1440,7 @@ under the License.
                 <!-- get the default facility Uom -->
                 <entity-one entity-name="Facility" value-field="facility"/>
                 <entity-one entity-name="Uom" value-field="defaultWeightUom" use-cache="true" auto-field-map="false">
-                    <field-map from-field="facility.defaultWeightUomId" field-name="uomId"/>
+                    <field-map field-name="uomId" from-field="facility.defaultWeightUomId"/>
                 </entity-one>
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/minilang/permission/WorkEffortPermissionServices.xml Sat Nov  5 12:41:35 2016
@@ -221,7 +221,7 @@ under the License.
         <set field="parameters.mainAction" value="UPDATE"/>
         <call-simple-method method-name="workEffortGenericPermission"/>
         <check-errors/>
-        <if-compare-field operator="not-equals" field="parameters.partyId" to-field="userLogin.partyId">
+        <if-compare-field field="parameters.partyId" operator="not-equals" to-field="userLogin.partyId">
             <property-to-field resource="WorkEffortUiLabels" property="WorkEffortTimesheetNotInRolePermissionError" field="failMessage"/>
             <set field="hasPermission" type="Boolean" value="false"/>
             <field-to-result field="hasPermission"/>
@@ -268,7 +268,7 @@ under the License.
                 <filter-list-by-date list="rolePartyGroups"/>
                 <if-not-empty field="rolePartyGroups">
                     <!-- Check to see if User is member of any of these Party groups -->
-                    <iterate entry="rolePartyGroup" list="rolePartyGroups">
+                    <iterate list="rolePartyGroups" entry="rolePartyGroup">
                         <!-- check current party is the member of party group-->
                         <!-- PartyGroup partyId-->
                         <set from-field="rolePartyGroup.partyId" field="lookupPartyRoleMap.partyIdFrom"/>
@@ -353,7 +353,7 @@ under the License.
                         </else>
                         </if-compare>
                     </iterate>
-                    <if-compare value="PUBLISH_PROPS" field="workEffort.workEffortTypeId" operator="equals">
+                    <if-compare field="workEffort.workEffortTypeId" operator="equals" value="PUBLISH_PROPS">
                         <log level="verbose" message="Checking publish properties permission, isOwner = ${isOwner}, isDelegate = ${isDelegate}"/>
                         <if>
                             <condition>

Modified: ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml Sat Nov  5 12:41:35 2016
@@ -168,7 +168,7 @@ under the License.
                 </if-not-empty>
             </if-not-empty>
         </if-not-empty>
-        <iterate entry="timeEntry" list="timeEntryList">
+        <iterate list="timeEntryList" entry="timeEntry">
             <if>
                 <condition>
                     <or>
@@ -220,7 +220,7 @@ under the License.
                                 <result-to-field result-name="rateAmount"/>
                             </call-service>
                             <!--  check if the RateTypeId changed or the first time entry record and invoice item is not exist with the same amount and description-->
-                            <entity-and list="existAmountAndDescriptionInvoiceItems" entity-name="InvoiceItem">
+                            <entity-and entity-name="InvoiceItem" list="existAmountAndDescriptionInvoiceItems">
                                 <field-map field-name="invoiceId" from-field="invoiceItemMap.invoiceId"/>
                                 <field-map field-name="amount" from-field="rateAmount"/>
                                 <field-map field-name="description" from-field="invoiceItemMap.description"/>

Modified: ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Sat Nov  5 12:41:35 2016
@@ -99,10 +99,10 @@ under the License.
             <set field="updCustReq.statusId" value="CRQ_REVIEWED"/>
             <set field="updCustReq.webSiteId" from-field="parameters.webSiteId"/>
             <call-service service-name="setCustRequestStatus" in-map-name="updCustReq"/>
-            <entity-and list="custRequestContents" entity-name="CustRequestContent">
+            <entity-and entity-name="CustRequestContent" list="custRequestContents">
                 <field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
             </entity-and>
-            <iterate entry="custRequestContent" list="custRequestContents">
+            <iterate list="custRequestContents" entry="custRequestContent">
                 <set field="newWorkEffortContent.workEffortId" from-field="newEntity.workEffortId"/>
                 <set field="newWorkEffortContent.contentId" from-field="custRequestContent.contentId"/>
                 <set field="newWorkEffortContent.workEffortContentTypeId" value="SUPPORTING_MEDIA"/>
@@ -250,7 +250,7 @@ under the License.
         <if-compare field="copyRelatedValues" operator="equals" value="Y">
             <set field="excludeExpiredRelations" from-field="parameters.excludeExpiredRelations" default-value="N" />
             <set field="modelRelationList" from-field="groovy:delegator.getModelEntity('WorkEffort').getRelationsManyList();" />
-            <iterate entry="modelRelation" list="modelRelationList">
+            <iterate list="modelRelationList" entry="modelRelation">
                 <set field="relatedEntityName" from-field="groovy:modelRelation.getRelEntityName();" />
                 <if-compare field="relatedEntityName" operator="not-equals" value="WorkEffortAssoc">
                     <set field="relationName" from-field="groovy:modelRelation.getCombinedName();" />
@@ -264,7 +264,7 @@ under the License.
                                 <filter-list-by-date list="relationValues" />
                             </if-not-empty>
                         </if-compare>
-                        <iterate entry="relatedValue" list="relationValues">
+                        <iterate list="relationValues" entry="relatedValue">
                             <clone-value value-field="relatedValue" new-value-field="newRelatedValue" />
                             <set field="newRelatedValue[relatedIdFieldName]" from-field="targetWorkEffortId" />
                             <make-value value-field="newRelatedPks" entity-name="${relatedEntityName}" />
@@ -311,7 +311,7 @@ under the License.
             </add-error>
         </if-empty>
         <check-errors/>
-        <set-nonpk-fields value-field="communicationEventWorkEff" map="parameters"/>
+        <set-nonpk-fields map="parameters" value-field="communicationEventWorkEff"/>
         <store-value value-field="communicationEventWorkEff"/>
     </simple-method>
 
@@ -457,7 +457,7 @@ under the License.
         </if-empty>
 
         <if-compare-field to-field="newWorkEffortContactMech.contactMechId" field="parameters.contactMechId" operator="not-equals">
-            <set-nonpk-fields value-field="newWorkEffortContactMech" map="parameters" set-if-null="false"/>
+            <set-nonpk-fields map="parameters" value-field="newWorkEffortContactMech"/> set-if-null="false"/>
             <now-timestamp field="newWorkEffortContactMech.fromDate"/>
             <now-timestamp field="workEffortContactMech.thruDate"/>
             <create-value value-field="newWorkEffortContactMech"/>
@@ -658,8 +658,8 @@ under the License.
     <simple-method method-name="updateWorkEffortNote" short-description="Update Work Effort Note">
         <entity-one entity-name="WorkEffortNote" 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"/>
     </simple-method>
@@ -724,7 +724,7 @@ under the License.
         <if-compare field="excludeExpiredAssocs" operator="equals" value="Y">
             <filter-list-by-date list="workEffortAssocs" />
         </if-compare>
-        <iterate entry="workEffortAssoc" list="workEffortAssocs">
+        <iterate list="workEffortAssocs" entry="workEffortAssoc">
             <set field="workEffortIdTo" from-field="workEffortAssoc.workEffortIdTo" />
             <if-compare field="deepCopy" operator="equals" value="Y">
                 <clear-field field="copyWorkEffortCtx" />
@@ -1020,7 +1020,7 @@ under the License.
         <set field="duplicateWorkEffortAssocs" from-field="parameters.duplicateWorkEffortAssocs" default-value="N" />
         <if-compare field="duplicateWorkEffortAssocs" operator="equals" value="Y">
             <find-by-and entity-name="WorkEffortAssoc" map="workEffortAssocFindContext" list="foundValues" />
-            <iterate entry="foundValue" list="foundValues">
+            <iterate list="foundValues" entry="foundValue">
                 <clone-value value-field="foundValue" new-value-field="newTempValue" />
                 <set from-field="workEffortId" field="newTempValue.workEffortIdFrom" />
                 <create-value value-field="newTempValue" />
@@ -1028,7 +1028,7 @@ under the License.
             <entity-and entity-name="WorkEffortAssoc" list="foundValues">
                 <field-map field-name="workEffortIdTo" from-field="parameters.oldWorkEffortId" />
             </entity-and>
-            <iterate entry="foundValue" list="foundValues">
+            <iterate list="foundValues" entry="foundValue">
                 <clone-value value-field="foundValue" new-value-field="newTempValue" />
                 <set from-field="workEffortId" field="newTempValue.workEffortIdTo" />
                 <create-value value-field="newTempValue" />
@@ -1038,7 +1038,7 @@ under the License.
         <set field="duplicateWorkEffortNotes" from-field="parameters.duplicateWorkEffortNotes" default-value="N" />
         <if-compare field="duplicateWorkEffortNotes" operator="equals" value="Y">
             <find-by-and entity-name="WorkEffortNote" map="workEffortFindContext" list="foundValues" />
-            <iterate entry="foundValue" list="foundValues">
+            <iterate list="foundValues" entry="foundValue">
                 <clone-value value-field="foundValue" new-value-field="newTempValue" />
                 <set from-field="workEffortId" field="newTempValue.workEffortId" />
                 <create-value value-field="newTempValue" />
@@ -1047,7 +1047,7 @@ under the License.
         <set field="duplicateWorkEffortContents" from-field="parameters.duplicateWorkEffortContents" default-value="N" />
         <if-compare field="duplicateWorkEffortContents" operator="equals" value="Y">
             <find-by-and entity-name="WorkEffortContent" map="workEffortFindContext" list="foundValues" />
-            <iterate entry="foundValue" list="foundValues">
+            <iterate list="foundValues" entry="foundValue">
                 <clone-value value-field="foundValue" new-value-field="newTempValue" />
                 <set from-field="workEffortId" field="newTempValue.workEffortId" />
                 <create-value value-field="newTempValue" />
@@ -1057,7 +1057,7 @@ under the License.
         <if-compare field="duplicateWorkEffortAssignmentRates" operator="equals" value="Y">
             <find-by-and entity-name="RateAmount" map="workEffortFindContext" list="foundValuesAll" />
             <filter-list-by-date list="foundValuesAll" to-list="foundValues" />
-            <iterate entry="foundValue" list="foundValues">
+            <iterate list="foundValues" entry="foundValue">
                 <clone-value value-field="foundValue" new-value-field="newTempValue" />
                 <set from-field="workEffortId" field="newTempValue.workEffortId" />
                 <create-value value-field="newTempValue" />
@@ -1186,7 +1186,7 @@ under the License.
         <!-- add the planned hours together -->
         <get-related value-field="lowInfo" relation-name="WorkEffortSkillStandard" list="estimates"/>
         <if-not-empty field="estimates">
-            <iterate entry="estimate" list="estimates">
+            <iterate list="estimates" entry="estimate">
                 <if-not-empty field="estimate.estimatedDuration">
                     <if-not-empty field="highInfo.plannedHours">
                         <calculate field="highInfo.plannedHours" type="Double">
@@ -1204,7 +1204,7 @@ under the License.
         <!-- get the actual billed / non billed hours -->
         <get-related value-field="lowInfo" relation-name="TimeEntry" list="actuals"/>
         <if-not-empty field="actuals">
-            <iterate entry="actual" list="actuals">
+            <iterate list="actuals" entry="actual">
                 <if-not-empty field="actual.hours">
                     <get-related-one value-field="actual" relation-name="Timesheet" to-value-field="timesheet"/>
 
@@ -1320,7 +1320,7 @@ under the License.
                 <condition-expr field-name="roleTypeId" value="ICAL_MEMBER"/>
             </condition-list>
         </entity-condition>
-        <iterate entry="assignedParty" list="assignedParties">
+        <iterate list="assignedParties" entry="assignedParty">
             <entity-condition list="resultList" entity-name="WorkEffortAndPartyAssign" filter-by-date="true">
                 <condition-list combine="and">
                     <condition-expr field-name="scopeEnumId" value="WES_PUBLIC"/>
@@ -1331,10 +1331,10 @@ under the License.
             </entity-condition>
             <list-to-list list="resultList" to-list="workEfforts"/>
         </iterate>
-        <entity-and list="assignedFixedAssets" entity-name="WorkEffortFixedAssetAssign" filter-by-date="true">
+        <entity-and entity-name="WorkEffortFixedAssetAssign" list="assignedFixedAssets" filter-by-date="true">
             <field-map field-name="workEffortId" from-field="workEffortId"/>
         </entity-and>
-        <iterate entry="assignedFixedAsset" list="assignedFixedAssets">
+        <iterate list="assignedFixedAssets" entry="assignedFixedAsset">
             <entity-condition list="resultList" entity-name="WorkEffortAndFixedAssetAssign" filter-by-date="true">
                 <condition-list combine="and">
                     <condition-expr field-name="scopeEnumId" value="WES_PUBLIC"/>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Sat Nov  5 12:41:35 2016
@@ -511,8 +511,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>
@@ -649,8 +649,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="viewIndex" from-field="viewIndex"/>
                 <field-map field-name="viewSize" from-field="viewSize"/>
             </service>
@@ -733,8 +733,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>
@@ -1012,7 +1012,7 @@ under the License.
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="WorkEffortContent" use-cache="true" list="workEffortContents">
-                <field-map from-field="workEffortId" field-name="workEffortId"/>
+                <field-map field-name="workEffortId" from-field="workEffortId"/>
             </entity-and>
         </actions>
         <auto-fields-service service-name="updateWorkEffortContent" default-field-type="edit"/>
@@ -1067,7 +1067,7 @@ under the License.
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="WorkEffortGoodStandard" use-cache="true" list="workEffortGoodStandards">
-                <field-map from-field="workEffortId" field-name="workEffortId"/>
+                <field-map field-name="workEffortId" from-field="workEffortId"/>
             </entity-and>
         </actions>
         <auto-fields-service service-name="updateWorkEffortGoodStandard" default-field-type="edit"/>
@@ -1124,7 +1124,7 @@ under the License.
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="WorkEffortReview" use-cache="true" list="workEffortReviews">
-                <field-map from-field="workEffortId" field-name="workEffortId"/>
+                <field-map field-name="workEffortId" from-field="workEffortId"/>
             </entity-and>
         </actions>
         <auto-fields-service service-name="updateWorkEffortReview" default-field-type="edit"/>
@@ -1167,7 +1167,7 @@ under the License.
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="WorkEffortKeyword" use-cache="true" list="workEffortkeywords">
-                <field-map from-field="workEffortId" field-name="workEffortId"/>
+                <field-map field-name="workEffortId" from-field="workEffortId"/>
             </entity-and>
         </actions>
         <field name="workEffortId" widget-style="buttontext"><hidden/></field>
@@ -1193,7 +1193,7 @@ under the License.
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="WorkEffortContactMech" list="workEffortContactMechs">
-                <field-map from-field="workEffortId" field-name="workEffortId"/>
+                <field-map field-name="workEffortId" from-field="workEffortId"/>
             </entity-and>
         </actions>
         <row-actions>
@@ -1231,7 +1231,7 @@ under the License.
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="AgreementWorkEffortApplic" use-cache="true" list="agreementWorkEffortApplics">
-                <field-map from-field="workEffortId" field-name="workEffortId"/>
+                <field-map field-name="workEffortId" from-field="workEffortId"/>
             </entity-and>
         </actions>
         <field name="agreementId">

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml Sat Nov  5 12:41:35 2016
@@ -76,7 +76,7 @@ under the License.
                                     <label text="${uiLabelMap.PageTitleListWorkEffortPartyAssigns}"/>
                                 </container>
                                 <container style="screenlet-body">
-                                    <include-form location="component://workeffort/widget/WorkEffortForms.xml" name="DisplayWorkEffortPartyAssigns"/>
+                                    <include-form name="DisplayWorkEffortPartyAssigns" location="component://workeffort/widget/WorkEffortForms.xml"/>
                                 </container>
                             </widgets>
                         </section>
@@ -88,7 +88,7 @@ under the License.
                                     <label text="${uiLabelMap.PageTitleListWorkEffortFixedAssetAssigns}"/>
                                 </container>
                                 <container style="screenlet-body">
-                                    <include-form location="component://workeffort/widget/WorkEffortForms.xml" name="DisplayWorkEffortFixedAssetAssigns"/>
+                                    <include-form name="DisplayWorkEffortFixedAssetAssigns" location="component://workeffort/widget/WorkEffortForms.xml"/>
                                 </container>
                             </widgets>
                         </section>

Modified: ofbiz/trunk/framework/common/minilang/CommonServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/CommonServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/minilang/CommonServices.xml (original)
+++ ofbiz/trunk/framework/common/minilang/CommonServices.xml Sat Nov  5 12:41:35 2016
@@ -124,7 +124,7 @@ under the License.
 
         <if-empty field="uomConversion">
             <!-- if still no uom conversion entity, then no conversion is possible -->
-            <add-error><fail-property property="CommonNoUomConversionFound" resource="CommonUiLabels"/></add-error>
+            <add-error><fail-property resource="CommonUiLabels" property="CommonNoUomConversionFound"/></add-error>
             <check-errors/>
         <else>
             <!-- Do custom conversion, if we have customMethodId -->
@@ -171,7 +171,7 @@ under the License.
         <entity-one entity-name="CustomMethod" value-field="customMethod" auto-field-map="true" use-cache="true"/>
 
         <if-empty field="customMethod.customMethodName">
-            <add-error> <fail-property property="CommonNoCustomMethodName" resource="CommonUiLabels"/> </add-error>
+            <add-error> <fail-property resource="CommonUiLabels" property="CommonNoCustomMethodName"/> </add-error>
             <check-errors/>
         <else>
             <log level="verbose" message="calling custom method ${customMethod.customMethodName}"/>
@@ -221,7 +221,7 @@ under the License.
             </entity-condition>
         </if-empty>
         <if-empty field="resourceList">
-            <add-error><fail-property property="CommonVisualThemeResourcesNotFound" resource="CommonUiLabels"/></add-error>
+            <add-error><fail-property resource="CommonUiLabels" property="CommonVisualThemeResourcesNotFound"/></add-error>
             <check-errors/>
         </if-empty>
         <iterate list="resourceList" entry="resourceRecord">

Modified: ofbiz/trunk/framework/common/minilang/PortalPageMethods.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/PortalPageMethods.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/minilang/PortalPageMethods.xml (original)
+++ ofbiz/trunk/framework/common/minilang/PortalPageMethods.xml Sat Nov  5 12:41:35 2016
@@ -55,7 +55,7 @@ under the License.
                             </condition-list>
                         </entity-condition>
                         <!-- remove all not supplied attributes -->
-                        <iterate entry="attribute" list="attributeList">
+                        <iterate list="attributeList" entry="attribute">
                             <if-empty field="parameters.${attribute.attrName}">
                                 <remove-value value-field="attribute"/>
                             </if-empty>
@@ -108,7 +108,7 @@ under the License.
             <field-map field-name="portalPageId" from-field="parameters.portalPageId" />
           </entity-and>
           <set field="first" value="true" type="Boolean" />
-          <iterate entry="portalPageColumn" list="portalPageColumns">
+          <iterate list="portalPageColumns" entry="portalPageColumn">
             <set-service-fields service-name="addPortalPageColumn" map="portalPageColumn" to-map="addColumnMap" />
             <clear-field field="addColumnMap.columnSeqId" />
             <set field="addColumnMap.portalPageId" from-field="portalPageId" />
@@ -119,7 +119,7 @@ under the License.
           <entity-and entity-name="PortalPagePortlet" list="portalPagePortlets">
             <field-map field-name="portalPageId" from-field="parameters.portalPageId" />
           </entity-and>
-          <iterate entry="portalPagePortlet" list="portalPagePortlets">
+          <iterate list="portalPagePortlets" entry="portalPagePortlet">
             <set-service-fields service-name="createPortalPagePortlet" map="portalPagePortlet" to-map="createPortLet" />
             <set field="createPortLet.portalPageId" from-field="portalPageId" />
             <call-service service-name="createPortalPagePortlet" in-map-name="createPortLet" />
@@ -129,7 +129,7 @@ under the License.
               <field-map field-name="portalPortletId" from-field="portalPagePortlet.portalPortletId" />
               <field-map field-name="portletSeqId" from-field="portalPagePortlet.portletSeqId" />
             </entity-and>
-            <iterate entry="portletAttribute" list="portletAttributes">
+            <iterate list="portletAttributes" entry="portletAttribute">
               <set field="portletAttribute.portalPageId" from-field="portalPageId" />
               <create-value value-field="portletAttribute" />
             </iterate>

Modified: ofbiz/trunk/framework/common/minilang/PortalPageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/minilang/PortalPageServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/minilang/PortalPageServices.xml (original)
+++ ofbiz/trunk/framework/common/minilang/PortalPageServices.xml Sat Nov  5 12:41:35 2016
@@ -290,7 +290,7 @@ under the License.
         <set field="columnSeqId" from-field="parameters.destinationColumn" default-value="${originPp.columnSeqId}"/>
 
         <!-- destination Portlet -->
-        <if-compare operator="contains" field="parameters.mode" value="DRAGDROPBEFORE">
+        <if-compare field="parameters.mode" operator="contains" value="DRAGDROPBEFORE">
             <entity-one value-field="destiPp" entity-name="PortalPagePortlet">
                 <field-map field-name="portalPageId" from-field="parameters.d_portalPageId"/>
                 <field-map field-name="portalPortletId" from-field="parameters.d_portalPortletId"/>
@@ -310,7 +310,7 @@ under the License.
             <set field="newSequenceNo" from-field="destiPp.sequenceNum"/>
         </if-compare>
 
-        <if-compare operator="equals" field="parameters.mode" value="DRAGDROPAFTER">
+        <if-compare field="parameters.mode" operator="equals" value="DRAGDROPAFTER">
             <entity-one value-field="destiPp" entity-name="PortalPagePortlet">
                 <field-map field-name="portalPageId" from-field="parameters.d_portalPageId"/>
                 <field-map field-name="portalPortletId" from-field="parameters.d_portalPortletId"/>
@@ -330,13 +330,13 @@ under the License.
             <set field="newSequenceNo" from-field="destiPp.sequenceNum"/>
         </if-compare>
 
-        <if-compare operator="contains" field="parameters.mode" value="NEW">
+        <if-compare field="parameters.mode" operator="contains" value="NEW">
             <set field="newSequenceNo" value="0"/>
         </if-compare>
 
         <!-- Modify the sequence id from the following portlets -->
         <if-not-empty field="modifyPpList">
-            <iterate entry="modifyPp" list="modifyPpList">
+            <iterate list="modifyPpList" entry="modifyPp">
                 <if-empty field="modifyPp.sequenceNum">
                     <set field="modifyPp.sequenceNum" value="newSequenceNo"/>
                     <else>

Modified: ofbiz/trunk/framework/common/widget/SecurityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/SecurityScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/SecurityScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/SecurityScreens.xml Sat Nov  5 12:41:35 2016
@@ -345,8 +345,8 @@ under the License.
                             <include-form name="EditCertificate" location="component://common/widget/SecurityForms.xml"/>
                         </screenlet>
                         <screenlet title="${uiLabelMap.CertSaveToKeyStore}">
-                            <include-form location="component://common/widget/SecurityForms.xml" name="ViewCertificate"/>
-                            <include-form location="component://common/widget/SecurityForms.xml" name="CertToKeystore"/>
+                            <include-form name="ViewCertificate" location="component://common/widget/SecurityForms.xml"/>
+                            <include-form name="CertToKeystore" location="component://common/widget/SecurityForms.xml"/>
                         </screenlet>
                         </container>
                     </decorator-section>

Modified: ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/GeoManagementScreens.xml Sat Nov  5 12:41:35 2016
@@ -60,7 +60,7 @@
                 <decorator-screen name="CommonGeoManagementDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.CommonSummary}">
-                            <include-form location="component://webtools/widget/GeoManagementForms.xml" name="GeoPoint"/>
+                            <include-form name="GeoPoint" location="component://webtools/widget/GeoManagementForms.xml"/>
                         </screenlet>
                         <screenlet title="${uiLabelMap.CommonMap}">
                             <platform-specific>

Modified: ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml (original)
+++ ofbiz/trunk/specialpurpose/bi/minilang/FactServices.xml Sat Nov  5 12:41:35 2016
@@ -483,7 +483,7 @@ under the License.
             <entity-and entity-name="SalesOrderItemFact" list="checkGSList">
                 <field-map field-name="orderId" from-field="orderHeader.orderId"/>
             </entity-and>
-            <iterate entry="checkGS" list="checkGSList">
+            <iterate list="checkGSList" entry="checkGS">
                 <if-not-empty field="checkGS.GS">
                     <if-compare field="checkGS.GS" operator="not-equals" value="0">
                         <set field="countGS" value="1"/>
@@ -526,7 +526,7 @@ under the License.
             <entity-and entity-name="SalesOrderItemFact" list="checkGSPList">
                 <field-map field-name="orderId" from-field="orderHeader.orderId"/>
             </entity-and>
-            <iterate entry="checkGSP" list="checkGSPList">
+            <iterate list="checkGSPList" entry="checkGSP">
                 <if-not-empty field="checkGSP.GSP">
                     <if-compare field="checkGSP.GSP" operator="not-equals" value="0">
                         <set field="countGSP" value="1"/>
@@ -534,7 +534,7 @@ under the License.
                 </if-not-empty>
             </iterate>
             <if-compare field="countGSP" operator="equals" value="0">
-                <entity-and list="orderItemList" entity-name="OrderItem">
+                <entity-and entity-name="OrderItem" list="orderItemList">
                     <field-map field-name="orderId" from-field="orderHeader.orderId"/>
                 </entity-and>
 
@@ -585,7 +585,7 @@ under the License.
             <entity-and entity-name="SalesOrderItemFact" list="checkCountOrderList">
                 <field-map field-name="orderId" from-field="orderHeader.orderId"/>
             </entity-and>
-            <iterate entry="checkCountOrder" list="checkCountOrderList">
+            <iterate list="checkCountOrderList" entry="checkCountOrder">
                 <if-not-empty field="checkCountOrder.countOrder">
                     <if-compare field="checkCountOrder.countOrder" operator="not-equals" value="0">
                         <set field="countOrder" value="1"/>

Modified: ofbiz/trunk/specialpurpose/birt/widget/birt/BirtScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/widget/birt/BirtScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/widget/birt/BirtScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/widget/birt/BirtScreens.xml Sat Nov  5 12:41:35 2016
@@ -144,7 +144,7 @@ under the License.
                         <section>
                             <widgets>
                                 <screenlet title="Send BIRT report by mail">
-                                    <include-form location="component://birt/widget/birt/BirtForms.xml" name="EditMail"/>
+                                    <include-form name="EditMail" location="component://birt/widget/birt/BirtForms.xml"/>
                                 </screenlet>
                             </widgets>
                         </section>

Modified: ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/minilang/EbayServices.xml Sat Nov  5 12:41:35 2016
@@ -78,8 +78,8 @@
         <set from-field="parameters.facilityId" field="facilityId"/>
         <if-not-empty field="facilityId">
             <entity-and entity-name="ProductStoreFacility" list="productStoreFacilities" use-cache="true">
-                <field-map from-field="productStore.productStoreId" field-name="productStoreId"/>
-                <field-map from-field="facilityId" field-name="facilityId"/>
+                <field-map field-name="productStoreId" from-field="productStore.productStoreId"/>
+                <field-map field-name="facilityId" from-field="facilityId"/>
                 <order-by field-name="sequenceNum"/>
             </entity-and>
             <iterate list="productStoreFacilities" entry="productStoreFacility">
@@ -95,8 +95,8 @@
             </if-empty>
             <!-- verifly that product was store in facility -->
             <entity-and entity-name="ProductFacility" list="productFacilityList">
-                <field-map from-field="facilityId" field-name="facilityId"/>
-                <field-map from-field="parameters.productId" field-name="productId"/>
+                <field-map field-name="facilityId" from-field="facilityId"/>
+                <field-map field-name="productId" from-field="parameters.productId"/>
             </entity-and>
             <if-empty field="productFacilityList">
                 <add-error>
@@ -286,7 +286,7 @@
             <order-by field-name="${orderByString}"/>
         </entity-condition>
         <set field="qtyless" type="BigDecimal" default-value="0"  from-field="qtyToRemove"/>
-        <iterate entry="inventoryItem" list="inventoryItems">
+        <iterate list="inventoryItems" entry="inventoryItem">
             <if>
                 <condition>
                     <and>
@@ -296,7 +296,7 @@
                 <then>
                     <get-related value-field="inventoryItem" relation-name="InventoryItemDetail" list="inventoryItemDetails"/>
                     <if-not-empty field="inventoryItemDetails">
-                        <iterate entry="inventoryItemDetail" list="inventoryItemDetails">
+                        <iterate list="inventoryItemDetails" entry="inventoryItemDetail">
                             <if>
                                 <condition>
                                     <and>

Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml Sat Nov  5 12:41:35 2016
@@ -70,7 +70,7 @@
                                             </entity-one>
                                         </actions>
                                         <widgets>
-                                           <include-form location="component://ebaystore/widget/EbayStoreForms.xml" name="EbayAccountSelection"/>
+                                           <include-form name="EbayAccountSelection" location="component://ebaystore/widget/EbayStoreForms.xml"/>
                                               <label text="${uiLabelMap.EbayAccount} : ${person.firstName} ${person.lastName}" style="h1"></label>
                                             <include-menu name="EbayStoreFunctionTabBar"  location="component://ebaystore/widget/EbayStoreMenus.xml"/>
                                         </widgets>

Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml Sat Nov  5 12:41:35 2016
@@ -32,7 +32,7 @@
                 <decorator-screen name="AccountDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet name="" title="${uiLabelMap.EbayPersonalInformation}">
-                            <include-form location="component://ebaystore/widget/EbayAccountForms.xml" name="EbayPersonalInformationForm"/>
+                            <include-form name="EbayPersonalInformationForm" location="component://ebaystore/widget/EbayAccountForms.xml"/>
                         </screenlet>
                     </decorator-section>
                 </decorator-screen>