From e151947731152ca508aff610d856b802e49d4212 Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Wed, 5 Nov 2014 17:31:44 -0500
Subject: [PATCH] IDEMPIERE-2305 Cash Payment button is ignoring amount entered

---
 .../adempiere/webui/apps/form/WPaymentFormCash.java  | 12 +-----------
 .../src/org/compiere/grid/PaymentFormCash.java       | 10 ++--------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCash.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCash.java
index 8d6c116236..f91a7221c9 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCash.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCash.java
@@ -67,17 +67,7 @@ public class WPaymentFormCash extends PaymentFormCash implements EventListener<E
 		window = new WPaymentFormWindow(this, windowNo);
 		init();
 				
-		//Bojana&Daniel
-		//If Invoice is Vendor invoice then Cash has to be created by negative amount
-		int C_Invoice_ID = Env.getContextAsInt(Env.getCtx(), getWindowNo(), "C_Invoice_ID");
-		MInvoice invoice_tmp = new MInvoice (Env.getCtx(), C_Invoice_ID, null);
-		if (! invoice_tmp.isSOTrx())
-		{
-			bAmountField.setValue(m_Amount.negate());
-		}else {
-			bAmountField.setValue(m_Amount);
-		}
-		invoice_tmp = null;
+		bAmountField.setValue(m_Amount);
 	}
 	
 	public void init() {
diff --git a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCash.java b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCash.java
index 544a6b43ec..1d8eac3536 100644
--- a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCash.java
+++ b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCash.java
@@ -250,24 +250,19 @@ public abstract class PaymentFormCash extends PaymentForm {
 			C_Invoice_ID = getInvoiceID (C_Order_ID);
 
 		//  Amount sign negative, if ARC (Credit Memo) or API (AP Invoice)
-		boolean negateAmt = false;
 		MInvoice invoice = null;
 		if (C_Invoice_ID != 0)
 		{
 			invoice = new MInvoice (Env.getCtx(), C_Invoice_ID, null);
-			negateAmt = invoice.isCreditMemo();
 		}
 		MOrder order = null;
 		if (invoice == null && C_Order_ID != 0)
 			order = new MOrder (Env.getCtx(), C_Order_ID, null);
 		
-		BigDecimal payAmount = m_Amount;
-		
+		BigDecimal payAmount = newAmount;
 
-		if (negateAmt)
-			payAmount = m_Amount.negate();
 		// Info
-		if (log.isLoggable(Level.CONFIG)) log.config("C_Order_ID=" + C_Order_ID + ", C_Invoice_ID=" + C_Invoice_ID + ", NegateAmt=" + negateAmt);
+		if (log.isLoggable(Level.CONFIG)) log.config("C_Order_ID=" + C_Order_ID + ", C_Invoice_ID=" + C_Invoice_ID);
 		
 		/***********************
 		 *  CashBook
@@ -284,7 +279,6 @@ public abstract class PaymentFormCash extends PaymentForm {
 			}
 			else
 			{
-				payAmount = newAmount;
 				//  Changed Amount
 				if (m_cashLine != null
 					&& payAmount.compareTo(m_cashLine.getAmount()) != 0)