From 749b98cb547862565925aab3ce62ba761dbe8272 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 11 Sep 2013 09:55:04 -0500 Subject: [PATCH 1/8] IDEMPIERE-325 - minor deprecation patch --- .../src/org/adempiere/webui/factory/DefaultInfoFactory.java | 1 + .../WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java | 1 + .../src/org/adempiere/webui/panel/InfoAssignmentPanel.java | 1 + .../src/org/adempiere/webui/panel/InfoBPartnerPanel.java | 2 +- .../src/org/adempiere/webui/panel/InfoCashLinePanel.java | 1 + .../WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java | 1 + .../WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java | 2 ++ .../WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java | 2 ++ .../src/org/adempiere/webui/panel/InfoPAttributePanel.java | 1 + .../WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java | 1 + .../WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java | 2 ++ 11 files changed, 14 insertions(+), 1 deletion(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultInfoFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultInfoFactory.java index b868cbaebc..08d7e727a7 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultInfoFactory.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultInfoFactory.java @@ -44,6 +44,7 @@ import org.compiere.util.Env; * @author hengsin * */ +@SuppressWarnings("deprecation") public class DefaultInfoFactory implements IInfoFactory { @Override diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java index d074d41cb1..1576cb398f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java @@ -63,6 +63,7 @@ import org.zkoss.zul.Vbox; * @version InfoAsset.java Adempiere Swing UI 3.4.1 */ +@Deprecated // replaced with InfoAssetWindow IDEMPIERE-325 public class InfoAssetPanel extends InfoPanel implements ValueChangeListener, EventListener { /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java index 40cc57ff28..aa46bcfb20 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java @@ -68,6 +68,7 @@ import org.zkoss.zul.Vbox; * @version InfoAssignment.java Adempiere Swing UI 3.4.1 */ +@Deprecated // replaced with InfoAssignmentWindow IDEMPIERE-325 public class InfoAssignmentPanel extends InfoPanel implements EventListener, ValueChangeListener { /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java index a02e9ef782..6e784a32b2 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java @@ -63,7 +63,7 @@ import org.zkoss.zul.Vbox; * @version InfoBPartner.java Adempiere Swing UI 3.4.1 */ - +@Deprecated // replaced with InfoBPartnerWindow IDEMPIERE-325 public class InfoBPartnerPanel extends InfoPanel implements EventListener, WTableModelListener { /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java index 143029c265..516dec0b53 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java @@ -68,6 +68,7 @@ import org.zkoss.zul.Vbox; * @version InfoCashLine.java Adempiere Swing UI 3.4.1 */ +@Deprecated // IDEMPIERE-170 IDEMPIERE-325 public class InfoCashLinePanel extends InfoPanel implements ValueChangeListener, EventListener { /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java index 2fbebc845e..ec0fa70e77 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java @@ -69,6 +69,7 @@ import org.zkoss.zul.Vbox; * @version InfoInOut.java Adempiere Swing UI 3.4.1 */ +@Deprecated // replaced with InfoInOutWindow IDEMPIERE-325 public class InfoInOutPanel extends InfoPanel implements ValueChangeListener, EventListener { /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java index c0a3c79ee2..f7b95c7f3d 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java @@ -69,6 +69,8 @@ import org.zkoss.zul.Vbox; * @author Elaine * @version InfoInvoice.java Adempiere Swing UI 3.4.1 **/ + +@Deprecated // replaced with InfoInvoiceWindow IDEMPIERE-325 public class InfoInvoicePanel extends InfoPanel implements ValueChangeListener { /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java index b3c00f12e2..45812c2a07 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java @@ -69,6 +69,8 @@ import org.zkoss.zul.Vbox; * @author Elaine * @version InfoOrder.java Adempiere Swing UI 3.4.1 **/ + +@Deprecated // replaced with InfoOrderWindow IDEMPIERE-325 public class InfoOrderPanel extends InfoPanel implements ValueChangeListener { /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java index 0e4610e59f..ceacf873a8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java @@ -71,6 +71,7 @@ public class InfoPAttributePanel extends Window implements EventListener * Called from InfoProduct,cmd_InfoPAttribute * @param parent */ + @SuppressWarnings("deprecation") public InfoPAttributePanel(Object input) { super(); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java index 028ab63fa6..330ee22bc5 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java @@ -69,6 +69,7 @@ import org.zkoss.zul.Vbox; * @version InfoPayment.java Adempiere Swing UI 3.4.1 */ +@Deprecated // replaced with InfoPaymentWindow IDEMPIERE-325 public class InfoPaymentPanel extends InfoPanel implements ValueChangeListener, EventListener { /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java index acd6244bea..032faecdd4 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java @@ -94,6 +94,8 @@ import org.zkoss.zul.South; * @author Elaine * @version InfoPayment.java Adempiere Swing UI 3.4.1 */ + +@Deprecated // replaced with InfoProductWindow IDEMPIERE-325 public class InfoProductPanel extends InfoPanel implements EventListener { /** From 8052798bacb2f217ba4c0cd734148a1de0365f07 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 11 Sep 2013 10:00:20 -0500 Subject: [PATCH 2/8] IDEMPIERE-1348 Cannot translate HTML content on dashboard --- .../oracle/201309110955_IDEMPIERE-1348.sql | 46 +++++++++++++++++++ .../201309110955_IDEMPIERE-1348.sql | 43 +++++++++++++++++ .../adempiere/apps/graph/HtmlDashboard.java | 2 +- .../webui/desktop/DashboardController.java | 2 +- 4 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 migration/i1.0c-release/oracle/201309110955_IDEMPIERE-1348.sql create mode 100644 migration/i1.0c-release/postgresql/201309110955_IDEMPIERE-1348.sql diff --git a/migration/i1.0c-release/oracle/201309110955_IDEMPIERE-1348.sql b/migration/i1.0c-release/oracle/201309110955_IDEMPIERE-1348.sql new file mode 100644 index 0000000000..3c9de4659a --- /dev/null +++ b/migration/i1.0c-release/oracle/201309110955_IDEMPIERE-1348.sql @@ -0,0 +1,46 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Sep 11, 2013 9:47:04 AM COT +-- IDEMPIERE-1348 Cannot translate HTML content on dashboard +INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Table_ID,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,AD_Element_ID,IsSecure) VALUES (0,'N',0,53295,210868,'N','N','N',0,'N',0,'N',36,'N','N','Y','6ec9f091-1c67-4b1e-8117-10f120939584','Y','HTML','HTML','Y',TO_DATE('2013-09-11 09:46:55','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_DATE('2013-09-11 09:46:55','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N',51005,'N') +; + +-- Sep 11, 2013 9:47:07 AM COT +-- IDEMPIERE-1348 Cannot translate HTML content on dashboard +ALTER TABLE PA_DashboardContent_Trl ADD HTML CLOB DEFAULT NULL +; + +-- Sep 11, 2013 9:47:22 AM COT +-- IDEMPIERE-1348 Cannot translate HTML content on dashboard +UPDATE AD_Column SET IsTranslated='Y',Updated=TO_DATE('2013-09-11 09:47:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=51012 +; + +-- Sep 11, 2013 9:48:56 AM COT +-- IDEMPIERE-1348 Cannot translate HTML content on dashboard +INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,AD_Client_ID,ColumnSpan) VALUES ('N',53372,36,'N','N',60965,90,'Y',202494,'N','D','PA_DashboardContent_Trl_UU','361b6894-aa95-424e-a371-e6123f14e502','N','N',100,0,TO_DATE('2013-09-11 09:48:48','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-09-11 09:48:48','YYYY-MM-DD HH24:MI:SS'),'Y','N',0,2) +; + +-- Sep 11, 2013 9:48:57 AM COT +-- IDEMPIERE-1348 Cannot translate HTML content on dashboard +INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,AD_Client_ID,ColumnSpan,NumLines) VALUES ('N',53372,0,'N','N',210868,100,'Y',202495,'N','D','HTML','ac01ef3e-7eed-49e5-84eb-5b7bdb3d4218','Y','N',100,0,TO_DATE('2013-09-11 09:48:56','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-09-11 09:48:56','YYYY-MM-DD HH24:MI:SS'),'Y',0,2,5) +; + +-- Sep 11, 2013 9:49:20 AM COT +-- IDEMPIERE-1348 Cannot translate HTML content on dashboard +UPDATE AD_Field SET SeqNo=90, ColumnSpan=5,Updated=TO_DATE('2013-09-11 09:49:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202495 +; + +-- Sep 11, 2013 9:49:20 AM COT +-- IDEMPIERE-1348 Cannot translate HTML content on dashboard +UPDATE AD_Field SET SeqNo=0,Updated=TO_DATE('2013-09-11 09:49:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202494 +; + +-- Sep 11, 2013 9:49:36 AM COT +-- IDEMPIERE-1348 Cannot translate HTML content on dashboard +UPDATE AD_Field SET SeqNo=20, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-09-11 09:49:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=60879 +; + +SELECT register_migration_script('201309110955_IDEMPIERE-1348.sql') FROM dual +; + diff --git a/migration/i1.0c-release/postgresql/201309110955_IDEMPIERE-1348.sql b/migration/i1.0c-release/postgresql/201309110955_IDEMPIERE-1348.sql new file mode 100644 index 0000000000..9d3717955c --- /dev/null +++ b/migration/i1.0c-release/postgresql/201309110955_IDEMPIERE-1348.sql @@ -0,0 +1,43 @@ +-- Sep 11, 2013 9:47:04 AM COT +-- IDEMPIERE-1348 Cannot translate HTML content on dashboard +INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Table_ID,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,AD_Element_ID,IsSecure) VALUES (0,'N',0,53295,210868,'N','N','N',0,'N',0,'N',36,'N','N','Y','6ec9f091-1c67-4b1e-8117-10f120939584','Y','HTML','HTML','Y',TO_TIMESTAMP('2013-09-11 09:46:55','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_TIMESTAMP('2013-09-11 09:46:55','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N',51005,'N') +; + +-- Sep 11, 2013 9:47:07 AM COT +-- IDEMPIERE-1348 Cannot translate HTML content on dashboard +ALTER TABLE PA_DashboardContent_Trl ADD COLUMN HTML TEXT DEFAULT NULL +; + +-- Sep 11, 2013 9:47:22 AM COT +-- IDEMPIERE-1348 Cannot translate HTML content on dashboard +UPDATE AD_Column SET IsTranslated='Y',Updated=TO_TIMESTAMP('2013-09-11 09:47:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=51012 +; + +-- Sep 11, 2013 9:48:56 AM COT +-- IDEMPIERE-1348 Cannot translate HTML content on dashboard +INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,AD_Client_ID,ColumnSpan) VALUES ('N',53372,36,'N','N',60965,90,'Y',202494,'N','D','PA_DashboardContent_Trl_UU','361b6894-aa95-424e-a371-e6123f14e502','N','N',100,0,TO_TIMESTAMP('2013-09-11 09:48:48','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-09-11 09:48:48','YYYY-MM-DD HH24:MI:SS'),'Y','N',0,2) +; + +-- Sep 11, 2013 9:48:57 AM COT +-- IDEMPIERE-1348 Cannot translate HTML content on dashboard +INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,AD_Client_ID,ColumnSpan,NumLines) VALUES ('N',53372,0,'N','N',210868,100,'Y',202495,'N','D','HTML','ac01ef3e-7eed-49e5-84eb-5b7bdb3d4218','Y','N',100,0,TO_TIMESTAMP('2013-09-11 09:48:56','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-09-11 09:48:56','YYYY-MM-DD HH24:MI:SS'),'Y',0,2,5) +; + +-- Sep 11, 2013 9:49:20 AM COT +-- IDEMPIERE-1348 Cannot translate HTML content on dashboard +UPDATE AD_Field SET SeqNo=90, ColumnSpan=5,Updated=TO_TIMESTAMP('2013-09-11 09:49:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202495 +; + +-- Sep 11, 2013 9:49:20 AM COT +-- IDEMPIERE-1348 Cannot translate HTML content on dashboard +UPDATE AD_Field SET SeqNo=0,Updated=TO_TIMESTAMP('2013-09-11 09:49:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202494 +; + +-- Sep 11, 2013 9:49:36 AM COT +-- IDEMPIERE-1348 Cannot translate HTML content on dashboard +UPDATE AD_Field SET SeqNo=20, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-09-11 09:49:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=60879 +; + +SELECT register_migration_script('201309110955_IDEMPIERE-1348.sql') FROM dual +; + diff --git a/org.adempiere.ui.swing/src/org/adempiere/apps/graph/HtmlDashboard.java b/org.adempiere.ui.swing/src/org/adempiere/apps/graph/HtmlDashboard.java index af4fe097a6..7126843026 100644 --- a/org.adempiere.ui.swing/src/org/adempiere/apps/graph/HtmlDashboard.java +++ b/org.adempiere.ui.swing/src/org/adempiere/apps/graph/HtmlDashboard.java @@ -170,7 +170,7 @@ public class HtmlDashboard extends JPanel implements MouseListener, if (!Util.isEmpty(dc.getZulFilePath(), true)) continue; // - appendToHome = dc.getHTML(); + appendToHome = dc.get_Translation(MDashboardContent.COLUMNNAME_HTML); String descriptionTrl = dp.get_Translation(MDashboardContent.COLUMNNAME_Description); if (appendToHome != null) { if (descriptionTrl != null) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java index 818358763b..8f967a6137 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java @@ -187,7 +187,7 @@ public class DashboardController implements EventListener { boolean panelEmpty = true; // HTML content - String htmlContent = dc.getHTML(); + String htmlContent = dc.get_Translation(MDashboardContent.COLUMNNAME_HTML); if(htmlContent != null) { StringBuilder result = new StringBuilder(""); From 6ec33a6eeaa4b43bb608f949c56021b055b5afe7 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 12 Sep 2013 02:27:21 +0800 Subject: [PATCH 3/8] IDEMPIERE-1347 2Pack: ColumnElementHandler should ensure column exists in database when IsSyncDatabase=Y. Remove unnecessary commit and packin log when there's no ddl action needed. --- .../pipo2/handler/ColumnElementHandler.java | 45 ++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java index 643cf8c090..874ac7a591 100644 --- a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java +++ b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java @@ -174,14 +174,16 @@ public class ColumnElementHandler extends AbstractElementHandler { if (!table.isView() && !mColumn.isVirtualColumn()) { success = createColumn(ctx, table, mColumn, recreateColumn); - X_AD_Package_Imp_Detail dbDetail = createImportDetail(ctx, "dbColumn", X_AD_Column.Table_Name, X_AD_Column.Table_ID); - if (success == 1) { - logImportDetail(ctx, dbDetail, 1, mColumn.getColumnName(), - mColumn.get_ID(), action); - } else { - logImportDetail(ctx, dbDetail, 0, mColumn.getColumnName(), - mColumn.get_ID(), action); - throw new DatabaseAccessException("Failed to create column or related constraint for " + mColumn.getColumnName()); + if (success != 0) { + X_AD_Package_Imp_Detail dbDetail = createImportDetail(ctx, "dbColumn", X_AD_Column.Table_Name, X_AD_Column.Table_ID); + if (success == 1) { + logImportDetail(ctx, dbDetail, 1, mColumn.getColumnName(), + mColumn.get_ID(), action); + } else { + logImportDetail(ctx, dbDetail, 0, mColumn.getColumnName(), + mColumn.get_ID(), action); + throw new DatabaseAccessException("Failed to create column or related constraint for " + mColumn.getColumnName()); + } } } } @@ -199,15 +201,11 @@ public class ColumnElementHandler extends AbstractElementHandler { */ private int createColumn(PIPOContext ctx, MTable table, MColumn column, boolean doAlter) { - int no = 0; - String sql = null; ResultSet rst = null; ResultSet rsc = null; Connection conn = null; Trx trx = Trx.get(getTrxName(ctx), true); - if (!trx.commit()) - return 0; try { // Find Column in Database @@ -251,27 +249,32 @@ public class ColumnElementHandler extends AbstractElementHandler { if (sql != null && sql.trim().length() > 0) { log.info(sql); + //make it consistent for oracle and postgresql + if (!trx.commit()) + return -1; + if (sql.indexOf(DB.SQLSTATEMENT_SEPARATOR) == -1) { - no = DB.executeUpdate(sql, false, trx.getTrxName()); - if (no == -1) - return 0; + int ret = DB.executeUpdate(sql, false, trx.getTrxName()); + if (ret == -1) + return -1; } else { String statements[] = sql.split(DB.SQLSTATEMENT_SEPARATOR); for (int i = 0; i < statements.length; i++) { - int count = DB.executeUpdate(statements[i], false, + int ret = DB.executeUpdate(statements[i], false, trx.getTrxName()); - if (count == -1) { - return 0; + if (ret == -1) { + return -1; } - no += count; } } + trx.commit(true); + } else { + return 0; } - trx.commit(true); } catch (SQLException e) { log.log(Level.SEVERE, e.getLocalizedMessage(), e); trx.rollback(); - return 0; + return -1; } finally { From 546c85b4d6e2278777fff8e2b4661e61dff318a8 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 11 Sep 2013 14:46:03 -0500 Subject: [PATCH 4/8] IDEMPIERE-1349 Setup Wizard wrong translation --- .../src/org/compiere/model/MDocType.java | 1 + org.adempiere.base/src/org/compiere/wf/MWFNode.java | 10 ++++++---- org.adempiere.base/src/org/compiere/wf/MWorkflow.java | 7 ++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MDocType.java b/org.adempiere.base/src/org/compiere/model/MDocType.java index 95eae88f4d..a0aec2dc21 100644 --- a/org.adempiere.base/src/org/compiere/model/MDocType.java +++ b/org.adempiere.base/src/org/compiere/model/MDocType.java @@ -364,6 +364,7 @@ public class MDocType extends X_C_DocType */ public String getNameTrl() { + // warning: to cache this translation you need to change the cache to include language (see i.e. MWFNode) return get_Translation (COLUMNNAME_Name, Env.getAD_Language(getCtx())); } // getNameTrl diff --git a/org.adempiere.base/src/org/compiere/wf/MWFNode.java b/org.adempiere.base/src/org/compiere/wf/MWFNode.java index e3f8398bc3..241b511109 100644 --- a/org.adempiere.base/src/org/compiere/wf/MWFNode.java +++ b/org.adempiere.base/src/org/compiere/wf/MWFNode.java @@ -64,7 +64,7 @@ public class MWFNode extends X_AD_WF_Node */ public static MWFNode get (Properties ctx, int AD_WF_Node_ID) { - Integer key = new Integer (AD_WF_Node_ID); + String key = Env.getAD_Language(ctx) + "_" + AD_WF_Node_ID; MWFNode retValue = (MWFNode) s_cache.get (key); if (retValue != null) return retValue; @@ -75,7 +75,7 @@ public class MWFNode extends X_AD_WF_Node } // get /** Cache */ - private static CCache s_cache = new CCache (Table_Name, 50); + private static CCache s_cache = new CCache (Table_Name, 50); /************************************************************************** @@ -139,9 +139,11 @@ public class MWFNode extends X_AD_WF_Node loadNext(); loadTrl(); // Save to Cache - Integer key = null; + String key = null; try { - key = new Integer (rs.getInt("AD_WF_Node_ID")); + Integer wfnodeid = new Integer (rs.getInt("AD_WF_Node_ID")); + if (wfnodeid != null && wfnodeid.intValue() > 0) + key = Env.getAD_Language(ctx) + "_" + wfnodeid; } catch (SQLException e) { throw new AdempiereException(e); } diff --git a/org.adempiere.base/src/org/compiere/wf/MWorkflow.java b/org.adempiere.base/src/org/compiere/wf/MWorkflow.java index 9fa1cec49c..0a90d574a5 100644 --- a/org.adempiere.base/src/org/compiere/wf/MWorkflow.java +++ b/org.adempiere.base/src/org/compiere/wf/MWorkflow.java @@ -70,12 +70,13 @@ public class MWorkflow extends X_AD_Workflow */ public static MWorkflow get (Properties ctx, int AD_Workflow_ID) { - MWorkflow retValue = (MWorkflow)s_cache.get(AD_Workflow_ID); + String key = Env.getAD_Language(ctx) + "_" + AD_Workflow_ID; + MWorkflow retValue = (MWorkflow)s_cache.get(key); if (retValue != null) return retValue; retValue = new MWorkflow (ctx, AD_Workflow_ID, null); if (retValue.get_ID() != 0) - s_cache.put(AD_Workflow_ID, retValue); + s_cache.put(key, retValue); return retValue; } // get @@ -144,7 +145,7 @@ public class MWorkflow extends X_AD_Workflow /** Single Cache */ - private static CCache s_cache = new CCache(Table_Name, 20); + private static CCache s_cache = new CCache(Table_Name, 20); /** Document Value Cache */ private static CCache s_cacheDocValue = new CCache (Table_Name, Table_Name+"_Document_Value", 5); /** Static Logger */ From 731b4863dd88edefcd7b61064dc0134cdc8fb73b Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 11 Sep 2013 18:53:20 -0500 Subject: [PATCH 5/8] IDEMPIERE-677 Deleting the last row in the swing clients grid view causes an indexoutofbounds exception / Thanks to Jan Thielemann --- .../src/org/compiere/grid/VTable.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VTable.java b/org.adempiere.ui.swing/src/org/compiere/grid/VTable.java index 32e68650cc..18f4d98751 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/VTable.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/VTable.java @@ -49,7 +49,8 @@ public final class VTable extends CTable /** * */ - private static final long serialVersionUID = -2655102084935019329L; + private static final long serialVersionUID = -3878986086328742243L; + private final static String PACK_ALL_COMMAND = CColumnControlButton.COLUMN_CONTROL_MARKER + "packAll"; /** @@ -197,4 +198,13 @@ public final class VTable extends CTable .append(getModel()).append("]").toString(); } // toString + /** + * Sets the row selection interval. If the index is out of bounds we decrement it before setting the JTables row selection interval + */ + @Override + public void setRowSelectionInterval(int index0, int index1) { + super.setRowSelectionInterval( index0 == getRowCount() && index0 > 0 ? --index0 : index0, + index1 == getRowCount() && index1 > 0 ? --index1 : index1); + } + } // VTable From 1599bb6a6094775437e296e12b0b3edf5cb7c8c0 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 11 Sep 2013 18:56:57 -0500 Subject: [PATCH 6/8] IDEMPIERE-1253 Password is not hidden in the window Storage Provider --- .../oracle/201309111856_IDEMPIERE-1253.sql | 11 +++++++++++ .../postgresql/201309111856_IDEMPIERE-1253.sql | 8 ++++++++ 2 files changed, 19 insertions(+) create mode 100644 migration/i1.0c-release/oracle/201309111856_IDEMPIERE-1253.sql create mode 100644 migration/i1.0c-release/postgresql/201309111856_IDEMPIERE-1253.sql diff --git a/migration/i1.0c-release/oracle/201309111856_IDEMPIERE-1253.sql b/migration/i1.0c-release/oracle/201309111856_IDEMPIERE-1253.sql new file mode 100644 index 0000000000..0e441a9d78 --- /dev/null +++ b/migration/i1.0c-release/oracle/201309111856_IDEMPIERE-1253.sql @@ -0,0 +1,11 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Sep 11, 2013 6:56:20 PM COT +-- IDEMPIERE-1253 Password is not hidden in the window Storage Provider +UPDATE AD_Field SET IsEncrypted='Y',Updated=TO_DATE('2013-09-11 18:56:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200867 +; + +SELECT register_migration_script('201309111856_IDEMPIERE-1253.sql') FROM dual +; + diff --git a/migration/i1.0c-release/postgresql/201309111856_IDEMPIERE-1253.sql b/migration/i1.0c-release/postgresql/201309111856_IDEMPIERE-1253.sql new file mode 100644 index 0000000000..320a1785be --- /dev/null +++ b/migration/i1.0c-release/postgresql/201309111856_IDEMPIERE-1253.sql @@ -0,0 +1,8 @@ +-- Sep 11, 2013 6:56:20 PM COT +-- IDEMPIERE-1253 Password is not hidden in the window Storage Provider +UPDATE AD_Field SET IsEncrypted='Y',Updated=TO_TIMESTAMP('2013-09-11 18:56:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200867 +; + +SELECT register_migration_script('201309111856_IDEMPIERE-1253.sql') FROM dual +; + From 0af5dda930a89a547411e3478e56e6be39da3f32 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 12 Sep 2013 10:36:41 +0800 Subject: [PATCH 7/8] IDEMPIERE-1273 "Invoice Payment Schedule" window isn't suitable. Disable insert for invoice header. --- .../oracle/201309111525_IDEMPIERE-1273.sql | 12 ++++++++++++ .../postgresql/201309111525_IDEMPIERE-1273.sql | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 migration/i1.0c-release/oracle/201309111525_IDEMPIERE-1273.sql create mode 100644 migration/i1.0c-release/postgresql/201309111525_IDEMPIERE-1273.sql diff --git a/migration/i1.0c-release/oracle/201309111525_IDEMPIERE-1273.sql b/migration/i1.0c-release/oracle/201309111525_IDEMPIERE-1273.sql new file mode 100644 index 0000000000..54aca97703 --- /dev/null +++ b/migration/i1.0c-release/oracle/201309111525_IDEMPIERE-1273.sql @@ -0,0 +1,12 @@ +-- Sep 11, 2013 3:25:16 PM COT +-- IDEMPIERE-1273 Invoice Payment Schedule" window isn't suitable +UPDATE AD_Tab SET IsInsertRecord='N',Updated=TO_DATE('2013-09-11 15:25:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=501 +; + +-- Sep 11, 2013 3:25:23 PM COT +-- IDEMPIERE-1273 Invoice Payment Schedule" window isn't suitable +UPDATE AD_Tab SET IsInsertRecord='N',Updated=TO_DATE('2013-09-11 15:25:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=666 +; + +SELECT register_migration_script('201309111525_IDEMPIERE-1273.sql') FROM dual +; diff --git a/migration/i1.0c-release/postgresql/201309111525_IDEMPIERE-1273.sql b/migration/i1.0c-release/postgresql/201309111525_IDEMPIERE-1273.sql new file mode 100644 index 0000000000..ea4a41a855 --- /dev/null +++ b/migration/i1.0c-release/postgresql/201309111525_IDEMPIERE-1273.sql @@ -0,0 +1,12 @@ +-- Sep 11, 2013 3:25:16 PM COT +-- IDEMPIERE-1273 Invoice Payment Schedule" window isn't suitable +UPDATE AD_Tab SET IsInsertRecord='N',Updated=TO_TIMESTAMP('2013-09-11 15:25:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=501 +; + +-- Sep 11, 2013 3:25:23 PM COT +-- IDEMPIERE-1273 Invoice Payment Schedule" window isn't suitable +UPDATE AD_Tab SET IsInsertRecord='N',Updated=TO_TIMESTAMP('2013-09-11 15:25:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=666 +; + +SELECT register_migration_script('201309111525_IDEMPIERE-1273.sql') FROM dual +; From a08f30412abe0bcbc7759a1991d7fe5d2a503795 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 12 Sep 2013 10:49:17 +0800 Subject: [PATCH 8/8] IDEMPIERE-1357 Tree panel not is updated with result of "Find" window. --- .../i1.0c-release/oracle/201309111130_IDEMPIERE-1357.sql | 8 ++++++++ .../postgresql/201309111130_IDEMPIERE-1357.sql | 8 ++++++++ .../src/org/adempiere/webui/adwindow/ADTabpanel.java | 7 ++++++- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 migration/i1.0c-release/oracle/201309111130_IDEMPIERE-1357.sql create mode 100644 migration/i1.0c-release/postgresql/201309111130_IDEMPIERE-1357.sql diff --git a/migration/i1.0c-release/oracle/201309111130_IDEMPIERE-1357.sql b/migration/i1.0c-release/oracle/201309111130_IDEMPIERE-1357.sql new file mode 100644 index 0000000000..c412ebb319 --- /dev/null +++ b/migration/i1.0c-release/oracle/201309111130_IDEMPIERE-1357.sql @@ -0,0 +1,8 @@ +-- Sep 11, 2013 11:30:06 AM COT +-- IDEMPIERE-1357 Tree panel not is updated with result of "Find" window +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Record is not in current search',200231,'D','6380f694-62e5-4368-96a2-418b006e240a','RecordIsNotInCurrentSearch','Y',TO_DATE('2013-09-11 11:30:05','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-09-11 11:30:05','YYYY-MM-DD HH24:MI:SS'),0) +; + +SELECT register_migration_script('201309111130_IDEMPIERE-1357.sql') FROM dual +; + diff --git a/migration/i1.0c-release/postgresql/201309111130_IDEMPIERE-1357.sql b/migration/i1.0c-release/postgresql/201309111130_IDEMPIERE-1357.sql new file mode 100644 index 0000000000..e0832c7005 --- /dev/null +++ b/migration/i1.0c-release/postgresql/201309111130_IDEMPIERE-1357.sql @@ -0,0 +1,8 @@ +-- Sep 11, 2013 11:30:06 AM COT +-- IDEMPIERE-1357 Tree panel not is updated with result of "Find" window +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Record is not in current search',200231,'D','6380f694-62e5-4368-96a2-418b006e240a','RecordIsNotInCurrentSearch','Y',TO_TIMESTAMP('2013-09-11 11:30:05','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-09-11 11:30:05','YYYY-MM-DD HH24:MI:SS'),0) +; + +SELECT register_migration_script('201309111130_IDEMPIERE-1357.sql') FROM dual +; + diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java index c154d827c6..702a9ea97c 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java @@ -26,6 +26,7 @@ import java.util.Map.Entry; import java.util.logging.Level; import org.adempiere.base.Core; +import org.adempiere.exceptions.AdempiereException; import org.adempiere.webui.AdempiereIdGenerator; import org.adempiere.webui.AdempiereWebUI; import org.adempiere.webui.LayoutUtils; @@ -1126,7 +1127,11 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer { if (nodeID > 0 && logger.isLoggable(Level.WARNING)) logger.log(Level.WARNING, "Tab does not have ID with Node_ID=" + nodeID); - return; + if (gridTab.getCurrentRow() >= 0) + { + gridTab.setCurrentRow(gridTab.getCurrentRow(), true); + } + throw new AdempiereException(Msg.getMsg(Env.getCtx(),"RecordIsNotInCurrentSearch")); } // Navigate to node row