Author: jleroux
Date: Tue Dec 30 09:25:18 2008 New Revision: 730194 URL: http://svn.apache.org/viewvc?rev=730194&view=rev Log: <now-timestamp-to-env env-name => <now-timestamp field Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml 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/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/UpgradeServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml Tue Dec 30 09:25:18 2008 @@ -105,7 +105,7 @@ <simple-method method-name="updateFXConversion" short-description="Update Foreign Exchange conversion rate"> <!-- set the FX rate changes as of now --> <if-empty field="parameters.asOfTimestamp"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <else> <set from-field="parameters.asOfTimestamp" field="nowTimestamp"/> </else> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/cost/CostServices.xml Tue Dec 30 09:25:18 2008 @@ -43,7 +43,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> </simple-method> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml Tue Dec 30 09:25:18 2008 @@ -26,7 +26,7 @@ <!-- NOTE: this is not yet complete --> <!-- NOTE: this will behave differently depending on how the FinAccount is used, see comments on different GlAccounts for trans entries below --> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <entity-one entity-name="FinAccountTrans" value-field="finAccountTrans"/> <set field="finAccountId" from-field="finAccountTrans.finAccountId"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Tue Dec 30 09:25:18 2008 @@ -138,7 +138,7 @@ </simple-method> <simple-method method-name="createFinAccountStatus" short-description="Create FinAccountStatus"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <!-- find the most recent status record and set the statusEndDate --> <entity-and entity-name="FinAccountStatus" list="oldFinAccountStatusList"> @@ -166,7 +166,7 @@ <set-nonpk-fields value-field="newEntity" map="parameters"/> <sequenced-id sequence-name="FinAccountTrans" field="newEntity.finAccountTransId"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <if-empty field="newEntity.transactionDate"> <set from-field="nowTimestamp" field="newEntity.transactionDate"/> </if-empty> @@ -196,7 +196,7 @@ <set-nonpk-fields value-field="newEntity" map="parameters"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> @@ -220,7 +220,7 @@ <sequenced-id sequence-name="FinAccountAuth" field="newEntity.finAccountAuthId"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <if-empty field="newEntity.authorizationDate"> <set from-field="nowTimestamp" field="newEntity.authorizationDate"/> </if-empty> @@ -243,7 +243,7 @@ <simple-method method-name="expireFinAccountAuth" short-description="Expire a Financial Account Authorization"> <entity-one entity-name="FinAccountAuth" value-field="finAccountAuth"/> <if-empty field="parameters.expireDateTime"> - <now-timestamp-to-env env-name="finAccountAuth.thruDate"/> + <now-timestamp field="finAccountAuth.thruDate"/> <else> <set from-field="parameters.expireDatetime" field="finAccountAuth.thruDate"/> </else> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Tue Dec 30 09:25:18 2008 @@ -55,7 +55,7 @@ <log level="info" message="In createInvoice sequence enum INVSQ_RESTARTYR"/> <!-- this is sequential sequencing, we can't skip a number; except that it is restarted each fiscal year --> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <if-empty field="partyAcctgPreference.lastInvoiceRestartDate"> <!-- if no lastInvoiceRestartDate then it's easy, just start now with 1 --> <calculate field="partyAcctgPreference.lastInvoiceNumber" type="Long"><number value="1"/></calculate> @@ -120,7 +120,7 @@ <simple-method method-name="createInvoice" short-description="Create a new Invoice"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <make-value value-field="newEntity" entity-name="Invoice"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -169,7 +169,7 @@ <result-to-field result-name="invoiceItems" field="invoiceItems"/> </call-service> <set field="invoice.invoiceId" from-field="parameters.invoiceId"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="invoice.invoiceDate" from-field="nowTimestamp"/> <set field="invoice.statusId" value="INVOICE_IN_PROCESS"/> <if-not-empty field="parameters.invoiceTypeId"> @@ -229,7 +229,7 @@ <if-compare-field field="parameters.statusId" to-field="savedValue.statusId" operator="not-equals"> <set from-field="parameters.invoiceId" field="inputMap.invoiceId"/> <set from-field="parameters.statusId" field="inputMap.statusId"/> - <now-timestamp-to-env env-name="inputMap.statusDate"/> + <now-timestamp field="inputMap.statusDate"/> <call-service service-name="setInvoiceStatus" in-map-name="inputMap"/> </if-compare-field> </if-not-empty> @@ -371,7 +371,7 @@ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_PAID"> <set field="invoiceStatusMap.invoiceId" value="${paymentApplication.invoiceId}" /> <set field="invoiceStatusMap.statusId" value="INVOICE_READY"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="invoiceStatusMap.statusDate" from-field="nowTimestamp" /> <call-service service-name="setInvoiceStatus" in-map-name="invoiceStatusMap" /> </if-compare> @@ -423,7 +423,7 @@ <make-value value-field="newEntity" entity-name="InvoiceRole"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.datetimePerformed"><now-timestamp-to-env env-name="newEntity.datetimePerformed"/></if-empty> + <if-empty field="newEntity.datetimePerformed"><now-timestamp field="newEntity.datetimePerformed"/></if-empty> <create-value value-field="newEntity"/> </simple-method> @@ -456,7 +456,7 @@ <!-- if it's OK to mark invoice paid, use parameter for paidDate --> <if-empty field="parameters.paidDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set from-field="nowTimestamp" field="invoice.paidDate"/> <else> <set from-field="parameters.paidDate" field="invoice.paidDate"/> @@ -478,7 +478,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.statusDate"> - <now-timestamp-to-env env-name="newEntity.statusDate"/> + <now-timestamp field="newEntity.statusDate"/> </if-empty> <create-value value-field="newEntity"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml Tue Dec 30 09:25:18 2008 @@ -431,7 +431,7 @@ <!-- for AcctgTrans: set isPosted to Y, postedDate to now --> <set from-field="acctgTrans.acctgTransId" field="updateAcctgTransParams.acctgTransId"/> - <now-timestamp-to-env env-name="updateAcctgTransParams.postedDate"/> + <now-timestamp field="updateAcctgTransParams.postedDate"/> <set value="Y" field="updateAcctgTransParams.isPosted"/> <call-service service-name="updateAcctgTrans" in-map-name="updateAcctgTransParams" include-user-login="true"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml Tue Dec 30 09:25:18 2008 @@ -30,7 +30,7 @@ <field-to-result field="billingAccountId" result-name="billingAccountId"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.fromDate"/> </if-empty> @@ -48,7 +48,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Tue Dec 30 09:25:18 2008 @@ -59,7 +59,7 @@ <set-nonpk-fields map="parameters" value-field="payment"/> <if-empty field="payment.effectiveDate"> - <now-timestamp-to-env env-name="payment.effectiveDate"/> + <now-timestamp field="payment.effectiveDate"/> </if-empty> <create-value value-field="payment"/> </simple-method> @@ -104,7 +104,7 @@ <set field="payment.statusId" from-field="statusIdSave"/> <!-- do not allow status change here --> <if-empty field="payment.effectiveDate"> - <now-timestamp-to-env env-name="payment.effectiveDate"/> + <now-timestamp field="payment.effectiveDate"/> </if-empty> <if-not-empty field="payment.paymentMethodId"> <entity-one entity-name="PaymentMethod" value-field="paymentMethod"> @@ -350,7 +350,7 @@ </simple-method> <simple-method method-name="getInvoicePaymentInfoListByDueDateOffset" short-description="Select a list with information on payment due dates and amounts for invoices."> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayEnd" ret-field-name="asOfDate"> <field field-name="nowTimestamp" type="Timestamp"/> <field field-name="parameters.daysOffset" type="Long"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/rate/RateServices.xml Tue Dec 30 09:25:18 2008 @@ -65,7 +65,7 @@ <make-value entity-name="RateAmount" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <now-timestamp-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="newEntity.fromDate"/> <clear-field field="newEntity.thruDate"/> <create-value value-field="newEntity"/> </simple-method> @@ -95,7 +95,7 @@ <entity-one entity-name="RateAmount" value-field="rateAmount"/> <if-not-empty field="rateAmount"> - <now-timestamp-to-env env-name="rateAmount.thruDate"/> + <now-timestamp field="rateAmount.thruDate"/> <store-value value-field="rateAmount"/> <else> <add-error><fail-message message="could not find record to be deleted"/></add-error> @@ -303,13 +303,13 @@ </entity-and> <if-not-empty field="partyRates"> <first-from-list entry="partyRate" list="partyRates"/> - <now-timestamp-to-env env-name="partyRate.thruDate"/> + <now-timestamp field="partyRate.thruDate"/> <store-value value-field="partyRate"/> </if-not-empty> <make-value value-field="newEntity" entity-name="PartyRate"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> + <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty> <set-nonpk-fields map="parameters" value-field="newEntity"/> <call-simple-method method-name="checkOtherDefaultRate"/> <create-value value-field="newEntity"/> @@ -342,7 +342,7 @@ <check-errors/> <entity-one entity-name="PartyRate" value-field="lookedUpValue"/> - <now-timestamp-to-env env-name="lookedUpValue.thruDate"/> + <now-timestamp field="lookedUpValue.thruDate"/> <store-value value-field="lookedUpValue"/> <set-service-fields service-name="deleteRateAmount" map="parameters" to-map="delRateAmount"/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml Tue Dec 30 09:25:18 2008 @@ -58,7 +58,7 @@ <make-value entity-name="TaxAuthorityAssoc" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> + <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> </simple-method> @@ -194,7 +194,7 @@ <make-value entity-name="PartyTaxAuthInfo" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> + <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml Tue Dec 30 09:25:18 2008 @@ -68,7 +68,7 @@ <!-- populate fields --> <set from-field="parameters.contentName" field="rootInstanceContent.contentName" default-value="${rootTemplateContent.contentName}"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set from-field="parameters.instanceOfContentId" field="rootInstanceContent.instanceOfContentId"/> <set from-field="nowTimestamp" field="rootInstanceContent.createdDate"/> <set from-field="nowTimestamp" field="rootInstanceContent.lastModifiedDate"/> @@ -611,7 +611,7 @@ <set from-field="parameters.contentRevisionSeqId" field="thisContentRevisionSeqId"/> <log level="info" message="cloneContentApprovals(0)- thisContentRevisionSeqId : ${thisContentRevisionSeqId}"/> <log level="info" message="cloneContentApprovals(0b)- parameters : ${parameters} "/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <!-- get previous list of ContentApproval --> <entity-condition entity-name="MaxContentApprovalView" list="maxContentApprovalList"> <condition-list combine="and"> @@ -776,7 +776,7 @@ <return/> </if-compare> <if-not-empty field="contentApproval.roleTypeId"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <entity-condition entity-name="ContentRole" list="contentRoleList"> <condition-list combine="and"> <condition-expr field-name="contentId" from-field="contentId" operator="equals"/> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Tue Dec 30 09:25:18 2008 @@ -42,7 +42,7 @@ <set field="content.statusId" from-field="statusItem.statusId"/> </if-empty> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/> <set field="content.createdByUserLogin" from-field="userLogin.userLoginId"/> <set field="content.lastModifiedDate" from-field="nowTimestamp"/> @@ -56,7 +56,7 @@ <entity-one entity-name="Content" value-field="content" auto-field-map="true"/> <set-nonpk-fields value-field="content" map="parameters"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/> <set field="content.lastModifiedDate" from-field="nowTimestamp"/> @@ -78,7 +78,7 @@ <set-pk-fields value-field="assoc" map="parameters"/> <set field="assoc.contentId" from-field="parameters.contentIdFrom" default-value="${parameters.contentId}" /> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <if-empty field="assoc.fromDate"> <set field="assoc.fromDate" from-field="nowTimestamp"/> </if-empty> @@ -97,7 +97,7 @@ <entity-one entity-name="ContentAssoc" value-field="assoc" auto-field-map="true"/> <set-nonpk-fields value-field="assoc" map="parameters"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/> <set field="content.lastModifiedDate" from-field="nowTimestamp"/> @@ -213,7 +213,7 @@ <now-timestamp-to-env env-name="newContentAssoc.lastModifiedDate"/> <if-empty field="parameters.fromDate"> - <now-timestamp-to-env env-name="parameters.fromDate"/> + <now-timestamp field="parameters.fromDate"/> <to-string map-name="parameters" field-name="fromDate" /> </if-empty> <set from-field="parameters.fromDate" field="newContentAssoc.fromDate"/> @@ -249,7 +249,7 @@ <!-- Methods for ContentRole --> <simple-method method-name="createContentRole" short-description="Create Content Role"> <if-empty field="parameters.fromDate"> - <now-timestamp-to-env env-name="parameters.fromDate"/> + <now-timestamp field="parameters.fromDate"/> </if-empty> <make-value value-field="partyRolePK" entity-name="PartyRole"/> <set-pk-fields value-field="partyRolePK" map="parameters"/> @@ -284,7 +284,7 @@ <find-by-and entity-name="ContentRole" map-name="lookupKeyValue" list-name="roleList"/> <iterate entry="contentRoleMap" list="roleList"> <make-value entity-name="ContentRole" value-field="role" map-name="contentRoleMap"/> - <now-timestamp-to-env env-name="role.thruDate"/> + <now-timestamp field="role.thruDate"/> <store-value value-field="role"/> </iterate> </simple-method> @@ -721,8 +721,8 @@ <set from-field="parameters.newTopicDescription" field="content.description" /> <set value="TOPIC" field="content.contentTypeId" /> - <now-timestamp-to-env env-name="content.lastModifiedDate"/> - <now-timestamp-to-env env-name="content.createdDate"/> + <now-timestamp field="content.lastModifiedDate"/> + <now-timestamp field="content.createdDate"/> <set from-field="parameters.userLogin.userLoginId" field="content.lastModifiedByUserLogin"/> <set from-field="parameters.userLogin.userLoginId" field="content.createdByUserLogin"/> @@ -777,7 +777,7 @@ <check-errors/> --> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set-service-fields to-map="persistIn" service-name="persistContentAndAssoc" map="parameters"/> <!-- let's take a guess at what the dataResourceTypeId should be if it is empty --> <if-empty field="persistIn.dataResourceTypeId"> @@ -844,7 +844,7 @@ <set-pk-fields value-field="commEventContentAssoc" map="parameters"/> <set-nonpk-fields value-field="commEventContentAssoc" map="parameters"/> <if-empty field="commEventContentAssoc.fromDate"> - <now-timestamp-to-env env-name="commEventContentAssoc.fromDate"/> + <now-timestamp field="commEventContentAssoc.fromDate"/> </if-empty> <create-value value-field="commEventContentAssoc" /> <field-to-result field="commEventContentAssoc.fromDate" result-name="fromDate"/> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Tue Dec 30 09:25:18 2008 @@ -31,7 +31,7 @@ <set field="newEntity.dataResourceId" from-field="dataResourceId"/> </if-empty> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="newEntity.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/> <set field="newEntity.createdByUserLogin" from-field="userLogin.userLoginId"/> <set field="newEntity.lastModifiedDate" from-field="nowTimestamp"/> @@ -63,7 +63,7 @@ <to-string map-name="parameters" field-name="locale" /> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="lookedUpValue.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/> <set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp"/> @@ -168,7 +168,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="newEntity.fromDate" from-field="nowTimestamp"/> </if-empty> 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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -126,7 +126,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> @@ -151,7 +151,7 @@ <entity-one entity-name="WebSite" value-field="webSite"> <field-map field-name="webSiteId" from-field="parameters.webSiteId"/> </entity-one> - <now-timestamp-to-env env-name="now"/> + <now-timestamp field="now"/> <log level="always" message="Parameters: ${parameters}"/> <if-instance-of field-name="parameters.webSiteContentTypeId" class="String"> 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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -38,7 +38,7 @@ <property-to-field resource="security" property="username.lowercase" default="false" field-name="username_lowercase"/> <property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/> - <now-timestamp-to-env env-name="nowStamp"/> + <now-timestamp field="nowStamp"/> <set value="CUSTOMER" field="parameters.roleTypeId"/> <if-compare field="allowPassword" operator="not-equals" value="Y"> @@ -504,7 +504,7 @@ <simple-method method-name="validateCustomerInfo" short-description="validateCustomerInfo" login-required="false"> <!-- timestamp to be used --> - <now-timestamp-to-env env-name="nowStamp"/> + <now-timestamp field="nowStamp"/> <!-- setup the party/person --> <if-not-empty field="parameters.birthDateYear"> Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Tue Dec 30 09:25:18 2008 @@ -30,7 +30,7 @@ <property-to-field resource="security" property="username.lowercase" default="false" field-name="username_lowercase"/> <property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/> <set field="default_user_password" value="ungssblepsswd" /> - <now-timestamp-to-env env-name="nowStamp"/> + <now-timestamp field="nowStamp"/> <if-compare field="create_allow_password" operator="not-equals" value="true"> <set field="parameters.password" from-field="default_user_password" /> Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original) +++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Tue Dec 30 09:25:18 2008 @@ -26,7 +26,7 @@ <make-value entity-name="PartyQual" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimeStamp"/> + <now-timestamp field="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -147,7 +147,7 @@ <set-pk-fields value-field="newEntity" map="parameters"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimeStamp"/> + <now-timestamp field="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> <create-value value-field="newEntity"/> @@ -169,7 +169,7 @@ <set-pk-fields value-field="newEntity" map="parameters"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimeStamp"/> + <now-timestamp field="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> <create-value value-field="newEntity"/> @@ -192,7 +192,7 @@ <set-pk-fields value-field="newEntity" map="parameters"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimeStamp"/> + <now-timestamp field="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> <create-value value-field="newEntity"/> @@ -236,7 +236,7 @@ <set-pk-fields value-field="newEntity" map="parameters"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimeStamp"/> + <now-timestamp field="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> <create-value value-field="newEntity"/> @@ -249,7 +249,7 @@ </simple-method> <simple-method method-name="deletePartyBenefit" short-description="Delete Party Benefit"> - <now-timestamp-to-env env-name="nowTimeStamp"/> + <now-timestamp field="nowTimeStamp"/> <entity-one entity-name="PartyBenefit" value-field="lookedUpValue"/> <set field="lookedUpValue.thruDate" from-field="nowTimeStamp"/> <store-value value-name="lookedUpValue"/> @@ -285,7 +285,7 @@ <set-pk-fields value-field="newEntity" map="parameters"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimeStamp"/> + <now-timestamp field="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> <create-value value-field="newEntity"/> @@ -298,7 +298,7 @@ </simple-method> <simple-method method-name="deletePayHistory" short-description="Delete Pay History"> - <now-timestamp-to-env env-name="nowTimeStamp"/> + <now-timestamp field="nowTimeStamp"/> <entity-one entity-name="PayHistory" value-field="lookedUpValue"/> <set field="lookedUpValue.thruDate" from-field="nowTimeStamp"/> <store-value value-name="lookedUpValue"/> @@ -379,7 +379,7 @@ </simple-method> <simple-method method-name="deleteUnemploymentClaim" short-description="Delete Unemployment Claim"> - <now-timestamp-to-env env-name="nowTimeStamp"/> + <now-timestamp field="nowTimeStamp"/> <entity-one entity-name="UnemploymentClaim" value-field="lookedUpValue"/> <set field="lookedUpValue.thruDate" from-field="nowTimeStamp"/> <store-value value-name="lookedUpValue"/> @@ -410,7 +410,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimeStamp"/> + <now-timestamp field="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> <create-value value-field="newEntity"/> @@ -432,7 +432,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimeStamp"/> + <now-timestamp field="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> <if> @@ -467,7 +467,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimeStamp"/> + <now-timestamp field="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> <create-value value-field="newEntity"/> @@ -489,7 +489,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimeStamp"/> + <now-timestamp field="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> <create-value value-field="newEntity"/> @@ -536,7 +536,7 @@ <set field="partyRelationshipCtx.roleTypeIdTo" value="EMPLOYEE"/> <set field="partyRelationshipCtx.relationshipName" value="EMPLOYMENT"/> <set field="partyRelationshipCtx.fromDate" from-field="parameters.fromDate"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <if-empty field="partyRelationshipCtx.fromDate"> <set field="partyRelationshipCtx.fromDate" from-field="nowTimestamp"/> </if-empty> @@ -614,13 +614,13 @@ </entity-and> <if-not-empty field="emplPositionTypeRates"> <first-from-list entry="emplPositionTypeRate" list="emplPositionTypeRates"/> - <now-timestamp-to-env env-name="emplPositionTypeRate.thruDate"/> + <now-timestamp field="emplPositionTypeRate.thruDate"/> <store-value value-name="emplPositionTypeRate"/> </if-not-empty> <make-value value-field="newEntity" entity-name="EmplPositionTypeRate"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> + <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> @@ -632,7 +632,7 @@ <simple-method method-name="deleteEmplPositionTypeRate" short-description="Delete EmplPositionTypeRate"> <entity-one entity-name="EmplPositionTypeRate" value-field="lookedUpValue"/> - <now-timestamp-to-env env-name="lookedUpValue.thruDate"/> + <now-timestamp field="lookedUpValue.thruDate"/> <store-value value-name="lookedUpValue"/> <set-service-fields service-name="deleteRateAmount" map="parameters" to-map="delRateAmount"/> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml Tue Dec 30 09:25:18 2008 @@ -78,7 +78,7 @@ <!-- kind of like the inventory reservation routine, find InventoryItems to issue from, but instead of doing the reservation just create an issuance and an inventory item detail for the change --> <if-not-empty field="productId"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <!-- NOTE: the inventory will be issued from the WorkEffort.facilityId --> <entity-one entity-name="WorkEffort" value-field="workEffort"/> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml Tue Dec 30 09:25:18 2008 @@ -28,7 +28,7 @@ <if-not-empty field="parameters.applicableDate"> <set from-field="parameters.applicableDate" field="filterDate"/> <else> - <now-timestamp-to-env env-name="filterDate"/> + <now-timestamp field="filterDate"/> </else> </if-not-empty> <!-- If a workEffortId has been passed, use it to look up the desired routing--> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml Tue Dec 30 09:25:18 2008 @@ -34,7 +34,7 @@ </call-service> </if-compare> <if-empty field="parameters.fromDate"> - <now-timestamp-to-env env-name="parameters.fromDate"/> + <now-timestamp field="parameters.fromDate"/> </if-empty> <call-map-processor xml-resource="org/ofbiz/manufacturing/techdata/RoutingMapProcs.xml" processor-name="routingTaskAssoc" in-map-name="parameters" out-map-name="context1"/> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Tue Dec 30 09:25:18 2008 @@ -107,7 +107,7 @@ <make-value entity-name="ContactListParty" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> + <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty> <create-value value-field="newEntity"/> @@ -176,7 +176,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <now-timestamp-to-env env-name="newEntity.statusDate"/> + <now-timestamp field="newEntity.statusDate"/> <set from-field="userLogin.userLoginId" field="newEntity.setByUserLoginId"/> <!-- if statusId is CLPT_PENDING, set optInVerifyCode; else if statusId is CLPT_ACCEPTED, make sure optInVerifyCode is the same as the last CLPT_PENDING --> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml Tue Dec 30 09:25:18 2008 @@ -160,7 +160,7 @@ <check-permission permission="MARKETING" action="${securityAction}"><fail-message message="Security Error\: to run ${methodShortDescription} you must have the MARKETING${securityAction} or MARKETING_ADMIN permission"/></check-permission> <check-errors/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <entity-condition entity-name="SegmentGroupViewRelatedParties" list="segmentGroupViewRelatedPartiesList"> <condition-list combine="and"> <condition-expr field-name="partyId" from-field="parameters.partyId"/> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml Tue Dec 30 09:25:18 2008 @@ -25,7 +25,7 @@ <check-permission permission="MARKETING" action="_CREATE"><fail-message message="Security Error: to run createTrackingCode you must have the MARKETING_CREATE or MARKETING_ADMIN permission"/></check-permission> <check-errors/> - <now-timestamp-to-env env-name="nowStamp"/> + <now-timestamp field="nowStamp"/> <make-value value-field="newEntity" entity-name="TrackingCode"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -43,7 +43,7 @@ <check-permission permission="MARKETING" action="_UPDATE"><fail-message message="Security Error: to run updateTrackingCode you must have the MARKETING_UPDATE or MARKETING_ADMIN permission"/></check-permission> <check-errors/> - <now-timestamp-to-env env-name="nowStamp"/> + <now-timestamp field="nowStamp"/> <make-value entity-name="TrackingCode" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> @@ -70,7 +70,7 @@ <check-permission permission="MARKETING" action="_CREATE"><fail-message message="Security Error: to run createTrackingCodeType you must have the MARKETING_CREATE or MARKETING_ADMIN permission"/></check-permission> <check-errors/> - <now-timestamp-to-env env-name="nowStamp"/> + <now-timestamp field="nowStamp"/> <make-value value-field="newEntity" entity-name="TrackingCodeType"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -85,7 +85,7 @@ <check-permission permission="MARKETING" action="_UPDATE"><fail-message message="Security Error: to run updateTrackingCodeType you must have the MARKETING_UPDATE or MARKETING_ADMIN permission"/></check-permission> <check-errors/> - <now-timestamp-to-env env-name="nowStamp"/> + <now-timestamp field="nowStamp"/> <make-value entity-name="TrackingCodeType" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> @@ -105,7 +105,7 @@ </simple-method> <simple-method method-name="createTrackingCodeOrder" short-description="Create an TrackingCodeOrder"> - <now-timestamp-to-env env-name="nowStamp"/> + <now-timestamp field="nowStamp"/> <make-value value-field="newEntity" entity-name="TrackingCodeOrder"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> @@ -116,7 +116,7 @@ <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateTrackingCodeOrder" short-description="Update an TrackingCodeOrder"> - <now-timestamp-to-env env-name="nowStamp"/> + <now-timestamp field="nowStamp"/> <make-value entity-name="TrackingCodeOrder" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> @@ -131,7 +131,7 @@ <!-- add service for tracking code return --> <simple-method method-name="createTrackingCodeOrderReturn" short-description="Create an TrackingCodeOrderReturn"> - <now-timestamp-to-env env-name="nowStamp"/> + <now-timestamp field="nowStamp"/> <make-value value-field="newEntity" entity-name="TrackingCodeOrderReturn"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> @@ -170,7 +170,7 @@ </if-not-empty> </simple-method> <simple-method method-name="updateTrackingCodeOrderReturn" short-description="update an TrackingCodeOrderReturn"> - <now-timestamp-to-env env-name="nowStamp"/> + <now-timestamp field="nowStamp"/> <make-value entity-name="TrackingCodeOrderReturn" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml Tue Dec 30 09:25:18 2008 @@ -109,7 +109,7 @@ <make-value entity-name="PartyDataSource" value-field="partyDataSource"/> <set field="partyDataSource.partyId" from-field="partyId"/> <set field="partyDataSource.dataSourceId" from-field="dataSourceId"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="partyDataSource.fromDate" from-field="nowTimestamp"/> <set field="partyDataSource.isCreate" value="Y"/> <create-value value-field="partyDataSource"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/UpgradeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/UpgradeServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/UpgradeServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/UpgradeServices.xml Tue Dec 30 09:25:18 2008 @@ -38,7 +38,7 @@ <simple-method method-name="migrateCustRequestRole" short-description="Migrate data from OldCustRequestRole to CustRequestParty"> <entity-condition entity-name="OldCustRequestRole" list="oldCustRequestRoles"/> - <now-timestamp-to-env env-name="fromDate"/> + <now-timestamp field="fromDate"/> <iterate list="oldCustRequestRoles" entry="oldCustRequestRole"> <make-value entity-name="CustRequestParty" value-field="custRequestParty"/> <set field="custRequestParty.custRequestId" from-field="oldCustRequestRole.custRequestId"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml Tue Dec 30 09:25:18 2008 @@ -23,7 +23,7 @@ <simple-method method-name="validateCustomerInfo" short-description="validateCustomerInfo" login-required="false"> <!-- timestamp to be used --> - <now-timestamp-to-env env-name="nowStamp"/> + <now-timestamp field="nowStamp"/> <!-- setup the party/person --> <call-map-processor in-map-name="parameters" out-map-name="personMap"> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml Tue Dec 30 09:25:18 2008 @@ -74,7 +74,7 @@ <set field="salesForecastHistory.changeNote" from-field="parameters.changeNote"/> <!-- set the modified info --> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="salesForecastHistory.modifiedTimestamp" from-field="nowTimestamp"/> <set field="salesForecast.modifiedByUserLoginId" from-field="userLogin.userLoginId"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Tue Dec 30 09:25:18 2008 @@ -21,7 +21,7 @@ <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-method method-name="createReturnHeader" short-description="Create a ReturnHeader"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <if> <condition> @@ -570,7 +570,7 @@ <set field="newReturnStatus.returnId" from-field="returnItem.returnId"/> <set field="newReturnStatus.statusId" from-field="returnItem.statusId"/> - <now-timestamp-to-env env-name="newReturnStatus.statusDatetime"/> + <now-timestamp field="newReturnStatus.statusDatetime"/> <create-value value-field="newReturnStatus"/> </if-compare-field> @@ -619,7 +619,7 @@ <set field="newValue.returnId" from-field="returnHeader.returnId"/> <set field="newValue.statusId" value="RETURN_RECEIVED"/> - <now-timestamp-to-env env-name="newValue.statusDatetime"/> + <now-timestamp field="newValue.statusDatetime"/> <create-value value-field="newValue"/> </if-compare> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Tue Dec 30 09:25:18 2008 @@ -35,7 +35,7 @@ <check-errors/> <if-not-empty field="monthsToInclude"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <call-bsh><![CDATA[ calendar = java.util.Calendar.getInstance(); calendar.setTimeInMillis(nowTimestamp.getTime()); @@ -887,7 +887,7 @@ <make-value value-field="newEntity" entity-name="OrderItemChange"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="parameters.changeDatetime"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="newEntity.changeDatetime" from-field="nowTimestamp"/> </if-empty> <if-empty field="parameters.changeUserLogin"> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Tue Dec 30 09:25:18 2008 @@ -661,7 +661,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="QuoteAdjustment" field="quoteAdjustmentId"/> - <now-timestamp-to-env env-name="newEntity.createdDate"/> + <now-timestamp field="newEntity.createdDate"/> <set from-field="quoteAdjustmentId" field="newEntity.quoteAdjustmentId"/> <set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/> <field-to-result field="quoteAdjustmentId" result-name="quoteAdjustmentId"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Tue Dec 30 09:25:18 2008 @@ -52,7 +52,7 @@ <make-value value-field="newEntity" entity-name="CustRequest"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.lastModifiedDate"/> <set from-field="nowTimestamp" field="newEntity.createdDate"/> <set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/> @@ -176,7 +176,7 @@ <clear-field field="successMessage"/> </if-not-empty> </if-compare-field> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set from-field="nowTimestamp" field="custRequest.lastModifiedDate"/> <set from-field="userLogin.userLoginId" field="custRequest.lastModifiedByUserLogin"/> <set-nonpk-fields map="parameters" value-field="custRequest"/> @@ -232,7 +232,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> </simple-method> @@ -243,7 +243,7 @@ </simple-method> <simple-method method-name="deleteCustRequestParty" short-description="Delete Customer CustRequestParty"> <entity-one entity-name="CustRequestParty" value-field="lookedUpValue"/> - <now-timestamp-to-env env-name="thruDate"/> + <now-timestamp field="thruDate"/> <set field="lookedUpValue.thruDate" from-field="thruDate"/> <store-value value-field="lookedUpValue"/> </simple-method> @@ -392,7 +392,7 @@ <make-next-seq-id value-field="newEntity" seq-field-name="custRequestStatusId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.statusDatetime"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.statusDatetime"/> </if-empty> <create-value value-field="newEntity"/> @@ -477,7 +477,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="newEntity.fromDate" from-field="nowTimestamp"/> </if-empty> @@ -487,7 +487,7 @@ <entity-one entity-name="CustRequestContent" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> <if-empty field="lookedUpValue.thruDate"> - <now-timestamp-to-env env-name="lookedUpValue.thruDate"/> + <now-timestamp field="lookedUpValue.thruDate"/> </if-empty> <store-value value-field="lookedUpValue"/> </simple-method> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Tue Dec 30 09:25:18 2008 @@ -29,7 +29,7 @@ <if-empty field="parameters.statusId"> <set value="REQ_CREATED" field="newEntity.statusId"/> </if-empty> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.createdDate"/> <create-value value-field="newEntity"/> <field-to-result field="requirementId" result-name="requirementId"/> @@ -85,7 +85,7 @@ <set field="requirementSupplier.requirementId" from-field="requirement.requirementId"/> <set field="requirementSupplier.partyId" from-field="supplierProduct.partyId"/> <set field="requirementSupplier.roleTypeId" value="SUPPLIER"/> - <now-timestamp-to-env env-name="requirementSupplier.fromDate"/> + <now-timestamp field="requirementSupplier.fromDate"/> <create-value value-field="requirementSupplier"/> </if-not-empty> </if-not-empty> @@ -111,7 +111,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> <check-errors/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Tue Dec 30 09:25:18 2008 @@ -133,7 +133,7 @@ <create-value value-field="newEntity"/> <if-compare-field field="shoppingList.partyId" to-field="userLogin.partyId" operator="not-equals"> - <now-timestamp-to-env env-name="shoppingList.lastAdminModified"/> + <now-timestamp field="shoppingList.lastAdminModified"/> <store-value value-name="shoppingList"/> </if-compare-field> </simple-method> @@ -159,7 +159,7 @@ </if-compare> <if-compare-field field="shoppingList.partyId" to-field="userLogin.partyId" operator="not-equals"> - <now-timestamp-to-env env-name="shoppingList.lastAdminModified"/> + <now-timestamp field="shoppingList.lastAdminModified"/> <store-value value-name="shoppingList"/> </if-compare-field> </simple-method> @@ -175,7 +175,7 @@ <remove-value value-field="shoppingListItem"/> <if-compare-field field="shoppingList.partyId" to-field="userLogin.partyId" operator="not-equals"> - <now-timestamp-to-env env-name="shoppingList.lastAdminModified"/> + <now-timestamp field="shoppingList.lastAdminModified"/> <store-value value-name="shoppingList"/> </if-compare-field> </simple-method> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Tue Dec 30 09:25:18 2008 @@ -299,7 +299,7 @@ <first-from-list list="emailAddressVerifications" entry="emailAddressVerification"/> <if-not-empty field="emailAddressVerification"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <if-compare-field field="emailAddressVerification.expireDate" to-field="nowTimestamp" operator="less"> <add-error><fail-property resource="PartyUiLabels" property="PartyEmailAddressVerificationExpired"/></add-error> </if-compare-field> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Tue Dec 30 09:25:18 2008 @@ -64,7 +64,7 @@ <field-to-result field="contactMechId" map-name="newValue"/> <field-to-request field="contactMechId" map-name="newValue"/> <set-nonpk-fields map="parameters" value-field="newValue"/> - <now-timestamp-to-env env-name="newValue.fromDate"/> + <now-timestamp field="newValue.fromDate"/> <create-value value-field="newValue"/> </simple-method> @@ -102,8 +102,8 @@ </if-empty> <set-nonpk-fields value-field="newPartyContactMech" map="parameters"/> - <now-timestamp-to-env env-name="newPartyContactMech.fromDate"/> - <now-timestamp-to-env env-name="partyContactMech.thruDate"/> + <now-timestamp field="newPartyContactMech.fromDate"/> + <now-timestamp field="partyContactMech.thruDate"/> <store-value value-field="partyContactMech"/> <create-value value-field="newPartyContactMech"/> @@ -112,7 +112,7 @@ <get-related value-field="partyContactMech" relation-name="PartyContactMechPurpose" list="partyContactMechPurposes"/> <iterate entry="partyContactMechPurposeOld" list="partyContactMechPurposes"> <clone-value value-name="partyContactMechPurposeOld" new-value-name="partyContactMechPurpose"/> - <now-timestamp-to-env env-name="partyContactMechPurposeOld.thruDate"/> + <now-timestamp field="partyContactMechPurposeOld.thruDate"/> <store-value value-field="partyContactMechPurposeOld"/> <set field="partyContactMechPurpose.contactMechId" from-field="newPartyContactMech.contactMechId"/> @@ -149,7 +149,7 @@ </add-error> <return/> </if-empty> - <now-timestamp-to-env env-name="partyContactMech.thruDate"/> + <now-timestamp field="partyContactMech.thruDate"/> <store-value value-field="partyContactMech"/> </simple-method> @@ -303,7 +303,7 @@ <log level="info" message="findPartyFromEmailAddress with case insensitive search: ${parameters.caseInsensitive}"/> <if-empty field="parameters.fromDate"> - <now-timestamp-to-env env-name="input.filterByDateValue"/> + <now-timestamp field="input.filterByDateValue"/> <else> <set field="input.filterByDateValue" from-field="parameters.fromDate"/> </else> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml Tue Dec 30 09:25:18 2008 @@ -27,7 +27,7 @@ <set-nonpk-fields value-field="partyContent" map="parameters"/> <if-empty field="partyContent.fromDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="partyContent.fromDate" from-field="nowTimestamp"/> </if-empty> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/customer/CustomerEvents.xml Tue Dec 30 09:25:18 2008 @@ -29,7 +29,7 @@ <property-to-field resource="security" property="username.lowercase" default="false" field-name="username_lowercase"/> <property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/> - <now-timestamp-to-env env-name="nowStamp"/> + <now-timestamp field="nowStamp"/> <set field="parameters.roleTypeId" value="CUSTOMER" /> <if-compare field="create_allow_password" operator="not-equals" value="true"> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml Tue Dec 30 09:25:18 2008 @@ -32,7 +32,7 @@ </entity-one> <set field="parameters.toName" value="${person.firstName} ${person.middleName} ${person.lastName}"/> </if-not-empty> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.lastInviteDate"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> 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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -43,7 +43,7 @@ <make-value value-field="partyNameHistory" entity-name="PartyNameHistory"/> <set-pk-fields value-field="partyNameHistory" map="parameters"/> - <now-timestamp-to-env env-name="partyNameHistory.changeDate"/> + <now-timestamp field="partyNameHistory.changeDate"/> <if> <condition><not><if-empty field="parameters.groupName"/></not></condition> @@ -97,7 +97,7 @@ <entity-one entity-name="Person" value-field="person"/> <entity-one entity-name="PartyGroup" value-field="partyGroup"/> <if-empty field="parameters.compareDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="parameters.compareDate" from-field="nowTimestamp"/> </if-empty> <!-- go through the list which is sorted by most recent first and find the oldest (last) one with the changeDate greater than the compareDate --> @@ -198,7 +198,7 @@ <make-value entity-name="PartyClassification" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> + <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty> <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updatePartyClassification" short-description="update a PartyClassification"> @@ -337,7 +337,7 @@ </call-service> <!-- create the content role --> <if-not-empty field="parameters.partyId"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set-service-fields service-name="createContentRole" map="parameters" to-map="contentRole"/> <set from-field="contentId" field="contentRole.contentId"/> <set from-field="parameters.partyId" field="contentRole.partyId"/> @@ -505,7 +505,7 @@ - useCache (should be "true" or "false") --> - <if-empty field="nowTimestamp"><now-timestamp-to-env env-name="nowTimestamp"/></if-empty> + <if-empty field="nowTimestamp"><now-timestamp field="nowTimestamp"/></if-empty> <!-- only create these if they don't already exist, more efficient and avoids potential problems in recursed calls --> <if-empty field="_inline_roleTypeIdFromList"> @@ -763,7 +763,7 @@ <if-empty field="parameters.roleTypeIdTo"><set field="parameters.roleTypeIdTo" value="_NA_"/></if-empty> <if-empty field="parameters.partyIdFrom"><set field="parameters.partyIdFrom" from-field="userLogin.partyId"/></if-empty> - <if-empty field="parameters.fromDate"><now-timestamp-to-env env-name="parameters.fromDate"/></if-empty> + <if-empty field="parameters.fromDate"><now-timestamp field="parameters.fromDate"/></if-empty> <!-- check if not already exist --> <entity-and entity-name="PartyRelationship" list="partyRels" filter-by-date="true"> @@ -801,7 +801,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimeStamp"/> + <now-timestamp field="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> <create-value value-field="newEntity"/> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Tue Dec 30 09:25:18 2008 @@ -38,7 +38,7 @@ <property-to-field resource="security" property="username.lowercase" default="false" field-name="username_lowercase"/> <property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/> - <now-timestamp-to-env env-name="nowStamp"/> + <now-timestamp field="nowStamp"/> <set field="parameters.roleTypeId" value="PROSPECT" /> <call-simple-method method-name="createUser"/> </simple-method> @@ -52,7 +52,7 @@ <property-to-field resource="security" property="username.lowercase" default="false" field-name="username_lowercase"/> <property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/> - <now-timestamp-to-env env-name="nowStamp"/> + <now-timestamp field="nowStamp"/> <set field="parameters.roleTypeId" value="EMPLOYEE" /> <call-simple-method method-name="createUser"/> </simple-method> @@ -61,7 +61,7 @@ <property-to-field resource="security" property="username.lowercase" default="false" field-name="username_lowercase"/> <property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/> <set field="default_user_password" value="ungssblepsswd" /> - <now-timestamp-to-env env-name="nowStamp"/> + <now-timestamp field="nowStamp"/> <if-compare field="create_allow_password" operator="not-equals" value="true"> <set field="parameters.PASSWORD" from-field="default_user_password" /> |
Free forum by Nabble | Edit this page |