diff --git a/event.test/src/event/test/MyEventHandler.java b/event.test/src/event/test/MyEventHandler.java
index 971a9fa621..be9b2a93c8 100644
--- a/event.test/src/event/test/MyEventHandler.java
+++ b/event.test/src/event/test/MyEventHandler.java
@@ -14,7 +14,6 @@
 package event.test;
 
 import org.adempiere.base.event.AbstractEventHandler;
-import org.adempiere.base.event.IEventManager;
 import org.adempiere.base.event.IEventTopics;
 import org.adempiere.base.event.LoginEventData;
 import org.compiere.model.I_C_BP_Group;
diff --git a/org.adempiere.base.process/src/org/compiere/process/CostUpdate.java b/org.adempiere.base.process/src/org/compiere/process/CostUpdate.java
index 0118282f62..0ef7963bc7 100644
--- a/org.adempiere.base.process/src/org/compiere/process/CostUpdate.java
+++ b/org.adempiere.base.process/src/org/compiere/process/CostUpdate.java
@@ -238,7 +238,7 @@ public class CostUpdate extends SvrProcess
 	 */
 	private boolean createNew (MProduct product, MAcctSchema as)
 	{
-		MCost cost = MCost.get(product, 0, as, 0, m_ce.getM_CostElement_ID());
+		MCost cost = MCost.get(product, 0, as, 0, m_ce.getM_CostElement_ID(), get_TrxName());
 		if (cost.is_new())
 			return cost.save();
 		return false;
@@ -362,7 +362,7 @@ public class CostUpdate extends SvrProcess
 			MCostElement ce = getCostElement(TO_AverageInvoice);
 			if (ce == null)
 				throw new AdempiereSystemError("CostElement not found: " + TO_AverageInvoice);
-			MCost xCost = MCost.get(getCtx(), cost.getAD_Client_ID(), cost.getAD_Org_ID(), cost.getM_Product_ID(), cost.getM_CostType_ID(), cost.getC_AcctSchema_ID(), ce.getM_CostElement_ID(), cost.getM_AttributeSetInstance_ID());
+			MCost xCost = MCost.get(getCtx(), cost.getAD_Client_ID(), cost.getAD_Org_ID(), cost.getM_Product_ID(), cost.getM_CostType_ID(), cost.getC_AcctSchema_ID(), ce.getM_CostElement_ID(), cost.getM_AttributeSetInstance_ID(), get_TrxName());
 			if (xCost != null)
 				retValue = xCost.getCurrentCostPrice();
 		}
@@ -372,7 +372,7 @@ public class CostUpdate extends SvrProcess
 			MCostElement ce = getCostElement(TO_AverageInvoice);
 			if (ce == null)
 				throw new AdempiereSystemError("CostElement not found: " + TO_AverageInvoice);
-			MCost xCost = MCost.get(getCtx(), cost.getAD_Client_ID(), cost.getAD_Org_ID(), cost.getM_Product_ID(), cost.getM_CostType_ID(), cost.getC_AcctSchema_ID(), ce.getM_CostElement_ID(), cost.getM_AttributeSetInstance_ID());
+			MCost xCost = MCost.get(getCtx(), cost.getAD_Client_ID(), cost.getAD_Org_ID(), cost.getM_Product_ID(), cost.getM_CostType_ID(), cost.getC_AcctSchema_ID(), ce.getM_CostElement_ID(), cost.getM_AttributeSetInstance_ID(), get_TrxName());
 			if (xCost != null) 
 				retValue = xCost.getHistoryAverage();
 		}
@@ -383,7 +383,7 @@ public class CostUpdate extends SvrProcess
 			MCostElement ce = getCostElement(TO_AveragePO);
 			if (ce == null)
 				throw new AdempiereSystemError("CostElement not found: " + TO_AveragePO);
-			MCost xCost = MCost.get(getCtx(), cost.getAD_Client_ID(), cost.getAD_Org_ID(), cost.getM_Product_ID(), cost.getM_CostType_ID(), cost.getC_AcctSchema_ID(), ce.getM_CostElement_ID(), cost.getM_AttributeSetInstance_ID());
+			MCost xCost = MCost.get(getCtx(), cost.getAD_Client_ID(), cost.getAD_Org_ID(), cost.getM_Product_ID(), cost.getM_CostType_ID(), cost.getC_AcctSchema_ID(), ce.getM_CostElement_ID(), cost.getM_AttributeSetInstance_ID(), get_TrxName());
 			if (xCost != null)
 				retValue = xCost.getCurrentCostPrice();
 		}
@@ -393,7 +393,7 @@ public class CostUpdate extends SvrProcess
 			MCostElement ce = getCostElement(TO_AveragePO);
 			if (ce == null)
 				throw new AdempiereSystemError("CostElement not found: " + TO_AveragePO);
-			MCost xCost = MCost.get(getCtx(), cost.getAD_Client_ID(), cost.getAD_Org_ID(), cost.getM_Product_ID(), cost.getM_CostType_ID(), cost.getC_AcctSchema_ID(), ce.getM_CostElement_ID(), cost.getM_AttributeSetInstance_ID());
+			MCost xCost = MCost.get(getCtx(), cost.getAD_Client_ID(), cost.getAD_Org_ID(), cost.getM_Product_ID(), cost.getM_CostType_ID(), cost.getC_AcctSchema_ID(), ce.getM_CostElement_ID(), cost.getM_AttributeSetInstance_ID(), get_TrxName());
 			if (xCost != null) 
 				retValue = xCost.getHistoryAverage();
 		}
@@ -404,7 +404,7 @@ public class CostUpdate extends SvrProcess
 			MCostElement ce = getCostElement(TO_FiFo);
 			if (ce == null)
 				throw new AdempiereSystemError("CostElement not found: " + TO_FiFo);
-			MCost xCost = MCost.get(getCtx(), cost.getAD_Client_ID(), cost.getAD_Org_ID(), cost.getM_Product_ID(), cost.getM_CostType_ID(), cost.getC_AcctSchema_ID(), ce.getM_CostElement_ID(), cost.getM_AttributeSetInstance_ID());
+			MCost xCost = MCost.get(getCtx(), cost.getAD_Client_ID(), cost.getAD_Org_ID(), cost.getM_Product_ID(), cost.getM_CostType_ID(), cost.getC_AcctSchema_ID(), ce.getM_CostElement_ID(), cost.getM_AttributeSetInstance_ID(), get_TrxName());
 			if (xCost != null)
 				retValue = xCost.getCurrentCostPrice();
 		}
@@ -419,7 +419,7 @@ public class CostUpdate extends SvrProcess
 			MCostElement ce = getCostElement(TO_LastInvoicePrice);
 			if (ce != null)
 			{
-				MCost xCost = MCost.get(getCtx(), cost.getAD_Client_ID(), cost.getAD_Org_ID(), cost.getM_Product_ID(), cost.getM_CostType_ID(), cost.getC_AcctSchema_ID(), ce.getM_CostElement_ID(), cost.getM_AttributeSetInstance_ID());
+				MCost xCost = MCost.get(getCtx(), cost.getAD_Client_ID(), cost.getAD_Org_ID(), cost.getM_Product_ID(), cost.getM_CostType_ID(), cost.getC_AcctSchema_ID(), ce.getM_CostElement_ID(), cost.getM_AttributeSetInstance_ID(), get_TrxName());
 				if (xCost != null)
 					retValue = xCost.getCurrentCostPrice();
 			}
@@ -438,7 +438,7 @@ public class CostUpdate extends SvrProcess
 			MCostElement ce = getCostElement(TO_LastPOPrice);
 			if (ce != null)
 			{
-				MCost xCost = MCost.get(getCtx(), cost.getAD_Client_ID(), cost.getAD_Org_ID(), cost.getM_Product_ID(), cost.getM_CostType_ID(), cost.getC_AcctSchema_ID(), ce.getM_CostElement_ID(), cost.getM_AttributeSetInstance_ID());
+				MCost xCost = MCost.get(getCtx(), cost.getAD_Client_ID(), cost.getAD_Org_ID(), cost.getM_Product_ID(), cost.getM_CostType_ID(), cost.getC_AcctSchema_ID(), ce.getM_CostElement_ID(), cost.getM_AttributeSetInstance_ID(), get_TrxName());
 				if (xCost != null)
 					retValue = xCost.getCurrentCostPrice();
 			}
@@ -457,7 +457,7 @@ public class CostUpdate extends SvrProcess
 			MCostElement ce = getCostElement(TO_LiFo);
 			if (ce == null)
 				throw new AdempiereSystemError("CostElement not found: " + TO_LiFo);
-			MCost xCost = MCost.get(getCtx(), cost.getAD_Client_ID(), cost.getAD_Org_ID(), cost.getM_Product_ID(), cost.getM_CostType_ID(), cost.getC_AcctSchema_ID(), ce.getM_CostElement_ID(), cost.getM_AttributeSetInstance_ID());
+			MCost xCost = MCost.get(getCtx(), cost.getAD_Client_ID(), cost.getAD_Org_ID(), cost.getM_Product_ID(), cost.getM_CostType_ID(), cost.getC_AcctSchema_ID(), ce.getM_CostElement_ID(), cost.getM_AttributeSetInstance_ID(), get_TrxName());
 			if (xCost != null)
 				retValue = xCost.getCurrentCostPrice();
 		}
diff --git a/org.adempiere.base/src/org/adempiere/util/ServerContextPropertiesWrapper.java b/org.adempiere.base/src/org/adempiere/util/ServerContextPropertiesWrapper.java
index 9cf55a76a8..a929c49768 100644
--- a/org.adempiere.base/src/org/adempiere/util/ServerContextPropertiesWrapper.java
+++ b/org.adempiere.base/src/org/adempiere/util/ServerContextPropertiesWrapper.java
@@ -27,6 +27,8 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
+import org.adempiere.exceptions.AdempiereException;
+
 /**
  * @author hengsin
  *
@@ -73,7 +75,11 @@ public class ServerContextPropertiesWrapper extends Properties {
 	 */
 	@Override
 	public void save(OutputStream out, String comments) {
-		ServerContext.getCurrentInstance().save(out, comments);
+		try {
+			ServerContext.getCurrentInstance().store(out, comments);
+		} catch (IOException e) {
+			throw new AdempiereException(e);
+		}
 	}
 
 	/* (non-Javadoc)
diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_AssetAddition.java b/org.adempiere.base/src/org/compiere/acct/Doc_AssetAddition.java
index 0a64abd223..61e9924add 100644
--- a/org.adempiere.base/src/org/compiere/acct/Doc_AssetAddition.java
+++ b/org.adempiere.base/src/org/compiere/acct/Doc_AssetAddition.java
@@ -101,7 +101,7 @@ public class Doc_AssetAddition extends Doc
 		else if (MAssetAddition.A_SOURCETYPE_Manual.equals(assetAdd.getA_SourceType())
 				&& getC_Charge_ID() > 0) // backward compatibility: only if charge defined; if not fallback to product account 
 		{	
-			pAssetAcct = MCharge.getAccount(getC_Charge_ID(), as, null);
+			pAssetAcct = MCharge.getAccount(getC_Charge_ID(), as);
 			return pAssetAcct;
 		}	
 		else if (MAssetAddition.A_SOURCETYPE_Invoice.equals(assetAdd.getA_SourceType())
diff --git a/org.adempiere.base/src/org/compiere/model/MMovementConfirm.java b/org.adempiere.base/src/org/compiere/model/MMovementConfirm.java
index febdf16e50..0e78e9fcfc 100644
--- a/org.adempiere.base/src/org/compiere/model/MMovementConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/MMovementConfirm.java
@@ -455,7 +455,7 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
 			if (m_inventoryFrom == null)
 			{
 				MWarehouse wh = MWarehouse.get(getCtx(), loc.getM_Warehouse_ID());
-				m_inventoryFrom = new MInventory (wh);
+				m_inventoryFrom = new MInventory (wh, get_TrxName());
 				m_inventoryFrom.setDescription(Msg.translate(getCtx(), "M_MovementConfirm_ID") + " " + getDocumentNo());
 				if (!m_inventoryFrom.save(get_TrxName()))
 				{
@@ -497,7 +497,7 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
 			if (m_inventoryTo == null)
 			{
 				MWarehouse wh = MWarehouse.get(getCtx(), loc.getM_Warehouse_ID());
-				m_inventoryTo = new MInventory (wh);
+				m_inventoryTo = new MInventory (wh, get_TrxName());
 				m_inventoryTo.setDescription(Msg.translate(getCtx(), "M_MovementConfirm_ID") + " " + getDocumentNo());
 				if (!m_inventoryTo.save(get_TrxName()))
 				{
diff --git a/org.adempiere.base/src/org/compiere/model/MTemplate.java b/org.adempiere.base/src/org/compiere/model/MTemplate.java
index 53cf25fc4c..2908f2df12 100644
--- a/org.adempiere.base/src/org/compiere/model/MTemplate.java
+++ b/org.adempiere.base/src/org/compiere/model/MTemplate.java
@@ -20,7 +20,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.Properties;
 import java.util.logging.Level;
 
diff --git a/org.adempiere.base/src/org/compiere/model/MTimeExpense.java b/org.adempiere.base/src/org/compiere/model/MTimeExpense.java
index 4a09ee3701..121dad548e 100644
--- a/org.adempiere.base/src/org/compiere/model/MTimeExpense.java
+++ b/org.adempiere.base/src/org/compiere/model/MTimeExpense.java
@@ -560,7 +560,7 @@ public class MTimeExpense extends X_S_TimeExpense implements DocAction
 			return m_AD_User_ID;
 		if (getC_BPartner_ID() != 0)
 		{
-			MUser[] users = MUser.getOfBPartner(getCtx(), getC_BPartner_ID());
+			MUser[] users = MUser.getOfBPartner(getCtx(), getC_BPartner_ID(), get_TrxName());
 			if (users.length > 0)
 			{
 				m_AD_User_ID = users[0].getAD_User_ID();
diff --git a/org.adempiere.base/src/org/compiere/util/DB.java b/org.adempiere.base/src/org/compiere/util/DB.java
index 26b874d567..28e5092a70 100644
--- a/org.adempiere.base/src/org/compiere/util/DB.java
+++ b/org.adempiere.base/src/org/compiere/util/DB.java
@@ -1880,6 +1880,7 @@ public final class DB
 	 * 	@param trxName optional Transaction Name
 	 *  @return next no
 	 */
+	@SuppressWarnings("deprecation")
 	public static int getNextID (int AD_Client_ID, String TableName, String trxName)
 	{
 		boolean SYSTEM_NATIVE_SEQUENCE = MSysConfig.getBooleanValue(MSysConfig.SYSTEM_NATIVE_SEQUENCE,false);
diff --git a/org.adempiere.base/src/org/globalqss/process/CashFlow.java b/org.adempiere.base/src/org/globalqss/process/CashFlow.java
index c9b9e257fb..9234078396 100644
--- a/org.adempiere.base/src/org/globalqss/process/CashFlow.java
+++ b/org.adempiere.base/src/org/globalqss/process/CashFlow.java
@@ -20,6 +20,7 @@ import java.math.BigDecimal;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
+import java.util.Calendar;
 import java.util.logging.Level;
 
 import org.compiere.model.MAcctSchemaElement;
@@ -79,10 +80,12 @@ public class CashFlow  extends SvrProcess {
 	 */
 	protected String doIt() throws Exception {
 		
-		p_dateFrom = new Timestamp(System.currentTimeMillis());
-		p_dateFrom.setHours(0);
-		p_dateFrom.setMinutes(0);
-		p_dateFrom.setSeconds(0);
+		Calendar dateFrom = Calendar.getInstance();
+		dateFrom.setTimeInMillis(System.currentTimeMillis());
+		dateFrom.set(Calendar.HOUR_OF_DAY, 0);
+		dateFrom.set(Calendar.MINUTE, 0);
+		dateFrom.set(Calendar.SECOND, 0);
+		p_dateFrom = new Timestamp(dateFrom.getTimeInMillis());
 		p_dateFrom.setNanos(0);
 		
 		log.info("Calculating initial balance");
diff --git a/org.adempiere.ui.swing.pluginlist/src/org/adempiere/plugin/list/PluginList.java b/org.adempiere.ui.swing.pluginlist/src/org/adempiere/plugin/list/PluginList.java
index 7c521f93c8..d6bf19fa6c 100644
--- a/org.adempiere.ui.swing.pluginlist/src/org/adempiere/plugin/list/PluginList.java
+++ b/org.adempiere.ui.swing.pluginlist/src/org/adempiere/plugin/list/PluginList.java
@@ -1,7 +1,6 @@
 package org.adempiere.plugin.list;
 
 import java.awt.BorderLayout;
-import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Vector;
@@ -13,7 +12,6 @@ import javax.swing.table.DefaultTableModel;
 
 import org.compiere.apps.form.FormFrame;
 import org.compiere.apps.form.FormPanel;
-import org.compiere.apps.form.VFileImport;
 import org.compiere.minigrid.MiniTable;
 import org.compiere.swing.CPanel;
 import org.compiere.util.CLogger;
diff --git a/org.adempiere.ui.swing/src/de/schaeffer/compiere/tools/DocumentSearch.java b/org.adempiere.ui.swing/src/de/schaeffer/compiere/tools/DocumentSearch.java
index d79de15c02..6d21951cc5 100644
--- a/org.adempiere.ui.swing/src/de/schaeffer/compiere/tools/DocumentSearch.java
+++ b/org.adempiere.ui.swing/src/de/schaeffer/compiere/tools/DocumentSearch.java
@@ -48,7 +48,7 @@ public class DocumentSearch extends AbstractDocumentSearch {
 	static CLogger log = CLogger.getCLogger(DocumentSearch.class);
 	@Override
 	protected boolean openWindow(int windowId, MQuery query) {
-		final AWindow frame = new AWindow();
+		final AWindow frame = new AWindow(null);
 		AEnv.addToWindowManager(frame);
 		if (frame.initWindow(windowId, query)) {
 			frame.pack();
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/AEnv.java b/org.adempiere.ui.swing/src/org/compiere/apps/AEnv.java
index cde55fb876..dcc9469862 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/AEnv.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/AEnv.java
@@ -668,7 +668,7 @@ public final class AEnv
 		}
 		
 		log.config(TableName + " - Record_ID=" + Record_ID + " (IsSOTrx=" + isSOTrx + ")");
-		AWindow frame = new AWindow();
+		AWindow frame = new AWindow(null);
 		if (!frame.initWindow(AD_Window_ID, MQuery.getEqualQuery(TableName + "_ID", Record_ID)))
 			return;
 		addToWindowManager(frame);
@@ -726,7 +726,7 @@ public final class AEnv
 		}
 		
 		log.config(query + " (IsSOTrx=" + isSOTrx + ")");
-		AWindow frame = new AWindow();
+		AWindow frame = new AWindow(null);
 		if (!frame.initWindow(AD_Window_ID, query))
 			return;
 		addToWindowManager(frame);
@@ -840,7 +840,7 @@ public final class AEnv
 			query.addRestriction("Record_ID", MQuery.EQUAL, Record_ID);
 		}
 		//
-		AWindow frame = new AWindow();
+		AWindow frame = new AWindow(null);
 		if (!frame.initWindow(s_workflow_Window_ID, query))
 			return;
 		addToWindowManager(frame);
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/AZoomAcross.java b/org.adempiere.ui.swing/src/org/compiere/apps/AZoomAcross.java
index 173ac55730..163eff3cc2 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/AZoomAcross.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/AZoomAcross.java
@@ -118,7 +118,7 @@ public class AZoomAcross
 		logger.info("AD_Window_ID=" + AD_Window_ID 
 			+ " - " + query); 
 		
-		AWindow frame = new AWindow();
+		AWindow frame = new AWindow(null);
 		if (!frame.initWindow(AD_Window_ID, query))
 			return;
 		AEnv.addToWindowManager(frame);
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/Waiting.java b/org.adempiere.ui.swing/src/org/compiere/apps/Waiting.java
index 481fbaa625..1ce51e0834 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/Waiting.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/Waiting.java
@@ -19,7 +19,6 @@ package org.compiere.apps;
 import java.awt.BorderLayout;
 import java.awt.Cursor;
 import java.awt.Dialog;
-import java.awt.FlowLayout;
 import java.awt.Frame;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/VAttributeGrid.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VAttributeGrid.java
index f5cb28274c..40439b2c1a 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/form/VAttributeGrid.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/VAttributeGrid.java
@@ -540,7 +540,7 @@ public class VAttributeGrid extends CPanel
 	{
 		Adempiere.startup(true);
 		Env.setContext(Env.getCtx(), "#AD_Client_ID", 11);
-		FormFrame ff = new FormFrame();
+		FormFrame ff = new FormFrame(null);
 		ff.openForm(1111, "org.compiere.apps.form.VAttributeGrid", "Attribute Table");
 		ff.pack();
 		AEnv.showCenterScreen(ff);
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/VPaySelect.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VPaySelect.java
index 7489aa6479..5e1fbd6c2d 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/form/VPaySelect.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/VPaySelect.java
@@ -407,7 +407,7 @@ public class VPaySelect extends PaySelect implements FormPanel, ActionListener,
 
 		//  Start PayPrint
 		int AD_Form_ID = FORM_PAYMENT_PRINT_EXPORT;	//	Payment Print/Export
-		FormFrame ff = new FormFrame();
+		FormFrame ff = new FormFrame(null);
 		ff.openForm (AD_Form_ID);
 		//	Set Parameter
 		if (m_ps != null)
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/VTrxMaterial.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VTrxMaterial.java
index 968347de65..afc83dd5f6 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/form/VTrxMaterial.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/VTrxMaterial.java
@@ -286,7 +286,7 @@ public class VTrxMaterial extends TrxMaterial
 
 		//  Zoom
 		panel.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-		AWindow frame = new AWindow();
+		AWindow frame = new AWindow(panel.getGraphicsConfiguration());
 		if (!frame.initWindow(AD_Window_ID, query))
 		{
 			panel.setCursor(Cursor.getDefaultCursor());
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/Info.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/Info.java
index 55a7392678..4badc03225 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/search/Info.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/Info.java
@@ -815,7 +815,7 @@ public abstract class Info extends CDialog
 	protected void zoom (int AD_Window_ID, MQuery zoomQuery)
 	{
 		setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-		final AWindow frame = new AWindow();
+		final AWindow frame = new AWindow(null);
 		if (!frame.initWindow(AD_Window_ID, zoomQuery))
 			return;
 		AEnv.addToWindowManager(frame);
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/wf/WFActivity.java b/org.adempiere.ui.swing/src/org/compiere/apps/wf/WFActivity.java
index 79564a2e9e..fcee145a41 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/wf/WFActivity.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/wf/WFActivity.java
@@ -674,7 +674,7 @@ public class WFActivity extends CPanel
 			//
 			log.info("Zoom to AD_Window_ID=" + AD_Window_ID 
 				+ " - " + query + " (IsSOTrx=" + IsSOTrx + ")");
-			AWindow frame = new AWindow();
+			AWindow frame = new AWindow(null);
 			if (!frame.initWindow(AD_Window_ID, query))
 				return;
 			AEnv.addToWindowManager(frame);
@@ -684,7 +684,7 @@ public class WFActivity extends CPanel
 		else if (MWFNode.ACTION_UserForm.equals(node.getAction()))
 		{
 			int AD_Form_ID = node.getAD_Form_ID();
-			FormFrame ff = new FormFrame();
+			FormFrame ff = new FormFrame(null);
 			ff.openForm(AD_Form_ID);
 			ff.pack();
 			AEnv.addToWindowManager(ff);
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/wf/WFPanel.java b/org.adempiere.ui.swing/src/org/compiere/apps/wf/WFPanel.java
index 087f0c25e3..43ca35bf28 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/wf/WFPanel.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/wf/WFPanel.java
@@ -490,7 +490,7 @@ public class WFPanel extends CPanel
 		MQuery query = null;
 		if (m_wf != null)
 			query = MQuery.getEqualQuery("AD_Workflow_ID", m_wf.getAD_Workflow_ID());
-		AWindow frame = new AWindow();
+		AWindow frame = new AWindow(null);
 		if (!frame.initWindow (m_WF_Window_ID, query))
 			return;
 		AEnv.addToWindowManager(frame);
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocator.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocator.java
index 16a1055739..a605419dff 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocator.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocator.java
@@ -526,7 +526,7 @@ public class VLocator extends JComponent
 		log.info("");
 		//
 		setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-		AWindow frame = new AWindow();
+		AWindow frame = new AWindow(null);
 		
 		MQuery zoomQuery = new MQuery();
 		zoomQuery.addRestriction(MLocator.COLUMNNAME_M_Locator_ID, MQuery.EQUAL, getValue());
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java
index 5d619f550e..fd65f8c548 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java
@@ -1412,7 +1412,7 @@ public class VLookup extends JComponent
 		//
 		setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
 		//
-		AWindow frame = new AWindow();
+		AWindow frame = new AWindow(null);
 		if (!frame.initWindow(AD_Window_ID, zoomQuery))
 		{
 			setCursor(Cursor.getDefaultCursor());
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttributeDialog.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttributeDialog.java
index 68a1e71409..f406343d22 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttributeDialog.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttributeDialog.java
@@ -685,7 +685,7 @@ public class VPAttributeDialog extends CDialog
 		setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
 		//
 		int AD_Window_ID = WINDOW_LOT;		//	Lot
-		AWindow frame = new AWindow();
+		AWindow frame = new AWindow(null);
 		if (frame.initWindow(AD_Window_ID, zoomQuery))
 		{
 			this.setVisible(false);
diff --git a/org.adempiere.ui.swing/src/org/compiere/print/SwingViewerProvider.java b/org.adempiere.ui.swing/src/org/compiere/print/SwingViewerProvider.java
index aaab4c0de0..efb50c90b3 100644
--- a/org.adempiere.ui.swing/src/org/compiere/print/SwingViewerProvider.java
+++ b/org.adempiere.ui.swing/src/org/compiere/print/SwingViewerProvider.java
@@ -29,8 +29,8 @@ import org.compiere.apps.AMenu;
 public class SwingViewerProvider implements ReportViewerProvider {
 
 	public void openViewer(ReportEngine re) {
-		Viewer viewer = new Viewer(re);
 		JFrame top = AEnv.getWindow(0);
+		Viewer viewer = new Viewer(top.getGraphicsConfiguration(), re);
 		if (top instanceof AMenu)
 			((AMenu)top).getWindowManager().add(viewer);
 	}
diff --git a/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java b/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java
index 4e1300c9d2..fc26d865f9 100644
--- a/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java
+++ b/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java
@@ -1339,7 +1339,7 @@ public class Viewer extends CFrame
 	//	MPrintFormat f = new MPrintFormat(Env.getCtx(), 101);
 	//	ReportEngine re = new ReportEngine(f, null);
 
-		new Viewer(re);
+		new Viewer(null, re);
 	}	//	main
 
 	@Override
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAttributeGrid.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAttributeGrid.java
index ff98237692..a806d3c995 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAttributeGrid.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAttributeGrid.java
@@ -115,7 +115,7 @@ public class WAttributeGrid extends ADForm implements EventListener<Event>
 		
 		gridView.setWidth("100%");
 		gridView.setHeight("100%");
-		gridView.setFixedLayout(true);
+		gridView.setSizedByContent(false);
         
 		Rows rows = new Rows();
 		gridSelection.appendChild(rows);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java
index 7c8994a051..1861c548bf 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java
@@ -357,7 +357,7 @@ public class WTreeBOM extends TreeBOM implements IFormController, EventListener<
 			
 			SimpleTreeModel model = new SimpleTreeModel(parent);
 			m_tree.setPageSize(-1);
-			m_tree.setTreeitemRenderer(model);
+			m_tree.setItemRenderer(model);
 			m_tree.setModel(model);
 		}
 		else
@@ -386,7 +386,7 @@ public class WTreeBOM extends TreeBOM implements IFormController, EventListener<
 			SimpleTreeModel model = new SimpleTreeModel(parent);
 			
 			m_tree.setPageSize(-1);
-			m_tree.setTreeitemRenderer(model);
+			m_tree.setItemRenderer(model);
 			m_tree.setModel(model);
 		}
 		
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java
index 5a6d803aaa..457155b666 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java
@@ -122,10 +122,10 @@ public class WTreeMaintenance extends TreeMaintenance implements IFormController
 	 */
 	private void jbInit () throws Exception
 	{
-		bAddAll.setSrc("images/FastBack24.png");
-		bAdd.setSrc("images/StepBack24.png");
-		bDelete.setSrc("images/StepForward24.png");
-		bDeleteAll.setSrc("images/FastForward24.png");
+		bAddAll.setImage("images/FastBack24.png");
+		bAdd.setImage("images/StepBack24.png");
+		bDelete.setImage("images/StepForward24.png");
+		bDeleteAll.setImage("images/FastForward24.png");
 		
 		form.setWidth("99%");
 		form.setHeight("100%");
@@ -183,7 +183,7 @@ public class WTreeMaintenance extends TreeMaintenance implements IFormController
 		east.setSplittable(true);
 		east.setWidth("45%");
 		centerList.setVflex(true);
-		centerList.setFixedLayout(true);
+		centerList.setSizedByContent(false);
 		centerList.addEventListener(Events.ON_SELECT, this);
 	}	//	jbInit
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
index 74dcbceecd..22585ff627 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
@@ -415,7 +415,7 @@ public class WWFActivity extends ADForm implements EventListener<Event>
 		listbox.setModel(model);
 		listbox.setItemRenderer(renderer);
 		listbox.repaint();
-		listbox.setFixedLayout(true);
+		listbox.setSizedByContent(false);
 
 		return m_activities.length;
 	}	//	loadActivities
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DatetimeBox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DatetimeBox.java
index 57ea4d6f74..788ede8d75 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DatetimeBox.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DatetimeBox.java
@@ -13,6 +13,7 @@
 package org.adempiere.webui.component;
 
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 
 import org.zkoss.zk.ui.event.EventListener;
@@ -111,9 +112,13 @@ public class DatetimeBox extends Panel {
 		Date t = timeBox.getValue();
 		
 		if (d != null && t != null) {
-			d.setHours(t.getHours());
-			d.setMinutes(t.getMinutes());
-			d.setSeconds(t.getSeconds());
+			Calendar cd = Calendar.getInstance();
+			cd.setTime(d);
+			Calendar ct = Calendar.getInstance();
+			ct.setTime(t);
+			cd.set(cd.get(Calendar.YEAR), cd.get(Calendar.MONTH), cd.get(Calendar.DAY_OF_MONTH),
+				   ct.get(Calendar.HOUR_OF_DAY), ct.get(Calendar.MINUTE), ct.get(Calendar.SECOND));
+			d = cd.getTime();
 		}
 		
 		return d;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListboxFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListboxFactory.java
index 5df2f35b2a..1331c21c3c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListboxFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListboxFactory.java
@@ -37,7 +37,7 @@ public class ListboxFactory {
 		WListbox dataTable = new WListbox();
 		dataTable.setWidth("100%");
 		dataTable.setHeight("100%");
-		dataTable.setFixedLayout(true);
+		dataTable.setSizedByContent(false);
 		dataTable.setVflex(true);
 		
 		return dataTable;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
index 4b2701ce1d..f78ab455a4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
@@ -651,7 +651,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 
     private void addDoubleClickListener() {
-		Iterator<EventListener<? extends Event>> i = contentPanel.getListenerIterator(Events.ON_DOUBLE_CLICK);
+    	Iterator<EventListener<? extends Event>> i = contentPanel.getEventListeners(Events.ON_DOUBLE_CLICK).iterator();
 		while (i.hasNext()) {
 			if (i.next() == this)
 				return;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/InfoSchedule.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/InfoSchedule.java
index d9db320ec7..327ce7ec63 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/InfoSchedule.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/InfoSchedule.java
@@ -277,7 +277,7 @@ public class InfoSchedule extends Window implements EventListener<Event>
 			btnNew = new Button();
 	        btnNew.setName("btnNew");
 	        btnNew.setId("New");
-	        btnNew.setSrc("/images/New24.png");
+	        btnNew.setImage("/images/New24.png");
 	        
 			confirmPanel.addComponentsLeft(btnNew);			
 			btnNew.addEventListener(Events.ON_CLICK, this);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java
index 7bc5d4a425..42517f1534 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java
@@ -30,9 +30,9 @@ import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zul.Borderlayout;
 import org.zkoss.zul.Center;
-import org.zkoss.zul.North;
 import org.zkoss.zul.Iframe;
 import org.zkoss.zul.Listitem;
+import org.zkoss.zul.North;
 import org.zkoss.zul.Tab;
 import org.zkoss.zul.Toolbar;
 
diff --git a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ADLookup.java b/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ADLookup.java
index 8d5f342431..b648478349 100644
--- a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ADLookup.java
+++ b/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ADLookup.java
@@ -89,7 +89,7 @@ public class ADLookup {
 	 
 	 try  {
 		 
-		PreparedStatement pstmt = DB.prepareStatement( info.getSQL() );
+		PreparedStatement pstmt = DB.prepareStatement( info.getSQL(), null );
 		info.setParameters( pstmt, false );
 		ResultSet rs = pstmt.executeQuery();
 		while (rs.next())
@@ -317,7 +317,7 @@ public class ADLookup {
 				PreparedStatement pstmt = null;
 				try
 				{
-					pstmt = DB.prepareStatement(query);
+					pstmt = DB.prepareStatement(query, null);
 					pstmt.setInt(1, AD_Reference_ID);
 					ResultSet rs = pstmt.executeQuery();
 					if (rs.next())
@@ -385,7 +385,7 @@ public class ADLookup {
 		PreparedStatement pstmt = null;
 		try
 		{
-			pstmt = DB.prepareStatement(query);
+			pstmt = DB.prepareStatement(query, null);
 			pstmt.setString(1, m_keyColumnName);
 			ResultSet rs = pstmt.executeQuery();
 			while (rs.next())
diff --git a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/Process.java b/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/Process.java
index e02e0714fe..071d689b59 100644
--- a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/Process.java
+++ b/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/Process.java
@@ -869,7 +869,7 @@ public class Process {
 				+ " AND l.AD_Reference_ID=135 ORDER BY t.Name";
 		try
 		{
-			PreparedStatement pstmt = DB.prepareStatement(sql);
+			PreparedStatement pstmt = DB.prepareStatement(sql, null);
 			ResultSet rs = pstmt.executeQuery();
 			while (rs.next())
 			{
diff --git a/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportInfo.java b/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportInfo.java
index 99a905fe33..a93856a04f 100644
--- a/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportInfo.java
+++ b/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportInfo.java
@@ -94,7 +94,7 @@ public class ReportInfo
             {
                 try
                 {
-                    jasperReport = (JasperReport)JRLoader.loadObject(jasperFile.getAbsolutePath());   // Marco LOMBARDO: should refer to local.
+                    jasperReport = (JasperReport)JRLoader.loadObjectFromFile(jasperFile.getAbsolutePath());   // Marco LOMBARDO: should refer to local.
                 }
                 catch (JRException e)
                 {
@@ -156,7 +156,7 @@ public class ReportInfo
    	    System.setProperty("jasper.reports.compile.class.path", compiere_home+"/lib/reporttools.jar;"+compiere_home+"/lib/Compiere.jar");
             JasperCompileManager.compileReportToFile( reportFile.getAbsolutePath(), jasperFile.getAbsolutePath());
             jasperFile.setLastModified( reportFile.lastModified());
-            res = (JasperReport)JRLoader.loadObject(jasperFile.getAbsolutePath());
+            res = (JasperReport)JRLoader.loadObjectFromFile(jasperFile.getAbsolutePath());
         }
         catch (JRException e)
         {
@@ -180,7 +180,7 @@ public class ReportInfo
         ResultSet rs = null;
         try
         {
-            pstmt = DB.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
+            pstmt = DB.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, null);
             pstmt.setInt(1, AD_Process_ID);
             rs = pstmt.executeQuery();
             String path = null;