Author: jleroux
Date: Thu Jan 1 15:19:00 2009
New Revision: 730638
URL: http://svn.apache.org/viewvc?rev=730638&view=rev
Log:
<now-date-to-env env-name => <now-date-to-env field
Modified:
ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
Modified:
ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml?rev=730638&r1=730637&r2=730638&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
(original)
+++
ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
Thu Jan 1 15:19:00 2009
@@ -48,7 +48,7 @@
<set-pk-fields value-field="newEntity" map="parameters"/>
<set-nonpk-fields value-field="newEntity" map="parameters"/>
<if-empty field="newEntity.fromDate">
- <now-date-to-env env-name="nowTimestamp"/>
+ <now-date-to-env field="nowTimestamp"/>
<set field="newEntity.fromDate" from-field="nowTimestamp"/>
</if-empty>
<create-value value-field="newEntity"/>
Modified:
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=730638&r1=730637&r2=730638&view=diff
==============================================================================
---
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
(original)
+++
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
Thu Jan 1 15:19:00 2009
@@ -1376,7 +1376,7 @@
<if-not-empty field="parameters.disabledDateTime">
<set field="disabledDateTime"
from-field="parameters.disabledDateTime" type="Date"/>
<else>
- <now-date-to-env env-name="nowTimeStamp"/>
+ <now-date-to-env field="nowTimeStamp"/>
<set field="disableForYears"
from-field="parameters.disableForYears" default-value="20"/>
<set-calendar field="disabledDateTime"
from-field="nowTimeStamp" years="${disableForYears}"/>
</else>
Modified:
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=730638&r1=730637&r2=730638&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
(original)
+++
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
Thu Jan 1 15:19:00 2009
@@ -665,7 +665,7 @@
<set field="findMap.contactMechTypeId" value="ELECTRONIC_ADDRESS"/>
<find-by-and entity-name="PartyAndContactMech" map="findMap"
list="emailAddressesAll"/>
</if-empty>
- <now-date-to-env env-name="fromDate"/>
+ <now-date-to-env field="fromDate"/>
<filter-list-by-date list="emailAddressesAll"
from-field-name="fromDate" to-list="emailAddresses"/>
<first-from-list entry="emailAddress" list="emailAddresses"/>
<field-to-result field="emailAddress.infoString"
result-name="emailAddress"/>
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=730638&r1=730637&r2=730638&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
Thu Jan 1 15:19:00 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
env-name="workEffortPartyAssignment.thruDate"/>
+ <now-date-to-env 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 env-name="newAssign.fromDate"/>
+ <now-date-to-env 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 env-name="assignment.thruDate"/>
+ <now-date-to-env 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 env-name="generalStartDate"/>
+ <now-date-to-env field="generalStartDate"/>
</else>
</if-not-empty>
<while>
@@ -1336,7 +1336,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 env-name="newAssign.fromDate"/>
+ <now-date-to-env field="newAssign.fromDate"/>
<set field="newAssign.statusId" value="PAS_ASSIGNED"/>
<create-value value-field="newAssign"/>
</iterate>
