From 4dd66c31275ceb02b16f59a5bd8a00bdf9014839 Mon Sep 17 00:00:00 2001 From: vpj-cd Date: Tue, 6 Nov 2007 03:16:28 +0000 Subject: [PATCH] [ 1826511 ] DecimalFormat Static to #.## this should take context http://sourceforge.net/tracker/index.php?func=detail&aid=1826511&group_id=176962&atid=928568 --- .../posterita/businesslogic/CustomPOSReportManager.java | 7 +++++-- .../main/org/posterita/businesslogic/OrderManager.java | 4 +++- .../src/main/org/posterita/businesslogic/POSManager.java | 4 +++- .../org/posterita/businesslogic/POSReportManager.java | 8 ++++++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/posterita/src/main/org/posterita/businesslogic/CustomPOSReportManager.java b/posterita/src/main/org/posterita/businesslogic/CustomPOSReportManager.java index 6434baab04..71adebf6b9 100644 --- a/posterita/src/main/org/posterita/businesslogic/CustomPOSReportManager.java +++ b/posterita/src/main/org/posterita/businesslogic/CustomPOSReportManager.java @@ -37,6 +37,7 @@ import java.util.Iterator; import java.util.Properties; import java.util.TreeMap; +import org.compiere.util.DisplayType; import org.jfree.chart.axis.DateAxis; import org.jfree.chart.labels.StandardPieSectionLabelGenerator; import org.jfree.chart.plot.PiePlot; @@ -292,7 +293,8 @@ public class CustomPOSReportManager ArrayList reportData = new ArrayList(); //copying data from tmpData to reportData - NumberFormat formatter = new DecimalFormat("###,###,##0.00"); + //NumberFormat formatter = new DecimalFormat("###,###,##0.00"); + NumberFormat formatter = DisplayType.getNumberFormat(DisplayType.CostPrice); Iterator iter = tmpData.iterator(); @@ -392,7 +394,8 @@ public class CustomPOSReportManager boolean isTaxDue = (account_id == Constants.TAX_DUE.intValue() ); boolean isTaxCredit = (account_id == Constants.TAX_CREDIT.intValue() ); - NumberFormat formatter = new DecimalFormat("###,###,##0.00"); + //NumberFormat formatter = new DecimalFormat("###,###,##0.00"); + NumberFormat formatter = DisplayType.getNumberFormat(DisplayType.CostPrice); String sql = SalesAnalysisReportManager.getTabularDataSetSQL(ctx,account_id,fromDate,toDate,salesGroup); ArrayList tmpData = ReportManager.getReportData(ctx,sql,true); diff --git a/posterita/src/main/org/posterita/businesslogic/OrderManager.java b/posterita/src/main/org/posterita/businesslogic/OrderManager.java index 0e799dbac5..e5ec98c676 100644 --- a/posterita/src/main/org/posterita/businesslogic/OrderManager.java +++ b/posterita/src/main/org/posterita/businesslogic/OrderManager.java @@ -39,6 +39,7 @@ import org.compiere.print.ReportEngine; import org.compiere.process.DocAction; import org.compiere.process.DocumentEngine; import org.compiere.util.DB; +import org.compiere.util.DisplayType; import org.compiere.util.Env; import org.posterita.beans.CreditCheckBean; @@ -185,7 +186,8 @@ public class OrderManager public static double round(double value) { - DecimalFormat f = new DecimalFormat("#.##"); + DecimalFormat f = DisplayType.getNumberFormat(DisplayType.Number); + return Double.parseDouble(f.format(value)); } diff --git a/posterita/src/main/org/posterita/businesslogic/POSManager.java b/posterita/src/main/org/posterita/businesslogic/POSManager.java index c55cf117ee..a2d3792be1 100644 --- a/posterita/src/main/org/posterita/businesslogic/POSManager.java +++ b/posterita/src/main/org/posterita/businesslogic/POSManager.java @@ -69,6 +69,7 @@ import org.compiere.model.MUser; import org.compiere.model.MWarehouse; import org.compiere.process.DocumentEngine; import org.compiere.util.DB; +import org.compiere.util.DisplayType; import org.compiere.util.Env; import org.compiere.util.TimeUtil; import org.compiere.util.Trx; @@ -987,7 +988,8 @@ public class POSManager Object[] headers = new Object[]{"POS Name","Cash Total","Card Total","Cheque Total","Amount"}; reportData.add(headers); - NumberFormat formatter = new DecimalFormat("###,###,##0.00"); + //NumberFormat formatter = new DecimalFormat("###,###,##0.00"); + DecimalFormat f = DisplayType.getNumberFormat(DisplayType.CostPrice); Object[] data = null; String grandTotal = null; diff --git a/posterita/src/main/org/posterita/businesslogic/POSReportManager.java b/posterita/src/main/org/posterita/businesslogic/POSReportManager.java index 5453000315..9ce187d1b3 100644 --- a/posterita/src/main/org/posterita/businesslogic/POSReportManager.java +++ b/posterita/src/main/org/posterita/businesslogic/POSReportManager.java @@ -51,6 +51,7 @@ import org.compiere.model.MTransaction; import org.compiere.model.MUser; import org.compiere.model.MWarehouse; import org.compiere.util.DB; +import org.compiere.util.DisplayType; import org.compiere.util.Env; import org.compiere.utils.DBUtils; import org.posterita.Constants; @@ -1009,7 +1010,8 @@ public class POSReportManager { String customerAddress = null; String documentNo = null; String currency = "Rs "; - NumberFormat formatter = new DecimalFormat("###,###,##0.00"); + //NumberFormat formatter = new DecimalFormat("###,###,##0.00"); + NumberFormat formatter = DisplayType.getNumberFormat(DisplayType.CostPrice); currency = POSTerminalManager.getPOSDefaultSellCurrency(ctx) .getCurSymbol() @@ -2264,7 +2266,9 @@ public class POSReportManager { // final float THIN_BORDER = 1.0f; String currency = "Rs "; - NumberFormat formatter = new DecimalFormat("###,###,##0.00"); + //NumberFormat formatter = new DecimalFormat("###,###,##0.00"); + NumberFormat formatter = DisplayType.getNumberFormat(DisplayType.CostPrice); + PdfPCell cell = null; // step 1: creation of a document-object