details: http://code.openbravo.com/erp/devel/cyclone/rev/70a1a69445c2 changeset: 4597:70a1a69445c2 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Fri Aug 14 01:15:31 2009 +0200 summary: [NumberFormat] Fixes callout number replies
diffstat: src/org/openbravo/erpCommon/ad_callouts/SE_Expense_Amount.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SE_Expense_Product.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SL_Assets.java | 8 +- src/org/openbravo/erpCommon/ad_callouts/SL_BankDebt_Amount.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SL_BankStmt_Amount.java | 7 +- src/org/openbravo/erpCommon/ad_callouts/SL_CashJournal_Amounts.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Charge.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Conversion_Rate.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Amt.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Charge_Tax.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_JournalLineAmt.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SL_MachineCost.java | 28 ++++---- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java | 18 +++--- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Charge_Tax.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Payment_Amounts.java | 18 +++--- src/org/openbravo/erpCommon/ad_callouts/SL_ProductionPlan_WRPhase.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Amt.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SL_WRPhase_Sequence.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_WorkRequirement_Sequence.java | 3 +- 20 files changed, 69 insertions(+), 71 deletions(-) diffs (truncated from 472 to 300 lines): diff -r 5067857f7fcc -r 70a1a69445c2 src/org/openbravo/erpCommon/ad_callouts/SE_Expense_Amount.java --- a/src/org/openbravo/erpCommon/ad_callouts/SE_Expense_Amount.java Fri Aug 14 00:33:45 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Expense_Amount.java Fri Aug 14 01:15:31 2009 +0200 @@ -129,9 +129,9 @@ if (!strConvRateErrorMsg.equals("") && strConvRateErrorMsg != null) { resultado.append("new Array('MESSAGE', \"" + strConvRateErrorMsg + "\"), "); } - resultado.append("new Array(\"inpexpenseamt\", \"" + amount.toPlainString() + "\")"); - resultado.append(", new Array(\"inpconvertedamt\", \"" - + (convAmount.compareTo(BigDecimal.ZERO) == 0 ? "" : convAmount.toPlainString()) + "\")"); + resultado.append("new Array(\"inpexpenseamt\", " + amount.toPlainString() + ")"); + resultado.append(", new Array(\"inpconvertedamt\", " + + (convAmount.compareTo(BigDecimal.ZERO) == 0 ? "" : convAmount.toPlainString()) + ")"); resultado.append(");"); xmlDocument.setParameter("array", resultado.toString()); xmlDocument.setParameter("frameName", "appFrame"); diff -r 5067857f7fcc -r 70a1a69445c2 src/org/openbravo/erpCommon/ad_callouts/SE_Expense_Product.java --- a/src/org/openbravo/erpCommon/ad_callouts/SE_Expense_Product.java Fri Aug 14 00:33:45 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Expense_Product.java Fri Aug 14 01:15:31 2009 +0200 @@ -147,7 +147,7 @@ } if (amount.scale() > stdPrecision) amount = amount.setScale(stdPrecision, BigDecimal.ROUND_HALF_UP); - resultado.append(", new Array(\"inpexpenseamt\", \"" + amount.toPlainString() + "\")"); + resultado.append(", new Array(\"inpexpenseamt\", " + amount.toPlainString() + ")"); String c_Currency_To_ID = Utility.getContext(this, vars, "$C_Currency_ID", ""); // Checks if there is a conversion rate for each of the transactions of // the report @@ -180,8 +180,8 @@ } if (convAmount.scale() > stdPrecisionConv) convAmount = convAmount.setScale(stdPrecisionConv, BigDecimal.ROUND_HALF_UP); - resultado.append(", new Array(\"inpconvertedamt\", \"" - + (convAmount.compareTo(BigDecimal.ZERO) == 0 ? "" : convAmount.toPlainString()) + "\")"); + resultado.append(", new Array(\"inpconvertedamt\", " + + (convAmount.compareTo(BigDecimal.ZERO) == 0 ? "" : convAmount.toPlainString()) + ")"); } if (strChanged.equals("inpmProductId") && !cCurrencyID.equals("")) { resultado.append(", new Array(\"inpcCurrencyId\", \"" + cCurrencyID + "\")"); diff -r 5067857f7fcc -r 70a1a69445c2 src/org/openbravo/erpCommon/ad_callouts/SL_Assets.java --- a/src/org/openbravo/erpCommon/ad_callouts/SL_Assets.java Fri Aug 14 00:33:45 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Assets.java Fri Aug 14 01:15:31 2009 +0200 @@ -106,10 +106,10 @@ StringBuffer resultado = new StringBuffer(); resultado.append("var calloutName='SL_Assets';\n\n"); - resultado.append("var respuesta = new Array(new Array(\"inpassetvalueamt\",\"" - + fAssetvalue.toString() + "\"), new Array(\"inpresidualassetvalueamt\",\"" - + fResidualvalue.toString() + "\"), new Array(\"inpamortizationvalueamt\",\"" - + fAmortizationvalue.toString() + "\"));"); + resultado.append("var respuesta = new Array(new Array(\"inpassetvalueamt\"," + + fAssetvalue.toString() + "), new Array(\"inpresidualassetvalueamt\"," + + fResidualvalue.toString() + "), new Array(\"inpamortizationvalueamt\"," + + fAmortizationvalue.toString() + "));"); resultado.append("\n\n//" + strLastChanged); xmlDocument.setParameter("array", resultado.toString()); diff -r 5067857f7fcc -r 70a1a69445c2 src/org/openbravo/erpCommon/ad_callouts/SL_BankDebt_Amount.java --- a/src/org/openbravo/erpCommon/ad_callouts/SL_BankDebt_Amount.java Fri Aug 14 00:33:45 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_BankDebt_Amount.java Fri Aug 14 01:15:31 2009 +0200 @@ -93,10 +93,10 @@ resultado.append("var respuesta = new Array("); resultado.append("new Array(\"inpdescription\", \"" + FormatUtilities.replaceJS(strDescription) + "\"),"); - resultado.append("new Array(\"inptrxamt\", \"" + Amount + "\"),"); + resultado.append("new Array(\"inptrxamt\", " + Amount + "),"); resultado.append("new Array(\"inpcurrconv\", \"" + conv + "\"),"); - resultado.append("new Array(\"inpconvertchargeamt\", \"" + ConvChargeAmt + "\"),"); - resultado.append("new Array(\"inpstmtamt\", \"" + Amount + "\")"); + resultado.append("new Array(\"inpconvertchargeamt\", " + ConvChargeAmt + "),"); + resultado.append("new Array(\"inpstmtamt\", " + Amount + ")"); resultado.append(");"); xmlDocument.setParameter("array", resultado.toString()); diff -r 5067857f7fcc -r 70a1a69445c2 src/org/openbravo/erpCommon/ad_callouts/SL_BankStmt_Amount.java --- a/src/org/openbravo/erpCommon/ad_callouts/SL_BankStmt_Amount.java Fri Aug 14 00:33:45 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_BankStmt_Amount.java Fri Aug 14 01:15:31 2009 +0200 @@ -94,19 +94,18 @@ // ConvChgAmount = // StmAmount.subtract(TrxAmount).subtract(ChgAmount); ConvChgAmount = TrxAmount.subtract(ChgAmount).subtract(StmAmount); - resultado - .append("new Array(\"inpconvertchargeamt\", \"" + ConvChgAmount.toString() + "\")"); + resultado.append("new Array(\"inpconvertchargeamt\", " + ConvChgAmount.toString() + ")"); resultado.append(");"); } else { TrxAmount = StmAmount.subtract(ChgAmount); - resultado.append("new Array(\"inptrxamt\", \"" + TrxAmount.toString() + "\")"); + resultado.append("new Array(\"inptrxamt\", " + TrxAmount.toString() + ")"); resultado.append(");"); } } if (strChanged.equals("inpchargeamt") || (strChanged.equals("inpconvertchargeamt"))) { // StmAmount = TrxAmount.add(ChgAmount).add(ConvChgAmount); StmAmount = TrxAmount.subtract(ChgAmount).subtract(ConvChgAmount); - resultado.append("new Array(\"inpstmtamt\", \"" + StmAmount.toString() + "\")"); + resultado.append("new Array(\"inpstmtamt\", " + StmAmount.toString() + ")"); resultado.append(");"); } diff -r 5067857f7fcc -r 70a1a69445c2 src/org/openbravo/erpCommon/ad_callouts/SL_CashJournal_Amounts.java --- a/src/org/openbravo/erpCommon/ad_callouts/SL_CashJournal_Amounts.java Fri Aug 14 00:33:45 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_CashJournal_Amounts.java Fri Aug 14 01:15:31 2009 +0200 @@ -93,7 +93,7 @@ resultado.append("var respuesta = new Array("); resultado.append("new Array(\"inpdescription\", \"" + FormatUtilities.replaceJS(strDescription) + "\"),"); - resultado.append("new Array(\"inpamount\", \"" + amount + "\")"); + resultado.append("new Array(\"inpamount\", " + amount + ")"); resultado.append(");"); xmlDocument.setParameter("array", resultado.toString()); diff -r 5067857f7fcc -r 70a1a69445c2 src/org/openbravo/erpCommon/ad_callouts/SL_Charge.java --- a/src/org/openbravo/erpCommon/ad_callouts/SL_Charge.java Fri Aug 14 00:33:45 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Charge.java Fri Aug 14 01:15:31 2009 +0200 @@ -73,7 +73,7 @@ StringBuffer resultado = new StringBuffer(); resultado.append("var calloutName='SL_Charge';\n\n"); resultado.append("var respuesta = new Array("); - resultado.append("new Array(\"inpchargeamt\", \"" + chargeAmt + "\")\n"); + resultado.append("new Array(\"inpchargeamt\", " + chargeAmt + ")\n"); resultado.append(");"); xmlDocument.setParameter("array", resultado.toString()); diff -r 5067857f7fcc -r 70a1a69445c2 src/org/openbravo/erpCommon/ad_callouts/SL_Conversion_Rate.java --- a/src/org/openbravo/erpCommon/ad_callouts/SL_Conversion_Rate.java Fri Aug 14 00:33:45 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Conversion_Rate.java Fri Aug 14 01:15:31 2009 +0200 @@ -83,12 +83,12 @@ if (strChanged.equals("inpmultiplyrate")) { if (multiplyRate.compareTo(BigDecimal.ZERO) != 0) rate = one.divide(multiplyRate, 12, 4); - resultado.append("new Array(\"inpdividerate\", \"" + rate.toString() + "\")"); + resultado.append("new Array(\"inpdividerate\", " + rate.toString() + ")"); } else { if (divideRate.compareTo(BigDecimal.ZERO) != 0) rate = one.divide(divideRate, 12, 4); - resultado.append("new Array(\"inpmultiplyrate\", \"" + rate.toString() + "\")"); + resultado.append("new Array(\"inpmultiplyrate\", " + rate.toString() + ")"); } resultado.append(");"); xmlDocument.setParameter("array", resultado.toString()); diff -r 5067857f7fcc -r 70a1a69445c2 src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Amt.java --- a/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Amt.java Fri Aug 14 00:33:45 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Amt.java Fri Aug 14 01:15:31 2009 +0200 @@ -118,7 +118,7 @@ dataInvoice[0].cBpartnerId, priceActual.toString(), strProduct, dataInvoice[0].dateinvoiced, qtyInvoice.toString(), dataInvoice[0].mPricelistId, dataInvoice[0].id)); - resultado.append("new Array(\"inppricestd\", \"" + priceStd.toString() + "\"),"); + resultado.append("new Array(\"inppricestd\", " + priceStd.toString() + "),"); } // If quantity changes, recalculates unit price (actual price) applying @@ -147,8 +147,8 @@ + FormatUtilities.replaceJS(Utility.messageBD(this, "UnderLimitPrice", vars .getLanguage())) + "\"), "); } - resultado.append("new Array(\"inplinenetamt\", \"" + LineNetAmt.toString() + "\"),"); - resultado.append("new Array(\"inppriceactual\", \"" + priceActual.toString() + "\")"); + resultado.append("new Array(\"inplinenetamt\", " + LineNetAmt.toString() + "),"); + resultado.append("new Array(\"inppriceactual\", " + priceActual.toString() + ")"); resultado.append(");"); xmlDocument.setParameter("array", resultado.toString()); xmlDocument.setParameter("frameName", "appFrame"); diff -r 5067857f7fcc -r 70a1a69445c2 src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Charge_Tax.java --- a/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Charge_Tax.java Fri Aug 14 00:33:45 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Charge_Tax.java Fri Aug 14 01:15:31 2009 +0200 @@ -92,7 +92,7 @@ data[0].cProjectId, strIsSOTrx.equals("Y")); resultado.append("new Array(\"inpcTaxId\", \"" + strCTaxID + "\"),"); - resultado.append("new Array(\"inpchargeamt\", \"" + chargeAmt + "\")\n"); + resultado.append("new Array(\"inpchargeamt\", " + chargeAmt + ")\n"); resultado.append(");"); xmlDocument.setParameter("array", resultado.toString()); diff -r 5067857f7fcc -r 70a1a69445c2 src/org/openbravo/erpCommon/ad_callouts/SL_JournalLineAmt.java --- a/src/org/openbravo/erpCommon/ad_callouts/SL_JournalLineAmt.java Fri Aug 14 00:33:45 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_JournalLineAmt.java Fri Aug 14 01:15:31 2009 +0200 @@ -106,9 +106,9 @@ StringBuffer resultado = new StringBuffer(); resultado.append("var calloutName='SL_JournalLineAmt';\n\n"); resultado.append("var respuesta = new Array("); - resultado.append("new Array(\"inpamtacctdr\", \"" + AmtAcctDr.toString() + "\"),"); - resultado.append("new Array(\"inpamtacctcr\", \"" + AmtAcctCr.toString() + "\"),"); - resultado.append("new Array(\"inpcurrencyrate\", \"" + CurrencyRateValue.toString() + "\"),"); + resultado.append("new Array(\"inpamtacctdr\", " + AmtAcctDr.toString() + "),"); + resultado.append("new Array(\"inpamtacctcr\", " + AmtAcctCr.toString() + "),"); + resultado.append("new Array(\"inpcurrencyrate\", " + CurrencyRateValue.toString() + "),"); resultado.append("new Array(\"inpcurrencyratetype\", \"" + strCurrencyRateType + "\")"); resultado.append(");"); diff -r 5067857f7fcc -r 70a1a69445c2 src/org/openbravo/erpCommon/ad_callouts/SL_MachineCost.java --- a/src/org/openbravo/erpCommon/ad_callouts/SL_MachineCost.java Fri Aug 14 00:33:45 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_MachineCost.java Fri Aug 14 01:15:31 2009 +0200 @@ -49,11 +49,11 @@ log4j.debug("CHANGED: " + strChanged); String strPurchaseAmt = vars.getNumericParameter("inppurchaseamt"); String strToolsetAmt = vars.getNumericParameter("inptoolsetamt"); - String strYearValue = vars.getStringParameter("inpyearvalue"); + String strYearValue = vars.getNumericParameter("inpyearvalue"); String strAmortization = vars.getNumericParameter("inpamortization"); - String strDaysYear = vars.getStringParameter("inpdaysyear"); - String strDayHours = vars.getStringParameter("inpdayhours"); - String strImproductiveHoursYear = vars.getStringParameter("inpimproductivehoursyear"); + String strDaysYear = vars.getNumericParameter("inpdaysyear"); + String strDayHours = vars.getNumericParameter("inpdayhours"); + String strImproductiveHoursYear = vars.getNumericParameter("inpimproductivehoursyear"); String strCostUomYear = vars.getNumericParameter("inpcostuomyear"); String strCost = vars.getNumericParameter("inpcost"); String strCostUom = vars.getStringParameter("inpcostuom"); @@ -168,16 +168,16 @@ StringBuffer resultado = new StringBuffer(); resultado.append("var calloutName='SL_MachineCost';\n\n"); resultado.append("var respuesta = new Array("); - resultado.append("new Array(\"inppurchaseamt\", \"" + strPurchaseAmt + "\"),\n"); - resultado.append("new Array(\"inptoolsetamt\", \"" + strToolsetAmt + "\"),\n"); - resultado.append("new Array(\"inpyearvalue\", \"" + strYearValue + "\"),\n"); - resultado.append("new Array(\"inpamortization\", \"" + strAmortization + "\"), \n"); - resultado.append("new Array(\"inpdaysyear\", \"" + strDaysYear + "\"),\n"); - resultado.append("new Array(\"inpdayhours\", \"" + strDayHours + "\"),\n"); - resultado.append("new Array(\"inpimproductivehoursyear\", \"" + strImproductiveHoursYear - + "\"),\n"); - resultado.append("new Array(\"inpcostuomyear\", \"" + strCostUomYear + "\"),\n"); - resultado.append("new Array(\"inpcost\", \"" + strCost + "\") \n"); + resultado.append("new Array(\"inppurchaseamt\", " + strPurchaseAmt + "),\n"); + resultado.append("new Array(\"inptoolsetamt\", " + strToolsetAmt + "),\n"); + resultado.append("new Array(\"inpyearvalue\", " + strYearValue + "),\n"); + resultado.append("new Array(\"inpamortization\", " + strAmortization + "), \n"); + resultado.append("new Array(\"inpdaysyear\", " + strDaysYear + "),\n"); + resultado.append("new Array(\"inpdayhours\", " + strDayHours + "),\n"); + resultado + .append("new Array(\"inpimproductivehoursyear\", " + strImproductiveHoursYear + "),\n"); + resultado.append("new Array(\"inpcostuomyear\", " + strCostUomYear + "),\n"); + resultado.append("new Array(\"inpcost\", " + strCost + ") \n"); resultado.append(");\n"); xmlDocument.setParameter("array", resultado.toString()); response.setContentType("text/html; charset=UTF-8"); diff -r 5067857f7fcc -r 70a1a69445c2 src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java --- a/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java Fri Aug 14 00:33:45 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java Fri Aug 14 01:15:31 2009 +0200 @@ -139,26 +139,26 @@ log4j.debug("priceActual:" + Double.toString(priceActual.doubleValue())); if ("Y".equals(cancelPriceAd)) { priceStd = priceActual; - resultado.append("new Array(\"inppricestd\", \"" + priceStd.toString() + "\"),"); + resultado.append("new Array(\"inppricestd\", " + priceStd.toString() + "),"); } else { priceStd = new BigDecimal(SLOrderProductData.getOffersStdPrice(this, dataOrder[0].cBpartnerId, strPriceActual.replace("\"", ""), strProduct, dataOrder[0].dateordered, strQty, dataOrder[0].mPricelistId, dataOrder[0].id)); // priceList - resultado.append("new Array(\"inppricestd\", \"" + priceStd.toString() + "\"),"); + resultado.append("new Array(\"inppricestd\", " + priceStd.toString() + "),"); } } if (strChanged.equals("inpcancelpricead")) { if ("Y".equals(cancelPriceAd)) { - resultado.append("new Array(\"inppriceactual\", \"" + strPriceStd + "\"),"); + resultado.append("new Array(\"inppriceactual\", " + strPriceStd + "),"); } else { strPriceActual = SLOrderProductData.getOffersPrice(this, dataOrder[0].dateordered, dataOrder[0].cBpartnerId, strProduct, (strPriceStd.equals("undefined") ? "0" : strPriceStd.replace("\"", "")), strQty, dataOrder[0].mPricelistId, dataOrder[0].id); - resultado.append("new Array(\"inppriceactual\", \"" + strPriceActual + "\"),"); + resultado.append("new Array(\"inppriceactual\", " + strPriceActual + "),"); } } @@ -190,14 +190,14 @@ discount = discount.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP); if (log4j.isDebugEnabled()) log4j.debug("Discount rounded: " + discount.toString()); - resultado.append("new Array(\"inpdiscount\", \"" + discount.toString() + "\"),"); + resultado.append("new Array(\"inpdiscount\", " + discount.toString() + "),"); } else if (strChanged.equals("inpqtyordered")) { // calculate Actual priceActual = new BigDecimal(SLOrderProductData.getOffersPrice(this, dataOrder[0].dateordered, dataOrder[0].cBpartnerId, strProduct, priceStd.toString(), strQty, dataOrder[0].mPricelistId, dataOrder[0].id)); if (priceActual.scale() > PricePrecision) priceActual = priceActual.setScale(PricePrecision, BigDecimal.ROUND_HALF_UP); - resultado.append("new Array(\"inppriceactual\", \"" + priceActual.toString() + "\"),"); + resultado.append("new Array(\"inppriceactual\", " + priceActual.toString() + "),"); } else if (strChanged.equals("inpdiscount")) { // calculate std and // actual BigDecimal discount1 = null; @@ -220,8 +220,8 @@ priceStd = priceStd.setScale(PricePrecision, BigDecimal.ROUND_HALF_UP); if (priceActual.scale() > PricePrecision) priceActual = priceActual.setScale(PricePrecision, BigDecimal.ROUND_HALF_UP); - resultado.append("new Array(\"inppriceactual\", \"" + priceActual.toString() + "\"),"); - resultado.append("new Array(\"inppricestd\", \"" + priceStd.toString() + "\"),"); + resultado.append("new Array(\"inppriceactual\", " + priceActual.toString() + "),"); + resultado.append("new Array(\"inppricestd\", " + priceStd.toString() + "),"); } } ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits