- Welcome to the iDempiere (OSGi+ADempiere) 1.0a Page!
+ | Welcome to the iDempiere (OSGi+ADempiere) 1.0b Page!
|
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java
index 5fb96f5793..f2b39bfffc 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java
@@ -282,11 +282,11 @@ public class ProcessParameterPanel extends Panel implements
editor.getComponent().addEventListener(Events.ON_BLUR, this);
editor.addValueChangeListener(this);
editor.dynamicDisplay();
+ // MField => VEditor - New Field value to be updated to editor
+ mField.addPropertyChangeListener(editor);
// Set Default
Object defaultObject = mField.getDefault();
mField.setValue(defaultObject, true);
- // MField => VEditor - New Field value to be updated to editor
- mField.addPropertyChangeListener(editor);
// streach component to fill grid cell
editor.fillHorizontal();
// setup editor context menu
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
index 9d1f496238..d923052a11 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
@@ -13,6 +13,8 @@
*****************************************************************************/
package org.adempiere.webui.dashboard;
+import static org.compiere.model.MSysConfig.CALENDAR_ALTERNATE_TIMEZONE;
+
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.math.BigDecimal;
@@ -30,9 +32,11 @@ import java.util.TimeZone;
import org.adempiere.webui.component.Window;
import org.adempiere.webui.session.SessionManager;
+import org.compiere.model.MSysConfig;
import org.compiere.model.X_R_RequestType;
import org.compiere.util.Env;
import org.compiere.util.Msg;
+import org.compiere.util.Util;
import org.jfree.chart.ChartFactory;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.encoders.EncoderUtil;
@@ -370,10 +374,20 @@ public class CalendarWindow extends Window implements EventListener {
private String getTimeZone()
{
+ String alternateTimeZone = MSysConfig.getValue(CALENDAR_ALTERNATE_TIMEZONE, "Pacific Time=PST", Env.getAD_Client_ID(Env.getCtx()));
TimeZone defaultTimeZone = TimeZone.getDefault();
- String defaultTimeZoneName = defaultTimeZone.getDisplayName();
- int defaultTimeZoneOffset = defaultTimeZone.getOffset(0) / 3375000;
- return defaultTimeZoneName + "=GMT" + (defaultTimeZoneOffset > 0 ? "+" : "-") + defaultTimeZoneOffset + ",Pacific Time=GMT-8";
+ StringBuilder defaultTimeZoneName = new StringBuilder(defaultTimeZone.getDisplayName());
+ int defaultTimeZoneOffset = defaultTimeZone.getOffset(0) / 3600000;
+ defaultTimeZoneName.append("=GMT");
+ if (defaultTimeZoneOffset >= 0)
+ defaultTimeZoneName.append("+");
+ defaultTimeZoneName.append(defaultTimeZoneOffset);
+ if (!Util.isEmpty(alternateTimeZone, true)) {
+ if (!alternateTimeZone.equalsIgnoreCase(defaultTimeZoneName.toString())) {
+ defaultTimeZoneName.append(",").append(alternateTimeZone);
+ }
+ }
+ return defaultTimeZoneName.toString();
}
private void updateDateLabel() {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
index d8eabc75e1..93b4875e68 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
@@ -399,6 +399,7 @@ ContextMenuListener, IZoomableEditor
ValueChangeEvent changeEvent = new ValueChangeEvent(this, this.getColumnName(), oldValue, newValue);
super.fireValueChange(changeEvent);
oldValue = newValue;
+ getComponent().setValue(newValue);
}
} finally {
onselecting = false;
diff --git a/org.adempiere.webstore.resource/ADempiere120x60.gif b/org.adempiere.webstore.resource/iDempiere120x60.png
similarity index 100%
rename from org.adempiere.webstore.resource/ADempiere120x60.gif
rename to org.adempiere.webstore.resource/iDempiere120x60.png