Modified: ofbiz/trunk/applications/product/minilang/product/feature/ProductFeatureServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/feature/ProductFeatureServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/feature/ProductFeatureServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/feature/ProductFeatureServices.xml Sat Nov 5 12:41:35 2016 @@ -33,7 +33,7 @@ under the License. <field-map field-name="idCode" from-field="parameters.idCode"/> </entity-and> - <iterate entry="productFeature" list="productFeatures"> + <iterate list="productFeatures" entry="productFeature"> <set-service-fields service-name="applyFeatureToProduct" map="parameters" to-map="applyFeatureContext"/> <set field="applyFeatureContext.productFeatureId" from-field="productFeature.productFeatureId"/>
Modified: ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml Sat Nov 5 12:41:35 2016 @@ -39,7 +39,7 @@ under the License. <create-value value-field="productContent"/> <!-- set thumbnail to product --> - <!--<entity-and list="productContentAndInfos" entity-name="ProductContentAndInfo"> + <!--<entity-and entity-name="ProductContentAndInfo" list="productContentAndInfos"> <field-map field-name="productId" from-field="parameters.productId"/> <field-map field-name="contentId" from-field="parameters.contentId"/> <field-map field-name="productContentTypeId" value="DEFAULT_IMAGE"/> Modified: ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml Sat Nov 5 12:41:35 2016 @@ -133,12 +133,12 @@ under the License. <field-map field-name="productContentTypeId" value="DEFAULT_IMAGE"/> </entity-and> <if-empty field="checkDefaultImage"> - <entity-and list="contentAssocs" entity-name="ContentAssoc"> + <entity-and entity-name="ContentAssoc" list="contentAssocs"> <field-map field-name="contentId" from-field="parameters.contentId"/> <field-map field-name="contentAssocTypeId" value="IMAGE_THUMBNAIL"/> </entity-and> <if-not-empty field="contentAssocs"> - <iterate entry="contentAssoc" list="contentAssocs"> + <iterate list="contentAssocs" entry="contentAssoc"> <remove-value value-field="contentAssoc"/> <set field="removeContent.contentId" from-field="contentAssoc.contentIdTo"/> @@ -165,7 +165,7 @@ under the License. </simple-method> <simple-method method-name="removeProductContentForImageManagement" short-description="Remove Content From Product"> - <entity-and list="contentRoles" entity-name="ContentRole" > + <entity-and entity-name="ContentRole" list="contentRoles" > <field-map field-name="contentId" from-field="parameters.contentId"/> </entity-and> <if-not-empty field="contentRoles"> @@ -178,14 +178,14 @@ under the License. <condition-expr field-name="roleTypeId" value="IMAGEAPPROVER"/> </condition-list> </entity-condition> - <iterate entry="contentApproval" list="contentApprovals"> + <iterate list="contentApprovals" entry="contentApproval"> <remove-value value-field="contentApproval"/> </iterate> <entity-and entity-name="ContentKeyword" list="contentKeywords"> <field-map field-name="contentId" from-field="parameters.contentId"/> </entity-and> - <iterate entry="contentKeyword" list="contentKeywords"> + <iterate list="contentKeywords" entry="contentKeyword"> <remove-value value-field="contentKeyword"/> </iterate> @@ -197,7 +197,7 @@ under the License. <call-service service-name="removeContent" in-map-name="removeContentMap"/> <set field="dataResourceId" from-field="content.dataResourceId"/> - <entity-and list="dataResourceRoles" entity-name="DataResourceRole" > + <entity-and entity-name="DataResourceRole" list="dataResourceRoles" > <field-map field-name="dataResourceId" from-field="dataResourceId"/> </entity-and> <if-not-empty field="dataResourceRoles"> @@ -258,7 +258,7 @@ under the License. <field-map field-name="contentId" from-field="parameters.contentId"/> <field-map field-name="roleTypeId" value="IMAGEAPPROVER"/> </entity-and> - <iterate entry="contentApproval" list="contentApprovals"> + <iterate list="contentApprovals" entry="contentApproval"> <set field="contentApproval.approvalStatusId" from-field="parameters.checkStatusId"/> <store-value value-field="contentApproval"/> </iterate> @@ -281,7 +281,7 @@ under the License. <condition-expr field-name="roleTypeId" operator="equals" value="IMAGEAPPROVER"/> </condition-list> </entity-condition> - <iterate entry="checkReject" list="checkRejects"> + <iterate list="checkRejects" entry="checkReject"> <set field="checkReject.statusId" value="IM_REJECTED"/> <store-value value-field="checkReject"/> </iterate> @@ -337,7 +337,7 @@ under the License. <condition-expr field-name="roleTypeId" operator="equals" value="IMAGEAPPROVER"/> </condition-list> </entity-condition> - <iterate entry="checkApprove" list="checkApproveList"> + <iterate list="checkApproveList" entry="checkApprove"> <set field="checkApprove.approvalStatusId" value="IM_APPROVED"/> <store-value value-field="checkApprove"/> </iterate> @@ -363,7 +363,7 @@ under the License. <condition-expr field-name="roleTypeId" operator="equals" value="IMAGEAPPROVER"/> </condition-list> </entity-condition> - <iterate entry="checkApprove" list="checkApproveList"> + <iterate list="checkApproveList" entry="checkApprove"> <set field="checkApprove.approvalStatusId" value="IM_APPROVED"/> <store-value value-field="checkApprove"/> </iterate> @@ -470,14 +470,14 @@ under the License. <!--<field-map field-name="statusId" value="IM_APPROVED"/>--> </condition-list> </entity-condition> - <iterate entry="productContentAndInfo" list="productContentAndInfos"> + <iterate list="productContentAndInfos" entry="productContentAndInfo"> <entity-and list="contentAssocs" entity-name="ContentAssoc"> <field-map field-name="contentId" from-field="productContentAndInfo.contentId"/> <field-map field-name="contentAssocTypeId" value="IMAGE_THUMBNAIL"/> <field-map field-name="mapKey" from-field="parameters.mapKey"/> </entity-and> <if-not-empty field="contentAssocs"> - <iterate entry="contentAssoc" list="contentAssocs"> + <iterate list="contentAssocs" entry="contentAssoc"> <remove-value value-field="contentAssoc"/> <set field="removeContent.contentId" from-field="contentAssoc.contentIdTo"/> Modified: ofbiz/trunk/applications/product/minilang/product/inventory/InventoryIssueServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/inventory/InventoryIssueServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/inventory/InventoryIssueServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/inventory/InventoryIssueServices.xml Sat Nov 5 12:41:35 2016 @@ -116,7 +116,7 @@ under the License. <set field="parameters.quantityNotIssued" from-field="orderItem.quantity"/> - <iterate entry="inventoryItem" list="inventoryItemList"> + <iterate list="inventoryItemList" entry="inventoryItem"> <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names --> <call-simple-method method-name="issueImmediateForInventoryItemInline"/> </iterate> @@ -221,7 +221,7 @@ under the License. <and> <or> <if-empty field="inventoryItem.statusId"/> - <if-compare operator="equals" field="inventoryItem.statusId" value="INV_AVAILABLE"/> + <if-compare field="inventoryItem.statusId" operator="equals" value="INV_AVAILABLE"/> </or> <not><if-empty field="inventoryItem.availableToPromiseTotal"/></not> <if-compare field="inventoryItem.availableToPromiseTotal" operator="greater" value="0" type="BigDecimal"/> Modified: ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml Sat Nov 5 12:41:35 2016 @@ -94,7 +94,7 @@ under the License. </condition-list> <order-by field-name="${orderByString}"/> </entity-condition> - <iterate entry="inventoryItemAndLocation" list="inventoryItemAndLocations"> + <iterate list="inventoryItemAndLocations" entry="inventoryItemAndLocation"> <if-compare field="parameters.quantityNotReserved" operator="greater" value="0" type="Double"> <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names --> <make-value entity-name="InventoryItem" map="inventoryItemAndLocation" value-field="inventoryItem"/> @@ -117,7 +117,7 @@ under the License. </condition-list> <order-by field-name="${orderByString}"/> </entity-condition> - <iterate entry="inventoryItemAndLocation" list="inventoryItemAndLocations"> + <iterate list="inventoryItemAndLocations" entry="inventoryItemAndLocation"> <if-compare field="parameters.quantityNotReserved" operator="greater" value="0" type="Double"> <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names --> <make-value entity-name="InventoryItem" map="inventoryItemAndLocation" value-field="inventoryItem"/> @@ -141,7 +141,7 @@ under the License. </condition-list> <order-by field-name="${orderByString}"/> </entity-condition> - <iterate entry="inventoryItem" list="inventoryItems"> + <iterate list="inventoryItems" entry="inventoryItem"> <if> <condition> <and> @@ -564,7 +564,7 @@ under the License. <log level="verbose" message="OISGIR Cancel for single item : ${oisgirListLookupMap}"/> </if-not-empty> <find-by-and entity-name="OrderItemShipGrpInvRes" map="oisgirListLookupMap" list="oisgirList" use-cache="false"/> - <iterate entry="oisgir" list="oisgirList"> + <iterate list="oisgirList" entry="oisgir"> <set from-field="oisgir.orderId" field="cancelOisgirMap.orderId"/> <set from-field="oisgir.orderItemSeqId" field="cancelOisgirMap.orderItemSeqId"/> <set from-field="oisgir.shipGroupSeqId" field="cancelOisgirMap.shipGroupSeqId"/> @@ -593,7 +593,7 @@ under the License. <set from-field="parameters.orderItemSeqId" field="oisgirListLookupMap.orderItemSeqId"/> <set from-field="parameters.shipGroupSeqId" field="oisgirListLookupMap.shipGroupSeqId"/> <find-by-and entity-name="OrderItemShipGrpInvRes" map="oisgirListLookupMap" list="oisgirList" use-cache="false"/> - <iterate entry="oisgir" list="oisgirList"> + <iterate list="oisgirList" entry="oisgir"> <if-compare field="toCancelAmount" operator="greater" value="0" type="BigDecimal"> <if-compare-field field="oisgir.quantity" to-field="toCancelAmount" operator="greater-equals" type="BigDecimal"> <set from-field="toCancelAmount" field="cancelOisgirMap.cancelQuantity"/> Modified: ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml Sat Nov 5 12:41:35 2016 @@ -114,7 +114,7 @@ under the License. <!-- Create a lot before --> <entity-one value-field="product" entity-name="Product"> - <field-map from-field="parameters.productId" field-name="productId"/> + <field-map field-name="productId" from-field="parameters.productId"/> </entity-one> <!-- Check if this product can or not have a lotId --> @@ -154,7 +154,7 @@ under the License. <if-compare operator="equals" value="N" field="parameters.isReturned"> <if-not-empty field="parameters.lotId"> <!-- Check if the lot already exists --> - <entity-and list="lotList" entity-name="Lot"> + <entity-and entity-name="Lot" list="lotList"> <field-map field-name="lotId" from-field="parameters.lotId" /> </entity-and> <if-empty field="lotList"> @@ -304,7 +304,7 @@ under the License. <set field="oldUnitCost" from-field="lookedUpValue.unitCost"/> <if-not-empty field="parameters.lotId"> <!-- Check if the lot already exists --> - <entity-and list="lotList" entity-name="Lot"> + <entity-and entity-name="Lot" list="lotList"> <field-map field-name="lotId" from-field="parameters.lotId" /> </entity-and> <if-empty field="lotList"> @@ -629,7 +629,7 @@ under the License. <set field="parameters.availableToPromiseTotal" value="0" type="BigDecimal"/> <set field="parameters.quantityOnHandTotal" value="0" type="BigDecimal"/> - <iterate entry="inventoryItem" list="inventoryItems"> + <iterate list="inventoryItems" entry="inventoryItem"> <!-- NOTE: this code no longer distinguishes between serialized and non-serialized because both now have availableToPromiseTotal and quantityOnHandTotal populated (for serialized are based on status, non-serialized are based on InventoryItemDetail) --> <if> <condition> @@ -915,8 +915,8 @@ under the License. <if-compare-field field="parameters.statusId" to-field="inventoryTransfer.statusId" operator="not-equals"> <!-- make sure a StatusValidChange record exists, if not return error --> <entity-one entity-name="StatusValidChange" value-field="checkStatusValidChange" auto-field-map="false"> - <field-map from-field="inventoryTransfer.statusId" field-name="statusId"/> - <field-map from-field="parameters.statusId" field-name="statusIdTo"/> + <field-map field-name="statusId" from-field="inventoryTransfer.statusId"/> + <field-map field-name="statusIdTo" from-field="parameters.statusId"/> </entity-one> <if-empty field="checkStatusValidChange"> <set value="ERROR: Changing the status from ${inventoryTransfer.statusId} to ${parameters.statusId} is not allowed." field="error_list[]"/> @@ -975,7 +975,7 @@ under the License. <set from-field="parameters.quantity" field="quantityNotTransferred"/> <set field="locationTypeEnumIds" value="${groovy: ['FLT_PICKLOC', 'FLT_BULK', null]}"/> - <iterate entry="locationTypeEnumId" list="locationTypeEnumIds"> + <iterate list="locationTypeEnumIds" entry="locationTypeEnumId"> <find-by-and entity-name="InventoryItemAndLocation" map="lookupFieldMap" list="inventoryItemAndLocations" use-iterator="true" order-by-list="orderByList"/> <entity-condition list="inventoryItemAndLocations" entity-name="InventoryItemAndLocation"> <condition-list> @@ -988,7 +988,7 @@ under the License. <order-by field-name="${orderByString}"/> </entity-condition> <!-- first transfer InventoryItems in FLT_PICKLOC type locations, then FLT_BULK locations, then InventoryItems with no locations --> - <iterate entry="inventoryItemAndLocation" list="inventoryItemAndLocations"> + <iterate list="inventoryItemAndLocations" entry="inventoryItemAndLocation"> <clear-field field="inputMap"/> <set field="inputMap.inventoryItemId" from-field="inventoryItemAndLocation.inventoryItemId"/> <if-empty field="parameters.statusId"> @@ -1083,10 +1083,10 @@ under the License. </entity-one> <set field="priority" from-field="parameters.priority"/> <if-empty field="priority"> - <entity-and list="oisgirs" entity-name="OrderItemShipGrpInvRes"> + <entity-and entity-name="OrderItemShipGrpInvRes" list="oisgirs"> <field-map field-name="orderId" from-field="orderId"/> </entity-and> - <iterate entry="oisgir" list="oisgirs"> + <iterate list="oisgirs" entry="oisgir"> <set field="oisgir.priority" default-value="2"/> <store-value value-field="oisgir"/> </iterate> @@ -1095,10 +1095,10 @@ under the License. <else> <set field="orderHeader.priority" from-field="priority"/> <store-value value-field="orderHeader"/> - <entity-and list="oisgirs" entity-name="OrderItemShipGrpInvRes"> + <entity-and entity-name="OrderItemShipGrpInvRes" list="oisgirs"> <field-map field-name="orderId" from-field="orderId"/> </entity-and> - <iterate entry="oisgir" list="oisgirs"> + <iterate list="oisgirs" entry="oisgir"> <set field="oisgir.priority" from-field="priority"/> <store-value value-field="oisgir"/> <clear-field field="oisgir"/> @@ -1106,7 +1106,7 @@ under the License. <entity-condition entity-name="OrderItemAndShipGrpInvResAndItem" list="oisgirais"> <condition-expr field-name="orderId" operator="equals" from-field="orderId"/> </entity-condition> - <iterate entry="oisgir" list="oisgirais"> + <iterate list="oisgirais" entry="oisgir"> <set field="reassignInventoryReservationsCtx.productId" from-field="oisgir.productId"/> <set field="reassignInventoryReservationsCtx.facilityId" from-field="oisgir.facilityId"/> <call-service service-name="reassignInventoryReservations" in-map-name="reassignInventoryReservationsCtx"/> @@ -1119,7 +1119,7 @@ under the License. <entity-one value-field="inventoryItem" entity-name="InventoryItem" auto-field-map="false"> <field-map field-name="inventoryItemId" from-field="parameters.inventoryItemId"/> </entity-one> - <entity-and list="productFacilities" entity-name="ProductFacility"> + <entity-and entity-name="ProductFacility" list="productFacilities"> <field-map field-name="productId" from-field="inventoryItem.productId" /> </entity-and> <if-not-empty field="productFacilities"> Modified: ofbiz/trunk/applications/product/minilang/product/inventory/StockMoveServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/inventory/StockMoveServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/inventory/StockMoveServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/inventory/StockMoveServices.xml Sat Nov 5 12:41:35 2016 @@ -49,7 +49,7 @@ under the License. - orderItemShipGrpInvResInfoList (to be done later if we need it) --> <!-- start by making a Map where the locationSeqId is the key and the value is a List of orderItemShipGrpInvResAndItemLocation --> - <iterate entry="orderItemShipGrpInvResAndItemLocation" list="orderItemShipGrpInvResAndItemLocationList"> + <iterate list="orderItemShipGrpInvResAndItemLocationList" entry="orderItemShipGrpInvResAndItemLocation"> <field-to-list field="orderItemShipGrpInvResAndItemLocation" list="oiirailByLocMap[orderItemShipGrpInvResAndItemLocation.locationSeqId]"/> </iterate> @@ -57,7 +57,7 @@ under the License. <iterate-map key="locationSeqId" value="perLocationOiirailList" map="oiirailByLocMap"> <!-- now for more fun, split up by productId; this should generally not happen, but we'll make sure here --> <clear-field field="oiirailByProdMap"/> - <iterate entry="orderItemShipGrpInvResAndItemLocation" list="perLocationOiirailList"> + <iterate list="perLocationOiirailList" entry="orderItemShipGrpInvResAndItemLocation"> <field-to-list field="orderItemShipGrpInvResAndItemLocation" list="oiirailByProdMap[orderItemShipGrpInvResAndItemLocation.productId]"/> </iterate> @@ -90,7 +90,7 @@ under the License. <!-- get totalQuantity: iterate through perProductOiirailList and add up quantity (from OrderItemShipGrpInvRes) --> <calculate field="moveInfo.totalQuantity"><number value="0"/></calculate> - <iterate entry="perProductOiirail" list="perProductOiirailList"> + <iterate list="perProductOiirailList" entry="perProductOiirail"> <calculate field="moveInfo.totalQuantity"> <calcop field="moveInfo.totalQuantity" operator="add"><calcop field="perProductOiirail.quantity" operator="get"/></calcop> </calculate> @@ -105,7 +105,7 @@ under the License. <calculate field="totalQuantityOnHand"><number value="0"/></calculate> <calculate field="totalAvailableToPromise"><number value="0"/></calculate> - <iterate entry="inventoryItem" list="inventoryItemList"> + <iterate list="inventoryItemList" entry="inventoryItem"> <calculate field="totalQuantityOnHand"> <calcop field="totalQuantityOnHand" operator="get"/> <calcop field="inventoryItem.quantityOnHandTotal" operator="get"/> @@ -128,7 +128,7 @@ under the License. <get-related value-field="moveInfo.targetProductFacilityLocation" relation-name="InventoryItem" list="targetInventoryItemList"/> <calculate field="targetTotalAvailableToPromise"><number value="0"/></calculate> <calculate field="targetTotalQuantityOnHand"><number value="0"/></calculate> - <iterate entry="inventoryItem" list="targetInventoryItemList"> + <iterate list="targetInventoryItemList" entry="inventoryItem"> <calculate field="targetTotalAvailableToPromise"> <calcop field="targetTotalAvailableToPromise" operator="add"><calcop field="inventoryItem.availableToPromiseTotal" operator="get"/></calcop> </calculate> @@ -215,7 +215,7 @@ under the License. <order-by field-name="productId"/> </entity-and> - <iterate entry="productFacilityLocationQuantityTest" list="productFacilityLocationQuantityTestList"> + <iterate list="productFacilityLocationQuantityTestList" entry="productFacilityLocationQuantityTest"> <!-- TODO: this comparison could be done by the database and be more efficient, but since we don't have field to field comparisons in the entity engine or EntityCondition operations in simple-methods, some work needs to be done before that can happen --> <set field="minimumStock" from-field="productFacilityLocationQuantityTest.minimumStock" default-value="0" type="BigDecimal"/> <if> @@ -263,7 +263,7 @@ under the License. <set from-field="productFacilityLocationQuantityTest.moveQuantity" field="targetLocationMoveQuantity"/> <!-- start by making a Map where the locationSeqId is the key and the value is a List of InventoryItemAndLocation --> <clear-field field="InventoryItemAndLocationByLocMap"/> - <iterate entry="InventoryItemAndLocation" list="inventoryItemAndLocationList"> + <iterate list="inventoryItemAndLocationList" entry="InventoryItemAndLocation"> <field-to-list field="InventoryItemAndLocation" list="InventoryItemAndLocationByLocMap[InventoryItemAndLocation.locationSeqId]"/> </iterate> <clear-field field="locationSeqId"/> @@ -272,7 +272,7 @@ under the License. <if-empty field="fromLocationTotalAvailableToPromise[locationSeqId]"> <calculate field="totalQuantityOnHand"><number value="0"/></calculate> <calculate field="totalAvailableToPromise"><number value="0"/></calculate> - <iterate entry="inventoryItem" list="perLocationInventoryItemAndLocList"> + <iterate list="perLocationInventoryItemAndLocList" entry="inventoryItem"> <calculate field="totalQuantityOnHand"> <calcop field="totalQuantityOnHand" operator="add"><calcop field="inventoryItem.quantityOnHandTotal" operator="get"/></calcop> </calculate> @@ -370,7 +370,7 @@ under the License. <order-by field-name="datetimeReceived"/> </entity-and> - <iterate entry="inventoryItem" list="inventoryItemList"> + <iterate list="inventoryItemList" entry="inventoryItem"> <!-- for each inventoryItem only process if quantityLeftToProcess > 0 and inventoryItem.availableToPromiseTotal > 0 --> <if-compare field="quantityLeftToProcess" operator="greater" value="0" type="BigDecimal"> <if-compare field="inventoryItem.availableToPromiseTotal" operator="greater" value="0" type="BigDecimal"> @@ -434,7 +434,7 @@ under the License. <clear-field field="oiirailByInvItemMap"/> <log level="info" message="In processOisgirMoveByStatusInline orderItemShipGrpInvResAndItemLocationList=${orderItemShipGrpInvResAndItemLocationList}"/> - <iterate entry="orderItemShipGrpInvResAndItemLocation" list="orderItemShipGrpInvResAndItemLocationList"> + <iterate list="orderItemShipGrpInvResAndItemLocationList" entry="orderItemShipGrpInvResAndItemLocation"> <field-to-list field="orderItemShipGrpInvResAndItemLocation" list="oiirailByInvItemMap[orderItemShipGrpInvResAndItemLocation.inventoryItemId]"/> </iterate> @@ -473,7 +473,7 @@ under the License. sure to stay within quantityOnHand --> <set from-field="inventoryItem.quantityOnHandTotal" field="remainingQuantityOnHand"/> - <iterate entry="orderItemShipGrpInvResAndItemLocation" list="orderItemShipGrpInvResAndItemLocationList"> + <iterate list="orderItemShipGrpInvResAndItemLocationList" entry="orderItemShipGrpInvResAndItemLocation"> <get-related-one value-field="orderItemShipGrpInvResAndItemLocation" relation-name="OrderItemShipGrpInvRes" to-value-field="orderItemShipGrpInvRes"/> <!-- see if there is enough physically moved over to move this reservation --> Modified: ofbiz/trunk/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml Sat Nov 5 12:41:35 2016 @@ -126,7 +126,7 @@ under the License. <check-errors/> <!-- keep the product around, just expire SupplierProduct and ProductCategoryMember records --> - <iterate entry="supplierProduct" list="supplierProductList"> + <iterate list="supplierProductList" entry="supplierProduct"> <set field="supplierProduct.availableThruDate" from-field="nowTimestamp"/> <store-value value-field="supplierProduct"/> </iterate> @@ -134,7 +134,7 @@ under the License. <entity-and entity-name="ProductCategoryMember" list="productCategoryMemberList"> <field-map field-name="productId"/> </entity-and> - <iterate entry="productCategoryMember" list="productCategoryMemberList"> + <iterate list="productCategoryMemberList" entry="productCategoryMember"> <set field="productCategoryMember.thruDate" from-field="nowTimestamp"/> <store-value value-field="productCategoryMember"/> </iterate> Modified: ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml Sat Nov 5 12:41:35 2016 @@ -169,7 +169,7 @@ under the License. <!-- Product Content SEO --> <simple-method method-name="updateContentSEOForProduct" short-description="Update Product SEO"> <if-not-empty field="parameters.title"> - <entity-and list="productContents" entity-name="ProductContentAndInfo"> + <entity-and entity-name="ProductContentAndInfo" list="productContents"> <field-map field-name="productId" from-field="parameters.productId"/> <field-map field-name="productContentTypeId" value="PAGE_TITLE"/> </entity-and> @@ -191,7 +191,7 @@ under the License. </if-not-empty> </if-not-empty> <if-not-empty field="parameters.metaKeyword"> - <entity-and list="productContents" entity-name="ProductContentAndInfo"> + <entity-and entity-name="ProductContentAndInfo" list="productContents"> <field-map field-name="productId" from-field="parameters.productId"/> <field-map field-name="productContentTypeId" value="META_KEYWORD"/> </entity-and> @@ -213,7 +213,7 @@ under the License. </if-not-empty> </if-not-empty> <if-not-empty field="parameters.metaDescription"> - <entity-and list="productContents" entity-name="ProductContentAndInfo"> + <entity-and entity-name="ProductContentAndInfo" list="productContents"> <field-map field-name="productId" from-field="parameters.productId"/> <field-map field-name="productContentTypeId" value="META_DESCRIPTION"/> </entity-and> Modified: ofbiz/trunk/applications/product/minilang/product/product/ProductServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/product/ProductServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/product/ProductServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/product/ProductServices.xml Sat Nov 5 12:41:35 2016 @@ -81,7 +81,7 @@ under the License. <field-map field-name="roleTypeId" value="LTD_ADMIN"/> </entity-and> - <iterate entry="productCategoryRole" list="productCategoryRoles"> + <iterate list="productCategoryRoles" entry="productCategoryRole"> <!-- add this new product to the category --> <make-value value-field="newLimitMember" entity-name="ProductCategoryMember"/> <set from-field="newEntity.productId" field="newLimitMember.productId"/> @@ -147,7 +147,7 @@ under the License. <!-- get all productAssocs, then get the actual product to update --> <find-by-and entity-name="ProductAssoc" map="variantProductAssocMap" list="variantProductAssocs"/> <filter-list-by-date list="variantProductAssocs"/> - <iterate entry="variantProductAssoc" list="variantProductAssocs"> + <iterate list="variantProductAssocs" entry="variantProductAssoc"> <clear-field field="variantProduct"/> <entity-one entity-name="Product" value-field="variantProduct" auto-field-map="false"> <field-map field-name="productId" from-field="variantProductAssoc.productIdTo"/> @@ -207,7 +207,7 @@ under the License. <!-- if requested, duplicate related data as well --> <if-not-empty field="parameters.duplicatePrices"> <find-by-and entity-name="ProductPrice" map="productFindContext" list="foundValues"/> - <iterate entry="foundValue" list="foundValues"> + <iterate list="foundValues" entry="foundValue"> <clone-value value-field="foundValue" new-value-field="newTempValue"/> <set from-field="parameters.productId" field="newTempValue.productId"/> <create-value value-field="newTempValue"/> @@ -215,7 +215,7 @@ under the License. </if-not-empty> <if-not-empty field="parameters.duplicateIDs"> <find-by-and entity-name="GoodIdentification" map="productFindContext" list="foundValues"/> - <iterate entry="foundValue" list="foundValues"> + <iterate list="foundValues" entry="foundValue"> <clone-value value-field="foundValue" new-value-field="newTempValue"/> <set from-field="parameters.productId" field="newTempValue.productId"/> <create-value value-field="newTempValue"/> @@ -223,7 +223,7 @@ under the License. </if-not-empty> <if-not-empty field="parameters.duplicateContent"> <find-by-and entity-name="ProductContent" map="productFindContext" list="foundValues"/> - <iterate entry="foundValue" list="foundValues"> + <iterate list="foundValues" entry="foundValue"> <clone-value value-field="foundValue" new-value-field="newTempValue"/> <set from-field="parameters.productId" field="newTempValue.productId"/> <create-value value-field="newTempValue"/> @@ -231,7 +231,7 @@ under the License. </if-not-empty> <if-not-empty field="parameters.duplicateCategoryMembers"> <find-by-and entity-name="ProductCategoryMember" map="productFindContext" list="foundValues"/> - <iterate entry="foundValue" list="foundValues"> + <iterate list="foundValues" entry="foundValue"> <clone-value value-field="foundValue" new-value-field="newTempValue"/> <set from-field="parameters.productId" field="newTempValue.productId"/> <!-- Clone Content --> @@ -270,7 +270,7 @@ under the License. </if-not-empty> <if-not-empty field="parameters.duplicateAssocs"> <find-by-and entity-name="ProductAssoc" map="productFindContext" list="foundValues"/> - <iterate entry="foundValue" list="foundValues"> + <iterate list="foundValues" entry="foundValue"> <clone-value value-field="foundValue" new-value-field="newTempValue"/> <set from-field="parameters.productId" field="newTempValue.productId"/> <create-value value-field="newTempValue"/> @@ -280,7 +280,7 @@ under the License. <entity-and entity-name="ProductAssoc" list="foundValues"> <field-map field-name="productIdTo" from-field="parameters.oldProductId"/> </entity-and> - <iterate entry="foundValue" list="foundValues"> + <iterate list="foundValues" entry="foundValue"> <clone-value value-field="foundValue" new-value-field="newTempValue"/> <set from-field="parameters.productId" field="newTempValue.productIdTo"/> <create-value value-field="newTempValue"/> @@ -288,7 +288,7 @@ under the License. </if-not-empty> <if-not-empty field="parameters.duplicateAttributes"> <find-by-and entity-name="ProductAttribute" map="productFindContext" list="foundValues"/> - <iterate entry="foundValue" list="foundValues"> + <iterate list="foundValues" entry="foundValue"> <clone-value value-field="foundValue" new-value-field="newTempValue"/> <set from-field="parameters.productId" field="newTempValue.productId"/> <create-value value-field="newTempValue"/> @@ -296,7 +296,7 @@ under the License. </if-not-empty> <if-not-empty field="parameters.duplicateFeatureAppls"> <find-by-and entity-name="ProductFeatureAppl" map="productFindContext" list="foundValues"/> - <iterate entry="foundValue" list="foundValues"> + <iterate list="foundValues" entry="foundValue"> <clone-value value-field="foundValue" new-value-field="newTempValue"/> <set from-field="parameters.productId" field="newTempValue.productId"/> <create-value value-field="newTempValue"/> @@ -304,7 +304,7 @@ under the License. </if-not-empty> <if-not-empty field="parameters.duplicateInventoryItems"> <find-by-and entity-name="InventoryItem" map="productFindContext" list="foundValues"/> - <iterate entry="foundValue" list="foundValues"> + <iterate list="foundValues" entry="foundValue"> <!-- NOTE: new inventory items should always be created calling the createInventoryItem service because in this way we are sure @@ -397,7 +397,7 @@ under the License. <store-value value-field="product"/> <!-- expire product from all categories --> <get-related value-field="product" relation-name="ProductCategoryMember" list="productCategoryMembers"/> - <iterate entry="productCategoryMember" list="productCategoryMembers"> + <iterate list="productCategoryMembers" entry="productCategoryMember"> <if-empty field="productCategoryMember.thruDate"> <set from-field="nowTimestamp" field="productCategoryMember.thruDate"/> <store-value value-field="productCategoryMember"/> @@ -405,7 +405,7 @@ under the License. </iterate> <!-- expire product from all associations going to it --> <get-related value-field="product" relation-name="AssocProductAssoc" list="assocProductAssocs"/> - <iterate entry="assocProductAssoc" list="assocProductAssocs"> + <iterate list="assocProductAssocs" entry="assocProductAssoc"> <if-empty field="assocProductAssoc.thruDate"> <set from-field="nowTimestamp" field="assocProductAssoc.thruDate"/> <store-value value-field="assocProductAssoc"/> @@ -534,18 +534,18 @@ under the License. <set value="PRODUCT_VARIANT" field="variantsFindContext.productAssocTypeId"/> <find-by-and entity-name="ProductAssoc" map="variantsFindContext" list="variants"/> <filter-list-by-date list="variants"/> - <iterate entry="newProduct" list="variants"> + <iterate list="variants" entry="newProduct"> <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="productVariantContext" list="foundVariantValues"/> - <iterate entry="foundVariantValue" list="foundVariantValues"> + <iterate list="foundVariantValues" entry="foundVariantValue"> <remove-value value-field="foundVariantValue"/> </iterate> </if-not-empty> <find-by-and entity-name="ProductPrice" map="productFindContext" list="foundValues"/> - <iterate entry="foundValue" list="foundValues"> + <iterate list="foundValues" entry="foundValue"> <clone-value value-field="foundValue" new-value-field="newTempValue"/> <set from-field="newProduct.productIdTo" field="newTempValue.productId"/> <create-value value-field="newTempValue"/> @@ -554,12 +554,12 @@ under the License. <if-not-empty field="parameters.duplicateIDs"> <if-not-empty field="parameters.removeBefore"> <find-by-and entity-name="GoodIdentification" map="productVariantContext" list="foundVariantValues"/> - <iterate entry="foundVariantValue" list="foundVariantValues"> + <iterate list="foundVariantValues" entry="foundVariantValue"> <remove-value value-field="foundVariantValue"/> </iterate> </if-not-empty> <find-by-and entity-name="GoodIdentification" map="productFindContext" list="foundValues"/> - <iterate entry="foundValue" list="foundValues"> + <iterate list="foundValues" entry="foundValue"> <clone-value value-field="foundValue" new-value-field="newTempValue"/> <set from-field="newProduct.productIdTo" field="newTempValue.productId"/> <create-value value-field="newTempValue"/> @@ -568,12 +568,12 @@ under the License. <if-not-empty field="parameters.duplicateContent"> <if-not-empty field="parameters.removeBefore"> <find-by-and entity-name="ProductContent" map="productVariantContext" list="foundVariantValues"/> - <iterate entry="foundVariantValue" list="foundVariantValues"> + <iterate list="foundVariantValues" entry="foundVariantValue"> <remove-value value-field="foundVariantValue"/> </iterate> </if-not-empty> <find-by-and entity-name="ProductContent" map="productFindContext" list="foundValues"/> - <iterate entry="foundValue" list="foundValues"> + <iterate list="foundValues" entry="foundValue"> <clone-value value-field="foundValue" new-value-field="newTempValue"/> <set from-field="newProduct.productIdTo" field="newTempValue.productId"/> <create-value value-field="newTempValue"/> @@ -582,12 +582,12 @@ under the License. <if-not-empty field="parameters.duplicateCategoryMembers"> <if-not-empty field="parameters.removeBefore"> <find-by-and entity-name="ProductCategoryMember" map="productVariantContext" list="foundVariantValues"/> - <iterate entry="foundVariantValue" list="foundVariantValues"> + <iterate list="foundVariantValues" entry="foundVariantValue"> <remove-value value-field="foundVariantValue"/> </iterate> </if-not-empty> <find-by-and entity-name="ProductCategoryMember" map="productFindContext" list="foundValues"/> - <iterate entry="foundValue" list="foundValues"> + <iterate list="foundValues" entry="foundValue"> <clone-value value-field="foundValue" new-value-field="newTempValue"/> <set from-field="newProduct.productIdTo" field="newTempValue.productId"/> <create-value value-field="newTempValue"/> @@ -596,12 +596,12 @@ under the License. <if-not-empty field="parameters.duplicateAttributes"> <if-not-empty field="parameters.removeBefore"> <find-by-and entity-name="ProductAttribute" map="productVariantContext" list="foundVariantValues"/> - <iterate entry="foundVariantValue" list="foundVariantValues"> + <iterate list="foundVariantValues" entry="foundVariantValue"> <remove-value value-field="foundVariantValue"/> </iterate> </if-not-empty> <find-by-and entity-name="ProductAttribute" map="productFindContext" list="foundValues"/> - <iterate entry="foundValue" list="foundValues"> + <iterate list="foundValues" entry="foundValue"> <clone-value value-field="foundValue" new-value-field="newTempValue"/> <set from-field="newProduct.productIdTo" field="newTempValue.productId"/> <create-value value-field="newTempValue"/> @@ -610,12 +610,12 @@ under the License. <if-not-empty field="parameters.duplicateFacilities"> <if-not-empty field="parameters.removeBefore"> <find-by-and entity-name="ProductFacility" map="productVariantContext" list="foundVariantValues"/> - <iterate entry="foundVariantValue" list="foundVariantValues"> + <iterate list="foundVariantValues" entry="foundVariantValue"> <remove-value value-field="foundVariantValue"/> </iterate> </if-not-empty> <find-by-and entity-name="ProductFacility" map="productFindContext" list="foundValues"/> - <iterate entry="foundValue" list="foundValues"> + <iterate list="foundValues" entry="foundValue"> <clone-value value-field="foundValue" new-value-field="newTempValue"/> <set from-field="newProduct.productIdTo" field="newTempValue.productId"/> <create-value value-field="newTempValue"/> @@ -624,7 +624,7 @@ under the License. <if-not-empty field="parameters.duplicateLocations"> <if-not-empty field="parameters.removeBefore"> <find-by-and entity-name="ProductFacilityLocation" map="productVariantContext" list="foundVariantValues"/> - <iterate entry="foundVariantValue" list="foundVariantValues"> + <iterate list="foundVariantValues" entry="foundVariantValue"> <remove-value value-field="foundVariantValue"/> </iterate> </if-not-empty> @@ -799,7 +799,7 @@ under the License. <check-errors/> <entity-one entity-name="ProductCategoryGlAccount" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> <store-value value-field="lookedUpValue"/> </simple-method> @@ -818,13 +818,13 @@ under the License. <make-value entity-name="ProductGroupOrder" value-field="newEntity"/> <make-next-seq-id value-field="newEntity" seq-field-name="groupOrderId"/> <field-to-result field="newEntity.groupOrderId" result-name="groupOrderId"/> - <set-nonpk-fields value-field="newEntity" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductGroupOrder" short-description="Update ProductGroupOrder"> <entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder"/> - <set-nonpk-fields value-field="productGroupOrder" map="parameters"/> + <set-nonpk-fields map="parameters" value-field="productGroupOrder"/> <store-value value-field="productGroupOrder"/> <if-compare field="productGroupOrder.statusId" operator="equals" value="GO_CREATED"> @@ -842,7 +842,7 @@ under the License. <entity-and entity-name="OrderItemGroupOrder" list="orderItemGroupOrders"> <field-map field-name="groupOrderId" from-field="parameters.groupOrderId"/> </entity-and> - <iterate entry="orderItemGroupOrder" list="orderItemGroupOrders"> + <iterate list="orderItemGroupOrders" entry="orderItemGroupOrder"> <remove-value value-field="orderItemGroupOrder"/> </iterate> @@ -857,7 +857,7 @@ under the License. <entity-and entity-name="JobSandbox" list="jobSandboxList"> <field-map field-name="runtimeDataId" from-field="jobSandbox.runtimeDataId"/> </entity-and> - <iterate entry="jobSandboxRelatedRuntimeData" list="jobSandboxList"> + <iterate list="jobSandboxList" entry="jobSandboxRelatedRuntimeData"> <remove-value value-field="jobSandboxRelatedRuntimeData"/> </iterate> @@ -904,7 +904,7 @@ under the License. <entity-and entity-name="OrderItem" list="orderItems"> <field-map field-name="orderId" from-field="parameters.orderId"/> </entity-and> - <iterate entry="orderItem" list="orderItems"> + <iterate list="orderItems" entry="orderItem"> <set field="productId" from-field="orderItem.productId"/> <entity-one entity-name="Product" value-field="product"> <field-map field-name="productId" from-field="orderItem.productId"/> @@ -950,7 +950,7 @@ under the License. </entity-and> </else> </if-not-empty> - <iterate entry="orderItem" list="orderItems"> + <iterate list="orderItems" entry="orderItem"> <entity-and entity-name="OrderItemGroupOrder" list="orderItemGroupOrders"> <field-map field-name="orderId" from-field="orderItem.orderId"/> <field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/> @@ -1002,7 +1002,7 @@ under the License. <entity-and entity-name="OrderItemGroupOrder" list="orderItemGroupOrders"> <field-map field-name="groupOrderId" from-field="productGroupOrder.groupOrderId"/> </entity-and> - <iterate entry="orderItemGroupOrder" list="orderItemGroupOrders"> + <iterate list="orderItemGroupOrders" entry="orderItemGroupOrder"> <set field="changeOrderItemStatusMap.orderId" from-field="orderItemGroupOrder.orderId"/> <set field="changeOrderItemStatusMap.orderItemSeqId" from-field="orderItemGroupOrder.orderItemSeqId"/> <set field="changeOrderItemStatusMap.statusId" from-field="newItemStatusId"/> Modified: ofbiz/trunk/applications/product/minilang/product/product/ProductUomFormulas.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/product/ProductUomFormulas.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/product/ProductUomFormulas.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/product/ProductUomFormulas.xml Sat Nov 5 12:41:35 2016 @@ -41,7 +41,7 @@ under the License. <set field="args" from-field="parameters.arguments"/> <if-empty field="args.conversionParameters.productId"> - <add-error> <fail-property property="ProductNoSpecifiedForUomConversion" resource="ProductUiLabels"/> </add-error> + <add-error> <fail-property resource="ProductUiLabels" property="ProductNoSpecifiedForUomConversion"/> </add-error> <check-errors/> </if-empty> @@ -52,7 +52,7 @@ under the License. <entity-one entity-name="Product" value-field="product" auto-field-map="true"/> <if-empty field="product"> - <add-error> <fail-property property="ProductNoSpecifiedForUomConversion" resource="ProductUiLabels"/> </add-error> + <add-error> <fail-property resource="ProductUiLabels" property="ProductNoSpecifiedForUomConversion"/> </add-error> <check-errors/> </if-empty> Modified: ofbiz/trunk/applications/product/minilang/product/storage/FacilityContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/storage/FacilityContactMechServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/storage/FacilityContactMechServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/storage/FacilityContactMechServices.xml Sat Nov 5 12:41:35 2016 @@ -89,7 +89,7 @@ under the License. </else> </if-empty> - <set-nonpk-fields value-field="newFacilityContactMech" map="parameters" set-if-null="false"/> + <set-nonpk-fields map="parameters" value-field="newFacilityContactMech"/> set-if-null="false"/> <now-timestamp field="newFacilityContactMech.fromDate"/> <now-timestamp field="facilityContactMech.thruDate"/> @@ -99,7 +99,7 @@ under the License. <if-compare-field to-field="newFacilityContactMech.contactMechId" field="parameters.contactMechId" operator="not-equals"> <get-related value-field="facilityContactMech" relation-name="FacilityContactMechPurpose" list="facilityContactMechPurposes"/> - <iterate entry="facilityContactMechPurposeOld" list="facilityContactMechPurposes"> + <iterate list="facilityContactMechPurposes" entry="facilityContactMechPurposeOld"> <clone-value value-field="facilityContactMechPurposeOld" new-value-field="facilityContactMechPurpose"/> <now-timestamp field="facilityContactMechPurposeOld.thruDate"/> Modified: ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml Sat Nov 5 12:41:35 2016 @@ -29,7 +29,7 @@ under the License. <if-compare field="parameters.oneInventoryFacility" operator="equals" value="Y"> <if-empty field="parameters.inventoryFacilityId"> <add-error> - <fail-property property="InventoryFacilityIdRequired" resource="ProductUiLabels"/> + <fail-property resource="ProductUiLabels" property="InventoryFacilityIdRequired"/> </add-error> </if-empty> <check-errors/> @@ -38,12 +38,12 @@ under the License. <if-compare field="parameters.showPricesWithVatTax" operator="equals" value="Y"> <if-empty field="parameters.vatTaxAuthGeoId"> <add-error> - <fail-property property="ProductVatTaxAuthGeoNotSet" resource="ProductUiLabels"/> + <fail-property resource="ProductUiLabels" property="ProductVatTaxAuthGeoNotSet"/> </add-error> </if-empty> <if-empty field="parameters.vatTaxAuthPartyId"> <add-error> - <fail-property property="ProductVatTaxAuthPartyNotSet" resource="ProductUiLabels"/> + <fail-property resource="ProductUiLabels" property="ProductVatTaxAuthPartyNotSet"/> </add-error> </if-empty> <check-errors/> @@ -78,7 +78,7 @@ under the License. <if-compare field="parameters.oneInventoryFacility" operator="equals" value="Y"> <if-empty field="parameters.inventoryFacilityId"> <add-error> - <fail-property property="InventoryFacilityIdRequired" resource="ProductUiLabels"/> + <fail-property resource="ProductUiLabels" property="InventoryFacilityIdRequired"/> </add-error> </if-empty> <check-errors/> @@ -92,12 +92,12 @@ under the License. <if-compare field="store.showPricesWithVatTax" operator="equals" value="Y"> <if-empty field="store.vatTaxAuthGeoId"> <add-error> - <fail-property property="ProductVatTaxAuthGeoNotSet" resource="ProductUiLabels"/> + <fail-property resource="ProductUiLabels" property="ProductVatTaxAuthGeoNotSet"/> </add-error> </if-empty> <if-empty field="store.vatTaxAuthPartyId"> <add-error> - <fail-property property="ProductVatTaxAuthPartyNotSet" resource="ProductUiLabels"/> + <fail-property resource="ProductUiLabels" property="ProductVatTaxAuthPartyNotSet"/> </add-error> </if-empty> <check-errors/> @@ -152,7 +152,7 @@ under the License. <set from-field="parameters.facilityId" field="facilityId"/> <if-empty field="facilityId"> - <if-compare value="Y" field="productStore.oneInventoryFacility" operator="equals"> + <if-compare field="productStore.oneInventoryFacility" operator="equals" value="Y"> <if-empty field="productStore.inventoryFacilityId"> <add-error> <fail-property resource="ProductUiLabels" property="ProductProductStoreNoSpecifiedInventoryFacility"/> @@ -167,7 +167,7 @@ under the License. <result-to-field result-name="quantityNotReserved"/> </call-service> - <if-compare value="0" field="quantityNotReserved" operator="equals" type="BigDecimal"> + <if-compare field="quantityNotReserved" operator="equals" value="0" type="BigDecimal"> <log level="info" message="Inventory IS reserved in facility with id [${productStore.inventoryFacilityId}] for product id [${parameters.productId}]; desired quantity was ${parameters.quantity}"/> <else> <log level="info" message="There is insufficient inventory available in facility with id [${productStore.inventoryFacilityId}] for product id [${parameters.productId}]; desired quantity is ${parameters.quantity}, amount could not reserve is ${quantityNotReserved}"/> @@ -175,7 +175,7 @@ under the License. </if-compare> <else> <entity-and entity-name="ProductStoreFacility" list="productStoreFacilities" use-cache="true"> - <field-map from-field="productStore.productStoreId" field-name="productStoreId"/> + <field-map field-name="productStoreId" from-field="productStore.productStoreId"/> <order-by field-name="sequenceNum"/> </entity-and> <iterate list="productStoreFacilities" entry="productStoreFacility"> @@ -215,8 +215,8 @@ under the License. </if-compare> <else> <entity-and entity-name="ProductStoreFacility" list="productStoreFacilities" use-cache="true"> - <field-map from-field="productStore.productStoreId" field-name="productStoreId"/> - <field-map from-field="facilityId" field-name="facilityId"/> + <field-map field-name="productStoreId" from-field="productStore.productStoreId"/> + <field-map field-name="facilityId" from-field="facilityId"/> <order-by field-name="sequenceNum"/> </entity-and> <iterate list="productStoreFacilities" entry="productStoreFacility"> @@ -237,7 +237,7 @@ under the License. <call-service service-name="reserveProductInventoryByFacility" in-map-name="callServiceMap"> <result-to-field result-name="quantityNotReserved"/> </call-service> - <if-compare value="0" field="quantityNotReserved" operator="equals" type="BigDecimal"> + <if-compare field="quantityNotReserved" operator="equals" value="0" type="BigDecimal"> <log level="info" message="Inventory IS reserved in facility with id [${facilityId}] for product id [${parameters.productId}]; desired quantity was ${parameters.quantity}"/> <else> <log level="info" message="There is insufficient inventory available in facility with id [${facilityId}] for product id [${parameters.productId}]; desired quantity is ${parameters.quantity}, amount could not reserve is ${quantityNotReserved}"/> @@ -308,7 +308,7 @@ under the License. <!-- TODO: what to do with ASSET_USAGE? Only done elsewhere? Would need date/time range info to check availability --> <!-- if prodCatalog is set to not check inventory break here --> - <if-compare value="N" field="productStore.checkInventory" operator="equals"> + <if-compare field="productStore.checkInventory" operator="equals" value="N"> <!-- note: if not set, defaults to yes, check inventory --> <log level="verbose" message="ProductStore with id ${productStore.productStoreId}, is set to NOT check inventory, returning true for inventory available check"/> <set value="Y" field="available"/> @@ -348,13 +348,13 @@ under the License. </if-compare-field> <else> <entity-and entity-name="ProductStoreFacility" list="productStoreFacilities" use-cache="true"> - <field-map from-field="productStore.productStoreId" field-name="productStoreId"/> + <field-map field-name="productStoreId" from-field="productStore.productStoreId"/> <order-by field-name="sequenceNum"/> </entity-and> <set value="N" field="available"/> <iterate list="productStoreFacilities" entry="productStoreFacility"> - <if-compare value="N" field="available" operator="equals"> + <if-compare field="available" operator="equals" value="N"> <!-- TODO: must entire quantity be available in one location? --> <!-- Right now the answer is yes, it only succeeds if one facility has sufficient inventory for the order. --> <set from-field="parameters.productId" field="callServiceMap.productId"/> @@ -521,7 +521,7 @@ under the License. <call-service service-name="updateProductStoreGroup" in-map-name="productStoreGroupMap"/> </if-not-empty> <else> - <entity-and list="productStoreGroupRollups" entity-name="ProductStoreGroupRollup" filter-by-date="true"> + <entity-and entity-name="ProductStoreGroupRollup" list="productStoreGroupRollups" filter-by-date="true"> <field-map field-name="productStoreGroupId" from-field="productStoreGroup.productStoreGroupId"/> <field-map field-name="parentGroupId" from-field="parameters.primaryParentGroupId"/> </entity-and> Modified: ofbiz/trunk/applications/product/minilang/product/subscription/SubscriptionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/subscription/SubscriptionServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/subscription/SubscriptionServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/subscription/SubscriptionServices.xml Sat Nov 5 12:41:35 2016 @@ -40,7 +40,7 @@ under the License. </entity-and> <first-from-list entry="resource" list="resourceList"/> <if-not-empty field="resource"> - <set-nonpk-fields value-field="newEntity" map="resource"/> + <set-nonpk-fields map="resource" value-field="newEntity"/> </if-not-empty> </if-not-empty> </if-not-empty> Modified: ofbiz/trunk/applications/product/minilang/product/test/CostTests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/test/CostTests.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/test/CostTests.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/test/CostTests.xml Sat Nov 5 12:41:35 2016 @@ -33,7 +33,7 @@ under the License. <set field="serviceCtx.costComponentTypePrefix" value="EST_STD"/> <call-service service-name="calculateProductCosts" in-map-name="serviceCtx"/> - <entity-and list="costComponents" entity-name="CostComponent"> + <entity-and entity-name="CostComponent" list="costComponents"> <field-map field-name="productId" from-field="productId"/> </entity-and> <filter-list-by-date list="costComponents"/> Modified: ofbiz/trunk/applications/product/minilang/product/test/ProductTagTest.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/test/ProductTagTest.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/product/test/ProductTagTest.xml (original) +++ ofbiz/trunk/applications/product/minilang/product/test/ProductTagTest.xml Sat Nov 5 12:41:35 2016 @@ -124,7 +124,7 @@ under the License. <field-map field-name="keywordTypeId" value="KWT_TAG"/> <field-map field-name="statusId" value="KW_PENDING"/> </entity-and> - <iterate entry="checkAllProductKeywordApprove" list="checkAllProductKeywordApproveList"> + <iterate list="checkAllProductKeywordApproveList" entry="checkAllProductKeywordApprove"> <set field="updateProductKeywordMap.userLogin" from-field="systemUserLogin"/> <set field="updateProductKeywordMap.productId" from-field="checkAllProductKeywordApprove.productId"/> <set field="updateProductKeywordMap.keyword" from-field="checkAllProductKeywordApprove.keyword"/> Modified: ofbiz/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff ============================================================================== --- ofbiz/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml (original) +++ ofbiz/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml Sat Nov 5 12:41:35 2016 @@ -271,13 +271,13 @@ under the License. </calculate> <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/> <clear-field field="createDetailMap"/> - <entity-and list="oisgirs" entity-name="OrderItemShipGrpInvRes"> + <entity-and entity-name="OrderItemShipGrpInvRes" list="oisgirs"> <field-map field-name="orderId" from-field="orderItemShipGrpInvRes.orderId"/> <field-map field-name="orderItemSeqId" from-field="orderItemShipGrpInvRes.orderItemSeqId"/> <field-map field-name="inventoryItemId" from-field="orderItemShipGrpInvRes.inventoryItemId"/> </entity-and> <!-- Need to Cancel and re-reserve oisgir to fix OFBIZ-5364 issue, while there are multiple ship groups for an order item associated with same inventory and you are issuing items from one ship group to another, then quantityNotAvailable will be incorrect if we do not cancel and reserve all oisgir of order item --> - <iterate entry="oisgir" list="oisgirs"> + <iterate list="oisgirs" entry="oisgir"> <set field="cancelOrderItemShipGrpInvResMap.orderId" from-field="oisgir.orderId"/> <set field="cancelOrderItemShipGrpInvResMap.orderItemSeqId" from-field="oisgir.orderItemSeqId"/> <set field="cancelOrderItemShipGrpInvResMap.shipGroupSeqId" from-field="oisgir.shipGroupSeqId"/> @@ -286,7 +286,7 @@ under the License. <call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOrderItemShipGrpInvResMap"/> </iterate> <!-- Re-reserve cancelled oisgirs again so that shipped quantity will be subtract from oisgir.quantity and oisgir.quantityNotAvailable will be calculated accordingly --> - <iterate entry="oisgir" list="oisgirs"> + <iterate list="oisgirs" entry="oisgir"> <get-related-one value-field="oisgir" relation-name="InventoryItem" to-value-field="tmpInventoryItem"/> <set field="reserveProductInventoryByFacilityMap.quantity" from-field="oisgir.quantity"/> <set field="reserveProductInventoryByFacilityMap.facilityId" from-field="tmpInventoryItem.facilityId"/> @@ -307,7 +307,7 @@ under the License. should not contribute to the adjustment calculation here --> <if-not-empty field="parameters.inventoryItemId"> - <entity-and list="itemIssuances" entity-name="ItemIssuance"> + <entity-and entity-name="ItemIssuance" list="itemIssuances"> <field-map field-name="orderId" from-field="parameters.orderId"/> <field-map field-name="orderItemSeqId" from-field="parameters.orderItemSeqId"/> <field-map field-name="shipGroupSeqId" from-field="parameters.shipGroupSeqId"/> @@ -419,7 +419,7 @@ under the License. <simple-method method-name="findCreateItemIssuance" short-description="Find Create ItemIssuance - meant to be called in-line"> <!-- If a non-sales order find ItemIssuance for orderItemSeqId-shimentItemSeqId-shipGroupSeqId pair, update it and return --> <if-compare field="orderHeader.orderTypeId" operator="not-equals" value="SALES_ORDER"> - <entity-and list="itemIssuances" entity-name="ItemIssuance"> + <entity-and entity-name="ItemIssuance" list="itemIssuances"> <field-map field-name="orderId" from-field="orderItem.orderId"/> <field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/> <field-map field-name="shipmentId" from-field="shipmentItem.shipmentId"/> @@ -708,21 +708,21 @@ under the License. </simple-method> <simple-method method-name="getTotalIssuedQuantityForOrderItem" short-description="Computes the total quantity assigned to shipment for a purchase order item"> <set field="totalIssuedQuantity" type="BigDecimal" value="0"/> - <entity-and list="orderShipments" entity-name="OrderShipment"> + <entity-and entity-name="OrderShipment" list="orderShipments"> <field-map field-name="orderId" from-field="orderItem.orderId"/> <field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/> </entity-and> <if-not-empty field="orderShipments"> - <iterate entry="orderShipment" list="orderShipments"> + <iterate list="orderShipments" entry="orderShipment"> <set field="totalIssuedQuantity" value="${totalIssuedQuantity$bigDecimal + orderShipment.quantity$bigDecimal}" type="BigDecimal"/> </iterate> <else> <!-- This is here for backward compatibility only: ItemIssuances are no more created for purchase orders --> - <entity-and list="allItemIssuances" entity-name="ItemIssuance"> + <entity-and entity-name="ItemIssuance" list="allItemIssuances"> <field-map field-name="orderId" from-field="orderItem.orderId"/> <field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/> </entity-and> - <iterate entry="itemIssuance" list="allItemIssuances"> + <iterate list="allItemIssuances" entry="itemIssuance"> <set field="totalIssuedQuantity" value="${totalIssuedQuantity$bigDecimal + itemIssuance.quantity$bigDecimal}" type="BigDecimal"/> </iterate> </else>
