svn commit: r1686674 [9/9] - in /ofbiz/trunk: applications/accounting/widget/ applications/accounting/widget/ap/forms/ applications/accounting/widget/ar/forms/ applications/commonext/widget/ofbizsetup/ applications/content/widget/cms/ applications/cont...

[nmalin]

Modified: ofbiz/trunk/specialpurpose/scrum/widget/OpenTestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/OpenTestForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/OpenTestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/OpenTestForms.xml Sat Jun 20 21:58:05 2015
@@ -37,7 +37,7 @@
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="productId"/>
             </hyperlink></field>
-        <field name="workEffortTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="WorkEffortType" description="${description}"/></field>
+        <field name="workEffortTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="WorkEffortType"/></field>
         <field name="createdDate" title="${uiLabelMap.FormFieldTitle_createdDate}"><display/></field>
         <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}">
             <display-entity entity-name="PartyNameView" description="${lastName} ${firstName} ${middleName}" key-field-name="partyId"/>
@@ -67,7 +67,7 @@
         <field name="productId" title="${uiLabelMap.ScrumProduct}"><display-entity entity-name="Product" description="${internalName}"></display-entity></field>
         <field name="workEffortTypeId" title="${uiLabelMap.CommonType}">
             <drop-down >
-                <entity-options entity-name="WorkEffortType" description="${description}">
+                <entity-options entity-name="WorkEffortType">
                     <entity-constraint name="parentTypeId" value="SCRUM_TASK"/>
                 </entity-options>
             </drop-down>
@@ -146,7 +146,7 @@
         </field>
         <field name="story"><display description="${story[0].story}"></display> </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" description="${description}"/>
+            <display-entity entity-name="StatusItem"/>
         </field>
     </form>
     <form name="editTask" type="upload" target="createTestTask">
@@ -182,7 +182,7 @@
             <display description="${sprint.workEffortName} [${sprintId}]"/>
         </field>
         <field name="custRequestId" title="${uiLabelMap.ScrumBacklogItem}">
-            <display-entity entity-name="CustRequest" description="${description}">
+            <display-entity entity-name="CustRequest">
                 <sub-hyperlink target="EditProdBacklog"></sub-hyperlink>
             </display-entity>
         </field>
@@ -245,7 +245,7 @@
             <hyperlink target="editDefaultTaskScrum" description="${workEffortName}">
                 <parameter param-name="workEffortId"/>
             </hyperlink></field>
-        <field name="workEffortTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="WorkEffortType" description="${description}"/></field>
+        <field name="workEffortTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="WorkEffortType"/></field>
         <field name="createdDate" title="${uiLabelMap.FormFieldTitle_createdDate}"><display/></field>
         <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}">
             <display-entity entity-name="PartyNameView" description="${lastName} ${firstName} ${middleName}" key-field-name="partyId"/>
@@ -275,7 +275,7 @@
         <!--<field name="productId" title="${uiLabelMap.ScrumProduct}"><display-entity entity-name="Product" description="${internalName}"></display-entity></field>-->
         <field name="workEffortTypeId" title="${uiLabelMap.CommonType}">
             <drop-down >
-                <entity-options entity-name="WorkEffortType" description="${description}">
+                <entity-options entity-name="WorkEffortType">
                     <entity-constraint name="parentTypeId" value="SCRUM_TASK"/>
                 </entity-options>
             </drop-down>

Modified: ofbiz/trunk/specialpurpose/scrum/widget/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/ProjectForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/ProjectForms.xml Sat Jun 20 21:58:05 2015
@@ -48,7 +48,7 @@
         <field use-when="project==null" name="currentStatusId"><hidden value="_NA_"/></field>
         <field entry-name="test" name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
             <drop-down>
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" value="SCRUM_MEMBER"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -83,10 +83,10 @@
             </hyperlink>
         </field>
         <field name="roleTypeId">
-            <display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/>
+            <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
         </field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="priority" widget-area-style="centered"><display description="${Priority}"/></field>
         <field name="estimatedStartDate" widget-area-style="centered"><display type="date"/></field>

Modified: ofbiz/trunk/specialpurpose/scrum/widget/ResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/ResourceForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/ResourceForms.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/ResourceForms.xml Sat Jun 20 21:58:05 2015
@@ -44,7 +44,7 @@
         <field name="groupId">
             <drop-down allow-empty="false">
                 <option key="" description=" "/>
-                <list-options list-name="securityGroupList" description="${description}" key-name="groupId"/>
+                <list-options list-name="securityGroupList" key-name="groupId"/>
             </drop-down>
         </field>
         <field name="find" title="${uiLabelMap.CommonFind}"><submit/></field>
@@ -80,9 +80,9 @@
         </field>
         <field name="userLoginId"><display/></field>
         <field name="groupId" sort-field="true">
-            <display-entity entity-name="SecurityGroup" key-field-name="groupId" description="${description}"/>
+            <display-entity entity-name="SecurityGroup" key-field-name="groupId"/>
         </field>
-        <field name="rateTypeId" use-when="rateTypeId!=null"><display-entity entity-name="RateType" description="${description}" key-field-name="rateTypeId"/></field>
+        <field name="rateTypeId" use-when="rateTypeId!=null"><display-entity entity-name="RateType" key-field-name="rateTypeId"/></field>
         <field name="rateAmount" use-when="rateTypeId!=null"><display/></field>
         <field name="percentageUsed" use-when="rateTypeId!=null"><display/></field>
         <field name="update" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext" use-when="rateTypeId!=null">
@@ -144,7 +144,7 @@
         </field>
         <field name="groupId">
             <drop-down allow-empty="false">
-                <list-options list-name="securityGroupList" description="${description}" key-name="groupId"/>
+                <list-options list-name="securityGroupList" key-name="groupId"/>
             </drop-down>
         </field>
         <field name="addButton" ><submit  confirmation-message="Are you sure to add this person ?"/></field>
@@ -152,7 +152,7 @@
     <form name="AddPartyRole" extends="AddPartyRole" extends-resource="component://party/widget/partymgr/PartyForms.xml">
         <field name="roleTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" operator="equals" value="SCRUM_MEMBER"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -270,7 +270,7 @@
         </field>
         <field name="roleTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="RoleType">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" value="SCRUM_MEMBER"/>
                     <entity-order-by field-name="roleTypeId"/>
                 </entity-options>
@@ -333,7 +333,7 @@
         </field>
         <field name="roleTypeId">
             <drop-down current="first-in-list" allow-empty="false" >
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" operator="equals" value="SCRUM_MEMBER"/>
                     <entity-constraint name="roleTypeId" operator="not-equals" value="SCRUM_TEAM"/>
                     <entity-constraint name="roleTypeId" operator="not-equals" value="PRODUCT_OWNER_COMP"/>
@@ -371,7 +371,7 @@
             </hyperlink>
         </field>
         <field name="roleTypeId">
-            <display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/>
+            <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
         </field>
         <field name="fromDate" sort-field="true">
             <display type="date"/>
@@ -395,7 +395,7 @@
         <field name="partyId"><display/></field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
           <drop-down allow-empty="false">
-              <entity-options entity-name="RateType" description="${description}" key-field-name="rateTypeId"></entity-options>
+              <entity-options entity-name="RateType" key-field-name="rateTypeId"></entity-options>
           </drop-down>
         </field>
         <field name="defaultRate">

Modified: ofbiz/trunk/specialpurpose/scrum/widget/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/TaskForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/TaskForms.xml Sat Jun 20 21:58:05 2015
@@ -73,14 +73,14 @@
         <field name="workEffortName" title="${uiLabelMap.ScrumTaskName}" required-field="true" tooltip="${uiLabelMap.ScrumToolTip100CharsMaximun}"><text/></field>
         <field name="workEffortTypeId" title="${uiLabelMap.ScrumTaskType}" required-field="true">
             <drop-down>
-                <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+                <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
                     <entity-constraint name="parentTypeId" value="SCRUM_TASK"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="custRequestId" use-when="task==null" title="${uiLabelMap.ScrumSprintBacklog}">
             <drop-down>
-                <list-options key-name="custRequestId" list-name="scrumProjectSprintBacklogs" description="${description}"/>
+                <list-options key-name="custRequestId" list-name="scrumProjectSprintBacklogs"/>
             </drop-down>
         </field>
         <field name="custRequestId" use-when="task!=null" title="${uiLabelMap.ScrumSprintBacklog}" map-name="parameters">
@@ -134,7 +134,7 @@
         </field>
         <field name="sprintBacklog"><display description="${custRequest.description}"/></field>
         <field name="currentStatusId">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="estimatedHours"><text size="3" default-value="${groovy: if (estimatedMilliSeconds != null) return estimatedMilliSeconds/3600000}"/></field>
         <field name="actualHours"><text size="3" default-value="${groovy: if (actualMilliSeconds != null) return actualMilliSeconds/3600000}"/></field>
@@ -306,12 +306,12 @@
             </service>
         </actions>
         <field name="workEffortName" title="${uiLabelMap.ScrumTaskName}"><display description="${task.workEffortName}"/></field>
-        <field name="workEffortTypeId" title="${uiLabelMap.ScrumTaskType}"><display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${description}"/></field>
+        <field name="workEffortTypeId" title="${uiLabelMap.ScrumTaskType}"><display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId"/></field>
         <field name="sprintName" title="${uiLabelMap.ScrumSprint}"><hidden value="${sprintName}"/></field>
         <field name="projectName" title="${uiLabelMap.ScrumProject}"><hidden value="${projectName}"/></field>
         <field name="custRequestDesp" title="${uiLabelMap.ScrumProductBacklog}"><display description="${description}"/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><hidden value="${task.description}"/></field>
-        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="planHours"><hidden value="${resultPlanHour.planHours}"/></field>
         <field name="actualHours"><hidden value="${groovy: if (result != null) return result.actualHours}"/></field>
         <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}"><hidden value ="${person.lastName} ${person.firstName}"/></field>
@@ -336,7 +336,7 @@
         <field name="lastName"><display/></field>
         <field name="groupName"><display/></field>
         <field name="roleTypeId">
-            <display-entity entity-name="RoleType" description="${description}"/>
+            <display-entity entity-name="RoleType"/>
         </field>
         <field name="fromDate"><display/></field>
         <field name="thruDate"><display/></field>
@@ -456,7 +456,7 @@
         <field name="workEffortId"><hidden value="${parameters.taskId}"/></field>
         <field name="workEffortTypeId" title="${uiLabelMap.ScrumTaskType}" required-field="true">
             <drop-down>
-                <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+                <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
                     <entity-constraint name="parentTypeId" value="SCRUM_TASK"/>
                 </entity-options>
             </drop-down>
@@ -490,7 +490,7 @@
             </display-entity>
         </field>
         <field name="custRequestId" use-when="task!=null&amp;&amp;project==null" title="${uiLabelMap.ScrumSprintBacklog}" map-name="parameters">
-            <display-entity entity-name="CustRequest" key-field-name="custRequestId" description="${description}">
+            <display-entity entity-name="CustRequest" key-field-name="custRequestId">
                 <sub-hyperlink target="ViewProdBacklogItem" description="[${parameters.custRequestId}]">
                     <parameter param-name="custRequestId" from-field="parameters.custRequestId"/>
                     <parameter param-name="productId" from-field="parameters.projectId"/>
@@ -635,14 +635,14 @@
             </hyperlink>
         </field>
         <field name="taskTypeId" title="${uiLabelMap.ScrumTaskType}" use-when="&quot;SCRUM_TASK_ERROR&quot;.equals(taskTypeId)" widget-style="alert">
-            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${description}"/>
+            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId"/>
         </field>
         <field name="taskTypeId" title="${uiLabelMap.ScrumTaskType}" use-when="!&quot;SCRUM_TASK_ERROR&quot;.equals(taskTypeId)">
-            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${description}"/>
+            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId"/>
         </field>
         <field name="sprintName" title="${uiLabelMap.ScrumSprint}"><display/></field>
         <field name="productBacklogName" entry-name="description" title="${uiLabelMap.ScrumProductBacklog}" ><display/></field>
-        <field name="taskCurrentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="taskCurrentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="taskActualStartDate" title="${uiLabelMap.CommonActualStartDate}"><display type="date"/></field>
         <field name="actualHours"><display description="${results.actualHours}"/></field>
         <field name="planHours">
@@ -725,10 +725,10 @@
             </display-entity>
         </field>
         <field name="taskTypeId" >
-            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${description}"/>
+            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId"/>
         </field>
         <field name="taskCurrentStatusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         
         <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}" >
@@ -775,7 +775,7 @@
         <field name="taskName" position="2"><text/></field>
         <field name="taskTypeId" title="Task Type">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+                <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
                     <entity-constraint name="parentTypeId" value="SCRUM_TASK"/>
                 </entity-options>
             </drop-down>
@@ -788,7 +788,7 @@
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <list-options key-name="statusId" list-name="statusItemList" description="${description}"/>
+                <list-options key-name="statusId" list-name="statusItemList"/>
             </drop-down>
         </field>
         <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}" position="2">
@@ -921,12 +921,12 @@
         </field>
         <field name="roleTypeId" use-when="parameters.get(&quot;partyId&quot;)!=null&amp;&amp;sprint==null">
             <drop-down current="selected" allow-empty="false">
-                <list-options key-name="roleTypeId" list-name="roleTypeList" description="${description}"/>
+                <list-options key-name="roleTypeId" list-name="roleTypeList"/>
             </drop-down>
         </field>
         <field name="roleTypeId" use-when="parameters.get(&quot;partyId&quot;)!=null&amp;&amp;sprint!=null">
             <drop-down current="selected" allow-empty="false">
-                <entity-options entity-name="WorkEffortPartyAssignAndRoleType" description="${description}">
+                <entity-options entity-name="WorkEffortPartyAssignAndRoleType">
                     <entity-constraint name="partyId" operator="equals" value="${parameters.partyId}"/>
                     <entity-constraint name="workEffortId" operator="equals" value="${sprint.sprintId}"/>
                 </entity-options>
@@ -954,7 +954,7 @@
             </hyperlink>
         </field>
         <field name="roleTypeId">
-            <display-entity entity-name="RoleType" description="${description}"/>
+            <display-entity entity-name="RoleType"/>
         </field>
         <field name="fromDate"><display type="date"/></field>
         <field name="thruDate"><display type="date"/></field>

Modified: ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetForms.xml Sat Jun 20 21:58:05 2015
@@ -45,7 +45,7 @@
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="1">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="TIMESHEET_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -70,7 +70,7 @@
         </field>
         <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"/></field>
         <field name="hours" title="${uiLabelMap.ScrumActualHours}"><display/></field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
         <!--field name="comments" title="${uiLabelMap.CommonComments}"><display/></field-->
@@ -98,7 +98,7 @@
             </hyperlink>
         </field>
         <field name="weekNumber" title="${uiLabelMap.ScrumWeekNumber}"><display/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
         <field name="hours"><display/></field>
@@ -144,7 +144,7 @@
         <field name="taskId" title="${uiLabelMap.ScrumTaskName}" parameter-name="workEffortId" encode-output="true">
             <drop-down allow-empty="true" current-description="${result.projectId} ${product.productId} - ${result.projectName}${product.internalName} - ${result.sprintName} - ${groovy:result.backlogName.toString().substring(0,Math.min(result.backlogName.toString().length(),30))}[${result.backlogId}] - ${groovy:result.taskName.toString().substring(0,Math.min(result.taskName.toString().length(),30))}[${result.taskId}]">
                 <list-options key-name="taskId" list-name="taskListDropdown" description="${projectId}${productId} - ${projectName} ${productName} - ${sprintName} - ${groovy: if (description) description.substring(0,Math.min(description.length(),30))} [${custRequestId}] - ${groovy:taskName.substring(0,Math.min(taskName.length(),20))}[${taskId}]"/>
-                <entity-options description="${description}" entity-name="EmplLeaveType" key-field-name="leaveTypeId"/>
+                <entity-options entity-name="EmplLeaveType" key-field-name="leaveTypeId"/>
                 <sub-hyperlink target="taskView" description="${groovy:workEffortId!=void&amp;&amp;!&quot;Totals&quot;.equals(workEffortId)?workEffortId:&quot;&quot;}" target-window="_blank">
                     <parameter param-name="taskId" from-field="workEffortId"/>
                 </sub-hyperlink>
@@ -153,7 +153,7 @@
         <field name="checkComplete" title="${uiLabelMap.ScrumCheckComplete}"><check/></field>
         <field name="rateTypeId" title="${uiLabelMap.ScrumRateTypeId}">
             <drop-down allow-empty="false" no-current-selected-key="${defaultRateTypeId}">
-                <entity-options entity-name="RateType" description="${description}"/>
+                <entity-options entity-name="RateType"/>
             </drop-down>
         </field>
         <field name="planHours" title="${uiLabelMap.ScrumPlanHrs}"><text size="2"/></field>

Modified: ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml?rev=1686674&r1=1686673&r2=1686674&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml Sat Jun 20 21:58:05 2015
@@ -46,7 +46,7 @@ under the License.
                 <parameter param-name="projectId" from-field="projectWorkEffort.workEffortId"/>
             </hyperlink>
         </field>
-        <field name="currentStatusId" title="Current Status"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"></display-entity></field>
+        <field name="currentStatusId" title="Current Status"><display-entity entity-name="StatusItem" key-field-name="statusId"></display-entity></field>
         <field name="actualStartDate" title="Start Date"><display></display></field>
         <field name="actualCompletionDate" title="End Date"><display></display></field>
         <field name="estimatedHours" title="Sprint Length (hours)"><display></display></field>
@@ -162,7 +162,7 @@ under the License.
             </display-entity>
         </field>
         <field name="custRequest.statusId" title="${uiLabelMap.ScrumStatusBacklog}" position="1" use-when="showPosition1&amp;&amp;&quot;Any&quot;.equals(paraBacklogStatusId)">
-            <display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="taskId" title="${uiLabelMap.ScrumTab} ${uiLabelMap.ScrumTask}" position="2" parameter-name="workEffortId" use-when="!&quot;SCRUM_SPRINT&quot;.equals(taskTypeId)">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description=" ">
@@ -175,8 +175,8 @@ under the License.
         <field name="taskTypeId" title="${uiLabelMap.ScrumTab} ${uiLabelMap.ScrumTaskType}" position="2" use-when="!&quot;SCRUM_SPRINT&quot;.equals(taskTypeId)">
             <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${uiLabelMap.ScrumTab} ${description}"/>
         </field>
-        <field name="taskCurrentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="!&quot;STS_COMPLETED&quot;.equals(taskCurrentStatusId)&amp;&amp;!&quot;SCRUM_SPRINT&quot;.equals(taskTypeId)"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field>
-        <field name="taskCurrentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="&quot;STS_COMPLETED&quot;.equals(taskCurrentStatusId)&amp;&amp;!&quot;SCRUM_SPRINT&quot;.equals(taskTypeId)" widget-style="alert"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field>
+        <field name="taskCurrentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="!&quot;STS_COMPLETED&quot;.equals(taskCurrentStatusId)&amp;&amp;!&quot;SCRUM_SPRINT&quot;.equals(taskTypeId)"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="taskCurrentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="&quot;STS_COMPLETED&quot;.equals(taskCurrentStatusId)&amp;&amp;!&quot;SCRUM_SPRINT&quot;.equals(taskTypeId)" widget-style="alert"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="dummy1" title=" " position="1" use-when="showPosition1"><display description=" "/></field>
         <field name="dummy2" title=" " position="1" use-when="showPosition1"><display description=" "/></field>
         <field name="dummy3" title=" " position="1" use-when="showPosition1"><display description=" "/></field>
@@ -336,7 +336,7 @@ under the License.
         <field name="statusName"><hidden/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down>
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="SPRINT_STATUS" operator="equals"/>
                 </entity-options>
             </drop-down>
@@ -411,7 +411,7 @@ under the License.
         </field>
         <field name="roleTypeId">
             <drop-down current="selected" allow-empty="false">
-                <entity-options entity-name="PartyRoleDetailAndPartyDetail" description="${description}">
+                <entity-options entity-name="PartyRoleDetailAndPartyDetail">
                     <entity-constraint name="partyId" operator="equals" value="${parameters.partyId}"/>
                     <entity-constraint name="parentTypeId" operator="equals" value="SCRUM_MEMBER"/>
                 </entity-options>
@@ -444,7 +444,7 @@ under the License.
         <field name="workEffortId"><hidden value="${parameters.sprintId}"/></field>
         <field name="memberName" title="${uiLabelMap.ScrumMembersName}"><hyperlink target="viewprofile" description="${lastName}, ${firstName} ${middleName} [${partyId}]"><parameter param-name="partyId"/></hyperlink></field>
         <field name="roleTypeId">
-            <display-entity entity-name="RoleType" description="${description}"/>
+            <display-entity entity-name="RoleType"/>
         </field>
         <field name="fromDate"><display type="date"/></field>
         <field name="thruDate"><display type="date"/></field>
@@ -509,7 +509,7 @@ under the License.
         <field name="description" title="${uiLabelMap.ScrumProjectGoal}"><textarea/></field>
         <field name="currentStatusId" use-when="workEffortId!=null" title="${uiLabelMap.CommonStatus}">
             <drop-down current="first-in-list" current-description="${currentStatus.description}">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="SCRUM_PROJECT_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -564,7 +564,7 @@ under the License.
         <field name="description" title="${uiLabelMap.ScrumProjectGoal}"><display/></field>
         <field name="billed" title="${uiLabelMap.ScrumBilled}"><display description="${workEffortAttMap.attrValue}"/></field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="actualStartDate"><display description="${actualStartDate}"/></field>
         <field name="actualCompletionDate"><display type="date"/></field>
@@ -718,7 +718,7 @@ under the License.
             </drop-down>
         </field>
         <field name="custRequestTypeId" title="${uiLabelMap.ScrumUnplanBacklog}" use-when="custRequest!=null&amp;&amp;isTeamMember==true">
-            <display-entity entity-name="CustRequestType" description="${description}" key-field-name="custRequestTypeId"/>
+            <display-entity entity-name="CustRequestType" key-field-name="custRequestTypeId"/>
         </field>
         <field name="unplannedFlag" title="${uiLabelMap.ScrumUnplanBacklog}" use-when="custRequest==null">
             <drop-down allow-empty="false" no-current-selected-key="N">
@@ -727,7 +727,7 @@ under the License.
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" use-when="custRequest!=null">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"></display-entity>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"></display-entity>
         </field>
         <field name="partyIdTo" title="${uiLabelMap.ScrumRequestName}" parameter-name="partyIdTo" use-when="custRequest!=null&amp;&amp;isTeamMember==false">
             <drop-down no-current-selected-key="${custRequest.fromPartyId}" allow-empty="false">
@@ -821,7 +821,7 @@ under the License.
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
             <drop-down allow-empty="false">
                 <option key="${uiLabelMap.CommonAny}" description=" "/>
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="CUSTREQ_STTS"/>
                     <entity-constraint name="statusId" operator="not-equals" value="CRQ_PENDING"/>
                     <entity-constraint name="statusId" operator="not-equals" value="CRQ_REJECTED"/>
@@ -880,7 +880,7 @@ under the License.
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="false">
                 <option key="${uiLabelMap.CommonAny}" description=" "/>
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="CUSTREQ_STTS"/>
                     <entity-constraint name="statusId" operator="not-equals" value="CRQ_PENDING"/>
                     <entity-constraint name="statusId" operator="not-equals" value="CRQ_REJECTED"/>
@@ -1232,7 +1232,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="sprintCurrentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="&quot;${sprintId}&quot;!=&quot;&quot;">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="estimatedHrs" title="${uiLabelMap.ScrumSprintLengthWeeks}" position="2" use-when="&quot;${sprintId}&quot;!=&quot;&quot;"><display/></field>
         <field name="planHours" title="${uiLabelMap.ScrumPlannedHours}" position="2" use-when="&quot;${sprintId}&quot;!=&quot;&quot;"><display/></field>
@@ -1304,7 +1304,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="sprintCurrentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="&quot;${sprintId}&quot;!=&quot;&quot;">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="estimatedHrs" title="${uiLabelMap.ScrumSprintLengthWeeks}" position="2" use-when="&quot;${sprintId}&quot;!=&quot;&quot;"><display/></field>
         <field name="planHours" title="${uiLabelMap.ScrumPlannedHours}" position="2" use-when="&quot;${sprintId}&quot;!=&quot;&quot;"><display/></field>
@@ -1482,7 +1482,7 @@ under the License.
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" use-when="product!=null">
             <drop-down>
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="PRODUCT_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -1547,7 +1547,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" use-when="product!=null" map-name="statusMap">
-            <display-entity entity-name="StatusItem" description="${description}"/>
+            <display-entity entity-name="StatusItem"/>
         </field>
         <field name="internalName" title="${uiLabelMap.ScrumProductName}"><display description="${product.internalName} [${product.productId}]"/></field>
         <field name="longDescription" title="${uiLabelMap.CommonDescription}"><display /></field>
@@ -1691,7 +1691,7 @@ under the License.
             <field name="statusId" parameter-name="statusId">
                 <drop-down allow-empty="false">
                     <option key="Any" description="${uiLabelMap.CommonAny}"/>
-                    <entity-options entity-name="StatusItem" description="${description}">
+                    <entity-options entity-name="StatusItem">
                         <entity-constraint name="statusTypeId" operator="equals" value="PRODUCT_STATUS"/>
                     </entity-options>
                 </drop-down>
@@ -1834,7 +1834,7 @@ under the License.
                 <parameter param-name="timesheetId"/>
             </hyperlink>
         </field>
-        <field name="rateTypeId" title="${uiLabelMap.ScrumRateTypeId}" position="2"><display-entity entity-name="RateType" description="${description}"/></field>
+        <field name="rateTypeId" title="${uiLabelMap.ScrumRateTypeId}" position="2"><display-entity entity-name="RateType"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonDate}" position="2"><display type="date"/> </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
@@ -2000,7 +2000,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
-            <display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="custRequestCategoryGroupId" position="1" use-when="${groovy:showPosition1==true&amp;&amp;sequence.equals(&quot;N&quot;)}" title="${uiLabelMap.ScrumCategory}" widget-style="h3">
             <display-entity entity-name="CustRequest" key-field-name="custRequestId" description="${custRequestName}"/>
@@ -2040,7 +2040,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
-            <display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="parentCustRequestId" position="2" title="${uiLabelMap.ScrumCategory}">
             <display-entity entity-name="CustRequest" description="${custRequestName}" key-field-name="custRequestId"/>
@@ -2121,17 +2121,17 @@ under the License.
             </hyperlink>
         </field>
         <field name="custRequestId" title="${uiLabelMap.ScrumSprintBacklog}">
-            <display-entity entity-name="CustRequest" key-field-name="custRequestId" description="${description}">
+            <display-entity entity-name="CustRequest" key-field-name="custRequestId">
                 <sub-hyperlink target="ViewProdBacklogItem" description="[${custRequestId}]">
                     <parameter param-name="custRequestId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="taskTypeId" title="${uiLabelMap.ScrumTaskType}">
-            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${description}"/>
+            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId"/>
         </field>
         <field name="taskCurrentStatusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}">
             <drop-down allow-empty="true" no-current-selected-key="${partyId}">
@@ -2240,7 +2240,7 @@ under the License.
         <field name="taskName"><text/></field>
         <field name="taskTypeId" title="${uiLabelMap.ScrumTaskType}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+                <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
                     <entity-constraint name="parentTypeId" value="SCRUM_TASK"/>
                 </entity-options>
             </drop-down>
@@ -2419,7 +2419,7 @@ under the License.
         <field name="productId"><hidden/></field>
         <field name="name"><hidden/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" description="${description}"/>
+            <display-entity entity-name="StatusItem"/>
         </field>
         <field name="companyNameId" title="${uiLabelMap.ScrumOwnerCompany}" use-when="!isCurrentCompany">
             <hyperlink target="viewprofile" description="${resultCompanyGroup.groupName} [${companyNameId}]">
@@ -2477,10 +2477,10 @@ under the License.
         </hyperlink>
    </field>
    <field name="taskTypeId" title="Task Type">
-        <display-entity entity-name="WorkEffortType" description="${description}" key-field-name="workEffortTypeId"></display-entity>
+        <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId"></display-entity>
    </field>
    <field name="taskCurrentStatusId" title="Status">
-        <display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/>
+        <display-entity entity-name="StatusItem" key-field-name="statusId"/>
    </field>
    <field name="taskActualCompletionDate" title="Completion Date"><display/></field>
    </form>
@@ -2542,12 +2542,12 @@ under the License.
         <field name="workEffortContentTypeId"><hidden value="PROJECT_SPEC"/></field>
         <field name="contentTypeId">
             <drop-down allow-empty="false" no-current-selected-key="DOCUMENT">
-                <entity-options description="${description}" entity-name="ContentType"/>
+                <entity-options entity-name="ContentType"/>
             </drop-down>
         </field>
         <field name="mimeTypeId" >
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId"/>
+                <entity-options entity-name="MimeType" key-field-name="mimeTypeId"/>
             </drop-down>
         </field>
         <field name="dataResourceName" title="${uiLabelMap.CommonUpload}"><file/></field>
@@ -2560,7 +2560,7 @@ under the License.
                 <field-map field-name="workEffortId" from-field="workEffortId"/>
             </entity-and>
         </actions>
-        <field name="contentTypeId"><display-entity entity-name="ContentType" description="${description}"/></field>
+        <field name="contentTypeId"><display-entity entity-name="ContentType"/></field>
         <field name="contentName" widget-style="buttontext">
             <display description="${contentName}[${contentId}]"/>
         </field>
@@ -2664,14 +2664,14 @@ under the License.
         <field name="custRequestId" map-name="parameters"><hidden/></field>
         <field name="contentTypeId">
             <drop-down allow-empty="false" no-current-selected-key="DOCUMENT">
-                <entity-options description="${description}" entity-name="ContentType">
+                <entity-options entity-name="ContentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="mimeTypeId" >
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId"/>
+                <entity-options entity-name="MimeType" key-field-name="mimeTypeId"/>
             </drop-down>
         </field>
         <field name="dataResourceName" title="${uiLabelMap.CommonUpload}*"><file/></field>
@@ -2773,10 +2773,10 @@ under the License.
             </hyperlink>
         </field>
         <field name="taskTypeId" title="${uiLabelMap.ScrumTaskType}">
-            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${description}"/>
+            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId"/>
         </field>
         <field name="taskCurrentStatusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}">
             <display-entity entity-name="Person" description="${lastName} ${firstName} ${middleName}" key-field-name="partyId"/>
@@ -2892,7 +2892,7 @@ under the License.
         <field name="workEffortName" title="${uiLabelMap.ScrumTaskName}" required-field="true" tooltip="${uiLabelMap.ScrumToolTip100CharsMaximun}"><text/></field>
         <field name="workEffortTypeId" title="${uiLabelMap.ScrumTaskType}" required-field="true">
             <drop-down>
-                <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+                <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
                     <entity-constraint name="parentTypeId" value="SCRUM_TASK"/>
                 </entity-options>
             </drop-down>
@@ -3021,7 +3021,7 @@ under the License.
             </display-entity>
         </field>
         <field name="statusId" title="${uiLabelMap.ScrumStatusBacklog}" position="1" use-when="showPosition1&amp;&amp;&quot;Any&quot;.equals(paraBacklogStatusId)">
-            <display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="workEffortId" title="${uiLabelMap.ScrumTab} ${uiLabelMap.ScrumTask}" position="2" use-when="workEffortId!=null">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description=" ">
@@ -3033,8 +3033,8 @@ under the License.
         <field name="workEffortTypeId" title="${uiLabelMap.ScrumTab} ${uiLabelMap.ScrumTaskType}" position="2" use-when="workEffortId!=null">
             <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${uiLabelMap.ScrumTab} ${description}"/>
         </field>
-        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="!&quot;STS_COMPLETED&quot;.equals(currentStatusId)"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field>
-        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="&quot;STS_COMPLETED&quot;.equals(currentStatusId)" widget-style="alert"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field>
+        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="!&quot;STS_COMPLETED&quot;.equals(currentStatusId)"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="&quot;STS_COMPLETED&quot;.equals(currentStatusId)" widget-style="alert"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="dummy1" title=" " position="1" use-when="showPosition1"><display description=" "/></field>
         <field name="dummy2" title=" " position="1" use-when="showPosition1"><display description=" "/></field>
         <field name="dummy3" title=" " position="1" use-when="showPosition1"><display description=" "/></field>