svn commit: r730189 [2/2] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r730189 [2/2] - in /ofbiz/trunk: applications/accounting/script
 
|
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=730189&r1=730188&r2=730189&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:19:35 2008 @@ -24,7 +24,7 @@ <simple-method method-name="createCostComponent" short-description="Create a CostComponent"> <make-value value-field="newEntity" entity-name="CostComponent"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id-to-env sequence-name="CostComponent" env-name="newEntity.costComponentId"/> + <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"/> @@ -34,7 +34,7 @@ <simple-method method-name="updateCostComponent" short-description="Update a CostComponent"> <entity-one entity-name="CostComponent" value-field="costComponent"/> <set-nonpk-fields map="parameters" value-field="costComponent"/> - <store-value value-name="costComponent"/> + <store-value value-field="costComponent"/> </simple-method> <simple-method method-name="deleteCostComponent" short-description="Delete a CostComponent"> <entity-one entity-name="CostComponent" value-field="costComponent"/> @@ -49,7 +49,7 @@ <filter-list-by-date list-name="existingCosts"/> <iterate list="existingCosts" entry="existingCost"> <now-timestamp-to-env env-name="existingCost.thruDate"/> - <store-value value-name="existingCost"/> + <store-value value-field="existingCost"/> </iterate> </simple-method> <simple-method method-name="recreateCostComponent" short-description="Create a CostComponent and cancel the existing ones"> @@ -61,12 +61,12 @@ <filter-list-by-date list-name="existingCosts"/> <iterate list="existingCosts" entry="existingCost"> <now-timestamp-to-env env-name="existingCost.thruDate"/> - <store-value value-name="existingCost"/> + <store-value value-field="existingCost"/> </iterate> <!-- The new cost is created --> <make-value value-field="newEntity" entity-name="CostComponent"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id-to-env sequence-name="CostComponent" env-name="newEntity.costComponentId"/> + <sequenced-id sequence-name="CostComponent" field="newEntity.costComponentId"/> <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> 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=730189&r1=730188&r2=730189&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:19:35 2008 @@ -27,7 +27,7 @@ <make-value entity-name="ProductFeatureCategory" value-field="newEntity"/> <set-nonpk-fields value-field="newEntity" map="parameters"/> - <sequenced-id-to-env sequence-name="ProductFeatureCategory" env-name="newEntity.productFeatureCategoryId"/> + <sequenced-id sequence-name="ProductFeatureCategory" field="newEntity.productFeatureCategoryId"/> <field-to-result field="newEntity.productFeatureCategoryId" result-name="productFeatureCategoryId"/> <create-value value-field="newEntity"/> @@ -48,7 +48,7 @@ <make-value value-field="newEntity" entity-name="ProductFeature"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="parameters.productFeatureId"> - <sequenced-id-to-env sequence-name="ProductFeature" env-name="newEntity.productFeatureId"/> + <sequenced-id sequence-name="ProductFeature" field="newEntity.productFeatureId"/> <else> <set field="newEntity.productFeatureId" from-field="parameters.productFeatureId"/> </else> @@ -210,7 +210,7 @@ <make-value value-field="newEntity" entity-name="ProductFeatureGroup"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id-to-env sequence-name="ProductFeatureGroup" env-name="newEntity.productFeatureGroupId"/> + <sequenced-id sequence-name="ProductFeatureGroup" field="newEntity.productFeatureGroupId"/> <field-to-result field="newEntity.productFeatureGroupId" result-name="productFeatureGroupId"/> <create-value value-field="newEntity"/> @@ -373,7 +373,7 @@ <simple-method method-name="createFeaturePrice" short-description="Create a Feature Price"> <make-value value-field="newEntity" entity-name="ProductFeaturePrice"/> <if-empty field="parameters.productFeatureId"> - <sequenced-id-to-env sequence-name="ProductFeaturePrice" env-name="parameters.productFeatureId"/> + <sequenced-id sequence-name="ProductFeaturePrice" field="parameters.productFeatureId"/> </if-empty> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> 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=730189&r1=730188&r2=730189&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:19:35 2008 @@ -113,7 +113,7 @@ <call-simple-method method-name="inventoryItemCheckSetDefaultValues"/> <check-errors/> - <sequenced-id-to-env sequence-name="InventoryItem" env-name="inventoryItem.inventoryItemId"/> + <sequenced-id sequence-name="InventoryItem" field="inventoryItem.inventoryItemId"/> <create-value value-field="inventoryItem"/> <field-to-result field="inventoryItem.inventoryItemId" result-name="inventoryItemId"/> </simple-method> @@ -286,7 +286,7 @@ <set from-field="parameters.inventoryItemId" field="newEntity.inventoryItemId"/> <!-- NOTE DEJ20070927: not using make-next-seq-id because a single InventoryItem may see traffic from lots of threads at the same time, and make-next-seq-id doesn't do well with that <make-next-seq-id seq-field-name="inventoryItemDetailSeqId" value-name="newEntity" increment-by="1" numeric-padding="4"/> --> - <sequenced-id-to-env sequence-name="InventoryItemDetail" env-name="newEntity.inventoryItemDetailSeqId"/> + <sequenced-id sequence-name="InventoryItemDetail" field="newEntity.inventoryItemDetailSeqId"/> <field-to-result field="newEntity.inventoryItemDetailSeqId" result-name="inventoryItemDetailSeqId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -507,7 +507,7 @@ <set from-field="userLogin.partyId" field="newEntity.partyId"/> </if-empty> - <sequenced-id-to-env sequence-name="PhysicalInventory" env-name="physicalInventoryId"/> + <sequenced-id sequence-name="PhysicalInventory" field="physicalInventoryId"/> <set from-field="physicalInventoryId" field="newEntity.physicalInventoryId"/> <field-to-result field="physicalInventoryId" result-name="physicalInventoryId"/> @@ -987,7 +987,7 @@ <make-value value-field="newEntity" entity-name="InventoryTransfer"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id-to-env sequence-name="InventoryTransfer" env-name="newEntity.inventoryTransferId"/> + <sequenced-id sequence-name="InventoryTransfer" field="newEntity.inventoryTransferId"/> <field-to-result field="newEntity.inventoryTransferId" result-name="inventoryTransferId"/> <create-value value-field="newEntity"/> 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=730189&r1=730188&r2=730189&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:19:35 2008 @@ -64,7 +64,7 @@ <set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp" /> <set field="lookedUpValue.lastModifiedByUserLogin" from-field="userLogin.userLoginId" /> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteProductPrice" short-description="Delete an ProductPrice"> <set field="callingMethodName" value="deleteProductPrice" /> @@ -98,7 +98,7 @@ <make-value value-field="newEntity" entity-name="ProductPriceChange"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id-to-env sequence-name="ProductPriceChange" env-name="productPriceChangeId"/> + <sequenced-id sequence-name="ProductPriceChange" field="productPriceChangeId"/> <set field="newEntity.productPriceChangeId" from-field="productPriceChangeId" /> <now-timestamp-to-env env-name="nowTimestamp"/> <set field="newEntity.changedDate" from-field="nowTimestamp" /> @@ -126,7 +126,7 @@ <check-errors/> <entity-one entity-name="ProductPaymentMethodType" value-field="lookedUpValue"/> <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteProductPaymentMethodType" short-description="delete a ProductPaymentMethodType"> <set field="callingMethodName" value="deleteProductPaymentMethodType" /> @@ -145,7 +145,7 @@ <make-value value-field="newEntity" entity-name="ProductPriceRule"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id-to-env sequence-name="ProductPriceRule" env-name="newEntity.productPriceRuleId"/> + <sequenced-id sequence-name="ProductPriceRule" field="newEntity.productPriceRuleId"/> <field-to-result field="productPriceRuleId" map-name="newEntity"/> <create-value value-field="newEntity"/> @@ -159,7 +159,7 @@ <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductPriceRule" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteProductPriceRule" short-description="Delete an ProductPriceRule"> <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPriceRule you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> @@ -195,7 +195,7 @@ <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductPriceCond" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteProductPriceCond" short-description="Delete an ProductPriceCond"> <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPriceCond you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> @@ -231,7 +231,7 @@ <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductPriceAction" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteProductPriceAction" short-description="Delete an ProductPriceAction"> <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPriceAction you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> 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=730189&r1=730188&r2=730189&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:19:35 2008 @@ -24,7 +24,7 @@ <now-timestamp-to-env env-name="nowTimestamp"/> <make-value value-field="createProductMap" entity-name="Product"/> - <sequenced-id-to-env sequence-name="Product" env-name="createProductMap.productId"/> + <sequenced-id sequence-name="Product" field="createProductMap.productId"/> <set field="productId" from-field="createProductMap.productId"/> <set field="createProductMap.productName" from-field="parameters.productName"/> @@ -89,7 +89,7 @@ <entity-one entity-name="Product" value-field="product"/> <set field="product.productName" from-field="parameters.productName" set-if-empty="false"/> <set field="product.description" from-field="parameters.description" set-if-empty="false"/> - <store-value value-name="product"/> + <store-value value-field="product"/> </then> </if> @@ -104,7 +104,7 @@ <!-- should just be one --> <first-from-list entry="productPrice" list="productPriceList"/> <set field="productPrice.price" from-field="parameters.price"/> - <store-value value-name="productPrice"/> + <store-value value-field="productPrice"/> </if-not-empty> </simple-method> <simple-method method-name="deleteCustomerDigitalDownloadProduct" short-description="deleteCustomerDigitalDownloadProduct"> @@ -124,7 +124,7 @@ <!-- keep the product around, just expire SupplierProduct and ProductCategoryMember records --> <iterate entry="supplierProduct" list="supplierProductList"> <set field="supplierProduct.availableThruDate" from-field="nowTimestamp"/> - <store-value value-name="supplierProduct"/> + <store-value value-field="supplierProduct"/> </iterate> <entity-and entity-name="ProductCategoryMember" list="productCategoryMemberList"> @@ -132,7 +132,7 @@ </entity-and> <iterate entry="productCategoryMember" list="productCategoryMemberList"> <set field="productCategoryMember.thruDate" from-field="nowTimestamp"/> - <store-value value-name="productCategoryMember"/> + <store-value value-field="productCategoryMember"/> </iterate> </simple-method> @@ -183,6 +183,6 @@ <entity-one entity-name="ProductContent" value-field="productContent"/> <set field="productContent.thruDate" from-field="nowTimestamp"/> - <store-value value-name="productContent"/> + <store-value value-field="productContent"/> </simple-method> </simple-methods> 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=730189&r1=730188&r2=730189&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:19:35 2008 @@ -32,7 +32,7 @@ <set from-field="parameters.productId" field="newEntity.productId"/> <if-empty field="newEntity.productId"> - <sequenced-id-to-env sequence-name="Product" env-name="newEntity.productId"/> + <sequenced-id sequence-name="Product" field="newEntity.productId"/> <else> <check-id field-name="productId" map-name="newEntity"/> <check-errors/> @@ -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-to-env sequence-name="InventoryItem" env-name="newTempValue.inventoryItemId"/> + <sequenced-id sequence-name="InventoryItem" field="newTempValue.inventoryItemId"/> <create-value value-field="newTempValue"/> </iterate> </if-not-empty> @@ -546,7 +546,7 @@ </if-empty> <!-- create the new ProductReview --> - <sequenced-id-to-env sequence-name="ProductReview" env-name="newEntity.productReviewId"/> + <sequenced-id sequence-name="ProductReview" field="newEntity.productReviewId"/> <field-to-result field="newEntity.productReviewId" result-name="productReviewId"/> <if-empty field="newEntity.postedDateTime"> 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=730189&r1=730188&r2=730189&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:19:35 2008 @@ -28,7 +28,7 @@ <make-value value-field="newEntity" entity-name="ProductPromo"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id-to-env sequence-name="ProductPromo" env-name="newEntity.productPromoId"/> + <sequenced-id sequence-name="ProductPromo" field="newEntity.productPromoId"/> <field-to-result field="productPromoId" map-name="newEntity"/> <if-empty field="newEntity.userEntered"> @@ -154,7 +154,7 @@ <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.productPromoCodeId"> - <sequenced-id-to-env sequence-name="ProductPromoCode" env-name="newEntity.productPromoCodeId" stagger-max="100"/> + <sequenced-id sequence-name="ProductPromoCode" field="newEntity.productPromoCodeId" stagger-max="100"/> </if-empty> <field-to-result field="productPromoCodeId" map-name="newEntity"/> 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=730189&r1=730188&r2=730189&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:19:35 2008 @@ -25,7 +25,7 @@ <make-value value-field="newEntity" entity-name="Facility"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id-to-env sequence-name="Facility" env-name="facilityId"/> + <sequenced-id sequence-name="Facility" field="facilityId"/> <to-string field-name="facilityId"/> <set field="newEntity.facilityId" from-field="facilityId" /> <field-to-result field="facilityId" result-name="facilityId"/> @@ -36,7 +36,7 @@ <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" /> <find-by-primary-key entity-name="Facility" map="lookupPKMap" value-field="facility"/> <set-nonpk-fields map="parameters" value-field="facility"/> - <store-value value-name="facility"/> + <store-value value-field="facility"/> </simple-method> <simple-method method-name="deleteFacility" short-description="Delete a Facility"> <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" /> @@ -81,7 +81,7 @@ </if-not-empty> <if-empty field="locationSeqId"> - <sequenced-id-to-env sequence-name="FacilityLocation" env-name="locationSeqId"/> + <sequenced-id sequence-name="FacilityLocation" field="locationSeqId"/> <to-string field-name="locationSeqId"/> </if-empty> <set field="newEntity.locationSeqId" from-field="locationSeqId" /> @@ -94,7 +94,7 @@ <set field="lookupPKMap.locationSeqId" from-field="parameters.locationSeqId" /> <find-by-primary-key entity-name="FacilityLocation" map="lookupPKMap" value-field="facilityLocation"/> <set-nonpk-fields map="parameters" value-field="facilityLocation"/> - <store-value value-name="facilityLocation"/> + <store-value value-field="facilityLocation"/> </simple-method> <simple-method method-name="deleteFacilityLocation" short-description="Delete a Facility Location"> <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" /> @@ -108,7 +108,7 @@ <make-value value-field="newEntity" entity-name="FacilityGroup"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id-to-env sequence-name="FacilityGroup" env-name="facilityGroupId"/> + <sequenced-id sequence-name="FacilityGroup" field="facilityGroupId"/> <to-string field-name="facilityGroupId"/> <set field="newEntity.facilityGroupId" from-field="facilityGroupId" /> <field-to-result field="facilityGroupId" result-name="facilityGroupId"/> @@ -119,7 +119,7 @@ <set field="lookupPKMap.facilityGroupId" from-field="parameters.facilityGroupId" /> <find-by-primary-key entity-name="FacilityGroup" map="lookupPKMap" value-field="facilityGroup"/> <set-nonpk-fields map="parameters" value-field="facilityGroup"/> - <store-value value-name="facilityGroup"/> + <store-value value-field="facilityGroup"/> </simple-method> <simple-method method-name="deleteFacilityGroup" short-description="Delete an Facility Group"> <set field="lookupPKMap.facilityGroupId" from-field="parameters.facilityGroupId" /> @@ -145,7 +145,7 @@ <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="FacilityGroupMember" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="removeFacilityFromGroup" short-description="Remove Facility From FacilityGroup"> <make-value value-field="lookupPKMap" entity-name="FacilityGroupMember"/> @@ -172,7 +172,7 @@ <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="FacilityGroupRollup" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="removeFacilityGroupFromGroup" short-description="Remove FacilityGroup From FacilityGroup"> <make-value value-field="lookupPKMap" entity-name="FacilityGroupRollup"/> @@ -211,7 +211,7 @@ <entity-one entity-name="FacilityParty" value-field="lookedUpValue"/> <now-timestamp-to-env env-name="thruDate"/> <set field="lookedUpValue.thruDate" from-field="thruDate"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="removePartyFromFacilityGroup" short-description="Remove Party From FacilityGroup"> 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=730189&r1=730188&r2=730189&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:19:35 2008 @@ -37,7 +37,7 @@ <make-value value-field="newEntity" entity-name="ProductStore"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id-to-env sequence-name="ProductStore" env-name="productStoreId" /> + <sequenced-id sequence-name="ProductStore" field="productStoreId" /> <set from-field="productStoreId" field="newEntity.productStoreId"/> <field-to-result field="productStoreId" result-name="productStoreId"/> @@ -228,7 +228,7 @@ <make-value value-field="newEntity" entity-name="ProductStoreShipmentMeth"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id-to-env sequence-name="ProductStoreShipmentMeth" env-name="newEntity.productStoreShipMethId"/> + <sequenced-id sequence-name="ProductStoreShipmentMeth" field="newEntity.productStoreShipMethId"/> <create-value value-field="newEntity"/> </simple-method> @@ -333,7 +333,7 @@ <check-errors/> <make-value value-field="newEntity" entity-name="ProductStoreSurveyAppl"/> - <sequenced-id-to-env sequence-name="ProductStoreSurveyAppl" env-name="productStoreSurveyId"/> + <sequenced-id sequence-name="ProductStoreSurveyAppl" field="productStoreSurveyId"/> <set from-field="productStoreSurveyId" field="newEntity.productStoreSurveyId"/> <field-to-result field="productStoreSurveyId" result-name="productStoreSurveyId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> 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=730189&r1=730188&r2=730189&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:19:35 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-to-env sequence-name="Subscription" env-name="newEntity.subscriptionId"/> <!-- get the next sequenced ID --> + <sequenced-id sequence-name="Subscription" field="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-to-env sequence-name="SubscriptionResource" env-name="newEntity.subscriptionResourceId"/> + <sequenced-id sequence-name="SubscriptionResource" field="newEntity.subscriptionResourceId"/> <field-to-result field="newEntity.subscriptionResourceId" result-name="subscriptionResourceId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> 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=730189&r1=730188&r2=730189&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:19:35 2008 @@ -30,7 +30,7 @@ <check-errors/> <make-value value-field="newEntity" entity-name="ItemIssuance"/> - <sequenced-id-to-env sequence-name="ItemIssuance" env-name="newEntity.itemIssuanceId"/> + <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"/> 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=730189&r1=730188&r2=730189&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:19:35 2008 @@ -581,7 +581,7 @@ <make-value value-field="newEntity" entity-name="Picklist"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id-to-env sequence-name="Picklist" env-name="newEntity.picklistId"/> + <sequenced-id sequence-name="Picklist" field="newEntity.picklistId"/> <field-to-result field="newEntity.picklistId" result-name="picklistId"/> <if-empty field="newEntity.statusId"> @@ -637,7 +637,7 @@ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> <set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deletePicklist" short-description="Delete Picklist"> <check-permission permission="FACILITY" action="_DELETE"> @@ -661,7 +661,7 @@ <make-value value-field="newEntity" entity-name="PicklistBin"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id-to-env sequence-name="PicklistBin" env-name="newEntity.picklistBinId"/> + <sequenced-id sequence-name="PicklistBin" field="newEntity.picklistBinId"/> <field-to-result field="newEntity.picklistBinId" result-name="picklistBinId"/> <create-value value-field="newEntity"/> @@ -676,7 +676,7 @@ <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deletePicklistBin" short-description="Delete PicklistBin"> <check-permission permission="FACILITY" action="_DELETE"> @@ -739,7 +739,7 @@ <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> <!-- store the changes --> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deletePicklistItem" short-description="Delete PicklistItem"> <check-permission permission="FACILITY" action="_DELETE"> @@ -789,7 +789,7 @@ <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deletePicklistRole" short-description="Delete PicklistRole"> <check-permission permission="FACILITY" action="_DELETE"> @@ -1271,13 +1271,13 @@ <if-compare field="allCancelled" value="true" type="Boolean" operator="equals"> <log level="info" message="Setting picklist #${picklist.picklistId} to cancelled"/> <set field="picklist.statusId" value="PICKLIST_CANCELLED"/> - <store-value value-name="picklist"/> + <store-value value-field="picklist"/> <else> <log level="info" message="Not all items were cancelled; now check if we can complete the picklist : ${allCompleteOrCancelled}"/> <if-compare field="allCompleteOrCancelled" value="true" type="Boolean" operator="equals"> <log level="info" message="Setting picklist #${picklist.picklistId} to completed"/> <set field="picklist.statusId" value="PICKLIST_PICKED"/> - <store-value value-name="picklist"/> + <store-value value-field="picklist"/> </if-compare> </else> </if-compare> 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=730189&r1=730188&r2=730189&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:19:35 2008 @@ -27,7 +27,7 @@ <make-value value-field="newEntity" entity-name="ShipmentReceipt"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id-to-env sequence-name="ShipmentReceipt" env-name="receiptId"/> + <sequenced-id sequence-name="ShipmentReceipt" field="receiptId"/> <to-string field-name="receiptId"/> <set field="newEntity.receiptId" from-field="receiptId"/> <field-to-result field="receiptId" result-name="receiptId"/> @@ -46,7 +46,7 @@ <field-map field-name="inventoryItemId" from-field="parameters.inventoryItemId"/> </entity-one> <set field="invDet.receiptId" from-field="receiptId"/> - <store-value value-name="invDet"/> + <store-value value-field="invDet"/> </if-not-empty> </simple-method> @@ -299,7 +299,7 @@ <!-- now that the receive is done; set the need flag to N --> <refresh-value value-name="returnHeader"/> <set field="returnHeader.needsInventoryReceive" value="N"/> - <store-value value-name="returnHeader"/> + <store-value value-field="returnHeader"/> <!-- check if we need to manually update the status --> <if-compare-field field="nonProductItems" to-field="returnItemCount" operator="equals" type="Long"> 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=730189&r1=730188&r2=730189&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:19:35 2008 @@ -33,7 +33,7 @@ <if-not-empty field="parameters.shipmentId"> <set-pk-fields map="parameters" value-field="newEntity"/> <else> - <sequenced-id-to-env sequence-name="Shipment" env-name="newEntity.shipmentId"/> + <sequenced-id sequence-name="Shipment" field="newEntity.shipmentId"/> </else> </if-not-empty> <field-to-result field="newEntity.shipmentId" result-name="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-to-env sequence-name="QuantityBreak" env-name="quantityBreak.quantityBreakId"/> + <sequenced-id sequence-name="QuantityBreak" field="quantityBreak.quantityBreakId"/> <create-value value-field="quantityBreak"/> <check-errors/> </simple-method> 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=730189&r1=730188&r2=730189&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:19:35 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-to-env sequence-name="Timesheet" env-name="newEntity.timesheetId"/> + <sequenced-id sequence-name="Timesheet" field="newEntity.timesheetId"/> <field-to-result field="newEntity.timesheetId" result-name="timesheetId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -36,12 +36,12 @@ <simple-method method-name="updateTimesheet" short-description="Update Timesheet"> <call-simple-method method-name="checkTimesheetStatus"/> <set-nonpk-fields map="parameters" value-field="timesheet"/> - <store-value value-name="timesheet"/> + <store-value value-field="timesheet"/> </simple-method> <simple-method method-name="updateTimesheetToInProcess" short-description="Updates the Timesheet status back to in process to be able to correct errors"> <entity-one entity-name="Timesheet" value-field="timesheet"/> <set field="timesheet.statusId" value="TIMESHEET_IN_PROCESS"/> - <store-value value-name="timesheet"/> + <store-value value-field="timesheet"/> </simple-method> <simple-method method-name="deleteTimesheet" short-description="Delete Timesheet"> <call-simple-method method-name="checkTimesheetStatus"/> @@ -299,7 +299,7 @@ <now-timestamp-to-env env-name="nowTimestamp"/> <make-value value-field="newEntity" entity-name="TimeEntry"/> - <sequenced-id-to-env sequence-name="TimeEntry" env-name="newEntity.timeEntryId"/> + <sequenced-id sequence-name="TimeEntry" field="newEntity.timeEntryId"/> <field-to-result field="newEntity.timeEntryId" result-name="timeEntryId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -323,7 +323,7 @@ </else> </if-empty> </if-not-empty> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteTimeEntry" short-description="Delete TimeEntry"> <entity-one entity-name="TimeEntry" value-field="lookedUpValue"/> @@ -334,7 +334,7 @@ <entity-one entity-name="TimeEntry" value-field="lookedUpValue"/> <field-to-result field="invoiceId" map-name="lookedUpValue"/> <clear-field field="lookedUpValue.invoiceId"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="getTimeEntryRate" short-description="Get TimeEntry Rate"> <check-permission permission="WORKEFFORTMGR" action="_VIEW"><fail-message message="You do not have permission to perform this operation: ${methodShortDescription}."/></check-permission> 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=730189&r1=730188&r2=730189&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:19:35 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-to-env sequence-name="WorkEffort" env-name="newEntity.workEffortId"/> + <sequenced-id sequence-name="WorkEffort" field="newEntity.workEffortId"/> <else> <set field="newEntity.workEffortId" from-field="parameters.workEffortId"/> </else> @@ -164,7 +164,7 @@ <set field="lookedUpValue.revisionNumber" value="1" type="Long"/> </else> </if-not-empty> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </if-compare-field> </simple-method> <simple-method method-name="deleteWorkEffort" short-description="Delete Work Effort"> @@ -204,7 +204,7 @@ <if-not-empty field="eventWe.workEffortId"> <set-nonpk-fields map="parameters" value-field="eventWe"/> <set field="eventWe.description" from-field="parameters.relationDescription"/> - <store-value value-name="eventWe"/> + <store-value value-field="eventWe"/> </if-not-empty> <if-empty field="eventWe.workEffortId"> <set-nonpk-fields map="parameters" value-field="lookupMap"/> @@ -227,7 +227,7 @@ </if-empty> <check-errors/> <set-nonpk-fields value-field="communicationEventWorkEff" map="parameters"/> - <store-value value-name="communicationEventWorkEff"/> + <store-value value-field="communicationEventWorkEff"/> </simple-method> <simple-method method-name="deleteCommunicationEventWorkEff" short-description="Delete a CommunicationEventWorkEff"> @@ -302,7 +302,7 @@ <field field-name="dispatcher" type="org.ofbiz.service.LocalDispatcher"/> </call-class-method> </if-compare-field> - <store-value value-name="workEffortPartyAssignment"/> + <store-value value-field="workEffortPartyAssignment"/> </simple-method> <simple-method method-name="deletePartyToWorkEffortAssignment" short-description="Update WorkEffortPartyAssignment entity"> <set-service-fields service-name="updatePartyToWorkEffortAssignment" map="parameters" to-map="del"/> @@ -560,7 +560,7 @@ </simple-method> <simple-method method-name="createWorkEffortNote" short-description="Create Work Effort Note"> <make-value value-field="newEntity" entity-name="NoteData"/> - <sequenced-id-to-env sequence-name="NoteData" env-name="newEntity.noteId"/> + <sequenced-id sequence-name="NoteData" field="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"> @@ -585,8 +585,8 @@ <entity-one entity-name="NoteData" value-field="lookedUpValueForNoteData"/> <set-nonpk-fields value-field="lookedUpValueForNoteData" map="parameters"/> <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-name="lookedUpValue"/> - <store-value value-name="lookedUpValueForNoteData"/> + <store-value value-field="lookedUpValue"/> + <store-value value-field="lookedUpValueForNoteData"/> </simple-method> <simple-method method-name="createWorkEffortAndAssoc" short-description="Create a WorkEffort and association"> <if-empty field="parameters.fromDate"> @@ -638,7 +638,7 @@ <simple-method method-name="updateWorkEffortAssoc" short-description="Update a WorkEffort association"> <entity-one entity-name="WorkEffortAssoc" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="removeWorkEffortAssoc" short-description="Remove a WorkEffort association"> <entity-one entity-name="WorkEffortAssoc" value-field="lookedUpValue"/> @@ -664,7 +664,7 @@ <simple-method method-name="updateWorkEffortGoodStandard" short-description="Update a link between a WorkEffort and a Product"> <entity-one entity-name="WorkEffortGoodStandard" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="removeWorkEffortGoodStandard" short-description="Remove a link between a WorkEffort and a Product"> <entity-one entity-name="WorkEffortGoodStandard" value-field="lookedUpValue"/> @@ -679,7 +679,7 @@ <calcop field="foundEntity.quantity" operator="get"/> <calcop field="parameters.quantity" operator="get"/> </calculate> - <store-value value-name="foundEntity"/> + <store-value value-field="foundEntity"/> <else> <make-value value-field="newEntity" entity-name="WorkEffortInventoryAssign"/> <set-pk-fields map="parameters" value-field="newEntity"/> @@ -880,7 +880,7 @@ <check-errors /> <entity-one entity-name="WorkEffortFixedAssetStd" value-field="lookedUpValue" /> <set-nonpk-fields map="parameters" value-field="lookedUpValue" /> - <store-value value-name="lookedUpValue" /> + <store-value value-field="lookedUpValue" /> </simple-method> <simple-method method-name="removeWorkEffortFixedAssetStd" short-description="Delete a WorkEffort FixedAsset Standard"> @@ -930,7 +930,7 @@ <check-errors /> <entity-one entity-name="WorkEffortFixedAssetAssign" value-field="lookedUpValue" /> <set-nonpk-fields map="parameters" value-field="lookedUpValue" /> - <store-value value-name="lookedUpValue" /> + <store-value value-field="lookedUpValue" /> </simple-method> <simple-method method-name="removeWorkEffortFixedAssetAssign" short-description="Remove a WorkEffort FixedAsset Assign"> @@ -970,7 +970,7 @@ --> <entity-one entity-name="WorkEffortContent" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteWorkEffortContent" short-description="Remove a WorkEffort Content"> @@ -1014,7 +1014,7 @@ <check-errors /> <entity-one entity-name="WorkEffortReview" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteWorkEffortReview" short-description="Remove a WorkEffort Review"> @@ -1198,7 +1198,7 @@ <simple-method method-name="updateWorkEffortSkillStandard" short-description="Update WorkEffortSkillStandard"> <entity-one entity-name="WorkEffortSkillStandard" value-field="lookedUpValue"/> <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteWorkEffortSkillStandard" short-description="Delete WorkEffortSkillStandard"> <entity-one entity-name="WorkEffortSkillStandard" value-field="lookedUpValue"/> 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=730189&r1=730188&r2=730189&view=diff ============================================================================== --- ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml (original) +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml Tue Dec 30 09:19:35 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-to-env sequence-name="Enumeration" env-name="newEntity.enumId"/> <!-- get the next sequenced ID --> + <sequenced-id sequence-name="Enumeration" field="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=730189&r1=730188&r2=730189&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 Tue Dec 30 09:19:35 2008 @@ -33,11 +33,11 @@ <if-not-empty field="currencyDims"> <iterate list="currencyDims" entry="currencyDim"> <set field="currencyDim.description" from-field="currency.description"/> - <store-value value-name="currencyDim"/> + <store-value value-field="currencyDim"/> </iterate> <else> <make-value value-field="currencyDim" entity-name="CurrencyDimension"/> - <sequenced-id-to-env sequence-name="CurrencyDimension" env-name="currencyDim.dimensionId"/> + <sequenced-id sequence-name="CurrencyDimension" field="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=730189&r1=730188&r2=730189&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 Tue Dec 30 09:19:35 2008 @@ -28,7 +28,7 @@ <make-value value-field="newEntity" entity-name="CustomTimePeriod"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id-to-env sequence-name="CustomTimePeriod" env-name="customTimePeriodId"/> + <sequenced-id sequence-name="CustomTimePeriod" field="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=730189&r1=730188&r2=730189&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:19:35 2008 @@ -27,7 +27,7 @@ <make-value value-field="newEntity" entity-name="EntitySync"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id-to-env sequence-name="EntitySync" env-name="entitySyncId"/> + <sequenced-id sequence-name="EntitySync" field="entitySyncId"/> <set field="newEntity.entitySyncId" from-field="entitySyncId"/> <field-to-result field="entitySyncId" result-name="entitySyncId"/> @@ -40,7 +40,7 @@ <set field="lookupPKMap.entitySyncId" from-field="parameters.entitySyncId"/> <find-by-primary-key entity-name="EntitySync" map="lookupPKMap" value-field="valueToStore"/> <set-nonpk-fields map="parameters" value-field="valueToStore"/> - <store-value value-name="valueToStore"/> + <store-value value-field="valueToStore"/> </simple-method> <simple-method method-name="resetEntitySyncStatusToNotStarted" short-description="Update a EntitySync, set the Status to ESR_NOT_STARTED, but ONLY if running (ie in ESR_RUNNING)"> <check-permission permission="ENTITY_SYNC" action="_UPDATE"><fail-message message="Security Error: to run resetEntitySyncStatusToNotStarted you must have the ENTITY_SYNC_UPDATE or ENTITY_SYNC_ADMIN permission"/></check-permission> @@ -51,7 +51,7 @@ <find-by-primary-key entity-name="EntitySync" map="lookupPKMap" value-field="valueToStore"/> <if-compare field="valueToStore.runStatusId" operator="equals" value="ESR_RUNNING"> <set field="valueToStore.runStatusId" value="ESR_NOT_STARTED"/> - <store-value value-name="valueToStore"/> + <store-value value-field="valueToStore"/> </if-compare> </simple-method> @@ -70,7 +70,7 @@ <!-- also set the lastHistoryStartDate on the EntitySync --> <entity-one entity-name="EntitySync" value-field="entitySync"/> <set from-field="newEntity.startDate" field="entitySync.lastHistoryStartDate"/> - <store-value value-name="entitySync"/> + <store-value value-field="entitySync"/> </simple-method> <simple-method method-name="updateEntitySyncHistory" short-description="Update EntitySyncHistory"> <check-permission permission="ENTITY_SYNC" action="_UPDATE"><fail-message message="Security Error: to run updateEntitySyncHistory you must have the ENTITY_SYNC_UPDATE or ENTITY_SYNC_ADMIN permission"/></check-permission> @@ -80,7 +80,7 @@ <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteEntitySyncHistory" short-description="Delete EntitySyncHistory"> <check-permission permission="ENTITY_SYNC" action="_DELETE"><fail-message message="Security Error: to run deleteEntitySyncHistory you must have the ENTITY_SYNC_DELETE or ENTITY_SYNC_ADMIN permission"/></check-permission> @@ -110,7 +110,7 @@ <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteEntitySyncInclude" short-description="Delete EntitySyncInclude"> <check-permission permission="ENTITY_SYNC" action="_DELETE"><fail-message message="Security Error: to run deleteEntitySyncInclude you must have the ENTITY_SYNC_DELETE or ENTITY_SYNC_ADMIN permission"/></check-permission> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |