svn commit: r762648 [11/11] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/admin/ applications/accounting/script/org/ofbiz/accounting/finaccount/ applications/acco...

Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/controller.xml Tue Apr  7 08:27:15 2009
@@ -98,56 +98,56 @@
     <!-- TO DO
     
     <request-map uri="UploadOagisMessage">
-        <security https="true" auth="true" />
-        <response name="success" type="view" value="UploadOagisMessage" />
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="UploadOagisMessage"/>
     </request-map>
     
     <request-map uri="importConfirmBODOagisMessage">
-        <security https="true" auth="true" />
-        <event type="service" path="" invoke="importConfirmBOD" />
-        <response name="success" type="view" value="UploadOagisMessage" />
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="importConfirmBOD"/>
+        <response name="success" type="view" value="UploadOagisMessage"/>
         <response name="error" type="view" value="UploadOagisMessage"/>
     </request-map>
     
     <request-map uri="importSyncInventoryOagisMessage">
-        <security https="true" auth="true" />
-        <event type="service" path="" invoke="importConfirmBOD" />
-        <response name="success" type="view" value="UploadOagisMessage" />
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="importConfirmBOD"/>
+        <response name="success" type="view" value="UploadOagisMessage"/>
         <response name="error" type="view" value="UploadOagisMessage"/>
     </request-map>
     
     <request-map uri="importAcknowledgementDeliveryOagisMessage">
-        <security https="true" auth="true" />
-        <event type="service" path="" invoke="importConfirmBOD" />
-        <response name="success" type="view" value="UploadOagisMessage" />
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="importConfirmBOD"/>
+        <response name="success" type="view" value="UploadOagisMessage"/>
         <response name="error" type="view" value="UploadOagisMessage"/>
     </request-map>
     
     <request-map uri="importProcessShipmentOagisMessage">
-        <security https="true" auth="true" />
-        <event type="service" path="" invoke="importConfirmBOD" />
-        <response name="success" type="view" value="UploadOagisMessage" />
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="importConfirmBOD"/>
+        <response name="success" type="view" value="UploadOagisMessage"/>
         <response name="error" type="view" value="UploadOagisMessage"/>
     </request-map>
     
     <request-map uri="importShowShipmentOagisMessage">
-        <security https="true" auth="true" />
-        <event type="service" path="" invoke="importConfirmBOD" />
-        <response name="success" type="view" value="UploadOagisMessage" />
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="importConfirmBOD"/>
+        <response name="success" type="view" value="UploadOagisMessage"/>
         <response name="error" type="view" value="UploadOagisMessage"/>
     </request-map>
     
     <request-map uri="importAcknowledgementDeliveryOagisMessage">
-        <security https="true" auth="true" />
-        <event type="service" path="" invoke="importConfirmBOD" />
-        <response name="success" type="view" value="UploadOagisMessage" />
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="importConfirmBOD"/>
+        <response name="success" type="view" value="UploadOagisMessage"/>
         <response name="error" type="view" value="UploadOagisMessage"/>
     </request-map>
     
     <request-map uri="importReceiveDeliveryOagisMessage">
-        <security https="true" auth="true" />
-        <event type="service" path="" invoke="importConfirmBOD" />
-        <response name="success" type="view" value="UploadOagisMessage" />
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="importConfirmBOD"/>
+        <response name="success" type="view" value="UploadOagisMessage"/>
         <response name="error" type="view" value="UploadOagisMessage"/>
     </request-map>
     -->

Modified: ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml Tue Apr  7 08:27:15 2009
@@ -5,86 +5,86 @@
     <!-- user 'admin' has full access and can create projects, add resources etc.  -->
     
     <!-- Demo Employee is an employee with no access to any projects-->
-    <Party partyId="DemoEmployee" partyTypeId="PERSON" statusId="PARTY_ENABLED" />
-    <Person partyId="DemoEmployee" firstName="Demo" lastName="Employee" />
+    <Party partyId="DemoEmployee" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
+    <Person partyId="DemoEmployee" firstName="Demo" lastName="Employee"/>
     <UserLogin userLoginId="DemoEmployee" partyId="DemoEmployee"/>
     <PartyRole partyId="DemoEmployee" roleTypeId="EMPLOYEE"/>
     <PartyRole partyId="DemoEmployee" roleTypeId="PROVIDER_ANALYST"/>
-    <PartyContactMech partyId="DemoEmployee" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
-    <PartyContactMech partyId="DemoEmployee" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
-    <PartyContactMech partyId="DemoEmployee" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
+    <PartyContactMech partyId="DemoEmployee" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
+    <PartyContactMech partyId="DemoEmployee" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
+    <PartyContactMech partyId="DemoEmployee" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
     <PartyRole partyId="DemoEmployee" roleTypeId="PROJECT_TEAM"/>
     <UserLoginSecurityGroup groupId="PROJECTADMIN" userLoginId="DemoEmployee" fromDate="2000-01-01 00:00:00.0"/>
     
     <!-- Demo Employee1 manager is a projectmanager of both projects and can can maintain data within the project-->
-    <Party partyId="DemoEmployee1" partyTypeId="PERSON" statusId="PARTY_ENABLED" />
-    <Person partyId="DemoEmployee1" firstName="Peter" lastName="Manager" />
+    <Party partyId="DemoEmployee1" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
+    <Person partyId="DemoEmployee1" firstName="Peter" lastName="Manager"/>
     <UserLogin userLoginId="DemoEmployee1" partyId="DemoEmployee1"/>
     <PartyRole partyId="DemoEmployee1" roleTypeId="EMPLOYEE"/>
     <PartyRole partyId="DemoEmployee1" roleTypeId="PROVIDER_MANAGER"/>
-    <PartyContactMech partyId="DemoEmployee1" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
-    <PartyContactMech partyId="DemoEmployee1" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
-    <PartyContactMech partyId="DemoEmployee1" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
+    <PartyContactMech partyId="DemoEmployee1" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
+    <PartyContactMech partyId="DemoEmployee1" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
+    <PartyContactMech partyId="DemoEmployee1" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
     <PartyRole partyId="DemoEmployee1" roleTypeId="PROJECT_TEAM"/>
     <UserLoginSecurityGroup groupId="PROJECTADMIN" userLoginId="DemoEmployee1" fromDate="2000-01-01 00:00:00.0"/>
     
     <!-- Demo Employee2 analist of project 1 can register time, accept and assign tasks withn his project 1 only-->
-    <Party partyId="DemoEmployee2" partyTypeId="PERSON" statusId="PARTY_ENABLED" />
-    <Person partyId="DemoEmployee2" firstName="Jo" lastName="Analist1" />
+    <Party partyId="DemoEmployee2" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
+    <Person partyId="DemoEmployee2" firstName="Jo" lastName="Analist1"/>
     <UserLogin userLoginId="DemoEmployee2"  partyId="DemoEmployee2"/>
     <PartyRole partyId="DemoEmployee2" roleTypeId="PROVIDER_ANALYST"/>
     <PartyRole partyId="DemoEmployee2" roleTypeId="EMPLOYEE"/>
-    <PartyContactMech partyId="DemoEmployee2" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
-    <PartyContactMech partyId="DemoEmployee2" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
-    <PartyContactMech partyId="DemoEmployee2" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
+    <PartyContactMech partyId="DemoEmployee2" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
+    <PartyContactMech partyId="DemoEmployee2" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
+    <PartyContactMech partyId="DemoEmployee2" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
     <PartyRole partyId="DemoEmployee2" roleTypeId="PROJECT_TEAM"/>
     <UserLoginSecurityGroup groupId="PROJECTUSER" userLoginId="DemoEmployee2" fromDate="2000-01-01 00:00:00.0"/>
     
     <!-- Demo Employee3 analist of project 2 can register time, accept and assign tasks withn his project 2 only-->
-    <Party partyId="DemoEmployee3" partyTypeId="PERSON" statusId="PARTY_ENABLED" />
-    <Person partyId="DemoEmployee3" firstName="Tom" lastName="Analist2" />
+    <Party partyId="DemoEmployee3" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
+    <Person partyId="DemoEmployee3" firstName="Tom" lastName="Analist2"/>
     <UserLogin userLoginId="DemoEmployee3"  partyId="DemoEmployee3"/>
     <PartyRole partyId="DemoEmployee3" roleTypeId="PROVIDER_ANALYST"/>
     <PartyRole partyId="DemoEmployee3" roleTypeId="EMPLOYEE"/>
-    <PartyContactMech partyId="DemoEmployee3" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
-    <PartyContactMech partyId="DemoEmployee3" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
-    <PartyContactMech partyId="DemoEmployee3" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
+    <PartyContactMech partyId="DemoEmployee3" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
+    <PartyContactMech partyId="DemoEmployee3" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
+    <PartyContactMech partyId="DemoEmployee3" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
     <PartyRole partyId="DemoEmployee3" roleTypeId="PROJECT_TEAM"/>
     <UserLoginSecurityGroup groupId="PROJECTUSER" userLoginId="DemoEmployee3" fromDate="2000-01-01 00:00:00.0"/>
     
     <!-- Demo Customer1 client for demo project 1 has access to project 1 only-->
-    <Party partyId="DemoCustomer1" partyTypeId="PERSON" statusId="PARTY_ENABLED" />
-    <Person partyId="DemoCustomer1" firstName="ManagerP1" lastName="Customer 1" />
+    <Party partyId="DemoCustomer1" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
+    <Person partyId="DemoCustomer1" firstName="ManagerP1" lastName="Customer 1"/>
     <UserLogin userLoginId="DemoCustomer1"  partyId="DemoCustomer1"/>
     <PartyRole partyId="DemoCustomer1" roleTypeId="CUSTOMER"/>
     <PartyRole partyId="DemoCustomer1" roleTypeId="CLIENT_MANAGER"/>
-    <PartyContactMech partyId="DemoCustomer1" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
-    <PartyContactMech partyId="DemoCustomer1" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
-    <PartyContactMech partyId="DemoCustomer1" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
+    <PartyContactMech partyId="DemoCustomer1" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
+    <PartyContactMech partyId="DemoCustomer1" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
+    <PartyContactMech partyId="DemoCustomer1" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
     <PartyRole partyId="DemoCustomer1" roleTypeId="PROJECT_TEAM"/>
     <UserLoginSecurityGroup groupId="PROJECTUSER" userLoginId="DemoCustomer1" fromDate="2000-01-01 00:00:00.0"/>
     
     <!-- Demo Customer2 client for demo project 2 has access to project 2 only-->
-    <Party partyId="DemoCustomer2" partyTypeId="PERSON" statusId="PARTY_ENABLED" />
+    <Party partyId="DemoCustomer2" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
     <Person partyId="DemoCustomer2" firstName="ManagerP2" lastName="Customer 2"/>
     <UserLogin userLoginId="DemoCustomer2"  partyId="DemoCustomer2"/>
     <PartyRole partyId="DemoCustomer2" roleTypeId="CUSTOMER"/>
     <PartyRole partyId="DemoCustomer2" roleTypeId="CLIENT_MANAGER"/>
-    <PartyContactMech partyId="DemoCustomer2" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
-    <PartyContactMech partyId="DemoCustomer2" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
-    <PartyContactMech partyId="DemoCustomer2" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
+    <PartyContactMech partyId="DemoCustomer2" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
+    <PartyContactMech partyId="DemoCustomer2" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
+    <PartyContactMech partyId="DemoCustomer2" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
     <PartyRole partyId="DemoCustomer2" roleTypeId="PROJECT_TEAM"/>
     <UserLoginSecurityGroup groupId="PROJECTUSER" userLoginId="DemoCustomer2" fromDate="2000-01-01 00:00:00.0"/>
     
     <!-- Demo Customer3 billing for demo project 1 and project 2 -->
-    <Party partyId="DemoCustomer3" partyTypeId="PERSON" statusId="PARTY_ENABLED" />
+    <Party partyId="DemoCustomer3" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
     <Person partyId="DemoCustomer3" firstName="Billing" lastName="Customer 2"/>
     <UserLogin userLoginId="DemoCustomer3"  partyId="DemoCustomer3"/>
     <PartyRole partyId="DemoCustomer3" roleTypeId="CUSTOMER"/>
     <PartyRole partyId="DemoCustomer3" roleTypeId="CLIENT_BILLING"/>
-    <PartyContactMech partyId="DemoCustomer3" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
-    <PartyContactMech partyId="DemoCustomer3" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
-    <PartyContactMech partyId="DemoCustomer3" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
+    <PartyContactMech partyId="DemoCustomer3" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
+    <PartyContactMech partyId="DemoCustomer3" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
+    <PartyContactMech partyId="DemoCustomer3" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
     <PartyRole partyId="DemoCustomer3" roleTypeId="PROJECT_TEAM"/>
     <UserLoginSecurityGroup groupId="PROJECTUSER" userLoginId="DemoCustomer3" fromDate="2000-01-01 00:00:00.0"/>
     
@@ -102,16 +102,16 @@
     
     <!-- First Demo project from customer 1 and employee 1,2-->
     <WorkEffort workEffortId="9000" workEffortTypeId="PROJECT" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 15:07:52.901" scopeEnumId="WES_PUBLIC" workEffortName="Demo Project1 Cust1" revisionNumber="1"/>
-    <WorkEffortPartyAssignment workEffortId="9000" partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2009-04-05 20:27:52.818" />
+    <WorkEffortPartyAssignment workEffortId="9000" partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2009-04-05 20:27:52.818"/>
     <WorkEffortPartyAssignment  workEffortId="9000" partyId="admin" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
     <WorkEffortPartyAssignment  workEffortId="9000" partyId="DemoCustomer1" statusId="PAS_ASSIGNED" roleTypeId="CLIENT_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
     <WorkEffortPartyAssignment  workEffortId="9000" partyId="DemoCustomer3" statusId="PAS_ASSIGNED" roleTypeId="CLIENT_BILLING" fromDate="2007-12-14 16:45:21.831"/>
     <WorkEffortPartyAssignment  workEffortId="9000" partyId="DemoEmployee1" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
     <WorkEffortPartyAssignment  workEffortId="9000" partyId="DemoEmployee2" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_ANALYST" fromDate="2007-12-14 16:45:21.831"/>
-    <WorkEffort workEffortId="9001" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:14.226" workEffortParentId="9000" workEffortName="phase1" revisionNumber="1" />
-    <WorkEffort workEffortId="9002" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9001" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1" />
+    <WorkEffort workEffortId="9001" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:14.226" workEffortParentId="9000" workEffortName="phase1" revisionNumber="1"/>
+    <WorkEffort workEffortId="9002" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9001" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1"/>
     <WorkEffortSkillStandard workEffortId="9002" skillTypeId="9000" estimatedDuration="16.0"/>
-    <WorkEffort workEffortId="9003" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:29.453" workEffortParentId="9001" scopeEnumId="WES_PUBLIC" workEffortName="task2" estimatedStartDate="2007-12-05 00:00:00.0" estimatedCompletionDate="2007-12-16 00:00:00.0" revisionNumber="1" />
+    <WorkEffort workEffortId="9003" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:29.453" workEffortParentId="9001" scopeEnumId="WES_PUBLIC" workEffortName="task2" estimatedStartDate="2007-12-05 00:00:00.0" estimatedCompletionDate="2007-12-16 00:00:00.0" revisionNumber="1"/>
     <WorkEffortSkillStandard workEffortId="9003" skillTypeId="9000" estimatedDuration="24.0"/>
     <WorkEffort workEffortId="9004" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:35.939" workEffortParentId="9000" workEffortName="phase2" revisionNumber="1"/>
     <WorkEffort workEffortId="9005" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:50.84" workEffortParentId="9004" scopeEnumId="WES_PUBLIC" workEffortName="task3" estimatedStartDate="2007-12-16 00:00:00.0" estimatedCompletionDate="2007-12-17 00:00:00.0" revisionNumber="1"/>
@@ -127,15 +127,15 @@
     <!-- Second Demo project for customer 2 and employee 1,3-->
     <WorkEffort workEffortId="9100" workEffortTypeId="PROJECT" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 15:07:52.911" scopeEnumId="WES_PUBLIC" workEffortName="Demo Project2 Cust 2" revisionNumber="1"/>
     <WorkEffortPartyAssignment  workEffortId="9100" partyId="admin" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
-    <WorkEffortPartyAssignment workEffortId="9100" partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2009-04-05 20:27:52.818" />
+    <WorkEffortPartyAssignment workEffortId="9100" partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2009-04-05 20:27:52.818"/>
     <WorkEffortPartyAssignment  workEffortId="9100" partyId="DemoCustomer2" statusId="PAS_ASSIGNED" roleTypeId="CLIENT_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
     <WorkEffortPartyAssignment  workEffortId="9100" partyId="DemoCustomer3" statusId="PAS_ASSIGNED" roleTypeId="CLIENT_BILLING" fromDate="2007-12-14 16:45:21.831"/>
     <WorkEffortPartyAssignment  workEffortId="9100" partyId="DemoEmployee1" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
     <WorkEffortPartyAssignment  workEffortId="9100" partyId="DemoEmployee3" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_ANALYST" fromDate="2007-12-14 16:45:21.831"/>
-    <WorkEffort workEffortId="9101" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:14.226" workEffortParentId="9100" workEffortName="phase1" revisionNumber="1" />
-    <WorkEffort workEffortId="9102" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9101" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1" />
+    <WorkEffort workEffortId="9101" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:14.226" workEffortParentId="9100" workEffortName="phase1" revisionNumber="1"/>
+    <WorkEffort workEffortId="9102" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9101" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1"/>
     <WorkEffortSkillStandard workEffortId="9102" skillTypeId="9000" estimatedDuration="16.0"/>
-    <WorkEffort workEffortId="9103" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:29.453" workEffortParentId="9101" scopeEnumId="WES_PUBLIC" workEffortName="task2" estimatedStartDate="2007-12-05 00:00:00.0" estimatedCompletionDate="2007-12-16 00:00:00.0" revisionNumber="1" />
+    <WorkEffort workEffortId="9103" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:29.453" workEffortParentId="9101" scopeEnumId="WES_PUBLIC" workEffortName="task2" estimatedStartDate="2007-12-05 00:00:00.0" estimatedCompletionDate="2007-12-16 00:00:00.0" revisionNumber="1"/>
     <WorkEffortSkillStandard workEffortId="9103" skillTypeId="9000" estimatedDuration="24.0"/>
     <WorkEffort workEffortId="9104" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:35.939" workEffortParentId="9100" workEffortName="phase2" revisionNumber="1"/>
     <WorkEffort workEffortId="9105" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:50.84" workEffortParentId="9104" scopeEnumId="WES_PUBLIC" workEffortName="task3" estimatedStartDate="2007-12-16 00:00:00.0" estimatedCompletionDate="2007-12-17 00:00:00.0" revisionNumber="1"/>
@@ -150,12 +150,12 @@
 
     <!-- Another Demo project for DemoCustomeCompanyr and employee 1,3-->
     <WorkEffort workEffortId="9200" workEffortTypeId="PROJECT" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 15:07:52.911" scopeEnumId="WES_PUBLIC" workEffortName="Demo Project3 DemoCustomerCompany" revisionNumber="1"/>
-    <WorkEffortPartyAssignment workEffortId="9200" partyId="DemoEmployee3" roleTypeId="PROVIDER_ANALYST" fromDate="2007-12-14 16:45:21.831" statusId="PAS_ASSIGNED" />
-    <WorkEffortPartyAssignment workEffortId="9200" partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2009-04-05 20:27:52.818" />
+    <WorkEffortPartyAssignment workEffortId="9200" partyId="DemoEmployee3" roleTypeId="PROVIDER_ANALYST" fromDate="2007-12-14 16:45:21.831" statusId="PAS_ASSIGNED"/>
+    <WorkEffortPartyAssignment workEffortId="9200" partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2009-04-05 20:27:52.818"/>
     <WorkEffortPartyAssignment workEffortId="9200" partyId="DemoCustCompany" roleTypeId="CLIENT_BILLING" fromDate="2009-04-05 20:27:52.893"/>
     <WorkEffortPartyAssignment  workEffortId="9200" partyId="DemoEmployee1" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
-    <WorkEffort workEffortId="9201" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:14.226" workEffortParentId="9200" workEffortName="phase1" revisionNumber="1" />
-    <WorkEffort workEffortId="9202" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9201" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1" />
+    <WorkEffort workEffortId="9201" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:14.226" workEffortParentId="9200" workEffortName="phase1" revisionNumber="1"/>
+    <WorkEffort workEffortId="9202" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9201" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1"/>
     <WorkEffortSkillStandard workEffortId="9202" skillTypeId="9000" estimatedDuration="16.0"/>
     
     

Modified: ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrPortletData.xml Tue Apr  7 08:27:15 2009
@@ -24,7 +24,7 @@
         portletName="My Timesheet"
         screenName="CurrentTimesheet"
         screenLocation="component://projectmgr/widget/TimeSheetScreens.xml"
-        description="My Current Timesheet" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
+        description="My Current Timesheet" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW"/>
     <PortletPortletCategory portalPortletId="mytimesheet" portletCategoryId="PROJECTMANAGER"/>
     
     <PortalPortlet
@@ -32,14 +32,14 @@
         portletName="MyTasks"
         screenName="MyTaskList"
         screenLocation="component://projectmgr/widget/TaskScreens.xml"
-        description="My Tasks from the Project Manager" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />    
+        description="My Tasks from the Project Manager" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW"/>    
     <PortletPortletCategory portalPortletId="mytasks" portletCategoryId="PROJECTMANAGER"/>
     
     <PortalPortlet portalPortletId="ListCustomerProjects"
         portletName="List Customer Projects"
         screenName="ListCustomerProjects"
         screenLocation="component://projectmgr/widget/ProjectScreens.xml"
-        description="List Projects For a certain Customer" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" />
+        description="List Projects For a certain Customer" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW"/>
     <PortletPortletCategory portalPortletId="ListCustomerProjects" portletCategoryId="PROJECTMANAGER"/>
     
     

Modified: ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml Tue Apr  7 08:27:15 2009
@@ -76,6 +76,6 @@
     <!-- for current installations -->
     <StatusValidChange condition="" statusId="_NA_" statusIdTo="PRJ_CLOSED" transitionName="Close project"/>
     
-    <WebSite webSiteId="PROJECTMGR" siteName="Project Manager" visualThemeSetId="BACKOFFICE" />
+    <WebSite webSiteId="PROJECTMGR" siteName="Project Manager" visualThemeSetId="BACKOFFICE"/>
     
 </entity-engine-xml>

Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Apr  7 08:27:15 2009
@@ -907,40 +907,40 @@
         <!-- set the dates from the lower level tasks -->
         <if-not-empty field="lowInfo.estimatedStartDate">
             <if-empty field="highInfo.estimatedStartDate">
-                <set field="highInfo.estimatedStartDate" from-field="lowInfo.estimatedStartDate" />
+                <set field="highInfo.estimatedStartDate" from-field="lowInfo.estimatedStartDate"/>
                 <else>
                     <if-compare-field to-field="lowInfo.estimatedStartDate" field="highInfo.estimatedStartDate" operator="greater">
-                        <set field="highInfo.estimatedStartDate" from-field="lowInfo.estimatedStartDate" />
+                        <set field="highInfo.estimatedStartDate" from-field="lowInfo.estimatedStartDate"/>
                     </if-compare-field>
                 </else>
             </if-empty>
         </if-not-empty>
         <if-not-empty field="lowInfo.estimatedCompletionDate">
             <if-empty field="highInfo.estimatedCompletionDate">
-                <set field="highInfo.estimatedCompletionDate" from-field="lowInfo.estimatedCompletionDate" />
+                <set field="highInfo.estimatedCompletionDate" from-field="lowInfo.estimatedCompletionDate"/>
                 <else>
                     <if-compare-field to-field="lowInfo.estimatedCompletionDate" field="highInfo.estimatedCompletionDate" operator="less">
-                        <set field="highInfo.estimatedCompletionDate" from-field="lowInfo.estimatedCompletionDate" />
+                        <set field="highInfo.estimatedCompletionDate" from-field="lowInfo.estimatedCompletionDate"/>
                     </if-compare-field>
                 </else>
             </if-empty>
         </if-not-empty>
         <if-not-empty field="lowInfo.actualStartDate">
             <if-empty field="highInfo.actualStartDate">
-                <set field="highInfo.actualStartDate" from-field="lowInfo.actualStartDate" />
+                <set field="highInfo.actualStartDate" from-field="lowInfo.actualStartDate"/>
                 <else>
                     <if-compare-field to-field="lowInfo.actualStartDate" field="highInfo.actualStartDate" operator="greater">
-                        <set field="highInfo.actualStartDate" from-field="lowInfo.actualStartDate" />
+                        <set field="highInfo.actualStartDate" from-field="lowInfo.actualStartDate"/>
                     </if-compare-field>
                 </else>
             </if-empty>
         </if-not-empty>
         <if-not-empty field="lowInfo.actualCompletionDate">
             <if-empty field="highInfo.actualCompletionDate">
-                <set field="highInfo.actualCompletionDate" from-field="lowInfo.actualCompletionDate" />
+                <set field="highInfo.actualCompletionDate" from-field="lowInfo.actualCompletionDate"/>
                 <else>
                     <if-compare-field to-field="lowInfo.actualCompletionDate" field="highInfo.actualCompletionDate" operator="less">
-                        <set field="highInfo.actualCompletionDate" from-field="lowInfo.actualCompletionDate" />
+                        <set field="highInfo.actualCompletionDate" from-field="lowInfo.actualCompletionDate"/>
                     </if-compare-field>
                 </else>
             </if-empty>
@@ -949,10 +949,10 @@
         <!-- combine the priorities -->
         <if-not-empty field="lowInfo.priority">
             <if-empty field="highInfo.priority">
-                <set field="highInfo.priority" from-field="lowInfo.priority" />
+                <set field="highInfo.priority" from-field="lowInfo.priority"/>
                 <else>
                     <if-compare-field to-field="lowInfo.priority" field="highInfo.priority" operator="greater">
-                        <set field="highInfo.priority" from-field="lowInfo.priority" />
+                        <set field="highInfo.priority" from-field="lowInfo.priority"/>
                     </if-compare-field>
                 </else>
             </if-empty>

Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Tue Apr  7 08:27:15 2009
@@ -26,7 +26,7 @@
             <result-to-field result-name="custRequestId" field="custRequestId"/>
         </call-service>
         <if-not-empty field="parameters.workEffortParentId">
-            <set-service-fields service-name="createWorkEffort" map="parameters" to-map="createTask" />
+            <set-service-fields service-name="createWorkEffort" map="parameters" to-map="createTask"/>
             <set field="createTask.custRequestId" from-field="custRequestId"/>
             <set field="createTask.workEffortName" from-field="parameters.custRequestName"/>
             <call-service service-name="createWorkEffort" in-map-name="createTask" >
@@ -40,7 +40,7 @@
                 <set field="assignParty.partyId" from-field="parameters.partyId"/>
                 <set field="assignParty.roleTypeId" from-field="parameters.roleTypeId"/>
                 <set field="assignParty.statusId" value="PAS_ASSIGNED"/>
-                <call-service service-name="assignPartyToWorkEffort" in-map-name="assignParty" />
+                <call-service service-name="assignPartyToWorkEffort" in-map-name="assignParty"/>
             </if-not-empty>
         </if-not-empty>    
     </simple-method>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Tue Apr  7 08:27:15 2009
@@ -462,7 +462,7 @@
         <section>
             <actions>
                 <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
-                <set field="parameters.workEffortParentId" from-field="projectId" />
+                <set field="parameters.workEffortParentId" from-field="projectId"/>
             </actions>
             <widgets>
                 <container style="screenlet">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Tue Apr  7 08:27:15 2009
@@ -277,7 +277,7 @@
         <field name="statusId"><hidden value="PAS_ASSIGNED"/></field>
         <field name="workEffortId"  title="${uiLabelMap.ProjectMgrTaskName}" use-when="parameters.get(&quot;workEffortId&quot;)!=null">
             <display-entity entity-name="WorkEffort" description="${workEffortName}[${workEffortId}]">
-                <sub-hyperlink target="MyTasks" description="[${uiLabelMap.CommonChange}]" />
+                <sub-hyperlink target="MyTasks" description="[${uiLabelMap.CommonChange}]"/>
             </display-entity></field>
         <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}" event="onChange" action="javascript:document.assignTaskToMe.submit();" use-when="parameters.get(&quot;workEffortId&quot;)==null">
             <drop-down allow-empty="true">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Tue Apr  7 08:27:15 2009
@@ -141,8 +141,8 @@
         <!--field name="comments" title="${uiLabelMap.CommonComments}"><display/></field-->
         <field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
             <hyperlink target="TimeSheetStatusToComplete" description="${completeLink}">
-                <parameter param-name="timesheetId" />
-                <parameter param-name="statusId" value="TIMESHEET_COMPLETED" />
+                <parameter param-name="timesheetId"/>
+                <parameter param-name="statusId" value="TIMESHEET_COMPLETED"/>
             </hyperlink>
         </field>
     </form>

Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml Tue Apr  7 08:27:15 2009
@@ -50,9 +50,9 @@
     <request-map uri="checkLogin" edit="false">
         <description>Verify a user is logged in.</description>
         <security https="true" auth="false"/>
-        <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin" />
-        <response name="success" type="view" value="main" />
-        <response name="error" type="view" value="login" />
+        <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin"/>
+        <response name="success" type="view" value="main"/>
+        <response name="error" type="view" value="login"/>
     </request-map>
 
     <request-map uri="login">
@@ -85,12 +85,12 @@
         <response name="error" type="request" value="main"/>
     </request-map>
     <request-map uri="LookupLocales">
-        <security https="true" auth="false" />
-        <response name="success" type="view" value="LookupLocales" />
+        <security https="true" auth="false"/>
+        <response name="success" type="view" value="LookupLocales"/>
     </request-map>
     <request-map uri="LookupTimezones">
-        <security https="true" auth="false" />
-        <response name="success" type="view" value="LookupTimezones" />
+        <security https="true" auth="false"/>
+        <response name="success" type="view" value="LookupTimezones"/>
     </request-map>
 
     <!-- Request Mappings -->

Modified: ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml Tue Apr  7 08:27:15 2009
@@ -151,7 +151,7 @@
             <actions>
                 <set field="MainColumnStyle" value="center"/>
                 <set field="titleProperty" value="PageTitleMain"/>
-                <set field="headerItem" value="Main" />
+                <set field="headerItem" value="Main"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">