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

[diveshdutta]

Modified: ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml Sat Nov  5 14:14:04 2016
@@ -81,7 +81,7 @@
             <check-errors/>
             
             <!-- find exist e-mail address. if have not exist then create new-->
-            <entity-condition list="existEmailAddresses" entity-name="WorkEffortContactMechView">
+            <entity-condition entity-name="WorkEffortContactMechView" list="existEmailAddresses">
                 <condition-list combine="and">
                     <condition-expr field-name="workEffortId" from-field="parameters.workEffortId"/>
                     <condition-expr field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
@@ -101,7 +101,7 @@
                         <field-map field-name="workEffortId" from-field="oldEmailAddress.workEffortId"/>
                         <field-map field-name="contactMechId" from-field="oldEmailAddress.contactMechId"/>
                     </entity-and>
-                    <first-from-list entry="oldWorkEffortContactMech" list="oldWorkEffortContactMechs"/>
+                    <first-from-list list="oldWorkEffortContactMechs" entry="oldWorkEffortContactMech"/>
                     <now-timestamp field="oldWorkEffortContactMech.thruDate"/>
                     <store-value value-field="oldWorkEffortContactMech"/>
                 </iterate>
@@ -130,7 +130,7 @@
         </entity-and>
         <!-- end current record if required -->
         <if-not-empty field="workEffortPartyAssignments">
-            <first-from-list entry="workEffortPartyAssignment" list="workEffortPartyAssignments"/>
+            <first-from-list list="workEffortPartyAssignments" entry="workEffortPartyAssignment"/>
             <if-compare-field field="updProjectRole.newPartyId" operator="not-equals" to-field="workEffortPartyAssignment.partyId">
                 <now-timestamp field="workEffortPartyAssignment.thruDate"/>
                 <store-value value-field="workEffortPartyAssignment"/>
@@ -180,23 +180,23 @@
     </simple-method>
 
     <simple-method method-name="updateTaskAndRelatedInfo" short-description="Update the task and when info is provided update the related information too">
-        <set-service-fields service-name="updateWorkEffort" to-map="updateWorkeffort" map="parameters"/>
+        <set-service-fields service-name="updateWorkEffort" map="parameters" to-map="updateWorkeffort"/>/>
         <call-service service-name="updateWorkEffort" in-map-name="updateWorkeffort"/>
         <if-not-empty field="parameters.estimatedDuration">
-            <set-service-fields service-name="updateWorkEffortSkillStandard" to-map="updateWorkEffortSkillStandard" map="parameters"/>
+            <set-service-fields service-name="updateWorkEffortSkillStandard" map="parameters" to-map="updateWorkEffortSkillStandard"/>/>
             <if-empty field="parameters.skillTypeId">
                 <entity-and entity-name="WorkEffortSkillStandard" list="workEffortSkillStandards">
                     <field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
                 </entity-and>
                 <if-not-empty field="workEffortSkillStandards">
-                    <first-from-list entry="workEffortSkillStandard" list="workEffortSkillStandards"/>
+                    <first-from-list list="workEffortSkillStandards" entry="workEffortSkillStandard"/>
                     <set field="updateWorkEffortSkillStandard.skillTypeId" from-field="workEffortSkillStandard.skillTypeId"/>
                     <else>
                         <set field="updateWorkEffortSkillStandard.skillTypeId" value="_NA_"/>
                     </else>
                 </if-not-empty>
             </if-empty>
-            <entity-one value-field="workEffortSkillStandard" entity-name="WorkEffortSkillStandard">
+            <entity-one entity-name="WorkEffortSkillStandard" value-field="workEffortSkillStandard">
                 <field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
                 <field-map field-name="skillTypeId" from-field="updateWorkEffortSkillStandard.skillTypeId"/>
             </entity-one>
@@ -344,7 +344,7 @@
                 <clear-field field="task.estimatedCompletionDate"/>
             </iterate>
 
-            <first-from-list entry="task" list="tasks"/>
+            <first-from-list list="tasks" entry="task"/>
             <set field="startDate" from-field="task.actualStartDate"/>
             <set field="taskId" from-field="task.workEffortId"/>
             <else>
@@ -483,7 +483,7 @@
                 <field-map field-name="workEffortId" from-field="projectId"/>
                 <field-map field-name="partyId" from-field="timesheet.partyId"/>
             </entity-and>
-            <first-from-list entry="projectAssign" list="projectAssigns"/>
+            <first-from-list list="projectAssigns" entry="projectAssign"/>
             <set field="parameters.partyId" from-field="timesheet.partyId"/>
             <set field="parameters.roleTypeId" from-field="projectAssign.roleTypeId"/>
             <set field="parameters.statusId" value="PAS_ASSIGNED"/>
@@ -550,7 +550,7 @@
                 <field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
                 <field-map field-name="partyId" from-field="timesheet.partyId"/>
             </entity-and>
-            <first-from-list entry="alreadyAssign" list="assigns"/>
+            <first-from-list list="assigns" entry="alreadyAssign"/>
             <if-compare field="alreadyAssign.statusId" value="PAS_COMPLETED" operator="not-equals">
                 <set field="upStat.partyId" from-field="timesheet.partyId"/>
                 <set field="upStat.statusId" value="PAS_COMPLETED"/>
@@ -718,7 +718,7 @@
         </entity-and>
         <filter-list-by-date list="emailAddresses"/>
         <if-not-empty field="emailAddresses">
-            <first-from-list entry="emailAddress" list="emailAddresses"/>
+            <first-from-list list="emailAddresses" entry="emailAddress"/>
             <set field="highInfo.emailAddress" from-field="emailAddress.infoString"/>
         </if-not-empty>
 
@@ -1050,7 +1050,7 @@
         </entity-condition>
 
         <!-- Now used TimeEntries to update (or not) actual start and end Date -->
-        <first-from-list entry="summaryInfo" list="summaryInfos"/>
+        <first-from-list list="summaryInfos" entry="summaryInfo"/>
         <set field="highInfo.estimatedStartDate" from-field="summaryInfo.estimatedStartDate"/>
         <set field="highInfo.estimatedCompletionDate" from-field="summaryInfo.estimatedCompletionDate"/>
         <set field="highInfo.actualStartDate" from-field="summaryInfo.actualStartDate"/>
@@ -1068,7 +1068,7 @@
             </condition-list>
             <select-field field-name="actualEntryStartDate"/>
         </entity-condition>
-        <first-from-list entry="timeEntriesInfo" list="summaryEntriesInfos"/>
+        <first-from-list list="summaryEntriesInfos" entry="timeEntriesInfo"/>
         <if-not-empty field="timeEntriesInfo">
           <if-not-empty field="timeEntriesInfo.actualEntryStartDate">
             <if>
@@ -1104,7 +1104,7 @@
         <clear-field field="originalActualHours"/>
 
         <!-- I- get timeEntries for which there is no rate  (originalHours)-->
-        <entity-condition list="notRatedValues" entity-name="ProjectPhaseTaskActualNotRatedHoursView">
+        <entity-condition entity-name="ProjectPhaseTaskActualNotRatedHoursView" list="notRatedValues">
             <condition-list>
                 <condition-expr field-name="projectId" from-field="highInfo.projectId" ignore-if-empty="true"/>
                 <condition-expr field-name="phaseId" from-field="highInfo.phaseId" ignore-if-empty="true"/>
@@ -1113,13 +1113,13 @@
             </condition-list>
             <select-field field-name="totalOriginalHours"/>
         </entity-condition>
-        <first-from-list entry="notRatedValue" list="notRatedValues"/>
+        <first-from-list list="notRatedValues" entry="notRatedValue"/>
         <set field="originalHours" from-field="notRatedValue.totalOriginalHours" type="Double"/>
 
         <!-- II- get total for timeEntries having a partyRate that should be applied
         before applying rate (totalOriginalHours)
         after applying rate (totalRatedHours)-->
-        <entity-condition list="ratedValues" entity-name="ProjectPhaseTaskActualRatedHoursView">
+        <entity-condition entity-name="ProjectPhaseTaskActualRatedHoursView" list="ratedValues">
             <condition-list>
                 <condition-expr field-name="projectId" from-field="highInfo.projectId" ignore-if-empty="true"/>
                 <condition-expr field-name="phaseId" from-field="highInfo.phaseId" ignore-if-empty="true"/>
@@ -1161,7 +1161,7 @@
         <set field="highInfo.actualHours" from-field="actualHours"/>
         <!-- do the same but for non-billed hours -->
         <!-- first get not rated hours -->
-        <entity-condition list="notRatedValues" entity-name="ProjectPhaseTaskActualNotRatedHoursView">
+        <entity-condition entity-name="ProjectPhaseTaskActualNotRatedHoursView" list="notRatedValues">
             <condition-list>
                 <condition-expr field-name="projectId" from-field="highInfo.projectId" ignore-if-empty="true"/>
                 <condition-expr field-name="phaseId" from-field="highInfo.phaseId" ignore-if-empty="true"/>
@@ -1171,10 +1171,10 @@
             </condition-list>
             <select-field field-name="totalOriginalHours"/>
         </entity-condition>
-        <first-from-list entry="notRatedValue" list="notRatedValues"/>
+        <first-from-list list="notRatedValues" entry="notRatedValue"/>
         <set field="actualNonBilledHours" from-field="notRatedValue.totalOriginalHours" type="Double"/>
         <!-- second get non billed for entries having an invoiceId -->
-        <entity-condition list="ratedValues" entity-name="ProjectPhaseTaskActualRatedHoursView">
+        <entity-condition entity-name="ProjectPhaseTaskActualRatedHoursView" list="ratedValues">
             <condition-list>
                 <condition-expr field-name="projectId" from-field="highInfo.projectId" ignore-if-empty="true"/>
                 <condition-expr field-name="phaseId" from-field="highInfo.phaseId" ignore-if-empty="true"/>
@@ -1358,7 +1358,7 @@
                 </entity-condition>
                 <if-not-empty field="timesheets">
                     <!-- use existing timesheet -->
-                    <first-from-list entry="timesheet" list="timesheets"/>
+                    <first-from-list list="timesheets" entry="timesheet"/>
                     <if-compare field="timesheet.statusId" value="TIMESHEET_IN_PROCESS" operator="equals">
                         <set field="parameters.timesheetId" from-field="timesheet.timesheetId"/>
                         <else>
@@ -1383,7 +1383,7 @@
               <field-map field-name="partyId" from-field="parameters.partyId"/>
               <field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
           </entity-and>
-          <first-from-list entry="taskRole" list="taskRoles"/>
+          <first-from-list list="taskRoles" entry="taskRole"/>
           <set field="parameters.roleTypeId" from-field="taskRole.roleTypeId"/>
           <set field="parameters.statusId" value="PAS_ASSIGNED"/>
           <call-simple-method method-name="assignPartyToWorkEffort" xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Sat Nov  5 14:14:04 2016
@@ -975,7 +975,7 @@ under the License.
                 <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="layoutSettings.javaScripts[]" value="/images/jsgantt.js" global="true"/>
                 <set field="layoutSettings.styleSheets[]" value="/images/jsgantt.css" global="true"/>
-                <entity-condition list="projects" entity-name="WorkEffortPartyAssignByGroup" filter-by-date="true">
+                <entity-condition entity-name="WorkEffortPartyAssignByGroup" list="projects" filter-by-date="true">
                     <condition-list combine="and">
                         <condition-expr field-name="partyId" from-field="userLogin.partyId"/>
                         <condition-list combine="or">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml Sat Nov  5 14:14:04 2016
@@ -101,13 +101,13 @@ under the License.
         <field name="custRequestName"><display/></field>
         <field name="description"><display/></field>
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}">
-            <hyperlink also-hidden="false" description="${projectName}" target="projectView">
+            <hyperlink description="${projectName}" target="projectView" also-hidden="false">
                 <parameter param-name="projectId"/>
             </hyperlink>
         </field>
         <field name="phaseName"><display description="${result.phaseName}"/></field>
         <field name="taskName">
-            <hyperlink target="taskView" description="${workEffort.workEffortName}">
+            <hyperlink description="${workEffort.workEffortName}" target="taskView">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
@@ -134,12 +134,12 @@ under the License.
             </service>
         </row-actions>
         <field name="custRequestId">
-            <hyperlink target="ViewRequest" description="${custRequestName} [${custRequestId}]">
+            <hyperlink description="${custRequestName} [${custRequestId}]" target="ViewRequest">
                 <parameter param-name="custRequestId"/>
             </hyperlink>
          </field>
         <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrProjectId}" map-name="sResult" sort-field="true">
-            <hyperlink target="projectView" description="${sResult.projectName} [${sResult.projectId}]">
+            <hyperlink description="${sResult.projectName} [${sResult.projectId}]" target="projectView">
                 <parameter param-name="projectId" from-field="sResult.projectId"/>
             </hyperlink>
         </field>
@@ -147,7 +147,7 @@ under the License.
             <display description="${sResult.phaseName} [${sResult.phaseId}]"/>
         </field>
         <field name="workEffortId">
-            <hyperlink target="taskView" description="${workEffortName} [${workEffortId}]">
+            <hyperlink description="${workEffortName} [${workEffortId}]" target="taskView">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
@@ -166,7 +166,7 @@ under the License.
     </form>
     <form name="ViewRequestWorkEfforts" extends="ViewRequestWorkEfforts" extends-resource="component://order/widget/ordermgr/CustRequestForms.xml">
         <field name="workEffortId">
-            <hyperlink target="taskView" description="${workEffortName} [${workEffortId}]">
+            <hyperlink description="${workEffortName} [${workEffortId}]" target="taskView">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sat Nov  5 14:14:04 2016
@@ -42,7 +42,7 @@
         <field name="projectId"><hidden/></field>
         <field name="templateId" use-when="projectId==null">
             <drop-down allow-empty="true">
-                <entity-options entity-name="WorkEffort" description="${workEffortName}" key-field-name="workEffortId">
+                <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}">
                     <entity-constraint name="workEffortTypeId" value="PROJECT_TEMPLATE"/>
                 </entity-options>
             </drop-down>
@@ -60,7 +60,7 @@
         </field>
         <field name="organizationPartyId">
             <drop-down no-current-selected-key="defaultOrganizationPartyId">
-                <entity-options entity-name="PartyAcctgPrefAndGroup" description="${groupName}" key-field-name="partyId"/>
+                <entity-options entity-name="PartyAcctgPrefAndGroup" key-field-name="partyId" description="${groupName}"/>
             </drop-down>
         </field>
         <field name="priority" title="${uiLabelMap.CommonPriority}">
@@ -86,7 +86,7 @@
         </field>
         <field name="parentProjectName" entry-name="parentProjectId" parameter-name="workEffortParentId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="WorkEffort" description="${workEffortName}" key-field-name="workEffortId">
+                <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}">
                     <entity-constraint name="workEffortTypeId" value="PROJECT"/>
                     <entity-constraint name="workEffortId" operator="not-equals" env-name="projectId"/>
                 </entity-options>
@@ -140,7 +140,7 @@
         </row-actions>
         <field name="workEffortId"><hidden/></field>
         <field name="phaseName" position="1" use-when="showPosition1"><display description="${phaseName}[${phaseId}]"/></field>
-        <field name="workEffortName" title="${uiLabelMap.FormFieldTitle_taskName}" position="1" use-when="showPosition1"><hyperlink target="taskView?workEffortId=${workEffortId}" description="${workEffortName}[${workEffortId}]"/></field>
+        <field name="workEffortName" title="${uiLabelMap.FormFieldTitle_taskName}" position="1" use-when="showPosition1"><hyperlink description="${workEffortName}[${workEffortId}]" target="taskView?workEffortId=${workEffortId}"/></field>
         <field name="timesheetId" position="2">
             <hyperlink description="${timesheetId}" target="Timesheet">
                 <parameter param-name="timesheetId"/>
@@ -221,7 +221,7 @@
         <field name="workEffortParentId"><hidden value=""/></field>
         <field name="workEffortId"><hidden value="${projectId}"/></field>
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${workEffortName}" target="projectView">
+            <hyperlink description="${workEffortName}" target="projectView" also-hidden="false">
                 <parameter param-name="projectId" from-field="workEffortId"/>
             </hyperlink>
         </field>
@@ -352,7 +352,7 @@
         <field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><date-time type="date"/></field>
         <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><date-time type="date"/></field>
         <field name="edit" title=" ">
-            <hyperlink target="EditTask?workEffortId=${workEffortId}" description="${uiLabelMap.CommonEdit}"/>
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditTask?workEffortId=${workEffortId}"/>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
@@ -415,7 +415,7 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="wbsId"><display description="${projectId}.${phaseSeqNum}"/></field>
         <field name="phase">
-            <hyperlink target="FindPhase" description="${phaseName}">
+            <hyperlink description="${phaseName}" target="FindPhase">
                 <parameter param-name="projectId"/>
             </hyperlink>
         </field>
@@ -435,7 +435,7 @@
         </row-actions>
         <field name="wbsId"><display description="${projectId}.${phaseSeqNum}.${sequenceNum}"/></field>
         <field name="task">
-            <hyperlink target="taskView" description="${workEffortName}">
+            <hyperlink description="${workEffortName}" target="taskView">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
@@ -457,7 +457,7 @@
     </form>
     <form name="ListOrderInfo" target="EditProjectOrders?projectId=${projectId}" type="list" list-name="listOrderAssoProject" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="orderId">
-            <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"/>
             </hyperlink>
         </field>
@@ -467,7 +467,7 @@
         <field name="orderDate"><display/></field>
         <field name="entryDate"><display/></field>
         <field name="linkProjectOrder" title=" " widget-style="buttontext" use-when="headerItem.equals(&quot;editProjectOrders&quot;)">
-            <hyperlink target="unLinkProjectOrder" description="${uiLabelMap.ProjectMgrRemoveLinkFromProject}">
+            <hyperlink description="${uiLabelMap.ProjectMgrRemoveLinkFromProject}" target="unLinkProjectOrder">
                 <parameter param-name="workEffortId" from-field="projectId"/>
                 <parameter param-name="orderId"/>
                 <parameter param-name="projectId"/>
@@ -548,7 +548,7 @@
         </row-actions>
         <field name="projectId"><hidden/></field>
         <field name="partyName" title="${uiLabelMap.CommonName}">
-            <hyperlink target="viewprofile" description="${groupName} [${partyId}]">
+            <hyperlink description="${groupName} [${partyId}]" target="viewprofile">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
@@ -691,13 +691,13 @@
             <set field="statusId" from-field="result.statusId"/>
         </row-actions>
         <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${workEffortName}" target="taskView">
+            <hyperlink description="${workEffortName}" target="taskView" also-hidden="false">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
         <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display description="${resultProject.phaseName}"/></field>
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}">
-            <hyperlink target="projectView" description="${resultProject.projectName}">
+            <hyperlink description="${resultProject.projectName}" target="projectView">
                 <parameter param-name="projectId" from-field="resultProject.projectId"/>
             </hyperlink>
         </field>
@@ -723,7 +723,7 @@
         </hyperlink>
         </field>
         <field name="toComplete" title="${uiLabelMap.CommonStatustoComplete}">
-        <hyperlink target="updateResourcesTaskAssigment" description="${uiLabelMap.CommonStatustoComplete}">
+        <hyperlink description="${uiLabelMap.CommonStatustoComplete}" target="updateResourcesTaskAssigment">
             <parameter param-name="workEffortId"/>
             <parameter param-name="partyId"/>
             <parameter param-name="roleTypeId"/>
@@ -749,7 +749,7 @@
             <set field="ActualCompletionDate" from-field="result.projectInfo.actualCompletionDate"/>
         </row-actions>
         <field entry-name="workEffortName" name="projectName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}" widget-style="buttontext">
-            <hyperlink target="projectView" description="${workEffortName}[${workEffortId}]">
+            <hyperlink description="${workEffortName}[${workEffortId}]" target="projectView">
                 <parameter param-name="projectId" from-field="workEffortId"/>
             </hyperlink>
         </field>
@@ -773,7 +773,7 @@
         <field name="partyId"><hidden/></field>
         <field use-when="workEffortId==projectId" name="workEffortId" entry-name="test" title="${uiLabelMap.ProjectMgrProjectName}"><!-- project level -->
             <drop-down allow-empty="false">
-                <entity-options entity-name="WorkEffort" description="${workEffortName}" key-field-name="workEffortId">
+                <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}">
                     <entity-constraint name="workEffortTypeId" value="PROJECT"/>
                     <entity-constraint name="workEffortId" operator="not-equals" env-name="projectId"/>
                     <entity-constraint name="currentStatusId" operator="not-equals" value="PRJ_CLOSED"/>
@@ -888,7 +888,7 @@
         <field name="thruDate"><ignored/></field>
         <field name="submitButton"><ignored/></field>
         <field name="deleteLink" title=" " widget-style="buttontext" use-when="headerItem.equals(&quot;EditProjectContents&quot;)">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteProjectContent">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteProjectContent" also-hidden="false">
                 <auto-parameters-entity/>
             </hyperlink>
         </field>
@@ -896,7 +896,7 @@
             <hyperlink description="${uiLabelMap.ContentDownload}" target="ViewSimpleContent?contentId=${contentId}"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext" use-when="headerItem.equals(&quot;EditTaskContents&quot;)">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteTaskContent">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTaskContent" also-hidden="false">
                 <auto-parameters-entity/>
             </hyperlink>
         </field>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml Sat Nov  5 14:14:04 2016
@@ -31,13 +31,13 @@
             <service service-name="getPartyTelephone" result-map="telResult"/>
         </row-actions>
         <field name="resourceName" parameter-name="partyId" title="${uiLabelMap.ProjectMgrResourceName}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${lastName}, ${firstName} ${middleName} ${groupName}" target="viewprofile">
+            <hyperlink description="${lastName}, ${firstName} ${middleName} ${groupName}" target="viewprofile" also-hidden="false">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
         <field name="roleTypeId"><hidden/></field>
         <field name="emailAddress" title="${uiLabelMap.PartyEmailAddress}">
-            <hyperlink target="/partymgr/control/EditCommunicationEvent" description="${emailResult.emailAddress}" target-type="inter-app">
+            <hyperlink description="${emailResult.emailAddress}" target="/partymgr/control/EditCommunicationEvent" target-type="inter-app">
                 <parameter param-name="partyIdFrom" from-field="userLogin.partyId"/>
                 <parameter param-name="partyIdTo" from-field="partyId"/>
                 <parameter param-name="communicationEventTypeId" value="EMAIL_COMMUNICATION"/>
@@ -48,7 +48,7 @@
         <field name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber}${groovy:telResult.get(&quot;extension&quot;)!=null?&quot; Ext:&quot;:&quot; &quot;}${telResult.extension}"/></field>
         <field name="contactMechPurposeTypeId" entry-name="telResult.contactMechPurposeTypeId" title="${uiLabelMap.CommonPurpose}"><display-entity entity-name="ContactMechPurposeType"/></field>
         <field name="remove" title="${uiLabelMap.CommonRemove}">
-            <hyperlink target="removeResource" description="${uiLabelMap.CommonRemove}">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeResource">
                 <parameter param-name="partyId"/>
                 <parameter param-name="roleTypeId"/>
             </hyperlink>
@@ -57,7 +57,7 @@
     <form name="ListBillingHours" type="list" list-name="billingList" paginate-target="ListResourcesBillingHours"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="projectName">
-            <hyperlink target="projectView" description="${projectName} [${projectId}]">
+            <hyperlink description="${projectName} [${projectId}]" target="projectView">
                 <parameter param-name="projectId"/>
             </hyperlink>
         </field>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sat Nov  5 14:14:04 2016
@@ -204,13 +204,13 @@
             <set field="currentStatusId" from-field="result.taskInfo.currentStatusId"/>
         </row-actions>
         <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${workEffortName}" target="taskView">
+            <hyperlink description="${workEffortName}" target="taskView" also-hidden="false">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
         <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display/></field>
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}" widget-style="buttontext" sort-field="true">
-            <hyperlink also-hidden="false" description="${projectName}" target="projectView">
+            <hyperlink description="${projectName}" target="projectView" also-hidden="false">
                 <parameter param-name="projectId"/>
             </hyperlink>
         </field>
@@ -239,14 +239,14 @@
         <field name="oldRoleTypeId" parameter-name="roleTypeId"><hidden value="${roleTypeId}"/></field>
         <field name="oldPartyId" parameter-name="partyId"><hidden value="${partyId}"/></field>
         <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${workEffortName}" target="taskView">
+            <hyperlink description="${workEffortName}" target="taskView" also-hidden="false">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="my"/>
             </hyperlink>
         </field>
         <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display description="${resultProject.phaseName}"/></field>
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}">
-            <hyperlink target="projectView" description="${resultProject.projectName}">
+            <hyperlink description="${resultProject.projectName}" target="projectView">
                 <parameter param-name="projectId" from-field="resultProject.projectId"/>
             </hyperlink>
         </field>
@@ -279,7 +279,7 @@
         <field name="fromDate"><hidden/></field>
         <field name="updateButton"><submit/></field>
         <field name="remove" title="${uiLabelMap.CommonRemove}">
-        <hyperlink target="updateTaskAssigment" description="${uiLabelMap.CommonRemove}">
+        <hyperlink description="${uiLabelMap.CommonRemove}" target="updateTaskAssigment">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="partyId"/>
                 <parameter param-name="roleTypeId"/>
@@ -288,7 +288,7 @@
             </hyperlink>
         </field>
         <field name="toComplete" title="${uiLabelMap.CommonStatustoComplete}">
-            <hyperlink target="updateTaskAssigment" description="${uiLabelMap.CommonStatustoComplete}">
+            <hyperlink description="${uiLabelMap.CommonStatustoComplete}" target="updateTaskAssigment">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="partyId"/>
                 <parameter param-name="roleTypeId"/>
@@ -307,7 +307,7 @@
             </display-entity></field>
         <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}" event="onchange" action="javascript:document.assignTaskToMe.submit();" use-when="parameters.get(&quot;workEffortId&quot;)==null">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${projectName} -- ${phaseName} -- ${workEffortName}" key-field-name="workEffortId" filter-by-date="true">
+                <entity-options entity-name="ProjectPartyAndPhaseAndTask" key-field-name="workEffortId" description="${projectName} -- ${phaseName} -- ${workEffortName}" filter-by-date="true">
                     <entity-constraint name="projectStatusId" operator="not-equals" value="PRJ_CLOSED"/>
                     <entity-constraint name="partyId" operator="equals" value="${parameters.userLogin.partyId}"/>
                     <entity-constraint name="currentStatusId" operator="equals" value="PTS_CREATED"/>
@@ -340,7 +340,7 @@
         <field name="fromDate"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
         <field name="workEffortIdFrom" title="${uiLabelMap.CommonName}">
-            <hyperlink target="taskView" description="${r.taskInfo.taskName}">
+            <hyperlink description="${r.taskInfo.taskName}" target="taskView">
                 <parameter param-name="workEffortId" from-field="workEffortIdFrom"/>
             </hyperlink>
         </field>
@@ -365,7 +365,7 @@
         <field name="fromDate"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
         <field name="workEffortIdTo" title="${uiLabelMap.CommonName}">
-            <hyperlink target="taskView" description="${r.taskInfo.taskName}">
+            <hyperlink description="${r.taskInfo.taskName}" target="taskView">
                 <parameter param-name="workEffortId" from-field="workEffortIdTo"/>
             </hyperlink>
         </field>
@@ -452,7 +452,7 @@
         <field name="timeEntryId"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
         <field name="timesheetId">
-            <hyperlink target="Timesheet" description="${timesheetId}">
+            <hyperlink description="${timesheetId}" target="Timesheet">
                 <parameter param-name="timesheetId"/>
             </hyperlink>
         </field>
@@ -478,7 +478,7 @@
         <field name="comments"><text size="60"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteTimeEntry" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTimeEntry" also-hidden="false">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="timeEntryId"/>
             </hyperlink>
@@ -526,14 +526,14 @@
         <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${groovy:org.apache.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${groovy: org.apache.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, &quot;dd-MM-yyyy HH:mm&quot;, TimeZone.getDefault(), context.get(&quot;locale&quot;))}"/></field>
 
         <field name="internalNote" widget-style="buttontext" title="${uiLabelMap.ProjectMgrPrivateOrPublic}" use-when="internalNote.equals(&quot;N&quot;)">
-            <hyperlink target="updateTaskNote" description="${uiLabelMap.OrderNotesPrivate}">
+            <hyperlink description="${uiLabelMap.OrderNotesPrivate}" target="updateTaskNote">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="noteId"/>
                 <parameter param-name="internalNote" value="Y"/>
             </hyperlink>
         </field>
         <field name="internalNote" widget-style="buttontext" title="${uiLabelMap.ProjectMgrPrivateOrPublic}" use-when="internalNote.equals(&quot;Y&quot;)">
-            <hyperlink target="updateTaskNote" description="${uiLabelMap.OrderNotesPublic}">
+            <hyperlink description="${uiLabelMap.OrderNotesPublic}" target="updateTaskNote">
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="noteId"/>
                 <parameter param-name="internalNote" value="N"/>
@@ -545,7 +545,7 @@
         <field name="taskName" title="${uiLabelMap.ProjectMgrTaskName}"><display description="${task.taskName} [${task.taskId}]"/></field>
         <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display description="${projectResult.phaseName} [${projectResult.phaseId}]"/></field>
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}">
-            <hyperlink target="projectView" description="${projectResult.projectName} [${projectResult.projectId}]">
+            <hyperlink description="${projectResult.projectName} [${projectResult.projectId}]" target="projectView">
                 <parameter param-name="projectId" from-field="projectResult.projectId"/>
             </hyperlink>
         </field>
@@ -598,7 +598,7 @@
     <form name="ListTaskParties" type="list" list-name="taskParties"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="partyId" title="${uiLabelMap.CommonName}">
-            <hyperlink target="viewprofile" description="${partyName}">
+            <hyperlink description="${partyName}" target="viewprofile">
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
@@ -615,7 +615,7 @@
             </entity-and>
         </actions>
         <field name="contentName" widget-style="smallSubmit">
-            <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="ViewSimpleContent">
+            <hyperlink description="${contentName} [${contentId}]" target="ViewSimpleContent" also-hidden="false">
                 <parameter param-name="contentId"/>
                 <parameter param-name="dataResourceId"/>
                 <parameter param-name="communicationEventId"/>
@@ -660,7 +660,7 @@
         <field name="fromDate"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
         <field name="workEffortIdFrom" title="${uiLabelMap.CommonName}">
-            <hyperlink target="Dependencies" description="${result.taskInfo.taskName}">
+            <hyperlink description="${result.taskInfo.taskName}" target="Dependencies">
                 <parameter param-name="workEffortId" from-field="workEffortIdFrom"/>
             </hyperlink>
         </field>
@@ -687,7 +687,7 @@
         <field name="fromDate"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
         <field name="workEffortIdTo" title="${uiLabelMap.CommonName}">
-            <hyperlink target="Dependencies" description="${result.taskInfo.taskName}">
+            <hyperlink description="${result.taskInfo.taskName}" target="Dependencies">
                 <parameter param-name="workEffortId" from-field="workEffortIdFrom"/>
             </hyperlink>
         </field>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Sat Nov  5 14:14:04 2016
@@ -74,7 +74,7 @@
             <set field="complete" value="${uiLabelMap.ProjectMgrToComplete}"/>
         </actions>
         <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${timesheetId}" target="${my}Timesheet">
+            <hyperlink description="${timesheetId}" target="${my}Timesheet" also-hidden="false">
                 <parameter param-name="timesheetId"/>
             </hyperlink>
         </field>
@@ -85,7 +85,7 @@
         <field name="hours"><display/></field>
         <field name="comments" title="${uiLabelMap.CommonComments}"><display/></field>
         <field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
-            <hyperlink target="TimeSheetStatusToComplete" description="${groovy:statusId.equals(&quot;TIMESHEET_IN_PROCESS&quot;)?complete:&quot;&quot;}" also-hidden="false">
+            <hyperlink description="${groovy:statusId.equals(&quot;TIMESHEET_IN_PROCESS&quot;)?complete:&quot;&quot;}" target="TimeSheetStatusToComplete" also-hidden="false">
                 <parameter param-name="timesheetId"/>
                 <parameter param-name="statusId" value="TIMESHEET_COMPLETED"/>
             </hyperlink>
@@ -134,7 +134,7 @@
             <set field="completeLink" value="${groovy:&quot;TIMESHEET_IN_PROCESS&quot;.equals(statusId)?complete:&quot;&quot;}"/>
         </row-actions>
         <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${timesheetId}" target="Timesheet">
+            <hyperlink description="${timesheetId}" target="Timesheet" also-hidden="false">
                 <parameter param-name="timesheetId"/>
             </hyperlink>
         </field>
@@ -145,7 +145,7 @@
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
         <!--field name="comments" title="${uiLabelMap.CommonComments}"><display/></field-->
         <field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
-            <hyperlink target="TimeSheetStatusToComplete" description="${groovy:statusId.equals(&quot;TIMESHEET_IN_PROCESS&quot;)?complete:&quot;&quot;}">
+            <hyperlink description="${groovy:statusId.equals(&quot;TIMESHEET_IN_PROCESS&quot;)?complete:&quot;&quot;}" target="TimeSheetStatusToComplete">
                 <parameter param-name="timesheetId"/>
                 <parameter param-name="statusId" value="TIMESHEET_COMPLETED"/>
             </hyperlink>
@@ -272,7 +272,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
 
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink target="deleteTimesheetEntry" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteTimesheetEntry" also-hidden="false">
                 <parameter param-name="timesheetId"/>
                 <parameter param-name="timeEntryId"/>
             </hyperlink>
@@ -283,7 +283,7 @@
         <field name="timesheetId"><hidden/></field>
         <field name="taskWbsId"><display/></field>
         <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}">
-            <hyperlink target="taskView" description="${workEffortName}">
+            <hyperlink description="${workEffortName}" target="taskView">
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>