From 1a1817ddc55c30843582d8f23634dbcffa1a2ded Mon Sep 17 00:00:00 2001 From: vpj-cd Date: Fri, 14 Aug 2009 03:41:13 +0000 Subject: [PATCH] Incorrect write-off amount when create payment selection http://sourceforge.net/tracker/?func=detail&atid=879332&aid=2837278&group_id=176962 --- base/src/org/compiere/model/MPayment.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/src/org/compiere/model/MPayment.java b/base/src/org/compiere/model/MPayment.java index 6d1c47d94d..46434e74d4 100644 --- a/base/src/org/compiere/model/MPayment.java +++ b/base/src/org/compiere/model/MPayment.java @@ -545,7 +545,7 @@ public final class MPayment extends X_C_Payment { // @Trifon - CashPayments //if ( getTenderType().equals("X") ) { - if ( isCashTrx() && !MSysConfig.getBooleanValue("CASH_AS_PAYMENT", true, getAD_Client_ID())) { + if ( isCashTrx() && !MSysConfig.getBooleanValue("CASH_AS_PAYMENT", true)) { // Cash Book Is mandatory if ( getC_CashBook_ID() <= 0 ) { log.saveError("Error", Msg.parseTranslation(getCtx(), "@Mandatory@: @C_CashBook_ID@")); @@ -1826,7 +1826,7 @@ public final class MPayment extends X_C_Payment // @Trifon - CashPayments //if ( getTenderType().equals("X") ) { - if ( isCashTrx() && !MSysConfig.getBooleanValue("CASH_AS_PAYMENT", true, getAD_Client_ID())) { + if ( isCashTrx() && !MSysConfig.getBooleanValue("CASH_AS_PAYMENT", true)) { // Create Cash Book entry if ( getC_CashBook_ID() <= 0 ) { log.saveError("Error", Msg.parseTranslation(getCtx(), "@Mandatory@: @C_CashBook_ID@")); @@ -2133,7 +2133,7 @@ public final class MPayment extends X_C_Payment boolean isSOTrx = "Y".equals(rs.getString(3)); BigDecimal PayAmt = rs.getBigDecimal(4); BigDecimal DiscountAmt = rs.getBigDecimal(5); - BigDecimal WriteOffAmt = rs.getBigDecimal(6); + BigDecimal WriteOffAmt = Env.ZERO; BigDecimal OpenAmt = rs.getBigDecimal(7); BigDecimal OverUnderAmt = OpenAmt.subtract(PayAmt) .subtract(DiscountAmt).subtract(WriteOffAmt);