svn commit: r667748 [10/16] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r667748 [10/16] - 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=667748&r1=667747&r2=667748&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 Fri Jun 13 23:03:12 2008 @@ -26,7 +26,7 @@ <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <sequenced-id-to-env sequence-name="CostComponent" env-name="newEntity.costComponentId"/> <field-to-result field-name="costComponentId" map-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> <create-value value-name="newEntity"/> @@ -67,7 +67,7 @@ <make-value value-name="newEntity" entity-name="CostComponent"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <sequenced-id-to-env sequence-name="CostComponent" env-name="newEntity.costComponentId"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> <create-value value-name="newEntity"/> @@ -108,14 +108,14 @@ </calcop> </calculate> <!-- if the cost is zero, and the product is a variant, get the cost of the virtual --> - <if-compare field-name="productCost" operator="equals" value="0" type="Double"> + <if-compare field="productCost" operator="equals" value="0" type="Double"> <entity-one entity-name="Product" value-name="product"/> <set from-field="product.productId" field="assocAndMap.productIdTo"/> <set value="PRODUCT_VARIANT" field="assocAndMap.productAssocTypeId"/> <find-by-and entity-name="ProductAssoc" map-name="assocAndMap" list-name="virtualAssocs"/> <filter-list-by-date list-name="virtualAssocs"/> <first-from-list list-name="virtualAssocs" entry-name="virtualAssoc"/> - <if-not-empty field-name="virtualAssoc"> + <if-not-empty field="virtualAssoc"> <set from-field="virtualAssoc.productId" field="inputMap.productId"/> <set from-field="parameters.currencyUomId" field="inputMap.currencyUomId"/> <set from-field="parameters.costComponentTypePrefix" field="inputMap.costComponentTypePrefix"/> @@ -125,7 +125,7 @@ </if-not-empty> </if-compare> <!-- if the cost is zero, get the purchase cost from the SupplierProduct --> - <if-compare field-name="productCost" operator="equals" value="0" type="Double"> + <if-compare field="productCost" operator="equals" value="0" type="Double"> <set field="orderByList[]" value="+supplierPrefOrderId"/> <set field="orderByList[]" value="+lastPrice"/> <clear-field field-name="costsAndMap"/> @@ -134,20 +134,20 @@ <find-by-and entity-name="SupplierProduct" map-name="costsAndMap" list-name="priceCosts" order-by-list-name="orderByList"/> <filter-list-by-date list-name="priceCosts" from-field-name="availableFromDate" thru-field-name="availableThruDate"/> <first-from-list list-name="priceCosts" entry-name="priceCost"/> - <if-not-empty field-name="priceCost.lastPrice"> + <if-not-empty field="priceCost.lastPrice"> <set from-field="priceCost.lastPrice" field="productCost"/> </if-not-empty> <!-- if the cost is zero, get the purchase cost from the SupplierProduct in a different currency and try to convert --> - <if-compare field-name="productCost" operator="equals" value="0" type="Double"> + <if-compare field="productCost" operator="equals" value="0" type="Double"> <clear-field field-name="costsAndMap"/> <set from-field="parameters.productId" field="costsAndMap.productId"/> <set from-field="parameters.productPriceTypeId" field="costsAndMap.productPriceTypeId"/> <find-by-and entity-name="SupplierProduct" map-name="costsAndMap" list-name="priceCosts" order-by-list-name="orderByList"/> <filter-list-by-date list-name="priceCosts" from-field-name="availableFromDate" thru-field-name="availableThruDate"/> <first-from-list list-name="priceCosts" entry-name="priceCost"/> - <if-not-empty field-name="priceCost.lastPrice"> + <if-not-empty field="priceCost.lastPrice"> <!-- we try to convert the lastPrice to the desired currency --> <clear-field field-name="inputMap"/> <set from-field="priceCost.lastPrice" field="inputMap.originalValue"/> @@ -160,7 +160,7 @@ </if-compare> </if-compare> <!-- - <if-compare field-name="productCost" operator="equals" value="0" type="Double"> + <if-compare field="productCost" operator="equals" value="0" type="Double"> <clear-field field-name="costsAndMap"/> <set from-field="parameters.productId" field="costsAndMap.productId"/> <set from-field="parameters.currencyUomId" field="costsAndMap.currencyUomId"/> @@ -168,7 +168,7 @@ <find-by-and entity-name="ProductPrice" map-name="costsAndMap" list-name="priceCosts"/> <filter-list-by-date list-name="priceCosts"/> <first-from-list list-name="priceCosts" entry-name="priceCost"/> - <if-not-empty field-name="priceCost.price"> + <if-not-empty field="priceCost.price"> <set from-field="priceCost.price" field="productCost"/> </if-not-empty> </if-compare> @@ -191,7 +191,7 @@ </calculate> <entity-one entity-name="WorkEffort" value-name="task"/> - <if-not-empty field-name="task"> + <if-not-empty field="task"> <get-related-one value-name="task" relation-name="FixedAsset" to-value-name="fixedAsset"/> <set from-field="parameters.currencyUomId" field="costsAndMap.amountUomId"/> <set value="SETUP_COST" field="costsAndMap.fixedAssetStdCostTypeId"/> @@ -251,7 +251,7 @@ <call-service service-name="getManufacturingComponents" in-map-name="callSvcMap"> <result-to-field result-name="componentsMap"/> </call-service> - <if-not-empty field-name="componentsMap"> + <if-not-empty field="componentsMap"> <iterate entry-name="componentMap" list-name="componentsMap"> <clear-field field-name="inputMap"/> <set field="product" from-field="componentMap.product"/> @@ -311,8 +311,8 @@ </calculate> <!-- The CostComponent records are created. --> - <if-not-empty field-name="totalTaskCost"> - <if-compare field-name="totalTaskCost" operator="greater" value="0" type="Double"> + <if-not-empty field="totalTaskCost"> + <if-compare field="totalTaskCost" operator="greater" value="0" type="Double"> <clear-field field-name="callSvcMap"/> <set value="${parameters.costComponentTypePrefix}_ROUTE_COST" field="callSvcMap.costComponentTypeId"/> <set from-field="parameters.productId" field="callSvcMap.productId"/> @@ -321,8 +321,8 @@ <call-service service-name="recreateCostComponent" in-map-name="callSvcMap"/> </if-compare> </if-not-empty> - <if-not-empty field-name="totalProductsCost"> - <if-compare field-name="totalProductsCost" operator="greater" value="0" type="Double"> + <if-not-empty field="totalProductsCost"> + <if-compare field="totalProductsCost" operator="greater" value="0" type="Double"> <clear-field field-name="callSvcMap"/> <set value="${parameters.costComponentTypePrefix}_MAT_COST" field="callSvcMap.costComponentTypeId"/> <set from-field="parameters.productId" field="callSvcMap.productId"/> 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=667748&r1=667747&r2=667748&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 Fri Jun 13 23:03:12 2008 @@ -68,7 +68,7 @@ <call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/> <check-errors/> - <if-empty field-name="parameters.fromDate"> + <if-empty field="parameters.fromDate"> <now-timestamp-to-env env-name="parameters.fromDate"/> </if-empty> <make-value value-name="newEntity" entity-name="ProductFeatureAppl"/> @@ -94,7 +94,7 @@ <entity-one entity-name="ProductFeatureAppl" value-name="productFeatureAppl"/> <!-- This is old code that just sets the thru date; the current codes actually removes the db row - <if-empty field-name="thruDate" map-name="parameters"> + <if-empty field="parameters.thruDate"> <now-timestamp-to-env env-name="nowStamp"/> <env-to-field env-name="nowStamp" field-name="thruDate" map-name="parameters"/> </if-empty> @@ -120,7 +120,7 @@ <set-service-fields service-name="applyFeatureToProduct" map-name="parameters" to-map-name="applyFeatureContext"/> <set field="applyFeatureContext.productFeatureId" from-field="productFeature.productFeatureId"/> - <if-empty field-name="applyFeatureContext.sequenceNum"> + <if-empty field="applyFeatureContext.sequenceNum"> <set field="applyFeatureContext.sequenceNum" from-field="productFeature.defaultSequenceNum"/> </if-empty> @@ -137,7 +137,7 @@ <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set-pk-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> @@ -172,7 +172,7 @@ <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set-pk-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> @@ -227,7 +227,7 @@ <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set-pk-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> @@ -311,7 +311,7 @@ <make-value value-name="newEntity" entity-name="ProductFeatureApplAttr"/> <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"> <entity-condition entity-name="ProductFeatureAppl" list-name="productFeatureAppls" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="productId" env-name="newEntity.productId"/> @@ -354,7 +354,7 @@ <!-- Feature Price Service --> <simple-method method-name="createFeaturePrice" short-description="Create a Feature Price"> <make-value value-name="newEntity" entity-name="ProductFeaturePrice"/> - <if-empty field-name="parameters.productFeatureId"> + <if-empty field="parameters.productFeatureId"> <sequenced-id-to-env sequence-name="ProductFeaturePrice" env-name="parameters.productFeatureId"/> </if-empty> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> @@ -362,7 +362,7 @@ <now-timestamp-to-env env-name="nowTimestamp"/> - <if-empty field-name="fromDate" map-name="newEntity"> + <if-empty field="newEntity.fromDate"> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> <field-to-result field-name="fromDate" map-name="newEntity"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml Fri Jun 13 23:03:12 2008 @@ -27,8 +27,8 @@ <field-map field-name="productStoreId" env-name="orderHeader.productStoreId"/> </entity-one> - <if-not-empty field-name="orderHeader"> - <if-compare field-name="orderHeader.needsInventoryIssuance" operator="equals" value="Y"> + <if-not-empty field="orderHeader"> + <if-compare field="orderHeader.needsInventoryIssuance" operator="equals" value="Y"> <get-related list-name="orderItemList" relation-name="OrderItem" value-name="orderHeader"/> <!-- before issuing inventory, check to see if there is inventory information in this database --> @@ -38,9 +38,9 @@ </entity-count> <!-- now go through each order item and call a service to issue the inventory --> - <if-compare field-name="iiCount" operator="greater" value="0" type="Double"> + <if-compare field="iiCount" operator="greater" value="0" type="Double"> <iterate list-name="orderItemList" entry-name="orderItem"> - <if-not-empty field-name="orderItem.productId"> + <if-not-empty field="orderItem.productId"> <clear-field field-name="callSvcMap"/> <set-service-fields to-map-name="callSvcMap" service-name="issueImmediatelyFulfilledOrderItem" map-name="orderItem"/> <set field="callSvcMap.orderHeader" from-field="orderHeader" /> @@ -61,7 +61,7 @@ </if-not-empty> </simple-method> <simple-method method-name="issueImmediatelyFulfilledOrderItem" short-description="Issues the Inventory for an Order Item that was Immediately Fulfilled" login-required="false"> - <if-empty field-name="parameters.orderItem"> + <if-empty field="parameters.orderItem"> <entity-one entity-name="OrderItem" value-name="orderItem"/> <else> <set field="orderItem" from-field="parameters.orderItem" /> @@ -69,11 +69,11 @@ </if-empty> <!-- kind of like the inventory reservation routine (with a few variations...), find InventoryItems to issue from, but instead of doing the reservation just create an issuance and an inventory item detail for the change --> - <if-not-empty field-name="orderItem.productId"> + <if-not-empty field="orderItem.productId"> <now-timestamp-to-env env-name="nowTimestamp"/> <!-- NOTE: the inventory will be issued from the OrderHeader.originFacilityId --> - <if-empty field-name="parameters.orderHeader"> + <if-empty field="parameters.orderHeader"> <entity-one entity-name="OrderHeader" value-name="orderHeader"/> <else> <set field="orderHeader" from-field="parameters.orderHeader" /> @@ -81,7 +81,7 @@ </if-empty> <!-- get the ProductStore to fund the reserveOrderEnumId --> - <if-empty field-name="parameters.productStore"> + <if-empty field="parameters.productStore"> <entity-one entity-name="ProductStore" value-name="productStore"> <field-map field-name="productStoreId" env-name="orderHeader.productStoreId"/> </entity-one> @@ -91,13 +91,13 @@ </if-empty> <!-- before we do the find, put together the orderBy list based on which reserveOrderEnumId is specified --> - <if-compare value="INVRO_FIFO_EXP" operator="equals" field-name="productStore.reserveOrderEnumId"> + <if-compare value="INVRO_FIFO_EXP" operator="equals" field="productStore.reserveOrderEnumId"> <set field="orderByString" value="+expireDate" /> <else> - <if-compare value="INVRO_LIFO_EXP" operator="equals" field-name="productStore.reserveOrderEnumId"> + <if-compare value="INVRO_LIFO_EXP" operator="equals" field="productStore.reserveOrderEnumId"> <set field="orderByString" value="-expireDate" /> <else> - <if-compare value="INVRO_LIFO_REC" operator="equals" field-name="productStore.reserveOrderEnumId"> + <if-compare value="INVRO_LIFO_REC" operator="equals" field="productStore.reserveOrderEnumId"> <set field="orderByString" value="+datetimeReceived" /> <else> <!-- the default reserveOrderEnumId is INVRO_FIFO_REC, ie FIFO based on date received --> @@ -121,8 +121,8 @@ </iterate> <!-- if quantityNotIssued is not 0, then pull it from the last non-serialized inventory item found, in the quantityNotIssued field --> - <if-compare field-name="parameters.quantityNotIssued" operator="not-equals" value="0" type="Double"> - <if-not-empty field-name="lastNonSerInventoryItem"> + <if-compare field="parameters.quantityNotIssued" operator="not-equals" value="0" type="Double"> + <if-not-empty field="lastNonSerInventoryItem"> <!-- create ItemIssuance record --> <set field="issuanceCreateMap.orderId" from-field="parameters.orderId" /> <set field="issuanceCreateMap.orderItemSeqId" from-field="parameters.orderItemSeqId" /> @@ -192,9 +192,9 @@ </simple-method> <simple-method method-name="issueImmediateForInventoryItemInline" short-description="Does a issuance for one InventoryItem, meant to be called in-line"> <!-- only do something with this inventoryItem if there is more inventory to issue --> - <if-compare field-name="parameters.quantityNotIssued" operator="greater" value="0" type="Double"> - <if-compare value="SERIALIZED_INV_ITEM" operator="equals" field-name="inventoryItemTypeId" map-name="inventoryItem"> - <if-compare value="INV_AVAILABLE" operator="equals" field-name="statusId" map-name="inventoryItem"> + <if-compare field="parameters.quantityNotIssued" operator="greater" value="0" type="Double"> + <if-compare value="SERIALIZED_INV_ITEM" operator="equals" field="inventoryItem.inventoryItemTypeId"> + <if-compare value="INV_AVAILABLE" operator="equals" field="inventoryItem.statusId"> <!-- change status on inventoryItem --> <set field="inventoryItem.statusId" value="INV_DELIVERED" /> <set-service-fields service-name="updateInventoryItem" map-name="inventoryItem" to-map-name="inventoryItemMap"/> @@ -213,18 +213,18 @@ </calculate> </if-compare> </if-compare> - <if-compare field-name="inventoryItem.inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM"> + <if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM"> <!-- reduce atp on inventoryItem if availableToPromise greater than 0, if not the code at the end of this method will handle it --> <if> <condition> <and> - <if-empty field-name="inventoryItem.statusId"/> - <not><if-empty field-name="inventoryItem.availableToPromiseTotal"/></not> - <if-compare field-name="inventoryItem.availableToPromiseTotal" operator="greater" value="0" type="Double"/> + <if-empty field="inventoryItem.statusId"/> + <not><if-empty field="inventoryItem.availableToPromiseTotal"/></not> + <if-compare field="inventoryItem.availableToPromiseTotal" operator="greater" value="0" type="Double"/> </and> </condition> <then> - <if-compare-field field-name="parameters.quantityNotIssued" operator="greater" to-field-name="inventoryItem.availableToPromiseTotal" type="Double"> + <if-compare-field field="parameters.quantityNotIssued" to-field="inventoryItem.availableToPromiseTotal" operator="greater" type="Double"> <set field="parameters.deductAmount" from-field="inventoryItem.availableToPromiseTotal" /> <else> <set field="parameters.deductAmount" from-field="parameters.quantityNotIssued" /> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml Fri Jun 13 23:03:12 2008 @@ -40,7 +40,7 @@ <entity-one entity-name="Product" value-name="product"/> <entity-one entity-name="Facility" value-name="facility" use-cache="true"/> <get-related-one value-name="product" relation-name="ProductType" to-value-name="productType"/> - <if-compare field-name="productType.isPhysical" operator="equals" value="N"> + <if-compare field="productType.isPhysical" operator="equals" value="N"> <set field="parameters.quantityNotReserved" value="0" type="Double"/> <else> <entity-one entity-name="OrderHeader" value-name="orderHeader"/> @@ -49,19 +49,19 @@ <!-- FIFO=first in first out, so it should be order by ASCending receive or expire date LIFO=last in first out, so it means order by DESCending receive or expire date --> - <if-compare value="INVRO_GUNIT_COST" operator="equals" field-name="reserveOrderEnumId" map-name="parameters"> + <if-compare value="INVRO_GUNIT_COST" operator="equals" field="parameters.reserveOrderEnumId"> <set value="-unitCost" field="orderByString"/> <else> - <if-compare value="INVRO_LUNIT_COST" operator="equals" field-name="reserveOrderEnumId" map-name="parameters"> + <if-compare value="INVRO_LUNIT_COST" operator="equals" field="parameters.reserveOrderEnumId"> <set value="+unitCost" field="orderByString"/> <else> - <if-compare value="INVRO_FIFO_EXP" operator="equals" field-name="reserveOrderEnumId" map-name="parameters"> + <if-compare value="INVRO_FIFO_EXP" operator="equals" field="parameters.reserveOrderEnumId"> <set value="+expireDate" field="orderByString"/> <else> - <if-compare value="INVRO_LIFO_EXP" operator="equals" field-name="reserveOrderEnumId" map-name="parameters"> + <if-compare value="INVRO_LIFO_EXP" operator="equals" field="parameters.reserveOrderEnumId"> <set value="-expireDate" field="orderByString"/> <else> - <if-compare value="INVRO_LIFO_REC" operator="equals" field-name="reserveOrderEnumId" map-name="parameters"> + <if-compare value="INVRO_LIFO_REC" operator="equals" field="parameters.reserveOrderEnumId"> <set value="-datetimeReceived" field="orderByString"/> <else> <!-- the default reserveOrderEnumId is INVRO_FIFO_REC, ie FIFO based on date received --> @@ -92,7 +92,7 @@ <order-by field-name="${orderByString}"/> </entity-condition> <iterate entry-name="inventoryItemAndLocation" list-name="inventoryItemAndLocations"> - <if-compare field-name="inventoryItemAndLocation.locationTypeEnumId" operator="equals" value="FLT_PICKLOC"> + <if-compare field="inventoryItemAndLocation.locationTypeEnumId" operator="equals" value="FLT_PICKLOC"> <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names --> <make-value entity-name="InventoryItem" map-name="inventoryItemAndLocation" value-name="inventoryItem"/> <call-simple-method method-name="reserveForInventoryItemInline"/> @@ -100,7 +100,7 @@ </iterate> <!-- still some left? try the FLT_BULK locations --> - <if-compare field-name="parameters.quantityNotReserved" operator="greater" value="0" type="Double"> + <if-compare field="parameters.quantityNotReserved" operator="greater" value="0" type="Double"> <entity-condition entity-name="InventoryItemAndLocation" list-name="inventoryItemAndLocations"> <condition-list combine="and"> <condition-expr field-name="productId" env-name="parameters.productId"/> @@ -112,7 +112,7 @@ <order-by field-name="${orderByString}"/> </entity-condition> <iterate entry-name="inventoryItemAndLocation" list-name="inventoryItemAndLocations"> - <if-compare field-name="inventoryItemAndLocation.locationTypeEnumId" operator="equals" value="FLT_BULK"> + <if-compare field="inventoryItemAndLocation.locationTypeEnumId" operator="equals" value="FLT_BULK"> <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names --> <make-value entity-name="InventoryItem" map-name="inventoryItemAndLocation" value-name="inventoryItem"/> <call-simple-method method-name="reserveForInventoryItemInline"/> @@ -121,7 +121,7 @@ </if-compare> <!-- last of all try reserving in InventoryItems that have no locationSeqId, ie are not in any particular location --> - <if-compare field-name="parameters.quantityNotReserved" operator="greater" value="0" type="Double"> + <if-compare field="parameters.quantityNotReserved" operator="greater" value="0" type="Double"> <entity-condition entity-name="InventoryItem" list-name="inventoryItems"> <condition-list combine="and"> <condition-expr field-name="productId" env-name="parameters.productId"/> @@ -133,7 +133,7 @@ <order-by field-name="${orderByString}"/> </entity-condition> <iterate entry-name="inventoryItem" list-name="inventoryItems"> - <if-empty field-name="inventoryItem.locationSeqId"> + <if-empty field="inventoryItem.locationSeqId"> <call-simple-method method-name="reserveForInventoryItemInline"/> </if-empty> </iterate> @@ -144,11 +144,11 @@ - subtract the remaining quantityNotReserved from the availableToPromise of the last non-serialized inventory item - or if none was found create a non-ser InventoryItem with availableToPromise = -quantityNotReserved --> - <if-compare field-name="parameters.quantityNotReserved" operator="not-equals" value="0" type="Double"> - <if-compare field-name="parameters.requireInventory" operator="equals" value="Y"> + <if-compare field="parameters.quantityNotReserved" operator="not-equals" value="0" type="Double"> + <if-compare field="parameters.requireInventory" operator="equals" value="Y"> <!-- use this else pattern to accomplish the anything but Y logic, ie if not specified default to inventory NOT required --> <else> - <if-not-empty field-name="lastNonSerInventoryItem"> + <if-not-empty field="lastNonSerInventoryItem"> <!-- subtract from quantityNotReserved from the availableToPromise of existing inventory item --> <!-- instead of updating InventoryItem, add an InventoryItemDetail --> <set from-field="lastNonSerInventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/> @@ -165,9 +165,9 @@ <get-related-one value-name="lastNonSerInventoryItem" relation-name="ProductFacility" to-value-name="productFacility"/> <clear-field field-name="daysToShip"/> <set field="daysToShip" from-field="productFacility.daysToShip"/> - <if-empty field-name="daysToShip"> + <if-empty field="daysToShip"> <!-- if the product does not have its own days to ship, use Facility.defaultDaysToShip, if not then use 30 days as a USA industry default --> - <if-not-empty field-name="facility.defaultDaysToShip"> + <if-not-empty field="facility.defaultDaysToShip"> <set field="daysToShip" from-field="facility.defaultDaysToShip" type="Long"/> <else> <set field="daysToShip" value="30" type="Long"/> @@ -230,9 +230,9 @@ <get-related-one value-name="newNonSerInventoryItem" relation-name="ProductFacility" to-value-name="productFacility"/> <clear-field field-name="daysToShip"/> <set field="daysToShip" from-field="productFacility.daysToShip"/> - <if-empty field-name="daysToShip"> + <if-empty field="daysToShip"> <!-- if the product does not have its own days to ship, use Facility.defaultDaysToShip, if not then use 30 days as a USA industry default --> - <if-not-empty field-name="facility.defaultDaysToShip"> + <if-not-empty field="facility.defaultDaysToShip"> <set field="daysToShip" from-field="facility.defaultDaysToShip" type="Long"/> <else> <set field="daysToShip" value="30" type="Long"/> @@ -282,7 +282,7 @@ <entity-one entity-name="InventoryItem" value-name="inventoryItem"/> <set field="facilityId" from-field="inventoryItem.facilityId"/> <set field="inventoryReservationLookUp.inventoryItemId" from-field="inventoryItem.inventoryItemId"/> - <if-compare value="NON_SERIAL_INV_ITEM" operator="equals" field-name="inventoryItem.inventoryItemTypeId"> + <if-compare value="NON_SERIAL_INV_ITEM" operator="equals" field="inventoryItem.inventoryItemTypeId"> <!-- Reservation was holding on to a InventoryItem shadow, Reduce number of Shadow's available --> <set from-field="inventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/> <set from-field="parameters.orderId" field="createDetailMap.orderId"/> @@ -304,7 +304,7 @@ <clear-field field-name="inventoryItem"/> <first-from-list list-name="inventoryItems" entry-name="inventoryItem"/> <!-- If no inventory item found for the serial number, than create it --> - <if-empty field-name="inventoryItem"> + <if-empty field="inventoryItem"> <set field="receiveCtx.productId" from-field="parameters.productId"/> <set field="receiveCtx.facilityId" from-field="facilityId"/> <set field="receiveCtx.quantityAccepted" from-field="parameters.quantity"/> @@ -320,7 +320,7 @@ <set field="inventoryReservationLookUp.inventoryItemId" from-field="inventoryItem.inventoryItemId"/> <find-by-and map-name="inventoryReservationLookUp" list-name="invReservations" entity-name="OrderItemShipGrpInvRes"/> <first-from-list entry-name="inventoryItemReservation" list-name="invReservations"/> - <if-not-empty field-name="inventoryItemReservation"> + <if-not-empty field="inventoryItemReservation"> <set-service-fields map-name="inventoryItemReservation" to-map-name="cancelOrderItemShipGrpInvResMap" service-name="cancelOrderItemShipGrpInvRes"/> <call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOrderItemShipGrpInvResMap"/> <!-- Hold our inventoryItem --> @@ -337,7 +337,7 @@ <set from-field="inventoryItemReservation.reservedDatetime" field="reserveOisgirMap.reservedDatetime"/> <set field="reserveOisgirMap.quantity" value="1" type="Double"/> <set field="reserveOisgirMap.requireInventory" from-field="parameters.requireInventory"/> - <if-not-empty field-name="inventoryItemReservation.sequenceId"> + <if-not-empty field="inventoryItemReservation.sequenceId"> <set field="reserveOisgirMap.sequenceId" from-field="inventoryItemReservation.sequenceId"/> </if-not-empty> <call-service service-name="reserveProductInventory" in-map-name="reserveOisgirMap"/> @@ -345,7 +345,7 @@ </if-not-empty> <!-- Step 3 Now Reserve for our order--> - <if-compare value="INV_AVAILABLE" operator="equals" field-name="statusId" map-name="inventoryItem"> + <if-compare value="INV_AVAILABLE" operator="equals" field="inventoryItem.statusId"> <!-- change status on inventoryItem --> <set value="INV_PROMISED" field="inventoryItem.statusId"/> <store-value value-name="inventoryItem"/> @@ -358,7 +358,7 @@ <set from-field="parameters.reservedDatetime" field="reserveOisgirMap.reservedDatetime"/> <set from-field="promisedDatetime" field="reserveOisgirMap.promisedDatetime"/> <set field="reserveOisgirMap.quantity" value="1" type="Double"/> - <if-not-empty field-name="parameters.sequenceId"> + <if-not-empty field="parameters.sequenceId"> <set field="reserveOisgirMap.sequenceId" from-field="parameters.sequenceId"/> </if-not-empty> <!-- store OrderItemShipGrpInvRes record --> @@ -369,13 +369,13 @@ <simple-method method-name="reserveForInventoryItemInline" short-description="Does a reservation for one InventoryItem, meant to be called in-line"> <!-- only do something with this inventoryItem if there is more inventory to reserve --> - <if-compare field-name="parameters.quantityNotReserved" operator="greater" value="0" type="Double"> + <if-compare field="parameters.quantityNotReserved" operator="greater" value="0" type="Double"> <!-- get the promiseDatetime --> <get-related-one value-name="inventoryItem" relation-name="ProductFacility" to-value-name="productFacility"/> <set field="daysToShip" from-field="productFacility.daysToShip"/> - <if-empty field-name="daysToShip"> + <if-empty field="daysToShip"> <!-- if the product does not have its own days to ship, use Facility.defaultDaysToShip, if not then use 30 days as a USA industry default --> - <if-not-empty field-name="facility.defaultDaysToShip"> + <if-not-empty field="facility.defaultDaysToShip"> <set field="daysToShip" from-field="facility.defaultDaysToShip" type="Long"/> <else> <set field="daysToShip" value="30" type="Long"/> @@ -390,8 +390,8 @@ return org.ofbiz.base.util.UtilMisc.toMap("promisedDatetime", new java.sql.Timestamp(cal.getTimeInMillis())); ]]></call-bsh> - <if-compare value="SERIALIZED_INV_ITEM" operator="equals" field-name="inventoryItemTypeId" map-name="inventoryItem"> - <if-compare value="INV_AVAILABLE" operator="equals" field-name="statusId" map-name="inventoryItem"> + <if-compare value="SERIALIZED_INV_ITEM" operator="equals" field="inventoryItem.inventoryItemTypeId"> + <if-compare value="INV_AVAILABLE" operator="equals" field="inventoryItem.statusId"> <!-- change status on inventoryItem --> <set value="INV_PROMISED" field="inventoryItem.statusId"/> <store-value value-name="inventoryItem"/> @@ -405,7 +405,7 @@ <set from-field="parameters.reservedDatetime" field="reserveOisgirMap.reservedDatetime"/> <set from-field="promisedDatetime" field="reserveOisgirMap.promisedDatetime"/> <set field="reserveOisgirMap.quantity" value="1" type="Double"/> - <if-not-empty field-name="parameters.sequenceId"> + <if-not-empty field="parameters.sequenceId"> <set field="reserveOisgirMap.sequenceId" from-field="parameters.sequenceId"/> </if-not-empty> <call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/> @@ -416,18 +416,18 @@ </calculate> </if-compare> </if-compare> - <if-compare field-name="inventoryItem.inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM"> + <if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM"> <!-- reduce atp on inventoryItem if availableToPromise greater than 0, if not the code at the end of this method will handle it --> <if> <condition> <and> - <if-empty field-name="inventoryItem.statusId"/> - <not><if-empty field-name="inventoryItem.availableToPromiseTotal"/></not> - <if-compare field-name="inventoryItem.availableToPromiseTotal" operator="greater" value="0" type="Double"/> + <if-empty field="inventoryItem.statusId"/> + <not><if-empty field="inventoryItem.availableToPromiseTotal"/></not> + <if-compare field="inventoryItem.availableToPromiseTotal" operator="greater" value="0" type="Double"/> </and> </condition> <then> - <if-compare-field field-name="parameters.quantityNotReserved" operator="greater" to-field-name="inventoryItem.availableToPromiseTotal" type="Double"> + <if-compare-field field="parameters.quantityNotReserved" to-field="inventoryItem.availableToPromiseTotal" operator="greater" type="Double"> <set from-field="inventoryItem.availableToPromiseTotal" field="parameters.deductAmount"/> <else> <set from-field="parameters.quantityNotReserved" field="parameters.deductAmount"/> @@ -453,7 +453,7 @@ <set from-field="parameters.reservedDatetime" field="reserveOisgirMap.reservedDatetime"/> <set from-field="parameters.deductAmount" field="reserveOisgirMap.quantity"/> <set from-field="promisedDatetime" field="reserveOisgirMap.promisedDatetime"/> - <if-not-empty field-name="parameters.sequenceId"> + <if-not-empty field="parameters.sequenceId"> <set field="reserveOisgirMap.sequenceId" from-field="parameters.sequenceId"/> </if-not-empty> <call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/> @@ -480,14 +480,14 @@ <set field="parameters.promisedDatetime" from-field="orderItem.shipBeforeDate"/> <set field="parameters.currentPromisedDate" from-field="orderItem.shipBeforeDate"/> - <if-empty field-name="checkOisgirEntity"> + <if-empty field="checkOisgirEntity"> <!-- create OrderItemShipGrpInvRes record --> <make-value entity-name="OrderItemShipGrpInvRes" value-name="newOisgirEntity"/> <set-pk-fields map-name="parameters" value-name="newOisgirEntity"/> <set-nonpk-fields map-name="parameters" value-name="newOisgirEntity"/> <now-timestamp-to-env env-name="nowTimestamp"/> <set from-field="nowTimestamp" field="newOisgirEntity.createdDatetime"/> - <if-empty field-name="newOisgirEntity.reservedDatetime"> + <if-empty field="newOisgirEntity.reservedDatetime"> <set from-field="nowTimestamp" field="newOisgirEntity.reservedDatetime"/> </if-empty> <create-value value-name="newOisgirEntity"/> @@ -514,11 +514,11 @@ corresponding serialized inventoryItem to available. --> <set from-field="parameters.orderId" field="oisgirListLookupMap.orderId"/> - <if-not-empty field-name="parameters.orderItemSeqId"> + <if-not-empty field="parameters.orderItemSeqId"> <set from-field="parameters.orderItemSeqId" field="oisgirListLookupMap.orderItemSeqId"/> <log level="verbose" message="OISGIR Cancel for single item : ${oisgirListLookupMap}"/> </if-not-empty> - <if-not-empty field-name="parameters.shipGroupSeqId"> + <if-not-empty field="parameters.shipGroupSeqId"> <set from-field="parameters.shipGroupSeqId" field="oisgirListLookupMap.shipGroupSeqId"/> <log level="verbose" message="OISGIR Cancel for single item : ${oisgirListLookupMap}"/> </if-not-empty> @@ -539,13 +539,13 @@ This will cancel the specified amount by looking through the reservations in order and cancelling just the right amount --> - <if-empty field-name="parameters.cancelQuantity"> + <if-empty field="parameters.cancelQuantity"> <set from-field="parameters.orderId" field="cancelMap.orderId"/> <set from-field="parameters.orderItemSeqId" field="cancelMap.orderItemSeqId"/> <set from-field="parameters.shipGroupSeqId" field="cancelMap.shipGroupSeqId"/> <call-service service-name="cancelOrderInventoryReservation" in-map-name="cancelMap"/> </if-empty> - <if-not-empty field-name="parameters.cancelQuantity"> + <if-not-empty field="parameters.cancelQuantity"> <set from-field="parameters.cancelQuantity" field="toCancelAmount"/> <set from-field="parameters.orderId" field="oisgirListLookupMap.orderId"/> @@ -553,11 +553,11 @@ <set from-field="parameters.shipGroupSeqId" field="oisgirListLookupMap.shipGroupSeqId"/> <find-by-and entity-name="OrderItemShipGrpInvRes" map-name="oisgirListLookupMap" list-name="oisgirList" use-cache="false"/> <iterate entry-name="oisgir" list-name="oisgirList"> - <if-compare field-name="toCancelAmount" operator="greater" value="0" type="Double"> - <if-compare-field field-name="oisgir.quantity" operator="greater-equals" to-field-name="toCancelAmount" type="Double"> + <if-compare field="toCancelAmount" operator="greater" value="0" type="Double"> + <if-compare-field field="oisgir.quantity" to-field="toCancelAmount" operator="greater-equals" type="Double"> <set from-field="toCancelAmount" field="cancelOisgirMap.cancelQuantity"/> </if-compare-field> - <if-compare-field field-name="oisgir.quantity" operator="less" to-field-name="toCancelAmount" type="Double"> + <if-compare-field field="oisgir.quantity" to-field="toCancelAmount" operator="less" type="Double"> <set from-field="oisgir.quantity" field="cancelOisgirMap.cancelQuantity"/> </if-compare-field> @@ -582,16 +582,16 @@ <simple-method method-name="cancelOrderItemShipGrpInvRes" short-description="Cancel An Inventory Reservation"> <entity-one entity-name="OrderItemShipGrpInvRes" value-name="orderItemShipGrpInvRes"/> <get-related-one relation-name="InventoryItem" value-name="orderItemShipGrpInvRes" to-value-name="inventoryItem"/> - <if-compare value="SERIALIZED_INV_ITEM" operator="equals" field-name="inventoryItem.inventoryItemTypeId"> + <if-compare value="SERIALIZED_INV_ITEM" operator="equals" field="inventoryItem.inventoryItemTypeId"> <log level="verbose" message="Serialized inventory re-enabled."/> <set value="INV_AVAILABLE" field="inventoryItem.statusId"/> <remove-value value-name="orderItemShipGrpInvRes"/> <store-value value-name="inventoryItem"/> </if-compare> - <if-compare value="NON_SERIAL_INV_ITEM" operator="equals" field-name="inventoryItem.inventoryItemTypeId"> + <if-compare value="NON_SERIAL_INV_ITEM" operator="equals" field="inventoryItem.inventoryItemTypeId"> <log level="verbose" message="Non-Serialized inventory item incrementing availableToPromise."/> <set from-field="parameters.cancelQuantity" field="cancelQuantity"/> - <if-empty field-name="cancelQuantity"> + <if-empty field="cancelQuantity"> <set from-field="orderItemShipGrpInvRes.quantity" field="cancelQuantity"/> </if-empty> @@ -604,7 +604,7 @@ <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/> <clear-field field-name="createDetailMap"/> - <if-compare-field field-name="cancelQuantity" operator="less" to-field-name="quantity" to-map-name="orderItemShipGrpInvRes" type="Double"> + <if-compare-field field="cancelQuantity" to-field="orderItemShipGrpInvRes.quantity" operator="less" type="Double"> <calculate field-name="orderItemShipGrpInvRes.quantity"> <calcop operator="subtract" field-name="orderItemShipGrpInvRes.quantity"> <calcop operator="get" field-name="cancelQuantity"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |