You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 13:04:26 UTC
svn commit: r730109 [2/3] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/script/org/ofbiz/accounting/ledger/
applications/accounting...
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=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml Tue Dec 30 04:04:24 2008
@@ -128,7 +128,7 @@
<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"/>
+ <clear-field field="costsAndMap"/>
<set from-field="parameters.productId" field="costsAndMap.productId"/>
<set from-field="parameters.currencyUomId" field="costsAndMap.currencyUomId"/>
<find-by-and entity-name="SupplierProduct" map-name="costsAndMap" list-name="priceCosts" order-by-list-name="orderByList"/>
@@ -141,7 +141,7 @@
in a different currency and try to convert
-->
<if-compare field="productCost" operator="equals" value="0" type="Double">
- <clear-field field-name="costsAndMap"/>
+ <clear-field field="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"/>
@@ -149,7 +149,7 @@
<first-from-list list="priceCosts" entry="priceCost"/>
<if-not-empty field="priceCost.lastPrice">
<!-- we try to convert the lastPrice to the desired currency -->
- <clear-field field-name="inputMap"/>
+ <clear-field field="inputMap"/>
<set from-field="priceCost.lastPrice" field="inputMap.originalValue"/>
<set from-field="priceCost.currencyUomId" field="inputMap.uomId"/>
<set from-field="parameters.currencyUomId" field="inputMap.uomIdTo"/>
@@ -161,7 +161,7 @@
</if-compare>
<!--
<if-compare field="productCost" operator="equals" value="0" type="Double">
- <clear-field field-name="costsAndMap"/>
+ <clear-field field="costsAndMap"/>
<set from-field="parameters.productId" field="costsAndMap.productId"/>
<set from-field="parameters.currencyUomId" field="costsAndMap.currencyUomId"/>
<set from-field="parameters.productPriceTypeId" field="costsAndMap.productPriceTypeId"/>
@@ -253,7 +253,7 @@
</call-service>
<if-not-empty field="componentsMap">
<iterate entry="componentMap" list="componentsMap">
- <clear-field field-name="inputMap"/>
+ <clear-field field="inputMap"/>
<set field="product" from-field="componentMap.product"/>
<set field="inputMap.productId" from-field="product.productId"/>
<set field="inputMap.currencyUomId" from-field="parameters.currencyUomId"/>
@@ -270,7 +270,7 @@
</calculate>
</iterate>
<else>
- <clear-field field-name="inputMap"/>
+ <clear-field field="inputMap"/>
<set field="inputMap.productId" from-field="parameters.productId"/>
<set field="inputMap.currencyUomId" from-field="parameters.currencyUomId"/>
<set field="inputMap.costComponentTypePrefix" from-field="parameters.costComponentTypePrefix"/>
@@ -289,7 +289,7 @@
<result-to-field result-name="routing"/>
</call-service>
<iterate entry="task" list="tasks">
- <clear-field field-name="callSvcMap"/>
+ <clear-field field="callSvcMap"/>
<set from-field="task.workEffortIdTo" field="callSvcMap.workEffortId"/>
<set from-field="parameters.currencyUomId" field="callSvcMap.currencyUomId"/>
<set from-field="parameters.productId" field="callSvcMap.productId"/>
@@ -313,7 +313,7 @@
<!-- The CostComponent records are created. -->
<if-not-empty field="totalTaskCost">
<if-compare field="totalTaskCost" operator="greater" value="0" type="Double">
- <clear-field field-name="callSvcMap"/>
+ <clear-field field="callSvcMap"/>
<set value="${parameters.costComponentTypePrefix}_ROUTE_COST" field="callSvcMap.costComponentTypeId"/>
<set from-field="parameters.productId" field="callSvcMap.productId"/>
<set from-field="parameters.currencyUomId" field="callSvcMap.costUomId"/>
@@ -323,7 +323,7 @@
</if-not-empty>
<if-not-empty field="totalProductsCost">
<if-compare field="totalProductsCost" operator="greater" value="0" type="Double">
- <clear-field field-name="callSvcMap"/>
+ <clear-field field="callSvcMap"/>
<set value="${parameters.costComponentTypePrefix}_MAT_COST" field="callSvcMap.costComponentTypeId"/>
<set from-field="parameters.productId" field="callSvcMap.productId"/>
<set from-field="parameters.currencyUomId" field="callSvcMap.costUomId"/>
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=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml Tue Dec 30 04:04:24 2008
@@ -41,7 +41,7 @@
<if-compare field="iiCount" operator="greater" value="0" type="Double">
<iterate list="orderItemList" entry="orderItem">
<if-not-empty field="orderItem.productId">
- <clear-field field-name="callSvcMap"/>
+ <clear-field field="callSvcMap"/>
<set-service-fields to-map-name="callSvcMap" service-name="issueImmediatelyFulfilledOrderItem" map-name="orderItem"/>
<set field="callSvcMap.orderHeader" from-field="orderHeader" />
<set field="callSvcMap.orderItem" from-field="orderItem" />
@@ -146,12 +146,12 @@
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
- <clear-field field-name="createDetailMap"/>
- <clear-field field-name="itemIssuanceId"/>
+ <clear-field field="createDetailMap"/>
+ <clear-field field="itemIssuanceId"/>
<else>
<!-- no non-ser inv item, create a non-ser InventoryItem with availableToPromise = -quantityNotIssued -->
- <clear-field field-name="createInvItemInMap"/>
- <clear-field field-name="createInvItemOutMap"/>
+ <clear-field field="createInvItemInMap"/>
+ <clear-field field="createInvItemOutMap"/>
<set field="createInvItemInMap.productId" from-field="orderItem.productId"/>
<set field="createInvItemInMap.facilityId" from-field="orderHeader.originFacilityId"/>
<set field="createInvItemInMap.inventoryItemTypeId" value="NON_SERIAL_INV_ITEM"/>
@@ -181,8 +181,8 @@
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
- <clear-field field-name="createDetailMap"/>
- <clear-field field-name="itemIssuanceId"/>
+ <clear-field field="createDetailMap"/>
+ <clear-field field="itemIssuanceId"/>
</else>
</if-not-empty>
@@ -206,7 +206,7 @@
<set field="issuanceCreateMap.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
<calculate field-name="quantity" map-name="issuanceCreateMap"><number value="1"/></calculate>
<call-service service-name="createItemIssuance" in-map-name="issuanceCreateMap"/>
- <clear-field field-name="issuanceCreateMap"/>
+ <clear-field field="issuanceCreateMap"/>
<calculate field-name="parameters.quantityNotIssued">
<calcop field-name="parameters.quantityNotIssued" operator="subtract"><number value="1.0"/></calcop>
@@ -256,7 +256,7 @@
<calcop field-name="parameters.deductAmount" operator="negative"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
- <clear-field field-name="createDetailMap"/>
+ <clear-field field="createDetailMap"/>
<calculate field-name="quantityNotIssued" map-name="parameters">
<calcop operator="subtract" field-name="parameters.quantityNotIssued">
@@ -264,8 +264,8 @@
</calcop>
</calculate>
- <clear-field field-name="issuanceCreateMap"/>
- <clear-field field-name="itemIssuanceId"/>
+ <clear-field field="issuanceCreateMap"/>
+ <clear-field field="itemIssuanceId"/>
<!-- keep track of the last non-serialized inventory item for use if inventory is not sufficient for amount already issued -->
<!-- use env variable named lastNonSerInventoryItem -->
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=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml Tue Dec 30 04:04:24 2008
@@ -167,11 +167,11 @@
<calcop field-name="parameters.quantityNotReserved" operator="negative"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
- <clear-field field-name="createDetailMap"/>
+ <clear-field field="createDetailMap"/>
<!-- get the promiseDatetime -->
<get-related-one value-name="lastNonSerInventoryItem" relation-name="ProductFacility" to-value-name="productFacility"/>
- <clear-field field-name="daysToShip"/>
+ <clear-field field="daysToShip"/>
<set field="daysToShip" from-field="productFacility.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 -->
@@ -202,11 +202,11 @@
<set from-field="promisedDatetime" field="reserveOisgirMap.promisedDatetime"/>
<set from-field="parameters.sequenceId" field="reserveOisgirMap.sequenceId"/>
<call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/>
- <clear-field field-name="reserveOisgirMap"/>
+ <clear-field field="reserveOisgirMap"/>
<else>
<!-- no non-ser inv item, create a non-ser InventoryItem with availableToPromise = -quantityNotReserved -->
- <clear-field field-name="createInventoryItemInMap"/>
- <clear-field field-name="createInventoryItemOutMap"/>
+ <clear-field field="createInventoryItemInMap"/>
+ <clear-field field="createInventoryItemOutMap"/>
<!-- the createInventoryItem service is run by the the system user here -->
<entity-one entity-name="UserLogin" value-name="permUserLogin">
<field-map field-name="userLoginId" value="system"/>
@@ -232,11 +232,11 @@
<calcop field-name="parameters.quantityNotReserved" operator="negative"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
- <clear-field field-name="createDetailMap"/>
+ <clear-field field="createDetailMap"/>
<!-- get the promiseDatetime -->
<get-related-one value-name="newNonSerInventoryItem" relation-name="ProductFacility" to-value-name="productFacility"/>
- <clear-field field-name="daysToShip"/>
+ <clear-field field="daysToShip"/>
<set field="daysToShip" from-field="productFacility.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 -->
@@ -267,7 +267,7 @@
<set from-field="promisedDatetime" field="reserveOisgirMap.promisedDatetime"/>
<set from-field="parameters.sequenceId" field="reserveOisgirMap.sequenceId"/>
<call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/>
- <clear-field field-name="reserveOisgirMap"/>
+ <clear-field field="reserveOisgirMap"/>
</else>
</if-not-empty>
@@ -309,7 +309,7 @@
<field-map field-name="inventoryItemTypeId" value="SERIALIZED_INV_ITEM"/>
<field-map field-name="serialNumber" from-field="parameters.serialNumber"/>
</entity-and>
- <clear-field field-name="inventoryItem"/>
+ <clear-field field="inventoryItem"/>
<first-from-list list="inventoryItems" entry="inventoryItem"/>
<!-- If no inventory item found for the serial number, than create it -->
<if-empty field="inventoryItem">
@@ -349,7 +349,7 @@
<set field="reserveOisgirMap.sequenceId" from-field="inventoryItemReservation.sequenceId"/>
</if-not-empty>
<call-service service-name="reserveProductInventory" in-map-name="reserveOisgirMap"/>
- <clear-field field-name="reserveOisgirMap"/>
+ <clear-field field="reserveOisgirMap"/>
</if-not-empty>
<!-- Step 3 Now Reserve for our order-->
@@ -371,7 +371,7 @@
</if-not-empty>
<!-- store OrderItemShipGrpInvRes record -->
<call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/>
- <clear-field field-name="reserveOisgirMap"/>
+ <clear-field field="reserveOisgirMap"/>
<field-to-result field-name="inventoryItemId" map-name="inventoryItem"/>
</simple-method>
@@ -399,7 +399,7 @@
<set field="reserveOisgirMap.sequenceId" from-field="parameters.sequenceId"/>
</if-not-empty>
<call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/>
- <clear-field field-name="reserveOisgirMap"/>
+ <clear-field field="reserveOisgirMap"/>
<calculate field-name="parameters.quantityNotReserved">
<calcop field-name="parameters.quantityNotReserved" operator="subtract"><number value="1.0"/></calcop>
@@ -432,7 +432,7 @@
<calcop field-name="parameters.deductAmount" operator="negative"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
- <clear-field field-name="createDetailMap"/>
+ <clear-field field="createDetailMap"/>
<!-- create OrderItemShipGrpInvRes record -->
<call-simple-method method-name="getPromisedDateTime"/>
@@ -448,7 +448,7 @@
<set field="reserveOisgirMap.sequenceId" from-field="parameters.sequenceId"/>
</if-not-empty>
<call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/>
- <clear-field field-name="reserveOisgirMap"/>
+ <clear-field field="reserveOisgirMap"/>
<calculate field-name="quantityNotReserved" map-name="parameters">
<calcop operator="subtract" field-name="quantityNotReserved" map-name="parameters">
@@ -613,7 +613,7 @@
<set from-field="parameters.shipGroupSeqId" field="createDetailMap.shipGroupSeqId"/>
<set from-field="cancelQuantity" field="createDetailMap.availableToPromiseDiff"/>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
- <clear-field field-name="createDetailMap"/>
+ <clear-field field="createDetailMap"/>
<if-compare-field field="cancelQuantity" to-field="orderItemShipGrpInvRes.quantity" operator="less" type="Double">
<calculate field-name="orderItemShipGrpInvRes.quantity">
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Tue Dec 30 04:04:24 2008
@@ -389,7 +389,7 @@
<iterate list="inventoryItemList" entry="inventoryItem">
<set from-field="inventoryItem" field="callServiceMap.inventoryItem"/>
<call-service service-name="updateOldInventoryToDetailSingle" in-map-name="callServiceMap"/>
- <clear-field field-name="callServiceMap.inventoryItem"/>
+ <clear-field field="callServiceMap.inventoryItem"/>
</iterate>
</simple-method>
<simple-method method-name="updateOldInventoryToDetailSingle" short-description="Update Old Inventory To Detail Single">
@@ -399,8 +399,8 @@
<set from-field="parameters.inventoryItem.oldQuantityOnHand" field="createDetailMap.quantityOnHandDiff"/>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
- <clear-field field-name="parameters.inventoryItem.oldAvailableToPromise"/>
- <clear-field field-name="parameters.inventoryItem.oldQuantityOnHand"/>
+ <clear-field field="parameters.inventoryItem.oldAvailableToPromise"/>
+ <clear-field field="parameters.inventoryItem.oldQuantityOnHand"/>
<store-value value-name="parameters.inventoryItem"/>
</simple-method>
@@ -787,7 +787,7 @@
<if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM">
<!-- if the new item is serialized, i.e. qoh is 1, we just need the first reservation -->
<first-from-list entry="inventoryReservation" list="allReservations"/>
- <clear-field field-name="allReservations"/>
+ <clear-field field="allReservations"/>
<field-to-list field-name="inventoryReservation" list-name="allReservations"/>
</if-compare>
@@ -898,7 +898,7 @@
<!-- FIRST, cancel all the reservations -->
<iterate list="allReservations" entry="oisgir">
- <clear-field field-name="cancelOisgirMap"/>
+ <clear-field field="cancelOisgirMap"/>
<set field="cancelOisgirMap.orderId" from-field="oisgir.orderId"/>
<set field="cancelOisgirMap.orderItemSeqId" from-field="oisgir.orderItemSeqId"/>
<set field="cancelOisgirMap.inventoryItemId" from-field="oisgir.inventoryItemId"/>
@@ -917,7 +917,7 @@
</if-not-empty>
<!-- require inventory is N because it had to be N to begin with to have a negative ATP -->
- <clear-field field-name="resMap"/>
+ <clear-field field="resMap"/>
<set field="resMap.productId" from-field="parameters.productId"/>
<set field="resMap.orderId" from-field="oisgir.orderId"/>
<set field="resMap.orderItemSeqId" from-field="oisgir.orderItemSeqId"/>
@@ -1077,7 +1077,7 @@
</and>
</condition>
<then>
- <clear-field field-name="inputMap"/>
+ <clear-field field="inputMap"/>
<set field="inputMap.inventoryItemId" from-field="inventoryItemAndLocation.inventoryItemId"/>
<set field="inputMap.statusId" value="IXF_REQUESTED"/>
<set field="inputMap.facilityId" from-field="parameters.facilityId"/>
@@ -1115,7 +1115,7 @@
</and>
</condition>
<then>
- <clear-field field-name="inputMap"/>
+ <clear-field field="inputMap"/>
<set field="inputMap.inventoryItemId" from-field="inventoryItemAndLocation.inventoryItemId"/>
<set field="inputMap.statusId" value="IXF_REQUESTED"/>
<set field="inputMap.facilityId" from-field="parameters.facilityId"/>
@@ -1154,7 +1154,7 @@
</and>
</condition>
<then>
- <clear-field field-name="inputMap"/>
+ <clear-field field="inputMap"/>
<set field="inputMap.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
<set field="inputMap.statusId" value="IXF_REQUESTED"/>
<set field="inputMap.facilityId" from-field="parameters.facilityId"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml Tue Dec 30 04:04:24 2008
@@ -60,13 +60,13 @@
<!-- now get all info for each origin location -->
<iterate-map key-name="locationSeqId" value-name="perLocationOiirailList" map-name="oiirailByLocMap">
<!-- now for more fun, split up by productId; this should generally not happen, but we'll make sure here -->
- <clear-field field-name="oiirailByProdMap"/>
+ <clear-field field="oiirailByProdMap"/>
<iterate entry="orderItemShipGrpInvResAndItemLocation" list="perLocationOiirailList">
<field-to-list field-name="orderItemShipGrpInvResAndItemLocation" list-name="oiirailByProdMap[orderItemShipGrpInvResAndItemLocation.productId]"/>
</iterate>
- <clear-field field-name="perProductOiirailList"/>
- <clear-field field-name="productId"/>
+ <clear-field field="perProductOiirailList"/>
+ <clear-field field="productId"/>
<iterate-map key-name="productId" value-name="perProductOiirailList" map-name="oiirailByProdMap">
<!-- get product -->
<entity-one entity-name="Product" value-name="moveInfo.product"/>
@@ -179,7 +179,7 @@
<!-- add the moveInfo to the master list -->
<field-to-list field-name="moveInfo" list-name="moveByOisgirInfoList"/>
- <clear-field field-name="moveInfo"/>
+ <clear-field field="moveInfo"/>
</else>
</if-empty>
</iterate-map>
@@ -252,7 +252,7 @@
<then>
<if-compare-field field="productFacilityLocationQuantityTest.productId" to-field="productSave.productId" operator="not-equals">
<get-related-one value-name="productFacilityLocationQuantityTest" relation-name="Product" to-value-name="productSave"/>
- <clear-field field-name="fromLocationTotalAvailableToPromise"/>
+ <clear-field field="fromLocationTotalAvailableToPromise"/>
</if-compare-field>
<get-related-one value-name="productFacilityLocationQuantityTest" relation-name="FacilityLocation" to-value-name="targetFacilityLocationSave"/>
@@ -268,12 +268,12 @@
<else>
<set from-field="productFacilityLocationQuantityTest.moveQuantity" field="targetLocationMoveQuantity"/>
<!-- start by making a Map where the locationSeqId is the key and the value is a List of InventoryItemAndLocation -->
- <clear-field field-name="InventoryItemAndLocationByLocMap"/>
+ <clear-field field="InventoryItemAndLocationByLocMap"/>
<iterate entry="InventoryItemAndLocation" list="inventoryItemAndLocationList">
<field-to-list field-name="InventoryItemAndLocation" list-name="InventoryItemAndLocationByLocMap.${InventoryItemAndLocation.locationSeqId}"/>
</iterate>
- <clear-field field-name="locationSeqId"/>
- <clear-field field-name="perLocationInventoryItemAndLocList"/>
+ <clear-field field="locationSeqId"/>
+ <clear-field field="perLocationInventoryItemAndLocList"/>
<iterate-map key-name="locationSeqId" value-name="perLocationInventoryItemAndLocList" map-name="InventoryItemAndLocationByLocMap">
<if-empty field="fromLocationTotalAvailableToPromise.${locationSeqId}">
<calculate field-name="totalQuantityOnHand" type="Double"><number value="0"/></calculate>
@@ -329,7 +329,7 @@
<!-- add the moveInfo to the master list -->
<field-to-list field-name="moveInfo" list-name="moveByPflInfoList"/>
- <clear-field field-name="moveInfo"/>
+ <clear-field field="moveInfo"/>
</then>
</if>
</iterate-map>
@@ -392,7 +392,7 @@
<make-value entity-name="InventoryItem" map-name="inventoryItem" value-field="targetInventoryItem"/>
<set from-field="parameters.targetLocationSeqId" field="targetInventoryItem.locationSeqId"/>
<!-- now that targetInventoryItem is populated with quantities, etc, call createInventoryItem service -->
- <clear-field field-name="createNonOisgirTargetDetailMap"/>
+ <clear-field field="createNonOisgirTargetDetailMap"/>
<set-service-fields map-name="targetInventoryItem" service-name="createInventoryItem" to-map-name="createInventoryItemMap"/>
<call-service service-name="createInventoryItem" in-map-name="createInventoryItemMap">
<result-to-field result-name="inventoryItemId" field-name="createNonOisgirTargetDetailMap.inventoryItemId"/>
@@ -405,7 +405,7 @@
<!-- okay, move it over, calculate new ATP, QOH -->
<!-- instead of updating InventoryItem, add an InventoryItemDetail -->
- <clear-field field-name="createNonOisgirDetailMap"/>
+ <clear-field field="createNonOisgirDetailMap"/>
<set from-field="inventoryItem.inventoryItemId" field="createNonOisgirDetailMap.inventoryItemId"/>
<calculate field-name="createNonOisgirDetailMap.availableToPromiseDiff" type="Double">
<calcop field-name="currentQuantityToMove" operator="negative"/>
@@ -438,7 +438,7 @@
<order-by field-name="reservedDatetime"/>
</entity-and>
- <clear-field field-name="oiirailByInvItemMap"/>
+ <clear-field field="oiirailByInvItemMap"/>
<log level="info" message="In processOisgirMoveByStatusInline orderItemShipGrpInvResAndItemLocationList=${orderItemShipGrpInvResAndItemLocationList}"/>
<iterate entry="orderItemShipGrpInvResAndItemLocation" list="orderItemShipGrpInvResAndItemLocationList">
<field-to-list field-name="orderItemShipGrpInvResAndItemLocation" list-name="oiirailByInvItemMap.${orderItemShipGrpInvResAndItemLocation.inventoryItemId}"/>
@@ -487,7 +487,7 @@
InventoryItem then the full quantity will be against that item for the given
OISGIR (reservation), so we would have to split it up
-->
- <clear-field field-name="reservedQuantityLeftOver"/>
+ <clear-field field="reservedQuantityLeftOver"/>
<if-compare-field field="quantityLeftToProcess" to-field="orderItemShipGrpInvRes.quantity" operator="less" type="Double">
<!-- the complicated part: can split up the OISGIR (reservation) into two parts, and then transfer the inventory, somewhat complicated... -->
<calculate field-name="reservedQuantityLeftOver" type="Double">
@@ -537,8 +537,8 @@
<!-- okay, move it over, start by calculating new QOHs; note that don't need to modify the ATP since with an OISGIR that has already been subtracted out, so it shouldn't be subtracted from the source or added to the target -->
<!-- instead of updating InventoryItem, add an InventoryItemDetail -->
- <clear-field field-name="createOisgirDetailMap"/>
- <clear-field field-name="createOisgirTargetDetailMap"/>
+ <clear-field field="createOisgirDetailMap"/>
+ <clear-field field="createOisgirTargetDetailMap"/>
<set from-field="inventoryItem.inventoryItemId" field="createOisgirDetailMap.inventoryItemId"/>
<set from-field="targetInventoryItem.inventoryItemId" field="createOisgirTargetDetailMap.inventoryItemId"/>
<calculate field-name="createOisgirDetailMap.quantityOnHandDiff" type="Double">
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml Tue Dec 30 04:04:24 2008
@@ -41,7 +41,7 @@
<call-service service-name="prepareProductDimensionData" in-map-name="inMap">
<result-to-field result-name="productDimension"/>
</call-service>
- <clear-field field-name="inMap"/>
+ <clear-field field="inMap"/>
<set-service-fields service-name="storeGenericDimension" map-name="parameters" to-map-name="inMap"/>
<set field="inMap.naturalKeyFields[]" value="productId"/>
<set field="inMap.dimensionValue" from-field="productDimension"/>
@@ -53,7 +53,7 @@
<set-service-fields service-name="loadProductInProductDimension" map-name="parameters" to-map-name="inMap"/>
<set field="inMap.productId" from-field="product.productId"/>
<call-service service-name="loadProductInProductDimension" in-map-name="inMap"/>
- <clear-field field-name="inMap"/>
+ <clear-field field="inMap"/>
</iterate>
</simple-method>
</simple-methods>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml Tue Dec 30 04:04:24 2008
@@ -143,7 +143,7 @@
<find-by-and entity-name="ProductAssoc" map-name="variantProductAssocMap" list-name="variantProductAssocs"/>
<filter-list-by-date list-name="variantProductAssocs"/>
<iterate entry="variantProductAssoc" list="variantProductAssocs">
- <clear-field field-name="variantProduct"/>
+ <clear-field field="variantProduct"/>
<entity-one entity-name="Product" value-name="variantProduct" auto-field-map="false">
<field-map field-name="productId" from-field="variantProductAssoc.productIdTo"/>
</entity-one>
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=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Tue Dec 30 04:04:24 2008
@@ -448,12 +448,12 @@
<call-service service-name="getInventoryAvailableByFacility" in-map-name="callServiceMap">
<result-to-field result-name="availableToPromiseTotal"/>
</call-service>
- <clear-field field-name="callServiceMap"/>
+ <clear-field field="callServiceMap"/>
<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"/>
+ <clear-field field="availableToPromiseTotal"/>
</if-empty>
</iterate>
@@ -640,13 +640,13 @@
</else>
</if>
- <clear-field field-name="callServiceMap"/>
+ <clear-field field="callServiceMap"/>
<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>
- <clear-field field-name="availableToPromiseTotal"/>
+ <clear-field field="availableToPromiseTotal"/>
</if-compare>
</iterate>
</else>
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=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Tue Dec 30 04:04:24 2008
@@ -267,7 +267,7 @@
<calcop field-name="parameters.quantity" operator="negative"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
- <clear-field field-name="createDetailMap"/>
+ <clear-field field="createDetailMap"/>
</simple-method>
<!-- some inline methods for the issuance process -->
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Tue Dec 30 04:04:24 2008
@@ -211,7 +211,7 @@
<set from-field="inventoryItem" field="orderItemShipGrpInvResInfo.inventoryItem"/>
<set from-field="facilityLocation" field="orderItemShipGrpInvResInfo.facilityLocation"/>
<field-to-list field-name="orderItemShipGrpInvResInfo" list-name="orderItemShipGrpInvResInfoList"/>
- <clear-field field-name="orderItemShipGrpInvResInfo"/>
+ <clear-field field="orderItemShipGrpInvResInfo"/>
</else>
</if>
</if-empty>
@@ -272,7 +272,7 @@
</if-compare>
</else>
</if-compare>
- <clear-field field-name="orderHeaderInfo"/>
+ <clear-field field="orderHeaderInfo"/>
<calculate field-name="numberSoFar" type="Long">
<calcop field-name="numberSoFar" operator="add"><number value="1"/></calcop>
@@ -284,8 +284,8 @@
</else>
</if>
- <clear-field field-name="orderItemAndShipGroupAssocList"/>
- <clear-field field-name="orderItemShipGrpInvResInfoList"/>
+ <clear-field field="orderItemAndShipGroupAssocList"/>
+ <clear-field field="orderItemShipGrpInvResInfoList"/>
</then>
<else>
<log level="info" message="Order is not a member of the requested shipment method: ${parameters.shipmentMethodTypeId}"/>
@@ -293,8 +293,8 @@
</if>
</iterate>
- <clear-field field-name="orderHeaderInfo"/>
- <clear-field field-name="orderItemShipGroupList"/>
+ <clear-field field="orderHeaderInfo"/>
+ <clear-field field="orderItemShipGroupList"/>
</iterate>
<!-- find all ShipmentMethodType in order by sequenceNum, for each one get the value from the pickMoveByShipmentMethodInfoMap and add it to the pickMoveByShipmentMethodInfoList -->
@@ -361,7 +361,7 @@
<set field="inventoryItemOrderItemList" from-field="inventoryItemOrderItems.${inventoryItemId}"/>
<set field="inventoryItemOrderItemList[]" from-field="orderItemAndShipGroupAssoc"/>
<set field="inventoryItemOrderItems.${orderItemShipGrpInvRes.inventoryItemId}" from-field="inventoryItemOrderItemList"/>
- <clear-field field-name="inventoryItemOrderItemList"/>
+ <clear-field field="inventoryItemOrderItemList"/>
<if-not-empty field="inventoryItemQuantities.${inventoryItemId}">
<calculate field-name="inventoryItemQuantities.${inventoryItemId}" type="Double">
<calcop field-name="inventoryItemQuantities.${inventoryItemId}" operator="add">
@@ -373,7 +373,7 @@
</else>
</if-not-empty>
</if-compare-field>
- <clear-field field-name="inventoryItem"/>
+ <clear-field field="inventoryItem"/>
<!-- update total quantity reserved, picked, etc per line item to check to see if all and not more is reserved -->
<calculate field-name="reservedQuantity" type="Double">
<calcop field-name="reservedQuantity" operator="add">
@@ -383,13 +383,13 @@
</iterate>
<if-not-empty field="perItemResListValid">
- <clear-field field-name="orderItemInfo"/>
+ <clear-field field="orderItemInfo"/>
<set field="orderItemInfo.orderItemAndShipGroupAssoc" from-field="orderItemAndShipGroupAssoc"/>
<set field="orderItemInfo.orderItemShipGrpInvResList" from-field="perItemResListValid"/>
<get-related-one value-name="orderItemAndShipGroupAssoc" relation-name="Product" to-value-name="orderItemInfo.product" use-cache="true"/>
<set field="orderItemInfoList[]" from-field="orderItemInfo"/>
</if-not-empty>
- <clear-field field-name="perItemResListValid"/>
+ <clear-field field="perItemResListValid"/>
<!-- warn if wrong inventory has been reserved+issued -->
<!-- must include issued items as well, otherwise can't really do an effective check... -->
@@ -414,7 +414,7 @@
<set field="wrongQuantityReserved.issuedQuantity" from-field="issuedQuantity"/>
<set field="wrongQuantityReserved.reservedIssuedQuantity" from-field="reservedIssuedQuantity"/>
<set field="wrongQuantityReservedList[]" from-field="wrongQuantityReserved"/>
- <clear-field field-name="wrongQuantityReserved"/>
+ <clear-field field="wrongQuantityReserved"/>
</if-compare-field>
</if-compare>
</iterate>
@@ -427,8 +427,8 @@
<set field="orderHeaderInfoList[]" from-field="orderHeaderInfo"/>
</if-not-empty>
- <clear-field field-name="orderHeaderInfo"/>
- <clear-field field-name="orderItemInfoList"/>
+ <clear-field field="orderHeaderInfo"/>
+ <clear-field field="orderItemInfoList"/>
</iterate>
</iterate>
@@ -456,7 +456,7 @@
</and>
</condition>
<then>
- <clear-field field-name="insufficientQoh"/>
+ <clear-field field="insufficientQoh"/>
<set from-field="inventoryItem" field="insufficientQoh.inventoryItem"/>
<set from-field="quantityNeeded" field="insufficientQoh.quantityNeeded"/>
<set from-field="insufficientQoh" field="insufficientQohList[]"/>
@@ -499,8 +499,8 @@
<!-- iterate over the orderHeaderInfoList and create a PicklistBin for each order and a PicklistItem for each item -->
<calculate field-name="binLocationNumber" type="Long"><number value="1"/></calculate>
<iterate entry="orderHeaderInfo" list="orderHeaderInfoList">
- <clear-field field-name="picklistBinId"/>
- <clear-field field-name="createPicklistBinMap"/>
+ <clear-field field="picklistBinId"/>
+ <clear-field field="createPicklistBinMap"/>
<set from-field="picklistId" field="createPicklistBinMap.picklistId"/>
<set from-field="binLocationNumber" field="createPicklistBinMap.binLocationNumber"/>
<set from-field="orderHeaderInfo.orderItemShipGroup.orderId" field="createPicklistBinMap.primaryOrderId"/>
@@ -539,7 +539,7 @@
<log level="info" message="Order #${orderItemShipGrpInvRes.orderId} / ${orderItemShipGrpInvRes.orderItemSeqId} - ${quantityToPick}"/>
<if-compare field="quantityToPick" value="0" operator="greater" type="Double">
- <clear-field field-name="createPicklistItemMap"/>
+ <clear-field field="createPicklistItemMap"/>
<set from-field="picklistBinId" field="createPicklistItemMap.picklistBinId"/>
<set field="createPicklistItemMap.itemStatusId" value="PICKITEM_PENDING"/>
<set-service-fields service-name="createPicklistItem" map-name="orderItemShipGrpInvRes" to-map-name="createPicklistItemMap"/>
@@ -550,7 +550,7 @@
<number value="1"/>
</calculate>
</if-compare>
- <clear-field field-name="quantityToPick"/>
+ <clear-field field="quantityToPick"/>
</iterate>
</iterate>
@@ -865,14 +865,14 @@
<make-value value-field="facilityLocation" entity-name="FacilityLocation" map-name="picklistItemInfo.inventoryItemAndLocation"/>
<set from-field="facilityLocation" field="facilityLocationByLocationSeqIdMap.${facilityLocation.locationSeqId}"/>
- <clear-field field-name="picklistItemInfoTempList"/>
+ <clear-field field="picklistItemInfoTempList"/>
<set field="picklistItemInfoTempList" from-field="picklistItemInfoListByLocationSeqIdMap.${facilityLocation.locationSeqId}"/>
<set field="picklistItemInfoTempList[]" from-field="picklistItemInfo"/>
<set field="picklistItemInfoListByLocationSeqIdMap.${facilityLocation.locationSeqId}" from-field="picklistItemInfoTempList"/>
<else>
<!-- handle case where an InventoryItem is not associated with a location -->
<if-not-empty field="picklistItemInfo.orderItem.productId">
- <clear-field field-name="productValueTemp"/>
+ <clear-field field="productValueTemp"/>
<set field="productId" from-field="picklistItemInfo.inventoryItemAndLocation.productId"/>
<entity-one entity-name="Product" value-name="productValueTemp" use-cache="true">
<field-map field-name="productId"/>
@@ -885,7 +885,7 @@
]]></call-bsh>
-->
- <clear-field field-name="picklistItemInfoTempList"/>
+ <clear-field field="picklistItemInfoTempList"/>
<set field="picklistItemInfoTempList" from-field="picklistItemInfoListByProductIdMap.${productId}"/>
<set field="picklistItemInfoTempList[]" from-field="picklistItemInfo"/>
<set field="picklistItemInfoListByProductIdMap.${productId}" from-field="picklistItemInfoTempList"/>
@@ -919,7 +919,7 @@
<!-- Now we have an ordered list of FacilityLocations, create a facilityLocationInfoList -->
<iterate entry="facilityLocation" list="facilityLocationList">
- <clear-field field-name="facilityLocationInfo"/>
+ <clear-field field="facilityLocationInfo"/>
<set from-field="facilityLocation" field="facilityLocationInfo.facilityLocation"/>
<set from-field="picklistItemInfoListByLocationSeqIdMap.${facilityLocation.locationSeqId}" field="facilityLocationInfo.picklistItemInfoList"/>
@@ -952,7 +952,7 @@
<!-- create the picklistBinInfoList from the quantityByPicklistBinIdMap -->
<iterate-map key-name="picklistBinId" value-name="quantity" map-name="facilityLocationInfo.quantityByPicklistBinIdMap">
- <clear-field field-name="picklistBinInfo"/>
+ <clear-field field="picklistBinInfo"/>
<set from-field="picklistBinByIdMap.${picklistBinId}" field="picklistBinInfo.picklistBin"/>
<set from-field="quantity" field="picklistBinInfo.quantity"/>
<set from-field="picklistBinInfo" field="facilityLocationInfo.picklistBinInfoList[]"/>
@@ -972,7 +972,7 @@
<!-- Now we have an ordered list of Products, create a noLocationProductInfoList -->
<iterate entry="product" list="productList">
- <clear-field field-name="productInfo"/>
+ <clear-field field="productInfo"/>
<set from-field="product" field="productInfo.product"/>
<set from-field="picklistItemInfoListByProductIdMap.${product.productId}" field="productInfo.picklistItemInfoList"/>
@@ -993,7 +993,7 @@
<!-- create the picklistBinInfoList from the quantityByPicklistBinIdMap -->
<iterate-map key-name="picklistBinId" value-name="quantity" map-name="productInfo.quantityByPicklistBinIdMap">
- <clear-field field-name="picklistBinInfo"/>
+ <clear-field field="picklistBinInfo"/>
<set from-field="picklistBinByIdMap.${picklistBinId}" field="picklistBinInfo.picklistBin"/>
<set from-field="quantity" field="picklistBinInfo.quantity"/>
<set from-field="picklistBinInfo" field="productInfo.picklistBinInfoList[]"/>
@@ -1024,40 +1024,40 @@
- picklistItemInfoList (picklistItem, picklistBin, orderItem, product, inventoryItemAndLocation, orderItemShipGrpInvRes, itemIssuanceList)
-->
<!-- expects a picklist GenericValue to be in the context, and creates a picklistInfo Map -->
- <clear-field field-name="picklistRoleInfoList"/>
+ <clear-field field="picklistRoleInfoList"/>
<get-related value-name="picklist" relation-name="PicklistRole" list-name="picklistRoleList"/>
<iterate entry="picklistRole" list="picklistRoleList">
- <clear-field field-name="picklistRoleInfo"/>
+ <clear-field field="picklistRoleInfo"/>
<get-related-one value-name="picklistRole" relation-name="PartyNameView" to-value-name="picklistRoleInfo.partyNameView" use-cache="true"/>
<get-related-one value-name="picklistRole" relation-name="RoleType" to-value-name="picklistRoleInfo.roleType" use-cache="true"/>
<set from-field="picklistRole" field="picklistRoleInfo.picklistRole"/>
<field-to-list field-name="picklistRoleInfo" list-name="picklistRoleInfoList"/>
</iterate>
- <clear-field field-name="picklistStatusHistoryInfoList"/>
+ <clear-field field="picklistStatusHistoryInfoList"/>
<get-related value-name="picklist" relation-name="PicklistStatusHistory" list-name="picklistStatusHistoryList"/>
<iterate entry="picklistStatusHistory" list="picklistStatusHistoryList">
- <clear-field field-name="picklistStatusHistoryInfo"/>
+ <clear-field field="picklistStatusHistoryInfo"/>
<get-related-one value-name="picklistStatusHistory" relation-name="StatusItem" to-value-name="picklistStatusHistoryInfo.statusItem" use-cache="true"/>
<get-related-one value-name="picklistStatusHistory" relation-name="ToStatusItem" to-value-name="picklistStatusHistoryInfo.statusItemTo" use-cache="true"/>
<set from-field="picklistStatusHistory" field="picklistStatusHistoryInfo.picklistStatusHistory"/>
<field-to-list field-name="picklistStatusHistoryInfo" list-name="picklistStatusHistoryInfoList"/>
</iterate>
- <clear-field field-name="picklistBinOrderList"/>
- <clear-field field-name="picklistBinInfoList"/>
+ <clear-field field="picklistBinOrderList"/>
+ <clear-field field="picklistBinInfoList"/>
<set value="+binLocationNumber" field="picklistBinOrderList[]"/>
<get-related value-name="picklist" relation-name="PicklistBin" list-name="picklistBinList" order-by-list-name="picklistBinOrderList"/>
<iterate entry="picklistBin" list="picklistBinList">
- <clear-field field-name="picklistBinInfo"/>
+ <clear-field field="picklistBinInfo"/>
<get-related-one value-name="picklistBin" relation-name="PrimaryOrderHeader" to-value-name="picklistBinInfo.primaryOrderHeader"/>
<get-related-one value-name="picklistBin" relation-name="PrimaryOrderItemShipGroup" to-value-name="picklistBinInfo.primaryOrderItemShipGroup"/>
- <clear-field field-name="picklistItemInfoList"/>
+ <clear-field field="picklistItemInfoList"/>
<get-related value-name="picklistBin" relation-name="PicklistItem" list-name="picklistItemList" use-cache="true"/>
<iterate entry="picklistItem" list="picklistItemList">
- <clear-field field-name="picklistItemInfo"/>
+ <clear-field field="picklistItemInfo"/>
<get-related-one value-name="picklistItem" relation-name="OrderItem" to-value-name="picklistItemInfo.orderItem"/>
<get-related-one value-name="picklistItemInfo.orderItem" relation-name="Product" to-value-name="picklistItemInfo.product"/>
<get-related-one value-name="picklistItem" relation-name="InventoryItemAndLocation" to-value-name="picklistItemInfo.inventoryItemAndLocation"/>
@@ -1073,7 +1073,7 @@
<field-to-list field-name="picklistBinInfo" list-name="picklistBinInfoList"/>
</iterate>
- <clear-field field-name="picklistInfo"/>
+ <clear-field field="picklistInfo"/>
<set from-field="picklist" field="picklistInfo.picklist"/>
<set from-field="picklistRoleInfoList" field="picklistInfo.picklistRoleInfoList"/>
<set from-field="picklistStatusHistoryInfoList" field="picklistInfo.picklistStatusHistoryInfoList"/>
@@ -1142,12 +1142,12 @@
<set from-field="inventoryItems.${inventoryItemId}" field="inventoryItem"/>
<!-- create a list of locations, then sort it, will have to create a reverse Map to go from location to inventory item -->
- <clear-field field-name="facilityLocation"/>
+ <clear-field field="facilityLocation"/>
<get-related-one value-name="inventoryItem" relation-name="FacilityLocation" to-value-name="facilityLocation"/>
<if-not-empty field="facilityLocation">
<set from-field="facilityLocation" field="facilityLocationMap.${facilityLocation.locationSeqId}"/>
<!-- support multiple invnetoryItemIds per facilityLocation.locationSeqId -->
- <clear-field field-name="inventoryItemIdList"/>
+ <clear-field field="inventoryItemIdList"/>
<set from-field="inventoryItemsByLocation.${facilityLocation.locationSeqId}" field="inventoryItemIdList"/>
<set from-field="inventoryItemId" field="inventoryItemIdList[]"/>
<set from-field="inventoryItemIdList" field="inventoryItemsByLocation.${facilityLocation.locationSeqId}"/>
@@ -1173,13 +1173,13 @@
<!-- for each facility location add an entry to the inventoryItemInfoList -->
<iterate entry="facilityLocation" list="facilityLocations">
<!-- facilityLocationInfoList: facilityLocation, productInfoList (product, quantity, inventoryItemList, orderItemList) -->
- <clear-field field-name="facilityLocationInfo"/>
+ <clear-field field="facilityLocationInfo"/>
<set from-field="facilityLocation" field="facilityLocationInfo.facilityLocation"/>
<!-- inventoryItemInfoList: facilityLocation, inventoryItem, orderItems, quantity, product, statusItems -->
<set from-field="inventoryItemsByLocation.${facilityLocation.locationSeqId}" field="inventoryItemIdList"/>
<iterate entry="inventoryItemId" list="inventoryItemIdList">
- <clear-field field-name="inventoryItemInfo"/>
+ <clear-field field="inventoryItemInfo"/>
<set from-field="facilityLocation" field="inventoryItemInfo.facilityLocation"/>
<set from-field="inventoryItems.${inventoryItemId}" field="inventoryItemInfo.inventoryItem"/>
<set from-field="inventoryItemOrderItems.${inventoryItemId}" field="inventoryItemInfo.orderItems"/>
@@ -1212,8 +1212,8 @@
</iterate-map>
<set from-field="facilityLocationInfo" field="facilityLocationInfoList[]"/>
- <clear-field field-name="orderItemMap"/>
- <clear-field field-name="productInfoMap"/>
+ <clear-field field="orderItemMap"/>
+ <clear-field field="productInfoMap"/>
</iterate>
<!-- add all noLocationInventoryItemIds to inventoryItemInfoList with all entries except facilityLocation -->
@@ -1225,7 +1225,7 @@
<get-related-one value-name="inventoryItemInfo.inventoryItem" relation-name="StatusItem" to-value-name="inventoryItemInfo.statusItem"/>
<set from-field="inventoryItemInfo" field="inventoryItemInfoList[]"/>
- <clear-field field-name="inventoryItemInfo"/>
+ <clear-field field="inventoryItemInfo"/>
</iterate>
</simple-method>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Tue Dec 30 04:04:24 2008
@@ -112,8 +112,8 @@
<log level="info" message="receiveInventoryProduct Looping and creating inventory info - ${currentLoop}"/>
<!-- if there is an inventoryItemId, update it (this will happen when receiving serialized inventory already in the system, like for returns); if not create one -->
- <clear-field field-name="serviceInMap"/>
- <clear-field field-name="currentInventoryItemId"/>
+ <clear-field field="serviceInMap"/>
+ <clear-field field="currentInventoryItemId"/>
<if-empty field="parameters.currentInventoryItemId">
<set-service-fields service-name="createInventoryItem" map-name="parameters" to-map-name="serviceInMap"/>
@@ -133,7 +133,7 @@
<!-- do this only for non-serialized inventory -->
<if-compare value="SERIALIZED_INV_ITEM" operator="not-equals" field="parameters.inventoryItemTypeId">
- <clear-field field-name="serviceInMap"/>
+ <clear-field field="serviceInMap"/>
<set-service-fields service-name="createInventoryItemDetail" map-name="parameters" to-map-name="serviceInMap"/>
<set field="serviceInMap.inventoryItemId" from-field="currentInventoryItemId"/>
<call-service service-name="createInventoryItemDetail" in-map-name="serviceInMap">
@@ -141,7 +141,7 @@
</call-service>
</if-compare>
- <clear-field field-name="serviceInMap"/>
+ <clear-field field="serviceInMap"/>
<set-service-fields service-name="createShipmentReceipt" map-name="parameters" to-map-name="serviceInMap"/>
<set field="serviceInMap.inventoryItemId" from-field="currentInventoryItemId"/>
<call-service service-name="createShipmentReceipt" in-map-name="serviceInMap"/>
@@ -167,7 +167,7 @@
</and>
</condition>
<then>
- <clear-field field-name="serviceInMap"/>
+ <clear-field field="serviceInMap"/>
<set field="serviceInMap.inventoryItemId" from-field="currentInventoryItemId"/>
<set field="serviceInMap.statusId" value="INV_AVAILABLE"/> <!-- XXX set to returned instead -->
<call-service service-name="updateInventoryItem" in-map-name="serviceInMap"/>
@@ -176,7 +176,7 @@
</then>
</if>
- <clear-field field-name="serviceInMap"/>
+ <clear-field field="serviceInMap"/>
<set-service-fields service-name="balanceInventoryItems" map-name="parameters" to-map-name="serviceInMap"/>
<set field="serviceInMap.inventoryItemId" from-field="currentInventoryItemId"/>
<call-service service-name="balanceInventoryItems" in-map-name="serviceInMap"/>
@@ -228,7 +228,7 @@
<iterate entry="returnItem" list="returnItems">
<!-- record this return item on the return shipment as well. not sure if this is actually necessary... -->
- <clear-field field-name="shipItemCtx"/>
+ <clear-field field="shipItemCtx"/>
<set from-field="shipmentId" field="shipItemCtx.shipmentId"/>
<set from-field="returnItem.productId" field="shipItemCtx.productId"/>
<set from-field="returnItem.returnQuantity" field="shipItemCtx.quantity"/>
@@ -238,7 +238,7 @@
</call-service>
</iterate>
<iterate entry="returnItem" list="returnItems">
- <clear-field field-name="receiveCtx"/>
+ <clear-field field="receiveCtx"/>
<if-empty field="returnItem.expectedItemStatus">
<set value="INV_RETURNED" field="returnItem.expectedItemStatus" type="String"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Tue Dec 30 04:04:24 2008
@@ -311,7 +311,7 @@
<condition-expr field-name="returnId" operator="equals" env-name="parameters.returnId"/>
</entity-condition>
<iterate entry="returnItem" list="returnItems">
- <clear-field field-name="shipItemCtx"/>
+ <clear-field field="shipItemCtx"/>
<set from-field="shipmentId" field="shipItemCtx.shipmentId"/>
<set from-field="returnItem.productId" field="shipItemCtx.productId"/>
<set from-field="returnItem.returnQuantity" field="shipItemCtx.quantity"/>
@@ -319,7 +319,7 @@
<call-service service-name="createShipmentItem" in-map-name="shipItemCtx">
<result-to-field result-name="shipmentItemSeqId"/>
</call-service>
- <clear-field field-name="shipItemCtx"/>
+ <clear-field field="shipItemCtx"/>
<set from-field="shipmentId" field="shipItemCtx.shipmentId"/>
<set from-field="shipmentItemSeqId" field="shipItemCtx.shipmentItemSeqId"/>
<set from-field="returnItem.returnId" field="shipItemCtx.returnId"/>
@@ -343,7 +343,7 @@
<condition-expr field-name="returnId" operator="equals" env-name="parameters.primaryReturnId"/>
</entity-condition>
<iterate entry="returnItem" list="returnItems">
- <clear-field field-name="shipItemCtx"/>
+ <clear-field field="shipItemCtx"/>
<set from-field="shipmentId" field="shipItemCtx.shipmentId"/>
<set from-field="returnItem.productId" field="shipItemCtx.productId"/>
<set from-field="returnItem.returnQuantity" field="shipItemCtx.quantity"/>
@@ -351,7 +351,7 @@
<call-service service-name="createShipmentItem" in-map-name="shipItemCtx">
<result-to-field result-name="shipmentItemSeqId"/>
</call-service>
- <clear-field field-name="shipItemCtx"/>
+ <clear-field field="shipItemCtx"/>
<set from-field="shipmentId" field="shipItemCtx.shipmentId"/>
<set from-field="shipmentItemSeqId" field="shipItemCtx.shipmentItemSeqId"/>
<set from-field="returnItem.returnId" field="shipItemCtx.returnId"/>
@@ -442,7 +442,7 @@
<if-not-empty field="limitOrderRole">
<set from-field="limitOrderRole.partyId" field="shipment.partyIdFrom"/>
</if-not-empty>
- <clear-field field-name="limitRoleMap"/><clear-field field-name="limitOrderRoles"/><clear-field field-name="limitOrderRole"/>
+ <clear-field field-name="limitRoleMap"/><clear-field field-name="limitOrderRoles"/><clear-field field="limitOrderRole"/>
</if-empty>
<!-- From: VENDOR -->
<if-empty field="shipment.partyIdFrom">
@@ -452,7 +452,7 @@
<if-not-empty field="limitOrderRole">
<set from-field="limitOrderRole.partyId" field="shipment.partyIdFrom"/>
</if-not-empty>
- <clear-field field-name="limitRoleMap"/><clear-field field-name="limitOrderRoles"/><clear-field field-name="limitOrderRole"/>
+ <clear-field field-name="limitRoleMap"/><clear-field field-name="limitOrderRoles"/><clear-field field="limitOrderRole"/>
</if-empty>
<!-- To: SHIP_TO_CUSTOMER -->
@@ -463,7 +463,7 @@
<if-not-empty field="limitOrderRole">
<set from-field="limitOrderRole.partyId" field="shipment.partyIdTo"/>
</if-not-empty>
- <clear-field field-name="limitRoleMap"/><clear-field field-name="limitOrderRoles"/><clear-field field-name="limitOrderRole"/>
+ <clear-field field-name="limitRoleMap"/><clear-field field-name="limitOrderRoles"/><clear-field field="limitOrderRole"/>
</if-empty>
<!-- To: CUSTOMER -->
<if-empty field="shipment.partyIdTo">
@@ -473,7 +473,7 @@
<if-not-empty field="limitOrderRole">
<set from-field="limitOrderRole.partyId" field="shipment.partyIdTo"/>
</if-not-empty>
- <clear-field field-name="limitRoleMap"/><clear-field field-name="limitOrderRoles"/><clear-field field-name="limitOrderRole"/>
+ <clear-field field-name="limitRoleMap"/><clear-field field-name="limitOrderRoles"/><clear-field field="limitOrderRole"/>
</if-empty>
<entity-and entity-name="OrderContactMech" list-name="orderContactMechs">
@@ -773,7 +773,7 @@
</iterate>
<set field="issuance.quantity" from-field="issuanceQuantity"/>
<store-value value-name="issuance"/>
- <clear-field field-name="issuanceQuantity"/>
+ <clear-field field="issuanceQuantity"/>
</iterate>
</simple-method>
@@ -826,7 +826,7 @@
<entity-one entity-name="ShipmentItem" value-name="originalShipmentItem"/>
<!-- create new ShipmentItem -->
- <clear-field field-name="inputMap"/>
+ <clear-field field="inputMap"/>
<set field="inputMap.shipmentId" from-field="originalShipmentItem.shipmentId"/>
<set field="inputMap.productId" from-field="originalShipmentItem.productId"/>
<set field="inputMap.quantity" from-field="parameters.newItemQuantity"/>
@@ -856,7 +856,7 @@
<if-compare field="orderShipmentQuantityLeft" operator="greater" value="0" type="Double">
<if-compare-field field="itemOrderShipment.quantity" to-field="orderShipmentQuantityLeft" operator="greater" type="Double">
<!-- there is enough in this OrderShipment record, so just adjust it and move on -->
- <clear-field field-name="updateOrderShipmentMap"/>
+ <clear-field field="updateOrderShipmentMap"/>
<set-service-fields service-name="updateOrderShipment" map-name="itemOrderShipment" to-map-name="updateOrderShipmentMap"/>
<calculate field-name="updateOrderShipmentMap.quantity" type="Double">
<calcop operator="add" field-name="itemOrderShipment.quantity">
@@ -865,7 +865,7 @@
</calculate>
<call-service service-name="updateOrderShipment" in-map-name="updateOrderShipmentMap"/>
- <clear-field field-name="createOrderShipmentMap"/>
+ <clear-field field="createOrderShipmentMap"/>
<set field="createOrderShipmentMap.orderId" from-field="itemOrderShipment.orderId"/>
<set field="createOrderShipmentMap.orderItemSeqId" from-field="itemOrderShipment.orderItemSeqId"/>
<set field="createOrderShipmentMap.shipmentId" from-field="itemOrderShipment.shipmentId"/>
@@ -877,11 +877,11 @@
<else>
<!-- not enough on this one, create a new one for the new item and delete this one -->
- <clear-field field-name="deleteOrderShipmentMap"/>
+ <clear-field field="deleteOrderShipmentMap"/>
<set-service-fields service-name="deleteOrderShipment" map-name="itemOrderShipment" to-map-name="deleteOrderShipmentMap"/>
<call-service service-name="deleteOrderShipment" in-map-name="deleteOrderShipmentMap"/>
- <clear-field field-name="createOrderShipmentMap"/>
+ <clear-field field="createOrderShipmentMap"/>
<set field="createOrderShipmentMap.orderId" from-field="itemOrderShipment.orderId"/>
<set field="createOrderShipmentMap.orderItemSeqId" from-field="itemOrderShipment.orderItemSeqId"/>
<set field="createOrderShipmentMap.shipmentId" from-field="itemOrderShipment.shipmentId"/>
@@ -916,7 +916,7 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<if-compare value="New" operator="equals" field="newEntity.shipmentPackageSeqId">
- <clear-field field-name="shipmentPackageSeqId" map-name="newEntity"/>
+ <clear-field field="shipmentPackageSeqId" map-name="newEntity"/>
</if-compare>
<!-- if no shipmentPackageSeqId, generate one based on existing items, ie one greater than the current higher number -->
@@ -1480,7 +1480,7 @@
<then>
<iterate list="perShipGroupItemList" entry="orderItemAndShipGroupAssoc">
<!-- just get the OrderItemShipGrpInvResAndItem records for this facility and this ship group, since that is what this shipment is for -->
- <clear-field field-name="itemResFindMap"/>
+ <clear-field field="itemResFindMap"/>
<set from-field="orderItemShipGrpInvResFacilityId" field="itemResFindMap.facilityId"/>
<get-related value-name="orderItemAndShipGroupAssoc" relation-name="OrderItemShipGrpInvResAndItem" map-name="itemResFindMap" list-name="itemResList"/>
<iterate list="itemResList" entry="itemRes">
@@ -1495,7 +1495,7 @@
</iterate>
</then>
<else> <!-- Issue all purchase order items -->
- <clear-field field-name="itemResFindMap"/>
+ <clear-field field="itemResFindMap"/>
<set from-field="facilityId" field="itemResFindMap.facilityId"/>
<iterate list="orderItemAndShipGroupAssocList" entry="item">
<set from-field="shipment.shipmentId" field="issueContext.shipmentId"/>
@@ -1518,7 +1518,7 @@
<set value="New" field="shipmentPackageSeqId"/>
<iterate list="itemIssuances" entry="itemIssuance">
<log level="verbose" message="In quick ship adding item to package: ${shipmentPackageSeqId}"/>
- <clear-field field-name="shipItemContext"/>
+ <clear-field field="shipItemContext"/>
<set from-field="itemIssuance.shipmentId" field="shipItemContext.shipmentId"/>
<set from-field="itemIssuance.shipmentItemSeqId" field="shipItemContext.shipmentItemSeqId"/>
<set from-field="itemIssuance.quantity" field="shipItemContext.quantity"/>
@@ -1552,7 +1552,7 @@
<set from-field="orderItemShipGroup.shipGroupSeqId" field="shipmentShipGroupFacility.shipGroupSeqId"/>
<field-to-list field-name="shipmentShipGroupFacility" list-name="shipmentShipGroupFacilityList"/>
<string-to-list string="Created shipment with ID [${shipmentShipGroupFacility.shipmentId}] for ship group ID [${shipmentShipGroupFacility.shipGroupSeqId}] for facility ID [${shipmentShipGroupFacility.facilityId}]" list-name="successMessageList"/>
- <clear-field field-name="shipmentShipGroupFacility"/>
+ <clear-field field="shipmentShipGroupFacility"/>
</else>
</if-empty>
</iterate>
@@ -1575,7 +1575,7 @@
<iterate list="orderItemShipGroupList" entry="orderItemShipGroup">
<!-- For each shipGroup create Shipment -->
- <clear-field field-name="createShipmentContext"/>
+ <clear-field field="createShipmentContext"/>
<set field="createShipmentContext.primaryOrderId" from-field="orderHeader.orderId"/>
<set field="createShipmentContext.primaryShipGroupSeqId" from-field="orderItemShipGroup.shipGroupSeqId"/>
<set field="createShipmentContext.statusId" value="SHIPMENT_INPUT"/>
@@ -1596,7 +1596,7 @@
<get-related-one value-name="itemProduct" relation-name="ProductType" to-value-name="itemProductType" use-cache="true"/>
<if-compare field="itemProductType.isPhysical" operator="equals" value="Y">
<!-- Create shipment item -->
- <clear-field field-name="addOrderShipmentToShipmentCtx"/>
+ <clear-field field="addOrderShipmentToShipmentCtx"/>
<set field="addOrderShipmentToShipmentCtx.orderId" from-field="orderHeader.orderId"/>
<set field="addOrderShipmentToShipmentCtx.orderItemSeqId" from-field="orderItem.orderItemSeqId"/>
<set field="addOrderShipmentToShipmentCtx.shipmentId" from-field="parameters.shipmentId"/>
@@ -1630,7 +1630,7 @@
</if-compare-field>
</if-not-empty>
<!-- get InventoryItem issued to shipment -->
- <clear-field field-name="issueContext"/>
+ <clear-field field="issueContext"/>
<set from-field="parameters.shipmentId" field="issueContext.shipmentId"/>
<set from-field="parameters.inventoryItemId" field="issueContext.inventoryItemId"/>
<set from-field="parameters.orderId" field="issueContext.orderId"/>
@@ -1646,7 +1646,7 @@
<entity-one entity-name="ItemIssuance" value-name="itemIssuance">
<field-map field-name="itemIssuanceId" from-field="parameters.itemIssuanceId"/>
</entity-one>
- <clear-field field-name="shipItemContext"/>
+ <clear-field field="shipItemContext"/>
<set from-field="parameters.shipmentPackageSeqId" field="shipItemContext.shipmentPackageSeqId"/>
<if-empty field="shipItemContext.shipmentPackageSeqId">
<set value="New" field="shipItemContext.shipmentPackageSeqId"/>
@@ -1763,7 +1763,7 @@
<log level="verbose" message="ShipMap List : ${itemMapList} / ${parameters.itemShipList}"/>
<iterate list="itemMapList" entry="itemMap">
<log level="verbose" message="Item Map : ${itemMap}"/>
- <clear-field field-name="issueContext"/>
+ <clear-field field="issueContext"/>
<set from-field="shipment.shipmentId" field="issueContext.shipmentId"/>
<set from-field="parameters.orderId" field="issueContext.orderId"/>
<set from-field="parameters.shipGroupSeqId" field="issueContext.shipGroupSeqId"/>
@@ -1783,7 +1783,7 @@
<field-map field-name="itemIssuanceId" from-field="itemMap.itemIssuanceId"/>
</entity-one>
- <clear-field field-name="shipItemContext"/>
+ <clear-field field="shipItemContext"/>
<set from-field="packageMap.${itemMap.trackingNum}" field="shipItemContext.shipmentPackageSeqId"/>
<if-empty field="shipItemContext.shipmentPackageSeqId">
<set value="New" field="shipItemContext.shipmentPackageSeqId"/>
@@ -1843,7 +1843,7 @@
<make-value entity-name="OrderShipment" value-field="lookupPk"/>
<set-pk-fields value-field="lookupPk" map="parameters"/>
<find-by-primary-key entity-name="OrderShipment" map="lookupPk" value-field="orderShipment"/>
- <clear-field field-name="lookupPk"/>
+ <clear-field field="lookupPk"/>
<make-value entity-name="ShipmentItem" value-field="lookupPk"/>
<set-pk-fields value-field="lookupPk" map="parameters"/>
<find-by-primary-key entity-name="ShipmentItem" map="lookupPk" value-field="shipmentItem"/>
@@ -1860,7 +1860,7 @@
<calcop field-name="orderShipment.quantity" operator="get"/>
</calcop>
</calculate>
- <clear-field field-name="inMap"/>
+ <clear-field field="inMap"/>
<if-compare field="shipmentItem.quantity" operator="greater" value="0.0" type="Double">
<set from-field="parameters.userLogin" field="inMap.userLogin"/>
<set from-field="parameters.shipmentId" field="inMap.shipmentId"/>
@@ -1923,7 +1923,7 @@
<string-to-list string="Not adding Order Item to plan for shipment [${parameters.shipmentId}] because the quantity is greater than the remaining quantity (order [${parameters.orderId}], order item [${parameters.orderItemSeqId}])" list-name="error_list"/>
</if-compare-field>
<check-errors/>
- <clear-field field-name="inputMap"/>
+ <clear-field field="inputMap"/>
<set from-field="parameters.userLogin" field="inputMap.userLogin"/>
<set from-field="parameters.shipmentId" field="inputMap.shipmentId"/>
<set from-field="orderItem.productId" field="inputMap.productId"/>
@@ -1931,7 +1931,7 @@
<call-service service-name="createShipmentItem" in-map-name="inputMap">
<result-to-field result-name="shipmentItemSeqId" field-name="parameters.shipmentItemSeqId"/>
</call-service>
- <clear-field field-name="inputMap"/>
+ <clear-field field="inputMap"/>
<set from-field="parameters.userLogin" field="inputMap.userLogin"/>
<set from-field="parameters.shipmentId" field="inputMap.shipmentId"/>
<set from-field="parameters.shipmentItemSeqId" field="inputMap.shipmentItemSeqId"/>
@@ -1957,7 +1957,7 @@
</calcop>
</calculate>
</iterate>
- <clear-field field-name="existingOrderShipments"/>
+ <clear-field field="existingOrderShipments"/>
<find-by-and entity-name="ItemIssuance" map-name="orderShipmentLookup" list-name="existingOrderShipments"/>
<iterate list="existingOrderShipments" entry="itemIssuance">
<calculate field-name="issuedQuantity" type="Double">
@@ -1992,7 +1992,7 @@
<field-map field-name="shipmentId" from-field="parameters.shipmentId"/>
</entity-and>
<iterate entry="orderShipment" list="orderShipmentList">
- <clear-field field-name="deleteOrderShipmentMap"/>
+ <clear-field field="deleteOrderShipmentMap"/>
<set-service-fields service-name="deleteOrderShipment" map-name="orderShipment" to-map-name="deleteOrderShipmentMap"/>
<call-service service-name="deleteOrderShipment" in-map-name="deleteOrderShipmentMap"/>
</iterate>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml Tue Dec 30 04:04:24 2008
@@ -153,7 +153,7 @@
<set field="hasPermission" type="Boolean" value="true"/>
<field-to-result field-name="hasPermission"/>
<log level="info" message="Party ${userLogin.partyId} is in ${lookupRoleWorkEffortMap.roleTypeId} role with workEffort: ${workEffortId}"/>
- <clear-field field-name="workEffortId"/>
+ <clear-field field="workEffortId"/>
<else>
<log level="info" message="Party ${userLogin.partyId} is not in ${roleTypeId} role with workEffort: ${workEffortId}"/>
@@ -167,7 +167,7 @@
<find-by-primary-key entity-name="WorkEffort" map="workEffortLookUpMap" value-field="workEffortParent"/>
<set from-field="workEffortParent.workEffortParentId" field="workEffortId"/>
<if-empty field="workEffortParent.workEffortParentId">
- <clear-field field-name="workEffortId"/>
+ <clear-field field="workEffortId"/>
</if-empty>
</else>
@@ -194,7 +194,7 @@
<set field="hasPermission" type="Boolean" value="true"/>
<field-to-result field-name="hasPermission"/>
<log level="info" message="Party ${userLogin.partyId} is associated with workEffort: ${workEffortId}"/>
- <clear-field field-name="workEffortId"/>
+ <clear-field field="workEffortId"/>
<else>
<log level="info" message="Party ${userLogin.partyId} is not associated with workEffort: ${workEffortId}"/>
@@ -208,7 +208,7 @@
<find-by-primary-key entity-name="WorkEffort" map="workEffortLookUpMap" value-field="workEffortParent"/>
<set from-field="workEffortParent.workEffortParentId" field="workEffortId"/>
<if-empty field="workEffortParent.workEffortParentId">
- <clear-field field-name="workEffortId"/>
+ <clear-field field="workEffortId"/>
</if-empty>
</else>
@@ -283,7 +283,7 @@
<log level="info" message="Party ${userLogin.partyId} is associated with workEffort: ${workEffortId}"/>
</if-not-empty>
</iterate>
- <clear-field field-name="workEffortId"/>
+ <clear-field field="workEffortId"/>
<else>
<log level="info" message="Party ${userLogin.partyId} is not associated with workEffort: ${workEffortId}"/>
<property-to-field resource="WorkEffortUiLabels" property="WorkEffortNotInRolePermissionError" field-name="failMessage"/>
@@ -295,7 +295,7 @@
<find-by-primary-key entity-name="WorkEffort" map="workEffortLookUpMap" value-field="workEffortParent"/>
<set from-field="workEffortParent.workEffortParentId" field="workEffortId"/>
<if-empty field="workEffortParent.workEffortParentId">
- <clear-field field-name="workEffortId"/>
+ <clear-field field="workEffortId"/>
</if-empty>
</else>
</if-not-empty>