diff --git a/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties b/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
index 9e31774ef1..ec0e6ba1fe 100644
--- a/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
+++ b/specialpurpose/projectmgr/config/ProjectMgrUiLabels.properties
@@ -120,7 +120,8 @@ ProjectMgrRelease=Release
ProjectMgrResources=Resources
ProjectMgrResourceName=Resource Name
ProjectMgrSetOnHold=On-Hold
-ProjectMgrSkillStandards=Requirements
+ProjectMgrSkillStandards=Planned Hours
+ProjectMgrTimeEntries=Actual Hours
ProjectMgrSkillType=Skill Type
ProjectMgrSaveAsTemplate=Save As Template
ProjectMgrSubProjectName=Sub Project Name
@@ -162,7 +163,6 @@ ProjectMgrTaskSummary=Task Summary
ProjectMgrTaskNotAssignedPhase=Task not assigned to Phase/Iteration
ProjectMgrToFindTask=To Find Task Give Range
ProjectMgrToFindProject=To Find Project Give Range
-ProjectMgrTimeEntries=Add/Edit Time Entries
PageTitleListTimeEntries=List Time Entries for
ProjectMgrQuickAssignPartyId=Quick Assign Party Id
CommonStatustoComplete=Status to 'complete'
diff --git a/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml b/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml
index f0278a203b..bee7c56efe 100644
--- a/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml
+++ b/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml
@@ -48,11 +48,13 @@ under the License.
-
+
+
-
+
+
diff --git a/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml b/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
index 984f91d857..e148d00653 100644
--- a/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
+++ b/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
@@ -915,4 +915,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/specialpurpose/projectmgr/servicedef/services.xml b/specialpurpose/projectmgr/servicedef/services.xml
index 0181e38f18..ed5f72fff6 100644
--- a/specialpurpose/projectmgr/servicedef/services.xml
+++ b/specialpurpose/projectmgr/servicedef/services.xml
@@ -22,6 +22,16 @@ under the License.
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
Project Manager service definitions.
+
+ Creates TimeEntry and searches for a timesheetId, if required it will create a weekly time sheet, it also assigns the party to the task
+
+
+
+
+
+
+
Creates Timesheet for this week if no required date specified.
diff --git a/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh b/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh
index 38f5255398..25aab2cef9 100644
--- a/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh
+++ b/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh
@@ -106,7 +106,7 @@ void retrieveWorkEffortData() {
workEffortPartyAssign = workEffortPartyAssigns.get(0);
entry.put("fromDate", workEffortPartyAssign.getTimestamp("fromDate"));
entry.put("roleTypeId", workEffortPartyAssign.getString("roleTypeId"));
- if (workEffortPartyAssign.getString("statusId").equals("PAS_COMPLETED")) {
+ if ("PAS_COMPLETED".equals(workEffortPartyAssign.getString("statusId"))) {
entry.put("checkComplete", "Y");
}
}
diff --git a/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml b/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
index 37493b4f32..e649a85897 100644
--- a/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
+++ b/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
@@ -382,7 +382,7 @@
-
+
@@ -807,7 +807,7 @@
-
+
diff --git a/specialpurpose/projectmgr/widget/Menus.xml b/specialpurpose/projectmgr/widget/Menus.xml
index 5c2f4eec86..a1a98022f1 100644
--- a/specialpurpose/projectmgr/widget/Menus.xml
+++ b/specialpurpose/projectmgr/widget/Menus.xml
@@ -260,17 +260,28 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/specialpurpose/projectmgr/widget/ProjectScreens.xml b/specialpurpose/projectmgr/widget/ProjectScreens.xml
index c803f65e12..5438e51526 100644
--- a/specialpurpose/projectmgr/widget/ProjectScreens.xml
+++ b/specialpurpose/projectmgr/widget/ProjectScreens.xml
@@ -605,45 +605,6 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/specialpurpose/projectmgr/widget/TaskScreens.xml b/specialpurpose/projectmgr/widget/TaskScreens.xml
index 11ccf4bb74..bd8c610850 100644
--- a/specialpurpose/projectmgr/widget/TaskScreens.xml
+++ b/specialpurpose/projectmgr/widget/TaskScreens.xml
@@ -356,33 +356,42 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/specialpurpose/projectmgr/widget/forms/ProjectForms.xml b/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
index 04bdded70f..d6a46b0e74 100644
--- a/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
+++ b/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
@@ -411,46 +411,6 @@
-
+
+