details: https://code.openbravo.com/erp/devel/pi/rev/7821151b8743
changeset: 32283:7821151b8743
user: Asier Martirena <asier.martirena <at> openbravo.com>
date: Mon Jun 05 12:32:10 2017 +0200
summary: Related to issue 35955: Credit updated after doing a C&R and CL
diffstat:
src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java | 11
++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diffs (28 lines):
diff -r 0a8198433dbd -r 7821151b8743
src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java
--- a/src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java
Thu Jun 08 15:12:14 2017 +0000
+++ b/src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java
Mon Jun 05 12:32:10 2017 +0200
@@ -55,6 +55,7 @@
import org.openbravo.erpCommon.utility.Utility;
import org.openbravo.materialmgmt.ReservationUtils;
import org.openbravo.model.ad.access.OrderLineTax;
+import org.openbravo.model.common.businesspartner.BusinessPartner;
import org.openbravo.model.common.enterprise.DocumentType;
import org.openbravo.model.common.enterprise.Locator;
import org.openbravo.model.common.enterprise.Organization;
@@ -984,6 +985,16 @@
TriggerHandler.getInstance().enable();
}
if (nettingPayment != null) {
+ if (jsonorder != null && jsonorder.has("canceledorder")) {
+ final JSONObject canceledOrder =
jsonorder.getJSONObject("canceledorder");
+ if (canceledOrder.has("paidOnCredit") &&
canceledOrder.getBoolean("paidOnCredit")) {
+ final BusinessPartner bp =
OBDal.getInstance().get(BusinessPartner.class,
+ canceledOrder.getJSONObject("bp").getString("id"));
+ bp.setCreditUsed(bp.getCreditUsed().subtract(
+
BigDecimal.valueOf(canceledOrder.getDouble("creditAmount"))));
+ OBDal.getInstance().save(bp);
+ }
+ }
FIN_PaymentProcess.doProcessPayment(nettingPayment, "P", null, null);
}
if (triggersDisabled && replaceOrder) {
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
