Modified: 
ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml 
(original)
+++ ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml Sat 
Nov  5 14:14:04 2016
@@ -29,7 +29,7 @@ under the License.
         <field name="skillTypeId" 
title="${uiLabelMap.HumanResSkillTypeId}"><display/></field>
         <field name="description" 
title="${uiLabelMap.CommonDescription}"><text/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" 
widget-style="buttontext">
-            <hyperlink target="deleteSkillType" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deleteSkillType" also-hidden="false">
                 <parameter param-name="skillTypeId"/>
             </hyperlink>
         </field>
@@ -51,7 +51,7 @@ under the License.
         <auto-fields-service service-name="updateResponsibilityType" 
default-field-type="hidden"/>
         <field name="responsibilityTypeId" 
title="${uiLabelMap.HumanResResponsibilityTypeId}"><display/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" 
widget-style="buttontext">
-            <hyperlink target="deleteResponsibilityType" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deleteResponsibilityType" also-hidden="false">
                 <parameter param-name="responsibilityTypeId"/>
             </hyperlink>
         </field>
@@ -74,7 +74,7 @@ under the License.
         <field name="terminationTypeId" 
title="${uiLabelMap.HumanResTerminationTypeId}"><display/></field>
         <field name="description" 
title="${uiLabelMap.CommonDescription}"><text/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" 
widget-style="buttontext">
-            <hyperlink target="deleteTerminationType" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deleteTerminationType" also-hidden="false">
                 <parameter param-name="terminationTypeId"/>
             </hyperlink>
         </field>
@@ -111,13 +111,13 @@ under the License.
         </actions>
         <auto-fields-service service-name="updateEmplPositionType" 
default-field-type="hidden"/>
         <field name="emplPositionTypeId" 
title="${uiLabelMap.HumanResEmplPositionType}">
-            <hyperlink also-hidden="false" description="${emplPositionTypeId}" 
target="EditEmplPositionTypes">
+            <hyperlink description="${emplPositionTypeId}" 
target="EditEmplPositionTypes" also-hidden="false">
                 <parameter param-name="emplPositionTypeId"/>
             </hyperlink>
         </field>
         <field name="description" 
title="${uiLabelMap.CommonDescription}"><display/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" 
widget-style="buttontext">
-            <hyperlink target="deleteEmplPositionType" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deleteEmplPositionType" also-hidden="false">
                 <parameter param-name="emplPositionTypeId"/>
             </hyperlink>
         </field>
@@ -205,7 +205,7 @@ under the License.
         <field name="description"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" 
widget-style="smallSubmit"><submit/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" 
widget-style="buttontext">
-            <hyperlink target="deleteTerminationReason" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deleteTerminationReason" also-hidden="false">
                 <parameter param-name="terminationReasonId"/>
             </hyperlink>
         </field>
@@ -226,7 +226,7 @@ under the License.
         <field name="jobInterviewTypeId"><display/></field>
         <field name="description" 
title="${uiLabelMap.CommonDescription}"><text/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" 
widget-style="buttontext">
-            <hyperlink also-hidden="false" 
description="${uiLabelMap.CommonDelete}" target="deleteJobInterviewType"> 
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deleteJobInterviewType" also-hidden="false"> 
                 <parameter param-name="jobInterviewTypeId"/> 
             </hyperlink>
         </field>
@@ -247,7 +247,7 @@ under the License.
         <field name="parentTypeId" 
title="${uiLabelMap.HumanResPreRequisiteSkill}" 
widget-style="buttontext"><text/></field>
         <field name="description" 
title="${uiLabelMap.CommonDescription}"><text/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" 
widget-style="buttontext">
-           <hyperlink also-hidden="false" 
description="${uiLabelMap.CommonDelete}" target="deleteTrainingTypes"> 
+           <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deleteTrainingTypes" also-hidden="false"> 
                 <parameter param-name="trainingClassTypeId"/> 
             </hyperlink>
         </field>
@@ -276,7 +276,7 @@ under the License.
         <field name="leaveTypeId"><display/></field>
         <field name="description" 
title="${uiLabelMap.CommonDescription}"><text/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" 
widget-style="buttontext">
-            <hyperlink target="deleteEmplLeaveType" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deleteEmplLeaveType" also-hidden="false">
                 <parameter param-name="leaveTypeId"/>
             </hyperlink>
         </field>
@@ -299,7 +299,7 @@ under the License.
         <field name="emplLeaveReasonTypeId"><display/></field>
         <field name="description" 
title="${uiLabelMap.CommonDescription}"><text/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" 
widget-style="buttontext">
-            <hyperlink target="deleteEmplLeaveReasonType" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deleteEmplLeaveReasonType" also-hidden="false">
                 <parameter param-name="emplLeaveReasonTypeId"/>
             </hyperlink>
         </field>

Modified: ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml Sat Nov  5 
14:14:04 2016
@@ -46,7 +46,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="Budget" default-field-type="display"/>
         <field name="budgetId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" 
description="${budgetId}" target="javascript:set_value('${budgetId}')"/>
+            <hyperlink description="${budgetId}" 
target="javascript:set_value('${budgetId}')" also-hidden="false" 
target-type="plain"/>
         </field>
     </form>
     <form name="LookupBudgetItem" type="single" target="LookupBudgetItem"
@@ -74,7 +74,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="BudgetItem" 
default-field-type="display"/>
         <field name="budgetItemSeqId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" 
description="${budgetItemSeqId}" 
target="javascript:set_value('${budgetItemSeqId}')"/>
+            <hyperlink description="${budgetItemSeqId}" 
target="javascript:set_value('${budgetItemSeqId}')" also-hidden="false" 
target-type="plain"/>
         </field>
     </form>
     <form name="LookupEmplPosition" type="single" target="LookupEmplPosition"
@@ -108,7 +108,7 @@ under the License.
             </service>
         </actions>
         <field name="emplPositionId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" 
description="${emplPositionId}" 
target="javascript:set_value('${emplPositionId}')"/>
+            <hyperlink description="${emplPositionId}" 
target="javascript:set_value('${emplPositionId}')" also-hidden="false" 
target-type="plain"/>
         </field>
         <field name="statusId"><display/></field>
         <field name="partyId"><display/></field>
@@ -134,7 +134,7 @@ under the License.
             </service>
         </actions>
         <field name="terminationReasonId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" 
description="${terminationReasonId}" 
target="javascript:set_value('${terminationReasonId}')"/>
+            <hyperlink description="${terminationReasonId}" 
target="javascript:set_value('${terminationReasonId}')" also-hidden="false" 
target-type="plain"/>
         </field>
         <field name="description"><display/></field>
     </form>
@@ -157,7 +157,7 @@ under the License.
             </service>
         </actions>
         <field name="salaryStepSeqId" 
title="${uiLabelMap.HumanResLookupSalaryStepSeqId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" 
description="${salaryStepSeqId}" 
target="javascript:set_value('${salaryStepSeqId}')"/>
+            <hyperlink description="${salaryStepSeqId}" 
target="javascript:set_value('${salaryStepSeqId}')" also-hidden="false" 
target-type="plain"/>
         </field>
         <field name="fromDate" 
title="${uiLabelMap.CommonFrom}"><display/></field>
         <field name="thruDate" 
title="${uiLabelMap.CommonThru}"><display/></field>
@@ -181,7 +181,7 @@ under the License.
             </service>
         </actions>
         <field name="payGradeId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" 
description="${payGradeId}" target="javascript:set_value('${payGradeId}')"/>
+            <hyperlink description="${payGradeId}" 
target="javascript:set_value('${payGradeId}')" also-hidden="false" 
target-type="plain"/>
         </field>
         <field name="description"><display/></field>
     </form>
@@ -203,7 +203,7 @@ under the License.
             </service>
         </actions>
         <field name="payrollPreferenceSeqId" 
title="${uiLabelMap.HumanResLookupPayrollPreferenceSeqId}" 
widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" 
description="${payrollPreferenceSeqId}" 
target="javascript:set_value('${payrollPreferenceSeqId}')"/>
+            <hyperlink description="${payrollPreferenceSeqId}" 
target="javascript:set_value('${payrollPreferenceSeqId}')" also-hidden="false" 
target-type="plain"/>
         </field>
         <field name="description"><display/></field>
     </form>
@@ -225,7 +225,7 @@ under the License.
             </service>
         </actions>
         <field name="unemploymentClaimId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" 
description="${unemploymentClaimId}" 
target="javascript:set_value('${unemploymentClaimId}')"/>
+            <hyperlink description="${unemploymentClaimId}" 
target="javascript:set_value('${unemploymentClaimId}')" also-hidden="false" 
target-type="plain"/>
         </field>
         <field name="description"><display/></field>
     </form>
@@ -247,7 +247,7 @@ under the License.
             </service>
         </actions>
         <field name="agreementItemSeqId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" 
description="${agreementItemSeqId}" 
target="javascript:set_value('${agreementItemSeqId}')"/>
+            <hyperlink description="${agreementItemSeqId}" 
target="javascript:set_value('${agreementItemSeqId}')" also-hidden="false" 
target-type="plain"/>
         </field>
         <field name="description"><display/></field>
     </form>
@@ -269,7 +269,7 @@ under the License.
             </service>
         </actions>
         <field name="perfReviewId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" 
description="${perfReviewId}" target="javascript:set_value('${perfReviewId}')"/>
+            <hyperlink description="${perfReviewId}" 
target="javascript:set_value('${perfReviewId}')" also-hidden="false" 
target-type="plain"/>
         </field>
         <field name="description"><display/></field>
     </form>
@@ -291,7 +291,7 @@ under the License.
             </service>
         </actions>
         <field name="resumeId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" 
description="${resumeId}" target="javascript:set_value('${resumeId}')"/>
+            <hyperlink description="${resumeId}" 
target="javascript:set_value('${resumeId}')" also-hidden="false" 
target-type="plain"/>
         </field>
         <field name="description"><display/></field>
     </form>
@@ -313,7 +313,7 @@ under the License.
             </service>
         </actions>
         <field name="applicationId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" 
description="${applicationId}" 
target="javascript:set_value('${applicationId}')"/>
+            <hyperlink description="${applicationId}" 
target="javascript:set_value('${applicationId}')" also-hidden="false" 
target-type="plain"/>
         </field>
         <field name="description"><display/></field>
     </form>
@@ -349,7 +349,7 @@ under the License.
             </service>
         </actions>
         <field name="jobRequisitionId" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" 
description="${jobRequisitionId}" 
target="javascript:set_value('${jobRequisitionId}')"/>
+            <hyperlink description="${jobRequisitionId}" 
target="javascript:set_value('${jobRequisitionId}')" also-hidden="false" 
target-type="plain"/>
         </field>
         <field name="jobPostingTypeEnumId"><display/></field>
         <field name="qualification"><display/></field>
@@ -373,7 +373,7 @@ under the License.
             </service>
         </actions>
         <field name="trainingClassTypeId" 
title="${uiLabelMap.HumanResTrainingClassType}" widget-style="buttontext">
-             <hyperlink also-hidden="false" target-type="plain" 
description="${trainingClassTypeId}" 
target="javascript:set_value('${trainingClassTypeId}')"/>
+             <hyperlink description="${trainingClassTypeId}" 
target="javascript:set_value('${trainingClassTypeId}')" also-hidden="false" 
target-type="plain"/>
         </field>        
         <field name="parentTypeId" 
title="${uiLabelMap.HumanResPreRequisiteSkill}"><display/></field>
         <field name="description" 
title="${uiLabelMap.CommonDescription}"><display/></field>

Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml Sat Nov  
5 14:14:04 2016
@@ -92,7 +92,7 @@ under the License.
         </field>
         <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden 
value="Y"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" 
widget-style="buttontext">
-            <hyperlink target="deletePartyQual" also-hidden="false" 
description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deletePartyQual" also-hidden="false">
                 <auto-parameters-service service-name="deletePartyQual"/>
             </hyperlink>
         </field>

Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml 
(original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml Sat Nov 
 5 14:14:04 2016
@@ -41,7 +41,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="PartyResume" 
default-field-type="display"/>
         <field name="resumeId" widget-style="linktext">
-            <hyperlink also-hidden="false" description="${resumeId}" 
target="EditPartyResumes">
+            <hyperlink description="${resumeId}" target="EditPartyResumes" 
also-hidden="false">
                 <parameter param-name="resumeId"/>
                 <parameter param-name="partyId"/>
             </hyperlink>
@@ -54,7 +54,7 @@ under the License.
            </display-entity>
        </field>
        <field name="deleteLink" title="${uiLabelMap.CommonDelete}" 
widget-style="buttontext">
-           <hyperlink target="deletePartyResume" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+           <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deletePartyResume" also-hidden="false">
                <parameter param-name="resumeId"/>
                <parameter param-name="partyId"/>
             </hyperlink>

Modified: ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml 
(original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml Sat Nov  
5 14:14:04 2016
@@ -53,7 +53,7 @@ under the License.
         <field name="rating"><text/></field>
         <field name="skillLevel"><text/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" 
widget-style="buttontext">
-            <hyperlink target="deletePartySkill" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deletePartySkill" also-hidden="false">
                 <parameter param-name="skillTypeId"/>
                 <parameter param-name="partyId"/>
             </hyperlink>

Modified: ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml Sat Nov  5 
14:14:04 2016
@@ -44,7 +44,7 @@
             </hyperlink>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" 
widget-style="buttontext">
-            <hyperlink target="deletePayGrade" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deletePayGrade" also-hidden="false">
                 <parameter param-name="payGradeId"/>
             </hyperlink>
         </field>
@@ -71,7 +71,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="deleteSalaryStep" 
description="${uiLabelMap.CommonDelete}">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deleteSalaryStep">
                 <parameter param-name="salaryStepSeqId"/>
                 <parameter param-name="payGradeId"/>
                 <parameter param-name="fromDate"/>

Modified: ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml 
(original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml Sat Nov  
5 14:14:04 2016
@@ -57,7 +57,7 @@ under the License.
         </field>
         <field name="managerRoleTypeId"><ignored/></field>
         <field name="perfReviewId">
-           <hyperlink also-hidden="false" description="${perfReviewId}" 
target="EditPerfReview">
+           <hyperlink description="${perfReviewId}" target="EditPerfReview" 
also-hidden="false">
                 <parameter param-name="perfReviewId"/>
                 <parameter param-name="employeePartyId"/>
                 <parameter param-name="employeeRoleTypeId"/>
@@ -102,7 +102,7 @@ under the License.
         <field name="perfReviewItemTypeId"><display-entity 
entity-name="PerfReviewItemType"></display-entity></field>
         <field name="perfRatingTypeId"><display-entity 
entity-name="PerfRatingType"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" 
widget-style="buttontext">
-            <hyperlink target="deletePerfReviewItem" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deletePerfReviewItem" also-hidden="false">
                 <parameter param-name="perfReviewId"/>
                 <parameter param-name="employeePartyId"/>
                 <parameter param-name="employeeRoleTypeId"/>

Modified: ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml 
(original)
+++ ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml Sat Nov 
 5 14:14:04 2016
@@ -71,7 +71,7 @@ under the License.
             </service>
         </actions>
         <field name="jobRequisitionId" widget-style="buttontext" 
use-when="hasAdminPermission">
-            <hyperlink target="EditJobRequisition" 
description="${jobRequisitionId}">
+            <hyperlink description="${jobRequisitionId}" 
target="EditJobRequisition">
                 <parameter param-name="jobRequisitionId"/>
             </hyperlink>
         </field>
@@ -86,12 +86,12 @@ under the License.
         <field name="experienceYears"><display/></field>
         <field name="experienceMonths"><display/></field>
         <field name="applyLink" title="${uiLabelMap.CommonApply}" 
widget-style="buttontext">
-            <hyperlink also-hidden="false" 
description="${uiLabelMap.CommonApply}" target="EditInternalJobPosting"> 
+            <hyperlink description="${uiLabelMap.CommonApply}" 
target="EditInternalJobPosting" also-hidden="false"> 
                 <parameter param-name="jobRequisitionId"/> 
             </hyperlink>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" 
widget-style="buttontext" use-when="hasAdminPermission">
-            <hyperlink also-hidden="false" 
description="${uiLabelMap.CommonDelete}" target="deleteJobRequisition"> 
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deleteJobRequisition" also-hidden="false"> 
                 <parameter param-name="jobRequisitionId"/> 
             </hyperlink>
         </field>
@@ -174,7 +174,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="EmploymentApp" 
default-field-type="display"/>
         <field name="applicationId" widget-style="buttontext">
-            <hyperlink target="EditInternalJobPosting" 
description="${applicationId}">
+            <hyperlink description="${applicationId}" 
target="EditInternalJobPosting">
                 <parameter param-name="applicationId"/>
             </hyperlink>
         </field>        
@@ -197,12 +197,12 @@ under the License.
 
         <field name="statusId" 
title="${uiLabelMap.HumanResIJPStatus}"><display/></field>
         <field name="jobRequisitionId" widget-style="buttontext">
-            <hyperlink target="EditJobRequisition" 
description="${jobRequisitionId}">
+            <hyperlink description="${jobRequisitionId}" 
target="EditJobRequisition">
                 <parameter param-name="jobRequisitionId"/>
             </hyperlink>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" 
widget-style="buttontext" use-when="hasAdminPermission">
-            <hyperlink also-hidden="false" 
description="${uiLabelMap.CommonDelete}" target="deleteInternalJobPosting"> 
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deleteInternalJobPosting" also-hidden="false"> 
                 <parameter param-name="applicationId"/> 
             </hyperlink>
         </field>
@@ -266,7 +266,7 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="JobInterview" 
default-field-type="display"/>
         <field name="jobInterviewId" widget-style="buttontext">
-            <hyperlink target="EditJobInterview" 
description="${jobInterviewId}">
+            <hyperlink description="${jobInterviewId}" 
target="EditJobInterview">
                 <parameter param-name="jobInterviewId"/>
             </hyperlink>
         </field>
@@ -285,7 +285,7 @@ under the License.
             </display-entity>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" 
description="${uiLabelMap.CommonDelete}" target="deleteJobInterview"> 
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deleteJobInterview" also-hidden="false"> 
                 <parameter param-name="jobInterviewId"/> 
             </hyperlink>
         </field>
@@ -371,7 +371,7 @@ under the License.
             </display-entity>
         </field>
         <field name="UpdateStatus" title="${uiLabelMap.CommonUpdate}" 
widget-style="buttontext">
-            <hyperlink target="EditApprovalStatus" 
description="${uiLabelMap.CommonUpdate}" > 
+            <hyperlink description="${uiLabelMap.CommonUpdate}" 
target="EditApprovalStatus" > 
                 <parameter param-name="applicationId"/> 
             </hyperlink>
         </field>
@@ -407,7 +407,7 @@ under the License.
         <field name="emplPositionIdReportingTo"><lookup 
target-form-name="LookupEmplPosition"/></field>
         <field name="internalOrganisation">
             <drop-down allow-empty="true">
-                <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>
@@ -435,12 +435,12 @@ under the License.
             </display-entity>
         </field>
         <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>
         <field name="emplPositionIdReportingTo" widget-style="linktext">
-            <hyperlink also-hidden="false" 
description="${emplPositionIdReportingTo}" target="emplPositionView">
+            <hyperlink description="${emplPositionIdReportingTo}" 
target="emplPositionView" also-hidden="false">
                 <parameter param-name="emplPositionId" 
from-field="emplPositionIdReportingTo"/>
             </hyperlink>
         </field>

Modified: 
ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml 
(original)
+++ ofbiz/trunk/applications/manufacturing/minilang/bom/BomSimpleMethods.xml 
Sat Nov  5 14:14:04 2016
@@ -75,7 +75,7 @@ under the License.
                                 in-map-name="parameters" 
out-map-name="context"/>
             <check-errors/>
             <call-service service-name="createBOMAssoc" in-map-name="context">
-                <result-to-field field="errorMessage" 
result-name="errorMessage"/>
+                <result-to-field result-name="errorMessage" 
field="errorMessage"/>
             </call-service>
              <if-not-empty field="errorMessage">
                 <add-error>

Modified: 
ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml
 Sat Nov  5 14:14:04 2016
@@ -72,7 +72,7 @@ under the License.
                 <iterate list="components" entry="component">
                     <if-not-empty field="component.productId">
                         <clear-field field="callSvcMap"/>
-                        <set-service-fields to-map="callSvcMap" 
service-name="issueProductionRunTaskComponent" map="component"/>
+                        <set-service-fields 
service-name="issueProductionRunTaskComponent" map="component" 
to-map="callSvcMap"/>
                         <set from-field="reserveOrderEnumId" 
field="callSvcMap.reserveOrderEnumId"/>
                         <!-- calculate quantity needed if the produced run 
quantity is produced partially -->
                         <entity-and entity-name="WorkEffortAndInventoryAssign" 
list="issuances">
@@ -83,8 +83,8 @@ under the License.
                         <iterate list="issuances" entry="issuance">
                             <calculate field="totalIssuance">
                                 <calcop operator="add">
-                                    <calcop field="issuance.quantity" 
operator="get"/>
-                                    <calcop field="totalIssuance" 
operator="get"/>
+                                    <calcop operator="get" 
field="issuance.quantity"/>
+                                    <calcop operator="get" 
field="totalIssuance"/>
                                 </calcop>
                             </calculate>
                         </iterate>
@@ -92,7 +92,7 @@ under the License.
                         <if-compare field="totalIssuance" 
operator="not-equals" value="0.00">
                             <set field="callSvcMap.quantity" value="0.00" 
type="BigDecimal"/>
                             <calculate field="callSvcMap.quantity">
-                                <calcop field="component.estimatedQuantity" 
operator="subtract">
+                                <calcop operator="subtract" 
field="component.estimatedQuantity">
                                     <calcop operator="get" 
field="totalIssuance"/>
                                 </calcop>
                             </calculate>
@@ -245,10 +245,10 @@ under the License.
                     <set from-field="lastNonSerInventoryItem.inventoryItemId" 
field="createDetailMap.inventoryItemId"/>
                     <set from-field="parameters.workEffortId" 
field="createDetailMap.workEffortId"/>
                     <calculate field="createDetailMap.availableToPromiseDiff">
-                        <calcop field="parameters.quantityNotIssued" 
operator="negative"/>
+                        <calcop operator="negative" 
field="parameters.quantityNotIssued"/>
                     </calculate>
                     <calculate field="createDetailMap.quantityOnHandDiff">
-                        <calcop field="parameters.quantityNotIssued" 
operator="negative"/>
+                        <calcop operator="negative" 
field="parameters.quantityNotIssued"/>
                     </calculate>
                     <set field="createDetailMap.reasonEnumId" 
from-field="parameters.reasonEnumId"/>
                     <set field="createDetailMap.description" 
from-field="parameters.description"/>
@@ -278,10 +278,10 @@ under the License.
                     <set field="createDetailMap.inventoryItemId" 
from-field="createInvItemOutMap.inventoryItemId"/>
                     <set field="createDetailMap.workEffortId" 
from-field="parameters.workEffortId"/>
                     <calculate field="createDetailMap.availableToPromiseDiff">
-                        <calcop field="parameters.quantityNotIssued" 
operator="negative"/>
+                        <calcop operator="negative" 
field="parameters.quantityNotIssued"/>
                     </calculate>
                     <calculate field="createDetailMap.quantityOnHandDiff">
-                        <calcop field="parameters.quantityNotIssued" 
operator="negative"/>
+                        <calcop operator="negative" 
field="parameters.quantityNotIssued"/>
                     </calculate>
                     <set field="createDetailMap.reasonEnumId" 
from-field="parameters.reasonEnumId"/>
                     <set field="createDetailMap.description" 
from-field="parameters.description"/>
@@ -299,8 +299,8 @@ under the License.
                 <iterate list="issuances" entry="issuance">
                     <calculate field="totalIssuance">
                         <calcop operator="add">
-                            <calcop field="issuance.quantity" operator="get"/>
-                            <calcop field="totalIssuance" operator="get"/>
+                            <calcop operator="get" field="issuance.quantity"/>
+                            <calcop operator="get" field="totalIssuance"/>
                         </calcop>
                     </calculate>
                 </iterate>
@@ -328,7 +328,7 @@ under the License.
                     <clear-field field="issuanceCreateMap"/>
 
                     <calculate field="parameters.quantityNotIssued">
-                        <calcop field="parameters.quantityNotIssued" 
operator="subtract"><number value="1.0"/></calcop>
+                        <calcop operator="subtract" 
field="parameters.quantityNotIssued"><number value="1.0"/></calcop>
                     </calculate>
                 </if-compare>
             </if-compare>
@@ -372,10 +372,10 @@ under the License.
                             <set from-field="parameters.workEffortId" 
field="createDetailMap.workEffortId"/>
                             <!-- update availableToPromiseDiff AND 
quantityOnHandDiff since this is an issuance -->
                             <calculate 
field="createDetailMap.availableToPromiseDiff">
-                                <calcop field="parameters.deductAmount" 
operator="negative"/>
+                                <calcop operator="negative" 
field="parameters.deductAmount"/>
                             </calculate>
                             <calculate 
field="createDetailMap.quantityOnHandDiff">
-                                <calcop field="parameters.deductAmount" 
operator="negative"/>
+                                <calcop operator="negative" 
field="parameters.deductAmount"/>
                             </calculate>
                             <set field="createDetailMap.reasonEnumId" 
from-field="parameters.reasonEnumId"/>
                             <set field="createDetailMap.description" 
from-field="parameters.description"/>
@@ -454,10 +454,10 @@ under the License.
                 <set from-field="parameters.workEffortId" 
field="createDetailMap.workEffortId"/>
                 <!-- update availableToPromiseDiff AND quantityOnHandDiff 
since this is an issuance -->
                 <calculate field="createDetailMap.availableToPromiseDiff">
-                    <calcop field="deductAmount" operator="negative"/>
+                    <calcop operator="negative" field="deductAmount"/>
                 </calculate>
                 <calculate field="createDetailMap.quantityOnHandDiff">
-                    <calcop field="deductAmount" operator="negative"/>
+                    <calcop operator="negative" field="deductAmount"/>
                 </calculate>
                 <call-service service-name="createInventoryItemDetail" 
in-map-name="createDetailMap"/>
                 <field-to-result field="deductAmount" 
result-name="quantityIssued"/>

Modified: 
ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/minilang/techdata/RoutingSimpleServices.xml
 Sat Nov  5 14:14:04 2016
@@ -67,7 +67,7 @@ under the License.
         <make-value value-field="lookupPKMap" entity-name="TechDataCalendar"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <get-related value-field="lookupPKMap" 
relation-name="TechDataCalendarExcDay" list="relatedResultList"/>
-        <first-from-list entry="relatedResult" list="relatedResultList"/>
+        <first-from-list list="relatedResultList" entry="relatedResult"/>
         <if-not-empty field="relatedResult">
             <add-error>
                 <fail-property resource="ManufacturingUiLabels" 
property="ManufacturingCalendarExceptionDayUseCalendar"/>
@@ -75,7 +75,7 @@ under the License.
             <check-errors/>
         </if-not-empty>
         <get-related value-field="lookupPKMap" 
relation-name="TechDataCalendarExcWeek" list="relatedResultList"/>
-        <first-from-list entry="relatedResult" list="relatedResultList"/>
+        <first-from-list list="relatedResultList" entry="relatedResult"/>
         <if-not-empty field="relatedResult">
             <add-error>
                 <fail-property resource="ManufacturingUiLabels" 
property="ManufacturingCalendarExceptionWeekUseCalendar"/>
@@ -124,7 +124,7 @@ under the License.
         <make-value value-field="lookupPKMap" 
entity-name="TechDataCalendarWeek"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <get-related value-field="lookupPKMap" 
relation-name="TechDataCalendar" list="relatedResultList"/>
-        <first-from-list entry="relatedResult" list="relatedResultList"/>
+        <first-from-list list="relatedResultList" entry="relatedResult"/>
         <if-not-empty field="relatedResult">
             <add-error>
                 <fail-property resource="ManufacturingUiLabels" 
property="ManufacturingCalendarUseCalendarWeek"/>
@@ -132,7 +132,7 @@ under the License.
             <check-errors/>
         </if-not-empty>
         <get-related value-field="lookupPKMap" 
relation-name="TechDataCalendarExcWeek" list="relatedResultList"/>
-        <first-from-list entry="relatedResult" list="relatedResultList"/>
+        <first-from-list list="relatedResultList" entry="relatedResult"/>
         <if-not-empty field="relatedResult">
             <add-error>
                 <fail-property resource="ManufacturingUiLabels" 
property="ManufacturingCalendarWeekExceptionUseCalendarWeek"/>

Modified: 
ofbiz/trunk/applications/manufacturing/minilang/test/ProductionRunTests.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/minilang/test/ProductionRunTests.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/minilang/test/ProductionRunTests.xml 
(original)
+++ ofbiz/trunk/applications/manufacturing/minilang/test/ProductionRunTests.xml 
Sat Nov  5 14:14:04 2016
@@ -66,7 +66,7 @@ under the License.
         <entity-and entity-name="WorkEffortGoodStandard" 
list="productionRunProducts">
             <field-map field-name="workEffortId" from-field="productionRunId"/>
         </entity-and>
-        <first-from-list entry="productionRunProduct" 
list="productionRunProducts"/>
+        <first-from-list list="productionRunProducts" 
entry="productionRunProduct"/>
 
         <assert>
             <not><if-empty field="productionRunProduct"/></not>
@@ -78,7 +78,7 @@ under the License.
         <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" 
from-field="productionRunId"/>
         </entity-and>
-        <first-from-list entry="productionRunTask" list="productionRunTasks"/>
+        <first-from-list list="productionRunTasks" entry="productionRunTask"/>
 
         <assert>
             <not><if-empty field="productionRunTask"/></not>
@@ -97,7 +97,7 @@ under the License.
         <entity-and entity-name="WorkEffortCostCalc" list="costCalcs">
             <field-map field-name="workEffortId" 
from-field="productionRunTask.workEffortId" />
         </entity-and>
-        <first-from-list entry="costCalc" list="costCalcs"/>
+        <first-from-list list="costCalcs" entry="costCalc"/>
         
         <assert>
             <not><if-empty field="costCalc" /></not>
@@ -110,7 +110,7 @@ under the License.
             <field-map field-name="workEffortId" 
from-field="productionRunTask.workEffortId"/>
             <field-map field-name="productId" value="MAT_A_COST"/>
         </entity-and>
-        <first-from-list entry="productionRunMaterialA" 
list="productionRunMaterials"/>
+        <first-from-list list="productionRunMaterials" 
entry="productionRunMaterialA"/>
         <assert>
             <not><if-empty field="productionRunMaterialA"/></not>
             <if-compare field="productionRunMaterialA.workEffortGoodStdTypeId" 
operator="equals" value="PRUNT_PROD_NEEDED"/>
@@ -120,7 +120,7 @@ under the License.
             <field-map field-name="workEffortId" 
from-field="productionRunTask.workEffortId"/>
             <field-map field-name="productId" value="MAT_B_COST"/>
         </entity-and>
-        <first-from-list entry="productionRunMaterialB" 
list="productionRunMaterials"/>
+        <first-from-list list="productionRunMaterials" 
entry="productionRunMaterialB"/>
         <assert>
             <not><if-empty field="productionRunMaterialB"/></not>
             <if-compare field="productionRunMaterialB.workEffortGoodStdTypeId" 
operator="equals" value="PRUNT_PROD_NEEDED"/>
@@ -163,7 +163,7 @@ under the License.
         <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" 
from-field="productionRunId"/>
         </entity-and>
-        <first-from-list entry="productionRunTask" list="productionRunTasks"/>
+        <first-from-list list="productionRunTasks" entry="productionRunTask"/>
 
         <assert>
             <if-compare field="productionRunHeader.currentStatusId" 
operator="equals" value="PRUN_SCHEDULED"/>
@@ -205,7 +205,7 @@ under the License.
         <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" 
from-field="productionRunId"/>
         </entity-and>
-        <first-from-list entry="productionRunTask" list="productionRunTasks"/>
+        <first-from-list list="productionRunTasks" entry="productionRunTask"/>
 
         <assert>
             <if-compare field="productionRunHeader.currentStatusId" 
operator="equals" value="PRUN_DOC_PRINTED"/>
@@ -247,7 +247,7 @@ under the License.
         <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" 
from-field="productionRunId"/>
         </entity-and>
-        <first-from-list entry="productionRunTask" list="productionRunTasks"/>
+        <first-from-list list="productionRunTasks" entry="productionRunTask"/>
 
         <call-class-method 
class-name="org.apache.ofbiz.base.util.UtilDateTime" method-name="getInterval" 
ret-field="originalProductionRunEstimatedTime">
             <field field="productionRunHeader.estimatedStartDate" 
type="Timestamp"/>
@@ -320,7 +320,7 @@ under the License.
         <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" 
from-field="productionRunId"/>
         </entity-and>
-        <first-from-list entry="productionRunTask" list="productionRunTasks"/>
+        <first-from-list list="productionRunTasks" entry="productionRunTask"/>
 
         <assert>
             <if-compare field="productionRunHeader.currentStatusId" 
operator="equals" value="PRUN_CANCELLED"/>
@@ -330,7 +330,7 @@ under the License.
         <entity-and entity-name="WorkEffortGoodStandard" 
list="productionRunProducts">
             <field-map field-name="workEffortId" from-field="productionRunId"/>
         </entity-and>
-        <first-from-list entry="productionRunProduct" 
list="productionRunProducts"/>
+        <first-from-list list="productionRunProducts" 
entry="productionRunProduct"/>
 
         <assert>
             <not><if-empty field="productionRunProduct"/></not>
@@ -342,7 +342,7 @@ under the License.
             <field-map field-name="workEffortId" 
from-field="productionRunTask.workEffortId"/>
             <field-map field-name="productId" value="MAT_A_COST"/>
         </entity-and>
-        <first-from-list entry="productionRunMaterialA" 
list="productionRunMaterials"/>
+        <first-from-list list="productionRunMaterials" 
entry="productionRunMaterialA"/>
         <assert>
             <not><if-empty field="productionRunMaterialA"/></not>
             <if-compare field="productionRunMaterialA.workEffortGoodStdTypeId" 
operator="equals" value="PRUNT_PROD_NEEDED"/>
@@ -352,7 +352,7 @@ under the License.
             <field-map field-name="workEffortId" 
from-field="productionRunTask.workEffortId"/>
             <field-map field-name="productId" value="MAT_B_COST"/>
         </entity-and>
-        <first-from-list entry="productionRunMaterialB" 
list="productionRunMaterials"/>
+        <first-from-list list="productionRunMaterials" 
entry="productionRunMaterialB"/>
         <assert>
             <not><if-empty field="productionRunMaterialB"/></not>
             <if-compare field="productionRunMaterialB.workEffortGoodStdTypeId" 
operator="equals" value="PRUNT_PROD_NEEDED"/>
@@ -784,7 +784,7 @@ under the License.
         <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" 
from-field="productionRunId"/>
         </entity-and>
-        <first-from-list entry="productionRunTask" list="productionRunTasks"/>
+        <first-from-list list="productionRunTasks" entry="productionRunTask"/>
 
         <assert>
             <if-compare field="productionRunHeader.currentStatusId" 
operator="equals" value="PRUN_COMPLETED"/>
@@ -839,7 +839,7 @@ under the License.
         <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" 
from-field="productionRunId"/>
         </entity-and>
-        <first-from-list entry="productionRunTask" list="productionRunTasks"/>
+        <first-from-list list="productionRunTasks" entry="productionRunTask"/>
 
         <assert>
             <if-compare field="productionRunHeader.currentStatusId" 
operator="equals" value="PRUN_CLOSED"/>
@@ -873,7 +873,7 @@ under the License.
             <field-map field-name="orderId" from-field="orderId"/>
             <field-map field-name="productId" from-field="productId"/>
         </entity-and>
-        <first-from-list entry="orderItem" list="orderItems"/>
+        <first-from-list list="orderItems" entry="orderItem"/>
         <assert>
             <not><if-empty field="orderItem"/></not>
         </assert>
@@ -882,7 +882,7 @@ under the License.
             <field-map field-name="orderId" from-field="orderId"/>
             <field-map field-name="orderItemSeqId" 
from-field="orderItem.orderItemSeqId"/>
         </entity-and>
-        <first-from-list entry="originalOrderItemShipGrpInvRes" 
list="orderItemShipGrpInvRess"/>
+        <first-from-list list="orderItemShipGrpInvRess" 
entry="originalOrderItemShipGrpInvRes"/>
         <assert>
             <not><if-empty field="originalOrderItemShipGrpInvRes"/></not>
         </assert>
@@ -894,7 +894,7 @@ under the License.
         <call-service service-name="createProductionRunsForOrder" 
in-map-name="serviceCtx">
             <result-to-field result-name="productionRuns"/>
         </call-service>
-        <first-from-list entry="productionRunId" list="productionRuns"/>
+        <first-from-list list="productionRuns" entry="productionRunId"/>
         <assert><not><if-empty field="productionRunId"/></not></assert>
         <check-errors/>
 
@@ -904,7 +904,7 @@ under the License.
         <entity-and entity-name="WorkEffort" list="productionRunTasks">
             <field-map field-name="workEffortParentId" 
from-field="productionRunId"/>
         </entity-and>
-        <first-from-list entry="productionRunTask" list="productionRunTasks"/>
+        <first-from-list list="productionRunTasks" entry="productionRunTask"/>
 
         <assert>
             <if-compare field="productionRunHeader.workEffortTypeId" 
operator="equals" value="PROD_ORDER_HEADER"/>
@@ -917,7 +917,7 @@ under the License.
         <entity-and entity-name="WorkEffortGoodStandard" 
list="productionRunProducts">
             <field-map field-name="workEffortId" from-field="productionRunId"/>
         </entity-and>
-        <first-from-list entry="productionRunProduct" 
list="productionRunProducts"/>
+        <first-from-list list="productionRunProducts" 
entry="productionRunProduct"/>
 
         <assert>
             <not><if-empty field="productionRunProduct"/></not>
@@ -930,7 +930,7 @@ under the License.
             <field-map field-name="workEffortId" from-field="productionRunId"/>
             <field-map field-name="orderId" from-field="orderId"/>
         </entity-and>
-        <first-from-list entry="workOrderItemFulfillment" 
list="workOrderItemFulfillments"/>
+        <first-from-list list="workOrderItemFulfillments" 
entry="workOrderItemFulfillment"/>
         <assert>
             <not><if-empty field="workOrderItemFulfillment"/></not>
             <not><if-empty 
field="workOrderItemFulfillment.orderItemSeqId"/></not>
@@ -990,7 +990,7 @@ under the License.
         <set field="serviceCtx.statusId" value="REQ_APPROVED"/>
         <call-service service-name="updateRequirement" 
in-map-name="serviceCtx"/>
 
-        <entity-condition list="workEfforts" entity-name="WorkEffort">
+        <entity-condition entity-name="WorkEffort" list="workEfforts">
             <condition-list>
                 <condition-expr field-name="lastUpdatedStamp" 
operator="greater-equals" from-field="nowTime"/>
                 <condition-expr field-name="workEffortTypeId" 
value="PROD_ORDER_HEADER"/>
@@ -1015,7 +1015,7 @@ under the License.
         <entity-and entity-name="WorkEffortGoodStandard" 
list="productionRunProducts">
             <field-map field-name="workEffortId" 
from-field="productionRunHeader.workEffortId"/>
         </entity-and>
-        <first-from-list entry="productionRunProduct" 
list="productionRunProducts"/>
+        <first-from-list list="productionRunProducts" 
entry="productionRunProduct"/>
 
         <assert>
             <not><if-empty field="productionRunProduct"/></not>

Modified: 
ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml 
(original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomForms.xml 
Sat Nov  5 14:14:04 2016
@@ -86,12 +86,12 @@ under the License.
         <field name="fromDate"><display/></field>
         <field name="thruDate"><display/></field>
         <field name="updateLink" title=" " widget-style="buttontext">
-            <hyperlink target="EditProductManufacturingRules" 
description="${uiLabelMap.CommonSelect}" >
+            <hyperlink description="${uiLabelMap.CommonSelect}" 
target="EditProductManufacturingRules" >
                 <parameter param-name="ruleId"/>
             </hyperlink>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="DeleteProductManufacturingRule" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="DeleteProductManufacturingRule" also-hidden="false">
                 <parameter param-name="ruleId"/>
             </hyperlink>
         </field>
@@ -144,7 +144,7 @@ under the License.
     <form name="ListBom"  type="list" list-name="ListProductBom" 
odd-row-style="alternate-row"
         default-table-style="basic-table hover-bar"  paginate-target="FindBom">
         <field name="productId" title="${uiLabelMap.ProductProductId}" 
use-when="">
-            <hyperlink target="EditProductBom" description="${productId}">
+            <hyperlink description="${productId}" target="EditProductBom">
                 <parameter param-name="productId"/>
                 <parameter param-name="productAssocTypeId"/>
             </hyperlink>

Modified: 
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarForms.xml 
(original)
+++ 
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarForms.xml 
Sat Nov  5 14:14:04 2016
@@ -26,12 +26,12 @@ under the License.
         <field name="description" 
title="${uiLabelMap.CommonDescription}"><display/></field>
         <field name="calendarWeekId" 
title="${uiLabelMap.ManufacturingCalendarWeekId}"><display/></field>
         <field name="updateLink" title=" " widget-style="buttontext">
-            <hyperlink target="EditCalendar" 
description="${uiLabelMap.CommonUpdate}" >
+            <hyperlink description="${uiLabelMap.CommonUpdate}" 
target="EditCalendar" >
                 <parameter param-name="calendarId"/>
             </hyperlink>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="RemoveCalendar" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="RemoveCalendar" also-hidden="false">
                 <parameter param-name="calendarId"/>
             </hyperlink>
         </field>
@@ -41,12 +41,12 @@ under the License.
         <field name="calendarWeekId" 
title="${uiLabelMap.ManufacturingCalendarWeekId}"><display/></field>
         <field name="description" 
title="${uiLabelMap.CommonDescription}"><display/></field>
         <field name="updateLink" title=" " widget-style="buttontext">
-            <hyperlink target="EditCalendarWeek" 
description="${uiLabelMap.CommonUpdate}" >
+            <hyperlink description="${uiLabelMap.CommonUpdate}" 
target="EditCalendarWeek" >
                 <parameter param-name="calendarWeekId"/>
             </hyperlink>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="RemoveCalendarWeek" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="RemoveCalendarWeek" also-hidden="false">
                 <parameter param-name="calendarWeekId"/>
             </hyperlink>
         </field>
@@ -59,13 +59,13 @@ under the License.
         <field name="exceptionCapacity" 
title="${uiLabelMap.ManufacturingCalendarCapacity}" ><display/></field>
         <field name="usedCapacity" 
title="${uiLabelMap.ManufacturingUsedCapacity}" ><display/></field>        
         <field name="updateLink" title=" " widget-style="buttontext">
-            <hyperlink target="EditCalendarExceptionDay" 
description="${uiLabelMap.CommonSelect}" >
+            <hyperlink description="${uiLabelMap.CommonSelect}" 
target="EditCalendarExceptionDay" >
                 <parameter param-name="calendarId"/>
                 <parameter param-name="exceptionDateStartTime"/>
             </hyperlink>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="RemoveCalendarExceptionDay" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="RemoveCalendarExceptionDay" also-hidden="false">
                 <parameter param-name="calendarId"/>
                 <parameter param-name="exceptionDateStartTime"/>
             </hyperlink>
@@ -110,13 +110,13 @@ under the License.
             <display description="${calendarWeek.description} "/>
         </field>
         <field name="updateLink" title=" " widget-style="buttontext">
-            <hyperlink target="EditCalendarExceptionWeek" 
description="${uiLabelMap.CommonSelect}" >
+            <hyperlink description="${uiLabelMap.CommonSelect}" 
target="EditCalendarExceptionWeek" >
                 <parameter param-name="calendarId" 
from-field="calendarExceptionWeek.calendarId"/>
                 <parameter param-name="exceptionDateStart" 
from-field="calendarExceptionWeek.exceptionDateStart"/>
             </hyperlink>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="RemoveCalendarExceptionWeek" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="RemoveCalendarExceptionWeek" also-hidden="false">
                 <parameter param-name="calendarId" 
from-field="calendarExceptionWeek.calendarId"/>
                 <parameter param-name="exceptionDateStart" 
from-field="calendarExceptionWeek.exceptionDateStart"/>
             </hyperlink>

Modified: 
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml 
(original)
+++ 
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml 
Sat Nov  5 14:14:04 2016
@@ -71,7 +71,7 @@ under the License.
                 <property-to-field resource="widget" 
property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" 
type="Integer" default-value="${viewSizeDefaultValue}"/>
 
-                <entity-condition list="techDataCalendars" 
entity-name="TechDataCalendar"/>
+                <entity-condition entity-name="TechDataCalendar" 
list="techDataCalendars"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonCalendarDecorator">
@@ -97,7 +97,7 @@ under the License.
                 <property-to-field resource="widget" 
property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" 
type="Integer" default-value="${viewSizeDefaultValue}"/>
 
-                <entity-condition list="calendarWeeks" 
entity-name="TechDataCalendarWeek"/>
+                <entity-condition entity-name="TechDataCalendarWeek" 
list="calendarWeeks"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonCalendarDecorator">

Modified: 
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.xml 
(original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CostForms.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">
         <auto-fields-entity entity-name="CostComponentCalc" 
default-field-type="display"/>
         <field name="costComponentCalcId" widget-style="buttontext">
-            <hyperlink target="EditCostCalcs" 
description="${costComponentCalcId}" also-hidden="false">
+            <hyperlink description="${costComponentCalcId}" 
target="EditCostCalcs" also-hidden="false">
                 <parameter param-name="costComponentCalcId"/>
             </hyperlink>
         </field>
@@ -37,7 +37,7 @@ under the License.
             <display-entity entity-name="CustomMethod" 
key-field-name="customMethodId"/>
         </field>
         <field name="removeCostComponentCalc" title=" " 
widget-style="buttontext">
-            <hyperlink target="removeCostComponentCalc" 
description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" 
target="removeCostComponentCalc" also-hidden="false">
                 <parameter param-name="costComponentCalcId"/>
             </hyperlink>
         </field>

Modified: 
ofbiz/trunk/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/widget/manufacturing/FieldLookupForms.xml
 Sat Nov  5 14:14:04 2016
@@ -41,7 +41,7 @@ under the License.
             </service>
         </actions>
         <field name="workEffortId" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" 
description="${workEffortId}" target="javascript:set_value('${workEffortId}')"/>
+            <hyperlink description="${workEffortId}" 
target="javascript:set_value('${workEffortId}')" also-hidden="false" 
target-type="plain"/>
         </field>
         <field name="workEffortName" 
title="${uiLabelMap.ManufacturingRoutingName}"><display/></field>
         <field name="description" 
title="${uiLabelMap.CommonDescription}"><display/></field>
@@ -76,7 +76,7 @@ under the License.
             </service>
         </actions>
         <field name="workEffortId" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" 
description="${workEffortId}" target="javascript:set_value('${workEffortId}')"/>
+            <hyperlink description="${workEffortId}" 
target="javascript:set_value('${workEffortId}')" also-hidden="false" 
target-type="plain"/>
         </field>
         <field name="workEffortName" 
title="${uiLabelMap.ManufacturingTaskName}"><display/></field>
         <field name="description" 
title="${uiLabelMap.CommonDescription}"><display/></field>

Modified: 
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
 Sat Nov  5 14:14:04 2016
@@ -103,13 +103,13 @@ under the License.
             </service>
         </actions>
         <row-actions>
-            <entity-one value-field="product" entity-name="Product"/>
-            <entity-one value-field="uom" entity-name="Uom">
+            <entity-one entity-name="Product" value-field="product"/>
+            <entity-one entity-name="Uom" value-field="uom">
                 <field-map field-name="uomId" 
from-field="product.quantityUomId"/>
             </entity-one>
         </row-actions>
         <field name="workEffortId" title=" " widget-style="buttontext">
-            <hyperlink target="ShowProductionRun" 
description="${workEffortId}" also-hidden="false">
+            <hyperlink description="${workEffortId}" 
target="ShowProductionRun" also-hidden="false">
                 <parameter param-name="productionRunId" 
from-field="workEffortId"/>
             </hyperlink>
         </field>
@@ -154,7 +154,7 @@ under the License.
     <form name="ListProductionRunOrderItems" type="list" 
target="EditProductionRun" title="" list-name="orderItems"
         odd-row-style="alternate-row" default-table-style="basic-table 
hover-bar">
         <field name="orderId" widget-style="buttontext">
-            <hyperlink target="/ordermgr/control/orderview" 
description="${orderId}/${orderItemSeqId}" also-hidden="false" 
target-type="inter-app">
+            <hyperlink description="${orderId}/${orderItemSeqId}" 
target="/ordermgr/control/orderview" also-hidden="false" 
target-type="inter-app">
                 <parameter param-name="orderId"/>
             </hyperlink>
         </field>
@@ -221,7 +221,7 @@ under the License.
         <!--<field name="estimatedMilliSeconds" 
title="${uiLabelMap.ManufacturingTaskEstimatedMilliSeconds}" 
><display/></field>-->
         <field name="estimatedTotalMilliSeconds" 
title="${uiLabelMap.ManufacturingTaskEstimatedTotalMilliSeconds}" 
><display/></field>
         <field name="editLink" title=" " widget-style="smallSubmit">
-            <hyperlink target="ProductionRunTasks" 
description="${uiLabelMap.CommonEdit}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonEdit}" 
target="ProductionRunTasks" also-hidden="false">
                 <parameter param-name="routingTaskId" 
from-field="workEffortId"/>
                 <parameter param-name="productionRunId" 
from-field="workEffortParentId"/>
             </hyperlink>
@@ -233,7 +233,7 @@ under the License.
                 <parameter param-name="fromDate"/>
                 <parameter param-name="workEffortAssocTypeId" 
value="ROUTING_COMPONENT"/>
             </hyperlink>-->
-            <hyperlink target="deleteProductionRunRoutingTask" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deleteProductionRunRoutingTask" also-hidden="false">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="productionRunId" 
from-field="workEffortParentId"/>
             </hyperlink>
@@ -243,7 +243,7 @@ under the License.
     <form name="ListProductionRunComponents" type="list" 
target="EditProductionRun" title="" list-name="productionRunComponents"
         odd-row-style="alternate-row" default-table-style="basic-table 
hover-bar">
         <row-actions>
-            <entity-one value-field="product" entity-name="Product" 
use-cache="true"/>
+            <entity-one entity-name="Product" value-field="product" 
use-cache="true"/>
         </row-actions>
         <field name="workEffortId" 
title="${uiLabelMap.ManufacturingRoutingTaskId}">
             <display-entity entity-name="WorkEffort" 
description="${workEffortName} [${workEffortId}]"/>
@@ -352,7 +352,7 @@ under the License.
         </field>
         <field name="secondaryLocationSeqId" use-when="estimatedQuantity != 
issuedQuantity">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ProductFacilityLocation" 
description="${locationSeqId}" key-field-name="locationSeqId">
+                <entity-options entity-name="ProductFacilityLocation" 
key-field-name="locationSeqId" description="${locationSeqId}">
                     <entity-constraint name="productId" env-name="productId"/>
                     <entity-constraint name="facilityId" 
env-name="facilityId"/>
                 </entity-options>
@@ -385,34 +385,34 @@ under the License.
         <field name="actualMilliSeconds" 
title="${uiLabelMap.ManufacturingTaskActualMilliSeconds}" ><display/></field>
         <field name="quantityProduced" 
title="${uiLabelMap.ManufacturingQuantityProduced}" ><display/></field>
         <field name="startLink" title=" " widget-style="smallSubmit" 
use-when="&quot;${startTaskId}&quot;.equals(&quot;${workEffortId}&quot;)">
-            <hyperlink target="changeProductionRunTaskStatus" 
description="${uiLabelMap.ManufacturingStartProductionRunTask}" 
also-hidden="false">
+            <hyperlink 
description="${uiLabelMap.ManufacturingStartProductionRunTask}" 
target="changeProductionRunTaskStatus" also-hidden="false">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="productionRunId" 
from-field="workEffortParentId"/>
             </hyperlink>
         </field>
         <field name="issueLinkAtp" title=" " widget-style="smallSubmit" 
use-when="&quot;${issueTaskId}&quot;.equals(&quot;${workEffortId}&quot;)">
-            <hyperlink target="issueProductionRunRoutingTask" 
description="${uiLabelMap.ManufacturingIssueAvailableProductionRunTask}" 
also-hidden="false">
+            <hyperlink 
description="${uiLabelMap.ManufacturingIssueAvailableProductionRunTask}" 
target="issueProductionRunRoutingTask" also-hidden="false">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="productionRunId" 
from-field="workEffortParentId"/>
                 <parameter param-name="failIfItemsAreNotAvailable" value="Y"/>
             </hyperlink>
         </field>
         <field name="issueLinkQoh" title=" " widget-style="smallSubmit" 
use-when="&quot;${issueTaskId}&quot;.equals(&quot;${workEffortId}&quot;)">
-            <hyperlink target="issueProductionRunRoutingTask" 
description="${uiLabelMap.ManufacturingIssueProductionRunTask}" 
also-hidden="false">
+            <hyperlink 
description="${uiLabelMap.ManufacturingIssueProductionRunTask}" 
target="issueProductionRunRoutingTask" also-hidden="false">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="productionRunId" 
from-field="workEffortParentId"/>
                 <parameter param-name="failIfItemsAreNotAvailable" value="N"/>
             </hyperlink>
         </field>
         <field name="declareLink" title=" " widget-style="smallSubmit" 
use-when="&quot;PRUN_RUNNING&quot;.equals(&quot;${currentStatusId}&quot;)">
-            <hyperlink target="ProductionRunDeclaration" 
description="${uiLabelMap.ManufacturingDeclareProductionRunTask}" 
also-hidden="false">
+            <hyperlink 
description="${uiLabelMap.ManufacturingDeclareProductionRunTask}" 
target="ProductionRunDeclaration" also-hidden="false">
                 <parameter param-name="actionForm" value="EditRoutingTask"/>
                 <parameter param-name="routingTaskId" 
from-field="workEffortId"/>
                 <parameter param-name="productionRunId" 
from-field="workEffortParentId"/>
             </hyperlink>
         </field>
         <field name="completeLink" title=" " widget-style="smallSubmit" 
use-when="&quot;${completeTaskId}&quot;.equals(&quot;${workEffortId}&quot;)">
-            <hyperlink target="changeProductionRunTaskStatus" 
description="${uiLabelMap.ManufacturingCompleteProductionRunTask}" 
also-hidden="false">
+            <hyperlink 
description="${uiLabelMap.ManufacturingCompleteProductionRunTask}" 
target="changeProductionRunTaskStatus" also-hidden="false">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="productionRunId" 
from-field="workEffortParentId"/>
             </hyperlink>
@@ -449,7 +449,7 @@ under the License.
         </field>
         <field name="secondaryLocationSeqId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ProductFacilityLocation" 
description="${locationSeqId}" key-field-name="locationSeqId">
+                <entity-options entity-name="ProductFacilityLocation" 
key-field-name="locationSeqId" description="${locationSeqId}">
                     <entity-constraint name="productId" env-name="productId"/>
                     <entity-constraint name="facilityId" 
env-name="facilityId"/>
                 </entity-options>
@@ -558,7 +558,7 @@ under the License.
             <display description="default ${drObjectInfo}"/>
         </field>
         <field name="drObjectInfo" title="${uiLabelMap.CommonContent}" 
use-when="${groovy: drDataResourceTypeId != null &amp;&amp; 
(drDataResourceTypeId.contains(&quot;FILE&quot;) || 
drDataResourceTypeId.equals(&quot;IMAGE_OBJECT&quot;))}">
-            <hyperlink target="/content/control/ViewBinaryDataResource" 
target-type="content" target-window="productionRunContentWindow" 
description="${drObjectInfo}">
+            <hyperlink description="${drObjectInfo}" 
target="/content/control/ViewBinaryDataResource" target-type="content" 
target-window="productionRunContentWindow">
                 <parameter param-name="dataResourceId" 
from-field="drDataResourceId"/>
             </hyperlink>
         </field>
@@ -566,7 +566,7 @@ under the License.
             <display-entity entity-name="ElectronicText" 
key-field-name="dataResourceId" description="${textData}"></display-entity>
         </field>
         <field name="deleteLink" title=" " widget-style="smallSubmit">
-            <hyperlink description="${uiLabelMap.CommonDelete}" 
also-hidden="false" target="deleteProductionRunContent">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deleteProductionRunContent" also-hidden="false">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="workEffortContentTypeId"/>
                 <parameter param-name="contentId"/>
@@ -590,7 +590,7 @@ under the License.
             <display description="default ${drObjectInfo}"/>
         </field>
         <field name="drObjectInfo" title="${uiLabelMap.CommonContent}" 
use-when="${groovy: drDataResourceTypeId != null &amp;&amp; 
(drDataResourceTypeId.contains(&quot;FILE&quot;) || 
drDataResourceTypeId.equals(&quot;IMAGE_OBJECT&quot;))}">
-            <hyperlink target="/content/control/ViewBinaryDataResource" 
target-type="content" target-window="productionRunContentWindow" 
description="${drObjectInfo}">
+            <hyperlink description="${drObjectInfo}" 
target="/content/control/ViewBinaryDataResource" target-type="content" 
target-window="productionRunContentWindow">
                 <parameter param-name="dataResourceId" 
from-field="drDataResourceId"/>
             </hyperlink>
         </field>
@@ -622,7 +622,7 @@ under the License.
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" 
widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="smallSubmit"
                     
use-when="!&quot;${declarationScreen}&quot;.equals(&quot;Y&quot;)">
-            <hyperlink description="${uiLabelMap.CommonDelete}" 
also-hidden="false" target="removeWorkEffortFixedAssetAssign">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="removeWorkEffortFixedAssetAssign" also-hidden="false">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="fixedAssetId"/>
                 <parameter param-name="fromDate"/>
@@ -733,7 +733,7 @@ under the License.
     <form name="ListShipmentPlan" type="list" target="" title="" 
list-name="shipmentPlan"
         odd-row-style="alternate-row" default-table-style="basic-table 
hover-bar">
         <field name="orderId" widget-style="buttontext">
-            <hyperlink target="/ordermgr/control/orderview" 
target-type="inter-app" description="${orderId}">
+            <hyperlink description="${orderId}" 
target="/ordermgr/control/orderview" target-type="inter-app">
                 <parameter param-name="orderId" from-field="orderId"/>
             </hyperlink>
         </field>
@@ -752,7 +752,7 @@ under the License.
         <!-- total issued quantity -->
         <field name="totIssuedQuantity"><display/></field>
         <field name="productionRunId" widget-style="buttontext">
-            <hyperlink target="ShowProductionRun" 
description="${productionRunId}" also-hidden="false">
+            <hyperlink description="${productionRunId}" 
target="ShowProductionRun" also-hidden="false">
                 <parameter param-name="productionRunId" 
from-field="productionRunId"/>
             </hyperlink>
         </field>
@@ -764,7 +764,7 @@ under the License.
     <form name="ListShipmentPlans" type="list" target="" title="" 
list-name="shipmentPlans"
         odd-row-style="alternate-row" default-table-style="basic-table 
hover-bar" header-row-style="header-row-2">
         <field name="shipmentId" widget-style="buttontext" sort-field="true">
-            <hyperlink target="/facility/control/ViewShipment" 
target-type="inter-app" description="${shipmentId}">
+            <hyperlink description="${shipmentId}" 
target="/facility/control/ViewShipment" target-type="inter-app">
                 <parameter param-name="shipmentId" from-field="shipmentId"/>
             </hyperlink>
         </field>
@@ -773,7 +773,7 @@ under the License.
         </field>
         <field name="estimatedShipDate" sort-field="true"><display/></field>
         <field name="viewShipmentPlanLink" title=" " widget-style="buttontext">
-            <hyperlink target="WorkWithShipmentPlans" 
description="${uiLabelMap.CommonView}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonView}" 
target="WorkWithShipmentPlans" also-hidden="false">
                 <parameter param-name="shipmentId"/>
             </hyperlink>
         </field>
@@ -808,7 +808,7 @@ under the License.
     <form name="MandatoryWorkEfforts" type="list" target="" title="" 
list-name="mandatoryWorkEfforts"
         odd-row-style="alternate-row" default-table-style="basic-table 
hover-bar">
         <field name="workEffortIdFrom" title=" " widget-style="buttontext">
-            <hyperlink target="ShowProductionRun" 
description="${workEffortIdFrom}" also-hidden="false" link-type="anchor">
+            <hyperlink description="${workEffortIdFrom}" 
target="ShowProductionRun" also-hidden="false" link-type="anchor">
                 <parameter param-name="productionRunId" 
from-field="workEffortIdFrom"/>
             </hyperlink>
         </field>
@@ -834,7 +834,7 @@ under the License.
             <display-entity entity-name="WorkEffort" 
key-field-name="workEffortId" description="${actualCompletionDate} " 
cache="true"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeProductionRunAssoc" 
description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" 
target="removeProductionRunAssoc" also-hidden="false">
                 <parameter param-name="workEffortIdFrom"/>
                 <parameter param-name="workEffortIdTo" 
from-field="productionRunId"/>
                 <parameter param-name="fromDate" 
from-field="estimatedStartDate"/>
@@ -846,7 +846,7 @@ under the License.
     <form name="DependentWorkEfforts" type="list" target="" title="" 
list-name="dependentWorkEfforts"
         odd-row-style="alternate-row" default-table-style="basic-table 
hover-bar">
         <field name="workEffortIdTo" title=" " widget-style="buttontext">
-            <hyperlink target="ShowProductionRun" 
description="${workEffortIdTo}" also-hidden="false" link-type="anchor">
+            <hyperlink description="${workEffortIdTo}" 
target="ShowProductionRun" also-hidden="false" link-type="anchor">
                 <parameter param-name="productionRunId" 
from-field="workEffortIdTo"/>
             </hyperlink>
         </field>
@@ -872,7 +872,7 @@ under the License.
             <display-entity entity-name="WorkEffort" 
key-field-name="workEffortId" description="${actualCompletionDate} " 
cache="true"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="removeProductionRunAssoc" 
description="${uiLabelMap.CommonRemove}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonRemove}" 
target="removeProductionRunAssoc" also-hidden="false">
                 <parameter param-name="workEffortIdFrom" 
from-field="productionRunId"/>
                 <parameter param-name="workEffortIdTo"/>
                 <parameter param-name="fromDate" 
from-field="estimatedStartDate"/>
@@ -956,7 +956,7 @@ under the License.
     <form name="ProductionRunTaskComponents" type="list" 
target="updateProductionRunComponent" paginate-target="ProductionRunComponents" 
title="" list-name="records"
         odd-row-style="alternate-row" default-table-style="basic-table 
hover-bar">
         <row-actions>
-            <entity-one value-field="product" entity-name="Product" 
use-cache="true"/>
+            <entity-one entity-name="Product" value-field="product" 
use-cache="true"/>
         </row-actions>
         <field name="productId"><display/></field>
         <field name="internalName" map-name="product" 
title="${uiLabelMap.ProductInternalName}"><display/></field>
@@ -966,7 +966,7 @@ under the License.
         <field name="quantityUomId" map-name="product" 
title="${uiLabelMap.CommonUom}"><display-entity entity-name="Uom" 
key-field-name="uomId" description="${abbreviation}"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" 
widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="smallSubmit">
-            <hyperlink target="deleteProductionRunComponent" 
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" 
target="deleteProductionRunComponent" also-hidden="false">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="fromDate"/>
                 <parameter param-name="productId"/>
@@ -981,7 +981,7 @@ under the License.
             <set field="quantityOnHandDiff" 
value="${groovy:-1*quantityOnHandDiff}" type="BigDecimal"/>
         </row-actions>
         <field name="inventoryItemId" widget-style="buttontext">
-            <hyperlink target="/facility/control/EditInventoryItem" 
description="${inventoryItemId}" also-hidden="false" target-type="inter-app">
+            <hyperlink description="${inventoryItemId}" 
target="/facility/control/EditInventoryItem" also-hidden="false" 
target-type="inter-app">
                 <parameter param-name="inventoryItemId"/>
             </hyperlink>
         </field>


Reply via email to