svn commit: r721986 [9/13] - in /ofbiz/branches/typecheckclean
Locked
svn commit: r721986 [9/13] - in /ofbiz/branches/typecheckclean
 
|
Modified: ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Sun Nov 30 22:51:11 2008 @@ -90,7 +90,7 @@ <not><if-empty field="parameters.serialNumber"/></not> <not><if-empty field="parameters.currentInventoryItemId"/></not> </or> - <if-compare field="parameters.quantityAccepted" operator="greater" value="1" type="Double"/> + <if-compare field="parameters.quantityAccepted" operator="greater" value="1" type="BigDecimal"/> </and> </condition> <then> @@ -99,7 +99,7 @@ </if> <set field="loops" from-field="parameters.quantityAccepted"/> - <set field="parameters.quantityAccepted" value="1" type="Double"/> + <set field="parameters.quantityAccepted" value="1" type="BigDecimal"/> </if-compare> <set field="parameters.quantityOnHandDiff" from-field="parameters.quantityAccepted"/> @@ -201,7 +201,7 @@ <condition-expr field-name="facilityId" operator="equals" env-name="returnHeader.destinationFacilityId"/> </entity-count> - <if-compare field="iiCount" operator="greater" value="0" type="Double"> + <if-compare field="iiCount" operator="greater" value="0" type="Integer"> <!-- create a return shipment for this return --> <set field="shipmentCtx.returnId" from-field="parameters.returnId"/> <call-service service-name="createShipmentForReturn" in-map-name="shipmentCtx"> @@ -268,7 +268,7 @@ </if-compare> <if-compare field="setNonSerial" value="false" operator="equals"> <set field="parameters.inventoryItemTypeId" value="SERIALIZED_INV_ITEM"/> - <set field="returnItem.returnQuantity" value="1" type="Double"/> + <set field="returnItem.returnQuantity" value="1" type="BigDecimal"/> </if-compare> <set from-field="parameters.inventoryItemTypeId" field="receiveCtx.inventoryItemTypeId"/> @@ -283,7 +283,7 @@ <set field="receiveCtx.comments" value="Returned Item RA# ${returnItem.returnId}"/> <set field="receiveCtx.datetimeReceived" from-field="nowTimestamp"/> - <set field="receiveCtx.quantityRejected" value="0" type="Double"/> + <set field="receiveCtx.quantityRejected" value="0" type="BigDecimal"/> <call-service service-name="receiveInventoryProduct" in-map-name="receiveCtx"/> <else> Modified: ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Sun Nov 30 22:51:11 2008 @@ -768,7 +768,7 @@ <field-map field-name="orderItemSeqId" env-name="issuance.orderItemSeqId"/> </entity-and> <iterate list-name="receipts" entry-name="receipt"> - <calculate field-name="issuanceQuantity" type="Double"> + <calculate field-name="issuanceQuantity" type="BigDecimal"> <calcop field-name="receipt.quantityAccepted" operator="add"> <calcop field-name="receipt.quantityRejected" operator="get"/> <calcop field-name="issuanceQuantity" operator="get"/> @@ -839,7 +839,7 @@ </call-service> <!-- reduce the originalShipmentItem.quantity --> - <calculate field-name="originalShipmentItem.quantity" type="Double"> + <calculate field-name="originalShipmentItem.quantity" type="BigDecimal"> <calcop operator="add" field-name="originalShipmentItem.quantity"> <calcop operator="negative" field-name="parameters.newItemQuantity"/> </calcop> @@ -857,12 +857,12 @@ <set field="orderShipmentQuantityLeft" from-field="parameters.newItemQuantity"/> <iterate entry-name="itemOrderShipment" list-name="itemOrderShipmentList"> - <if-compare field="orderShipmentQuantityLeft" operator="greater" value="0" type="Double"> - <if-compare-field field="itemOrderShipment.quantity" to-field="orderShipmentQuantityLeft" operator="greater" type="Double"> + <if-compare field="orderShipmentQuantityLeft" operator="greater" value="0" type="BigDecimal"> + <if-compare-field field="itemOrderShipment.quantity" to-field="orderShipmentQuantityLeft" operator="greater" type="BigDecimal"> <!-- there is enough in this OrderShipment record, so just adjust it and move on --> <clear-field field-name="updateOrderShipmentMap"/> <set-service-fields service-name="updateOrderShipment" map-name="itemOrderShipment" to-map-name="updateOrderShipmentMap"/> - <calculate field-name="updateOrderShipmentMap.quantity" type="Double"> + <calculate field-name="updateOrderShipmentMap.quantity" type="BigDecimal"> <calcop operator="add" field-name="itemOrderShipment.quantity"> <calcop operator="negative" field-name="orderShipmentQuantityLeft"/> </calcop> @@ -877,7 +877,7 @@ <set field="createOrderShipmentMap.quantity" from-field="orderShipmentQuantityLeft"/> <call-service service-name="createOrderShipment" in-map-name="createOrderShipmentMap"/> - <set field="orderShipmentQuantityLeft" value="0" type="Double"/> + <set field="orderShipmentQuantityLeft" value="0" type="BigDecimal"/> <else> <!-- not enough on this one, create a new one for the new item and delete this one --> @@ -893,7 +893,7 @@ <set field="createOrderShipmentMap.quantity" from-field="itemOrderShipment.quantity"/> <call-service service-name="createOrderShipment" in-map-name="createOrderShipmentMap"/> - <calculate field-name="orderShipmentQuantityLeft" type="Double"> + <calculate field-name="orderShipmentQuantityLeft" type="BigDecimal"> <calcop operator="add" field-name="orderShipmentQuantityLeft"> <calcop operator="negative" field-name="itemOrderShipment.quantity"></calcop> </calcop> @@ -1047,7 +1047,7 @@ </call-service> <else> <!-- add the quantities and store it --> - <calculate field-name="shipmentPackageContent.quantity" type="Double"> + <calculate field-name="shipmentPackageContent.quantity" type="BigDecimal"> <calcop field-name="shipmentPackageContent.quantity" operator="add"><calcop field-name="parameters.quantity" operator="get"/></calcop> </calculate> <set-service-fields service-name="updateShipmentPackageContent" map-name="shipmentPackageContent" to-map-name="updateSPCMap"/> @@ -1859,13 +1859,13 @@ <set from-field="parameters.orderItemSeqId" field="inMap.orderItemSeqId"/> <call-service service-name="deleteOrderShipment" in-map-name="inMap"/> - <calculate field-name="shipmentItem.quantity" type="Double"> + <calculate field-name="shipmentItem.quantity" type="BigDecimal"> <calcop field-name="shipmentItem.quantity" operator="subtract"> <calcop field-name="orderShipment.quantity" operator="get"/> </calcop> </calculate> <clear-field field-name="inMap"/> - <if-compare field="shipmentItem.quantity" operator="greater" value="0.0" type="Double"> + <if-compare field="shipmentItem.quantity" operator="greater" value="0.0" type="BigDecimal"> <set from-field="parameters.userLogin" field="inMap.userLogin"/> <set from-field="parameters.shipmentId" field="inMap.shipmentId"/> <set from-field="parameters.shipmentItemSeqId" field="inMap.shipmentItemSeqId"/> @@ -1892,7 +1892,7 @@ </check-permission> <!-- if quantity is greater than 0 we add or update the ShipmentPlan --> - <if-compare field="parameters.quantity" operator="greater" value="0" type="Double"> + <if-compare field="parameters.quantity" operator="greater" value="0" type="BigDecimal"> <!-- get orderHeader --> <make-value entity-name="OrderHeader" value-name="orderHeaderLookupPk"/> @@ -1923,7 +1923,7 @@ <result-to-field result-name="remainingQuantity" field-name="remainingQuantity"/> </call-service> - <if-compare-field field="parameters.quantity" to-field="remainingQuantity" operator="greater" type="Double"> + <if-compare-field field="parameters.quantity" to-field="remainingQuantity" operator="greater" type="BigDecimal"> <string-to-list string="Not adding Order Item to plan for shipment [${parameters.shipmentId}] because the quantity is greater than the remaining quantity (order [${parameters.orderId}], order item [${parameters.orderItemSeqId}])" list-name="error_list"/> </if-compare-field> <check-errors/> @@ -1955,7 +1955,7 @@ <set from-field="parameters.orderItemSeqId" field="orderShipmentLookup.orderItemSeqId"/> <find-by-and entity-name="OrderShipment" map-name="orderShipmentLookup" list-name="existingOrderShipments"/> <iterate list-name="existingOrderShipments" entry-name="orderShipment"> - <calculate field-name="plannedQuantity" type="Double"> + <calculate field-name="plannedQuantity" type="BigDecimal"> <calcop field-name="plannedQuantity" operator="add"> <calcop field-name="orderShipment.quantity" operator="get"/> </calcop> @@ -1964,7 +1964,7 @@ <clear-field field-name="existingOrderShipments"/> <find-by-and entity-name="ItemIssuance" map-name="orderShipmentLookup" list-name="existingOrderShipments"/> <iterate list-name="existingOrderShipments" entry-name="itemIssuance"> - <calculate field-name="issuedQuantity" type="Double"> + <calculate field-name="issuedQuantity" type="BigDecimal"> <calcop field-name="issuedQuantity" operator="add"> <calcop field-name="itemIssuance.quantity" operator="get"/> <calcop field-name="itemIssuance.cancelQuantity" operator="negative"/> @@ -1972,12 +1972,12 @@ </calculate> </iterate> - <calculate field-name="totPlannedOrIssuedQuantity" type="Double"> + <calculate field-name="totPlannedOrIssuedQuantity" type="BigDecimal"> <calcop field-name="issuedQuantity" operator="add"> <calcop field-name="plannedQuantity" operator="get"/> </calcop> </calculate> - <calculate field-name="remainingQuantity" type="Double"> + <calculate field-name="remainingQuantity" type="BigDecimal"> <calcop field-name="orderItem.quantity" operator="subtract"> <calcop field-name="orderItem.cancelQuantity" operator="get"/> <calcop field-name="totPlannedOrIssuedQuantity" operator="get"/> Modified: ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/shipment/test/TestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/shipment/test/TestServices.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/shipment/test/TestServices.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/shipment/test/TestServices.xml Sun Nov 30 22:51:11 2008 @@ -25,7 +25,7 @@ <set field="packSingleItemInMap.productId" value="GZ-2644"/> <set field="packSingleItemInMap.orderId" value="DEMO10090"/> <set field="packSingleItemInMap.shipGroupSeqId" value="00001"/> - <set field="packSingleItemInMap.quantity" value="1" type="Double"/> + <set field="packSingleItemInMap.quantity" value="1" type="BigDecimal"/> <set field="packSingleItemInMap.packageSeq" value="1" type="Integer"/> <set field="packSingleItemInMap.pickerPartyId" value="DemoCustomer"/> <set field="packSingleItemInMap.handlingInstructions" value="Handle with care"/> @@ -62,7 +62,7 @@ <set field="completePackInMap.packingSession" from-field="packingSession"/> <set field="completePackInMap.handlingInstructions" value="Handle with care"/> <set field="completePackInMap.pickerPartyId" value="DemoCustomer"/> - <set field="completePackInMap.additionalShippingCharge" value="10.0" type="Double"/> + <set field="completePackInMap.additionalShippingCharge" value="10.0" type="BigDecimal"/> <set field="completePackInMap.forceComplete" value="Y" type="Boolean"/> <set field="completePackInMap.userLogin" from-field="userLogin"/> @@ -161,9 +161,9 @@ <set field="serviceCtx.userLogin" from-field="userLogin"/> <set field="serviceCtx.facilityId" value="WebStoreWarehouse"/> <set field="serviceCtx.productId" value="GZ-2644"/> - <set field="serviceCtx.quantityAccepted" value="5" type="Double"/> - <set field="serviceCtx.quantityRejected" value="0" type="Double"/> - <set field="serviceCtx.unitCost" value="24" type="Double"/> + <set field="serviceCtx.quantityAccepted" value="5" type="BigDecimal"/> + <set field="serviceCtx.quantityRejected" value="0" type="BigDecimal"/> + <set field="serviceCtx.unitCost" value="24" type="BigDecimal"/> <set field="serviceCtx.inventoryItemTypeId" value="NON_SERIAL_INV_ITEM"/> <set field="serviceCtx.datetimeReceived" from-field="nowTimeStamp"/> <call-service service-name="receiveInventoryProduct" in-map-name="serviceCtx"> Modified: ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/secas.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/secas.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/secas.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/secas.xml Sun Nov 30 22:51:11 2008 @@ -75,7 +75,7 @@ <action service="saveProductPriceChange" mode="sync"/> </eca> <eca service="updateProductPrice" event="commit"> - <condition-field field-name="price" operator="not-equals" to-field-name="oldPrice" type="Double"/> + <condition-field field-name="price" operator="not-equals" to-field-name="oldPrice" type="BigDecimal"/> <action service="saveProductPriceChange" mode="sync"/> </eca> <eca service="deleteProductPrice" event="commit"> Modified: ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services.xml Sun Nov 30 22:51:11 2008 @@ -180,7 +180,7 @@ location="org/ofbiz/product/product/ProductServices.xml" invoke="countProductQuantityOrdered" auth="true"> <description>count Product Quantity Ordered</description> <attribute name="productId" type="String" mode="IN" optional="false"/> - <attribute name="quantity" type="Double" mode="IN" optional="false"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/> </service> <service name="createProductReview" engine="simple" @@ -189,7 +189,7 @@ <attribute name="productStoreId" type="String" mode="IN" optional="false"/> <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="postedAnonymous" type="Boolean" mode="IN" optional="true"/> - <attribute name="productRating" type="Double" mode="IN" optional="false"/> + <attribute name="productRating" type="BigDecimal" mode="IN" optional="false"/> <attribute name="productReview" type="String" mode="IN" optional="true"/> <attribute name="productReviewId" type="String" mode="OUT" optional="false"/> </service> @@ -248,14 +248,14 @@ <exclude field-name="lastModifiedDate"/> <exclude field-name="lastModifiedByUserLogin"/> </auto-attributes> - <attribute name="oldPrice" type="Double" mode="OUT" optional="false"/> + <attribute name="oldPrice" type="BigDecimal" mode="OUT" optional="false"/> <override name="price" optional="false"/> </service> <service name="deleteProductPrice" default-entity-name="ProductPrice" engine="simple" location="org/ofbiz/product/price/PriceServices.xml" invoke="deleteProductPrice" auth="true"> <description>Delete an ProductPrice</description> <auto-attributes include="pk" mode="IN" optional="false"/> - <attribute name="oldPrice" type="Double" mode="OUT" optional="false"/> + <attribute name="oldPrice" type="BigDecimal" mode="OUT" optional="false"/> </service> <!-- called by ECAs on ProductPrice service call events --> @@ -264,7 +264,7 @@ <description>Save History of a ProductPrice Change</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> - <attribute name="oldPrice" type="Double" mode="IN" optional="true"/> + <attribute name="oldPrice" type="BigDecimal" mode="IN" optional="true"/> </service> <!-- Product PaymentMethodType Services --> @@ -707,8 +707,8 @@ <auto-attributes entity-name="Product" include="nonpk" mode="IN" optional="true"/> <attribute name="productFeatureIdByType" type="java.util.Map" mode="IN" optional="false" string-map-prefix="pft_"/> <attribute name="productFeatureSelectableByType" type="java.util.Map" mode="IN" optional="false" string-map-prefix="pftsel_"/> - <attribute name="defaultPrice" type="Double" mode="IN" optional="true"/> - <attribute name="averageCost" type="Double" mode="IN" optional="true"/> + <attribute name="defaultPrice" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="averageCost" type="BigDecimal" mode="IN" optional="true"/> <attribute name="currencyUomId" type="String" mode="IN" optional="true"/> </service> @@ -931,12 +931,12 @@ <description></description> <attribute name="productName" type="String" mode="IN" optional="false"/> <attribute name="productStoreId" type="String" mode="IN" optional="false"/> - <attribute name="price" type="Double" mode="IN" optional="false"/> + <attribute name="price" type="BigDecimal" mode="IN" optional="false"/> <attribute name="description" type="String" mode="IN" optional="true"/> <attribute name="currencyUomId" type="String" mode="IN" optional="true"/> <attribute name="productId" type="String" mode="OUT" optional="false"/> <attribute name="currencyUomId" type="String" mode="OUT" optional="false"/> - <attribute name="minimumOrderQuantity" type="Double" mode="OUT" optional="false"/> + <attribute name="minimumOrderQuantity" type="BigDecimal" mode="OUT" optional="false"/> <attribute name="availableFromDate" type="Timestamp" mode="OUT" optional="false"/> </service> <service name="updateCustomerDigitalDownloadProduct" auth="true" engine="simple" @@ -944,11 +944,11 @@ <description></description> <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="currencyUomId" type="String" mode="IN" optional="false"/> - <attribute name="minimumOrderQuantity" type="Double" mode="IN" optional="false"/> + <attribute name="minimumOrderQuantity" type="BigDecimal" mode="IN" optional="false"/> <attribute name="availableFromDate" type="Timestamp" mode="IN" optional="false"/> <attribute name="productName" type="String" mode="IN" optional="true"/> <attribute name="description" type="String" mode="IN" optional="true"/> - <attribute name="price" type="Double" mode="IN" optional="true"/> + <attribute name="price" type="BigDecimal" mode="IN" optional="true"/> </service> <service name="deleteCustomerDigitalDownloadProduct" auth="true" engine="simple" location="org/ofbiz/product/product/CustomerDigitalDownloadServices.xml" invoke="deleteCustomerDigitalDownloadProduct"> Modified: ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_cost.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_cost.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_cost.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_cost.xml Sun Nov 30 22:51:11 2008 @@ -62,7 +62,7 @@ <attribute mode="IN" name="productId" optional="false" type="String"/> <attribute mode="IN" name="currencyUomId" optional="false" type="String"/> <attribute mode="IN" name="costComponentTypePrefix" optional="false" type="String"/> - <attribute mode="OUT" name="productCost" type="Double" optional="false"/> + <attribute mode="OUT" name="productCost" type="BigDecimal" optional="false"/> </service> <service name="getTaskCost" engine="simple" auth="true" location="org/ofbiz/product/cost/CostServices.xml" invoke="getTaskCost"> @@ -71,7 +71,7 @@ <attribute mode="IN" name="currencyUomId" optional="false" type="String"/> <attribute mode="IN" name="productId" optional="true" type="String"/> <attribute mode="IN" name="routingId" optional="true" type="String"/> - <attribute mode="OUT" name="taskCost" type="Double" optional="false"/> + <attribute mode="OUT" name="taskCost" type="BigDecimal" optional="false"/> </service> <service name="calculateProductCosts" engine="simple" auth="true" location="org/ofbiz/product/cost/CostServices.xml" invoke="calculateProductCosts"> @@ -79,7 +79,7 @@ <attribute mode="IN" name="productId" optional="false" type="String"/> <attribute mode="IN" name="currencyUomId" optional="false" type="String"/> <attribute mode="IN" name="costComponentTypePrefix" optional="false" type="String"/> - <attribute mode="OUT" name="totalCost" type="Double"/> + <attribute mode="OUT" name="totalCost" type="BigDecimal"/> </service> <service name="calculateAllProductsCosts" engine="simple" auth="true" transaction-timeout="7200" location="org/ofbiz/product/cost/CostServices.xml" invoke="calculateAllProductsCosts"> Modified: ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_facility.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_facility.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_facility.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_facility.xml Sun Nov 30 22:51:11 2008 @@ -53,8 +53,8 @@ <description> </description> <attribute name="inventoryItemId" type="String" mode="IN" optional="false"/> - <attribute name="availableToPromiseTotal" type="Double" mode="IN" optional="true"/> - <attribute name="quantityOnHandTotal" type="Double" mode="IN" optional="true"/> + <attribute name="availableToPromiseTotal" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="quantityOnHandTotal" type="BigDecimal" mode="IN" optional="true"/> </service> <service name="updateInventoryItem" default-entity-name="InventoryItem" engine="simple" @@ -142,16 +142,16 @@ <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="facilityId" type="String" mode="IN" optional="true"/> <attribute name="statusId" type="String" mode="IN" optional="true"/> - <attribute name="quantityOnHandTotal" type="Double" mode="OUT" optional="false"/> - <attribute name="availableToPromiseTotal" type="Double" mode="OUT" optional="false"/> + <attribute name="quantityOnHandTotal" type="BigDecimal" mode="OUT" optional="false"/> + <attribute name="availableToPromiseTotal" type="BigDecimal" mode="OUT" optional="false"/> </service> <service name="getProductInventoryAvailable" engine="simple" location="org/ofbiz/product/inventory/InventoryServices.xml" invoke="getProductInventoryAvailable" auth="false" use-transaction="false"> <description>Get Inventory Availability for a Product</description> <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="statusId" type="String" mode="IN" optional="true"/> - <attribute name="quantityOnHandTotal" type="Double" mode="OUT" optional="false"/> - <attribute name="availableToPromiseTotal" type="Double" mode="OUT" optional="false"/> + <attribute name="quantityOnHandTotal" type="BigDecimal" mode="OUT" optional="false"/> + <attribute name="availableToPromiseTotal" type="BigDecimal" mode="OUT" optional="false"/> <attribute name="useCache" type="Boolean" mode="IN" optional="true"/> </service> <service name="getInventoryAvailableByFacility" engine="simple" @@ -160,8 +160,8 @@ <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="facilityId" type="String" mode="IN" optional="false"/> <attribute name="statusId" type="String" mode="IN" optional="true"/> - <attribute name="quantityOnHandTotal" type="Double" mode="OUT" optional="false"/> - <attribute name="availableToPromiseTotal" type="Double" mode="OUT" optional="false"/> + <attribute name="quantityOnHandTotal" type="BigDecimal" mode="OUT" optional="false"/> + <attribute name="availableToPromiseTotal" type="BigDecimal" mode="OUT" optional="false"/> <attribute name="useCache" type="Boolean" mode="IN" optional="true"/> </service> <service name="getInventoryAvailableByLocation" engine="simple" @@ -171,8 +171,8 @@ <attribute name="facilityId" type="String" mode="IN" optional="false"/> <attribute name="locationSeqId" type="String" mode="IN" optional="false"/> <attribute name="statusId" type="String" mode="IN" optional="true"/> - <attribute name="quantityOnHandTotal" type="Double" mode="OUT" optional="false"/> - <attribute name="availableToPromiseTotal" type="Double" mode="OUT" optional="false"/> + <attribute name="quantityOnHandTotal" type="BigDecimal" mode="OUT" optional="false"/> + <attribute name="availableToPromiseTotal" type="BigDecimal" mode="OUT" optional="false"/> <attribute name="useCache" type="Boolean" mode="IN" optional="true"/> </service> <service name="getInventoryAvailableByContainer" engine="simple" @@ -181,15 +181,15 @@ <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="containerId" type="String" mode="IN" optional="false"/> <attribute name="statusId" type="String" mode="IN" optional="true"/> - <attribute name="quantityOnHandTotal" type="Double" mode="OUT" optional="false"/> - <attribute name="availableToPromiseTotal" type="Double" mode="OUT" optional="false"/> + <attribute name="quantityOnHandTotal" type="BigDecimal" mode="OUT" optional="false"/> + <attribute name="availableToPromiseTotal" type="BigDecimal" mode="OUT" optional="false"/> </service> <service name="getInventoryAvailableByItem" engine="simple" location="org/ofbiz/product/inventory/InventoryServices.xml" invoke="getProductInventoryAvailable" auth="false" use-transaction="false"> <description>Get Inventory Availability for an InventoryItem</description> <attribute name="inventoryItemId" type="String" mode="IN" optional="false"/> - <attribute name="quantityOnHandTotal" type="Double" mode="OUT" optional="false"/> - <attribute name="availableToPromiseTotal" type="Double" mode="OUT" optional="false"/> + <attribute name="quantityOnHandTotal" type="BigDecimal" mode="OUT" optional="false"/> + <attribute name="availableToPromiseTotal" type="BigDecimal" mode="OUT" optional="false"/> <attribute name="useCache" type="Boolean" mode="IN" optional="true"/> </service> <service name="getProductInventoryAvailableFromAssocProducts" engine="java" @@ -201,8 +201,8 @@ <attribute name="facilityId" type="String" mode="IN" optional="true"/> <attribute name="assocProducts" type="List" mode="IN" optional="false"/> <attribute name="statusId" type="String" mode="IN" optional="true"/> - <attribute name="quantityOnHandTotal" type="Double" mode="OUT" optional="false"/> - <attribute name="availableToPromiseTotal" type="Double" mode="OUT" optional="false"/> + <attribute name="quantityOnHandTotal" type="BigDecimal" mode="OUT" optional="false"/> + <attribute name="availableToPromiseTotal" type="BigDecimal" mode="OUT" optional="false"/> </service> <service name="getProductInventorySummaryForItems" engine="java" location="org.ofbiz.product.inventory.InventoryServices" invoke="getProductInventorySummaryForItems" auth="false" use-transaction="false"> @@ -226,13 +226,13 @@ <attribute name="statusId" type="String" mode="IN" optional="true"/> <attribute name="totalQuantityOnHand" mode="OUT" type="String" optional="true"/> <attribute name="totalAvailableToPromise" mode="OUT" type="String" optional="true"/> - <attribute name="quantityOnOrder" mode="OUT" type="Double" optional="true"/> - <attribute name="offsetQOHQtyAvailable" mode="OUT" type="Integer" optional="true"/> - <attribute name="offsetATPQtyAvailable" mode="OUT" type="Integer" optional="true"/> - <attribute name="defultPrice" mode="OUT" type="Double" optional="true"/> - <attribute name="listPrice" mode="OUT" type="Double" optional="true"/> - <attribute name="wholeSalePrice" mode="OUT" type="Double" optional="true"/> - <attribute name="usageQuantity" mode="OUT" type="Double" optional="true"/> + <attribute name="quantityOnOrder" mode="OUT" type="BigDecimal" optional="true"/> + <attribute name="offsetQOHQtyAvailable" mode="OUT" type="BigDecimal" optional="true"/> + <attribute name="offsetATPQtyAvailable" mode="OUT" type="BigDecimal" optional="true"/> + <attribute name="defultPrice" mode="OUT" type="BigDecimal" optional="true"/> + <attribute name="listPrice" mode="OUT" type="BigDecimal" optional="true"/> + <attribute name="wholeSalePrice" mode="OUT" type="BigDecimal" optional="true"/> + <attribute name="usageQuantity" mode="OUT" type="BigDecimal" optional="true"/> </service> <service name="checkInventoryAvailability" engine="java" @@ -391,7 +391,7 @@ <description>Create an inventory transfer. Uses the prepareInventoryTransfer service; see comments there about transfer quantities and inventory items.</description> <permission-service service-name="facilityGenericPermission" main-action="CREATE"/> <implements service="interfaceInventoryTransfer"/> - <attribute name="xferQty" type="Double" mode="IN" optional="false"/> + <attribute name="xferQty" type="BigDecimal" mode="IN" optional="false"/> <attribute name="inventoryTransferId" type="String" mode="OUT" optional="false"/> </service> <service name="updateInventoryTransfer" engine="simple" @@ -405,7 +405,7 @@ location="org.ofbiz.product.inventory.InventoryServices" invoke="prepareInventoryTransfer"> <description>Prepares inventory item for transfer. If the xferQty is less than quantityOnHandTotal of the inventory item, then the inventory item is "split," and an new inventory item will be created with xferQty and used for the inventory transfer.</description> <attribute name="inventoryItemId" type="String" mode="INOUT" optional="false"/> - <attribute name="xferQty" type="Double" mode="IN" optional="false"/> + <attribute name="xferQty" type="BigDecimal" mode="IN" optional="false"/> </service> <service name="completeInventoryTransfer" engine="java" location="org.ofbiz.product.inventory.InventoryServices" invoke="completeInventoryTransfer"> @@ -427,9 +427,9 @@ <attribute name="facilityIdTo" type="String" mode="IN" optional="false"/> <attribute name="sendDate" type="Timestamp" mode="IN" optional="true"/> <attribute name="productId" type="String" mode="IN" optional="false"/> - <attribute name="quantity" type="Double" mode="IN" optional="false"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/> <attribute name="reserveOrderEnumId" type="String" mode="IN" optional="true"/> - <attribute name="quantityNotTransferred" type="Double" mode="OUT" optional="false"/> + <attribute name="quantityNotTransferred" type="BigDecimal" mode="OUT" optional="false"/> </service> <service name="issueImmediatelyFulfilledOrder" engine="simple" @@ -797,7 +797,7 @@ <attribute name="facilityId" type="String" mode="IN" optional="false"/> <attribute name="locationSeqId" type="String" mode="IN" optional="false"/> <attribute name="targetLocationSeqId" type="String" mode="IN" optional="false"/> - <attribute name="quantityMoved" type="Double" mode="IN" optional="false"/> + <attribute name="quantityMoved" type="BigDecimal" mode="IN" optional="false"/> <attribute name="warningMessageList" type="List" mode="INOUT" optional="true"/> </service> <!-- Inventory Label Services --> Modified: ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_feature.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_feature.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_feature.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_feature.xml Sun Nov 30 22:51:11 2008 @@ -47,8 +47,8 @@ <attribute name="productFeatureCategoryId" type="String" mode="IN" optional="true"/> <attribute name="description" type="String" mode="IN" optional="false"/> <attribute name="uomId" type="String" mode="IN" optional="true"/> - <attribute name="numberSpecified" type="Double" mode="IN" optional="true"/> - <attribute name="defaultAmount" type="Double" mode="IN" optional="true"/> + <attribute name="numberSpecified" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="defaultAmount" type="BigDecimal" mode="IN" optional="true"/> <attribute name="productFeatureId" type="String" mode="IN" optional="true"/> <attribute name="productFeatureId" type="String" mode="OUT" optional="false"/> <attribute name="defaultSequenceNum" type="Long" mode="IN" optional="true"/> @@ -63,8 +63,8 @@ <attribute name="productFeatureCategoryId" type="String" mode="IN" optional="true"/> <attribute name="description" type="String" mode="IN" optional="false"/> <attribute name="uomId" type="String" mode="IN" optional="true"/> - <attribute name="numberSpecified" type="Double" mode="IN" optional="true"/> - <attribute name="defaultAmount" type="Double" mode="IN" optional="true"/> + <attribute name="numberSpecified" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="defaultAmount" type="BigDecimal" mode="IN" optional="true"/> <attribute name="defaultSequenceNum" type="Long" mode="IN" optional="true"/> <attribute name="idCode" type="String" mode="IN" optional="true"/> <attribute name="abbrev" type="String" mode="IN" optional="true"/> @@ -81,7 +81,7 @@ <attribute name="fromDate" type="java.sql.Timestamp" mode="IN" optional="true"/> <attribute name="thruDate" type="java.sql.Timestamp" mode="IN" optional="true"/> <attribute name="sequenceNum" type="Long" mode="IN" optional="true"/> - <attribute name="amount" type="Double" mode="IN" optional="true"/> + <attribute name="amount" type="BigDecimal" mode="IN" optional="true"/> </service> <service name="updateFeatureToProductApplication" engine="simple" location="org/ofbiz/product/feature/ProductFeatureServices.xml" invoke="updateFeatureToProductApplication" auth="true"> @@ -92,7 +92,7 @@ <attribute name="fromDate" type="java.sql.Timestamp" mode="IN" optional="false"/> <attribute name="thruDate" type="java.sql.Timestamp" mode="IN" optional="true"/> <attribute name="sequenceNum" type="Long" mode="IN" optional="true"/> - <attribute name="amount" type="Double" mode="IN" optional="true"/> + <attribute name="amount" type="BigDecimal" mode="IN" optional="true"/> </service> <service name="removeFeatureFromProduct" engine="simple" location="org/ofbiz/product/feature/ProductFeatureServices.xml" invoke="removeFeatureFromProduct" auth="true"> Modified: ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_pricepromo.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_pricepromo.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_pricepromo.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_pricepromo.xml Sun Nov 30 22:51:11 2008 @@ -35,8 +35,8 @@ <attribute name="productStoreId" type="String" mode="IN" optional="true"/> <attribute name="productStoreGroupId" type="String" mode="IN" optional="true"/> <attribute name="agreementId" type="String" mode="IN" optional="true"/> - <attribute name="quantity" type="Double" mode="IN" optional="true"/> - <attribute name="amount" type="Double" mode="IN" optional="true"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="amount" type="BigDecimal" mode="IN" optional="true"/> <attribute name="currencyUomId" type="String" mode="IN" optional="true"/> <attribute name="productPricePurposeId" type="String" mode="IN" optional="true"><!-- defaults to PURCHASE --></attribute> <attribute name="termUomId" type="String" mode="IN" optional="true"><!-- if specified ProductPrice records will be filtered by this, ensures for purposes like recurring prices that only the recurring term desired is taken into consideration --></attribute> @@ -45,14 +45,14 @@ <attribute name="findAllQuantityPrices" type="String" mode="IN" optional="true"><!-- can be Y or N, defaults to N; see the allQuantityPrices attribute for more details --></attribute> <attribute name="surveyResponseId" type="String" mode="IN" optional="true"/> <attribute name="customAttributes" type="Map" mode="IN" optional="true"/> - <attribute name="basePrice" type="Double" mode="OUT" optional="false"><!-- will only be different from price if there is a display price adjustment, for example: checkIncludeVat=Y and a VAT amount was found --></attribute> - <attribute name="price" type="Double" mode="OUT" optional="false"/> - <attribute name="listPrice" type="Double" mode="OUT" optional="true"/> - <attribute name="defaultPrice" type="Double" mode="OUT" optional="true"/> - <attribute name="competitivePrice" type="Double" mode="OUT" optional="true"/> - <attribute name="averageCost" type="Double" mode="OUT" optional="true"/> - <attribute name="promoPrice" type="Double" mode="OUT" optional="true"/> - <attribute name="specialPromoPrice" type="Double" mode="OUT" optional="true"><!-- used for the Product [Special Promo] Type ProductPromo Action --></attribute> + <attribute name="basePrice" type="BigDecimal" mode="OUT" optional="false"><!-- will only be different from price if there is a display price adjustment, for example: checkIncludeVat=Y and a VAT amount was found --></attribute> + <attribute name="price" type="BigDecimal" mode="OUT" optional="false"/> + <attribute name="listPrice" type="BigDecimal" mode="OUT" optional="true"/> + <attribute name="defaultPrice" type="BigDecimal" mode="OUT" optional="true"/> + <attribute name="competitivePrice" type="BigDecimal" mode="OUT" optional="true"/> + <attribute name="averageCost" type="BigDecimal" mode="OUT" optional="true"/> + <attribute name="promoPrice" type="BigDecimal" mode="OUT" optional="true"/> + <attribute name="specialPromoPrice" type="BigDecimal" mode="OUT" optional="true"><!-- used for the Product [Special Promo] Type ProductPromo Action --></attribute> <attribute name="isSale" type="Boolean" mode="OUT" optional="false"/> <attribute name="validPriceFound" type="Boolean" mode="OUT" optional="false"/> <attribute name="currencyUsed" type="String" mode="OUT" optional="false"/> @@ -327,10 +327,10 @@ <attribute name="product" type="org.ofbiz.entity.GenericValue" mode="IN" optional="false"/> <attribute name="currencyUomId" type="String" mode="IN" optional="false"/> <attribute name="partyId" type="String" mode="IN" optional="true"/> - <attribute name="quantity" type="Double" mode="IN" optional="true"/> - <attribute name="amount" type="Double" mode="IN" optional="true"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="amount" type="BigDecimal" mode="IN" optional="true"/> - <attribute name="price" type="Double" mode="OUT" optional="false"/> + <attribute name="price" type="BigDecimal" mode="OUT" optional="false"/> <attribute name="validPriceFound" type="Boolean" mode="OUT" optional="false"/> <attribute name="orderItemPriceInfos" type="java.util.List" mode="OUT" optional="false"/> </service> Modified: ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_shipment.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_shipment.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_shipment.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_shipment.xml Sun Nov 30 22:51:11 2008 @@ -227,7 +227,7 @@ NOTE that this does manage OrderShipment records, but NOTHING else, so it is only to be used for Shipment Plan stuff BEFORE the items are issued, shipment packed, etc.</description> <auto-attributes entity-name="ShipmentItem" include="pk" mode="IN" optional="false"/> - <attribute name="newItemQuantity" type="Double" mode="IN" optional="false"/> + <attribute name="newItemQuantity" type="BigDecimal" mode="IN" optional="false"/> <attribute name="newShipmentItemSeqId" type="String" mode="OUT" optional="true"/> </service> @@ -395,7 +395,7 @@ <description>Issue an OrderItem to a Shipment - only for non-sales orders</description> <auto-attributes entity-name="Shipment" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="OrderItemShipGroupAssoc" include="pk" mode="IN" optional="false"/> - <attribute name="quantity" type="Double" mode="IN" optional="false"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/> <attribute name="shipmentItemSeqId" type="String" mode="OUT" optional="false"/> <attribute name="itemIssuanceId" type="String" mode="OUT" optional="false"/> </service> @@ -404,7 +404,7 @@ <description>Add an OrderItemShipGrpInvRes to a Shipment - only for sales orders</description> <auto-attributes entity-name="Shipment" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="OrderItemShipGrpInvRes" include="pk" mode="IN" optional="false"/> - <attribute name="quantity" type="Double" mode="IN" optional="false"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/> <attribute name="shipmentItemSeqId" type="String" mode="OUT" optional="false"/> <attribute name="itemIssuanceId" type="String" mode="OUT" optional="false"/> </service> @@ -413,7 +413,7 @@ <description>Issue an InventoryItem to a FixedAssetMaint - for conversion to use as supples/parts</description> <auto-attributes entity-name="InventoryItem" include="pk" mode="IN" optional="false"/> <auto-attributes entity-name="FixedAssetMaint" include="pk" mode="IN" optional="false"/> - <attribute name="quantity" type="Double" mode="IN" optional="false"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/> <attribute name="itemIssuanceId" type="String" mode="OUT" optional="false"/> </service> <service name="returnInventoryItemIssuedToFixedAssetMaint" engine="simple" @@ -425,8 +425,8 @@ location="org/ofbiz/shipment/issuance/IssuanceServices.xml" invoke="cancelOrderItemIssuanceFromSalesShipment" auth="true"> <description>Cancel an ItemIssuance from Sales Shipment</description> <attribute name="itemIssuanceId" type="String" mode="IN" optional="false"/> - <attribute name="cancelQuantity" type="Double" mode="IN" optional="true"/> - <attribute name="canceledQuantity" type="Double" mode="OUT" optional="false"/> + <attribute name="cancelQuantity" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="canceledQuantity" type="BigDecimal" mode="OUT" optional="false"/> </service> <service name="issueInventoryItemToShipment" engine="simple" @@ -435,8 +435,8 @@ <attribute name="shipmentId" type="String" mode="IN" optional="false"/> <attribute name="shipmentItemSeqId" type="String" mode="IN" optional="false"/> <attribute name="inventoryItemId" type="String" mode="IN" optional="false"/> - <attribute name="quantity" type="Double" mode="IN" optional="false"/> - <attribute name="totalIssuedQty" type="Double" mode="IN" optional="false"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/> + <attribute name="totalIssuedQty" type="BigDecimal" mode="IN" optional="false"/> <attribute name="itemIssuanceId" type="String" mode="OUT" optional="false"/> </service> @@ -448,7 +448,7 @@ <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="orderId" type="String" mode="IN" optional="true"/> <attribute name="shipGroupSeqId" type="String" mode="IN" optional="true"/> - <attribute name="quantity" type="Double" mode="IN" optional="true"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="packageSeq" type="Integer" mode="IN" optional="false"/> <attribute name="pickerPartyId" type="String" mode="IN" optional="true"/> <attribute name="handlingInstructions" type="String" mode="IN" optional="true"/> @@ -489,7 +489,7 @@ <attribute name="carrierPartyId" type="String" mode="IN" optional="false"/> <attribute name="carrierRoleTypeId" type="String" mode="IN" optional="false"/> <attribute name="productStoreId" type="String" mode="IN" optional="false"/> - <attribute name="additionalShippingCharge" type="Double" mode="OUT" optional="true"/> + <attribute name="additionalShippingCharge" type="BigDecimal" mode="OUT" optional="true"/> </service> <service name="clearPackAll" engine="java" @@ -521,7 +521,7 @@ <attribute name="packingSession" type="org.ofbiz.shipment.packing.PackingSession" mode="IN" optional="false"/> <attribute name="handlingInstructions" type="String" mode="IN" optional="true"/> <attribute name="pickerPartyId" type="String" mode="IN" optional="true"/> - <attribute name="additionalShippingCharge" type="Double" mode="IN" optional="true"/> + <attribute name="additionalShippingCharge" type="BigDecimal" mode="IN" optional="true"/> <attribute name="forceComplete" type="Boolean" mode="IN" optional="true"/> <attribute name="packageWeights" type="Map" string-map-prefix="packageWeight_" mode="IN" optional="true"/> <attribute name="weightUomId" type="String" mode="IN" optional="true"/> @@ -545,7 +545,7 @@ location="org/ofbiz/shipment/shipment/ShipmentServices.xml" invoke="getQuantityForShipment" auth="true"> <description>get the order item quantity still not put in shipments</description> <auto-attributes include="pk" mode="IN" optional="false"/> - <attribute name="remainingQuantity" type="Double" mode="OUT" optional="false"/> + <attribute name="remainingQuantity" type="BigDecimal" mode="OUT" optional="false"/> </service> <!-- ============================================================== --> <!-- Receipt Services --> @@ -638,29 +638,29 @@ <attribute name="fromGeo" type="String" mode="IN" optional="true"/> <attribute name="partyId" type="String" mode="IN" optional="true"/> <attribute name="roleTypeId" type="String" mode="IN" optional="true"/> - <attribute name="flatPercent" type="Double" mode="IN" optional="false"/> - <attribute name="flatPrice" type="Double" mode="IN" optional="true"/> - <attribute name="flatItemPrice" type="Double" mode="IN" optional="true"/> - <attribute name="shippingPricePercent" type="Double" mode="IN" optional="true"/> + <attribute name="flatPercent" type="BigDecimal" mode="IN" optional="false"/> + <attribute name="flatPrice" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="flatItemPrice" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="shippingPricePercent" type="BigDecimal" mode="IN" optional="true"/> <attribute name="productFeatureGroupId" type="String" mode="IN" optional="true"/> - <attribute name="featurePercent" type="Double" mode="IN" optional="true"/> - <attribute name="featurePrice" type="Double" mode="IN" optional="true"/> - <attribute name="oversizeUnit" type="Double" mode="IN" optional="true"/> - <attribute name="oversizePrice" type="Double" mode="IN" optional="true"/> + <attribute name="featurePercent" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="featurePrice" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="oversizeUnit" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="oversizePrice" type="BigDecimal" mode="IN" optional="true"/> <attribute name="weightBreakId" type="String" mode="IN" optional="true"/> - <attribute name="wmin" type="Double" mode="IN" optional="true"/> - <attribute name="wmax" type="Double" mode="IN" optional="true"/> - <attribute name="wprice" type="Double" mode="IN" optional="true"/> + <attribute name="wmin" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="wmax" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="wprice" type="BigDecimal" mode="IN" optional="true"/> <attribute name="wuom" type="String" mode="IN" optional="true"/> <attribute name="quantityBreakId" type="String" mode="IN" optional="true"/> - <attribute name="qmin" type="Double" mode="IN" optional="true"/> - <attribute name="qmax" type="Double" mode="IN" optional="true"/> - <attribute name="qprice" type="Double" mode="IN" optional="true"/> + <attribute name="qmin" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="qmax" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="qprice" type="BigDecimal" mode="IN" optional="true"/> <attribute name="quom" type="String" mode="IN" optional="true"/> <attribute name="priceBreakId" type="String" mode="IN" optional="true"/> - <attribute name="pmin" type="Double" mode="IN" optional="true"/> - <attribute name="pmax" type="Double" mode="IN" optional="true"/> - <attribute name="pprice" type="Double" mode="IN" optional="true"/> + <attribute name="pmin" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="pmax" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="pprice" type="BigDecimal" mode="IN" optional="true"/> <attribute name="puom" type="String" mode="IN" optional="true"/> <attribute name="shipmentCostEstimateId" type="String" mode="OUT"/> </service> @@ -674,7 +674,7 @@ <service name="calcShipmentEstimateInterface" engine="interface" location="" invoke=""> <description>Interface for shipment estimate calc service</description> <attribute name="serviceConfigProps" type="String" mode="IN" optional="true"/> - <attribute name="initialEstimateAmt" type="Double" mode="IN" optional="true"/> + <attribute name="initialEstimateAmt" type="BigDecimal" mode="IN" optional="true"/> <attribute name="shippingContactMechId" type="String" mode="IN" optional="true"/> <attribute name="shippingOriginContactMechId" type="String" mode="IN" optional="true"/> <attribute name="shippingPostalCode" type="String" mode="IN" optional="true"/> @@ -684,11 +684,11 @@ <attribute name="carrierRoleTypeId" type="String" mode="IN" optional="false"/> <attribute name="productStoreId" type="String" mode="IN" optional="false"/> <attribute name="shippableItemInfo" type="List" mode="IN" optional="false"/> - <attribute name="shippableWeight" type="Double" mode="IN" optional="false"/> - <attribute name="shippableQuantity" type="Double" mode="IN" optional="false"/> - <attribute name="shippableTotal" type="Double" mode="IN" optional="false"/> + <attribute name="shippableWeight" type="BigDecimal" mode="IN" optional="false"/> + <attribute name="shippableQuantity" type="BigDecimal" mode="IN" optional="false"/> + <attribute name="shippableTotal" type="BigDecimal" mode="IN" optional="false"/> <attribute name="partyId" type="String" mode="IN" optional="true"/> - <attribute name="shippingEstimateAmount" type="Double" mode="OUT" optional="false"/> + <attribute name="shippingEstimateAmount" type="BigDecimal" mode="OUT" optional="false"/> </service> <service name="calcShipmentCostEstimate" engine="java" @@ -735,7 +735,7 @@ <attribute name="orderId" type="String" mode="IN" optional="false"/> <attribute name="orderItemSeqId" type="String" mode="IN" optional="false"/> <attribute name="shipGroupSeqId" type="String" mode="IN" optional="false"/> - <attribute name="quantity" type="Double" mode="IN" optional="true"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="reservedDatetime" type="Timestamp" mode="IN" optional="true"/> <attribute name="requireInventory" type="String" mode="IN" optional="true"/> <attribute name="reserveOrderEnumId" type="String" mode="IN" optional="true"/> @@ -743,7 +743,7 @@ <attribute name="serialNumber" type="String" mode="IN" optional="true"/> <attribute name="trackingNum" type="String" mode="IN" optional="true"/> <attribute name="originFacilityId" type="String" mode="IN" optional="true"/> - <attribute name="quantityNotReserved" type="Double" mode="IN" optional="true"/> + <attribute name="quantityNotReserved" type="BigDecimal" mode="IN" optional="true"/> <attribute name="promisedDatetime" type="Timestamp" mode="IN" optional="false"/> <attribute name="shipmentPackageSeqId" type="String" mode="IN" optional="true"/> </service> Modified: ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_shipment_ups.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_shipment_ups.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_shipment_ups.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_shipment_ups.xml Sun Nov 30 22:51:11 2008 @@ -64,7 +64,7 @@ <description>UPS On-Line rate inquire tool. Also supports rate shopping by setting upsRateInquireMode to 'Shop', and upsRateCodeMap will return a Map of serviceCode -> rate</description> <attribute name="serviceConfigProps" type="String" mode="IN" optional="true"/> - <attribute name="initialEstimateAmt" type="Double" mode="IN" optional="true"/> + <attribute name="initialEstimateAmt" type="BigDecimal" mode="IN" optional="true"/> <!-- The postal code must not be required or service validation could create an exception and break other things. It will be checked in the service and a Failure (not Error) will be returned if it is null --> <attribute name="shippingPostalCode" type="String" mode="IN" optional="true"/> @@ -75,10 +75,10 @@ <!-- Passing in a list of package weights will override the splitting of packages and calculation of package weights by item --> <attribute name="packageWeights" type="List" mode="IN" optional="true"/> <attribute name="shippableItemInfo" type="List" mode="IN" optional="false"/> - <attribute name="shippableWeight" type="Double" mode="IN" optional="false"/> - <attribute name="shippableQuantity" type="Double" mode="IN" optional="false"/> - <attribute name="shippableTotal" type="Double" mode="IN" optional="false"/> - <attribute name="shippingEstimateAmount" type="Double" mode="OUT" optional="false"/> + <attribute name="shippableWeight" type="BigDecimal" mode="IN" optional="false"/> + <attribute name="shippableQuantity" type="BigDecimal" mode="IN" optional="false"/> + <attribute name="shippableTotal" type="BigDecimal" mode="IN" optional="false"/> + <attribute name="shippingEstimateAmount" type="BigDecimal" mode="OUT" optional="false"/> <attribute name="upsRateInquireMode" type="String" mode="IN" optional="true"/> <attribute name="upsRateCodeMap" type="Map" mode="OUT" optional="false"/> <attribute name="isResidentialAddress" type="String" mode="IN" optional="true"/> Modified: ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_uom.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_uom.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_uom.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_uom.xml Sun Nov 30 22:51:11 2008 @@ -27,7 +27,7 @@ <!-- UOM Formulas --> <service name="interfaceUomFormula" engine="interface" location="" invoke=""> <attribute mode="IN" name="arguments" optional="false" type="java.util.Map"/> - <attribute mode="OUT" name="convertedValue" optional="true" type="Double"/> + <attribute mode="OUT" name="convertedValue" optional="true" type="BigDecimal"/> </service> <service name="convertUomProduct" engine="simple" auth="false" location="org/ofbiz/product/product/ProductUomFormulas.xml" invoke="convertUomProduct"> Modified: ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_view.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_view.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_view.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_view.xml Sun Nov 30 22:51:11 2008 @@ -86,7 +86,7 @@ <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="partyId" type="String" mode="IN" optional="true"/> <attribute name="currencyUomId" type="String" mode="IN" optional="true"/> - <attribute name="quantity" type="Double" mode="IN" optional="true"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="canDropShip" type="String" mode="IN" optional="true"/> <attribute name="supplierProducts" type="java.util.List" mode="OUT" optional="false"/> </service> Modified: ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java (original) +++ ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java Sun Nov 30 22:51:11 2008 @@ -20,6 +20,7 @@ package org.ofbiz.product.config; import java.io.Serializable; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; @@ -55,8 +56,8 @@ protected GenericDelegator delegator; protected GenericValue product = null; // the aggregated product protected GenericValue autoUserLogin = null; - protected double basePrice = 0.0; - protected double defaultPrice = 0.0; + protected BigDecimal basePrice = BigDecimal.ZERO; + protected BigDecimal defaultPrice = BigDecimal.ZERO; protected String configId = null; // Id of persisted ProductConfigWrapper protected List questions = null; // ProductConfigs @@ -102,9 +103,9 @@ Map priceContext = UtilMisc.toMap("product", product, "prodCatalogId", catalogId, "webSiteId", webSiteId, "productStoreId", productStoreId, "currencyUomId", currencyUomId, "autoUserLogin", autoUserLogin); Map priceMap = dispatcher.runSync("calculateProductPrice", priceContext); - Double price = (Double)priceMap.get("price"); + BigDecimal price = (BigDecimal) priceMap.get("price"); if (price != null) { - basePrice = price.doubleValue(); + basePrice = price; } questions = new ArrayList(); List questionsValues = new ArrayList(); @@ -303,27 +304,27 @@ return defaultOptions; } - public double getTotalPrice() { - double totalPrice = basePrice; + public BigDecimal getTotalPrice() { + BigDecimal totalPrice = basePrice; List options = getSelectedOptions(); for (int i = 0; i < options.size(); i++) { ConfigOption oneOption = (ConfigOption)options.get(i); - totalPrice += oneOption.getPrice(); + totalPrice = totalPrice.add(oneOption.getPrice()); } return totalPrice; } private void setDefaultPrice() { - double totalPrice = basePrice; + BigDecimal totalPrice = basePrice; List options = getDefaultOptions(); for (int i = 0; i < options.size(); i++) { ConfigOption oneOption = (ConfigOption)options.get(i); - totalPrice += oneOption.getPrice(); + totalPrice = totalPrice.add(oneOption.getPrice()); } defaultPrice = totalPrice; } - public double getDefaultPrice(){ + public BigDecimal getDefaultPrice(){ return defaultPrice; } @@ -522,7 +523,7 @@ } public class ConfigOption implements java.io.Serializable { - double optionPrice = 0; + BigDecimal optionPrice = BigDecimal.ZERO; Date availabilityDate = null; List componentList = null; // lists of ProductConfigProduct Map componentOptions = null; @@ -538,32 +539,32 @@ componentList = option.getRelated("ConfigOptionProductConfigProduct"); Iterator componentsIt = componentList.iterator(); while (componentsIt.hasNext()) { - double price = 0; + BigDecimal price = BigDecimal.ZERO; GenericValue oneComponent = (GenericValue)componentsIt.next(); // Get the component's price Map fieldMap = UtilMisc.toMap("product", oneComponent.getRelatedOne("ProductProduct"), "prodCatalogId", catalogId, "webSiteId", webSiteId, "currencyUomId", currencyUomId, "productPricePurposeId", "COMPONENT_PRICE", "autoUserLogin", autoUserLogin); Map priceMap = dispatcher.runSync("calculateProductPrice", fieldMap); - Double componentPrice = (Double) priceMap.get("price"); + BigDecimal componentPrice = (BigDecimal) priceMap.get("price"); Boolean validPriceFound = (Boolean)priceMap.get("validPriceFound"); - double mult = 1; - if (oneComponent.getDouble("quantity") != null) { - mult = oneComponent.getDouble("quantity").doubleValue(); + BigDecimal mult = BigDecimal.ONE; + if (oneComponent.getBigDecimal("quantity") != null) { + mult = oneComponent.getBigDecimal("quantity"); } - if (mult == 0) { - mult = 1; + if (mult.compareTo(BigDecimal.ZERO) == 0) { + mult = BigDecimal.ONE; } if (componentPrice != null && validPriceFound.booleanValue()) { - price = componentPrice.doubleValue(); + price = componentPrice; } else { fieldMap.put("productPricePurposeId", "PURCHASE"); Map purchasePriceResultMap = dispatcher.runSync("calculateProductPrice", fieldMap); - Double purchasePrice = (Double) purchasePriceResultMap.get("price"); + BigDecimal purchasePrice = (BigDecimal) purchasePriceResultMap.get("price"); if (purchasePrice != null) { - price = purchasePrice.doubleValue(); + price = purchasePrice; } } - optionPrice += (price * mult); + optionPrice = optionPrice.add(price.multiply(mult)); // TODO: get the component's availability date } } @@ -581,10 +582,10 @@ } public void recalculateOptionPrice(ProductConfigWrapper pcw) throws Exception { - optionPrice = 0; + optionPrice = BigDecimal.ZERO; Iterator componentsIt = componentList.iterator(); while (componentsIt.hasNext()) { - double price = 0; + BigDecimal price = BigDecimal.ZERO; GenericValue oneComponent = (GenericValue)componentsIt.next(); GenericValue oneComponentProduct = oneComponent.getRelatedOne("ProductProduct"); String variantProductId = (String)componentOptions.get(oneComponent.getString("productId")); @@ -597,26 +598,26 @@ Map fieldMap = UtilMisc.toMap("product", oneComponentProduct, "prodCatalogId", pcw.catalogId, "webSiteId", pcw.webSiteId, "currencyUomId", pcw.currencyUomId, "productPricePurposeId", "COMPONENT_PRICE", "autoUserLogin", pcw.autoUserLogin); Map priceMap = dispatcher.runSync("calculateProductPrice", fieldMap); - Double componentPrice = (Double) priceMap.get("price"); + BigDecimal componentPrice = (BigDecimal) priceMap.get("price"); Boolean validPriceFound = (Boolean)priceMap.get("validPriceFound"); - double mult = 1; - if (oneComponent.getDouble("quantity") != null) { - mult = oneComponent.getDouble("quantity").doubleValue(); + BigDecimal mult = BigDecimal.ONE; + if (oneComponent.getBigDecimal("quantity") != null) { + mult = oneComponent.getBigDecimal("quantity"); } - if (mult == 0) { - mult = 1; + if (mult.compareTo(BigDecimal.ZERO) == 0) { + mult = BigDecimal.ONE; } if (componentPrice != null && validPriceFound.booleanValue()) { - price = componentPrice.doubleValue(); + price = componentPrice; } else { fieldMap.put("productPricePurposeId", "PURCHASE"); Map purchasePriceResultMap = dispatcher.runSync("calculateProductPrice", fieldMap); - Double purchasePrice = (Double) purchasePriceResultMap.get("price"); + BigDecimal purchasePrice = (BigDecimal) purchasePriceResultMap.get("price"); if (purchasePrice != null) { - price = purchasePrice.doubleValue(); + price = purchasePrice; } } - optionPrice += (price * mult); + optionPrice = optionPrice.add(price.multiply(mult)); } } @@ -636,14 +637,14 @@ this.comments = comments; } - public double getPrice() { + public BigDecimal getPrice() { return optionPrice; } - public double getOffsetPrice() { + public BigDecimal getOffsetPrice() { ConfigOption defaultConfigOption = parentConfigItem.getDefault(); if (parentConfigItem.isSingleChoice() && UtilValidate.isNotEmpty(defaultConfigOption)){ - return optionPrice - defaultConfigOption.getPrice(); + return optionPrice.subtract(defaultConfigOption.getPrice()); } else { // can select multiple or no default; show full price return optionPrice; } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |