From 39d159d44a43c63a39f7b48d61bef1bf498f36d3 Mon Sep 17 00:00:00 2001
From: hengsin <hengsin@gmail.com>
Date: Wed, 13 Sep 2023 12:48:54 +0800
Subject: [PATCH] IDEMPIERE-5567 Support of UUID as Key (FHCA-4195) -
 AD_PInstance (#2005)

- Fix unit test errors
---
 org.adempiere.base/src/org/compiere/model/PO.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/org.adempiere.base/src/org/compiere/model/PO.java b/org.adempiere.base/src/org/compiere/model/PO.java
index 4b575bebd3..35ca1c1a36 100644
--- a/org.adempiere.base/src/org/compiere/model/PO.java
+++ b/org.adempiere.base/src/org/compiere/model/PO.java
@@ -5794,6 +5794,12 @@ public abstract class PO
 	private void checkRecordIDCrossTenant() {
 		if (isSafeCrossTenant.get())
 			return;
+		
+		//ad_table_id+record_id validation will fail for ad_pinstance due to ad_pinstance is 
+		//being saved and updated outside of server process transaction.
+		if (I_AD_PInstance.Table_Name.equals(p_info.getTableName()))
+			return;
+		
 		int idxRecordId = p_info.getColumnIndex("Record_ID");
 		if (idxRecordId < 0)
 			return;