details: https://code.openbravo.com/erp/devel/pi/rev/2e94293e0e22
changeset: 23087:2e94293e0e22
user: Sandra Huguet <sandra.huguet <at> openbravo.com>
date: Wed May 21 18:40:37 2014 +0200
summary: Fixed bug 26652: Is impossible to do a manual reconciliation of a
glitem
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java
| 26 +++++----
1 files changed, 14 insertions(+), 12 deletions(-)
diffs (39 lines):
diff -r 21088355a1fa -r 2e94293e0e22
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java
Wed May 21 16:33:59 2014 +0000
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java
Wed May 21 18:40:37 2014 +0200
@@ -305,21 +305,23 @@
TransactionsDao.updateAccountingDate(trans);
}
Boolean invoicePaidold = false;
- for (FIN_PaymentDetail pd :
finacctrxv.getPayment().getFINPaymentDetailList()) {
- for (FIN_PaymentScheduleDetail psd :
pd.getFINPaymentScheduleDetailList()) {
- invoicePaidold = psd.isInvoicePaid();
- if (!invoicePaidold) {
- if
((FIN_Utility.invoicePaymentStatus(finacctrxv.getPayment().getPaymentMethod(),
- reconciliation.getAccount(),
finacctrxv.getPayment().isReceipt())
- .equals(finacctrxv.getPayment().getStatus()))) {
- psd.setInvoicePaid(true);
- }
- if (psd.isInvoicePaid()) {
- FIN_Utility.updatePaymentAmounts(psd);
+ if (finacctrxv.getPayment() != null) {
+ for (FIN_PaymentDetail pd :
finacctrxv.getPayment().getFINPaymentDetailList()) {
+ for (FIN_PaymentScheduleDetail psd :
pd.getFINPaymentScheduleDetailList()) {
+ invoicePaidold = psd.isInvoicePaid();
+ if (!invoicePaidold) {
+ if
((FIN_Utility.invoicePaymentStatus(finacctrxv.getPayment().getPaymentMethod(),
+ reconciliation.getAccount(),
finacctrxv.getPayment().isReceipt())
+ .equals(finacctrxv.getPayment().getStatus()))) {
+ psd.setInvoicePaid(true);
+ }
+ if (psd.isInvoicePaid()) {
+ FIN_Utility.updatePaymentAmounts(psd);
+ }
}
}
+ FIN_Utility.updateBusinessPartnerCredit(finacctrxv.getPayment());
}
- FIN_Utility.updateBusinessPartnerCredit(finacctrxv.getPayment());
}
}
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
