[OpenbravoERP-commits] devel/pi: [APRM] Fixes issue 18523: add transaction with comma d...

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/c7d4cea487d3
changeset: 13773:c7d4cea487d3
user:      Mikel Irurita <mikel.irurita <at> openbravo.com>
date:      Tue Sep 13 16:46:56 2011 +0200
summary:   [APRM] Fixes issue 18523: add transaction with comma decimal 
separator changed the amount is multiplied by 10

diffstat:

 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
         |  2 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
     |  4 ++--
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
 |  7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diffs (68 lines):

diff -r bb6c8650777a -r c7d4cea487d3 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
      Tue Sep 13 14:21:51 2011 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
      Tue Sep 13 16:46:56 2011 +0200
@@ -126,7 +126,7 @@
       String strDocumentType = vars.getStringParameter("inpDocumentType", "");
       String paymentCurrencyId = 
vars.getRequiredStringParameter("inpCurrencyId");
       BigDecimal exchangeRate = new 
BigDecimal(vars.getRequiredNumericParameter("inpExchangeRate",
-          "1.0"));
+          "1"));
       BigDecimal convertedAmount = new 
BigDecimal(vars.getRequiredNumericParameter(
           "inpActualConverted", strPaymentAmount));
       OBError message = null;
diff -r bb6c8650777a -r c7d4cea487d3 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
  Tue Sep 13 14:21:51 2011 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
  Tue Sep 13 16:46:56 2011 +0200
@@ -179,7 +179,7 @@
       String strReferenceNo = vars.getStringParameter("inpReferenceNo", "");
       String paymentCurrencyId = 
vars.getRequiredStringParameter("inpCurrencyId");
       BigDecimal exchangeRate = new 
BigDecimal(vars.getRequiredNumericParameter("inpExchangeRate",
-          "1.0"));
+          "1"));
       BigDecimal convertedAmount = new 
BigDecimal(vars.getRequiredNumericParameter(
           "inpActualConverted", strPaymentAmount));
       OBError message = null;
@@ -516,7 +516,7 @@
 
   private String findExchangeRate(Currency paymentCurrency, Currency 
financialAccountCurrency,
       Date paymentDate, Organization organization, int 
conversionRatePrecision) {
-    String exchangeRate = "1.0";
+    String exchangeRate = "1";
     if (financialAccountCurrency != null && 
!financialAccountCurrency.equals(paymentCurrency)) {
       final ConversionRate conversionRate = 
FIN_Utility.getConversionRate(paymentCurrency,
           financialAccountCurrency, paymentDate, organization);
diff -r bb6c8650777a -r c7d4cea487d3 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
      Tue Sep 13 14:21:51 2011 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
      Tue Sep 13 16:46:56 2011 +0200
@@ -178,7 +178,7 @@
       String strReferenceNo = vars.getStringParameter("inpReferenceNo", "");
       String paymentCurrencyId = 
vars.getRequiredStringParameter("inpCurrencyId");
       BigDecimal exchangeRate = new 
BigDecimal(vars.getRequiredNumericParameter("inpExchangeRate",
-          "1.0"));
+          "1"));
       BigDecimal convertedAmount = new 
BigDecimal(vars.getRequiredNumericParameter(
           "inpActualConverted", strPaymentAmount));
       OBError message = null;
@@ -407,11 +407,12 @@
           .getStandardPrecision().toString());
     }
 
-    String exchangeRate = "1.0";
+    String exchangeRate = "1";
     if (financialAccountCurrency != null && 
!financialAccountCurrency.equals(paymentCurrency)) {
       exchangeRate = findExchangeRate(paymentCurrency, 
financialAccountCurrency, new Date(),
           financialAccount.getOrganization(), conversionRatePrecision);
     }
+
     xmlDocument.setParameter("exchangeRate", exchangeRate);
 
     // Payment Method combobox
@@ -604,7 +605,7 @@
 
   private String findExchangeRate(Currency paymentCurrency, Currency 
financialAccountCurrency,
       Date paymentDate, Organization organization, int 
conversionRatePrecision) {
-    String exchangeRate = "1.0";
+    String exchangeRate = "1";
     if (financialAccountCurrency != null && 
!financialAccountCurrency.equals(paymentCurrency)) {
       final ConversionRate conversionRate = 
FIN_Utility.getConversionRate(paymentCurrency,
           financialAccountCurrency, paymentDate, organization);

------------------------------------------------------------------------------
BlackBerry&reg; DevCon Americas, Oct. 18-20, San Francisco, CA
Learn about the latest advances in developing for the 
BlackBerry&reg; mobile platform with sessions, labs & more.
See new tools and technologies. Register for BlackBerry&reg; DevCon today!
http://p.sf.net/sfu/rim-devcon-copy1 
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits