details: https://code.openbravo.com/erp/devel/pi/rev/c01c0677ff02 changeset: 23876:c01c0677ff02 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Jun 25 13:25:14 2014 +0200 summary: Backed out changeset 3aaaf391b34d
details: https://code.openbravo.com/erp/devel/pi/rev/c426b60a4efb changeset: 23877:c426b60a4efb user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Jun 25 17:05:07 2014 +0200 summary: Fixed bug 26937: Payments against GLItems are not automatically deposited diffstat: modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java | 40 +++------ 1 files changed, 14 insertions(+), 26 deletions(-) diffs (59 lines): diff -r 3ade2f82a24c -r c426b60a4efb modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java Wed Jun 25 14:29:16 2014 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java Wed Jun 25 17:05:07 2014 +0200 @@ -187,41 +187,29 @@ OBContext.setAdminMode(true); for (FIN_PaymentDetail pd : payment.getFINPaymentDetailList()) { for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) { - if ((pd.getGLItem() != null || psd.isInvoicePaid()) - && FIN_Utility.isAutomaticDepositWithdrawn(paymentRunPayment.getPayment()) - && paymentRunPayment.getPayment().getAmount().compareTo(BigDecimal.ZERO) != 0) { - FIN_FinaccTransaction transaction = TransactionsDao - .createFinAccTransaction(paymentRunPayment.getPayment()); - VariablesSecureApp vars = new VariablesSecureApp(RequestContext.get() - .getRequest()); - OBError processTransactionError = processTransaction(vars, - new DalConnectionProvider(), "P", transaction); - if (processTransactionError != null - && "Error".equals(processTransactionError.getType())) { - return processTransactionError; + if (pd.getGLItem() != null || psd.isInvoicePaid()) { + if (FIN_Utility.isAutomaticDepositWithdrawn(paymentRunPayment.getPayment()) + && paymentRunPayment.getPayment().getAmount().compareTo(BigDecimal.ZERO) != 0) { + FIN_FinaccTransaction transaction = TransactionsDao + .createFinAccTransaction(paymentRunPayment.getPayment()); + VariablesSecureApp vars = new VariablesSecureApp(RequestContext.get() + .getRequest()); + OBError processTransactionError = processTransaction(vars, + new DalConnectionProvider(), "P", transaction); + if (processTransactionError != null + && "Error".equals(processTransactionError.getType())) { + return processTransactionError; + } } + updatePaymentAmounts(paymentRunPayment.getPayment()); } } break; } - } finally { OBContext.restorePreviousMode(); } } - try { - OBContext.setAdminMode(true); - for (FIN_PaymentDetail pd : payment.getFINPaymentDetailList()) { - for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) { - if (pd.getGLItem() != null || psd.isInvoicePaid()) { - updatePaymentAmounts(paymentRunPayment.getPayment()); - } - } - break; - } - } finally { - OBContext.restorePreviousMode(); - } OBDal.getInstance().save(paymentRunPayment.getPayment()); } ------------------------------------------------------------------------------ Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
