OFBiz › OFBiz - Commits

svn commit: r1768219 [9/18] - in /ofbiz/trunk: applications/accounting/minilang/ applications/accounting/minilang/admin/ applications/accounting/minilang/agreement/ applications/accounting/minilang/budget/ applications/accounting/minilang/finaccount/ a...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

diveshdutta

svn commit: r1768219 [9/18] - in /ofbiz/trunk: applications/accounting/minilang/ applications/accounting/minilang/admin/ applications/accounting/minilang/agreement/ applications/accounting/minilang/budget/ applications/accounting/minilang/finaccount/ a...

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=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/inventory/InventoryReserveServices.xml Sat Nov 5 14:14:04 2016
@@ -173,7 +173,7 @@ under the License.
<set from-field="parameters.orderItemSeqId" field="createDetailMap.orderItemSeqId"/>
<set from-field="parameters.shipGroupSeqId" field="createDetailMap.shipGroupSeqId"/>
<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="parameters.quantityNotReserved" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantityNotReserved"/>
</calculate>

<if-not-empty field="parameters.reserveReasonEnumId"><set from-field="parameters.reserveReasonEnumId" field="createDetailMap.reasonEnumId"/></if-not-empty>
@@ -242,7 +242,7 @@ under the License.
<set from-field="parameters.orderItemSeqId" field="createDetailMap.orderItemSeqId"/>
<set from-field="parameters.shipGroupSeqId" field="createDetailMap.shipGroupSeqId"/>
<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="parameters.quantityNotReserved" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantityNotReserved"/>
</calculate>
<if-not-empty field="parameters.reserveReasonEnumId"><set from-field="parameters.reserveReasonEnumId" field="createDetailMap.reasonEnumId"/></if-not-empty>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
@@ -315,7 +315,7 @@ under the License.
<set field="createDetailMap.availableToPromiseDiff" value="-1" type="BigDecimal"/>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
</if-compare>
- <set-service-fields map="parameters" to-map="cancelOrderItemShipGrpInvResMap" service-name="cancelOrderItemShipGrpInvRes"/>
+ <set-service-fields service-name="cancelOrderItemShipGrpInvRes" map="parameters" to-map="cancelOrderItemShipGrpInvResMap"/>/>
<set field="cancelOrderItemShipGrpInvResMap.cancelQuantity" from-field="parameters.quantity"/>

<call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOrderItemShipGrpInvResMap"/>
@@ -343,9 +343,9 @@ under the License.

<set field="inventoryReservationLookUp.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
<find-by-and map="inventoryReservationLookUp" list="invReservations" entity-name="OrderItemShipGrpInvRes"/>
- <first-from-list entry="inventoryItemReservation" list="invReservations"/>
+ <first-from-list list="invReservations" entry="inventoryItemReservation"/>
<if-not-empty field="inventoryItemReservation">
- <set-service-fields map="inventoryItemReservation" to-map="cancelOrderItemShipGrpInvResMap" service-name="cancelOrderItemShipGrpInvRes"/>
+ <set-service-fields service-name="cancelOrderItemShipGrpInvRes" map="inventoryItemReservation" to-map="cancelOrderItemShipGrpInvResMap"/>/>
<call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOrderItemShipGrpInvResMap"/>

<refresh-value value-field="inventoryItem"/>
@@ -420,7 +420,7 @@ under the License.
<clear-field field="reserveOisgirMap"/>

<calculate field="parameters.quantityNotReserved">
- <calcop field="parameters.quantityNotReserved" operator="subtract"><number value="1.0"/></calcop>
+ <calcop operator="subtract" field="parameters.quantityNotReserved"><number value="1.0"/></calcop>
</calculate>
</if-compare>
</if-compare>
@@ -454,7 +454,7 @@ under the License.
<set from-field="parameters.orderId" field="createDetailMap.orderId"/>
<set from-field="parameters.orderItemSeqId" field="createDetailMap.orderItemSeqId"/>
<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="parameters.deductAmount" operator="negative"/>
+ <calcop operator="negative" field="parameters.deductAmount"/>
</calculate>
<if-not-empty field="ebayReserveReasonEnumId"><set from-field="parameters.reserveReasonEnumId" field="createDetailMap.reasonEnumId"/></if-not-empty>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>

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=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/inventory/InventoryServices.xml Sat Nov 5 14:14:04 2016
@@ -333,7 +333,7 @@ under the License.
<field-map field-name="inventoryItemId" from-field="parameters.inventoryItemId"/>
<order-by field-name="-statusDatetime"/>
</entity-and>
- <first-from-list entry="oldInventoryItemStatus" list="oldInventoryItemStatusList"/>
+ <first-from-list list="oldInventoryItemStatusList" entry="oldInventoryItemStatus"/>
<if-not-empty field="oldInventoryItemStatus">
<set field="oldInventoryItemStatus.statusEndDatetime" from-field="nowTimestamp"/>
<store-value value-field="oldInventoryItemStatus"/>
@@ -493,7 +493,7 @@ under the License.
<find-by-and entity-name="ProductAssoc" map="getAssoc" list="assocs"/>
<if-not-empty field="assocs">
<filter-list-by-date list="assocs" to-list="assocsDate"/>
- <first-from-list entry="assoc" list="assocsDate"/>
+ <first-from-list list="assocsDate" entry="assoc"/>
<if-not-empty field="assoc">
<get-related-one value-field="assoc" relation-name="MainProduct" to-value-field="virtProduct"/>
<if-empty field="product.salesDiscWhenNotAvail">
@@ -669,7 +669,7 @@ under the License.
</condition-list>
<select-field field-name="quantityOnHandSum"/>
</entity-condition>
- <first-from-list entry="inventoryItemDetailTotal" list="inventoryItemDetailTotals"/>
+ <first-from-list list="inventoryItemDetailTotals" entry="inventoryItemDetailTotal"/>
<set field="quantityOnHandTotal" from-field="inventoryItemDetailTotal.quantityOnHandSum" type="BigDecimal" default-value="0"/>
<field-to-result field="quantityOnHandTotal" result-name="quantityOnHandTotal"/>
</simple-method>
@@ -689,7 +689,7 @@ under the License.
</condition-list>
<select-field field-name="quantityOnHandSum"/>
</entity-condition>
- <first-from-list entry="inventoryItemDetailTotal" list="inventoryItemDetailTotals"/>
+ <first-from-list list="inventoryItemDetailTotals" entry="inventoryItemDetailTotal"/>
<set field="quantityOnHandTotal" from-field="${inventoryItemDetailTotal.quantityOnHandSum * -1}" type="BigDecimal" default-value="0"/>
<field-to-result field="quantityOnHandTotal" result-name="quantityOnHandTotal"/>
</simple-method>
@@ -977,7 +977,7 @@ under the License.
<set field="locationTypeEnumIds" value="${groovy: ['FLT_PICKLOC', 'FLT_BULK', null]}"/>
<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">
+ <entity-condition entity-name="InventoryItemAndLocation" list="inventoryItemAndLocations">
<condition-list>
<condition-expr field-name="locationTypeEnumId" value="${locationTypeEnumId}" ignore-if-empty="true" ignore-if-null="true"/>
<condition-expr field-name="productId" value="${parameters.productId}"/>
@@ -1116,7 +1116,7 @@ under the License.
</if-empty>
</simple-method>
<simple-method method-name="setLastInventoryCount" short-description="Service that updates stock availability of products">
- <entity-one value-field="inventoryItem" entity-name="InventoryItem" auto-field-map="false">
+ <entity-one entity-name="InventoryItem" value-field="inventoryItem" auto-field-map="false">
<field-map field-name="inventoryItemId" from-field="parameters.inventoryItemId"/>
</entity-one>
<entity-and entity-name="ProductFacility" list="productFacilities">
@@ -1140,15 +1140,15 @@ under the License.
</simple-method>
<simple-method method-name="createUpdateFacilityGeoPoint" short-description="Create or update GeoPoint assigned to facility">
<if-empty field="parameters.geoPointId">
- <set-service-fields service-name="createGeoPoint" to-map="createGeoPointMap" map="parameters"/>
+ <set-service-fields service-name="createGeoPoint" map="parameters" to-map="createGeoPointMap"/>/>
<call-service service-name="createGeoPoint" in-map-name="createGeoPointMap">
<result-to-field result-name="geoPointId" field="geoPointId"/>
</call-service>
- <entity-one value-field="facility" entity-name="Facility"/>
+ <entity-one entity-name="Facility" value-field="facility"/>
<set field="facility.geoPointId" from-field="geoPointId"/>
<store-value value-field="facility"/>
<else>
- <set-service-fields service-name="updateGeoPoint" to-map="updateGeoPointMap" map="parameters"/>
+ <set-service-fields service-name="updateGeoPoint" map="parameters" to-map="updateGeoPointMap"/>/>
<call-service service-name="updateGeoPoint" in-map-name="updateGeoPointMap"/>
</else>
</if-empty>

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=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/inventory/StockMoveServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/inventory/StockMoveServices.xml Sat Nov 5 14:14:04 2016
@@ -84,7 +84,7 @@ under the License.
<string-to-list string="Error in stock move, could not find a pick/primary location for facility [${parameters.facilityId}] and product [${productId}]" list="warningMessageList"/>
<else>

- <first-from-list entry="productFacilityLocationView" list="productFacilityLocationViewList"/>
+ <first-from-list list="productFacilityLocationViewList" entry="productFacilityLocationView"/>
<get-related-one value-field="productFacilityLocationView" relation-name="FacilityLocation" to-value-field="moveInfo.facilityLocationTo"/>
<get-related-one value-field="productFacilityLocationView" relation-name="ProductFacilityLocation" to-value-field="moveInfo.targetProductFacilityLocation"/>

@@ -92,7 +92,7 @@ under the License.
<calculate field="moveInfo.totalQuantity"><number value="0"/></calculate>
<iterate list="perProductOiirailList" entry="perProductOiirail">
<calculate field="moveInfo.totalQuantity">
- <calcop field="moveInfo.totalQuantity" operator="add"><calcop field="perProductOiirail.quantity" operator="get"/></calcop>
+ <calcop operator="add" field="moveInfo.totalQuantity"><calcop operator="get" field="perProductOiirail.quantity"/></calcop>
</calculate>
</iterate>

@@ -107,12 +107,12 @@ under the License.
<calculate field="totalAvailableToPromise"><number value="0"/></calculate>
<iterate list="inventoryItemList" entry="inventoryItem">
<calculate field="totalQuantityOnHand">
- <calcop field="totalQuantityOnHand" operator="get"/>
- <calcop field="inventoryItem.quantityOnHandTotal" operator="get"/>
+ <calcop operator="get" field="totalQuantityOnHand"/>
+ <calcop operator="get" field="inventoryItem.quantityOnHandTotal"/>
</calculate>
<calculate field="totalAvailableToPromise">
- <calcop field="totalAvailableToPromise" operator="get"/>
- <calcop field="inventoryItem.availableToPromiseTotal" operator="get"/>
+ <calcop operator="get" field="totalAvailableToPromise"/>
+ <calcop operator="get" field="inventoryItem.availableToPromiseTotal"/>
</calculate>
</iterate>
<set from-field="totalQuantityOnHand" field="moveInfo.quantityOnHandTotalFrom"/>
@@ -130,10 +130,10 @@ under the License.
<calculate field="targetTotalQuantityOnHand"><number value="0"/></calculate>
<iterate list="targetInventoryItemList" entry="inventoryItem">
<calculate field="targetTotalAvailableToPromise">
- <calcop field="targetTotalAvailableToPromise" operator="add"><calcop field="inventoryItem.availableToPromiseTotal" operator="get"/></calcop>
+ <calcop operator="add" field="targetTotalAvailableToPromise"><calcop operator="get" field="inventoryItem.availableToPromiseTotal"/></calcop>
</calculate>
<calculate field="targetTotalQuantityOnHand">
- <calcop field="targetTotalQuantityOnHand" operator="add"><calcop field="inventoryItem.quantityOnHandTotal" operator="get"/></calcop>
+ <calcop operator="add" field="targetTotalQuantityOnHand"><calcop operator="get" field="inventoryItem.quantityOnHandTotal"/></calcop>
</calculate>
</iterate>
<set from-field="targetTotalAvailableToPromise" field="moveInfo.availableToPromiseTotalTo"/>
@@ -148,7 +148,7 @@ under the License.


<calculate field="moveInfo.totalQuantity">
- <calcop field="moveInfo.totalQuantity" operator="add"><calcop field="moveInfo.targetProductFacilityLocation.moveQuantity" operator="get"/></calcop>
+ <calcop operator="add" field="moveInfo.totalQuantity"><calcop operator="get" field="moveInfo.targetProductFacilityLocation.moveQuantity"/></calcop>
</calculate>
<else>

<calculate field="moveInfo.totalQuantity">
- <calcop field="moveInfo.totalQuantity" operator="add"><calcop field="targetLocationSimpleMoveQuantity[moveInfo.targetProductFacilityLocation.locationSeqId]" operator="get"/></calcop>
+ <calcop operator="add" field="moveInfo.totalQuantity"><calcop operator="get" field="targetLocationSimpleMoveQuantity[moveInfo.targetProductFacilityLocation.locationSeqId]"/></calcop>
</calculate>
</else>
</if-empty>
<if-compare-field field="totalQuantityOnHand" to-field="moveInfo.totalQuantity" operator="less" type="BigDecimal">
<calculate field="targetLocationSimpleMoveQuantity[moveInfo.targetProductFacilityLocation.locationSeqId]">
- <calcop field="moveInfo.totalQuantity" operator="subtract"><calcop field="totalQuantityOnHand" operator="get"/></calcop>
+ <calcop operator="subtract" field="moveInfo.totalQuantity"><calcop operator="get" field="totalQuantityOnHand"/></calcop>
</calculate>
<set from-field="totalQuantityOnHand" field="moveInfo.totalQuantity"/>
</if-compare-field>
@@ -274,10 +274,10 @@ under the License.
<calculate field="totalAvailableToPromise"><number value="0"/></calculate>
<iterate list="perLocationInventoryItemAndLocList" entry="inventoryItem">
<calculate field="totalQuantityOnHand">
- <calcop field="totalQuantityOnHand" operator="add"><calcop field="inventoryItem.quantityOnHandTotal" operator="get"/></calcop>
+ <calcop operator="add" field="totalQuantityOnHand"><calcop operator="get" field="inventoryItem.quantityOnHandTotal"/></calcop>
</calculate>
<calculate field="totalAvailableToPromise">
- <calcop field="totalAvailableToPromise" operator="add"><calcop field="inventoryItem.availableToPromiseTotal" operator="get"/></calcop>
+ <calcop operator="add" field="totalAvailableToPromise"><calcop operator="get" field="inventoryItem.availableToPromiseTotal"/></calcop>
</calculate>
</iterate>
<else>
@@ -295,7 +295,7 @@ under the License.
<then>
<set from-field="productSave" field="moveInfo.product"/>
<set from-field="targetFacilityLocationSave" field="moveInfo.facilityLocationTo"/>
- <first-from-list entry="InventoryItemAndLocation" list="perLocationInventoryItemAndLocList"/>
+ <first-from-list list="perLocationInventoryItemAndLocList" entry="InventoryItemAndLocation"/>
<get-related-one value-field="InventoryItemAndLocation" relation-name="FacilityLocation" to-value-field="moveInfo.facilityLocationFrom"/>
<get-related-one value-field="productFacilityLocationQuantityTest" relation-name="ProductFacilityLocation" to-value-field="moveInfo.targetProductFacilityLocation"/>
<set from-field="productFacilityLocationQuantityTest.availableToPromiseTotal" field="moveInfo.availableToPromiseTotalTo"/>
@@ -308,14 +308,14 @@ under the License.
trying to move more from the location than is there, find the difference and put it in targetLocationMoveQuantity -->
<if-compare-field field="totalAvailableToPromise" to-field="targetLocationMoveQuantity" operator="less" type="BigDecimal">
<calculate field="targetLocationMoveQuantity">
- <calcop field="targetLocationMoveQuantity" operator="subtract"><calcop field="totalAvailableToPromise" operator="get"/></calcop>
+ <calcop operator="subtract" field="targetLocationMoveQuantity"><calcop operator="get" field="totalAvailableToPromise"/></calcop>
</calculate>
<set from-field="totalAvailableToPromise" field="moveInfo.totalQuantity"/>
<calculate field="fromLocationTotalAvailableToPromise[locationSeqId]"><number value="0"/></calculate>
<else>
<set from-field="targetLocationMoveQuantity" field="moveInfo.totalQuantity"/>
<calculate field="fromLocationTotalAvailableToPromise[locationSeqId]">
- <calcop field="totalAvailableToPromise" operator="subtract"><calcop field="targetLocationMoveQuantity" operator="get"/></calcop>
+ <calcop operator="subtract" field="totalAvailableToPromise"><calcop operator="get" field="targetLocationMoveQuantity"/></calcop>
</calculate>
<calculate field="targetLocationMoveQuantity"><number value="0"/></calculate>
</else>
@@ -402,10 +402,10 @@ under the License.
<clear-field field="createNonOisgirDetailMap"/>
<set from-field="inventoryItem.inventoryItemId" field="createNonOisgirDetailMap.inventoryItemId"/>
<calculate field="createNonOisgirDetailMap.availableToPromiseDiff">
- <calcop field="currentQuantityToMove" operator="negative"/>
+ <calcop operator="negative" field="currentQuantityToMove"/>
</calculate>
<calculate field="createNonOisgirDetailMap.quantityOnHandDiff">
- <calcop field="currentQuantityToMove" operator="negative"/>
+ <calcop operator="negative" field="currentQuantityToMove"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createNonOisgirDetailMap"/>

@@ -508,9 +508,9 @@ under the License.
</if-empty>

<calculate field="reservedQuantityLeftOver" type="BigDecimal">
- <calcop field="orderItemShipGrpInvRes.quantity" operator="get"/>
- <calcop field="orderItemShipGrpInvRes.quantityNotAvailable" operator="negative"/>
- <calcop field="currentQuantityToMove" operator="negative"/>
+ <calcop operator="get" field="orderItemShipGrpInvRes.quantity"/>
+ <calcop operator="negative" field="orderItemShipGrpInvRes.quantityNotAvailable"/>
+ <calcop operator="negative" field="currentQuantityToMove"/>
</calculate>

<if>
@@ -539,10 +539,10 @@ under the License.
<set from-field="inventoryItem.inventoryItemId" field="createOisgirDetailMap.inventoryItemId"/>
<set from-field="targetInventoryItem.inventoryItemId" field="createOisgirTargetDetailMap.inventoryItemId"/>
<calculate field="createOisgirDetailMap.quantityOnHandDiff">
- <calcop field="currentQuantityToMove" operator="negative"/>
+ <calcop operator="negative" field="currentQuantityToMove"/>
</calculate>
<calculate field="createOisgirTargetDetailMap.quantityOnHandDiff">
- <calcop field="currentQuantityToMove" operator="get"/>
+ <calcop operator="get" field="currentQuantityToMove"/>
</calculate>


<calculate field="targetOrderItemShipGrpInvRes.quantity" type="BigDecimal">
- <calcop field="currentQuantityToMove" operator="get"/>
- <calcop field="quantityNotAvailableToMove" operator="get"/>
+ <calcop operator="get" field="currentQuantityToMove"/>
+ <calcop operator="get" field="quantityNotAvailableToMove"/>
</calculate>
<calculate field="targetOrderItemShipGrpInvRes.quantityNotAvailable" type="BigDecimal">
- <calcop field="quantityNotAvailableToMove" operator="get"/>
+ <calcop operator="get" field="quantityNotAvailableToMove"/>
</calculate>
<create-value value-field="targetOrderItemShipGrpInvRes"/>
<calculate field="orderItemShipGrpInvRes.quantity">
- <calcop field="orderItemShipGrpInvRes.quantity" operator="get"/>
- <calcop field="currentQuantityToMove" operator="negative"/>
- <calcop field="quantityNotAvailableToMove" operator="negative"/>
+ <calcop operator="get" field="orderItemShipGrpInvRes.quantity"/>
+ <calcop operator="negative" field="currentQuantityToMove"/>
+ <calcop operator="negative" field="quantityNotAvailableToMove"/>
</calculate>
<calculate field="orderItemShipGrpInvRes.quantityNotAvailable">
- <calcop field="orderItemShipGrpInvRes.quantityNotAvailable" operator="get"/>
- <calcop field="quantityNotAvailableToMove" operator="negative"/>
+ <calcop operator="get" field="orderItemShipGrpInvRes.quantityNotAvailable"/>
+ <calcop operator="negative" field="quantityNotAvailableToMove"/>
</calculate>
<store-value value-field="orderItemShipGrpInvRes"/>

@@ -603,12 +603,12 @@ under the License.


<calculate field="quantityLeftToProcess">
- <calcop field="quantityLeftToProcess" operator="get"/>
- <calcop field="currentQuantityToMove" operator="negative"/>
+ <calcop operator="get" field="quantityLeftToProcess"/>
+ <calcop operator="negative" field="currentQuantityToMove"/>
</calculate>
<calculate field="remainingQuantityOnHand">
- <calcop field="remainingQuantityOnHand" operator="subtract"/>
- <calcop field="currentQuantityToMove" operator="negative"/>
+ <calcop operator="subtract" field="remainingQuantityOnHand"/>
+ <calcop operator="negative" field="currentQuantityToMove"/>
</calculate>



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=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml Sat Nov 5 14:14:04 2016
@@ -104,7 +104,7 @@ under the License.
<field-map field-name="productStoreGroupId" value="_NA_"/>
</entity-and>

- <first-from-list entry="productPrice" list="productPriceList"/>
+ <first-from-list list="productPriceList" entry="productPrice"/>
<set field="productPrice.price" from-field="parameters.price"/>
<store-value value-field="productPrice"/>
</if-not-empty>

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=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/product/ProductContentServices.xml Sat Nov 5 14:14:04 2016
@@ -159,7 +159,7 @@ under the License.


<simple-method method-name="removeProductPromoContent" short-description="Remove Content From Product Promo">
- <set-service-fields service-name="updateProductPromoContent" to-map="updateProductPromoContentMap" map="parameters"/>
+ <set-service-fields service-name="updateProductPromoContent" map="parameters" to-map="updateProductPromoContentMap"/>/>
<if-empty field="updateProductPromoContentMap.thruDate">
<now-timestamp field="updateProductPromoContentMap.thruDate"/>
</if-empty>
@@ -175,7 +175,7 @@ under the License.
</entity-and>
<if-not-empty field="productContents">
<first-from-list entry="productContent" list="productContents"/>
- <entity-one value-field="electronicText" entity-name="ElectronicText">
+ <entity-one entity-name="ElectronicText" value-field="electronicText">
<field-map field-name="dataResourceId" from-field="productContent.dataResourceId"/>
</entity-one>
<if-not-empty field="electronicText">
@@ -197,7 +197,7 @@ under the License.
</entity-and>
<if-not-empty field="productContents">
<first-from-list entry="productContent" list="productContents"/>
- <entity-one value-field="electronicText" entity-name="ElectronicText">
+ <entity-one entity-name="ElectronicText" value-field="electronicText">
<field-map field-name="dataResourceId" from-field="productContent.dataResourceId"/>
</entity-one>
<if-not-empty field="electronicText">
@@ -219,7 +219,7 @@ under the License.
</entity-and>
<if-not-empty field="productContents">
<first-from-list entry="productContent" list="productContents"/>
- <entity-one value-field="electronicText" entity-name="ElectronicText">
+ <entity-one entity-name="ElectronicText" value-field="electronicText">
<field-map field-name="dataResourceId" from-field="productContent.dataResourceId"/>
</entity-one>
<if-not-empty field="electronicText">

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=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/product/ProductServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/product/ProductServices.xml Sat Nov 5 14:14:04 2016
@@ -36,7 +36,7 @@ under the License.
<else>
<check-id field="newEntity.productId"/>
<check-errors />
- <entity-one value-field="dummyProduct" entity-name="Product"><field-map field-name="productId" from-field="parameters.productId"/></entity-one>
+ <entity-one entity-name="Product" value-field="dummyProduct"><field-map field-name="productId" from-field="parameters.productId"/></entity-one>
<if-not-empty field="dummyProduct">
<add-error ><fail-property resource="CommonErrorUiLabels" property="CommonErrorDuplicateKey" /></add-error>
</if-not-empty>
@@ -426,8 +426,8 @@ under the License.
<create-value value-field="productCalculatedInfo"/>
<else>
<calculate field="productCalculatedInfo.totalTimesViewed" type="Long">
- <calcop field="productCalculatedInfo.totalTimesViewed" operator="add">
- <calcop field="parameters.weight" operator="get"></calcop>
+ <calcop operator="add" field="productCalculatedInfo.totalTimesViewed">
+ <calcop operator="get" field="parameters.weight"></calcop>
</calcop>
</calculate>
<store-value value-field="productCalculatedInfo"/>
@@ -914,7 +914,7 @@ under the License.
<field-map field-name="productIdTo" from-field="orderItem.productId"/>
<field-map field-name="productAssocTypeId" value="PRODUCT_VARIANT"/>
</entity-and>
- <first-from-list entry="variantProductAssoc" list="variantProductAssocs"/>
+ <first-from-list list="variantProductAssocs" entry="variantProductAssoc"/>
<set field="productId" from-field="variantProductAssoc.productId"/>
</if-compare>

@@ -922,10 +922,10 @@ under the License.
<field-map field-name="productId" from-field="productId"/>
</entity-and>
<if-not-empty field="productGroupOrders">
- <first-from-list entry="productGroupOrder" list="productGroupOrders"/>
+ <first-from-list list="productGroupOrders" entry="productGroupOrder"/>
<calculate field="productGroupOrder.soldOrderQty">
- <calcop field="productGroupOrder.soldOrderQty" operator="add">
- <calcop field="orderItem.quantity" operator="get"/>
+ <calcop operator="add" field="productGroupOrder.soldOrderQty">
+ <calcop operator="get" field="orderItem.quantity"/>
</calcop>
</calculate>
<store-value value-field="productGroupOrder"/>
@@ -956,7 +956,7 @@ under the License.
<field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/>
</entity-and>
<if-not-empty field="orderItemGroupOrders">
- <first-from-list entry="orderItemGroupOrder" list="orderItemGroupOrders"/>
+ <first-from-list list="orderItemGroupOrders" entry="orderItemGroupOrder"/>
<entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder">
<field-map field-name="groupOrderId" from-field="orderItemGroupOrder.groupOrderId"/>
</entity-one>
@@ -970,8 +970,8 @@ under the License.
</else>
</if-not-empty>
<calculate field="productGroupOrder.soldOrderQty">
- <calcop field="productGroupOrder.soldOrderQty" operator="subtract">
- <calcop field="cancelQuantity" operator="get"/>
+ <calcop operator="subtract" field="productGroupOrder.soldOrderQty">
+ <calcop operator="get" field="cancelQuantity"/>
</calcop>
</calculate>
</if-compare>
@@ -1017,7 +1017,7 @@ under the License.
<call-simple-method method-name="checkProductRelatedPermission"/>
<check-errors/>

- <entity-one value-field="productReview" entity-name="ProductReview"/>
+ <entity-one entity-name="ProductReview" value-field="productReview"/>
<if-not-empty field="productReview">
<if-compare-field field="productReview.statusId" to-field="parameters.statusId" operator="not-equals">
<entity-one entity-name="StatusValidChange" value-field="statusChange">

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=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/storage/FacilityContactMechServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/storage/FacilityContactMechServices.xml Sat Nov 5 14:14:04 2016
@@ -64,7 +64,7 @@ under the License.
<field-map field-name="facilityId" from-field="parameters.facilityId"/>
<field-map field-name="contactMechId" from-field="parameters.contactMechId"/>
</entity-and>
- <first-from-list entry="facilityContactMech" list="facilityContactMechs"/>
+ <first-from-list list="facilityContactMechs" entry="facilityContactMech"/>
<if-empty field="facilityContactMech">
<add-error>
<fail-property resource="PartyUiLabels" property="PartyCannotUpdateContactBecauseNotWithSpecifiedParty"/>
@@ -131,7 +131,7 @@ under the License.
<find-by-and entity-name="FacilityContactMech" list="facilityContactMechs" map="facilityContactMechMap"/>
<filter-list-by-date list="facilityContactMechs" to-list="validFacilityContactMechs"/>

- <first-from-list entry="facilityContactMech" list="validFacilityContactMechs"/>
+ <first-from-list list="validFacilityContactMechs" entry="facilityContactMech"/>
<if-empty field="facilityContactMech">
<add-error>
<fail-property resource="PartyUiLabels" property="PartyContactMechNotFoundCannotDelete"/>

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=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/store/ProductStoreServices.xml Sat Nov 5 14:14:04 2016
@@ -159,7 +159,7 @@ under the License.
</add-error>
<check-errors/>
</if-empty>
- <set-service-fields map="parameters" to-map="callServiceMap" service-name="reserveProductInventoryByFacility"/>
+ <set-service-fields service-name="reserveProductInventoryByFacility" map="parameters" to-map="callServiceMap"/>/>
<set from-field="productStore.inventoryFacilityId" field="callServiceMap.facilityId"/>
<set from-field="requireInventory" field="callServiceMap.requireInventory"/>
<set from-field="productStore.reserveOrderEnumId" field="callServiceMap.reserveOrderEnumId"/>
@@ -203,7 +203,7 @@ under the License.
<first-from-list list="productStoreFacilities" entry="storeFound"/>
</if-empty>
<set from-field="storeFound.facilityId" field="facilityId" default-value=""/>
- <set-service-fields map="parameters" to-map="callServiceMap" service-name="reserveProductInventoryByFacility"/>
+ <set-service-fields service-name="reserveProductInventoryByFacility" map="parameters" to-map="callServiceMap"/>/>
<set from-field="facilityId" field="callServiceMap.facilityId"/>
<set from-field="requireInventory" field="callServiceMap.requireInventory"/>
<set from-field="productStore.reserveOrderEnumId" field="callServiceMap.reserveOrderEnumId"/>
@@ -230,7 +230,7 @@ under the License.
</add-error>
<check-errors/>
</if-empty>
- <set-service-fields map="parameters" to-map="callServiceMap" service-name="reserveProductInventoryByFacility"/>
+ <set-service-fields service-name="reserveProductInventoryByFacility" map="parameters" to-map="callServiceMap"/>/>
<set from-field="facilityId" field="callServiceMap.facilityId"/>
<set from-field="requireInventory" field="callServiceMap.requireInventory"/>
<set from-field="productStore.reserveOrderEnumId" field="callServiceMap.reserveOrderEnumId"/>
@@ -420,7 +420,7 @@ under the License.
<set value="Y" field="availableOrNotRequired"/>
<field-to-result field="availableOrNotRequired"/>
<else>
- <set-service-fields map="parameters" to-map="callServiceMap" service-name="isStoreInventoryAvailable"/>
+ <set-service-fields service-name="isStoreInventoryAvailable" map="parameters" to-map="callServiceMap"/>/>
<call-service service-name="isStoreInventoryAvailable" in-map-name="callServiceMap">
<result-to-result result-name="available" service-result-name="availableOrNotRequired"/>
</call-service>
@@ -512,12 +512,12 @@ under the License.
</simple-method>

<simple-method method-name="checkProductStoreGroupRollup" short-description="When product store group hierarchy has been operate, synchronize primaryParentGroupId with ProductStoreGroupRollup">
- <entity-one value-field="productStoreGroup" entity-name="ProductStoreGroup"/>
+ <entity-one entity-name="ProductStoreGroup" value-field="productStoreGroup"/>
<if-empty field="parameters.primaryParentGroupId">
- <entity-one value-field="productStoreGroupRollup" entity-name="ProductStoreGroupRollup"/>
+ <entity-one entity-name="ProductStoreGroupRollup" value-field="productStoreGroupRollup"/>
<if-not-empty field="productStoreGroupRollup">
<set field="productStoreGroup.primaryParentGroupId"/>
- <set-service-fields service-name="updateProductStoreGroup" to-map="productStoreGroupMap" map="productStoreGroup"/>
+ <set-service-fields service-name="updateProductStoreGroup" map="productStoreGroup" to-map="productStoreGroupMap"/>/>
<call-service service-name="updateProductStoreGroup" in-map-name="productStoreGroupMap"/>
</if-not-empty>
<else>

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=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/subscription/SubscriptionServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/subscription/SubscriptionServices.xml Sat Nov 5 14:14:04 2016
@@ -38,7 +38,7 @@ under the License.
<field-map field-name="productId" from-field="parameters.productId"/>
<order-by field-name="-fromDate"/>
</entity-and>
- <first-from-list entry="resource" list="resourceList"/>
+ <first-from-list list="resourceList" entry="resource"/>
<if-not-empty field="resource">
<set-nonpk-fields map="resource" value-field="newEntity"/>
</if-not-empty>
@@ -62,7 +62,7 @@ under the License.
<set field="found" value="false" type="Boolean"/>
<else>
<set field="found" value="true" type="Boolean"/>
- <first-from-list entry="subscription" list="pfResultList"/>
+ <first-from-list list="pfResultList" entry="subscription"/>
<field-to-result field="subscription.subscriptionId" result-name="subscriptionId"/>
</else>
</if-empty>

Modified: ofbiz/trunk/applications/product/minilang/product/test/GroupOrderTest.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/test/GroupOrderTest.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/test/GroupOrderTest.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/test/GroupOrderTest.xml Sat Nov 5 14:14:04 2016
@@ -36,7 +36,7 @@ under the License.
<field field="nowTimestamp" type="java.sql.Timestamp"/>
<field field="days" type="int"/>
</call-class-method>
- <entity-one value-field="systemUserLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="createProductGroupOrderMap.userLogin" from-field="systemUserLogin"/>
@@ -58,7 +58,7 @@ under the License.
<field field="response" type="javax.servlet.http.HttpServletResponse"/>
</call-class-method>
<log level="info" message="===== >>> Event : routeOrderEntry, Response : ${result}"/>
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<script>groovy:
@@ -132,7 +132,7 @@ under the License.
<entity-and entity-name="OrderItemGroupOrder" list="orderItemGroupOrders">
<field-map field-name="groupOrderId" from-field="groupOrderId"/>
</entity-and>
- <first-from-list entry="orderItemGroupOrder" list="orderItemGroupOrders"/>
+ <first-from-list list="orderItemGroupOrders" entry="orderItemGroupOrder"/>
<entity-one entity-name="OrderItem" value-field="orderItem">
<field-map field-name="orderId" from-field="orderItemGroupOrder.orderId"/>
<field-map field-name="orderItemSeqId" from-field="orderItemGroupOrder.orderItemSeqId"/>
@@ -158,7 +158,7 @@ under the License.
<field field="nowTimestamp" type="java.sql.Timestamp"/>
<field field="days" type="int"/>
</call-class-method>
- <entity-one value-field="systemUserLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="createProductGroupOrderMap.userLogin" from-field="systemUserLogin"/>
@@ -180,7 +180,7 @@ under the License.
<field field="response" type="javax.servlet.http.HttpServletResponse"/>
</call-class-method>
<log level="info" message="===== >>> Event : routeOrderEntry, Response : ${result}"/>
- <entity-one value-field="userLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
<script>groovy:
@@ -254,7 +254,7 @@ under the License.
<entity-and entity-name="OrderItemGroupOrder" list="orderItemGroupOrders">
<field-map field-name="groupOrderId" from-field="groupOrderId"/>
</entity-and>
- <first-from-list entry="orderItemGroupOrder" list="orderItemGroupOrders"/>
+ <first-from-list list="orderItemGroupOrders" entry="orderItemGroupOrder"/>
<entity-one entity-name="OrderItem" value-field="orderItem">
<field-map field-name="orderId" from-field="orderItemGroupOrder.orderId"/>
<field-map field-name="orderItemSeqId" from-field="orderItemGroupOrder.orderItemSeqId"/>

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=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/test/ProductTagTest.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/test/ProductTagTest.xml Sat Nov 5 14:14:04 2016
@@ -33,7 +33,7 @@ under the License.
Step 8) Check all product tags is created.
-->

- <entity-one value-field="systemUserLogin" entity-name="UserLogin">
+ <entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="request" from-field="parameters.request"/>

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=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml Sat Nov 5 14:14:04 2016
@@ -45,7 +45,7 @@ under the License.
<set field="updateContext.statusId" value="INV_DELIVERED"/>
<call-service service-name="updateInventoryItem" in-map-name="updateContext"/>

- <entity-one value-field="product" entity-name="Product">
+ <entity-one entity-name="Product" value-field="product">
<field-map field-name="productId" from-field="inventoryItem.productId"/>
</entity-one>
<if>
@@ -185,7 +185,7 @@ under the License.
<make-value entity-name="OrderShipment" value-field="orderShipmentLookupPk"/>
<set-pk-fields value-field="orderShipmentLookupPk" map="parameters"/>
<find-by-and entity-name="OrderShipment" map="orderShipmentLookupPk" list="orderShipments"/>
- <first-from-list entry="orderShipment" list="orderShipments"/>
+ <first-from-list list="orderShipments" entry="orderShipment"/>


<call-simple-method method-name="calcQtyForShipmentItemInline"/>
@@ -210,7 +210,7 @@ under the License.
<else>

<calculate field="orderShipment.quantity">
- <calcop field="orderShipment.quantity" operator="subtract">
+ <calcop operator="subtract" field="orderShipment.quantity">
<calcop operator="get" field="parameters.quantity"/>
</calcop>
</calculate>
@@ -267,7 +267,7 @@ under the License.
<set from-field="shipmentItem.shipmentItemSeqId" field="createDetailMap.shipmentItemSeqId"/>
<set from-field="itemIssuanceId" field="createDetailMap.itemIssuanceId"/>
<calculate field="createDetailMap.quantityOnHandDiff" decimal-scale="6">
- <calcop field="parameters.quantity" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantity"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
<clear-field field="createDetailMap"/>
@@ -319,7 +319,7 @@ under the License.
<iterate list="itemIssuances" entry="itemIssuance">
<if-compare-field field="itemIssuance.inventoryItemId" operator="not-equals" to-field="parameters.inventoryItemId">
<calculate field="otherInventoryItemQuantity">
- <calcop field="otherInventoryItemQuantity" operator="add">
+ <calcop operator="add" field="otherInventoryItemQuantity">
<calcop operator="get" field="itemIssuance.quantity"/>
</calcop>
</calculate>
@@ -331,13 +331,13 @@ under the License.
from the current one should be ignored as we calculate the adjustment to make.
-->
<calculate field="orderShipmentAmount">
- <calcop field="orderShipment.quantity" operator="subtract">
+ <calcop operator="subtract" field="orderShipment.quantity">
<calcop operator="get" field="otherInventoryItemQuantity"/>
</calcop>
</calculate>

<calculate field="qtyForShipmentItem">
- <calcop field="parameters.quantity" operator="subtract">
+ <calcop operator="subtract" field="parameters.quantity">
<calcop operator="get" field="orderShipmentAmount"/>
</calcop>
</calculate>
@@ -356,7 +356,7 @@ under the License.
</condition-list>
<order-by field-name="shipmentItemSeqId"/>
</entity-condition>
- <first-from-list entry="shipmentItem" list="shipmentItems"/>
+ <first-from-list list="shipmentItems" entry="shipmentItem"/>
</if-not-empty>

<if-empty field="shipmentItem">
@@ -400,14 +400,14 @@ under the License.
<make-value entity-name="OrderShipment" value-field="orderShipmentLookupPk"/>
<set-pk-fields value-field="orderShipmentLookupPk" map="orderShipmentCreate"/>
<find-by-and entity-name="OrderShipment" map="orderShipmentLookupPk" list="orderShipments"/>
- <first-from-list entry="orderShipment" list="orderShipments"/>
+ <first-from-list list="orderShipments" entry="orderShipment"/>

<if-empty field="orderShipment">
<set from-field="parameters.quantity" field="orderShipmentCreate.quantity"/>
<call-service service-name="createOrderShipment" in-map-name="orderShipmentCreate"/>
<else>
<calculate field="orderShipment.quantity">
- <calcop field="orderShipment.quantity" operator="add">
+ <calcop operator="add" field="orderShipment.quantity">
<calcop operator="get" field="parameters.quantity"/>
</calcop>
</calculate>
@@ -428,7 +428,7 @@ under the License.
<order-by field-name="-issuedDateTime"/>
</entity-and>
<if-not-empty field="itemIssuances">
- <first-from-list entry="itemIssuance" list="itemIssuances"/>
+ <first-from-list list="itemIssuances" entry="itemIssuance"/>
<set field="itemIssuance.quantity" value="${itemIssuance.quantity$bigDecimal + parameters.quantity$bigDecimal}" type="BigDecimal"/>
<store-value value-field="itemIssuance"/>
<set field="itemIssuanceId" from-field="itemIssuance.itemIssuanceId"/>
@@ -472,7 +472,7 @@ under the License.
</if-empty>


- <entity-one value-field="itemIssuanceRole" entity-name="ItemIssuanceRole">
+ <entity-one entity-name="ItemIssuanceRole" value-field="itemIssuanceRole">
<field-map field-name="itemIssuanceId" from-field="itemIssuanceId"/>
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="roleTypeId" value="PACKER"/>
@@ -523,10 +523,10 @@ under the License.
<set from-field="fixedAssetMaint.maintHistSeqId" field="createDetailMap.maintHistSeqId"/>
<set from-field="itemIssuanceId" field="createDetailMap.itemIssuanceId"/>
<calculate field="createDetailMap.quantityOnHandDiff" decimal-scale="6">
- <calcop field="parameters.quantity" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantity"/>
</calculate>
<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="parameters.quantity" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantity"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
</simple-method>
@@ -545,10 +545,10 @@ under the License.
<set from-field="itemIssuance.maintHistSeqId" field="createDetailMap.maintHistSeqId"/>
<set from-field="itemIssuance.itemIssuanceId" field="createDetailMap.itemIssuanceId"/>
<calculate field="createDetailMap.quantityOnHandDiff" decimal-scale="6">
- <calcop field="oldQuantity" operator="add"/>
+ <calcop operator="add" field="oldQuantity"/>
</calculate>
<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="oldQuantity" operator="add"/>
+ <calcop operator="add" field="oldQuantity"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
</simple-method>
@@ -577,7 +577,7 @@ under the License.


<calculate field="qtyIssuedLeft">
- <calcop field="itemIssuance.quantity" operator="subtract">
+ <calcop operator="subtract" field="itemIssuance.quantity">
<calcop operator="get" field="itemIssuance.cancelQuantity"/>
</calcop>
</calculate>
@@ -699,10 +699,10 @@ under the License.
<set field="createDetailMap.shipmentId" from-field="shipmentId"/>
<set field="createDetailMap.shipmentItemSeqId" from-field="shipmentItemSeqId"/>
<calculate field="createDetailMap.quantityOnHandDiff" decimal-scale="6">
- <calcop field="parameters.quantity" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantity"/>
</calculate>
<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="parameters.quantity" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantity"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
</simple-method>

Modified: ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml Sat Nov 5 14:14:04 2016
@@ -398,7 +398,7 @@ under the License.
<clear-field field="orderHeaderInfo"/>

<calculate field="numberSoFar" type="Long">
- <calcop field="numberSoFar" operator="add"><number value="1"/></calcop>
+ <calcop operator="add" field="numberSoFar"><number value="1"/></calcop>
</calculate>
<log level="info" message="Added order #${orderHeader.orderId} to pick list [${numberSoFar} of ${parameters.maxNumberOfOrders}] - ${pickThisOrder} / ${allPickStarted}"/>
<set field="pickMoveInfoMap[groupName].groupName" from-field="groupName"/>
@@ -480,7 +480,7 @@ under the License.
</if>

<calculate field="numberSoFar" type="Long">
- <calcop field="numberSoFar" operator="add"><number value="1"/></calcop>
+ <calcop operator="add" field="numberSoFar"><number value="1"/></calcop>
</calculate>
</iterate>
-->
@@ -511,8 +511,8 @@ under the License.
<clear-field field="inventoryItemOrderItemList"/>
<if-not-empty field="inventoryItemQuantities[inventoryItemId]">
<calculate field="inventoryItemQuantities[inventoryItemId]">
- <calcop field="inventoryItemQuantities[inventoryItemId]" operator="add">
- <calcop field="orderItemShipGrpInvRes.quantity" operator="get"/>
+ <calcop operator="add" field="inventoryItemQuantities[inventoryItemId]">
+ <calcop operator="get" field="orderItemShipGrpInvRes.quantity"/>
</calcop>
</calculate>
<else>
@@ -523,8 +523,8 @@ under the License.
<clear-field field="inventoryItem"/>

<calculate field="reservedQuantity">
- <calcop field="reservedQuantity" operator="add">
- <calcop field="orderItemShipGrpInvRes.quantity" operator="get"/>
+ <calcop operator="add" field="reservedQuantity">
+ <calcop operator="get" field="orderItemShipGrpInvRes.quantity"/>
</calcop>
</calculate>
</iterate>
@@ -544,8 +544,8 @@ under the License.
<calculate field="issuedQuantity"><number value="0"/></calculate>
<iterate list="itemIssuances" entry="itemIssuance">
<calculate field="issuedQuantity">
- <calcop field="issuedQuantity" operator="get"/>
- <calcop field="itemIssuance.quantity" operator="get"/>
+ <calcop operator="get" field="issuedQuantity"/>
+ <calcop operator="get" field="itemIssuance.quantity"/>
</calculate>
</iterate>
<calculate field="reservedIssuedQuantity">
@@ -648,7 +648,7 @@ under the License.
<result-to-field result-name="picklistBinId"/>
</call-service>

- <calculate field="binLocationNumber" type="Long"><calcop field="binLocationNumber" operator="add"/><number value="1"/></calculate>
+ <calculate field="binLocationNumber" type="Long"><calcop operator="add" field="binLocationNumber"/><number value="1"/></calculate>
<set field="itemsInBin" type="Long" value="0"/>

<iterate list="orderHeaderInfo.orderItemInfoList" entry="orderItemInfo">
@@ -669,8 +669,8 @@ under the License.
<set field="quantityToSubtract" from-field="orderItemShipGrpInvRes.quantityNotAvailable"/>
<log level="info" message="Subtracting ${quantityToSubtract} from ${quantityToPick}"/>
<calculate field="quantityToPick">
- <calcop field="quantityToPick" operator="subtract">
- <calcop field="quantityToSubtract" operator="get"/>
+ <calcop operator="subtract" field="quantityToPick">
+ <calcop operator="get" field="quantityToSubtract"/>
</calcop>
</calculate>
</then>
@@ -921,7 +921,7 @@ under the License.


- <entity-condition list="inventoryItemList" entity-name="InventoryItem">
+ <entity-condition entity-name="InventoryItem" list="inventoryItemList">
<condition-expr field-name="lotId" from-field="parameters.lotId" operator="equals"/>
</entity-condition>

@@ -948,8 +948,8 @@ under the License.


<call-service service-name="getInventoryAvailableByFacility" in-map-name="inputMap">
- <result-to-field field="quantityOnHandTotal" result-name="quantityOnHandTotal"/>
- <result-to-field field="availableToPromiseTotal" result-name="availableToPromiseTotal"/>
+ <result-to-field result-name="quantityOnHandTotal" field="quantityOnHandTotal"/>
+ <result-to-field result-name="availableToPromiseTotal" field="availableToPromiseTotal"/>
</call-service>

<if>
@@ -977,7 +977,7 @@ under the License.
<remove-value value-field="picklistItem"/>


- <set-service-fields map="parameters" to-map="cancelOrderItemShipGrpInvResMap" service-name="cancelOrderItemShipGrpInvRes"/>
+ <set-service-fields service-name="cancelOrderItemShipGrpInvRes" map="parameters" to-map="cancelOrderItemShipGrpInvResMap"/>/>
<call-service service-name="cancelOrderItemShipGrpInvRes" in-map-name="cancelOrderItemShipGrpInvResMap"/>

<clear-field field="inputMap"/>
@@ -1023,7 +1023,7 @@ under the License.
<call-service service-name="reserveProductInventoryByFacility" in-map-name="inputMap"/>
</if-compare-field>

- <entity-condition list="oisgirs" entity-name="OrderItemShipGrpInvRes">
+ <entity-condition entity-name="OrderItemShipGrpInvRes" list="oisgirs">
<condition-list>
<condition-expr from-field="parameters.orderId" field-name="orderId" operator="equals"/>
<condition-expr from-field="parameters.shipGroupSeqId" field-name="shipGroupSeqId" operator="equals"/>
@@ -1033,7 +1033,7 @@ under the License.

<set from-field="picklistItem.picklistBinId" field="picklistBinId"/>

- <entity-condition list="picklistItemList" entity-name="PicklistItem">
+ <entity-condition entity-name="PicklistItem" list="picklistItemList">
<condition-list>
<condition-expr from-field="parameters.orderId" field-name="orderId" operator="equals"/>
<condition-expr from-field="parameters.shipGroupSeqId" field-name="shipGroupSeqId" operator="equals"/>
@@ -1260,14 +1260,14 @@ under the License.

<iterate list="facilityLocationInfo.picklistItemInfoList" entry="picklistItemInfo">
<calculate field="facilityLocationInfo.pickQuantity">
- <calcop field="facilityLocationInfo.pickQuantity" operator="add">
- <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
+ <calcop operator="add" field="facilityLocationInfo.pickQuantity">
+ <calcop operator="get" field="picklistItemInfo.picklistItem.quantity"/>
</calcop>
</calculate>

<calculate field="facilityLocationInfo.quantityByPicklistBinIdMap[picklistItemInfo.picklistBin.picklistBinId]">
- <calcop field="facilityLocationInfo.quantityByPicklistBinIdMap[picklistItemInfo.picklistBin.picklistBinId]" operator="add">
- <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
+ <calcop operator="add" field="facilityLocationInfo.quantityByPicklistBinIdMap[picklistItemInfo.picklistBin.picklistBinId]">
+ <calcop operator="get" field="picklistItemInfo.picklistItem.quantity"/>
</calcop>
</calculate>

@@ -1313,13 +1313,13 @@ under the License.

<iterate list="productInfo.picklistItemInfoList" entry="picklistItemInfo">
<calculate field="productInfo.pickQuantity">
- <calcop field="productInfo.pickQuantity" operator="add"/>
- <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
+ <calcop operator="add" field="productInfo.pickQuantity"/>
+ <calcop operator="get" field="picklistItemInfo.picklistItem.quantity"/>
</calculate>

<calculate field="productInfo.quantityByPicklistBinIdMap[picklistItemInfo.picklistBin.picklistBinId]">
- <calcop field="productInfo.quantityByPicklistBinIdMap[picklistItemInfo.picklistBin.picklistBinId]" operator="add">
- <calcop field="picklistItemInfo.picklistItem.quantity" operator="get"/>
+ <calcop operator="add" field="productInfo.quantityByPicklistBinIdMap[picklistItemInfo.picklistBin.picklistBinId]">
+ <calcop operator="get" field="picklistItemInfo.picklistItem.quantity"/>
</calcop>
</calculate>
</iterate>
@@ -1526,8 +1526,8 @@ under the License.

<set from-field="inventoryItemInfo.product" field="productInfoMap.${inventoryItemInfo.product.productId}.product"/>
<calculate field="productInfoMap.${inventoryItemInfo.product.productId}.quantity">
- <calcop field="productInfoMap.${inventoryItemInfo.product.productId}.quantity" operator="get"/>
- <calcop field="inventoryItemInfo.quantity" operator="get"/>
+ <calcop operator="get" field="productInfoMap.${inventoryItemInfo.product.productId}.quantity"/>
+ <calcop operator="get" field="inventoryItemInfo.quantity"/>
</calculate>
<set from-field="inventoryItemInfo.inventoryItem" field="productInfoMap.${inventoryItemInfo.product.productId}.inventoryItemList[]"/>


Modified: ofbiz/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml Sat Nov 5 14:14:04 2016
@@ -47,7 +47,7 @@ under the License.
</if-not-empty>
<set field="affectAccounting" type="Boolean" value="true"/>

- <entity-one value-field="product" entity-name="Product"/>
+ <entity-one entity-name="Product" value-field="product"/>
<if>
<condition>
<or>
@@ -382,7 +382,7 @@ under the License.
</condition-list>
<order-by field-name="shipmentItemSeqId"/>
</entity-condition>
- <first-from-list entry="shipmentItem" list="shipmentItems"/>
+ <first-from-list list="shipmentItems" entry="shipmentItem"/>
</if-not-empty>

<if-empty field="shipmentItem">
@@ -418,7 +418,7 @@ under the License.
<field-map field-name="shipmentItemSeqId" from-field="shipmentItem.shipmentItemSeqId"/>
<field-map field-name="shipGroupSeqId" from-field="orderItemShipGroupAssoc.shipGroupSeqId"/>
</entity-and>
- <first-from-list entry="orderShipment" list="orderShipments"/>
+ <first-from-list list="orderShipments" entry="orderShipment"/>
<if-compare-field field="totalIssuedQuantity" operator="less" to-field="receivedQuantity" type="BigDecimal">
<set field="quantityToAdd" value="${receivedQuantity$bigDecimal - totalIssuedQuantity$bigDecimal}" type="BigDecimal"/>
<set field="shipmentItem.quantity" value="${shipmentItem.quantity$bigDecimal + quantityToAdd$bigDecimal}" type="BigDecimal"/>
@@ -454,7 +454,7 @@ under the License.
</simple-method>

<simple-method method-name="updateIssuanceShipmentAndPoOnReceiveInventory" short-description="Update issuance, shipment and order items if quantity received is higher than quantity on purchase order">
- <entity-one value-field="orderItem" entity-name="OrderItem"/>
+ <entity-one entity-name="OrderItem" value-field="orderItem"/>
<if-not-empty field="parameters.orderCurrencyUnitPrice">
<if-compare-field field="parameters.orderCurrencyUnitPrice" operator="not-equals" to-field="orderItem.unitPrice" type="BigDecimal">
<set field="orderItem.unitPrice" from-field="parameters.orderCurrencyUnitPrice" type="BigDecimal"/>
@@ -479,7 +479,7 @@ under the License.
<calcop operator="get" field="orderItem.quantity"/>
</calcop>
</calculate>
- <first-from-list entry="orderItemShipGroupAssoc" list="orderItemShipGroupAssocs"/>
+ <first-from-list list="orderItemShipGroupAssocs" entry="orderItemShipGroupAssoc"/>
<calculate field="oisgaQuantity" type="BigDecimal" decimal-scale="2" rounding-mode="HalfUp">
<calcop operator="add">
<calcop operator="get" field="orderItemShipGroupAssoc.quantity"/>
@@ -504,7 +504,7 @@ under the License.
</condition-list>
<order-by field-name="shipmentItemSeqId"/>
</entity-condition>
- <first-from-list entry="shipmentItem" list="shipmentItems"/>
+ <first-from-list list="shipmentItems" entry="shipmentItem"/>
<set field="shipmentItem.quantity" value="${shipmentItem.quantity$bigDecimal + quantityToAdd$bigDecimal}" type="BigDecimal"/>
<store-value value-field="shipmentItem"/>

@@ -514,7 +514,7 @@ under the License.
<field-map field-name="shipmentId" from-field="parameters.shipmentId"/>
<field-map field-name="shipmentItemSeqId" from-field="shipmentItem.shipmentItemSeqId"/>
</entity-and>
- <first-from-list entry="orderShipment" list="orderShipments"/>
+ <first-from-list list="orderShipments" entry="orderShipment"/>
<set field="orderShipment.quantity" value="${orderShipment.quantity$bigDecimal + quantityToAdd$bigDecimal}" type="BigDecimal"/>
<store-value value-field="orderShipment"/>
<!--