From 08c6d0aaa0c17ffb6eb81d408510d2d9899c766d Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Tue, 6 Jun 2023 15:19:46 +0200
Subject: [PATCH] IDEMPIERE-5567 Support of UUID as Key (FHCA-4195) (#1881)

- Fix issues created with latest change - not able to create new records in Zero ID tables (C_DocType, AD_User, etc)
---
 org.adempiere.base/src/org/compiere/model/GridTable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.adempiere.base/src/org/compiere/model/GridTable.java b/org.adempiere.base/src/org/compiere/model/GridTable.java
index 54695d04cd..c4a8335277 100644
--- a/org.adempiere.base/src/org/compiere/model/GridTable.java
+++ b/org.adempiere.base/src/org/compiere/model/GridTable.java
@@ -1632,7 +1632,7 @@ public class GridTable extends AbstractTableModel
 			m_trxName = null;
 		if (Record_ID != -1)
 		{
-			if (Record_ID == 0 && MTable.isZeroIDTable(table.getTableName())) {
+			if (Record_ID == 0 && !m_inserting && MTable.isZeroIDTable(table.getTableName())) {
 				String uuidFromZeroID = table.getUUIDFromZeroID();
 				po = table.getPOByUU(uuidFromZeroID, m_trxName);
 			} else {