details: https://code.openbravo.com/erp/devel/pi/rev/fa17d173e3ce changeset: 30295:fa17d173e3ce user: Mark <markmm82 <at> gmail.com> date: Wed Sep 14 19:39:08 2016 -0400 summary: Fixes issue 33887: GLItem accounting dimensions maintained when posting Payment
In case Payment document has business partner set in payment's header and GL Item line is included setting different business partner, then accounting entry is generated for line's business partner instead of header's business partner. details: https://code.openbravo.com/erp/devel/pi/rev/7237a9b65b09 changeset: 30296:7237a9b65b09 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Mon Sep 19 12:53:30 2016 +0200 summary: Related to issue 33887: Code review improvements - Remove unnecessary parenthesis. - Add paymentDetail.getFINPaymentScheduleDetailList().get(0).getOrderPaymentSchedule() != null check to avoid NPE. diffstat: src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 23 +++++++++------- 1 files changed, 13 insertions(+), 10 deletions(-) diffs (34 lines): diff -r 018192ddfcb3 -r 7237a9b65b09 src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java --- a/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java Mon Sep 19 11:14:46 2016 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java Mon Sep 19 12:53:30 2016 +0200 @@ -146,17 +146,20 @@ FieldProviderFactory .setField(data[i], "AD_Org_ID", paymentDetail.getOrganization().getId()); FieldProviderFactory.setField(data[i], "FIN_Payment_Detail_ID", paymentDetail.getId()); - // Calculate Business Partner from payment header or from details if header is null or from - // the PSD in case of GL Item - BusinessPartner bPartner = payment.getBusinessPartner() != null ? payment + // Calculate Business Partner from the PSD in case of GL Item or from payment header or from + // details if header is null + BusinessPartner bPartner = paymentDetail.getFINPaymentScheduleDetailList().get(0) + .getBusinessPartner() != null ? paymentDetail.getFINPaymentScheduleDetailList().get(0) .getBusinessPartner() - : (paymentDetail.getFINPaymentScheduleDetailList().get(0).getInvoicePaymentSchedule() != null ? paymentDetail - .getFINPaymentScheduleDetailList().get(0).getInvoicePaymentSchedule().getInvoice() - .getBusinessPartner() - : (paymentDetail.getFINPaymentScheduleDetailList().get(0).getOrderPaymentSchedule() != null ? paymentDetail - .getFINPaymentScheduleDetailList().get(0).getOrderPaymentSchedule().getOrder() - .getBusinessPartner() - : (paymentDetail.getFINPaymentScheduleDetailList().get(0).getBusinessPartner()))); + : payment.getBusinessPartner() != null ? payment.getBusinessPartner() + : paymentDetail.getFINPaymentScheduleDetailList().get(0) + .getInvoicePaymentSchedule() != null ? paymentDetail + .getFINPaymentScheduleDetailList().get(0).getInvoicePaymentSchedule() + .getInvoice().getBusinessPartner() + : paymentDetail.getFINPaymentScheduleDetailList().get(0) + .getOrderPaymentSchedule() != null ? paymentDetail + .getFINPaymentScheduleDetailList().get(0).getOrderPaymentSchedule() + .getOrder().getBusinessPartner() : null; FieldProviderFactory.setField(data[i], "cBpartnerId", bPartner != null ? bPartner.getId() : ""); FieldProviderFactory.setField(data[i], "DoubtFulDebtAmount", paymentDetail ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
