From afde8a0cf1c2b9f7ddb9da1f6fd544f512c287b6 Mon Sep 17 00:00:00 2001
From: igorpojzl <59439434+igorpojzl@users.noreply.github.com>
Date: Thu, 31 Dec 2020 13:21:04 +0100
Subject: [PATCH] IDEMPIERE-4621  Cross Tenant Parent Tax Error (#502)

* IDEMPIERE-4621  Cross Tenant Parent Tax Error

* IDEMPIERE-4621 Add CLient Check on getTaxNodes
---
 org.adempiere.base/src/org/compiere/model/MTax.java             | 1 +
 .../src/org/compiere/model/StandardTaxProvider.java             | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/org.adempiere.base/src/org/compiere/model/MTax.java b/org.adempiere.base/src/org/compiere/model/MTax.java
index 2feaae8d20..c37041f5c6 100644
--- a/org.adempiere.base/src/org/compiere/model/MTax.java
+++ b/org.adempiere.base/src/org/compiere/model/MTax.java
@@ -243,6 +243,7 @@ public class MTax extends X_C_Tax implements ImmutablePOSupport
 		List<MTax> list = new Query(getCtx(), I_C_Tax.Table_Name, whereClause,  get_TrxName())
 			.setParameters(getC_Tax_ID())
 			.setOnlyActiveRecords(true)
+			.setClient_ID()
 			.list();	
 		//red1 - end -
 		if (list.size() > 0 && is_Immutable())
diff --git a/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java b/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java
index 31aed1bd80..f398f60c2e 100644
--- a/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java
+++ b/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java
@@ -97,8 +97,6 @@ public class StandardTaxProvider implements ITaxProvider {
 				}
 				if (!oTax.delete(true, order.get_TrxName()))
 					return false;
-				if (!oTax.save(order.get_TrxName()))
-					return false;
 			}
 			else
 			{