svn commit: r634225 [4/4] - in /ofbiz/trunk/specialpurpose/projectmgr: ./ data/ entitydef/ script/org/ofbiz/project/ servicedef/ src/org/ofbiz/project/ webapp/projectmgr/WEB-INF/ webapp/projectmgr/js/ widget/ widget/forms/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r634225 [4/4] - in /ofbiz/trunk/specialpurpose/projectmgr: ./ data/ entitydef/ script/org/ofbiz/project/ servicedef/ src/org/ofbiz/project/ webapp/projectmgr/WEB-INF/ webapp/projectmgr/js/ widget/ widget/forms/

ChrisG-2
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml?rev=634225&r1=634224&r2=634225&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml Thu Mar  6 03:32:39 2008
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-    <form name="ListUnBilledHours" type="list" list-name="unBilledList" paginate-target="ListResourcesUnBilledHours"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <field name="projectName"><display/></field>
-        <field name="phaseName"><display/></field>
-        <field name="taskName"><display/></field>
-        <field name="hours"><display/></field>
-        <field name="rate"><display/></field>
-        <field name="total"><display/></field>
-    </form>                                        
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+    <form name="ListUnBilledHours" type="list" list-name="unBilledList" paginate-target="ListResourcesUnBilledHours"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <field name="projectName"><display/></field>
+        <field name="phaseName"><display/></field>
+        <field name="taskName"><display/></field>
+        <field name="hours"><display/></field>
+        <field name="rate"><display/></field>
+        <field name="total"><display/></field>
+    </form>                                        
 </forms>

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=634225&r1=634224&r2=634225&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Thu Mar  6 03:32:39 2008
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     
     <form name="EditTask" type="single" target="updateTask" default-map-name="task"
-        header-row-style="header-row" default-table-style="basic-table">
-        <actions>
-            <service service-name="getProjectTask" result-map-name="result">
-                <field-map field-name="taskId" env-name="workEffortId"/>
-            </service>
-            <set field="statusId" from-field="result.taskInfo.currentStatusId"/>
+        header-row-style="header-row" default-table-style="basic-table">
+        <actions>
+            <service service-name="getProjectTask" result-map-name="result">
+                <field-map field-name="taskId" env-name="workEffortId"/>
+            </service>
+            <set field="statusId" from-field="result.taskInfo.currentStatusId"/>
         </actions>
         <alt-target use-when="myTask!=void" target="createMyTask"/>
-        <alt-target use-when="task==null" target="createTask"/>
+        <alt-target use-when="task==null" target="createTask"/>
         <field name="statusId"><hidden value="PAS_ASSIGNED"/></field>
         <field use-when="myTask!=void" name="partyId"><hidden value="${userLogin.partyId}"/></field>
         <field name="projectId"><hidden value="${parameters.projectId}"/></field>
@@ -61,29 +61,29 @@
                     <entity-order-by field-name="phaseName"/>
                 </entity-options>        
             </drop-down>
-        </field>
-        <field use-when="myTask!=void" name="estimatedHours"><text size="5"/></field>
-        <field use-when="myTask!=void" name="skillTypeId">
-            <drop-down allow-empty="true">
-                <entity-options entity-name="SkillType" description="${description}"/>        
-            </drop-down>
+        </field>
+        <field use-when="myTask!=void" name="estimatedHours"><text size="5"/></field>
+        <field use-when="myTask!=void" name="skillTypeId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="SkillType" description="${description}"/>        
+            </drop-down>
         </field>
         <field use-when="myTask!=null||task==null" name="currentStatusId"><hidden value="PTS_CREATED"/></field>
         <field use-when="task!=null" name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
-        <field name="priority" title="${uiLabelMap.CommonPriority}">
-            <drop-down allow-empty="true" current="selected">
-                <option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/>
-                <option key="2" description="2"/>
-                <option key="3" description="3"/>
-                <option key="4" description="4"/>
-                <option key="5" description="5"/>
-                <option key="6" description="6"/>
-                <option key="7" description="7"/>
-                <option key="8" description="8"/>
-                <option key="9" description="9 (${uiLabelMap.WorkEffortPriorityLow})"/>
-            </drop-down>
-        </field>
-        <field name="description" title="${uiLabelMap.CommonDescription}"><textarea/></field>
+        <field name="priority" title="${uiLabelMap.CommonPriority}">
+            <drop-down allow-empty="true" current="selected">
+                <option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/>
+                <option key="2" description="2"/>
+                <option key="3" description="3"/>
+                <option key="4" description="4"/>
+                <option key="5" description="5"/>
+                <option key="6" description="6"/>
+                <option key="7" description="7"/>
+                <option key="8" description="8"/>
+                <option key="9" description="9 (${uiLabelMap.WorkEffortPriorityLow})"/>
+            </drop-down>
+        </field>
+        <field name="description" title="${uiLabelMap.CommonDescription}"><textarea/></field>
         <field name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}">
             <drop-down allow-empty="false">
                 <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
@@ -99,7 +99,7 @@
         header-row-style="header-row" default-table-style="basic-table">
         <field name="projectId"><hidden value="${parameters.projectId}"/></field>
         <field name="workEffortTypeId"><hidden value="TASK"/></field>
-        <field name="currentStatusId"><hidden value="PTS_CREATED"/></field>
+        <field name="currentStatusId"><hidden value="PTS_CREATED"/></field>
         <field name="taskName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
         <field name="taskDescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
         <field name="phaseName" parameter-name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}">
@@ -111,12 +111,12 @@
                 </entity-options>        
             </drop-down>
         </field>
-        <field name="estimatedHours"><text size="5"/></field>
-        <field name="skillTypeId">
-            <drop-down allow-empty="true">
-                <entity-options entity-name="SkillType" description="${description}"/>        
-            </drop-down>
-        </field>
+        <field name="estimatedHours"><text size="5"/></field>
+        <field name="skillTypeId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="SkillType" description="${description}"/>        
+            </drop-down>
+        </field>
         <field name="taskPriority" parameter-name="priority" title="${uiLabelMap.CommonPriority}">
             <drop-down allow-empty="true" current="selected">
                 <option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/>
@@ -174,16 +174,16 @@
         header-row-style="header-row" default-table-style="basic-table">
         <field name="workEffortTypeId"><hidden value="TASK"/></field>
         <field name="workEffortId"  title="${uiLabelMap.ProjectMgrTaskId}"><text-find default-option="contains" ignore-case="true"/></field>
-        <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}"><text-find default-option="contains" ignore-case="true"/></field>
-        <field name="partyId">
-            <drop-down allow-empty="true">
-                <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${middleName} ${lastName}">
-                    <entity-constraint name="roleTypeId" value="PROJECT_TEAM"/>
-                    <entity-order-by field-name="lastName"/>
-                    <entity-order-by field-name="groupName"/>
-                </entity-options>    
-            </drop-down>
-        </field>
+        <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}"><text-find default-option="contains" ignore-case="true"/></field>
+        <field name="partyId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${middleName} ${lastName}">
+                    <entity-constraint name="roleTypeId" value="PROJECT_TEAM"/>
+                    <entity-order-by field-name="lastName"/>
+                    <entity-order-by field-name="groupName"/>
+                </entity-options>    
+            </drop-down>
+        </field>
         <field name="projectName"><text-find default-option="contains" ignore-case="true"/></field>
         <field name="estimatedStartDate" title="${uiLabelMap.CommonFromDate}"><date-find/></field>
         <field name="find" title="${uiLabelMap.CommonFind}"><submit/></field>
@@ -198,18 +198,18 @@
             </service>
         </actions>
         <row-actions>
-            <service service-name="getProjectTask" result-map-name="result">
-                <field-map field-name="taskId" env-name="workEffortId"/>
-                <field-map field-name="hoursPartyId" env-name="partyId"/>
-            </service>
+            <service service-name="getProjectTask" result-map-name="result">
+                <field-map field-name="taskId" env-name="workEffortId"/>
+                <field-map field-name="hoursPartyId" env-name="partyId"/>
+            </service>
             <set field="plannedHours" from-field="result.taskInfo.plannedHours"/>
             <set field="actualHours" from-field="result.taskInfo.actualTotalHours"/>
-            <set field="currentStatusId" from-field="result.taskInfo.currentStatusId"/>
+            <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?workEffortId=${workEffortId}"/>
-        </field>
-        <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display/></field>
+            <hyperlink also-hidden="false" description="${workEffortName}" target="taskView?workEffortId=${workEffortId}"/>
+        </field>
+        <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display/></field>
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${projectName}" target="projectView?projectId=${projectId}"/>
         </field>
@@ -224,24 +224,24 @@
     </form>
     <form name="MyTasks" type="list" list-name="tasks" paginate-target="MyTasks" target="updateTaskAssigment"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <row-actions>
+        <row-actions>
             <service service-name="getProjectTask" result-map-name="result">
                 <field-map field-name="taskId" env-name="workEffortId"/>
                 <field-map field-name="hoursPartyId" env-name="userLogin.partyId"/>
-            </service>
-            <service service-name="getProjectIdAndNameFromTask" result-map-name="resultProject">
-                <field-map field-name="taskId" env-name="workEffortId"/>
-            </service>
+            </service>
+            <service service-name="getProjectIdAndNameFromTask" result-map-name="resultProject">
+                <field-map field-name="taskId" env-name="workEffortId"/>
+            </service>
         </row-actions>
-        <field name="fromDate"><hidden/></field>
-        <field name="workEffortId"><hidden/></field>
-        <field name="oldRoleTypeId" parameter-name="roleTypeId"><hidden value="${roleTypeId}"/></field>
-        <field name="oldPartyId" parameter-name="partyId"><hidden value="${partyId}"/></field>
+        <field name="fromDate"><hidden/></field>
+        <field name="workEffortId"><hidden/></field>
+        <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?workEffortId=${workEffortId}"/>
         </field>
-        <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display description="${resultProject.phaseName}"/></field>
-        <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><hyperlink target="projectView?projectId=${resultProject.projectId}" description="${resultProject.projectName}"/></field>
+        <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display description="${resultProject.phaseName}"/></field>
+        <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><hyperlink target="projectView?projectId=${resultProject.projectId}" description="${resultProject.projectName}"/></field>
         <field entry-name="result.taskInfo.currentStatusId" name="currentStatusId" ><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="priority"><display/></field>
         <field name="estimatedStartDate"><display type="date"/></field>
@@ -250,38 +250,38 @@
         <field name="actualCompletionDate" red-when="before-now"><display type="date"/></field>
         <field entry-name="result.taskInfo.plannedHours" name="plannedHours" title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field>
         <field entry-name="result.taskInfo.actualHours" name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
         <field name="partyId" parameter-name="newPartyId">
             <drop-down>
                 <entity-options entity-name="PartyDetailAndWorkEffortAssign" description="${firstName} ${middleName} ${lastName}">
                     <entity-constraint name="workEffortId" env-name="projectId"/>
-                    <entity-constraint name="workEffortTypeId" value="PROJECT"/>
+                    <entity-constraint name="workEffortTypeId" value="PROJECT"/>
                 </entity-options>    
             </drop-down>
         </field>
-        <field name="roleTypeId" parameter-name="newRoleTypeId" title="${uiLabelMap.PartyRole}">
-            <drop-down>
-                <entity-options entity-name="RoleType" description="${description}">
-                    <entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>        
-            </drop-down>
-        </field>
-        <field name="workEffortId"><hidden/></field>
-        <field name="fromDate"><hidden/></field>
-        <field name="updateButton"><submit/></field>
-        <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_ENDED" description="${uiLabelMap.CommonRemove}"/></field>
-        <field name="toComplete" title="${uiLabelMap.CommonStatustoComplete}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_COMPLETED" description="${uiLabelMap.CommonStatustoComplete}"/></field>
+        <field name="roleTypeId" parameter-name="newRoleTypeId" title="${uiLabelMap.PartyRole}">
+            <drop-down>
+                <entity-options entity-name="RoleType" description="${description}">
+                    <entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>        
+            </drop-down>
+        </field>
+        <field name="workEffortId"><hidden/></field>
+        <field name="fromDate"><hidden/></field>
+        <field name="updateButton"><submit/></field>
+        <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_ENDED" description="${uiLabelMap.CommonRemove}"/></field>
+        <field name="toComplete" title="${uiLabelMap.CommonStatustoComplete}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_COMPLETED" description="${uiLabelMap.CommonStatustoComplete}"/></field>
     </form>
     <form name="assignTaskToMe" type="single" target="addTaskAssignment"
         header-row-style="header-row" default-table-style="basic-table">
-        <field name="partyId"><hidden value="${userLogin.partyId}"/></field>
+        <field name="partyId"><hidden value="${userLogin.partyId}"/></field>
         <field name="statusId"><hidden value="PAS_ASSIGNED"/></field>
         <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}">
             <drop-down>
                 <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${workEffortName} (${phaseName}-${projectName})">
                     <entity-constraint name="partyId" env-name="userLogin.partyId"/>
-                    <entity-constraint name="workEffortTypeId" value="TASK"/>
+                    <entity-constraint name="workEffortTypeId" value="TASK"/>
                     <entity-constraint name="currentStatusId" operator="equals" value="PTS_CREATED"/>
                 </entity-options>                
             </drop-down>
@@ -297,45 +297,45 @@
         <field name="addButton"><submit/></field>
     </form>
     <form name="DependenciesBefore" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="Dependencies"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <row-actions>
-            <service service-name="getProjectTask" result-map-name="r">
-                <field-map field-name="taskId" env-name="workEffortIdFrom"/>
-            </service>
-        </row-actions>
-        <field name="workEffortIdTo"><hidden/></field>
-        <field name="workEffortAssocTypeId"><hidden/></field>
-        <field name="fromDate"><hidden/></field>
-        <field name="workEffortId"><hidden/></field>
-        <field name="workEffortIdFrom" title="${uiLabelMap.CommonName}"><hyperlink target="Dependencies?workEffortId=${workEffortIdFrom}" description="${r.taskInfo.taskName}"/></field>
-        <field name="workEffortParentId" entry-name="r.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>        
-        <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
-        <field name="estimatedStartDate" entry-name="r.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
-        <field name="estimatedCompletionDate"  entry-name="r.taskInfo.estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
-        <field name="actualStartDate" entry-name="r.taskInfo.actualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>
-        <field name="actualCompletionDate"  entry-name="r.taskInfo.actualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field>
-        <field name="deleteButton"><submit button-type="button"/></field>
-    </form>
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <row-actions>
+            <service service-name="getProjectTask" result-map-name="r">
+                <field-map field-name="taskId" env-name="workEffortIdFrom"/>
+            </service>
+        </row-actions>
+        <field name="workEffortIdTo"><hidden/></field>
+        <field name="workEffortAssocTypeId"><hidden/></field>
+        <field name="fromDate"><hidden/></field>
+        <field name="workEffortId"><hidden/></field>
+        <field name="workEffortIdFrom" title="${uiLabelMap.CommonName}"><hyperlink target="Dependencies?workEffortId=${workEffortIdFrom}" description="${r.taskInfo.taskName}"/></field>
+        <field name="workEffortParentId" entry-name="r.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>        
+        <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="estimatedStartDate" entry-name="r.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
+        <field name="estimatedCompletionDate"  entry-name="r.taskInfo.estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
+        <field name="actualStartDate" entry-name="r.taskInfo.actualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>
+        <field name="actualCompletionDate"  entry-name="r.taskInfo.actualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field>
+        <field name="deleteButton"><submit button-type="button"/></field>
+    </form>
     <form name="DependenciesAfter" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="Dependencies"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <row-actions>
-            <service service-name="getProjectTask" result-map-name="r">
-                <field-map field-name="taskId" env-name="workEffortIdTo"/>
-            </service>
-        </row-actions>
-        <field name="workEffortIdFrom"><hidden/></field>
-        <field name="workEffortAssocTypeId"><hidden/></field>
-        <field name="fromDate"><hidden/></field>
-        <field name="workEffortId"><hidden/></field>
-        <field name="workEffortIdTo" title="${uiLabelMap.CommonName}"><hyperlink target="Dependencies?workEffortId=${workEffortIdTo}" description="${r.taskInfo.taskName}"/></field>
-        <field name="workEffortParentId" entry-name="r.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>        
-        <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
-        <field name="estimatedStartDate" entry-name="r.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
-        <field name="estimatedCompletionDate"  entry-name="r.taskInfo.estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
-        <field name="actualStartDate" entry-name="r.taskInfo.actualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>
-        <field name="actualCompletionDate"  entry-name="r.taskInfo.actualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field>
-        <field name="deleteButton"><submit button-type="button"/></field>
-    </form>
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <row-actions>
+            <service service-name="getProjectTask" result-map-name="r">
+                <field-map field-name="taskId" env-name="workEffortIdTo"/>
+            </service>
+        </row-actions>
+        <field name="workEffortIdFrom"><hidden/></field>
+        <field name="workEffortAssocTypeId"><hidden/></field>
+        <field name="fromDate"><hidden/></field>
+        <field name="workEffortId"><hidden/></field>
+        <field name="workEffortIdTo" title="${uiLabelMap.CommonName}"><hyperlink target="Dependencies?workEffortId=${workEffortIdTo}" description="${r.taskInfo.taskName}"/></field>
+        <field name="workEffortParentId" entry-name="r.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>        
+        <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="estimatedStartDate" entry-name="r.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
+        <field name="estimatedCompletionDate"  entry-name="r.taskInfo.estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
+        <field name="actualStartDate" entry-name="r.taskInfo.actualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>
+        <field name="actualCompletionDate"  entry-name="r.taskInfo.actualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field>
+        <field name="deleteButton"><submit button-type="button"/></field>
+    </form>
     <form name="AddDependencyBefore" type="single" target="addDependency"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="workEffortId"><hidden/></field>
@@ -360,7 +360,7 @@
         <field name="workEffortAssocTypeId"><hidden value="WORK_EFF_DEPENDENCY"/></field>
         <field name="relatedTasks" parameter-name="workEffortIdTo">
             <drop-down>
-                <entity-options entity-name="ProjectAndPhaseAndTask" key-field-name="workEffortId" description="${workEffortName} -- ${phaseName}">
+                <entity-options entity-name="ProjectAndPhaseAndTask" key-field-name="workEffortId" description="${workEffortName} -- ${phaseName}">
                     <entity-constraint name="projectId" value="${projectId}"/>
                     <entity-constraint name="workEffortId" operator="not-equals" env-name="workEffortId"/>
                     <entity-order-by field-name="phaseName"/>
@@ -371,103 +371,103 @@
         <field name="add"><submit/></field>
     </form>
     <form name="ListTaskSkills" type="list" target="updateTaskSkillStandard" list-name="workEffortSkillStandards" paginate-target="EditTaskSkills" separate-columns="true"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <field name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}">
-            <display-entity entity-name="WorkEffort" description="${workEffortName}">
-                <sub-hyperlink target="EditTask?workEffortId=${workEffortId}" description="${workEffortId}" link-style="buttontext"/>
-            </display-entity>
-        </field>
-        <field name="skillTypeId" title="${uiLabelMap.ProjectMgrSkillType}"><display-entity entity-name="SkillType" description="${description}"/></field>
-        <field name="estimatedNumPeople" title="${uiLabelMap.ProjectMgrEstimatedNumPeople}"><text/></field>
-        <field name="estimatedDuration" title="${uiLabelMap.ProjectMgrEstimatedDuration}"><text/></field>
-        <field name="estimatedCost" title="${uiLabelMap.ProjectMgrEstimatedCost}" widget-style="linktext"><text/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
-    </form>
-    <form name="ListTimeEntries" type="list" list-name="timesheetEntries" target="updateTimeEntry" paginate-target="EditTimeEntries"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <actions>
-            <entity-condition entity-name="TimeEntry">
-                <condition-expr field-name="workEffortId" env-name="workEffortId"/>
-                <order-by field-name="timesheetId"/>
-                <order-by field-name="partyId"/>
-                <order-by field-name="rateTypeId"/>
-                <order-by field-name="-fromDate"/>
-            </entity-condition>
-        </actions>
-        <auto-fields-service service-name="updateTimeEntry"/>        
-        <field name="fixedAssetId"><hidden/></field>
-        <field name="maintHistSeqId"><hidden/></field>
-        <field name="timeEntryId"><hidden/></field>
-        <field name="workEffortId"><hidden/></field>
-        <field name="timesheetId"><hyperlink target="Timesheet?timesheetId=${timesheetId}" description="${timesheetId}"/></field>
-        <field name="partyId">
-            <drop-down allow-empty="false">
-                <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${middleName} ${lastName}">
-                    <entity-constraint name="roleTypeId" operator="equals" value="PROJECT_TEAM"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
-            <drop-down no-current-selected-key="STANDARD">
-                <entity-options entity-name="RateType" description="${description}">
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="invoiceId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field>
-        <field name="invoiceItemSeqId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field>
-        <field name="fromDate"><date-time type="date"/></field>
-        <field name="thruDate"><ignored/></field><!-- not used in project manager -->
-        <field name="invoiceInfo"><hidden/></field>
-        <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?workEffortId=${workEffortId}&amp;timeEntryId=${timeEntryId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
-        </field>
-    </form>
-    <form name="createTimeEntry" type="single" target="createTimeEntry" header-row-style="header-row" default-table-style="basic-table">
-        <field name="fromDate" title="${uiLabelMap.CommonDate}"><date-time type="date"/></field>
-        <field name="hours"><text size="10"/></field>
-        <field name="partyId">
-            <drop-down allow-empty="false">
-                <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${middleName} ${lastName}">
-                    <entity-constraint name="roleTypeId" operator="equals" value="PROJECT_TEAM"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
-            <drop-down no-current-selected-key="STANDARD">
-                <entity-options entity-name="RateType" description="${description}">
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="comments"><text size="40"/></field>
-        <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field>
-        <field name="addButton" title="${uiLabelMap.CommonAdd}"><submit/></field>
-    </form>    
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <field name="workEffortId" title="${uiLabelMap.ProjectMgrWorkEffortId}">
+            <display-entity entity-name="WorkEffort" description="${workEffortName}">
+                <sub-hyperlink target="EditTask?workEffortId=${workEffortId}" description="${workEffortId}" link-style="buttontext"/>
+            </display-entity>
+        </field>
+        <field name="skillTypeId" title="${uiLabelMap.ProjectMgrSkillType}"><display-entity entity-name="SkillType" description="${description}"/></field>
+        <field name="estimatedNumPeople" title="${uiLabelMap.ProjectMgrEstimatedNumPeople}"><text/></field>
+        <field name="estimatedDuration" title="${uiLabelMap.ProjectMgrEstimatedDuration}"><text/></field>
+        <field name="estimatedCost" title="${uiLabelMap.ProjectMgrEstimatedCost}" widget-style="linktext"><text/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+    </form>
+    <form name="ListTimeEntries" type="list" list-name="timesheetEntries" target="updateTimeEntry" paginate-target="EditTimeEntries"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <actions>
+            <entity-condition entity-name="TimeEntry">
+                <condition-expr field-name="workEffortId" env-name="workEffortId"/>
+                <order-by field-name="timesheetId"/>
+                <order-by field-name="partyId"/>
+                <order-by field-name="rateTypeId"/>
+                <order-by field-name="-fromDate"/>
+            </entity-condition>
+        </actions>
+        <auto-fields-service service-name="updateTimeEntry"/>        
+        <field name="fixedAssetId"><hidden/></field>
+        <field name="maintHistSeqId"><hidden/></field>
+        <field name="timeEntryId"><hidden/></field>
+        <field name="workEffortId"><hidden/></field>
+        <field name="timesheetId"><hyperlink target="Timesheet?timesheetId=${timesheetId}" description="${timesheetId}"/></field>
+        <field name="partyId">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${middleName} ${lastName}">
+                    <entity-constraint name="roleTypeId" operator="equals" value="PROJECT_TEAM"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+            <drop-down no-current-selected-key="STANDARD">
+                <entity-options entity-name="RateType" description="${description}">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="invoiceId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field>
+        <field name="invoiceItemSeqId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field>
+        <field name="fromDate"><date-time type="date"/></field>
+        <field name="thruDate"><ignored/></field><!-- not used in project manager -->
+        <field name="invoiceInfo"><hidden/></field>
+        <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?workEffortId=${workEffortId}&amp;timeEntryId=${timeEntryId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+        </field>
+    </form>
+    <form name="createTimeEntry" type="single" target="createTimeEntry" header-row-style="header-row" default-table-style="basic-table">
+        <field name="fromDate" title="${uiLabelMap.CommonDate}"><date-time type="date"/></field>
+        <field name="hours"><text size="10"/></field>
+        <field name="partyId">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${middleName} ${lastName}">
+                    <entity-constraint name="roleTypeId" operator="equals" value="PROJECT_TEAM"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+            <drop-down no-current-selected-key="STANDARD">
+                <entity-options entity-name="RateType" description="${description}">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="comments"><text size="40"/></field>
+        <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field>
+        <field name="addButton" title="${uiLabelMap.CommonAdd}"><submit/></field>
+    </form>    
     <form name="ListTaskNotes" extends="ListWorkEffortNotes" extends-resource="component://workeffort/widget/WorkEffortForms.xml" type="list" list-name="taskNotes" paginate-target="EditTaskNotes"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <actions>
-            <entity-condition entity-name="WorkEffortNoteAndData">
-                <condition-expr field-name="workEffortId" env-name="workEffortId"/>
-                <order-by field-name="noteId"/>
-            </entity-condition>
-        </actions>
-        <field name="noteId" widget-style="tabletext"><hidden/></field>
-        <field name="workEffortId"><hidden/></field>
-        <field name="noteParty" title="${uiLabelMap.CommonBy}" widget-style="tabletext"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${bsh: org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, &quot;dd-MM-yyyy HH:mm&quot;, TimeZone.getDefault(), context.get(&quot;locale&quot;))}"/></field>
-    
-        <field name="Private/Public" widget-style="buttontext" use-when="internalNote.equals(&quot;N&quot;)">
-            <hyperlink target="updateTaskNote?workEffortId=${workEffortId}&amp;noteId=${noteId}&amp;internalNote=Y" description="${uiLabelMap.OrderNotesPrivate}"></hyperlink>
-        </field>
-        <field name="Private/Public" widget-style="buttontext" use-when="internalNote.equals(&quot;Y&quot;)">
-            <hyperlink target="updateTaskNote?workEffortId=${workEffortId}&amp;noteId=${noteId}&amp;internalNote=N" description="${uiLabelMap.OrderNotesPublic}"></hyperlink>
-        </field>
-    </form>
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <actions>
+            <entity-condition entity-name="WorkEffortNoteAndData">
+                <condition-expr field-name="workEffortId" env-name="workEffortId"/>
+                <order-by field-name="noteId"/>
+            </entity-condition>
+        </actions>
+        <field name="noteId" widget-style="tabletext"><hidden/></field>
+        <field name="workEffortId"><hidden/></field>
+        <field name="noteParty" title="${uiLabelMap.CommonBy}" widget-style="tabletext"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${bsh: org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, &quot;dd-MM-yyyy HH:mm&quot;, TimeZone.getDefault(), context.get(&quot;locale&quot;))}"/></field>
+    
+        <field name="Private/Public" widget-style="buttontext" use-when="internalNote.equals(&quot;N&quot;)">
+            <hyperlink target="updateTaskNote?workEffortId=${workEffortId}&amp;noteId=${noteId}&amp;internalNote=Y" description="${uiLabelMap.OrderNotesPrivate}"></hyperlink>
+        </field>
+        <field name="Private/Public" widget-style="buttontext" use-when="internalNote.equals(&quot;Y&quot;)">
+            <hyperlink target="updateTaskNote?workEffortId=${workEffortId}&amp;noteId=${noteId}&amp;internalNote=N" description="${uiLabelMap.OrderNotesPublic}"></hyperlink>
+        </field>
+    </form>
     <form name="AddTaskNote" extends="AddWorkEffortNote" extends-resource="component://workeffort/widget/WorkEffortForms.xml" type="single" target="createTaskNote" title=""
         header-row-style="header-row" default-table-style="basic-table">
-    </form>
+    </form>
     <form name="TaskInfo" type="single" default-map-name="task"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="taskName" title="${uiLabelMap.ProjectMgrTaskName}"><display/></field>
@@ -505,141 +505,141 @@
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
         <field name="deleteButton" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="complete"><hyperlink description="set to Complete" target="updateTaskPartyAssign?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=CAL_COMPLETED&amp;thruDate=${nowDate}"/></field>
-    </form>
+    </form>
     <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="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyName}"/>
-        </field>
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <field name="partyId" title="${uiLabelMap.CommonName}">
+            <hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyName}"/>
+        </field>
         <field name="roleTypeId" title="${uiLabelMap.ProjectMgrPartyRoleTypeId}"><display-entity entity-name="RoleType" description="${description}"/></field>        
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>        
-        <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
-        <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
-        <field name="actualHours"><display/></field>
-    </form>  
+        <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
+        <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
+        <field name="actualHours"><display/></field>
+    </form>  
     <form name="ListWorkEffortRequests" type="list"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <actions>
-            <entity-and entity-name="WorkEffortCustRequestView">
-                <field-map field-name="workEffortId"/>
-            </entity-and>
-        </actions>
-        <field name="workEffortId"><hidden/></field>
-        <field name="custRequestId" widget-style="buttontext"><hyperlink description="${custRequestId}" target="/projectmgr/control/ViewRequest?custRequestId=${custRequestId}" target-type="inter-app"/></field>
-        <field name="description"><display/></field>
-        <field name="custRequestTypeDescription"><display/></field>
-        <field name="statusItemDescription"><display/></field>
-    </form>
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <actions>
+            <entity-and entity-name="WorkEffortCustRequestView">
+                <field-map field-name="workEffortId"/>
+            </entity-and>
+        </actions>
+        <field name="workEffortId"><hidden/></field>
+        <field name="custRequestId" widget-style="buttontext"><hyperlink description="${custRequestId}" target="/projectmgr/control/ViewRequest?custRequestId=${custRequestId}" target-type="inter-app"/></field>
+        <field name="description"><display/></field>
+        <field name="custRequestTypeDescription"><display/></field>
+        <field name="statusItemDescription"><display/></field>
+    </form>
     <form name="TaskBefore" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="taskView"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <row-actions>
-            <service service-name="getProjectTask" result-map-name="result">
-                <field-map field-name="taskId" env-name="workEffortIdFrom"/>
-            </service>
-            <set field="task" from-field="result.taskInfo"/>
-            <set field="currentStatusId" from-field="task.currentStatusId"/>
-            <set field="taskName" from-field="task.taskName"/>
-            <set field="workEffortParentId" from-field="task.workEffortParentId"/>
-        </row-actions>
-        <field name="workEffortIdTo"><hidden/></field>
-        <field name="workEffortAssocTypeId"><hidden/></field>
-        <field name="fromDate"><hidden/></field>
-        <field name="workEffortId"><hidden/></field>
-        <field name="workEffortIdFrom" title="${uiLabelMap.CommonName}"><hyperlink target="taskView?workEffortId=${workEffortIdFrom}" description="${taskName}"/></field>
-        <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>        
-        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
-        <field name="estimatedStartDate" entry-name="workEffortToEstimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
-        <field name="estimatedCompletionDate"  entry-name="workEffortToEstimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
-        <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>
-        <field name="actualCompletionDate"  entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field>
-    </form>
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <row-actions>
+            <service service-name="getProjectTask" result-map-name="result">
+                <field-map field-name="taskId" env-name="workEffortIdFrom"/>
+            </service>
+            <set field="task" from-field="result.taskInfo"/>
+            <set field="currentStatusId" from-field="task.currentStatusId"/>
+            <set field="taskName" from-field="task.taskName"/>
+            <set field="workEffortParentId" from-field="task.workEffortParentId"/>
+        </row-actions>
+        <field name="workEffortIdTo"><hidden/></field>
+        <field name="workEffortAssocTypeId"><hidden/></field>
+        <field name="fromDate"><hidden/></field>
+        <field name="workEffortId"><hidden/></field>
+        <field name="workEffortIdFrom" title="${uiLabelMap.CommonName}"><hyperlink target="taskView?workEffortId=${workEffortIdFrom}" description="${taskName}"/></field>
+        <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>        
+        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="estimatedStartDate" entry-name="workEffortToEstimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
+        <field name="estimatedCompletionDate"  entry-name="workEffortToEstimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
+        <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>
+        <field name="actualCompletionDate"  entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field>
+    </form>
     <form name="TaskAfter" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="taskView"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <row-actions>
-            <service service-name="getProjectTask" result-map-name="result">
-                <field-map field-name="taskId" env-name="workEffortIdTo"/>
-            </service>
-            <set field="task" from-field="result.taskInfo"/>
-            <set field="currentStatusId" from-field="task.currentStatusId"/>
-            <set field="taskName" from-field="task.taskName"/>
-            <set field="workEffortParentId" from-field="task.workEffortParentId"/>
-        </row-actions>
-        <field name="workEffortIdFrom"><hidden/></field>
-        <field name="workEffortAssocTypeId"><hidden/></field>
-        <field name="fromDate"><hidden/></field>
-        <field name="workEffortId"><hidden/></field>
-        <field name="workEffortIdTo" title="${uiLabelMap.CommonName}"><hyperlink target="taskView?workEffortId=${workEffortIdTo}" description="${taskName}"/></field>
-        <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>        
-        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
-        <field name="estimatedStartDate" entry-name="workEffortToEstimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
-        <field name="estimatedCompletionDate"  entry-name="workEffortToEstimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
-        <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>
-        <field name="actualCompletionDate"  entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field>
-    </form>    
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <row-actions>
+            <service service-name="getProjectTask" result-map-name="result">
+                <field-map field-name="taskId" env-name="workEffortIdTo"/>
+            </service>
+            <set field="task" from-field="result.taskInfo"/>
+            <set field="currentStatusId" from-field="task.currentStatusId"/>
+            <set field="taskName" from-field="task.taskName"/>
+            <set field="workEffortParentId" from-field="task.workEffortParentId"/>
+        </row-actions>
+        <field name="workEffortIdFrom"><hidden/></field>
+        <field name="workEffortAssocTypeId"><hidden/></field>
+        <field name="fromDate"><hidden/></field>
+        <field name="workEffortId"><hidden/></field>
+        <field name="workEffortIdTo" title="${uiLabelMap.CommonName}"><hyperlink target="taskView?workEffortId=${workEffortIdTo}" description="${taskName}"/></field>
+        <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>        
+        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="estimatedStartDate" entry-name="workEffortToEstimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
+        <field name="estimatedCompletionDate"  entry-name="workEffortToEstimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
+        <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>
+        <field name="actualCompletionDate"  entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field>
+    </form>    
     <form name="createTaskbyRequest" type="single" target="CreateTaskbyRequests"
-        header-row-style="header-row" default-table-style="basic-table">
-        <actions>
-            <entity-and entity-name="WorkEffortCustRequestView">
-                <field-map field-name="workEffortId"/>
-                </entity-and>
-            </actions>
-        <field name="custRequestId"><hidden value="${parameters.custRequestId}"/></field>
-        <field name="projectId"><hidden value="${parameters.projectId}"/></field>
-        <field name="workEffortTypeId"><hidden value="TASK"/></field>
-        <field name="currentStatusId"><hidden value="CAL_ACCEPTED"/></field>
-        <field name="statusId"><hidden value="CRQ_ACCEPTED"/></field>
-        <field name="taskName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
-        <field name="taskDescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text default-value="${custRequest.description}"/></field>
-        <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrProjectAndPhaseName}*" parameter-name="workEffortParentId">
-            <drop-down allow-empty="true">
-                <entity-options entity-name="ProjectAndPhaseAndTask" description="${projectName} : ${phaseName}">    
-                    <entity-order-by field-name="workEffortParentId"/>
-                    </entity-options>
-                </drop-down>
-            </field>
-        <field name="taskPriority" parameter-name="priority" title="${uiLabelMap.CommonPriority}">
-            <drop-down allow-empty="true" current="selected">
-                <option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/>
-                <option key="2" description="2"/>
-                <option key="3" description="3"/>
-                <option key="4" description="4"/>
-                <option key="5" description="5"/>
-                <option key="6" description="6"/>
-                <option key="7" description="7"/>
-                <option key="8" description="8"/>
-                <option key="9" description="9 (${uiLabelMap.WorkEffortPriorityLow})"/>
-                </drop-down>
-            </field>
-        <field name="taskScopeEnumId" parameter-name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}">
-            <drop-down allow-empty="false">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
-                    <entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
-                    </entity-options>
-                </drop-down>
-            </field>
-        <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrProjectAndPhaseName}*">
-            <drop-down allow-empty="true">
-                <entity-options entity-name="ProjectAndPhaseAndTask" description="${projectName} : ${phaseName}">    
-                    <entity-order-by field-name="phaseName"/>
-                    </entity-options>
-                </drop-down>
-            </field>
-        <field name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><date-time type="date"/></field>
-        <field name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><date-time type="date"/></field>
-        <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
+        header-row-style="header-row" default-table-style="basic-table">
+        <actions>
+            <entity-and entity-name="WorkEffortCustRequestView">
+                <field-map field-name="workEffortId"/>
+                </entity-and>
+            </actions>
+        <field name="custRequestId"><hidden value="${parameters.custRequestId}"/></field>
+        <field name="projectId"><hidden value="${parameters.projectId}"/></field>
+        <field name="workEffortTypeId"><hidden value="TASK"/></field>
+        <field name="currentStatusId"><hidden value="CAL_ACCEPTED"/></field>
+        <field name="statusId"><hidden value="CRQ_ACCEPTED"/></field>
+        <field name="taskName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
+        <field name="taskDescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text default-value="${custRequest.description}"/></field>
+        <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrProjectAndPhaseName}*" parameter-name="workEffortParentId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="ProjectAndPhaseAndTask" description="${projectName} : ${phaseName}">    
+                    <entity-order-by field-name="workEffortParentId"/>
+                    </entity-options>
+                </drop-down>
+            </field>
+        <field name="taskPriority" parameter-name="priority" title="${uiLabelMap.CommonPriority}">
+            <drop-down allow-empty="true" current="selected">
+                <option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/>
+                <option key="2" description="2"/>
+                <option key="3" description="3"/>
+                <option key="4" description="4"/>
+                <option key="5" description="5"/>
+                <option key="6" description="6"/>
+                <option key="7" description="7"/>
+                <option key="8" description="8"/>
+                <option key="9" description="9 (${uiLabelMap.WorkEffortPriorityLow})"/>
+                </drop-down>
+            </field>
+        <field name="taskScopeEnumId" parameter-name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                    <entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
+                    </entity-options>
+                </drop-down>
+            </field>
+        <field name="workEffortParentId" title="${uiLabelMap.ProjectMgrProjectAndPhaseName}*">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="ProjectAndPhaseAndTask" description="${projectName} : ${phaseName}">    
+                    <entity-order-by field-name="phaseName"/>
+                    </entity-options>
+                </drop-down>
+            </field>
+        <field name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><date-time type="date"/></field>
+        <field name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><date-time type="date"/></field>
+        <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
     </form>                            
     <form name="CreateCustRequestWorkEffortByExistingTaskForm" type="single" target="createTaskListForms"
-        header-row-style="header-row" default-table-style="basic-table">
-        <field name="custRequestId"><hidden/></field>
-        <field name="statusId"><hidden value="CRQ_ACCEPTED"/></field>
-        <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}">
-            <drop-down allow-empty="false">
-                <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${workEffortName} (${phaseName}-${projectName})">
-                    <entity-constraint name="partyId" env-name="userLogin.partyId"/>
-                    <entity-constraint name="workEffortTypeId" value="TASK"/>
-                    </entity-options>                
-                </drop-down>
-            </field>
-        <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
-    </form>    
+        header-row-style="header-row" default-table-style="basic-table">
+        <field name="custRequestId"><hidden/></field>
+        <field name="statusId"><hidden value="CRQ_ACCEPTED"/></field>
+        <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${workEffortName} (${phaseName}-${projectName})">
+                    <entity-constraint name="partyId" env-name="userLogin.partyId"/>
+                    <entity-constraint name="workEffortTypeId" value="TASK"/>
+                    </entity-options>                
+                </drop-down>
+            </field>
+        <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
+    </form>    
 </forms>

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=634225&r1=634224&r2=634225&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Thu Mar  6 03:32:39 2008
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <form name="EditWeekTimesheet" type="multi" list-name="timeEntries" use-row-submit="true"
         separate-columns="true" target="update${my}Timesheet" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <field name="timesheetId"><hidden/></field>
-        <field name="roleTypeId"><hidden/></field>
+        <field name="timesheetId"><hidden/></field>
+        <field name="roleTypeId"><hidden/></field>
         <field name="fromDate"><hidden/></field>
         <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${workEffortName} -- ${phaseName} -- ${projectName}">
-                    <entity-constraint name="workEffortTypeId" operator="not-equals" value="TASK_TEMPLATE"/>
+                    <entity-constraint name="workEffortTypeId" operator="not-equals" value="TASK_TEMPLATE"/>
                     <entity-constraint name="partyId" env-name="timesheet.partyId"/>
                     <entity-order-by field-name="projectName"/>
                     <entity-order-by field-name="phaseName"/>
                     <entity-order-by field-name="workEffortName"/>
-                </entity-options>
-                <sub-hyperlink target="taskView?workEffortId=${workEffortId}" link-style="buttontext" description="${bsh:workEffortId != void &amp;&amp; !workEffortId.equals(&quot;Totals&quot;) ? workEffortId : &quot;&quot;}"/>
+                </entity-options>
+                <sub-hyperlink target="taskView?workEffortId=${workEffortId}" link-style="buttontext" description="${bsh:workEffortId != void &amp;&amp; !workEffortId.equals(&quot;Totals&quot;) ? workEffortId : &quot;&quot;}"/>
+            </drop-down>
+        </field>
+        <field name="checkComplete"><check/></field>
+        <field name="rateTypeId">
+            <drop-down allow-empty="false" no-current-selected-key="${defaultRateTypeId}">
+                <entity-options entity-name="RateType" description="${description}"/>
             </drop-down>
         </field>
-        <field name="checkComplete"><check/></field>
-        <field name="rateTypeId">
-            <drop-down allow-empty="false" no-current-selected-key="${defaultRateTypeId}">
-                <entity-options entity-name="RateType" description="${description}"/>
-            </drop-down>
-        </field>
         <field name="0" parameter-name="hoursDay0" title="Sun"><text size="5"/></field>
         <field name="1" parameter-name="hoursDay1" title="Mon"><text size="5"/></field>
         <field name="2" parameter-name="hoursDay2" title="Tue"><text size="5"/></field>
@@ -54,7 +54,7 @@
         <field name="update"><submit button-type="button"/></field>
         <field name="_rowSubmit"><check all-checked="true"/></field>
     </form>
-
+
     <form name="ListTimeSheets" type="list" list-name="timesheets" paginate-target="MyTimesheet"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="timesheetId" title="${uiLabelMap.TimesheetTimesheetId}" widget-style="buttontext">
@@ -65,82 +65,82 @@
         <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>
-        <field name="comments" title="${uiLabelMap.CommonComments}"><display/></field>
-        <field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
-            <hyperlink target="${my}StatusToComplete?timesheetId=${timesheetId}&amp;statusId=TIMESHEET_COMPLETED"
-                description="${bsh:statusId.equals(&quot;TIMESHEET_IN_PROCESS&quot;)?&quot;To complete&quot;:&quot;&quot;}" also-hidden="false"/>
-        </field>
-    </form>
+        <field name="comments" title="${uiLabelMap.CommonComments}"><display/></field>
+        <field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
+            <hyperlink target="${my}StatusToComplete?timesheetId=${timesheetId}&amp;statusId=TIMESHEET_COMPLETED"
+                description="${bsh:statusId.equals(&quot;TIMESHEET_IN_PROCESS&quot;)?&quot;To complete&quot;:&quot;&quot;}" also-hidden="false"/>
+        </field>
+    </form>
     <form name="FindTimeSheet" target="FindTimeSheet" title="" type="single"
-        header-row-style="header-row" default-table-style="basic-table">
-        <field name="noConditionFind"><hidden value="Y"/></field>
-        <field name="newTimesheetId" parameter-name="timesheetId"><text-find default-option="contains" ignore-case="true"/></field>
-        <field name="comments"><text-find default-option="contains" ignore-case="true"/></field>
-        <field name="partyId" title="${uiLabelMap.PartyParty}">
-            <drop-down allow-empty="true">
-                <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${lastName}">
-                    <entity-constraint name="roleTypeId" value="PROJECT_TEAM"/>
-                    <entity-order-by field-name="lastName"/>
-                    <entity-order-by field-name="groupName"/>
-                </entity-options>
-            </drop-down>
-        </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-constraint name="statusTypeId" value="TIMESHEET_STATUS"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="fromDate"><date-find/></field>
-        <field name="${uiLabelMap.CommonFind}" title="${uiLabelMap.CommonFind}"><submit/></field>    
-    </form>
+        header-row-style="header-row" default-table-style="basic-table">
+        <field name="noConditionFind"><hidden value="Y"/></field>
+        <field name="newTimesheetId" parameter-name="timesheetId"><text-find default-option="contains" ignore-case="true"/></field>
+        <field name="comments"><text-find default-option="contains" ignore-case="true"/></field>
+        <field name="partyId" title="${uiLabelMap.PartyParty}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${lastName}">
+                    <entity-constraint name="roleTypeId" value="PROJECT_TEAM"/>
+                    <entity-order-by field-name="lastName"/>
+                    <entity-order-by field-name="groupName"/>
+                </entity-options>
+            </drop-down>
+        </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-constraint name="statusTypeId" value="TIMESHEET_STATUS"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="fromDate"><date-find/></field>
+        <field name="${uiLabelMap.CommonFind}" title="${uiLabelMap.CommonFind}"><submit/></field>    
+    </form>
     <form name="ListFindTimeSheet" type="list" list-name="listIt" paginate-target="FindTimeSheet"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="parameters"/>
-                <field-map field-name="entityName" value="Timesheet"/>
-                <field-map field-name="orderBy" value="fromDate DESC"/>
-            </service>
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <actions>
+            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="entityName" value="Timesheet"/>
+                <field-map field-name="orderBy" value="fromDate DESC"/>
+            </service>
         </actions>
         <field name="timesheetId" title="${uiLabelMap.TimesheetTimesheetId}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${timesheetId}" target="Timesheet?timesheetId=${timesheetId}"/>
         </field>
-        <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"/></field>
+        <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></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>
-        <field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
-            <hyperlink target="TimesheetToComplete?timesheetId=${timesheetId}&amp;statusId=TIMESHEET_COMPLETED"
-                description="${bsh:statusId.equals(&quot;TIMESHEET_IN_PROCESS&quot;)?&quot;To complete&quot;:&quot;&quot;}" also-hidden="false"/>
-        </field>
-    </form>
+        <field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
+            <hyperlink target="TimesheetToComplete?timesheetId=${timesheetId}&amp;statusId=TIMESHEET_COMPLETED"
+                description="${bsh:statusId.equals(&quot;TIMESHEET_IN_PROCESS&quot;)?&quot;To complete&quot;:&quot;&quot;}" also-hidden="false"/>
+        </field>
+    </form>
     
     <form name="AddMyWeeklyTimesheet" type="single" target="createMyWeeklyTimesheet" title=""
-        header-row-style="header-row" default-table-style="basic-table">
-        <field name="partyId"><hidden value="${userLogin.partyId}"/></field>
-        <field entry-name="dummy" name="requiredDate"><date-time type="date"/></field>
-        <field name="addButton"><submit/></field>
-    </form>
-    
+        header-row-style="header-row" default-table-style="basic-table">
+        <field name="partyId"><hidden value="${userLogin.partyId}"/></field>
+        <field entry-name="dummy" name="requiredDate"><date-time type="date"/></field>
+        <field name="addButton"><submit/></field>
+    </form>
+    
     <form name="AddWeeklyTimesheet" type="single" target="createWeeklyTimesheet" title=""
-        header-row-style="header-row" default-table-style="basic-table">
-        <field name="partyId" title="${uiLabelMap.PartyParty}">
-            <drop-down allow-empty="true" no-current-selected-key="${timesheet.partyId}">
-                <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${lastName}">
-                    <entity-constraint name="roleTypeId" value="PROJECT_TEAM"/>
-                    <entity-order-by field-name="lastName"/>
-                    <entity-order-by field-name="groupName"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field entry-name="dummy" name="requiredDate"><date-time type="date"/></field>
-        <field name="addButton"><submit/></field>
-    </form>
-    
+        header-row-style="header-row" default-table-style="basic-table">
+        <field name="partyId" title="${uiLabelMap.PartyParty}">
+            <drop-down allow-empty="true" no-current-selected-key="${timesheet.partyId}">
+                <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${lastName}">
+                    <entity-constraint name="roleTypeId" value="PROJECT_TEAM"/>
+                    <entity-order-by field-name="lastName"/>
+                    <entity-order-by field-name="groupName"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field entry-name="dummy" name="requiredDate"><date-time type="date"/></field>
+        <field name="addButton"><submit/></field>
+    </form>
+    
     <form name="AddTimesheetEntry" type="single" target="createTimesheetEntry" title=""
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createTimeEntry"/>
@@ -245,25 +245,25 @@
         </field>
     </form>
     <form name="WeekTimesheet" type="list" list-name="timeEntries" separate-columns="true"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <field name="timesheetId"><hidden/></field>
-        <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}">
-            <hyperlink target="taskView?workEffortId=${workEffortId} " description="${workEffortName}"/>
-        </field>
-        <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display/></field>
-        <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}">
-            <hyperlink target="projectView?projectId=${projectId} " description="${projectName}"/>
-        </field>
-        <field name="checkComplete"><display/></field>
-        <field name="rateTypeId"><display-entity entity-name="RateType" description="${description}"/></field>
-        <field name="0" parameter-name="hoursDay0" title="Sun"><display/></field>
-        <field name="1" parameter-name="hoursDay1" title="Mon"><display/></field>
-        <field name="2" parameter-name="hoursDay2" title="Tue"><display/></field>
-        <field name="3" parameter-name="hoursDay3" title="Wen"><display/></field>
-        <field name="4" parameter-name="hoursDay4" title="Thu"><display/></field>
-        <field name="5" parameter-name="hoursDay5" title="Fri"><display/></field>
-        <field name="6" parameter-name="hoursDay6" title="Sat"><display/></field>
-        <field name="total" title="Act Total"><display/></field>
-        <field name="plannedHours" title="Plan.Hrs"><display/></field>
-    </form>
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <field name="timesheetId"><hidden/></field>
+        <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}">
+            <hyperlink target="taskView?workEffortId=${workEffortId} " description="${workEffortName}"/>
+        </field>
+        <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display/></field>
+        <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}">
+            <hyperlink target="projectView?projectId=${projectId} " description="${projectName}"/>
+        </field>
+        <field name="checkComplete"><display/></field>
+        <field name="rateTypeId"><display-entity entity-name="RateType" description="${description}"/></field>
+        <field name="0" parameter-name="hoursDay0" title="Sun"><display/></field>
+        <field name="1" parameter-name="hoursDay1" title="Mon"><display/></field>
+        <field name="2" parameter-name="hoursDay2" title="Tue"><display/></field>
+        <field name="3" parameter-name="hoursDay3" title="Wen"><display/></field>
+        <field name="4" parameter-name="hoursDay4" title="Thu"><display/></field>
+        <field name="5" parameter-name="hoursDay5" title="Fri"><display/></field>
+        <field name="6" parameter-name="hoursDay6" title="Sat"><display/></field>
+        <field name="total" title="Act Total"><display/></field>
+        <field name="plannedHours" title="Plan.Hrs"><display/></field>
+    </form>
 </forms>

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml