svn commit: r730643 - in /ofbiz/trunk/applications: accounting/script/org/ofbiz/ac
Locked
svn commit: r730643 - in /ofbiz/trunk/applications: accounting/script/org/ofbiz/ac
 
|
Author: jleroux
Date: Thu Jan 1 15:34:52 2009 New Revision: 730643 URL: http://svn.apache.org/viewvc?rev=730643&view=rev Log: <calcop field-name= => <calcop field= Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml?rev=730643&r1=730642&r2=730643&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml Thu Jan 1 15:34:52 2009 @@ -29,7 +29,7 @@ <check-errors/> <if-compare field="invoice.invoiceTypeId" operator="equals" value="SALES_INVOICE"> <set field="andConditions.invoiceItemTypeId" value="INV_FPROD_ITEM"/> - <get-related relation-name="InvoiceItem" value-field="invoice" list="invoiceItems" map-name="andConditions"/> + <get-related relation-name="InvoiceItem" value-field="invoice" list="invoiceItems" map="andConditions"/> <iterate list="invoiceItems" entry="invoiceItem"> <clear-field field="inMap"/> <set field="inMap.invoice" from-field="invoice"/> @@ -131,7 +131,7 @@ <!-- taxes --> <clear-field field="andConditions"/> <set field="andConditions.invoiceItemTypeId" value="ITM_SALES_TAX"/> - <get-related relation-name="ChildrenInvoiceItem" value-field="invoiceItem" list="taxes" map-name="andConditions"/> + <get-related relation-name="ChildrenInvoiceItem" value-field="invoiceItem" list="taxes" map="andConditions"/> <iterate list="taxes" entry="tax"> <calculate field="fact.extTaxAmount" type="BigDecimal"> <calcop field="fact.extTaxAmount" operator="add"> @@ -142,7 +142,7 @@ <!-- discounts --> <clear-field field="andConditions"/> <set field="andConditions.invoiceItemTypeId" value="ITM_PROMOTION_ADJ"/> - <get-related relation-name="ChildrenInvoiceItem" value-field="invoiceItem" list="discounts" map-name="andConditions"/> + <get-related relation-name="ChildrenInvoiceItem" value-field="invoiceItem" list="discounts" map="andConditions"/> <iterate list="discounts" entry="discount"> <calculate field="fact.extDiscountAmount" type="BigDecimal"> <calcop field="fact.extDiscountAmount" operator="add"> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=730643&r1=730642&r2=730643&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Thu Jan 1 15:34:52 2009 @@ -900,7 +900,7 @@ <get-related-one value-field="returnItem" relation-name="OrderItem" to-value-field="orderItem"/> <!-- get the order items of the replacement order associated to the returned item --> <set field="oiaMap.orderItemAssocTypeId" value="REPLACEMENT"/> - <get-related value-field="orderItem" relation-name="FromOrderItemAssoc" map-name="oiaMap" list="replacementOrderItems"/> + <get-related value-field="orderItem" relation-name="FromOrderItemAssoc" map="oiaMap" list="replacementOrderItems"/> <iterate list="replacementOrderItems" entry="replacementOrderItem"> <set field="orderItemMap.orderId" from-field="replacementOrderItem.toOrderId"/> <set field="orderItemMap.orderItemSeqId" from-field="replacementOrderItem.toOrderItemSeqId"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml?rev=730643&r1=730642&r2=730643&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml Thu Jan 1 15:34:52 2009 @@ -89,9 +89,9 @@ <set field="totalsMap.${receipt.orderItemSeqId}" value="0" type="Double"/> </if-empty> <calculate field-name="${receipt.orderItemSeqId}" map-name="totalsMap" type="Double"> - <calcop field-name="${receipt.orderItemSeqId}" map-name="totalsMap" operator="add"> - <calcop field-name="quantityAccepted" map-name="receipt" operator="get"/> - <calcop field-name="quantityRejected" map-name="receipt" operator="get"/> + <calcop field="${receipt.orderItemSeqId}" map-name="totalsMap" operator="add"> + <calcop field="quantityAccepted" map-name="receipt" operator="get"/> + <calcop field="quantityRejected" map-name="receipt" operator="get"/> </calcop> </calculate> <set from-field="receipt.orderId" field="newLookupMap.orderId"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml?rev=730643&r1=730642&r2=730643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml Thu Jan 1 15:34:52 2009 @@ -195,12 +195,12 @@ <get-related-one value-field="task" relation-name="FixedAsset" to-value-field="fixedAsset"/> <set from-field="parameters.currencyUomId" field="costsAndMap.amountUomId"/> <set value="SETUP_COST" field="costsAndMap.fixedAssetStdCostTypeId"/> - <get-related value-field="fixedAsset" relation-name="FixedAssetStdCost" map-name="costsAndMap" list="setupCosts"/> + <get-related value-field="fixedAsset" relation-name="FixedAssetStdCost" map="costsAndMap" list="setupCosts"/> <filter-list-by-date list="setupCosts"/> <!--<filter-list-by-and list-name="costs" map-name="costsAndMap"/>--> <first-from-list list="setupCosts" entry="setupCost"/> <set value="USAGE_COST" field="costsAndMap.fixedAssetStdCostTypeId"/> - <get-related value-field="fixedAsset" relation-name="FixedAssetStdCost" map-name="costsAndMap" list="usageCosts"/> + <get-related value-field="fixedAsset" relation-name="FixedAssetStdCost" map="costsAndMap" list="usageCosts"/> <filter-list-by-date list="usageCosts"/> <first-from-list list="usageCosts" entry="usageCost"/> </if-not-empty> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml?rev=730643&r1=730642&r2=730643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml Thu Jan 1 15:34:52 2009 @@ -96,7 +96,7 @@ <calculate field="moveInfo.totalQuantity" type="Double"><number value="0"/></calculate> <iterate entry="perProductOiirail" list="perProductOiirailList"> <calculate field="moveInfo.totalQuantity" type="Double"> - <calcop field-name="moveInfo.totalQuantity" operator="add"><calcop field="perProductOiirail.quantity" operator="get"/></calcop> + <calcop field="moveInfo.totalQuantity" operator="add"><calcop field="perProductOiirail.quantity" operator="get"/></calcop> </calculate> </iterate> @@ -111,10 +111,10 @@ <calculate field="totalAvailableToPromise" type="Double"><number value="0"/></calculate> <iterate entry="inventoryItem" list="inventoryItemList"> <calculate field="totalQuantityOnHand" type="Double"> - <calcop field-name="totalQuantityOnHand" operator="add"><calcop field="inventoryItem.quantityOnHandTotal" operator="get"/></calcop> + <calcop field="totalQuantityOnHand" operator="add"><calcop field="inventoryItem.quantityOnHandTotal" operator="get"/></calcop> </calculate> <calculate field="totalAvailableToPromise" type="Double"> - <calcop field-name="totalAvailableToPromise" operator="add"><calcop field="inventoryItem.availableToPromiseTotal" operator="get"/></calcop> + <calcop field="totalAvailableToPromise" operator="add"><calcop field="inventoryItem.availableToPromiseTotal" operator="get"/></calcop> </calculate> </iterate> <set from-field="totalQuantityOnHand" field="moveInfo.quantityOnHandTotalFrom"/> @@ -132,10 +132,10 @@ <calculate field="targetTotalQuantityOnHand" type="Double"><number value="0"/></calculate> <iterate entry="inventoryItem" list="targetInventoryItemList"> <calculate field="targetTotalAvailableToPromise" type="Double"> - <calcop field-name="targetTotalAvailableToPromise" operator="add"><calcop field="inventoryItem.availableToPromiseTotal" operator="get"/></calcop> + <calcop field="targetTotalAvailableToPromise" operator="add"><calcop field="inventoryItem.availableToPromiseTotal" operator="get"/></calcop> </calculate> <calculate field="targetTotalQuantityOnHand" type="Double"> - <calcop field-name="targetTotalQuantityOnHand" operator="add"><calcop field="inventoryItem.quantityOnHandTotal" operator="get"/></calcop> + <calcop field="targetTotalQuantityOnHand" operator="add"><calcop field="inventoryItem.quantityOnHandTotal" operator="get"/></calcop> </calculate> </iterate> <set from-field="targetTotalAvailableToPromise" field="moveInfo.availableToPromiseTotalTo"/> @@ -150,7 +150,7 @@ <!-- if trying to move more from the location than is there, find the difference and put it in targetLocationSimpleMoveQuantity.${moveInfo.targetProductFacilityLocation.locationSeqId} --> <calculate field="moveInfo.totalQuantity" type="Double"> - <calcop field-name="moveInfo.totalQuantity" operator="add"><calcop field="moveInfo.targetProductFacilityLocation.moveQuantity" operator="get"/></calcop> + <calcop field="moveInfo.totalQuantity" operator="add"><calcop field="moveInfo.targetProductFacilityLocation.moveQuantity" operator="get"/></calcop> </calculate> <else> <!-- @@ -160,13 +160,13 @@ targetLocationSimpleMoveQuantity.${moveInfo.targetProductFacilityLocation.locationSeqId} --> <calculate field="moveInfo.totalQuantity" type="Double"> - <calcop field-name="moveInfo.totalQuantity" operator="add"><calcop field="targetLocationSimpleMoveQuantity.${moveInfo.targetProductFacilityLocation.locationSeqId}" operator="get"/></calcop> + <calcop field="moveInfo.totalQuantity" operator="add"><calcop field="targetLocationSimpleMoveQuantity.${moveInfo.targetProductFacilityLocation.locationSeqId}" operator="get"/></calcop> </calculate> </else> </if-empty> <if-compare-field field="totalQuantityOnHand" to-field="moveInfo.totalQuantity" operator="less" type="Double"> <calculate field="targetLocationSimpleMoveQuantity.${moveInfo.targetProductFacilityLocation.locationSeqId}" type="Double"> - <calcop field-name="moveInfo.totalQuantity" operator="subtract"><calcop field="totalQuantityOnHand" operator="get"/></calcop> + <calcop field="moveInfo.totalQuantity" operator="subtract"><calcop field="totalQuantityOnHand" operator="get"/></calcop> </calculate> <set from-field="totalQuantityOnHand" field="moveInfo.totalQuantity"/> </if-compare-field> @@ -280,10 +280,10 @@ <calculate field="totalAvailableToPromise" type="Double"><number value="0"/></calculate> <iterate entry="inventoryItem" list="perLocationInventoryItemAndLocList"> <calculate field="totalQuantityOnHand" type="Double"> - <calcop field-name="totalQuantityOnHand" operator="add"><calcop field="inventoryItem.quantityOnHandTotal" operator="get"/></calcop> + <calcop field="totalQuantityOnHand" operator="add"><calcop field="inventoryItem.quantityOnHandTotal" operator="get"/></calcop> </calculate> <calculate field="totalAvailableToPromise" type="Double"> - <calcop field-name="totalAvailableToPromise" operator="add"><calcop field="inventoryItem.availableToPromiseTotal" operator="get"/></calcop> + <calcop field="totalAvailableToPromise" operator="add"><calcop field="inventoryItem.availableToPromiseTotal" operator="get"/></calcop> </calculate> </iterate> <else> @@ -314,14 +314,14 @@ 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="Double"> <calculate field="targetLocationMoveQuantity" type="Double"> - <calcop field-name="targetLocationMoveQuantity" operator="subtract"><calcop field="totalAvailableToPromise" operator="get"/></calcop> + <calcop field="targetLocationMoveQuantity" operator="subtract"><calcop field="totalAvailableToPromise" operator="get"/></calcop> </calculate> <set from-field="totalAvailableToPromise" field="moveInfo.totalQuantity"/> <calculate field="fromLocationTotalAvailableToPromise.${locationSeqId}" type="Double"><number value="0"/></calculate> <else> <set from-field="targetLocationMoveQuantity" field="moveInfo.totalQuantity"/> <calculate map-name="fromLocationTotalAvailableToPromise" field-name="${locationSeqId}" type="Double"> - <calcop field-name="totalAvailableToPromise" operator="subtract"><calcop field="targetLocationMoveQuantity" operator="get"/></calcop> + <calcop field="totalAvailableToPromise" operator="subtract"><calcop field="targetLocationMoveQuantity" operator="get"/></calcop> </calculate> <calculate field="targetLocationMoveQuantity" type="Double"><number value="0"/></calculate> </else> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=730643&r1=730642&r2=730643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Thu Jan 1 15:34:52 2009 @@ -1044,7 +1044,7 @@ <else> <!-- add the quantities and store it --> <calculate field="shipmentPackageContent.quantity" type="Double"> - <calcop field-name="shipmentPackageContent.quantity" operator="add"><calcop field="parameters.quantity" operator="get"/></calcop> + <calcop field="shipmentPackageContent.quantity" operator="add"><calcop field="parameters.quantity" operator="get"/></calcop> </calculate> <set-service-fields service-name="updateShipmentPackageContent" map="shipmentPackageContent" to-map="updateSPCMap"/> <call-service service-name="updateShipmentPackageContent" in-map-name="updateSPCMap"/> @@ -1482,7 +1482,7 @@ <!-- just get the OrderItemShipGrpInvResAndItem records for this facility and this ship group, since that is what this shipment is for --> <clear-field field="itemResFindMap"/> <set from-field="orderItemShipGrpInvResFacilityId" field="itemResFindMap.facilityId"/> - <get-related value-field="orderItemAndShipGroupAssoc" relation-name="OrderItemShipGrpInvResAndItem" map-name="itemResFindMap" list="itemResList"/> + <get-related value-field="orderItemAndShipGroupAssoc" relation-name="OrderItemShipGrpInvResAndItem" map="itemResFindMap" list="itemResList"/> <iterate list="itemResList" entry="itemRes"> <set from-field="shipment.shipmentId" field="issueContext.shipmentId"/> <set from-field="itemRes.orderId" field="issueContext.orderId"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |