svn commit: r781681 - in /ofbiz/branches/release09.04: ./ specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml

[hansbak-2]

Author: hansbak
Date: Thu Jun  4 08:31:51 2009
New Revision: 781681

URL: http://svn.apache.org/viewvc?rev=781681&view=rev
Log:
Applied fix from trunk for revision: 781680
 replace now-date with now-timestamp causing error messages in the log

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun  4 08:31:51 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680

Modified: ofbiz/branches/release09.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=781681&r1=781680&r2=781681&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Thu Jun  4 08:31:51 2009
@@ -143,7 +143,7 @@
                 <set field="workEffortPartyAssignment.delegateReasonEnumId" from-field="parameters.delegateReasonEnumId"/>
                 <set field="workEffortPartyAssignment.comments" from-field="parameters.comments"/>
                 <set field="workEffortPartyAssignment.assignedByUserLoginId" from-field="userLogin.userLoginId"/>
-                <now-date-to-env field="workEffortPartyAssignment.thruDate"/>
+                <now-timestamp field="workEffortPartyAssignment.thruDate"/>
                 <store-value value-field="workEffortPartyAssignment"/>
                 <!-- create a new one -->
                 <make-value value-field="newAssign" entity-name="WorkEffortPartyAssignment"/>
@@ -151,7 +151,7 @@
                 <set field="newAssign.partyId" from-field="parameters.newPartyId"/>
                 <set field="newAssign.roleTypeId" from-field="parameters.newRoleTypeId"/>
                 <set field="newAssign.assignedByUserLoginId" from-field="userLogin.userLoginId"/>
-                <now-date-to-env field="newAssign.fromDate"/>
+                <now-timestamp field="newAssign.fromDate"/>
                 <set field="newAssign.statusId" value="PAS_ASSIGNED"/>
                 <create-value value-field="newAssign"/>
             </then>
@@ -166,7 +166,7 @@
                     </entity-one>
                     <if-compare field="parameters.statusId" value="PAS_ENDED" operator="equals">
                         <!-- special case to indicate end of assignment -->
-                        <now-date-to-env field="assignment.thruDate"/>
+                        <now-timestamp field="assignment.thruDate"/>
                         <clear-field field="parameters.statusId"/>
                     </if-compare>
                     <set-nonpk-fields value-field="assignment" map="parameters"/>
@@ -258,7 +258,7 @@
             <set field="startDate" from-field="task.actualStartDate"/>
             <set field="taskId" from-field="task.workEffortId"/>
             <else>
-                <now-date-to-env field="generalStartDate"/>
+                <now-timestamp field="generalStartDate"/>
             </else>
         </if-not-empty>
         <while>
@@ -1199,7 +1199,7 @@
                     <set field="newAssign.partyId" from-field="assign.partyId"/>
                     <set field="newAssign.roleTypeId" from-field="assign.roleTypeId"/>
                     <set field="newAssign.assignedByUserLoginId" value="system"/>
-                    <now-date-to-env field="newAssign.fromDate"/>
+                    <now-timestamp field="newAssign.fromDate"/>
                     <set field="newAssign.statusId" value="PAS_ASSIGNED"/>
                     <create-value value-field="newAssign"/>
                 </iterate>