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 12:06:33 UTC
svn commit: r730090 [2/2] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/script/org/ofbiz/accounting/ledger/
applications/accountin...
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=730090&r1=730089&r2=730090&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 03:06:31 2008
@@ -76,7 +76,7 @@
<field-map field-name="roleTypeId" value="LTD_ADMIN"/>
</entity-and>
- <iterate entry-name="productCategoryRole" list-name="productCategoryRoles">
+ <iterate entry="productCategoryRole" list-name="productCategoryRoles">
<!-- add this new product to the category -->
<make-value value-name="newLimitMember" entity-name="ProductCategoryMember"/>
<set from-field="newEntity.productId" field="newLimitMember.productId"/>
@@ -142,7 +142,7 @@
<!-- get all productAssocs, then get the actual product to update -->
<find-by-and entity-name="ProductAssoc" map-name="variantProductAssocMap" list-name="variantProductAssocs"/>
<filter-list-by-date list-name="variantProductAssocs"/>
- <iterate entry-name="variantProductAssoc" list-name="variantProductAssocs">
+ <iterate entry="variantProductAssoc" list-name="variantProductAssocs">
<clear-field field-name="variantProduct"/>
<entity-one entity-name="Product" value-name="variantProduct" auto-field-map="false">
<field-map field-name="productId" env-name="variantProductAssoc.productIdTo"/>
@@ -202,7 +202,7 @@
<!-- if requested, duplicate related data as well -->
<if-not-empty field="parameters.duplicatePrices">
<find-by-and entity-name="ProductPrice" map-name="productFindContext" list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.productId" field="newTempValue.productId"/>
<create-value value-name="newTempValue"/>
@@ -210,7 +210,7 @@
</if-not-empty>
<if-not-empty field="parameters.duplicateIDs">
<find-by-and entity-name="GoodIdentification" map-name="productFindContext" list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.productId" field="newTempValue.productId"/>
<create-value value-name="newTempValue"/>
@@ -218,7 +218,7 @@
</if-not-empty>
<if-not-empty field="parameters.duplicateContent">
<find-by-and entity-name="ProductContent" map-name="productFindContext" list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.productId" field="newTempValue.productId"/>
<create-value value-name="newTempValue"/>
@@ -226,7 +226,7 @@
</if-not-empty>
<if-not-empty field="parameters.duplicateCategoryMembers">
<find-by-and entity-name="ProductCategoryMember" map-name="productFindContext" list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.productId" field="newTempValue.productId"/>
<create-value value-name="newTempValue"/>
@@ -234,7 +234,7 @@
</if-not-empty>
<if-not-empty field="parameters.duplicateAssocs">
<find-by-and entity-name="ProductAssoc" map-name="productFindContext" list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.productId" field="newTempValue.productId"/>
<create-value value-name="newTempValue"/>
@@ -244,7 +244,7 @@
<entity-and entity-name="ProductAssoc" list-name="foundValues">
<field-map field-name="productIdTo" env-name="parameters.oldProductId"/>
</entity-and>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.productId" field="newTempValue.productIdTo"/>
<create-value value-name="newTempValue"/>
@@ -252,7 +252,7 @@
</if-not-empty>
<if-not-empty field="parameters.duplicateAttributes">
<find-by-and entity-name="ProductAttribute" map-name="productFindContext" list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.productId" field="newTempValue.productId"/>
<create-value value-name="newTempValue"/>
@@ -260,7 +260,7 @@
</if-not-empty>
<if-not-empty field="parameters.duplicateFeatureAppls">
<find-by-and entity-name="ProductFeatureAppl" map-name="productFindContext" list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.productId" field="newTempValue.productId"/>
<create-value value-name="newTempValue"/>
@@ -268,7 +268,7 @@
</if-not-empty>
<if-not-empty field="parameters.duplicateInventoryItems">
<find-by-and entity-name="InventoryItem" map-name="productFindContext" list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<!--
NOTE: new inventory items should always be created calling the
createInventoryItem service because in this way we are sure
@@ -376,7 +376,7 @@
<store-value value-name="product"/>
<!-- expire product from all categories -->
<get-related value-name="product" relation-name="ProductCategoryMember" list-name="productCategoryMembers"/>
- <iterate entry-name="productCategoryMember" list-name="productCategoryMembers">
+ <iterate entry="productCategoryMember" list-name="productCategoryMembers">
<if-empty field="productCategoryMember.thruDate">
<set from-field="nowTimestamp" field="productCategoryMember.thruDate"/>
<store-value value-name="productCategoryMember"/>
@@ -384,7 +384,7 @@
</iterate>
<!-- expire product from all associations going to it -->
<get-related value-name="product" relation-name="AssocProductAssoc" list-name="assocProductAssocs"/>
- <iterate entry-name="assocProductAssoc" list-name="assocProductAssocs">
+ <iterate entry="assocProductAssoc" list-name="assocProductAssocs">
<if-empty field="assocProductAssoc.thruDate">
<set from-field="nowTimestamp" field="assocProductAssoc.thruDate"/>
<store-value value-name="assocProductAssoc"/>
@@ -613,18 +613,18 @@
<set value="PRODUCT_VARIANT" field="variantsFindContext.productAssocTypeId"/>
<find-by-and entity-name="ProductAssoc" map-name="variantsFindContext" list-name="variants"/>
<filter-list-by-date list-name="variants"/>
- <iterate entry-name="newProduct" list-name="variants">
+ <iterate entry="newProduct" list-name="variants">
<set from-field="newProduct.productIdTo" field="productVariantContext.productId"/>
<!-- if requested, duplicate related data -->
<if-not-empty field="parameters.duplicatePrices">
<if-not-empty field="parameters.removeBefore">
<find-by-and entity-name="ProductPrice" map-name="productVariantContext" list-name="foundVariantValues"/>
- <iterate entry-name="foundVariantValue" list-name="foundVariantValues">
+ <iterate entry="foundVariantValue" list-name="foundVariantValues">
<remove-value value-name="foundVariantValue"/>
</iterate>
</if-not-empty>
<find-by-and entity-name="ProductPrice" map-name="productFindContext" list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
<create-value value-name="newTempValue"/>
@@ -633,12 +633,12 @@
<if-not-empty field="parameters.duplicateIDs">
<if-not-empty field="parameters.removeBefore">
<find-by-and entity-name="GoodIdentification" map-name="productVariantContext" list-name="foundVariantValues"/>
- <iterate entry-name="foundVariantValue" list-name="foundVariantValues">
+ <iterate entry="foundVariantValue" list-name="foundVariantValues">
<remove-value value-name="foundVariantValue"/>
</iterate>
</if-not-empty>
<find-by-and entity-name="GoodIdentification" map-name="productFindContext" list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
<create-value value-name="newTempValue"/>
@@ -647,12 +647,12 @@
<if-not-empty field="parameters.duplicateContent">
<if-not-empty field="parameters.removeBefore">
<find-by-and entity-name="ProductContent" map-name="productVariantContext" list-name="foundVariantValues"/>
- <iterate entry-name="foundVariantValue" list-name="foundVariantValues">
+ <iterate entry="foundVariantValue" list-name="foundVariantValues">
<remove-value value-name="foundVariantValue"/>
</iterate>
</if-not-empty>
<find-by-and entity-name="ProductContent" map-name="productFindContext" list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
<create-value value-name="newTempValue"/>
@@ -661,12 +661,12 @@
<if-not-empty field="parameters.duplicateCategoryMembers">
<if-not-empty field="parameters.removeBefore">
<find-by-and entity-name="ProductCategoryMember" map-name="productVariantContext" list-name="foundVariantValues"/>
- <iterate entry-name="foundVariantValue" list-name="foundVariantValues">
+ <iterate entry="foundVariantValue" list-name="foundVariantValues">
<remove-value value-name="foundVariantValue"/>
</iterate>
</if-not-empty>
<find-by-and entity-name="ProductCategoryMember" map-name="productFindContext" list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
<create-value value-name="newTempValue"/>
@@ -675,12 +675,12 @@
<if-not-empty field="parameters.duplicateAttributes">
<if-not-empty field="parameters.removeBefore">
<find-by-and entity-name="ProductAttribute" map-name="productVariantContext" list-name="foundVariantValues"/>
- <iterate entry-name="foundVariantValue" list-name="foundVariantValues">
+ <iterate entry="foundVariantValue" list-name="foundVariantValues">
<remove-value value-name="foundVariantValue"/>
</iterate>
</if-not-empty>
<find-by-and entity-name="ProductAttribute" map-name="productFindContext" list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
<create-value value-name="newTempValue"/>
@@ -689,12 +689,12 @@
<if-not-empty field="parameters.duplicateFacilities">
<if-not-empty field="parameters.removeBefore">
<find-by-and entity-name="ProductFacility" map-name="productVariantContext" list-name="foundVariantValues"/>
- <iterate entry-name="foundVariantValue" list-name="foundVariantValues">
+ <iterate entry="foundVariantValue" list-name="foundVariantValues">
<remove-value value-name="foundVariantValue"/>
</iterate>
</if-not-empty>
<find-by-and entity-name="ProductFacility" map-name="productFindContext" list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="newProduct.productIdTo" field="newTempValue.productId"/>
<create-value value-name="newTempValue"/>
@@ -703,7 +703,7 @@
<if-not-empty field="parameters.duplicateLocations">
<if-not-empty field="parameters.removeBefore">
<find-by-and entity-name="ProductFacilityLocation" map-name="productVariantContext" list-name="foundVariantValues"/>
- <iterate entry-name="foundVariantValue" list-name="foundVariantValues">
+ <iterate entry="foundVariantValue" list-name="foundVariantValues">
<remove-value value-name="foundVariantValue"/>
</iterate>
</if-not-empty>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=730090&r1=730089&r2=730090&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 03:06:31 2008
@@ -95,7 +95,7 @@
<if-compare-field to-field="newFacilityContactMech.contactMechId" field="parameters.contactMechId" operator="not-equals">
<get-related value-name="facilityContactMech" relation-name="FacilityContactMechPurpose" list-name="facilityContactMechPurposes"/>
- <iterate entry-name="facilityContactMechPurposeOld" list-name="facilityContactMechPurposes">
+ <iterate entry="facilityContactMechPurposeOld" list-name="facilityContactMechPurposes">
<clone-value value-name="facilityContactMechPurposeOld" new-value-name="facilityContactMechPurpose"/>
<now-timestamp-to-env env-name="facilityContactMechPurposeOld.thruDate"/>
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=730090&r1=730089&r2=730090&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 03:06:31 2008
@@ -84,7 +84,7 @@
<set field="maxNumberOfOrders" type="Long" from-field="parameters.maxNumberOfOrders" set-if-empty="true"/>
<set field="numberSoFar" type="Long" value="0"/>
- <iterate entry-name="orderHeader" list-name="orderHeaderList">
+ <iterate entry="orderHeader" list-name="orderHeaderList">
<log level="info" message="Checking order #${orderHeader.orderId} to add to picklist"/>
<!-- get all ship groups, and iterate over them for each order -->
<entity-and entity-name="OrderItemShipGroup" list-name="orderItemShipGroupList">
@@ -92,7 +92,7 @@
<order-by field-name="shipGroupSeqId"/>
</entity-and>
- <iterate entry-name="orderItemShipGroup" list-name="orderItemShipGroupList">
+ <iterate entry="orderItemShipGroup" list-name="orderItemShipGroupList">
<!-- get the order items and the order item inventory res entries -->
<!-- if a shipmentMethodTypeId was not passed or is the same as the current, then process this order -->
@@ -128,7 +128,7 @@
<set value="N" field="needsStockMove"/>
<set value="Y" field="allPickStarted"/>
<set value="N" field="hasStockToPick"/>
- <iterate entry-name="orderItemShipGrpInvRes" list-name="orderItemShipGrpInvResList">
+ <iterate entry="orderItemShipGrpInvRes" list-name="orderItemShipGrpInvResList">
<get-related-one value-name="orderItemShipGrpInvRes" relation-name="OrderItem" to-value-name="orderItem"/>
<if-compare field="orderItem.statusId" value="ITEM_APPROVED" operator="not-equals">
<set value="N" field="pickThisOrder"/>
@@ -302,7 +302,7 @@
<order-by field-name="+sequenceNum"/>
</entity-condition>
- <iterate entry-name="shipmentMethodType" list-name="shipmentMethodTypeList">
+ <iterate entry="shipmentMethodType" list-name="shipmentMethodTypeList">
<if-not-empty field="pickMoveByShipmentMethodInfoMap.${shipmentMethodType.shipmentMethodTypeId}">
<field-to-list field-name="pickMoveByShipmentMethodInfoMap.${shipmentMethodType.shipmentMethodTypeId}" list-name="pickMoveByShipmentMethodInfoList"/>
</if-not-empty>
@@ -319,7 +319,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>
- <iterate entry-name="pickMoveByShipmentMethodInfo" list-name="pickMoveByShipmentMethodInfoList">
+ <iterate entry="pickMoveByShipmentMethodInfo" list-name="pickMoveByShipmentMethodInfoList">
<if>
<condition>
<or>
@@ -338,15 +338,15 @@
</iterate>
-->
- <iterate entry-name="pickMoveByShipmentMethodInfo" list-name="pickMoveByShipmentMethodInfoList">
- <iterate entry-name="orderReadyToPickInfo" list-name="pickMoveByShipmentMethodInfo.orderReadyToPickInfoList">
- <iterate entry-name="orderItemAndShipGroupAssoc" list-name="orderReadyToPickInfo.orderItemAndShipGroupAssocList">
+ <iterate entry="pickMoveByShipmentMethodInfo" list-name="pickMoveByShipmentMethodInfoList">
+ <iterate entry="orderReadyToPickInfo" list-name="pickMoveByShipmentMethodInfo.orderReadyToPickInfoList">
+ <iterate entry="orderItemAndShipGroupAssoc" list-name="orderReadyToPickInfo.orderItemAndShipGroupAssocList">
<if-compare value="ITEM_APPROVED" operator="equals" field="orderItemAndShipGroupAssoc.statusId">
<calculate field-name="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"/>
- <iterate entry-name="orderItemShipGrpInvRes" list-name="perItemResList">
+ <iterate entry="orderItemShipGrpInvRes" list-name="perItemResList">
<set from-field="orderItemShipGrpInvRes.inventoryItemId" field="inventoryItemId"/>
<!-- update reserved quantity per inventoryItem, keep track of orderItems this came from -->
<set from-field="inventoryItems.${inventoryItemId}" field="inventoryItem"/>
@@ -395,7 +395,7 @@
<!-- 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>
- <iterate entry-name="itemIssuance" list-name="itemIssuances">
+ <iterate entry="itemIssuance" list-name="itemIssuances">
<calculate field-name="issuedQuantity" type="Double">
<calcop field-name="issuedQuantity" operator="add">
<calcop field-name="itemIssuance.quantity" operator="get"/>
@@ -498,7 +498,7 @@
<!-- 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-name="orderHeaderInfo" list-name="orderHeaderInfoList">
+ <iterate entry="orderHeaderInfo" list-name="orderHeaderInfoList">
<clear-field field-name="picklistBinId"/>
<clear-field field-name="createPicklistBinMap"/>
<set from-field="picklistId" field="createPicklistBinMap.picklistId"/>
@@ -512,8 +512,8 @@
<calculate field-name="binLocationNumber" type="Long"><calcop field-name="binLocationNumber" operator="add"/><number value="1"/></calculate>
<set field="itemsInBin" type="Long" value="0"/>
- <iterate entry-name="orderItemInfo" list-name="orderHeaderInfo.orderItemInfoList">
- <iterate entry-name="orderItemShipGrpInvRes" list-name="orderItemInfo.orderItemShipGrpInvResList">
+ <iterate entry="orderItemInfo" list-name="orderHeaderInfo.orderItemInfoList">
+ <iterate entry="orderItemShipGrpInvRes" list-name="orderItemInfo.orderItemShipGrpInvResList">
<log level="info" message="Getting pick quantity : ${orderItemShipGrpInvRes.quantity} - ${orderItemShipGrpInvRes.quantityNotAvailable}"/>
<set field="quantityToPick" from-field="orderItemShipGrpInvRes.quantity"/>
<!--If a portion of the item is not available, then reduce the quantity to pick. For example,
@@ -821,7 +821,7 @@
<order-by field-name="picklistDate"/>
</entity-condition>
- <iterate entry-name="picklist" list-name="picklistList">
+ <iterate entry="picklist" list-name="picklistList">
<call-simple-method method-name="getPicklistSingleInfoInline"/>
<field-to-list field-name="picklistInfo" list-name="picklistInfoList"/>
</iterate>
@@ -847,10 +847,10 @@
<field-to-result field-name="picklistInfo"/>
<!-- Assemble the information per facility location for the pick sheet -->
- <iterate entry-name="picklistBinInfo" list-name="picklistInfo.picklistBinInfoList">
+ <iterate entry="picklistBinInfo" list-name="picklistInfo.picklistBinInfoList">
<set from-field="picklistBinInfo.picklistBin" field="picklistBinByIdMap.${picklistBinInfo.picklistBin.picklistBinId}"/>
- <iterate entry-name="picklistItemInfo" list-name="picklistBinInfo.picklistItemInfoList">
+ <iterate entry="picklistItemInfo" list-name="picklistBinInfo.picklistItemInfoList">
<!--
In this iteration through the items we want 2 things:
1. A Map with all FacilityLocation records by locationSeqId, so that we have one unique of each
@@ -918,13 +918,13 @@
<order-value-list list-name="facilityLocationList" order-by-list-name="facilityLocsOrdLst"/>
<!-- Now we have an ordered list of FacilityLocations, create a facilityLocationInfoList -->
- <iterate entry-name="facilityLocation" list-name="facilityLocationList">
+ <iterate entry="facilityLocation" list-name="facilityLocationList">
<clear-field field-name="facilityLocationInfo"/>
<set from-field="facilityLocation" field="facilityLocationInfo.facilityLocation"/>
<set from-field="picklistItemInfoListByLocationSeqIdMap.${facilityLocation.locationSeqId}" field="facilityLocationInfo.picklistItemInfoList"/>
<!-- make the pickQuantity and quantityByPicklistBinIdMap -->
- <iterate entry-name="picklistItemInfo" list-name="facilityLocationInfo.picklistItemInfoList">
+ <iterate entry="picklistItemInfo" list-name="facilityLocationInfo.picklistItemInfoList">
<calculate field-name="facilityLocationInfo.pickQuantity" type="Double">
<calcop field-name="facilityLocationInfo.pickQuantity" operator="add">
<calcop field-name="picklistItemInfo.picklistItem.quantity" operator="get"/>
@@ -971,13 +971,13 @@
<order-value-list list-name="productList" order-by-list-name="productsOrdLst"/>
<!-- Now we have an ordered list of Products, create a noLocationProductInfoList -->
- <iterate entry-name="product" list-name="productList">
+ <iterate entry="product" list-name="productList">
<clear-field field-name="productInfo"/>
<set from-field="product" field="productInfo.product"/>
<set from-field="picklistItemInfoListByProductIdMap.${product.productId}" field="productInfo.picklistItemInfoList"/>
<!-- make the pickQuantity and quantityByPicklistBinIdMap -->
- <iterate entry-name="picklistItemInfo" list-name="productInfo.picklistItemInfoList">
+ <iterate entry="picklistItemInfo" list-name="productInfo.picklistItemInfoList">
<calculate field-name="productInfo.pickQuantity" type="Double">
<calcop field-name="productInfo.pickQuantity" operator="add">
<calcop field-name="picklistItemInfo.picklistItem.quantity" operator="get"/>
@@ -1026,7 +1026,7 @@
<!-- expects a picklist GenericValue to be in the context, and creates a picklistInfo Map -->
<clear-field field-name="picklistRoleInfoList"/>
<get-related value-name="picklist" relation-name="PicklistRole" list-name="picklistRoleList"/>
- <iterate entry-name="picklistRole" list-name="picklistRoleList">
+ <iterate entry="picklistRole" list-name="picklistRoleList">
<clear-field field-name="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"/>
@@ -1036,7 +1036,7 @@
<clear-field field-name="picklistStatusHistoryInfoList"/>
<get-related value-name="picklist" relation-name="PicklistStatusHistory" list-name="picklistStatusHistoryList"/>
- <iterate entry-name="picklistStatusHistory" list-name="picklistStatusHistoryList">
+ <iterate entry="picklistStatusHistory" list-name="picklistStatusHistoryList">
<clear-field field-name="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"/>
@@ -1049,14 +1049,14 @@
<set value="+binLocationNumber" field="picklistBinOrderList[]"/>
<get-related value-name="picklist" relation-name="PicklistBin" list-name="picklistBinList" order-by-list-name="picklistBinOrderList"/>
- <iterate entry-name="picklistBin" list-name="picklistBinList">
+ <iterate entry="picklistBin" list-name="picklistBinList">
<clear-field field-name="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"/>
<get-related value-name="picklistBin" relation-name="PicklistItem" list-name="picklistItemList" use-cache="true"/>
- <iterate entry-name="picklistItem" list-name="picklistItemList">
+ <iterate entry="picklistItem" list-name="picklistItemList">
<clear-field field-name="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"/>
@@ -1171,14 +1171,14 @@
<order-value-list list-name="facilityLocations" order-by-list-name="facilityLocsOrdLst"/>
<!-- for each facility location add an entry to the inventoryItemInfoList -->
- <iterate entry-name="facilityLocation" list-name="facilityLocations">
+ <iterate entry="facilityLocation" list-name="facilityLocations">
<!-- facilityLocationInfoList: facilityLocation, productInfoList (product, quantity, inventoryItemList, orderItemList) -->
<clear-field field-name="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-name="inventoryItemId" list-name="inventoryItemIdList">
+ <iterate entry="inventoryItemId" list-name="inventoryItemIdList">
<clear-field field-name="inventoryItemInfo"/>
<set from-field="facilityLocation" field="inventoryItemInfo.facilityLocation"/>
<set from-field="inventoryItems.${inventoryItemId}" field="inventoryItemInfo.inventoryItem"/>
@@ -1197,7 +1197,7 @@
</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 -->
- <iterate entry-name="orderItem" list-name="inventoryItemInfo.orderItems">
+ <iterate entry="orderItem" list-name="inventoryItemInfo.orderItems">
<set from-field="orderItem" field="orderItemMap.${orderItem.orderId}:${orderItem.orderItemSeqId}"/>
</iterate>
</iterate>
@@ -1217,7 +1217,7 @@
</iterate>
<!-- add all noLocationInventoryItemIds to inventoryItemInfoList with all entries except facilityLocation -->
- <iterate entry-name="inventoryItemId" list-name="noLocationInventoryItemIds">
+ <iterate entry="inventoryItemId" list-name="noLocationInventoryItemIds">
<set from-field="inventoryItems${inventoryItemId}" field="inventoryItemInfo.inventoryItem"/>
<set from-field="inventoryItemOrderItems.${inventoryItemId}" field="inventoryItemInfo.orderItems"/>
<set from-field="inventoryItemQuantities.${inventoryItemId}" field="inventoryItemInfo.quantity"/>
@@ -1254,7 +1254,7 @@
<set field="allCancelled" type="Boolean" value="true"/>
<!-- determine if all the items are completed and/or cancelled -->
- <iterate entry-name="item" list-name="picklistItem">
+ <iterate entry="item" list-name="picklistItem">
<log level="info" message="checking status for item: ${item}"/>
<if-compare field="item.itemStatusId" value="PICKITEM_CANCELLED" operator="not-equals">
<log level="info" message="item is not cancelled; all cancelled set to false"/>
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=730090&r1=730089&r2=730090&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 03:06:31 2008
@@ -226,7 +226,7 @@
</entity-count>
<set field="nonProductItems" type="Long" value="0"/>
- <iterate entry-name="returnItem" list-name="returnItems">
+ <iterate entry="returnItem" list-name="returnItems">
<!-- record this return item on the return shipment as well. not sure if this is actually necessary... -->
<clear-field field-name="shipItemCtx"/>
<set from-field="shipmentId" field="shipItemCtx.shipmentId"/>
@@ -237,7 +237,7 @@
<result-to-field result-name="shipmentItemSeqId"/>
</call-service>
</iterate>
- <iterate entry-name="returnItem" list-name="returnItems">
+ <iterate entry="returnItem" list-name="returnItems">
<clear-field field-name="receiveCtx"/>
<if-empty field="returnItem.expectedItemStatus">
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=730090&r1=730089&r2=730090&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 03:06:31 2008
@@ -310,7 +310,7 @@
<entity-condition entity-name="ReturnItem" list-name="returnItems">
<condition-expr field-name="returnId" operator="equals" env-name="parameters.returnId"/>
</entity-condition>
- <iterate entry-name="returnItem" list-name="returnItems">
+ <iterate entry="returnItem" list-name="returnItems">
<clear-field field-name="shipItemCtx"/>
<set from-field="shipmentId" field="shipItemCtx.shipmentId"/>
<set from-field="returnItem.productId" field="shipItemCtx.productId"/>
@@ -342,7 +342,7 @@
<entity-condition entity-name="ReturnItem" list-name="returnItems">
<condition-expr field-name="returnId" operator="equals" env-name="parameters.primaryReturnId"/>
</entity-condition>
- <iterate entry-name="returnItem" list-name="returnItems">
+ <iterate entry="returnItem" list-name="returnItems">
<clear-field field-name="shipItemCtx"/>
<set from-field="shipmentId" field="shipItemCtx.shipmentId"/>
<set from-field="returnItem.productId" field="shipItemCtx.productId"/>
@@ -705,7 +705,7 @@
<field-map field-name="roleTypeId" value="SUPPLIER_AGENT"/>
</entity-and>
- <iterate entry-name="supplierAgentOrderRole" list-name="supplierAgentOrderRoles">
+ <iterate entry="supplierAgentOrderRole" list-name="supplierAgentOrderRoles">
<set from-field="supplierAgentOrderRole.partyId" field="sendToPartyIdMap.${supplierAgentOrderRole.partyId}"/>
</iterate>
@@ -716,7 +716,7 @@
<field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
</entity-and>
- <iterate entry-name="sendToPartyPartyAndContactMech" list-name="sendToPartyPartyAndContactMechs">
+ <iterate entry="sendToPartyPartyAndContactMech" list-name="sendToPartyPartyAndContactMechs">
<string-append field-name="sendEmailMap.sendTo" string="${sendToPartyPartyAndContactMech.infoString}" prefix=","/>
</iterate>
</iterate-map>
@@ -852,7 +852,7 @@
</entity-and>
<set field="orderShipmentQuantityLeft" from-field="parameters.newItemQuantity"/>
- <iterate entry-name="itemOrderShipment" list-name="itemOrderShipmentList">
+ <iterate entry="itemOrderShipment" list-name="itemOrderShipmentList">
<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 -->
@@ -965,7 +965,7 @@
<field-map field-name="shipmentId" env-name="shipmentId"/>
</entity-and>
- <iterate entry-name="shipmentRouteSegment" list-name="shipmentRouteSegments">
+ <iterate entry="shipmentRouteSegment" list-name="shipmentRouteSegments">
<entity-one entity-name="ShipmentPackageRouteSeg" value-name="checkShipmentPackageRouteSeg" auto-field-map="false">
<field-map field-name="shipmentId" env-name="shipmentId"/>
<field-map field-name="shipmentPackageSeqId" env-name="shipmentPackageSeqId"/>
@@ -1198,7 +1198,7 @@
<entity-and entity-name="ShipmentPackage" list-name="shipmentPackages">
<field-map field-name="shipmentId" env-name="shipmentId"/>
</entity-and>
- <iterate entry-name="shipmentPackage" list-name="shipmentPackages">
+ <iterate entry="shipmentPackage" list-name="shipmentPackages">
<entity-one entity-name="ShipmentPackageRouteSeg" value-name="checkShipmentPackageRouteSeg" auto-field-map="false">
<field-map field-name="shipmentId" env-name="shipmentId"/>
<field-map field-name="shipmentRouteSegmentId" env-name="shipmentRouteSegmentId"/>
@@ -1381,7 +1381,7 @@
<field-map field-name="orderId" env-name="parameters.orderId"/>
<field-map field-name="shipGroupSeqId" env-name="parameters.shipGroupSeqId"/>
</entity-and>
- <iterate entry-name="orderItemShipGroupAssoc" list-name="orderItemShipGroupAssocs">
+ <iterate entry="orderItemShipGroupAssoc" list-name="orderItemShipGroupAssocs">
<get-related-one relation-name="OrderItem" value-name="orderItemShipGroupAssoc" to-value-name="orderItem"/>
<!-- Set the item status to completed -->
@@ -1398,7 +1398,7 @@
<field-map field-name="orderItemAssocTypeId" value="DROP_SHIPMENT"/>
</entity-and>
<if-not-empty field="orderItemAssocs">
- <iterate entry-name="orderItemAssoc" list-name="orderItemAssocs">
+ <iterate entry="orderItemAssoc" list-name="orderItemAssocs">
<set field="itemStatusContext.orderId" from-field="orderItemAssoc.orderId"/>
<set field="itemStatusContext.orderItemSeqId" from-field="orderItemAssoc.orderItemSeqId"/>
<call-service service-name="changeOrderItemStatus" in-map-name="itemStatusContext"/>
@@ -1586,7 +1586,7 @@
</call-service>
<entity-one entity-name="Shipment" value-name="shipment"/>
<get-related value-name="orderHeader" relation-name="OrderItem" list-name="orderItems"/>
- <iterate entry-name="orderItem" list-name="orderItems">
+ <iterate entry="orderItem" list-name="orderItems">
<entity-one entity-name="Product" value-name="itemProduct" auto-field-map="false" use-cache="true">
<field-map field-name="productId" env-name="orderItem.productId"/>
</entity-one>
@@ -1991,7 +1991,7 @@
<entity-and entity-name="OrderShipment" list-name="orderShipmentList">
<field-map field-name="shipmentId" env-name="parameters.shipmentId"/>
</entity-and>
- <iterate entry-name="orderShipment" list-name="orderShipmentList">
+ <iterate entry="orderShipment" list-name="orderShipmentList">
<clear-field field-name="deleteOrderShipmentMap"/>
<set-service-fields service-name="deleteOrderShipment" map-name="orderShipment" to-map-name="deleteOrderShipmentMap"/>
<call-service service-name="deleteOrderShipment" in-map-name="deleteOrderShipmentMap"/>
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=730090&r1=730089&r2=730090&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 03:06:31 2008
@@ -268,7 +268,7 @@
<filter-list-by-date list-name="rolePartyGroups"/>
<if-not-empty field="rolePartyGroups">
<!-- Check to see if User is member of any of these Party groups -->
- <iterate entry-name="rolePartyGroup" list-name="rolePartyGroups">
+ <iterate entry="rolePartyGroup" list-name="rolePartyGroups">
<!-- check current party is the member of party group-->
<!-- PartyGroup partyId-->
<set from-field="rolePartyGroup.partyId" field="lookupPartyRoleMap.partyIdFrom"/>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=730090&r1=730089&r2=730090&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Tue Dec 30 03:06:31 2008
@@ -149,7 +149,7 @@
<set field="invoiceItemMap.taxableFlag" value="N"/>
<set field="invoiceItemMap.invoiceItemTypeId" value="INV_TE_ITEM"/>
<set field="invoiceItemMap.uomId" value="TF_hr"/>
- <iterate entry-name="timeEntry" list-name="timeEntryList">
+ <iterate entry="timeEntry" list-name="timeEntryList">
<if>
<condition>
<or>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=730090&r1=730089&r2=730090&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Tue Dec 30 03:06:31 2008
@@ -90,7 +90,7 @@
<entity-and list="custRequestContents" entity-name="CustRequestContent">
<field-map field-name="custRequestId" env-name="parameters.custRequestId"/>
</entity-and>
- <iterate entry-name="custRequestContent" list-name="custRequestContents">
+ <iterate entry="custRequestContent" list-name="custRequestContents">
<set field="newWorkEffortContent.workEffortId" from-field="newEntity.workEffortId"/>
<set field="newWorkEffortContent.contentId" from-field="custRequestContent.contentId"/>
<set field="newWorkEffortContent.workEffortContentTypeId" value="SUPPORTING_MEDIA"/>
@@ -1128,7 +1128,7 @@
<set field="reverseWorkEffortFindContext.workEffortIdTo" from-field="parameters.oldWorkEffortId"/>
<if-not-empty field="parameters.duplicateWorkEffortAssocs">
<find-by-and entity-name="WorkEffortAssoc" map-name="workEffortAssocFindContext" list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.workEffortId" field="newTempValue.workEffortIdFrom"/>
<create-value value-name="newTempValue"/>
@@ -1136,7 +1136,7 @@
<entity-and entity-name="WorkEffortAssoc" list-name="foundValues">
<field-map field-name="workEffortIdTo" env-name="parameters.oldWorkEffortId"/>
</entity-and>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.workEffortId" field="newTempValue.workEffortIdTo"/>
<create-value value-name="newTempValue"/>
@@ -1148,7 +1148,7 @@
<set field="workEffortFindContext.workEffortId" from-field="parameters.oldWorkEffortId"/>
<if-not-empty field="parameters.duplicateWorkEffortNotes">
<find-by-and entity-name="WorkEffortNote" map-name="workEffortFindContext" list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.workEffortId" field="newTempValue.workEffortId"/>
<create-value value-name="newTempValue"/>
@@ -1156,7 +1156,7 @@
</if-not-empty>
<if-not-empty field="parameters.duplicateWorkEffortContents">
<find-by-and entity-name="WorkEffortContent" map-name="workEffortFindContext" list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.workEffortId" field="newTempValue.workEffortId"/>
<create-value value-name="newTempValue"/>
@@ -1165,7 +1165,7 @@
<if-not-empty field="parameters.duplicateWorkEffortAssignmentRates">
<find-by-and entity-name="RateAmount" map-name="workEffortFindContext" list-name="foundValuesAll"/>
<filter-list-by-date list-name="foundValuesAll" to-list-name="foundValues"/>
- <iterate entry-name="foundValue" list-name="foundValues">
+ <iterate entry="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
<set from-field="parameters.workEffortId" field="newTempValue.workEffortId"/>
<create-value value-name="newTempValue"/>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml?rev=730090&r1=730089&r2=730090&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml Tue Dec 30 03:06:31 2008
@@ -28,7 +28,7 @@
<set from-field="parameters.lastName" field="LookupMap.lastName"/>
</if-not-empty>
<find-by-and entity-name="Person" map-name="LookupMap" list-name="parties" />
- <iterate entry-name="party" list-name="parties">
+ <iterate entry="party" list-name="parties">
<set from-field="party.firstName" field="resultEntry.label"/>
<set from-field="party.partyId" field="resultEntry.value"/>
<field-to-list field-name="resultEntry" list-name="lookupResult"/>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml?rev=730090&r1=730089&r2=730090&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml Tue Dec 30 03:06:31 2008
@@ -62,7 +62,7 @@
<result-to-field result-name="parentOrganizationPartyIdList"/>
</call-service>
- <iterate entry-name="curOrganizationPartyId" list-name="parentOrganizationPartyIdList">
+ <iterate entry="curOrganizationPartyId" list-name="parentOrganizationPartyIdList">
<clear-field field-name="orgTimePeriodList"/>
<entity-condition entity-name="CustomTimePeriod" list-name="orgTimePeriodList">
<condition-list combine="and">
Modified: ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml?rev=730090&r1=730089&r2=730090&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml (original)
+++ ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml Tue Dec 30 03:06:31 2008
@@ -67,7 +67,7 @@
<simple-method method-name="setupItems" short-description="">
<!-- Get Items from Cart -->
<call-object-method method-name="items" obj-field-name="cart" ret-field-name="cartItems"/>
- <iterate entry-name="item" list-name="cartItems">
+ <iterate entry="item" list-name="cartItems">
<!-- itemName -->
<call-object-method method-name="getProductId" obj-field-name="item" ret-field-name="itemName" ret-map-name="thisItem"/>
<!-- itemDesc -->
@@ -129,7 +129,7 @@
</simple-method>
<simple-method method-name="getShippingMethods" short-description="">
- <iterate entry-name="" list-name="">
+ <iterate entry="" list-name="">
<field-to-list field-name="" list-name="shippingMethods"/>
</iterate>
Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml?rev=730090&r1=730089&r2=730090&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml Tue Dec 30 03:06:31 2008
@@ -115,7 +115,7 @@
<simple-method method-name="createCommunicationEventRoles" short-description="">
<entity-condition list-name="commEvents" entity-name="CommunicationEvent" />
<set field="count" value="0" type="Integer" />
- <iterate entry-name="commEvent" list-name="commEvents">
+ <iterate entry="commEvent" list-name="commEvents">
<get-related value-name="commEvent" relation-name="CommunicationEventRole" list-name="roles" />
<if-empty field="roles">
<!--partyId To -->
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=730090&r1=730089&r2=730090&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Dec 30 03:06:31 2008
@@ -190,7 +190,7 @@
</entity-and>
<!-- check if all open assignments were completed -->
<if-not-empty field="assignments">
- <iterate entry-name="assignment" list-name="assignments">
+ <iterate entry="assignment" list-name="assignments">
<if-compare field="assignment.statusId" value="PAS_COMPLETED" operator="not-equals">
<set field="status" value="notcomplete"/>
</if-compare>
@@ -205,7 +205,7 @@
<field-map field-name="workEffortId" env-name="parameters.workEffortId"/>
</entity-and>
<if-not-empty field="custRequests">
- <iterate entry-name="custReq" list-name="custRequests">
+ <iterate entry="custReq" list-name="custRequests">
<set field="updStat.custRequestId" from-field="custReq.custRequestId"/>
<set field="updStat.statusId" value="CRQ_COMPLETED"/>
<call-service service-name="updateCustRequest" in-map-name="updStat"/>
@@ -249,7 +249,7 @@
<if-not-empty field="tasks">
<!-- remove all estimated dates -->
- <iterate entry-name="task" list-name="tasks">
+ <iterate entry="task" list-name="tasks">
<clear-field field-name="task.estimatedStartDate"/>
<clear-field field-name="task.estimatedCompletionDate"/>
</iterate>
@@ -270,7 +270,7 @@
<field-map field-name="workEffortIdTo" env-name="taskId"/>
</entity-and>
<if-not-empty field="assocs">
- <iterate entry-name="assoc" list-name="assocs">
+ <iterate entry="assoc" list-name="assocs">
<clear-field field-name="hours"/>
<set field="getTask.taskId" from-field="assoc.workEffortIdFrom"/>
<call-service service-name="getProjectTask" in-map-name="getTask">
@@ -342,10 +342,10 @@
</entity-one>
<get-related value-name="project" relation-name="ChildWorkEffort" list-name="phases"/>
<if-not-empty field="phases">
- <iterate entry-name="phase" list-name="phases">
+ <iterate entry="phase" list-name="phases">
<get-related value-name="phase" relation-name="ChildWorkEffort" list-name="tasks"/>
<if-not-empty field="tasks">
- <iterate entry-name="task" list-name="tasks">
+ <iterate entry="task" list-name="tasks">
<get-related value-name="task" relation-name="ToWorkEffortAssoc" list-name="t.prevTasks"/>
<if-empty field="t.prevTasks">
<!-- no predecessors so i can set the dates -->
@@ -414,7 +414,7 @@
<!-- update existing entries -->
<set field="hours" value="0" type="Double"/>
<if-not-empty field="timeEntries">
- <iterate entry-name="timeEntry" list-name="timeEntries">
+ <iterate entry="timeEntry" list-name="timeEntries">
<if-compare-field field="timeEntry.workEffortId" to-field="parameters.workEffortId" operator="equals">
<if-compare-field field="timeEntry.rateTypeId" to-field="parameters.rateTypeId" operator="equals">
<if-not-empty field="timeEntry.hours">
@@ -540,7 +540,7 @@
<get-related value-name="project" relation-name="WorkEffortPartyAssignment" list-name="partiesAll"/>
<filter-list-by-date list-name="partiesAll" to-list-name="parties"/>
<if-not-empty field="parties">
- <iterate entry-name="party" list-name="parties">
+ <iterate entry="party" list-name="parties">
<set field="parameters.workEffortId" from-field="newProjectId"/>
<set field="parameters.partyId" from-field="party.partyId"/>
<set field="parameters.roleTypeId" from-field="party.roleTypeId"/>
@@ -551,7 +551,7 @@
<get-related value-name="project" relation-name="ChildWorkEffort" list-name="phases"/>
<if-not-empty field="phases">
- <iterate entry-name="phase" list-name="phases">
+ <iterate entry="phase" list-name="phases">
<clear-field field-name="newPhase"/>
<if-not-empty field="toTemplate">
<set field="parameters.workEffortTypeId" value="PHASE_TEMPLATE"/>
@@ -568,7 +568,7 @@
<get-related value-name="phase" relation-name="ChildWorkEffort" list-name="tasks"/>
<if-not-empty field="tasks">
- <iterate entry-name="task" list-name="tasks">
+ <iterate entry="task" list-name="tasks">
<clear-field field-name="newTask"/>
<if-not-empty field="toTemplate">
<set field="newTask.workEffortTypeId" value="TASK_TEMPLATE"/>
@@ -612,10 +612,10 @@
<!-- loop through the related phases and tasks -->
<get-related value-name="project" relation-name="ChildWorkEffort" list-name="phases"/>
<if-not-empty field="phases">
- <iterate entry-name="phase" list-name="phases">
+ <iterate entry="phase" list-name="phases">
<get-related value-name="phase" relation-name="ChildWorkEffort" list-name="tasks"/>
<if-not-empty field="tasks">
- <iterate entry-name="lowInfo" list-name="tasks">
+ <iterate entry="lowInfo" list-name="tasks">
<if-compare field="lowInfo.currentStatusId" value="PTS_COMPLETED" operator="not-equals">
<if-compare field="lowInfo.currentStatusId" value="PTS_CANCELLED" operator="not-equals">
<set field="allTaskStatus" value="notComplete"/>
@@ -676,7 +676,7 @@
<order-by field-name="workEffortName"/>
</entity-and>
<if-not-empty field="phases">
- <iterate entry-name="phase" list-name="phases">
+ <iterate entry="phase" list-name="phases">
<!-- get the phase seq id -->
<entity-one entity-name="StatusItem" value-name="highSeq">
<field-map field-name="statusId" env-name="phase.currentStatusId"/>
@@ -691,7 +691,7 @@
<!-- loop through the related tasks and combine information -->
<get-related value-name="phase" relation-name="ChildWorkEffort" list-name="tasks"/>
<if-not-empty field="tasks">
- <iterate entry-name="lowInfo" list-name="tasks">
+ <iterate entry="lowInfo" list-name="tasks">
<if-compare field="lowInfo.currentStatusId" value="PTS_COMPLETED" operator="not-equals">
<if-compare field="lowInfo.currentStatusId" value="PTS_CANCELLED" operator="not-equals">
<set field="allTaskStatus" value="notComplete"/>
@@ -751,7 +751,7 @@
<order-by field-name="workEffortName"/>
</entity-and>
<if-not-empty field="tasks">
- <iterate entry-name="lowInfo" list-name="tasks">
+ <iterate entry="lowInfo" list-name="tasks">
<set field="highInfo.phaseName" from-field="lowInfo.phaseName"/>
<call-simple-method method-name="combineInfo"/>
<clear-field field-name="highInfo.sequenceId"/>
@@ -795,7 +795,7 @@
<order-by field-name="partyId"/>
</entity-condition>
<if-not-empty field="tasks">
- <iterate entry-name="task" list-name="tasks">
+ <iterate entry="task" list-name="tasks">
<if>
<condition>
<and>
@@ -857,7 +857,7 @@
<order-by field-name="partyId"/>
</entity-condition>
<if-not-empty field="tasks">
- <iterate entry-name="task" list-name="tasks">
+ <iterate entry="task" list-name="tasks">
<if>
<condition >
<and>
@@ -1014,7 +1014,7 @@
<!-- add the planned hours together -->
<get-related value-name="lowInfo" relation-name="WorkEffortSkillStandard" list-name="estimates"/>
<if-not-empty field="estimates">
- <iterate entry-name="estimate" list-name="estimates">
+ <iterate entry="estimate" list-name="estimates">
<if-not-empty field="estimate.estimatedDuration">
<if-not-empty field="highInfo.plannedHours">
<calculate field-name="highInfo.plannedHours">
@@ -1032,7 +1032,7 @@
<!-- get the actual billed / non billed hours -->
<get-related value-name="lowInfo" relation-name="TimeEntry" list-name="actuals"/>
<if-not-empty field="actuals">
- <iterate entry-name="actual" list-name="actuals">
+ <iterate entry="actual" list-name="actuals">
<if-not-empty field="actual.hours">
<get-related-one value-name="actual" relation-name="Timesheet" to-value-name="timesheet"/>
@@ -1266,7 +1266,7 @@
</add-error>
<check-errors/>
</if-empty>
- <iterate entry-name="task" list-name="tasks">
+ <iterate entry="task" list-name="tasks">
<if-empty field="notFirst">
<!-- first time so create invoice -->
<set-service-fields service-name="addWorkEffortTimeToNewInvoice" map-name="parameters" to-map-name="addTaskToNewInvoice"/>
@@ -1330,7 +1330,7 @@
<if-not-empty field="assigns">
<set field="addAssign.workEffortId" from-field="parameters.workEffortId"/>
<set field="addAssign.statusId" value="PAS_ASSIGNED"/>
- <iterate entry-name="assign" list-name="assigns">
+ <iterate entry="assign" list-name="assigns">
<make-value value-name="newAssign" entity-name="WorkEffortPartyAssignment"/>
<set field="newAssign.workEffortId" from-field="parameters.workEffortId"/>
<set field="newAssign.partyId" from-field="assign.partyId"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml?rev=730090&r1=730089&r2=730090&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Tue Dec 30 03:06:31 2008
@@ -82,7 +82,7 @@
</entity-and>
<!-- if all assigns are complete the task will be set to complete -->
<if-not-empty field="assigns">
- <iterate entry-name="assign" list-name="assigns">
+ <iterate entry="assign" list-name="assigns">
<set-service-fields service-name="updateTaskAssigment" map-name="assign" to-map-name="upd"/>
<set field="upd.statusId" value="PAS_COMPLETED"/>
<call-service service-name="updateTaskAssigment" in-map-name="upd"/>