From 50f5041015c701709395959fe7b32318ff8a084f Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 24 Nov 2014 16:14:23 -0500 Subject: [PATCH] IDEMPIERE-2305 Cash/Check Payment button is ignoring amount entered / fix issue reversing a payment (and in general setting wrongly the docstatus when the document save fails) --- org.adempiere.base/src/org/compiere/model/MPayment.java | 2 -- org.adempiere.base/src/org/compiere/wf/MWFActivity.java | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MPayment.java b/org.adempiere.base/src/org/compiere/model/MPayment.java index 7d7158835a..eaa222be18 100644 --- a/org.adempiere.base/src/org/compiere/model/MPayment.java +++ b/org.adempiere.base/src/org/compiere/model/MPayment.java @@ -660,8 +660,6 @@ public class MPayment extends X_C_Payment || is_ValueChanged(COLUMNNAME_C_Charge_ID) || is_ValueChanged(COLUMNNAME_C_Currency_ID) || is_ValueChanged(COLUMNNAME_C_DocType_ID) - || is_ValueChanged(COLUMNNAME_C_Invoice_ID) - || is_ValueChanged(COLUMNNAME_C_Order_ID) || is_ValueChanged(COLUMNNAME_DateAcct) || is_ValueChanged(COLUMNNAME_DateTrx) || is_ValueChanged(COLUMNNAME_DiscountAmt) diff --git a/org.adempiere.base/src/org/compiere/wf/MWFActivity.java b/org.adempiere.base/src/org/compiere/wf/MWFActivity.java index d38fc37c96..d6185dcac8 100644 --- a/org.adempiere.base/src/org/compiere/wf/MWFActivity.java +++ b/org.adempiere.base/src/org/compiere/wf/MWFActivity.java @@ -1011,6 +1011,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable if (!m_po.save()) { success = false; + m_docStatus = null; processMsg = "SaveError"; } if (!success)