diff --git a/base/src/org/compiere/model/MInvoiceLine.java b/base/src/org/compiere/model/MInvoiceLine.java
index a54ba4df41..ef575469af 100644
--- a/base/src/org/compiere/model/MInvoiceLine.java
+++ b/base/src/org/compiere/model/MInvoiceLine.java
@@ -807,11 +807,11 @@ public class MInvoiceLine extends X_C_InvoiceLine
 		if (tax != null) {
 			if (!tax.calculateTaxFromLines())
 				return false;
-			if (tax.getTaxAmt().signum() != 0) {
+			if (tax.getTaxAmt().signum() != 0 || tax.getTaxAmt().signum() == 0 ) { //red1 - added zero condition to solve bugs stated below
 				if (!tax.save(get_TrxName()))
 					return false;
 			}
-			else {
+			else { //red1 - this may become redundant due to above ZERO condition for BUGS #[ 1701331 ] , #[ 1786103 ]
 				if (!tax.is_new() && !tax.delete(false, get_TrxName()))
 					return false;
 			}