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

[diveshdutta]

Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml Sat Nov  5 14:14:04 2016
@@ -176,13 +176,13 @@ under the License.
         </field>
         <!--
         <field name="costComponentCalcView" entry-name="costComponentCalcId" title=" " widget-style="buttontext">
-            <hyperlink target="viewCostComponentCalc" description="${uiLabelMap.CommonViewFormula}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonViewFormula}" target="viewCostComponentCalc" also-hidden="false">
                 <parameter param-name="costComponentCalcId"/>
             </hyperlink>
         </field>
         -->
         <field name="calcelWorkEffortCostCalc" title=" " widget-style="buttontext">
-            <hyperlink target="removeRoutingTaskCost" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeRoutingTaskCost" also-hidden="false">
                 <parameter param-name="costComponentCalcId"/>
                 <parameter param-name="costComponentTypeId"/>
                 <parameter param-name="fromDate"/>
@@ -221,7 +221,7 @@ under the License.
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
         <field name="editRouting" title=" " widget-style="buttontext">
-            <hyperlink target="EditRouting" description="${uiLabelMap.ManufacturingEditRouting}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.ManufacturingEditRouting}" target="EditRouting" also-hidden="false">
                 <parameter param-name="workEffortId" from-field="workEffortIdFrom"/>
             </hyperlink>
         </field>
@@ -234,7 +234,7 @@ under the License.
         <field name="workEffortIdFrom"><hidden/></field>
         <field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"><display/></field>
         <field name="workEffortIdTo"  title="${uiLabelMap.ManufacturingTaskName}" widget-style="buttontext">
-            <hyperlink target="EditRoutingTask" description="[${workEffortIdTo}] ${workEffortToName}" also-hidden="false">
+            <hyperlink description="[${workEffortIdTo}] ${workEffortToName}" target="EditRoutingTask" also-hidden="false">
                 <parameter param-name="workEffortId" from-field="workEffortIdTo"/>
             </hyperlink>
         </field>
@@ -244,7 +244,7 @@ under the License.
         <field name="workEffortToSetup" title="${uiLabelMap.ManufacturingTaskEstimatedSetupMillis}" ><display/></field>
         <field name="workEffortToRun" title="${uiLabelMap.ManufacturingTaskEstimatedMilliSeconds}" ><display/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="RemoveRoutingTaskAssoc" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="RemoveRoutingTaskAssoc" also-hidden="false">
                 <parameter param-name="workEffortId" from-field="workEffortIdFrom"/>
                 <parameter param-name="workEffortIdFrom"/>
                 <parameter param-name="workEffortIdTo"/>
@@ -312,7 +312,7 @@ under the License.
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
         <field name="estimatedQuantity" title="${uiLabelMap.ManufacturingQuantity}"><display/></field>
        <field name="editLink" title=" " widget-style="buttontext" >
-            <hyperlink target="EditRoutingProductLink" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditRoutingProductLink" also-hidden="false">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="productId"/>
                 <parameter param-name="fromDate"/>
@@ -320,7 +320,7 @@ under the License.
             </hyperlink>
         </field>
        <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeRoutingProductLink" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeRoutingProductLink" also-hidden="false">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="productId"/>
                 <parameter param-name="fromDate"/>
@@ -336,7 +336,7 @@ under the License.
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
         <field name="editLink" title=" " widget-style="buttontext">
-            <hyperlink target="EditRoutingTaskProduct" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditRoutingTaskProduct" also-hidden="false">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="productId"/>
                 <parameter param-name="fromDate"/>
@@ -344,7 +344,7 @@ under the License.
                 </hyperlink>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeRoutingTaskProduct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeRoutingTaskProduct" also-hidden="false">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="productId"/>
                 <parameter param-name="fromDate"/>

Modified: ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml (original)
+++ ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml Sat Nov  5 14:14:04 2016
@@ -138,7 +138,7 @@ under the License.
                  </condition-list>
                  <order-by field-name="-statusDate"/>
              </entity-condition>
-             <first-from-list entry="lastRecord" list="lookupList"/>
+             <first-from-list list="lookupList" entry="lastRecord"/>
              <set field="parameters.fromDate" from-field="lastRecord.fromDate"/>            
         </if-empty>
         
@@ -169,7 +169,7 @@ under the License.
         </entity-and>
         <if-not-empty field="contactListPartyStatusList">
             <set-service-fields service-name="updateContactListParty" map="parameters" to-map="updateContactListPartyMap"/>
-            <entity-one value-field="systemUserLogin" entity-name="UserLogin">
+            <entity-one entity-name="UserLogin" value-field="systemUserLogin">
                 <field-map field-name="userLoginId" value="system"/>
             </entity-one>
             <set field="updateContactListPartyMap.userLogin" from-field="systemUserLogin"/>
@@ -191,7 +191,7 @@ under the License.
             <check-errors/>
         </if-compare>
         
-        <entity-one value-field="userLogin" entity-name="UserLogin">
+        <entity-one entity-name="UserLogin" value-field="userLogin">
             <field-map field-name="userLoginId" value="system"/>
         </entity-one>
         <if-empty field="parameters.partyId">
@@ -243,9 +243,9 @@ under the License.
             <field-map field-name="partyId" from-field="parameters.partyId"/>
             <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
         </entity-and>
-        <first-from-list entry="partyContactWithPurpose" list="partyContactWithPurposes"/>
+        <first-from-list list="partyContactWithPurposes" entry="partyContactWithPurpose"/>
         <set field="email" from-field="partyContactWithPurpose.infoString"/>
-        <set-service-fields service-name="unsubscribeContactListParty" to-map="unsubscribeContactListPartyCtx" map="parameters"/>
+        <set-service-fields service-name="unsubscribeContactListParty" map="parameters" to-map="unsubscribeContactListPartyCtx"/>/>
         <set field="unsubscribeContactListPartyCtx.email" from-field="email"/>
         <call-service service-name="unsubscribeContactListParty" in-map-name="unsubscribeContactListPartyCtx"/>
     </simple-method>
@@ -302,7 +302,7 @@ under the License.
                     </condition-list>
                     <order-by field-name="-statusDate"/>
                 </entity-condition>
-                <first-from-list entry="lastContactListPartyStatus" list="lastContactListPartyStatusList"/>
+                <first-from-list list="lastContactListPartyStatusList" entry="lastContactListPartyStatus"/>
 
                 <!-- only require an optInVerifyCode if there was one in place -->
                 <if-not-empty field="lastContactListPartyStatus.optInVerifyCode">
@@ -369,7 +369,7 @@ under the License.
                     </condition-list>
                     <order-by field-name="-statusDate"/>
                 </entity-condition>
-                <first-from-list entry="contactListPartyStatus" list="lastContactListPartyStatusList"/>
+                <first-from-list list="lastContactListPartyStatusList" entry="contactListPartyStatus"/>
 
                 <!-- TODO: if preferredContactMech.contactMechTypeId != EMAIL_ADDRESS, return an error -->
                 <!-- TODO: if preferredContactMech is empty, should we try to find the ContactMech we want based on the Party? -->
@@ -416,7 +416,7 @@ under the License.
             <field-map field-name="contactListId" from-field="parameters.contactListId"/>
             <field-map field-name="fromDate" from-field="parameters.fromDate"/>
         </entity-and>
-        <first-from-list entry="entryWebSiteContactList" list="webSiteContactList"/>
+        <first-from-list list="webSiteContactList" entry="entryWebSiteContactList"/>
         <set-pk-fields value-field="entryWebSiteContactList" map="parameters"/>
         <set-nonpk-fields map="parameters" value-field="entryWebSiteContactList"/>
         <store-value value-field="entryWebSiteContactList"/>
@@ -432,7 +432,7 @@ under the License.
     
     <!-- service to use in contact list communications to handle opt-out links based on the communication event sent -->
     <simple-method method-name="optOutOfListFromCommEvent" short-description="Contact List Opt Out From Communication Event" login-required="false">
-        <entity-one value-field="commEvent" entity-name="CommunicationEvent"/>
+        <entity-one entity-name="CommunicationEvent" value-field="commEvent"/>
         <if>
             <condition>
                 <and>                    
@@ -493,8 +493,8 @@ under the License.
     
     <simple-method method-name="sendContactListPartySubscribeEmail" short-description="Send contact list party subscribe email" login-required="true">
         <set field="productStoreId" type="String" from-field="parameters.productStoreId"/>
-        <entity-one value-field="contactList" entity-name="ContactList"/>
-        <entity-one value-field="contactListParty" entity-name="ContactListParty"/>
+        <entity-one entity-name="ContactList" value-field="contactList"/>
+        <entity-one entity-name="ContactListParty" value-field="contactListParty"/>
         <!-- get the latest accepted status -->
         <!-- look up the last ContactListPartyStatus with statusId=CLPT_ACCEPTED -->
         <entity-condition entity-name="ContactListPartyStatus" list="lastContactListPartyStatusList">
@@ -506,10 +506,10 @@ under the License.
             </condition-list>
             <order-by field-name="-statusDate"/>
         </entity-condition>
-        <first-from-list entry="contactListPartyStatus" list="lastContactListPartyStatusList"/>
+        <first-from-list list="lastContactListPartyStatusList" entry="contactListPartyStatus"/>
                 
         <if-empty field="productStoreId">
-            <entity-one value-field="webSite" entity-name="WebSite">
+            <entity-one entity-name="WebSite" value-field="webSite">
                 <field-map field-name="webSiteId" from-field="contactList.verifyEmailWebSiteId"/>
             </entity-one>
             <set field="productStoreId" from-field="webSite.productStoreId"/>
@@ -568,12 +568,12 @@ under the License.
             </condition-list>
             <order-by field-name="-statusDate"/>
         </entity-condition>
-        <first-from-list entry="contactListPartyStatus" list="lastContactListPartyStatusList"/>
+        <first-from-list list="lastContactListPartyStatusList" entry="contactListPartyStatus"/>
         
         <set field="productStoreId" type="String" from-field="parameters.productStoreId"/>
-        <entity-one value-field="contactList" entity-name="ContactList"/>
+        <entity-one entity-name="ContactList" value-field="contactList"/>
         <if-empty field="productStoreId">
-            <entity-one value-field="webSite" entity-name="WebSite">
+            <entity-one entity-name="WebSite" value-field="webSite">
                 <field-map field-name="webSiteId" from-field="contactList.verifyEmailWebSiteId"/>
             </entity-one>
             <set field="productStoreId" from-field="webSite.productStoreId"/>
@@ -620,9 +620,9 @@ under the License.
     </simple-method>
     <simple-method method-name="sendContactListPartyUnSubscribeEmail" short-description="Send contact list party unsubscribe email" login-required="true">
         <set field="productStoreId" type="String" from-field="parameters.productStoreId"/>
-        <entity-one value-field="contactList" entity-name="ContactList"/>
+        <entity-one entity-name="ContactList" value-field="contactList"/>
         <if-empty field="productStoreId">
-            <entity-one value-field="webSite" entity-name="WebSite">
+            <entity-one entity-name="WebSite" value-field="webSite">
                 <field-map field-name="webSiteId" from-field="contactList.verifyEmailWebSiteId"/>
             </entity-one>
             <set field="productStoreId" from-field="webSite.productStoreId"/>

Modified: ofbiz/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml (original)
+++ ofbiz/trunk/applications/marketing/minilang/marketing/tracking/TrackingCodeServices.xml Sat Nov  5 14:14:04 2016
@@ -104,7 +104,7 @@ under the License.
                 <set field="trackingCodeOrder" from-field="trackingCodeOrders[0]"/>
                 <log level="info" message="Create  Tracking Code Order Return  For ${trackingCodeOrder}"/>
                 <if-not-empty field="trackingCodeOrder">
-                    <set-service-fields to-map="trackingCodeOrderReturnContext" service-name="createTrackingCodeOrderReturn" map="trackingCodeOrder"/>
+                    <set-service-fields service-name="createTrackingCodeOrderReturn" map="trackingCodeOrder" to-map="trackingCodeOrderReturnContext"/>
                     <set field="trackingCodeOrderReturnContext.returnId" from-field="parameters.returnId"/>
                     <set field="trackingCodeOrderReturnContext.orderId" from-field="trackingCodeOrder.orderId"/>
                     <set field="trackingCodeOrderReturnContext.trackingCodeTypeId" value="PARTNER_MGD"/>

Modified: ofbiz/trunk/applications/marketing/widget/ContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ContactListForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ContactListForms.xml Sat Nov  5 14:14:04 2016
@@ -78,7 +78,7 @@ under the License.
         
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> -->
-        <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> -->
+        <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" target-type="inter-app"/></field> -->
     </form>
 
     <form name="FindContactLists" target="FindContactLists" title="" type="single"
@@ -122,7 +122,7 @@ under the License.
             </service>
         </actions>
         <field name="contactListId"  widget-style="buttontext" title="${uiLabelMap.MarketingContactListContactListId}">
-            <hyperlink target="EditContactList" description="${contactListId}" also-hidden="false">
+            <hyperlink description="${contactListId}" target="EditContactList" also-hidden="false">
                 <parameter param-name="contactListId"/>
             </hyperlink>
         </field>
@@ -135,7 +135,7 @@ under the License.
         <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity entity-name="MarketingCampaign" description="${campaignName}"/></field>
         <!-- deleting contact lists is a bit more complicated than this... don't like have a link like this for top level entities
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeContactList" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContactList" also-hidden="false">
                 <parameter param-name="contactListId"/>
             </hyperlink>
         </field>
@@ -156,7 +156,7 @@ under the License.
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down no-current-selected-key="CLPT_ACCEPTED">
                 <entity-options entity-name="StatusItem">
-                    <entity-constraint name="statusTypeId" value="CONTACTLST_PARTY" operator="equals"/>
+                    <entity-constraint name="statusTypeId" operator="equals"  value="CONTACTLST_PARTY"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -169,7 +169,7 @@ under the License.
 
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <field use-when="partyId!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
-        <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+        <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false"/></field>
      </form>
     
 
@@ -226,14 +226,14 @@ under the License.
             <display-entity entity-name="ContactMechDetail" key-field-name="contactMechId" description="[${contactMechId}]: [${infoString}] [${tnCountryCode}-${tnAreaCode}-${tnContactNumber}] [${paAddress1}, ${paAddress1}, ${paCity}, ${paStateProvinceGeoId}, ${paPostalCode}, ${paPostalCodeExt} ${paCountryGeoId}]"/>
         </field>
         <field name="editLink" use-when="${groovy:thruDate == null || isDateAfterNow == true}" widget-style="buttontext">
-            <hyperlink target="EditContactListParty" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditContactListParty" also-hidden="false">
                 <parameter param-name="contactListId"/>
                 <parameter param-name="partyId"/>
                 <parameter param-name="fromDate"/>
             </hyperlink>
         </field>
         <field name="expireLink" use-when="${groovy:thruDate == null || isDateAfterNow == true}" widget-style="buttontext">
-            <hyperlink target="expireContactListParty" description="${uiLabelMap.CommonExpire}"  link-type="hidden-form" also-hidden="false">                
+            <hyperlink description="${uiLabelMap.CommonExpire}" target="expireContactListParty"  link-type="hidden-form" also-hidden="false">                
                 <parameter param-name="contactListId"/>                
                 <parameter param-name="partyId"/>
                 <parameter param-name="fromDate"/>
@@ -409,7 +409,7 @@ under the License.
         <field name="content" title="${uiLabelMap.CommonContent} -- ${communicationEventType.description}"><textarea cols="60" rows="10" visual-editor-enable="true"/></field>
         <field name="note" title="${uiLabelMap.CommonNote}"><textarea cols="60" rows="3"/></field>
         <field name="submitButton" title=" ${uiLabelMap.CommonSave} "><submit button-type="button"/></field>
-        <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+        <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false"/></field>
 
         <sort-order>
             <field-group title="${uiLabelMap.CommonAdvancedFeatures}" collapsible="true" initially-collapsed="true">
@@ -522,7 +522,7 @@ under the License.
             </service>
         </actions>
         <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${contactListId}" target="javascript:set_value('${contactListId}')" target-type="plain"/>
+            <hyperlink description="${contactListId}" target="javascript:set_value('${contactListId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><display/></field>
         <field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}"><display-entity entity-name="ContactListType"/></field>
@@ -569,7 +569,7 @@ under the License.
             </service>
         </actions>
         <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" target-type="plain"/>
+            <hyperlink description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}">
             <display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/>
@@ -658,7 +658,7 @@ under the License.
         <field name="thruDate"><date-time/></field>
         <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit/></field>
         <field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteWebSiteContactList" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWebSiteContactList">
                 <parameter param-name="webSiteId"/>
                 <parameter param-name="contactListId"/>
                 <parameter param-name="fromDate"/>

Modified: ofbiz/trunk/applications/marketing/widget/DataSourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/DataSourceForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/DataSourceForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/DataSourceForms.xml Sat Nov  5 14:14:04 2016
@@ -39,7 +39,7 @@ under the License.
 
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> -->
-        <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> -->
+        <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" target-type="inter-app"/></field> -->
     </form>
 
     <form name="ListDataSource" target="ListDataSource" title="" type="list"
@@ -48,14 +48,14 @@ under the License.
             <entity-condition entity-name="DataSource"/>
         </actions>
         <field name="dataSourceId"  widget-style="buttontext" title="${uiLabelMap.DataSourceDataSourceId}">
-            <hyperlink target="EditDataSource" description="${dataSourceId}" also-hidden="false">
+            <hyperlink description="${dataSourceId}" target="EditDataSource" also-hidden="false">
                 <parameter param-name="dataSourceId"/>
             </hyperlink>
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
         <field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}"><display-entity entity-name="DataSourceType"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteDataSource" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteDataSource" also-hidden="false">
                 <parameter param-name="dataSourceId"/>
             </hyperlink>
         </field>
@@ -95,12 +95,12 @@ under the License.
         <field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}"><display/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
         <field name="editLink" title=" " widget-style="buttontext">
-            <hyperlink target="EditDataSourceType" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditDataSourceType" also-hidden="false">
                 <parameter param-name="dataSourceTypeId"/>
             </hyperlink>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteDataSourceType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteDataSourceType" also-hidden="false">
                 <parameter param-name="dataSourceTypeId"/>
             </hyperlink>
         </field>
@@ -130,7 +130,7 @@ under the License.
             </service>
         </actions>
         <field name="dataSourceId" title="${uiLabelMap.DataSourceDataSourceId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${dataSourceId}" target="javascript:set_value('${dataSourceId}')" target-type="plain"/>
+            <hyperlink description="${dataSourceId}" target="javascript:set_value('${dataSourceId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
         <field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}"><display-entity entity-name="DataSourceType"/></field>
@@ -153,7 +153,7 @@ under the License.
             </service>
         </actions>
         <field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${dataSourceTypeId}" target="javascript:set_value('${dataSourceTypeId}')" target-type="plain"/>
+            <hyperlink description="${dataSourceTypeId}" target="javascript:set_value('${dataSourceTypeId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
     </form>

Modified: ofbiz/trunk/applications/marketing/widget/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/LookupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/LookupForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/LookupForms.xml Sat Nov  5 14:14:04 2016
@@ -41,7 +41,7 @@ under the License.
             </service>
         </actions>
         <field name="segmentGroupId"  widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}">
-            <hyperlink also-hidden="false" target-type="plain" description="${segmentGroupId}" target="javascript:set_value('${segmentGroupId}')"/>
+            <hyperlink description="${segmentGroupId}" target="javascript:set_value('${segmentGroupId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="segmentGroupTypeId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupTypeId}"><display/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
@@ -56,13 +56,13 @@ under the License.
             </entity-and>
         </actions>
         <field name="segmentGroupId"  widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}">
-            <hyperlink also-hidden="false" target-type="intra-app" description="${segmentGroupId}" target="viewSegmentGroup">
+            <hyperlink description="${segmentGroupId}" target="viewSegmentGroup" also-hidden="false" target-type="intra-app">
                 <parameter param-name="segmentGroupId"/>
             </hyperlink>
         </field>
         <field name="partyClassificationGroupId" title="${uiLabelMap.MarketingSegmentGroupPartyClassificationGroupId}"><display/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteSegmentGroupClass" description="[${uiLabelMap.CommonDelete}]" also-hidden="false">
+            <hyperlink description="[${uiLabelMap.CommonDelete}]" target="deleteSegmentGroupClass" also-hidden="false">
                 <parameter param-name="segmentGroupId"/>
                 <parameter param-name="partyClassificationGroupId"/>
             </hyperlink>
@@ -97,7 +97,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="SalesForecast" default-field-type="display"/>
         <field name="salesForecastId"  widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${salesForecastId}" target="javascript:set_value('${salesForecastId}')"/>
+            <hyperlink description="${salesForecastId}" target="javascript:set_value('${salesForecastId}')" also-hidden="false" target-type="plain"/>
         </field>
     </form>
 </forms>

Modified: ofbiz/trunk/applications/marketing/widget/MarketingCampaignForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingCampaignForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingCampaignForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingCampaignForms.xml Sat Nov  5 14:14:04 2016
@@ -60,7 +60,7 @@ under the License.
             <hidden value="${donePage}"/>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
-        <field name="cancelLink" widget-style="buttontext" title=" "><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field>
+        <field name="cancelLink" widget-style="buttontext" title=" "><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" target-type="inter-app"/></field>
     </form>
 
    <form name="ListMarketingCampaign" type="list" paginate-target="FindMarketingCampaign"
@@ -69,7 +69,7 @@ under the License.
             <entity-condition entity-name="MarketingCampaign"/>
         </actions>
         <field name="marketingCampaignId" widget-style="buttontext" title="${uiLabelMap.MarketingCampaignId}">
-            <hyperlink target="EditMarketingCampaign" description="${marketingCampaignId}" also-hidden="false">
+            <hyperlink description="${marketingCampaignId}" target="EditMarketingCampaign" also-hidden="false">
                 <parameter param-name="marketingCampaignId"/>
             </hyperlink>
         </field>
@@ -114,7 +114,7 @@ under the License.
             </display-entity>-->
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeMarketingCampaignRole" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeMarketingCampaignRole" also-hidden="false">
                 <parameter param-name="marketingCampaignId"/>
                 <parameter param-name="roleTypeId"/>
                 <parameter param-name="partyId"/>
@@ -139,7 +139,7 @@ under the License.
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <field name="cancelLink" widget-style="buttontext" title=" ">
-            <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+            <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false">
                 <parameter param-name="marketingCampaignId"/>
             </hyperlink>
         </field>

Modified: ofbiz/trunk/applications/marketing/widget/SegmentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/SegmentForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/SegmentForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/SegmentForms.xml Sat Nov  5 14:14:04 2016
@@ -33,7 +33,7 @@ under the License.
             </service>
         </actions>
         <field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}">
-            <hyperlink also-hidden="false" description="${segmentGroupId}" target="viewSegmentGroup">
+            <hyperlink description="${segmentGroupId}" target="viewSegmentGroup" also-hidden="false">
                 <parameter param-name="segmentGroupId"/>
             </hyperlink>
         </field>
@@ -41,7 +41,7 @@ under the License.
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
         <field name="productStoreId" title="${uiLabelMap.MarketingSegmentGroupProductStoreId}"><display/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteSegmentGroup" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSegmentGroup" also-hidden="false">
                 <parameter param-name="segmentGroupId"/>
             </hyperlink>
         </field>
@@ -98,7 +98,7 @@ under the License.
         <field name="segmentGroupId"><hidden/></field>
         <field name="partyClassificationGroupId"><display/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteSegmentGroupClassification" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSegmentGroupClassification" also-hidden="false">
                 <parameter param-name="segmentGroupId"/>
                 <parameter param-name="partyClassificationGroupId"/>
             </hyperlink>
@@ -124,7 +124,7 @@ under the License.
         <field name="segmentGroupId"><hidden/></field>
         <field name="geoId" title="${uiLabelMap.CommonGeoId}"><display-entity entity-name="Geo" description="${geoName} [Code:${geoCode}][ID:${geoId}]"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteSegmentGroupGeo" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSegmentGroupGeo" also-hidden="false">
                 <parameter param-name="segmentGroupId"/>
                 <parameter param-name="geoId"/>
             </hyperlink>
@@ -168,7 +168,7 @@ under the License.
         </field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"><display-entity entity-name="RoleType"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteSegmentGroupRole" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSegmentGroupRole" also-hidden="false">
                 <parameter param-name="segmentGroupId"/>
                 <parameter param-name="partyId"/>
                 <parameter param-name="roleTypeId"/>

Modified: ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml Sat Nov  5 14:14:04 2016
@@ -64,7 +64,7 @@ under the License.
 
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> -->
-        <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> -->
+        <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" target-type="inter-app"/></field> -->
     </form>
 
     <form name="ListTrackingCode" target="ListTrackingCode" title="" type="list"
@@ -73,7 +73,7 @@ under the License.
             <entity-condition entity-name="TrackingCode"/>
         </actions>
         <field name="trackingCodeId"  widget-style="buttontext" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}">
-            <hyperlink target="EditTrackingCode" description="${trackingCodeId}" also-hidden="false">
+            <hyperlink description="${trackingCodeId}" target="EditTrackingCode" also-hidden="false">
                 <parameter param-name="trackingCodeId"/>
             </hyperlink>
         </field>
@@ -83,7 +83,7 @@ under the License.
         <field name="prodCatalogId"><display-entity description="${catalogName}" entity-name="ProdCatalog"/></field>
 
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteTrackingCode" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTrackingCode" also-hidden="false">
                 <parameter param-name="trackingCodeId"/>
             </hyperlink>
         </field>
@@ -164,7 +164,7 @@ under the License.
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/>        </field>
-        <field name="cancelLink" title="${uiLabelMap.CommonCancel}" widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+        <field name="cancelLink" title="${uiLabelMap.CommonCancel}" widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false"/></field>
     </form>
     <form name="FindTrackingCodeVisits" target="ListTrackingCodeVisits" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
@@ -241,7 +241,7 @@ under the License.
             </service>
         </actions>
         <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${trackingCodeId}" target="javascript:set_value('${trackingCodeId}')" target-type="plain"/>
+            <hyperlink description="${trackingCodeId}" target="javascript:set_value('${trackingCodeId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description" title="${uiLabelMap.MarketingTrackingCodeDescription}"><display/></field>
         <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType"/></field>
@@ -268,7 +268,7 @@ under the License.
             </service>
         </actions>
         <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${visitId}" target="javascript:set_value('${visitId}')" target-type="plain"/>
+            <hyperlink description="${visitId}" target="javascript:set_value('${visitId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="partyId" title="${uiLabelMap.MarketingTrackingCodeVisitPartyId}">
             <display-entity description="${partyId}" entity-name="Party" key-field-name="partyId"/>
@@ -297,7 +297,7 @@ under the License.
         <field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> -->
-        <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> -->
+        <!-- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false" target-type="inter-app"/></field> -->
     </form>
 
     <form name="ListTrackingCodeType" target="ListTrackingCodeType" title="" type="list"
@@ -306,14 +306,14 @@ under the License.
             <entity-condition entity-name="TrackingCodeType"/>
         </actions>
         <field name="trackingCodeTypeId"  widget-style="buttontext" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}">
-            <hyperlink target="EditTrackingCodeType" description="${trackingCodeTypeId}" also-hidden="false">
+            <hyperlink description="${trackingCodeTypeId}" target="EditTrackingCodeType" also-hidden="false">
                 <parameter param-name="trackingCodeTypeId"/>
             </hyperlink>
         </field>
         <field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><display/></field>
 
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteTrackingCodeType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTrackingCodeType" also-hidden="false">
                 <parameter param-name="trackingCodeTypeId"/>
             </hyperlink>
         </field>
@@ -335,7 +335,7 @@ under the License.
             </service>
         </actions>
         <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${trackingCodeTypeId}" target="javascript:set_value('${trackingCodeTypeId}')" target-type="plain"/>
+            <hyperlink description="${trackingCodeTypeId}" target="javascript:set_value('${trackingCodeTypeId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><display/></field>
     </form>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml Sat Nov  5 14:14:04 2016
@@ -133,7 +133,7 @@ under the License.
                     <widgets>
                         <section>
                             <actions>
-                                <entity-condition list="states" entity-name="Geo">
+                                <entity-condition entity-name="Geo" list="states">
                                     <condition-list combine="or">
                                         <condition-expr field-name="geoTypeId" value="STATE"/>
                                         <condition-expr field-name="geoTypeId" value="PROVINCE"/>
@@ -141,7 +141,7 @@ under the License.
                                     </condition-list>
                                     <order-by field-name="geoName"/>
                                 </entity-condition>
-                                <entity-condition list="countries" entity-name="Geo">
+                                <entity-condition entity-name="Geo" list="countries">
                                     <condition-list combine="or">
                                         <condition-expr field-name="geoTypeId" value="COUNTRY"/>
                                     </condition-list>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml Sat Nov  5 14:14:04 2016
@@ -138,7 +138,7 @@ under the License.
             <set field="existRelationship" from-field="existRelationships[0]"/>
         </row-actions>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
-            <hyperlink target="viewprofile" description="${partyName} [${partyId}]" >
+            <hyperlink description="${partyName} [${partyId}]" target="viewprofile" >
                 <parameter param-name="partyId"/>
                 <parameter param-name="roleTypeId"/>
             </hyperlink>
@@ -152,7 +152,7 @@ under the License.
             <display-entity entity-name="Geo" description="${geoName}" key-field-name="geoId"/>
         </field>
         <field name="relatedCompany" use-when="relatedCompanyPartyId!=null" title="${uiLabelMap.PartyRelatedCompany}">
-            <hyperlink target="viewprofile" description="${groovy:org.apache.ofbiz.party.party.PartyHelper.getPartyName(delegator,relatedCompanyPartyId,true);} [${relatedCompanyPartyId}]">
+            <hyperlink description="${groovy:org.apache.ofbiz.party.party.PartyHelper.getPartyName(delegator,relatedCompanyPartyId,true);} [${relatedCompanyPartyId}]" target="viewprofile">
                 <parameter param-name="partyId" from-field="relatedCompanyPartyId"/>
             </hyperlink>
         </field>
@@ -161,7 +161,7 @@ under the License.
     <form name="ListAccounts" extends="ListAccounts">
         <field name="assignToMe" use-when="existRelationship==null&amp;&amp;!&quot;false&quot;.equals(parameters.get(&quot;all&quot;))"
                 title="${uiLabelMap.SfaAssignToMe}" widget-style="buttontext">
-            <hyperlink target="createPartyRelationshipAndRole" description="${uiLabelMap.SfaAssignToMe}">
+            <hyperlink description="${uiLabelMap.SfaAssignToMe}" target="createPartyRelationshipAndRole">
                 <parameter param-name="partyIdFrom" from-field="userLogin.partyId"/>
                 <parameter param-name="roleTypeIdFrom"/>
                 <parameter param-name="roleTypeIdTo"/>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/CommonForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/CommonForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/CommonForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/CommonForms.xml Sat Nov  5 14:14:04 2016
@@ -41,7 +41,7 @@ under the License.
             <set field="postalAddress" from-field="postalAddresses[0]" type="Object"/>
         </row-actions>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
-            <hyperlink target="viewprofile" description="${partyName} [${partyId}]" target-window="_blank">
+            <hyperlink description="${partyName} [${partyId}]" target="viewprofile" target-window="_blank">
                 <parameter param-name="partyId"/>
                 <parameter param-name="roleTypeId"/>
             </hyperlink>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml Sat Nov  5 14:14:04 2016
@@ -58,13 +58,13 @@ under the License.
             </service>
         </actions>
         <field name="export" title="${uiLabelMap.SfaVCard}">
-            <hyperlink target="createVCardFromContact" description="${uiLabelMap.SfaVCard}">
+            <hyperlink description="${uiLabelMap.SfaVCard}" target="createVCardFromContact">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
         <field name="assignToMe" use-when="existRelationship==null&amp;&amp;!&quot;false&quot;.equals(parameters.get(&quot;all&quot;))"
                 title="${uiLabelMap.SfaAssignToMe}" widget-style="buttontext">
-            <hyperlink target="createPartyRelationshipAndRole" description="${uiLabelMap.SfaAssignToMe}">
+            <hyperlink description="${uiLabelMap.SfaAssignToMe}" target="createPartyRelationshipAndRole">
                 <parameter param-name="partyIdFrom" from-field="userLogin.partyId"/>
                 <parameter param-name="roleTypeIdFrom"/>
                 <parameter param-name="roleTypeIdTo"/>
@@ -175,7 +175,7 @@ under the License.
         <field name="emailAddress" title="${uiLabelMap.CommonEmail}"><text size="15"/></field>
         <field name="contactListId" title="${uiLabelMap.MarketingContactList}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ContactList" description="${groovy:contactListName.substring(0,Math.min(contactListName.length(), 12))}..." key-field-name="contactListId"/>
+                <entity-options entity-name="ContactList" key-field-name="contactListId" description="${groovy:contactListName.substring(0,Math.min(contactListName.length(), 12))}..."/>
             </drop-down>
         </field>
         <field name="quickAdd"><hidden value="Y"/></field>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/EventForms.xml Sat Nov  5 14:14:04 2016
@@ -33,17 +33,17 @@ under the License.
         <field name="deleteLink"><hidden/></field>
         <field name="currentStatusId"><hidden/></field>
         <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${workEffortName} [${workEffortId}]" target="/workeffort/control/WorkEffortSummary" target-type="inter-app">
+            <hyperlink description="${workEffortName} [${workEffortId}]" target="/workeffort/control/WorkEffortSummary" also-hidden="false" target-type="inter-app">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
         <field name="assignedByUserLoginId" title="${uiLabelMap.SfaAssignedBy}">
-            <hyperlink target="/partymgr/control/viewprofile" description="${assignByPartyName.firstName} ${assignByPartyName.middleName} ${assignByPartyName.lastName} ${assignByPartyName.groupName} [${assignByPartyName.partyId}]" target-type="inter-app">
+            <hyperlink description="${assignByPartyName.firstName} ${assignByPartyName.middleName} ${assignByPartyName.lastName} ${assignByPartyName.groupName} [${assignByPartyName.partyId}]" target="/partymgr/control/viewprofile" target-type="inter-app">
                 <parameter param-name="partyId" from-field="assignByPartyName.partyId"/>
             </hyperlink>
         </field>
         <field name="complete" title="${uiLabelMap.SfaComplete}" widget-style="buttontext">
-            <hyperlink target="updateWorkEffort" description="${uiLabelMap.SfaComplete}">
+            <hyperlink description="${uiLabelMap.SfaComplete}" target="updateWorkEffort">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="currentStatusId" value="CAL_COMPLETED"/>
             </hyperlink>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml Sat Nov  5 14:14:04 2016
@@ -38,7 +38,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="SalesForecast" default-field-type="display"/>
         <field name="salesForecastId" widget-style="buttontext">
-            <hyperlink target="EditSalesForecast" description="${salesForecastId}" also-hidden="false">
+            <hyperlink description="${salesForecastId}" target="EditSalesForecast" also-hidden="false">
                 <parameter param-name="salesForecastId"/>
             </hyperlink>
         </field>
@@ -105,7 +105,7 @@ under the License.
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="deleteLink" title="" widget-style="buttontext">
-            <hyperlink target="deleteSalesForecastDetail" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSalesForecastDetail" also-hidden="false">
                 <parameter param-name="salesForecastId"/>
                 <parameter param-name="salesForecastDetailId"/>
             </hyperlink>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Sat Nov  5 14:14:04 2016
@@ -85,7 +85,7 @@ under the License.
         </field>
         <field name="partyGroupId" title="${uiLabelMap.SfaAccountName}" tooltip="${uiLabelMap.SfaSelectExistingAccountOrLeaveBlankToCreateNew}" use-when="parameters.get(&quot;partyGroupId&quot;)==&quot;&quot;">
             <drop-down allow-empty="true" current-description="">
-              <entity-options entity-name="PartyRole" description="${groovy:org.apache.ofbiz.party.party.PartyHelper.getPartyName(delegator, partyId, false)} : [partyId]" key-field-name="partyId">
+              <entity-options entity-name="PartyRole" key-field-name="partyId" description="${groovy:org.apache.ofbiz.party.party.PartyHelper.getPartyName(delegator, partyId, false)} : [partyId]">
                   <entity-constraint name="roleTypeId" operator="equals" value="ACCOUNT"/>
               </entity-options>
             </drop-down>
@@ -126,7 +126,7 @@ under the License.
         <field name="emailAddress" title="${uiLabelMap.CommonEmail}"><text size="15"/></field>
         <field name="contactListId" title="${uiLabelMap.MarketingContactList}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ContactList" description="${groovy:contactListName.substring(0,Math.min(contactListName.length(), 12))}..." key-field-name="contactListId"/>
+                <entity-options entity-name="ContactList" key-field-name="contactListId" description="${groovy:contactListName.substring(0,Math.min(contactListName.length(), 12))}..."/>
             </drop-down>
         </field>
         <field name="quickAdd"><hidden value="Y"/></field>
@@ -196,7 +196,7 @@ under the License.
     <form name="ListLeads" extends="listLeads">
         <field name="assignToMe" use-when="existRelationship==null&amp;&amp;!&quot;false&quot;.equals(parameters.get(&quot;all&quot;))"
                 title="${uiLabelMap.SfaAssignToMe}" widget-style="buttontext">
-            <hyperlink target="createPartyRelationshipAndRole" description="${uiLabelMap.SfaAssignToMe}">
+            <hyperlink description="${uiLabelMap.SfaAssignToMe}" target="createPartyRelationshipAndRole">
                 <parameter param-name="partyIdFrom" from-field="userLogin.partyId"/>
                 <parameter param-name="roleTypeIdFrom"/>
                 <parameter param-name="roleTypeIdTo"/>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LookupForms.xml Sat Nov  5 14:14:04 2016
@@ -23,19 +23,19 @@ under the License.
 
     <form name="ListLookupAccount" extends="ListAccounts" extends-resource="component://marketing/widget/sfa/forms/AccountForms.xml">
         <field name="partyId">
-            <hyperlink also-hidden="false" target-type="plain" description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')"/>
+            <hyperlink description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="relatedCompany"><hidden/></field>
     </form>
     <form name="ListLookupLead" extends="listLeads" extends-resource="component://marketing/widget/sfa/forms/LeadForms.xml">
         <field name="partyId">
-            <hyperlink also-hidden="false" target-type="plain" description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')"/>
+            <hyperlink description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="relatedCompany"><hidden/></field>
     </form>
     <form name="ListLookupAccountLead" extends="ListAccountLeads" extends-resource="component://marketing/widget/sfa/forms/AccountForms.xml">
         <field name="partyId">
-            <hyperlink also-hidden="false" target-type="plain" description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')"/>
+            <hyperlink description="${partyName} [${partyId}]" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="relatedCompany"><hidden/></field>
     </form>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml Sat Nov  5 14:14:04 2016
@@ -68,7 +68,7 @@ under the License.
         </row-actions>
         <field name="salesOpportunityId"><hidden/></field>
         <field name="opportunityName" title="${uiLabelMap.SfaOpportunityName}">
-            <hyperlink target="EditSalesOpportunity" description="${opportunityName}[${salesOpportunityId}] ${roleTypeId}">
+            <hyperlink description="${opportunityName}[${salesOpportunityId}] ${roleTypeId}" target="EditSalesOpportunity">
                 <parameter param-name="salesOpportunityId"/>
             </hyperlink>
         </field>
@@ -86,7 +86,7 @@ under the License.
         <field name="nextStepDate" position="1" title="${uiLabelMap.SfaNextStepDate}" sort-field="true"><display/></field>
         <field name="estimatedCloseDate" title="${uiLabelMap.SfaCloseDate}"><display/></field>
         <field name="editButton" title="${uiLabelMap.CommonClose}" use-when="estimatedCloseDate == void || estimatedCloseDate == null || org.apache.ofbiz.base.util.UtilValidate.isDateAfterNow(estimatedCloseDate) || opportunityStageId != &quot;SOSTG_CLOSED&quot;" widget-style="buttontext">
-            <hyperlink target="closeSalesOpportunity" description="${uiLabelMap.CommonClose}">
+            <hyperlink description="${uiLabelMap.CommonClose}" target="closeSalesOpportunity">
                 <parameter param-name="salesOpportunityId"/>
                 <parameter param-name="opportunityStageId" value="SOSTG_CLOSED"/>
             </hyperlink>

Modified: ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/opportunity/OpportunityServices.xml Sat Nov  5 14:14:04 2016
@@ -138,7 +138,7 @@ This file contains basic services for Sa
             <field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/>
             <field-map field-name="salesOpportunityId" from-field="parameters.salesOpportunityId"/>
         </entity-and>
-        <first-from-list entry="lookedUpValue" list="salesOpportunityRoles"/>
+        <first-from-list list="salesOpportunityRoles" entry="lookedUpValue"/>
         <field-to-result field="lookedUpValue.partyId" result-name="partyId"/>
     </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/applications/order/minilang/order/OrderDeliveryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/OrderDeliveryServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/order/OrderDeliveryServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/order/OrderDeliveryServices.xml Sat Nov  5 14:14:04 2016
@@ -87,7 +87,7 @@ under the License.
         <set field="curUserPcmFindMap.partyId" from-field="userLogin.partyId"/>
         <set field="curUserPcmFindMap.contactMechTypeId" value="EMAIL_ADDRESS"/>
         <find-by-and entity-name="PartyAndContactMech" map="curUserPcmFindMap" list="curUserPartyAndContactMechs"/>
-        <first-from-list entry="curUserPartyAndContactMech" list="curUserPartyAndContactMechs"/>
+        <first-from-list list="curUserPartyAndContactMechs" entry="curUserPartyAndContactMech"/>
         <string-append field="sendEmailMap.sendFrom" string="${curUserPartyAndContactMech.infoString}" prefix=","/>
 
         <!-- find email addresses of all parties in SHIPMENT_CLERK roleTypeId, set as sendTo -->

Modified: ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/order/OrderReturnServices.xml Sat Nov  5 14:14:04 2016
@@ -183,7 +183,7 @@ under the License.
               <check-errors/>
                <!-- tally up the return total amount -->
                <calculate field="returnTotalAmount">
-                   <calcop field="returnTotalAmount" operator="add">
+                   <calcop operator="add" field="returnTotalAmount">
                        <calcop operator="multiply">
                            <calcop operator="get" field="returnItem.returnPrice"/>
                            <calcop operator="get" field="returnItem.returnQuantity"/>
@@ -235,7 +235,7 @@ under the License.
             </entity-and>
             <iterate list="returnAdjustments" entry="returnAdjustment">
                 <calculate field="returnTotalAmount">
-                    <calcop field="returnTotalAmount" operator="add">
+                    <calcop operator="add" field="returnTotalAmount">
                         <calcop operator="get" field="returnAdjustment.amount"/>
                     </calcop>
                 </calculate>
@@ -521,7 +521,7 @@ under the License.
         <iterate-map key="returnItemSeqId" value="value" map="totalsMap">
             <set field="filterMap.returnItemSeqId" from="returnItemSeqId"/>
             <filter-list-by-and list="returnItems" map="filterMap" to-list="items"/>
-            <first-from-list entry="item" list="items"/>
+            <first-from-list list="items" entry="item"/>
             <set field="item.receivedQuantity" from="value" type="BigDecimal"/>
             <set-service-fields service-name="updateReturnItem" map="item" to-map="serviceInMap"/>
             <if-compare-field field="value" to-field="item.returnQuantity" operator="greater-equals" type="BigDecimal">
@@ -606,7 +606,7 @@ under the License.
                 <condition-expr field-name="roleTypeId" operator="equals" from-field="roleTypeId"/>
             </condition-list>
         </entity-condition>
-        <first-from-list entry="orderRole" list="orderRoles"/>
+        <first-from-list list="orderRoles" entry="orderRole"/>
         <!-- create the return header -->
         <set from-field="orderHeader.originFacilityId" field="createHeaderCtx.destinationFacilityId"/>
         <set value="Y" field="updateHeaderCtx.needsInventoryReceive"/>
@@ -1093,7 +1093,7 @@ under the License.
         <make-value value-field="returnContactMechMap" entity-name="ReturnContactMech"/>
 
         <set-pk-fields map="parameters" value-field="returnContactMechMap"/>
-        <entity-one value-field="returnHeader" entity-name="ReturnHeader"/>
+        <entity-one entity-name="ReturnHeader" value-field="returnHeader"/>
         <set from-field="parameters.returnId" field="createReturnContactMechMap.returnId"/>
         <set from-field="parameters.contactMechPurposeTypeId" field="createReturnContactMechMap.contactMechPurposeTypeId"/>
         <set from-field="parameters.contactMechId" field="createReturnContactMechMap.contactMechId"/>
@@ -1126,7 +1126,7 @@ under the License.
                     <condition-expr field-name="roleTypeId" operator="equals" value="BILL_TO_CUSTOMER"/>
                 </condition-list>
             </entity-condition>
-            <first-from-list entry="orderRole" list="orderRoles"/>
+            <first-from-list list="orderRoles" entry="orderRole"/>
 
             <get-related-one relation-name="ProductStore" value-field="orderHeader" to-value-field="productStore"/>
 

Modified: ofbiz/trunk/applications/order/minilang/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/OrderServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/order/OrderServices.xml (original)
+++ ofbiz/trunk/applications/order/minilang/order/OrderServices.xml Sat Nov  5 14:14:04 2016
@@ -101,11 +101,11 @@ under the License.
         </if-not-empty>
 
         <call-service service-name="createRequirement" in-map-name="inputMap">
-            <result-to-field field="parameters.requirementId" result-name="requirementId"/>
+            <result-to-field result-name="requirementId" field="parameters.requirementId"/>
         </call-service>
 
         <!-- create the OrderRequirementCommitment to record the Requirement created for an order item -->
-        <set-service-fields to-map="orderReqCommitParams" service-name="createOrderRequirementCommitment" map="parameters"/>
+        <set-service-fields service-name="createOrderRequirementCommitment" map="parameters" to-map="orderReqCommitParams"/>
         <call-service service-name="createOrderRequirementCommitment" in-map-name="orderReqCommitParams"/>
 
         <field-to-result field="parameters.requirementId" result-name="requirementId"/>
@@ -122,8 +122,8 @@ under the License.
         <set from-field="inventoryItem.productId" field="inputMap.productId"/>
         <set from-field="inventoryItem.facilityId" field="inputMap.facilityId"/>
         <call-service service-name="getInventoryAvailableByFacility" in-map-name="inputMap">
-           <result-to-field field="quantityOnHandTotal" result-name="quantityOnHandTotal"/>
-           <result-to-field field="availableToPromiseTotal" result-name="availableToPromiseTotal"/>
+           <result-to-field result-name="quantityOnHandTotal" field="quantityOnHandTotal"/>
+           <result-to-field result-name="availableToPromiseTotal" field="availableToPromiseTotal"/>
         </call-service>
         <clear-field field="inputMap"/>
     </simple-method>
@@ -198,7 +198,7 @@ under the License.
                 <!-- No requirements are created if we are already under stock -->
                 <if-compare-field field="quantityOnHandTotal" to-field="productFacility.minimumStock" operator="greater-equals" type="BigDecimal">
                     <calculate field="newQuantityOnHand">
-                        <calcop field="quantityOnHandTotal" operator="subtract">
+                        <calcop operator="subtract" field="quantityOnHandTotal">
                             <calcop operator="get" field="parameters.quantity"/>
                         </calcop>
                     </calculate>
@@ -214,7 +214,7 @@ under the License.
                         </if-not-empty>
                         <set value="PRODUCT_REQUIREMENT" field="inputMap.requirementTypeId"/>
                         <call-service service-name="createRequirement" in-map-name="inputMap">
-                            <result-to-field field="parameters.requirementId" result-name="requirementId"/>
+                            <result-to-field result-name="requirementId" field="parameters.requirementId"/>
                         </call-service>
                         <field-to-result field="parameters.requirementId" result-name="requirementId"/>
                     </if-compare-field>
@@ -245,7 +245,7 @@ under the License.
                 <!-- this service is supposed to be called after inventory is reserved, so inventory should have been updated already -->
                 <if-compare-field field="availableToPromiseTotal" to-field="productFacility.minimumStock" operator="less" type="BigDecimal">
                     <calculate field="oldAvailableToPromise">
-                        <calcop field="availableToPromiseTotal" operator="add">
+                        <calcop operator="add" field="availableToPromiseTotal">
                             <calcop operator="get" field="parameters.quantity"/>
                         </calcop>
                     </calculate>
@@ -261,7 +261,7 @@ under the License.
                         </if-not-empty>
                         <set value="PRODUCT_REQUIREMENT" field="inputMap.requirementTypeId"/>
                         <call-service service-name="createRequirement" in-map-name="inputMap">
-                            <result-to-field field="parameters.requirementId" result-name="requirementId"/>
+                            <result-to-field result-name="requirementId" field="parameters.requirementId"/>
                         </call-service>
                         <field-to-result field="parameters.requirementId" result-name="requirementId"/>
                     </if-compare-field>
@@ -298,7 +298,7 @@ under the License.
             <if-compare-field field="availableToPromiseTotal" to-field="minimumStock" operator="less" type="BigDecimal">
                 <!-- what is the right quantity?  It is the lesser of the actual quantity and the quantity required to bring us back up to minimum stock -->
                 <calculate field="quantityShortfall">
-                    <calcop field="minimumStock" operator="subtract">
+                    <calcop operator="subtract" field="minimumStock">
                         <calcop operator="get" field="availableToPromiseTotal"/>
                     </calcop>
                 </calculate>
@@ -383,8 +383,8 @@ under the License.
                         <set from-field="productFacility.productId" field="inputMap.productId"/>
                         <set from-field="productFacility.facilityId" field="inputMap.facilityId"/>
                         <call-service service-name="getInventoryAvailableByFacility" in-map-name="inputMap">
-                           <result-to-field field="quantityOnHandTotal" result-name="quantityOnHandTotal"/>
-                           <result-to-field field="availableToPromiseTotal" result-name="availableToPromiseTotal"/>
+                           <result-to-field result-name="quantityOnHandTotal" field="quantityOnHandTotal"/>
+                           <result-to-field result-name="availableToPromiseTotal" field="availableToPromiseTotal"/>
                         </call-service>
 
                         <if-compare field="requirementMethodId" operator="equals" value="PRODRQM_STOCK">
@@ -406,7 +406,7 @@ under the License.
                             </if-not-empty>
 
                             <calculate field="quantityShortfall">
-                                <calcop field="productFacility.minimumStock" operator="subtract">
+                                <calcop operator="subtract" field="productFacility.minimumStock">
                                     <calcop operator="get" field="currentQuantity"/>
                                 </calcop>
                             </calculate>
@@ -417,7 +417,7 @@ under the License.
                             <set value="PRODUCT_REQUIREMENT" field="inputMap.requirementTypeId"/>
                             <set from-field="parameters.facilityId" field="inputMap.facilityId"/>
                             <call-service service-name="createRequirement" in-map-name="inputMap">
-                                <result-to-field field="requirementId" result-name="requirementId"/>
+                                <result-to-field result-name="requirementId" field="requirementId"/>
                             </call-service>
                             <log level="info" message="Requirement creted with id [${requirementId}] for product with id [${productFacility.productId}]."/>
                         </if-compare-field>
@@ -563,7 +563,7 @@ under the License.
                 </condition>
                 <then>
                     <clear-field field="cancelOrderItemInMap"/>
-                    <set-service-fields service-name="cancelOrderItemNoActions" to-map="cancelOrderItemInMap" map="parameters"/>
+                    <set-service-fields service-name="cancelOrderItemNoActions" map="parameters" to-map="cancelOrderItemInMap"/>/>
                     <set from-field="orderItem.orderItemSeqId" field="cancelOrderItemInMap.orderItemSeqId"/>
                     <call-service service-name="cancelOrderItemNoActions" in-map-name="cancelOrderItemInMap"/>
                 </then>
@@ -594,7 +594,7 @@ under the License.
         </iterate>
 
         <!-- Recalculate the promotions for the order -->
-        <set-service-fields service-name="loadCartFromOrder" to-map="loadCartFromOrderInMap" map="parameters"/>
+        <set-service-fields service-name="loadCartFromOrder" map="parameters" to-map="loadCartFromOrderInMap"/>/>
         <set value="true" field="loadCartFromOrderInMap.skipInventoryChecks" type="Boolean"/>
         <set value="true" field="loadCartFromOrderInMap.skipProductChecks" type="Boolean"/>
         <call-service service-name="loadCartFromOrder" in-map-name="loadCartFromOrderInMap">
@@ -694,7 +694,7 @@ under the License.
                  <set field="inputMap.shipGroupSeqId" from-field="shipGroup.shipGroupSeqId"/>
                  <set field="inputMap.shipmentMethod" value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId}@${shipGroup.carrierRoleTypeId}"/>
                  <set field="inputMap.oldContactMechId" from-field="parameters.oldContactMechId"/>
-                 <set-service-fields to-map="orderItemShipGroupMap" service-name="updateOrderItemShipGroup" map="inputMap"/>
+                 <set-service-fields service-name="updateOrderItemShipGroup" map="inputMap" to-map="orderItemShipGroupMap"/>
                  <call-service service-name="updateOrderItemShipGroup" in-map-name="orderItemShipGroupMap" include-user-login="true"/>
               </iterate>
            </if-not-empty>
@@ -772,7 +772,7 @@ under the License.
         </else>
         </if-compare>
         <get-related value-field="orderItemShipGroup" relation-name="OrderItemShipGrpInvRes" list="orderItemShipGroupInvResList" order-by-list="orderByList"/>
-        <first-from-list entry="orderItemShipGroupInvRes" list="orderItemShipGroupInvResList"/>
+        <first-from-list list="orderItemShipGroupInvResList" entry="orderItemShipGroupInvRes"/>
         <field-to-result field="orderItemShipGroupInvRes.promisedDatetime" result-name="estimatedShipDate"/>
     </simple-method>
 
@@ -800,7 +800,7 @@ under the License.
         <set field="inputMap.paymentMethodTypeId" from-field="paymentMethod.paymentMethodTypeId"/>
         <!--In this method we calls createOrderPaymentPreference and returns orderPaymentPreferenceId field to authOrderPaymentPreference -->
         <call-service service-name="createOrderPaymentPreference" in-map-name="inputMap" include-user-login="true">
-           <result-to-field field="parameters.orderPaymentPreferenceId" result-name="orderPaymentPreferenceId"/>
+           <result-to-field result-name="orderPaymentPreferenceId" field="parameters.orderPaymentPreferenceId"/>
         </call-service>
         <field-to-result field="parameters.orderPaymentPreferenceId" result-name="orderPaymentPreferenceId"/>
     </simple-method>
@@ -971,7 +971,7 @@ under the License.
                         <field-map field-name="partyId" from-field="partyId"/>
                         <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
                     </entity-and>
-                    <first-from-list entry="pcmp" list="pcmpList"/>
+                    <first-from-list list="pcmpList" entry="pcmp"/>
                     <if-not-empty field="pcmp">
                         <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/>
                         <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/>
@@ -1236,7 +1236,7 @@ under the License.
 
     <simple-method method-name="cancelAllBackOrders" short-description="Cancels those back orders from suppliers whose cancel back order date (cancelBackOrderDate) has passed the current date">
         <now-timestamp field="nowTimestamp"/>
-        <entity-condition list="orders" entity-name="OrderHeader">
+        <entity-condition entity-name="OrderHeader" list="orders">
             <condition-list combine="and">
                 <condition-expr field-name="orderTypeId" operator="equals" value="PURCHASE_ORDER"/>
                 <condition-expr field-name="statusId" operator="not-equals" value="ORDER_CANCELLED"/>
@@ -1292,26 +1292,26 @@ under the License.
         </else>
         </if-compare-field>
         <if-compare-field field="diffPercentage" operator="greater" to-field="percentAllowed" type="BigDecimal">
-            <set-service-fields map="parameters" to-map="updateOrderItemShipGroupContext" service-name="updateOrderItemShipGroup"/>
+            <set-service-fields service-name="updateOrderItemShipGroup" map="parameters" to-map="updateOrderItemShipGroupContext"/>/>
             <call-service service-name="updateOrderItemShipGroup" in-map-name="updateOrderItemShipGroupContext"/>
-            <set-service-fields map="parameters" to-map="updateOrderAdjustmentContext" service-name="updateOrderAdjustment"/>
+            <set-service-fields service-name="updateOrderAdjustment" map="parameters" to-map="updateOrderAdjustmentContext"/>/>
             <call-service service-name="updateOrderAdjustment" in-map-name="updateOrderAdjustmentContext"/>
-            <set-service-fields map="parameters" to-map="updateShipmentRouteSegmentContext" service-name="updateShipmentRouteSegment"/>
+            <set-service-fields service-name="updateShipmentRouteSegment" map="parameters" to-map="updateShipmentRouteSegmentContext"/>/>
             <clear-field field="updateShipmentRouteSegmentContext.trackingIdNumber"/>
             <clear-field field="updateShipmentRouteSegmentContext.trackingDigest"/>
             <clear-field field="updateShipmentRouteSegmentContext.carrierServiceStatusId"/>
             <call-service service-name="updateShipmentRouteSegment" in-map-name="updateShipmentRouteSegmentContext"/>
-            <set-service-fields map="parameters" to-map="upsShipmentConfirmContext" service-name="upsShipmentConfirm"/>
+            <set-service-fields service-name="upsShipmentConfirm" map="parameters" to-map="upsShipmentConfirmContext"/>/>
             <call-service service-name="upsShipmentConfirm" in-map-name="upsShipmentConfirmContext"/>
         <else>
-            <set-service-fields map="parameters" to-map="updateOrderItemShipGroupContext" service-name="updateOrderItemShipGroup"/>
+            <set-service-fields service-name="updateOrderItemShipGroup" map="parameters" to-map="updateOrderItemShipGroupContext"/>/>
             <call-service service-name="updateOrderItemShipGroup" in-map-name="updateOrderItemShipGroupContext"/>
-            <set-service-fields map="parameters" to-map="updateShipmentRouteSegmentContext" service-name="updateShipmentRouteSegment"/>
+            <set-service-fields service-name="updateShipmentRouteSegment" map="parameters" to-map="updateShipmentRouteSegmentContext"/>/>
             <clear-field field="updateShipmentRouteSegmentContext.trackingIdNumber"/>
             <clear-field field="updateShipmentRouteSegmentContext.trackingDigest"/>
             <clear-field field="updateShipmentRouteSegmentContext.carrierServiceStatusId"/>
             <call-service service-name="updateShipmentRouteSegment" in-map-name="updateShipmentRouteSegmentContext"/>
-            <set-service-fields map="parameters" to-map="upsShipmentConfirmContext" service-name="upsShipmentConfirm"/>
+            <set-service-fields service-name="upsShipmentConfirm" map="parameters" to-map="upsShipmentConfirmContext"/>/>
             <call-service service-name="upsShipmentConfirm" in-map-name="upsShipmentConfirmContext"/>
         </else>
         </if-compare-field>
@@ -1337,10 +1337,10 @@ under the License.
     </simple-method>
 
     <simple-method method-name="createOrderPaymentApplication" short-description="Create Order Payment Application">
-        <entity-one value-field="paymentMap" entity-name="Payment"/>
+        <entity-one entity-name="Payment" value-field="paymentMap"/>
         <set field="createCtx.amountApplied" from-field="paymentMap.amount" type="BigDecimal"/>
         <set field="createCtx.paymentId" from-field="paymentMap.paymentId"/>
-        <entity-one value-field="orderPaymentPreMap" entity-name="OrderPaymentPreference">
+        <entity-one entity-name="OrderPaymentPreference" value-field="orderPaymentPreMap">
             <field-map field-name="orderPaymentPreferenceId" from-field="paymentMap.paymentPreferenceId"/>
         </entity-one>
         <entity-and entity-name="OrderItemBilling" list="orderItemBilList">

Modified: ofbiz/trunk/applications/order/minilang/order/OrderSimpleMethods.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/minilang/order/OrderSimpleMethods.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/minilang/order/OrderSimpleMethods.xml (original)
+++ ofbiz/trunk/applications/order/minilang/order/OrderSimpleMethods.xml Sat Nov  5 14:14:04 2016
@@ -71,9 +71,9 @@ under the License.
                 <set field="totalsMap[receipt.orderItemSeqId]" value="0" type="BigDecimal"/>
             </if-empty>
             <calculate field="totalsMap[receipt.orderItemSeqId]">
-                <calcop field="totalsMap[receipt.orderItemSeqId]" operator="add">
-                    <calcop field="receipt.quantityAccepted" operator="get"/>
-                    <calcop field="receipt.quantityRejected" operator="get"/>
+                <calcop operator="add" field="totalsMap[receipt.orderItemSeqId]">
+                    <calcop operator="get" field="receipt.quantityAccepted"/>
+                    <calcop operator="get" field="receipt.quantityRejected"/>
                 </calcop>
             </calculate>
             <set from-field="receipt.orderId" field="newLookupMap.orderId"/>