From faf6e29f9d90ba7d21465e93638c912635c851b6 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 29 Jul 2008 23:45:59 +0000 Subject: [PATCH] Fix [ 1979978 ] A_VALID_ASSET_COMBINATIONS in dict not in db GenerateModel is generating even for inactive tables --- base/src/org/adempiere/util/GenerateModel.java | 2 +- base/src/org/adempiere/util/ModelClassGenerator.java | 2 +- base/src/org/adempiere/util/ModelInterfaceGenerator.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/src/org/adempiere/util/GenerateModel.java b/base/src/org/adempiere/util/GenerateModel.java index 282a84859b..af02d66714 100644 --- a/base/src/org/adempiere/util/GenerateModel.java +++ b/base/src/org/adempiere/util/GenerateModel.java @@ -117,7 +117,7 @@ public class GenerateModel + "FROM AD_Table " + "WHERE (TableName IN ('RV_WarehousePrice','RV_BPartner')" // special views + " OR IsView='N')" - + " AND TableName NOT LIKE '%_Trl' AND "); + + " AND IsActive = 'Y' AND TableName NOT LIKE '%_Trl' AND "); sql.append(" AND TableName LIKE ").append(tableLike); sql.append(" ORDER BY TableName"); diff --git a/base/src/org/adempiere/util/ModelClassGenerator.java b/base/src/org/adempiere/util/ModelClassGenerator.java index edb1feb2dd..c3855d0975 100644 --- a/base/src/org/adempiere/util/ModelClassGenerator.java +++ b/base/src/org/adempiere/util/ModelClassGenerator.java @@ -1011,7 +1011,7 @@ public class ModelClassGenerator + "FROM AD_Table " + "WHERE (TableName IN ('RV_WarehousePrice','RV_BPartner')" // special views + " OR IsView='N')" - + " AND TableName NOT LIKE '%_Trl' AND "); + + " AND IsActive = 'Y' AND TableName NOT LIKE '%_Trl' AND "); sql.append(" AND TableName LIKE ").append(tableLike); sql.append(" ORDER BY TableName"); diff --git a/base/src/org/adempiere/util/ModelInterfaceGenerator.java b/base/src/org/adempiere/util/ModelInterfaceGenerator.java index 15575dbf06..40cbeb7636 100644 --- a/base/src/org/adempiere/util/ModelInterfaceGenerator.java +++ b/base/src/org/adempiere/util/ModelInterfaceGenerator.java @@ -588,7 +588,7 @@ public class ModelInterfaceGenerator { // complete sql sql.insert(0, "SELECT AD_Table_ID " + "FROM AD_Table " + "WHERE (TableName IN ('RV_WarehousePrice','RV_BPartner')" // special views - + " OR IsView='N')" + " AND TableName NOT LIKE '%_Trl' AND "); + + " OR IsView='N') AND IsActive = 'Y' AND TableName NOT LIKE '%_Trl' AND "); sql.append(" AND TableName LIKE ").append(tableLike); sql.append(" ORDER BY TableName");