From 6de8036d6d604fcd62be23527ddd0d52d69e5e28 Mon Sep 17 00:00:00 2001 From: trifonnt Date: Wed, 24 Mar 2010 09:30:10 +0000 Subject: [PATCH] FR [2975307] - AD_Menu_Trl overwritten by AD_Window https://sourceforge.net/tracker/index.php?func=detail&aid=2975307&group_id=176962&atid=879335 --- .../src/org/compiere/process/SynchronizeTerminology.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/base/src/org/compiere/process/SynchronizeTerminology.java b/base/src/org/compiere/process/SynchronizeTerminology.java index 7eeb7dbad1..cdf3436ef1 100644 --- a/base/src/org/compiere/process/SynchronizeTerminology.java +++ b/base/src/org/compiere/process/SynchronizeTerminology.java @@ -58,7 +58,8 @@ public class SynchronizeTerminology extends SvrProcess sql="SELECT DISTINCT ColumnName, Name, Description, Help, EntityType " +"FROM AD_COLUMN c WHERE NOT EXISTS " +"(SELECT 1 FROM AD_ELEMENT e " - +" WHERE UPPER(c.ColumnName)=UPPER(e.ColumnName))"; + +" WHERE UPPER(c.ColumnName)=UPPER(e.ColumnName))" + +" AND c.isActive = 'Y'"; PreparedStatement pstmt = DB.prepareStatement(sql, get_TrxName()); ResultSet rs = pstmt.executeQuery (); while (rs.next()){ @@ -76,12 +77,14 @@ public class SynchronizeTerminology extends SvrProcess pstmt.close(); rs.close(); trx.commit(true); - // Create Elements from Process Parameters + // Create Elements for Process Parameters which are centrally maintained sql="SELECT DISTINCT ColumnName, Name, Description, Help, EntityType " +" FROM AD_PROCESS_PARA p " +" WHERE NOT EXISTS " +" (SELECT 1 FROM AD_ELEMENT e " - +" WHERE UPPER(p.ColumnName)=UPPER(e.ColumnName))"; + +" WHERE UPPER(p.ColumnName)=UPPER(e.ColumnName))" + +" AND p.isCentrallyMaintained = 'Y'" + +" AND p.isActive = 'Y'"; pstmt = DB.prepareStatement(sql, get_TrxName()); rs = pstmt.executeQuery (); while (rs.next()){