svn commit: r1768219 [4/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/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Sat Nov  5 14:14:04 2016
@@ -52,7 +52,7 @@ under the License.
         <field name="contentTypeId"><display/></field>
         <field name="contentName"><display/></field>
         <field name="edit" use-when="&quot;COMPDOC_TEMPLATE&quot;.equals(contentTypeId)" widget-style="buttontext">
-           <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc">
+           <hyperlink description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="rootContentId" from-field="caContentIdTo"/>
                 <parameter param-name="caContentAssocTypeId"/>
@@ -60,7 +60,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="edit" use-when="&quot;COMPDOC_INSTANCE&quot;.equals(contentTypeId)" widget-style="buttontext">
-           <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc">
+           <hyperlink description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="rootContentId" from-field="caContentIdTo"/>
                 <parameter param-name="caContentAssocTypeId"/>
@@ -68,7 +68,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="edit" use-when="&quot;TEMPLATE&quot;.equals(contentTypeId)" widget-style="buttontext">
-           <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditChildCompDoc">
+           <hyperlink description="${uiLabelMap.CommonEdit}" target="EditChildCompDoc" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="rootContentId" from-field="caContentIdTo"/>
                 <parameter param-name="caContentAssocTypeId"/>
@@ -76,7 +76,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="edit" use-when="&quot;DOCUMENT&quot;.equals(contentTypeId)" widget-style="buttontext">
-           <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditChildCompDoc">
+           <hyperlink description="${uiLabelMap.CommonEdit}" target="EditChildCompDoc" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="rootContentId" from-field="caContentIdTo"/>
                 <parameter param-name="caContentAssocTypeId"/>
@@ -84,12 +84,12 @@ under the License.
             </hyperlink>
         </field>
         <field name="tree" use-when="&quot;COMPDOC_TEMPLATE&quot;.equals(contentTypeId)" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.ContentTree}" target="ViewCompDocTemplateTree">
+            <hyperlink description="${uiLabelMap.ContentTree}" target="ViewCompDocTemplateTree" also-hidden="false">
                 <parameter param-name="rootContentId" from-field="contentId"/>
             </hyperlink>
         </field>
         <field name="tree" use-when="&quot;COMPDOC_INSTANCE&quot;.equals(contentTypeId)" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.ContentTree}" target="ViewCompDocInstanceTree">
+            <hyperlink description="${uiLabelMap.ContentTree}" target="ViewCompDocInstanceTree" also-hidden="false">
                 <parameter param-name="rootContentId" from-field="contentId"/>
             </hyperlink>
         </field>
@@ -104,12 +104,12 @@ under the License.
         <field name="caFromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
         <field name="caThruDate"><hidden/></field>
         <field name="editTemplate" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-           <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc">
+           <hyperlink description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc" also-hidden="false">
                 <parameter param-name="rootContentId" from-field="contentId"/>
             </hyperlink>
         </field>
         <field name="templateTree" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.ContentTree}" target="ViewCompDocInstanceTree">
+            <hyperlink description="${uiLabelMap.ContentTree}" target="ViewCompDocInstanceTree" also-hidden="false">
                 <parameter param-name="rootContentId" from-field="contentId"/>
             </hyperlink>
         </field>
@@ -143,7 +143,7 @@ under the License.
         <field name="committedByPartyId"><display/></field>
         <field name="comments"><display/></field>
         <field name="editLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContentRevision">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditContentRevision" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="contentRevisionSeqId"/>
                 <parameter param-name="rootContentId"/>
@@ -151,7 +151,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="itemLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonItems}" target="ListContentRevisionItem">
+            <hyperlink description="${uiLabelMap.CommonItems}" target="ListContentRevisionItem" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="contentRevisionSeqId"/>
                 <parameter param-name="rootContentId"/>
@@ -159,7 +159,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="create" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonCreate}" target="EditContentRevision">
+            <hyperlink description="${uiLabelMap.CommonCreate}" target="EditContentRevision" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="contentRevisionSeqId"/>
                 <parameter param-name="rootContentId"/>
@@ -167,13 +167,13 @@ under the License.
             </hyperlink>
         </field>
         <field name="tree" title=" " widget-style="buttontext" use-when="&quot;COMPDOC_INSTANCE&quot;.equals(contentTypeId)">
-            <hyperlink also-hidden="false" description="${uiLabelMap.ContentTree}" target="ViewCompDocInstanceTree">
+            <hyperlink description="${uiLabelMap.ContentTree}" target="ViewCompDocInstanceTree" also-hidden="false">
                 <parameter param-name="rootContentId" from-field="contentId"/>
                 <parameter param-name="rootContentRevisionSeqId" from-field="contentRevisionSeqId"/>
             </hyperlink>
         </field>
         <field name="tree" title=" " widget-style="buttontext" use-when="&quot;COMPDOC_TEMPLATE&quot;.equals(contentTypeId)">
-            <hyperlink also-hidden="false" description="${uiLabelMap.ContentTree}" target="ViewCompDocTemplateTree">
+            <hyperlink description="${uiLabelMap.ContentTree}" target="ViewCompDocTemplateTree" also-hidden="false">
                 <parameter param-name="rootContentId" from-field="contentId"/>
                 <parameter param-name="rootContentRevisionSeqId" from-field="contentRevisionSeqId"/>
             </hyperlink>
@@ -204,7 +204,7 @@ under the License.
         <field name="oldDataResourceId"><display/></field>
         <field name="newDataResourceId"><display/></field>
         <field name="editLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContentRevisionItem">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditContentRevisionItem" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="contentRevisionSeqId"/>
                 <parameter param-name="itemContentId"/>
@@ -213,7 +213,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="create" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonCreate}" target="EditContentRevisionItem">
+            <hyperlink description="${uiLabelMap.CommonCreate}" target="EditContentRevisionItem" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="contentRevisionSeqId"/>
                 <parameter param-name="rootContentId"/>
@@ -298,7 +298,7 @@ under the License.
         <field name="comments" widget-style="inputBox"><textarea cols="30" rows="3"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field>
         <field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit">
-            <hyperlink target="removeContentApproval" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentApproval">
                 <parameter param-name="contentApprovalId"/>
                 <parameter param-name="rootContentId"/>
                 <parameter param-name="rootContentRevisionSeqId"/>
@@ -470,7 +470,7 @@ under the License.
         </field>
         <field name="addSurveyResponse" map-name="dummy" widget-style="buttontext"
             use-when="&quot;DOCUMENT&quot;.equals(contentTypeId) &amp;&amp; dataResource!=null &amp;&amp; dataResource.get(&quot;relatedDetailId&quot;)==null &amp;&amp; templateDataResource!=null &amp;&amp; templateDataResource.get(&quot;relatedDetailId&quot;)!=null">
-            <hyperlink description="${uiLabelMap.CommonCreate} ${uiLabelMap.ContentSurveyResponse} (${uiLabelMap.CommonFor} ${uiLabelMap.ContentSurvey} ${templateDataResource.relatedDetailId})" target="EditSurveyResponse" also-hidden="false" target-window="_blank">
+            <hyperlink description="${uiLabelMap.CommonCreate} ${uiLabelMap.ContentSurveyResponse} (${uiLabelMap.CommonFor} ${uiLabelMap.ContentSurvey} ${templateDataResource.relatedDetailId})" target="EditSurveyResponse" target-window="_blank" also-hidden="false">
                 <parameter param-name="surveyId" from-field="templateDataResource.relatedDetailId"/>
                 <parameter param-name="dataResourceId" from-field="dataResource.dataResourceId"/>
                 <parameter param-name="rootContentId"/>
@@ -478,7 +478,7 @@ under the License.
         </field>
         <field name="updateSurveyResponse" map-name="dummy" widget-style="buttontext"
             use-when="&quot;DOCUMENT&quot;.equals(contentTypeId) &amp;&amp; dataResource!=null &amp;&amp; dataResource.get(&quot;relatedDetailId&quot;)!=null &amp;&amp; templateDataResource!=null &amp;&amp; templateDataResource.get(&quot;relatedDetailId&quot;)!=null">
-            <hyperlink description="${uiLabelMap.CommonUpdate} ${uiLabelMap.ContentSurveyResponse} (${uiLabelMap.CommonFor} ${uiLabelMap.ContentSurvey} ${templateDataResource.relatedDetailId}, Response ${dataResource.relatedDetailId})" target="EditSurveyResponse" also-hidden="false" target-window="_blank">
+            <hyperlink description="${uiLabelMap.CommonUpdate} ${uiLabelMap.ContentSurveyResponse} (${uiLabelMap.CommonFor} ${uiLabelMap.ContentSurvey} ${templateDataResource.relatedDetailId}, Response ${dataResource.relatedDetailId})" target="EditSurveyResponse" target-window="_blank" also-hidden="false">
                 <parameter param-name="surveyId" from-field="templateDataResource.relatedDetailId"/>
                 <parameter param-name="surveyResponseId" from-field="dataResource.relatedDetailId"/>
                 <parameter param-name="dataResourceId" from-field="dataResource.dataResourceId"/>

Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Sat Nov  5 14:14:04 2016
@@ -62,7 +62,7 @@ under the License.
         </field>
         <!--<field name="localeString">
             <drop-down allow-empty="true">
-                <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode">
+                <entity-options entity-name="CountryCode" key-field-name="countryCode" description="${countryName} [${countryCode}]">
                     <entity-order-by field-name="countryName"/>
                 </entity-options>
             </drop-down>
@@ -123,7 +123,7 @@ under the License.
             <call-parent-actions/>
         </actions>
         <field name="contentId">
-            <hyperlink also-hidden="false" target-type="plain" description="${contentId}" target="javascript:set_value('${contentId}')"/>
+            <hyperlink description="${contentId}" target="javascript:set_value('${contentId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="contentName"><display/></field>
         <field name="mimeTypeId"><display/></field>
@@ -223,7 +223,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
 
         <field name="contentId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${contentId}" target="javascript:set_value('${contentId}')"/>
+            <hyperlink description="${contentId}" target="javascript:set_value('${contentId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="contentName" widget-style="buttontext"><display/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}" widget-style="buttontext"><display/></field>
@@ -294,7 +294,7 @@ under the License.
         <field name="mapKey"><display/></field>
         <field name="fromDate"><display description="${groovy:fromDate.toString().substring(0,10)}"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssoc">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentAssoc" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="contentIdTo"/>
                 <parameter param-name="contentAssocTypeId"/>
@@ -325,7 +325,7 @@ under the License.
         <field name="mapKey"><display/></field>
         <field name="fromDate"><display description="${groovy:fromDate.toString().substring(0,10)}"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssoc">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentAssoc" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="contentIdTo"/>
                 <parameter param-name="contentAssocTypeId"/>
@@ -377,7 +377,7 @@ under the License.
             <submit button-type="button"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="remove${contentRoleTarget}ContentRole">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="remove${contentRoleTarget}ContentRole" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="roleTypeId"/>
                 <parameter param-name="partyId"/>
@@ -411,7 +411,7 @@ under the License.
         <field name="sequenceNum"><text /></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurpose">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentPurpose" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="contentPurposeTypeId"/>
             </hyperlink>
@@ -438,7 +438,7 @@ under the License.
         <field name="attrValue" widget-style="buttontext"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAttribute">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentAttribute" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="attrName"/>
             </hyperlink>
@@ -484,7 +484,7 @@ under the License.
         <field name="metaDataPredicateId" widget-style="buttontext"><display/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentMetaData">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentMetaData" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="metaDataPredicateId"/>
             </hyperlink>
@@ -495,7 +495,7 @@ under the License.
     <form name="MruLookupPerson" list-name="mruList" target="" title="" type="list"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="partyId" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
+            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="firstName" title=" " widget-style="buttontext"><display/></field>
         <field name="lastName" title=" " widget-style="buttontext"><display/></field>
@@ -503,7 +503,7 @@ under the License.
     <form name="MruLookupPartyAndUserLoginAndPerson" list-name="mruList" target="" title="" type="list"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="partyId" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}', '${userLoginId}')"/>
+            <hyperlink description="${partyId}" target="javascript:set_value('${partyId}', '${userLoginId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="firstName" title=" " widget-style="buttontext"><display/></field>
         <field name="lastName" title=" " widget-style="buttontext"><display/></field>
@@ -547,7 +547,7 @@ under the License.
         <field name="fromDate"><display/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContent">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContent" also-hidden="false">
                 <parameter param-name="workEffortContentTypeId"/>
                 <parameter param-name="fromDate"/>
                 <parameter param-name="workEffortId"/>
@@ -558,10 +558,10 @@ under the License.
     <!--form name="ListDocument"  target="" type="list"  list-name="contentAssoc" paginate-target="navigateContent"
         odd-row-style="alternate-row" header-row-style="header-row" default-table-style="basic-table hover-bar">
         <field name="contentId" use-when="&quot;application/pdf&quot;.equals(mimeTypeId)">
-            <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="showContentPdf?contentId=${contentId}" target-window="_blank"/>
+            <hyperlink description="${contentName} [${contentId}]" target="showContentPdf?contentId=${contentId}" target-window="_blank" also-hidden="false"/>
         </field>
         <field name="contentId" use-when="&quot;text/html&quot;.equals(mimeTypeId)">
-            <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="showContent?contentId=${contentId}" target-window="_blank"/>
+            <hyperlink description="${contentName} [${contentId}]" target="showContent?contentId=${contentId}" target-window="_blank" also-hidden="false"/>
         </field>
         <field name="contentTypeId">
             <display-entity entity-name="ContentType" key-field-name="contentTypeId"/>
@@ -574,7 +574,7 @@ under the License.
         </field>
         <field name="caCreatedDate"><display/></field>
         <field name="delete" title="${uiLabelMap.CommonDelete}">
-            <hyperlink target="removeDocumentFromTree" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeDocumentFromTree">
                 <parameter param-name="contentId"/>
                 <parameter param-name="contentIdTo"/>
                 <parameter param-name="contentAssocTypeId"/>
@@ -616,7 +616,7 @@ under the License.
     </form>
     <form name="ViewContentDetail" type="single" default-map-name="lookupContentDetail">
         <field name="contentId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${contentId}" target="javascript:set_value('${contentId}')"/>
+            <hyperlink description="${contentId}" target="javascript:set_value('${contentId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="contentName"><display/></field>
         <field name="contentTypeId"><display/></field>

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Sat Nov  5 14:14:04 2016
@@ -53,7 +53,7 @@ under the License.
         </field>
         <!--<field name="localeString" position="2">
             <drop-down allow-empty="true">
-                <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode">
+                <entity-options entity-name="CountryCode" key-field-name="countryCode" description="${countryName} [${countryCode}]">
                     <entity-order-by field-name="countryName"/>
                 </entity-options>
             </drop-down>
@@ -141,14 +141,14 @@ under the License.
             </service>
         </actions>
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}">
-            <hyperlink also-hidden="false" target-type="plain" description="${dataResourceId}" target="javascript:set_value('${dataResourceId}')"/>
+            <hyperlink description="${dataResourceId}" target="javascript:set_value('${dataResourceId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="dataResourceName"><display/></field>
     </form>
     <form name="MruLookupDataResource" default-entity-name="DataResource" list-name="mruList" target="" title="" type="list" default-widget-style="display"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="contentId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${dataResourceId}" target="javascript:set_value('${dataResourceId}')"/>
+            <hyperlink description="${dataResourceId}" target="javascript:set_value('${dataResourceId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="dataResourceName" widget-style="buttontext"><display/></field>
         <field name="dataCategoryId" widget-style="buttontext"><display/></field>
@@ -227,7 +227,7 @@ under the License.
             </entity-and>
         </actions>
         <field name="contentId" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${contentId}" target="/EditContent">
+            <hyperlink description="${contentId}" target="/EditContent" also-hidden="false">
                 <parameter param-name="contentId"/>
             </hyperlink>
         </field>
@@ -375,7 +375,7 @@ under the License.
         <field name="attrValue"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceAttribute">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeDataResourceAttribute" also-hidden="false">
                 <parameter param-name="dataResourceId"/>
                 <parameter param-name="attrName"/>
             </hyperlink>
@@ -410,7 +410,7 @@ under the License.
         <field name="thruDate" widget-style="buttontext"><date-time/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceRole">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeDataResourceRole" also-hidden="false">
                 <parameter param-name="dataResourceId"/>
                 <parameter param-name="roleTypeId"/>
                 <parameter param-name="partyId"/>
@@ -439,7 +439,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="ProductFeatureDataResource" default-field-type="display"/>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceProductFeature">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeDataResourceProductFeature" also-hidden="false">
                 <parameter param-name="dataResourceId"/>
                 <parameter param-name="productFeatureId"/>
             </hyperlink>
@@ -468,13 +468,13 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="ProductFeature" default-field-type="display"/>
         <field name="productFeatureId" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')"/>
+            <hyperlink description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')" also-hidden="false" target-type="plain"/>
         </field>
     </form>
     <form name="MruLookupProductFeature" default-entity-name="ProductFeature" list-name="mruList" target="" title="" type="list"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="contentId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')"/>
+            <hyperlink description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')" also-hidden="false" target-type="plain"/>
         </field>
         <field name="description" title="${uiLabelMap.FormFieldTitle_contentName}" widget-style="buttontext"><display/></field>
         <field name="productFeatureTypeId" title="${uiLabelMap.CommonType}" widget-style="buttontext"><display/></field>

Modified: ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupForms.xml Sat Nov  5 14:14:04 2016
@@ -41,7 +41,7 @@ under the License.
             <submit button-type="button"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentType">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentType" also-hidden="false">
                 <parameter param-name="contentTypeId"/>
             </hyperlink>
         </field>
@@ -73,7 +73,7 @@ under the License.
             <display/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentTypeAttr">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentTypeAttr" also-hidden="false">
                 <parameter param-name="contentTypeId"/>
                 <parameter param-name="attrName"/>
             </hyperlink>
@@ -101,7 +101,7 @@ under the License.
             <submit button-type="button"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssocType">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentAssocType" also-hidden="false">
                 <parameter param-name="contentAssocTypeId"/>
             </hyperlink>
         </field>
@@ -128,7 +128,7 @@ under the License.
             <submit button-type="button"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurposeType">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentPurposeType" also-hidden="false">
                 <parameter param-name="contentPurposeTypeId"/>
             </hyperlink>
         </field>
@@ -155,7 +155,7 @@ under the License.
             <submit button-type="button"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssocPredicate">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentAssocPredicate" also-hidden="false">
                 <parameter param-name="contentAssocPredicateId"/>
             </hyperlink>
         </field>
@@ -182,7 +182,7 @@ under the License.
             <submit button-type="button"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentOperation">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentOperation" also-hidden="false">
                 <parameter param-name="contentOperationId"/>
             </hyperlink>
         </field>
@@ -218,7 +218,7 @@ under the License.
         </actions>
         <auto-fields-service service-name="updateContentPurposeOperation" default-field-type="display"/>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation" also-hidden="false">
                 <parameter param-name="contentPurposeTypeId"/>
                 <parameter param-name="contentOperationId"/>
                 <parameter param-name="roleTypeId"/>

Modified: ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/datasetup/DataSetupForms.xml Sat Nov  5 14:14:04 2016
@@ -41,7 +41,7 @@ under the License.
             <submit button-type="button"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceType">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeDataResourceType" also-hidden="false">
                 <parameter param-name="dataResourceTypeId"/>
             </hyperlink>
         </field>
@@ -73,7 +73,7 @@ under the License.
             <display/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceTypeAttr">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeDataResourceTypeAttr" also-hidden="false">
                 <parameter param-name="dataResourceTypeId"/>
                 <parameter param-name="attrName"/>
             </hyperlink>
@@ -101,7 +101,7 @@ under the License.
             <submit button-type="button"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeCharacterSet">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeCharacterSet" also-hidden="false">
                 <parameter param-name="characterSetId"/>
             </hyperlink>
         </field>
@@ -113,7 +113,7 @@ under the License.
         <auto-fields-service service-name="createDataCategory"/>
         <field name="parentCategoryId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="DataCategory" description="${categoryName}" key-field-name="dataCategoryId"></entity-options>
+                <entity-options entity-name="DataCategory" key-field-name="dataCategoryId" description="${categoryName}"></entity-options>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
@@ -140,7 +140,7 @@ under the License.
             <submit button-type="button"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataCategory">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeDataCategory" also-hidden="false">
                 <parameter param-name="dataCategoryId"/>
             </hyperlink>
         </field>
@@ -178,7 +178,7 @@ under the License.
             <submit button-type="button"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeFileExtension">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeFileExtension" also-hidden="false">
                 <parameter param-name="fileExtensionId"/>
             </hyperlink>
         </field>
@@ -206,7 +206,7 @@ under the License.
             <submit button-type="button"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeMetaDataPredicate">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeMetaDataPredicate" also-hidden="false">
                 <parameter param-name="metaDataPredicateId"/>
             </hyperlink>
         </field>
@@ -233,7 +233,7 @@ under the License.
             <submit button-type="button"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeMimeType">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeMimeType" also-hidden="false">
                 <parameter param-name="mimeTypeId"/>
             </hyperlink>
         </field>
@@ -268,7 +268,7 @@ under the License.
             <submit button-type="button"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeMimeTypeHtmlTemplate">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeMimeTypeHtmlTemplate" also-hidden="false">
                 <parameter param-name="mimeTypeId"/>
                 <parameter param-name="dataResourceId"/>
                 <parameter param-name="fromDate"/>

Modified: ofbiz/trunk/applications/content/widget/forum/BlogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/BlogForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/BlogForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/BlogForms.xml Sat Nov  5 14:14:04 2016
@@ -24,7 +24,7 @@ under the License.
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="contentId"><hidden/></field>
         <field name="contentName">
-            <hyperlink target="editBlog" description="${contentName} [${contentId}]">
+            <hyperlink description="${contentName} [${contentId}]" target="editBlog">
                 <parameter param-name="blogContentId" from-field="contentId"/>
             </hyperlink>
         </field>
@@ -40,7 +40,7 @@ under the License.
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="contentId"><hidden/></field>
         <field name="contentName">
-            <hyperlink target="ViewBlogArticle" description="${contentName} [${contentId}]">
+            <hyperlink description="${contentName} [${contentId}]" target="ViewBlogArticle">
                 <parameter param-name="articleContentId" from-field="contentId"/>
                 <parameter param-name="blogContentId" from-field="parameters.blogContentId"/>
             </hyperlink>

Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Sat Nov  5 14:14:04 2016
@@ -23,7 +23,7 @@ under the License.
     <form name="ListForumGroups" type="list" list-name="forumGroups" separate-columns="true" target="updateForumGroup"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="select" widget-style="buttontext" entry-name="contentId" parameter-name="contentId">
-            <hyperlink target="findForums" description="${uiLabelMap.FormFieldTitle_forums}">
+            <hyperlink description="${uiLabelMap.FormFieldTitle_forums}" target="findForums">
                 <parameter param-name="forumGroupId" from-field="contentId"/>
             </hyperlink>
         </field>
@@ -47,7 +47,7 @@ under the License.
         <field name="caContentAssocTypeId"><hidden value="${caContentAssocTypeId}"/></field>
         <field name="contentTypeId"><hidden/></field>
         <field name="select" widget-style="buttontext" entry-name="contentId" parameter-name="contentId">
-            <hyperlink target="findForumMessages" description="${uiLabelMap.ContentForumMessages}">
+            <hyperlink description="${uiLabelMap.ContentForumMessages}" target="findForumMessages">
                 <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/>
                 <parameter param-name="forumId" from-field="contentId"/>
             </hyperlink>
@@ -57,7 +57,7 @@ under the License.
         <field name="thruDate" entry-name="caThruDate"><date-time/></field>
         <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="updateForum" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="updateForum">
                 <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/>
                 <parameter param-name="caContentIdTo" from-field="contentId"/>
                 <parameter param-name="caContentId"/>
@@ -112,7 +112,7 @@ under the License.
         <field name="fromDate"><display/></field>
         <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="text-link"/></field>
         <field name="deleteButton" title="${uiLabelMap.CommonDelete}">
-            <hyperlink target="deleteForumGroupRole" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteForumGroupRole">
                 <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/>
                 <parameter param-name="contentIdTo"/>
                 <parameter param-name="contentId"/>
@@ -158,7 +158,7 @@ under the License.
         <field name="fromDate" entry-name="caFromDate"><display description="${groovy:caFromDate!=null?caFromDate.toString().substring(0,10):&quot;&quot;}"/></field>
         <field name="thruDate" entry-name="caThruDate"><display description="${groovy:caThruDate!=null?caThruDate.toString().substring(0,10):&quot;&quot;}"/></field>
         <field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="updateForumMessage" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="updateForumMessage">
                 <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/>
                 <parameter param-name="forumId" from-field="${parameters.forumId}"/>
                 <parameter param-name="caContentIdTo"/>
@@ -171,7 +171,7 @@ under the License.
         <field name="messageText" entry-name="contentData.resultData.electronicText.textData" parameter-name="textData"><textarea rows="8"/></field>
         <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <field name="responseButton" title="${uiLabelMap.FormFieldTitle_reponse}" widget-style="buttontext">
-            <hyperlink target="addForumMessage" description="${uiLabelMap.FormFieldTitle_reponse}">
+            <hyperlink description="${uiLabelMap.FormFieldTitle_reponse}" target="addForumMessage">
                 <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/>
                 <parameter param-name="forumId" from-field="parameters.forumId"/>
                 <parameter param-name="forumMessageIdTo" from-field="contentId"/>

Modified: ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/layout/LayoutForms.xml Sat Nov  5 14:14:04 2016
@@ -94,7 +94,7 @@ under the License.
             <submit button-type="button"/>
         </field>
         <field name="createLink" title=" " widget-style="buttontext" position="1">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonCreateNew}" target="EditLayoutTemplate?mode=add&amp;contentIdTo=TEMPLATE_MASTER"/>
+            <hyperlink description="${uiLabelMap.CommonCreateNew}" target="EditLayoutTemplate?mode=add&amp;contentIdTo=TEMPLATE_MASTER" also-hidden="false"/>
         </field>
         -->
     </form>
@@ -154,13 +154,13 @@ under the License.
               </service>
           </actions>
         <field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${contentId}" target="EditLayout">
+            <hyperlink description="${contentId}" target="EditLayout" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="drDataResourceId"/>
             </hyperlink>
         </field>
         <field name="dummy" title="${uiLabelMap.ContentClip}" widget-style="buttontext" map-name="dummy">
-            <hyperlink also-hidden="false" description="${contentId}" target="clipFindLayout">
+            <hyperlink description="${contentId}" target="clipFindLayout" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="drDataResourceId"/>
                 <parameter param-name="viewSize"/>
@@ -173,7 +173,7 @@ under the License.
         <field name="drObjectInfo"><display/></field>
         <!--
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeLayout">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeLayout" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="contentIdTo"/>
                 <parameter param-name="contentAssocTypeId"/>
@@ -186,7 +186,7 @@ under the License.
     <form name="ListListLayout" default-entity-name="ContentAssocDataResourceViewFrom" list-name="layoutList" target="" title="" type="list" paginate-target="FindLayout"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="contentId" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${contentId}" target="EditLayout">
+            <hyperlink description="${contentId}" target="EditLayout" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="drDataResourceId"/>
             </hyperlink>
@@ -195,7 +195,7 @@ under the License.
         <field name="description"><display/></field>
         <field name="drObjectInfo"><display/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeLayout">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeLayout" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="contentIdTo" from-field="caContentIdTo"/>
                 <parameter param-name="contentAssocTypeId" from-field="caContentAssocTypeId"/>
@@ -388,7 +388,7 @@ under the License.
     <form name="ListRelatedLayouts" default-entity-name="ContentDataResourceView" list-name="entityList" target="" title="" type="list" paginate-target="FindLayout"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${contentId}" target="EditLayout">
+            <hyperlink description="${contentId}" target="EditLayout" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="drDataResourceId"/>
             </hyperlink>

Modified: ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/survey/SurveyForms.xml Sat Nov  5 14:14:04 2016
@@ -214,7 +214,7 @@ under the License.
         <field name="surveyId"><hidden value="${surveyId}"/></field>
         <field name="parentCategoryId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="SurveyQuestionCategory" description="${description} [${surveyQuestionCategoryId}]" key-field-name="surveyQuestionCategoryId">
+                <entity-options entity-name="SurveyQuestionCategory" key-field-name="surveyQuestionCategoryId" description="${description} [${surveyQuestionCategoryId}]">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -270,7 +270,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="SurveyResponse" default-field-type="display"/>
         <field name="surveyResponseId" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${surveyResponseId}" target="EditSurveyResponse">
+            <hyperlink description="${surveyResponseId}" target="EditSurveyResponse" also-hidden="false">
                 <parameter param-name="surveyResponseId"/>
             </hyperlink>
         </field>
@@ -299,7 +299,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="Survey" default-field-type="display"/>
         <field name="surveyId" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${surveyId}" target="javascript:set_value('${surveyId}')"/>
+            <hyperlink description="${surveyId}" target="javascript:set_value('${surveyId}')" also-hidden="false" target-type="plain"/>
         </field>
     </form>
 
@@ -322,7 +322,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="SurveyResponse" default-field-type="display"/>
         <field name="surveyResponseId" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${surveyResponseId}" target="javascript:set_value('${surveyResponseId}')"/>
+            <hyperlink description="${surveyResponseId}" target="javascript:set_value('${surveyResponseId}')" also-hidden="false" target-type="plain"/>
         </field>
     </form>
 </forms>

Modified: ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml Sat Nov  5 14:14:04 2016
@@ -37,7 +37,7 @@ under the License.
             <display-entity entity-name="WebAnalyticsType" description="${description} [${webAnalyticsTypeId}]"/>
         </field>
         <field name="webAnalyticsCode">
-            <hyperlink target="EditWebAnalyticsConfig" description="${webAnalyticsCode}">
+            <hyperlink description="${webAnalyticsCode}" target="EditWebAnalyticsConfig">
                 <parameter param-name="productStoreId"/>
                 <parameter param-name="webAnalyticsTypeId"/>
                 <parameter param-name="webSiteId"/>
@@ -45,7 +45,7 @@ under the License.
         </field>
         <field name="webSiteId"><hidden value="${webSiteId}"/></field>
         <field name="removeButton" title="${uiLabelMap.CommonRemove}" widget-style="buttontext">
-            <hyperlink target="deleteWebAnalyticsConfig" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteWebAnalyticsConfig">
                 <parameter param-name="webSiteId"/>
                 <parameter param-name="webAnalyticsTypeId"/>
             </hyperlink>

Modified: ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml Sat Nov  5 14:14:04 2016
@@ -93,7 +93,7 @@ under the License.
             </service>
         </actions>
         <field name="pathAlias" sort-field="true" widget-style="buttontext">
-            <hyperlink target="EditWebSitePathAlias?webSiteId=${webSiteId}&amp;pathAlias=${pathAlias}" description="${pathAlias}"></hyperlink>
+            <hyperlink description="${pathAlias}" target="EditWebSitePathAlias?webSiteId=${webSiteId}&amp;pathAlias=${pathAlias}"></hyperlink>
         </field>        
         <field name="aliasTo" sort-field="true"><display/></field>
         <field name="contentId" sort-field="true">
@@ -107,7 +107,7 @@ under the License.
         <field name="fromDate" sort-field="true"><display/></field>
         <field name="thruDate" sort-field="true"><display/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeWebSitePathAlias" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeWebSitePathAlias" also-hidden="false">
               <parameter param-name="webSiteId"/>
               <parameter param-name="pathAlias"/>
             </hyperlink>
@@ -161,7 +161,7 @@ under the License.
 
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="RemoveWebSiteContent" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="RemoveWebSiteContent" also-hidden="false">
                 <parameter param-name="webSiteId"/>
                 <parameter param-name="contentId"/>
                 <parameter param-name="webSiteContentTypeId"/>
@@ -226,7 +226,7 @@ under the License.
         <field name="thruDate"></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeWebSiteRole" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeWebSiteRole" also-hidden="false">
                 <parameter param-name="webSiteId" from-field="webSiteRole.webSiteId"/>
                 <parameter param-name="partyId" from-field="webSiteRole.partyId"/>
                 <parameter param-name="roleTypeId" from-field="webSiteRole.roleTypeId"/>
@@ -310,7 +310,7 @@ under the License.
         <field name="thruDate"><date-time/></field>
         <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><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/datamodel/entitydef/accounting-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml (original)
+++ ofbiz/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml Sat Nov  5 14:14:04 2016
@@ -4316,4 +4316,7 @@ under the License.
             <key-map field-name="fixedAssetId"/>
         </relation>
     </extend-entity>
+    <extend-entity entity-name="TaxAuthorityRateProduct">
+        <field name="isTaxInShippingPrice" type="indicator"></field>
+    </extend-entity>
 </entitymodel>

Modified: ofbiz/trunk/applications/humanres/minilang/HumanResEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/minilang/HumanResEvents.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/minilang/HumanResEvents.xml (original)
+++ ofbiz/trunk/applications/humanres/minilang/HumanResEvents.xml Sat Nov  5 14:14:04 2016
@@ -35,11 +35,11 @@
         </entity-and>
         <if-not-empty field="emplPositionFulfillment">
             <set field="parameters.fromDate" from-field="emplPositionFulfillment[0].fromDate"/>
-            <set-service-fields service-name="deleteEmplPositionFulfillment" to-map="delFullfillCtx" map="parameters"/>
+            <set-service-fields service-name="deleteEmplPositionFulfillment" map="parameters" to-map="delFullfillCtx"/>/>
             <call-service service-name="deleteEmplPositionFulfillment" in-map-name="delFullfillCtx"></call-service>
         </if-not-empty>
         
-        <set-service-fields service-name="deleteEmplPosition" to-map="delEmlpCtx" map="parameters"/>
+        <set-service-fields service-name="deleteEmplPosition" map="parameters" to-map="delEmlpCtx"/>/>
         <call-service service-name="deleteEmplPosition" in-map-name="delEmlpCtx"></call-service>
     </simple-method>
     <simple-method method-name="removeInternalOrg" short-description="">

Modified: ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml (original)
+++ ofbiz/trunk/applications/humanres/minilang/HumanResServices.xml Sat Nov  5 14:14:04 2016
@@ -96,7 +96,7 @@
             <field-map field-name="rateTypeId" from-field="parameters.rateTypeId"/>
         </entity-and>
         <if-not-empty field="emplPositionTypeRates">
-            <first-from-list entry="emplPositionTypeRate" list="emplPositionTypeRates"/>
+            <first-from-list list="emplPositionTypeRates" entry="emplPositionTypeRate"/>
             <now-timestamp field="emplPositionTypeRate.thruDate"/>
             <store-value value-field="emplPositionTypeRate"/>
         </if-not-empty>
@@ -143,14 +143,14 @@
         <entity-and entity-name="Employment" list="employments" filter-by-date="true">
             <field-map field-name="partyIdTo" from-field="parameters.partyId"/>
         </entity-and>
-        <first-from-list entry="employment" list="employments"/>
+        <first-from-list list="employments" entry="employment"/>
         <field-to-result field="employment"/>
         <!-- position -->
         <entity-and entity-name="EmplPositionAndFulfillment" list="emplPositionAndFulfillments" filter-by-date="true">
             <field-map field-name="employeePartyId" from-field="parameters.partyId"/>
             <field-map field-name="partyId" from-field="employment.partyIdFrom"/>
         </entity-and>
-        <first-from-list entry="emplPositionAndFulfillment" list="emplPositionAndFulfillments"/>
+        <first-from-list list="emplPositionAndFulfillments" entry="emplPositionAndFulfillment"/>
         <field-to-result field="emplPositionAndFulfillment" result-name="emplPosition"/>
         <!-- position type -->
         <if-not-empty field="emplPositionAndFulfillment">
@@ -165,7 +165,7 @@
             <field-map field-name="emplPositionTypeId" from-field="emplPositionType.emplPositionTypeId"/>
             <field-map field-name="rateCurrencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
         </entity-and>
-        <first-from-list entry="rateAmount" list="rateAmounts"/>
+        <first-from-list list="rateAmounts" entry="rateAmount"/>
         <field-to-result field="rateAmount" result-name="emplPositionRateAmount"/>
     </simple-method>
 

Modified: ofbiz/trunk/applications/humanres/minilang/UpgradeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/minilang/UpgradeServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/minilang/UpgradeServices.xml (original)
+++ ofbiz/trunk/applications/humanres/minilang/UpgradeServices.xml Sat Nov  5 14:14:04 2016
@@ -24,7 +24,7 @@ under the License.
     <simple-method method-name="migrateSalaryStep" short-description="Migrate data from OldSalaryStep to SalaryStep">
         <entity-condition entity-name="OldSalaryStep" list="oldSalarySteps"/>
         <now field="fromDate"/>
-        <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>
         <iterate list="oldSalarySteps" entry="oldSalaryStep">

Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Sat Nov  5 14:14:04 2016
@@ -217,7 +217,7 @@ under the License.
                                         <not><if-empty field="perfReview"/></not>
                                     </condition>
                                     <actions>
-                                        <entity-one value-field="partyNameView" entity-name="PartyNameView">
+                                        <entity-one entity-name="PartyNameView" value-field="partyNameView">
                                             <field-map field-name="partyId" from-field="perfReview.employeePartyId"/>
                                         </entity-one>
                                     </actions>
@@ -423,7 +423,7 @@ under the License.
                     <decorator-section name="body">
                         <section>
                             <condition>
-                                <if-has-permission action="_VIEW" permission="HUMANRES"/>
+                                <if-has-permission permission="HUMANRES" action="_VIEW"/>
                             </condition>
                             <widgets>
                                 <decorator-section-include name="body"/>

Modified: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml Sat Nov  5 14:14:04 2016
@@ -316,7 +316,7 @@ under the License.
                 <set field="tabButtonItem" value="PayrollHistory"/>
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="parameters.sortField" from-field="parameters.sortField" default-value="invoiceDate DESC"/>
-                <entity-condition list="payroll" entity-name="InvoiceAndType">
+                <entity-condition entity-name="InvoiceAndType" list="payroll">
                     <condition-list combine="and">
                         <condition-expr field-name="partyIdFrom" operator="equals" from-field="partyId"/>
                         <condition-expr field-name="invoiceTypeId" operator="equals" value="PAYROL_INVOICE"/>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml Sat Nov  5 14:14:04 2016
@@ -77,14 +77,14 @@
         </field>
         <field name="leaveStatus"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="updateLeave" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext" use-when="hasAdminPermission">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonUpdate}" target="EditEmplLeave">
+            <hyperlink description="${uiLabelMap.CommonUpdate}" target="EditEmplLeave" also-hidden="false">
                 <parameter param-name="partyId"/>
                 <parameter param-name="leaveTypeId"/>
                 <parameter param-name="fromDate"/>
             </hyperlink>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext" use-when="hasAdminPermission">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteEmplLeave">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEmplLeave" also-hidden="false">
                 <parameter param-name="partyId"/>
                 <parameter param-name="leaveTypeId"/>
                 <parameter param-name="fromDate"/>
@@ -158,7 +158,7 @@
         </field>
         <field name="leaveStatus"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="UpdateStatus" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext">
-            <hyperlink target="EditEmplLeaveStatus" description="${uiLabelMap.CommonUpdate}" >
+            <hyperlink description="${uiLabelMap.CommonUpdate}" target="EditEmplLeaveStatus" >
                 <parameter param-name="partyId"/>
                 <parameter param-name="fromDate"/>
                 <parameter param-name="leaveTypeId"/>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Sat Nov  5 14:14:04 2016
@@ -33,7 +33,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="EmplPosition" default-field-type="display"/>
         <field name="emplPositionId" title="${uiLabelMap.HumanResEmployeePositionId}" widget-style="linktext">
-            <hyperlink also-hidden="false" description="${emplPositionId}" target="emplPositionView">
+            <hyperlink description="${emplPositionId}" target="emplPositionView" also-hidden="false">
                 <parameter param-name="emplPositionId"/>
             </hyperlink>
         </field>
@@ -118,7 +118,7 @@ under the License.
         <field name="fromDate" title="${uiLabelMap.CommonDate}"><display/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteEmplPositionFulfillment" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEmplPositionFulfillment" also-hidden="false">
                 <parameter param-name="emplPositionId"/>
                 <parameter param-name="partyId"/>
                 <parameter param-name="fromDate"/>
@@ -183,7 +183,7 @@ under the License.
         <field name="comments"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteEmplPositionReportingStruct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEmplPositionReportingStruct" also-hidden="false">
                 <parameter param-name="emplPositionIdReportingTo"/>
                 <parameter param-name="emplPositionIdManagedBy"/>
                 <parameter param-name="fromDate"/>
@@ -214,7 +214,7 @@ under the License.
         <field name="fromDate"><display /></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteEmplPositionResponsibility" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEmplPositionResponsibility" also-hidden="false">
                 <parameter param-name="emplPositionId"/>
                 <parameter param-name="responsibilityTypeId"/>
                 <parameter param-name="fromDate"/>
@@ -246,7 +246,7 @@ under the License.
         <field name="fromDate"><display /></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteValidResponsibility" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteValidResponsibility" also-hidden="false">
                 <parameter param-name="emplPositionTypeId" from-field="emplPositionId"/>
                 <parameter param-name="responsibilityTypeId"/>
                 <parameter param-name="fromDate"/>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml Sat Nov  5 14:14:04 2016
@@ -96,7 +96,7 @@
         <field name="rating"><text/></field>
         <field name="skillLevel"><text/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteEmployeeSkill" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEmployeeSkill" also-hidden="false">
                 <parameter param-name="skillTypeId"/>
                 <parameter param-name="partyId"/>
             </hyperlink>
@@ -163,7 +163,7 @@
         </field>
         <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteEmployeeQualification" also-hidden="false" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEmployeeQualification" also-hidden="false">
                 <parameter param-name="partyId"/>
                 <parameter param-name="partyQualTypeId"/>
                 <parameter param-name="fromDate"/>
@@ -229,7 +229,7 @@
             </display-entity>
         </field>
         <field name="position" entry-name="emplPositionType.emplPositionTypeId">
-            <hyperlink target="emplPositionView" description="${employmentData.emplPositionType.description} [${employmentData.emplPosition.emplPositionId}]">
+            <hyperlink description="${employmentData.emplPositionType.description} [${employmentData.emplPosition.emplPositionId}]" target="emplPositionView">
                 <parameter param-name="emplPositionId" from-field="employmentData.emplPosition.emplPositionId"/>
             </hyperlink>
         </field>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml Sat Nov  5 14:14:04 2016
@@ -61,7 +61,7 @@ under the License.
         <field name="referredByPartyId" title="${uiLabelMap.FormFieldTitle_referredByPartyId}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="applicationDate" title="${uiLabelMap.FormFieldTitle_applicationDate}"><date-time/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteEmploymentApp" description="${uiLabelMap.CommonDelete}" also-hidden="true">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteEmploymentApp" also-hidden="true">
                 <parameter param-name="applicationId"/>
                 <parameter param-name="partyId"/>
                 <parameter param-name="referredByPartyId"/>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Sat Nov  5 14:14:04 2016
@@ -59,7 +59,7 @@
         </actions>
         <field name="partyIdFrom" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}"><display></display></field>
         <field name="partyIdTo" title="${uiLabelMap.HumanResEmployeePartyIdTo}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${partyIdTo}" target="EmployeeProfile">
+            <hyperlink description="${partyIdTo}" target="EmployeeProfile" also-hidden="false">
                 <parameter param-name="partyId" from-field="partyIdTo"/>
             </hyperlink>
         </field>
@@ -70,7 +70,7 @@
         <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display/></field>
         <field name="terminationTypeId"><display/></field>
         <field name="editLink" title=" " widget-style="buttontext">
-            <hyperlink target="EditEmployment" description="${uiLabelMap.CommonEdit}">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditEmployment">
                 <parameter param-name="partyIdFrom"/>
                 <parameter param-name="partyIdTo"/>
                 <parameter param-name="roleTypeIdFrom"/>
@@ -91,7 +91,7 @@
         </actions>
         <field name="partyIdFrom" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}"><display></display></field>
         <field name="partyIdTo" title="${uiLabelMap.HumanResEmployeePartyIdTo}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${partyIdTo}" target="viewprofile">
+            <hyperlink description="${partyIdTo}" target="viewprofile" also-hidden="false">
                 <parameter param-name="partyId" from-field="partyIdTo"/>
             </hyperlink>
         </field>
@@ -100,7 +100,7 @@
         <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display/></field>
         <field name="terminationTypeId"><display/></field>
         <field name="editLink" title=" " widget-style="buttontext">
-            <hyperlink target="EditEmployment" description="${uiLabelMap.CommonEdit}">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditEmployment">
                 <parameter param-name="partyIdFrom"/>
                 <parameter param-name="partyIdTo"/>
                 <parameter param-name="roleTypeIdFrom"/>
@@ -117,7 +117,7 @@
         <field name="roleTypeIdTo"><hidden value="EMPLOYEE"/></field>
         <field name="partyIdFrom" use-when="employment==null" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}" required-field="true">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PartyRole" description="${partyId}" key-field-name="partyId">
+                <entity-options entity-name="PartyRole" key-field-name="partyId" description="${partyId}">
                     <entity-constraint name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
                 </entity-options>
             </drop-down>
@@ -177,7 +177,7 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deletePayHistory" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePayHistory">
                 <parameter param-name="roleTypeIdFrom"/>
                 <parameter param-name="roleTypeIdTo"/>
                 <parameter param-name="partyIdFrom"/>
@@ -209,7 +209,7 @@
         <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deletePartyBenefit" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyBenefit">
                 <parameter param-name="benefitTypeId"/>
                 <parameter param-name="roleTypeIdFrom"/>
                 <parameter param-name="roleTypeIdTo"/>
@@ -264,7 +264,7 @@
         <field name="fromDate"><display/></field>
         <field name="thruDate"><date-time/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deletePayrollPreference" description="${uiLabelMap.CommonDelete}" also-hidden="true">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePayrollPreference" also-hidden="true">
                 <parameter param-name="partyId"/>
                 <parameter param-name="roleTypeId"/>
                 <parameter param-name="payrollPreferenceSeqId"/>
@@ -362,7 +362,7 @@
         <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteUnemploymentClaim" description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteUnemploymentClaim">
                 <parameter param-name="unemploymentClaimId"/>
                 <parameter param-name="roleTypeIdFrom"/>
                 <parameter param-name="roleTypeIdTo"/>