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

hg merge release-6.2 (merge release6.2 into default)

This commit is contained in:
Carlos Ruiz 2019-09-07 13:30:15 +02:00
parent 63fab58fc1 c2a1aea45c
commit 54aab6fea3
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -895,20 +895,24 @@ public class ModelClassGenerator
file.mkdirs(); file.mkdirs();
// complete sql // complete sql
String filterViews = null;
if (tableLike.toString().contains("%")) {
filterViews = "AND (TableName IN ('RV_WarehousePrice','RV_BPartner') OR IsView='N')"; // special views
}
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append("SELECT AD_Table_ID ") sql.append("SELECT AD_Table_ID ")
.append("FROM AD_Table ") .append("FROM AD_Table ")
.append("WHERE (TableName IN ('RV_WarehousePrice','RV_BPartner')") // special views .append("WHERE IsActive = 'Y' AND TableName NOT LIKE '%_Trl' ");
.append(" OR IsView='N')")
.append(" AND IsActive = 'Y' AND TableName NOT LIKE '%_Trl' ");
// Autodetect if we need to use IN or LIKE clause - teo_sarca [ 3020640 ] // Autodetect if we need to use IN or LIKE clause - teo_sarca [ 3020640 ]
if (tableLike.indexOf(",") == -1) if (tableLike.indexOf(",") == -1)
sql.append(" AND TableName LIKE ").append(tableLike); sql.append(" AND TableName LIKE ").append(tableLike);
else else
sql.append(" AND TableName IN (").append(tableLike).append(")"); // only specific tables sql.append(" AND TableName IN (").append(tableLike).append(")"); // only specific tables
sql.append(" AND ").append(entityTypeFilter.toString()); sql.append(" AND ").append(entityTypeFilter.toString());
if (filterViews != null) {
sql.append(filterViews);
}
sql.append(" ORDER BY TableName"); sql.append(" ORDER BY TableName");
// //
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;

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

@ -813,18 +813,23 @@ public class ModelInterfaceGenerator
file.mkdirs(); file.mkdirs();
// complete sql // complete sql
String filterViews = null;
if (tableLike.toString().contains("%")) {
filterViews = "AND (TableName IN ('RV_WarehousePrice','RV_BPartner') OR IsView='N')"; // special views
}
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append("SELECT AD_Table_ID ") sql.append("SELECT AD_Table_ID ")
.append("FROM AD_Table ") .append("FROM AD_Table ")
.append("WHERE (TableName IN ('RV_WarehousePrice','RV_BPartner')") // special views .append("WHERE IsActive = 'Y' AND TableName NOT LIKE '%_Trl' ");
.append(" OR IsView='N')")
.append(" AND IsActive = 'Y' AND TableName NOT LIKE '%_Trl' ");
// Autodetect if we need to use IN or LIKE clause - teo_sarca [ 3020640 ] // Autodetect if we need to use IN or LIKE clause - teo_sarca [ 3020640 ]
if (tableLike.indexOf(",") == -1) if (tableLike.indexOf(",") == -1)
sql.append(" AND TableName LIKE ").append(tableLike); sql.append(" AND TableName LIKE ").append(tableLike);
else else
sql.append(" AND TableName IN (").append(tableLike).append(")"); // only specific tables sql.append(" AND TableName IN (").append(tableLike).append(")"); // only specific tables
sql.append(" AND ").append(entityTypeFilter.toString()); sql.append(" AND ").append(entityTypeFilter.toString());
if (filterViews != null) {
sql.append(filterViews);
}
sql.append(" ORDER BY TableName"); sql.append(" ORDER BY TableName");
// //

10
org.adempiere.ui.zk/js/photobooth_min.js
View File

File diff suppressed because one or more lines are too long