From ed90b53e4d666d75dac8fe36bc5729ca87f9aac7 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Wed, 11 Sep 2019 15:07:55 +0800
Subject: [PATCH] IDEMPIERE-4047 Minor trx fix for GridTabCSVImporter

---
 .../src/org/adempiere/model/GridTabWrapper.java              | 2 +-
 org.adempiere.base/src/org/compiere/model/GridField.java     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/org.adempiere.base/src/org/adempiere/model/GridTabWrapper.java b/org.adempiere.base/src/org/adempiere/model/GridTabWrapper.java
index 385bcc5616..047c600f3f 100644
--- a/org.adempiere.base/src/org/adempiere/model/GridTabWrapper.java
+++ b/org.adempiere.base/src/org/adempiere/model/GridTabWrapper.java
@@ -133,7 +133,7 @@ public class GridTabWrapper implements InvocationHandler
 	
 	private final String getTrxName()
 	{
-		return null;
+		return getGridTab().getTableModel().get_TrxName();
 	}
 	
 	/**
diff --git a/org.adempiere.base/src/org/compiere/model/GridField.java b/org.adempiere.base/src/org/compiere/model/GridField.java
index fe9f8a6160..16feabb144 100644
--- a/org.adempiere.base/src/org/compiere/model/GridField.java
+++ b/org.adempiere.base/src/org/compiere/model/GridField.java
@@ -775,8 +775,9 @@ public class GridField
 				PreparedStatement stmt = null;
 				ResultSet rs = null;
 				try
-				{
-					stmt = DB.prepareStatement(sql, null);
+				{					
+					String trxName = m_gridTab != null ? m_gridTab.getTableModel().get_TrxName() : null;
+					stmt = DB.prepareStatement(sql, trxName);
 					rs = stmt.executeQuery();
 					if (rs.next())
 						defStr = rs.getString(1);