details: https://code.openbravo.com/erp/devel/pi/rev/357149849277
changeset: 17957:357149849277
user: David Miguelez <david.miguelez <at> openbravo.com>
date: Fri Sep 14 14:47:39 2012 +0200
summary: Fixes issue 21461: Filters Financial Accounts by selected
Payment Method.
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
| 7 +++++--
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
| 2 ++
2 files changed, 7 insertions(+), 2 deletions(-)
diffs (31 lines):
diff -r 245c366769f7 -r 357149849277
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
Fri Sep 14 13:09:26 2012 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
Fri Sep 14 14:47:39 2012 +0200
@@ -505,10 +505,13 @@
JSONObject msg = new JSONObject();
try {
msg.put("combo", finAccountComboHtml);
- msg.put("financialAccountCurrencyId", financialAccountCurrency.getId());
+ if (financialAccountCurrency != null) {
+ msg.put("financialAccountCurrencyId",
financialAccountCurrency.getId());
+ msg.put("financialAccountCurrencyPrecision",
+ financialAccountCurrency.getStandardPrecision());
+ }
msg.put("exchangeRate", exchangeRate == null ? "" : exchangeRate);
msg.put("formatOutput", formatOutput);
- msg.put("financialAccountCurrencyPrecision",
financialAccountCurrency.getStandardPrecision());
} catch (JSONException e) {
log4j.error("JSON object error" + msg.toString());
}
diff -r 245c366769f7 -r 357149849277
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
Fri Sep 14 13:09:26 2012 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
Fri Sep 14 14:47:39 2012 +0200
@@ -1322,6 +1322,8 @@
Criterion crit = exp.getCriterion();
if (crit != null) {
obc.add(crit);
+ } else {
+ return new ArrayList<FIN_FinancialAccount>();
}
}
return obc.list();
------------------------------------------------------------------------------
Got visibility?
Most devs has no idea what their production app looks like.
Find out how fast your code is with AppDynamics Lite.
http://ad.doubleclick.net/clk;262219671;13503038;y?
http://info.appdynamics.com/FreeJavaPerformanceDownload.html
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
