svn commit: r660980 [4/5] - in /ofbiz/trunk/applications/humanres: config/ webapp/humanres/WEB-INF/ widget/ widget/forms/

[ashish-18]

Added: ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml?rev=660980&view=auto
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml (added)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml Wed May 28 08:25:38 2008
@@ -0,0 +1,121 @@
+<?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="ListEmploymentApps" type="multi" list-name="listIt" use-row-submit="true" separate-columns="true" target="updateEmploymentApp?partyId=${partyId}&amp;&amp;referredByPartyId=${partyId}" paginate-target="FindEmploymentApps"
+        odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" >
+        <actions>
+            <set field="partyId" from-field="parameters.partyId"/>
+            <set field="referredByPartyId" from-field="parameters.partyId"/>
+            <entity-one entity-name="EmploymentApp" auto-field-map="true"/>
+            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" env-name="employmentAppCtx"/>
+                <field-map field-name="entityName" value="EmploymentApp"/>
+                <field-map field-name="orderBy" value="applicationId"/>
+            </service>
+        </actions>
+        <row-actions>
+            <set field="applicationId" from-field="applicationId"/>
+        </row-actions>
+        <auto-fields-service default-field-type="hidden" service-name="updateEmploymentApp"/>
+        <field name="applicationId" title="${uiLabelMap.HumanResApplicationId}"><display also-hidden="true"/></field>
+        <field name="statusId">
+            <drop-down allow-empty="true" current-description="">
+                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                    <entity-constraint name="statusTypeId" operator="equals" value="EMPL_POSITION_STATUS"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="emplPositionId" title="${uiLabelMap.FormFieldTitle_emplPositionId}"><lookup target-form-name="LookupEmplPosition"/></field>
+        <field name="employmentAppSourceTypeId">
+            <drop-down allow-empty="true" current-description="">
+                <entity-options description="${employmentAppSourceTypeId}" key-field-name="employmentAppSourceTypeId" entity-name="EmploymentAppSourceType">
+                    <entity-order-by field-name="employmentAppSourceTypeId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="partyId"><hidden/></field>
+        <field name="applyingPartyId" title="${uiLabelMap.FormFieldTitle_applyingPartyId}"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="referredByPartyId" title="${uiLabelMap.FormFieldTitle_referredByPartyId}" use-when="&quot;${referredByPartyId}&quot;.equals(null)"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="referredByPartyId" use-when="referredByPartyId!=null"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="applicationDate" title="${uiLabelMap.FormFieldTitle_applicationDate}"><date-time/></field>
+        <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
+            <hyperlink target="deleteEmploymentApp?applicationId=${applicationId}&amp;&amp;partyId=${partyId}&amp;&amp;referredByPartyId=${referredByPartyId}" description="${uiLabelMap.CommonDelete}" also-hidden="true"/>
+        </field>
+        <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
+    </form>
+    <form name="FindEmploymentApps" type="single" target="FindEmploymentApps" header-row-style="header-row" default-table-style="basic-table" default-map-name="employmentApp">
+        <actions>
+            <set field="referredByPartyId" from-field="parameters.partyId"/>
+        </actions>
+        <auto-fields-entity entity-name="EmploymentApp" default-field-type="find"/>
+        <field name="noConditionFind"><hidden value="Y"/></field>
+        <field name="statusId">
+            <drop-down allow-empty="true" current-description="">
+                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                    <entity-constraint name="statusTypeId" operator="equals" value="EMPL_POSITION_STATUS"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="employmentAppSourceTypeId">
+            <drop-down allow-empty="true" current-description="">
+                <entity-options description="${description}" key-field-name="employmentAppSourceTypeId" entity-name="EmploymentAppSourceType">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="applyingPartyId"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="referredByPartyId" use-when="referredByPartyId==null">
+            <lookup target-form-name="LookupPartyName"/>
+        </field>
+        <field name="referredByPartyId" use-when="referredByPartyId!=null"><hidden/></field>
+         <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="AddEmploymentApp" type="single" target="createEmploymentApp?applicationId=${applicationId}&amp;&amp;partyId=${referredByPartyId}" default-entity-name="EmploymentApp" paginate-target="FindEmploymentApps"
+        header-row-style="header-row" default-table-style="basic-table">
+        <auto-fields-service service-name="createEmploymentApp" default-field-type="hidden"/>
+        <field name="applicationId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>.
+        <field name="emplPositionId"><lookup target-form-name="LookupEmplPosition"/></field>
+        <field name="statusId">
+            <drop-down allow-empty="true" current-description="">
+                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                    <entity-constraint name="statusTypeId" operator="equals" value="EMPL_POSITION_STATUS"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="applyingPartyId"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="referredByPartyId" use-when="employmentApp==null"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="referredByPartyId" use-when="employmentApp!=null"><hidden/></field>
+        <field name="employmentAppSourceTypeId">
+            <drop-down allow-empty="true" current-description="">
+                <entity-options description="${description}" key-field-name="employmentAppSourceTypeId" entity-name="EmploymentAppSourceType">
+                    <entity-order-by field-name="employmentAppSourceTypeId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="applicationDate"><date-time/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>        
+    </form>
+</forms>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=660980&r1=660979&r2=660980&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Wed May 28 08:25:38 2008
@@ -23,21 +23,15 @@
     <form name="FindEmployments" type="single" target="FindEmployments"
         odd-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="Employment" default-field-type="find"/>
-        <field name="roleTypeIdFrom" tooltip="${uiLabelMap.CommonRequired}">
+        <field name="roleTypeIdFrom"><hidden value="INTERNAL_ORGANIZATIO"/></field>
+        <field name="roleTypeIdTo"><hidden value="EMPLOYEE"/></field>  
+        <field name="partyIdFrom" title="${uiLabelMap.HumanResPartyIdFrom}" tooltip="${uiLabelMap.CommonRequired}">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">                    
-                    <entity-order-by field-name="description"/>
+                <entity-options entity-name="PartyRole" description="${partyId}" key-field-name="partyId">
+                    <entity-constraint name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
                 </entity-options>
-            </drop-down>
+            </drop-down>            
         </field>
-        <field name="roleTypeIdTo" tooltip="${uiLabelMap.CommonRequired}">
-            <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">                    
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>  
-        <field name="partyIdFrom" title="${uiLabelMap.HumanResPartyIdFrom}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="partyIdTo" title="${uiLabelMap.HumanResPartyIdTo}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="fromDate"><date-time/></field>
         <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><lookup target-form-name="LookupTerminationReason"/></field>
@@ -51,47 +45,41 @@
         <field name="noConditionFind"><hidden value="Y"/></field>    
         <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="ListEmployments" type="list" target="updateEmployment" paginate-target="FindEmployments" default-entity-name="Employment" list-name="listIt" separate-columns="true"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+    <form name="ListEmployments" type="list" paginate-target="FindEmployments" default-entity-name="Employment" list-name="listIt" separate-columns="true"
+        odd-row-style="alternate-row" header-row-style="header-row-2" 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="inputFields" env-name="employmentCtx"/>
                 <field-map field-name="entityName" value="Employment"/>
             </service>
         </actions>
-        <auto-fields-service service-name="updateEmployment"/>
-        <field name="roleTypeIdFrom" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${roleTypeIdFrom}" target="EditEmployment?partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;fromDate=${fromDate}"/>
-        </field>            
-        <field name="roleTypeIdTo"><display also-hidden="true"/></field>
-        <field name="partyIdFrom"><display also-hidden="true"/></field>
+        <field name="partyIdFrom" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${partyIdFrom}" target="EditEmployment?partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;fromDate=${fromDate}&amp;roleTypeIdTo=${roleTypeIdTo}"/>
+        </field>
         <field name="partyIdTo"><display also-hidden="true"/></field>
         <field name="fromDate"><display also-hidden="true"/></field>
         <field name="thruDate"><display/></field>
         <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display/></field>
-        <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}"><display/></field>        
+        <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}"><display/></field>
     </form>
     <form name="EditEmployment" type="single" target="updateEmployment" default-map-name="employment"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="employment==null" target="createEmployment"/>
         <auto-fields-service service-name="createEmployment" default-field-type="hidden"/>  
-        <field name="roleTypeIdFrom" tooltip="${uiLabelMap.CommonRequired}">
-            <drop-down allow-empty="true" no-current-selected-key="------">
-                <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">                    
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="roleTypeIdTo" tooltip="${uiLabelMap.CommonRequired}">
-            <drop-down allow-empty="false" no-current-selected-key="------">
-                <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">                    
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>        
-        <field name="partyIdFrom" title="${uiLabelMap.HumanResPartyIdFrom}" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="partyIdTo" title="${uiLabelMap.HumanResPartyIdTo}" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="fromDate" title="${uiLabelMap.CommonDate}" tooltip="${uiLabelMap.CommonRequired}"><date-time/></field>
+        <field name="roleTypeIdFrom"><hidden value="INTERNAL_ORGANIZATIO"/></field>
+        <field name="roleTypeIdTo"><hidden value="EMPLOYEE"/></field>        
+        <field name="partyIdFrom" use-when="employment==null" title="${uiLabelMap.HumanResPartyIdFrom}" tooltip="${uiLabelMap.CommonRequired}">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="PartyRole" description="${partyId}" key-field-name="partyId">
+                    <entity-constraint name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
+                </entity-options>
+            </drop-down>            
+        </field>
+        <field name="partyIdFrom" use-when="employment!=null" title="${uiLabelMap.HumanResPartyIdFrom}" widget-style="tabletext" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+        <field name="partyIdTo" use-when="employment==null" title="${uiLabelMap.HumanResPartyIdTo}" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="partyIdTo" use-when="employment!=null" title="${uiLabelMap.HumanResPartyIdTo}" widget-style="tabletext" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+        <field name="fromDate" use-when="employment==null" title="${uiLabelMap.CommonDate}" tooltip="${uiLabelMap.CommonRequired}"><date-time/></field>
+        <field name="fromDate" use-when="employment!=null" title="${uiLabelMap.CommonDate}" widget-style="tabletext" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
         <field name="terminationReasonId" use-when="employment!=null" title="${uiLabelMap.HumanResTerminationReasonId}"><lookup target-form-name="LookupTerminationReason"/></field>
         <field name="terminationTypeId" use-when="employment!=null" title="${uiLabelMap.HumanResTerminationTypeId}">
             <drop-down allow-empty="true" no-current-selected-key="------">
@@ -103,75 +91,6 @@
         <field name="submitButton" use-when="employment==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>        
         <field name="submitButton" use-when="employment!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="ListEmploymentApps" type="multi" list-name="listIt" use-row-submit="true" separate-columns="true" target="updateEmploymentApp?partyId=${partyId}&amp;&amp;referredByPartyId=${partyId}" paginate-target="FindEmploymentApp"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" >
-        <actions>
-            <set field="partyId" from-field="parameters.partyId"/>
-            <set field="referredByPartyId" from-field="parameters.partyId"/>
-            <entity-one entity-name="EmploymentApp" auto-field-map="true"/>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="employmentAppCtx"/>
-                <field-map field-name="entityName" value="EmploymentApp"/>
-                <field-map field-name="orderBy" value="applicationId"/>
-            </service>
-        </actions>
-        <row-actions>
-            <set field="applicationId" from-field="applicationId"/>
-        </row-actions>
-        <auto-fields-service default-field-type="hidden" service-name="updateEmploymentApp"/>
-        <field name="applicationId" title="${uiLabelMap.HumanResApplicationId}"><display also-hidden="true"/></field>
-        <field name="statusId">
-            <drop-down allow-empty="true" current-description="">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
-                    <entity-constraint name="statusTypeId" operator="equals" value="EMPL_POSITION_STATUS"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="emplPositionId" title="${uiLabelMap.FormFieldTitle_emplPositionId}"><lookup target-form-name="LookupEmplPosition"/></field>
-        <field name="employmentAppSourceTypeId">
-            <drop-down allow-empty="true" current-description="">
-                <entity-options description="${employmentAppSourceTypeId}" key-field-name="employmentAppSourceTypeId" entity-name="EmploymentAppSourceType">
-                    <entity-order-by field-name="employmentAppSourceTypeId"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="partyId"><hidden/></field>
-        <field name="applyingPartyId" title="${uiLabelMap.FormFieldTitle_applyingPartyId}"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="referredByPartyId" title="${uiLabelMap.FormFieldTitle_referredByPartyId}" use-when="&quot;${referredByPartyId}&quot;.equals(null)"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="referredByPartyId" use-when="referredByPartyId!=null"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="applicationDate" title="${uiLabelMap.FormFieldTitle_applicationDate}"><date-time/></field>
-        <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteEmploymentApp?applicationId=${applicationId}&amp;&amp;partyId=${partyId}&amp;&amp;referredByPartyId=${referredByPartyId}" description="${uiLabelMap.CommonDelete}" also-hidden="true"/>
-        </field>
-        <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
-    </form>
-    <form name="AddEmploymentApp" type="single" target="createEmploymentApp?applicationId=${applicationId}&amp;&amp;partyId=${referredByPartyId}" default-entity-name="EmploymentApp" paginate-target="FindEmploymentApp"
-        header-row-style="header-row" default-table-style="basic-table">
-        <auto-fields-service service-name="createEmploymentApp" default-field-type="hidden"/>
-        <field name="emplPositionId"><lookup target-form-name="LookupEmplPosition"/></field>
-        <field name="statusId">
-            <drop-down allow-empty="true" current-description="">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
-                    <entity-constraint name="statusTypeId" operator="equals" value="EMPL_POSITION_STATUS"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="applyingPartyId"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="referredByPartyId" use-when="employmentApp==null"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="referredByPartyId" use-when="employmentApp!=null"><hidden/></field>
-        <field name="employmentAppSourceTypeId">
-            <drop-down allow-empty="true" current-description="">
-                <entity-options description="${employmentAppSourceTypeId}" key-field-name="employmentAppSourceTypeId" entity-name="EmploymentAppSourceType">
-                    <entity-order-by field-name="employmentAppSourceTypeId"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="applicationDate"><date-time/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>        
-    </form>                        
     <form name="ListPayHistories" type="list" target="updatePayHistory" title="" paginate-target="findPayHistories"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
@@ -186,8 +105,8 @@
             </entity-condition>            
         </actions>
         <auto-fields-service service-name="updatePayHistory"/>
-        <field name="roleTypeIdFrom"><display/></field>
-        <field name="roleTypeIdTo"><display/></field>
+        <field name="roleTypeIdFrom"><hidden/></field>
+        <field name="roleTypeIdTo"><hidden/></field>
         <field name="partyIdFrom"><display/></field>
         <field name="partyIdTo"><display/></field>
         <field name="fromDate"><display/></field>        
@@ -207,25 +126,17 @@
             <hyperlink target="deletePayHistory?roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}"/>
         </field>
     </form>          
-    <form name="ListPartyBenefits" type="list" target="updatePartyBenefit" title="" paginate-target="findPartyBenefits"
+    <form name="ListPartyBenefits" type="multi" target="updatePartyBenefit" title="" paginate-target="findPartyBenefits"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <entity-condition entity-name="PartyBenefit" filter-by-date="true">
-                <condition-list combine="and">                    
-                    <condition-expr field-name="roleTypeIdFrom" operator="equals" env-name="parameters.roleTypeIdFrom"/>
-                    <condition-expr field-name="roleTypeIdTo" operator="equals" env-name="parameters.roleTypeIdTo"/>
-                    <condition-expr field-name="partyIdFrom" operator="equals" env-name="parameters.partyIdFrom"/>
-                    <condition-expr field-name="partyIdTo" operator="equals" env-name="parameters.partyIdTo"/>
-                    <condition-expr field-name="fromDate" operator="equals" env-name="parameters.fromDate"/>
-                </condition-list>
-            </entity-condition>
+            <entity-condition entity-name="PartyBenefit"><order-by field-name="fromDate"/></entity-condition>
         </actions>
         <auto-fields-service service-name="updatePartyBenefit"/>        
-        <field name="roleTypeIdFrom"><display/></field>
-        <field name="roleTypeIdTo"><display/></field>
+        <field name="roleTypeIdFrom"><hidden/></field>
+        <field name="roleTypeIdTo"><hidden/></field>
         <field name="partyIdFrom"><display/></field>
         <field name="partyIdTo"><display/></field>
-        <field name="benefitTypeId"><display/></field>
+        <field name="benefitTypeId"><display-entity entity-name="BenefitType" description="${description}"/></field>
         <field name="fromDate"><display/></field>      
         <field name="periodTypeId">
             <drop-down allow-empty="false">
@@ -235,7 +146,8 @@
             </drop-down>
         </field>
         <field name="thruDate"><date-time/></field>      
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+        <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="deletePartyBenefit?benefitTypeId=${benefitTypeId}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}"/>
         </field>
@@ -265,7 +177,7 @@
         </field>        
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
-    <form name="ListPayrollPreferences" type="list" target="updatePayrollPreference" separate-columns="true" paginate-target="findPayRollPreferences"
+    <form name="ListPayrollPreferences" type="multi" target="updatePayrollPreference" separate-columns="true" paginate-target="findPayRollPreferences"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="PayrollPreference">
@@ -278,113 +190,74 @@
         </actions>
         <auto-fields-service default-field-type="hidden" service-name="updatePayrollPreference"/>  
         <field name="partyId"><display/></field>
-        <field name="roleTypeId"><display/></field>
+        <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
         <field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResPayrollPreferenceSeqId}"><display/></field>
-        <field name="paymentMethodTypeId"><display/></field>
-        <field name="periodTypeId"><display/></field>
+        <field name="paymentMethodTypeId"><display-entity entity-name="PaymentMethodType" description="${description}"/></field>
+        <field name="periodTypeId"><display-entity entity-name="PeriodType" description="${description}"/></field>
         <field name="fromDate"><display/></field>
         <field name="thruDate"><date-time/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
+            <hyperlink target="deletePayrollPreference?partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;payrollPreferenceSeqId=${payrollPreferenceSeqId}" description="${uiLabelMap.CommonDelete}" also-hidden="true"/>
+        </field>
+        <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
     </form>
-    <form name="AddPayrollPreference" type="single" target="createPayrollPreference" title="" default-map-name="payrollPreference"
+    <form name="AddPayrollPreference" type="single" target="createPayrollPreference"
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createPayrollPreference" />
-        <field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResPayrollPreferenceSeqId}"><text/></field>
+        <field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResPayrollPreferenceSeqId}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
         <field name="partyId"><hidden/></field>
         <field name="roleTypeId"><hidden/></field>        
         <field name="fromDate"><hidden/></field>        
         <field name="deductionTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${deductionTypeId}" key-field-name="deductionTypeId" entity-name="DeductionType">
+                <entity-options description="${description}" key-field-name="deductionTypeId" entity-name="DeductionType">
                     <entity-order-by field-name="deductionTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="paymentMethodTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${paymentMethodTypeId}" key-field-name="paymentMethodTypeId" entity-name="PaymentMethodType">
+                <entity-options description="${description}" key-field-name="paymentMethodTypeId" entity-name="PaymentMethodType">
                     <entity-order-by field-name="paymentMethodTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="periodTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${periodTypeId}" key-field-name="periodTypeId" entity-name="PeriodType">
+                <entity-options description="${description}" key-field-name="periodTypeId" entity-name="PeriodType">
                     <entity-order-by field-name="periodTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>        
     </form>
-    <form name="FindPayGrades" type="single" target="FindPayGrades" title=""
-        header-row-style="header-row" default-table-style="basic-table">
-        <auto-fields-service service-name="createPayGrade" default-field-type="find"/>
-        <field name="noConditionFind"><hidden value="Y"/></field>
-        <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
-    </form>
-    <form name="ListPayGrades" type="list" list-name="listIt" title="" target="updatePayGrade" paginate-target="FindPayGrade"
+    <form name="ListPerformanceNotes" type="list" target="updatePerformanceNote" title="" paginate-target="findPerformanceNotes"
         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="payGradeCtx"/>
-                <field-map field-name="entityName" value="PayGrade"/>
-            </service>
-        </actions>
-        <auto-fields-service default-field-type="display" service-name="updatePayGrade"/>
-        <field name="payGradeId" title="${uiLabelMap.HumanResPayGradeID}" widget-style="linktext">
-                <hyperlink also-hidden="true" target="EditPayGrade?payGradeId=${payGradeId}" target-type="plain" description="${payGradeId}"/>
-        </field>
-    </form>
-    <form name="EditPayGrade" type="single" target="updatePayGrade" title=""
-        header-row-style="header-row" default-table-style="basic-table" default-map-name="payGrade">
-        <alt-target use-when="payGradeId==null" target="createPayGrade"/>
-        <auto-fields-service default-field-type="edit" service-name="createPayGrade"/>
-        <field use-when="payGrade!=null" name="payGradeId" widget-style="tabletext" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
-        <field use-when="payGrade==null" name="payGradeId"><text/></field>
-        <field name="payGradeName" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
-    </form>
-    <form name="ListSalarySteps" type="list" title="" target="updateSalaryStep" paginate-target="findSalarySteps"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <actions>
-            <entity-condition entity-name="SalaryStep"><order-by field-name="salaryStepSeqId"/></entity-condition>
+            <entity-condition entity-name="PerformanceNote"/>
         </actions>  
-        <auto-fields-service service-name="updateSalaryStep"/>      
-        <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><display/></field>                  
-        <field name="payGradeId"><hidden/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
-        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="deleteSalaryStep?salaryStepSeqId=${salaryStepSeqId}&amp;payGradeId=${payGradeId}" description="${uiLabelMap.CommonDelete}"/>
+        <auto-fields-service default-field-type="display" service-name="updatePerformanceNote"/>
+        <field name="partyId" title="${uiLabelMap.PartyPartyId}">
+           <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView">
+               <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/>
+           </display-entity>
         </field>
-    </form>
-    <form name="AddSalaryStep" type="single" target="createSalaryStep" title=""
-        header-row-style="header-row" default-table-style="basic-table">    
-        <auto-fields-service service-name="createSalaryStep"/>        
-        <field name="salaryStepSeqId"><ignored/></field>
-        <field name="payGradeId"><hidden/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
-    </form>
-    <form name="ListTerminationReasons" type="multi" title="" target="updateTerminationReason" paginate-target="FindTerminationReason"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <actions>
-            <entity-condition entity-name="TerminationReason"><order-by field-name="terminationReasonId"/></entity-condition>
-        </actions>
-        <auto-fields-service default-field-type="display" service-name="updateTerminationReason"/>        
-        <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
-        <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteTerminationReason?terminationReasonId=${terminationReasonId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
-        </field>    
-        <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
-    </form>
-    <form name="AddTerminationReason" type="single" target="createTerminationReason" title="" default-map-name = "terminationReason"
+    </form>      
+    <form name="AddPerformanceNote" type="single" target="createPerformanceNote" default-map-name="performanceNote"
         header-row-style="header-row" default-table-style="basic-table">
-        <auto-fields-service service-name="createTerminationReason"/>
-        <field name="terminationReasonId"><text/></field>
-        <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
+        <auto-fields-service service-name="createPerformanceNote" map-name="performanceNote"/>
+        <field name="partyId"><hidden/></field>
+        <field name="roleTypeId" title="roleType Id">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>        
-    </form>  
-    <form name="ListUnemploymentClaims" type="list" title="" target="updateUnemploymentClaim" paginate-target="FindUnemploymentClaim"
+    </form>
+    <form name="ListUnemploymentClaims" type="multi" target="updateUnemploymentClaim" paginate-target="FindUnemploymentClaim"
          odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
          <actions>
             <entity-condition entity-name="UnemploymentClaim" filter-by-date="true">
@@ -398,12 +271,11 @@
                 <order-by field-name="unemploymentClaimId"/>
             </entity-condition>
         </actions>
-        <auto-fields-service  service-name="updateUnemploymentClaim"/>
         <field name="unemploymentClaimId"><display/></field>
         <field name="partyIdFrom"><display/></field>
         <field name="partyIdTo"><display/></field>
-        <field name="roleTypeIdTo"><display/></field>
-        <field name="roleTypeIdFrom"><display/></field>
+        <field name="roleTypeIdTo"><hidden/></field>
+        <field name="roleTypeIdFrom"><hidden/></field>
         <field name="fromDate"><display/></field>
         <field name="description"><text size="12"/></field>
         <field name="statusId">
@@ -414,7 +286,8 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="deleteUnemploymentClaim?unemploymentClaimId=${unemploymentClaimId}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}"/>
         </field>
@@ -422,7 +295,7 @@
     <form name="AddUnemploymentClaim" type="single" target="createUnemploymentClaim" title="" default-map-name="unemploymentClaim"
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createUnemploymentClaim"/>
-        <field name="unemploymentClaimId"><ignored/></field>
+        <field name="unemploymentClaimId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
         <field name="statusId">
             <drop-down allow-empty="false">
                 <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
@@ -438,109 +311,33 @@
         <field name="fromDate"><hidden/></field>        
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>        
     </form>
-    <form name="CreateEmployee" type="single" target="createEmployee"
-        header-row-style="header-row" default-table-style="basic-table">
-        <field name="salutation" title="${uiLabelMap.CommonTitle}"><text size="10" maxlength="30"/></field>
-        <field name="firstName" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
-        <field name="middleName" title="${uiLabelMap.PartyMiddleInitial}"><text size="4" maxlength="4"/></field>
-        <field name="lastName" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
-        <field name="partyIdFrom" title="${uiLabelMap.OrderOrderEntryInternalOrganziation}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
-            <drop-down allow-empty="true">
-                <entity-options entity-name="PartyRole" key-field-name="partyId" description="${partyId}">
-                    <entity-constraint name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>                    
-                </entity-options>
-                <option key="null" description="-----"/>
-            </drop-down>
-        </field>
-        <field name="fromDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><date-time/></field>
-        <field name="permanentAddress" title="${uiLabelMap.OrderAddress}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
-        <field name="postalAddContactMechPurpTypeId"><hidden value="PRIMARY_LOCATION"/></field>
-        <field name="address1" title="${uiLabelMap.CommonAddress1}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
-        <field name="address2" title="${uiLabelMap.CommonAddress2}"><text size="30" maxlength="60"/></field>
-        <field name="city" title="${uiLabelMap.CommonCity}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
-        <field name="state" title="${uiLabelMap.CommonState}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
-            <drop-down allow-empty="true">
-                <entity-options entity-name="Geo" key-field-name="geoId" description="${geoId} - ${geoName}">
-                    <entity-constraint name="geoTypeId" operator="in" value="STATE,PROVINCE"/>
-                    <entity-order-by field-name="geoId"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="postalCode" title="${uiLabelMap.CommonZipPostalCode}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="10" maxlength="30"/></field>
-        <field name="country" title="${uiLabelMap.CommonCountry}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
-            <drop-down allow-empty="false" no-current-selected-key="${defaultCountryGeoId}">
-                <entity-options entity-name="Geo" key-field-name="geoId" description="${geoId}: ${geoName}">
-                    <entity-constraint name="geoTypeId" value="COUNTRY"/>
-                    <entity-order-by field-name="geoId"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="phoneTitle" title="${uiLabelMap.PartyPrimaryPhone}" title-area-style="group-label"><display/></field>
-        <field name="countryCode" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
-        <field name="areaCode" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
-        <field name="contactNumber" title="${uiLabelMap.PartyPhoneNumber}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="15" maxlength="15"/></field>
-        <field name="extension" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
-        <field name="emailAddressTitle" title="${uiLabelMap.PartyEmailAddress}" title-area-style="group-label"><display/></field>
-        <field name="emailAddress" title="${uiLabelMap.CommonEmail}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="50" maxlength="60"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
-    </form>    
-    <form name="FindEmploymentApps" type="single" target="FindEmploymentApp" header-row-style="header-row" default-table-style="basic-table" default-map-name="employmentApp">
-        <actions>
-            <set field="referredByPartyId" from-field="parameters.partyId"/>
-        </actions>
-        <auto-fields-entity entity-name="EmploymentApp" default-field-type="find"/>
-        <field name="noConditionFind"><hidden value="Y"/></field>
-        <field name="statusId">
-            <drop-down allow-empty="true" current-description="">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
-                    <entity-constraint name="statusTypeId" operator="equals" value="EMPL_POSITION_STATUS"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="employmentAppSourceTypeId">
-            <drop-down allow-empty="true" current-description="">
-                <entity-options description="${description}" key-field-name="employmentAppSourceTypeId" entity-name="EmploymentAppSourceType">
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="applyingPartyId"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="referredByPartyId" use-when="referredByPartyId==null">
-            <lookup target-form-name="LookupPartyName"/>
-        </field>
-        <field name="referredByPartyId" use-when="referredByPartyId!=null"><hidden/></field>
-         <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
-        <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
-    </form>
-    <form name="ListAgreementEmploymentAppls" type="multi" title="" target="updateAgreementEmploymentAppl"
+    <form name="ListAgreementEmploymentAppls" type="multi" title="" target="updateAgreementEmploymentAppl?agreementId=${agreementId}&amp;partyIdTo=${partyIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;fromDate=${fromDate}&amp;agreementItemSeqId=${agreementItemSeqId}" paginate-target="EditAgreementEmploymentAppls"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="AgreementEmploymentAppl"><order-by field-name="fromDate"/></entity-condition>
         </actions>
-        <auto-fields-service service-name="updateAgreementEmploymentAppl" default-field-type="hidden"/>        
-        <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><display/></field>
-        <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><display/></field>        
-        <field name="partyIdFrom" title="${uiLabelMap.HumanResPartyIdFrom}"><display/></field>
-        <field name="partyIdTo" title="${uiLabelMap.HumanResPartyIdTo}"><display/></field>
-        <field name="roleTypeIdFrom"><display/></field>
-        <field name="roleTypeIdTo"><display/></field>
+        <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><display also-hidden="true"/></field>
+        <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><display also-hidden="true"/></field>        
+        <field name="partyIdFrom" title="${uiLabelMap.HumanResPartyIdFrom}"><display also-hidden="true"/></field>
+        <field name="partyIdTo" title="${uiLabelMap.HumanResPartyIdTo}"><display also-hidden="true"/></field>
+        <field name="roleTypeIdFrom"><hidden/></field>
+        <field name="roleTypeIdTo"><hidden/></field>
         <field name="fromDate"><display/></field>
-        <field name="agreementDate"><date-time/></field>
         <field name="thruDate"><date-time/></field>
+        <field name="agreementDate"><date-time/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
             <hyperlink target="deleteAgreementEmploymentAppl?agreementId=${agreementId}&amp;partyIdTo=${partyIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;fromDate=${fromDate}&amp;agreementItemSeqId=${agreementItemSeqId}" description="${uiLabelMap.CommonDelete}" also-hidden="true"/>
         </field>
         <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
     </form>            
-    <form name="AddAgreementEmploymentAppl" type="single" target="createAgreementEmploymentAppl" default-map-name="agreementEmploymentAppl"
+    <form name="AddAgreementEmploymentAppl" type="single" target="createAgreementEmploymentAppl" default-map-name="agreementEmploymentAppl"
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createAgreementEmploymentAppl" default-field-type="display"/>
-        <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><text/></field>
-        <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><text/></field>
-        <field name="partyIdFrom" title="${uiLabelMap.HumanResPartyIdFrom}"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="partyIdTo" title="${uiLabelMap.HumanResPartyIdTo}"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
+        <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
+        <field name="partyIdFrom" title="${uiLabelMap.HumanResPartyIdFrom}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="partyIdTo" title="${uiLabelMap.HumanResPartyIdTo}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeIdFrom" tooltip="${uiLabelMap.CommonRequired}">
             <drop-down allow-empty="false">
                 <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">                    

Added: ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=660980&view=auto
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml (added)
+++ ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml Wed May 28 08:25:38 2008
@@ -0,0 +1,184 @@
+<?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="ListSkillTypes" type="multi" title="" target="updateSkillType"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <actions>
+            <entity-condition entity-name="SkillType"><order-by field-name="skillTypeId"/></entity-condition>
+        </actions>
+        <auto-fields-service service-name="updateSkillType" default-field-type="hidden"/>        
+        <field name="skillTypeId" title="${uiLabelMap.HumanResSkillTypeId}"><display-entity entity-name="SkillType" description="${description}"/></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
+        <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
+            <hyperlink target="deleteSkillType?skillTypeId=${skillTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+        </field>
+        <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
+    </form>            
+    <form name="AddSkillType" type="single" target="createSkillType" default-map-name="skillType"
+        header-row-style="header-row" default-table-style="basic-table">
+        <auto-fields-service service-name="createSkillType" default-field-type="hidden"/>
+        <field name="skillTypeId" title="${uiLabelMap.HumanResSkillTypeId}"><text/></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
+    </form>
+    <form name="ListResponsibilityTypes" type="multi" list-name="responsibilityTypes" target="updateResponsibilityType"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <actions>
+            <entity-condition entity-name="ResponsibilityType"><order-by field-name="responsibilityTypeId"/></entity-condition>
+        </actions>
+        <auto-fields-service service-name="updateResponsibilityType" default-field-type="hidden"/>
+        <field name="responsibilityTypeId" title="${uiLabelMap.HumanResResponsibilityTypeId}"><display-entity entity-name="ResponsibilityType" description="${description}"/></field>
+        <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
+            <hyperlink target="deleteResponsibilityType?responsibilityTypeId=${responsibilityTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+        </field>
+        <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
+        <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
+    </form>
+    <form name="AddResponsibilityType" type="single" target="createResponsibilityType" title="" default-map-name="responsibilityType">
+        <auto-fields-service service-name="createResponsibilityType" default-field-type="hidden"/>
+        <field name="responsibilityTypeId" title="${uiLabelMap.HumanResResponsibilityTypeId}"><text/></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
+    </form>
+    <form name="ListTerminationTypes" type="multi" title="" target="updateTerminationType"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <actions>
+            <entity-condition entity-name="TerminationType"><order-by field-name="terminationTypeId"/></entity-condition>
+        </actions>
+        <auto-fields-service service-name="updateTerminationType" default-field-type="hidden"/>        
+        <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}"><display-entity entity-name="TerminationType" description="${description}"/></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
+        <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
+            <hyperlink target="deleteTerminationType?terminationTypeId=${terminationTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+        </field>
+        <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
+    </form>            
+    <form name="AddTerminationType" type="single" target="createTerminationType" default-map-name="TerminationType"
+        header-row-style="header-row" default-table-style="basic-table">
+        <auto-fields-service service-name="createTerminationType" default-field-type="hidden"/>
+        <field name="terminationTypeId"><text/></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
+    </form>
+    <form name="FindEmplPositionTypes" type="single" header-row-style="header-row" default-table-style="basic-table">
+        <auto-fields-entity entity-name="EmplPositionType" default-field-type="find"/>
+        <field name="noConditionFind"><hidden value="Y"/></field>
+        <field name="emplPositionTypeId"><text/></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
+        <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="ListEmplPositionTypes" type="list" list-name="listIt" target="updateEmplPositionType"
+        odd-row-style="alternate-row" header-row-style="header-row-2" 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="emplPositionTypeCtx"/>
+                <field-map field-name="entityName" value="EmplPositionType"/>
+            </service>
+        </actions>            
+        <auto-fields-service service-name="updateEmplPositionType" default-field-type="hidden"/>        
+        <field name="emplPositionTypeId" title="${uiLabelMap.HumanResEmplPositionType}">
+            <hyperlink also-hidden="false" description="${emplPositionTypeId}" target="EditEmplPositionTypes?emplPositionTypeId=${emplPositionTypeId}"/>
+        </field>
+        <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
+    </form>            
+    <form name="EditEmplPositionTypes" type="single" target="updateEmplPositionType" default-map-name="emplPositionType"
+        header-row-style="header-row" default-table-style="basic-table">
+        <alt-target use-when="emplPositionType==null" target="createEmplPositionType"/>
+        <auto-fields-service service-name="updateEmplPositionType"/>
+        <field name="emplPositionTypeId" use-when="emplPositionType==null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
+        <field name="emplPositionTypeId" use-when="emplPositionType!=null"><display/></field>        
+        <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>        
+        <field name="submitButton" use-when="emplPositionType==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>        
+        <field name="submitButton" use-when="emplPositionType!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="ListEmplPositionTypeRates" type="multi" title="" target="updateEmplPositionTypeRate"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <actions>
+            <entity-condition entity-name="EmplPositionTypeRate"><order-by field-name="fromDate"/></entity-condition>
+        </actions>
+        <auto-fields-service service-name="updateEmplPositionTypeRate" default-field-type="hidden"/>        
+        <field name="emplPositionTypeId"><hidden/></field>
+        <field name="periodTypeId"><display-entity entity-name="PeriodType" description="${description}"/></field>
+        <field name="rateTypeId">
+            <drop-down allow-empty="true" no-current-selected-key="">
+                <entity-options description="${description}" key-field-name="rateTypeId" entity-name="RateType">
+                    <entity-order-by field-name="rateTypeId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="payGradeId"><lookup target-form-name="LookupPayGrade"/></field>        
+        <field name="salaryStepSeqId"><lookup target-form-name="LookupSalaryStep"/></field>
+        <field name="fromDate"><display/></field>
+        <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
+            <hyperlink target="deleteEmplPositionTypeRate?emplPositionTypeId=${emplPositionTypeId}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+        </field>
+        <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
+    </form>            
+    <form name="AddEmplPositionTypeRate" type="single" target="createEmplPositionTypeRate" default-map-name="emplPositionTypeRate" paginate-target="EditEmplPositionTypeRates"
+        header-row-style="header-row" default-table-style="basic-table">
+        <field name="emplPositionTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><hidden/></field>
+        <field name="rateTypeId">
+            <drop-down allow-empty="true" no-current-selected-key="">
+                <entity-options description="${description}" key-field-name="rateTypeId" entity-name="RateType">
+                    <entity-order-by field-name="rateTypeId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="payGradeId"><lookup target-form-name="LookupPayGrade"/></field>        
+        <field name="salaryStepSeqId"><lookup target-form-name="LookupSalaryStep"/></field>  
+        <field name="periodTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
+            <drop-down allow-empty="false">
+                <entity-options description="${description}" key-field-name="periodTypeId" entity-name="PeriodType">
+                    <entity-order-by field-name="periodTypeId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="rate" title="${uiLabelMap.FormFieldTitle_conversionFactor}"><text/></field>
+        <field name="fromDate" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><date-time/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
+    </form>
+    <form name="ListTerminationReasons" type="multi" title="" target="updateTerminationReason" paginate-target="EditTerminationReasons"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <actions>
+            <entity-condition entity-name="TerminationReason"><order-by field-name="terminationReasonId"/></entity-condition>
+        </actions>
+        <auto-fields-service default-field-type="display" service-name="updateTerminationReason"/>        
+        <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display-entity entity-name="TerminationReason" description="${description}"/></field>
+        <field name="description"><text/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
+        <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
+            <hyperlink target="deleteTerminationReason?terminationReasonId=${terminationReasonId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+        </field>    
+        <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
+    </form>
+    <form name="AddTerminationReason" type="single" target="createTerminationReason" title="" default-map-name = "terminationReason"
+        header-row-style="header-row" default-table-style="basic-table">
+        <auto-fields-service service-name="createTerminationReason"/>
+        <field name="terminationReasonId"><text/></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>        
+    </form>
+</forms>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml