svn commit: r901119 - in /ofbiz/trunk/applications/humanres/widget: EmplLeaveScreens.xml HumanresMenus.xml forms/EmplLeaveForms.xml

[erwan]

Author: erwan
Date: Wed Jan 20 10:08:45 2010
New Revision: 901119

URL: http://svn.apache.org/viewvc?rev=901119&view=rev
Log:
Updates on menus and uilabels in the leave management screens (HumanRes)

Modified:
    ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml
    ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml

Modified: ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml?rev=901119&r1=901118&r2=901119&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml Wed Jan 20 10:08:45 2010
@@ -25,6 +25,7 @@
             <actions>
                 <set field="titleProperty" value="HumanResFindEmplLeave"/>
                 <set field="headerItem" value="Leave"/>
+                <set field="tabButtonItem" value="EmployeeLeave"/>
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="leaveTypeId" from-field="parameters.leaveTypeId"/>
                 <set field="fromDate" from-field="parameters.fromDate"/>
@@ -115,7 +116,7 @@
             <actions>
                 <set field="titleProperty" value="HumanResEditEmplLeave"/>
                 <set field="headerItem" value="Leave"/>
-                <set field="tabButtonItem" value="EditEmplLeaves"/>
+                <set field="tabButtonItem" value="EmployeeLeave"/>
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="leaveTypeId" from-field="parameters.leaveTypeId"/>
                 <set field="fromDate" from-field="parameters.fromDate"/>

Modified: ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml?rev=901119&r1=901118&r2=901119&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml Wed Jan 20 10:08:45 2010
@@ -289,7 +289,7 @@
         </menu-item>
     </menu>
     
- <menu name="EmplLeaveReasonTypeTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+    <menu name="EmplLeaveReasonTypeTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
         default-menu-item-name="Employee Leave Reason Type" type="simple" menu-container-style="button-bar tab-bar"
         default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
         <menu-item name="EmplLeaveType" title="${uiLabelMap.HumanResEmployeeLeaveType}">
@@ -303,7 +303,7 @@
     <menu name="EmplLeaveTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
         default-menu-item-name="Employee Leave" type="simple" menu-container-style="button-bar tab-bar"
         default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
-        <menu-item name="Employee Leave" title="${uiLabelMap.HumanResEmployeeLeave}">
+        <menu-item name="EmployeeLeave" title="${uiLabelMap.HumanResEmployeeLeave}">
             <link target="FindEmplLeaves"/>
         </menu-item>
         <menu-item name="Approval" title="${uiLabelMap.HumanResLeaveApproval}">

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=901119&r1=901118&r2=901119&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml Wed Jan 20 10:08:45 2010
@@ -42,7 +42,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="approverPartyId" title="${uiLabelMap.PartyApproverId}"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="approverPartyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="description"><hidden/></field>
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
         <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -117,7 +117,7 @@
         <field name="noConditionFind"><hidden value="Y"/></field>
         <!--<field name="approverPartyId" use-when="!hasAdminPermission"><hidden value="${approverPartyId}"/></field>-->
         <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="leaveStatus" title="${uiLabelMap.HumanResLeaveStatus} ${uiLabelMap.CommonStatus}">
+        <field name="leaveStatus">
             <drop-down allow-empty="true">
                 <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="LEAVE_STATUS"/>
@@ -169,7 +169,7 @@
         <field name="fromDate"><display/></field>
         <field name="thruDate"><display/></field>
         <field name="description"><display/></field>
-        <field name="leaveStatus" title="${uiLabelMap.HumanResLeaveStatus} ${uiLabelMap.CommonStatus}">
+        <field name="leaveStatus" title="${uiLabelMap.HumanResLeaveStatus}">
             <drop-down allow-empty="false">
                 <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="LEAVE_STATUS"/>