svn commit: r731346 [1/3] - in /ofbiz/branches/typecheckclean
Locked
svn commit: r731346 [1/3] - in /ofbiz/branches/typecheckclean
 
|
Author: lektran
Date: Sun Jan 4 11:46:24 2009 New Revision: 731346 URL: http://svn.apache.org/viewvc?rev=731346&view=rev Log: Some more double -> BigDecimal conversions Modified: ofbiz/branches/typecheckcleanup200810/applications/accounting/widget/ReportFinancialSummaryForms.xml ofbiz/branches/typecheckcleanup200810/applications/content/script/org/ofbiz/content/content/ContentServices.xml ofbiz/branches/typecheckcleanup200810/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/forum/forumPaging.ftl ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/makebogodata.jsp ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl ofbiz/branches/typecheckcleanup200810/applications/ecommerce/widget/CustomerScreens.xml ofbiz/branches/typecheckcleanup200810/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomMapProcs.xml ofbiz/branches/typecheckcleanup200810/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml ofbiz/branches/typecheckcleanup200810/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_bom.xml ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_calendar.xml ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_formula.xml ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_mrp.xml ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_production_run.xml ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_routing.xml ofbiz/branches/typecheckcleanup200810/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java ofbiz/branches/typecheckcleanup200810/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java ofbiz/branches/typecheckcleanup200810/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java ofbiz/branches/typecheckcleanup200810/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java ofbiz/branches/typecheckcleanup200810/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java ofbiz/branches/typecheckcleanup200810/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java ofbiz/branches/typecheckcleanup200810/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java ofbiz/branches/typecheckcleanup200810/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/InventoryEventPlannedServices.java ofbiz/branches/typecheckcleanup200810/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java ofbiz/branches/typecheckcleanup200810/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java ofbiz/branches/typecheckcleanup200810/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java ofbiz/branches/typecheckcleanup200810/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/bom/BomSimulation.groovy ofbiz/branches/typecheckcleanup200810/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy ofbiz/branches/typecheckcleanup200810/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.groovy ofbiz/branches/typecheckcleanup200810/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy ofbiz/branches/typecheckcleanup200810/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy ofbiz/branches/typecheckcleanup200810/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy ofbiz/branches/typecheckcleanup200810/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.groovy ofbiz/branches/typecheckcleanup200810/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml ofbiz/branches/typecheckcleanup200810/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl ofbiz/branches/typecheckcleanup200810/applications/manufacturing/widget/manufacturing/CuttingListReport.groovy ofbiz/branches/typecheckcleanup200810/applications/party/data/ScheduledJobs.xml ofbiz/branches/typecheckcleanup200810/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml ofbiz/branches/typecheckcleanup200810/applications/party/servicedef/services.xml ofbiz/branches/typecheckcleanup200810/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java Modified: ofbiz/branches/typecheckcleanup200810/applications/accounting/widget/ReportFinancialSummaryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/accounting/widget/ReportFinancialSummaryForms.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/accounting/widget/ReportFinancialSummaryForms.xml Sun Jan 4 11:46:24 2009 @@ -83,8 +83,8 @@ <set field="showCredit" value="${bsh:(postedBalance >= 0 && org.ofbiz.accounting.util.UtilAccounting.isCreditAccount(glAccount)) || (postedBalance < 0 && org.ofbiz.accounting.util.UtilAccounting.isDebitAccount(glAccount))}" type="Boolean"/> <set field="absolutePostedBalance" value="${bsh:(postedBalance.abs())}" type="BigDecimal"/> <set field="showTotals" value="${bsh:(isLastRow != null && isLastRow==true)}" type="Boolean"/> - <set field="debitTotal" from-field="parameters.debitTotal" type="Double"/> - <set field="creditTotal" from-field="parameters.creditTotal" type="Double"/> + <set field="debitTotal" from-field="parameters.debitTotal" type="BigDecimal"/> + <set field="creditTotal" from-field="parameters.creditTotal" type="BigDecimal"/> <set field="parameters.debitTotal" value="${bsh:(showDebit? (debitTotal.add(absolutePostedBalance)): (debitTotal))}" type="BigDecimal"/> <set field="parameters.creditTotal" value="${bsh:(showCredit? (creditTotal.add(absolutePostedBalance)): (creditTotal))}" type="BigDecimal"/> </row-actions> Modified: ofbiz/branches/typecheckcleanup200810/applications/content/script/org/ofbiz/content/content/ContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/content/script/org/ofbiz/content/content/ContentServices.xml Sun Jan 4 11:46:24 2009 @@ -982,18 +982,15 @@ <log level="info" message="textDataLen:${textDataLen}"/> <property-to-field resource="forum" property="descriptLen" field-name="descriptLen" /> <log level="info" message="descriptLen:${descriptLen}"/> - <set field="dblTextDataLen" from-field="textDataLen" type="Double"/> - <set field="dblDescriptLen" from-field="descriptLen" type="Double"/> <call-class-method method-name="min" class-name="java.lang.Math" ret-field-name="subStringLen"> - <field field-name="dblTextDataLen" type="double"/> - <field field-name="dblDescriptLen" type="double"/> + <field field-name="textDataLen" type="int"/> + <field field-name="descriptLen" type="int"/> </call-class-method> - <set field="intSubStringLen" from-field="subStringLen" type="Integer"/> <log level="info" message="subStringLen:${subStringLen}"/> <set field="zeroValue" value="0" type="Integer"/> <call-object-method method-name="substring" obj-field-name="parameters.textData" ret-field-name="subDescript"> <field field-name="zeroValue" type="int"/> - <field field-name="intSubStringLen" type="int"/> + <field field-name="subStringLen" type="int"/> </call-object-method> <log level="info" message="subDescript:${subDescript}"/> <if-compare operator="equals" field="contentAssocTypeId" value="PUBLISH_LINK"> Modified: ofbiz/branches/typecheckcleanup200810/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Sun Jan 4 11:46:24 2009 @@ -1112,18 +1112,18 @@ <call-bsh><![CDATA[ Map shipCost = org.ofbiz.order.shoppingcart.shipping.ShippingEvents.getShipGroupEstimate(dispatcher, delegator, shoppingCart, 0); - Double shippingTotal = (Double) shipCost.get("shippingTotal"); + shippingTotal = shipCost.get("shippingTotal"); if (shippingTotal == null) { - shippingTotal = new Double(0.00); + shippingTotal = 0.00; } - shoppingCart.setItemShipGroupEstimate(shippingTotal.doubleValue(), 0); - parameters.put("shippingTotal", org.ofbiz.base.util.UtilFormatOut.formatCurrency(shippingTotal.doubleValue(), isoCode, locale)); + shoppingCart.setItemShipGroupEstimate(shippingTotal, 0); + parameters.put("shippingTotal", org.ofbiz.base.util.UtilFormatOut.formatCurrency(shippingTotal, isoCode, locale)); checkOutHelper = new org.ofbiz.order.shoppingcart.CheckOutHelper(dispatcher, delegator, shoppingCart); // Calculate and add the tax adjustments checkOutHelper.calcAndAddTax(); - double salesTax = shoppingCart.getTotalSalesTax(); + salesTax = shoppingCart.getTotalSalesTax(); totalSalesTax = org.ofbiz.base.util.UtilFormatOut.formatCurrency(salesTax, isoCode, locale); parameters.put("totalSalesTax", totalSalesTax); Modified: ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy (original) +++ ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy Sun Jan 4 11:46:24 2009 @@ -103,7 +103,7 @@ context.localOrderReadHelper = orh; context.orderShippingTotal = cart.getTotalShipping(); context.orderTaxTotal = cart.getTotalSalesTax(); -context.orderGrandTotal = new Double(cart.getGrandTotal()); +context.orderGrandTotal = cart.getGrandTotal(); // nuke the event messages request.removeAttribute("_EVENT_MESSAGE_"); Modified: ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (original) +++ ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl Sun Jan 4 11:46:24 2009 @@ -233,13 +233,13 @@ <#if totalPrice?exists> <div>${uiLabelMap.ProductAggregatedPrice}: <span id='totalPrice' class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div> <#else> - <#if price.competitivePrice?exists && price.price?exists && price.price?double < price.competitivePrice?double> + <#if price.competitivePrice?exists && price.price?exists && price.price < price.competitivePrice> <div>${uiLabelMap.ProductCompareAtPrice}: <span class='basePrice'><@ofbizCurrency amount=price.competitivePrice isoCode=price.currencyUsed/></span></div> </#if> - <#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double> + <#if price.listPrice?exists && price.price?exists && price.price < price.listPrice> <div>${uiLabelMap.ProductListPrice}: <span class='basePrice'><@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/></span></div> </#if> - <#if price.listPrice?exists && price.defaultPrice?exists && price.price?exists && price.price?double < price.defaultPrice?double && price.defaultPrice?double < price.listPrice?double> + <#if price.listPrice?exists && price.defaultPrice?exists && price.price?exists && price.price < price.defaultPrice && price.defaultPrice < price.listPrice> <div>${uiLabelMap.ProductRegularPrice}: <span class='basePrice'><@ofbizCurrency amount=price.defaultPrice isoCode=price.currencyUsed/></span></div> </#if> <div> @@ -253,15 +253,15 @@ ${uiLabelMap.OrderYourPrice}: <#if "Y" = product.isVirtual?if_exists> from </#if><span class='${priceStyle}'><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span> </b> </div> - <#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double> - <#assign priceSaved = price.listPrice?double - price.price?double> - <#assign percentSaved = (priceSaved?double / price.listPrice?double) * 100> + <#if price.listPrice?exists && price.price?exists && price.price < price.listPrice> + <#assign priceSaved = price.listPrice - price.price> + <#assign percentSaved = (priceSaved / price.listPrice) * 100> <div>${uiLabelMap.OrderSave}: <span class="basePrice"><@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)</span></div> </#if> </#if> <#-- Included quantities/pieces --> - <#if product.quantityIncluded?exists && product.quantityIncluded?double != 0> + <#if product.quantityIncluded?exists && product.quantityIncluded != 0> <div>${uiLabelMap.OrderIncludes}: ${product.quantityIncluded?if_exists} ${product.quantityUomId?if_exists} @@ -610,7 +610,7 @@ <tr> <td colspan="2"> <div>${uiLabelMap.OrderCustomerReviews}:</div> - <#if averageRating?exists && (averageRating?double > 0) && numRatings?exists && (numRatings?double > 1)> + <#if averageRating?exists && (averageRating > 0) && numRatings?exists && (numRatings > 1)> <div>${uiLabelMap.OrderAverageRating}: ${averageRating} <#if numRatings?exists>(${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</#if></div> </#if> </td> Modified: ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original) +++ ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Sun Jan 4 11:46:24 2009 @@ -315,13 +315,13 @@ - if price < defaultPrice and defaultPrice < listPrice, show default - if isSale show price with salePrice style and print "On Sale!" --> - <#if price.competitivePrice?exists && price.price?exists && price.price?double < price.competitivePrice?double> + <#if price.competitivePrice?exists && price.price?exists && price.price < price.competitivePrice> <div>${uiLabelMap.ProductCompareAtPrice}: <span class="basePrice"><@ofbizCurrency amount=price.competitivePrice isoCode=price.currencyUsed/></span></div> </#if> - <#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double> + <#if price.listPrice?exists && price.price?exists && price.price < price.listPrice> <div>${uiLabelMap.ProductListPrice}: <span class="basePrice"><@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/></span></div> </#if> - <#if price.listPrice?exists && price.defaultPrice?exists && price.price?exists && price.price?double < price.defaultPrice?double && price.defaultPrice?double < price.listPrice?double> + <#if price.listPrice?exists && price.defaultPrice?exists && price.price?exists && price.price < price.defaultPrice && price.defaultPrice < price.listPrice> <div>${uiLabelMap.ProductRegularPrice}: <span class="basePrice"><@ofbizCurrency amount=price.defaultPrice isoCode=price.currencyUsed/></span></div> </#if> <#if price.specialPromoPrice?exists> @@ -343,9 +343,9 @@ </#if> </b> </div> - <#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double> - <#assign priceSaved = price.listPrice?double - price.price?double> - <#assign percentSaved = (priceSaved?double / price.listPrice?double) * 100> + <#if price.listPrice?exists && price.price?exists && price.price < price.listPrice> + <#assign priceSaved = price.listPrice - price.price> + <#assign percentSaved = (priceSaved / price.listPrice) * 100> <div>${uiLabelMap.OrderSave}: <span class="basePrice"><@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)</span></div> </#if> <#-- show price details ("showPriceDetails" field can be set in the screen definition) --> @@ -363,32 +363,32 @@ ${uiLabelMap.OrderPieces}: ${product.piecesIncluded} </div> </#if> - <#if (product.quantityIncluded?exists && product.quantityIncluded?double != 0) || product.quantityUomId?has_content> + <#if (product.quantityIncluded?exists && product.quantityIncluded != 0) || product.quantityUomId?has_content> <#assign quantityUom = product.getRelatedOneCache("QuantityUom")?if_exists/> <div> ${uiLabelMap.CommonQuantity}: ${product.quantityIncluded?if_exists} ${((quantityUom.abbreviation)?default(product.quantityUomId))?if_exists} </div> </#if> - <#if (product.weight?exists && product.weight?double != 0) || product.weightUomId?has_content> + <#if (product.weight?exists && product.weight != 0) || product.weightUomId?has_content> <#assign weightUom = product.getRelatedOneCache("WeightUom")?if_exists/> <div> ${uiLabelMap.CommonWeight}: ${product.weight?if_exists} ${((weightUom.abbreviation)?default(product.weightUomId))?if_exists} </div> </#if> - <#if (product.productHeight?exists && product.productHeight?double != 0) || product.heightUomId?has_content> + <#if (product.productHeight?exists && product.productHeight != 0) || product.heightUomId?has_content> <#assign heightUom = product.getRelatedOneCache("HeightUom")?if_exists/> <div> ${uiLabelMap.CommonHeight}: ${product.productHeight?if_exists} ${((heightUom.abbreviation)?default(product.heightUomId))?if_exists} </div> </#if> - <#if (product.productWidth?exists && product.productWidth?double != 0) || product.widthUomId?has_content> + <#if (product.productWidth?exists && product.productWidth != 0) || product.widthUomId?has_content> <#assign widthUom = product.getRelatedOneCache("WidthUom")?if_exists/> <div> ${uiLabelMap.CommonWidth}: ${product.productWidth?if_exists} ${((widthUom.abbreviation)?default(product.widthUomId))?if_exists} </div> </#if> - <#if (product.productDepth?exists && product.productDepth?double != 0) || product.depthUomId?has_content> + <#if (product.productDepth?exists && product.productDepth != 0) || product.depthUomId?has_content> <#assign depthUom = product.getRelatedOneCache("DepthUom")?if_exists/> <div> ${uiLabelMap.CommonDepth}: ${product.productDepth?if_exists} ${((depthUom.abbreviation)?default(product.depthUomId))?if_exists} @@ -474,7 +474,7 @@ <#else> <input type="hidden" name="product_id" value="${product.productId}"/> <input type="hidden" name="add_product_id" value="${product.productId}"/> - <#assign isStoreInventoryNotAvailable = !(Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryAvailable(request, product, 1.0?double))> + <#assign isStoreInventoryNotAvailable = !(Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryAvailable(request, product, 1.0))> <#assign isStoreInventoryRequired = Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequired(request, product)> <#if isStoreInventoryNotAvailable> <#if isStoreInventoryRequired> @@ -618,7 +618,7 @@ <#-- Product Reviews --> <div id="reviews"> <div>${uiLabelMap.OrderCustomerReviews}:</div> - <#if averageRating?exists && (averageRating?double > 0) && numRatings?exists && (numRatings?double > 1)> + <#if averageRating?exists && (averageRating > 0) && numRatings?exists && (numRatings > 1)> <div>${uiLabelMap.OrderAverageRating}: ${averageRating} <#if numRatings?exists>(${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</#if></div> </#if> <tr><td colspan="2"><hr/></td></tr> Modified: ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/forum/forumPaging.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/forum/forumPaging.ftl?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/forum/forumPaging.ftl (original) +++ ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/forum/forumPaging.ftl Sun Jan 4 11:46:24 2009 @@ -25,8 +25,8 @@ <#assign listSize = forumMessages?size/> <#if highIndex gt listSize><#assign highIndex = listSize></#if> <div class="product-prevnext"> - <#assign r = listSize?double / viewSize?double /> - <#assign viewIndexMax = Static["java.lang.Math"].ceil(r?double)> + <#assign r = listSize / viewSize /> + <#assign viewIndexMax = Static["java.lang.Math"].ceil(r)> <select name="pageSelect" class="selectBox" onchange="window.location=this[this.selectedIndex].value;"> <option value="#">${uiLabelMap.CommonPage} ${viewIndex?int+1} ${uiLabelMap.CommonOf} ${viewIndexMax}</option> <#list 1..viewIndexMax as curViewNum> Modified: ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/makebogodata.jsp URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/makebogodata.jsp?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/makebogodata.jsp (original) +++ ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/makebogodata.jsp Sun Jan 4 11:46:24 2009 @@ -22,6 +22,7 @@ <%@ page import="org.ofbiz.entity.*" %> <%@ page import="org.ofbiz.base.util.*" %> <%@ page import="java.util.*" %> +<%@ page import="java.math.BigDecimal" %> <jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator" scope="request" /> @@ -59,7 +60,7 @@ int wordNum = (int)(Math.random()*(longWordBag.length-1)); longDesc += (" " + longWordBag[wordNum]); } - Double price = new Double(2.99 + prod); + BigDecimal price = new BigDecimal("2.99").add(BigDecimal.valueOf(prod)); GenericValue product = delegator.create("Product", UtilMisc.toMap("productId", "" + (cat*100 + prod), "primaryProductCategoryId", "" + (cat), "productName", "Product " + "" + (cat*100 + prod), "description", desc, "longDescription", longDesc, "defaultPrice", price)); KeywordIndex.indexKeywords(product); delegator.create("ProductCategoryMember", UtilMisc.toMap("productId", "" + (cat*100 + prod), "productCategoryId", "" + (cat))); Modified: ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl (original) +++ ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl Sun Jan 4 11:46:24 2009 @@ -168,7 +168,7 @@ <td> <span class="tabletext"> - <b>${uiLabelMap.OrderBillUpTo}:</b> <input type="text" size="5" class="inputBox" name="amount_${paymentMethod.paymentMethodId}" value="<#if (cart.getPaymentAmount(paymentMethod.paymentMethodId)?default(0) > 0)>${cart.getPaymentAmount(paymentMethod.paymentMethodId)?double?string("##0.00")}</#if>"> + <b>${uiLabelMap.OrderBillUpTo}:</b> <input type="text" size="5" class="inputBox" name="amount_${paymentMethod.paymentMethodId}" value="<#if (cart.getPaymentAmount(paymentMethod.paymentMethodId)?default(0) > 0)>${cart.getPaymentAmount(paymentMethod.paymentMethodId)?string("##0.00")}</#if>"> </span> </td> </tr> @@ -191,7 +191,7 @@ <td> <span class="tabletext"> - <b>${uiLabelMap.OrderBillUpTo}:</b> <input type="text" size="5" class="inputBox" name="amount_${paymentMethod.paymentMethodId}" value="<#if (cart.getPaymentAmount(paymentMethod.paymentMethodId)?default(0) > 0)>${cart.getPaymentAmount(paymentMethod.paymentMethodId)?double?string("##0.00")}</#if>"> + <b>${uiLabelMap.OrderBillUpTo}:</b> <input type="text" size="5" class="inputBox" name="amount_${paymentMethod.paymentMethodId}" value="<#if (cart.getPaymentAmount(paymentMethod.paymentMethodId)?default(0) > 0)>${cart.getPaymentAmount(paymentMethod.paymentMethodId)?string("##0.00")}</#if>"> </span> </td> </tr> @@ -226,8 +226,8 @@ <select name="billingAccountId"> <option value=""></option> <#list billingAccountList as billingAccount> - <#assign availableAmount = billingAccount.accountBalance?double> - <#assign accountLimit = billingAccount.accountLimit?double> + <#assign availableAmount = billingAccount.accountBalance> + <#assign accountLimit = billingAccount.accountLimit> <option value="${billingAccount.billingAccountId}" <#if billingAccount.billingAccountId == selectedBillingAccountId?default("")>selected</#if>>${billingAccount.description?default("")} [${billingAccount.billingAccountId}] Available: <@ofbizCurrency amount=availableAmount isoCode=billingAccount.accountCurrencyUomId/> Limit: <@ofbizCurrency amount=accountLimit isoCode=billingAccount.accountCurrencyUomId/></option> </#list> </select> Modified: ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl (original) +++ ofbiz/branches/typecheckcleanup200810/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl Sun Jan 4 11:46:24 2009 @@ -91,23 +91,23 @@ <#if product.piecesIncluded?exists && product.piecesIncluded?long != 0> [${uiLabelMap.OrderPieces}: ${product.piecesIncluded}] </#if> - <#if (product.quantityIncluded?exists && product.quantityIncluded?double != 0) || product.quantityUomId?has_content> + <#if (product.quantityIncluded?exists && product.quantityIncluded != 0) || product.quantityUomId?has_content> <#assign quantityUom = product.getRelatedOneCache("QuantityUom")?if_exists/> [${uiLabelMap.CommonQuantity}: ${product.quantityIncluded?if_exists} ${((quantityUom.abbreviation)?default(product.quantityUomId))?if_exists}] </#if> - <#if (product.weight?exists && product.weight?double != 0) || product.weightUomId?has_content> + <#if (product.weight?exists && product.weight != 0) || product.weightUomId?has_content> <#assign weightUom = product.getRelatedOneCache("WeightUom")?if_exists/> [${uiLabelMap.CommonWeight}: ${product.weight?if_exists} ${((weightUom.abbreviation)?default(product.weightUomId))?if_exists}] </#if> - <#if (product.productHeight?exists && product.productHeight?double != 0) || product.heightUomId?has_content> + <#if (product.productHeight?exists && product.productHeight != 0) || product.heightUomId?has_content> <#assign heightUom = product.getRelatedOneCache("HeightUom")?if_exists/> [${uiLabelMap.CommonHeight}: ${product.productHeight?if_exists} ${((heightUom.abbreviation)?default(product.heightUomId))?if_exists}] </#if> - <#if (product.productWidth?exists && product.productWidth?double != 0) || product.widthUomId?has_content> + <#if (product.productWidth?exists && product.productWidth != 0) || product.widthUomId?has_content> <#assign widthUom = product.getRelatedOneCache("WidthUom")?if_exists/> [${uiLabelMap.CommonWidth}: ${product.productWidth?if_exists} ${((widthUom.abbreviation)?default(product.widthUomId))?if_exists}] </#if> - <#if (product.productDepth?exists && product.productDepth?double != 0) || product.depthUomId?has_content> + <#if (product.productDepth?exists && product.productDepth != 0) || product.depthUomId?has_content> <#assign depthUom = product.getRelatedOneCache("DepthUom")?if_exists/> [${uiLabelMap.CommonDepth}: ${product.productDepth?if_exists} ${((depthUom.abbreviation)?default(product.depthUomId))?if_exists}] </#if> Modified: ofbiz/branches/typecheckcleanup200810/applications/ecommerce/widget/CustomerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/ecommerce/widget/CustomerScreens.xml?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/ecommerce/widget/CustomerScreens.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/ecommerce/widget/CustomerScreens.xml Sun Jan 4 11:46:24 2009 @@ -351,7 +351,7 @@ <actions> <set field="titleProperty" value="PageTitleDigitalProductEdit"/> - <set field="parameters.minimumOrderQuantity" value="1" type="Double"/> + <set field="parameters.minimumOrderQuantity" value="1" type="BigDecimal"/> <entity-one entity-name="SupplierProduct" value-name="supplierProduct" auto-field-map="false"> <field-map field-name="partyId" env-name="userLogin.partyId"/><!-- get from userLogin for security reasons --> <field-map field-name="productId" env-name="parameters.productId"/> Modified: ofbiz/branches/typecheckcleanup200810/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomMapProcs.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomMapProcs.xml?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomMapProcs.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomMapProcs.xml Sun Jan 4 11:46:24 2009 @@ -50,12 +50,12 @@ </convert> </process> <process field="quantity"> - <convert type="Double"> + <convert type="BigDecimal"> <fail-property resource="ManufacturingUiLabels" property="ManufacturingQuantityBadFormat"/> </convert> </process> <process field="scrapFactor"> - <convert type="Double"> + <convert type="BigDecimal"> <fail-property resource="ManufacturingUiLabels" property="ManufacturingScrapFactorBadFormat"/> </convert> </process> Modified: ofbiz/branches/typecheckcleanup200810/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml Sun Jan 4 11:46:24 2009 @@ -58,7 +58,7 @@ <simple-method method-name="issueProductionRunTaskComponent" short-description="Issues the Inventory for a Production Run Task Component" login-required="false"> <if-empty field="parameters.fromDate"> <set from-field="parameters.productId" field="productId"/> - <set from-field="parameters.quantity" field="estimatedQuantity" default-value="0.0" type="Double"/> + <set from-field="parameters.quantity" field="estimatedQuantity" default-value="0.0" type="BigDecimal"/> <else> <entity-one entity-name="WorkEffortGoodStandard" value-name="workEffortGoodStandard" auto-field-map="false"> <field-map field-name="workEffortId" env-name="parameters.workEffortId"/> @@ -70,7 +70,7 @@ <if-empty field="parameters.quantity"> <set from-field="workEffortGoodStandard.estimatedQuantity" field="estimatedQuantity"/> <else> - <set from-field="parameters.quantity" field="estimatedQuantity" default-value="0.0" type="Double"/> + <set from-field="parameters.quantity" field="estimatedQuantity" default-value="0.0" type="BigDecimal"/> </else> </if-empty> </else> @@ -132,13 +132,13 @@ <condition> <and> <if-compare field="parameters.failIfItemsAreNotAvailable" operator="not-equals" value="Y" type="String"/> - <if-compare field="parameters.quantityNotIssued" operator="greater" value="0" type="Double"/> + <if-compare field="parameters.quantityNotIssued" operator="greater" value="0" type="BigDecimal"/> </and> </condition> <then> <set field="parameters.useReservedItems" value="Y"/> <iterate entry-name="inventoryItem" list-name="inventoryItemList"> - <if-compare field="parameters.quantityNotIssued" operator="greater" value="0" type="Double"> + <if-compare field="parameters.quantityNotIssued" operator="greater" value="0" type="BigDecimal"> <refresh-value value-name="inventoryItem"/> <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names --> <call-simple-method method-name="issueProductionRunTaskComponentInline"/> @@ -148,7 +148,7 @@ </if> <!-- if quantityNotIssued is not 0, then pull it from the last non-serialized inventory item found, in the quantityNotIssued field --> - <if-compare field="parameters.quantityNotIssued" operator="not-equals" value="0" type="Double"> + <if-compare field="parameters.quantityNotIssued" operator="not-equals" value="0" type="BigDecimal"> <if> <condition> <or> @@ -174,10 +174,10 @@ <!-- instead of updating InventoryItem, add an InventoryItemDetail --> <set from-field="lastNonSerInventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/> <set from-field="parameters.workEffortId" field="createDetailMap.workEffortId"/> - <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double"> + <calculate field-name="createDetailMap.availableToPromiseDiff" type="BigDecimal"> <calcop field-name="parameters.quantityNotIssued" operator="negative"/> </calculate> - <calculate field-name="createDetailMap.quantityOnHandDiff" type="Double"> + <calculate field-name="createDetailMap.quantityOnHandDiff" type="BigDecimal"> <calcop field-name="parameters.quantityNotIssued" operator="negative"/> </calculate> <set field="createDetailMap.reasonEnumId" from-field="parameters.reasonEnumId"/> @@ -207,10 +207,10 @@ <!-- also create a detail record with the quantities --> <set field="createDetailMap.inventoryItemId" from-field="createInvItemOutMap.inventoryItemId"/> <set field="createDetailMap.workEffortId" from-field="parameters.workEffortId"/> - <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double"> + <calculate field-name="createDetailMap.availableToPromiseDiff" type="BigDecimal"> <calcop field-name="parameters.quantityNotIssued" operator="negative"/> </calculate> - <calculate field-name="createDetailMap.quantityOnHandDiff" type="Double"> + <calculate field-name="createDetailMap.quantityOnHandDiff" type="BigDecimal"> <calcop field-name="parameters.quantityNotIssued" operator="negative"/> </calculate> <set field="createDetailMap.reasonEnumId" from-field="parameters.reasonEnumId"/> @@ -234,7 +234,7 @@ </calcop> </calculate> </iterate> - <if-compare-field field="workEffortGoodStandard.estimatedQuantity" to-field="totalIssuance" operator="less-equals" type="Double"> + <if-compare-field field="workEffortGoodStandard.estimatedQuantity" to-field="totalIssuance" operator="less-equals" type="BigDecimal"> <set value="WEGS_COMPLETED" field="workEffortGoodStandard.statusId"/> <store-value value-name="workEffortGoodStandard"/> </if-compare-field> @@ -243,7 +243,7 @@ </simple-method> <simple-method method-name="issueProductionRunTaskComponentInline" short-description="Does a issuance for one InventoryItem, meant to be called in-line"> <!-- only do something with this inventoryItem if there is more inventory to issue --> - <if-compare field="parameters.quantityNotIssued" operator="greater" value="0" type="Double"> + <if-compare field="parameters.quantityNotIssued" operator="greater" value="0" type="BigDecimal"> <if-compare value="SERIALIZED_INV_ITEM" operator="equals" field="inventoryItem.inventoryItemTypeId"> <if-compare value="INV_AVAILABLE" operator="equals" field="inventoryItem.statusId"> <!-- change status on inventoryItem --> @@ -282,8 +282,8 @@ <if-not-empty field="inventoryItemQuantity"> <!-- reduce atp on inventoryItem if availableToPromise greater than 0, if not the code at the end of this method will handle it --> - <if-compare field="inventoryItemQuantity" operator="greater" value="0" type="Double"> - <if-compare-field field="parameters.quantityNotIssued" to-field="inventoryItemQuantity" operator="greater" type="Double"> + <if-compare field="inventoryItemQuantity" operator="greater" value="0" type="BigDecimal"> + <if-compare-field field="parameters.quantityNotIssued" to-field="inventoryItemQuantity" operator="greater" type="BigDecimal"> <set from-field="inventoryItemQuantity" field="parameters.deductAmount"/> <else> <set from-field="parameters.quantityNotIssued" field="parameters.deductAmount"/> @@ -301,10 +301,10 @@ <set from-field="inventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/> <set from-field="parameters.workEffortId" field="createDetailMap.workEffortId"/> <!-- update availableToPromiseDiff AND quantityOnHandDiff since this is an issuance --> - <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double"> + <calculate field-name="createDetailMap.availableToPromiseDiff" type="BigDecimal"> <calcop field-name="parameters.deductAmount" operator="negative"/> </calculate> - <calculate field-name="createDetailMap.quantityOnHandDiff" type="Double"> + <calculate field-name="createDetailMap.quantityOnHandDiff" type="BigDecimal"> <calcop field-name="parameters.deductAmount" operator="negative"/> </calculate> <set field="createDetailMap.reasonEnumId" from-field="parameters.reasonEnumId"/> @@ -354,7 +354,7 @@ <and> <if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM"/> <not><if-empty field="inventoryItem.availableToPromiseTotal"/></not> - <if-compare field="inventoryItem.availableToPromiseTotal" operator="greater" value="0" type="Double"/> + <if-compare field="inventoryItem.availableToPromiseTotal" operator="greater" value="0" type="BigDecimal"/> </and> </condition> <then> @@ -362,7 +362,7 @@ <condition> <or> <if-empty field="parameters.quantity"/> - <if-compare-field field="parameters.quantity" to-field="inventoryItem.availableToPromiseTotal" operator="greater" type="Double"/> + <if-compare-field field="parameters.quantity" to-field="inventoryItem.availableToPromiseTotal" operator="greater" type="BigDecimal"/> </or> </condition> <then> @@ -383,10 +383,10 @@ <set from-field="inventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/> <set from-field="parameters.workEffortId" field="createDetailMap.workEffortId"/> <!-- update availableToPromiseDiff AND quantityOnHandDiff since this is an issuance --> - <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double"> + <calculate field-name="createDetailMap.availableToPromiseDiff" type="BigDecimal"> <calcop field-name="deductAmount" operator="negative"/> </calculate> - <calculate field-name="createDetailMap.quantityOnHandDiff" type="Double"> + <calculate field-name="createDetailMap.quantityOnHandDiff" type="BigDecimal"> <calcop field-name="deductAmount" operator="negative"/> </calculate> <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/> Modified: ofbiz/branches/typecheckcleanup200810/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunSimpleEvents.xml Sun Jan 4 11:46:24 2009 @@ -47,13 +47,13 @@ </process> <process field="estimatedSetupMillis"> <copy/> - <convert type="Double"> + <convert type="BigDecimal"> <fail-property resource="ManufacturingUiLabels" property="ManufacturingProductionRunQuantityNotCorrect"/> </convert> </process> <process field="estimatedMilliSeconds"> <copy/> - <convert type="Double"> + <convert type="BigDecimal"> <fail-property resource="ManufacturingUiLabels" property="ManufacturingProductionRunQuantityNotCorrect"/> </convert> </process> @@ -85,13 +85,13 @@ </process> <process field="estimatedSetupMillis"> <copy/> - <convert type="Double"> + <convert type="BigDecimal"> <fail-property resource="ManufacturingUiLabels" property="ManufacturingProductionRunQuantityNotCorrect"/> </convert> </process> <process field="estimatedMilliSeconds"> <copy/> - <convert type="Double"> + <convert type="BigDecimal"> <fail-property resource="ManufacturingUiLabels" property="ManufacturingProductionRunQuantityNotCorrect"/> </convert> </process> @@ -137,13 +137,13 @@ </process> <process field="estimatedSetupMillis"> <copy/> - <convert type="Double"> + <convert type="BigDecimal"> <fail-property resource="ManufacturingUiLabels" property="ManufacturingProductionRunQuantityNotCorrect"/> </convert> </process> <process field="estimatedMilliSeconds"> <copy/> - <convert type="Double"> + <convert type="BigDecimal"> <fail-property resource="ManufacturingUiLabels" property="ManufacturingProductionRunQuantityNotCorrect"/> </convert> </process> Modified: ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_bom.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_bom.xml?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_bom.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_bom.xml Sun Jan 4 11:46:24 2009 @@ -110,8 +110,8 @@ <attribute mode="IN" name="type" optional="true" type="Integer"/> <attribute mode="IN" name="fromDate" optional="true" type="String"/> <attribute mode="IN" name="bomType" optional="false" type="String"/> - <attribute mode="IN" name="quantity" optional="true" type="Double"/> - <attribute mode="IN" name="amount" optional="true" type="Double"/> + <attribute mode="IN" name="quantity" optional="true" type="BigDecimal"/> + <attribute mode="IN" name="amount" optional="true" type="BigDecimal"/> <attribute mode="OUT" name="tree" optional="true" type="org.ofbiz.manufacturing.bom.BOMTree"/> </service> @@ -119,8 +119,8 @@ location="org.ofbiz.manufacturing.bom.BOMServices" invoke="getManufacturingComponents"> <description>Returns the product's routing id and the components of a given product (if necessary, running the configurator).</description> <attribute mode="IN" name="productId" optional="false" type="String"/> - <attribute mode="IN" name="quantity" optional="true" type="Double"/> - <attribute mode="IN" name="amount" optional="true" type="Double"/> + <attribute mode="IN" name="quantity" optional="true" type="BigDecimal"/> + <attribute mode="IN" name="amount" optional="true" type="BigDecimal"/> <attribute mode="IN" name="fromDate" optional="true" type="String"/> <attribute mode="IN" name="excludeWIPs" optional="true" type="Boolean"/> <attribute mode="OUT" name="workEffortId" optional="true" type="String"/> @@ -132,7 +132,7 @@ location="org.ofbiz.manufacturing.bom.BOMServices" invoke="getProductsInPackages"> <description>Returns the components (that needs to be packaged) of a given product (if necessary, running the configurator).</description> <attribute mode="IN" name="productId" optional="false" type="String"/> - <attribute mode="IN" name="quantity" optional="true" type="Double"/> + <attribute mode="IN" name="quantity" optional="true" type="BigDecimal"/> <attribute mode="IN" name="fromDate" optional="true" type="String"/> <attribute mode="OUT" name="productsInPackages" optional="false" type="java.util.List"/> </service> @@ -140,8 +140,8 @@ location="org.ofbiz.manufacturing.bom.BOMServices" invoke="getNotAssembledComponents" auth="true"> <description>Explodes a product id and returns all the components that are not manufactured on customer order: these components will be taken from warehouse.</description> <attribute mode="IN" name="productId" optional="false" type="String"/> - <attribute mode="IN" name="quantity" optional="true" type="Double"/> - <attribute mode="IN" name="amount" optional="true" type="Double"/> + <attribute mode="IN" name="quantity" optional="true" type="BigDecimal"/> + <attribute mode="IN" name="amount" optional="true" type="BigDecimal"/> <attribute mode="IN" name="fromDate" optional="true" type="String"/> <attribute mode="OUT" name="notAssembledComponents" type="java.util.List"/> </service> Modified: ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_calendar.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_calendar.xml?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_calendar.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_calendar.xml Sun Jan 4 11:46:24 2009 @@ -50,19 +50,19 @@ <attribute name="calendarWeekId" type="String" mode="IN" optional="false"/> <attribute name="description" type="String" mode="IN" optional="true"/> <attribute name="mondayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="mondayCapacity" type="Double" mode="IN" optional="true"/> + <attribute name="mondayCapacity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="tuesdayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="tuesdayCapacity" type="Double" mode="IN" optional="true"/> + <attribute name="tuesdayCapacity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="wednesdayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="wednesdayCapacity" type="Double" mode="IN" optional="true"/> + <attribute name="wednesdayCapacity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="thursdayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="thursdayCapacity" type="Double" mode="IN" optional="true"/> + <attribute name="thursdayCapacity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="fridayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="fridayCapacity" type="Double" mode="IN" optional="true"/> + <attribute name="fridayCapacity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="saturdayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="saturdayCapacity" type="Double" mode="IN" optional="true"/> + <attribute name="saturdayCapacity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="sundayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="sundayCapacity" type="Double" mode="IN" optional="true"/> + <attribute name="sundayCapacity" type="BigDecimal" mode="IN" optional="true"/> </service> <service name="updateCalendarWeek" engine="simple" location="org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="updateCalendarWeek"> @@ -70,19 +70,19 @@ <attribute name="calendarWeekId" type="String" mode="IN" optional="false"/> <attribute name="description" type="String" mode="IN" optional="true"/> <attribute name="mondayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="mondayCapacity" type="Double" mode="IN" optional="true"/> + <attribute name="mondayCapacity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="tuesdayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="tuesdayCapacity" type="Double" mode="IN" optional="true"/> + <attribute name="tuesdayCapacity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="wednesdayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="wednesdayCapacity" type="Double" mode="IN" optional="true"/> + <attribute name="wednesdayCapacity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="thursdayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="thursdayCapacity" type="Double" mode="IN" optional="true"/> + <attribute name="thursdayCapacity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="fridayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="fridayCapacity" type="Double" mode="IN" optional="true"/> + <attribute name="fridayCapacity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="saturdayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="saturdayCapacity" type="Double" mode="IN" optional="true"/> + <attribute name="saturdayCapacity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="sundayStartTime" type="java.sql.Time" mode="IN" optional="true"/> - <attribute name="sundayCapacity" type="Double" mode="IN" optional="true"/> + <attribute name="sundayCapacity" type="BigDecimal" mode="IN" optional="true"/> </service> <service name="removeCalendarWeek" engine="simple" location="org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="removeCalendarWeek"> @@ -96,7 +96,7 @@ <attribute name="calendarId" type="String" mode="IN" optional="false"/> <attribute name="description" type="String" mode="IN" optional="true"/> <attribute name="exceptionDateStartTime" type="java.sql.Timestamp" mode="IN" optional="false"/> - <attribute name="exceptionCapacity" type="Double" mode="IN" optional="true"/> + <attribute name="exceptionCapacity" type="BigDecimal" mode="IN" optional="true"/> </service> <service name="updateCalendarExceptionDay" engine="simple" location="org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="updateCalendarExceptionDay"> @@ -104,7 +104,7 @@ <attribute name="calendarId" type="String" mode="IN" optional="false"/> <attribute name="description" type="String" mode="IN" optional="true"/> <attribute name="exceptionDateStartTime" type="java.sql.Timestamp" mode="IN" optional="false"/> - <attribute name="exceptionCapacity" type="Double" mode="IN" optional="true"/> + <attribute name="exceptionCapacity" type="BigDecimal" mode="IN" optional="true"/> </service> <service name="removeCalendarExceptionDay" engine="simple" location="org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="removeCalendarExceptionDay"> Modified: ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_formula.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_formula.xml?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_formula.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_formula.xml Sun Jan 4 11:46:24 2009 @@ -27,7 +27,7 @@ <!-- BOM Formulas --> <service name="interfaceBomFormula" engine="interface" location="" invoke=""> <attribute mode="IN" name="arguments" optional="false" type="java.util.Map"/> - <attribute mode="OUT" name="quantity" optional="false" type="Double"/> + <attribute mode="OUT" name="quantity" optional="false" type="BigDecimal"/> </service> <service name="exampleComponentFormula" engine="simple" auth="true" location="org/ofbiz/manufacturing/bom/BomFormulas.xml" invoke="exampleComponentFormula"> @@ -42,7 +42,7 @@ <!-- Task Formulas --> <service name="interfaceTaskFormula" engine="interface" location="" invoke="" auth="false"> <attribute mode="IN" name="arguments" optional="false" type="java.util.Map"/> - <attribute mode="OUT" name="totalTime" optional="false" type="Double"/> + <attribute mode="OUT" name="totalTime" optional="false" type="BigDecimal"/> </service> <service name="exampleTaskFormula" engine="simple" auth="false" location="org/ofbiz/manufacturing/techdata/TaskFormulae.xml" invoke="exampleTaskFormula"> Modified: ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_mrp.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_mrp.xml?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_mrp.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_mrp.xml Sun Jan 4 11:46:24 2009 @@ -48,7 +48,7 @@ location="org.ofbiz.manufacturing.mrp.MrpServices" invoke="findProductMrpQoh" auth="true"> <description>Find the quantity on hand of products for the MRP</description> <attribute name="productId" type="String" mode="IN" optional="false"/> - <attribute name="quantityOnHandTotal" type="Double" mode="OUT" optional="false"/> + <attribute name="quantityOnHandTotal" type="BigDecimal" mode="OUT" optional="false"/> </service> <service name="createMrpEvent" engine="java" location="org.ofbiz.manufacturing.mrp.InventoryEventPlannedServices" invoke="createMrpEvent" auth="false"> @@ -57,7 +57,7 @@ <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="eventDate" type="Timestamp" mode="IN" optional="false"/> <attribute name="mrpEventTypeId" 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="facilityId" type="String" mode="IN" optional="true"/> <attribute name="eventName" type="String" mode="IN" optional="true"/> </service> Modified: ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_production_run.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_production_run.xml?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_production_run.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_production_run.xml Sun Jan 4 11:46:24 2009 @@ -29,7 +29,7 @@ location="org.ofbiz.manufacturing.jobshopmgt.ProductionRunServices" invoke="createProductionRunsForProductBom" auth="true"> <description>Explodes a product id and creates all the needed production runs.</description> <attribute name="productId" type="String" mode="IN" optional="false"/> - <attribute name="quantity" optional="true" mode="IN" type="Double"/> + <attribute name="quantity" optional="true" mode="IN" type="BigDecimal"/> <attribute name="startDate" type="java.sql.Timestamp" mode="IN" optional="false"/> <attribute name="facilityId" type="String" mode="IN" optional="false"/> <attribute name="routingId" type="String" mode="IN" optional="true"/> @@ -43,7 +43,7 @@ location="org.ofbiz.manufacturing.jobshopmgt.ProductionRunServices" invoke="createProductionRun" auth="true"> <description>Create a Production Run</description> <attribute name="productId" type="String" mode="IN" optional="false"/> - <attribute name="pRQuantity" type="Double" mode="IN" optional="false"/> + <attribute name="pRQuantity" type="BigDecimal" mode="IN" optional="false"/> <attribute name="startDate" type="java.sql.Timestamp" mode="IN" optional="false"/> <attribute name="facilityId" type="String" mode="IN" optional="false"/> <attribute name="routingId" type="String" mode="IN" optional="true"/> @@ -56,7 +56,7 @@ location="org.ofbiz.manufacturing.jobshopmgt.ProductionRunServices" invoke="updateProductionRun" auth="true"> <description>Update a Production Run</description> <attribute name="productionRunId" 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="estimatedStartDate" type="Timestamp" mode="IN" optional="true"/> <attribute name="workEffortName" type="String" mode="IN" optional="true"/> <attribute name="description" type="String" mode="IN" optional="true"/> @@ -85,8 +85,8 @@ <attribute name="productionRunId" type="String" mode="IN" optional="false"/> <attribute name="routingTaskId" type="String" mode="INOUT" optional="false"/> <attribute name="priority" type="Long" mode="IN" optional="false"/> - <attribute name="estimatedSetupMillis" type="Double" mode="IN" optional="true"/> - <attribute name="estimatedMilliSeconds" type="Double" mode="IN" optional="true"/> + <attribute name="estimatedSetupMillis" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="estimatedMilliSeconds" type="BigDecimal" mode="IN" optional="true"/> <attribute name="workEffortName" type="String" mode="IN" optional="true"/> <attribute name="description" type="String" mode="IN" optional="true"/> <attribute name="estimatedStartDate" type="Timestamp" mode="INOUT" optional="true"/> @@ -99,8 +99,8 @@ <attribute name="routingTaskId" type="String" mode="IN" optional="false"/> <attribute name="priority" type="Long" mode="IN"/> <attribute name="estimatedStartDate" type="Timestamp" mode="IN"/> - <attribute name="estimatedSetupMillis" type="Double" mode="IN"/> - <attribute name="estimatedMilliSeconds" type="Double" mode="IN"/> + <attribute name="estimatedSetupMillis" type="BigDecimal" mode="IN"/> + <attribute name="estimatedMilliSeconds" type="BigDecimal" mode="IN"/> </service> <!-- TODO: NOT STILL IMPLEMENTED ('deleteWorkEffort' is called directly) --> <service name="deleteProductionRunRoutingTask" engine="java" @@ -114,7 +114,7 @@ <description>add a Product Component to an existing ProductionRun</description> <attribute name="productionRunId" type="String" mode="IN" optional="false"/> <attribute name="productId" type="String" mode="IN" optional="false"/> - <attribute name="estimatedQuantity" type="Double" mode="IN"/> + <attribute name="estimatedQuantity" type="BigDecimal" mode="IN"/> <attribute name="workEffortId" type="String" mode="IN" optional="true"/> </service> <service name="updateProductionRunComponent" engine="java" @@ -123,7 +123,7 @@ <attribute name="productionRunId" type="String" mode="IN" optional="false"/> <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="workEffortId" type="String" mode="IN" optional="true"/> - <attribute name="estimatedQuantity" type="Double" mode="IN" optional="true"/> + <attribute name="estimatedQuantity" type="BigDecimal" mode="IN" optional="true"/> </service> <!-- TODO: NOT STILL IMPLEMENTED ('removeWorkEffortGoodStandard' is called directly) --> <service name="deleteProductionRunComponent" engine="java" @@ -159,7 +159,7 @@ <attribute name="workEffortId" type="String" mode="IN" optional="false"/> <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/> - <attribute name="quantity" type="Double" mode="IN" optional="true"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="true"/> <attribute name="failIfItemsAreNotAvailable" type="String" mode="IN" optional="true"/> <attribute name="failIfItemsAreNotOnHand" type="String" mode="IN" optional="true"/> <attribute name="reserveOrderEnumId" type="String" mode="IN" optional="true"/> @@ -176,8 +176,8 @@ </description> <attribute name="workEffortId" type="String" mode="IN" optional="false"/> <attribute name="inventoryItem" type="GenericValue" mode="IN" optional="false"/> - <attribute name="quantity" type="Double" mode="IN" optional="true"/> - <attribute name="quantityIssued" type="Double" mode="OUT" optional="false"/> + <attribute name="quantity" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="quantityIssued" type="BigDecimal" mode="OUT" optional="false"/> <attribute name="finishedProductId" type="String" mode="OUT" optional="false"/> </service> <service name="productionRunProduce" engine="java" transaction-timeout="7200" @@ -187,7 +187,7 @@ </description> <attribute name="workEffortId" type="String" mode="IN" optional="false"/> <attribute name="inventoryItemIds" type="List" mode="OUT" optional="false"/> - <attribute name="quantity" type="Double" mode="INOUT" optional="true"/> + <attribute name="quantity" type="BigDecimal" mode="INOUT" optional="true"/> <attribute name="inventoryItemTypeId" type="String" mode="IN" optional="true"/> <attribute name="lotId" type="String" mode="IN" optional="true"/> <attribute name="createLotIfNeeded" type="Boolean" mode="IN" optional="true"/> @@ -200,7 +200,7 @@ </description> <attribute name="workEffortId" type="String" mode="IN" optional="false"/> <attribute name="inventoryItemIds" type="List" mode="OUT" optional="false"/> - <attribute name="quantity" type="Double" mode="INOUT" optional="false"/> + <attribute name="quantity" type="BigDecimal" mode="INOUT" optional="false"/> <attribute name="inventoryItemTypeId" type="String" mode="IN" optional="true"/> <attribute name="lotId" type="String" mode="IN" optional="true"/> <attribute name="createLotIfNeeded" type="Boolean" mode="IN" optional="true"/> @@ -214,9 +214,9 @@ </description> <attribute name="workEffortId" type="String" mode="IN" optional="false"/> <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="facilityId" type="String" mode="IN" optional="true"/> - <attribute name="unitCost" type="Double" mode="IN" optional="true"/> + <attribute name="unitCost" type="BigDecimal" mode="IN" optional="true"/> <attribute name="currencyUomId" type="String" mode="IN" optional="true"/> <attribute name="inventoryItemTypeId" type="String" mode="IN" optional="true"/> <attribute name="inventoryItemIds" type="List" mode="OUT" optional="false"/> @@ -228,7 +228,7 @@ </description> <attribute name="workEffortId" type="String" mode="IN" optional="false"/> <attribute name="productId" 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="inventoryItemTypeId" type="String" mode="IN" optional="true"/> </service> <service name="checkDecomposeInventoryItem" engine="java" @@ -238,7 +238,7 @@ It is intended to be called as seca when a marketing package is received into warehouse (e.g. from a return). </description> <attribute name="inventoryItemId" type="String" mode="IN" optional="false"/> - <!--<attribute name="quantityAccepted" type="Double" mode="IN" optional="true"/>--> + <!--<attribute name="quantityAccepted" type="BigDecimal" mode="IN" optional="true"/>--> </service> <service name="decomposeInventoryItem" engine="java" location="org.ofbiz.manufacturing.jobshopmgt.ProductionRunServices" invoke="decomposeInventoryItem" auth="true"> @@ -248,7 +248,7 @@ The components will be returned to inventory at ((Marketing Package Actual Inventory Unit Cost) / (Marketing Package Standard Cost)) * (Component Standard Cost) </description> <attribute name="inventoryItemId" 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="inventoryItemIds" type="List" mode="OUT" optional="false"/> </service> <service name="updateProductionRunTask" engine="java" @@ -261,10 +261,10 @@ <attribute name="partyId" type="String" mode="IN" optional="true"/> <attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/> <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/> - <attribute name="addQuantityProduced" type="Double" mode="IN" optional="true"/> - <attribute name="addQuantityRejected" type="Double" mode="IN" optional="true"/> - <attribute name="addSetupTime" type="Double" mode="IN" optional="true"/> - <attribute name="addTaskTime" type="Double" mode="IN" optional="true"/> + <attribute name="addQuantityProduced" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="addQuantityRejected" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="addSetupTime" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="addTaskTime" type="BigDecimal" mode="IN" optional="true"/> <attribute name="comments" type="String" mode="IN" optional="true"/> <attribute name="issueRequiredComponents" type="Boolean" mode="IN" optional="true"/> <attribute name="componentsLocationMap" mode="IN" type="Map" optional="true"/> @@ -301,14 +301,14 @@ <description>Given a productId and an optional date, returns the total qty of productId reserved by production runs</description> <attribute name="productId" type="String" mode="IN" optional="false"/> <attribute name="startDate" type="Timestamp" mode="IN" optional="true"/> - <attribute name="reservedQuantity" type="Double" mode="OUT" optional="false"/> + <attribute name="reservedQuantity" type="BigDecimal" mode="OUT" optional="false"/> </service> <service name="createProductionRunsForOrder" engine="java" location="org.ofbiz.manufacturing.jobshopmgt.ProductionRunServices" invoke="createProductionRunsForOrder" auth="true"> <description>Explodes a product id and creates all the needed production runs; if an order id is also provided, it links the production runs to the sales order.</description> <attribute mode="IN" name="orderId" optional="false" type="String"/> <attribute mode="IN" name="orderItemSeqId" optional="true" type="String"/> - <attribute mode="IN" name="quantity" optional="true" type="Double"/> + <attribute mode="IN" name="quantity" optional="true" type="BigDecimal"/> <attribute mode="IN" name="fromDate" optional="true" type="String"/> <attribute mode="IN" name="shipmentId" optional="true" type="String"/> <attribute mode="OUT" name="productionRuns" type="java.util.List"/> @@ -317,7 +317,7 @@ location="org.ofbiz.manufacturing.jobshopmgt.ProductionRunServices" invoke="createProductionRunFromRequirement" auth="true"> <description>Creates a production run from 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"/> <attribute mode="OUT" name="productionRunId" optional="true" type="String"/> </service> <service name="createProductionRunFromConfiguration" engine="java" @@ -326,7 +326,7 @@ <attribute mode="IN" name="facilityId" optional="false" type="String"/> <attribute mode="IN" name="configId" optional="true" type="String"/> <attribute mode="IN" name="config" optional="true" type="org.ofbiz.product.config.ProductConfigWrapper"/> - <attribute mode="IN" name="quantity" optional="true" type="Double"/> + <attribute mode="IN" name="quantity" optional="true" type="BigDecimal"/> <attribute mode="IN" name="orderId" optional="true" type="String"/> <attribute mode="IN" name="orderItemSeqId" optional="true" type="String"/> <attribute mode="OUT" name="productionRunId" optional="false" type="String"/> Modified: ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_routing.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_routing.xml?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_routing.xml (original) +++ ofbiz/branches/typecheckcleanup200810/applications/manufacturing/servicedef/services_routing.xml Sun Jan 4 11:46:24 2009 @@ -63,9 +63,9 @@ <attribute mode="IN" name="taskId" optional="false" type="String"/> <attribute mode="IN" name="productId" optional="true" type="String"/> <attribute mode="IN" name="routingId" optional="true" type="String"/> - <attribute mode="IN" name="quantity" optional="true" type="Double"/> + <attribute mode="IN" name="quantity" optional="true" type="BigDecimal"/> <attribute mode="OUT" name="estimatedTaskTime" type="Long" optional="false"/> - <attribute mode="OUT" name="setupTime" type="Double" optional="true"/> - <attribute mode="OUT" name="taskUnitTime" type="Double" optional="true"/> + <attribute mode="OUT" name="setupTime" type="BigDecimal" optional="true"/> + <attribute mode="OUT" name="taskUnitTime" type="BigDecimal" optional="true"/> </service> </services> Modified: ofbiz/branches/typecheckcleanup200810/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/typecheckcleanup200810/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java?rev=731346&r1=731345&r2=731346&view=diff ============================================================================== --- ofbiz/branches/typecheckcleanup200810/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java (original) +++ ofbiz/branches/typecheckcleanup200810/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java Sun Jan 4 11:46:24 2009 @@ -154,7 +154,7 @@ Debug.logError("Production Run for order item (" + orderItem.getString("orderId") + "/" + orderItem.getString("orderItemSeqId") + ") not created.", module); continue; } - Map result = dispatcher.runSync("createProductionRunsForOrder", UtilMisc.<String, Object>toMap("quantity", shipmentPlan.getDouble("quantity"), "orderId", shipmentPlan.getString("orderId"), "orderItemSeqId", shipmentPlan.getString("orderItemSeqId"), "shipmentId", shipmentId, "userLogin", userLogin)); + Map result = dispatcher.runSync("createProductionRunsForOrder", UtilMisc.<String, Object>toMap("quantity", shipmentPlan.getBigDecimal("quantity"), "orderId", shipmentPlan.getString("orderId"), "orderItemSeqId", shipmentPlan.getString("orderItemSeqId"), "shipmentId", shipmentId, "userLogin", userLogin)); } } catch (Exception e) { // if there is an exception for either, the other probably wont work |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |