midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix [ 1979978 ] A_VALID_ASSET_COMBINATIONS in dict not in db 

GenerateModel is generating even for inactive tables
This commit is contained in:
Carlos Ruiz 2008-07-29 23:45:59 +00:00
parent d43944d2f5
commit faf6e29f9d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/src/org/adempiere/util/GenerateModel.java
View File

@ -117,7 +117,7 @@ public class GenerateModel
+ "FROM AD_Table " + "FROM AD_Table "
+ "WHERE (TableName IN ('RV_WarehousePrice','RV_BPartner')" // special views + "WHERE (TableName IN ('RV_WarehousePrice','RV_BPartner')" // special views
+ " OR IsView='N')" + " 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(" AND TableName LIKE ").append(tableLike);
sql.append(" ORDER BY TableName"); sql.append(" ORDER BY TableName");

2
base/src/org/adempiere/util/ModelClassGenerator.java
View File

@ -1011,7 +1011,7 @@ public class ModelClassGenerator
+ "FROM AD_Table " + "FROM AD_Table "
+ "WHERE (TableName IN ('RV_WarehousePrice','RV_BPartner')" // special views + "WHERE (TableName IN ('RV_WarehousePrice','RV_BPartner')" // special views
+ " OR IsView='N')" + " 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(" AND TableName LIKE ").append(tableLike);
sql.append(" ORDER BY TableName"); sql.append(" ORDER BY TableName");

2
base/src/org/adempiere/util/ModelInterfaceGenerator.java
View File

@ -588,7 +588,7 @@ public class ModelInterfaceGenerator {
// complete sql // complete sql
sql.insert(0, "SELECT AD_Table_ID " + "FROM AD_Table " sql.insert(0, "SELECT AD_Table_ID " + "FROM AD_Table "
+ "WHERE (TableName IN ('RV_WarehousePrice','RV_BPartner')" // special views + "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(" AND TableName LIKE ").append(tableLike);
sql.append(" ORDER BY TableName"); sql.append(" ORDER BY TableName");