midsuit
/
core-jgi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hg merge release-6.2 (merge release6.2 into default)

This commit is contained in:
Carlos Ruiz 2019-07-20 12:39:26 +02:00
parent e5110b9109 cc881f7354
commit 1c48a96b10
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
migration/i6.2/oracle/201907191210_IDEMPIERE-918.sql Normal file
View File

@ -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
;

16
migration/i6.2/postgresql/201907191210_IDEMPIERE-918.sql Normal file
View File

@ -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
;

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java
View File

@ -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("<html>\n<body>\n<div class=\"help-content\">\n");