svn commit: r1768209 [2/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/content/minilang/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/content/ContentServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/minilang/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/minilang/content/ContentServices.xml Sat Nov  5 12:41:35 2016
@@ -24,7 +24,7 @@
     <!-- base content CRUD services -->
     <simple-method method-name="createContent" short-description="Create a Content Record">
         <make-value value-field="content" entity-name="Content"/>
-        <set-nonpk-fields value-field="content" map="parameters"/>
+        <set-nonpk-fields map="parameters" value-field="content"/>
         <set-pk-fields value-field="content" map="parameters"/>
 
         <if-empty field="parameters.contentId">
@@ -53,7 +53,7 @@
     </simple-method>
     <simple-method method-name="updateContent" short-description="Update a Content Record">
         <entity-one entity-name="Content" value-field="content" auto-field-map="true"/>
-        <set-nonpk-fields value-field="content" map="parameters"/>
+        <set-nonpk-fields map="parameters" value-field="content"/>
 
         <now-timestamp field="nowTimestamp"/>
         <set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
@@ -94,7 +94,7 @@
     <!-- content assoc services -->
     <simple-method method-name="createContentAssoc" short-description="Create a ContntAssoc Record">
         <make-value value-field="assoc" entity-name="ContentAssoc"/>
-        <set-nonpk-fields value-field="assoc" map="parameters"/>
+        <set-nonpk-fields map="parameters" value-field="assoc"/>
         <set-pk-fields value-field="assoc" map="parameters"/>
 
         <set field="assoc.contentId" from-field="parameters.contentIdFrom" default-value="${parameters.contentId}"/>
@@ -116,7 +116,7 @@
     <simple-method method-name="updateContentAssoc" short-description="Update a ContentAssoc Record">
         <set field="contentId" from-field="parameters.contentIdFrom" default-value="${parameters.contentId}"/>
         <entity-one entity-name="ContentAssoc" value-field="assoc" auto-field-map="true"/>
-        <set-nonpk-fields value-field="assoc" map="parameters"/>
+        <set-nonpk-fields map="parameters" value-field="assoc"/>
 
         <now-timestamp field="nowTimestamp"/>
         <set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
@@ -182,7 +182,7 @@
         <entity-and entity-name="ContentAssoc" list="assocs">
             <field-map field-name="contentId" from-field="parameters.contentId"/>
         </entity-and>
-        <iterate entry="assoc" list="assocs">
+        <iterate list="assocs" entry="assoc">
             <set field="assoc.contentId" from-field="newContentId"/>
             <set-service-fields service-name="createContentAssoc" map="assoc" to-map="assocS"/>
             <call-service service-name="createContentAssoc" in-map-name="assocS"/>
@@ -191,7 +191,7 @@
         <entity-and entity-name="ContentAssoc" list="assocsTo">
             <field-map field-name="contentIdTo" from-field="parameters.contentId"/>
         </entity-and>
-        <iterate entry="assocTo" list="assocsTo">
+        <iterate list="assocsTo" entry="assocTo">
             <set field="assocTo.contentIdTo" from-field="newContentId"/>
             <set-service-fields service-name="createContentAssoc" map="assocTo" to-map="assocTos"/>
             <call-service service-name="createContentAssoc" in-map-name="assocTos"/>
@@ -249,7 +249,7 @@
         <set from-field="parameters.partyId" field="lookupKeyValue.partyId"/>
         <set from-field="parameters.roleTypeId" field="lookupKeyValue.roleTypeId"/>
         <find-by-and entity-name="ContentRole" map="lookupKeyValue" list="roleList"/>
-        <iterate entry="contentRoleMap" list="roleList">
+        <iterate list="roleList" entry="contentRoleMap">
             <make-value entity-name="ContentRole" value-field="role" map="contentRoleMap"/>
             <now-timestamp field="role.thruDate"/>
             <store-value value-field="role"/>
@@ -289,11 +289,11 @@
         <set from-field="parameters.contentId" field="queryMap.contentId"/>
         <set field="mapKeys" from-field="parameters.mapKeys"/>
         <field-to-list field="mapKey" list="mapKeys"/>
-        <iterate entry="mapKey" list="mapKeys">
+        <iterate list="mapKeys" entry="mapKey">
             <set from-field="mapKey" field="queryMap.mapKey"/>
             <find-by-and list="resultMap" entity-name="ContentAssoc" map="queryMap"/>
             <filter-list-by-date list="resultMap" to-list="validContent"/>
-            <iterate entry="contentAssoc" list="validContent">
+            <iterate list="validContent" entry="contentAssoc">
                 <field-to-list field="contentAssoc" list="result"/>
             </iterate>
         </iterate>
@@ -559,7 +559,7 @@
     <simple-method method-name="createCommEventContentAssoc" short-description="Create CommEventContentAssoc">
         <make-value entity-name="CommEventContentAssoc" value-field="commEventContentAssoc"/>
         <set-pk-fields value-field="commEventContentAssoc" map="parameters"/>
-        <set-nonpk-fields value-field="commEventContentAssoc" map="parameters"/>
+        <set-nonpk-fields map="parameters" value-field="commEventContentAssoc"/>
         <if-empty field="commEventContentAssoc.fromDate">
             <now-timestamp field="commEventContentAssoc.fromDate"/>
         </if-empty>
@@ -578,7 +578,7 @@
                 <fail-property resource="ContentUiLabels" property="ContenCommEventContentAssocNotFoundForUpdate"/>
             </add-error>
         </if-empty>
-        <set-nonpk-fields value-field="commEventContentAssoc" map="parameters"/>
+        <set-nonpk-fields map="parameters" value-field="commEventContentAssoc"/>
         <store-value value-field="commEventContentAssoc"/>
     </simple-method>
 
@@ -689,7 +689,7 @@
         <set field="contentAssocTypeId" from-field="parameters.contentAssocTypeId"/>
         <set field="origContentAssocTypeId" from-field="parameters.contentAssocTypeId"/>
         <set field="ownerContentId" from-field="parameters.threadContentId"/>
-        <if-compare operator="equals" field="origContentAssocTypeId" value="PUBLISH_LINK">
+        <if-compare field="origContentAssocTypeId" operator="equals" value="PUBLISH_LINK">
             <set field="ownerContentId" from-field="parameters.pubPtContentId"/>
         </if-compare>
         <set field="contentIdFrom" from-field="parameters.contentIdFrom"/>
@@ -710,7 +710,7 @@
             <field field="subStringLen" type="int"/>
         </call-object-method>
         <log level="info" message="subDescript:${subDescript}"/>
-        <if-compare operator="equals" field="contentAssocTypeId" value="PUBLISH_LINK">
+        <if-compare field="contentAssocTypeId" operator="equals" value="PUBLISH_LINK">
             <set field="ownerContentId" from-field="pubPtContentId"/>
         </if-compare>
 
@@ -851,7 +851,7 @@
         </if>
 
         <!-- If a response, still link it to the publish point -->
-        <if-compare operator="equals" field="origContentAssocTypeId" value="RESPONSE">
+        <if-compare field="origContentAssocTypeId" operator="equals" value="RESPONSE">
             <set field="contentAssocMap.contentId" from-field="pubPtContentId"/>
             <set field="contentAssocMap.contentIdTo" from-field="contentId"/>
             <set field="contentAssocMap.contentAssocTypeId" value="RESPONSE"/>
@@ -875,7 +875,7 @@
           </condition-list>
         </entity-condition>
 
-        <iterate entry="view" list="viewList">
+        <iterate list="viewList" entry="view">
             <set field="hasPermission" value="true" type="Boolean"/>
             <if>
                 <condition>
@@ -898,7 +898,7 @@
                     </call-service>
                 </then>
             </if>
-            <if-compare operator="equals" field="hasPermission" value="true" type="Boolean">
+            <if-compare field="hasPermission" operator="equals" value="true" type="Boolean">
                 <set field="contentViewList[]" from-field="view"/>
             </if-compare>
         </iterate>
@@ -914,7 +914,7 @@
             <result-to-field result-name="subContentList"/>
         </call-service>
 
-        <iterate entry="view" list="subContentList">
+        <iterate list="subContentList" entry="view">
             <entity-condition list="viewList" entity-name="ContentAssocViewTo" filter-by-date="true" use-cache="${useCache}">
               <condition-list combine="and">
                   <condition-expr field-name="contentIdStart" from-field="view.caContentIdTo"/>
@@ -1008,7 +1008,7 @@
                 </entity-condition>
             </else>
         </if>
-        <iterate entry="content" list="contents">
+        <iterate list="contents" entry="content">
             <set field="localeString" from-field="content.localeString" default-value="${defaultLocaleString}"/>
             <entity-condition list="contentAssocDataResources" entity-name="ContentAssocDataResourceViewTo">
                 <condition-list combine="and">
@@ -1085,22 +1085,22 @@
         <set field="contentsNotUpdated" value="0" type="Integer"/>
         <set field="contentsUpdated" value="0" type="Integer"/>
         <if-not-empty field="parameters.prodCatalogId">
-            <entity-and list="prodCatalogCategoryList" entity-name="ProdCatalogCategory" filter-by-date="false">
+            <entity-and entity-name="ProdCatalogCategory" list="prodCatalogCategoryList" filter-by-date="false">
                 <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/>
             </entity-and>
             
             <!-- Get all categories -->
             <set field="parameters.productCategories" value="${groovy: [];}" type="List"/>
-            <iterate entry="prodCatalogCategory" list="prodCatalogCategoryList">
+            <iterate list="prodCatalogCategoryList" entry="prodCatalogCategory">
                 <set field="rootProductCategoryId" from-field="prodCatalogCategory.productCategoryId"/>
-                <entity-and list="productCategoryRollupList" entity-name="ProductCategoryRollup" filter-by-date="true">
+                <entity-and entity-name="ProductCategoryRollup" list="productCategoryRollupList" filter-by-date="true">
                     <field-map field-name="parentProductCategoryId" from-field="rootProductCategoryId"/>
                 </entity-and>
                 <set field="parameters.parentProductCategoryId" from-field="rootProductCategoryId"/>
                 <call-simple-method method-name="createMissingCategoryContentAltUrlInline"/>
             </iterate>
             
-            <iterate entry="productCategoryList" list="parameters.productCategories">
+            <iterate list="parameters.productCategories" entry="productCategoryList">
                 <!-- Create Content Alternative URLs for Product Category Content -->
                 <entity-condition list="productCategoryContentAndInfoList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true">
                     <condition-list combine="and">
@@ -1109,7 +1109,7 @@
                     </condition-list>
                     <order-by field-name="-fromDate"/>
                 </entity-condition>
-                <iterate entry="productCategoryContentAndInfo" list="productCategoryContentAndInfoList">
+                <iterate list="productCategoryContentAndInfoList" entry="productCategoryContentAndInfo">
                     <set field="createMissingCategoryContentAltUrlsMap.contentId" from-field="productCategoryContentAndInfo.contentId"/>
                     <call-service service-name="createContentAlternativeUrl" in-map-name="createMissingCategoryContentAltUrlsMap">
                         <result-to-field result-name="contentCreated" field="contentCreated"/>
@@ -1137,7 +1137,7 @@
                     </condition-list>
                     <order-by field-name="-fromDate"/>
                 </entity-condition>
-                <iterate entry="productCategoryMember" list="productCategoryMemberList">
+                <iterate list="productCategoryMemberList" entry="productCategoryMember">
                     <set field="product.productId" from-field="productCategoryMember.productId"/>
                     <entity-condition list="productContentAndInfoList" entity-name="ProductContentAndInfo" filter-by-date="true" use-cache="true">
                         <condition-list combine="and">
@@ -1146,7 +1146,7 @@
                         </condition-list>
                         <order-by field-name="-fromDate"/>
                     </entity-condition>
-                    <iterate entry="productContentAndInfo" list="productContentAndInfoList">
+                    <iterate list="productContentAndInfoList" entry="productContentAndInfo">
                         <set field="createMissingProductContentAltUrlsMap.contentId" from-field="productContentAndInfo.contentId"/>
                         <call-service service-name="createContentAlternativeUrl" in-map-name="createMissingProductContentAltUrlsMap">
                             <result-to-field result-name="contentCreated" field="contentCreated"/>
@@ -1174,11 +1174,11 @@
         <entity-and list="webSiteContents" entity-name="WebSiteContent" filter-by-date="true">
             <field-map field-name="webSiteId" from-field="parameters.webSiteId"/>
         </entity-and>
-        <iterate entry="webSiteContent" list="webSiteContents">
+        <iterate list="webSiteContents" entry="webSiteContent">
             <entity-and list="subContents" entity-name="ContentAssoc" filter-by-date="true">
                 <field-map field-name="contentId" from-field="webSiteContent.contentId"/>
             </entity-and>
-            <iterate entry="subContent" list="subContents">
+            <iterate list="subContents" entry="subContent">
                 <set field="createMissingContentAltUrlsMap.contentId" from-field="subContent.contentIdTo"/>
                 <call-service service-name="createContentAlternativeUrl" in-map-name="createMissingContentAltUrlsMap">
                     <result-to-field result-name="contentCreated" field="contentCreated"/>
@@ -1197,10 +1197,10 @@
                         </calcop>
                     </calculate>
                 </if-compare>
-                <entity-and list="contentAssocs" entity-name="ContentAssoc" filter-by-date="true">
+                <entity-and entity-name="ContentAssoc" list="contentAssocs" filter-by-date="true">
                     <field-map field-name="contentId" from-field="subContent.contentIdTo"/>
                 </entity-and>
-                <iterate entry="contentAssoc" list="contentAssocs">
+                <iterate list="contentAssocs" entry="contentAssoc">
                     <set field="createMissingContentAltUrlsMap.contentId" from-field="contentAssoc.contentIdTo"/>
                     <call-service service-name="createContentAlternativeUrl" in-map-name="createMissingContentAltUrlsMap">
                         <result-to-field result-name="contentCreated" field="contentCreated"/>
@@ -1227,10 +1227,10 @@
     </simple-method>
 
     <simple-method method-name="createMissingCategoryContentAltUrlInline" short-description="create missing category alternative inline">
-        <entity-and list="productCategoryRollups" entity-name="ProductCategoryRollup" filter-by-date="true">
+        <entity-and entity-name="ProductCategoryRollup" list="productCategoryRollups" filter-by-date="true">
             <field-map field-name="parentProductCategoryId" from-field="parameters.parentProductCategoryId"/>
         </entity-and>
-        <iterate entry="productCategoryRollup" list="productCategoryRollups">
+        <iterate list="productCategoryRollups" entry="productCategoryRollup">
             <!-- append product category to list -->
             <entity-one value-field="productCategory" entity-name="ProductCategory">
                 <field-map field-name="productCategoryId" from-field="productCategoryRollup.productCategoryId"/>

Modified: ofbiz/trunk/applications/content/minilang/data/DataServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/data/DataServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/minilang/data/DataServices.xml (original)
+++ ofbiz/trunk/applications/content/minilang/data/DataServices.xml Sat Nov  5 12:41:35 2016
@@ -326,8 +326,8 @@ under the License.
                     </then>
                     <else>
                         <!-- if not upload is found on an update; its okay, don't do anything just return -->
-                        <field-to-result result-name="dataResourceId" field="dataResource.dataResourceId"/>
-                        <field-to-result result-name="mimeTypeId" field="dataResource.mimeTypeId"/>
+                        <field-to-result field="dataResource.dataResourceId" result-name="dataResourceId"/>
+                        <field-to-result field="dataResource.mimeTypeId" result-name="mimeTypeId"/>
                         <return/>
                     </else>
                 </if>
@@ -359,8 +359,8 @@ under the License.
         <set from-field="dataResource" field="fileCtx.dataResource"/>
         <call-service service-name="createAnonFile" in-map-name="fileCtx" include-user-login="true"/>
 
-        <field-to-result result-name="dataResourceId" field="dataResource.dataResourceId"/>
-        <field-to-result result-name="mimeTypeId" field="dataResource.mimeTypeId"/>
+        <field-to-result field="dataResource.dataResourceId" result-name="dataResourceId"/>
+        <field-to-result field="dataResource.mimeTypeId" result-name="mimeTypeId"/>
     </simple-method>
 
     <!-- save OFBIZ_FILE data -->
@@ -395,8 +395,8 @@ under the License.
                     </then>
                     <else>
                         <!-- if not upload is found on an update; its okay, don't do anything just return -->
-                        <field-to-result result-name="dataResourceId" field="dataResource.dataResourceId"/>
-                        <field-to-result result-name="mimeTypeId" field="dataResource.mimeTypeId"/>
+                        <field-to-result field="dataResource.dataResourceId" result-name="dataResourceId"/>
+                        <field-to-result field="dataResource.mimeTypeId" result-name="mimeTypeId"/>
                         <return/>
                     </else>
                 </if>
@@ -430,8 +430,8 @@ under the License.
         <set from-field="dataResource" field="fileCtx.dataResource"/>
         <call-service service-name="createAnonFile" in-map-name="fileCtx" include-user-login="true"/>
 
-        <field-to-result result-name="dataResourceId" field="dataResource.dataResourceId"/>
-        <field-to-result result-name="mimeTypeId" field="dataResource.mimeTypeId"/>
+        <field-to-result field="dataResource.dataResourceId" result-name="dataResourceId"/>
+        <field-to-result field="dataResource.mimeTypeId" result-name="mimeTypeId"/>
     </simple-method>
 
     <!-- save OTHER_OBJECT data -->
@@ -463,8 +463,8 @@ under the License.
                     </then>
                     <else>
                         <!-- if not upload is found on an update; its okay, don't do anything just return -->
-                        <field-to-result result-name="dataResourceId" field="dataResource.dataResourceId"/>
-                        <field-to-result result-name="mimeTypeId" field="dataResource.mimeTypeId"/>
+                        <field-to-result field="dataResource.dataResourceId" result-name="dataResourceId"/>
+                        <field-to-result field="dataResource.mimeTypeId" result-name="mimeTypeId"/>
                         <return/>
                     </else>
                 </if>
@@ -490,8 +490,8 @@ under the License.
             </else>
         </if-compare>
 
-        <field-to-result result-name="dataResourceId" field="dataResource.dataResourceId"/>
-        <field-to-result result-name="mimeTypeId" field="dataResource.mimeTypeId"/>
+        <field-to-result field="dataResource.dataResourceId" result-name="dataResourceId"/>
+        <field-to-result field="dataResource.mimeTypeId" result-name="mimeTypeId"/>
     </simple-method>
 
     <!-- save IMAGE_OBJECT data -->
@@ -523,8 +523,8 @@ under the License.
                     </then>
                     <else>
                         <!-- if not upload is found on an update; its okay, don't do anything just return -->
-                        <field-to-result result-name="dataResourceId" field="dataResource.dataResourceId"/>
-                        <field-to-result result-name="mimeTypeId" field="dataResource.mimeTypeId"/>
+                        <field-to-result field="dataResource.dataResourceId" result-name="dataResourceId"/>
+                        <field-to-result field="dataResource.mimeTypeId" result-name="mimeTypeId"/>
                         <return/>
                     </else>
                 </if>
@@ -550,8 +550,8 @@ under the License.
             </else>
         </if-compare>
 
-        <field-to-result result-name="dataResourceId" field="dataResource.dataResourceId"/>
-        <field-to-result result-name="mimeTypeId" field="dataResource.mimeTypeId"/>
+        <field-to-result field="dataResource.dataResourceId" result-name="dataResourceId"/>
+        <field-to-result field="dataResource.mimeTypeId" result-name="mimeTypeId"/>
     </simple-method>
 
     <!-- save VIDEO_OBJECT data -->
@@ -583,8 +583,8 @@ under the License.
                     </then>
                     <else>
                         <!-- if not upload is found on an update; its okay, don't do anything just return -->
-                        <field-to-result result-name="dataResourceId" field="dataResource.dataResourceId"/>
-                        <field-to-result result-name="mimeTypeId" field="dataResource.mimeTypeId"/>
+                        <field-to-result field="dataResource.dataResourceId" result-name="dataResourceId"/>
+                        <field-to-result field="dataResource.mimeTypeId" result-name="mimeTypeId"/>
                         <return/>
                     </else>
                 </if>
@@ -610,8 +610,8 @@ under the License.
             </else>
         </if-compare>
 
-        <field-to-result result-name="dataResourceId" field="dataResource.dataResourceId"/>
-        <field-to-result result-name="mimeTypeId" field="dataResource.mimeTypeId"/>
+        <field-to-result field="dataResource.dataResourceId" result-name="dataResourceId"/>
+        <field-to-result field="dataResource.mimeTypeId" result-name="mimeTypeId"/>
     </simple-method>
 
     <!-- save AUDIO_OBJECT data -->
@@ -643,8 +643,8 @@ under the License.
                     </then>
                     <else>
                         <!-- if not upload is found on an update; its okay, don't do anything just return -->
-                        <field-to-result result-name="dataResourceId" field="dataResource.dataResourceId"/>
-                        <field-to-result result-name="mimeTypeId" field="dataResource.mimeTypeId"/>
+                        <field-to-result field="dataResource.dataResourceId" result-name="dataResourceId"/>
+                        <field-to-result field="dataResource.mimeTypeId" result-name="mimeTypeId"/>
                         <return/>
                     </else>
                 </if>
@@ -670,8 +670,8 @@ under the License.
             </else>
         </if-compare>
 
-        <field-to-result result-name="dataResourceId" field="dataResource.dataResourceId"/>
-        <field-to-result result-name="mimeTypeId" field="dataResource.mimeTypeId"/>
+        <field-to-result field="dataResource.dataResourceId" result-name="dataResourceId"/>
+        <field-to-result field="dataResource.mimeTypeId" result-name="mimeTypeId"/>
     </simple-method>
 
     <!-- save CONTEXT_FILE data -->
@@ -706,8 +706,8 @@ under the License.
                     </then>
                     <else>
                         <!-- if not upload is found on an update; its okay, don't do anything just return -->
-                        <field-to-result result-name="dataResourceId" field="dataResource.dataResourceId"/>
-                        <field-to-result result-name="mimeTypeId" field="dataResource.mimeTypeId"/>
+                        <field-to-result field="dataResource.dataResourceId" result-name="dataResourceId"/>
+                        <field-to-result field="dataResource.mimeTypeId" result-name="mimeTypeId"/>
                         <return/>
                     </else>
                 </if>
@@ -744,7 +744,7 @@ under the License.
         <set from-field="dataResource" field="fileCtx.dataResource"/>
         <call-service service-name="createAnonFile" in-map-name="fileCtx" include-user-login="true"/>
 
-        <field-to-result result-name="dataResourceId" field="dataResource.dataResourceId"/>
-        <field-to-result result-name="mimeTypeId" field="dataResource.mimeTypeId"/>
+        <field-to-result field="dataResource.dataResourceId" result-name="dataResourceId"/>
+        <field-to-result field="dataResource.mimeTypeId" result-name="mimeTypeId"/>
     </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/applications/content/minilang/permission/ContentPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/permission/ContentPermissionServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/minilang/permission/ContentPermissionServices.xml (original)
+++ ofbiz/trunk/applications/content/minilang/permission/ContentPermissionServices.xml Sat Nov  5 12:41:35 2016
@@ -453,7 +453,7 @@
         <if>
             <condition>
                 <and>
-                    <if-compare value="CONTENT_CREATE" field="contentOperationId" operator="equals"/>
+                    <if-compare field="contentOperationId" operator="equals" value="CONTENT_CREATE"/>
                     <not>
                         <if-empty field="contentPurposeTypeId"/>
                     </not>
@@ -473,7 +473,7 @@
                 <call-simple-method method-name="findAllContentPurposes"/>
 
                 <!-- find defined purpose/operation mappings -->
-                <iterate entry="currentPurpose" list="contentPurposes">
+                <iterate list="contentPurposes" entry="currentPurpose">
                     <entity-condition entity-name="ContentPurposeOperation" list="currentOperations">
                         <condition-list combine="and">
                             <condition-expr field-name="contentPurposeTypeId" operator="equals" from-field="currentPurpose.contentPurposeTypeId"/>
@@ -516,7 +516,7 @@
                 <call-simple-method method-name="findAllAssociatedPartyIds"/>
 
                 <!-- check each operation security -->
-                <iterate entry="operation" list="operations">
+                <iterate list="operations" entry="operation">
                     <if-compare field="hasPermission" value="false" type="Boolean" operator="equals">
                         <!-- reset the checkId if needed -->
                         <if>
@@ -552,7 +552,7 @@
                                 <log level="verbose" message="Passed status check; now checking role(s)"/>
 
                                 <!-- first check passed; now we test for the role membership(s) -->
-                                <iterate entry="thisPartyId" list="partyIdList">
+                                <iterate list="partyIdList" entry="thisPartyId">
                                     <if-compare field="hasPermission" value="false" type="Boolean" operator="equals">
                                         <set field="checkRoleTypeId" from-field="operation.roleTypeId"/>
                                         <set field="checkPartyId" from-field="thisPartyId"/>
@@ -651,7 +651,7 @@
         <set field="checkRoleTypeId" value="OWNER"/>
 
         <!-- check to see if any of the parties are owner of the content -->
-        <iterate entry="thisPartyId" list="partyIdList">
+        <iterate list="partyIdList" entry="thisPartyId">
             <if>
                 <condition>
                     <not>

Modified: ofbiz/trunk/applications/content/minilang/survey/SurveyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/survey/SurveyServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/minilang/survey/SurveyServices.xml (original)
+++ ofbiz/trunk/applications/content/minilang/survey/SurveyServices.xml Sat Nov  5 12:41:35 2016
@@ -59,7 +59,7 @@
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <sequenced-id sequence-name="SurveyQuestion" field="newEntity.surveyQuestionId"/>
         <create-value value-field="newEntity"/>
-        <field-to-result result-name="surveyQuestionId" field="newEntity.surveyQuestionId"/>
+        <field-to-result field="newEntity.surveyQuestionId" result-name="surveyQuestionId"/>
     </simple-method>
     <simple-method method-name="updateSurveyQuestion" short-description="Update Survey Question">
         <if>
@@ -157,14 +157,14 @@
         <set field="answers" from-field="parameters.answers"/>
 
         <!-- make sure all required fields were responded to -->
-        <iterate entry="surveyQuestionAndAppl" list="surveyQuestionAndApplList">
+        <iterate list="surveyQuestionAndApplList" entry="surveyQuestionAndAppl">
             <!-- for validation get SurveyMultiResp and SurveyMultiRespColumn entries and if exist process for each surveyMultiRespColId -->
             <get-related-one value-field="surveyQuestionAndAppl" relation-name="SurveyMultiResp" to-value-field="surveyMultiResp" use-cache="true"/>
             <if-not-empty field="surveyMultiResp">
                 <!-- if the surveyQuestionAndAppl has a surveyMultiRespColId, then just look for one answer with that ID -->
                 <if-empty field="surveyQuestionAndAppl.surveyMultiRespColId">
                     <get-related value-field="surveyMultiResp" relation-name="SurveyMultiRespColumn" list="surveyMultiRespColumnList" use-cache="true"/>
-                    <iterate entry="surveyMultiRespColumn" list="surveyMultiRespColumnList">
+                    <iterate list="surveyMultiRespColumnList" entry="surveyMultiRespColumn">
                         <set field="answerFieldName" value="answers[&quot;${surveyQuestionAndAppl.surveyQuestionId}_${surveyMultiRespColumn.surveyMultiRespColId}&quot;]"/>
                         <call-simple-method method-name="validateSurveyResponseInline"/>
                     </iterate>
@@ -193,7 +193,7 @@
         <if-empty field="surveyResponse">
             <make-value value-field="surveyResponse" entity-name="SurveyResponse"/>
             <sequenced-id sequence-name="SurveyResponse" field="surveyResponse.surveyResponseId"/>
-            <set-nonpk-fields value-field="surveyResponse" map="parameters"/>
+            <set-nonpk-fields map="parameters" value-field="surveyResponse"/>
             <create-value value-field="surveyResponse"/>
         </if-empty>
 
@@ -214,7 +214,7 @@
 
         <!-- lookup any existing response answers -->
         <get-related value-field="surveyResponse" relation-name="SurveyResponseAnswer" list="existingAnswers"/>
-        <iterate entry="existingAnswer" list="existingAnswers">
+        <iterate list="existingAnswers" entry="existingAnswer">
             <set field="currentAnswersFieldName" from-field="existingAnswer.surveyQuestionId"/>
             <if>
                 <condition>
@@ -222,7 +222,7 @@
                         <not>
                             <if-empty field="existingAnswer.surveyMultiRespColId"/>
                         </not>
-                        <if-compare operator="not-equals" field="existingAnswer.surveyMultiRespColId" value="_NA_"/>
+                        <if-compare field="existingAnswer.surveyMultiRespColId" operator="not-equals" value="_NA_"/>
                     </and>
                 </condition>
                 <then>
@@ -233,14 +233,14 @@
         </iterate>
 
         <!-- create the response answers -->
-        <iterate entry="surveyQuestionAndAppl" list="surveyQuestionAndApplList">
+        <iterate list="surveyQuestionAndApplList" entry="surveyQuestionAndAppl">
             <!-- for process inputs get SurveyMultiResp and SurveyMultiRespColumn entries and if exist process for each surveyMultiRespColId -->
             <get-related-one value-field="surveyQuestionAndAppl" relation-name="SurveyMultiResp" to-value-field="surveyMultiResp" use-cache="true"/>
             <if-not-empty field="surveyMultiResp">
                 <!-- if the surveyQuestionAndAppl has a surveyMultiRespColId, then just look for one answer with that ID -->
                 <if-empty field="surveyQuestionAndAppl.surveyMultiRespColId">
                     <get-related value-field="surveyMultiResp" relation-name="SurveyMultiRespColumn" list="surveyMultiRespColumnList" use-cache="true"/>
-                    <iterate entry="surveyMultiRespColumn" list="surveyMultiRespColumnList">
+                    <iterate list="surveyMultiRespColumnList" entry="surveyMultiRespColumn">
                         <set field="currentFieldName" value="${surveyQuestionAndAppl.surveyQuestionId}_${surveyMultiRespColumn.surveyMultiRespColId}"/>
                         <call-simple-method method-name="processSurveyResponseInline"/>
                     </iterate>
@@ -293,7 +293,7 @@
             <set field="finAccountMap.statusId" value="FNACT_ACTIVE"/>
             <set field="codeOk" value="false"/>
             <find-by-and entity-name="FinAccount" map="finAccountMap" list="finAccountList"/>
-            <iterate entry="finAccount" list="finAccountList">
+            <iterate list="finAccountList" entry="finAccount">
                 <if-compare field="finAccount.finAccountCode" operator="equals" value="${${answerFieldName}}">
                     <set field="codeOk" value="true"/>
                 </if-compare>

Modified: ofbiz/trunk/applications/content/minilang/website/WebSiteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/minilang/website/WebSiteServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/minilang/website/WebSiteServices.xml (original)
+++ ofbiz/trunk/applications/content/minilang/website/WebSiteServices.xml Sat Nov  5 12:41:35 2016
@@ -57,7 +57,7 @@ under the License.
 
             <else>
                 <!-- multi-checked -->
-                <iterate entry="thisType" list="parameters.webSiteContentTypeId">
+                <iterate list="parameters.webSiteContentTypeId" entry="thisType">
                     <entity-one entity-name="WebSiteContentType" value-field="wct">
                         <field-map field-name="webSiteContentTypeId" from-field="thisType"/>
                     </entity-one>
@@ -90,12 +90,12 @@ under the License.
         </entity-one>
         <!-- Create Missing Category and Product Alternative URL's -->
         <if-compare operator="equals" value="all" field="parameters.prodCatalogId">
-            <entity-and list="productStoreCatalogs" entity-name="ProductStoreCatalog" filter-by-date="true">
+            <entity-and entity-name="ProductStoreCatalog" list="productStoreCatalogs" filter-by-date="true">
                 <field-map field-name="productStoreId" from-field="webSite.productStoreId"/>
             </entity-and>
             <if-not-empty field="productStoreCatalogs">
-                <iterate entry="productStoreCatalog" list="productStoreCatalogs">
-                    <iterate entry="typeGenerate" list="parameters.typeGenerate">
+                <iterate list="productStoreCatalogs" entry="productStoreCatalog">
+                    <iterate list="parameters.typeGenerate" entry="typeGenerate">
                         <if-compare operator="equals" value="category" field="typeGenerate">
                             <set field="createMissingCategoryAltUrlsMap.prodCatalogId" from-field="productStoreCatalog.prodCatalogId"/>
                             <set field="createMissingCategoryAltUrlsMap.category" value="category"/>
@@ -153,7 +153,7 @@ under the License.
                     </iterate>
                 </iterate>
             <else>
-                <iterate entry="typeGenerate" list="parameters.typeGenerate">
+                <iterate list="parameters.typeGenerate" entry="typeGenerate">
                     <if-compare operator="equals" value="content" field="typeGenerate">
                         <set field="createMissingContentAltUrlsMap.webSiteId" from-field="parameters.webSiteId"/>
                         <call-service service-name="createMissingContentAltUrls" in-map-name="createMissingContentAltUrlsMap">
@@ -175,7 +175,7 @@ under the License.
             </else>
             </if-not-empty>
         <else>
-            <iterate entry="typeGenerate" list="parameters.typeGenerate">
+            <iterate list="parameters.typeGenerate" entry="typeGenerate">
                 <if-compare operator="equals" value="category" field="typeGenerate">
                     <set field="createMissingCategoryAltUrlsMap.prodCatalogId" from-field="parameters.prodCatalogId"/>
                     <set field="createMissingCategoryAltUrlsMap.category" value="category"/>
@@ -236,7 +236,7 @@ under the License.
 
         <set field="generateMissingSeoUrlMessage" value="Generate missing seo url's successfully"/>
         <field-to-list list="successMessageList" field="generateMissingSeoUrlMessage"/>
-        <iterate entry="typeGenerate" list="parameters.typeGenerate">
+        <iterate list="parameters.typeGenerate" entry="typeGenerate">
             <if-compare operator="equals" value="category" field="typeGenerate">
                 <set field="categoriesMessage" value="Categories already having seo url's: ${totalCategoriesNotUpdated}, Categories with url added: ${totalCategoriesUpdated}"/>
                 <field-to-list list="successMessageList" field="categoriesMessage"/>

Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Sat Nov  5 12:41:35 2016
@@ -426,7 +426,7 @@ under the License.
                 <set field="labelTitleProperty" value="ContentWebSiteContactList"/>
                 <set field="webSiteId" from-field="parameters.webSiteId"/>
                 <entity-one entity-name="WebSite" value-field="webSite"/>
-                <entity-and list="webSiteContactLists" entity-name="WebSiteContactList">
+                <entity-and entity-name="WebSiteContactList" list="webSiteContactLists">
                     <field-map field-name="webSiteId" from-field="webSiteId"/>
                     <order-by field-name="-fromDate"/>
                 </entity-and>
@@ -435,10 +435,10 @@ under the License.
                 <decorator-screen name="CommonWebSiteDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.ContentWebSiteContactListCreate}">
-                            <include-form location="component://content/widget/website/WebSiteForms.xml" name="CreateWebSiteContactList"/>
+                            <include-form name="CreateWebSiteContactList" location="component://content/widget/website/WebSiteForms.xml"/>
                         </screenlet>
                         <screenlet title="${uiLabelMap.ContentWebSiteContactListView} of webSiteId[${webSiteId}]">
-                            <include-form location="component://content/widget/website/WebSiteForms.xml" name="ViewWebSiteContactList"/>
+                            <include-form name="ViewWebSiteContactList" location="component://content/widget/website/WebSiteForms.xml"/>
                         </screenlet>
                     </decorator-section>
                 </decorator-screen>

Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Sat Nov  5 12:41:35 2016
@@ -27,7 +27,7 @@ under the License.
                 <set field="titleProperty" value="PageTitleFindCMSContent"/>
                 <set field="entityName" value="ContentAssocDataResourceViewFrom"/>
                 <service service-name="urlEncodeArgs" result-map="result">
-                    <field-map from-field="requestParameters" field-name="mapIn"/>
+                    <field-map field-name="mapIn" from-field="requestParameters"/>
                 </service>
                 <set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer" default-value="0"/>
                 <set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="20"/>

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml Sat Nov  5 12:41:35 2016
@@ -37,8 +37,8 @@ under the License.
         <menu-item name="viewtree" title="${uiLabelMap.ContentCompDocViewTree}">
             <condition>
                 <or>
-                    <if-compare value="COMPDOC_TEMPLATE" field="contentTypeId" operator="equals"></if-compare>
-                    <if-compare value="TEMPLATE" field="contentTypeId" operator="equals"></if-compare>
+                    <if-compare field="contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"></if-compare>
+                    <if-compare field="contentTypeId" operator="equals" value="TEMPLATE"></if-compare>
                 </or>
             </condition>
             <link target="ViewCompDocTemplateTree">
@@ -49,8 +49,8 @@ under the License.
         <menu-item name="viewtree2" title="${uiLabelMap.ContentCompDocViewTree}">
             <condition>
                 <or>
-                    <if-compare value="COMPDOC_INSTANCE" field="contentTypeId" operator="equals"></if-compare>
-                    <if-compare value="DOCUMENT" field="contentTypeId" operator="equals"></if-compare>
+                    <if-compare field="contentTypeId" operator="equals" value="COMPDOC_INSTANCE"></if-compare>
+                    <if-compare field="contentTypeId" operator="equals" value="DOCUMENT"></if-compare>
                 </or>
             </condition>
             <link target="ViewCompDocInstanceTree">
@@ -83,8 +83,8 @@ under the License.
         <menu-item name="viewtree" title="${uiLabelMap.PageTitleViewCompDocTree}">
             <condition>
                 <or>
-                    <if-compare value="COMPDOC_TEMPLATE" field="contentTypeId" operator="equals"></if-compare>
-                    <if-compare value="TEMPLATE" field="contentTypeId" operator="equals"></if-compare>
+                    <if-compare field="contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"></if-compare>
+                    <if-compare field="contentTypeId" operator="equals" value="TEMPLATE"></if-compare>
                 </or>
             </condition>
             <link target="ViewCompDocTemplateTree">
@@ -95,8 +95,8 @@ under the License.
         <menu-item name="viewtree2" title="${uiLabelMap.PageTitleViewCompDocTree}">
             <condition>
                 <or>
-                    <if-compare value="COMPDOC_INSTANCE" field="contentTypeId" operator="equals"></if-compare>
-                    <if-compare value="DOCUMENT" field="contentTypeId" operator="equals"></if-compare>
+                    <if-compare field="contentTypeId" operator="equals" value="COMPDOC_INSTANCE"></if-compare>
+                    <if-compare field="contentTypeId" operator="equals" value="DOCUMENT"></if-compare>
                 </or>
             </condition>
             <link target="ViewCompDocInstanceTree">

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Sat Nov  5 12:41:35 2016
@@ -126,7 +126,7 @@ under the License.
                 <set field="currentMenuItemName" value="approval"/>
 
                 <entity-one entity-name="ContentApproval" value-field="contentApproval" use-cache="true">
-                    <field-map from-field="parameters.contentApprovalId" field-name="contentApprovalId"/>
+                    <field-map field-name="contentApprovalId" from-field="parameters.contentApprovalId"/>
                 </entity-one>
                 <set from-field="contentApproval.contentId" field="rootContentId"/>
                 <set from-field="contentApproval.contentRevisionSeqId" field="rootContentRevisionSeqId"/>
@@ -167,7 +167,7 @@ under the License.
                 </entity-one>
                 <set from-field="content.contentTypeId" field="contentTypeId"/>
                 <entity-and entity-name="ContentRevision" list="contentRevisionList" use-cache="true">
-                    <field-map from-field="contentId" field-name="contentId"/>
+                    <field-map field-name="contentId" from-field="contentId"/>
                 </entity-and>
 
                 <set field="title" value="${uiLabelMap.ContentCompDocRevisionListPageForContent} ${rootContentId} ${uiLabelMap.ContentCompDocRev} ${rootContentRevisionSeqId}"/>

Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Sat Nov  5 12:41:35 2016
@@ -233,10 +233,10 @@ under the License.
         header-row-style="header-row" default-table-style="basic-table">
         <actions>
             <entity-one entity-name="ContentAssoc" use-cache="true">
-                <field-map from-field="contentId" field-name="contentId"/>
-                <field-map from-field="contentIdTo" field-name="contentIdTo"/>
-                <field-map from-field="contentAssocTypeId" field-name="contentAssocTypeId"/>
-                <field-map from-field="fromDate" field-name="fromDate"/>
+                <field-map field-name="contentId" from-field="contentId"/>
+                <field-map field-name="contentIdTo" from-field="contentIdTo"/>
+                <field-map field-name="contentAssocTypeId" from-field="contentAssocTypeId"/>
+                <field-map field-name="fromDate" from-field="fromDate"/>
             </entity-one>
         </actions>
         <auto-fields-entity entity-name="ContentAssoc"/>
@@ -278,7 +278,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="ContentAssoc" use-cache="true">
-                <field-map from-field="contentId" field-name="contentId"/>
+                <field-map field-name="contentId" from-field="contentId"/>
             </entity-and>
         </actions>
         <!--auto-fields-entity entity-name="ContentAssoc" default-field-type="display"/-->
@@ -310,7 +310,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="ContentAssoc" use-cache="true">
-                <field-map from-field="contentId" field-name="contentIdTo"/>
+                <field-map field-name="contentIdTo" from-field="contentId"/>
             </entity-and>
         </actions>
         <field name="contentId">
@@ -367,7 +367,7 @@ under the License.
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true">
         <actions>
             <entity-and entity-name="ContentRole" use-cache="true">
-                <field-map from-field="contentId" field-name="contentId"/>
+                <field-map field-name="contentId" from-field="contentId"/>
             </entity-and>
         </actions>
         <auto-fields-service service-name="updateContentRole" default-field-type="display"/>
@@ -404,7 +404,7 @@ under the License.
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true">
         <actions>
             <entity-and entity-name="ContentPurpose" use-cache="true">
-                <field-map from-field="contentId" field-name="contentId"/>
+                <field-map field-name="contentId" from-field="contentId"/>
             </entity-and>
         </actions>
         <auto-fields-service service-name="updateContentPurpose" default-field-type="display"/>
@@ -431,7 +431,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="ContentAttribute" use-cache="true">
-                <field-map from-field="contentId" field-name="contentId"/>
+                <field-map field-name="contentId" from-field="contentId"/>
             </entity-and>
         </actions>
         <auto-fields-service service-name="updateContentAttribute" default-field-type="display"/>
@@ -476,7 +476,7 @@ under the License.
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true">
         <actions>
             <entity-and entity-name="ContentMetaData" use-cache="true">
-                <field-map from-field="contentId" field-name="contentId"/>
+                <field-map field-name="contentId" from-field="contentId"/>
             </entity-and>
         </actions>
         <auto-fields-service service-name="updateContentMetaData" default-field-type="edit"/>
@@ -531,7 +531,7 @@ under the License.
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true">
         <actions>
             <entity-and entity-name="WorkEffortContent" use-cache="true" list="workEffortContents">
-                <field-map from-field="contentId" field-name="contentId"/>
+                <field-map field-name="contentId" from-field="contentId"/>
             </entity-and>
         </actions>
         <auto-fields-service service-name="updateWorkEffortContent" default-field-type="edit"/>
@@ -652,7 +652,7 @@ under the License.
     <form name="ListContentKeywords" type="list" target="deleteContentKeyword" odd-row-style="alternate-row" default-table-style="basic-table">
         <actions>
             <entity-and entity-name="ContentKeyword" use-cache="true">
-                <field-map from-field="contentId" field-name="contentId"/>
+                <field-map field-name="contentId" from-field="contentId"/>
             </entity-and>
         </actions>
         <auto-fields-entity entity-name="ContentKeyword" default-field-type="display"/>

Modified: ofbiz/trunk/applications/humanres/minilang/HumanResEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/minilang/HumanResEvents.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/minilang/HumanResEvents.xml (original)
+++ ofbiz/trunk/applications/humanres/minilang/HumanResEvents.xml Sat Nov  5 12:41:35 2016
@@ -29,7 +29,7 @@
         <call-service service-name="createPartyRelationship" in-map-name="internalCtx"></call-service>
     </simple-method>
     <simple-method method-name="removeEmlpPosition" short-description="">
-        <entity-and list="emplPositionFulfillment" entity-name="EmplPositionFulfillment">
+        <entity-and entity-name="EmplPositionFulfillment" list="emplPositionFulfillment">
             <field-map field-name="emplPositionId" from-field="parameters.emplPositionId"/>
             <field-map field-name="partyId" from-field="parameters.partyId"/>
         </entity-and>
@@ -43,7 +43,7 @@
         <call-service service-name="deleteEmplPosition" in-map-name="delEmlpCtx"></call-service>
     </simple-method>
     <simple-method method-name="removeInternalOrg" short-description="">
-        <entity-and list="partyRelationship" entity-name="PartyRelationship">
+        <entity-and entity-name="PartyRelationship" list="partyRelationship">
             <field-map field-name="partyIdTo" from-field="parameters.partyId"/>
             <field-map field-name="partyIdFrom" from-field="parameters.parentpartyId"/>
         </entity-and>
@@ -72,7 +72,7 @@
             <field field="dateValue" type="java.sql.Timestamp"/>
         </call-class-method>
         <set field="parameters.estimatedCompletionDate" from-field="dateEnd"/>
-        <entity-and list="workEffortList" entity-name="WorkEffort">
+        <entity-and entity-name="WorkEffort" list="workEffortList">
             <field-map field-name="workEffortTypeId" value="PUBLIC_HOLIDAY"/>
             <field-map field-name="estimatedStartDate" from-field="parameters.estimatedStartDate"/>
         </entity-and>

Modified: ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml (original)
+++ ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml Sat Nov  5 12:41:35 2016
@@ -61,7 +61,7 @@
             </then>
             <else>
                 <add-error>
-                    <fail-property property="HumanResEmplPostitionIdReportingToAndEmplPositionIdManagedByMustBeDiff" resource="HumanResUiLabels"/>
+                    <fail-property resource="HumanResUiLabels" property="HumanResEmplPostitionIdReportingToAndEmplPositionIdManagedByMustBeDiff"/>
                 </add-error>
                 <check-errors/>
             </else>
@@ -126,7 +126,7 @@
     <simple-method method-name="createEmplLeave" short-description="Create Employee Leave">
         <make-value entity-name="EmplLeave" value-field="newEntity"/>
         <set-pk-fields value-field="newEntity" map="parameters"/>
-        <set-nonpk-fields value-field="newEntity" map="parameters"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-field="newEntity"/>
         <check-errors/>
         <property-to-field resource="HumanResUiLabels" property="HumanResLeaveCreationSuccess" field="successMessage"/>
@@ -210,7 +210,7 @@
     
     <simple-method method-name="updateSalaryStep" short-description="Update Salary Step">
         <entity-one entity-name="SalaryStep" value-field="lookedUpValue"/>
-        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <set field="lookedUpValue.lastModifiedByUserLogin" from-field="parameters.userLogin.userLoginId"/>
         <now field="fromDate"/>
         <set field="lookedUpValue.dateModified" from-field="fromDate"/>

Modified: ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml (original)
+++ ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml Sat Nov  5 12:41:35 2016
@@ -51,7 +51,7 @@ under the License.
         <set-pk-fields map="parameters" value-field="lookupMap"/>
         <find-by-and entity-name="ProductAssoc" map="lookupMap" list="assocs"/>
         <filter-list-by-date list="assocs"/>
-        <iterate entry="assoc" list="assocs">
+        <iterate list="assocs" entry="assoc">
             <set-service-fields service-name="createBOMAssoc" map="assoc" to-map="context"/>
             <set field="context.productId" from-field="parameters.copyToProductId"/>
             <call-service service-name="createBOMAssoc" in-map-name="context" break-on-error="false"/>
@@ -59,7 +59,7 @@ under the License.
     </simple-method>
 
     <simple-method method-name="eventEditBOM" short-description="Add, update, delete components in BOM">
-        <if-compare value="UPDATE" field="parameters.UPDATE_MODE" operator="equals">
+        <if-compare field="parameters.UPDATE_MODE" operator="equals" value="UPDATE">
             <set-service-fields service-name="updateProductAssoc" map="parameters" to-map="context"/>
             <call-map-processor xml-resource="component://manufacturing/minilang/bom/BomMapProcs.xml"
                                 processor-name="prepareUpdateBOMAssoc"
@@ -68,7 +68,7 @@ under the License.
             <call-service service-name="updateProductAssoc" in-map-name="context"/>
             <check-errors/>
         </if-compare>
-        <if-compare value="CREATE" field="parameters.UPDATE_MODE" operator="equals">
+        <if-compare field="parameters.UPDATE_MODE" operator="equals" value="CREATE">
             <set-service-fields service-name="createBOMAssoc" map="parameters" to-map="context"/>
             <call-map-processor xml-resource="component://manufacturing/minilang/bom/BomMapProcs.xml"
                                 processor-name="prepareUpdateBOMAssoc"
@@ -84,7 +84,7 @@ under the License.
             </if-not-empty>
             <!--<check-errors/>-->
         </if-compare>
-        <if-compare value="DELETE" field="parameters.UPDATE_MODE" operator="equals">
+        <if-compare field="parameters.UPDATE_MODE" operator="equals" value="DELETE">
             <set-service-fields service-name="deleteProductAssoc" map="parameters" to-map="context"/>
             <call-map-processor xml-resource="component://manufacturing/minilang/bom/BomMapProcs.xml"
                                 processor-name="prepareDeleteProductAssoc"
@@ -93,7 +93,7 @@ under the License.
             <call-service service-name="deleteProductAssoc" in-map-name="context"/>
             <check-errors/>
         </if-compare>
-        <if-compare value="COPY" field="parameters.UPDATE_MODE" operator="equals">
+        <if-compare field="parameters.UPDATE_MODE" operator="equals" value="COPY">
             <set-service-fields service-name="copyBOMAssocs" map="parameters" to-map="context"/>
             <call-service service-name="copyBOMAssocs" in-map-name="context"/>
             <check-errors/>

Modified: ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml Sat Nov  5 12:41:35 2016
@@ -75,7 +75,7 @@ under the License.
                         <set-service-fields to-map="callSvcMap" service-name="issueProductionRunTaskComponent" map="component"/>
                         <set from-field="reserveOrderEnumId" field="callSvcMap.reserveOrderEnumId"/>
                         <!-- calculate quantity needed if the produced run quantity is produced partially -->
-                        <entity-and list="issuances" entity-name="WorkEffortAndInventoryAssign">
+                        <entity-and entity-name="WorkEffortAndInventoryAssign" list="issuances">
                             <field-map field-name="workEffortId" from-field="workEffort.workEffortId"/>
                             <field-map field-name="productId" from-field="component.productId"/>
                         </entity-and>
@@ -192,7 +192,7 @@ under the License.
             <set from-field="estimatedQuantity" field="parameters.quantityNotIssued"/>
 
             <set field="parameters.useReservedItems" value="N"/>
-            <iterate entry="inventoryItem" list="inventoryItemList">
+            <iterate list="inventoryItemList" entry="inventoryItem">
                 <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names -->
                 <call-simple-method method-name="issueProductionRunTaskComponentInline"/>
             </iterate>
@@ -206,7 +206,7 @@ under the License.
                 </condition>
                 <then>
                     <set field="parameters.useReservedItems" value="Y"/>
-                    <iterate entry="inventoryItem" list="inventoryItemList">
+                    <iterate list="inventoryItemList" entry="inventoryItem">
                         <if-compare field="parameters.quantityNotIssued" operator="greater" value="0" type="BigDecimal">
                             <refresh-value value-field="inventoryItem"/>
                             <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names -->
@@ -227,7 +227,7 @@ under the License.
                     </condition>
                     <then>
                         <add-error>
-                            <fail-property property="ManufacturingMaterialsNotAvailable" resource="ManufacturingUiLabels"/>
+                            <fail-property resource="ManufacturingUiLabels" property="ManufacturingMaterialsNotAvailable"/>
                         </add-error>
                     </then>
                 </if>
@@ -292,7 +292,7 @@ under the License.
                 <calculate field="parameters.quantityNotIssued" ><number value="0"/></calculate>
             </if-compare>
             <if-not-empty field="workEffortGoodStandard">
-                <entity-and list="issuances" entity-name="WorkEffortAndInventoryAssign">
+                <entity-and entity-name="WorkEffortAndInventoryAssign" list="issuances">
                     <field-map field-name="workEffortId" from-field="workEffortGoodStandard.workEffortId"/>
                     <field-map field-name="productId" from-field="workEffortGoodStandard.productId"/>
                 </entity-and>
@@ -337,7 +337,7 @@ under the License.
                     <and>
                         <or>
                             <if-empty field="inventoryItem.statusId"/>
-                            <if-compare operator="equals" field="inventoryItem.statusId" value="INV_AVAILABLE"/>
+                            <if-compare field="inventoryItem.statusId" operator="equals" value="INV_AVAILABLE"/>
                         </or>
                         <if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM"/>
                     </and>

Modified: ofbiz/trunk/applications/manufacturing/minilang/test/ProductionRunTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/minilang/test/ProductionRunTests.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/minilang/test/ProductionRunTests.xml (original)
+++ ofbiz/trunk/applications/manufacturing/minilang/test/ProductionRunTests.xml Sat Nov  5 12:41:35 2016
@@ -63,7 +63,7 @@ under the License.
             <if-compare-field field="productionRunHeader.estimatedStartDate" operator="less" to-field="productionRunHeader.estimatedCompletionDate" type="Timestamp"/>
         </assert>
 
-        <entity-and list="productionRunProducts" entity-name="WorkEffortGoodStandard">
+        <entity-and entity-name="WorkEffortGoodStandard" list="productionRunProducts">
             <field-map field-name="workEffortId" from-field="productionRunId"/>
         </entity-and>
         <first-from-list entry="productionRunProduct" list="productionRunProducts"/>
@@ -75,7 +75,7 @@ under the License.
             <if-compare-field field="productionRunProduct.estimatedQuantity" operator="equals" to-field="quantity"/>
         </assert>
 
-        <entity-and list="productionRunTasks" entity-name="WorkEffort">
+        <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" from-field="productionRunId"/>
         </entity-and>
         <first-from-list entry="productionRunTask" list="productionRunTasks"/>
@@ -94,7 +94,7 @@ under the License.
         </assert>
 
         <!-- Verify that the cost calcs were copied from the routing task to the production run task -->
-        <entity-and list="costCalcs" entity-name="WorkEffortCostCalc">
+        <entity-and entity-name="WorkEffortCostCalc" list="costCalcs">
             <field-map field-name="workEffortId" from-field="productionRunTask.workEffortId" />
         </entity-and>
         <first-from-list entry="costCalc" list="costCalcs"/>
@@ -106,7 +106,7 @@ under the License.
         </assert>
 
         <!-- Verify that the BOM was properly copied to the production run task -->
-        <entity-and list="productionRunMaterials" entity-name="WorkEffortGoodStandard">
+        <entity-and entity-name="WorkEffortGoodStandard" list="productionRunMaterials">
             <field-map field-name="workEffortId" from-field="productionRunTask.workEffortId"/>
             <field-map field-name="productId" value="MAT_A_COST"/>
         </entity-and>
@@ -116,7 +116,7 @@ under the License.
             <if-compare field="productionRunMaterialA.workEffortGoodStdTypeId" operator="equals" value="PRUNT_PROD_NEEDED"/>
             <if-compare field="productionRunMaterialA.estimatedQuantity" operator="equals" value="${quantity * 2}" type="BigDecimal"/>
         </assert>
-        <entity-and list="productionRunMaterials" entity-name="WorkEffortGoodStandard">
+        <entity-and entity-name="WorkEffortGoodStandard" list="productionRunMaterials">
             <field-map field-name="workEffortId" from-field="productionRunTask.workEffortId"/>
             <field-map field-name="productId" value="MAT_B_COST"/>
         </entity-and>
@@ -160,7 +160,7 @@ under the License.
         <entity-one entity-name="WorkEffort" value-field="productionRunHeader">
             <field-map field-name="workEffortId" from-field="productionRunId"/>
         </entity-one>
-        <entity-and list="productionRunTasks" entity-name="WorkEffort">
+        <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" from-field="productionRunId"/>
         </entity-and>
         <first-from-list entry="productionRunTask" list="productionRunTasks"/>
@@ -202,7 +202,7 @@ under the License.
         <entity-one entity-name="WorkEffort" value-field="productionRunHeader">
             <field-map field-name="workEffortId" from-field="productionRunId"/>
         </entity-one>
-        <entity-and list="productionRunTasks" entity-name="WorkEffort">
+        <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" from-field="productionRunId"/>
         </entity-and>
         <first-from-list entry="productionRunTask" list="productionRunTasks"/>
@@ -244,7 +244,7 @@ under the License.
         <entity-one entity-name="WorkEffort" value-field="productionRunHeader">
             <field-map field-name="workEffortId" from-field="productionRunId"/>
         </entity-one>
-        <entity-and list="productionRunTasks" entity-name="WorkEffort">
+        <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" from-field="productionRunId"/>
         </entity-and>
         <first-from-list entry="productionRunTask" list="productionRunTasks"/>
@@ -317,7 +317,7 @@ under the License.
         <entity-one entity-name="WorkEffort" value-field="productionRunHeader">
             <field-map field-name="workEffortId" from-field="productionRunId"/>
         </entity-one>
-        <entity-and list="productionRunTasks" entity-name="WorkEffort">
+        <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" from-field="productionRunId"/>
         </entity-and>
         <first-from-list entry="productionRunTask" list="productionRunTasks"/>
@@ -327,7 +327,7 @@ under the License.
             <if-compare field="productionRunTask.currentStatusId" operator="equals" value="PRUN_CANCELLED"/>
         </assert>
 
-        <entity-and list="productionRunProducts" entity-name="WorkEffortGoodStandard">
+        <entity-and entity-name="WorkEffortGoodStandard" list="productionRunProducts">
             <field-map field-name="workEffortId" from-field="productionRunId"/>
         </entity-and>
         <first-from-list entry="productionRunProduct" list="productionRunProducts"/>
@@ -338,7 +338,7 @@ under the License.
             <if-compare field="productionRunProduct.statusId" operator="equals" value="WEGS_CANCELLED"/>
         </assert>
 
-        <entity-and list="productionRunMaterials" entity-name="WorkEffortGoodStandard">
+        <entity-and entity-name="WorkEffortGoodStandard" list="productionRunMaterials">
             <field-map field-name="workEffortId" from-field="productionRunTask.workEffortId"/>
             <field-map field-name="productId" value="MAT_A_COST"/>
         </entity-and>
@@ -348,7 +348,7 @@ under the License.
             <if-compare field="productionRunMaterialA.workEffortGoodStdTypeId" operator="equals" value="PRUNT_PROD_NEEDED"/>
             <if-compare field="productionRunMaterialA.statusId" operator="equals" value="WEGS_CANCELLED"/>
         </assert>
-        <entity-and list="productionRunMaterials" entity-name="WorkEffortGoodStandard">
+        <entity-and entity-name="WorkEffortGoodStandard" list="productionRunMaterials">
             <field-map field-name="workEffortId" from-field="productionRunTask.workEffortId"/>
             <field-map field-name="productId" value="MAT_B_COST"/>
         </entity-and>
@@ -402,16 +402,16 @@ under the License.
         <entity-one entity-name="WorkEffort" value-field="productionRunHeader">
             <field-map field-name="workEffortId" from-field="productionRunId"/>
         </entity-one>
-        <entity-and list="productionRunTasks" entity-name="WorkEffort">
+        <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" from-field="productionRunId"/>
         </entity-and>
         <first-from-list entry="productionRunTask" list="productionRunTasks"/>
-        <entity-and list="productionRunMaterials" entity-name="WorkEffortGoodStandard">
+        <entity-and entity-name="WorkEffortGoodStandard" list="productionRunMaterials">
             <field-map field-name="workEffortId" from-field="productionRunTask.workEffortId"/>
             <field-map field-name="productId" value="MAT_A_COST"/>
         </entity-and>
         <first-from-list entry="productionRunMaterialA" list="productionRunMaterials"/>
-        <entity-and list="productionRunMaterials" entity-name="WorkEffortGoodStandard">
+        <entity-and entity-name="WorkEffortGoodStandard" list="productionRunMaterials">
             <field-map field-name="workEffortId" from-field="productionRunTask.workEffortId"/>
             <field-map field-name="productId" value="MAT_B_COST"/>
         </entity-and>
@@ -433,7 +433,7 @@ under the License.
         <refresh-value value-field="productionRunHeader"/>
         <refresh-value value-field="productionRunTask"/>
 
-        <entity-and list="consumedMaterials" entity-name="WorkEffortAndInventoryAssign">
+        <entity-and entity-name="WorkEffortAndInventoryAssign" list="consumedMaterials">
             <field-map field-name="workEffortId" from-field="productionRunTask.workEffortId"/>
             <field-map field-name="productId" value="MAT_A_COST"/>
         </entity-and>
@@ -441,7 +441,7 @@ under the License.
         <iterate list="consumedMaterials" entry="consumedMaterial">
             <set field="materialAConsumedTotal" value="${materialAConsumedTotal + consumedMaterial.quantity}" type="BigDecimal"/>
         </iterate>
-        <entity-and list="consumedMaterials" entity-name="WorkEffortAndInventoryAssign">
+        <entity-and entity-name="WorkEffortAndInventoryAssign" list="consumedMaterials">
             <field-map field-name="workEffortId" from-field="productionRunTask.workEffortId"/>
             <field-map field-name="productId" value="MAT_B_COST"/>
         </entity-and>
@@ -449,7 +449,7 @@ under the License.
         <iterate list="consumedMaterials" entry="consumedMaterial">
             <set field="materialBConsumedTotal" value="${materialBConsumedTotal + consumedMaterial.quantity}" type="BigDecimal"/>
         </iterate>
-        <entity-and list="producedMaterials" entity-name="WorkEffortAndInventoryProduced">
+        <entity-and entity-name="WorkEffortAndInventoryProduced" list="producedMaterials">
             <field-map field-name="workEffortId" from-field="productionRunHeader.workEffortId"/>
         </entity-and>
         <set field="materialProducedTotal" value="0.0" type="BigDecimal"/>
@@ -487,7 +487,7 @@ under the License.
 
         <refresh-value value-field="productionRunHeader"/>
         <refresh-value value-field="productionRunTask"/>
-        <entity-and list="consumedMaterials" entity-name="WorkEffortAndInventoryAssign">
+        <entity-and entity-name="WorkEffortAndInventoryAssign" list="consumedMaterials">
             <field-map field-name="workEffortId" from-field="productionRunTask.workEffortId"/>
             <field-map field-name="productId" value="MAT_A_COST"/>
         </entity-and>
@@ -497,7 +497,7 @@ under the License.
             <set field="materialAConsumedTotal" value="${materialAConsumedTotal + consumedMaterial.quantity}" type="BigDecimal"/>
             <set field="totalMaterialCost" value="${totalMaterialCost + consumedMaterial.unitCost * consumedMaterial.quantity}" type="BigDecimal"/>
         </iterate>
-        <entity-and list="consumedMaterials" entity-name="WorkEffortAndInventoryAssign">
+        <entity-and entity-name="WorkEffortAndInventoryAssign" list="consumedMaterials">
             <field-map field-name="workEffortId" from-field="productionRunTask.workEffortId"/>
             <field-map field-name="productId" value="MAT_B_COST"/>
         </entity-and>
@@ -506,7 +506,7 @@ under the License.
             <set field="materialBConsumedTotal" value="${materialBConsumedTotal + consumedMaterial.quantity}" type="BigDecimal"/>
             <set field="totalMaterialCost" value="${totalMaterialCost + consumedMaterial.unitCost * consumedMaterial.quantity}" type="BigDecimal"/>
         </iterate>
-        <entity-and list="producedMaterials" entity-name="WorkEffortAndInventoryProduced">
+        <entity-and entity-name="WorkEffortAndInventoryProduced" list="producedMaterials">
             <field-map field-name="workEffortId" from-field="productionRunHeader.workEffortId"/>
         </entity-and>
         <set field="materialProducedTotal" value="0.0" type="BigDecimal"/>
@@ -540,7 +540,7 @@ under the License.
             <if-compare field="productionRunTask.currentStatusId" operator="equals" value="PRUN_COMPLETED"/>
         </assert>
 
-        <entity-and list="costComponents" entity-name="CostComponent">
+        <entity-and entity-name="CostComponent" list="costComponents">
             <field-map field-name="workEffortId" from-field="productionRunHeader.workEffortId"/>
         </entity-and>
         <iterate list="costComponents" entry="costComponent">
@@ -553,7 +553,7 @@ under the License.
             </if-compare>
         </iterate>
 
-        <entity-and list="costComponents" entity-name="CostComponent">
+        <entity-and entity-name="CostComponent" list="costComponents">
             <field-map field-name="workEffortId" from-field="productionRunTask.workEffortId"/>
         </entity-and>
         <iterate list="costComponents" entry="costComponent">
@@ -590,7 +590,7 @@ under the License.
         </assert>
 
         <set field="postedTotalAmount" value="0.0" type="BigDecimal"/>
-        <entity-and list="acctgTransList" entity-name="AcctgTrans">
+        <entity-and entity-name="AcctgTrans" list="acctgTransList">
             <field-map field-name="acctgTransTypeId" value="INVENTORY"/>
             <field-map field-name="workEffortId" from-field="productionRunHeader.workEffortId"/>
         </entity-and>
@@ -620,7 +620,7 @@ under the License.
         </assert>
 
         <set field="postedTotalAmount" value="0.0" type="BigDecimal"/>
-        <entity-and list="acctgTransList" entity-name="AcctgTrans">
+        <entity-and entity-name="AcctgTrans" list="acctgTransList">
             <field-map field-name="acctgTransTypeId" value="MANUFACTURING"/>
             <field-map field-name="workEffortId" from-field="productionRunHeader.workEffortId"/>
         </entity-and>
@@ -651,7 +651,7 @@ under the License.
         </assert>
 
         <set field="postedTotalAmount" value="0.0" type="BigDecimal"/>
-        <entity-and list="acctgTransList" entity-name="AcctgTrans">
+        <entity-and entity-name="AcctgTrans" list="acctgTransList">
             <field-map field-name="acctgTransTypeId" value="INVENTORY"/>
             <field-map field-name="workEffortId" from-field="productionRunTask.workEffortId"/>
         </entity-and>
@@ -702,7 +702,7 @@ under the License.
         </assert>
 
         <set field="postedTotalAmount" value="0.0" type="BigDecimal"/>
-        <entity-and list="acctgTransList" entity-name="AcctgTrans">
+        <entity-and entity-name="AcctgTrans" list="acctgTransList">
             <field-map field-name="acctgTransTypeId" value="MANUFACTURING"/>
             <field-map field-name="workEffortId" from-field="productionRunTask.workEffortId"/>
         </entity-and>
@@ -781,7 +781,7 @@ under the License.
         <entity-one entity-name="WorkEffort" value-field="productionRunHeader">
             <field-map field-name="workEffortId" from-field="productionRunId"/>
         </entity-one>
-        <entity-and list="productionRunTasks" entity-name="WorkEffort">
+        <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" from-field="productionRunId"/>
         </entity-and>
         <first-from-list entry="productionRunTask" list="productionRunTasks"/>
@@ -836,7 +836,7 @@ under the License.
         <entity-one entity-name="WorkEffort" value-field="productionRunHeader">
             <field-map field-name="workEffortId" from-field="productionRunId"/>
         </entity-one>
-        <entity-and list="productionRunTasks" entity-name="WorkEffort">
+        <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" from-field="productionRunId"/>
         </entity-and>
         <first-from-list entry="productionRunTask" list="productionRunTasks"/>
@@ -869,7 +869,7 @@ under the License.
             <field-map field-name="userLoginId" value="TestManufAdmin"/>
         </entity-one>
 
-        <entity-and list="orderItems" entity-name="OrderItem">
+        <entity-and entity-name="OrderItem" list="orderItems">
             <field-map field-name="orderId" from-field="orderId"/>
             <field-map field-name="productId" from-field="productId"/>
         </entity-and>
@@ -878,7 +878,7 @@ under the License.
             <not><if-empty field="orderItem"/></not>
         </assert>
         <check-errors/>
-        <entity-and list="orderItemShipGrpInvRess" entity-name="OrderItemShipGrpInvRes">
+        <entity-and entity-name="OrderItemShipGrpInvRes" list="orderItemShipGrpInvRess">
             <field-map field-name="orderId" from-field="orderId"/>
             <field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/>
         </entity-and>
@@ -901,7 +901,7 @@ under the License.
         <entity-one entity-name="WorkEffort" value-field="productionRunHeader">
             <field-map field-name="workEffortId" from-field="productionRunId"/>
         </entity-one>
-        <entity-and list="productionRunTasks" entity-name="WorkEffort">
+        <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" from-field="productionRunId"/>
         </entity-and>
         <first-from-list entry="productionRunTask" list="productionRunTasks"/>
@@ -914,7 +914,7 @@ under the License.
             <if-compare field="productionRunHeader.quantityToProduce" operator="equals" value="1.0" type="BigDecimal"/>
         </assert>
 
-        <entity-and list="productionRunProducts" entity-name="WorkEffortGoodStandard">
+        <entity-and entity-name="WorkEffortGoodStandard" list="productionRunProducts">
             <field-map field-name="workEffortId" from-field="productionRunId"/>
         </entity-and>
         <first-from-list entry="productionRunProduct" list="productionRunProducts"/>
@@ -926,7 +926,7 @@ under the License.
             <if-compare field="productionRunProduct.estimatedQuantity" operator="equals" value="1.0" type="BigDecimal"/>
         </assert>
 
-        <entity-and list="workOrderItemFulfillments" entity-name="WorkOrderItemFulfillment">
+        <entity-and entity-name="WorkOrderItemFulfillment" list="workOrderItemFulfillments">
             <field-map field-name="workEffortId" from-field="productionRunId"/>
             <field-map field-name="orderId" from-field="orderId"/>
         </entity-and>
@@ -948,12 +948,12 @@ under the License.
         <set field="serviceCtx.statusId" value="PRUN_CLOSED"/>
         <call-service service-name="quickChangeProductionRunStatus" in-map-name="serviceCtx"/>
 
-        <entity-and list="producedMaterials" entity-name="WorkEffortAndInventoryProduced">
+        <entity-and entity-name="WorkEffortAndInventoryProduced" list="producedMaterials">
             <field-map field-name="workEffortId" from-field="productionRunHeader.workEffortId"/>
         </entity-and>
         <first-from-list entry="producedMaterial" list="producedMaterials"/>
 
-        <entity-and list="orderItemShipGrpInvRess" entity-name="OrderItemShipGrpInvRes">
+        <entity-and entity-name="OrderItemShipGrpInvRes" list="orderItemShipGrpInvRess">
             <field-map field-name="orderId" from-field="orderId"/>
             <field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/>
         </entity-and>
@@ -997,7 +997,7 @@ under the License.
             </condition-list>
         </entity-condition>
         <first-from-list entry="productionRunHeader" list="workEfforts"/>
-        <entity-and list="productionRunTasks" entity-name="WorkEffort">
+        <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" from-field="productionRunHeader.workEffortId"/>
         </entity-and>
         <first-from-list entry="productionRunTask" list="productionRunTasks"/>
@@ -1012,7 +1012,7 @@ under the License.
             <if-compare-field field="productionRunTask.estimatedStartDate" operator="equals" to-field="startDate" type="Timestamp"/>
         </assert>
 
-        <entity-and list="productionRunProducts" entity-name="WorkEffortGoodStandard">
+        <entity-and entity-name="WorkEffortGoodStandard" list="productionRunProducts">
             <field-map field-name="workEffortId" from-field="productionRunHeader.workEffortId"/>
         </entity-and>
         <first-from-list entry="productionRunProduct" list="productionRunProducts"/>

Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml Sat Nov  5 12:41:35 2016
@@ -109,8 +109,8 @@ under the License.
                 <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
 
                 <entity-and entity-name="ProductFeatureAndAppl" list="selectedFeatures">
-                    <field-map from-field="productId" field-name="productId"/>
-                    <field-map from-field="productFeatureApplTypeId" field-name="productFeatureApplTypeId"/>
+                    <field-map field-name="productId" from-field="productId"/>
+                    <field-map field-name="productFeatureApplTypeId" from-field="productFeatureApplTypeId"/>
                     <order-by field-name="sequenceNum"/>
                 </entity-and>
                 <script location="component://manufacturing/groovyScripts/bom/BomSimulation.groovy"/>