diff --git a/migration/i3.1/oracle/201602011711_IDEMPIERE-3022.sql b/migration/i3.1/oracle/201602011711_IDEMPIERE-3022.sql new file mode 100644 index 0000000000..cb8be70eb1 --- /dev/null +++ b/migration/i3.1/oracle/201602011711_IDEMPIERE-3022.sql @@ -0,0 +1,8 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-3022 Copy Columns from table error message +-- Feb 1, 2016 5:11:42 PM CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('E','Target table must not have columns',0,0,'Y',TO_DATE('2016-02-01 17:11:42','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2016-02-01 17:11:42','YYYY-MM-DD HH24:MI:SS'),0,200398,'ErrorCopyColumns','D','e74d8970-44f1-4cd0-9b5e-ee21af6c286e') +; + diff --git a/migration/i3.1/postgresql/201602011711_IDEMPIERE-3022.sql b/migration/i3.1/postgresql/201602011711_IDEMPIERE-3022.sql new file mode 100644 index 0000000000..a400313af9 --- /dev/null +++ b/migration/i3.1/postgresql/201602011711_IDEMPIERE-3022.sql @@ -0,0 +1,5 @@ +-- IDEMPIERE-3022 Copy Columns from table error message +-- Feb 1, 2016 5:11:42 PM CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('E','Target table must not have columns',0,0,'Y',TO_TIMESTAMP('2016-02-01 17:11:42','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2016-02-01 17:11:42','YYYY-MM-DD HH24:MI:SS'),0,200398,'ErrorCopyColumns','D','e74d8970-44f1-4cd0-9b5e-ee21af6c286e') +; + diff --git a/org.adempiere.base.process/src/org/compiere/process/CopyColumnsFromTable.java b/org.adempiere.base.process/src/org/compiere/process/CopyColumnsFromTable.java index 513b7e0dff..1b09fd1f2d 100644 --- a/org.adempiere.base.process/src/org/compiere/process/CopyColumnsFromTable.java +++ b/org.adempiere.base.process/src/org/compiere/process/CopyColumnsFromTable.java @@ -22,6 +22,8 @@ import org.compiere.model.MTable; import org.compiere.model.M_Element; import org.compiere.model.PO; import org.compiere.util.AdempiereSystemError; +import org.compiere.util.Env; +import org.compiere.util.Msg; /** * Copy columns from one table to other @@ -76,8 +78,7 @@ public class CopyColumnsFromTable extends SvrProcess MTable targetTable = new MTable(getCtx(), p_target_AD_Table_ID, get_TrxName()); MColumn[] targetColumns = targetTable.getColumns(true); if (targetColumns.length > 0) - // TODO: dictionary message - throw new AdempiereSystemError("Target table must not have columns"); + throw new AdempiereSystemError(Msg.getMsg(Env.getCtx(), "ErrorCopyColumns")); MTable sourceTable = new MTable(getCtx(), p_source_AD_Table_ID, get_TrxName()); MColumn[] sourceColumns = sourceTable.getColumns(true);