svn commit: r636182 [2/2] - in /ofbiz/trunk: applications/humanres/config/ applications/party/config/ applications/workeffort/config
Locked
svn commit: r636182 [2/2] - in /ofbiz/trunk: applications/humanres/config/ applications/party/config/ applications/workeffort/config
 
|
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=636182&r1=636181&r2=636182&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Tue Mar 11 19:45:18 2008 @@ -87,9 +87,9 @@ <hyperlink also-hidden="false" description="${firstName} ${middleName} ${lastName} ${groupName}" target="viewprofile?partyId=${partyId}"/> </field> <field name="roleTypeId"><hidden/></field> - <field name="emailAddess"><hyperlink target="/partymgr/control/EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&partyIdTo=${partyId}&communicationEventTypeId=EMAIL_COMMUNICATION&contactMechIdTo=${contactMechId}&contactMechTypeId=EMAIL_ADDRESS" description="${emailResult.emailAddress}" target-type="inter-app"/></field> - <field use-when="telResult.get("extension")!=null" name="telephone"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber} Ext:${telResult.extension}"/></field> - <field use-when="telResult.get("extension")==null" name="telephone"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber}"/></field> + <field name="emailAddess" title="${uiLabelMap.PartyEmailAddress}"><hyperlink target="/partymgr/control/EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&partyIdTo=${partyId}&communicationEventTypeId=EMAIL_COMMUNICATION&contactMechIdTo=${contactMechId}&contactMechTypeId=EMAIL_ADDRESS" description="${emailResult.emailAddress}" target-type="inter-app"/></field> + <field use-when="telResult.get("extension")!=null" name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber} Ext:${telResult.extension}"/></field> + <field use-when="telResult.get("extension")==null" name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber}"/></field> <field name="contactMechPurposeTypeId" entry-name="telResult.contactMechPurposeTypeId" title="${uiLabelMap.CommonPurpose}"><display-entity entity-name="ContactMechPurposeType"/></field> <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="removeResource?partyId=${partyId}&roleTypeId=${roleTypeId}" description="${uiLabelMap.CommonRemove}"/></field> </form> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=636182&r1=636181&r2=636182&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Tue Mar 11 19:45:18 2008 @@ -37,7 +37,7 @@ <display-entity also-hidden="false" entity-name="StatusItem"/> </field> <field name="description"><display/></field> - <field name="createTaskFromRequest" widget-style="buttontext"> + <field name="createTaskFromRequest" title="${uiLabelMap.ProjectMgrCreateTaskFromRequest}" widget-style="buttontext"> <hyperlink description="${uiLabelMap.ProjectMgrCreateTaskFromRequest}" target="CreateTaskbyRequest?custRequestId=${custRequestId}"/> </field> </form> @@ -53,7 +53,7 @@ </drop-down> </field> <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}"><ignored/></field> - <field name="custRequestCategoryId"> + <field name="custRequestCategoryId" title="${uiLabelMap.ProjectMgrCustRequestCategoryId}"> <drop-down allow-empty="true"> <entity-options entity-name="CustRequestCategory" description="${description}"/> </drop-down> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=636182&r1=636181&r2=636182&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Tue Mar 11 19:45:18 2008 @@ -62,8 +62,8 @@ </entity-options> </drop-down> </field> - <field use-when="myTask!=void" name="estimatedHours"><text size="5"/></field> - <field use-when="myTask!=void" name="skillTypeId"> + <field use-when="myTask!=void" name="estimatedHours" title="${uiLabelMap.ProjectMgrEstimatedHours}"><text size="5"/></field> + <field use-when="myTask!=void" name="skillTypeId" title="${uiLabelMap.HumanResSkillTypeId}"> <drop-down allow-empty="true"> <entity-options entity-name="SkillType" description="${description}"/> </drop-down> @@ -184,7 +184,7 @@ </entity-options> </drop-down> </field> - <field name="projectName"><text-find default-option="contains" ignore-case="true"/></field> + <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><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> </form> @@ -242,7 +242,7 @@ </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 entry-name="result.taskInfo.currentStatusId" name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="priority"><display/></field> <field name="estimatedStartDate"><display type="date"/></field> <field name="estimatedCompletionDate" red-when="before-now"><display type="date"/></field> @@ -250,7 +250,7 @@ <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" description="${description}"/></field> <field name="partyId" parameter-name="newPartyId"> <drop-down> <entity-options entity-name="PartyDetailAndWorkEffortAssign" description="${firstName} ${middleName} ${lastName}"> @@ -351,7 +351,7 @@ </entity-options> </drop-down> </field> - <field name="add"><submit/></field> + <field name="addButton"><submit/></field> </form> <form name="AddDependencyAfter" type="single" target="addDependency" header-row-style="header-row" default-table-style="basic-table"> @@ -368,7 +368,7 @@ </entity-options> </drop-down> </field> - <field name="add"><submit/></field> + <field name="addButton"><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"> @@ -458,10 +458,10 @@ <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, "dd-MM-yyyy HH:mm", TimeZone.getDefault(), context.get("locale"))}"/></field> - <field name="Private/Public" widget-style="buttontext" use-when="internalNote.equals("N")"> + <field name="Private/Public" widget-style="buttontext" title="${uiLabelMap.PorjectMgrPrivateOrPublic}" use-when="internalNote.equals("N")"> <hyperlink target="updateTaskNote?workEffortId=${workEffortId}&noteId=${noteId}&internalNote=Y" description="${uiLabelMap.OrderNotesPrivate}"></hyperlink> </field> - <field name="Private/Public" widget-style="buttontext" use-when="internalNote.equals("Y")"> + <field name="Private/Public" widget-style="buttontext" title="${uiLabelMap.PorjectMgrPrivateOrPublic}" use-when="internalNote.equals("Y")"> <hyperlink target="updateTaskNote?workEffortId=${workEffortId}&noteId=${noteId}&internalNote=N" description="${uiLabelMap.OrderNotesPublic}"></hyperlink> </field> </form> @@ -472,7 +472,7 @@ header-row-style="header-row" default-table-style="basic-table"> <field name="taskName" title="${uiLabelMap.ProjectMgrTaskName}"><display/></field> <field name="taskDescription" title="${uiLabelMap.CommonDescription}"><display/></field> - <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"></display-entity></field> + <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"></display-entity></field> <field name="priority" title="${uiLabelMap.CommonPriority}"><display type="date"/></field> <field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field> <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=636182&r1=636181&r2=636182&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Tue Mar 11 19:45:18 2008 @@ -36,23 +36,23 @@ <sub-hyperlink target="taskView?workEffortId=${workEffortId}" link-style="buttontext" description="${bsh:workEffortId != void && !workEffortId.equals("Totals") ? workEffortId : ""}"/> </drop-down> </field> - <field name="checkComplete"><check/></field> - <field name="rateTypeId"> + <field name="checkComplete" title="${uiLabelMap.ProjectMgrCheckComplete}"><check/></field> + <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}"> <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> - <field name="3" parameter-name="hoursDay3" title="Wen"><text size="5"/></field> - <field name="4" parameter-name="hoursDay4" title="Thu"><text size="5"/></field> - <field name="5" parameter-name="hoursDay5" title="Fri"><text size="5"/></field> - <field name="6" parameter-name="hoursDay6" title="Sat"><text size="5"/></field> - <field name="total" title="Act Total"><display/></field> - <field name="plannedHours" title="Plan.Hrs"><display/></field> - <field name="update"><submit button-type="button"/></field> - <field name="_rowSubmit"><check all-checked="true"/></field> + <field name="0" parameter-name="hoursDay0" title="${uiLabelMap.ProjectMgrSun}"><text size="5"/></field> + <field name="1" parameter-name="hoursDay1" title="${uiLabelMap.ProjectMgrMon}"><text size="5"/></field> + <field name="2" parameter-name="hoursDay2" title="${uiLabelMap.ProjectMgrTue}"><text size="5"/></field> + <field name="3" parameter-name="hoursDay3" title="${uiLabelMap.ProjectMgrWen}"><text size="5"/></field> + <field name="4" parameter-name="hoursDay4" title="${uiLabelMap.ProjectMgrThu}"><text size="5"/></field> + <field name="5" parameter-name="hoursDay5" title="${uiLabelMap.ProjectMgrFri}"><text size="5"/></field> + <field name="6" parameter-name="hoursDay6" title="${uiLabelMap.ProjectMgrSat}"><text size="5"/></field> + <field name="total" title="${uiLabelMap.ProjectMgrActualTotal}"><display/></field> + <field name="plannedHours" title="${uiLabelMap.ProjectMgrPlanHours}"><display/></field> + <field name="updateButton"><submit button-type="button"/></field> + <field name="_rowSubmit" title="${uiLabelMap.ProjectMgrRowSubmit}"><check all-checked="true"/></field> </form> <form name="ListTimeSheets" type="list" list-name="timesheets" paginate-target="MyTimesheet" @@ -60,7 +60,7 @@ <field name="timesheetId" title="${uiLabelMap.TimesheetTimesheetId}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${timesheetId}" target="${my}Timesheet?timesheetId=${timesheetId}"/> </field> - <field name="weekNumber"><display/></field> + <field name="weekNumber" title="${uiLabelMap.ProjectMgrWeekNumber}"><display/></field> <field name="statusId"><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> @@ -68,7 +68,7 @@ <field name="comments" title="${uiLabelMap.CommonComments}"><display/></field> <field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext"> <hyperlink target="${my}StatusToComplete?timesheetId=${timesheetId}&statusId=TIMESHEET_COMPLETED" - description="${bsh:statusId.equals("TIMESHEET_IN_PROCESS")?"To complete":""}" also-hidden="false"/> + description="${bsh:statusId.equals("TIMESHEET_IN_PROCESS")?"${uiLabelMap.CommonStatustoComplete}":""}" also-hidden="false"/> </field> </form> <form name="FindTimeSheet" target="FindTimeSheet" title="" type="single" @@ -122,7 +122,7 @@ <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 entry-name="dummy" name="requiredDate" title="${uiLabelMap.ProjectMgrSelectedDate}"><date-time type="date"/></field> <field name="addButton"><submit/></field> </form> @@ -137,7 +137,7 @@ </entity-options> </drop-down> </field> - <field entry-name="dummy" name="requiredDate"><date-time type="date"/></field> + <field entry-name="dummy" name="requiredDate" title="${uiLabelMap.ProjectMgrSelectedDate}"><date-time type="date"/></field> <field name="addButton"><submit/></field> </form> @@ -254,16 +254,16 @@ <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> + <field name="checkComplete" title="${uiLabelMap.ProjectMgrCheckComplete}"><display/></field> + <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}"><display-entity entity-name="RateType" description="${description}"/></field> + <field name="0" parameter-name="hoursDay0" title="${uiLabelMap.ProjectMgrSun}"><display/></field> + <field name="1" parameter-name="hoursDay1" title="${uiLabelMap.ProjectMgrMon}"><display/></field> + <field name="2" parameter-name="hoursDay2" title="${uiLabelMap.ProjectMgrTue}"><display/></field> + <field name="3" parameter-name="hoursDay3" title="${uiLabelMap.ProjectMgrWen}"><display/></field> + <field name="4" parameter-name="hoursDay4" title="${uiLabelMap.ProjectMgrThu}"><display/></field> + <field name="5" parameter-name="hoursDay5" title="${uiLabelMap.ProjectMgrFri}"><display/></field> + <field name="6" parameter-name="hoursDay6" title="${uiLabelMap.ProjectMgrSat}"><display/></field> + <field name="total" title="${uiLabelMap.ProjectMgrActualTotal}"><display/></field> + <field name="plannedHours" title="${uiLabelMap.ProjectMgrPlanHours}"><display/></field> </form> </forms> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |