You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/31 14:59:10 UTC
svn commit: r730397 [3/3] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/admin/
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/cost/
applications/accounting/scr...
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml Wed Dec 31 05:59:08 2008
@@ -32,7 +32,7 @@
<set from-field="parameters.productId" field="newEntity.productId"/>
<if-empty field="newEntity.productId">
- <sequenced-id sequence-name="Product" field="newEntity.productId"/>
+ <sequenced-id-to-env sequence-name="Product" env-name="newEntity.productId"/>
<else>
<check-id field-name="productId" map-name="newEntity"/>
<check-errors/>
@@ -40,7 +40,7 @@
</if-empty>
<field-to-result field="productId" map-name="newEntity" result-name="productId"/>
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<set from-field="nowTimestamp" field="newEntity.createdDate"/>
<set from-field="nowTimestamp" field="newEntity.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/>
@@ -63,7 +63,7 @@
<make-value entity-name="ProductCategoryMember" value-field="newMember"/>
<set from-field="productId" map-name="newEntity" to-field-name="productId" to-map-name="newMember"/>
<set from-field="primaryProductCategoryId" map-name="newEntity" to-field-name="productCategoryId" to-map-name="newMember"/>
- <now-timestamp field="nowStamp"/>
+ <now-timestamp-to-env env-name="nowStamp"/>
<set from-field="nowStamp" field="newMember.fromDate"/>
<create-value value-field="newMember"/>
</if-not-empty>
@@ -97,7 +97,7 @@
<set from-field="lookedUpValue.primaryProductCategoryId" field="saveIdMap.primaryProductCategoryId"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <now-timestamp field="lookedUpValue.lastModifiedDate"/>
+ <now-timestamp-to-env env-name="lookedUpValue.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/>
<store-value value-field="lookedUpValue"/>
@@ -109,7 +109,7 @@
<make-value entity-name="ProductCategoryMember" value-field="newMember"/>
<set from-field="productId" map-name="newEntity" to-field-name="productId" to-map-name="newMember"/>
<set from-field="primaryProductCategoryId" map-name="newEntity" to-field-name="productCategoryId" to-map-name="newMember"/>
- <now-timestamp field="newMember.fromDate"/>
+ <now-timestamp-to-env env-name="newMember.fromDate"/>
<create-value value-field="newMember"/>
</if-compare-field>
</if-not-empty>
@@ -129,7 +129,7 @@
<set from-field="lookedUpValue.productName" field="lookedUpValue.internalName"/>
</if-compare>
- <now-timestamp field="lookedUpValue.lastModifiedDate"/>
+ <now-timestamp-to-env env-name="lookedUpValue.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/>
<store-value value-field="lookedUpValue"/>
@@ -149,7 +149,7 @@
</entity-one>
<set from-field="parameters.productName" field="variantProduct.productName"/>
- <now-timestamp field="variantProduct.lastModifiedDate"/>
+ <now-timestamp-to-env env-name="variantProduct.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="variantProduct.lastModifiedByUserLogin"/>
<store-value value-field="variantProduct"/>
</iterate>
@@ -281,7 +281,7 @@
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.productId" field="newTempValue.productId"/>
<!-- this one is slightly different because it needs a new sequenced inventoryItemId -->
- <sequenced-id sequence-name="InventoryItem" field="newTempValue.inventoryItemId"/>
+ <sequenced-id-to-env sequence-name="InventoryItem" env-name="newTempValue.inventoryItemId"/>
<create-value value-field="newTempValue"/>
</iterate>
</if-not-empty>
@@ -370,7 +370,7 @@
<simple-method method-name="discontinueProductSales" short-description="Discontinue Product Sales" login-required="false">
<!-- set sales discontinuation date to now -->
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<entity-one entity-name="Product" value-field="product"/>
<set from-field="nowTimestamp" field="product.salesDiscontinuationDate"/>
<store-value value-field="product"/>
@@ -546,11 +546,11 @@
</if-empty>
<!-- create the new ProductReview -->
- <sequenced-id sequence-name="ProductReview" field="newEntity.productReviewId"/>
+ <sequenced-id-to-env sequence-name="ProductReview" env-name="newEntity.productReviewId"/>
<field-to-result field="newEntity.productReviewId" result-name="productReviewId"/>
<if-empty field="newEntity.postedDateTime">
- <now-timestamp field="newEntity.postedDateTime"/>
+ <now-timestamp-to-env env-name="newEntity.postedDateTime"/>
</if-empty>
<create-value value-field="newEntity"/>
@@ -936,7 +936,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/promo/PromoServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml Wed Dec 31 05:59:08 2008
@@ -28,14 +28,14 @@
<make-value value-field="newEntity" entity-name="ProductPromo"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id sequence-name="ProductPromo" field="newEntity.productPromoId"/>
+ <sequenced-id-to-env sequence-name="ProductPromo" env-name="newEntity.productPromoId"/>
<field-to-result field="productPromoId" map-name="newEntity"/>
<if-empty field="newEntity.userEntered">
<set value="Y" set-if-empty="true" field="newEntity.userEntered"/>
</if-empty>
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<set from-field="nowTimestamp" field="newEntity.createdDate"/>
<set from-field="nowTimestamp" field="newEntity.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/>
@@ -56,7 +56,7 @@
<set value="Y" set-if-empty="true" field="lookedUpValue.userEntered"/>
</if-empty>
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<set from-field="nowTimestamp" field="lookedUpValue.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/>
@@ -154,12 +154,12 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.productPromoCodeId">
- <sequenced-id sequence-name="ProductPromoCode" field="newEntity.productPromoCodeId" stagger-max="100"/>
+ <sequenced-id-to-env sequence-name="ProductPromoCode" env-name="newEntity.productPromoCodeId" stagger-max="100"/>
</if-empty>
<field-to-result field="productPromoCodeId" map-name="newEntity"/>
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<if-empty field="newEntity.fromDate">
<set field="newEntity.fromDate" from-field="nowTimestamp"/>
</if-empty>
@@ -180,7 +180,7 @@
<find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<set from-field="nowTimestamp" field="newEntity.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/>
@@ -360,7 +360,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" set-if-empty="true" field="newEntity.fromDate"/>
</if-empty>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml Wed Dec 31 05:59:08 2008
@@ -44,7 +44,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>
@@ -87,8 +87,8 @@
<set-nonpk-fields value-field="newFacilityContactMech" map="parameters" set-if-null="false"/>
- <now-timestamp field="newFacilityContactMech.fromDate"/>
- <now-timestamp field="facilityContactMech.thruDate"/>
+ <now-timestamp-to-env env-name="newFacilityContactMech.fromDate"/>
+ <now-timestamp-to-env env-name="facilityContactMech.thruDate"/>
<store-value value-field="facilityContactMech"/>
<create-value value-field="newFacilityContactMech"/>
@@ -98,7 +98,7 @@
<iterate entry="facilityContactMechPurposeOld" list="facilityContactMechPurposes">
<clone-value value-name="facilityContactMechPurposeOld" new-value-name="facilityContactMechPurpose"/>
- <now-timestamp field="facilityContactMechPurposeOld.thruDate"/>
+ <now-timestamp-to-env env-name="facilityContactMechPurposeOld.thruDate"/>
<store-value value-field="facilityContactMechPurposeOld"/>
<set field="facilityContactMechPurpose.contactMechId" from-field="newFacilityContactMech.contactMechId"/>
@@ -136,7 +136,7 @@
</add-error>
<return/>
</if-empty>
- <now-timestamp field="facilityContactMech.thruDate"/>
+ <now-timestamp-to-env env-name="facilityContactMech.thruDate"/>
<store-value value-field="facilityContactMech"/>
</simple-method>
@@ -295,7 +295,7 @@
<check-errors/>
</if-not-empty>
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<make-value value-field="newEntity" entity-name="FacilityContactMechPurpose"/>
<set field="newEntity.facilityId" from-field="parameters.facilityId" />
<set field="newEntity.contactMechId" from-field="parameters.contactMechId" />
@@ -321,7 +321,7 @@
<check-errors/>
</if-empty>
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<set field="purposeEntity.thruDate" from-field="nowTimestamp" />
<store-value value-field="purposeEntity"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml Wed Dec 31 05:59:08 2008
@@ -25,7 +25,7 @@
<make-value value-field="newEntity" entity-name="Facility"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id sequence-name="Facility" field="facilityId"/>
+ <sequenced-id-to-env sequence-name="Facility" env-name="facilityId"/>
<to-string field-name="facilityId"/>
<set field="newEntity.facilityId" from-field="facilityId" />
<field-to-result field="facilityId" result-name="facilityId"/>
@@ -81,7 +81,7 @@
</if-not-empty>
<if-empty field="locationSeqId">
- <sequenced-id sequence-name="FacilityLocation" field="locationSeqId"/>
+ <sequenced-id-to-env sequence-name="FacilityLocation" env-name="locationSeqId"/>
<to-string field-name="locationSeqId"/>
</if-empty>
<set field="newEntity.locationSeqId" from-field="locationSeqId" />
@@ -108,7 +108,7 @@
<make-value value-field="newEntity" entity-name="FacilityGroup"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id sequence-name="FacilityGroup" field="facilityGroupId"/>
+ <sequenced-id-to-env sequence-name="FacilityGroup" env-name="facilityGroupId"/>
<to-string field-name="facilityGroupId"/>
<set field="newEntity.facilityGroupId" from-field="facilityGroupId" />
<field-to-result field="facilityGroupId" result-name="facilityGroupId"/>
@@ -134,7 +134,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>
@@ -161,7 +161,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>
@@ -195,7 +195,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>
@@ -209,7 +209,7 @@
<simple-method method-name="removePartyFromFacility" short-description="Remove Party From Facility">
<entity-one entity-name="FacilityParty" 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>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Wed Dec 31 05:59:08 2008
@@ -37,14 +37,14 @@
<make-value value-field="newEntity" entity-name="ProductStore"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id sequence-name="ProductStore" field="productStoreId" />
+ <sequenced-id-to-env sequence-name="ProductStore" env-name="productStoreId" />
<set from-field="productStoreId" field="newEntity.productStoreId"/>
<field-to-result field="productStoreId" result-name="productStoreId"/>
<create-value value-field="newEntity"/>
<!-- create the ProductStoreFacility record -->
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<if-not-empty field="newEntity.inventoryFacilityId">
<make-value value-field="storeFacility" entity-name="ProductStoreFacility"/>
@@ -76,7 +76,7 @@
<store-value value-field="store"/>
<!-- update the ProductStoreFacility record -->
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<if-compare-field field="store.inventoryFacilityId" to-field="oldFacilityId" operator="not-equals">
<if-compare field="store.oneInventoryFacility" operator="equals" value="Y">
<!-- expire all the facilities -->
@@ -107,7 +107,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>
@@ -228,7 +228,7 @@
<make-value value-field="newEntity" entity-name="ProductStoreShipmentMeth"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id sequence-name="ProductStoreShipmentMeth" field="newEntity.productStoreShipMethId"/>
+ <sequenced-id-to-env sequence-name="ProductStoreShipmentMeth" env-name="newEntity.productStoreShipMethId"/>
<create-value value-field="newEntity"/>
</simple-method>
@@ -266,7 +266,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>
@@ -282,7 +282,7 @@
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<if-empty field="lookedUpValue.thruDate">
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<set from-field="nowTimestamp" field="lookedUpValue.thruDate"/>
</if-empty>
<store-value value-field="lookedUpValue"/>
@@ -298,7 +298,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>
@@ -333,13 +333,13 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="ProductStoreSurveyAppl"/>
- <sequenced-id sequence-name="ProductStoreSurveyAppl" field="productStoreSurveyId"/>
+ <sequenced-id-to-env sequence-name="ProductStoreSurveyAppl" env-name="productStoreSurveyId"/>
<set from-field="productStoreSurveyId" field="newEntity.productStoreSurveyId"/>
<field-to-result field="productStoreSurveyId" result-name="productStoreSurveyId"/>
<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>
@@ -355,7 +355,7 @@
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
<if-empty field="lookedUpValue.thruDate">
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<set from-field="nowTimestamp" field="lookedUpValue.thruDate"/>
</if-empty>
<store-value value-field="lookedUpValue"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml Wed Dec 31 05:59:08 2008
@@ -23,7 +23,7 @@
<simple-method method-name="createSubscription" short-description="Create a Subscription">
<make-value entity-name="Subscription" value-field="newEntity"/>
<if-empty field="parameters.subscriptionId">
- <sequenced-id sequence-name="Subscription" field="newEntity.subscriptionId"/> <!-- get the next sequenced ID -->
+ <sequenced-id-to-env sequence-name="Subscription" env-name="newEntity.subscriptionId"/> <!-- get the next sequenced ID -->
<else>
<set field="newEntity.subscriptionId" from-field="parameters.subscriptionId"/>
</else>
@@ -85,7 +85,7 @@
<simple-method method-name="createSubscriptionResource" short-description="Create a SubscriptionResource">
<make-value entity-name="SubscriptionResource" value-field="newEntity"/>
- <sequenced-id sequence-name="SubscriptionResource" field="newEntity.subscriptionResourceId"/>
+ <sequenced-id-to-env sequence-name="SubscriptionResource" env-name="newEntity.subscriptionResourceId"/>
<field-to-result field="newEntity.subscriptionResourceId" result-name="subscriptionResourceId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
@@ -99,7 +99,7 @@
<simple-method method-name="createProductSubscriptionResource" short-description="Create a ProductSubscriptionResource">
<make-value entity-name="ProductSubscriptionResource" 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>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Wed Dec 31 05:59:08 2008
@@ -30,10 +30,10 @@
<check-errors/>
<make-value value-field="newEntity" entity-name="ItemIssuance"/>
- <sequenced-id sequence-name="ItemIssuance" field="newEntity.itemIssuanceId"/>
+ <sequenced-id-to-env sequence-name="ItemIssuance" env-name="newEntity.itemIssuanceId"/>
<field-to-result field="itemIssuanceId" map-name="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <now-timestamp field="newEntity.issuedDateTime"/>
+ <now-timestamp-to-env env-name="newEntity.issuedDateTime"/>
<create-value value-field="newEntity"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Wed Dec 31 05:59:08 2008
@@ -63,7 +63,7 @@
</check-permission>
<check-errors/>
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<if-empty field="parameters.orderHeaderList">
<log level="info" message="No order header list found in parameters; finding orders to pick."/>
@@ -474,7 +474,7 @@
</check-permission>
<check-errors/>
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<set-service-fields map="parameters" service-name="findOrdersToPickMove" to-map="findOrdersToPickMoveMap"/>
<call-service service-name="findOrdersToPickMove" in-map-name="findOrdersToPickMoveMap">
@@ -581,7 +581,7 @@
<make-value value-field="newEntity" entity-name="Picklist"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id sequence-name="Picklist" field="newEntity.picklistId"/>
+ <sequenced-id-to-env sequence-name="Picklist" env-name="newEntity.picklistId"/>
<field-to-result field="newEntity.picklistId" result-name="picklistId"/>
<if-empty field="newEntity.statusId">
@@ -589,7 +589,7 @@
</if-empty>
<!-- auto-set the picklistDate, this is not user-changeable -->
- <now-timestamp field="newEntity.picklistDate"/>
+ <now-timestamp-to-env env-name="newEntity.picklistDate"/>
<!-- set the created and lastModified info -->
<set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/>
@@ -621,7 +621,7 @@
<set from-field="parameters.picklistId" field="newStatusValue.picklistId"/>
<set from-field="lookedUpValue.statusId" field="newStatusValue.statusId"/>
<set from-field="parameters.statusId" field="newStatusValue.statusIdTo"/>
- <now-timestamp field="newStatusValue.changeDate"/>
+ <now-timestamp-to-env env-name="newStatusValue.changeDate"/>
<set from-field="userLogin.userLoginId" field="newStatusValue.changeUserLoginId"/>
<create-value value-field="newStatusValue"/>
</if-compare-field>
@@ -661,7 +661,7 @@
<make-value value-field="newEntity" entity-name="PicklistBin"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id sequence-name="PicklistBin" field="newEntity.picklistBinId"/>
+ <sequenced-id-to-env sequence-name="PicklistBin" env-name="newEntity.picklistBinId"/>
<field-to-result field="newEntity.picklistBinId" result-name="picklistBinId"/>
<create-value value-field="newEntity"/>
@@ -774,7 +774,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"/>
@@ -1113,7 +1113,7 @@
</check-permission>
<check-errors/>
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<set-service-fields map="parameters" service-name="findOrdersToPickMove" to-map="findOrdersToPickMoveMap"/>
<call-service service-name="findOrdersToPickMove" in-map-name="findOrdersToPickMoveMap">
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Wed Dec 31 05:59:08 2008
@@ -27,13 +27,13 @@
<make-value value-field="newEntity" entity-name="ShipmentReceipt"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id sequence-name="ShipmentReceipt" field="receiptId"/>
+ <sequenced-id-to-env sequence-name="ShipmentReceipt" env-name="receiptId"/>
<to-string field-name="receiptId"/>
<set field="newEntity.receiptId" from-field="receiptId"/>
<field-to-result field="receiptId" result-name="receiptId"/>
<if-empty field="newEntity.datetimeReceived">
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<set field="newEntity.datetimeReceived" from-field="nowTimestamp"/>
</if-empty>
@@ -219,7 +219,7 @@
<set from-field="facility.defaultInventoryItemTypeId" field="parameters.inventoryItemTypeId"/>
</if-empty>
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<entity-count entity-name="ReturnItem" count-name="returnItemCount">
<condition-expr field-name="returnId" operator="equals" from-field="returnHeader.returnId"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Wed Dec 31 05:59:08 2008
@@ -33,15 +33,15 @@
<if-not-empty field="parameters.shipmentId">
<set-pk-fields map="parameters" value-field="newEntity"/>
<else>
- <sequenced-id sequence-name="Shipment" field="newEntity.shipmentId"/>
+ <sequenced-id-to-env sequence-name="Shipment" env-name="newEntity.shipmentId"/>
</else>
</if-not-empty>
<field-to-result field="newEntity.shipmentId" result-name="shipmentId"/>
<!-- set the created and lastModified info -->
- <now-timestamp field="newEntity.createdDate"/>
+ <now-timestamp-to-env env-name="newEntity.createdDate"/>
<set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/>
- <now-timestamp field="newEntity.lastModifiedDate"/>
+ <now-timestamp-to-env env-name="newEntity.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/>
<!-- if needed create some WorkEfforts and remember their IDs:
@@ -98,7 +98,7 @@
<make-value entity-name="ShipmentStatus" value-field="newStatusValue"/>
<set from-field="newEntity.statusId" field="newStatusValue.statusId"/>
<set from-field="newEntity.shipmentId" field="newStatusValue.shipmentId"/>
- <now-timestamp field="newStatusValue.statusDate"/>
+ <now-timestamp-to-env env-name="newStatusValue.statusDate"/>
<create-value value-field="newStatusValue"/>
</if-not-empty>
</simple-method>
@@ -130,7 +130,7 @@
<make-value entity-name="ShipmentStatus" value-field="newStatusValue"/>
<set from-field="parameters.statusId" field="newStatusValue.statusId"/>
<set from-field="parameters.shipmentId" field="newStatusValue.shipmentId"/>
- <now-timestamp field="newStatusValue.statusDate"/>
+ <now-timestamp-to-env env-name="newStatusValue.statusDate"/>
<create-value value-field="newStatusValue"/>
</if-compare-field>
</if-not-empty>
@@ -239,7 +239,7 @@
<!-- now that all changes have been checked, set the nonpks -->
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <now-timestamp field="lookedUpValue.lastModifiedDate"/>
+ <now-timestamp-to-env env-name="lookedUpValue.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/>
<field-to-result field="lookedUpValue.shipmentId" result-name="shipmentId"/>
<store-value value-field="lookedUpValue"/>
@@ -923,7 +923,7 @@
<make-next-seq-id value-field="newEntity" seq-field-name="shipmentPackageSeqId"/>
<field-to-result field="shipmentPackageSeqId" map-name="newEntity" result-name="shipmentPackageSeqId"/>
- <now-timestamp field="newEntity.dateCreated"/>
+ <now-timestamp-to-env env-name="newEntity.dateCreated"/>
<create-value value-field="newEntity"/>
@@ -1176,7 +1176,7 @@
<set from-field="userLogin.userLoginId" field="lookedUpValue.updatedByUserLoginId"/>
- <now-timestamp field="lookedUpValue.lastUpdatedDate"/>
+ <now-timestamp-to-env env-name="lookedUpValue.lastUpdatedDate"/>
<store-value value-field="lookedUpValue"/>
<set from-field="lookedUpValue.shipmentId" field="shipmentId"/>
@@ -2015,7 +2015,7 @@
<check-errors/>
<make-value value-field="quantityBreak" entity-name="QuantityBreak"/>
<set-nonpk-fields map="parameters" value-field="quantityBreak"/>
- <sequenced-id sequence-name="QuantityBreak" field="quantityBreak.quantityBreakId"/>
+ <sequenced-id-to-env sequence-name="QuantityBreak" env-name="quantityBreak.quantityBreakId"/>
<create-value value-field="quantityBreak"/>
<check-errors/>
</simple-method>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml Wed Dec 31 05:59:08 2008
@@ -154,7 +154,7 @@
</simple-method>
<simple-method method-name="testReceiveInventoryNonSerialized" short-description="Test Receive Non-Serialized Inventory" login-required="false">
- <now-timestamp field="nowTimeStamp"/>
+ <now-timestamp-to-env env-name="nowTimeStamp"/>
<entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
Modified: ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml (original)
+++ ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml Wed Dec 31 05:59:08 2008
@@ -100,7 +100,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>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Wed Dec 31 05:59:08 2008
@@ -24,7 +24,7 @@
<!-- Timesheet Services -->
<simple-method method-name="createTimesheet" short-description="Create Timesheet">
<make-value value-field="newEntity" entity-name="Timesheet"/>
- <sequenced-id sequence-name="Timesheet" field="newEntity.timesheetId"/>
+ <sequenced-id-to-env sequence-name="Timesheet" env-name="newEntity.timesheetId"/>
<field-to-result field="newEntity.timesheetId" result-name="timesheetId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
@@ -49,7 +49,7 @@
</simple-method>
<simple-method method-name="createTimesheetForThisWeek" short-description="Create Timesheet For This Week of no date provided, otherwise for a specific week">
<if-empty field="parameters.requiredDate">
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<else>
<set field="nowTimestamp" from-field="parameters.requiredDate"/>
</else>
@@ -134,7 +134,7 @@
</entity-one>
<set field="updateInvoiceMap.invoiceId" from-field="parameters.invoiceId"/>
<set field="updateInvoiceMap.currencyUomId" from-field="party.preferredCurrencyUomId"/>
- <now-timestamp field="updateInvoiceMap.invoiceDate"/>
+ <now-timestamp-to-env env-name="updateInvoiceMap.invoiceDate"/>
<if-empty field="updateInvoiceMap.currencyUomId">
<property-to-field field="invoice.currencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
</if-empty>
@@ -296,10 +296,10 @@
<!-- TimeEntry Services -->
<simple-method method-name="createTimeEntry" short-description="Create TimeEntry">
<call-simple-method method-name="checkTimesheetStatus"/>
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<make-value value-field="newEntity" entity-name="TimeEntry"/>
- <sequenced-id sequence-name="TimeEntry" field="newEntity.timeEntryId"/>
+ <sequenced-id-to-env sequence-name="TimeEntry" env-name="newEntity.timeEntryId"/>
<field-to-result field="newEntity.timeEntryId" result-name="timeEntryId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Wed Dec 31 05:59:08 2008
@@ -35,7 +35,7 @@
<simple-method method-name="createWorkEffort" short-description="Create Work Effort">
<make-value value-field="newEntity" entity-name="WorkEffort"/>
<if-empty field="parameters.workEffortId">
- <sequenced-id sequence-name="WorkEffort" field="newEntity.workEffortId"/>
+ <sequenced-id-to-env sequence-name="WorkEffort" env-name="newEntity.workEffortId"/>
<else>
<set field="newEntity.workEffortId" from-field="parameters.workEffortId"/>
</else>
@@ -43,7 +43,7 @@
<field-to-result field="newEntity.workEffortId" result-name="workEffortId"/>
<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.lastStatusUpdate"/>
<set from-field="nowTimestamp" field="newEntity.lastModifiedDate"/>
<set from-field="nowTimestamp" field="newEntity.createdDate"/>
@@ -115,7 +115,7 @@
<entity-one entity-name="WorkEffort" value-field="lookedUpValue"/>
<clone-value value-name="lookedUpValue" new-value-field="savedValue"/>
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<!-- if necessary create new status entry, and set lastStatusUpdate date -->
<if>
@@ -267,12 +267,12 @@
<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>
<field-to-result field="newEntity.fromDate" result-name="fromDate"/>
<if-not-empty field="parameters.statusId">
- <now-timestamp field="newEntity.statusDateTime"/>
+ <now-timestamp-to-env env-name="newEntity.statusDateTime"/>
<call-class-method class-name="org.ofbiz.workeffort.workeffort.WorkEffortPartyAssignmentServices" method-name="updateWorkflowEngine">
<field field="newEntity" type="org.ofbiz.entity.GenericValue"/>
<field field="userLogin" type="org.ofbiz.entity.GenericValue"/>
@@ -295,7 +295,7 @@
<set-nonpk-fields map="parameters" value-field="workEffortPartyAssignment"/>
<if-compare-field field="parameters.statusId" to-field="oldStatusId" operator="not-equals">
- <now-timestamp field="workEffortPartyAssignment.statusDateTime"/>
+ <now-timestamp-to-env env-name="workEffortPartyAssignment.statusDateTime"/>
<call-class-method class-name="org.ofbiz.workeffort.workeffort.WorkEffortPartyAssignmentServices" method-name="updateWorkflowEngine" >
<field field="workEffortPartyAssignment" type="org.ofbiz.entity.GenericValue"/>
<field field="userLogin" type="org.ofbiz.entity.GenericValue"/>
@@ -523,7 +523,7 @@
<simple-method method-name="quickAssignPartyToWorkEffort" short-description="Quick Assign Party To WorkEffort as Owner">
<if-not-empty field="parameters.quickAssignPartyId">
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<!-- add a party assignment for the creator of the event, use the list method and let the EE do the update or create... -->
<make-value value-field="newPartyRole" entity-name="PartyRole"/>
<set from-field="parameters.quickAssignPartyId" field="newPartyRole.partyId"/>
@@ -554,13 +554,13 @@
<set from-field="parameters.quickAssignPartyId" field="newWorkEffortPartyAssignment.partyId"/>
<set from-field="parameters.roleTypeId" field="newWorkEffortPartyAssignment.roleTypeId"/>
<set value="CAL_ACCEPTED" field="newWorkEffortPartyAssignment.statusId"/>
- <now-timestamp field="newWorkEffortPartyAssignment.fromDate"/>
+ <now-timestamp-to-env env-name="newWorkEffortPartyAssignment.fromDate"/>
<create-value value-field="newWorkEffortPartyAssignment"/>
</if-not-empty>
</simple-method>
<simple-method method-name="createWorkEffortNote" short-description="Create Work Effort Note">
<make-value value-field="newEntity" entity-name="NoteData"/>
- <sequenced-id sequence-name="NoteData" field="newEntity.noteId"/>
+ <sequenced-id-to-env sequence-name="NoteData" env-name="newEntity.noteId"/>
<field-to-result field="newEntity.noteId" result-name="noteId"/>
<set from-field="parameters.noteInfo" field="newEntity.noteInfo"/>
<if-not-empty field="parameters.noteParty">
@@ -570,7 +570,7 @@
</else>
</if-not-empty>
<set from-field="parameters.noteName" field="newEntity.noteName"/>
- <now-timestamp field="newEntity.noteDateTime"/>
+ <now-timestamp-to-env env-name="newEntity.noteDateTime"/>
<create-value value-field="newEntity"/>
<!-- create new status entry, and set lastStatusUpdate date -->
@@ -590,7 +590,7 @@
</simple-method>
<simple-method method-name="createWorkEffortAndAssoc" short-description="Create a WorkEffort and association">
<if-empty field="parameters.fromDate">
- <now-timestamp field="parameters.fromDate"/>
+ <now-timestamp-to-env env-name="parameters.fromDate"/>
<else>
<entity-one entity-name="WorkEffortAssoc" value-field="lookedUpValue"/>
</else>
@@ -615,7 +615,7 @@
<simple-method method-name="createWorkEffortAssoc" short-description="Create a WorkEffort association">
<if-empty field="parameters.fromDate">
- <now-timestamp field="parameters.fromDate"/>
+ <now-timestamp-to-env env-name="parameters.fromDate"/>
<else>
<entity-one entity-name="WorkEffortAssoc" value-field="lookedUpValue"/>
</else>
@@ -654,7 +654,7 @@
<make-value value-field="newEntity" entity-name="WorkEffortGoodStandard"/>
<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>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
@@ -910,7 +910,7 @@
if there is no actual start date, default to now (to the current date and time) -->
<if-empty field="parameters.fromDate">
<entity-one entity-name="WorkEffort" value-field="prodRunTask" />
- <now-timestamp field="newWEFixedAssetAssign.fromDate"/>
+ <now-timestamp-to-env env-name="newWEFixedAssetAssign.fromDate"/>
<if-not-empty field="prodRunTask.estimatedStartDate">
<set field="newWEFixedAssetAssign.fromDate" from-field="prodRunTask.estimatedStartDate" />
</if-not-empty>
@@ -955,7 +955,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>
@@ -1000,7 +1000,7 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<if-empty field="newEntity.reviewDate">
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<set field="newEntity.reviewDate" from-field="nowTimestamp"/>
</if-empty>
<create-value value-field="newEntity"/>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml Wed Dec 31 05:59:08 2008
@@ -67,7 +67,7 @@
</if-compare-field>
<if-empty field="parameters.asOfDate">
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<set field="asOfDate" from-field="nowTimestamp"/>
<else>
<set field="asOfDate" from-field="parameters.asOfDate"/>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml Wed Dec 31 05:59:08 2008
@@ -23,7 +23,7 @@
<!-- Enumeration methods -->
<simple-method method-name="createEnumeration" short-description="create a Enumeration">
<make-value entity-name="Enumeration" value-field="newEntity"/>
- <sequenced-id sequence-name="Enumeration" field="newEntity.enumId"/> <!-- get the next sequenced ID -->
+ <sequenced-id-to-env sequence-name="Enumeration" env-name="newEntity.enumId"/> <!-- get the next sequenced ID -->
<field-to-result field="newEntity.enumId" result-name="enumId"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml Wed Dec 31 05:59:08 2008
@@ -37,7 +37,7 @@
</iterate>
<else>
<make-value value-field="currencyDim" entity-name="CurrencyDimension"/>
- <sequenced-id sequence-name="CurrencyDimension" field="currencyDim.dimensionId"/>
+ <sequenced-id-to-env sequence-name="CurrencyDimension" env-name="currencyDim.dimensionId"/>
<set field="currencyDim.currencyId" from-field="currency.uomId"/>
<set field="currencyDim.description" from-field="currency.description"/>
<create-value value-field="currencyDim"/>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml Wed Dec 31 05:59:08 2008
@@ -28,7 +28,7 @@
<make-value value-field="newEntity" entity-name="CustomTimePeriod"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id sequence-name="CustomTimePeriod" field="customTimePeriodId"/>
+ <sequenced-id-to-env sequence-name="CustomTimePeriod" env-name="customTimePeriodId"/>
<set from-field="customTimePeriodId" field="newEntity.customTimePeriodId"/>
<field-to-result field="customTimePeriodId" result-name="customTimePeriodId"/>
Modified: ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml (original)
+++ ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml Wed Dec 31 05:59:08 2008
@@ -27,7 +27,7 @@
<make-value value-field="newEntity" entity-name="EntitySync"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id sequence-name="EntitySync" field="entitySyncId"/>
+ <sequenced-id-to-env sequence-name="EntitySync" env-name="entitySyncId"/>
<set field="newEntity.entitySyncId" from-field="entitySyncId"/>
<field-to-result field="entitySyncId" result-name="entitySyncId"/>
@@ -62,7 +62,7 @@
<make-value value-field="newEntity" entity-name="EntitySyncHistory"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
- <now-timestamp field="newEntity.startDate"/>
+ <now-timestamp-to-env env-name="newEntity.startDate"/>
<field-to-result field="newEntity.startDate" result-name="startDate"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
Modified: ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml (original)
+++ ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml Wed Dec 31 05:59:08 2008
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<!-- ExampleStatus methods -->
<simple-method method-name="createExampleStatus" short-description="create a ExampleItem">
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<!-- find the most recent status record and set the statusEndDate -->
<entity-and entity-name="ExampleStatus" list="oldExampleStatusList">
Modified: ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml Wed Dec 31 05:59:08 2008
@@ -38,7 +38,7 @@
<simple-method method-name="tc_ReceiveProductQty" short-description="Receive Product to Facility" login-required="false">
<log level="info" message="Receive product ${parameters.productId} qty ${parameters.qty} to location ${parameters.location} in facility ${parameters.facilityId} "/>
- <now-timestamp field="nowTimestamp"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
<clear-field field="receiveCtx"/>
<set from-field="parameters.facilityId" field="receiveCtx.facilityId"/>
<set from-field="parameters.productId" field="receiveCtx.productId"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Wed Dec 31 05:59:08 2008
@@ -69,7 +69,7 @@
<if-not-empty field="workEffortPartyAssignments">
<first-from-list entry="workEffortPartyAssignment" list="workEffortPartyAssignments"/>
<if-compare-field field="updProjectRole.newPartyId" operator="not-equals" to-field="workEffortPartyAssignment.partyId">
- <now-timestamp field="workEffortPartyAssignment.thruDate"/>
+ <now-timestamp-to-env env-name="workEffortPartyAssignment.thruDate"/>
<store-value value-field="workEffortPartyAssignment"/>
</if-compare-field>
</if-not-empty>
@@ -89,7 +89,7 @@
<set field="workEffortPartyAssignment.workEffortId" from-field="parameters.workEffortId"/>
<set field="workEffortPartyAssignment.partyId" from-field="updProjectRole.newPartyId"/>
<set field="workEffortPartyAssignment.roleTypeId" from-field="updProjectRole.roleTypeId"/>
- <now-timestamp field="workEffortPartyAssignment.fromDate"/>
+ <now-timestamp-to-env env-name="workEffortPartyAssignment.fromDate"/>
<create-value value-field="workEffortPartyAssignment"/>
</then>
</if>
@@ -197,7 +197,7 @@
</iterate>
</if-not-empty>
<if-empty field="status">
- <now-timestamp field="parameters.actualCompletionDate"/>
+ <now-timestamp-to-env env-name="parameters.actualCompletionDate"/>
<set field="parameters.currentStatusId" value="PTS_COMPLETED"/>
<call-simple-method method-name="updateWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
<!-- check for related customer request, set these too to completed -->
@@ -349,8 +349,8 @@
<get-related value-field="task" relation-name="ToWorkEffortAssoc" list="t.prevTasks"/>
<if-empty field="t.prevTasks">
<!-- no predecessors so i can set the dates -->
- <now-timestamp field="upd.estimatedStartDate"/>
- <now-timestamp field="currentDate"/>
+ <now-timestamp-to-env env-name="upd.estimatedStartDate"/>
+ <now-timestamp-to-env env-name="currentDate"/>
<call-class-method class-name="org.ofbiz.project.Various" method-name="calculateCompletionDate" ret-field="upd.estimatedCompletionDate">
<field field="task" type="org.ofbiz.entity.GenericValue"/>
<field field="currentDate" type="java.sql.Timestamp"/>
@@ -405,7 +405,7 @@
<!-- check if the actual start date is set, when not set it to todays date -->
<if-empty field="project.actualStartDate">
<entity-one entity-name="WorkEffort" value-field="workEffort"/>
- <now-timestamp field="workEffort.actualStartDate"/>
+ <now-timestamp-to-env env-name="workEffort.actualStartDate"/>
<store-value value-field="workEffort"/>
</if-empty>
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml?rev=730397&r1=730396&r2=730397&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Wed Dec 31 05:59:08 2008
@@ -127,7 +127,7 @@
</else>
</if-empty>
<set field="context.workEffortContentTypeId" from-field="formInput.formInput.workEffortContentTypeId"/>
- <now-timestamp field="context.fromDate"/>
+ <now-timestamp-to-env env-name="context.fromDate"/>
<call-map-processor in-map-name="context" out-map-name="workEffortContext">
<simple-map-processor name="newWorkEffortContent">
<process field="workEffortContentTypeId"><copy to-field="workEffortContentTypeId"/></process>