From 725c76c9942ef2761ab59ddd48ccfa1b5aa03c02 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 7 Nov 2017 15:14:13 +0100 Subject: [PATCH] IDEMPIERE-905 Post-it functionality / wrong column name - creating problems with native sequences --- .../oracle/201711071510_IDEMPIERE-905.sql | 27 +++++++++++++++++++ .../postgresql/201711071510_IDEMPIERE-905.sql | 24 +++++++++++++++++ .../src/org/compiere/model/I_AD_PostIt.java | 8 +++--- .../src/org/compiere/model/X_AD_PostIt.java | 18 ++++++------- .../src/org/compiere/grid/ed/VPostIt.java | 2 +- .../org/adempiere/webui/window/WPostIt.java | 2 +- 6 files changed, 66 insertions(+), 15 deletions(-) create mode 100644 migration/i5.1/oracle/201711071510_IDEMPIERE-905.sql create mode 100644 migration/i5.1/postgresql/201711071510_IDEMPIERE-905.sql diff --git a/migration/i5.1/oracle/201711071510_IDEMPIERE-905.sql b/migration/i5.1/oracle/201711071510_IDEMPIERE-905.sql new file mode 100644 index 0000000000..5e9a0d69c5 --- /dev/null +++ b/migration/i5.1/oracle/201711071510_IDEMPIERE-905.sql @@ -0,0 +1,27 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-905 Post-it functionality +-- Nov 7, 2017 3:09:53 PM CET +UPDATE AD_Element SET ColumnName='AD_PostIt_ID',Updated=TO_DATE('2017-11-07 15:09:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=203056 +; + +-- Nov 7, 2017 3:09:53 PM CET +UPDATE AD_Column SET ColumnName='AD_PostIt_ID', Name='Post-it', Description=NULL, Help=NULL WHERE AD_Element_ID=203056 +; + +-- Nov 7, 2017 3:09:53 PM CET +UPDATE AD_Process_Para SET ColumnName='AD_PostIt_ID', Name='Post-it', Description=NULL, Help=NULL, AD_Element_ID=203056 WHERE UPPER(ColumnName)='AD_POSTIT_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Nov 7, 2017 3:09:53 PM CET +UPDATE AD_Process_Para SET ColumnName='AD_PostIt_ID', Name='Post-it', Description=NULL, Help=NULL WHERE AD_Element_ID=203056 AND IsCentrallyMaintained='Y' +; + +-- Nov 7, 2017 3:09:53 PM CET +UPDATE AD_InfoColumn SET ColumnName='AD_PostIt_ID', Name='Post-it', Description=NULL, Help=NULL WHERE AD_Element_ID=203056 AND IsCentrallyMaintained='Y' +; + +SELECT register_migration_script('201711071510_IDEMPIERE-905.sql') FROM dual +; + diff --git a/migration/i5.1/postgresql/201711071510_IDEMPIERE-905.sql b/migration/i5.1/postgresql/201711071510_IDEMPIERE-905.sql new file mode 100644 index 0000000000..2f05c5c1f8 --- /dev/null +++ b/migration/i5.1/postgresql/201711071510_IDEMPIERE-905.sql @@ -0,0 +1,24 @@ +-- IDEMPIERE-905 Post-it functionality +-- Nov 7, 2017 3:09:53 PM CET +UPDATE AD_Element SET ColumnName='AD_PostIt_ID',Updated=TO_TIMESTAMP('2017-11-07 15:09:53','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=203056 +; + +-- Nov 7, 2017 3:09:53 PM CET +UPDATE AD_Column SET ColumnName='AD_PostIt_ID', Name='Post-it', Description=NULL, Help=NULL WHERE AD_Element_ID=203056 +; + +-- Nov 7, 2017 3:09:53 PM CET +UPDATE AD_Process_Para SET ColumnName='AD_PostIt_ID', Name='Post-it', Description=NULL, Help=NULL, AD_Element_ID=203056 WHERE UPPER(ColumnName)='AD_POSTIT_ID' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL +; + +-- Nov 7, 2017 3:09:53 PM CET +UPDATE AD_Process_Para SET ColumnName='AD_PostIt_ID', Name='Post-it', Description=NULL, Help=NULL WHERE AD_Element_ID=203056 AND IsCentrallyMaintained='Y' +; + +-- Nov 7, 2017 3:09:53 PM CET +UPDATE AD_InfoColumn SET ColumnName='AD_PostIt_ID', Name='Post-it', Description=NULL, Help=NULL WHERE AD_Element_ID=203056 AND IsCentrallyMaintained='Y' +; + +SELECT register_migration_script('201711071510_IDEMPIERE-905.sql') FROM dual +; + diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_PostIt.java b/org.adempiere.base/src/org/compiere/model/I_AD_PostIt.java index 99f4e371b4..4bb2047e25 100644 --- a/org.adempiere.base/src/org/compiere/model/I_AD_PostIt.java +++ b/org.adempiere.base/src/org/compiere/model/I_AD_PostIt.java @@ -62,14 +62,14 @@ public interface I_AD_PostIt */ public int getAD_Org_ID(); - /** Column name AD_Postit_ID */ - public static final String COLUMNNAME_AD_Postit_ID = "AD_Postit_ID"; + /** Column name AD_PostIt_ID */ + public static final String COLUMNNAME_AD_PostIt_ID = "AD_PostIt_ID"; /** Set Post-it */ - public void setAD_Postit_ID (int AD_Postit_ID); + public void setAD_PostIt_ID (int AD_PostIt_ID); /** Get Post-it */ - public int getAD_Postit_ID(); + public int getAD_PostIt_ID(); /** Column name AD_PostIt_UU */ public static final String COLUMNNAME_AD_PostIt_UU = "AD_PostIt_UU"; diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PostIt.java b/org.adempiere.base/src/org/compiere/model/X_AD_PostIt.java index 91ebdb659c..8b0e347e6f 100644 --- a/org.adempiere.base/src/org/compiere/model/X_AD_PostIt.java +++ b/org.adempiere.base/src/org/compiere/model/X_AD_PostIt.java @@ -29,7 +29,7 @@ public class X_AD_PostIt extends PO implements I_AD_PostIt, I_Persistent /** * */ - private static final long serialVersionUID = 20171031L; + private static final long serialVersionUID = 20171107L; /** Standard Constructor */ public X_AD_PostIt (Properties ctx, int AD_PostIt_ID, String trxName) @@ -37,7 +37,7 @@ public class X_AD_PostIt extends PO implements I_AD_PostIt, I_Persistent super (ctx, AD_PostIt_ID, trxName); /** if (AD_PostIt_ID == 0) { - setAD_Postit_ID (0); + setAD_PostIt_ID (0); } */ } @@ -70,20 +70,20 @@ public class X_AD_PostIt extends PO implements I_AD_PostIt, I_Persistent } /** Set Post-it. - @param AD_Postit_ID Post-it */ - public void setAD_Postit_ID (int AD_Postit_ID) + @param AD_PostIt_ID Post-it */ + public void setAD_PostIt_ID (int AD_PostIt_ID) { - if (AD_Postit_ID < 1) - set_ValueNoCheck (COLUMNNAME_AD_Postit_ID, null); + if (AD_PostIt_ID < 1) + set_ValueNoCheck (COLUMNNAME_AD_PostIt_ID, null); else - set_ValueNoCheck (COLUMNNAME_AD_Postit_ID, Integer.valueOf(AD_Postit_ID)); + set_ValueNoCheck (COLUMNNAME_AD_PostIt_ID, Integer.valueOf(AD_PostIt_ID)); } /** Get Post-it. @return Post-it */ - public int getAD_Postit_ID () + public int getAD_PostIt_ID () { - Integer ii = (Integer)get_Value(COLUMNNAME_AD_Postit_ID); + Integer ii = (Integer)get_Value(COLUMNNAME_AD_PostIt_ID); if (ii == null) return 0; return ii.intValue(); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPostIt.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPostIt.java index d3d36b4155..b3b55171d3 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPostIt.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPostIt.java @@ -98,7 +98,7 @@ public class VPostIt extends CDialog implements ChangeListener, ActionListener, textPane.setBackground(AdempierePLAF.getFieldBackground_Inactive()); String createdupdated = null; - if (m_postIt.getAD_Postit_ID() > 0) + if (m_postIt.getAD_PostIt_ID() > 0) createdupdated = m_postIt.getCreatedString(); String updated = m_postIt.getUpdatedString(); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPostIt.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPostIt.java index 99aafc3655..a96c2df3c9 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPostIt.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPostIt.java @@ -75,7 +75,7 @@ public class WPostIt extends Window implements EventListener{ m_postIt = new MPostIt (Env.getCtx(), tableID, recordID, trxName); String created = null; - if (m_postIt.getAD_Postit_ID() > 0) + if (m_postIt.getAD_PostIt_ID() > 0) created = m_postIt.getCreatedString(); String updated = m_postIt.getUpdatedString();