From e32d1f4312bba15d19ba2b778fa95732c59b7270 Mon Sep 17 00:00:00 2001 From: Diego Ruiz Date: Thu, 18 Jul 2019 21:00:36 +0200 Subject: [PATCH 1/2] IDEMPIERE-4007 Allow to use set Tool Tip text in the right Help panel from code. i.e in Forms --- .../src/org/adempiere/webui/panel/HelpController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java index 6cc16de445..8a43307de6 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java @@ -203,6 +203,11 @@ public class HelpController */ public void renderToolTip(String hdr, String desc, String help, String otherContent) { + if (Util.isEmpty(hdr) && Util.isEmpty(otherContent)) + pnlToolTip.setVisible(false); + else if (!pnlToolTip.isVisible()) + pnlToolTip.setVisible(true); + StringBuilder sb = new StringBuilder(); sb.append("\n\n
\n"); From cc881f73547adde1d4f17776c0b14cfc7b593eca Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 19 Jul 2019 12:19:56 +0200 Subject: [PATCH 2/2] IDEMPIERE-918 Allow to choose the reversal document for invoice - add forgotten parameter IsCreateAllocation --- .../oracle/201907191210_IDEMPIERE-918.sql | 19 +++++++++++++++++++ .../postgresql/201907191210_IDEMPIERE-918.sql | 16 ++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 migration/i6.2/oracle/201907191210_IDEMPIERE-918.sql create mode 100644 migration/i6.2/postgresql/201907191210_IDEMPIERE-918.sql diff --git a/migration/i6.2/oracle/201907191210_IDEMPIERE-918.sql b/migration/i6.2/oracle/201907191210_IDEMPIERE-918.sql new file mode 100644 index 0000000000..b9995a6116 --- /dev/null +++ b/migration/i6.2/oracle/201907191210_IDEMPIERE-918.sql @@ -0,0 +1,19 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-918 Allow to choose the reversal document for invoice +-- Jul 19, 2019, 12:09:45 PM CEST +INSERT INTO AD_Element (AD_Element_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,ColumnName,Name,Description,Help,PrintName,EntityType,AD_Element_UU) VALUES (203347,0,0,'Y',TO_DATE('2019-07-19 12:09:33','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-07-19 12:09:33','YYYY-MM-DD HH24:MI:SS'),100,'IsCreateAllocation','Create Allocation',NULL,NULL,'Create Allocation','D','99112248-05b8-41d1-857c-5620a990c2f6') +; + +-- Jul 19, 2019, 12:10:16 PM CEST +INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,AD_Process_ID,SeqNo,AD_Reference_ID,IsRange,FieldLength,IsMandatory,DefaultValue,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200279,0,0,'Y',TO_DATE('2019-07-19 12:10:16','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-07-19 12:10:16','YYYY-MM-DD HH24:MI:SS'),100,'Create Allocation',200100,50,20,'N',1,'N','N','IsCreateAllocation','Y','D',203347,'49d6934d-3604-4acc-b24e-6c0d4054cd2b','N') +; + +-- Jul 19, 2019, 12:14:09 PM CEST +UPDATE AD_Process_Para SET DisplayLogic='@DocAction@=CO',Updated=TO_DATE('2019-07-19 12:14:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200279 +; + +SELECT register_migration_script('201907191210_IDEMPIERE-918.sql') FROM dual +; + diff --git a/migration/i6.2/postgresql/201907191210_IDEMPIERE-918.sql b/migration/i6.2/postgresql/201907191210_IDEMPIERE-918.sql new file mode 100644 index 0000000000..0b85a140a8 --- /dev/null +++ b/migration/i6.2/postgresql/201907191210_IDEMPIERE-918.sql @@ -0,0 +1,16 @@ +-- IDEMPIERE-918 Allow to choose the reversal document for invoice +-- Jul 19, 2019, 12:09:45 PM CEST +INSERT INTO AD_Element (AD_Element_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,ColumnName,Name,Description,Help,PrintName,EntityType,AD_Element_UU) VALUES (203347,0,0,'Y',TO_TIMESTAMP('2019-07-19 12:09:33','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-07-19 12:09:33','YYYY-MM-DD HH24:MI:SS'),100,'IsCreateAllocation','Create Allocation',NULL,NULL,'Create Allocation','D','99112248-05b8-41d1-857c-5620a990c2f6') +; + +-- Jul 19, 2019, 12:10:16 PM CEST +INSERT INTO AD_Process_Para (AD_Process_Para_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,Name,AD_Process_ID,SeqNo,AD_Reference_ID,IsRange,FieldLength,IsMandatory,DefaultValue,ColumnName,IsCentrallyMaintained,EntityType,AD_Element_ID,AD_Process_Para_UU,IsEncrypted) VALUES (200279,0,0,'Y',TO_TIMESTAMP('2019-07-19 12:10:16','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-07-19 12:10:16','YYYY-MM-DD HH24:MI:SS'),100,'Create Allocation',200100,50,20,'N',1,'N','N','IsCreateAllocation','Y','D',203347,'49d6934d-3604-4acc-b24e-6c0d4054cd2b','N') +; + +-- Jul 19, 2019, 12:14:09 PM CEST +UPDATE AD_Process_Para SET DisplayLogic='@DocAction@=CO',Updated=TO_TIMESTAMP('2019-07-19 12:14:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200279 +; + +SELECT register_migration_script('201907191210_IDEMPIERE-918.sql') FROM dual +; +