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 18:12:17 UTC
svn commit: r730183 [5/6] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accoun...
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=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml Tue Dec 30 09:12:15 2008
@@ -375,7 +375,7 @@
<set from-field="nowTimestamp" field="product.salesDiscontinuationDate"/>
<store-value value-name="product"/>
<!-- expire product from all categories -->
- <get-related value-name="product" relation-name="ProductCategoryMember" list-name="productCategoryMembers"/>
+ <get-related value-field="product" relation-name="ProductCategoryMember" list="productCategoryMembers"/>
<iterate entry="productCategoryMember" list="productCategoryMembers">
<if-empty field="productCategoryMember.thruDate">
<set from-field="nowTimestamp" field="productCategoryMember.thruDate"/>
@@ -383,7 +383,7 @@
</if-empty>
</iterate>
<!-- expire product from all associations going to it -->
- <get-related value-name="product" relation-name="AssocProductAssoc" list-name="assocProductAssocs"/>
+ <get-related value-field="product" relation-name="AssocProductAssoc" list="assocProductAssocs"/>
<iterate entry="assocProductAssoc" list="assocProductAssocs">
<if-empty field="assocProductAssoc.thruDate">
<set from-field="nowTimestamp" field="assocProductAssoc.thruDate"/>
@@ -394,7 +394,7 @@
<simple-method method-name="countProductView" short-description="Count Product View" login-required="false">
<if-empty field="parameters.weight">
- <calculate field-name="parameters.weight" type="Long"><number value="1"/></calculate>
+ <calculate field="parameters.weight" type="Long"><number value="1"/></calculate>
</if-empty>
<entity-one entity-name="ProductCalculatedInfo" value-field="productCalculatedInfo"/>
<if-empty field="productCalculatedInfo">
@@ -404,9 +404,9 @@
<set from-field="parameters.weight" field="productCalculatedInfo.totalTimesViewed"/>
<create-value value-field="productCalculatedInfo"/>
<else>
- <calculate field-name="productCalculatedInfo.totalTimesViewed" type="Long">
- <calcop field-name="productCalculatedInfo.totalTimesViewed" operator="add">
- <calcop field-name="parameters.weight" operator="get"></calcop>
+ <calculate field="productCalculatedInfo.totalTimesViewed" type="Long">
+ <calcop field="productCalculatedInfo.totalTimesViewed" operator="add">
+ <calcop field="parameters.weight" operator="get"></calcop>
</calcop>
</calculate>
<store-value value-name="productCalculatedInfo"/>
@@ -426,7 +426,7 @@
</simple-method>
<simple-method method-name="countProductQuantityOrdered" short-description="Count Product Quantity Ordered" login-required="true">
<if-empty field="parameters.quantity">
- <calculate field-name="parameters.quantity" type="BigDecimal"><number value="1"/></calculate>
+ <calculate field="parameters.quantity" type="BigDecimal"><number value="1"/></calculate>
</if-empty>
<entity-one entity-name="ProductCalculatedInfo" value-field="productCalculatedInfo"/>
<if-empty field="productCalculatedInfo">
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml?rev=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml Tue Dec 30 09:12:15 2008
@@ -40,7 +40,7 @@
</if-not-empty>
<set field="createFixedAsset.instanceOfProductId" from-field="parameters.productId"/>
<call-service service-name="createFixedAsset" in-map-name="createFixedAsset">
- <result-to-field result-name="fixedAssetId" field-name="newLink.fixedAssetId"/>
+ <result-to-field result-name="fixedAssetId" field="newLink.fixedAssetId"/>
</call-service>
<set field="newLink.fixedAssetProductTypeId" value="FAPT_USE"/>
@@ -56,7 +56,7 @@
<check-errors/>
<entity-one entity-name="Product" value-field="product"/>
- <get-related relation-name="FixedAssetProduct" value-field="product" list-name="productFixedAssets"/>
+ <get-related relation-name="FixedAssetProduct" value-field="product" list="productFixedAssets"/>
<if-not-empty field="productFixedAssets">
<first-from-list list="productFixedAssets" entry="productFixedAsset"/>
<field-to-result field="productFixedAsset.fixedAssetId" result-name="fixedAssetId"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml Tue Dec 30 09:12:15 2008
@@ -42,7 +42,7 @@
<log level="info" message="Creating a FacilityContactMech with id: ${parameters.contactMechId}"/>
<set field="newValue.facilityId" from-field="parameters.facilityId" />
<field-to-result field="contactMechId" map-name="newValue"/>
- <field-to-request field-name="contactMechId" map-name="newValue"/>
+ <field-to-request field="contactMechId" map-name="newValue"/>
<set-nonpk-fields map="parameters" value-field="newValue"/>
<now-timestamp-to-env env-name="newValue.fromDate"/>
@@ -94,7 +94,7 @@
<create-value value-field="newFacilityContactMech"/>
<if-compare-field to-field="newFacilityContactMech.contactMechId" field="parameters.contactMechId" operator="not-equals">
- <get-related value-name="facilityContactMech" relation-name="FacilityContactMechPurpose" list-name="facilityContactMechPurposes"/>
+ <get-related value-field="facilityContactMech" relation-name="FacilityContactMechPurpose" list="facilityContactMechPurposes"/>
<iterate entry="facilityContactMechPurposeOld" list="facilityContactMechPurposes">
<clone-value value-name="facilityContactMechPurposeOld" new-value-name="facilityContactMechPurpose"/>
@@ -116,7 +116,7 @@
<log level="info" message="Setting id to result: ${newFacilityContactMech.contactMechId}"/>
<field-to-result field="newFacilityContactMech.contactMechId" result-name="contactMechId"/>
- <field-to-request field-name="newFacilityContactMech.contactMechId" request-name="contactMechId"/>
+ <field-to-request field="newFacilityContactMech.contactMechId" request-name="contactMechId"/>
</simple-method>
<simple-method method-name="deleteFacilityContactMech" short-description="Delete a FacilityContactMech">
@@ -161,7 +161,7 @@
<default-message>Facility Contact Mechanism successfully created</default-message>
</call-service>
- <field-to-request field-name="contactMechId" map-name="newFacilityContactMech"/>
+ <field-to-request field="contactMechId" map-name="newFacilityContactMech"/>
<field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
</simple-method>
@@ -173,7 +173,7 @@
<set-service-fields service-name="updatePostalAddress" map="parameters" to-map="updatePostalAddressMap"/>
<call-service in-map="updatePostalAddressMap" service-name="updatePostalAddress">
<default-message>Postal Address successfully updated</default-message>
- <result-to-field result-name="contactMechId" map-name="newFacilityContactMech" field-name="contactMechId" />
+ <result-to-field result-name="contactMechId" map-name="newFacilityContactMech" field="contactMechId" />
</call-service>
<set-service-fields service-name="updateFacilityContactMech" map="parameters" to-map="updateFacilityContactMechMap"/>
@@ -184,7 +184,7 @@
<call-service service-name="updateFacilityContactMech" in-map-name="updateFacilityContactMechMap">
<default-message>Facility Contact Mechanism successfully updated</default-message>
</call-service>
- <field-to-request field-name="contactMechId" map-name="newFacilityContactMech"/>
+ <field-to-request field="contactMechId" map-name="newFacilityContactMech"/>
<field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
</simple-method>
@@ -208,7 +208,7 @@
<default-message>Facility Contact Mechanism successfully created</default-message>
</call-service>
- <field-to-request field-name="contactMechId" map-name="newFacilityContactMech"/>
+ <field-to-request field="contactMechId" map-name="newFacilityContactMech"/>
<field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
</simple-method>
@@ -220,7 +220,7 @@
<set-service-fields service-name="updateTelecomNumber" map="parameters" to-map="updateTelecomNumberMap"/>
<call-service service-name="updateTelecomNumber" in-map="updateTelecomNumberMap">
<default-message>Telecom Number successfully updated</default-message>
- <result-to-field result-name="contactMechId" map-name="newFacilityContactMech" field-name="contactMechId" />
+ <result-to-field result-name="contactMechId" map-name="newFacilityContactMech" field="contactMechId" />
</call-service>
<set-service-fields service-name="updateFacilityContactMech" map="parameters" to-map="updateFacilityContactMechMap"/>
@@ -233,7 +233,7 @@
<default-message>Facility Contact Mechanism successfully updated</default-message>
</call-service>
<log level="info" message="Setting result id: ${newFacilityContactMech.contactMechId}"/>
- <field-to-request field-name="contactMechId" map-name="newFacilityContactMech"/>
+ <field-to-request field="contactMechId" map-name="newFacilityContactMech"/>
<field-to-result field="contactMechId" map-name="newFacilityContactMech"/>
</simple-method>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml?rev=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml Tue Dec 30 09:12:15 2008
@@ -60,7 +60,7 @@
<set field="pfInput.filterByDate" from-field="parameters.filterByDate" default-value="Y"/>
<call-service service-name="performFindList" in-map-name="pfInput">
- <result-to-field result-name="list" field-name="pfResultList"/>
+ <result-to-field result-name="list" field="pfResultList"/>
</call-service>
<if-empty field="pfResultList">
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=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Tue Dec 30 09:12:15 2008
@@ -38,7 +38,7 @@
<create-value value-field="newEntity"/>
<!-- if the InventoryItem issued is serialized, then change its status to DELIVERED -->
- <get-related-one value-name="newEntity" relation-name="InventoryItem" to-value-name="inventoryItem"/>
+ <get-related-one value-name="newEntity" relation-name="InventoryItem" to-value-field="inventoryItem"/>
<if-not-empty field="inventoryItem">
<if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM">
<set field="updateContext.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
@@ -188,9 +188,9 @@
<first-from-list entry="orderShipment" list="orderShipments"/>
<!-- qtyForShipmentItem is the quantity we will add to the ShipmentItem -->
<!-- OrderShipment.quantity stores the OrderItem.quantity planned in the shipment -->
- <calculate field-name="qtyForShipmentItem">
- <calcop field-name="parameters.quantity" operator="subtract">
- <calcop operator="get" field-name="orderShipment.quantity"/>
+ <calculate field="qtyForShipmentItem">
+ <calcop field="parameters.quantity" operator="subtract">
+ <calcop operator="get" field="orderShipment.quantity"/>
</calcop>
</calculate>
@@ -213,9 +213,9 @@
</if-compare>
<else>
<!-- decrement the orderShipment.quantity -->
- <calculate field-name="orderShipment.quantity">
- <calcop field-name="orderShipment.quantity" operator="subtract">
- <calcop operator="get" field-name="parameters.quantity"/>
+ <calculate field="orderShipment.quantity">
+ <calcop field="orderShipment.quantity" operator="subtract">
+ <calcop operator="get" field="parameters.quantity"/>
</calcop>
</calculate>
<store-value value-name="orderShipment"/>
@@ -232,17 +232,17 @@
<call-simple-method method-name="associateIssueRoles"/>
<!-- decrement quantity still reserved -->
- <calculate field-name="orderItemShipGrpInvRes.quantity">
+ <calculate field="orderItemShipGrpInvRes.quantity">
<calcop operator="subtract">
- <calcop operator="get" field-name="orderItemShipGrpInvRes.quantity"/>
- <calcop operator="get" field-name="parameters.quantity"/>
+ <calcop operator="get" field="orderItemShipGrpInvRes.quantity"/>
+ <calcop operator="get" field="parameters.quantity"/>
</calcop>
</calculate>
<if-compare value="0" operator="equals" field="orderItemShipGrpInvRes.quantity" type="Double">
<!-- if none left reserved, remove OIIR -->
<remove-value value-name="orderItemShipGrpInvRes"/>
<!-- if there are no more OIIRs for the orderItem, set the orderItem.statusId to ITEM_COMPLETED -->
- <get-related value-name="orderItem" relation-name="OrderItemShipGrpInvRes" list-name="otherOiirs"/>
+ <get-related value-field="orderItem" relation-name="OrderItemShipGrpInvRes" list="otherOiirs"/>
<if-empty field="otherOiirs">
<set value="ITEM_COMPLETED" field="changeOrderItemStatusMap.statusId"/>
<set from-field="orderItem.orderId" field="changeOrderItemStatusMap.orderId"/>
@@ -263,8 +263,8 @@
<set from-field="shipmentItem.shipmentId" field="createDetailMap.shipmentId"/>
<set from-field="shipmentItem.shipmentItemSeqId" field="createDetailMap.shipmentItemSeqId"/>
<set from-field="itemIssuanceId" field="createDetailMap.itemIssuanceId"/>
- <calculate field-name="createDetailMap.quantityOnHandDiff" type="Double">
- <calcop field-name="parameters.quantity" operator="negative"/>
+ <calculate field="createDetailMap.quantityOnHandDiff" type="Double">
+ <calcop field="parameters.quantity" operator="negative"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
<clear-field field="createDetailMap"/>
@@ -296,9 +296,9 @@
<set from-field="parameters.shipmentId" field="shipmentItemLookupPk.shipmentId"/>
<find-by-primary-key entity-name="ShipmentItem" map="shipmentItemLookupPk" value-field="shipmentItem"/>
<else>
- <calculate field-name="quantity" map-name="shipmentItem">
- <calcop operator="add" field-name="quantity" map-name="shipmentItem">
- <calcop operator="get" field-name="quantity" map-name="parameters"/>
+ <calculate field="quantity" map-name="shipmentItem">
+ <calcop operator="add" field="quantity" map-name="shipmentItem">
+ <calcop operator="get" field="quantity" map-name="parameters"/>
</calcop>
</calculate>
<store-value value-name="shipmentItem"/>
@@ -379,11 +379,11 @@
<set from-field="fixedAssetMaint.fixedAssetId" field="createDetailMap.fixedAssetId"/>
<set from-field="fixedAssetMaint.maintHistSeqId" field="createDetailMap.maintHistSeqId"/>
<set from-field="itemIssuanceId" field="createDetailMap.itemIssuanceId"/>
- <calculate field-name="createDetailMap.quantityOnHandDiff" type="Double">
- <calcop field-name="parameters.quantity" operator="negative"/>
+ <calculate field="createDetailMap.quantityOnHandDiff" type="Double">
+ <calcop field="parameters.quantity" operator="negative"/>
</calculate>
- <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double">
- <calcop field-name="parameters.quantity" operator="negative"/>
+ <calculate field="createDetailMap.availableToPromiseDiff" type="Double">
+ <calcop field="parameters.quantity" operator="negative"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
</simple-method>
@@ -401,11 +401,11 @@
<set from-field="itemIssuance.fixedAssetId" field="createDetailMap.fixedAssetId"/>
<set from-field="itemIssuance.maintHistSeqId" field="createDetailMap.maintHistSeqId"/>
<set from-field="itemIssuance.itemIssuanceId" field="createDetailMap.itemIssuanceId"/>
- <calculate field-name="createDetailMap.quantityOnHandDiff" type="Double">
- <calcop field-name="oldQuantity" operator="add"/>
+ <calculate field="createDetailMap.quantityOnHandDiff" type="Double">
+ <calcop field="oldQuantity" operator="add"/>
</calculate>
- <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double">
- <calcop field-name="oldQuantity" operator="add"/>
+ <calculate field="createDetailMap.availableToPromiseDiff" type="Double">
+ <calcop field="oldQuantity" operator="add"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
</simple-method>
@@ -418,9 +418,9 @@
<!-- get ItemIssuance and related entities-->
<entity-one entity-name="ItemIssuance" value-field="itemIssuance"/>
- <get-related-one value-name="itemIssuance" relation-name="OrderHeader" to-value-field="orderHeader"/>
- <get-related-one value-name="itemIssuance" relation-name="InventoryItem" to-value-name="inventoryItem"/>
- <get-related-one value-name="itemIssuance" relation-name="Shipment" to-value-name="shipment"/>
+ <get-related-one value-field="itemIssuance" relation-name="OrderHeader" to-value-field="orderHeader"/>
+ <get-related-one value-field="itemIssuance" relation-name="InventoryItem" to-value-field="inventoryItem"/>
+ <get-related-one value-name="itemIssuance" relation-name="Shipment" to-value-field="shipment"/>
<!-- issuance can be canceled only if the sales shipment is not packed -->
@@ -436,9 +436,9 @@
</if-compare>
<!-- get the quantity that can be cancelled ItemIssuance -->
- <calculate field-name="qtyIssuedLeft">
- <calcop field-name="itemIssuance.quantity" operator="subtract">
- <calcop operator="get" field-name="itemIssuance.cancelQuantity"/>
+ <calculate field="qtyIssuedLeft">
+ <calcop field="itemIssuance.quantity" operator="subtract">
+ <calcop operator="get" field="itemIssuance.cancelQuantity"/>
</calcop>
</calculate>
@@ -464,9 +464,9 @@
<check-errors/>
<!-- update ItemIssuance -->
- <calculate field-name="totalCancelQty">
- <calcop operator="add" field-name="itemIssuance.cancelQuantity"/>
- <calcop operator="add" field-name="toCancelQuantity"/>
+ <calculate field="totalCancelQty">
+ <calcop operator="add" field="itemIssuance.cancelQuantity"/>
+ <calcop operator="add" field="toCancelQuantity"/>
</calculate>
<set from-field="totalCancelQty" field="itemIssuanceUpdate.cancelQuantity"/>
<set from-field="parameters.itemIssuanceId" field="itemIssuanceUpdate.itemIssuanceId"/>
@@ -514,9 +514,9 @@
<field-map field-name="shipmentItemSeqId" from-field="parameters.shipmentItemSeqId"/>
</entity-and>
<first-from-list list="returnItemShipments" entry="returnItemShipment"/>
- <calculate field-name="quantityNotIssued">
- <calcop operator="subtract" field-name="returnItemShipment.quantity">
- <calcop operator="get" field-name="parameters.totalIssuedQty"/>
+ <calculate field="quantityNotIssued">
+ <calcop operator="subtract" field="returnItemShipment.quantity">
+ <calcop operator="get" field="parameters.totalIssuedQty"/>
</calcop>
</calculate>
<!-- make sure specified quantity is not less than or equal to 0 -->
@@ -548,11 +548,11 @@
<set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId"/>
<set field="createDetailMap.shipmentId" from-field="shipmentId"/>
<set field="createDetailMap.shipmentItemSeqId" from-field="shipmentItemSeqId"/>
- <calculate field-name="createDetailMap.quantityOnHandDiff" type="Double">
- <calcop field-name="parameters.quantity" operator="negative"/>
+ <calculate field="createDetailMap.quantityOnHandDiff" type="Double">
+ <calcop field="parameters.quantity" operator="negative"/>
</calculate>
- <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double">
- <calcop field-name="parameters.quantity" operator="negative"/>
+ <calculate field="createDetailMap.availableToPromiseDiff" type="Double">
+ <calcop field="parameters.quantity" operator="negative"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
</simple-method>
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=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Tue Dec 30 09:12:15 2008
@@ -129,13 +129,13 @@
<set value="Y" field="allPickStarted"/>
<set value="N" field="hasStockToPick"/>
<iterate entry="orderItemShipGrpInvRes" list="orderItemShipGrpInvResList">
- <get-related-one value-name="orderItemShipGrpInvRes" relation-name="OrderItem" to-value-name="orderItem"/>
+ <get-related-one value-name="orderItemShipGrpInvRes" relation-name="OrderItem" to-value-field="orderItem"/>
<if-compare field="orderItem.statusId" value="ITEM_APPROVED" operator="not-equals">
<set value="N" field="pickThisOrder"/>
</if-compare>
<if-compare field="pickThisOrder" operator="equals" value="Y">
- <get-related-one value-name="orderItemShipGrpInvRes" relation-name="InventoryItem" to-value-name="inventoryItem"/>
+ <get-related-one value-name="orderItemShipGrpInvRes" relation-name="InventoryItem" to-value-field="inventoryItem"/>
<!-- Look for other picklists which might include this order item ship group inventory reservation. If it is on another picklist, then
we should not include it again. We screen out picklists which are either cancelled or already picked or packed, so that we can re-pick items if
(1) the previous picklist was cancelled, or
@@ -199,7 +199,7 @@
</if>
<!-- check InventoryItem->FacilityLocation (if exists), if it is of type FLT_BULK set needs stock move to true -->
- <get-related-one value-name="inventoryItem" relation-name="FacilityLocation" to-value-name="facilityLocation"/>
+ <get-related-one value-name="inventoryItem" relation-name="FacilityLocation" to-value-field="facilityLocation"/>
<if-not-empty field="facilityLocation">
<if-compare field="facilityLocation.locationTypeEnumId" operator="equals" value="FLT_BULK">
<set value="Y" field="needsStockMove"/>
@@ -258,7 +258,7 @@
<!-- put in pick or move lists for the given shipmentMethodTypeId -->
<set from-field="orderItemShipGroup.shipmentMethodTypeId" field="shipmentMethodTypeId"/>
<if-empty field="pickMoveByShipmentMethodInfoMap.${shipmentMethodTypeId}">
- <get-related-one value-name="orderItemShipGroup" relation-name="ShipmentMethodType" to-value-name="pickMoveByShipmentMethodInfoMap.${shipmentMethodTypeId}.shipmentMethodType"/>
+ <get-related-one value-name="orderItemShipGroup" relation-name="ShipmentMethodType" to-value-field="pickMoveByShipmentMethodInfoMap.${shipmentMethodTypeId}.shipmentMethodType"/>
</if-empty>
<if-compare field="needsStockMove" operator="equals" value="Y">
<field-to-list field-name="orderHeaderInfo" list-name="pickMoveByShipmentMethodInfoMap.${shipmentMethodTypeId}.orderNeedsStockMoveInfoList"/>
@@ -274,8 +274,8 @@
</if-compare>
<clear-field field="orderHeaderInfo"/>
- <calculate field-name="numberSoFar" type="Long">
- <calcop field-name="numberSoFar" operator="add"><number value="1"/></calcop>
+ <calculate field="numberSoFar" type="Long">
+ <calcop field="numberSoFar" operator="add"><number value="1"/></calcop>
</calculate>
<log level="info" message="Added order #${orderHeader.orderId} to pick list [${numberSoFar} of ${parameters.maxNumberOfOrders}] - ${pickThisOrder} / ${allPickStarted}"/>
</then>
@@ -318,7 +318,7 @@
<!-- if maxNumberOfOrders is passed, get at most that many orders and go over them -->
<!-- moved above in findOrdersToPickMove
- <calculate field-name="numberSoFar" type="Long"><number value="0"/></calculate>
+ <calculate field="numberSoFar" type="Long"><number value="0"/></calculate>
<iterate entry="pickMoveByShipmentMethodInfo" list="pickMoveByShipmentMethodInfoList">
<if>
<condition>
@@ -332,8 +332,8 @@
</then>
</if>
- <calculate field-name="numberSoFar" type="Long">
- <calcop field-name="numberSoFar" operator="add"><number value="1"/></calcop>
+ <calculate field="numberSoFar" type="Long">
+ <calcop field="numberSoFar" operator="add"><number value="1"/></calcop>
</calculate>
</iterate>
-->
@@ -342,7 +342,7 @@
<iterate entry="orderReadyToPickInfo" list="pickMoveByShipmentMethodInfo.orderReadyToPickInfoList">
<iterate entry="orderItemAndShipGroupAssoc" list="orderReadyToPickInfo.orderItemAndShipGroupAssocList">
<if-compare value="ITEM_APPROVED" operator="equals" field="orderItemAndShipGroupAssoc.statusId">
- <calculate field-name="reservedQuantity" type="Double"><number value="0"/></calculate>
+ <calculate field="reservedQuantity" type="Double"><number value="0"/></calculate>
<set from-field="orderItemAndShipGroupAssoc.orderItemSeqId" field="itemFilterMap.orderItemSeqId"/>
<filter-list-by-and map-name="itemFilterMap" list-name="orderReadyToPickInfo.orderItemShipGrpInvResList" to-list-name="perItemResList"/>
@@ -363,9 +363,9 @@
<set field="inventoryItemOrderItems.${orderItemShipGrpInvRes.inventoryItemId}" from-field="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">
- <calcop field-name="orderItemShipGrpInvRes.quantity" operator="get"/>
+ <calculate field="inventoryItemQuantities.${inventoryItemId}" type="Double">
+ <calcop field="inventoryItemQuantities.${inventoryItemId}" operator="add">
+ <calcop field="orderItemShipGrpInvRes.quantity" operator="get"/>
</calcop>
</calculate>
<else>
@@ -375,9 +375,9 @@
</if-compare-field>
<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">
- <calcop field-name="orderItemShipGrpInvRes.quantity" operator="get"/>
+ <calculate field="reservedQuantity" type="Double">
+ <calcop field="reservedQuantity" operator="add">
+ <calcop field="orderItemShipGrpInvRes.quantity" operator="get"/>
</calcop>
</calculate>
</iterate>
@@ -386,26 +386,26 @@
<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"/>
+ <get-related-one value-name="orderItemAndShipGroupAssoc" relation-name="Product" to-value-field="orderItemInfo.product" use-cache="true"/>
<set field="orderItemInfoList[]" from-field="orderItemInfo"/>
</if-not-empty>
<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... -->
- <get-related value-name="orderItemAndShipGroupAssoc" relation-name="ItemIssuance" list-name="itemIssuances"/>
- <calculate field-name="issuedQuantity" type="Double"><number value="0"/></calculate>
+ <get-related value-field="orderItemAndShipGroupAssoc" relation-name="ItemIssuance" list="itemIssuances"/>
+ <calculate field="issuedQuantity" type="Double"><number value="0"/></calculate>
<iterate entry="itemIssuance" list="itemIssuances">
- <calculate field-name="issuedQuantity" type="Double">
- <calcop field-name="issuedQuantity" operator="add">
- <calcop field-name="itemIssuance.quantity" operator="get"/>
+ <calculate field="issuedQuantity" type="Double">
+ <calcop field="issuedQuantity" operator="add">
+ <calcop field="itemIssuance.quantity" operator="get"/>
</calcop>
</calculate>
</iterate>
- <calculate field-name="reservedIssuedQuantity">
+ <calculate field="reservedIssuedQuantity">
<calcop operator="add">
- <calcop operator="get" field-name="reservedQuantity"/>
- <calcop operator="get" field-name="issuedQuantity"/>
+ <calcop operator="get" field="reservedQuantity"/>
+ <calcop operator="get" field="issuedQuantity"/>
</calcop>
</calculate>
<if-compare-field field="reservedIssuedQuantity" to-field="orderItemAndShipGroupAssoc.quantity" operator="not-equals" type="Double">
@@ -497,7 +497,7 @@
<log level="info" message="Created Picklist with ID ${picklistId}"/>
<!-- 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>
+ <calculate field="binLocationNumber" type="Long"><number value="1"/></calculate>
<iterate entry="orderHeaderInfo" list="orderHeaderInfoList">
<clear-field field="picklistBinId"/>
<clear-field field="createPicklistBinMap"/>
@@ -509,7 +509,7 @@
<result-to-field result-name="picklistBinId"/>
</call-service>
- <calculate field-name="binLocationNumber" type="Long"><calcop field-name="binLocationNumber" operator="add"/><number value="1"/></calculate>
+ <calculate field="binLocationNumber" type="Long"><calcop field="binLocationNumber" operator="add"/><number value="1"/></calculate>
<set field="itemsInBin" type="Long" value="0"/>
<iterate entry="orderItemInfo" list="orderHeaderInfo.orderItemInfoList">
@@ -529,9 +529,9 @@
<then>
<set field="quantityToSubtract" from-field="orderItemShipGrpInvRes.quantityNotAvailable"/>
<log level="info" message="Subtracting ${quantityToSubtract} from ${quantityToPick}"/>
- <calculate field-name="quantityToPick" type="Double">
- <calcop field-name="quantityToPick" operator="subtract">
- <calcop field-name="quantityToSubtract" operator="get"/>
+ <calculate field="quantityToPick" type="Double">
+ <calcop field="quantityToPick" operator="subtract">
+ <calcop field="quantityToSubtract" operator="get"/>
</calcop>
</calculate>
</then>
@@ -545,7 +545,7 @@
<set-service-fields service-name="createPicklistItem" map="orderItemShipGrpInvRes" to-map="createPicklistItemMap"/>
<set field="createPicklistItemMap.quantity" from-field="quantityToPick"/>
<call-service service-name="createPicklistItem" in-map-name="createPicklistItemMap"/>
- <calculate field-name="itemsInBin">
+ <calculate field="itemsInBin">
<calcop operator="add"/>
<number value="1"/>
</calculate>
@@ -925,15 +925,15 @@
<!-- make the pickQuantity and quantityByPicklistBinIdMap -->
<iterate entry="picklistItemInfo" list="facilityLocationInfo.picklistItemInfoList">
- <calculate field-name="facilityLocationInfo.pickQuantity" type="Double">
- <calcop field-name="facilityLocationInfo.pickQuantity" operator="add">
- <calcop field-name="picklistItemInfo.picklistItem.quantity" operator="get"/>
+ <calculate field="facilityLocationInfo.pickQuantity" type="Double">
+ <calcop field="facilityLocationInfo.pickQuantity" operator="add">
+ <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
</calcop>
</calculate>
- <calculate field-name="facilityLocationInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}" type="Double">
- <calcop field-name="facilityLocationInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}" operator="add">
- <calcop field-name="picklistItemInfo.picklistItem.quantity" operator="get"/>
+ <calculate field="facilityLocationInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}" type="Double">
+ <calcop field="facilityLocationInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}" operator="add">
+ <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
</calcop>
</calculate>
@@ -978,15 +978,15 @@
<!-- make the pickQuantity and quantityByPicklistBinIdMap -->
<iterate entry="picklistItemInfo" list="productInfo.picklistItemInfoList">
- <calculate field-name="productInfo.pickQuantity" type="Double">
- <calcop field-name="productInfo.pickQuantity" operator="add">
- <calcop field-name="picklistItemInfo.picklistItem.quantity" operator="get"/>
+ <calculate field="productInfo.pickQuantity" type="Double">
+ <calcop field="productInfo.pickQuantity" operator="add">
+ <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
</calcop>
</calculate>
- <calculate field-name="productInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}" type="Double">
- <calcop field-name="productInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}" operator="add">
- <calcop field-name="picklistItemInfo.picklistItem.quantity" operator="get"/>
+ <calculate field="productInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}" type="Double">
+ <calcop field="productInfo.quantityByPicklistBinIdMap.${picklistItemInfo.picklistBin.picklistBinId}" operator="add">
+ <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
</calcop>
</calculate>
</iterate>
@@ -1025,21 +1025,21 @@
-->
<!-- expects a picklist GenericValue to be in the context, and creates a picklistInfo Map -->
<clear-field field="picklistRoleInfoList"/>
- <get-related value-name="picklist" relation-name="PicklistRole" list-name="picklistRoleList"/>
+ <get-related value-field="picklist" relation-name="PicklistRole" list="picklistRoleList"/>
<iterate entry="picklistRole" list="picklistRoleList">
<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"/>
+ <get-related-one value-name="picklistRole" relation-name="PartyNameView" to-value-field="picklistRoleInfo.partyNameView" use-cache="true"/>
+ <get-related-one value-field="picklistRole" relation-name="RoleType" to-value-field="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="picklistStatusHistoryInfoList"/>
- <get-related value-name="picklist" relation-name="PicklistStatusHistory" list-name="picklistStatusHistoryList"/>
+ <get-related value-field="picklist" relation-name="PicklistStatusHistory" list="picklistStatusHistoryList"/>
<iterate entry="picklistStatusHistory" list="picklistStatusHistoryList">
<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"/>
+ <get-related-one value-name="picklistStatusHistory" relation-name="StatusItem" to-value-field="picklistStatusHistoryInfo.statusItem" use-cache="true"/>
+ <get-related-one value-field="picklistStatusHistory" relation-name="ToStatusItem" to-value-field="picklistStatusHistoryInfo.statusItemTo" use-cache="true"/>
<set from-field="picklistStatusHistory" field="picklistStatusHistoryInfo.picklistStatusHistory"/>
<field-to-list field-name="picklistStatusHistoryInfo" list-name="picklistStatusHistoryInfoList"/>
</iterate>
@@ -1048,21 +1048,21 @@
<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"/>
+ <get-related value-field="picklist" relation-name="PicklistBin" list-name="picklistBinList" order-by-list="picklistBinOrderList"/>
<iterate entry="picklistBin" list="picklistBinList">
<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"/>
+ <get-related-one value-name="picklistBin" relation-name="PrimaryOrderHeader" to-value-field="picklistBinInfo.primaryOrderHeader"/>
+ <get-related-one value-field="picklistBin" relation-name="PrimaryOrderItemShipGroup" to-value-field="picklistBinInfo.primaryOrderItemShipGroup"/>
<clear-field field="picklistItemInfoList"/>
- <get-related value-name="picklistBin" relation-name="PicklistItem" list-name="picklistItemList" use-cache="true"/>
+ <get-related value-field="picklistBin" relation-name="PicklistItem" list="picklistItemList" use-cache="true"/>
<iterate entry="picklistItem" list="picklistItemList">
<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"/>
- <get-related-one value-name="picklistItem" relation-name="OrderItemShipGrpInvRes" to-value-name="picklistItemInfo.orderItemShipGrpInvRes"/>
- <get-related value-name="picklistItem" relation-name="ItemIssuance" list-name="picklistItemInfo.itemIssuanceList"/>
+ <get-related-one value-name="picklistItem" relation-name="OrderItem" to-value-field="picklistItemInfo.orderItem"/>
+ <get-related-one value-field="picklistItemInfo.orderItem" relation-name="Product" to-value-field="picklistItemInfo.product"/>
+ <get-related-one value-name="picklistItem" relation-name="InventoryItemAndLocation" to-value-field="picklistItemInfo.inventoryItemAndLocation"/>
+ <get-related-one value-field="picklistItem" relation-name="OrderItemShipGrpInvRes" to-value-field="picklistItemInfo.orderItemShipGrpInvRes"/>
+ <get-related value-field="picklistItem" relation-name="ItemIssuance" list="picklistItemInfo.itemIssuanceList"/>
<set from-field="picklistItem" field="picklistItemInfo.picklistItem"/>
<set from-field="picklistBin" field="picklistItemInfo.picklistBin"/>
<field-to-list field-name="picklistItemInfo" list-name="picklistItemInfoList"/>
@@ -1079,10 +1079,10 @@
<set from-field="picklistStatusHistoryInfoList" field="picklistInfo.picklistStatusHistoryInfoList"/>
<set from-field="picklistBinInfoList" field="picklistInfo.picklistBinInfoList"/>
<string-to-list string="sequenceId" list-name="orderBy"/>
- <get-related-one value-name="picklist" relation-name="StatusItem" to-value-name="picklistInfo.statusItem" use-cache="true"/>
- <get-related-one value-name="picklist" relation-name="Facility" to-value-name="picklistInfo.facility" use-cache="true"/>
- <get-related-one value-name="picklist" relation-name="ShipmentMethodType" to-value-name="picklistInfo.shipmentMethodType" use-cache="true"/>
- <get-related value-name="picklist" relation-name="StatusValidChangeToDetail" order-by-list-name="orderBy" list-name="picklistInfo.statusValidChangeToDetailList"/>
+ <get-related-one value-name="picklist" relation-name="StatusItem" to-value-field="picklistInfo.statusItem" use-cache="true"/>
+ <get-related-one value-field="picklist" relation-name="Facility" to-value-field="picklistInfo.facility" use-cache="true"/>
+ <get-related-one value-name="picklist" relation-name="ShipmentMethodType" to-value-field="picklistInfo.shipmentMethodType" use-cache="true"/>
+ <get-related value-field="picklist" relation-name="StatusValidChangeToDetail" order-by-list="orderBy" list="picklistInfo.statusValidChangeToDetailList"/>
</simple-method>
@@ -1143,7 +1143,7 @@
<!-- 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="facilityLocation"/>
- <get-related-one value-name="inventoryItem" relation-name="FacilityLocation" to-value-name="facilityLocation"/>
+ <get-related-one value-name="inventoryItem" relation-name="FacilityLocation" to-value-field="facilityLocation"/>
<if-not-empty field="facilityLocation">
<set from-field="facilityLocation" field="facilityLocationMap.${facilityLocation.locationSeqId}"/>
<!-- support multiple invnetoryItemIds per facilityLocation.locationSeqId -->
@@ -1184,16 +1184,16 @@
<set from-field="inventoryItems.${inventoryItemId}" field="inventoryItemInfo.inventoryItem"/>
<set from-field="inventoryItemOrderItems.${inventoryItemId}" field="inventoryItemInfo.orderItems"/>
<set from-field="inventoryItemQuantities.${inventoryItemId}" field="inventoryItemInfo.quantity"/>
- <get-related-one value-name="inventoryItemInfo.inventoryItem" relation-name="Product" to-value-name="inventoryItemInfo.product"/>
- <get-related-one value-name="inventoryItemInfo.inventoryItem" relation-name="StatusItem" to-value-name="inventoryItemInfo.statusItem"/>
+ <get-related-one value-name="inventoryItemInfo.inventoryItem" relation-name="Product" to-value-field="inventoryItemInfo.product"/>
+ <get-related-one value-field="inventoryItemInfo.inventoryItem" relation-name="StatusItem" to-value-field="inventoryItemInfo.statusItem"/>
<field-to-list field-name="inventoryItemInfo" list-name="inventoryItemInfoList"/>
<!-- before destroying inventoryItemInfo, add info to the productInfoMap -->
<set from-field="inventoryItemInfo.product" field="productInfoMap.${inventoryItemInfo.product.productId}.product"/>
- <calculate field-name="productInfoMap.${inventoryItemInfo.product.productId}.quantity" type="Double">
- <calcop field-name="productInfoMap.${inventoryItemInfo.product.productId}.quantity" operator="get"/>
- <calcop field-name="inventoryItemInfo.quantity" operator="get"/>
+ <calculate field="productInfoMap.${inventoryItemInfo.product.productId}.quantity" type="Double">
+ <calcop field="productInfoMap.${inventoryItemInfo.product.productId}.quantity" operator="get"/>
+ <calcop field="inventoryItemInfo.quantity" operator="get"/>
</calculate>
<set from-field="inventoryItemInfo.inventoryItem" field="productInfoMap.${inventoryItemInfo.product.productId}.inventoryItemList[]"/>
<!-- put orderItems in Map by orderId:orderItemSeqId to make sure they are unique -->
@@ -1221,8 +1221,8 @@
<set from-field="inventoryItems${inventoryItemId}" field="inventoryItemInfo.inventoryItem"/>
<set from-field="inventoryItemOrderItems.${inventoryItemId}" field="inventoryItemInfo.orderItems"/>
<set from-field="inventoryItemQuantities.${inventoryItemId}" field="inventoryItemInfo.quantity"/>
- <get-related-one value-name="inventoryItemInfo.inventoryItem" relation-name="Product" to-value-name="inventoryItemInfo.product"/>
- <get-related-one value-name="inventoryItemInfo.inventoryItem" relation-name="StatusItem" to-value-name="inventoryItemInfo.statusItem"/>
+ <get-related-one value-name="inventoryItemInfo.inventoryItem" relation-name="Product" to-value-field="inventoryItemInfo.product"/>
+ <get-related-one value-field="inventoryItemInfo.inventoryItem" relation-name="StatusItem" to-value-field="inventoryItemInfo.statusItem"/>
<set from-field="inventoryItemInfo" field="inventoryItemInfoList[]"/>
<clear-field field="inventoryItemInfo"/>
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=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Tue Dec 30 09:12:15 2008
@@ -118,7 +118,7 @@
<if-empty field="parameters.currentInventoryItemId">
<set-service-fields service-name="createInventoryItem" map="parameters" to-map="serviceInMap"/>
<call-service service-name="createInventoryItem" in-map="serviceInMap">
- <result-to-field result-name="inventoryItemId" field-name="currentInventoryItemId"/>
+ <result-to-field result-name="inventoryItemId" field="currentInventoryItemId"/>
</call-service>
<else>
@@ -137,7 +137,7 @@
<set-service-fields service-name="createInventoryItemDetail" map="parameters" to-map="serviceInMap"/>
<set field="serviceInMap.inventoryItemId" from-field="currentInventoryItemId"/>
<call-service service-name="createInventoryItemDetail" in-map-name="serviceInMap">
- <result-to-field result-name="inventoryItemDetailSeqId" field-name="parameters.inventoryItemDetailSeqId"/>
+ <result-to-field result-name="inventoryItemDetailSeqId" field="parameters.inventoryItemDetailSeqId"/>
</call-service>
</if-compare>
@@ -215,7 +215,7 @@
<!-- if no inventory item type specified, get default from facility -->
<if-empty field="parameters.inventoryItemTypeId">
- <get-related-one value-name="returnHeader" relation-name="Facility" to-value-name="facility"/>
+ <get-related-one value-name="returnHeader" relation-name="Facility" to-value-field="facility"/>
<set from-field="facility.defaultInventoryItemTypeId" field="parameters.inventoryItemTypeId"/>
</if-empty>
@@ -243,12 +243,12 @@
<if-empty field="returnItem.expectedItemStatus">
<set value="INV_RETURNED" field="returnItem.expectedItemStatus" type="String"/>
</if-empty>
- <get-related-one value-name="returnItem" relation-name="OrderItem" to-value-name="orderItem"/>
+ <get-related-one value-name="returnItem" relation-name="OrderItem" to-value-field="orderItem"/>
<if-not-empty field="orderItem.productId">
<set field="costCtx.returnItemSeqId" from-field="returnItem.returnItemSeqId"/>
<set field="costCtx.returnId" from-field="returnItem.returnId"/>
<call-service service-name="getReturnItemInitialCost" in-map-name="costCtx">
- <result-to-field result-name="initialItemCost" field-name="receiveCtx.unitCost"/>
+ <result-to-field result-name="initialItemCost" field="receiveCtx.unitCost"/>
</call-service>
<!--check if the items already have SERIALIZED inventory. If so, it still puts them back as SERIALIZED with status "Accepted."-->
<entity-count entity-name="InventoryItem" count-name="serializedItemCount">
@@ -258,7 +258,7 @@
<condition-expr field-name="inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM"/>
</condition-list>
</entity-count>
- <get-related-one value-name="returnHeader" relation-name="Facility" to-value-name="destinationFacility"/>
+ <get-related-one value-name="returnHeader" relation-name="Facility" to-value-field="destinationFacility"/>
<set field="setNonSerial" value="false"/>
<if-compare field="destinationFacility.defaultInventoryItemTypeId" value="NON_SERIAL_INV_ITEM" operator="equals">
<if-compare field="serializedItemCount" value="0" operator="equals">
@@ -287,7 +287,7 @@
<call-service service-name="receiveInventoryProduct" in-map-name="receiveCtx"/>
<else>
- <calculate field-name="nonProductItems" type="Long">
+ <calculate field="nonProductItems" type="Long">
<calcop operator="add">
<number value="1"/>
</calcop>
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=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Tue Dec 30 09:12:15 2008
@@ -60,7 +60,7 @@
<set from-field="parameters.originFacilityId" field="shipWorkEffortMap.facilityId"/>
<set from-field="userLogin.partyId" field="shipWorkEffortMap.quickAssignPartyId"/>
<call-service service-name="createWorkEffort" in-map-name="shipWorkEffortMap">
- <result-to-field result-name="workEffortId" field-name="newEntity.estimatedShipWorkEffId"/>
+ <result-to-field result-name="workEffortId" field="newEntity.estimatedShipWorkEffId"/>
</call-service>
<if-not-empty field="newEntity.partyIdFrom">
<set from-field="newEntity.estimatedShipWorkEffId" field="assignPartyToWorkEffortShip.workEffortId"/>
@@ -80,7 +80,7 @@
<set from-field="parameters.destinationFacilityId" field="arrivalWorkEffortMap.facilityId"/>
<set from-field="userLogin.partyId" field="arrivalWorkEffortMap.quickAssignPartyId"/>
<call-service service-name="createWorkEffort" in-map-name="arrivalWorkEffortMap">
- <result-to-field result-name="workEffortId" field-name="newEntity.estimatedArrivalWorkEffId"/>
+ <result-to-field result-name="workEffortId" field="newEntity.estimatedArrivalWorkEffId"/>
</call-service>
<if-not-empty field="newEntity.partyIdTo">
<set from-field="newEntity.estimatedArrivalWorkEffId" field="assignPartyToWorkEffortArrival.workEffortId"/>
@@ -756,7 +756,7 @@
<check-errors/>
<entity-one entity-name="Shipment" value-field="shipment"/>
- <get-related value-field="shipment" relation-name="ItemIssuance" list-name="issuances"/>
+ <get-related value-field="shipment" relation-name="ItemIssuance" list="issuances"/>
<iterate list="issuances" entry="issuance">
<entity-and entity-name="ShipmentReceipt" list="receipts">
<field-map field-name="shipmentId" from-field="shipment.shipmentId"/>
@@ -764,10 +764,10 @@
<field-map field-name="orderItemSeqId" from-field="issuance.orderItemSeqId"/>
</entity-and>
<iterate list="receipts" entry="receipt">
- <calculate field-name="issuanceQuantity" type="Double">
- <calcop field-name="receipt.quantityAccepted" operator="add">
- <calcop field-name="receipt.quantityRejected" operator="get"/>
- <calcop field-name="issuanceQuantity" operator="get"/>
+ <calculate field="issuanceQuantity" type="Double">
+ <calcop field="receipt.quantityAccepted" operator="add">
+ <calcop field="receipt.quantityRejected" operator="get"/>
+ <calcop field="issuanceQuantity" operator="get"/>
</calcop>
</calculate>
</iterate>
@@ -831,13 +831,13 @@
<set field="inputMap.productId" from-field="originalShipmentItem.productId"/>
<set field="inputMap.quantity" from-field="parameters.newItemQuantity"/>
<call-service service-name="createShipmentItem" in-map-name="inputMap">
- <result-to-field result-name="shipmentItemSeqId" field-name="newShipmentItemSeqId"/>
+ <result-to-field result-name="shipmentItemSeqId" field="newShipmentItemSeqId"/>
</call-service>
<!-- reduce the originalShipmentItem.quantity -->
- <calculate field-name="originalShipmentItem.quantity" type="Double">
- <calcop operator="add" field-name="originalShipmentItem.quantity">
- <calcop operator="negative" field-name="parameters.newItemQuantity"/>
+ <calculate field="originalShipmentItem.quantity" type="Double">
+ <calcop operator="add" field="originalShipmentItem.quantity">
+ <calcop operator="negative" field="parameters.newItemQuantity"/>
</calcop>
</calculate>
<!-- update the original ShipmentItem -->
@@ -858,9 +858,9 @@
<!-- there is enough in this OrderShipment record, so just adjust it and move on -->
<clear-field field="updateOrderShipmentMap"/>
<set-service-fields service-name="updateOrderShipment" map="itemOrderShipment" to-map="updateOrderShipmentMap"/>
- <calculate field-name="updateOrderShipmentMap.quantity" type="Double">
- <calcop operator="add" field-name="itemOrderShipment.quantity">
- <calcop operator="negative" field-name="orderShipmentQuantityLeft"/>
+ <calculate field="updateOrderShipmentMap.quantity" type="Double">
+ <calcop operator="add" field="itemOrderShipment.quantity">
+ <calcop operator="negative" field="orderShipmentQuantityLeft"/>
</calcop>
</calculate>
<call-service service-name="updateOrderShipment" in-map-name="updateOrderShipmentMap"/>
@@ -889,9 +889,9 @@
<set field="createOrderShipmentMap.quantity" from-field="itemOrderShipment.quantity"/>
<call-service service-name="createOrderShipment" in-map-name="createOrderShipmentMap"/>
- <calculate field-name="orderShipmentQuantityLeft" type="Double">
- <calcop operator="add" field-name="orderShipmentQuantityLeft">
- <calcop operator="negative" field-name="itemOrderShipment.quantity"></calcop>
+ <calculate field="orderShipmentQuantityLeft" type="Double">
+ <calcop operator="add" field="orderShipmentQuantityLeft">
+ <calcop operator="negative" field="itemOrderShipment.quantity"></calcop>
</calcop>
</calculate>
</else>
@@ -1039,12 +1039,12 @@
<if-empty field="shipmentPackageContent">
<set-service-fields service-name="createShipmentPackageContent" map="parameters" to-map="createSPCMap"/>
<call-service service-name="createShipmentPackageContent" in-map="createSPCMap">
- <result-to-field result-name="shipmentPackageSeqId" field-name="newEntity.shipmentPackageSeqId"/>
+ <result-to-field result-name="shipmentPackageSeqId" field="newEntity.shipmentPackageSeqId"/>
</call-service>
<else>
<!-- add the quantities and store it -->
- <calculate field-name="shipmentPackageContent.quantity" type="Double">
- <calcop field-name="shipmentPackageContent.quantity" operator="add"><calcop field-name="parameters.quantity" operator="get"/></calcop>
+ <calculate field="shipmentPackageContent.quantity" type="Double">
+ <calcop field-name="shipmentPackageContent.quantity" operator="add"><calcop field="parameters.quantity" operator="get"/></calcop>
</calculate>
<set-service-fields service-name="updateShipmentPackageContent" map="shipmentPackageContent" to-map="updateSPCMap"/>
<call-service service-name="updateShipmentPackageContent" in-map="updateSPCMap"/>
@@ -1257,8 +1257,8 @@
</or>
</condition>
<then>
- <get-related-one relation-name="StatusItem" value-name="testShipment" to-value-name="testShipmentStatus"/>
- <string-to-list string="Cannot perform operation ${operationName} when the shipment is in the ${testShipmentStatus.description} [${testShipment.statusId}] status." list-name="error_list"/>
+ <get-related-one relation-name="StatusItem" value-name="testShipment" to-value-field="testShipmentStatus"/>
+ <string-to-list string="Cannot perform operation ${operationName} when the shipment is in the ${testShipmentStatus.description} [${testShipment.statusId}] status." list="error_list"/>
</then>
</if>
</simple-method>
@@ -1364,7 +1364,7 @@
<set value="PURCH_SHIP_CREATED" field="shipmentContext.statusId"/>
<set value="DROP_SHIPMENT" field="shipmentContext.shipmentTypeId"/>
<call-service service-name="createShipment" in-map-name="shipmentContext">
- <result-to-field result-name="shipmentId" field-name="shipmentId"/>
+ <result-to-field result-name="shipmentId" field="shipmentId"/>
</call-service>
<check-errors/>
<set from-field="shipmentId" field="updateShipmentContext.shipmentId"/>
@@ -1382,7 +1382,7 @@
<field-map field-name="shipGroupSeqId" from-field="parameters.shipGroupSeqId"/>
</entity-and>
<iterate entry="orderItemShipGroupAssoc" list="orderItemShipGroupAssocs">
- <get-related-one relation-name="OrderItem" value-name="orderItemShipGroupAssoc" to-value-name="orderItem"/>
+ <get-related-one relation-name="OrderItem" value-name="orderItemShipGroupAssoc" to-value-field="orderItem"/>
<!-- Set the item status to completed -->
<set field="itemStatusContext.orderId" from-field="parameters.orderId"/>
@@ -1430,7 +1430,7 @@
<check-errors/>
</if-empty>
- <get-related relation-name="OrderItemShipGroup" value-name="orderHeader" list-name="orderItemShipGroupList"/>
+ <get-related relation-name="OrderItemShipGroup" value-field="orderHeader" list="orderItemShipGroupList"/>
<!-- group orderItems (actually OrderItemAndShipGroupAssocs) by shipGroupSeqId in a Map with List values
This Map is actually used only for sales orders' shipments right now. -->
@@ -1472,7 +1472,7 @@
</else>
</if>
<call-service service-name="createShipment" in-map-name="shipmentContext">
- <result-to-field result-name="shipmentId" field-name="shipmentLookupMap.shipmentId"/>
+ <result-to-field result-name="shipmentId" field="shipmentLookupMap.shipmentId"/>
</call-service>
<find-by-primary-key entity-name="Shipment" map="shipmentLookupMap" value-field="shipment"/>
@@ -1482,7 +1482,7 @@
<!-- just get the OrderItemShipGrpInvResAndItem records for this facility and this ship group, since that is what this shipment is for -->
<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"/>
+ <get-related value-field="orderItemAndShipGroupAssoc" relation-name="OrderItemShipGrpInvResAndItem" map-name="itemResFindMap" list="itemResList"/>
<iterate list="itemResList" entry="itemRes">
<set from-field="shipment.shipmentId" field="issueContext.shipmentId"/>
<set from-field="itemRes.orderId" field="issueContext.orderId"/>
@@ -1524,7 +1524,7 @@
<set from-field="itemIssuance.quantity" field="shipItemContext.quantity"/>
<set from-field="shipmentPackageSeqId" field="shipItemContext.shipmentPackageSeqId"/>
<call-service service-name="addShipmentContentToPackage" in-map-name="shipItemContext">
- <result-to-field result-name="shipmentPackageSeqId" field-name="shipmentPackageSeqId"/>
+ <result-to-field result-name="shipmentPackageSeqId" field="shipmentPackageSeqId"/>
</call-service>
</iterate>
@@ -1571,7 +1571,7 @@
<entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="false">
<field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/>
</entity-one>
- <get-related relation-name="OrderItemShipGroup" value-name="orderHeader" list-name="orderItemShipGroupList"/>
+ <get-related relation-name="OrderItemShipGroup" value-field="orderHeader" list="orderItemShipGroupList"/>
<iterate list="orderItemShipGroupList" entry="orderItemShipGroup">
<!-- For each shipGroup create Shipment -->
@@ -1582,10 +1582,10 @@
<set field="createShipmentContext.originFacilityId" from-field="productStore.inventoryFacilityId"/>
<set field="createShipmentContext.userLogin" from-field="parameters.userLogin"/>
<call-service service-name="createShipment" in-map-name="createShipmentContext">
- <result-to-field result-name="shipmentId" field-name="parameters.shipmentId"/>
+ <result-to-field result-name="shipmentId" field="parameters.shipmentId"/>
</call-service>
<entity-one entity-name="Shipment" value-field="shipment"/>
- <get-related value-field="orderHeader" relation-name="OrderItem" list-name="orderItems"/>
+ <get-related value-field="orderHeader" relation-name="OrderItem" list="orderItems"/>
<iterate entry="orderItem" list="orderItems">
<entity-one entity-name="Product" value-field="itemProduct" auto-field-map="false" use-cache="true">
<field-map field-name="productId" from-field="orderItem.productId"/>
@@ -1593,7 +1593,7 @@
<!-- make sure the OrderItem is for a Product that has a ProductType with isPhysical=Y -->
<if-not-empty field="itemProduct">
- <get-related-one value-name="itemProduct" relation-name="ProductType" to-value-name="itemProductType" use-cache="true"/>
+ <get-related-one value-name="itemProduct" relation-name="ProductType" to-value-field="itemProductType" use-cache="true"/>
<if-compare field="itemProductType.isPhysical" operator="equals" value="Y">
<!-- Create shipment item -->
<clear-field field="addOrderShipmentToShipmentCtx"/>
@@ -1620,12 +1620,12 @@
<make-value entity-name="OrderItemShipGrpInvRes" value-field="orderItemShipGrpInvResLookupPk"/>
<set-pk-fields value-field="orderItemShipGrpInvResLookupPk" map="parameters"/>
<find-by-primary-key entity-name="OrderItemShipGrpInvRes" map="orderItemShipGrpInvResLookupPk" value-field="orderItemShipGrpInvRes"/>
- <get-related-one to-value-name="inventoryItem" relation-name="InventoryItem" value-name="orderItemShipGrpInvRes"/>
+ <get-related-one to-value-name="inventoryItem" relation-name="InventoryItem" value-field="orderItemShipGrpInvRes"/>
<if-compare-field operator="not-equals" field="inventoryItem.serialNumber" to-field="parameters.serialNumber">
<!-- The inventory that we have reserved is not what we shipped. Lets reReserve, this time we'll get what we want -->
<set-service-fields map="parameters" to-map="reserveAnInventoryItemCtx" service-name="reserveAnInventoryItem"/>
<call-service service-name="reserveAnInventoryItem" in-map="reserveAnInventoryItemCtx">
- <result-to-field result-name="inventoryItemId" field-name="parameters.inventoryItemId"/>
+ <result-to-field result-name="inventoryItemId" field="parameters.inventoryItemId"/>
</call-service>
</if-compare-field>
</if-not-empty>
@@ -1639,7 +1639,7 @@
<set from-field="parameters.inventoryItemId" field="issueContext.inventoryItemId"/>
<set from-field="parameters.quantity" field="issueContext.quantity"/>
<call-service service-name="issueOrderItemShipGrpInvResToShipment" in-map-name="issueContext">
- <result-to-field result-name="itemIssuanceId" field-name="parameters.itemIssuanceId"/>
+ <result-to-field result-name="itemIssuanceId" field="parameters.itemIssuanceId"/>
</call-service>
<!-- place all issued items into a package for tracking num -->
<log level="info" message="QuickShipOrderByItem grouping by tracking number : ${parameters.trackingNum}"/>
@@ -1665,7 +1665,7 @@
<set from-field="itemIssuance.shipmentItemSeqId" field="shipItemContext.shipmentItemSeqId"/>
<set from-field="itemIssuance.quantity" field="shipItemContext.quantity"/>
<call-service service-name="addShipmentContentToPackage" in-map-name="shipItemContext">
- <result-to-field result-name="shipmentPackageSeqId" field-name="packageMap.${parameters.trackingNum}"/>
+ <result-to-field result-name="shipmentPackageSeqId" field="packageMap.${parameters.trackingNum}"/>
<result-to-field result-name="shipmentPackageSeqId" map-name="routeSegLookup"/>
</call-service>
@@ -1755,7 +1755,7 @@
<set from-field="parameters.shipGroupSeqId" field="shipmentContext.primaryShipGroupSeqId"/>
<set value="SHIPMENT_INPUT" field="shipmentContext.statusId"/>
<call-service service-name="createShipment" in-map-name="shipmentContext">
- <result-to-field result-name="shipmentId" field-name="shipmentLookupMap.shipmentId"/>
+ <result-to-field result-name="shipmentId" field="shipmentLookupMap.shipmentId"/>
</call-service>
<find-by-primary-key entity-name="Shipment" map="shipmentLookupMap" value-field="shipment"/>
@@ -1771,7 +1771,7 @@
<set from-field="itemMap.inventoryItemId" field="issueContext.inventoryItemId"/>
<set from-field="itemMap.qtyShipped" field="issueContext.quantity"/>
<call-service service-name="issueOrderItemShipGrpInvResToShipment" in-map-name="issueContext">
- <result-to-field result-name="itemIssuanceId" field-name="itemMap.itemIssuanceId"/>
+ <result-to-field result-name="itemIssuanceId" field="itemMap.itemIssuanceId"/>
</call-service>
</iterate>
@@ -1794,7 +1794,7 @@
<set from-field="itemIssuance.shipmentItemSeqId" field="shipItemContext.shipmentItemSeqId"/>
<set from-field="itemIssuance.quantity" field="shipItemContext.quantity"/>
<call-service service-name="addShipmentContentToPackage" in-map-name="shipItemContext">
- <result-to-field result-name="shipmentPackageSeqId" field-name="packageMap.${itemMap.trackingNum}"/>
+ <result-to-field result-name="shipmentPackageSeqId" field="packageMap.${itemMap.trackingNum}"/>
<result-to-field result-name="shipmentPackageSeqId" map-name="routeSegLookup"/>
</call-service>
@@ -1855,9 +1855,9 @@
<set from-field="parameters.orderItemSeqId" field="inMap.orderItemSeqId"/>
<call-service service-name="deleteOrderShipment" in-map-name="inMap"/>
- <calculate field-name="shipmentItem.quantity" type="Double">
- <calcop field-name="shipmentItem.quantity" operator="subtract">
- <calcop field-name="orderShipment.quantity" operator="get"/>
+ <calculate field="shipmentItem.quantity" type="Double">
+ <calcop field="shipmentItem.quantity" operator="subtract">
+ <calcop field="orderShipment.quantity" operator="get"/>
</calcop>
</calculate>
<clear-field field="inMap"/>
@@ -1916,7 +1916,7 @@
<set from-field="parameters.orderId" field="inputMap.orderId"/>
<set from-field="parameters.orderItemSeqId" field="inputMap.orderItemSeqId"/>
<call-service service-name="getQuantityForShipment" in-map-name="inputMap">
- <result-to-field result-name="remainingQuantity" field-name="remainingQuantity"/>
+ <result-to-field result-name="remainingQuantity" field="remainingQuantity"/>
</call-service>
<if-compare-field field="parameters.quantity" to-field="remainingQuantity" operator="greater" type="Double">
@@ -1929,7 +1929,7 @@
<set from-field="orderItem.productId" field="inputMap.productId"/>
<set from-field="parameters.quantity" field="inputMap.quantity"/>
<call-service service-name="createShipmentItem" in-map-name="inputMap">
- <result-to-field result-name="shipmentItemSeqId" field-name="parameters.shipmentItemSeqId"/>
+ <result-to-field result-name="shipmentItemSeqId" field="parameters.shipmentItemSeqId"/>
</call-service>
<clear-field field="inputMap"/>
<set from-field="parameters.userLogin" field="inputMap.userLogin"/>
@@ -1951,32 +1951,32 @@
<set from-field="parameters.orderItemSeqId" field="orderShipmentLookup.orderItemSeqId"/>
<find-by-and entity-name="OrderShipment" map-name="orderShipmentLookup" list-name="existingOrderShipments"/>
<iterate list="existingOrderShipments" entry="orderShipment">
- <calculate field-name="plannedQuantity" type="Double">
- <calcop field-name="plannedQuantity" operator="add">
- <calcop field-name="orderShipment.quantity" operator="get"/>
+ <calculate field="plannedQuantity" type="Double">
+ <calcop field="plannedQuantity" operator="add">
+ <calcop field="orderShipment.quantity" operator="get"/>
</calcop>
</calculate>
</iterate>
<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">
- <calcop field-name="issuedQuantity" operator="add">
- <calcop field-name="itemIssuance.quantity" operator="get"/>
- <calcop field-name="itemIssuance.cancelQuantity" operator="negative"/>
+ <calculate field="issuedQuantity" type="Double">
+ <calcop field="issuedQuantity" operator="add">
+ <calcop field="itemIssuance.quantity" operator="get"/>
+ <calcop field="itemIssuance.cancelQuantity" operator="negative"/>
</calcop>
</calculate>
</iterate>
- <calculate field-name="totPlannedOrIssuedQuantity" type="Double">
- <calcop field-name="issuedQuantity" operator="add">
- <calcop field-name="plannedQuantity" operator="get"/>
+ <calculate field="totPlannedOrIssuedQuantity" type="Double">
+ <calcop field="issuedQuantity" operator="add">
+ <calcop field="plannedQuantity" operator="get"/>
</calcop>
</calculate>
- <calculate field-name="remainingQuantity" type="Double">
- <calcop field-name="orderItem.quantity" operator="subtract">
- <calcop field-name="orderItem.cancelQuantity" operator="get"/>
- <calcop field-name="totPlannedOrIssuedQuantity" operator="get"/>
+ <calculate field="remainingQuantity" type="Double">
+ <calcop field="orderItem.quantity" operator="subtract">
+ <calcop field="orderItem.cancelQuantity" operator="get"/>
+ <calcop field="totPlannedOrIssuedQuantity" operator="get"/>
</calcop>
</calculate>
<field-to-result field="remainingQuantity"/>
@@ -1999,7 +1999,7 @@
<log level="info" message="Cancelling Item Issuances for shimpentId: ${parameters.shipmentId}"/>
<entity-one entity-name="Shipment" value-field="shipment"/>
- <get-related value-field="shipment" relation-name="ItemIssuance" list-name="issuances"/>
+ <get-related value-field="shipment" relation-name="ItemIssuance" list="issuances"/>
<iterate list="issuances" entry="issuance">
<set from-field="issuance.itemIssuanceId" field="inputMap.itemIssuanceId"/>
<call-service service-name="cancelOrderItemIssuanceFromSalesShipment" in-map-name="inputMap"/>
@@ -2054,7 +2054,7 @@
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<call-service service-name="createShipmentRouteSegment" in-map-name="shipRouteSegMap">
- <result-to-field result-name="shipmentRouteSegmentId" field-name="shipmentRouteSegmentId" map-name="routeSegMap"/>
+ <result-to-field result-name="shipmentRouteSegmentId" field="routeSegMap.shipmentRouteSegmentId"/>
</call-service>
<entity-one entity-name="ShipmentRouteSegment" value-field="shipmentRouteSegment">
<field-map field-name="shipmentId" from-field="shipRouteSegMap.shipmentId"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml?rev=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml Tue Dec 30 09:12:15 2008
@@ -167,11 +167,11 @@
<set field="serviceCtx.inventoryItemTypeId" value="NON_SERIAL_INV_ITEM"/>
<set field="serviceCtx.datetimeReceived" from-field="nowTimeStamp"/>
<call-service service-name="receiveInventoryProduct" in-map-name="serviceCtx">
- <result-to-field field-name="inventoryItemId" result-name="inventoryItemId"/>
+ <result-to-field field="inventoryItemId" result-name="inventoryItemId"/>
</call-service>
<entity-one entity-name="InventoryItem" value-field="inventoryItem"/>
- <get-related value-field="inventoryItem" relation-name="InventoryItemDetail" list-name="inventoryItemDetails"/>
+ <get-related value-field="inventoryItem" relation-name="InventoryItemDetail" list="inventoryItemDetails"/>
<entity-condition entity-name="ShipmentReceipt" list="shipmentReceipts">
<condition-expr field-name="inventoryItemId" from-field="inventoryItemId"/>
<order-by field-name="datetimeReceived"/>
Modified: ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/login/LoginSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/login/LoginSimpleEvents.xml?rev=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/login/LoginSimpleEvents.xml (original)
+++ ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/login/LoginSimpleEvents.xml Tue Dec 30 09:12:15 2008
@@ -33,7 +33,7 @@
<check-errors/>
<call-service service-name="updatePassword" in-map-name="context">
<default-message resource="SecurityextUiLabels" property="loginmapprocs.password_successfully_updated"/>
- <result-to-field result-name="updatedUserLogin" field-name="updatedUserLogin"/>
+ <result-to-field result-name="updatedUserLogin" field="updatedUserLogin"/>
</call-service>
<session-to-field field-name="userLogin"/>
<if-compare-field field="userLogin.userLoginId" operator="equals" to-field="updatedUserLogin.userLoginId">