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=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/UpgradeServices.xml Tue Dec 30 09:25:18 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-to-env env-name="fromDate"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -59,7 +59,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set 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-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -27,7 +27,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> 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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -32,7 +32,7 @@ </check-permission> <check-errors/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <make-value value-field="newEntity" entity-name="ProductCategory"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="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-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="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-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="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-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="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-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="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-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="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-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="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-to-env env-name="expireTimestamp"/> + <now-timestamp field="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-to-env env-name="expireTimestamp"/> + <now-timestamp field="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-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -32,7 +32,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <if-empty field="newEntity.fromDate"> <set field="newEntity.fromDate" from-field="nowTimestamp" /> 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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -27,7 +27,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> 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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -27,7 +27,7 @@ <sequenced-id sequence-name="CostComponent" field="newEntity.costComponentId"/> <field-to-result field="costComponentId" map-name="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> </simple-method> @@ -48,7 +48,7 @@ <find-by-and entity-name="CostComponent" map-name="costsAndMap" list-name="existingCosts"/> <filter-list-by-date list-name="existingCosts"/> <iterate list="existingCosts" entry="existingCost"> - <now-timestamp-to-env env-name="existingCost.thruDate"/> + <now-timestamp field="existingCost.thruDate"/> <store-value value-field="existingCost"/> </iterate> </simple-method> @@ -60,7 +60,7 @@ <find-by-and entity-name="CostComponent" map-name="costsAndMap" list-name="existingCosts"/> <filter-list-by-date list-name="existingCosts"/> <iterate list="existingCosts" entry="existingCost"> - <now-timestamp-to-env env-name="existingCost.thruDate"/> + <now-timestamp field="existingCost.thruDate"/> <store-value value-field="existingCost"/> </iterate> <!-- The new cost is created --> @@ -68,7 +68,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="CostComponent" field="newEntity.costComponentId"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> <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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -73,7 +73,7 @@ <check-errors/> <if-empty field="parameters.fromDate"> - <now-timestamp-to-env env-name="parameters.fromDate"/> + <now-timestamp field="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-to-env env-name="nowStamp"/> + <now-timestamp field="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-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="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-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> @@ -232,7 +232,7 @@ <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> @@ -378,7 +378,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -34,7 +34,7 @@ --> <log level="verbose" message="Parameters : ${parameters}"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -254,7 +254,7 @@ </simple-method> <simple-method method-name="createInventoryItemStatus" short-description="Create an inventory item status record"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <!-- find the most recent InventoryItemStatus record and set the statusEndDatetime --> <entity-and entity-name="InventoryItemStatus" list="oldInventoryItemStatusList"> @@ -296,7 +296,7 @@ <entity-one entity-name="ItemIssuance" value-field="itemIssuance"/> <set field="newEntity.effectiveDate" from-field="itemIssuance.issuedDateTime"/> <else> - <now-timestamp-to-env env-name="newEntity.effectiveDate"/> + <now-timestamp field="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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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,7 +501,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.physicalInventoryDate"> - <now-timestamp-to-env env-name="newEntity.physicalInventoryDate"/> + <now-timestamp field="newEntity.physicalInventoryDate"/> </if-empty> <if-empty field="newEntity.partyId"> <set from-field="userLogin.partyId" field="newEntity.partyId"/> @@ -964,7 +964,7 @@ <iterate list="oisgirais" entry="oisgir"> <set field="orderItems.${oisgir.orderItemSeqId}" from-field="oisgir"/> </iterate> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="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"/> @@ -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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -32,7 +32,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp" /> <set field="lookedUpValue.lastModifiedByUserLogin" from-field="userLogin.userLoginId" /> @@ -100,7 +100,7 @@ <sequenced-id sequence-name="ProductPriceChange" field="productPriceChangeId"/> <set field="newEntity.productPriceChangeId" from-field="productPriceChangeId" /> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="newEntity.fromDate"/></if-empty> + <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> </simple-method> 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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -21,7 +21,7 @@ <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-method method-name="createCustomerDigitalDownloadProduct" short-description="createCustomerDigitalDownloadProduct"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <make-value value-field="createProductMap" entity-name="Product"/> <sequenced-id sequence-name="Product" field="createProductMap.productId"/> @@ -66,7 +66,7 @@ </if-not-empty> </simple-method> <simple-method method-name="updateCustomerDigitalDownloadProduct" short-description="updateCustomerDigitalDownloadProduct"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -27,7 +27,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> 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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -40,7 +40,7 @@ </if-empty> <field-to-result field="productId" map-name="newEntity" result-name="productId"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="nowStamp"/> + <now-timestamp field="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-to-env env-name="lookedUpValue.lastModifiedDate"/> + <now-timestamp field="lookedUpValue.lastModifiedDate"/> <set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/> <store-value value-name="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-to-env env-name="newMember.fromDate"/> + <now-timestamp field="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-to-env env-name="lookedUpValue.lastModifiedDate"/> + <now-timestamp field="lookedUpValue.lastModifiedDate"/> <set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/> <store-value value-name="lookedUpValue"/> @@ -149,7 +149,7 @@ </entity-one> <set from-field="parameters.productName" field="variantProduct.productName"/> - <now-timestamp-to-env env-name="variantProduct.lastModifiedDate"/> + <now-timestamp field="variantProduct.lastModifiedDate"/> <set from-field="userLogin.userLoginId" field="variantProduct.lastModifiedByUserLogin"/> <store-value value-name="variantProduct"/> </iterate> @@ -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-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <entity-one entity-name="Product" value-field="product"/> <set from-field="nowTimestamp" field="product.salesDiscontinuationDate"/> <store-value value-name="product"/> @@ -550,7 +550,7 @@ <field-to-result field="newEntity.productReviewId" result-name="productReviewId"/> <if-empty field="newEntity.postedDateTime"> - <now-timestamp-to-env env-name="newEntity.postedDateTime"/> + <now-timestamp field="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-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -35,7 +35,7 @@ <set value="Y" set-if-empty="true" field="newEntity.userEntered"/> </if-empty> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set from-field="nowTimestamp" field="lookedUpValue.lastModifiedDate"/> <set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/> @@ -159,7 +159,7 @@ <field-to-result field="productPromoCodeId" map-name="newEntity"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 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-to-env env-name="newValue.fromDate"/> + <now-timestamp field="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-to-env env-name="newFacilityContactMech.fromDate"/> - <now-timestamp-to-env env-name="facilityContactMech.thruDate"/> + <now-timestamp field="newFacilityContactMech.fromDate"/> + <now-timestamp field="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-to-env env-name="facilityContactMechPurposeOld.thruDate"/> + <now-timestamp field="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-to-env env-name="facilityContactMech.thruDate"/> + <now-timestamp field="facilityContactMech.thruDate"/> <store-value value-field="facilityContactMech"/> </simple-method> @@ -295,7 +295,7 @@ <check-errors/> </if-not-empty> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -134,7 +134,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> @@ -161,7 +161,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> @@ -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-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="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-to-env env-name="thruDate"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -44,7 +44,7 @@ <create-value value-field="newEntity"/> <!-- create the ProductStoreFacility record --> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <if-not-empty field="newEntity.inventoryFacilityId"> <make-value value-field="storeFacility" entity-name="ProductStoreFacility"/> @@ -76,7 +76,7 @@ <store-value value-name="store"/> <!-- update the ProductStoreFacility record --> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.fromDate"/> </if-empty> @@ -266,7 +266,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set 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-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set from-field="nowTimestamp" field="lookedUpValue.thruDate"/> </if-empty> <store-value value-name="lookedUpValue"/> @@ -298,7 +298,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.fromDate"/> </if-empty> @@ -339,7 +339,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set 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-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set from-field="nowTimestamp" field="lookedUpValue.thruDate"/> </if-empty> <store-value value-name="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -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-to-env env-name="newEntity.fromDate"/></if-empty> + <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> </simple-method> 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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -33,7 +33,7 @@ <sequenced-id sequence-name="ItemIssuance" field="newEntity.itemIssuanceId"/> <field-to-result field="itemIssuanceId" map-name="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <now-timestamp-to-env env-name="newEntity.issuedDateTime"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -63,7 +63,7 @@ </check-permission> <check-errors/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set-service-fields map="parameters" service-name="findOrdersToPickMove" to-map="findOrdersToPickMoveMap"/> <call-service service-name="findOrdersToPickMove" in-map-name="findOrdersToPickMoveMap"> @@ -589,7 +589,7 @@ </if-empty> <!-- auto-set the picklistDate, this is not user-changeable --> - <now-timestamp-to-env env-name="newEntity.picklistDate"/> + <now-timestamp field="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-to-env env-name="newStatusValue.changeDate"/> + <now-timestamp field="newStatusValue.changeDate"/> <set from-field="userLogin.userLoginId" field="newStatusValue.changeUserLoginId"/> <create-value value-field="newStatusValue"/> </if-compare-field> @@ -774,7 +774,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="newEntity.fromDate"/> </if-empty> <create-value value-field="newEntity"/> @@ -1113,7 +1113,7 @@ </check-permission> <check-errors/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -33,7 +33,7 @@ <field-to-result field="receiptId" result-name="receiptId"/> <if-empty field="newEntity.datetimeReceived"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -39,9 +39,9 @@ <field-to-result field="newEntity.shipmentId" result-name="shipmentId"/> <!-- set the created and lastModified info --> - <now-timestamp-to-env env-name="newEntity.createdDate"/> + <now-timestamp field="newEntity.createdDate"/> <set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/> - <now-timestamp-to-env env-name="newEntity.lastModifiedDate"/> + <now-timestamp field="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-to-env env-name="newStatusValue.statusDate"/> + <now-timestamp field="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-to-env env-name="newStatusValue.statusDate"/> + <now-timestamp field="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-to-env env-name="lookedUpValue.lastModifiedDate"/> + <now-timestamp field="lookedUpValue.lastModifiedDate"/> <set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/> <field-to-result field="lookedUpValue.shipmentId" result-name="shipmentId"/> <store-value value-name="lookedUpValue"/> @@ -923,7 +923,7 @@ <make-next-seq-id value-name="newEntity" seq-field-name="shipmentPackageSeqId"/> <field-to-result field="shipmentPackageSeqId" map-name="newEntity" result-name="shipmentPackageSeqId"/> - <now-timestamp-to-env env-name="newEntity.dateCreated"/> + <now-timestamp field="newEntity.dateCreated"/> <create-value value-field="newEntity"/> @@ -1176,7 +1176,7 @@ <set from-field="userLogin.userLoginId" field="lookedUpValue.updatedByUserLoginId"/> - <now-timestamp-to-env env-name="lookedUpValue.lastUpdatedDate"/> + <now-timestamp field="lookedUpValue.lastUpdatedDate"/> <store-value value-name="lookedUpValue"/> <set from-field="lookedUpValue.shipmentId" field="shipmentId"/> 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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -154,7 +154,7 @@ </simple-method> <simple-method method-name="testReceiveInventoryNonSerialized" short-description="Test Receive Non-Serialized Inventory" login-required="false"> - <now-timestamp-to-env env-name="nowTimeStamp"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -100,7 +100,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set 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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="updateInvoiceMap.invoiceDate"/> + <now-timestamp field="updateInvoiceMap.invoiceDate"/> <if-empty field="updateInvoiceMap.currencyUomId"> <property-to-field field-name="invoice.currencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> </if-empty> @@ -296,7 +296,7 @@ <!-- TimeEntry Services --> <simple-method method-name="createTimeEntry" short-description="Create TimeEntry"> <call-simple-method method-name="checkTimesheetStatus"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <make-value value-field="newEntity" entity-name="TimeEntry"/> <sequenced-id sequence-name="TimeEntry" field="newEntity.timeEntryId"/> 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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -43,7 +43,7 @@ <field-to-result field="newEntity.workEffortId" result-name="workEffortId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <now-timestamp-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="newEntity.fromDate"/> </if-empty> <field-to-result field="newEntity.fromDate" result-name="fromDate"/> <if-not-empty field="parameters.statusId"> - <now-timestamp-to-env env-name="newEntity.statusDateTime"/> + <now-timestamp field="newEntity.statusDateTime"/> <call-class-method class-name="org.ofbiz.workeffort.workeffort.WorkEffortPartyAssignmentServices" method-name="updateWorkflowEngine"> <field field-name="newEntity" type="org.ofbiz.entity.GenericValue"/> <field field-name="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-to-env env-name="workEffortPartyAssignment.statusDateTime"/> + <now-timestamp field="workEffortPartyAssignment.statusDateTime"/> <call-class-method class-name="org.ofbiz.workeffort.workeffort.WorkEffortPartyAssignmentServices" method-name="updateWorkflowEngine" > <field field-name="workEffortPartyAssignment" type="org.ofbiz.entity.GenericValue"/> <field field-name="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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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,7 +554,7 @@ <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-to-env env-name="newWorkEffortPartyAssignment.fromDate"/> + <now-timestamp field="newWorkEffortPartyAssignment.fromDate"/> <create-value value-field="newWorkEffortPartyAssignment"/> </if-not-empty> </simple-method> @@ -570,7 +570,7 @@ </else> </if-not-empty> <set from-field="parameters.noteName" field="newEntity.noteName"/> - <now-timestamp-to-env env-name="newEntity.noteDateTime"/> + <now-timestamp field="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-to-env env-name="parameters.fromDate"/> + <now-timestamp field="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-to-env env-name="parameters.fromDate"/> + <now-timestamp field="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-to-env env-name="newEntity.fromDate"/> + <now-timestamp field="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-to-env env-name="newWEFixedAssetAssign.fromDate"/> + <now-timestamp field="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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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-to-env env-name="nowTimestamp"/> + <now-timestamp field="nowTimestamp"/> <set field="newEntity.reviewDate" from-field="nowTimestamp"/> </if-empty> <create-value value-field="newEntity"/> 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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 2008 @@ -62,7 +62,7 @@ <make-value value-field="newEntity" entity-name="EntitySyncHistory"/> <set-pk-fields map="parameters" value-field="newEntity"/> - <now-timestamp-to-env env-name="newEntity.startDate"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&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 Tue Dec 30 09:25:18 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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml (original) +++ ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml Tue Dec 30 09:25:18 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-to-env env-name="nowTimestamp"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Dec 30 09:25:18 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-to-env env-name="workEffortPartyAssignment.thruDate"/> + <now-timestamp field="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-to-env env-name="workEffortPartyAssignment.fromDate"/> + <now-timestamp field="workEffortPartyAssignment.fromDate"/> <create-value value-field="workEffortPartyAssignment"/> </then> </if> @@ -197,7 +197,7 @@ </iterate> </if-not-empty> <if-empty field="status"> - <now-timestamp-to-env env-name="parameters.actualCompletionDate"/> + <now-timestamp field="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-to-env env-name="upd.estimatedStartDate"/> - <now-timestamp-to-env env-name="currentDate"/> + <now-timestamp field="upd.estimatedStartDate"/> + <now-timestamp field="currentDate"/> <call-class-method class-name="org.ofbiz.project.Various" method-name="calculateCompletionDate" ret-field-name="upd.estimatedCompletionDate"> <field field-name="task" type="org.ofbiz.entity.GenericValue"/> <field field-name="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-to-env env-name="workEffort.actualStartDate"/> + <now-timestamp field="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=730194&r1=730193&r2=730194&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Tue Dec 30 09:25:18 2008 @@ -127,7 +127,7 @@ </else> </if-empty> <set field="context.workEffortContentTypeId" from-field="formInput.formInput.workEffortContentTypeId"/> - <now-timestamp-to-env env-name="context.fromDate"/> + <now-timestamp field="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> |
Free forum by Nabble | Edit this page |