svn commit: r731373 [3/3] - in /ofbiz/trunk/applications: manufacturing/config/ manufacturing/webapp/manufacturing/jobshopmgt/ manufacturing/webapp/manufacturing/routing/ marketing/config/ order/config/ party/config/ party/webapp/partymgr/party/ party/...

[mrisaliti]

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=731373&r1=731372&r2=731373&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Sun Jan  4 14:02:30 2009
@@ -718,7 +718,7 @@
         <field name="workEffortId"><hidden/></field>
         <field name="fromDate"><hidden/></field>
         <field name="rateCurrencyUomId"><hidden/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}"><display-entity entity-name="RateType"/></field>
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}"><display-entity entity-name="RateType"/></field>
         <field name="rateAmount"><display type="currency" currency="${rateCurrencyUomId}"/></field>
         <field name="periodTypeId"><display-entity entity-name="PeriodType" description="${description}"/></field>
         <field name="deleteButton" widget-style="smallSubmit"><submit /></field>
@@ -730,7 +730,7 @@
             <set field="periodTypeId" value="RATE_HOUR"/>
         </actions>
         <field name="workEffortId"><hidden/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
                 <entity-options entity-name="RateType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -777,7 +777,7 @@
         </field>
         
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
                 <entity-options entity-name="RateType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -807,7 +807,7 @@
         <field name="timesheetId"><lookup size="10" target-form-name="LookupTimesheet"/></field>
         
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
                 <entity-options entity-name="RateType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -868,7 +868,7 @@
         <field name="noteId" use-when="noteId != null"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
         <field name="noteInfo" title="${uiLabelMap.CommonNote}"><textarea cols="70" rows="5" /></field>
-        <field name="internalNote" title="${uiLabelMap.WorKEffortInternalNote}">
+        <field name="internalNote" title="${uiLabelMap.WorkEffortInternalNote}">
             <drop-down no-current-selected-key="">
                 <option key="Y" description="${uiLabelMap.CommonYes}"/>
                 <option key="N" description="${uiLabelMap.CommonNo}"/>                

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml?rev=731373&r1=731372&r2=731373&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Sun Jan  4 14:02:30 2009
@@ -24,10 +24,10 @@
         default-selected-style="selected" title="${uiLabelMap.WorkEffortWorkEffortManagerApplication}">
         <menu-item name="task" title="${uiLabelMap.WorkEffortTaskList}"><link target="mytasks"/></menu-item>
         <menu-item name="calendar" title="${uiLabelMap.WorkEffortCalendar}"><link target="day"/></menu-item>
-        <menu-item name="mytime" title="${uiLabelMap.TimesheetMyTime}"><link target="MyTimesheets"/></menu-item>
+        <menu-item name="mytime" title="${uiLabelMap.WorkEffortTimesheetMyTime}"><link target="MyTimesheets"/></menu-item>
         <menu-item name="request" title="${uiLabelMap.WorkEffortRequestList}"><link target="requestlist"/></menu-item>
         <menu-item name="workeffort" title="${uiLabelMap.WorkEffortWorkEffort}"><link target="FindWorkEffort"/></menu-item>
-        <menu-item name="timesheet" title="${uiLabelMap.Timesheet}"><link target="FindTimesheet"/></menu-item>
+        <menu-item name="timesheet" title="${uiLabelMap.WorkEffortTimesheet}"><link target="FindTimesheet"/></menu-item>
         <menu-item name="userJobs" title="${uiLabelMap.WorkEffortJobList}"><link target="UserJobs"/></menu-item>
         
         <menu-item name="Logout" title="Logout" align-style="opposed">
@@ -53,7 +53,7 @@
         <menu-item name="WorkEffortPartyAssigns" title="${uiLabelMap.WorkEffortParties}">
             <link target="ListWorkEffortPartyAssigns?workEffortId=${workEffortId}"/>
         </menu-item>
-        <menu-item name="WorkEffortRates" title="${uiLabelMap.TimesheetRates}">
+        <menu-item name="WorkEffortRates" title="${uiLabelMap.WorkEffortTimesheetRates}">
             <link target="EditWorkEffortRates?workEffortId=${workEffortId}"/>
         </menu-item>
         <menu-item name="WorkEffortCommEvents" title="${uiLabelMap.WorkEffortCommEvents}">
@@ -74,7 +74,7 @@
         <menu-item name="WorkEffortOrderHeaders" title="${uiLabelMap.WorkEffortOrderHeaders}">
             <link target="ListWorkEffortOrderHeaders?workEffortId=${workEffortId}"/>
         </menu-item>
-        <menu-item name="WorkEffortTimeEntries" title="${uiLabelMap.TimesheetTimeEntries}">
+        <menu-item name="WorkEffortTimeEntries" title="${uiLabelMap.WorkEffortTimesheetTimeEntries}">
             <link target="EditWorkEffortTimeEntries?workEffortId=${workEffortId}"/>
         </menu-item>
         <menu-item name="WorkEffortNotes" title="${uiLabelMap.WorkEffortNotes}">