Author: jaz
Date: Tue Mar 27 07:26:06 2007
New Revision: 522926
URL:
http://svn.apache.org/viewvc?view=rev&rev=522926Log:
small changes to remove no longer needed currency lookup
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java?view=diff&rev=522926&r1=522925&r2=522926==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java Tue Mar 27 07:26:06 2007
@@ -267,6 +267,8 @@
Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
}
+ Debug.logInfo("Financial account capture [" + finAccountAuth.get("finAccountId") + "] for the amount of $" +
+ amount + " Tx #" + finAccountAuth.get("finAccountAuthId"), module);
// get the financial account
GenericValue finAccount;
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java?view=diff&rev=522926&r1=522925&r2=522926==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java Tue Mar 27 07:26:06 2007
@@ -126,11 +126,6 @@
return ServiceUtil.returnError("Unable to locate financial account");
}
- String currencyUom = finAccount.getString("currencyUomId");
- if (currencyUom != null) {
- currencyUom = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD");
- }
-
// get the balance
BigDecimal availableBalance;
BigDecimal balance;
@@ -177,8 +172,7 @@
return ServiceUtil.returnError(ex.getMessage());
}
- if (finAccount != null) {
- String currency = finAccount.getString("currencyUomId");
+ if (finAccount != null) {
String frozen = finAccount.getString("isFrozen");
if (frozen == null) frozen = "N";