diff --git a/org.adempiere.base/src/org/compiere/model/MAssetAcct.java b/org.adempiere.base/src/org/compiere/model/MAssetAcct.java
index 45f93ea304..f69e0cdd33 100644
--- a/org.adempiere.base/src/org/compiere/model/MAssetAcct.java
+++ b/org.adempiere.base/src/org/compiere/model/MAssetAcct.java
@@ -21,7 +21,12 @@ import org.compiere.util.TimeUtil;
  */
 public class MAssetAcct extends X_A_Asset_Acct
 {
-	private static final long serialVersionUID = 1L;
+	
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3919172418904053712L;
 
 	/**
 	 * DO NOT USE DIRECTLY
diff --git a/org.adempiere.base/src/org/compiere/model/MAssetAddition.java b/org.adempiere.base/src/org/compiere/model/MAssetAddition.java
index 40741be988..065b8c4b6c 100644
--- a/org.adempiere.base/src/org/compiere/model/MAssetAddition.java
+++ b/org.adempiere.base/src/org/compiere/model/MAssetAddition.java
@@ -35,8 +35,11 @@ import org.idempiere.fa.util.POCacheLocal;
 public class MAssetAddition extends X_A_Asset_Addition
 	implements DocAction
 {
-	private static final long serialVersionUID = 1L;
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 5977180589101094202L;
 	/** Static Logger */
 	private static CLogger s_log = CLogger.getCLogger(MAssetAddition.class);
 
diff --git a/org.adempiere.base/src/org/compiere/model/MAssetGroup.java b/org.adempiere.base/src/org/compiere/model/MAssetGroup.java
index 422b6ece9a..de3d9bd917 100644
--- a/org.adempiere.base/src/org/compiere/model/MAssetGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/MAssetGroup.java
@@ -12,8 +12,11 @@ import org.compiere.util.DB;
  */
 public class MAssetGroup extends X_A_Asset_Group
 {
-	private static final long serialVersionUID = 1L;
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -173157506404569463L;
 	/** Cache: ID -> MAssetGroup */
 	private static CCache<Integer, MAssetGroup> s_cache = new CCache<Integer, MAssetGroup>(Table_Name, 10, 0);
 	
diff --git a/org.adempiere.base/src/org/compiere/model/MAssetGroupAcct.java b/org.adempiere.base/src/org/compiere/model/MAssetGroupAcct.java
index 6bfc1750d7..a3c588f90f 100644
--- a/org.adempiere.base/src/org/compiere/model/MAssetGroupAcct.java
+++ b/org.adempiere.base/src/org/compiere/model/MAssetGroupAcct.java
@@ -16,7 +16,11 @@ import org.idempiere.fa.feature.UseLifeImpl;
 public class MAssetGroupAcct extends X_A_Asset_Group_Acct
 	implements UseLife
 {
-	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3458020679308192943L;
 
 	/**
 	 * Get Asset Group Accountings for given group
diff --git a/org.adempiere.base/src/org/compiere/model/MAssetProduct.java b/org.adempiere.base/src/org/compiere/model/MAssetProduct.java
index 8c5a15e56f..f502c907af 100644
--- a/org.adempiere.base/src/org/compiere/model/MAssetProduct.java
+++ b/org.adempiere.base/src/org/compiere/model/MAssetProduct.java
@@ -12,7 +12,11 @@ import org.compiere.model.Query;
  */
 public class MAssetProduct extends X_A_Asset_Product
 {
-	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2459915999284269350L;
 
 	/** Standard Constructor */
 	public MAssetProduct (Properties ctx, int A_Asset_Product_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/MAssetReval.java b/org.adempiere.base/src/org/compiere/model/MAssetReval.java
index 910347b021..822d7094db 100644
--- a/org.adempiere.base/src/org/compiere/model/MAssetReval.java
+++ b/org.adempiere.base/src/org/compiere/model/MAssetReval.java
@@ -27,8 +27,11 @@ import org.compiere.util.TimeUtil;
 public class MAssetReval extends X_A_Asset_Reval
 implements DocAction
 {
-	private static final long serialVersionUID = 1L;
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3937514008250840440L;
 	private boolean		m_justPrepared = false;
 
 	public MAssetReval(Properties ctx, int X_A_Asset_Reval_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/MAssetTransfer.java b/org.adempiere.base/src/org/compiere/model/MAssetTransfer.java
index 794f5997fd..3a8174751a 100644
--- a/org.adempiere.base/src/org/compiere/model/MAssetTransfer.java
+++ b/org.adempiere.base/src/org/compiere/model/MAssetTransfer.java
@@ -38,7 +38,10 @@ import org.idempiere.fa.exceptions.AssetAlreadyDepreciatedException;
 public class MAssetTransfer extends X_A_Asset_Transfer
 implements DocAction
 {
-    private static final long serialVersionUID = 1L;
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2997284714883099922L;
 	/**	Just Prepared Flag			*/
 	private boolean		m_justPrepared = false;
     
diff --git a/org.adempiere.base/src/org/compiere/model/MDepreciation.java b/org.adempiere.base/src/org/compiere/model/MDepreciation.java
index f3e91d9eb6..0dbbcd4510 100644
--- a/org.adempiere.base/src/org/compiere/model/MDepreciation.java
+++ b/org.adempiere.base/src/org/compiere/model/MDepreciation.java
@@ -20,7 +20,11 @@ import org.idempiere.fa.exceptions.AssetNotSupportedException;
  */
 public class MDepreciation extends X_A_Depreciation
 {
-	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -632058079835100100L;
 
 	/** Standard Constructor */
 	public MDepreciation (Properties ctx, int A_Depreciation_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/MDepreciationEntry.java b/org.adempiere.base/src/org/compiere/model/MDepreciationEntry.java
index 2683591635..3ac40faa28 100644
--- a/org.adempiere.base/src/org/compiere/model/MDepreciationEntry.java
+++ b/org.adempiere.base/src/org/compiere/model/MDepreciationEntry.java
@@ -28,7 +28,12 @@ import org.idempiere.fa.exceptions.AssetException;
 public class MDepreciationEntry extends X_A_Depreciation_Entry
 implements DocAction
 {
-	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 6631244784741228058L;
+
 
 	/** Standard Constructor */
 	public MDepreciationEntry(Properties ctx, int A_Depreciation_Entry_ID, String trxName)
diff --git a/org.adempiere.base/src/org/compiere/model/MDepreciationExp.java b/org.adempiere.base/src/org/compiere/model/MDepreciationExp.java
index 3ceb11a6d0..9b7c694330 100644
--- a/org.adempiere.base/src/org/compiere/model/MDepreciationExp.java
+++ b/org.adempiere.base/src/org/compiere/model/MDepreciationExp.java
@@ -21,8 +21,11 @@ import org.idempiere.fa.exceptions.AssetNotActiveException;
 
 public class MDepreciationExp extends X_A_Depreciation_Exp
 {
-	private static final long serialVersionUID = 1L;
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 6731366890875525147L;
 	private static CLogger s_log = CLogger.getCLogger(MDepreciationExp.class);
 	private CLogger log = CLogger.getCLogger(this.getClass());
 	
diff --git a/org.adempiere.base/src/org/compiere/model/MIFixedAsset.java b/org.adempiere.base/src/org/compiere/model/MIFixedAsset.java
index b6186c4cb0..ab15920766 100644
--- a/org.adempiere.base/src/org/compiere/model/MIFixedAsset.java
+++ b/org.adempiere.base/src/org/compiere/model/MIFixedAsset.java
@@ -23,8 +23,11 @@ import org.compiere.util.Util;
  */
 public class MIFixedAsset extends X_I_FixedAsset
 {
-	private static final long serialVersionUID = 1L;
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -6394518107160329652L;
 	/** Default depreciation method */
 	private static final String s_defaultDepreciationType = "SL";
 	
diff --git a/org.adempiere.base/src/org/idempiere/exceptions/NoCurrencyConversionException.java b/org.adempiere.base/src/org/idempiere/exceptions/NoCurrencyConversionException.java
index 4327b4bd31..e21587169c 100644
--- a/org.adempiere.base/src/org/idempiere/exceptions/NoCurrencyConversionException.java
+++ b/org.adempiere.base/src/org/idempiere/exceptions/NoCurrencyConversionException.java
@@ -29,7 +29,11 @@ import org.compiere.util.Env;
  */
 public class NoCurrencyConversionException extends AdempiereException
 {
-	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1593966161685137709L;
 
 	/**
 	 * 
diff --git a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetAlreadyDepreciatedException.java b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetAlreadyDepreciatedException.java
index 09a7a34ea6..02bafe784c 100644
--- a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetAlreadyDepreciatedException.java
+++ b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetAlreadyDepreciatedException.java
@@ -11,7 +11,11 @@ package org.idempiere.fa.exceptions;
  */
 public class AssetAlreadyDepreciatedException extends AssetException
 {
-	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2531645693567226455L;
 
 	public AssetAlreadyDepreciatedException()
 	{
diff --git a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetCheckDocumentException.java b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetCheckDocumentException.java
index 3b87d551ff..27680144c2 100644
--- a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetCheckDocumentException.java
+++ b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetCheckDocumentException.java
@@ -10,7 +10,11 @@ package org.idempiere.fa.exceptions;
  */
 public class AssetCheckDocumentException extends AssetException
 {
-	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8096988198983528889L;
 
 	public AssetCheckDocumentException(String additionalMessage)
 	{
diff --git a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetException.java b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetException.java
index fb0f6c2619..e1e6473f69 100644
--- a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetException.java
+++ b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetException.java
@@ -11,7 +11,11 @@ import org.adempiere.exceptions.AdempiereException;
  */
 public class AssetException extends AdempiereException
 {
-	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2163958702697438015L;
 
 	public AssetException()
 	{
diff --git a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetInvoiceWithMixedLines_LRO.java b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetInvoiceWithMixedLines_LRO.java
index 6ff23f592d..ca332fef12 100644
--- a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetInvoiceWithMixedLines_LRO.java
+++ b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetInvoiceWithMixedLines_LRO.java
@@ -9,7 +9,11 @@ package org.idempiere.fa.exceptions;
  *
  */
 public class AssetInvoiceWithMixedLines_LRO extends AssetException {
-	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7477049497754422353L;
 
 	public AssetInvoiceWithMixedLines_LRO() {
 		super("No new bills that contain both fixed and normal products");
diff --git a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetNotActiveException.java b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetNotActiveException.java
index f690ca11ba..5589ce5da5 100644
--- a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetNotActiveException.java
+++ b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetNotActiveException.java
@@ -9,7 +9,11 @@ package org.idempiere.fa.exceptions;
  */
 public class AssetNotActiveException extends AssetException
 {
-	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -958395266586669844L;
 
 	public AssetNotActiveException(int A_Asset_ID)
 	{
diff --git a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetNotImplementedException.java b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetNotImplementedException.java
index e895538d1b..a4a274f8ab 100644
--- a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetNotImplementedException.java
+++ b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetNotImplementedException.java
@@ -11,7 +11,11 @@ package org.idempiere.fa.exceptions;
  */
 public class AssetNotImplementedException extends AssetException
 {
-	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -7015542410574849684L;
 
 	public AssetNotImplementedException(String additionalMessage)
 	{
diff --git a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetNotSupportedException.java b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetNotSupportedException.java
index 3486889b69..8f2d1d1d34 100644
--- a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetNotSupportedException.java
+++ b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetNotSupportedException.java
@@ -9,7 +9,11 @@ package org.idempiere.fa.exceptions;
  */
 public class AssetNotSupportedException extends AssetException
 {
-	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -9182818872935345775L;
 
 	public AssetNotSupportedException (String funcName, String actualValue)
 	{
diff --git a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetProductStockedException.java b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetProductStockedException.java
index bf5d05f837..29011ac230 100644
--- a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetProductStockedException.java
+++ b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetProductStockedException.java
@@ -11,7 +11,11 @@ import org.compiere.model.MProduct;
  */
 public class AssetProductStockedException extends AssetException
 {
-	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 229246069558704158L;
 
 	public AssetProductStockedException(MProduct product)
 	{
diff --git a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetStatusChangedException.java b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetStatusChangedException.java
index 7657349d90..a41596ab2a 100644
--- a/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetStatusChangedException.java
+++ b/org.adempiere.base/src/org/idempiere/fa/exceptions/AssetStatusChangedException.java
@@ -11,7 +11,11 @@ import org.compiere.util.Util;
  */
 public class AssetStatusChangedException extends AssetException
 {
-	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2015948851153849647L;
 
 	public AssetStatusChangedException()
 	{
diff --git a/org.adempiere.base/src/org/idempiere/fa/exceptions/DepreciationNoInPeriodException.java b/org.adempiere.base/src/org/idempiere/fa/exceptions/DepreciationNoInPeriodException.java
index 77a9f6b09c..f5f7fe2680 100644
--- a/org.adempiere.base/src/org/idempiere/fa/exceptions/DepreciationNoInPeriodException.java
+++ b/org.adempiere.base/src/org/idempiere/fa/exceptions/DepreciationNoInPeriodException.java
@@ -9,8 +9,12 @@ package org.idempiere.fa.exceptions;
  */
 public class DepreciationNoInPeriodException extends AssetException
 {
-	private static final long serialVersionUID = 1L;
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -6201871355182540721L;
+
 	public DepreciationNoInPeriodException(int A_Asset_ID, int Workfile_Period_ID, int DepExp_Period_ID)
 	{
 		super("Registration is not in balance (ID Asset="+A_Asset_ID
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeBOM.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeBOM.java
index e53fd586ec..6b58e98127 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeBOM.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeBOM.java
@@ -252,7 +252,12 @@ public class VTreeBOM extends CPanel implements FormPanel, ActionListener, TreeS
 				DisplayType.Search, language, MProduct.COLUMNNAME_M_Product_ID, 0, false,
 				" M_Product.IsSummary = 'N'");
 		fieldProduct = new VLookup ("M_Product_ID", false, false, true,  m_fieldProduct) {
-			private static final long serialVersionUID = 1L;
+			
+			/**
+			 * 
+			 */
+			private static final long serialVersionUID = 1084743143950828526L;
+
 			public void setValue(Object value) {
 				super.setValue(value);
 			}
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDialog.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDialog.java
index 0e153f6409..50d5945d04 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDialog.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDialog.java
@@ -38,8 +38,11 @@ import org.compiere.util.TrxRunnable;
 
 public class VCreateFromDialog extends CDialog implements ActionListener, TableModelListener
 {
-	private static final long serialVersionUID = 1L;
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8242250391030501785L;
 	private CreateFrom createFrom;
 	private int windowNo;
 	
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java
index c1aac1b4e6..4c03e88a3c 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java
@@ -45,7 +45,6 @@ import org.compiere.util.Msg;
 
 public class VCreateFromInvoiceUI extends CreateFromInvoice implements ActionListener, VetoableChangeListener
 {
-	private static final long serialVersionUID = 1L;
 	
 	private VCreateFromDialog dialog;
 
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java
index b7e2b70074..2b44a2d540 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java
@@ -39,7 +39,6 @@ import org.compiere.util.Msg;
 
 public class VCreateFromRMAUI extends CreateFromRMA implements VetoableChangeListener
 {
-	private static final long serialVersionUID = 1L;
 	
 	private VCreateFromDialog dialog;
 
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java
index 22ce405941..d41ef431a4 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java
@@ -55,7 +55,6 @@ import org.compiere.util.Msg;
 
 public class VCreateFromStatementUI extends CreateFromStatement implements ActionListener
 {
-	private static final long serialVersionUID = 1L;
 	
 	private VCreateFromDialog dialog;
 
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreeTransferHandler.java b/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreeTransferHandler.java
index 9de5485a94..11790db96d 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreeTransferHandler.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreeTransferHandler.java
@@ -36,10 +36,11 @@ import org.compiere.model.MTreeNode;
  */
 public class VTreeTransferHandler extends TransferHandler {
 
+
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 2799737958477528717L;
 
 	public int getSourceActions(JComponent c) {
 		return TransferHandler.MOVE;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromWindow.java
index 25033c3ef4..0c81d7f616 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromWindow.java
@@ -39,8 +39,11 @@ import org.zkoss.zul.Separator;
 
 public class WCreateFromWindow extends Window implements EventListener<Event>, WTableModelListener, DialogEvents
 {
-	private static final long serialVersionUID = 1L;
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3703236565441597403L;
 	private CreateFrom createFrom;
 	private int windowNo;
 	
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 d252120910..86182359bc 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
@@ -65,8 +65,11 @@ import org.zkoss.zul.Toolbarbutton;
  *
  */
 public class CalendarWindow extends Window implements EventListener<Event> {
-	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 5620139733919619691L;
 	private Calendars calendars;
 	private SimpleCalendarModel scm;
 	private Toolbarbutton btnRefresh;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java
index d39d746feb..85e7459a52 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java
@@ -47,8 +47,11 @@ import org.zkoss.zul.Toolbarbutton;
  */
 public class DPCalendar extends DashboardPanel implements EventListener<Event> {
 
-	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -224914882522997787L;
 	private Calendars calendars;
 	private SimpleCalendarModel scm;
 	private Toolbarbutton btnCal, btnRefresh;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/EventWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/EventWindow.java
index 1076ec953c..90c758eec7 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/EventWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/EventWindow.java
@@ -37,8 +37,11 @@ import org.zkoss.zul.South;
  *
  */
 public class EventWindow extends Window implements EventListener<Event> {
-	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 4758066526040260586L;
 	private DatetimeBox dtBeginDate, dtEndDate;
 	private Textbox txtContent, txtHeaderColor, txtContentColor;
 	private ConfirmPanel confirmPanel;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/RequestWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/RequestWindow.java
index 801639bef0..982e2b7d34 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/RequestWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/RequestWindow.java
@@ -53,8 +53,12 @@ import org.zkoss.zul.Timebox;
  *
  */
 public class RequestWindow extends Window implements EventListener<Event> {
-	private static final long serialVersionUID = 1L;
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7757368164776005797L;
+
 	private static CLogger log = CLogger.getCLogger(RequestWindow.class);
 	
 	/** Read Only				*/
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomForm.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomForm.java
index e9eded6254..ebce62f905 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomForm.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomForm.java
@@ -2,7 +2,11 @@ package org.adempiere.webui.panel;
 
 public class CustomForm extends ADForm
 {
-	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8498084996736578534L;
 
 	@Override
 	protected void initForm() 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java
index 290cb93ed1..d93b1503db 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java
@@ -45,9 +45,12 @@ import org.adempiere.util.ServerContextURLHandler;
  */
 public class WebUIServlet extends DHtmlLayoutServlet
 {
-	private static final long    serialVersionUID = 1L;
 
-    /** Logger for the class * */
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = -5625631664012999381L;
+	/** Logger for the class * */
     private static CLogger logger;
 
     public void init(ServletConfig servletConfig) throws ServletException