diff --git a/migration/iD11/oracle/202409231821_IDEMPIERE-6248_DelSysConfig.sql b/migration/iD11/oracle/202409231821_IDEMPIERE-6248_DelSysConfig.sql
new file mode 100644
index 0000000000..df393c1950
--- /dev/null
+++ b/migration/iD11/oracle/202409231821_IDEMPIERE-6248_DelSysConfig.sql
@@ -0,0 +1,8 @@
+-- IDEMPIERE-6248
+SELECT register_migration_script('202409231821_IDEMPIERE-6248_DelSysConfig.sql') FROM dual;
+
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+DELETE FROM AD_SysConfig WHERE AD_SysConfig_ID = 200250
+;
diff --git a/migration/iD11/postgresql/202409231821_IDEMPIERE-6248_DelSysConfig.sql b/migration/iD11/postgresql/202409231821_IDEMPIERE-6248_DelSysConfig.sql
new file mode 100644
index 0000000000..9146a8de45
--- /dev/null
+++ b/migration/iD11/postgresql/202409231821_IDEMPIERE-6248_DelSysConfig.sql
@@ -0,0 +1,5 @@
+-- IDEMPIERE-6248
+SELECT register_migration_script('202409231821_IDEMPIERE-6248_DelSysConfig.sql') FROM dual;
+
+DELETE FROM AD_SysConfig WHERE AD_SysConfig_ID = 200250
+;
diff --git a/org.adempiere.base.process/src/org/idempiere/process/MigraID.java b/org.adempiere.base.process/src/org/idempiere/process/MigraID.java
index 808a7a4f85..3001953ceb 100644
--- a/org.adempiere.base.process/src/org/idempiere/process/MigraID.java
+++ b/org.adempiere.base.process/src/org/idempiere/process/MigraID.java
@@ -109,7 +109,7 @@ protected String doIt() throws Exception {
.append(" WHERE ").append(uuidCol).append("=?");
int cnt = DB.executeUpdateEx(updUUIDSB.toString(), new Object[] {p_UUID_To, p_UUID_From}, get_TrxName());
if (cnt <= 0) {
- msg = "@Error@: UUID " + p_UUID_From + " not found on table " + l_tableName;
+ msg = "@Error@ UUID " + p_UUID_From + " not found on table " + l_tableName;
} else {
int id = -1;
msg = "UUID changed on table " + l_tableName + " from " + p_UUID_From + " to " + p_UUID_To;
@@ -144,7 +144,7 @@ protected String doIt() throws Exception {
// convert ID
int cnt = updID(l_tableName, idCol, true);
if (cnt <= 0) {
- msg = "@Error@: ID " + p_ID_From + " not found on table " + l_tableName;
+ msg = "@Error@ ID " + p_ID_From + " not found on table " + l_tableName;
} else {
msg = "ID changed on table " + l_tableName + " from " + p_ID_From + " to " + p_ID_To;
addBufferLog(0, null, null, msg, p_AD_Table_ID, p_ID_To);
diff --git a/org.adempiere.base/src/org/compiere/model/MSysConfig.java b/org.adempiere.base/src/org/compiere/model/MSysConfig.java
index 13d905f9db..c1a73d81a6 100644
--- a/org.adempiere.base/src/org/compiere/model/MSysConfig.java
+++ b/org.adempiere.base/src/org/compiere/model/MSysConfig.java
@@ -120,7 +120,6 @@ public class MSysConfig extends X_AD_SysConfig
public static final String FORM_SQL_QUERY_LOG_ISSUE = "FORM_SQL_QUERY_LOG_ISSUE";
public static final String FORM_SQL_QUERY_MAX_RECORDS = "FORM_SQL_QUERY_MAX_RECORDS";
public static final String FORM_SQL_QUERY_TIMEOUT_IN_SECONDS = "FORM_SQL_QUERY_TIMEOUT_IN_SECONDS";
- public static final String FULL_EXCEPTION_TRACE_IN_LOG = "FULL_EXCEPTION_TRACE_IN_LOG";
public static final String GLOBAL_MAX_QUERY_RECORDS = "GLOBAL_MAX_QUERY_RECORDS";
public static final String GLOBAL_MAX_REPORT_RECORDS = "GLOBAL_MAX_REPORT_RECORDS";
public static final String GRIDTABLE_LOAD_TIMEOUT_IN_SECONDS = "GRIDTABLE_LOAD_TIMEOUT_IN_SECONDS";
diff --git a/org.adempiere.base/src/org/compiere/model/SystemProperties.java b/org.adempiere.base/src/org/compiere/model/SystemProperties.java
index 611497068c..bd284de353 100644
--- a/org.adempiere.base/src/org/compiere/model/SystemProperties.java
+++ b/org.adempiere.base/src/org/compiere/model/SystemProperties.java
@@ -49,6 +49,7 @@ public class SystemProperties {
private static final String org_idempiere_db_debug_convert = "org.idempiere.db.debug.convert";
private static final String org_idempiere_db_debug_filter = "org.idempiere.db.debug.filter";
private static final String org_idempiere_FileLogPrefix = "org.idempiere.FileLogPrefix";
+ private static final String org_idempiere_FullExceptionTraceInLog = "org.idempiere.FullExceptionTraceInLog";
private static final String org_idempiere_postgresql_URLParameters = "org.idempiere.postgresql.URLParameters";
private static final String org_idempiere_po_useOptimisticLocking = "org.idempiere.po.useOptimisticLocking";
private static final String PostgreSQLNative = "PostgreSQLNative";
@@ -277,4 +278,11 @@ public static boolean isTraceNullTrxConnection() {
return "true".equals(System.getProperty(TRACE_NULL_TRX_CONNECTION));
}
+ /**
+ * org_idempiere_FullExceptionTraceInLog=true to not cut trace log
+ * @return
+ */
+ public static boolean isFullExceptionTraceInLog() {
+ return "true".equals(System.getProperty(org_idempiere_FullExceptionTraceInLog));
+ }
}
diff --git a/org.adempiere.base/src/org/compiere/print/MPrintFormatItem.java b/org.adempiere.base/src/org/compiere/print/MPrintFormatItem.java
index 4ee13a218f..d30e631ce4 100644
--- a/org.adempiere.base/src/org/compiere/print/MPrintFormatItem.java
+++ b/org.adempiere.base/src/org/compiere/print/MPrintFormatItem.java
@@ -24,6 +24,7 @@
import java.util.logging.Level;
import org.compiere.model.GridField;
+import org.compiere.model.I_AD_PrintFormatItem;
import org.compiere.model.MRole;
import org.compiere.model.X_AD_PrintFormatItem;
import org.compiere.util.CCache;
@@ -49,9 +50,9 @@ public class MPrintFormatItem extends X_AD_PrintFormatItem implements ImmutableP
/**
* generated serial id
*/
- private static final long serialVersionUID = 2950704375830865408L;
+ private static final long serialVersionUID = -971583490682254014L;
- /**
+ /**
* UUID based Constructor
* @param ctx Context
* @param AD_PrintFormatItem_UU UUID key
@@ -179,20 +180,51 @@ public MPrintFormatItem(Properties ctx, MPrintFormatItem copy, String trxName)
private static CLogger s_log = CLogger.getCLogger (MPrintFormatItem.class);
+ public String getPrintName (boolean useNameWhenEmpty) {
+ String printName = getPrintName();
+ if (Util.isEmpty(printName, true) && useNameWhenEmpty) {
+ return getName();
+ }
+
+ return printName;
+ }
/**
- * Get print name with language
+ * Get print name with language
+ * Order of alternative values when encountering empty value
+ *