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

Merge dae0e59c3529

This commit is contained in:
Heng Sin Low 2013-06-26 03:17:19 +08:00
parent 6cb2e6180b 916636c30f
commit 69de4d3d87
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.base/src/org/compiere/Adempiere.java
View File

@ -92,7 +92,7 @@ public final class Adempiere
/** Subtitle */
static public final String SUB_TITLE = "Smart Suite ERP, CRM and SCM";
static public final String ADEMPIERE_R = "iDempiere\u00AE";
static public String ADEMPIERE_R = "iDempiere\u00AE";
static public final String COPYRIGHT = "\u00A9 1999-2013 iDempiere\u00AE";
static private String s_ImplementationVersion = null;

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
View File

@ -41,6 +41,7 @@ import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.theme.ThemeManager;
import org.adempiere.webui.util.BrowserToken;
import org.adempiere.webui.util.UserPreference;
import org.compiere.Adempiere;
import org.compiere.model.MRole;
import org.compiere.model.MSession;
import org.compiere.model.MSysConfig;
@ -132,6 +133,8 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
{
this.getPage().setTitle(ThemeManager.getBrowserTitle());
Adempiere.ADEMPIERE_R = ThemeManager.getStandardReportFooterTrademarkText();
SessionManager.setSessionApplication(this);
Session session = Executions.getCurrent().getDesktop().getSession();
@SuppressWarnings("unchecked")

9
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java
View File

@ -16,6 +16,7 @@ package org.adempiere.webui.theme;
import java.io.IOException;
import org.adempiere.webui.AdempiereWebUI;
import org.compiere.Adempiere;
import org.compiere.model.MClientInfo;
import org.compiere.model.MImage;
import org.compiere.model.MSysConfig;
@ -144,4 +145,12 @@ public final class ThemeManager {
return null;
}
}
/**
* @return trademark text for standard report footer
*/
public static String getStandardReportFooterTrademarkText() {
String s = Env.getContext(Env.getCtx(), "#ZK_STANDARD_REPORT_FOOTER_TRADEMARK_TEXT");
return Util.isEmpty(s) ? Adempiere.ADEMPIERE_R : s;
}
}