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

IDEMPIERE-2271 iDempiere is hardcoded EMail to support subject / IDEMPIERE-2260 iDempiere is hardcoded in MClient.testEMail / based on patch from Nicolas Micoud (nmicoud)

This commit is contained in:
Carlos Ruiz 2014-10-29 11:48:00 -05:00
parent 5c27c2bf3d
commit 1c351ddd23
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
migration/i2.0z/oracle/201410291142_IDEMPIERE-2260.sql Normal file
View File

@ -0,0 +1,6 @@
update ad_system set name='iDempiere' where name='?'
;
SELECT register_migration_script('201410291142_IDEMPIERE-2260.sql') FROM dual
;

6
migration/i2.0z/postgresql/201410291142_IDEMPIERE-2260.sql Normal file
View File

@ -0,0 +1,6 @@
update ad_system set name='iDempiere' where name='?'
;
SELECT register_migration_script('201410291142_IDEMPIERE-2260.sql') FROM dual
;

5
org.adempiere.base/src/org/compiere/model/MClient.java
View File

@ -447,9 +447,10 @@ public class MClient extends X_AD_Client
return msgreturn.toString(); return msgreturn.toString();
} }
// //
StringBuilder msgce = new StringBuilder("iDempiere EMail Test: ").append(toString()); String systemName = MSystem.get(getCtx()).getName();
StringBuilder msgce = new StringBuilder(systemName).append(" EMail Test: ").append(toString());
EMail email = createEMail (getRequestEMail(), EMail email = createEMail (getRequestEMail(),
"iDempiere EMail Test",msgce.toString()); systemName + " EMail Test",msgce.toString());
if (email == null){ if (email == null){
StringBuilder msgreturn = new StringBuilder("Could not create EMail: ").append(getName()); StringBuilder msgreturn = new StringBuilder("Could not create EMail: ").append(getName());
return msgreturn.toString(); return msgreturn.toString();

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFeedbackService.java
View File

@ -103,7 +103,7 @@ public class DefaultFeedbackService implements IFeedbackService {
Msg.getMsg(Env.getCtx(), "EMailSupport"), Msg.getMsg(Env.getCtx(), "EMailSupport"),
MUser.get(Env.getCtx()), MUser.get(Env.getCtx()),
"", // to "", // to
"iDempiere " + Msg.getMsg(Env.getCtx(), "TraceInfo"), MSystem.get(Env.getCtx()).getName() + " " + Msg.getMsg(Env.getCtx(), "TraceInfo"),
"", ds); "", ds);
dialog.setAttribute(Window.MODE_KEY, Mode.OVERLAPPED); dialog.setAttribute(Window.MODE_KEY, Mode.OVERLAPPED);