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=730397&r1=730396&r2=730397&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 Wed Dec 31 05:59:08 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 field="nowStamp"/> + <now-timestamp-to-env env-name="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 field="nowStamp"/> + <now-timestamp-to-env env-name="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 field="nowStamp"/> + <now-timestamp-to-env env-name="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 field="nowStamp"/> + <now-timestamp-to-env env-name="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 field="nowStamp"/> + <now-timestamp-to-env env-name="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 field="nowStamp"/> + <now-timestamp-to-env env-name="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 field="nowStamp"/> + <now-timestamp-to-env env-name="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 field="nowStamp"/> + <now-timestamp-to-env env-name="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=730397&r1=730396&r2=730397&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 Wed Dec 31 05:59:08 2008 @@ -100,7 +100,7 @@ <log level="verbose" message=" ${partyGroupPartyId}"></log> <if-not-empty field="parameters.leadSource"> <make-value entity-name="DataSource" value-field="dataSource"/> - <sequenced-id sequence-name="DataSource" field="dataSourceId"/> + <sequenced-id-to-env sequence-name="DataSource" env-name="dataSourceId"/> <set field="dataSource.dataSourceId" from-field="dataSourceId"/> <set field="dataSource.dataSourceTypeId" value="LEAD_SOURCE"/> <set field="dataSource.description" from-field="parameters.leadSource"/> @@ -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 field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <set field="partyDataSource.fromDate" from-field="nowTimestamp"/> <set field="partyDataSource.isCreate" value="Y"/> <create-value value-field="partyDataSource"/> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml?rev=730397&r1=730396&r2=730397&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml Wed Dec 31 05:59:08 2008 @@ -24,7 +24,7 @@ <simple-method method-name="createOpportunity" short-description="Create Opportunity for SFA"> <make-value entity-name="SalesOpportunity" value-field="newEntity"/> <if-empty field="parameters.salesOpportunityId"> - <sequenced-id sequence-name="SalesOpportunity" field="parameters.salesOpportunityId"/> + <sequenced-id-to-env sequence-name="SalesOpportunity" env-name="parameters.salesOpportunityId"/> </if-empty> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> 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=730397&r1=730396&r2=730397&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/UpgradeServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/UpgradeServices.xml Wed Dec 31 05:59:08 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 field="fromDate"/> + <now-timestamp-to-env env-name="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=730397&r1=730396&r2=730397&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 Wed Dec 31 05:59:08 2008 @@ -23,7 +23,7 @@ <simple-method method-name="validateCustomerInfo" short-description="validateCustomerInfo" login-required="false"> <!-- timestamp to be used --> - <now-timestamp field="nowStamp"/> + <now-timestamp-to-env env-name="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=730397&r1=730396&r2=730397&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 Wed Dec 31 05:59:08 2008 @@ -29,7 +29,7 @@ <!-- make the value and set the fields from the parameters --> <make-value value-field="salesForecast" entity-name="SalesForecast"/> - <sequenced-id sequence-name="SalesForecast" field="salesForecastId"/> + <sequenced-id-to-env sequence-name="SalesForecast" env-name="salesForecastId"/> <set field="salesForecast.salesForecastId" from-field="salesForecastId"/> <set-nonpk-fields map="parameters" value-field="salesForecast"/> @@ -66,7 +66,7 @@ <!-- make the value and set the fields from the salesForecast map --> <make-value value-field="salesForecastHistory" entity-name="SalesForecastHistory"/> - <sequenced-id sequence-name="SalesForecastHistory" field="salesForecastHistoryId"/> + <sequenced-id-to-env sequence-name="SalesForecastHistory" env-name="salesForecastHistoryId"/> <set field="salesForecastHistory.salesForecastHistoryId" from-field="salesForecastHistoryId"/> <set-nonpk-fields value-field="salesForecastHistory" map="salesForecast"/> @@ -74,7 +74,7 @@ <set field="salesForecastHistory.changeNote" from-field="parameters.changeNote"/> <!-- set the modified info --> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <set field="salesForecastHistory.modifiedTimestamp" from-field="nowTimestamp"/> <set field="salesForecast.modifiedByUserLoginId" from-field="userLogin.userLoginId"/> @@ -85,7 +85,7 @@ <!-- Sales Forecast Detail --> <simple-method method-name="createSalesForecastDetail" short-description="Creates a sales forecast detail"> <make-value entity-name="SalesForecastDetail" value-field="newEntity"/> - <sequenced-id sequence-name="SalesForecastDetail" field="newEntity.salesForecastDetailId"/> + <sequenced-id-to-env sequence-name="SalesForecastDetail" env-name="newEntity.salesForecastDetailId"/> <field-to-result field="newEntity.salesForecastDetailId" result-name="salesForecastDetailId"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> 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=730397&r1=730396&r2=730397&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 Wed Dec 31 05:59:08 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 field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <if> <condition> @@ -92,7 +92,7 @@ </call-service> <else> - <sequenced-id sequence-name="ReturnHeader" field="newEntity.returnId"/> + <sequenced-id-to-env sequence-name="ReturnHeader" env-name="newEntity.returnId"/> </else> </if-compare> <field-to-result field="newEntity.returnId" result-name="returnId"/> @@ -513,7 +513,7 @@ <make-value value-field="newEntity" entity-name="ReturnAdjustment"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="ReturnAdjustment" field="newEntity.returnAdjustmentId"/> + <sequenced-id-to-env sequence-name="ReturnAdjustment" env-name="newEntity.returnAdjustmentId"/> <field-to-result field="newEntity.returnAdjustmentId" result-name="returnAdjustmentId"/> <create-value value-field="newEntity"/> <set field="responseMessage" value="Return Adjustment #${newEntity.returnAdjustmentId} was created successfully."/> @@ -564,13 +564,13 @@ <!-- create status change history --> <!-- TODO: this should be done with a createReturnStatus service call --> <make-value entity-name="ReturnStatus" value-field="newReturnStatus"/> - <sequenced-id sequence-name="ReturnStatus" field="newReturnStatus.returnStatusId"/> + <sequenced-id-to-env sequence-name="ReturnStatus" env-name="newReturnStatus.returnStatusId"/> <set field="newReturnStatus.returnId" from-field="returnItem.returnItemSeqId"/> <set field="newReturnStatus.returnId" from-field="returnItem.returnId"/> <set field="newReturnStatus.statusId" from-field="returnItem.statusId"/> - <now-timestamp field="newReturnStatus.statusDatetime"/> + <now-timestamp-to-env env-name="newReturnStatus.statusDatetime"/> <create-value value-field="newReturnStatus"/> </if-compare-field> @@ -614,12 +614,12 @@ <call-service service-name="updateReturnHeader" in-map-name="returnHeaderCtx"/> <!-- create the status history --> <make-value entity-name="ReturnStatus" value-field="newValue"/> - <sequenced-id sequence-name="ReturnStatus" field="newValue.returnStatusId"/> + <sequenced-id-to-env sequence-name="ReturnStatus" env-name="newValue.returnStatusId"/> <set field="newValue.returnId" from-field="returnHeader.returnId"/> <set field="newValue.statusId" value="RETURN_RECEIVED"/> - <now-timestamp field="newValue.statusDatetime"/> + <now-timestamp-to-env env-name="newValue.statusDatetime"/> <create-value value-field="newValue"/> </if-compare> @@ -629,7 +629,7 @@ </simple-method> <simple-method method-name="createReturnItemResponse" short-description="Create a ReturnItemResponse"> <make-value value-field="newEntity" entity-name="ReturnItemResponse"/> - <sequenced-id sequence-name="ReturnItemResponse" field="newEntity.returnItemResponseId"/> + <sequenced-id-to-env sequence-name="ReturnItemResponse" env-name="newEntity.returnItemResponseId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> <field-to-result field="newEntity.returnItemResponseId" result-name="returnItemResponseId"/> 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=730397&r1=730396&r2=730397&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 Wed Dec 31 05:59:08 2008 @@ -35,7 +35,7 @@ <check-errors/> <if-not-empty field="monthsToInclude"> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <call-bsh><![CDATA[ calendar = java.util.Calendar.getInstance(); calendar.setTimeInMillis(nowTimestamp.getTime()); @@ -498,7 +498,7 @@ <!-- default to the default sequencing: ODRSQ_STANDARD --> <set from-field="parameters.orderId" field="orderIdTemp"/> <if-empty field="orderIdTemp"> - <sequenced-id sequence-name="OrderHeader" field="orderIdTemp"/> + <sequenced-id-to-env sequence-name="OrderHeader" env-name="orderIdTemp"/> <else> <!-- check the provided ID --> <check-id field-name="orderIdTemp"/> @@ -528,7 +528,7 @@ <if-not-empty field="parameters.orderId"> <set field="newEntity.orderId" from-field="parameters.orderId"/> <else> - <sequenced-id sequence-name="OrderHeader" field="newEntity.orderId"/> + <sequenced-id-to-env sequence-name="OrderHeader" env-name="newEntity.orderId"/> </else> </if-not-empty> <field-to-result field="newEntity.orderId" result-name="orderId"/> @@ -887,13 +887,13 @@ <make-value value-field="newEntity" entity-name="OrderItemChange"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="parameters.changeDatetime"> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <set field="newEntity.changeDatetime" from-field="nowTimestamp"/> </if-empty> <if-empty field="parameters.changeUserLogin"> <set field="newEntity.changeUserLogin" from-field="userLogin.userLoginId"/> </if-empty> - <sequenced-id sequence-name="OrderItemChange" field="newEntity.orderItemChangeId"/> + <sequenced-id-to-env sequence-name="OrderItemChange" env-name="newEntity.orderItemChangeId"/> <create-value value-field="newEntity"/> <field-to-result field="newEntity.orderItemChangeId" result-name="orderItemChangeId"/> </simple-method> 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=730397&r1=730396&r2=730397&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 Wed Dec 31 05:59:08 2008 @@ -54,7 +54,7 @@ <!-- default to the default sequencing: QTESQ_STANDARD --> <set from-field="parameters.quoteId" field="quoteIdTemp"/> <if-empty field="quoteIdTemp"> - <sequenced-id sequence-name="Quote" field="quoteIdTemp"/> + <sequenced-id-to-env sequence-name="Quote" env-name="quoteIdTemp"/> <else> <!-- check the provided ID --> <check-id field-name="quoteIdTemp"/> @@ -99,7 +99,7 @@ <result-to-field result-name="quoteId" field="newEntity.quoteId"/> </call-service> <else> - <sequenced-id sequence-name="Quote" field="newEntity.quoteId"/> + <sequenced-id-to-env sequence-name="Quote" env-name="newEntity.quoteId"/> </else> </if-not-empty> <field-to-result field="newEntity.quoteId" result-name="quoteId"/> @@ -510,7 +510,7 @@ <set value="PROPOSAL" field="newQuote.quoteTypeId"/> <!-- create a non existing ID --> - <sequenced-id sequence-name="Quote" field="quoteId"/> + <sequenced-id-to-env sequence-name="Quote" env-name="quoteId"/> <set from-field="quoteId" field="newQuote.quoteId"/> <set from-field="quoteId" field="newQuoteItem.quoteId"/> <make-next-seq-id value-field="newQuoteItem" seq-field-name="quoteItemSeqId"/> @@ -647,7 +647,7 @@ <iterate list="adjustments" entry="adjustment"> <set from-field="parameters.quoteId" field="adjustment.quoteId"/> - <sequenced-id sequence-name="QuoteAdjustment" field="adjustment.quoteAdjustmentId"/> + <sequenced-id-to-env sequence-name="QuoteAdjustment" env-name="adjustment.quoteAdjustmentId"/> <create-value value-field="adjustment"/> </iterate> </simple-method> @@ -660,8 +660,8 @@ <make-value value-field="newEntity" entity-name="QuoteAdjustment"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="QuoteAdjustment" field="quoteAdjustmentId"/> - <now-timestamp field="newEntity.createdDate"/> + <sequenced-id-to-env sequence-name="QuoteAdjustment" env-name="quoteAdjustmentId"/> + <now-timestamp-to-env env-name="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"/> @@ -767,7 +767,7 @@ <call-object-method obj-field-name="parameters.cart" method-name="makeAllQuoteAdjustments" ret-field="adjustments"/> <iterate list="adjustments" entry="adjustment"> <set from-field="quote.quoteId" field="adjustment.quoteId"/> - <sequenced-id sequence-name="QuoteAdjustment" field="adjustment.quoteAdjustmentId"/> + <sequenced-id-to-env sequence-name="QuoteAdjustment" env-name="adjustment.quoteAdjustmentId"/> <create-value value-field="adjustment"/> </iterate> </then> 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=730397&r1=730396&r2=730397&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 Wed Dec 31 05:59:08 2008 @@ -52,7 +52,7 @@ <make-value value-field="newEntity" entity-name="CustRequest"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.lastModifiedDate"/> <set from-field="nowTimestamp" field="newEntity.createdDate"/> <set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/> @@ -66,7 +66,7 @@ <set value="CRQ_SUBMITTED" field="newEntity.statusId"/> </if-empty> - <sequenced-id sequence-name="CustRequest" field="custRequestId"/> + <sequenced-id-to-env sequence-name="CustRequest" env-name="custRequestId"/> <to-string field-name="custRequestId"/> <set from-field="custRequestId" field="newEntity.custRequestId"/> <create-value value-field="newEntity"/> @@ -176,7 +176,7 @@ <clear-field field="successMessage"/> </if-not-empty> </if-compare-field> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="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 field="newEntity.fromDate"/> + <now-timestamp-to-env env-name="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 field="thruDate"/> + <now-timestamp-to-env env-name="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 field="nowTimestamp"/> + <now-timestamp-to-env env-name="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 field="nowTimestamp"/> + <now-timestamp-to-env env-name="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 field="lookedUpValue.thruDate"/> + <now-timestamp-to-env env-name="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=730397&r1=730396&r2=730397&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 Wed Dec 31 05:59:08 2008 @@ -22,14 +22,14 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-method method-name="createRequirement" short-description="Create a new requirement"> <make-value value-field="newEntity" entity-name="Requirement"/> - <sequenced-id sequence-name="Requirement" field="requirementId"/> + <sequenced-id-to-env sequence-name="Requirement" env-name="requirementId"/> <to-string field-name="requirementId"/> <set from-field="requirementId" field="newEntity.requirementId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="parameters.statusId"> <set value="REQ_CREATED" field="newEntity.statusId"/> </if-empty> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="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 field="requirementSupplier.fromDate"/> + <now-timestamp-to-env env-name="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 field="newEntity.fromDate"/> + <now-timestamp-to-env env-name="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=730397&r1=730396&r2=730397&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 Wed Dec 31 05:59:08 2008 @@ -64,7 +64,7 @@ </if-compare> </if-empty> - <sequenced-id sequence-name="ShoppingList" field="newEntity.shoppingListId"/> + <sequenced-id-to-env sequence-name="ShoppingList" env-name="newEntity.shoppingListId"/> <field-to-result field="newEntity.shoppingListId" result-name="shoppingListId"/> <create-value value-field="newEntity"/> </simple-method> @@ -133,7 +133,7 @@ <create-value value-field="newEntity"/> <if-compare-field field="shoppingList.partyId" to-field="userLogin.partyId" operator="not-equals"> - <now-timestamp field="shoppingList.lastAdminModified"/> + <now-timestamp-to-env env-name="shoppingList.lastAdminModified"/> <store-value value-field="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 field="shoppingList.lastAdminModified"/> + <now-timestamp-to-env env-name="shoppingList.lastAdminModified"/> <store-value value-field="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 field="shoppingList.lastAdminModified"/> + <now-timestamp-to-env env-name="shoppingList.lastAdminModified"/> <store-value value-field="shoppingList"/> </if-compare-field> </simple-method> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=730397&r1=730396&r2=730397&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Wed Dec 31 05:59:08 2008 @@ -56,7 +56,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="parameters.communicationEventId"> - <sequenced-id sequence-name="CommunicationEvent" field="newEntity.communicationEventId"/> + <sequenced-id-to-env sequence-name="CommunicationEvent" env-name="newEntity.communicationEventId"/> <else> <set field="newEntity.communicationEventId" from-field="parameters.communicationEventId"/> </else> @@ -75,7 +75,7 @@ </if-not-empty> </if-empty> - <now-timestamp field="newEntity.entryDate"/> + <now-timestamp-to-env env-name="newEntity.entryDate"/> <create-value value-field="newEntity"/> <if-not-empty field="parameters.productId"> @@ -342,7 +342,7 @@ <simple-method method-name="sendEmailDated" short-description="Checks for email communication events with the status COM_IN_PROGRESS and a startdate which is expired, then send the email"> - <now-timestamp field="nowDate"/> + <now-timestamp-to-env env-name="nowDate"/> <entity-condition entity-name="CommunicationEvent" list="communicationEvents"> <condition-list combine="and"> <condition-list combine="or"> 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=730397&r1=730396&r2=730397&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 Wed Dec 31 05:59:08 2008 @@ -23,7 +23,7 @@ <simple-method method-name="createContactMech" short-description="Create Contact Mechanism"> <make-value value-field="newValue" entity-name="ContactMech"/> <if-empty field="parameters.contactMechId"> - <sequenced-id sequence-name="ContactMech" field="newValue.contactMechId"/> + <sequenced-id-to-env sequence-name="ContactMech" env-name="newValue.contactMechId"/> <else> <set field="newValue.contactMechId" from-field="parameters.contactMechId"/> </else> @@ -299,7 +299,7 @@ <first-from-list list="emailAddressVerifications" entry="emailAddressVerification"/> <if-not-empty field="emailAddressVerification"> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="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=730397&r1=730396&r2=730397&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 Wed Dec 31 05:59:08 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 field="newValue.fromDate"/> + <now-timestamp-to-env env-name="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 field="newPartyContactMech.fromDate"/> - <now-timestamp field="partyContactMech.thruDate"/> + <now-timestamp-to-env env-name="newPartyContactMech.fromDate"/> + <now-timestamp-to-env env-name="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 field="partyContactMechPurposeOld.thruDate"/> + <now-timestamp-to-env env-name="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 field="partyContactMech.thruDate"/> + <now-timestamp-to-env env-name="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 field="input.filterByDateValue"/> + <now-timestamp-to-env env-name="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=730397&r1=730396&r2=730397&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 Wed Dec 31 05:59:08 2008 @@ -27,7 +27,7 @@ <set-nonpk-fields value-field="partyContent" map="parameters"/> <if-empty field="partyContent.fromDate"> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="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=730397&r1=730396&r2=730397&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 Wed Dec 31 05:59:08 2008 @@ -29,7 +29,7 @@ <property-to-field resource="security" property="username.lowercase" default="false" field="username_lowercase"/> <property-to-field resource="security" property="password.lowercase" default="false" field="password_lowercase"/> - <now-timestamp field="nowStamp"/> + <now-timestamp-to-env env-name="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=730397&r1=730396&r2=730397&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 Wed Dec 31 05:59:08 2008 @@ -24,7 +24,7 @@ <!-- Party Invitation Services --> <simple-method method-name="createPartyInvitation" short-description="Create a PartyInvitation"> <make-value entity-name="PartyInvitation" value-field="newEntity"/> - <sequenced-id sequence-name="PartyInvitation" field="newEntity.partyInvitationId"/> + <sequenced-id-to-env sequence-name="PartyInvitation" env-name="newEntity.partyInvitationId"/> <field-to-result field="newEntity.partyInvitationId" result-name="partyInvitationId"/> <if-not-empty field="parameters.partyId"> <entity-one entity-name="Person" value-field="person" auto-field-map="false"> @@ -32,7 +32,7 @@ </entity-one> <set field="parameters.toName" value="${person.firstName} ${person.middleName} ${person.lastName}"/> </if-not-empty> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="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=730397&r1=730396&r2=730397&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 Wed Dec 31 05:59:08 2008 @@ -43,7 +43,7 @@ <make-value value-field="partyNameHistory" entity-name="PartyNameHistory"/> <set-pk-fields value-field="partyNameHistory" map="parameters"/> - <now-timestamp field="partyNameHistory.changeDate"/> + <now-timestamp-to-env env-name="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 field="nowTimestamp"/> + <now-timestamp-to-env env-name="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 field="newEntity.fromDate"/></if-empty> + <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updatePartyClassification" short-description="update a PartyClassification"> @@ -214,7 +214,7 @@ <simple-method method-name="createPartyClassificationGroup" short-description="create a PartyClassificationGroup"> <log level="verbose" message="in newEntity" /> <make-value entity-name="PartyClassificationGroup" value-field="newEntity"/> - <sequenced-id sequence-name="PartyClassificationGroup" field="newEntity.partyClassificationGroupId"/> + <sequenced-id-to-env sequence-name="PartyClassificationGroup" env-name="newEntity.partyClassificationGroupId"/> <field-to-result field="newEntity.partyClassificationGroupId" result-name="partyClassificationGroupId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <log level="verbose" message="newEntity:${newEntity}" /> @@ -337,7 +337,7 @@ </call-service> <!-- create the content role --> <if-not-empty field="parameters.partyId"> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="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 field="nowTimestamp"/></if-empty> + <if-empty field="nowTimestamp"><now-timestamp-to-env env-name="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 field="parameters.fromDate"/></if-empty> + <if-empty field="parameters.fromDate"><now-timestamp-to-env env-name="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 field="nowTimeStamp"/> + <now-timestamp-to-env env-name="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=730397&r1=730396&r2=730397&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 Wed Dec 31 05:59:08 2008 @@ -38,7 +38,7 @@ <property-to-field resource="security" property="username.lowercase" default="false" field="username_lowercase"/> <property-to-field resource="security" property="password.lowercase" default="false" field="password_lowercase"/> - <now-timestamp field="nowStamp"/> + <now-timestamp-to-env env-name="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="username_lowercase"/> <property-to-field resource="security" property="password.lowercase" default="false" field="password_lowercase"/> - <now-timestamp field="nowStamp"/> + <now-timestamp-to-env env-name="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="username_lowercase"/> <property-to-field resource="security" property="password.lowercase" default="false" field="password_lowercase"/> <set field="default_user_password" value="ungssblepsswd" /> - <now-timestamp field="nowStamp"/> + <now-timestamp-to-env env-name="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/product/script/org/ofbiz/product/UpgradeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml?rev=730397&r1=730396&r2=730397&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml Wed Dec 31 05:59:08 2008 @@ -23,7 +23,7 @@ <simple-method method-name="migrateFacilityRole" short-description="Migrate Data From OldFacilityRole To FacilityParty"> <entity-condition entity-name="OldFacilityRole" list="oldFacilityRoles"/> - <now-timestamp field="fromDate"/> + <now-timestamp-to-env env-name="fromDate"/> <iterate list="oldFacilityRoles" entry="oldFacilityRole"> <make-value entity-name="FacilityParty" value-field="facilityParty"/> <set field="facilityParty.facilityId" from-field="oldFacilityRole.facilityId"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=730397&r1=730396&r2=730397&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Wed Dec 31 05:59:08 2008 @@ -25,7 +25,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="parameters.prodCatalogId"> - <sequenced-id sequence-name="ProdCatalog" field="newEntity.prodCatalogId"/> + <sequenced-id-to-env sequence-name="ProdCatalog" env-name="newEntity.prodCatalogId"/> <else> <set field="newEntity.prodCatalogId" from-field="parameters.prodCatalogId"/> <check-id field-name="newEntity.prodCatalogId"/> @@ -59,7 +59,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.fromDate"/> </if-empty> @@ -88,7 +88,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="newEntity.fromDate"/> + <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml?rev=730397&r1=730396&r2=730397&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml Wed Dec 31 05:59:08 2008 @@ -27,7 +27,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=730397&r1=730396&r2=730397&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Wed Dec 31 05:59:08 2008 @@ -32,12 +32,12 @@ </check-permission> <check-errors/> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <make-value value-field="newEntity" entity-name="ProductCategory"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="parameters.productCategoryId"> - <sequenced-id sequence-name="ProductCategory" field="newEntity.productCategoryId"/> + <sequenced-id-to-env sequence-name="ProductCategory" env-name="newEntity.productCategoryId"/> <else> <set field="newEntity.productCategoryId" from-field="parameters.productCategoryId"/> <check-id field-name="newEntity.productCategoryId"/> @@ -94,7 +94,7 @@ <make-value entity-name="ProductCategoryRollup" value-field="newRollup"/> <field-to-field field-name="productCategoryId" map-name="lookedUpValue" to-field-name="productCategoryId" to-map-name="newRollup"/> <field-to-field field-name="primaryParentCategoryId" map-name="lookedUpValue" to-field-name="parentProductCategoryId" to-map-name="newRollup"/> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <env-to-field env-name="nowTimestamp" field-name="fromDate" map-name="newRollup"/> <create-value value-field="newRollup"/> </if-compare-field> @@ -120,7 +120,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="newEntity.fromDate"/> + <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> @@ -145,7 +145,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="newEntity.fromDate"/> + <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> @@ -165,7 +165,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="newEntity.fromDate"/> + <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> @@ -227,7 +227,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="newEntity.fromDate"/> + <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> @@ -273,7 +273,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="newEntity.fromDate"/> + <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> @@ -294,7 +294,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="newEntity.fromDate"/> + <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> @@ -313,7 +313,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="newEntity.fromDate"/> + <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> @@ -439,7 +439,7 @@ <if-not-empty field="parameters.thruDate"> <set field="expireTimestamp" from-field="parameters.thruDate"/> <else> - <now-timestamp field="expireTimestamp"/> + <now-timestamp-to-env env-name="expireTimestamp"/> </else> </if-not-empty> @@ -461,7 +461,7 @@ <if-not-empty field="parameters.validDate"> <set field="expireTimestamp" from-field="parameters.validDate"/> <else> - <now-timestamp field="expireTimestamp"/> + <now-timestamp-to-env env-name="expireTimestamp"/> </else> </if-not-empty> @@ -678,7 +678,7 @@ <!-- now set the rest of the PK fields (should just be fromDate now; unless linkSeqId is not empty --> <set-pk-fields value-field="newEntity" map="parameters"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="newEntity.fromDate"/> + <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> <set-nonpk-fields map="parameters" value-field="newEntity"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml?rev=730397&r1=730396&r2=730397&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml Wed Dec 31 05:59:08 2008 @@ -32,7 +32,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <if-empty field="newEntity.fromDate"> <set field="newEntity.fromDate" from-field="nowTimestamp" /> @@ -77,7 +77,7 @@ </check-permission> <check-errors/> <make-value entity-name="ProductConfigItem" value-field="newEntity"/> - <sequenced-id sequence-name="ProductConfigItem" field="newEntity.configItemId"/> + <sequenced-id-to-env sequence-name="ProductConfigItem" env-name="newEntity.configItemId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> <field-to-result field="configItemId" map-name="newEntity"/> @@ -112,7 +112,7 @@ <make-value entity-name="ProductConfigOption" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="ProductConfigOption" field="newEntity.configOptionId"/> + <sequenced-id-to-env sequence-name="ProductConfigOption" env-name="newEntity.configOptionId"/> <create-value value-field="newEntity"/> <field-to-result field="newEntity.configItemId" result-name="configItemId"/> <field-to-result field="newEntity.configOptionId" result-name="configOptionId"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml?rev=730397&r1=730396&r2=730397&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml Wed Dec 31 05:59:08 2008 @@ -27,7 +27,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml?rev=730397&r1=730396&r2=730397&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml Wed Dec 31 05:59:08 2008 @@ -24,10 +24,10 @@ <simple-method method-name="createCostComponent" short-description="Create a CostComponent"> <make-value value-field="newEntity" entity-name="CostComponent"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="CostComponent" field="newEntity.costComponentId"/> + <sequenced-id-to-env sequence-name="CostComponent" env-name="newEntity.costComponentId"/> <field-to-result field="costComponentId" map-name="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="newEntity.fromDate"/> + <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> </simple-method> @@ -48,7 +48,7 @@ <find-by-and entity-name="CostComponent" map="costsAndMap" list="existingCosts"/> <filter-list-by-date list-name="existingCosts"/> <iterate list="existingCosts" entry="existingCost"> - <now-timestamp field="existingCost.thruDate"/> + <now-timestamp-to-env env-name="existingCost.thruDate"/> <store-value value-field="existingCost"/> </iterate> </simple-method> @@ -60,15 +60,15 @@ <find-by-and entity-name="CostComponent" map="costsAndMap" list="existingCosts"/> <filter-list-by-date list-name="existingCosts"/> <iterate list="existingCosts" entry="existingCost"> - <now-timestamp field="existingCost.thruDate"/> + <now-timestamp-to-env env-name="existingCost.thruDate"/> <store-value value-field="existingCost"/> </iterate> <!-- The new cost is created --> <make-value value-field="newEntity" entity-name="CostComponent"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="CostComponent" field="newEntity.costComponentId"/> + <sequenced-id-to-env sequence-name="CostComponent" env-name="newEntity.costComponentId"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="newEntity.fromDate"/> + <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> <field-to-result field="newEntity.costComponentId" result-name="costComponentId"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml?rev=730397&r1=730396&r2=730397&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml Wed Dec 31 05:59:08 2008 @@ -27,7 +27,7 @@ <make-value entity-name="ProductFeatureCategory" value-field="newEntity"/> <set-nonpk-fields value-field="newEntity" map="parameters"/> - <sequenced-id sequence-name="ProductFeatureCategory" field="newEntity.productFeatureCategoryId"/> + <sequenced-id-to-env sequence-name="ProductFeatureCategory" env-name="newEntity.productFeatureCategoryId"/> <field-to-result field="newEntity.productFeatureCategoryId" result-name="productFeatureCategoryId"/> <create-value value-field="newEntity"/> @@ -48,7 +48,7 @@ <make-value value-field="newEntity" entity-name="ProductFeature"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="parameters.productFeatureId"> - <sequenced-id sequence-name="ProductFeature" field="newEntity.productFeatureId"/> + <sequenced-id-to-env sequence-name="ProductFeature" env-name="newEntity.productFeatureId"/> <else> <set field="newEntity.productFeatureId" from-field="parameters.productFeatureId"/> </else> @@ -73,7 +73,7 @@ <check-errors/> <if-empty field="parameters.fromDate"> - <now-timestamp field="parameters.fromDate"/> + <now-timestamp-to-env env-name="parameters.fromDate"/> </if-empty> <make-value value-field="newEntity" entity-name="ProductFeatureAppl"/> <set-pk-fields map="parameters" value-field="newEntity"/> @@ -99,7 +99,7 @@ <entity-one entity-name="ProductFeatureAppl" value-field="productFeatureAppl"/> <!-- This is old code that just sets the thru date; the current codes actually removes the db row <if-empty field="parameters.thruDate"> - <now-timestamp field="nowStamp"/> + <now-timestamp-to-env env-name="nowStamp"/> <env-to-field env-name="nowStamp" field-name="thruDate" map-name="parameters"/> </if-empty> <field-to-field field-name="thruDate" map-name="parameters" to-map-name="productFeatureAppl"/> @@ -142,7 +142,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="newEntity.fromDate"/> + <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> @@ -177,7 +177,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="newEntity.fromDate"/> + <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> @@ -210,7 +210,7 @@ <make-value value-field="newEntity" entity-name="ProductFeatureGroup"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="ProductFeatureGroup" field="newEntity.productFeatureGroupId"/> + <sequenced-id-to-env sequence-name="ProductFeatureGroup" env-name="newEntity.productFeatureGroupId"/> <field-to-result field="newEntity.productFeatureGroupId" result-name="productFeatureGroupId"/> <create-value value-field="newEntity"/> @@ -232,7 +232,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="newEntity.fromDate"/> + <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> @@ -373,12 +373,12 @@ <simple-method method-name="createFeaturePrice" short-description="Create a Feature Price"> <make-value value-field="newEntity" entity-name="ProductFeaturePrice"/> <if-empty field="parameters.productFeatureId"> - <sequenced-id sequence-name="ProductFeaturePrice" field="parameters.productFeatureId"/> + <sequenced-id-to-env sequence-name="ProductFeaturePrice" env-name="parameters.productFeatureId"/> </if-empty> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <if-empty field="newEntity.fromDate"> <set field="newEntity.fromDate" from-field="nowTimestamp" /> @@ -397,7 +397,7 @@ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp" /> <set field="lookedUpValue.lastModifiedByUserLogin" from-field="userLogin.userLoginId" /> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml?rev=730397&r1=730396&r2=730397&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml Wed Dec 31 05:59:08 2008 @@ -70,7 +70,7 @@ <!-- kind of like the inventory reservation routine (with a few variations...), 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="orderItem.productId"> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <!-- NOTE: the inventory will be issued from the OrderHeader.originFacilityId --> <if-empty field="parameters.orderHeader"> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml?rev=730397&r1=730396&r2=730397&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml Wed Dec 31 05:59:08 2008 @@ -34,7 +34,7 @@ --> <log level="verbose" message="Parameters : ${parameters}"/> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <!-- check the product; make sure its a physical item --> <entity-one entity-name="Product" value-field="product"/> @@ -496,7 +496,7 @@ <make-value entity-name="OrderItemShipGrpInvRes" value-field="newOisgirEntity"/> <set-pk-fields map="parameters" value-field="newOisgirEntity"/> <set-nonpk-fields map="parameters" value-field="newOisgirEntity"/> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <set from-field="nowTimestamp" field="newOisgirEntity.createdDatetime"/> <if-empty field="newOisgirEntity.reservedDatetime"> <set from-field="nowTimestamp" field="newOisgirEntity.reservedDatetime"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=730397&r1=730396&r2=730397&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Wed Dec 31 05:59:08 2008 @@ -113,7 +113,7 @@ <call-simple-method method-name="inventoryItemCheckSetDefaultValues"/> <check-errors/> - <sequenced-id sequence-name="InventoryItem" field="inventoryItem.inventoryItemId"/> + <sequenced-id-to-env sequence-name="InventoryItem" env-name="inventoryItem.inventoryItemId"/> <create-value value-field="inventoryItem"/> <field-to-result field="inventoryItem.inventoryItemId" result-name="inventoryItemId"/> </simple-method> @@ -254,7 +254,7 @@ </simple-method> <simple-method method-name="createInventoryItemStatus" short-description="Create an inventory item status record"> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <!-- find the most recent InventoryItemStatus record and set the statusEndDatetime --> <entity-and entity-name="InventoryItemStatus" list="oldInventoryItemStatusList"> @@ -286,7 +286,7 @@ <set from-field="parameters.inventoryItemId" field="newEntity.inventoryItemId"/> <!-- NOTE DEJ20070927: not using make-next-seq-id because a single InventoryItem may see traffic from lots of threads at the same time, and make-next-seq-id doesn't do well with that <make-next-seq-id seq-field-name="inventoryItemDetailSeqId" value-field="newEntity" increment-by="1" numeric-padding="4"/> --> - <sequenced-id sequence-name="InventoryItemDetail" field="newEntity.inventoryItemDetailSeqId"/> + <sequenced-id-to-env sequence-name="InventoryItemDetail" env-name="newEntity.inventoryItemDetailSeqId"/> <field-to-result field="newEntity.inventoryItemDetailSeqId" result-name="inventoryItemDetailSeqId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -296,7 +296,7 @@ <entity-one entity-name="ItemIssuance" value-field="itemIssuance"/> <set field="newEntity.effectiveDate" from-field="itemIssuance.issuedDateTime"/> <else> - <now-timestamp field="newEntity.effectiveDate"/> + <now-timestamp-to-env env-name="newEntity.effectiveDate"/> </else> </if-not-empty> @@ -407,7 +407,7 @@ <simple-method method-name="checkProductInventoryDiscontinuation" short-description="Check Product Inventory Discontinuation" login-required="false"> <set from-field="parameters.productId" field="productIdMap.productId"/> <find-by-primary-key entity-name="Product" map="productIdMap" value-field="product"/> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <!-- if discontinueProductSales field is empty and the product is a variant, get the fieldcontent from the virtual product --> <if-not-empty field="product"> @@ -501,13 +501,13 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.physicalInventoryDate"> - <now-timestamp field="newEntity.physicalInventoryDate"/> + <now-timestamp-to-env env-name="newEntity.physicalInventoryDate"/> </if-empty> <if-empty field="newEntity.partyId"> <set from-field="userLogin.partyId" field="newEntity.partyId"/> </if-empty> - <sequenced-id sequence-name="PhysicalInventory" field="physicalInventoryId"/> + <sequenced-id-to-env sequence-name="PhysicalInventory" env-name="physicalInventoryId"/> <set from-field="physicalInventoryId" field="newEntity.physicalInventoryId"/> <field-to-result field="physicalInventoryId" result-name="physicalInventoryId"/> @@ -964,7 +964,7 @@ <iterate list="oisgirais" entry="oisgir"> <set field="orderItems.${oisgir.orderItemSeqId}" from-field="oisgir"/> </iterate> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <iterate-map key="orderItemSeqId" value="oisgir" map="orderItems"> <set field="reassignInventoryReservationsCtx.productId" from-field="oisgir.productId"/> <set field="reassignInventoryReservationsCtx.facilityId" from-field="oisgir.facilityId"/> @@ -987,7 +987,7 @@ <make-value value-field="newEntity" entity-name="InventoryTransfer"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="InventoryTransfer" field="newEntity.inventoryTransferId"/> + <sequenced-id-to-env sequence-name="InventoryTransfer" env-name="newEntity.inventoryTransferId"/> <field-to-result field="newEntity.inventoryTransferId" result-name="inventoryTransferId"/> <create-value value-field="newEntity"/> @@ -1020,7 +1020,7 @@ <set from-field="parameters.productId" field="lookupFieldMap.productId"/> <set from-field="parameters.facilityId" field="lookupFieldMap.facilityId"/> <set from-field="parameters.containerId" field="lookupFieldMap.containerId"/> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <!-- check the product; make sure its a physical item --> <entity-one entity-name="Product" value-field="product"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=730397&r1=730396&r2=730397&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml Wed Dec 31 05:59:08 2008 @@ -32,7 +32,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <if-empty field="newEntity.fromDate"> <set field="newEntity.fromDate" from-field="nowTimestamp" /> @@ -60,7 +60,7 @@ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp" /> <set field="lookedUpValue.lastModifiedByUserLogin" from-field="userLogin.userLoginId" /> @@ -98,9 +98,9 @@ <make-value value-field="newEntity" entity-name="ProductPriceChange"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="ProductPriceChange" field="productPriceChangeId"/> + <sequenced-id-to-env sequence-name="ProductPriceChange" env-name="productPriceChangeId"/> <set field="newEntity.productPriceChangeId" from-field="productPriceChangeId" /> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <set field="newEntity.changedDate" from-field="nowTimestamp" /> <set field="newEntity.changedByUserLogin" from-field="userLogin.userLoginId" /> @@ -115,7 +115,7 @@ <check-errors/> <make-value entity-name="ProductPaymentMethodType" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty> + <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> </simple-method> @@ -145,7 +145,7 @@ <make-value value-field="newEntity" entity-name="ProductPriceRule"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="ProductPriceRule" field="newEntity.productPriceRuleId"/> + <sequenced-id-to-env sequence-name="ProductPriceRule" env-name="newEntity.productPriceRuleId"/> <field-to-result field="productPriceRuleId" map-name="newEntity"/> <create-value value-field="newEntity"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml?rev=730397&r1=730396&r2=730397&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml Wed Dec 31 05:59:08 2008 @@ -21,10 +21,10 @@ <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="createCustomerDigitalDownloadProduct" short-description="createCustomerDigitalDownloadProduct"> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <make-value value-field="createProductMap" entity-name="Product"/> - <sequenced-id sequence-name="Product" field="createProductMap.productId"/> + <sequenced-id-to-env sequence-name="Product" env-name="createProductMap.productId"/> <set field="productId" from-field="createProductMap.productId"/> <set field="createProductMap.productName" from-field="parameters.productName"/> @@ -66,7 +66,7 @@ </if-not-empty> </simple-method> <simple-method method-name="updateCustomerDigitalDownloadProduct" short-description="updateCustomerDigitalDownloadProduct"> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <!-- make sure SupplierProduct exists for userLogin.partyId --> <set field="parameters.partyId" from-field="userLogin.partyId"/> @@ -108,7 +108,7 @@ </if-not-empty> </simple-method> <simple-method method-name="deleteCustomerDigitalDownloadProduct" short-description="deleteCustomerDigitalDownloadProduct"> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <!-- make sure SupplierProduct exists for userLogin.partyId --> <entity-and entity-name="SupplierProduct" list="supplierProductList"> @@ -137,7 +137,7 @@ </simple-method> <simple-method method-name="addCustomerDigitalDownloadProductFile" short-description="addCustomerDigitalDownloadProductFile"> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <!-- make sure SupplierProduct exists for userLogin.partyId --> <entity-and entity-name="SupplierProduct" list="supplierProductList"> @@ -168,7 +168,7 @@ <create-value value-field="productContent"/> </simple-method> <simple-method method-name="removeCustomerDigitalDownloadProductFile" short-description="removeCustomerDigitalDownloadProductFile"> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <!-- make sure SupplierProduct exists for userLogin.partyId --> <entity-and entity-name="SupplierProduct" list="supplierProductList"> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml?rev=730397&r1=730396&r2=730397&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml Wed Dec 31 05:59:08 2008 @@ -27,7 +27,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimestamp"/> + <now-timestamp-to-env env-name="nowTimestamp"/> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> |
Free forum by Nabble | Edit this page |