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

IDEMPIERE-3647 Better disposal of acknowledge flag in the e-mail dialog

This commit is contained in:
Alan Lescano 2018-03-08 16:44:09 +01:00
parent 1e20f020ab
commit 077fcee55e
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
migration/i5.1/oracle/201803031514_IDEMPIERE-3647.sql Normal file
View File

@ -0,0 +1,10 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-3647 Better disposal of acknowledge flag in the e-mail dialog
-- 03/03/2018 15h10min45s BRT
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 ('I','Request a Read Receipt',0,0,'Y',TO_DATE('2018-03-03 15:10:44','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2018-03-03 15:10:44','YYYY-MM-DD HH24:MI:SS'),0,200450,'RequestReadReceipt','D','8f7f20d2-e518-4ada-a271-013e4801f648')
;
SELECT register_migration_script('201803031514_IDEMPIERE-3647.sql') FROM dual
;

7
migration/i5.1/postgresql/201803031514_IDEMPIERE-3647.sql Normal file
View File

@ -0,0 +1,7 @@
-- IDEMPIERE-3647 Better disposal of acknowledge flag in the e-mail dialog
-- 03/03/2018 15h10min45s BRT
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 ('I','Request a Read Receipt',0,0,'Y',TO_TIMESTAMP('2018-03-03 15:10:44','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2018-03-03 15:10:44','YYYY-MM-DD HH24:MI:SS'),0,200450,'RequestReadReceipt','D','8f7f20d2-e518-4ada-a271-013e4801f648')
;
SELECT register_migration_script('201803031514_IDEMPIERE-3647.sql') FROM dual
;

13
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
View File

@ -244,7 +244,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
lSubject.setValue(Msg.getMsg(Env.getCtx(), "Subject") + ":");
lAttachment.setValue(Msg.getMsg(Env.getCtx(), "Attachment") + ":");
fFrom.setReadonly(true);
isAcknowledgmentReceipt.setLabel(Msg.getMsg(Env.getCtx(), "Acknowledge"));
isAcknowledgmentReceipt.setLabel(Msg.getMsg(Env.getCtx(), "RequestReadReceipt"));
//
Grid grid = new Grid();
@ -254,10 +254,10 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
Columns columns = new Columns();
Column column = new Column();
ZKUpdateUtil.setWidth(column, "30%");
ZKUpdateUtil.setWidth(column, "10%");
columns.appendChild(column);
column = new Column();
ZKUpdateUtil.setWidth(column, "70%");
ZKUpdateUtil.setWidth(column, "90%");
columns.appendChild(column);
grid.appendChild(columns);
@ -284,7 +284,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
row = new Row();
rows.appendChild(row);
row.appendChild(isAcknowledgmentReceipt);
row.appendChild(new Label(""));
row.appendChild(fTo);
ZKUpdateUtil.setHflex(fTo, "1");
@ -303,6 +303,11 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
row.appendChild(fCc);
ZKUpdateUtil.setHflex(fCc, "1");
row = new Row();
rows.appendChild(row);
row.appendChild(new Label(""));
row.appendChild(isAcknowledgmentReceipt);
row = new Row();
rows.appendChild(row);
div = new Div();