From 04579bc6765f347a84d6423b6826bea5594e6d19 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 26 Feb 2011 20:55:17 -0500 Subject: [PATCH] Revert 12710 Allow the entry the Tax amount manually the same way PO - 6345 b330695a3a58 It was reverted with revision 13840 because it's causing big issues --- org.adempiere.base/src/org/compiere/model/MInvoiceLine.java | 2 +- org.adempiere.base/src/org/compiere/model/MInvoiceTax.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MInvoiceLine.java b/org.adempiere.base/src/org/compiere/model/MInvoiceLine.java index 64c246e4aa..7e319aaa1f 100644 --- a/org.adempiere.base/src/org/compiere/model/MInvoiceLine.java +++ b/org.adempiere.base/src/org/compiere/model/MInvoiceLine.java @@ -432,7 +432,7 @@ public class MInvoiceLine extends X_C_InvoiceLine return; // setLineNetAmt(); MTax tax = MTax.get (getCtx(), getC_Tax_ID()); - if (tax.isDocumentLevel() && m_IsSOTrx || getTaxAmt().signum() > 0)// AR Inv Tax + if (tax.isDocumentLevel() && m_IsSOTrx) // AR Inv Tax return; // TaxAmt = tax.calculateTax(getLineNetAmt(), isTaxIncluded(), getPrecision()); diff --git a/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java b/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java index 8187b0c8e1..d1eee99490 100644 --- a/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java +++ b/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java @@ -209,7 +209,7 @@ public class MInvoiceTax extends X_C_InvoiceTax // // phib [ 1702807 ]: manual tax should never be amended // on line level taxes - if (!documentLevel && amt.signum() != 0) // manually entered + if (!documentLevel && amt.signum() != 0 && !isSOTrx) // manually entered ; else if (documentLevel || baseAmt.signum() == 0) amt = Env.ZERO;