details: /erp/devel/pi/rev/2914bfec4bf5
changeset: 10970:2914bfec4bf5
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Wed Mar 02 13:08:18 2011 +0100
summary: Fixes issue 16101: MatchUIBS throws NPE when you have a manual
reconciliation started
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
| 16 +++++-----
1 files changed, 8 insertions(+), 8 deletions(-)
diffs (33 lines):
diff -r 5569fca75c05 -r 2914bfec4bf5
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
Wed Mar 02 12:45:06 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
Wed Mar 02 13:08:18 2011 +0100
@@ -96,6 +96,14 @@
.get(FIN_FinancialAccount.class, strFinancialAccountId), "N");
int reconciledItems = 0;
if (reconciliation != null) {
+ if (isManualReconciliation(reconciliation)) {
+ OBDal.getInstance().rollbackAndClose();
+ OBError message = Utility.translateError(this, vars,
vars.getLanguage(), Utility
+ .parseTranslation(this, vars, vars.getLanguage(),
"@APRM_ReconciliationMixed@"));
+ vars.setMessage(strTabId, message);
+ printPageClosePopUp(response, vars, Utility.getTabURL(strTabId, "R",
true));
+ return;
+ }
OBContext.setAdminMode();
try {
getSnapShot(reconciliation);
@@ -357,14 +365,6 @@
printPageClosePopUp(response, vars, Utility.getTabURL(strTabId, "R",
true));
return;
}
- if (isManualReconciliation(reconciliation)) {
- OBDal.getInstance().rollbackAndClose();
- OBError message = Utility.translateError(this, vars, vars.getLanguage(),
Utility
- .parseTranslation(this, vars, vars.getLanguage(),
"@APRM_ReconciliationMixed@"));
- vars.setMessage(strTabId, message);
- printPageClosePopUp(response, vars, Utility.getTabURL(strTabId, "R",
true));
- return;
- }
try {
ComboTableData comboTableData = new ComboTableData(vars, this, "LIST",
"",
"0CC268ED2E8D4B0397A0DCBBFA2237DE", "", Utility.getContext(this,
vars,
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
