midsuit
/
core-jgi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Incorrect write-off amount when create payment selection 

http://sourceforge.net/tracker/?func=detail&atid=879332&aid=2837278&group_id=176962
This commit is contained in:
vpj-cd 2009-08-14 03:41:13 +00:00
parent 0ea4118ec3
commit 1a1817ddc5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
base/src/org/compiere/model/MPayment.java
View File

@ -545,7 +545,7 @@ public final class MPayment extends X_C_Payment
{ {
// @Trifon - CashPayments // @Trifon - CashPayments
//if ( getTenderType().equals("X") ) { //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 // Cash Book Is mandatory
if ( getC_CashBook_ID() <= 0 ) { if ( getC_CashBook_ID() <= 0 ) {
log.saveError("Error", Msg.parseTranslation(getCtx(), "@Mandatory@: @C_CashBook_ID@")); log.saveError("Error", Msg.parseTranslation(getCtx(), "@Mandatory@: @C_CashBook_ID@"));
@ -1826,7 +1826,7 @@ public final class MPayment extends X_C_Payment
// @Trifon - CashPayments // @Trifon - CashPayments
//if ( getTenderType().equals("X") ) { //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 // Create Cash Book entry
if ( getC_CashBook_ID() <= 0 ) { if ( getC_CashBook_ID() <= 0 ) {
log.saveError("Error", Msg.parseTranslation(getCtx(), "@Mandatory@: @C_CashBook_ID@")); 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)); boolean isSOTrx = "Y".equals(rs.getString(3));
BigDecimal PayAmt = rs.getBigDecimal(4); BigDecimal PayAmt = rs.getBigDecimal(4);
BigDecimal DiscountAmt = rs.getBigDecimal(5); BigDecimal DiscountAmt = rs.getBigDecimal(5);
BigDecimal WriteOffAmt = rs.getBigDecimal(6); BigDecimal WriteOffAmt = Env.ZERO;
BigDecimal OpenAmt = rs.getBigDecimal(7); BigDecimal OpenAmt = rs.getBigDecimal(7);
BigDecimal OverUnderAmt = OpenAmt.subtract(PayAmt) BigDecimal OverUnderAmt = OpenAmt.subtract(PayAmt)
.subtract(DiscountAmt).subtract(WriteOffAmt); .subtract(DiscountAmt).subtract(WriteOffAmt);