svn commit: r667748 [12/16] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r667748 [12/16] - in /ofbiz/trunk: applications/accounting/script
 
|
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=667748&r1=667747&r2=667748&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 Fri Jun 13 23:03:12 2008 @@ -31,7 +31,7 @@ <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set from-field="parameters.productId" field="newEntity.productId"/> - <if-empty field-name="newEntity.productId"> + <if-empty field="newEntity.productId"> <sequenced-id-to-env sequence-name="Product" env-name="newEntity.productId"/> <else> <check-id field-name="productId" map-name="newEntity"/> @@ -45,13 +45,13 @@ <set from-field="nowTimestamp" field="newEntity.lastModifiedDate"/> <set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/> <set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/> - <if-empty field-name="newEntity.isVariant"> + <if-empty field="newEntity.isVariant"> <set field="newEntity.isVariant" value="N"/> </if-empty> - <if-empty field-name="newEntity.isVirtual"> + <if-empty field="newEntity.isVirtual"> <set field="newEntity.isVirtual" value="N"/> </if-empty> - <if-empty field-name="newEntity.billOfMaterialLevel"> + <if-empty field="newEntity.billOfMaterialLevel"> <set field="newEntity.billOfMaterialLevel" value="0" type="Integer"/> </if-empty> @@ -59,7 +59,7 @@ <!-- if setting the primaryProductCategoryId create a member entity too --> <!-- THIS IS REMOVED BECAUSE IT CAUSES PROBLEMS FOR WORKING ON PRODUCTION SITES - <if-not-empty field-name="primaryProductCategoryId" map-name="newEntity"> + <if-not-empty field="newEntity.primaryProductCategoryId"> <make-value entity-name="ProductCategoryMember" value-name="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"/> @@ -105,8 +105,8 @@ <!-- if setting the primaryParentCategoryId, create a rollup entity too --> <!-- THIS IS REMOVED BECAUSE IT CAUSES PROBLEMS FOR WORKING ON PRODUCTION SITES - <if-not-empty field-name="primaryProductCategoryId" map-name="lookedUpValue"> - <if-compare-field field-name="primaryProductCategoryId" map-name="lookedUpValue" operator="equals" to-map-name="saveIdMap"> + <if-not-empty field="lookedUpValue.primaryProductCategoryId"> + <if-compare-field to-field="saveIdMap." field="lookedUpValue.primaryProductCategoryId" operator="equals"> <make-value entity-name="ProductCategoryMember" value-name="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"/> @@ -126,7 +126,7 @@ <entity-one entity-name="Product" value-name="lookedUpValue"/> <set from-field="parameters.productName" field="lookedUpValue.productName"/> - <if-compare field-name="lookedUpValue.isVirtual" operator="equals" value="Y"> + <if-compare field="lookedUpValue.isVirtual" operator="equals" value="Y"> <set from-field="lookedUpValue.productName" field="lookedUpValue.internalName"/> </if-compare> @@ -135,7 +135,7 @@ <store-value value-name="lookedUpValue"/> - <if-compare field-name="lookedUpValue.isVirtual" operator="equals" value="Y"> + <if-compare field="lookedUpValue.isVirtual" operator="equals" value="Y"> <!-- get all variant products, to update their productNames --> <set from-field="parameters.productId" field="variantProductAssocMap.productId"/> <set value="PRODUCT_VARIANT" field="variantProductAssocMap.productAssocTypeId"/> @@ -175,22 +175,22 @@ <set from-field="parameters.productId" field="newProduct.productId"/> <!-- if requested, set the new internalName field --> - <if-not-empty field-name="newInternalName" map-name="parameters"> + <if-not-empty field="parameters.newInternalName"> <set from-field="parameters.newInternalName" field="newProduct.internalName"/> </if-not-empty> <!-- if requested, set the new productName field --> - <if-not-empty field-name="newProductName" map-name="parameters"> + <if-not-empty field="parameters.newProductName"> <set from-field="parameters.newProductName" field="newProduct.productName"/> </if-not-empty> <!-- if requested, set the new description field --> - <if-not-empty field-name="newDescription" map-name="parameters"> + <if-not-empty field="parameters.newDescription"> <set from-field="parameters.newDescription" field="newProduct.description"/> </if-not-empty> <!-- if requested, set the new longDescription field --> - <if-not-empty field-name="newLongDescription" map-name="parameters"> + <if-not-empty field="parameters.newLongDescription"> <set from-field="parameters.newLongDescription" field="newProduct.longDescription"/> </if-not-empty> @@ -201,7 +201,7 @@ <set field="reverseProductFindContext.productIdTo" from-field="parameters.oldProductId"/> <!-- if requested, duplicate related data as well --> - <if-not-empty field-name="duplicatePrices" map-name="parameters"> + <if-not-empty field="parameters.duplicatePrices"> <find-by-and entity-name="ProductPrice" map-name="productFindContext" list-name="foundValues"/> <iterate entry-name="foundValue" list-name="foundValues"> <clone-value value-name="foundValue" new-value-name="newTempValue"/> @@ -209,7 +209,7 @@ <create-value value-name="newTempValue"/> </iterate> </if-not-empty> - <if-not-empty field-name="duplicateIDs" map-name="parameters"> + <if-not-empty field="parameters.duplicateIDs"> <find-by-and entity-name="GoodIdentification" map-name="productFindContext" list-name="foundValues"/> <iterate entry-name="foundValue" list-name="foundValues"> <clone-value value-name="foundValue" new-value-name="newTempValue"/> @@ -217,7 +217,7 @@ <create-value value-name="newTempValue"/> </iterate> </if-not-empty> - <if-not-empty field-name="duplicateContent" map-name="parameters"> + <if-not-empty field="parameters.duplicateContent"> <find-by-and entity-name="ProductContent" map-name="productFindContext" list-name="foundValues"/> <iterate entry-name="foundValue" list-name="foundValues"> <clone-value value-name="foundValue" new-value-name="newTempValue"/> @@ -225,7 +225,7 @@ <create-value value-name="newTempValue"/> </iterate> </if-not-empty> - <if-not-empty field-name="duplicateCategoryMembers" map-name="parameters"> + <if-not-empty field="parameters.duplicateCategoryMembers"> <find-by-and entity-name="ProductCategoryMember" map-name="productFindContext" list-name="foundValues"/> <iterate entry-name="foundValue" list-name="foundValues"> <clone-value value-name="foundValue" new-value-name="newTempValue"/> @@ -233,7 +233,7 @@ <create-value value-name="newTempValue"/> </iterate> </if-not-empty> - <if-not-empty field-name="duplicateAssocs" map-name="parameters"> + <if-not-empty field="parameters.duplicateAssocs"> <find-by-and entity-name="ProductAssoc" map-name="productFindContext" list-name="foundValues"/> <iterate entry-name="foundValue" list-name="foundValues"> <clone-value value-name="foundValue" new-value-name="newTempValue"/> @@ -251,7 +251,7 @@ <create-value value-name="newTempValue"/> </iterate> </if-not-empty> - <if-not-empty field-name="duplicateAttributes" map-name="parameters"> + <if-not-empty field="parameters.duplicateAttributes"> <find-by-and entity-name="ProductAttribute" map-name="productFindContext" list-name="foundValues"/> <iterate entry-name="foundValue" list-name="foundValues"> <clone-value value-name="foundValue" new-value-name="newTempValue"/> @@ -259,7 +259,7 @@ <create-value value-name="newTempValue"/> </iterate> </if-not-empty> - <if-not-empty field-name="duplicateFeatureAppls" map-name="parameters"> + <if-not-empty field="parameters.duplicateFeatureAppls"> <find-by-and entity-name="ProductFeatureAppl" map-name="productFindContext" list-name="foundValues"/> <iterate entry-name="foundValue" list-name="foundValues"> <clone-value value-name="foundValue" new-value-name="newTempValue"/> @@ -267,7 +267,7 @@ <create-value value-name="newTempValue"/> </iterate> </if-not-empty> - <if-not-empty field-name="duplicateInventoryItems" map-name="parameters"> + <if-not-empty field="parameters.duplicateInventoryItems"> <find-by-and entity-name="InventoryItem" map-name="productFindContext" list-name="foundValues"/> <iterate entry-name="foundValue" list-name="foundValues"> <!-- @@ -288,30 +288,30 @@ </if-not-empty> <!-- if requested, remove related data as well --> - <if-not-empty field-name="removePrices" map-name="parameters"> + <if-not-empty field="parameters.removePrices"> <remove-by-and entity-name="ProductPrice" map-name="productFindContext"/> </if-not-empty> - <if-not-empty field-name="removeIDs" map-name="parameters"> + <if-not-empty field="parameters.removeIDs"> <remove-by-and entity-name="GoodIdentification" map-name="productFindContext"/> </if-not-empty> - <if-not-empty field-name="removeContent" map-name="parameters"> + <if-not-empty field="parameters.removeContent"> <remove-by-and entity-name="ProductContent" map-name="productFindContext"/> </if-not-empty> - <if-not-empty field-name="removeCategoryMembers" map-name="parameters"> + <if-not-empty field="parameters.removeCategoryMembers"> <remove-by-and entity-name="ProductCategoryMember" map-name="productFindContext"/> </if-not-empty> - <if-not-empty field-name="removeAssocs" map-name="parameters"> + <if-not-empty field="parameters.removeAssocs"> <remove-by-and entity-name="ProductAssoc" map-name="productFindContext"/> <!-- small difference here, also do the reverse assocs... --> <remove-by-and entity-name="ProductAssoc" map-name="reverseProductFindContext"/> </if-not-empty> - <if-not-empty field-name="removeAttributes" map-name="parameters"> + <if-not-empty field="parameters.removeAttributes"> <remove-by-and entity-name="ProductAttribute" map-name="productFindContext"/> </if-not-empty> - <if-not-empty field-name="removeFeatureAppls" map-name="parameters"> + <if-not-empty field="parameters.removeFeatureAppls"> <remove-by-and entity-name="ProductFeatureAppl" map-name="productFindContext"/> </if-not-empty> - <if-not-empty field-name="removeInventoryItems" map-name="parameters"> + <if-not-empty field="parameters.removeInventoryItems"> <remove-by-and entity-name="InventoryItem" map-name="productFindContext"/> </if-not-empty> </simple-method> @@ -348,7 +348,7 @@ <!-- if it is the Product entity itself triggering this action, then a [productInstance] parameter will be passed and we can save a few cycles looking that up --> <set from-field="parameters.productInstance" field="productInstance"/> - <if-empty field-name="productInstance"> + <if-empty field="productInstance"> <set from-field="parameters.productId" field="findProductMap.productId"/> <find-by-primary-key entity-name="Product" map-name="findProductMap" value-name="productInstance"/> </if-empty> @@ -357,8 +357,8 @@ <if> <condition> <or> - <if-empty field-name="autoCreateKeywords" map-name="productInstance"/> - <if-compare field-name="autoCreateKeywords" map-name="productInstance" operator="equals" value="Y"/> + <if-empty field="productInstance.autoCreateKeywords"/> + <if-compare field="productInstance.autoCreateKeywords" operator="equals" value="Y"/> </or> </condition> <then> @@ -378,7 +378,7 @@ <!-- expire product from all categories --> <get-related value-name="product" relation-name="ProductCategoryMember" list-name="productCategoryMembers"/> <iterate entry-name="productCategoryMember" list-name="productCategoryMembers"> - <if-empty field-name="productCategoryMember.thruDate"> + <if-empty field="productCategoryMember.thruDate"> <set from-field="nowTimestamp" field="productCategoryMember.thruDate"/> <store-value value-name="productCategoryMember"/> </if-empty> @@ -386,7 +386,7 @@ <!-- expire product from all associations going to it --> <get-related value-name="product" relation-name="AssocProductAssoc" list-name="assocProductAssocs"/> <iterate entry-name="assocProductAssoc" list-name="assocProductAssocs"> - <if-empty field-name="assocProductAssoc.thruDate"> + <if-empty field="assocProductAssoc.thruDate"> <set from-field="nowTimestamp" field="assocProductAssoc.thruDate"/> <store-value value-name="assocProductAssoc"/> </if-empty> @@ -394,11 +394,11 @@ </simple-method> <simple-method method-name="countProductView" short-description="Count Product View" login-required="false"> - <if-empty field-name="parameters.weight"> + <if-empty field="parameters.weight"> <calculate field-name="parameters.weight" type="Long"><number value="1"/></calculate> </if-empty> <entity-one entity-name="ProductCalculatedInfo" value-name="productCalculatedInfo"/> - <if-empty field-name="productCalculatedInfo"> + <if-empty field="productCalculatedInfo"> <!-- go ahead and create it --> <make-value value-name="productCalculatedInfo" entity-name="ProductCalculatedInfo"/> <set from-field="parameters.productId" field="productCalculatedInfo.productId"/> @@ -419,18 +419,18 @@ <call-class-method class-name="org.ofbiz.product.product.ProductWorker" method-name="getVariantVirtualId" ret-field-name="virtualProductId"> <field field-name="product" type="GenericValue"/> </call-class-method> - <if-not-empty field-name="virtualProductId"> + <if-not-empty field="virtualProductId"> <set from-field="virtualProductId" field="callSubMap.productId"/> <set from-field="parameters.weight" field="callSubMap.weight"/> <call-service service-name="countProductView" in-map-name="callSubMap"></call-service> </if-not-empty> </simple-method> <simple-method method-name="countProductQuantityOrdered" short-description="Count Product Quantity Ordered" login-required="true"> - <if-empty field-name="parameters.quantity"> + <if-empty field="parameters.quantity"> <calculate field-name="parameters.quantity" type="Double"><number value="1"/></calculate> </if-empty> <entity-one entity-name="ProductCalculatedInfo" value-name="productCalculatedInfo"/> - <if-empty field-name="productCalculatedInfo"> + <if-empty field="productCalculatedInfo"> <!-- go ahead and create it --> <make-value value-name="productCalculatedInfo" entity-name="ProductCalculatedInfo"/> <set from-field="parameters.productId" field="productCalculatedInfo.productId"/> @@ -451,7 +451,7 @@ <call-class-method class-name="org.ofbiz.product.product.ProductWorker" method-name="getVariantVirtualId" ret-field-name="virtualProductId"> <field field-name="product" type="GenericValue"/> </call-class-method> - <if-not-empty field-name="virtualProductId"> + <if-not-empty field="virtualProductId"> <set from-field="virtualProductId" field="callSubMap.productId"/> <set from-field="parameters.quantity" field="callSubMap.quantity"/> <call-service service-name="countProductQuantityOrdered" in-map-name="callSubMap"></call-service> @@ -539,14 +539,14 @@ <!-- code to check for auto-approved reviews (store setting) --> <entity-one entity-name="ProductStore" value-name="productStore"/> - <if-not-empty field-name="productStore"> - <if-compare field-name="productStore.autoApproveReviews" operator="equals" value="Y"> + <if-not-empty field="productStore"> + <if-compare field="productStore.autoApproveReviews" operator="equals" value="Y"> <set value="PRR_APPROVED" field="newEntity.statusId"/> </if-compare> </if-not-empty> <!-- auto approve the review if it is just a rating and has no review text --> - <if-empty field-name="parameters.productReview"> + <if-empty field="parameters.productReview"> <set value="PRR_APPROVED" field="newEntity.statusId"/> </if-empty> @@ -554,7 +554,7 @@ <sequenced-id-to-env sequence-name="ProductReview" env-name="newEntity.productReviewId"/> <field-to-result field-name="newEntity.productReviewId" result-name="productReviewId"/> - <if-empty field-name="postedDateTime" map-name="newEntity"> + <if-empty field="newEntity.postedDateTime"> <now-timestamp-to-env env-name="newEntity.postedDateTime"/> </if-empty> @@ -586,12 +586,12 @@ <field field-name="productId" type="java.lang.String"/> </call-class-method> <log level="info" message="Got new average customer rating ${averageCustomerRating}"/> - <if-compare field-name="averageCustomerRating" operator="equals" value="0" type="Double"> + <if-compare field="averageCustomerRating" operator="equals" value="0" type="Double"> <return/> </if-compare> <!-- update the review average on the ProductCalculatedInfo entity --> <entity-one entity-name="ProductCalculatedInfo" value-name="productCalculatedInfo"/> - <if-empty field-name="productCalculatedInfo"> + <if-empty field="productCalculatedInfo"> <!-- go ahead and create it --> <make-value value-name="productCalculatedInfo" entity-name="ProductCalculatedInfo"/> <set from-field="parameters.productId" field="productCalculatedInfo.productId"/> @@ -621,8 +621,8 @@ <iterate entry-name="newProduct" list-name="variants"> <set from-field="newProduct.productIdTo" field="productVariantContext.productId"/> <!-- if requested, duplicate related data --> - <if-not-empty field-name="duplicatePrices" map-name="parameters"> - <if-not-empty field-name="removeBefore" map-name="parameters"> + <if-not-empty field="parameters.duplicatePrices"> + <if-not-empty field="parameters.removeBefore"> <find-by-and entity-name="ProductPrice" map-name="productVariantContext" list-name="foundVariantValues"/> <iterate entry-name="foundVariantValue" list-name="foundVariantValues"> <remove-value value-name="foundVariantValue"/> @@ -635,8 +635,8 @@ <create-value value-name="newTempValue"/> </iterate> </if-not-empty> - <if-not-empty field-name="duplicateIDs" map-name="parameters"> - <if-not-empty field-name="removeBefore" map-name="parameters"> + <if-not-empty field="parameters.duplicateIDs"> + <if-not-empty field="parameters.removeBefore"> <find-by-and entity-name="GoodIdentification" map-name="productVariantContext" list-name="foundVariantValues"/> <iterate entry-name="foundVariantValue" list-name="foundVariantValues"> <remove-value value-name="foundVariantValue"/> @@ -649,8 +649,8 @@ <create-value value-name="newTempValue"/> </iterate> </if-not-empty> - <if-not-empty field-name="duplicateContent" map-name="parameters"> - <if-not-empty field-name="removeBefore" map-name="parameters"> + <if-not-empty field="parameters.duplicateContent"> + <if-not-empty field="parameters.removeBefore"> <find-by-and entity-name="ProductContent" map-name="productVariantContext" list-name="foundVariantValues"/> <iterate entry-name="foundVariantValue" list-name="foundVariantValues"> <remove-value value-name="foundVariantValue"/> @@ -663,8 +663,8 @@ <create-value value-name="newTempValue"/> </iterate> </if-not-empty> - <if-not-empty field-name="duplicateCategoryMembers" map-name="parameters"> - <if-not-empty field-name="removeBefore" map-name="parameters"> + <if-not-empty field="parameters.duplicateCategoryMembers"> + <if-not-empty field="parameters.removeBefore"> <find-by-and entity-name="ProductCategoryMember" map-name="productVariantContext" list-name="foundVariantValues"/> <iterate entry-name="foundVariantValue" list-name="foundVariantValues"> <remove-value value-name="foundVariantValue"/> @@ -677,8 +677,8 @@ <create-value value-name="newTempValue"/> </iterate> </if-not-empty> - <if-not-empty field-name="duplicateAttributes" map-name="parameters"> - <if-not-empty field-name="removeBefore" map-name="parameters"> + <if-not-empty field="parameters.duplicateAttributes"> + <if-not-empty field="parameters.removeBefore"> <find-by-and entity-name="ProductAttribute" map-name="productVariantContext" list-name="foundVariantValues"/> <iterate entry-name="foundVariantValue" list-name="foundVariantValues"> <remove-value value-name="foundVariantValue"/> @@ -691,8 +691,8 @@ <create-value value-name="newTempValue"/> </iterate> </if-not-empty> - <if-not-empty field-name="duplicateFacilities" map-name="parameters"> - <if-not-empty field-name="removeBefore" map-name="parameters"> + <if-not-empty field="parameters.duplicateFacilities"> + <if-not-empty field="parameters.removeBefore"> <find-by-and entity-name="ProductFacility" map-name="productVariantContext" list-name="foundVariantValues"/> <iterate entry-name="foundVariantValue" list-name="foundVariantValues"> <remove-value value-name="foundVariantValue"/> @@ -705,8 +705,8 @@ <create-value value-name="newTempValue"/> </iterate> </if-not-empty> - <if-not-empty field-name="parameters.duplicateLocations"> - <if-not-empty field-name="parameters.removeBefore"> + <if-not-empty field="parameters.duplicateLocations"> + <if-not-empty field="parameters.removeBefore"> <find-by-and entity-name="ProductFacilityLocation" map-name="productVariantContext" list-name="foundVariantValues"/> <iterate entry-name="foundVariantValue" list-name="foundVariantValues"> <remove-value value-name="foundVariantValue"/> @@ -844,10 +844,10 @@ <!-- a method to centralize product security code, meant to be called in-line with call-simple-method, and the checkAction and callingMethodName attributes should be in the method context --> <simple-method method-name="checkProductRelatedPermission" short-description="Check Product Related Permission"> - <if-empty field-name="callingMethodName"> + <if-empty field="callingMethodName"> <set value="this operation" field="callingMethodName"/> </if-empty> - <if-empty field-name="checkAction"> + <if-empty field="checkAction"> <set value="UPDATE" field="checkAction"/> </if-empty> @@ -872,10 +872,10 @@ <if-has-permission permission="CATALOG" action="_${checkAction}"/> <and> <if-has-permission permission="CATALOG_ROLE" action="_${checkAction}"/> - <not><if-empty field-name="roleCategories"/></not> + <not><if-empty field="roleCategories"/></not> </and> <and> - <not><if-empty field-name="alternatePermissionRoot"/></not> + <not><if-empty field="alternatePermissionRoot"/></not> <if-has-permission permission="${alternatePermissionRoot}" action="_${checkAction}"/> </and> </or> @@ -888,7 +888,7 @@ </simple-method> <simple-method method-name="productGenericPermission" short-description="Main permission logic"> <set field="mainAction" from-field="parameters.mainAction"/> - <if-empty field-name="mainAction"> + <if-empty field="mainAction"> <add-error><fail-message message="In the permission-service element for the productGenericPermission service the main-action attribute was missing but is required"/></add-error> <check-errors/> </if-empty> @@ -897,7 +897,7 @@ <set field="checkAction" from-field="parameters.mainAction"/> <call-simple-method method-name="checkProductRelatedPermission"/> - <if-empty field-name="error_list"> + <if-empty field="error_list"> <set field="hasPermission" type="Boolean" value="true"/> <field-to-result field-name="hasPermission"/> @@ -940,7 +940,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml Fri Jun 13 23:03:12 2008 @@ -40,7 +40,7 @@ login-required="false"> <set field="args" from-field="parameters.arguments"/> - <if-empty field-name="args.conversionParameters.productId"> + <if-empty field="args.conversionParameters.productId"> <add-error> <fail-property property="NoProductSpecifiedForUomConversion" resource="ProductUiLabels"/> </add-error> <check-errors/> </if-empty> @@ -51,7 +51,7 @@ <log level="verbose" message="convertUomProduct: productId=${productId}"/> <entity-one entity-name="Product" value-name="product" auto-field-map="true"/> - <if-empty field-name="product"> + <if-empty field="product"> <add-error> <fail-property property="NoProductSpecifiedForUomConversion" resource="ProductUiLabels"/> </add-error> <check-errors/> </if-empty> @@ -63,16 +63,16 @@ <entity-one entity-name="Uom" value-name="toUom" auto-field-map="true"/> <!-- if the UoM types are the same, just use the uomConversion.conversionFactor (not product based) --> - <if-compare-field field-name="fromUom.uomTypeId" operator="equals" to-field-name="toUom.uomTypeId"> + <if-compare-field field="fromUom.uomTypeId" to-field="toUom.uomTypeId" operator="equals"> <set field="productFactor" from-field="args.uomConversion.conversionFactor"/> <else> <!-- Determine a conversion value for the From UoM --> <set field="fromVal" type="Double" value="1"/> - <if-compare field-name="fromUom.uomTypeId" operator="equals" value="LENGTH_MEASURE"> + <if-compare field="fromUom.uomTypeId" operator="equals" value="LENGTH_MEASURE"> <set field="fromVal" type="Double" from-field="product.productDepth"/> </if-compare> - <if-compare field-name="fromUom.uomTypeId" operator="equals" value="AREA_MEASURE"> + <if-compare field="fromUom.uomTypeId" operator="equals" value="AREA_MEASURE"> <calculate field-name="fromVal" type="Double" decimal-scale="15"> <calcop operator="multiply"> <calcop operator="get" field-name="product.productDepth"/> @@ -80,7 +80,7 @@ </calcop> </calculate> </if-compare> - <if-compare field-name="fromUom.uomTypeId" operator="equals" value="VOLUME_DRY_MEASURE"> + <if-compare field="fromUom.uomTypeId" operator="equals" value="VOLUME_DRY_MEASURE"> <calculate field-name="fromVal" type="Double" decimal-scale="15"> <calcop operator="multiply"> <calcop operator="get" field-name="product.productDepth"/> @@ -91,17 +91,17 @@ </calcop> </calculate> </if-compare> - <if-compare field-name="fromUom.uomTypeId" operator="equals" value="WEIGHT_MEASURE"> + <if-compare field="fromUom.uomTypeId" operator="equals" value="WEIGHT_MEASURE"> <set field="fromVal" from-field="product.weight"/> </if-compare> <log level="verbose" message="From product-based conversion factor: ${fromVal}"/> <!-- Determine a conversion value for the To UoM --> <set field="toVal" type="Double" value="1"/> - <if-compare field-name="toUom.uomTypeId" operator="equals" value="LENGTH_MEASURE"> + <if-compare field="toUom.uomTypeId" operator="equals" value="LENGTH_MEASURE"> <set field="toVal" from-field="product.productDepth"/> </if-compare> - <if-compare field-name="toUom.uomTypeId" operator="equals" value="AREA_MEASURE"> + <if-compare field="toUom.uomTypeId" operator="equals" value="AREA_MEASURE"> <calculate field-name="toVal" type="Double" decimal-scale="15"> <calcop operator="multiply"> <calcop operator="get" field-name="product.productDepth"/> @@ -109,7 +109,7 @@ </calcop> </calculate> </if-compare> - <if-compare field-name="toUom.uomTypeId" operator="equals" value="VOLUME_DRY_MEASURE"> + <if-compare field="toUom.uomTypeId" operator="equals" value="VOLUME_DRY_MEASURE"> <calculate field-name="toVal" type="Double" decimal-scale="15"> <calcop operator="multiply"> <calcop operator="get" field-name="product.productDepth"/> @@ -120,7 +120,7 @@ </calcop> </calculate> </if-compare> - <if-compare field-name="toUom.uomTypeId" operator="equals" value="WEIGHT_MEASURE"> + <if-compare field="toUom.uomTypeId" operator="equals" value="WEIGHT_MEASURE"> <set field="toVal" from-field="product.weight"/> </if-compare> <log level="verbose" message="To product-based conversion factor: ${toVal}"/> 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=667748&r1=667747&r2=667748&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 Fri Jun 13 23:03:12 2008 @@ -31,7 +31,7 @@ <sequenced-id-to-env sequence-name="ProductPromo" env-name="newEntity.productPromoId"/> <field-to-result field-name="productPromoId" map-name="newEntity"/> - <if-empty field-name="newEntity.userEntered"> + <if-empty field="newEntity.userEntered"> <set value="Y" set-if-empty="true" field="newEntity.userEntered"/> </if-empty> @@ -52,7 +52,7 @@ <find-by-primary-key entity-name="ProductPromo" map-name="lookupPKMap" value-name="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> - <if-empty field-name="lookedUpValue.userEntered"> + <if-empty field="lookedUpValue.userEntered"> <set value="Y" set-if-empty="true" field="lookedUpValue.userEntered"/> </if-empty> @@ -153,14 +153,14 @@ <make-value value-name="newEntity" entity-name="ProductPromoCode"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.productPromoCodeId"> + <if-empty field="newEntity.productPromoCodeId"> <sequenced-id-to-env sequence-name="ProductPromoCode" env-name="newEntity.productPromoCodeId" stagger-max="100"/> </if-empty> <field-to-result field-name="productPromoCodeId" map-name="newEntity"/> <now-timestamp-to-env env-name="nowTimestamp"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <set field="newEntity.fromDate" from-field="nowTimestamp"/> </if-empty> <set from-field="nowTimestamp" field="newEntity.createdDate"/> @@ -359,7 +359,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="fromDate" map-name="newEntity"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimestamp"/> <set from-field="nowTimestamp" set-if-empty="true" field="newEntity.fromDate"/> </if-empty> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml Fri Jun 13 23:03:12 2008 @@ -28,10 +28,10 @@ <check-errors/> <set field="createFixedAsset.fixedAssetTypeId" value="PROPERTY"/> - <if-not-empty field-name="parameters.productName"> + <if-not-empty field="parameters.productName"> <set field="createFixedAsset.fixedAssetName" from-field="parameters.productName"/> </if-not-empty> - <if-not-empty field-name="parameters.internalName"> + <if-not-empty field="parameters.internalName"> <set field="createFixedAsset.fixedAssetName" from-field="parameters.internalName"/> </if-not-empty> <call-service service-name="createFixedAsset" in-map-name="createFixedAsset"> @@ -52,7 +52,7 @@ <entity-one entity-name="Product" value-name="product"/> <get-related relation-name="FixedAssetProduct" value-name="product" list-name="productFixedAssets"/> - <if-not-empty field-name="productFixedAssets"> + <if-not-empty field="productFixedAssets"> <first-from-list list-name="productFixedAssets" entry-name="productFixedAsset"/> <field-to-result field-name="productFixedAsset.fixedAssetId" result-name="fixedAssetId"/> </if-not-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=667748&r1=667747&r2=667748&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 Fri Jun 13 23:03:12 2008 @@ -26,7 +26,7 @@ <make-value entity-name="FacilityContactMech" value-name="newValue"/> <make-value entity-name="FacilityContactMech" value-name="newFacilityContactMech"/> <log level="info" message="contactMechId is ${parameters.contactMechId}"/> - <if-empty map-name="parameters" field-name="contactMechId"> + <if-empty field="parameters.contactMechId"> <set-service-fields service-name="createContactMech" map-name="parameters" to-map-name="createContactMechMap"/> <set field="createContactMechMap.contactMechTypeId" from-field="parameters.contactMechTypeId" /> @@ -62,7 +62,7 @@ <find-by-and entity-name="FacilityContactMech" list-name="facilityContactMechs" map-name="facilityContactMechMap"/> <filter-list-by-date list-name="facilityContactMechs" to-list-name="validFacilityContactMechs"/> <first-from-list entry-name="facilityContactMech" list-name="validFacilityContactMechs"/> - <if-empty field-name="facilityContactMech"> + <if-empty field="facilityContactMech"> <add-error><fail-message message="ERROR: Cannot update specified contact info because it does not correspond to the specified facility"/></add-error> </if-empty> <check-errors/> @@ -71,7 +71,7 @@ <clone-value value-name="facilityContactMech" new-value-name="newFacilityContactMech"/> <log message="parameters: ${parameters}" level="info"/> <!-- If we already have a new contactMechId don't update ContactMech --> - <if-empty map-name="parameters" field-name="newContactMechId"> + <if-empty field="parameters.newContactMechId"> <set-service-fields service-name="updateContactMech" map-name="parameters" to-map-name="updateContactMechMap"/> <set field="updateContactMechMap.contactMechTypeId" from-field="parameters.contactMechTypeId" /> <call-service service-name="updateContactMech" in-map-name="updateContactMechMap"> @@ -93,7 +93,7 @@ <store-value value-name="facilityContactMech"/> <create-value value-name="newFacilityContactMech"/> - <if-compare-field field-name="contactMechId" map-name="parameters" to-map-name="newFacilityContactMech" operator="not-equals"> + <if-compare-field to-field="newFacilityContactMech." field="parameters.contactMechId" operator="not-equals"> <get-related value-name="facilityContactMech" relation-name="FacilityContactMechPurpose" list-name="facilityContactMechPurposes"/> <iterate entry-name="facilityContactMechPurposeOld" list-name="facilityContactMechPurposes"> <clone-value value-name="facilityContactMechPurposeOld" new-value-name="facilityContactMechPurpose"/> @@ -107,7 +107,7 @@ <set field="purposeMap.contactMechId" from-field="facilityContactMechPurpose.contactMechId"/> <find-by-and entity-name="FacilityContactMechPurpose" list-name="purposeResult" map-name="purposeMap"/> - <if-empty field-name="purposeResult"> + <if-empty field="purposeResult"> <create-value value-name="facilityContactMechPurpose"/> </if-empty> @@ -130,7 +130,7 @@ <filter-list-by-date list-name="facilityContactMechs" to-list-name="validFacilityContactMechs"/> <first-from-list entry-name="facilityContactMech" list-name="validFacilityContactMechs"/> - <if-empty field-name="facilityContactMech"> + <if-empty field="facilityContactMech"> <add-error> <fail-property resource="PartyUiLabels" property="PartyContactMechNotFoundCannotDelete"/> </add-error> @@ -289,7 +289,7 @@ <find-by-and entity-name="FacilityContactMechPurpose" map-name="lookUpMap" list-name="purposeList"/> <filter-list-by-date list-name="purposeList"/> - <if-not-empty field-name="purposeList"> + <if-not-empty field="purposeList"> <add-error><fail-message message="Could not create new purpose, a purpose with that type already exists"/></add-error> <check-errors/> @@ -316,7 +316,7 @@ <set-pk-fields map-name="parameters" value-name="lookUpMap"/> <find-by-primary-key value-name="purposeEntity" entity-name="FacilityContactMechPurpose" map-name="lookUpMap"/> - <if-empty field-name="purposeEntity"> + <if-empty field="purposeEntity"> <add-error><fail-message message="Unable to locate purpose; cannot delete"/></add-error> <check-errors/> </if-empty> 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=667748&r1=667747&r2=667748&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 Fri Jun 13 23:03:12 2008 @@ -65,22 +65,22 @@ <set field="locationSeqId" value="${parameters.areaId}${parameters.aisleId}${parameters.sectionId}${parameters.levelId}${parameters.positionId}"/> <!-- check to see if it exists already, if so try a simple suffix, then give up and use a sequenced id --> - <if-not-empty field-name="locationSeqId"> + <if-not-empty field="locationSeqId"> <set field="checkLocationSeqIdMap.locationSeqId" from-field="locationSeqId" /> <set field="checkLocationSeqIdMap.facilityId" from-field="parameters.facilityId" /> <find-by-primary-key entity-name="FacilityLocation" map-name="checkLocationSeqIdMap" value-name="checkLocationSeqIdValue"/> - <if-not-empty field-name="checkLocationSeqIdValue"> + <if-not-empty field="checkLocationSeqIdValue"> <set field="locationSeqId" value="${locationSeqId}_2" /> <set field="checkLocationSeqIdMap.locationSeqId" from-field="locationSeqId" /> <set field="checkLocationSeqIdMap.facilityId" from-field="parameters.facilityId" /> <find-by-primary-key entity-name="FacilityLocation" map-name="checkLocationSeqIdMap" value-name="checkLocationSeqIdValue"/> - <if-not-empty field-name="checkLocationSeqIdValue"> + <if-not-empty field="checkLocationSeqIdValue"> <set field="locationSeqId" value="" /> </if-not-empty> </if-not-empty> </if-not-empty> - <if-empty field-name="locationSeqId"> + <if-empty field="locationSeqId"> <sequenced-id-to-env sequence-name="FacilityLocation" env-name="locationSeqId"/> <to-string field-name="locationSeqId"/> </if-empty> @@ -133,7 +133,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="fromDate" map-name="newEntity"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimestamp"/> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> @@ -160,7 +160,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="fromDate" map-name="newEntity"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimestamp"/> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=667748&r1=667747&r2=667748&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 Fri Jun 13 23:03:12 2008 @@ -24,11 +24,11 @@ <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductStore you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> <check-errors/> - <if-compare field-name="parameters.showPricesWithVatTax" operator="equals" value="Y"> - <if-empty field-name="parameters.vatTaxAuthGeoId" > + <if-compare field="parameters.showPricesWithVatTax" operator="equals" value="Y"> + <if-empty field="parameters.vatTaxAuthGeoId"> <add-error><fail-property property="VatTaxAuthGeoNotSet" resource="CommonUiLabels"/></add-error> </if-empty> - <if-empty field-name="parameters.vatTaxAuthPartyId" > + <if-empty field="parameters.vatTaxAuthPartyId"> <add-error><fail-property property="VatTaxAuthPartyNotSet" resource="CommonUiLabels"/></add-error> </if-empty> <check-errors/> @@ -46,7 +46,7 @@ <!-- create the ProductStoreFacility record --> <now-timestamp-to-env env-name="nowTimestamp"/> - <if-not-empty field-name="inventoryFacilityId" map-name="newEntity"> + <if-not-empty field="newEntity.inventoryFacilityId"> <make-value value-name="storeFacility" entity-name="ProductStoreFacility"/> <set from-field="newEntity.inventoryFacilityId" field="storeFacility.facilityId"/> <set from-field="newEntity.productStoreId" field="storeFacility.productStoreId"/> @@ -63,11 +63,11 @@ <set from-field="store.inventoryFacilityId" field="oldFacilityId"/> <set-nonpk-fields map-name="parameters" value-name="store"/> - <if-compare field-name="store.showPricesWithVatTax" operator="equals" value="Y"> - <if-empty field-name="store.vatTaxAuthGeoId" > + <if-compare field="store.showPricesWithVatTax" operator="equals" value="Y"> + <if-empty field="store.vatTaxAuthGeoId"> <add-error><fail-property property="VatTaxAuthGeoNotSet" resource="CommonUiLabels"/></add-error> </if-empty> - <if-empty field-name="store.vatTaxAuthPartyId" > + <if-empty field="store.vatTaxAuthPartyId"> <add-error><fail-property property="VatTaxAuthPartyNotSet" resource="CommonUiLabels"/></add-error> </if-empty> <check-errors/> @@ -77,8 +77,8 @@ <!-- update the ProductStoreFacility record --> <now-timestamp-to-env env-name="nowTimestamp"/> - <if-compare-field field-name="inventoryFacilityId" map-name="store" operator="not-equals" to-field-name="oldFacilityId"> - <if-compare field-name="oneInventoryFacility" map-name="store" operator="equals" value="Y"> + <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 --> <set from-field="store.productStoreId" field="lookupPFMap.productStoreId"/> <find-by-and entity-name="ProductStoreFacility" map-name="lookupPFMap" list-name="storeFacilities"/> @@ -106,7 +106,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="fromDate" map-name="newEntity"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.fromDate"/> </if-empty> @@ -265,7 +265,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="fromDate" map-name="newEntity"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.fromDate"/> </if-empty> @@ -281,7 +281,7 @@ <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> - <if-empty field-name="thruDate" map-name="lookedUpValue"> + <if-empty field="lookedUpValue.thruDate"> <now-timestamp-to-env env-name="nowTimestamp"/> <set from-field="nowTimestamp" field="lookedUpValue.thruDate"/> </if-empty> @@ -297,7 +297,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="fromDate" map-name="newEntity"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.fromDate"/> </if-empty> @@ -338,7 +338,7 @@ <field-to-result field-name="productStoreSurveyId" result-name="productStoreSurveyId"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="fromDate" map-name="newEntity"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.fromDate"/> </if-empty> @@ -354,7 +354,7 @@ <find-by-primary-key map-name="lookupPKMap" value-name="lookedUpValue"/> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> - <if-empty field-name="thruDate" map-name="lookedUpValue"> + <if-empty field="lookedUpValue.thruDate"> <now-timestamp-to-env env-name="nowTimestamp"/> <set from-field="nowTimestamp" field="lookedUpValue.thruDate"/> </if-empty> @@ -396,13 +396,13 @@ <simple-method method-name="reserveStoreInventory" short-description="Reserve Store Inventory"> <entity-one entity-name="Product" value-name="product" use-cache="true"/> <entity-one entity-name="ProductStore" value-name="productStore" use-cache="true"/> - <if-empty field-name="productStore"> + <if-empty field="productStore"> <add-error><fail-message message="No ProductStore found with id ${parameters.productStoreId}, not reserving inventory."/></add-error> <check-errors/> </if-empty> <!-- if prodCatalog is set to not reserve inventory, break here --> - <if-compare value="N" operator="equals" field-name="productStore.reserveInventory"> + <if-compare value="N" operator="equals" field="productStore.reserveInventory"> <!-- note: if not set, defaults to yes, reserve inventory --> <log level="verbose" message="ProductStore with id ${productStore.productStoreId}, is set to NOT reserve inventory, not reserving inventory"/> <field-to-result field-name="parameters.quantity" result-name="quantityNotReserved"/> @@ -411,8 +411,8 @@ <call-simple-method method-name="isStoreInventoryRequiredInline"/> - <if-compare value="Y" field-name="productStore.oneInventoryFacility" operator="equals"> - <if-empty field-name="productStore.inventoryFacilityId"> + <if-compare value="Y" field="productStore.oneInventoryFacility" operator="equals"> + <if-empty field="productStore.inventoryFacilityId"> <add-error><fail-message message="ProductStore with id ${productStoreId} has Y for oneInventoryFacility but inventoryFacilityId is empty, not reserving inventory."/></add-error> <check-errors/> </if-empty> @@ -425,7 +425,7 @@ <result-to-field result-name="quantityNotReserved"/> </call-service> - <if-compare value="0" field-name="quantityNotReserved" operator="equals" type="Double"> + <if-compare value="0" field="quantityNotReserved" operator="equals" type="Double"> <log level="info" message="Inventory IS reserved in facility with id [${productStore.inventoryFacilityId}] for product id [${parameters.productId}]; desired quantity was ${parameters.quantity}"/> <else> <log level="info" message="There is insufficient inventory available in facility with id [${productStore.inventoryFacilityId}] for product id [${parameters.productId}]; desired quantity is ${parameters.quantity}, amount could not reserve is ${quantityNotReserved}"/> @@ -439,7 +439,7 @@ <iterate list-name="productStoreFacilities" entry-name="productStoreFacility"> <!-- in this case quantityNotReserved will always be empty until it finds a facility it can totally reserve from, then it will be 0.0 and we are done --> - <if-empty field-name="storeFound"> + <if-empty field="storeFound"> <!-- TODO: must entire quantity be available in one location? --> <!-- Right now the answer is yes, it only succeeds if one facility has sufficient inventory for the order. --> <set from-field="parameters.productId" field="callServiceMap.productId"/> @@ -449,14 +449,14 @@ </call-service> <clear-field field-name="callServiceMap"/> - <if-compare-field field-name="availableToPromiseTotal" operator="greater-equals" to-field-name="parameters.quantity" type="Double"> + <if-compare-field field="availableToPromiseTotal" to-field="parameters.quantity" operator="greater-equals" type="Double"> <set field="storeFound" from-field="productStoreFacility"/> </if-compare-field> <clear-field field-name="availableToPromiseTotal"/> </if-empty> </iterate> <!-- didn't find anything? Take the first facility from list --> - <if-empty field-name="storeFound"> + <if-empty field="storeFound"> <first-from-list list-name="productStoreFacilities" entry-name="storeFound"/> </if-empty> <set-service-fields map-name="parameters" to-map-name="callServiceMap" service-name="reserveProductInventoryByFacility"/> @@ -474,13 +474,13 @@ </simple-method> <simple-method method-name="isStoreInventoryRequired" short-description="Is Store Inventory Required" login-required="false"> - <if-empty field-name="parameters.productStore"> + <if-empty field="parameters.productStore"> <entity-one entity-name="ProductStore" value-name="productStore" use-cache="true"/> <else> <set from-field="parameters.productStore" field="productStore"/> </else> </if-empty> - <if-empty field-name="parameters.product"> + <if-empty field="parameters.product"> <entity-one entity-name="Product" value-name="product" use-cache="true"/> <else> <set from-field="parameters.product" field="product"/> @@ -492,22 +492,22 @@ </simple-method> <simple-method method-name="isStoreInventoryRequiredInline" short-description="Is Store Inventory Required" login-required="false"> <set from-field="product.requireInventory" field="requireInventory"/> - <if-empty field-name="requireInventory"> + <if-empty field="requireInventory"> <set from-field="productStore.requireInventory" field="requireInventory"/> </if-empty> - <if-empty field-name="requireInventory"> + <if-empty field="requireInventory"> <set value="Y" field="requireInventory"/> </if-empty> </simple-method> <simple-method method-name="isStoreInventoryAvailable" short-description="Is Store Inventory Available" login-required="false"> - <if-empty field-name="parameters.productStore"> + <if-empty field="parameters.productStore"> <entity-one entity-name="ProductStore" value-name="productStore" use-cache="true"/> <else> <set from-field="parameters.productStore" field="productStore"/> </else> </if-empty> - <if-empty field-name="parameters.product"> + <if-empty field="parameters.product"> <entity-one entity-name="Product" value-name="product" use-cache="true"/> <else> <set from-field="parameters.product" field="product"/> @@ -518,8 +518,8 @@ <if> <condition> <or> - <if-compare field-name="product.productTypeId" operator="equals" value="SERVICE"/> - <if-compare field-name="product.productTypeId" operator="equals" value="DIGITAL_GOOD"/> + <if-compare field="product.productTypeId" operator="equals" value="SERVICE"/> + <if-compare field="product.productTypeId" operator="equals" value="DIGITAL_GOOD"/> </or> </condition> <then> @@ -533,7 +533,7 @@ <!-- TODO: what to do with ASSET_USAGE? Only done elsewhere? Would need date/time range info to check availability --> <!-- if prodCatalog is set to not check inventory break here --> - <if-compare value="N" field-name="productStore.checkInventory" operator="equals"> + <if-compare value="N" field="productStore.checkInventory" operator="equals"> <!-- note: if not set, defaults to yes, check inventory --> <log level="verbose" message="ProductStore with id ${productStore.productStoreId}, is set to NOT check inventory, returning true for inventory available check"/> <set value="Y" field="available"/> @@ -541,8 +541,8 @@ <return/> </if-compare> - <if-compare value="Y" operator="equals" field-name="productStore.oneInventoryFacility"> - <if-empty field-name="productStore.inventoryFacilityId"> + <if-compare value="Y" operator="equals" field="productStore.oneInventoryFacility"> + <if-empty field="productStore.inventoryFacilityId"> <add-error><fail-message message="ProductStore with id ${productStoreId} has Y for oneInventoryFacility but inventoryFacilityId is empty, not checking available inventory."/></add-error> <check-errors/> </if-empty> @@ -552,8 +552,8 @@ <if> <condition> <or> - <if-compare field-name="product.productTypeId" value="MARKETING_PKG_AUTO" operator="equals"/> - <if-compare field-name="product.productTypeId" value="MARKETING_PKG_PICK" operator="equals"/> + <if-compare field="product.productTypeId" value="MARKETING_PKG_AUTO" operator="equals"/> + <if-compare field="product.productTypeId" value="MARKETING_PKG_PICK" operator="equals"/> </or> </condition> <then> @@ -568,7 +568,7 @@ </else> </if> <!-- check to see if we got enough back... --> - <if-compare-field field-name="availableToPromiseTotal" operator="greater-equals" to-field-name="parameters.quantity" type="Double"> + <if-compare-field field="availableToPromiseTotal" to-field="parameters.quantity" operator="greater-equals" type="Double"> <set value="Y" field="available"/> <log level="info" message="Inventory IS available in facility with id ${productStore.inventoryFacilityId} for product id ${parameters.productId}; desired quantity is ${parameters.quantity}, available quantity is ${availableToPromiseTotal}"/> <else> @@ -584,7 +584,7 @@ <set value="N" field="available"/> <iterate list-name="productStoreFacilities" entry-name="productStoreFacility"> - <if-compare value="N" field-name="available" operator="equals"> + <if-compare value="N" field="available" operator="equals"> <!-- TODO: must entire quantity be available in one location? --> <!-- Right now the answer is yes, it only succeeds if one facility has sufficient inventory for the order. --> <set from-field="parameters.productId" field="callServiceMap.productId"/> @@ -592,8 +592,8 @@ <if> <condition> <or> - <if-compare field-name="product.productTypeId" value="MARKETING_PKG_AUTO" operator="equals"/> - <if-compare field-name="product.productTypeId" value="MARKETING_PKG_PICK" operator="equals"/> + <if-compare field="product.productTypeId" value="MARKETING_PKG_AUTO" operator="equals"/> + <if-compare field="product.productTypeId" value="MARKETING_PKG_PICK" operator="equals"/> </or> </condition> <then> @@ -610,7 +610,7 @@ <clear-field field-name="callServiceMap"/> - <if-compare-field field-name="availableToPromiseTotal" operator="greater-equals" to-field-name="parameters.quantity" type="Double"> + <if-compare-field field="availableToPromiseTotal" to-field="parameters.quantity" operator="greater-equals" type="Double"> <set value="Y" field="available"/> <log level="info" message="Inventory IS available in facility with id ${productStoreFacility.facilityId} for product id ${parameters.productId}; desired quantity is ${parameters.quantity}, available quantity is ${availableToPromiseTotal}"/> </if-compare-field> @@ -638,13 +638,13 @@ </simple-method> <simple-method method-name="isStoreInventoryAvailableOrNotRequired" short-description="Is Store Inventory Available or Not Required" login-required="false"> - <if-empty field-name="parameters.productStore"> + <if-empty field="parameters.productStore"> <entity-one entity-name="ProductStore" value-name="productStore" use-cache="true"/> <else> <set from-field="parameters.productStore" field="productStore"/> </else> </if-empty> - <if-empty field-name="parameters.product"> + <if-empty field="parameters.product"> <entity-one entity-name="Product" value-name="product" use-cache="true"/> <else> <set from-field="parameters.product" field="product"/> @@ -653,7 +653,7 @@ <call-simple-method method-name="isStoreInventoryRequiredInline"/> - <if-compare field-name="requireInventory" operator="not-equals" value="Y"> + <if-compare field="requireInventory" operator="not-equals" value="Y"> <set value="Y" field="availableOrNotRequired"/> <field-to-result field-name="availableOrNotRequired"/> <else> 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=667748&r1=667747&r2=667748&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 Fri Jun 13 23:03:12 2008 @@ -25,7 +25,7 @@ <check-permission permission="CATALOG" action="${securityAction}"><fail-property resource="ProductUiLabels" property="GeneralCatalogPermissionError"/></check-permission> <check-errors/> <make-value entity-name="Subscription" value-name="newEntity"/> - <if-empty field-name="parameters.subscriptionId"> + <if-empty field="parameters.subscriptionId"> <sequenced-id-to-env sequence-name="Subscription" env-name="newEntity.subscriptionId"/> <!-- get the next sequenced ID --> <else> <set field="newEntity.subscriptionId" from-field="parameters.subscriptionId"/> @@ -34,15 +34,15 @@ <field-to-result field-name="newEntity.subscriptionId" result-name="subscriptionId"/> <!-- lookup the product subscription resource (if exists) --> - <if-not-empty field-name="parameters.subscriptionResourceId"> - <if-not-empty field-name="parameters.productId"> + <if-not-empty field="parameters.subscriptionResourceId"> + <if-not-empty field="parameters.productId"> <entity-and entity-name="ProductSubscriptionResource" list-name="resourceList" filter-by-date="true"> <field-map field-name="subscriptionResourceId" env-name="parameters.subscriptionResourceId"/> <field-map field-name="productId" env-name="parameters.productId"/> <order-by field-name="-fromDate"/> </entity-and> <first-from-list entry-name="resource" list-name="resourceList"/> - <if-not-empty field-name="resource"> + <if-not-empty field="resource"> <set-nonpk-fields value-name="newEntity" map-name="resource"/> </if-not-empty> </if-not-empty> @@ -66,7 +66,7 @@ <check-errors/> <set field="pfInput.inputFields" from-field="parameters"/> <set field="pfInput.entityName" value="Subscription"/> - <if-empty field-name="parameters.filterByDate"> + <if-empty field="parameters.filterByDate"> <set field="pfInput.filterByDate" value="Y"/> <else> <set field="pfInput.filterByDate" from-field="parameters.filterByDate"/> @@ -77,7 +77,7 @@ <result-to-field result-name="list" field-name="pfResultList"/> </call-service> - <if-empty field-name="pfResultList"> + <if-empty field="pfResultList"> <set field="found" value="false" type="Boolean"/> <else> <set field="found" value="true" type="Boolean"/> @@ -95,7 +95,7 @@ <check-errors/> <entity-one entity-name="Subscription" value-name="subscription"/> <field-to-result field-name="parameters.subscriptionId" result-name="subscriptionId"/> - <if-not-empty field-name="subscription"> + <if-not-empty field="subscription"> <field-to-result field-name="subscription" result-name="subscription"/> </if-not-empty> </simple-method> @@ -125,7 +125,7 @@ <check-errors/> <make-value entity-name="ProductSubscriptionResource" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> + <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <create-value value-name="newEntity"/> </simple-method> @@ -150,7 +150,7 @@ <check-errors/> <field-to-result field-name="parameters.subscriptionId" result-name="subscriptionId"/> <entity-one entity-name="SubscriptionAttribute" value-name="lookedUpValue"/> - <if-empty field-name="lookedUpValue"> + <if-empty field="lookedUpValue"> <make-value entity-name="SubscriptionAttribute" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="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=667748&r1=667747&r2=667748&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 Fri Jun 13 23:03:12 2008 @@ -39,10 +39,10 @@ <!-- if the InventoryItem issued is serialized, then change its status to DELIVERED --> <get-related-one value-name="newEntity" relation-name="InventoryItem" to-value-name="inventoryItem"/> - <if-not-empty field-name="inventoryItem"> - <if-compare field-name="inventoryItem.inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM"> + <if-not-empty field="inventoryItem"> + <if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM"> <get-related-one value-name="newEntity" relation-name="OrderHeader" to-value-name="orderHeader"/> - <if-not-empty field-name="orderHeader"> + <if-not-empty field="orderHeader"> <set field="orderRoleAndMap.orderId" from-field="orderHeader.orderId"/> <set field="orderRoleAndMap.roleTypeId" value="END_USER_CUSTOMER"/> <find-by-and entity-name="OrderRole" list-name="orderRoles" map-name="orderRoleAndMap"/> @@ -53,11 +53,11 @@ <if> <condition> <and> - <not><if-empty field-name="orderRole"/></not> + <not><if-empty field="orderRole"/></not> <or> - <if-empty field-name="productStore"/> - <if-empty field-name="productStore.setOwnerUponIssuance"/> - <if-compare field-name="productStore.setOwnerUponIssuance" operator="equals" value="Y"/> + <if-empty field="productStore"/> + <if-empty field="productStore.setOwnerUponIssuance"/> + <if-compare field="productStore.setOwnerUponIssuance" operator="equals" value="Y"/> </or> </and> </condition> @@ -138,7 +138,7 @@ <entity-one entity-name="OrderHeader" value-name="orderHeader" auto-field-map="true"/> <!-- make sure the order is NOT of orderTypeId: SALES_ORDER --> - <if-compare field-name="orderTypeId" map-name="orderHeader" operator="equals" value="SALES_ORDER"> + <if-compare field="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER"> <string-to-list string="Not issuing Order Item to shipment [${parameters.shipmentId}] because the order is a Sales Order for order [${orderHeader.orderId}] order item [${parameters.orderItemSeqId}] (should call the issueOrderItemShipGrpInvResToShipment service)" list-name="error_list"/> </if-compare> <check-errors/> @@ -177,24 +177,24 @@ <find-by-primary-key map-name="orderHeaderLookupPk" value-name="orderHeader"/> <!-- make sure the order is of orderTypeId: SALES_ORDER --> - <if-compare field-name="orderTypeId" map-name="orderHeader" operator="not-equals" value="SALES_ORDER"> + <if-compare field="orderHeader.orderTypeId" operator="not-equals" value="SALES_ORDER"> <string-to-list string="Not issuing Order Item Ship Group Inventory Reservation to shipment [${parameters.shipmentId}] because the order is not a Sales Order for order [${orderItemShipGrpInvRes.orderId}] order item [${orderItemShipGrpInvRes.orderItemSeqId}] inventoryItem [${orderItemShipGrpInvRes.inventoryItemId}] (should call the issueOrderItemToShipment service)" list-name="error_list"/> </if-compare> <!-- make sure specified quantity is not empty --> - <if-empty field-name="parameters.quantity"> + <if-empty field="parameters.quantity"> <add-error><fail-message message="Not issuing Order Item Ship Group Inventory Reservation to shipment [${parameters.shipmentId}] because the quantity to issue is empty for order [${orderItemShipGrpInvRes.orderId}] order item [${orderItemShipGrpInvRes.orderItemSeqId}] inventoryItem [${orderItemShipGrpInvRes.inventoryItemId}]"/></add-error> </if-empty> - <if-empty field-name="orderItemShipGrpInvRes.quantity"> + <if-empty field="orderItemShipGrpInvRes.quantity"> <log level="info" message="Order item reservation amount is null! PK lookup: ${OrderItemShipGrpInvResLookupPk}"/> </if-empty> <!-- make sure specified quantity is not less than or equal to 0 --> - <if-compare field-name="parameters.quantity" operator="less-equals" value="0" type="Double"> + <if-compare field="parameters.quantity" operator="less-equals" value="0" type="Double"> <add-error><fail-message message="Not issuing Order Item Ship Group Inventory Reservation to shipment [${parameters.shipmentId}] because the quantity to issue [${parameters.quantity}] is less than or equal to 0 for order [${orderItemShipGrpInvRes.orderId}] order item [${orderItemShipGrpInvRes.orderItemSeqId}] inventoryItem [${orderItemShipGrpInvRes.inventoryItemId}]"/></add-error> </if-compare> <!-- make sure specified quantity is not greater than reserved quantity left to be issued, ie orderItemShipGrpInvRes.quantity --> - <if-compare-field field-name="parameters.quantity" operator="greater" to-field-name="orderItemShipGrpInvRes.quantity" type="Double"> + <if-compare-field field="parameters.quantity" to-field="orderItemShipGrpInvRes.quantity" operator="greater" type="Double"> <add-error><fail-message message="Not issuing Order Item Ship Group Inventory Reservation to shipment [${parameters.shipmentId}] because the quantity to issue [${parameters.quantity}] is greater than the quantity left to issue [${orderItemShipGrpInvRes.quantity}] for order [${orderItemShipGrpInvRes.orderId}] order item [${orderItemShipGrpInvRes.orderItemSeqId}] inventoryItem [${orderItemShipGrpInvRes.inventoryItemId}]"/></add-error> </if-compare-field> @@ -219,9 +219,9 @@ </calcop> </calculate> - <if-compare value="0" operator="greater-equals" field-name="qtyForShipmentItem" type="Double"> + <if-compare value="0" operator="greater-equals" field="qtyForShipmentItem" type="Double"> <!-- remove the orderShipment.quantity --> - <if-not-empty field-name="orderShipment"> + <if-not-empty field="orderShipment"> <field-to-result field-name="orderShipment.shipmentItemSeqId" result-name="shipmentItemSeqId"/> <make-value entity-name="ShipmentItem" value-name="shipmentItemLookupPk"/> <set-pk-fields value-name="shipmentItemLookupPk" map-name="parameters"/> @@ -229,7 +229,7 @@ <find-by-primary-key map-name="shipmentItemLookupPk" value-name="shipmentItem"/> <remove-value value-name="orderShipment"/> </if-not-empty> - <if-compare value="0" operator="not-equals" field-name="qtyForShipmentItem" type="Double"> + <if-compare value="0" operator="not-equals" field="qtyForShipmentItem" type="Double"> <!-- add the qtyForShipmentItem to the shipmentItem --> <set from-field="paremeters.quantity" field="originalQuantity"/> <set from-field="qtyForShipmentItem" field="paremeters.quantity"/> @@ -263,12 +263,12 @@ <calcop operator="get" field-name="parameters.quantity"/> </calcop> </calculate> - <if-compare value="0" operator="equals" field-name="orderItemShipGrpInvRes.quantity" type="Double"> + <if-compare value="0" operator="equals" field="orderItemShipGrpInvRes.quantity" type="Double"> <!-- if none left reserved, remove OIIR --> <remove-value value-name="orderItemShipGrpInvRes"/> <!-- if there are no more OIIRs for the orderItem, set the orderItem.statusId to ITEM_COMPLETED --> <get-related value-name="orderItem" relation-name="OrderItemShipGrpInvRes" list-name="otherOiirs"/> - <if-empty field-name="otherOiirs"> + <if-empty field="otherOiirs"> <set value="ITEM_COMPLETED" field="changeOrderItemStatusMap.statusId"/> <set from-field="orderItem.orderId" field="changeOrderItemStatusMap.orderId"/> <set from-field="orderItem.orderItemSeqId" field="changeOrderItemStatusMap.orderItemSeqId"/> @@ -299,7 +299,7 @@ <simple-method method-name="findCreateIssueShipmentItem" short-description="Find or Create ShipmentItem to Issue To - meant to be called in-line"> <!-- try to find an existing shipmentItem and attach to it, if none found create a new shipmentItem --> <!-- if there is NO productId on the orderItem, ALWAYS create a new shipmentItem --> - <if-not-empty field-name="productId" map-name="orderItem"> + <if-not-empty field="orderItem.productId"> <entity-condition entity-name="ShipmentItem" list-name="shipmentItems"> <condition-list combine="and"> <condition-expr field-name="productId" env-name="orderItem.productId"/> @@ -311,7 +311,7 @@ <first-from-list entry-name="shipmentItem" list-name="shipmentItems"/> </if-not-empty> - <if-empty field-name="shipmentItem"> + <if-empty field="shipmentItem"> <set from-field="orderItem.productId" field="shipmentItemCreate.productId"/> <set from-field="parameters.shipmentId" field="shipmentItemCreate.shipmentId"/> <set from-field="parameters.quantity" field="shipmentItemCreate.quantity"/> @@ -339,12 +339,12 @@ <set from-field="orderItem.orderId" field="itemIssuanceCreate.orderId"/> <set from-field="orderItem.orderItemSeqId" field="itemIssuanceCreate.orderItemSeqId"/> - <if-not-empty field-name="orderItemShipGrpInvRes"> + <if-not-empty field="orderItemShipGrpInvRes"> <!-- if this is coming from an OrderItem issue instead of an OrderItemShipGrpInvRes issue, we won't have this info --> <set from-field="orderItemShipGrpInvRes.inventoryItemId" field="itemIssuanceCreate.inventoryItemId"/> <set from-field="orderItemShipGrpInvRes.shipGroupSeqId" field="itemIssuanceCreate.shipGroupSeqId"/> </if-not-empty> - <if-not-empty field-name="orderItemShipGroupAssoc"> + <if-not-empty field="orderItemShipGroupAssoc"> <!-- If we have a ShipGroup Assoc for this Item to focus on, set that; this is mostly the case for purchase orders and such --> <set from-field="orderItemShipGroupAssoc.shipGroupSeqId" field="itemIssuanceCreate.shipGroupSeqId"/> </if-not-empty> @@ -361,7 +361,7 @@ <set field="partyRole.partyId" from-field="userLogin.partyId"/> <set field="partyRole.roleTypeId" value="PACKER"/> <find-by-primary-key entity-name="PartyRole" map-name="partyRole" value-name="checkPartyRole"/> - <if-empty field-name="checkPartyRole"> + <if-empty field="checkPartyRole"> <create-value value-name="partyRole"/> </if-empty> @@ -377,11 +377,11 @@ <entity-one entity-name="FixedAssetMaint" value-name="fixedAssetMaint"/> <!-- make sure specified quantity is not less than or equal to 0 --> - <if-compare field-name="parameters.quantity" operator="less-equals" value="0" type="Double"> + <if-compare field="parameters.quantity" operator="less-equals" value="0" type="Double"> <add-error><fail-message message="Not issuing InventoryItem to FixedAssetMaint [${fixedAssetMaint.fixedAssetId:fixedAssetMaint.maintHistSeqId}] because the quantity to issue [${parameters.quantity}] is less than or equal to 0 for inventoryItem [${inventoryItem.inventoryItemId}]"/></add-error> </if-compare> <!-- make sure specified quantity is not greater than available quantity left to be issued, ie intentoryItem.availableToPromiseTotal --> - <if-compare-field field-name="parameters.quantity" operator="greater" to-field-name="inventoryItem.availableToPromiseTotal" type="Double"> + <if-compare-field field="parameters.quantity" to-field="inventoryItem.availableToPromiseTotal" operator="greater" type="Double"> <add-error><fail-message message="Not issuing InventoryItem to FixedAssetMaint [${fixedAssetMaint.fixedAssetId:fixedAssetMaint.maintHistSeqId}] because the quantity to issue [${parameters.quantity}] is greater than the quantity left to issue (ie the ATP or Available To Promise) [${intentoryItem.availableToPromiseTotal}] for inventoryItem [${orderItemShipGrpInvRes.inventoryItemId}]"/></add-error> </if-compare-field> @@ -452,7 +452,7 @@ <check-errors/> <!-- make sure the order is of orderTypeId: SALES_ORDER --> - <if-compare field-name="orderTypeId" map-name="orderHeader" operator="not-equals" value="SALES_ORDER"> + <if-compare field="orderHeader.orderTypeId" operator="not-equals" value="SALES_ORDER"> <add-error><fail-message message="Not canceling ItemIssuance because the order is not a Sales Order"/></add-error> </if-compare> @@ -465,17 +465,17 @@ <!-- if not provided, get the left issued quantity --> <set from-field="parameters.cancelQuantity" field="toCancelQuantity"/> - <if-empty field-name="toCancelQuantity"> + <if-empty field="toCancelQuantity"> <set from-field="qtyIssuedLeft" field="toCancelQuantity"/> </if-empty> <!-- make sure specified cancel Quantity is not less than or equal to 0 --> - <if-compare field-name="toCancelQuantity" operator="less-equals" value="0" type="Double"> + <if-compare field="toCancelQuantity" operator="less-equals" value="0" type="Double"> <add-error><fail-message message="Not cancelling ItemIssuance [${parameters.itemIssuanceId}] because the quantity to cancel [${toCancelQuantity}] is less than or equal to 0 "/></add-error> </if-compare> <!-- make sure specified quantity is not greater than issued quantity left --> - <if-compare-field field-name="toCancelQuantity" operator="greater" to-field-name="qtyIssuedLeft" type="Double"> + <if-compare-field field="toCancelQuantity" to-field="qtyIssuedLeft" operator="greater" type="Double"> <add-error><fail-message message="Not cancelling ItemIssuance because the quantity to cancel [${toCancelQuantity}] is greater than the quantity left [${qtyIssuedLeft}] for ItemIssuance [${parameters.itemIssuanceId}]"/></add-error> </if-compare-field> <check-errors/> @@ -506,7 +506,7 @@ <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="false"> <field-map field-name="productStoreId" env-name="orderHeader.productStoreId"/> </entity-one> - <if-compare value="Y" operator="equals" field-name="productStore.isImmediatelyFulfilled"> + <if-compare value="Y" operator="equals" field="productStore.isImmediatelyFulfilled"> <log level="verbose" message="ProductStore with id ${productStore.productStoreId}, is immediatly fulfilled. Not reserving inventory"/> <else> <set field="reserveStoreInventoryMap.productId" from-field="inventoryItem.productId"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |