svn commit: r781695 - in /ofbiz/branches/release09.04: ./ applications/content/script/org/ofbiz/content/blog/ applications/workeffort/script/org/ofbiz/workeffort/workeffort/ specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/

[hansbak-2]

Author: hansbak
Date: Thu Jun  4 09:35:45 2009
New Revision: 781695

URL: http://svn.apache.org/viewvc?rev=781695&view=rev
Log:
Applied fix from trunk for revision: 781694
 some more now-date which should be now-timestamp

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/content/script/org/ofbiz/content/blog/BlogServices.xml
    ofbiz/branches/release09.04/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
    ofbiz/branches/release09.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun  4 09:35:45 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,781680
+/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,781694

Modified: ofbiz/branches/release09.04/applications/content/script/org/ofbiz/content/blog/BlogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/content/script/org/ofbiz/content/blog/BlogServices.xml?rev=781695&r1=781694&r2=781695&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/content/script/org/ofbiz/content/blog/BlogServices.xml (original)
+++ ofbiz/branches/release09.04/applications/content/script/org/ofbiz/content/blog/BlogServices.xml Thu Jun  4 09:35:45 2009
@@ -196,7 +196,7 @@
                     <field-map field-name="mapKey" value="IMAGE"/>
                 </entity-and>
                 <first-from-list entry="oldAssoc" list="oldAssocs"/>
-                <now-date-to-env field="oldAssoc.thruDate"/>
+                <now-timestamp field="oldAssoc.thruDate"/>
                 <store-value value-field="oldAssoc"/>
             </if-not-empty>
             <!-- upload a picture -->

Modified: ofbiz/branches/release09.04/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=781695&r1=781694&r2=781695&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/branches/release09.04/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Thu Jun  4 09:35:45 2009
@@ -312,7 +312,7 @@
     </simple-method>
     <simple-method method-name="deletePartyToWorkEffortAssignment" short-description="Update WorkEffortPartyAssignment entity">
         <set-service-fields service-name="updatePartyToWorkEffortAssignment" map="parameters" to-map="del"/>
-        <now-date-to-env field="del.thruDate"/>
+        <now-timestamp field="del.thruDate"/>
         <call-service service-name="updatePartyToWorkEffortAssignment" in-map-name="del"/>
     </simple-method>
     <simple-method method-name="unassignPartyFromWorkEffort" short-description="Service that deletes a WorkEffortPartyAssignment entity">

Modified: ofbiz/branches/release09.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=781695&r1=781694&r2=781695&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Thu Jun  4 09:35:45 2009
@@ -1379,7 +1379,7 @@
             <if-not-empty field="parameters.disabledDateTime">
                 <set field="disabledDateTime" from-field="parameters.disabledDateTime" type="Date"/>
             <else>
-                <now-date-to-env field="nowTimeStamp"/>
+                <now-timestamp field="nowTimeStamp"/>
                 <set field="disableForYears" from-field="parameters.disableForYears" default-value="20"/>
                 <set-calendar field="disabledDateTime" from-field="nowTimeStamp" years="${disableForYears}"/>
             </else>