svn commit: r721986 [1/13] - in /ofbiz/branches/typecheckclean
Locked
svn commit: r721986 [1/13] - in /ofbiz/branches/typecheckclean
 
|
Author: lektran
Date: Sun Nov 30 22:51:11 2008 New Revision: 721986 URL: http://svn.apache.org/viewvc?rev=721986&view=rev Log: Some more double to BigDecimal conversions Modified: ofbiz/branches/typecheckcleanup200810/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml ofbiz/branches/typecheckcleanup200810/applications/order/entitydef/entitymodel.xml ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/order/OrderServices.xml ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services.xml ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_cart.xml ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_quote.xml ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_requirement.xml ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_return.xml ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_shoppinglist.xml ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/OrderManagerEvents.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/test/OrderTestServices.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/test/PurchaseOrderTest.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareServices.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/thirdparty/taxware/TaxwareUTL.java ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java ofbiz/branches/typecheckcleanup200810/applications/product/entitydef/eecas.xml ofbiz/branches/typecheckcleanup200810/applications/product/entitydef/entitymodel.xml ofbiz/branches/typecheckcleanup200810/applications/product/entitydef/entitymodel_shipment.xml ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/product/cost/CostServices.xml ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/product/product/ProductServices.xml ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml ofbiz/branches/typecheckcleanup200810/applications/product/script/org/ofbiz/shipment/test/TestServices.xml ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/secas.xml ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services.xml ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_cost.xml ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_facility.xml ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_feature.xml ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_pricepromo.xml ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_shipment.xml ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_shipment_ups.xml ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_uom.xml ofbiz/branches/typecheckcleanup200810/applications/product/servicedef/services_view.xml ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/price/PriceServices.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/product/ProductEvents.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/product/ProductSearch.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/product/ProductServices.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/product/ProductWorker.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductHelper.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductServices.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/product/test/StockMovesTest.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java ofbiz/branches/typecheckcleanup200810/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java ofbiz/branches/typecheckcleanup200810/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy ofbiz/branches/typecheckcleanup200810/applications/product/widget/catalog/ProductScreens.xml ofbiz/branches/typecheckcleanup200810/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java ofbiz/branches/typecheckcleanup200810/framework/base/src/org/ofbiz/base/util/UtilParse.java ofbiz/branches/typecheckcleanup200810/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java ofbiz/branches/typecheckcleanup200810/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java ofbiz/branches/typecheckcleanup200810/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java ofbiz/branches/typecheckcleanup200810/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java ofbiz/branches/typecheckcleanup200810/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java ofbiz/branches/typecheckcleanup200810/specialpurpose/mypage/webapp/mypage/WEB-INF/actions/ConvertInvoiceCurrency.groovy ofbiz/branches/typecheckcleanup200810/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java ofbiz/branches/typecheckcleanup200810/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java ofbiz/branches/typecheckcleanup200810/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java ofbiz/branches/typecheckcleanup200810/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java ofbiz/branches/typecheckcleanup200810/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java ofbiz/branches/typecheckcleanup200810/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java ofbiz/branches/typecheckcleanup200810/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java ofbiz/branches/typecheckcleanup200810/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java Modified: ofbiz/branches/typecheckcleanup200810/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/accounting/script/org/ofbiz/accounting/olap/FactServices.xml Sun Nov 30 22:51:11 2008 @@ -69,7 +69,7 @@ <if-not-empty field="invoice.invoiceDate"> <clear-field field-name="inMap"/> <set field="inMap.dimensionEntityName" value="DateDimension"/> - <set field="inMap.naturalKeyFields.dateValue" from-field="invoice.invoiceDate"/> + <set field="inMap.naturalKeyFields.dateValue" from-field="invoice.invoiceDate" type="Date"/> <call-service service-name="getDimensionIdFromNaturalKey" in-map-name="inMap"> <result-to-field result-name="dimensionId" field-name="fact.invoiceDateDimId"/> </call-service> Modified: ofbiz/branches/typecheckcleanup200810/applications/order/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/order/entitydef/entitymodel.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/order/entitydef/entitymodel.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/order/entitydef/entitymodel.xml Sun Nov 30 22:51:11 2008 @@ -301,10 +301,10 @@ <field name="estimatedReadyDate" type="date-time"></field> <field name="cartons" type="numeric"></field> <field name="skidsPallets" type="numeric"></field> - <field name="unitsPieces" type="floating-point"></field> - <field name="totalCubicSize" type="floating-point"></field> + <field name="unitsPieces" type="fixed-point"></field> + <field name="totalCubicSize" type="fixed-point"></field> <field name="totalCubicUomId" type="id"></field> - <field name="totalWeight" type="floating-point"></field> + <field name="totalWeight" type="fixed-point"></field> <field name="totalWeightUomId" type="id"></field> <field name="statusId" type="id"></field> <prim-key field="orderId"/> @@ -1075,7 +1075,7 @@ <field name="orderItemSeqId" type="id-ne"></field> <field name="shipmentId" type="id-ne"></field> <field name="shipmentItemSeqId" type="id-ne"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <prim-key field="orderId"/> <prim-key field="orderItemSeqId"/> <prim-key field="shipmentId"/> @@ -1131,7 +1131,7 @@ <field name="entryDate" type="date"></field> <field name="productId" type="id-ne"></field> <field name="facilityId" type="id-ne"></field> - <field name="totalQuantity" type="floating-point"></field> + <field name="totalQuantity" type="fixed-point"></field> <field name="grossSales" type="currency-amount"></field> <field name="productCost" type="currency-amount"></field> <prim-key field="entryDate"/> @@ -1369,7 +1369,7 @@ title="Quote Coefficient Entity"> <field name="quoteId" type="id-ne"></field> <field name="coeffName" type="id-long-ne"></field> - <field name="coeffValue" type="floating-point"></field> + <field name="coeffValue" type="fixed-point"></field> <prim-key field="quoteId"/> <prim-key field="coeffName"/> <relation type="one" fk-name="QUOTE_COEFF" rel-entity-name="Quote"> @@ -1389,12 +1389,12 @@ <field name="workEffortId" type="id"></field> <field name="custRequestId" type="id"></field> <field name="custRequestItemSeqId" type="id"></field> - <field name="quantity" type="floating-point"></field> - <field name="selectedAmount" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> + <field name="selectedAmount" type="fixed-point"></field> <field name="quoteUnitPrice" type="currency-amount"></field> <field name="reservStart" type="date-time"></field> - <field name="reservLength" type="floating-point"></field> - <field name="reservPersons" type="floating-point"></field> + <field name="reservLength" type="fixed-point"></field> + <field name="reservPersons" type="fixed-point"></field> <field name="configId" type="id"></field> <field name="estimatedDeliveryDate" type="date-time"></field> <field name="comments" type="comment"></field> @@ -1555,7 +1555,7 @@ <field name="productFeatureId" type="id"></field> <field name="correspondingProductId" type="id"></field> <field name="sourceReferenceId" type="id-long"></field> - <field name="sourcePercentage" type="floating-point"><!-- for tax entries this is the tax percentage --></field> + <field name="sourcePercentage" type="fixed-point"><!-- for tax entries this is the tax percentage --></field> <field name="customerReferenceId" type="id-long"><!-- for tax entries this is partyTaxId --></field> <field name="primaryGeoId" type="id"><!-- for tax entries this is the primary jurisdiction Geo (the smallest or most local Geo that this tax is for, usually a state/province, perhaps a county or a city) --></field> <field name="secondaryGeoId" type="id"><!-- for tax entries this is the secondary jurisdiction Geo (usually a country, or other Geo that the primary is within) --></field> @@ -1752,12 +1752,12 @@ <field name="sequenceNum" type="numeric"></field> <field name="requiredByDate" type="date-time"></field> <field name="productId" type="id"></field> - <field name="quantity" type="floating-point"></field> - <field name="selectedAmount" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> + <field name="selectedAmount" type="fixed-point"></field> <field name="maximumAmount" type="currency-amount"></field> <field name="reservStart" type="date-time"></field> - <field name="reservLength" type="floating-point"></field> - <field name="reservPersons" type="floating-point"></field> + <field name="reservLength" type="fixed-point"></field> + <field name="reservPersons" type="fixed-point"></field> <field name="configId" type="id"></field> <field name="description" type="description"></field> <field name="story" type="very-long"></field> @@ -1981,7 +1981,7 @@ <field name="orderId" type="id-ne"></field> <field name="orderItemSeqId" type="id-ne"></field> <field name="requirementId" type="id-ne"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <prim-key field="orderId"/> <prim-key field="orderItemSeqId"/> <prim-key field="requirementId"/> @@ -2010,7 +2010,7 @@ <field name="requirementStartDate" type="date-time"></field> <field name="requiredByDate" type="date-time"></field> <field name="estimatedBudget" type="currency-amount"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <field name="useCase" type="very-long"></field> <field name="reason" type="long-varchar"></field> <field name="createdDate" type="date-time"></field> @@ -2220,7 +2220,7 @@ <field name="correspondingProductId" type="id"></field> <field name="taxAuthorityRateSeqId" type="id-ne"></field> <field name="sourceReferenceId" type="id-long"></field> - <field name="sourcePercentage" type="floating-point"> + <field name="sourcePercentage" type="fixed-point"> <description>for tax entries this is the tax percentage</description> </field> <field name="customerReferenceId" type="id-long"> @@ -2395,8 +2395,8 @@ <field name="orderItemSeqId" type="id"></field> <field name="statusId" type="id"></field> <field name="expectedItemStatus" type="id"></field> - <field name="returnQuantity" type="floating-point"><description>promised by the customer</description></field> - <field name="receivedQuantity" type="floating-point"><description>actually received from the customer</description></field> + <field name="returnQuantity" type="fixed-point"><description>promised by the customer</description></field> + <field name="receivedQuantity" type="fixed-point"><description>actually received from the customer</description></field> <field name="returnPrice" type="currency-amount"></field> <field name="returnItemResponseId" type="id"></field> <prim-key field="returnId"/> @@ -2546,7 +2546,7 @@ <field name="invoiceId" type="id-ne"></field> <field name="invoiceItemSeqId" type="id-ne"></field> <field name="shipmentReceiptId" type="id"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <field name="amount" type="currency-amount"></field> <prim-key field="returnId"/> <prim-key field="returnItemSeqId"/> @@ -2577,7 +2577,7 @@ <field name="returnItemSeqId" type="id-ne"></field> <field name="shipmentId" type="id-ne"></field> <field name="shipmentItemSeqId" type="id-ne"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <prim-key field="returnId"/> <prim-key field="returnItemSeqId"/> <prim-key field="shipmentId"/> @@ -2610,13 +2610,13 @@ <field name="cartAbandonedLineSeqId" type="id-ne"></field> <field name="productId" type="id-ne"></field> <field name="prodCatalogId" type="id-ne"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <field name="reservStart" type="date-time"></field> - <field name="reservLength" type="floating-point"></field> - <field name="reservPersons" type="floating-point"></field> + <field name="reservLength" type="fixed-point"></field> + <field name="reservPersons" type="fixed-point"></field> <field name="unitPrice" type="currency-amount"></field> - <field name="reserv2ndPPPerc" type="floating-point"/> - <field name="reservNthPPPerc" type="floating-point"/> + <field name="reserv2ndPPPerc" type="fixed-point"/> + <field name="reservNthPPPerc" type="fixed-point"/> <field name="configId" type="id"></field> <field name="totalWithAdjustments" type="currency-amount"></field> <field name="wasReserved" type="indicator"></field> @@ -2712,11 +2712,11 @@ <field name="shoppingListId" type="id-ne"></field> <field name="shoppingListItemSeqId" type="id-ne"></field> <field name="productId" type="id"></field> - <field name="quantity" type="floating-point"></field> + <field name="quantity" type="fixed-point"></field> <field name="reservStart" type="date-time"></field> - <field name="reservLength" type="floating-point"></field> - <field name="reservPersons" type="floating-point"></field> - <field name="quantityPurchased" type="floating-point"></field> + <field name="reservLength" type="fixed-point"></field> + <field name="reservPersons" type="fixed-point"></field> + <field name="quantityPurchased" type="fixed-point"></field> <field name="configId" type="id"></field> <prim-key field="shoppingListId"/> <prim-key field="shoppingListItemSeqId"/> @@ -2782,7 +2782,7 @@ <field name="description" type="very-long"/> <field name="nextStep" type="very-long"/> <field name="estimatedAmount" type="currency-amount"/> - <field name="estimatedProbability" type="floating-point"/> + <field name="estimatedProbability" type="fixed-point"/> <field name="currencyUomId" type="id-ne"/> <field name="marketingCampaignId" type="id-ne"/> <field name="dataSourceId" type="id-ne"/> @@ -2816,7 +2816,7 @@ <field name="description" type="very-long"/> <field name="nextStep" type="very-long"/> <field name="estimatedAmount" type="currency-amount"/> - <field name="estimatedProbability" type="floating-point"/> + <field name="estimatedProbability" type="fixed-point"/> <field name="currencyUomId" type="id-ne"/> <field name="estimatedCloseDate" type="date-time"/> <field name="opportunityStageId" type="id-ne"/> @@ -2870,7 +2870,7 @@ title="Describes stages of a sales opportunity with associated probability factors."> <field name="opportunityStageId" type="id-ne"></field> <field name="description" type="description"/> - <field name="defaultProbability" type="floating-point"/> + <field name="defaultProbability" type="fixed-point"/> <field name="sequenceNum" type="numeric"/> <prim-key field="opportunityStageId"/> </entity> @@ -2918,8 +2918,8 @@ <field name="forecastAmount" type="currency-amount"></field> <field name="bestCaseAmount" type="currency-amount"></field> <field name="closedAmount" type="currency-amount"/> - <field name="percentOfQuotaForecast" type="floating-point"/> - <field name="percentOfQuotaClosed" type="floating-point"/> + <field name="percentOfQuotaForecast" type="fixed-point"/> + <field name="percentOfQuotaClosed" type="fixed-point"/> <field name="pipelineAmount" type="currency-amount"></field> <field name="createdByUserLoginId" type="id-vlong"></field> <field name="modifiedByUserLoginId" type="id-vlong"></field> @@ -2954,7 +2954,7 @@ <field name="salesForecastDetailId" type="id-ne"/> <field name="amount" type="currency-amount"/> <field name="quantityUomId" type="id"/> - <field name="quantity" type="floating-point"/> + <field name="quantity" type="fixed-point"/> <field name="productId" type="id"/> <field name="productCategoryId" type="id"/> <prim-key field="salesForecastId"/> @@ -2987,8 +2987,8 @@ <field name="forecastAmount" type="currency-amount"></field> <field name="bestCaseAmount" type="currency-amount"></field> <field name="closedAmount" type="currency-amount"/> - <field name="percentOfQuotaForecast" type="floating-point"/> - <field name="percentOfQuotaClosed" type="floating-point"/> + <field name="percentOfQuotaForecast" type="fixed-point"/> + <field name="percentOfQuotaClosed" type="fixed-point"/> <field name="changeNote" type="very-long"> <description>Used to track a reason for this change</description> <!-- maybe one day this should be a link to NoteData --> </field> Modified: ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Sun Nov 30 22:51:11 2008 @@ -239,7 +239,7 @@ </calcop> </calculate> </iterate> - <if-compare field="returnTotalAmount" operator="less" value="0" type="Double"> + <if-compare field="returnTotalAmount" operator="less" value="0" type="BigDecimal"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderReturnTotalCannotLessThanZero"/></add-error> </if-compare> <check-errors/> @@ -295,14 +295,14 @@ </if> <check-errors/> - <if-compare field="parameters.returnQuantity" operator="equals" value="0" type="Double"> + <if-compare field="parameters.returnQuantity" operator="equals" value="0" type="BigDecimal"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderNoReturnQuantityAvailablePreviousReturnsMayExist"/></add-error> <check-errors/> </if-compare> <!-- setup some default values for protection --> - <set field="returnableQuantity" value="0" type="Double"/> - <set field="returnablePrice" value="0" type="Double"/> + <set field="returnableQuantity" value="0" type="BigDecimal"/> + <set field="returnablePrice" value="0" type="BigDecimal"/> <!-- if an orderItemSeqId is provided, then find the corresponding orderItem --> <if-not-empty field="parameters.orderItemSeqId"> @@ -325,7 +325,7 @@ </if-not-empty> - <if-compare field="returnableQuantity" value="0" operator="greater" type="Double"> + <if-compare field="returnableQuantity" value="0" operator="greater" type="BigDecimal"> <!-- the user is only allowed to set a returnPrice if he has ORDERMGR_CREATE privilege, otherwise only the returnablePrice calculated by service is used --> <if> @@ -338,21 +338,21 @@ </if> <!-- make sure the returnQuantity is not greater than the returnableQuantity from service or the quantity on the original orderItem --> - <if-compare-field field="parameters.returnQuantity" to-field="returnableQuantity" operator="greater" type="Double"> + <if-compare-field field="parameters.returnQuantity" to-field="returnableQuantity" operator="greater" type="BigDecimal"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderRequestedReturnQuantityNotAvailablePreviousReturnsMayExist"/></add-error> </if-compare-field> <!-- SC 20060202: Is this really needed? Or does the above duplicate it. If not, we should remove it --> <if-not-empty field="orderItem"> - <if-compare-field field="parameters.returnQuantity" to-field="orderItem.quantity" operator="greater" type="Double"> + <if-compare-field field="parameters.returnQuantity" to-field="orderItem.quantity" operator="greater" type="BigDecimal"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderReturnQuantityCannotExceedTheOrderedQuantity"/></add-error> </if-compare-field> </if-not-empty> <!-- Workaround for bug: returnPrice=16.99, returnablePrice=16.9894 => OrderReturnPriceCannotExceedThePurchasePrice --> - <set field="epsilon" value="0.01" type="Double"/> - <set field="zero" value="0.0" type="Double"/> - <calculate field-name="returnPriceDelta" type="Double"> + <set field="epsilon" value="0.01" type="BigDecimal"/> + <set field="zero" value="0.0" type="BigDecimal"/> + <calculate field-name="returnPriceDelta" type="BigDecimal"> <calcop operator="subtract"> <calcop operator="get" field-name="returnPrice" map-name="parameters"/> <calcop operator="get" field-name="returnablePrice"/> @@ -360,8 +360,8 @@ </calculate> <!-- just checking greater-equals sometimes returns an error if the difference is actually zero --> - <if-compare-field field="returnPriceDelta" to-field="zero" operator="not-equals" type="Double"> - <if-compare-field field="returnPriceDelta" to-field="epsilon" operator="greater-equals" type="Double"> + <if-compare-field field="returnPriceDelta" to-field="zero" operator="not-equals" type="BigDecimal"> + <if-compare-field field="returnPriceDelta" to-field="epsilon" operator="greater-equals" type="BigDecimal"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderReturnPriceCannotExceedThePurchasePrice"/></add-error> </if-compare-field > </if-compare-field> @@ -388,14 +388,15 @@ <set value="1" field="newEntity.returnItemSeqId"/> <else> <first-from-list entry-name="newestItem" list-name="currentItems"/> - <calculate field-name="returnItemSeqId" map-name="newEntity" type="Integer"> + <calculate field-name="returnItemSeqId" type="Integer"> <calcop field-name="returnItemSeqId" map-name="newestItem" operator="add"> <number value="1"/> </calcop> </calculate> </else> </if-empty> - <to-string field-name="returnItemSeqId" map-name="newEntity" numeric-padding="5"/> + <to-string field-name="returnItemSeqId" numeric-padding="5"/> + <set field="newEntity.returnItemSeqId" from-field="returnItemSeqId" type="PlainString"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set field="newEntity.statusId" value="RETURN_REQUESTED"/> <!-- default status for new return items --> @@ -543,7 +544,7 @@ <number value="0"/> </calculate> </if-empty> - <calculate field-name="${receipt.returnItemSeqId}" map-name="totalsMap" type="Double"> + <calculate field-name="${receipt.returnItemSeqId}" map-name="totalsMap" type="BigDecimal"> <calcop field-name="${receipt.returnItemSeqId}" map-name="totalsMap" operator="add"> <calcop field-name="quantityAccepted" map-name="receipt" operator="get"/> <calcop field-name="quantityRejected" map-name="receipt" operator="get"/> @@ -556,7 +557,7 @@ </entity-one> <set field="returnItem.receivedQuantity" from-field="totalsMap.${receipt.returnItemSeqId}"/> - <if-compare-field field="totalsMap.${receipt.returnItemSeqId}" to-field="returnItem.returnQuantity" operator="greater-equals" type="Double"> + <if-compare-field field="totalsMap.${receipt.returnItemSeqId}" to-field="returnItem.returnQuantity" operator="greater-equals" type="BigDecimal"> <!-- update the status for the item --> <set field="returnItem.statusId" value="RETURN_RECEIVED"/> <store-value value-name="returnItem"/> @@ -766,7 +767,7 @@ <log level="info" message="Found unexpected orderAdjustment:${newItemCtx.orderAdjustmentId}"/> <clear-field field-name="newItemCtx.orderAdjustmentId"/> </if-not-empty> - <if-compare field="newItemCtx.returnQuantity" value="0" operator="greater" type="Double"> + <if-compare field="newItemCtx.returnQuantity" value="0" operator="greater" type="BigDecimal"> <!-- otherwise, items which have been fully returned would still get passed in and then come back with an error --> <call-service service-name="createReturnItem" in-map-name="newItemCtx" include-user-login="true"/> <else> @@ -811,7 +812,7 @@ <set from-field="returnId" field="balanceItemCtx.returnId"/> <set field="balanceItemCtx.returnItemSeqId" value="_NA_"/> - <set from-field="availableReturnTotal" field="balanceItemCtx.amount" type="Double"/> + <set from-field="availableReturnTotal" field="balanceItemCtx.amount" type="BigDecimal"/> <log level="warning" message="Creating a balance adjustment of [${availableReturnTotal}] for return [${returnId}]"/> <!-- create the balance adjustment return item --> Modified: ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/order/OrderServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/order/OrderServices.xml Sun Nov 30 22:51:11 2008 @@ -72,10 +72,10 @@ </entity-condition> <!-- first set the required OUT fields to zero --> - <calculate field-name="plainDoubleZero" type="Double"><number value="0.0"/></calculate> + <calculate field-name="plainBigDecimalZero" type="BigDecimal"><number value="0.0"/></calculate> <calculate field-name="plainLongZero" type="Long"><number value="0"/></calculate> - <field-to-result field-name="plainDoubleZero" result-name="totalGrandAmount"/> - <field-to-result field-name="plainDoubleZero" result-name="totalSubRemainingAmount"/> + <field-to-result field-name="plainBigDecimalZero" result-name="totalGrandAmount"/> + <field-to-result field-name="plainBigDecimalZero" result-name="totalSubRemainingAmount"/> <field-to-result field-name="plainLongZero" result-name="totalOrders"/> <!-- because we specified the partyId and the roleTypeId, should only be one item in list returned --> @@ -242,14 +242,14 @@ <if-not-empty field="productFacility.minimumStock"> <!-- No requirements are created if we are already under stock --> - <if-compare-field field="quantityOnHandTotal" to-field="productFacility.minimumStock" operator="greater-equals" type="Double"> + <if-compare-field field="quantityOnHandTotal" to-field="productFacility.minimumStock" operator="greater-equals" type="BigDecimal"> <calculate field-name="newQuantityOnHand"> <calcop field-name="quantityOnHandTotal" operator="subtract"> <calcop operator="get" field-name="parameters.quantity"/> </calcop> </calculate> <!-- If this new issuance will cause the quantityOnHandTotal to go below the minimumStock, create a new requirement --> - <if-compare-field field="newQuantityOnHand" to-field="productFacility.minimumStock" operator="less" type="Double"> + <if-compare-field field="newQuantityOnHand" to-field="productFacility.minimumStock" operator="less" type="BigDecimal"> <set from-field="inventoryItem.productId" field="inputMap.productId"/> <set from-field="productFacility.facilityId" field="inputMap.facilityId"/> <if-not-empty field="productFacility.reorderQuantity"> @@ -289,14 +289,14 @@ <if-not-empty field="productFacility.minimumStock"> <!-- No requirements are created if we are not under stock --> <!-- this service is supposed to be called after inventory is reserved, so inventory should have been updated already --> - <if-compare-field field="availableToPromiseTotal" to-field="productFacility.minimumStock" operator="less" type="Double"> + <if-compare-field field="availableToPromiseTotal" to-field="productFacility.minimumStock" operator="less" type="BigDecimal"> <calculate field-name="oldAvailableToPromise"> <calcop field-name="availableToPromiseTotal" operator="add"> <calcop operator="get" field-name="parameters.quantity"/> </calcop> </calculate> <!-- If before this reservation the availableToPromiseTotal was over minimumStock, create a new requirement --> - <if-compare-field field="oldAvailableToPromise" to-field="productFacility.minimumStock" operator="greater-equals" type="Double"> + <if-compare-field field="oldAvailableToPromise" to-field="productFacility.minimumStock" operator="greater-equals" type="BigDecimal"> <set from-field="inventoryItem.productId" field="inputMap.productId"/> <set from-field="productFacility.facilityId" field="inputMap.facilityId"/> <if-not-empty field="productFacility.reorderQuantity"> @@ -335,14 +335,14 @@ <if-not-empty field="productFacility"> <!-- are we below minimum stock? this service is supposed to be called after inventory is reserved, so inventory should have been updated already --> - <if-compare-field field="availableToPromiseTotal" to-field="productFacility.minimumStock" operator="less" type="Double"> + <if-compare-field field="availableToPromiseTotal" to-field="productFacility.minimumStock" operator="less" type="BigDecimal"> <!-- what is the right quantity? It is the lesser of the actual quantity and the quantity required to bring us back up to minimum stock --> <calculate field-name="quantityShortfall"> <calcop field-name="productFacility.minimumStock" operator="subtract"> <calcop operator="get" field-name="availableToPromiseTotal"/> </calcop> </calculate> - <if-compare-field field="quantityShortfall" operator="less" to-field="parameters.quantity" type="Double"> + <if-compare-field field="quantityShortfall" operator="less" to-field="parameters.quantity" type="BigDecimal"> <set from-field="quantityShortfall" field="inputMap.quantity"/> <else> <set from-field="parameters.quantity" field="inputMap.quantity"/> @@ -366,7 +366,7 @@ </condition-list> </entity-condition> <iterate entry-name="requirement" list-name="requirements"> - <calculate field-name="existingRequirementTotal" type="Double"> + <calculate field-name="existingRequirementTotal" type="BigDecimal"> <calcop operator="add" field-name="existingRequirementTotal"> <calcop operator="get" field-name="requirement.quantity"/> </calcop> @@ -374,7 +374,7 @@ </iterate> <!-- Subtract the total quantity of existing requirements from the required quantity to determine if a new requirement needs to be created --> - <calculate field-name="newRequirementTotal" type="Double"> + <calculate field-name="newRequirementTotal" type="BigDecimal"> <calcop operator="subtract" field-name="inputMap.quantity"> <calcop operator="get" field-name="existingRequirementTotal"/> </calcop> @@ -437,13 +437,13 @@ </if-compare> <!-- No requirements are created if we are already under stock --> - <if-compare-field field="currentQuantity" to-field="productFacility.minimumStock" operator="less" type="Double"> + <if-compare-field field="currentQuantity" to-field="productFacility.minimumStock" operator="less" type="BigDecimal"> <clear-field field-name="inputMap"/> <set from-field="productFacility.productId" field="inputMap.productId"/> <if-not-empty field="productFacility.reorderQuantity"> - <set from-field="productFacility.reorderQuantity" field="inputMap.quantity" type="Double"/> + <set from-field="productFacility.reorderQuantity" field="inputMap.quantity" type="BigDecimal"/> <else> - <set value="0" field="inputMap.quantity" type="Double"/> + <set value="0" field="inputMap.quantity" type="BigDecimal"/> </else> </if-not-empty> @@ -452,8 +452,8 @@ <calcop operator="get" field-name="currentQuantity"/> </calcop> </calculate> - <if-compare-field field="inputMap.quantity" to-field="quantityShortfall" operator="less" type="Double"> - <set from-field="quantityShortfall" field="inputMap.quantity" type="Double"/> + <if-compare-field field="inputMap.quantity" to-field="quantityShortfall" operator="less" type="BigDecimal"> + <set from-field="quantityShortfall" field="inputMap.quantity" type="BigDecimal"/> </if-compare-field> <set value="PRODUCT_REQUIREMENT" field="inputMap.requirementTypeId"/> @@ -668,7 +668,7 @@ <set field="createOrderAdjContext.orderItemSeqId" value="_NA_"/> <set field="createOrderAdjContext.shipGroupSeqId" value="_NA_"/> <set field="createOrderAdjContext.description" value="Adjustment due to order change"/> - <set field="createOrderAdjContext.amount" from-field="orderAdjustmentTotalDifference" type="Double"/> + <set field="createOrderAdjContext.amount" from-field="orderAdjustmentTotalDifference" type="BigDecimal"/> <call-service service-name="createOrderAdjustment" in-map-name="createOrderAdjContext" include-user-login="true"/> <check-errors/> </if-compare> @@ -867,7 +867,7 @@ </simple-method> <simple-method method-name="checkOrderIsOnBackOrder" short-description="Check if an Order is on Back Order" login-required="false"> - <set field="zeroEnv" value="0" type="Double"/> + <set field="zeroEnv" value="0" type="BigDecimal"/> <entity-condition entity-name="OrderItemShipGrpInvRes" list-name="orderItemShipGrpInvResList"> <condition-list combine="and"> <condition-expr field-name="orderId" env-name="parameters.orderId"/> Modified: ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml Sun Nov 30 22:51:11 2008 @@ -86,9 +86,9 @@ </entity-and> <iterate list-name="shipmentReceipts" entry-name="receipt"> <if-empty field="totalsMap.${receipt.orderItemSeqId}"> - <set field="totalsMap.${receipt.orderItemSeqId}" value="0" type="Double"/> + <set field="totalsMap.${receipt.orderItemSeqId}" value="0" type="BigDecimal"/> </if-empty> - <calculate field-name="${receipt.orderItemSeqId}" map-name="totalsMap" type="Double"> + <calculate field-name="${receipt.orderItemSeqId}" map-name="totalsMap" type="BigDecimal"> <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"/> @@ -98,7 +98,7 @@ <set from-field="receipt.orderItemSeqId" field="newLookupMap.orderItemSeqId"/> <find-by-primary-key entity-name="OrderItem" map-name="newLookupMap" value-name="orderItem"/> <if-compare field="orderItem.statusId" operator="not-equals" value="ITEM_COMPLETED"> - <if-compare-field field="orderItem.quantity" to-field="totalsMap.${receipt.orderItemSeqId}" operator="less-equals" type="Double"> + <if-compare-field field="orderItem.quantity" to-field="totalsMap.${receipt.orderItemSeqId}" operator="less-equals" type="BigDecimal"> <!-- update the status for the item --> <set field="orderItem.statusId" value="ITEM_COMPLETED"/> <store-value value-name="orderItem"/> Modified: ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Sun Nov 30 22:51:11 2008 @@ -554,7 +554,7 @@ <set from-field="parameters.defaultQuoteUnitPrice" field="quoteItem.quoteUnitPrice"/> </if-not-empty> <!-- - <calculate field-name="quoteItem.quoteUnitPrice" type="Double"> + <calculate field-name="quoteItem.quoteUnitPrice" type="BigDecimal"> <calcop operator="multiply"> <calcop operator="get" field-name="parameters.averageCost"/> <calcop operator="get" field-name="parameters.costToPriceMult"/> @@ -627,7 +627,7 @@ <condition> <or> <if-empty field="quoteItem.quoteUnitPrice"/> - <if-compare field="quoteItem.quoteUnitPrice" value="0" operator="equals" type="Double"/> + <if-compare field="quoteItem.quoteUnitPrice" value="0" operator="equals" type="BigDecimal"/> </or> </condition> <then> Modified: ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Sun Nov 30 22:51:11 2008 @@ -158,7 +158,7 @@ <result-to-field field-name="quantityNotTransferred" result-name="quantityNotTransferred"/> </call-service> <check-errors/> - <if-compare field="quantityNotTransferred" value="0.0" operator="greater" type="Double"> + <if-compare field="quantityNotTransferred" value="0.0" operator="greater" type="BigDecimal"> <!-- we create a new requirement for the quantity not trasferred (because not available) --> <clear-field field-name="inputMap"/> <set-service-fields service-name="createRequirement" map-name="requirement" to-map-name="inputMap"/> Modified: ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Sun Nov 30 22:51:11 2008 @@ -147,7 +147,7 @@ <entity-one entity-name="ShoppingList" value-name="shoppingList"/> <entity-one entity-name="ShoppingListItem" value-name="shoppingListItem"/> - <if-compare field="parameters.quantity" operator="equals" value="0" type="Double"> + <if-compare field="parameters.quantity" operator="equals" value="0" type="BigDecimal"> <!-- if we're setting quantity to 0.0 then remove the item --> <set-service-fields service-name="removeShoppingListItem" map-name="parameters" to-map-name="removeParams"/> <call-service service-name="removeShoppingListItem" in-map-name="removeParams"/> @@ -215,7 +215,7 @@ <field-map field-name="shoppingListId" env-name="parameters.shoppingListId"/> </entity-and> - <set field="totalPrice" type="Double" value="0.0"/> + <set field="totalPrice" type="BigDecimal" value="0.0"/> <iterate entry-name="shoppingListItem" list-name="shoppingListItems"> <entity-one entity-name="Product" value-name="product" use-cache="true" auto-field-map="false"> <field-map field-name="productId" env-name="shoppingListItem.productId"/> @@ -337,7 +337,7 @@ <clear-field field-name="shoppingListParameters" /> <set field="shoppingListParameters.productId" from-field="compProductAssoc.productIdTo" /> <set field="shoppingListParameters.shoppingListId" from-field="shoppingListId" /> - <set field="shoppingListParameters.quantity" value="1" type="Double" /> + <set field="shoppingListParameters.quantity" value="1" type="BigDecimal" /> <call-service service-name="addDistinctShoppingListItem" in-map-name="shoppingListParameters" /> </iterate> <entity-one entity-name="Product" value-name="product" auto-field-map="false" > @@ -362,7 +362,7 @@ <clear-field field-name="shoppingListParameters" /> <set field="shoppingListParameters.productId" from-field="compProductAssoc.productIdTo" /> <set field="shoppingListParameters.shoppingListId" from-field="shoppingListId" /> - <set field="shoppingListParameters.quantity" value="1" type="Double" /> + <set field="shoppingListParameters.quantity" value="1" type="BigDecimal" /> <call-service service-name="addDistinctShoppingListItem" in-map-name="shoppingListParameters" /> </iterate> </if-not-empty> Modified: ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services.xml Sun Nov 30 22:51:11 2008 @@ -169,8 +169,8 @@ <attribute name="orderItemSeqId" type="String" mode="IN" optional="false"/> <attribute name="invoiceId" type="String" mode="IN" optional="false"/> <attribute name="invoiceItemSeqId" type="String" mode="IN" optional="false"/> - <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="itemIssuanceId" type="String" mode="IN" optional="true"/> <attribute name="shipmentReceiptId" type="String" mode="IN" optional="true"/> </service> @@ -203,7 +203,7 @@ <attribute name="orderAdjustmentId" type="String" mode="IN" optional="false"/> <attribute name="invoiceId" type="String" mode="IN" optional="false"/> <attribute name="invoiceItemSeqId" type="String" mode="IN" optional="false"/> - <attribute name="amount" type="Double" mode="IN" optional="true"/> + <attribute name="amount" type="BigDecimal" mode="IN" optional="true"/> </service> <service name="createPaymentFromPreference" engine="java" @@ -278,7 +278,7 @@ <attribute name="orderId" type="String" mode="IN" optional="false"/> <attribute name="orderItemSeqId" type="String" mode="IN" optional="true"/> <attribute name="shipGroupSeqId" type="String" mode="IN" optional="true"/> - <attribute name="cancelQuantity" type="Double" mode="IN" optional="true"/> + <attribute name="cancelQuantity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="itemReasonMap" type="Map" mode="IN" string-map-prefix="irm_" optional="true"/> <attribute name="itemCommentMap" type="Map" mode="IN" string-map-prefix="icm_" optional="true"/> </service> @@ -288,7 +288,7 @@ <attribute name="orderId" type="String" mode="IN" optional="false"/> <attribute name="orderItemSeqId" type="String" mode="IN" optional="true"/> <attribute name="shipGroupSeqId" type="String" mode="IN" optional="true"/> - <attribute name="cancelQuantity" type="Double" mode="IN" optional="true"/> + <attribute name="cancelQuantity" type="BigDecimal" mode="IN" optional="true"/> </service> <service name="updateOrderItems" engine="java" auth="true" @@ -312,8 +312,8 @@ <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="prodCatalogId" type="String" mode="IN" optional="true"/> <attribute name="basePrice" type="BigDecimal" mode="IN" optional="true"/> - <attribute name="quantity" type="Double" mode="IN" optional="false"/> - <attribute name="amount" type="Double" mode="IN" optional="true"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/> + <attribute name="amount" type="BigDecimal" mode="IN" optional="true"/> <attribute name="overridePrice" type="String" mode="IN" optional="true"/> <attribute name="reasonEnumId" type="String" mode="IN" optional="true"/> <attribute name="changeComments" type="String" mode="IN" optional="true"/> @@ -453,8 +453,8 @@ <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/> <attribute name="monthsToInclude" type="Integer" mode="IN" optional="true"/> <!-- if monthsToInclude specified along with fromDate/thruDate, will override fromDate/thruDate --> <attribute name="totalOrders" type="Long" mode="OUT" optional="false"/> - <attribute name="totalGrandAmount" type="Double" mode="OUT" optional="false"/> - <attribute name="totalSubRemainingAmount" type="Double" mode="OUT" optional="false"/> + <attribute name="totalGrandAmount" type="BigDecimal" mode="OUT" optional="false"/> + <attribute name="totalSubRemainingAmount" type="BigDecimal" mode="OUT" optional="false"/> </service> <service name="getOrderHeaderInformation" engine="java" validate="false" Modified: ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_cart.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_cart.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_cart.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_cart.xml Sun Nov 30 22:51:11 2008 @@ -31,7 +31,7 @@ <attribute name="fromGroupIndex" type="Integer" mode="IN" optional="false"/> <attribute name="toGroupIndex" type="Integer" mode="IN" optional="false"/> <attribute name="itemIndex" type="Integer" mode="IN" optional="false"/> - <attribute name="quantity" type="Double" mode="IN" optional="false"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/> <attribute name="clearEmptyGroups" type="Boolean" mode="IN" optional="true"/> </service> @@ -81,7 +81,7 @@ <description>Sets the ShoppingCart Payment Options</description> <attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/> <attribute name="paymentInfoId" type="String" mode="IN" optional="false"/> - <attribute name="amount" type="Double" mode="IN" optional="true"/> + <attribute name="amount" type="BigDecimal" mode="IN" optional="true"/> <attribute name="refNum" type="String" mode="IN" optional="true"/> </service> @@ -121,15 +121,15 @@ location="org.ofbiz.order.shoppingcart.ShoppingCartServices" invoke="getShoppingCartData"> <description>Get the ShoppingCart data</description> <attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/> - <attribute name="totalQuantity" type="Double" mode="OUT" optional="true"/> + <attribute name="totalQuantity" type="BigDecimal" mode="OUT" optional="true"/> <attribute name="currencyIsoCode" type="String" mode="OUT" optional="true"/> - <attribute name="subTotal" type="Double" mode="OUT" optional="true"/> + <attribute name="subTotal" type="BigDecimal" mode="OUT" optional="true"/> <attribute name="subTotalCurrencyFormatted" type="String" mode="OUT" optional="true"/> - <attribute name="totalShipping" type="Double" mode="OUT" optional="true"/> + <attribute name="totalShipping" type="BigDecimal" mode="OUT" optional="true"/> <attribute name="totalShippingCurrencyFormatted" type="String" mode="OUT" optional="true"/> - <attribute name="totalSalesTax" type="Double" mode="OUT" optional="true"/> + <attribute name="totalSalesTax" type="BigDecimal" mode="OUT" optional="true"/> <attribute name="totalSalesTaxCurrencyFormatted" type="String" mode="OUT" optional="true"/> - <attribute name="displayGrandTotal" type="Double" mode="OUT" optional="true"/> + <attribute name="displayGrandTotal" type="BigDecimal" mode="OUT" optional="true"/> <attribute name="displayGrandTotalCurrencyFormatted" type="String" mode="OUT" optional="true"/> <attribute name="cartItemData" type="Map" mode="OUT"/> <attribute name="displayOrderAdjustmentsTotalCurrencyFormatted" type="String" mode="OUT" optional="true"/> Modified: ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_quote.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_quote.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_quote.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_quote.xml Sun Nov 30 22:51:11 2008 @@ -149,10 +149,10 @@ location="org/ofbiz/order/quote/QuoteServices.xml" invoke="autoUpdateQuotePrice" auth="true"> <description>Update the QuoteItem price with the passed value (if present) or automatically from the averageCost</description> <auto-attributes include="pk" mode="IN" optional="false"/> - <attribute name="manualQuoteUnitPrice" type="Double" mode="IN" optional="true"/> - <attribute name="defaultQuoteUnitPrice" type="Double" mode="IN" optional="true"/> - <!--<attribute name="averageCost" type="Double" mode="IN" optional="true"/> - <attribute name="costToPriceMult" type="Double" mode="IN" optional="true"/>--> + <attribute name="manualQuoteUnitPrice" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="defaultQuoteUnitPrice" type="BigDecimal" mode="IN" optional="true"/> + <!--<attribute name="averageCost" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="costToPriceMult" type="BigDecimal" mode="IN" optional="true"/>--> </service> <service name="autoCreateQuoteAdjustments" engine="simple" auth="true" location="org/ofbiz/order/quote/QuoteServices.xml" invoke="autoCreateQuoteAdjustments"> Modified: ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_requirement.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_requirement.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_requirement.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_requirement.xml Sun Nov 30 22:51:11 2008 @@ -102,8 +102,8 @@ <attribute mode="IN" name="statusIds" type="List" optional="true"/> <!-- By default, this service looks for approved requirements. To override this, pass in a list of requirement statusIds to search. --> <attribute mode="OUT" name="requirementsForSupplier" type="java.util.List" optional="true"/> <attribute mode="OUT" name="distinctProductCount" type="Integer" optional="true"/> - <attribute mode="OUT" name="quantityTotal" type="Double" optional="true"/> - <attribute mode="OUT" name="amountTotal" type="Double" optional="true"/> + <attribute mode="OUT" name="quantityTotal" type="BigDecimal" optional="true"/> + <attribute mode="OUT" name="amountTotal" type="BigDecimal" optional="true"/> </service> <service name="createOrderRequirementCommitment" engine="simple" auth="true" location="org/ofbiz/order/order/OrderServices.xml" invoke="createOrderRequirementCommitment"> @@ -116,7 +116,7 @@ <attribute name="orderId" type="String" mode="IN" optional="false"/> <attribute name="orderItemSeqId" type="String" mode="IN" optional="false"/> <attribute name="productId" 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="requirementId" type="String" mode="OUT" optional="true"/> </service> <service name="checkCreateStockRequirementQoh" engine="simple" auth="true" default-entity-name="ItemIssuance" @@ -136,7 +136,7 @@ <attribute name="orderItemSeqId" type="String" mode="IN" optional="false"/> <attribute name="inventoryItemId" type="String" mode="IN" optional="true"/> <attribute name="productId" 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="requirementId" type="String" mode="OUT" optional="true"/> </service> <service name="createRequirementFromItemATP" engine="simple" auth="true" @@ -147,7 +147,7 @@ <attribute name="orderItemSeqId" type="String" mode="IN" optional="false"/> <attribute name="inventoryItemId" type="String" mode="IN" optional="true"/> <attribute name="productId" 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="requirementId" type="String" mode="OUT" optional="true"/> </service> @@ -162,7 +162,7 @@ location="org.ofbiz.manufacturing.jobshopmgt.ProductionRunServices" invoke="approveRequirement" auth="true"> <description>Approves a requirement.</description> <attribute mode="IN" name="requirementId" optional="false" type="String"/> - <attribute mode="IN" name="quantity" optional="true" type="Double"/> + <attribute mode="IN" name="quantity" optional="true" type="BigDecimal"/> </service> <service name="autoAssignRequirementToSupplier" engine="simple" auth="true" @@ -176,7 +176,7 @@ <description>Create the inventory transfers required to fulfill the requirement.</description> <attribute mode="IN" name="requirementId" optional="false" type="String"/> <attribute mode="IN" name="fromFacilityId" optional="false" type="String"/> - <attribute mode="IN" name="quantity" optional="true" type="Double"/> + <attribute mode="IN" name="quantity" optional="true" type="BigDecimal"/> </service> <service name="createAutoRequirementsForOrder" engine="java" Modified: ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_return.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_return.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_return.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_return.xml Sun Nov 30 22:51:11 2008 @@ -131,8 +131,8 @@ invoke="updateReturnAdjustment"> <description></description> <implements service="returnAdjustmentInterface"/> - <attribute name="originalReturnPrice" type="Double" mode="IN" optional="true"/> - <attribute name="originalReturnQuantity" type="Double" mode="IN" optional="true"/> + <attribute name="originalReturnPrice" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="originalReturnQuantity" type="BigDecimal" mode="IN" optional="true"/> <override name="returnAdjustmentId" optional="false"/> </service> <service name="removeReturnAdjustment" engine="simple" location="org/ofbiz/order/order/OrderReturnServices.xml" @@ -184,7 +184,7 @@ <description>Gets the item's initial cost based on the inventory item record associated with the order item or 0.00 if none found.</description> <attribute name="returnId" type="String" mode="IN" optional="false"/> <attribute name="returnItemSeqId" type="String" mode="IN" optional="false"/> - <attribute name="initialItemCost" type="Double" mode="OUT" optional="false"/> + <attribute name="initialItemCost" type="BigDecimal" mode="OUT" optional="false"/> </service> <service name="checkReturnComplete" engine="java" @@ -260,8 +260,8 @@ location="org.ofbiz.order.order.OrderReturnServices" invoke="getReturnableQuantity"> <description>Get the quantity allowed for an item to be returned</description> <attribute name="orderItem" type="GenericValue" mode="IN" optional="false"/> - <attribute name="returnableQuantity" type="Double" mode="OUT" optional="false"/> - <attribute name="returnablePrice" type="Double" mode="OUT" optional="false"/> + <attribute name="returnableQuantity" type="BigDecimal" mode="OUT" optional="false"/> + <attribute name="returnablePrice" type="BigDecimal" mode="OUT" optional="false"/> </service> <service name="getReturnableItems" engine="java" location="org.ofbiz.order.order.OrderReturnServices" invoke="getReturnableItems"> @@ -285,7 +285,7 @@ location="org.ofbiz.order.order.OrderReturnServices" invoke="refundBillingAccountPayment" auth="true"> <description>Refunds A Billing Account Payment</description> <attribute name="orderPaymentPreference" type="GenericValue" mode="IN" optional="false"/> - <attribute name="refundAmount" type="Double" mode="IN" optional="false"/> + <attribute name="refundAmount" type="BigDecimal" mode="IN" optional="false"/> <attribute name="paymentId" type="String" mode="OUT" optional="false"/> </service> Modified: ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_shoppinglist.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_shoppinglist.xml?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_shoppinglist.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/order/servicedef/services_shoppinglist.xml Sun Nov 30 22:51:11 2008 @@ -58,10 +58,10 @@ <attribute name="partyId" type="String" mode="IN" optional="true"/> <attribute name="productStoreId" type="String" mode="IN" optional="true"/> <attribute name="productStoreGroupId" 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="currencyUomId" type="String" mode="IN" optional="true"/> <attribute name="autoUserLogin" type="GenericValue" mode="IN" optional="true"/> - <attribute name="totalPrice" type="Double" mode="OUT" optional="false"/> + <attribute name="totalPrice" type="BigDecimal" mode="OUT" optional="false"/> </service> <service name="runShoppingListAutoReorder" engine="java" auth="true" use-transaction="false" @@ -100,11 +100,11 @@ <description>Interface of shopping list items</description> <attribute name="shoppingListId" type="String" mode="IN" optional="false"/> <attribute name="productId" 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="reservStart" type="Timestamp" mode="IN" optional="true"/> - <attribute name="reservLength" type="Double" mode="IN" optional="true"/> - <attribute name="reservPersons" type="Double" mode="IN" optional="true"/> - <attribute name="quantityPurchased" type="Double" mode="IN" optional="true"/> + <attribute name="reservLength" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="reservPersons" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="quantityPurchased" type="BigDecimal" mode="IN" optional="true"/> <attribute name="configId" type="String" mode="IN" optional="true"/> </service> <service name="createShoppingListItem" engine="simple" auth="true" Modified: ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/OrderManagerEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/OrderManagerEvents.java?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/OrderManagerEvents.java (original) +++ ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/OrderManagerEvents.java Sun Nov 30 22:51:11 2008 @@ -18,6 +18,7 @@ */ package org.ofbiz.order; +import java.math.BigDecimal; import java.text.NumberFormat; import java.util.Iterator; import java.util.LinkedList; @@ -141,9 +142,9 @@ return "error"; } - Double grandTotal = new Double(0.00); + BigDecimal grandTotal = BigDecimal.ZERO; if (orderHeader != null) { - grandTotal = orderHeader.getDouble("grandTotal"); + grandTotal = orderHeader.getBigDecimal("grandTotal"); } // get the payment types to receive @@ -182,21 +183,21 @@ String amountStr = request.getParameter(paymentMethodTypeId + "_amount"); String paymentReference = request.getParameter(paymentMethodTypeId + "_reference"); if (!UtilValidate.isEmpty(amountStr)) { - double paymentTypeAmount = 0.00; + BigDecimal paymentTypeAmount = BigDecimal.ZERO; try { - paymentTypeAmount = NumberFormat.getNumberInstance(locale).parse(amountStr).doubleValue(); + paymentTypeAmount = new BigDecimal(NumberFormat.getNumberInstance(locale).parse(amountStr).doubleValue()); } catch (java.text.ParseException pe) { request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resource_error,"OrderProblemsPaymentParsingAmount", locale)); return "error"; } - if (paymentTypeAmount > 0.00) { + if (paymentTypeAmount.compareTo(BigDecimal.ZERO) > 0) { // create the OrderPaymentPreference // TODO: this should be done with a service Map prefFields = UtilMisc.toMap("orderPaymentPreferenceId", delegator.getNextSeqId("OrderPaymentPreference")); GenericValue paymentPreference = delegator.makeValue("OrderPaymentPreference", prefFields); paymentPreference.set("paymentMethodTypeId", paymentMethodType.getString("paymentMethodTypeId")); - paymentPreference.set("maxAmount", new Double(paymentTypeAmount)); + paymentPreference.set("maxAmount", paymentTypeAmount); paymentPreference.set("statusId", "PAYMENT_RECEIVED"); paymentPreference.set("orderId", orderId); paymentPreference.set("createdDate", UtilDateTime.nowTimestamp()); @@ -236,7 +237,7 @@ // get the current payment prefs GenericValue offlineValue = null; List currentPrefs = null; - double paymentTally = 0.00; + BigDecimal paymentTally = BigDecimal.ZERO; try { EntityConditionList<EntityExpr> ecl = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId), @@ -254,9 +255,9 @@ if ("EXT_OFFLINE".equals(paymentMethodType)) { offlineValue = cp; } else { - Double cpAmt = cp.getDouble("maxAmount"); + BigDecimal cpAmt = cp.getBigDecimal("maxAmount"); if (cpAmt != null) { - paymentTally += cpAmt.doubleValue(); + paymentTally = paymentTally.add(cpAmt); } } } @@ -264,7 +265,7 @@ // now finish up boolean okayToApprove = false; - if (paymentTally >= grandTotal.doubleValue()) { + if (paymentTally.compareTo(grandTotal) >= 0) { // cancel the offline preference okayToApprove = true; if (offlineValue != null) { Modified: ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java (original) +++ ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java Sun Nov 30 22:51:11 2008 @@ -84,7 +84,7 @@ if ((transactions != null) && (transactions.size() == 1)) { GenericValue firstEntry = (GenericValue) transactions.get(0); if (firstEntry.get(fieldName) != null) { - BigDecimal valueToAdd = new BigDecimal(firstEntry.getDouble(fieldName).doubleValue()); + BigDecimal valueToAdd = firstEntry.getBigDecimal(fieldName); return initialValue.add(valueToAdd).setScale(decimals, rounding); } else { return initialValue; Modified: ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java?rev=721986&r1=721985&r2=721986&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java (original) +++ ofbiz/branches/typecheckcleanup200810/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java Sun Nov 30 22:51:11 2008 @@ -456,11 +456,11 @@ paramList.add("hasBackOrders=" + hasBackOrders); if ("Y".equals(hasBackOrders)) { conditions.add(EntityCondition.makeCondition("quantityNotAvailable", EntityOperator.NOT_EQUAL, null)); - conditions.add(EntityCondition.makeCondition("quantityNotAvailable", EntityOperator.GREATER_THAN, new Double(0))); + conditions.add(EntityCondition.makeCondition("quantityNotAvailable", EntityOperator.GREATER_THAN, BigDecimal.ZERO)); } else if ("N".equals(hasBackOrders)) { List orExpr = FastList.newInstance(); orExpr.add(EntityCondition.makeCondition("quantityNotAvailable", EntityOperator.EQUALS, null)); - orExpr.add(EntityCondition.makeCondition("quantityNotAvailable", EntityOperator.EQUALS, new Double(0))); + orExpr.add(EntityCondition.makeCondition("quantityNotAvailable", EntityOperator.EQUALS, BigDecimal.ZERO)); conditions.add(EntityCondition.makeCondition(orExpr, EntityOperator.OR)); } } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |