diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/GridTabSelectionListView.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/GridTabSelectionListView.java
index d9cb4e42e1..e3149936f2 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/GridTabSelectionListView.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/GridTabSelectionListView.java
@@ -44,14 +44,14 @@ import org.zkoss.zul.Vlayout;
 import org.zkoss.zul.ext.Selectable;
 
 /**
- * Read only grid view for single or multi selection
+ * Read only grid view for single or multiple selection
  * @author Low Heng Sin
  *
  */
 public class GridTabSelectionListView extends Vlayout
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 4145737989132101461L;
 
@@ -63,33 +63,45 @@ public class GridTabSelectionListView extends Vlayout
 	
 	private int pageSize = 100;
 	
+	/** GridFields of {@link #gridTab} */
 	private GridField[] gridField;
+	/** Table model (GridTable) of {@link #gridTab} */
 	private AbstractTableModel tableModel;
 	
+	/** length of {@link #gridField} */ 
 	private int numColumns = 5;
 	
 	private int windowNo;
 	
 	private GridTab gridTab;
 	
+	/** true if {@link #init(GridTab)} have been called */
 	private boolean init;
 
+	/** Model of {@link #listbox} */
 	private SimpleGridTableListModel listModel;
 
+	/** Renderer of {@link #listbox} */
 	private GridTabSelectionListViewRenderer renderer;
 
 	private Box labelBox;
 	
+	/** Custom column width from {@link MTabCustomization} */
 	private Map<Integer, String> columnWidthMap;
 
+	/** Show number of selected row */
 	private Label selectedLabel;
 	
+	/**
+	 * @param multiple
+	 */
 	public GridTabSelectionListView(boolean multiple)
 	{
 		this(multiple, 0);
 	}
 	
 	/**
+	 * @param multiple true for multiple selection mode, false for single selection mode
 	 * @param windowNo
 	 */
 	public GridTabSelectionListView(boolean multiple, int windowNo)
@@ -110,7 +122,6 @@ public class GridTabSelectionListView extends Vlayout
 	}
 
 	/**
-	 * 
 	 * @param gridTab
 	 */
 	public void init(GridTab gridTab)
@@ -125,6 +136,10 @@ public class GridTabSelectionListView extends Vlayout
 		this.init = true;
 	}
 
+	/**
+	 * 
+	 * @param gridTab
+	 */
 	private void setupFields(GridTab gridTab) {
 		this.gridTab = gridTab;
 		tableModel = gridTab.getTableModel();						
@@ -161,8 +176,7 @@ public class GridTabSelectionListView extends Vlayout
 	}
 	
 	/**
-	 * 
-	 * @return boolean
+	 * @return true if {@link #init(GridTab)} have been called
 	 */
 	public boolean isInit() {
 		return init;
@@ -186,7 +200,7 @@ public class GridTabSelectionListView extends Vlayout
 	}
 	
 	/**
-	 * 
+	 * Refresh (re-query) gridTab and call {@link #init(GridTab)} again.
 	 * @param gridTab
 	 */
 	public void refresh(GridTab gridTab) {
@@ -209,11 +223,17 @@ public class GridTabSelectionListView extends Vlayout
 		this.pageSize = pageSize;
 	}
 	
+	/**
+	 * Remove all child components
+	 */
 	public void clear()
 	{
 		this.getChildren().clear();
 	}
 	
+	/**
+	 * Setup {@link #listbox} columns
+	 */
 	private void setupColumns()
 	{		
 		if (init) return;
@@ -257,6 +277,11 @@ public class GridTabSelectionListView extends Vlayout
 		listbox.appendChild(header);
 	}
 	
+	/**
+	 * 
+	 * @param columnName
+	 * @return column index
+	 */
 	private int getColumnIndex(String columnName) {
 		for(int i = 0; i < gridTab.getTableModel().getColumnCount(); i++) {
 			if (gridTab.getTableModel().getColumnName(i).equals(columnName)) {
@@ -266,6 +291,9 @@ public class GridTabSelectionListView extends Vlayout
 		return -1;
 	}
 
+	/**
+	 * render {@link #listbox}
+	 */
 	private void render()
 	{
 		listbox.setStyle("min-height: 200px");
@@ -285,6 +313,9 @@ public class GridTabSelectionListView extends Vlayout
 		labelBox.appendChild(selectedLabel);
 	}
 	
+	/**
+	 * Update model and renderer of {@link #listbox}
+	 */
 	private void updateModel() {
 		listModel = new SimpleGridTableListModel((GridTable)tableModel, windowNo);	
 		listModel.setMultiple(listbox.isMultiple());
@@ -317,12 +348,15 @@ public class GridTabSelectionListView extends Vlayout
 		this.windowNo = windowNo;
 	}
 	
+	/**
+	 * @return GridField[]
+	 */
 	public GridField[] getFields() {
 		return gridField;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.zkoss.zk.ui.AbstractComponent#addEventListener(int, java.lang.String, org.zkoss.zk.ui.event.EventListener)
+	/**
+	 * If evtnm is ON_SElECT, add to {@link #listbox}, otherwise add to this component
 	 */
 	@Override
 	public boolean addEventListener(int priority, String evtnm,
@@ -334,6 +368,10 @@ public class GridTabSelectionListView extends Vlayout
 		}
 	}
 
+	/**
+	 * Set selected indices for {@link #listbox}
+	 * @param selectedIndices
+	 */
 	public void setSelectedIndices(int[] selectedIndices) {
 		ListModel<Object> model = listbox.getModel();
 		if (model != null && model instanceof Selectable) {
@@ -351,6 +389,9 @@ public class GridTabSelectionListView extends Vlayout
 		selectedLabel.setValue(Msg.getMsg(Env.getCtx(), "Selected") + " : " + selectedIndices.length);
 	}
 
+	/**
+	 * Clear {@link #listbox} selections
+	 */
 	public void clearSelection() {
 		ListModel<Object> model = listbox.getModel();
 		if (model != null && model instanceof Selectable) {
@@ -362,6 +403,10 @@ public class GridTabSelectionListView extends Vlayout
 		selectedLabel.setValue(Msg.getMsg(Env.getCtx(), "Selected") + " : 0");
 	}
 
+	/**
+	 * 
+	 * @param selected
+	 */
 	public void setSelectedIndex(int selected) {
 		ListModel<Object> model = listbox.getModel();
 		if (model != null && model instanceof Selectable) {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/GridTabSelectionListViewRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/GridTabSelectionListViewRenderer.java
index 2fa74c357a..753711460b 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/GridTabSelectionListViewRenderer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/GridTabSelectionListViewRenderer.java
@@ -34,7 +34,7 @@ import org.zkoss.zul.ListitemRendererExt;
 import org.zkoss.zul.RendererCtrl;
 
 /**
- * ListItem renderer for GridTabSelectionListView
+ * ListItem renderer for {@link GridTabSelectionListView}
  * @author hengsin
  *
  */
@@ -126,6 +126,12 @@ public class GridTabSelectionListViewRenderer implements ListitemRenderer<GridTa
 		}
 	}
 
+	/**
+	 * Create {@link Listcell} for gridField and value
+	 * @param gridField
+	 * @param value
+	 * @return Listcell
+	 */
 	private Listcell renderCell(GridField gridField, Object value) {
 		Listcell cell;
 		if (gridField.getDisplayType() == DisplayType.YesNo) {
@@ -186,6 +192,12 @@ public class GridTabSelectionListViewRenderer implements ListitemRenderer<GridTa
 		return item;
 	}
 
+	/**
+	 * 
+	 * @param gridField
+	 * @param value
+	 * @return display text
+	 */
 	private String getDisplayText(GridField gridField, Object value)
 	{
 		if (value == null)
@@ -211,15 +223,14 @@ public class GridTabSelectionListViewRenderer implements ListitemRenderer<GridTa
 	
 	/**
 	 * Is renderer initialize
-	 * @return boolean
+	 * @return true if initialize, false otherwise
 	 */
 	public boolean isInitialize() {
 		return !editors.isEmpty();
 	}
 
 	/**
-	 * 
-	 * @return active editor list
+	 * @return field editor list
 	 */
 	public List<WEditor> getEditors() {
 		List<WEditor> editorList = new ArrayList<WEditor>();
@@ -247,10 +258,16 @@ public class GridTabSelectionListViewRenderer implements ListitemRenderer<GridTa
 	public void doTry() {
 	}
 
+	/**
+	 * @param listView
+	 */
 	public void setListView (GridTabSelectionListView listView) {
 		this.listView = listView;
 	}
 
+	/**
+	 * @return GridTabSelectionListView
+	 */
 	public GridTabSelectionListView getListView() {
 		return listView;
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/GridTableRow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/GridTableRow.java
index ee0a043d4b..643e4b8f3a 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/GridTableRow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/GridTableRow.java
@@ -1,19 +1,44 @@
-/**
- * 
- */
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ *                                                                     *
+ * Contributors:                                                       *
+ * - hengsin                         								   *
+ **********************************************************************/
 package org.adempiere.webui.editor.grid.selection;
 
 /**
+ * A GridTable record/row.
  * @author hengsin
  *
  */
 public class GridTableRow {
 
+	/** record/row id */
 	private int id;
+	/** record/row values */
 	private Object[] values;
 
 	/**
-	 * 
+	 * @param id
+	 * @param values
 	 */
 	public GridTableRow(int id, Object[] values) {
 		this.id = id;
@@ -28,6 +53,9 @@ public class GridTableRow {
 		return id;
 	}
 	
+	/**
+	 * @return record/row values
+	 */
 	public Object[] getValues() {
 		return values;
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/SimpleGridTableListModel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/SimpleGridTableListModel.java
index 7cdb06941d..daee51821a 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/SimpleGridTableListModel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/SimpleGridTableListModel.java
@@ -29,14 +29,14 @@ import org.zkoss.zul.event.ListDataEvent;
 import org.zkoss.zul.ext.Sortable;
 
 /**
- * 
+ * ListModel for {@link GridTabSelectionListView}
  * @author Low Heng Sin
  *
  */
 public class SimpleGridTableListModel extends AbstractListModel<GridTableRow> implements TableModelListener, Sortable<Object> {
 	
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 698185856751242764L;
 	private GridTable tableModel;
@@ -61,6 +61,7 @@ public class SimpleGridTableListModel extends AbstractListModel<GridTableRow> im
 	 * @param rowIndex
 	 * @see ListModel#getElementAt(int)
 	 */
+	@Override
 	public GridTableRow getElementAt(int rowIndex) {
 		GridTableRow row = null;
 		int columnCount = tableModel.getColumnCount();
@@ -80,6 +81,7 @@ public class SimpleGridTableListModel extends AbstractListModel<GridTableRow> im
 	 * @return int
 	 * @see ListModel#getSize()
 	 */
+	@Override
 	public int getSize() {
 		return tableModel.getRowCount(); 
 	}
@@ -109,6 +111,7 @@ public class SimpleGridTableListModel extends AbstractListModel<GridTableRow> im
 	 * @param ascending
 	 * @see ListModelExt#sort(Comparator, boolean) 
 	 */
+	@Override
 	public void sort(Comparator<Object> cmpr, boolean ascending) {
 		//use default zk comparator
 		if (cmpr instanceof ListitemComparator) {			
@@ -129,6 +132,7 @@ public class SimpleGridTableListModel extends AbstractListModel<GridTableRow> im
 	 * @param e
 	 * @see TableModelListener#tableChanged(TableModelEvent) 
 	 */
+	@Override
 	public void tableChanged(TableModelEvent e) {
 		if (Executions.getCurrent() != null) {
 			if (e.getType() == TableModelEvent.DELETE) 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/WGridTabMultiSelectionEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/WGridTabMultiSelectionEditor.java
index 2fad63deae..cdeb506b11 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/WGridTabMultiSelectionEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/WGridTabMultiSelectionEditor.java
@@ -32,6 +32,7 @@ import org.compiere.model.GridField;
 import org.compiere.model.GridTab;
 import org.compiere.model.GridTabVO;
 import org.compiere.model.GridWindow;
+import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
 import org.compiere.util.Util;
@@ -43,7 +44,8 @@ import org.zkoss.zul.Menuitem;
 import org.zkoss.zul.ext.Selectable;
 
 /**
- * 
+ * Default editor for {@link DisplayType#MultipleSelectionGrid}.
+ * Implemented with {@link GridTabSelectionListView} component.
  * @author hengsin
  *
  */
@@ -51,10 +53,12 @@ public class WGridTabMultiSelectionEditor extends WEditor implements ContextMenu
 {
 	private static final String[] LISTENER_EVENTS = {Events.ON_SELECT};
 
+	/** comma separated list of selected row indices */
     private Object oldValue;
 
 	private GridTab listViewGridTab = null;
 
+	/** current value of link column */
 	private String currentLinkValue = null;
 
 	private boolean readWrite;
@@ -107,6 +111,9 @@ public class WGridTabMultiSelectionEditor extends WEditor implements ContextMenu
 		this.readWrite = readWrite; 
 	}
 
+	/**
+	 * Initialize component and context menu
+	 */
 	private void init()
     {
 		if (tableEditor)
@@ -147,6 +154,7 @@ public class WGridTabMultiSelectionEditor extends WEditor implements ContextMenu
 		}
     }
 
+	@Override
 	public void onEvent(Event event)
     {
     	if (Events.ON_SELECT.equals(event.getName()))
@@ -225,6 +233,9 @@ public class WGridTabMultiSelectionEditor extends WEditor implements ContextMenu
     		((Textbox)getComponent()).setValue(oldValue != null ? oldValue.toString() : "");
     }
 
+    /**
+     * Update selected row from {@link #oldValue}
+     */
 	private void updateSlectedIndices() {
 		GridTabSelectionListView listView = (GridTabSelectionListView) getComponent();
 		if (!Util.isEmpty((String)oldValue))
@@ -259,6 +270,7 @@ public class WGridTabMultiSelectionEditor extends WEditor implements ContextMenu
         return LISTENER_EVENTS;
     }
 
+    @Override
     public void onMenu(ContextMenuEvent evt)
 	{
 		if (WEditorPopupMenu.PREFERENCE_EVENT.equals(evt.getContextEvent()))
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/WGridTabSingleSelectionEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/WGridTabSingleSelectionEditor.java
index 6cf1507624..9e6a8e952e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/WGridTabSingleSelectionEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/grid/selection/WGridTabSingleSelectionEditor.java
@@ -27,6 +27,7 @@ import org.compiere.model.GridField;
 import org.compiere.model.GridTab;
 import org.compiere.model.GridTabVO;
 import org.compiere.model.GridWindow;
+import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
 import org.compiere.util.Util;
@@ -36,7 +37,8 @@ import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zul.Menuitem;
 
 /**
- * 
+ * Default editor for {@link DisplayType#SingleSelectionGrid}.
+ * Implemented with {@link GridTabSelectionListView} component.
  * @author hengsin
  *
  */
@@ -44,10 +46,12 @@ public class WGridTabSingleSelectionEditor extends WEditor implements ContextMen
 {
 	private static final String[] LISTENER_EVENTS = {Events.ON_SELECT};
 
+	/** selected row index */
     private Object oldValue;
 
 	private GridTab listViewGridTab = null;
 	
+	/** current value of link column */
 	private String currentLinkValue = null;
 
 	private boolean readWrite;
@@ -100,6 +104,9 @@ public class WGridTabSingleSelectionEditor extends WEditor implements ContextMen
 		this.readWrite = readWrite; 
 	}
 
+	/**
+	 * Initialize component and context menu
+	 */
 	private void init()
     {
 		if (tableEditor)
@@ -140,6 +147,7 @@ public class WGridTabSingleSelectionEditor extends WEditor implements ContextMen
 		}
     }
 
+	@Override
 	public void onEvent(Event event)
     {
     	if (Events.ON_SELECT.equals(event.getName()))
@@ -189,6 +197,9 @@ public class WGridTabSingleSelectionEditor extends WEditor implements ContextMen
     		((Textbox)getComponent()).setValue(oldValue != null ? oldValue.toString() : "");
     }
 
+    /**
+     * Update selected row indices from {@link #oldValue}
+     */
 	private void updateSlectedIndices() {
 		GridTabSelectionListView listView = (GridTabSelectionListView) getComponent();
 		listView.clearSelection();
@@ -210,6 +221,7 @@ public class WGridTabSingleSelectionEditor extends WEditor implements ContextMen
         return LISTENER_EVENTS;
     }
 
+    @Override
     public void onMenu(ContextMenuEvent evt)
 	{
 		if (WEditorPopupMenu.PREFERENCE_EVENT.equals(evt.getContextEvent()))
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ActionEvent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ActionEvent.java
index 96b28e6329..8e7693c54b 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ActionEvent.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ActionEvent.java
@@ -18,7 +18,7 @@
 package org.adempiere.webui.event;
 
 /**
- * ActionEvent represents events associated with no data change.
+ * Event for UI action
  * 
  * @author  Niraj Sohun
  * @date    Jul 25, 2007
@@ -26,7 +26,7 @@ package org.adempiere.webui.event;
 
 public class ActionEvent 
 {
-	 /**
+	/**
      * The object on which the Event initially occurred.
      */
 	protected Object source;
@@ -55,7 +55,7 @@ public class ActionEvent
 	}
 
     /**
-     * returns name of property that changed
+     * @return name of property that changed
      */
 	public String getPropertyName()
     {
@@ -63,7 +63,7 @@ public class ActionEvent
     }
 
 	/**
-	 * returns source of event
+	 * @return source of event
 	 */
     public Object getSource()
     {
@@ -71,7 +71,7 @@ public class ActionEvent
     }
 
     /**
-     * returns name of event
+     * @return name of event
      */
 	public String getEventName() 
 	{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ActionListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ActionListener.java
index 26c017c11f..b15465ddc0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ActionListener.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ActionListener.java
@@ -18,13 +18,15 @@
 package org.adempiere.webui.event;
 
 /**
- * ActionListener handles events associated with no data change.
+ * Listener interface for {@link ActionEvent}
  * 
  * @author  Niraj Sohun
  * @date    Jul 25, 2007
  */
-
 public interface ActionListener 
 {
+	/**
+	 * @param event
+	 */
 	void actionPerformed(ActionEvent event);
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ContextMenuEvent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ContextMenuEvent.java
index ff1a34ede6..7d3f82597d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ContextMenuEvent.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ContextMenuEvent.java
@@ -20,13 +20,14 @@ package org.adempiere.webui.event;
 import org.zkoss.zk.ui.Component;
 
 /**
- *
+ * Event for context menu (right-click menu) action
  * @author  <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
  * @date    Mar 10, 2007
  * @version $Revision: 0.10 $
  */
 public class ContextMenuEvent
 {
+	/** Event id/name */
     private String contextEvent;
 	private Component target;
     
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ContextMenuListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ContextMenuListener.java
index 1be5771b01..95ef54dade 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ContextMenuListener.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ContextMenuListener.java
@@ -18,12 +18,15 @@
 package org.adempiere.webui.event;
 
 /**
- *
+ * Listener interface for {@link ContextMenuEvent}
  * @author  <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
  * @date    Mar 10, 2007
  * @version $Revision: 0.10 $
  */
 public interface ContextMenuListener
 {
+	/**
+	 * @param evt
+	 */
     public void onMenu(ContextMenuEvent evt);
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/DialogEvents.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/DialogEvents.java
index d6fb0b7bb9..eacbd9de3c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/DialogEvents.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/DialogEvents.java
@@ -14,9 +14,8 @@
 package org.adempiere.webui.event;
 
 /**
- * 
+ * Event constant for popup modal/highlighted dialog.
  * @author hengsin
- *
  */
 public interface DialogEvents {
 
@@ -26,7 +25,7 @@ public interface DialogEvents {
 	public final static String ON_WINDOW_CLOSE = "onWindowClose";
 	
 	/**
-	 * rise event before run process, other code can inject a long process in there
+	 * event before running of process, other code can inject a long process in there
 	 * example: at info window, save info to database before run process
 	 */
 	public final static String ON_BEFORE_RUN_PROCESS = "onBeforeRunProcess";
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/DrillEvent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/DrillEvent.java
index cb98cf7600..89eb55e798 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/DrillEvent.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/DrillEvent.java
@@ -18,23 +18,30 @@ import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
 
 /**
- * 
+ * Event for drill down and drill across
  * @author hengsin
- *
  */
 public class DrillEvent extends Event {
 
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 4877800961258241047L;
 	public final static String ON_DRILL_DOWN = "onDrillDown";
 	public final static String ON_DRILL_ACROSS = "onDrillAcross";
 	
+	/**
+	 * @param name
+	 * @param target
+	 * @param data
+	 */
 	public DrillEvent(String name, Component target, Object data) {
 		super(name, target, data);
 	}
 
+	/**
+	 * Data for drill event 
+	 */
 	public static class DrillData {
 
 		private MQuery query;
@@ -50,6 +57,13 @@ public class DrillEvent extends Event {
 		 */
 		private Object data;
 
+		/**
+		 * @param query
+		 * @param columnName
+		 * @param value
+		 * @param displayValue
+		 * @param data
+		 */
 		public DrillData(MQuery query, String columnName, Object value, String displayValue, Object data) {
 			this.query = query;
 			this.columnName = columnName;
@@ -58,27 +72,40 @@ public class DrillEvent extends Event {
 			this.displayValue = displayValue;
 		}
 
+		/**
+		 * @return MQuery
+		 */
 		public MQuery getQuery() {
 			return query;
 		}
 
+		/**
+		 * @return column name
+		 */
 		public String getColumnName() {
 			return columnName;
 		}
 
+		/**
+		 * @return value
+		 */
 		public Object getValue() {
 			return value;
 		}
 
+		/**
+		 * @return [columnName, displayValue, value, processID - source]
+		 */
 		public Object getData() {
 			return data;
 		}
 
+		/**
+		 * @return display text
+		 */
 		public String getDisplayValue() {
 			return displayValue;
 		}
-
-
 	}
 
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/MenuListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/MenuListener.java
index d15b2f6488..85f7f230ea 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/MenuListener.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/MenuListener.java
@@ -18,12 +18,15 @@
 package org.adempiere.webui.event;
 
 /**
- *
+ * Listener interface for application menu item
  * @author  <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
  * @date    Feb 25, 2007
  * @version $Revision: 0.10 $
  */
 public interface MenuListener
 {
+	/**
+	 * @param menuId AD_Menu_ID
+	 */
     public void onMenuSelected(int menuId);
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TableValueChangeEvent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TableValueChangeEvent.java
index 05d594647b..0993e6bf90 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TableValueChangeEvent.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TableValueChangeEvent.java
@@ -34,12 +34,12 @@ public class TableValueChangeEvent extends ValueChangeEvent
 	/**
 	 * Constructor for the event.
 	 * 
-	 * @param source		The object that changed
-	 * @param propertyName	The column name of the changed object 
-	 * @param row			The row of the changed object
-	 * @param column		The column of the changed object 
-	 * @param oldValue		The new value of the object 
-	 * @param newValue		The old value of the object (often just a copy of the new value)
+	 * @param source		Source of event
+	 * @param propertyName	Column name 
+	 * @param row			Row index
+	 * @param column		Column index 
+	 * @param oldValue		The old value of the object 
+	 * @param newValue		The new value of the object (often just a copy of the new value)
 	 */
 	public TableValueChangeEvent(Object source, String propertyName, 
 								int row, int column,  
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TableValueChangeListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TableValueChangeListener.java
index 3ad954455e..956be2f94f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TableValueChangeListener.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TableValueChangeListener.java
@@ -18,17 +18,15 @@
 package org.adempiere.webui.event;
 
 /**
- * Interface specifying the functions
- * that must be implemented to listen for a TableValueChangeEvent event
+ * Listener interface for {@link TableValueChangeEvent}.
  * 
  * @author Andrew Kimball
  */
 public interface TableValueChangeListener
 {
 	/**
-	 * Respond to a TableValueChangeEvent event
-	 * Notifies this listener that an event has occurred.
-	 * To get the event, you have to register it first by use of 
+	 * Respond to a TableValueChangeEvent event.<br/>
+	 * To listen to the event, you have to register it first by calling 
 	 * {@link org.adempiere.webui.component.WListItemRenderer#addTableValueChangeListener(TableValueChangeListener)}
 	 * 
 	 * @param event	The event that has occurred
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TokenEvent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TokenEvent.java
index 352f2afe04..a48ea352e1 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TokenEvent.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TokenEvent.java
@@ -24,7 +24,7 @@ import org.zkoss.zk.ui.event.Event;
 public class TokenEvent extends Event {
 
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 7727018026113457776L;
 	/** on loading of user token **/
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ToolbarListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ToolbarListener.java
index 82b4631ab6..e15bcd5790 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ToolbarListener.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ToolbarListener.java
@@ -17,8 +17,10 @@
 
 package org.adempiere.webui.event;
 
+import org.adempiere.webui.adwindow.ADWindowToolbar;
+
 /**
- *
+ * Listener interface for {@link ADWindowToolbar}.
  * @author  <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
  * @date    Feb 25, 2007
  * @version $Revision: 0.10 $
@@ -175,6 +177,9 @@ public interface ToolbarListener
      */
     public void onCustomize();
 
+    /**
+     * Process (gear icon) button
+     */
     public void onProcess();
     
     /**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TouchEventHelper.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TouchEventHelper.java
index 4e6b92b6b8..d45f9d86e0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TouchEventHelper.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/TouchEventHelper.java
@@ -19,8 +19,8 @@ import org.zkoss.zul.Grid;
 
 /**
  * @author hengsin
- *
  */
+@Deprecated(forRemoval = true, since = "11")
 public class TouchEventHelper {
 
 	private static final String TABLET_SCROLLING_FIX_INIT = "tablet.scrolling.fix.init";
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ValueChangeEvent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ValueChangeEvent.java
index 9b83b3f2a3..793a384e0c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ValueChangeEvent.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ValueChangeEvent.java
@@ -18,7 +18,7 @@
 package org.adempiere.webui.event;
 
 /**
- *
+ * Value change event for a named property.
  * @author  <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
  * @date    Mar 10, 2007
  * @version $Revision: 0.10 $
@@ -32,7 +32,7 @@ public class ValueChangeEvent
     protected Object source;
 
     /**
-     * name of the property that changed. May be null, if not known.
+     * name of the property that changed
      */
     private String   propertyName;
 
@@ -47,9 +47,15 @@ public class ValueChangeEvent
     private Object   oldValue;
     
 	// IDEMPIERE-1287:indicate case user just start edit field, want update status of toolbar button (like save button) 
-	// but don't want change anything (ever value of edit field)
+	// but don't want change anything (even value of edit field)
     private boolean   isInitEdit = false;
 
+    /**
+     * @param source
+     * @param propertyName
+     * @param oldValue
+     * @param newValue
+     */
     public ValueChangeEvent(Object source, String propertyName,
             Object oldValue, Object newValue)
     {
@@ -59,16 +65,25 @@ public class ValueChangeEvent
         this.oldValue = oldValue;
     }
 
+    /**
+     * @return new value
+     */
     public Object getNewValue()
     {
         return newValue;
     }
 
+    /**
+     * @return old/previous value
+     */
     public Object getOldValue()
     {
         return oldValue;
     }
 
+    /**
+     * @return property name
+     */
     public String getPropertyName()
     {
         return propertyName;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ValueChangeListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ValueChangeListener.java
index 2f0f1e494c..d2bfd5d4db 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ValueChangeListener.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ValueChangeListener.java
@@ -18,12 +18,15 @@
 package org.adempiere.webui.event;
 
 /**
- *
+ * Listener interface for {@link ValueChangeEvent}
  * @author  <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
  * @date    Mar 10, 2007
  * @version $Revision: 0.10 $
  */
 public interface ValueChangeListener
 {
+	/**
+	 * @param evt
+	 */
     public void valueChange(ValueChangeEvent evt);
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/WTableModelEvent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/WTableModelEvent.java
index 93fdb01f5c..ea6c564d8b 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/WTableModelEvent.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/WTableModelEvent.java
@@ -17,12 +17,13 @@
 
 package org.adempiere.webui.event;
 
+import org.adempiere.webui.component.ListModelTable;
 import org.zkoss.zul.ListModel;
 import org.zkoss.zul.event.ListDataEvent;
 
 /**
+ * Change event for {@link ListModelTable} 
  * @author andy
- *
  */
 public class WTableModelEvent extends ListDataEvent
 {
@@ -42,11 +43,9 @@ public class WTableModelEvent extends ListDataEvent
 	/**
 	 * All row data in the table has changed, listeners should discard any state
 	 * that was based on the rows and requery the <code>TableModel</code> to
-	 * get the new row count and all the appropriate values. The
-	 * <code>WListbox</code> will repaint the entire visible region on receiving
-	 * this event, querying the model for the cell values that are visible. The
-	 * structure of the table ie, the column names, types and order have not
-	 * changed.
+	 * get the new row count and all the appropriate values.<br/> 
+	 * The <code>WListbox</code> will initiate repaint on receiving this event, 
+	 * querying the model for the cell values that are visible.<br/> 
 	 *
 	 * @param source	The list model that has changed
 	 */
@@ -60,7 +59,7 @@ public class WTableModelEvent extends ListDataEvent
 	/**
 	 * This row of data has been updated. To denote the arrival of a completely
 	 * new table with a different structure use <code>HEADER_ROW</code> as the
-	 * value for the <code>row</code>.
+	 * value for the <code>row</code> argument.
 	 *
 	 * @param source	The list model that has changed
 	 * @param row		Index of the affected row
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/WTableModelListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/WTableModelListener.java
index f43dec6e47..1030eb02c7 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/WTableModelListener.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/WTableModelListener.java
@@ -18,8 +18,7 @@
 package org.adempiere.webui.event;
 
 /**
- * WTableModelListener defines the interface for an object that listens
- * to changes in a WTableModel.
+ * Listener interface for {@link WTableModelEvent}
  * 
  * @author Andrew Kimball
  *
@@ -28,8 +27,8 @@ package org.adempiere.webui.event;
 public interface WTableModelListener
 {
     /**
-     * This fine grain notification tells listeners the exact range
-     * of cells, rows, or columns that changed.
+     * Notify listeners the exact range
+     * of cells, rows, or columns that have changed.
      * 
      * @param event	table model event 
      */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZKBroadCastManager.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZKBroadCastManager.java
index a377be1a08..50b6b59942 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZKBroadCastManager.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZKBroadCastManager.java
@@ -15,10 +15,12 @@
 package org.adempiere.webui.event;
 
 import org.compiere.util.WebUtil;
+
 import org.idempiere.broadcast.BroadCastMsg;
 import org.idempiere.broadcast.BroadCastUtil;
 import org.idempiere.broadcast.BroadcastMsgUtil;
 import org.idempiere.distributed.ITopicSubscriber;
+
 /**
  * Class Manages Broadcast Messages across webui cluster
  * @author Deepak Pansheriya
@@ -26,12 +28,20 @@ import org.idempiere.distributed.ITopicSubscriber;
  */
 public class ZKBroadCastManager implements ITopicSubscriber<BroadCastMsg>{
 
+	/** Global share singleton instance */
 	private final static ZKBroadCastManager broadCastMgr = new ZKBroadCastManager();
 	
+	/**
+	 * Get singleton instance
+	 * @return ZKBroadCastManager
+	 */
 	public static ZKBroadCastManager getBroadCastMgr()  {		
 		return broadCastMgr;
 	}
 		
+	/**
+	 * Default constructor
+	 */
 	private ZKBroadCastManager(){
 		BroadCastUtil.subscribe(this);
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZoomEvent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZoomEvent.java
index a6007b8633..9957f3dc63 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZoomEvent.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZoomEvent.java
@@ -24,11 +24,15 @@ import org.zkoss.zk.ui.event.Event;
 public class ZoomEvent extends Event {
 
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -8857628145535148973L;
 	public final static String EVENT_NAME = "onZoom";
 
+	/**
+	 * @param target
+	 * @param data
+	 */
 	public ZoomEvent(Component target, Object data) {
 		super(EVENT_NAME, target, data);
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/exception/ApplicationException.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/exception/ApplicationException.java
index dff8fcc711..968c75a6aa 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/exception/ApplicationException.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/exception/ApplicationException.java
@@ -18,7 +18,6 @@
 package org.adempiere.webui.exception;
 
 /**
- *
  * @author  <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
  * @date    Mar 25, 2007
  * @version $Revision: 0.10 $
@@ -26,15 +25,22 @@ package org.adempiere.webui.exception;
 public class ApplicationException extends RuntimeException
 {
     /**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -4217881437634023176L;
 
+	/**
+	 * @param msg
+	 */
 	public ApplicationException(String msg)
     {
         super(msg);
     }
     
+	/**
+	 * @param msg
+	 * @param ex
+	 */
     public ApplicationException(String msg, Exception ex)
     {
         super(msg, ex);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/AnnotationBasedFormFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/AnnotationBasedFormFactory.java
index a3d3992168..c7df55abe4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/AnnotationBasedFormFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/AnnotationBasedFormFactory.java
@@ -47,20 +47,25 @@ import io.github.classgraph.ClassGraph.ScanResultProcessor;
 import io.github.classgraph.ClassInfo;
 
 /**
- * Scan, discover and regiser classes with {@link Form} annotation.
+ * Scan, discover and register classes with {@link Form} annotation.
  * @author hengsin
  *
  */
 public abstract class AnnotationBasedFormFactory extends AnnotationBasedFactory implements IFormFactory {
 
+	/** AD_Form.ClassName:Real Class Name */
 	private final Map<String, String> classCache = new HashMap<>();
 	
+	/** Real Class Name: Constructor */
 	private final Map<String, Constructor<?>[]> constructorCache = new ConcurrentHashMap<>();
 
 	private BundleContext bundleContext = null;
 	
 	private static final CLogger s_log = CLogger.getCLogger(AnnotationBasedFormFactory.class);
 	
+	/**
+	 * Default constructor
+	 */
 	public AnnotationBasedFormFactory() {
 	}
 
@@ -126,8 +131,16 @@ public abstract class AnnotationBasedFormFactory extends AnnotationBasedFactory
 		}
 	}
 	
+	/**
+	 * @return packages to scan
+	 */
 	protected abstract String[] getPackages();
 	
+	/**
+	 * Perform scan
+	 * @param context
+	 * @throws ClassNotFoundException
+	 */
 	@Activate
 	public void activate(ComponentContext context) throws ClassNotFoundException {
 		long start = System.currentTimeMillis();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultAnnotationBasedFormFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultAnnotationBasedFormFactory.java
index 42bc998b9a..23514bfb70 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultAnnotationBasedFormFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultAnnotationBasedFormFactory.java
@@ -27,13 +27,16 @@ package org.adempiere.webui.factory;
 import org.osgi.service.component.annotations.Component;
 
 /**
- * 
+ * Core implementation of {@link AnnotationBasedFormFactory}
  * @author hengsin
  *
  */
 @Component(immediate = true, service = IFormFactory.class, property = {"service.ranking:Integer=0"})
 public final class DefaultAnnotationBasedFormFactory extends AnnotationBasedFormFactory {
 
+	/**
+	 * Default constructor
+	 */
 	public DefaultAnnotationBasedFormFactory() {
 	}
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultEditorFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultEditorFactory.java
index e950483484..5ea62430a9 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultEditorFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultEditorFactory.java
@@ -54,7 +54,7 @@ import org.compiere.model.GridTab;
 import org.compiere.util.DisplayType;
 
 /**
- *
+ * Default implementation of {@link IEditorFactory}
  * @author hengsin
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFeedbackService.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFeedbackService.java
index 3ab547ea27..54bb55284a 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFeedbackService.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFeedbackService.java
@@ -37,6 +37,7 @@ import org.zkoss.zk.ui.util.Clients;
 import org.zkoss.zul.Window.Mode;
 
 /**
+ * Default implementation of {@link IFeedbackService}
  * @author hengsin
  *
  */
@@ -64,14 +65,21 @@ public class DefaultFeedbackService implements IFeedbackService {
 		new CreateNewRequestAction();
 	}
 
+	/**
+	 * Action class to send feedback email to support
+	 */
 	protected static class EmailSupportAction implements EventListener<Event>{
 
 		private boolean errorOnly;
 		
+		/**
+		 * @param errorOnly
+		 */
 		protected EmailSupportAction(boolean errorOnly) {
 			this.errorOnly = errorOnly;
 			SessionManager.getAppDesktop().getComponent().addEventListener("onEmailSupport", this);
 			
+			//client side script to capture screenshot and send onEmailSupport event to server
 			String script = "html2canvas(document.body).then(canvas => " +
 					"{ const dataUrl = canvas.toDataURL();" +
 					"  let widget = zk.Widget.$('#" + SessionManager.getAppDesktop().getComponent().getUuid()+"');"+
@@ -98,11 +106,18 @@ public class DefaultFeedbackService implements IFeedbackService {
 			showEmailDialog(imageBytes);
 		}
 		
+		/**
+		 * @return Feedback subject
+		 */
 		protected String getFeedbackSubject() {
 			String feedBackHeader = Msg.getMsg(Env.getCtx(), "FeedBackHeader");
 			return Env.parseContext(Env.getCtx(), 0, feedBackHeader, false, false);
 		}
 		
+		/**
+		 * Show email dialog with screenshot attachment
+		 * @param imageBytes screenshot attachment content
+		 */
 		protected void showEmailDialog(byte[] imageBytes) {
 			DataSource ds = FeedbackManager.getLogAttachment(errorOnly);
 			
@@ -140,16 +155,25 @@ public class DefaultFeedbackService implements IFeedbackService {
 			dialog.focus();
 		}
 		
+		/**
+		 * Get recipient emails from AD_SysConfig configuration
+		 * @param scValue AD_SysConfig.Name
+		 * @return comma separated list of recipient emails
+		 */
 		protected String getFeedbackRecipient(String scValue) {
 			String retValue = MSysConfig.getValue(scValue, Env.getAD_Client_ID(Env.getCtx()), Env.getAD_Org_ID(Env.getCtx()));
 			return Util.isEmpty(retValue) ? "" : retValue;
 		}
 	}
 	
+	/**
+	 * Action class to create new feedback request 
+	 */
 	protected static class CreateNewRequestAction implements EventListener<Event>{
 		protected CreateNewRequestAction() {
 			SessionManager.getAppDesktop().getComponent().addEventListener("onCreateFeedbackRequest", this);
 			
+			//client side script to capture screenshot and send onCreateFeedbackRequest event to server
 			String script = "html2canvas(document.body).then(canvas => " +
 					"{ let dataUrl = canvas.toDataURL();" +
 					"  let widget = zk.Widget.$('#" + SessionManager.getAppDesktop().getComponent().getUuid()+"');"+
@@ -176,6 +200,10 @@ public class DefaultFeedbackService implements IFeedbackService {
 			showRequestDialog(imageBytes);
 		}
 		
+		/**
+		 * Show create feedback request dialog with screenshot attachment
+		 * @param imageBytes screenshot attachment content
+		 */
 		protected void showRequestDialog(byte[] imageBytes) {
 			FeedbackRequestWindow window = new FeedbackRequestWindow();
 			AEnv.showWindow(window);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFormFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFormFactory.java
index f87f87b1b1..f19f37e0a1 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFormFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFormFactory.java
@@ -23,6 +23,7 @@ import org.compiere.util.CLogger;
 import org.zkoss.zk.ui.Component;
 
 /**
+ * Default implementation of {@link IFormFactory}
  * @author hengsin
  *
  */
@@ -266,6 +267,10 @@ public class DefaultFormFactory implements IFormFactory {
 		return zkName;
 	}
 
+	/**
+	 * @param clazz
+	 * @return true if clazz is descendant of IFormController or Component
+	 */
 	private static boolean isZkFormClass(Class<?> clazz) {
 		return IFormController.class.isAssignableFrom(clazz) || Component.class.isAssignableFrom(clazz);
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultInfoFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultInfoFactory.java
index 1ba8811f4c..beda0a8c2c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultInfoFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultInfoFactory.java
@@ -42,7 +42,7 @@ import org.compiere.model.MInfoWindow;
 import org.compiere.util.Env;
 
 /**
- *
+ * Default implementation of {@link IInfoFactory}
  * @author hengsin
  *
  */
@@ -64,6 +64,19 @@ public class DefaultInfoFactory implements IInfoFactory {
 				value, multiSelection, whereClause, AD_InfoWindow_ID, lookup, null, field);
 	}
 
+	/**
+	 * @param WindowNo
+	 * @param tableName
+	 * @param keyColumn
+	 * @param value
+	 * @param multiSelection
+	 * @param whereClause
+	 * @param AD_InfoWindow_ID
+	 * @param lookup
+	 * @param predefinedContextVariables
+	 * @param field
+	 * @return InfoPanel
+	 */
 	public InfoPanel create(int WindowNo, String tableName, String keyColumn,
 				String value, boolean multiSelection, String whereClause, int AD_InfoWindow_ID, boolean lookup, String predefinedContextVariables, GridField field) {
 		InfoPanel info = null;
@@ -228,6 +241,10 @@ public class DefaultInfoFactory implements IInfoFactory {
 			return null;
 	}
 
+	/**
+	 * Set IsSOTrx context variable base on C_DocType_ID context value.
+	 * @param WindowNo
+	 */
 	private void setSOTrxBasedOnDocType(int WindowNo) {
 		int C_DocType_ID = Env.getContextAsInt(Env.getCtx(), WindowNo, "C_DocType_ID");
 		if (C_DocType_ID != 0) {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultQuickEntryFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultQuickEntryFactory.java
index 6b4398095f..c6bec3cbe4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultQuickEntryFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultQuickEntryFactory.java
@@ -19,8 +19,8 @@ package org.adempiere.webui.factory;
 import org.adempiere.webui.grid.AbstractWQuickEntry;
 import org.adempiere.webui.grid.WQuickEntry;
 
-
 /**
+ * Default implementation of {@link IQuickEntryFactory}
  * @author Andreas Sumerauer
  */
 public class DefaultQuickEntryFactory implements IQuickEntryFactory {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultTabPanelFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultTabPanelFactory.java
index 58cdf5828f..7812226d49 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultTabPanelFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultTabPanelFactory.java
@@ -19,6 +19,7 @@ import org.adempiere.webui.adwindow.IADTabpanel;
 import org.compiere.model.MTab;
 
 /**
+ * Default implementation of {@link IADTabPanelFactory}
  * @author Logilite Technologies
  */
 public class DefaultTabPanelFactory implements IADTabPanelFactory
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IADTabPanelFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IADTabPanelFactory.java
index 1231bbba7a..81beff9080 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IADTabPanelFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IADTabPanelFactory.java
@@ -16,15 +16,14 @@ package org.adempiere.webui.factory;
 import org.adempiere.webui.adwindow.IADTabpanel;
 
 /**
- * @author Logilite Technologies This interface implements OSGI service to
- *         retrieve ADTabPanel based on tab type.
+ * This interface implements OSGI service to instantiate ADTabPanel based on tab type.
+ * @author Logilite Technologies 
  */
 public interface IADTabPanelFactory
 {
 	/**
-	 * 
-	 * @param type Tab type
-	 * @return Implementor of IADTabPanel
+	 * @param type Tab type FORM, SORT or a custom type
+	 * @return new IADTabPanel instance
 	 */
 	public IADTabpanel getInstance(String type);
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IDashboardGadgetFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IDashboardGadgetFactory.java
index e5ba8968b6..06b1c168c3 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IDashboardGadgetFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IDashboardGadgetFactory.java
@@ -17,24 +17,25 @@ import org.compiere.model.MDashboardContent;
 import org.zkoss.zk.ui.Component;
 
 /**
+ * Factory interface for dashboard gadget
  * @author Antonio Cañaveral
  * @author hengsin
- *
  */
 public interface IDashboardGadgetFactory {
+	
 	/**
      * 
-     * @param uri String
+     * @param uri zul url
      * @param parent Component
-     * @return Component instance of DashboardPanel or null
+     * @return new DashboardPanel component instance or null
      */
     public Component getGadget(String uri, Component parent);
 
 	/**
-	 * @param url String
+	 * @param url zul url
 	 * @param parent Component
 	 * @param dc MDashboardContent
-     * @return Component instance of DashboardPanel or null
+     * @return new DashboardPanel component instance or null
 	 */
     default public Component getGadget(String url, Component parent, MDashboardContent dc) {
     	return getGadget(url, parent); // ignore the third method by default (backward compatibility)
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IEditorFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IEditorFactory.java
index 9b66d8f909..e06dd2d012 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IEditorFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IEditorFactory.java
@@ -19,7 +19,7 @@ import org.compiere.model.GridField;
 import org.compiere.model.GridTab;
 
 /**
- *
+ * Factory interface for {@link GridField} editor
  * @author hengsin
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IFeedbackService.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IFeedbackService.java
index dab66b0de0..8c64febde4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IFeedbackService.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IFeedbackService.java
@@ -14,9 +14,8 @@
 package org.adempiere.webui.factory;
 
 /**
- * 
+ * Interface for feedback service
  * @author hengsin
- *
  */
 public interface IFeedbackService {
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IFormFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IFormFactory.java
index a993b9c5f0..809da7927c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IFormFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IFormFactory.java
@@ -16,14 +16,12 @@ package org.adempiere.webui.factory;
 import org.adempiere.webui.panel.ADForm;
 
 /**
- * 
+ * Factory interface for {@link ADForm}
  * @author hengsin
- *
  */
 public interface IFormFactory {
 
 	/**
-	 * 
 	 * @param formName
 	 * @return new form instance
 	 */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IInfoFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IInfoFactory.java
index adac3fbdbd..c3b7433a68 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IInfoFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IInfoFactory.java
@@ -19,9 +19,8 @@ import org.compiere.model.GridField;
 import org.compiere.model.Lookup;
 
 /**
- *
+ * Factory interface for {@link InfoPanel} ({@link InfoWindow})
  * @author hengsin
- *
  */
 public interface IInfoFactory {
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IMappedFormFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IMappedFormFactory.java
index e4ef40f1d6..753f212aed 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IMappedFormFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IMappedFormFactory.java
@@ -30,7 +30,7 @@ import org.idempiere.ui.zk.annotation.Form;
 import org.osgi.framework.BundleContext;
 
 /**
- *
+ * {@link IMappedByNameFactory} interface for {@link ADForm}.
  * @author matheus.marcelino
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IQuickEntryFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IQuickEntryFactory.java
index c7152f95f7..633f46ba47 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IQuickEntryFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/IQuickEntryFactory.java
@@ -18,7 +18,7 @@ package org.adempiere.webui.factory;
 import org.adempiere.webui.grid.AbstractWQuickEntry;
 
 /**
- * 
+ * Factory interface for {@link AbstractWQuickEntry}
  * @author Andreas Sumerauer
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/InfoManager.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/InfoManager.java
index 2c5f93a4dd..51648ac7be 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/InfoManager.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/InfoManager.java
@@ -27,7 +27,7 @@ import org.compiere.util.CCache;
 import org.osgi.framework.Constants;
 
 /**
- *
+ * Static methods for instantiation of {@link InfoPanel}/{@link InfoWindow}
  * @author hengsin
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/MappedFormFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/MappedFormFactory.java
index c79a9020bd..6c87dbdb07 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/MappedFormFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/MappedFormFactory.java
@@ -49,6 +49,10 @@ import io.github.classgraph.ClassGraph;
 import io.github.classgraph.ClassInfo;
 import io.github.classgraph.ScanResult;
 
+/**
+ * Default implementation of {@link IMappedFormFactory}
+ * @author hengsin
+ */
 @Component(name = "org.adempiere.webui.factory.MappedFormFactory",
 immediate = true,
 service = {IFormFactory.class, IMappedFormFactory.class},
@@ -57,6 +61,9 @@ public class MappedFormFactory extends MappedByNameFactory<ADForm> implements IF
 
 	private final static CLogger s_log = CLogger.getCLogger(MappedFormFactory.class);
 	
+	/**
+	 * Default constructor
+	 */
 	public MappedFormFactory() {
 	}
 
@@ -101,10 +108,16 @@ public class MappedFormFactory extends MappedByNameFactory<ADForm> implements IF
 		
 	}
 
+	/**
+	 * {@link Supplier} class for instantiation of {@link ADForm} 
+	 */
 	private static final class FormSupplier implements Supplier<ADForm> {
 		
 		private Constructor<?> constructor;
 
+		/**
+		 * @param constructor form class constructor
+		 */
 		private FormSupplier(Constructor<?> constructor) {
 			this.constructor = constructor;
 		}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/ZulDashboardGadgetFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/ZulDashboardGadgetFactory.java
index 00a84b655d..104209920a 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/ZulDashboardGadgetFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/ZulDashboardGadgetFactory.java
@@ -21,7 +21,7 @@ import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
 
 /**
- * 
+ * Default {@link IDashboardGadgetFactory} implementation for ZUL based dashboard gadget
  * @author Antonio Cañaveral
  * @author hengsin
  *
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/AbstractWQuickEntry.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/AbstractWQuickEntry.java
index a303f8afd1..bbdc8303bc 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/AbstractWQuickEntry.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/AbstractWQuickEntry.java
@@ -24,26 +24,26 @@ import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 
 /**
- * Quick Entry Window
- * Interface based on class WQuickEntry by Carlos Ruiz
+ * Quick Entry Window.<br/>
+ * Based on class WQuickEntry by Carlos Ruiz
  * @Author Andreas Sumerauer
  */
 public abstract class AbstractWQuickEntry extends Window implements Component, ISupportMask, EventListener<Event>, ValueChangeListener
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 5092377634523789098L;
 
 	/**
 	 * check table is editable in quick entry
 	 * user must have write right and table has at least one input field
-	 * @return
+	 * @return true if quick edit form is available, false otherwise
 	 */
 	public abstract boolean isAvailableQuickEdit ();
 	
 	/**
-	 * Load Record_ID
+	 * Load record by Record_ID
 	 * @param Record_ID - existing Record or 0 for new
 	 * @return true if loaded
 	 */
@@ -56,12 +56,12 @@ public abstract class AbstractWQuickEntry extends Window implements Component, I
 	public abstract int getRecord_ID();
 
 	/**
-	 * refresh all fields
+	 * Dynamic update of all fields
 	 */
 	public abstract void dynamicDisplay();
 	
 	/**
-	 * get size quickfields
+	 * @return number of quick fields
 	 */
 	public abstract int getQuickFields();
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WQuickEntry.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WQuickEntry.java
index 3db7452a28..4ccc3873a1 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WQuickEntry.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WQuickEntry.java
@@ -67,7 +67,7 @@ import org.zkoss.zul.Vlayout;
 public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Event>, ValueChangeListener
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -6385383768870354870L;
 
@@ -82,14 +82,17 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 	private int parent_TabNo;
 
 	List<GridField> quickFields = new ArrayList<GridField>();
+	/** editors for {@link #quickFields} */
 	protected List<WEditor> quickEditors = new ArrayList<WEditor>();
 	protected List<Object> initialValues = new ArrayList<Object>();
 	protected List<GridTab> quickTabs = new ArrayList<GridTab>();
+	/** POs for {@link #quickTabs} */
 	protected List<PO> quickPOs = new ArrayList<PO>();
 
 	/** Read Only				*/
 	private boolean m_readOnly = false;
 
+	/** Center container for field label and editors */
 	protected Vlayout centerPanel = new Vlayout();
 
 	private ConfirmPanel confirmPanel = new ConfirmPanel(true, false, false, false, false, false);
@@ -98,8 +101,13 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 	
 	private boolean isHasField = false;
 
+	/** browser orientation */
 	private String orientation;
 
+	/**
+	 * @param WindowNo
+	 * @param AD_Window_ID
+	 */
 	public WQuickEntry(int WindowNo, int AD_Window_ID)
 	{
 		this(WindowNo, 0, AD_Window_ID);
@@ -109,6 +117,7 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 	 *	Constructor.
 	 *	Requires call loadRecord
 	 * 	@param WindowNo	Window No
+	 *  @param TabNo
 	 * 	@param AD_Window_ID
 	 */
 	public WQuickEntry(int WindowNo, int TabNo, int AD_Window_ID)
@@ -138,6 +147,9 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 
 	}	//	WQuickEntry
 	
+	/**
+	 * @param AD_Window_ID
+	 */
 	public WQuickEntry(int AD_Window_ID)
 	{
 		super();
@@ -145,14 +157,14 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 		m_AD_Window_ID = AD_Window_ID;
 		parent_WindowNo = 0;
 		m_WindowNo = 0;
-		log.info("R/O=" + isReadOnly());
+		if (log.isLoggable(Level.INFO))
+			log.info("R/O=" + isReadOnly());
 	}	//	WQuickEntry
 
 	/**
-	 *	Static Init
+	 *	Layout dialog
 	 * 	@throws Exception
 	 */
-
 	protected void initLayout() throws Exception
 	{
 		if (!ThemeManager.isUseCSSForWindowSize()) {
@@ -186,6 +198,9 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 		}
 	}
 
+	/**
+	 * Handle client info event
+	 */
 	protected void onClientInfo()
 	{
 		if (getPage() != null) {
@@ -200,7 +215,7 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 	}
 	
 	/**
-	 *	Dynamic Init
+	 * Initialize {@link #quickTabs}, {@link #quickFields} and {@link #quickEditors}
 	 */
 	protected void initPOs()
 	{
@@ -242,6 +257,10 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 		}
 	}	//	initPOs
 
+	/**
+	 * @param refID display type
+	 * @return true if display type support quick entry
+	 */
 	private boolean isValidQuickEntryType(int refID) {
 		boolean valid =
 			! (
@@ -252,6 +271,12 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 		return valid;
 	}
 
+	/**
+	 * Add new row of label and editor
+	 * @param editor
+	 * @param newTab true if start of new grid tab
+	 * @param gt
+	 */
 	private void createLine(WEditor editor, boolean newTab, GridTab gt) {
 		if (newTab) {
 			Separator sep = new Separator();
@@ -281,25 +306,15 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 		layout.appendChild(field);
 		ZKUpdateUtil.setHflex((HtmlBasedComponent)field, "7");
 		
-		//editor.setValue("Y");
 		centerPanel.appendChild(layout);
 	}
 
-	/**
-	 * check table is editable in quick entry
-	 * user must has write right and has at least a input field
-	 * @return
-	 */
+	@Override
 	public boolean isAvailableQuickEdit (){
 		return isHasField && !isReadOnly();
 	}
 	
-	/**
-	 *	Load Record_ID
-	 *  @param Record_ID - existing Record or 0 for new
-	 * 	@return true if loaded
-	 */
-
+	@Override
 	public boolean loadRecord (int Record_ID)
 	{
 		String parentColumn = null;
@@ -398,7 +413,8 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 	 */
 	protected boolean actionSave()
 	{
-		log.config("");
+		if (log.isLoggable(Level.CONFIG))
+			log.config("");
 		boolean anyChange = false;
 		for (int idxf = 0; idxf < quickEditors.size(); idxf++) {
 			if (isChanged(idxf)) {
@@ -508,11 +524,7 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 				|| (value != null && initialValue != null);
 	}
 
-	/**
-	 *	Returns Record_ID
-	 *	@return Record_ID (0 = not saved)
-	 */
-
+	@Override
 	public int getRecord_ID()
 	{
 		if (quickPOs.isEmpty() || quickPOs.get(0) == null)
@@ -521,6 +533,7 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 		return quickPOs.get(0).get_ID();
 	}	//	getRecord_ID
 
+	@Override
 	public void onEvent(Event e) throws Exception
 	{
 		if (isReadOnly())
@@ -552,6 +565,7 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 			desktop.unregisterWindow(m_WindowNo);
 	}
 	
+	@Override
 	public void valueChange(ValueChangeEvent evt)
 	{
 		if (evt.getSource() instanceof WEditor) {
@@ -595,9 +609,7 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 		}
 	}
 
-	/**
-	 *	refresh all fields
-	 */
+	@Override
 	public void dynamicDisplay()
 	{
 		for (int idxf = 0; idxf < quickFields.size(); idxf++) {
@@ -614,6 +626,10 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 		}
 	} // dynamicDisplay
 
+	/**
+	 * Update style of all field editors
+	 * @param tab
+	 */
 	private void updateStyleTab(GridTab tab) {
 		for (int idxf = 0; idxf < quickFields.size(); idxf++) {
 			GridField field = quickFields.get(idxf);
@@ -625,22 +641,20 @@ public class WQuickEntry extends AbstractWQuickEntry implements EventListener<Ev
 		}
 	}
 	
-	/**
-	 *	get size quickfields
-	 */
+	@Override
 	public final int getQuickFields(){
 		return quickFields.size();
-	}// size of quickfields
+	}
 
 	/**
-	 * get readOnly 
+	 * @return true if it is read only, false otherwise 
 	 */
 	protected final boolean isReadOnly() {
 		return m_readOnly;
 	}
 
 	/**
-	 * @return the confirmPanel
+	 * @return the ConfirmPanel
 	 */
 	protected final ConfirmPanel getConfirmPanel() {
 		return confirmPanel;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoAssetWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoAssetWindow.java
index f28d24c88e..fb9554823c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoAssetWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoAssetWindow.java
@@ -1,6 +1,27 @@
-/**
- * 
- */
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ *                                                                     *
+ * Contributors:                                                       *
+ * - hengsin                         								   *
+ **********************************************************************/
 package org.adempiere.webui.info;
 
 import org.compiere.model.GridField;
@@ -8,12 +29,13 @@ import org.compiere.model.MAsset;
 import org.compiere.util.Env;
 
 /**
+ * Info window for A_Asset
  * @author hengsin
  *
  */
 public class InfoAssetWindow extends InfoWindow {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 8671986505516245911L;
 
@@ -31,7 +53,6 @@ public class InfoAssetWindow extends InfoWindow {
 			int AD_InfoWindow_ID) {
 		super(WindowNo, tableName, keyColumn, queryValue, multipleSelection,
 				whereClause, AD_InfoWindow_ID);
-		// TODO Auto-generated constructor stub
 	}
 
 	/**
@@ -49,7 +70,6 @@ public class InfoAssetWindow extends InfoWindow {
 			int AD_InfoWindow_ID, boolean lookup) {
 		super(WindowNo, tableName, keyColumn, queryValue, multipleSelection,
 				whereClause, AD_InfoWindow_ID, lookup);
-		// TODO Auto-generated constructor stub
 	}
 
 	/**
@@ -61,6 +81,7 @@ public class InfoAssetWindow extends InfoWindow {
 	 * @param whereClause
 	 * @param AD_InfoWindow_ID
 	 * @param lookup
+	 * @param field
 	 * @param predefinedContextVariables
 	 */
 	public InfoAssetWindow(int WindowNo, String tableName, String keyColumn,
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoAssignmentWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoAssignmentWindow.java
index bb01c9707a..afc83d8890 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoAssignmentWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoAssignmentWindow.java
@@ -1,18 +1,40 @@
-/**
- * 
- */
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ *                                                                     *
+ * Contributors:                                                       *
+ * - hengsin                         								   *
+ **********************************************************************/
 package org.adempiere.webui.info;
 
 import org.compiere.model.GridField;
 
 /**
+ * Info window for S_ResourceAssignment
  * @author hengsin
  *
  */
 public class InfoAssignmentWindow extends InfoWindow {
 
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -5726562881863657609L;
 
@@ -58,6 +80,7 @@ public class InfoAssignmentWindow extends InfoWindow {
 	 * @param whereClause
 	 * @param AD_InfoWindow_ID
 	 * @param lookup
+	 * @param field
 	 * @param predefinedContextVariables
 	 */
 	public InfoAssignmentWindow(int WindowNo, String tableName,
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoBPartnerWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoBPartnerWindow.java
index 0cc4a4db07..52b3ffb4f0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoBPartnerWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoBPartnerWindow.java
@@ -1,20 +1,44 @@
-/**
- * 
- */
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ *                                                                     *
+ * Contributors:                                                       *
+ * - hengsin                         								   *
+ **********************************************************************/
 package org.adempiere.webui.info;
 
+import java.util.logging.Level;
+
 import org.adempiere.webui.panel.InvoiceHistory;
 import org.compiere.model.GridField;
 import org.compiere.model.MBPartner;
 import org.compiere.util.Env;
 
 /**
+ * Info window for C_BPartner
  * @author hengsin
  *
  */
 public class InfoBPartnerWindow extends InfoWindow {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 240758053410996182L;
 
@@ -43,6 +67,7 @@ public class InfoBPartnerWindow extends InfoWindow {
 	 * @param whereClause
 	 * @param AD_InfoWindow_ID
 	 * @param lookup
+	 * @param field
 	 */
 	public InfoBPartnerWindow(int WindowNo, String tableName, String keyColumn,
 			String queryValue, boolean multipleSelection, String whereClause,
@@ -60,6 +85,7 @@ public class InfoBPartnerWindow extends InfoWindow {
 	 * @param whereClause
 	 * @param AD_InfoWindow_ID
 	 * @param lookup
+	 * @param field
 	 * @param predefinedContextVariables
 	 */
 	public InfoBPartnerWindow(int WindowNo, String tableName, String keyColumn,
@@ -79,14 +105,14 @@ public class InfoBPartnerWindow extends InfoWindow {
 		return true;
 	}	//	hasHistory
 	
-	// Elaine 2008/12/16
-	/**************************************************************************
+	/**
 	 *	Show History
 	 */
 	@Override
 	protected void showHistory()
 	{
-		log.info("");
+		if (log.isLoggable(Level.INFO))
+			log.info("");
 		Integer C_BPartner_ID = getIntSelectedRowKey(MBPartner.Table_ID);
 		if (C_BPartner_ID == null)
 			return;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoInOutWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoInOutWindow.java
index f5b394339c..e301f49d75 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoInOutWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoInOutWindow.java
@@ -1,17 +1,39 @@
-/**
- * 
- */
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ *                                                                     *
+ * Contributors:                                                       *
+ * - hengsin                         								   *
+ **********************************************************************/
 package org.adempiere.webui.info;
 
 import org.compiere.model.GridField;
 
 /**
+ * Info window for M_InOut
  * @author hengsin
  *
  */
 public class InfoInOutWindow extends InfoWindow {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 3027121642718090785L;
 
@@ -57,6 +79,7 @@ public class InfoInOutWindow extends InfoWindow {
 	 * @param whereClause
 	 * @param AD_InfoWindow_ID
 	 * @param lookup
+	 * @param field
 	 * @param predefinedContextVariables
 	 */
 	public InfoInOutWindow(int WindowNo, String tableName, String keyColumn,
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoInvoiceWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoInvoiceWindow.java
index 8d1ea460b2..d15d43ec08 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoInvoiceWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoInvoiceWindow.java
@@ -1,6 +1,27 @@
-/**
- * 
- */
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ *                                                                     *
+ * Contributors:                                                       *
+ * - hengsin                         								   *
+ **********************************************************************/
 package org.adempiere.webui.info;
 
 import org.compiere.model.GridField;
@@ -8,12 +29,13 @@ import org.compiere.model.MInvoice;
 import org.compiere.util.Env;
 
 /**
+ * Info window for C_Invoice
  * @author hengsin
  *
  */
 public class InfoInvoiceWindow extends InfoWindow {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -5175983673145977830L;
 
@@ -59,6 +81,7 @@ public class InfoInvoiceWindow extends InfoWindow {
 	 * @param whereClause
 	 * @param AD_InfoWindow_ID
 	 * @param lookup
+	 * @param field
 	 * @param predefinedContextVariables
 	 */
 	public InfoInvoiceWindow(int WindowNo, String tableName, String keyColumn,
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoOrderWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoOrderWindow.java
index 034795fa83..4276ce61c6 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoOrderWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoOrderWindow.java
@@ -1,17 +1,39 @@
-/**
- * 
- */
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ *                                                                     *
+ * Contributors:                                                       *
+ * - hengsin                         								   *
+ **********************************************************************/
 package org.adempiere.webui.info;
 
 import org.compiere.model.GridField;
 
 /**
+ * Info window for C_Order
  * @author hengsin
  *
  */
 public class InfoOrderWindow extends InfoWindow {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 1241927188305227636L;
 
@@ -57,6 +79,7 @@ public class InfoOrderWindow extends InfoWindow {
 	 * @param whereClause
 	 * @param AD_InfoWindow_ID
 	 * @param lookup
+	 * @param field
 	 * @param predefinedContextVariables
 	 */
 	public InfoOrderWindow(int WindowNo, String tableName, String keyColumn,
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoPAttributeInstanceWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoPAttributeInstanceWindow.java
index 6b0ef55890..e4da574729 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoPAttributeInstanceWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoPAttributeInstanceWindow.java
@@ -1,16 +1,38 @@
-/**
- * 
- */
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ *                                                                     *
+ * Contributors:                                                       *
+ * - hengsin                         								   *
+ **********************************************************************/
 package org.adempiere.webui.info;
 
 /**
+ * Info window for M_AttributeSetInstance
  * @author hengsin
  *
  */
 public class InfoPAttributeInstanceWindow extends InfoWindow {
 
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 8387016462564425684L;
 
@@ -28,7 +50,6 @@ public class InfoPAttributeInstanceWindow extends InfoWindow {
 			String whereClause, int AD_InfoWindow_ID) {
 		super(WindowNo, tableName, keyColumn, queryValue, multipleSelection,
 				whereClause, AD_InfoWindow_ID);
-		// TODO Auto-generated constructor stub
 	}
 
 	/**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoPAttributeWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoPAttributeWindow.java
index 2221ce2fa3..347360c26c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoPAttributeWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoPAttributeWindow.java
@@ -1,6 +1,27 @@
-/**
- * 
- */
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ *                                                                     *
+ * Contributors:                                                       *
+ * - hengsin                         								   *
+ **********************************************************************/
 package org.adempiere.webui.info;
 
 /**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoPaymentWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoPaymentWindow.java
index 63ea20793d..a5141d89e1 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoPaymentWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoPaymentWindow.java
@@ -1,17 +1,39 @@
-/**
- * 
- */
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ *                                                                     *
+ * Contributors:                                                       *
+ * - hengsin                         								   *
+ **********************************************************************/
 package org.adempiere.webui.info;
 
 import org.compiere.model.GridField;
 
 /**
+ * Info window for C_Payment
  * @author hengsin
  *
  */
 public class InfoPaymentWindow extends InfoWindow {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 1322780214387328688L;
 
@@ -57,6 +79,7 @@ public class InfoPaymentWindow extends InfoWindow {
 	 * @param whereClause
 	 * @param AD_InfoWindow_ID
 	 * @param lookup
+	 * @param field
 	 * @param predefinedContextVariables
 	 */
 	public InfoPaymentWindow(int WindowNo, String tableName, String keyColumn,
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java
index 402a050a95..4f1f670e36 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java
@@ -71,29 +71,33 @@ import org.zkoss.zul.Center;
 import org.zkoss.zul.South;
 
 /**
+ * Info window for M_Product
  * @author hengsin
  *
  */
 public class InfoProductWindow extends InfoWindow {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -640644572459126094L;
 
 	protected Tabbox tabbedPane;
+	/** Storage by warehouse */
 	protected WListbox warehouseTbl;
 	protected String m_sqlWarehouse;
+	/** Substitute products */
 	protected WListbox substituteTbl;
 	protected String m_sqlSubstitute;
+	/** Related products */
 	protected WListbox relatedTbl;
 	protected String m_sqlRelated;
-    //Available to Promise Tab
+    /** Available to Promise Tab */
 	protected WListbox m_tableAtp;
 	
-	// Group atp by warehouse or non
+	/** true to sum ATP quantities by product attributes, warehouse and locator */
 	protected Checkbox chbShowDetailAtp;
 
-	//IDEMPIERE-337
+	/** Product price */
 	protected WListbox productpriceTbl;
 	protected String m_sqlProductprice;
     
@@ -104,7 +108,7 @@ public class InfoProductWindow extends InfoWindow {
 
 	protected Borderlayout contentBorderLayout;
 	
-	/** Instance Button				*/
+	/** Product Attribute Set Instance Button */
 	protected Button	m_PAttributeButton;
 
 	protected int m_M_Locator_ID;
@@ -168,6 +172,7 @@ public class InfoProductWindow extends InfoWindow {
 	 * @param whereClause
 	 * @param AD_InfoWindow_ID
 	 * @param lookup
+	 * @param field
 	 * @param predefinedContextVariables
 	 */
 	public InfoProductWindow(int WindowNo, String tableName, String keyColumn,
@@ -222,6 +227,7 @@ public class InfoProductWindow extends InfoWindow {
 
 	@Override
 	protected void renderContentPane(Center center) {
+		//storage by warehouse
 		ColumnInfo[] s_layoutWarehouse = new ColumnInfo[]{
         		new ColumnInfo(Msg.translate(Env.getCtx(), "Warehouse"), "Warehouse", String.class, true, "Warehouse"),
         		new ColumnInfo(Msg.translate(Env.getCtx(), "QtyAvailable"), "sum(QtyAvailable)", Double.class, true, "QtyAvailable"),
@@ -238,6 +244,7 @@ public class InfoProductWindow extends InfoWindow {
 		warehouseTbl.setShowTotals(true);
 		warehouseTbl.setwListBoxName("AD_InfoWindow_UU|"+ infoWindow.getAD_InfoWindow_UU() +"|stock");
 
+		//substitute products
         ColumnInfo[] s_layoutSubstitute = new ColumnInfo[]{
         		new ColumnInfo(Msg.translate(Env.getCtx(), "Warehouse"), "orgname", String.class, true, "orgname"),
         		new ColumnInfo(Msg.translate(Env.getCtx(), "Value"),
@@ -255,6 +262,7 @@ public class InfoProductWindow extends InfoWindow {
         substituteTbl.setMultiSelection(false);
         substituteTbl.setwListBoxName("AD_InfoWindow_UU|"+ infoWindow.getAD_InfoWindow_UU() + "|substitute");
 
+        //related products
         ColumnInfo[] s_layoutRelated = new ColumnInfo[]{
            		new ColumnInfo(Msg.translate(Env.getCtx(), "Warehouse"), "orgname", String.class, true, "orgname"),
         		new ColumnInfo(
@@ -272,9 +280,8 @@ public class InfoProductWindow extends InfoWindow {
         m_sqlRelated = relatedTbl.prepareTable(s_layoutRelated, s_sqlFrom, s_sqlWhere, false, "M_PRODUCT_SUBSTITUTERELATED_V");
         relatedTbl.setMultiSelection(false);
         relatedTbl.setwListBoxName("AD_InfoWindow_UU|"+ infoWindow.getAD_InfoWindow_UU() + "|related");
+        
         //Available to Promise Tab
-
-        //	Header
         ColumnInfo[] s_LayoutAtp =   new ColumnInfo[]{ 
         		new ColumnInfo(Msg.translate(Env.getCtx(), "Date"), "Date", String.class, true, "Date"),
         		new ColumnInfo(Msg.translate(Env.getCtx(), "QtyOnHand"), "QtyOnHand", Double.class, true, "QtyOnHand"),
@@ -291,7 +298,7 @@ public class InfoProductWindow extends InfoWindow {
         m_tableAtp.prepareTable(s_LayoutAtp, "M_Storage", null , false, "M_Storage");
 		m_tableAtp.setwListBoxName("AD_InfoWindow_UU|" + infoWindow.getAD_InfoWindow_UU() +"|ATP");
 		
-        //IDEMPIERE-337
+        //Product prices
         ArrayList<ColumnInfo> list = new ArrayList<ColumnInfo>();
         list.add(new ColumnInfo(Msg.translate(Env.getCtx(), "PriceListVersion"), "plv.Name", String.class, true, "PriceListVersion"));
         list.add(new ColumnInfo(Msg.translate(Env.getCtx(), "ValidFrom"), "plv.ValidFrom", Timestamp.class, true, "ValidFrom"));
@@ -450,7 +457,7 @@ public class InfoProductWindow extends InfoWindow {
 		productpriceTbl.repaint();
 		m_tableAtp.repaint();
 
-		// add related info windows
+		// add other related info windows (AD_InfoRelated)
 		if (embeddedWinList.size() > 0) {
 			for (EmbedWinInfo embeddedWin : embeddedWinList) {
 				if (embeddedWin.getInfoTbl() instanceof WListbox) {
@@ -786,7 +793,6 @@ public class InfoProductWindow extends InfoWindow {
 		}
 	}	//	refresh
 	
-	// Elaine 2008/11/26
 	/**
 	 * Query Avaiable to promise (ATP)
 	 * @param m_M_Warehouse_ID
@@ -951,7 +957,8 @@ public class InfoProductWindow extends InfoWindow {
 
 	@Override
 	protected void showHistory() {
-		log.info("");
+		if (log.isLoggable(Level.INFO))
+			log.info("");
 		Integer M_Product_ID = getIntSelectedRowKey(MProduct.Table_ID);
 		if (M_Product_ID == null)
 			return;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
index a660beac2e..bb076e9145 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
@@ -167,17 +167,19 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 
 	private static final String ON_QUERY_AFTER_CHANGE = "onQueryAfterChange";
 	
+	/** Query parameter grid */
 	protected Grid parameterGrid;
 	private Borderlayout layout;
 	private Vbox southBody;
 	/** List of WEditors            */
     protected List<WEditor> editors;
     protected ArrayList<WEditor> editors2;
+    /** List of editors that will trigger query after changes by user */
     protected List<WEditor> queryAfterChangeEditors;
     protected List<WEditor> identifiers;
     protected Properties infoContext;
 
-    /** embedded Panel **/
+    /** embedded Panel (AD_InfoRelated) **/
     protected Tabbox embeddedPane = new Tabbox();
     protected ArrayList <EmbedWinInfo> embeddedWinList = new ArrayList <EmbedWinInfo>();
     protected Map<Integer, RelatedInfoWindow> relatedMap = new HashMap<>();
@@ -191,9 +193,12 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	
 	protected AbstractWQuickEntry vqe;
 	
+	//From and to grid fields
 	private List<GridField> gridFields;
 	private List<GridField> gridFields2;
+	/** Selection Column Sequence:[InfoColumnVO, GridField] */
 	private TreeMap<Integer, List<Object[]>> parameterTree;
+	/** To grid field of {@link #parameterTree} */
 	private TreeMap<Integer, List<Object[]>> parameterTree2;
 	private Checkbox checkAND;
 		
@@ -209,19 +214,24 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	private Button exportButton = null;
 	
 	/**
-	 * Menu contail process menu item
+	 * Popup menu for process
 	 */
 	protected Menupopup ipMenu;
+	
+	/** Number of column for {@link #parameterGrid} */
 	private int noOfParameterColumn;
 	
+	/** true to auto collapse parameter panel after execution of query */
 	private boolean autoCollapsedParameterPanel = false;
 	
 	/**
 	 * @param WindowNo
 	 * @param tableName
 	 * @param keyColumn
+	 * @param queryValue
 	 * @param multipleSelection
 	 * @param whereClause
+	 * @param AD_InfoWindow_ID
 	 */
 	public InfoWindow(int WindowNo, String tableName, String keyColumn, String queryValue, 
 			boolean multipleSelection, String whereClause, int AD_InfoWindow_ID) {
@@ -232,8 +242,10 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	 * @param WindowNo
 	 * @param tableName
 	 * @param keyColumn
+	 * @param queryValue
 	 * @param multipleSelection
 	 * @param whereClause
+	 * @param AD_InfoWindow_ID
 	 * @param lookup
 	 */
 	public InfoWindow(int WindowNo, String tableName, String keyColumn, String queryValue, 
@@ -278,7 +290,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 
 		addEventListener(ON_QUERY_AFTER_CHANGE, e -> postQueryAfterChangeEvent());
 		
-   		//Xolali IDEMPIERE-1045
+   		//update related info window tabs
    		contentPanel.addActionListener(new EventListener<Event>() {
    			public void onEvent(Event event) throws Exception {
    				
@@ -297,17 +309,16 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
    				   				
    				updateSubcontent(row);
    			}
-   		}); //xolali --end-
+   		});
 
    		Env.setPredefinedVariables(Env.getCtx(), getWindowNo(), predefinedContextVariables);
 		infoContext = new Properties(Env.getCtx());
 		p_loadedOK = loadInfoDefinition(); 
 		
-		// make process button only in windown mode
+		// make process button only in window mode
 		if (!m_lookup){
-		// IDEMPIERE-1334
 			initInfoProcess();
-			// when have a process, force multi select mode
+			// when have a process, force multiple selection mode
 			if (haveProcess)
 				setMultipleSelection(true);
 		}		
@@ -360,7 +371,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	* {@inheritDoc}
 	*/
 	@Override
-	protected void updateSubcontent (int row){ // F3P: For multi-selection info, using selected row blocks the dislay to the first selected
+	protected void updateSubcontent (int row){ // F3P: For multi-selection info, display for the first selected row
 		
 		if(row < 0)
 			row = contentPanel.getSelectedRow();
@@ -384,11 +395,10 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	}
 
 	/**
-	 * IDEMPIERE-1334
-	 * load info process info
-	 * separate by layout type
-	 * init drop list and menu control
-	 * set status of haveProcess flag 
+	 * IDEMPIERE-1334<br/>
+	 * Load info processes by layout type.<br/>
+	 * Create buttons, drop down list and popup menu.<br/>
+	 * Set status of haveProcess flag.<br/> 
 	 */
 	protected void initInfoProcess() {
 		if (infoWindow == null){
@@ -509,10 +519,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	}
 	
 	/**
-	 * evel display logic of process info button
-	 * set visible of button base in display logic
-	 * when two button set for same process, two button can hiden too, or display too.
-	 * this is bug of implementor by never have this case
+	 * Evaluate display logic of process info button and set visiblity of button. <br/>
 	 */
 	protected void bindInfoProcessBt (){
 		if (infoProcessBtList == null){
@@ -521,11 +528,11 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 				
 		// display process in button style		
 		for (MInfoProcess infoProcessBt : infoProcessBtList){
-			// eval display logic
+			// evaluate display logic
 			for (Button evlBt: btProcessList){
 				Integer processId = (Integer)evlBt.getAttribute(PROCESS_ID_KEY);
 				if (processId.intValue() == infoProcessBt.getAD_Process_ID()){
-					// display or hiden button
+					// display or hide button
 					evlBt.setVisible(infoProcessBt.isDisplayed(infoContext, p_WindowNo));
 					break;
 				}
@@ -534,15 +541,14 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	}
 	
 	/**
-	 * recreate drop down item by recreate model to set hiden, display of drop down item
-	 * when all item is hiden, hiden combobox and process button too
+	 * Create drop down list (Combobox) of process
 	 */
 	protected void bindInfoProcessDropDown (){
 		if (infoProcessDropList == null || infoProcessDropList.size() == 0){
 			return;
 		}				
 				
-		// list info process after eval display logic
+		// list info process after evaluation of display logic
 		List<MInfoProcess> infoProcessDropListTmp = new ArrayList<MInfoProcess> (); 
 		
 		// filter item not display
@@ -552,7 +558,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 			}
 		}
 		
-		// when item is filter out all. don't show combobox
+		// When all item is hidden. don't show combobox
 		cbbProcess.setVisible(infoProcessDropListTmp.size() > 0);
 		btCbbProcess.setVisible(infoProcessDropListTmp.size() > 0);
 		if (infoProcessDropListTmp.size() > 0){			
@@ -563,8 +569,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	}
 	
 	/**
-	 * recreate menu item by set hiden, display of menu item
-	 * when all menu item is hiden, hiden process menu button too
+	 * Create popup of menu for processes
 	 */
 	protected void bindInfoProcessMenu (){
 		if (infoProcessMenuList == null || infoProcessMenuList == null)
@@ -577,7 +582,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 			}
 			
 			MProcess process = MProcess.get(Env.getCtx(), infoProcess.getAD_Process_ID());
-   			// make menu item for each info process
+   			// Create menu item for each info process
    	   		Menuitem ipMenuItem = new Menuitem();
    	   		ipMenuItem.setLabel(process.get_Translation(MProcess.COLUMNNAME_Name));
    	   		if (!Util.isEmpty(infoProcess.getImageURL(), true)) {
@@ -591,11 +596,12 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
    	   		ipMenu.appendChild(ipMenuItem);
    		}
    		
+		//hide menu button if no visible process
 		btMenuProcess.setVisible(ipMenu.getChildren().size() > 0);
 	}
 
 	/**
-	 * move process buttons from left side of center to the front of right side
+	 * Move process buttons from left of centre panel to the front of right panel
 	 */
 	public void moveProcessButtonsToBeforeRight() {
 		if (btProcessList == null || btProcessList.isEmpty())
@@ -607,7 +613,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	}
 	
 	/**
-	 * process query value from input element
+	 * Process query value from input element
 	 */
 	protected void processQueryValue() {
 		isQueryByUser = true;
@@ -750,7 +756,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 					gridField2 = new GridField(vo2);
 				}
 				gridFields2.add(gridField2);
-				//IDEMPIERE-4485 Clone new Gridfields with IsReadOnly = false
+				//IDEMPIERE-4485 Clone new Grid fields with IsReadOnly = false
 				if(infoColumn.isQueryCriteria()) {
 					vo = vo.clone(infoContext, p_WindowNo, 0, vo.AD_Window_ID, 0, false);
 					vo.IsReadOnly = false;
@@ -772,7 +778,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 				}
 			}
 			
-			// If we have a process and at least one process and an editable field, change to the info window rendered
+			// If we have a process and at least one editable field, listen for table change event
 			
 			int processCount = 0;
 			
@@ -795,13 +801,13 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 				
 			}
 
-					infoWindowListItemRenderer = new WInfoWindowListItemRenderer(this);
-					contentPanel.setItemRenderer(infoWindowListItemRenderer);
+			infoWindowListItemRenderer = new WInfoWindowListItemRenderer(this);
+			contentPanel.setItemRenderer(infoWindowListItemRenderer);
 			if(hasEditable)
 			{
-					contentPanel.setAllowIDColumnForReadWrite(true);
-					infoWindowListItemRenderer.addTableValueChangeListener(contentPanel); // Replicated from WListbox constructor
-				}					
+				contentPanel.setAllowIDColumnForReadWrite(true);
+				infoWindowListItemRenderer.addTableValueChangeListener(contentPanel); // Replicated from WListbox constructor
+			}					
 			
 			StringBuilder builder = new StringBuilder(p_whereClause != null ? p_whereClause.trim() : "");
 			String infoWhereClause = infoWindow.getWhereClause();
@@ -832,7 +838,6 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 		if (infoWindow == null)
 			return false;
 
-		// topinfoColumns = infoWindow.getInfoColumns();
 		MInfoRelated[] infoRelatedList = infoWindow.getInfoRelated(true);
 		//Init Info Related VO
 		relatedInfoList = InfoRelatedVO.getInfoRelatedVOList(Env.getCtx(), infoRelatedList, p_WindowNo);
@@ -840,8 +845,6 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 		Tabpanels tabPanels = new Tabpanels();
 		Tabs tabs = new Tabs();
 
-
-		//	for(int i=0; i <  relatedinfoList.length - 1 ; i++) {
 		for (InfoRelatedVO relatedInfo:relatedInfoList) {
 			
 			if(!relatedInfo.isDisplayed(infoContext)) {
@@ -861,8 +864,6 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 			WListbox embeddedTbl = new WListbox();
 			String m_sqlEmbedded;
 
-			//MInfoWindow.getInfoWindow(infoRelatedID);
-
 			if (embedInfo != null) {
 				ArrayList<ColumnInfo> list = new ArrayList<ColumnInfo>();
 				list = getInfoColumnslayout(embedInfo);
@@ -894,7 +895,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 				embeddedPaging.setSclass("infowindow-related-paging");
 
 				//Xolali - add embeddedTbl to list, add m_sqlembedded to list
-				EmbedWinInfo ewinInfo = new EmbedWinInfo(embedInfo,embeddedTbl,m_sqlEmbedded,relatedInfo.getLinkColumnName(), relatedInfo.getLinkInfoColumn(), relatedInfo.getParentRelatedColumn_ID());
+				EmbedWinInfo ewinInfo = new EmbedWinInfo(embedInfo, embeddedTbl, m_sqlEmbedded, relatedInfo.getLinkColumnName(), relatedInfo.getLinkInfoColumn(), relatedInfo.getParentRelatedColumn_ID());
 				embeddedWinList.add(ewinInfo);
 				RelatedInfoWindow relatedInfoWindow = new RelatedInfoWindow(ewinInfo, this, embeddedPaging, s_sqlCount, s_layoutEmbedded, editorMap);
 				relatedMap.put(embedInfo.getAD_InfoWindow_ID(), relatedInfoWindow);
@@ -903,7 +904,6 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 				Tab tab = new Tab(tabTitle);
 				tabs.appendChild(tab);
 				Tabpanel desktopTabPanel = new Tabpanel();
-				//desktopTabPanel.
 				ZKUpdateUtil.setHeight(desktopTabPanel, "100%");
 				Vlayout vlayout = new Vlayout();
 				ZKUpdateUtil.setVflex(vlayout, "1");
@@ -916,12 +916,8 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 		}
 		
 		if (relatedInfoList.length > 0) { // setup the panel
-
-			//embeddedPane.setTitle(Msg.translate(Env.getCtx(), "Related Information"));
 			ZKUpdateUtil.setHeight(embeddedPane, "100%");
-			//tabPanels = new Tabpanels();
 			embeddedPane.appendChild(tabPanels);
-			//tabs = new Tabs();
 			embeddedPane.appendChild(tabs);
 
 		}
@@ -930,7 +926,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	}
 
 	/**
-	 * setup list box and construct sql query clause
+	 * Setup list box and construct SQL query clause
 	 */
 	protected void prepareTable() {		
 		List<ColumnInfo> list = new ArrayList<ColumnInfo>();
@@ -1029,7 +1025,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 		MLookupInfo lookupInfo = MLookupFactory.getLookupInfo(Env.getCtx(), p_WindowNo, 0, infoColumn.getAD_Reference_ID(), Env.getLanguage(Env.getCtx()), columnName, infoColumn.getAD_Reference_Value_ID(), false, validationCode);
 		String displayColumn = lookupInfo.DisplayColumn;
 		
-		boolean haveNotProcess = !haveProcess; // A field is editabile only if is not readonly and theres a process;
+		boolean haveNotProcess = !haveProcess; // A field is editable only if is not readonly and there is a process;
 				
 		int index = infoColumn.getSelectClause().indexOf(".");
 		if (index >= 0 && index == infoColumn.getSelectClause().lastIndexOf("."))
@@ -1108,7 +1104,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	@Override
 	protected String getSQLWhere() {
 		/**
-		 * when query not by click requery button, reuse prev where clause
+		 * when query not by click re-query button, reuse previous where clause
 		 * IDEMPIERE-1979  
 		 */
 		if (!isQueryByUser && prevWhereClause != null){
@@ -1310,13 +1306,11 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	}
 
 	/**
-	 * Check has new parameter is change or new input
-	 * in case first time search, return true
-	 * @return
+	 * Check if parameter value has change
+	 * @return true if at least one parameter value has change or this is the first search by user
 	 */
 	protected boolean isParameteChangeValue (){
 		if (prevParameterValues == null){
-			// never process query, because consider as changed value to process current search
 			return true;
 		}
 		
@@ -1416,8 +1410,8 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	}
 	
 	/**
-	 * set parameter for statement. 
-	 * not need check null for value
+	 * Set parameters for prepared statement.<br/> 
+	 * Does not need null check for value.
 	 * @param pstmt
 	 * @param parameterIndex
 	 * @param value
@@ -1477,15 +1471,15 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	}
 
 	/**
-	 * add all ViewID in each MInfoProcess to query
-	 * if main query have subquery in SELECT, it will beak or incorrect
+	 * Add all ViewID in each MInfoProcess to query.<br/>
+	 * If main query have subquery in SELECT, it will beak or incorrect
 	 */
 	protected void addViewIDToQuery () {
 		m_sqlMain = addMoreColumnToQuery (m_sqlMain, infoProcessList);
 	}
 	
 	/**
-	 * if {@link #keyColumnOfView} not null and not display, add query to query it's value
+	 * If {@link #keyColumnOfView} not null and not display, add {@link #keyColumnOfView} to query
 	 */
 	protected void addKeyViewToQuery () {
 		if (isNeedAppendKeyViewData()){
@@ -1499,15 +1493,14 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	}
 	
 	/**
-	 * because data of infoColumn have isDisplay = false not load, 
-	 * just display column is load to show in List.
-	 * Some function receive data from hidden column as viewID in infoProcess
-	 * or parentLink of infoRelateWindow.
-	 * 
-	 * this function just add column name of hidden infoWindow to end of query
-	 * @param sqlMain main sql to append column
-	 * @param listInfoColumn list of PO contain infoColumnID, this infoColumnID will add to query
-	 * @return sql after append column
+	 * Info window load infoColumns with isDisplay = true to construct the main query. <br/>
+	 * Some function uses data from hidden column as viewID in infoProcess
+	 * or as parentLink of infoRelateWindow. This function is use to append the hidden column to main query.
+	 * <p/>
+	 * Append info window column to query.
+	 * @param sqlMain main SQL to append column
+	 * @param listInfoColumn list of info column to add to query
+	 * @return SQL after append column
 	 */
 	protected String addMoreColumnToQuery (String sqlMain, IInfoColumn [] listInfoColumn) {
 		if (sqlMain == null || sqlMain.length() == 0 || listInfoColumn == null || listInfoColumn.length == 0){
@@ -1675,14 +1668,12 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 			south.setTooltiptext(Msg.translate(Env.getCtx(), "Related Information"));
 			south.setSclass("south-collapsible-with-title");
 			south.setAutoscroll(true);
-			//south.sets
 			inner.appendChild(south);
 			embeddedPane.setSclass("info-product-tabbedpane");
 			ZKUpdateUtil.setVflex(embeddedPane, "1");
 			ZKUpdateUtil.setHflex(embeddedPane, "1");
 
 			south.appendChild(embeddedPane);
-
 		}// render embedded
 
 		center.appendChild(inner);
@@ -1834,7 +1825,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
      *  Add Selection Column to first Tab
 	 *  @param infoColumn 
      *  @param mField field
-    **/
+     */
     protected void addSelectionColumn(InfoColumnVO infoColumn, GridField mField, GridField mField2)
     {
         int displayLength = mField.getDisplayLength();
@@ -2117,7 +2108,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
      * Append ORDER BY expressions into the select list
      * @param sql
      * @param orderBy
-     * @return String parsed sql
+     * @return sql with order by
      */
     private String appendOrderByToSelectList(String sql, String orderBy) {
     	if(Util.isEmpty(orderBy))
@@ -2132,9 +2123,9 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
     }
 
     /**
-     * Get the index of the FROM statement
+     * Get the index of the FROM keyword
      * @param sql
-     * @return int idx
+     * @return index of the FROM keyword
      */
     private int getIdxFrom(String sql) {
 		int parenthesisLevel = 0;
@@ -2522,7 +2513,9 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 		return true;
 	}	//	testCount
 
-	/** Return true if there is an 'IsActive' criteria */
+	/** 
+	 * @return true if there is an 'IsActive' criteria 
+	 */
 	protected boolean hasIsActiveEditor() {
 		for (WEditor editor : editors) {
 			if (editor.getGridField() != null && "IsActive".equals(editor.getGridField().getColumnName())) {
@@ -2550,54 +2543,54 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 				? tableInfos[0].getSynonym()
 						: tableInfos[0].getTableName();
 
-				String keySelectClause = keyTableAlias + "." + p_keyColumn;
+		String keySelectClause = keyTableAlias + "." + p_keyColumn;
 
-				for (InfoColumnVO infoColumn : infoColumns)
+		for (InfoColumnVO infoColumn : infoColumns)
+		{
+			if (infoColumn.isDisplayed(infoContext, p_WindowNo))
+			{
+				ColumnInfo columnInfo = null;
+				String colSQL = infoColumn.getSelectClause();
+				if (! colSQL.toUpperCase().contains(" AS "))
+					colSQL += " AS " + infoColumn.getColumnName();
+				if (infoColumn.getAD_Reference_ID() == DisplayType.ID)
 				{
-					if (infoColumn.isDisplayed(infoContext, p_WindowNo))
-					{
-						ColumnInfo columnInfo = null;
-						String colSQL = infoColumn.getSelectClause();
-						if (! colSQL.toUpperCase().contains(" AS "))
-							colSQL += " AS " + infoColumn.getColumnName();
-						if (infoColumn.getAD_Reference_ID() == DisplayType.ID)
-						{
-							if (infoColumn.getSelectClause().equalsIgnoreCase(keySelectClause))
-								continue;
-
-							columnInfo = new ColumnInfo(infoColumn.getNameTrl(), colSQL, DisplayType.getClass(infoColumn.getAD_Reference_ID(), true));
-						}
-						else if (DisplayType.isLookup(infoColumn.getAD_Reference_ID()))
-						{
-							if (infoColumn.getAD_Reference_ID() == DisplayType.List)
-							{
-								WEditor editor = null;							
-						        editor = WebEditorFactory.getEditor(getGridField(infoColumn), true);
-						        editor.setMandatory(false);
-						        editor.setReadWrite(false);
-						        editorMap.put(colSQL, editor);
-								columnInfo = new ColumnInfo(infoColumn.getNameTrl(), colSQL, ValueNamePair.class, (String)null);
-							}
-							else
-							{
-								GridField field = getGridField(infoColumn);
-								columnInfo = createLookupColumnInfo(tableInfos, field, infoColumn);
-							}
-						}
-						else
-						{
-							columnInfo = new ColumnInfo(infoColumn.getNameTrl(), colSQL, DisplayType.getClass(infoColumn.getAD_Reference_ID(), true));
-						}
-						columnInfo.setColDescription(infoColumn.getDescriptionTrl());
-						columnInfo.setGridField(getGridField(infoColumn));
-						columnInfo.setAD_Reference_ID(infoColumn.getAD_Reference_ID());
-						columnInfo.setAD_Reference_Value_ID(infoColumn.getAD_Reference_Value_ID());
-						list.add(columnInfo);
-					}
+					if (infoColumn.getSelectClause().equalsIgnoreCase(keySelectClause))
+						continue;
 
+					columnInfo = new ColumnInfo(infoColumn.getNameTrl(), colSQL, DisplayType.getClass(infoColumn.getAD_Reference_ID(), true));
 				}
+				else if (DisplayType.isLookup(infoColumn.getAD_Reference_ID()))
+				{
+					if (infoColumn.getAD_Reference_ID() == DisplayType.List)
+					{
+						WEditor editor = null;							
+				        editor = WebEditorFactory.getEditor(getGridField(infoColumn), true);
+				        editor.setMandatory(false);
+				        editor.setReadWrite(false);
+				        editorMap.put(colSQL, editor);
+						columnInfo = new ColumnInfo(infoColumn.getNameTrl(), colSQL, ValueNamePair.class, (String)null);
+					}
+					else
+					{
+						GridField field = getGridField(infoColumn);
+						columnInfo = createLookupColumnInfo(tableInfos, field, infoColumn);
+					}
+				}
+				else
+				{
+					columnInfo = new ColumnInfo(infoColumn.getNameTrl(), colSQL, DisplayType.getClass(infoColumn.getAD_Reference_ID(), true));
+				}
+				columnInfo.setColDescription(infoColumn.getDescriptionTrl());
+				columnInfo.setGridField(getGridField(infoColumn));
+				columnInfo.setAD_Reference_ID(infoColumn.getAD_Reference_ID());
+				columnInfo.setAD_Reference_Value_ID(infoColumn.getAD_Reference_Value_ID());
+				list.add(columnInfo);
+			}
 
-				return   list;
+		}
+
+		return   list;
 	}
 
 	/**
@@ -2617,7 +2610,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	 * author xolali IDEMPIERE-1045
 	 * GridField getGridField(InfoColumnVO infoColumn)
 	 * @param infoColumn
-	 * @return
+	 * @return GridField
 	 */
 	protected GridField getGridField(InfoColumnVO infoColumn){
 		String columnName = infoColumn.getColumnName();
@@ -2668,10 +2661,10 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	}
 	
 	/**
-	 * valid mandatory of a not null, display field
-	 * display red color when a mandatory field is not input
+	 * Validate mandatory fields.<br/>
+	 * Display red color when a mandatory field is not fill.
 	 * @param wEditor
-	 * @return
+	 * @return true if pass mandatory validation, false otherwise
 	 */
 	protected boolean validateField (WEditor wEditor){
 		if (wEditor == null || !wEditor.isVisible() || wEditor.getGridField() == null){
@@ -2720,7 +2713,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	
 	/**	
 	 * Get id of window link with main table of this info window
-	 * @return
+	 * @return AD_Window_ID
 	 */
 	protected int getADWindowID() {
 		if(infoWindow == null)
@@ -2774,7 +2767,10 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 					
 	}
 
-	/** Allow to show or hide the sub panel (detail) programmatically */
+	/** 
+	 * Allow to show or hide the sub panel (detail) programmatically
+	 * @param visible 
+	 */
 	protected void setSouthVisible(boolean visible) {
 		Component comp = layout.getCenter();
 		for (Component c : comp.getChildren()) {
@@ -2802,7 +2798,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 		ListModelTable model = contentPanel.getModel();
 		Properties ctx = new Properties(Env.getCtx()); // Allow session values
 		
-		// Parameter dditors
+		// Parameter editors
 		
 		for(WEditor e:editors)
 		{
@@ -3099,7 +3095,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 			List<Object> originalSelectedRow = temporarySelectedData.get(keyViewValue);
 			ListModelTable model = contentPanel.getModel();
 			
-			// While restoring values we dong want to trigger listeners
+			// While restoring values we don't want to trigger listeners
 			model.removeTableModelListener(this);
 			
 			if (originalSelectedRow != null)
@@ -3140,12 +3136,12 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
 	 */
 	protected void initExport()
 	{
-    exportButton = ButtonFactory.createNamedButton("Export", false, true);        
-    exportButton.setId("Export");
-    exportButton.setEnabled(false);       
-    exportButton.addEventListener(Events.ON_CLICK, new XlsxExportAction());
-
-    confirmPanel.addComponentsLeft(exportButton);
+	    exportButton = ButtonFactory.createNamedButton("Export", false, true);        
+	    exportButton.setId("Export");
+	    exportButton.setEnabled(false);       
+	    exportButton.addEventListener(Events.ON_CLICK, new XlsxExportAction());
+	
+	    confirmPanel.addComponentsLeft(exportButton);
 	}
 
 	/**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/RelatedInfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/RelatedInfoWindow.java
index 8337748283..79737ef57e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/RelatedInfoWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/RelatedInfoWindow.java
@@ -83,10 +83,12 @@ public class RelatedInfoWindow implements EventListener<Event>, Sortable<Object>
 	private ColumnInfo[] columnsLayout;
 
 	/**
+	 * @param info
 	 * @param infoWindow
 	 * @param embeddedPaging
+	 * @param infoSqlCount
 	 * @param layoutEmbedded 
-	 *
+	 * @param editorMap
 	 */
 	public RelatedInfoWindow(EmbedWinInfo info, InfoWindow infoWindow, Paging embeddedPaging, String infoSqlCount, ColumnInfo[] layoutEmbedded, Map<String, WEditor> editorMap) {
 		this.editorMap = editorMap;
@@ -98,6 +100,9 @@ public class RelatedInfoWindow implements EventListener<Event>, Sortable<Object>
 		columnsLayout = layoutEmbedded;
 	}
 
+	/**
+	 * @param id
+	 */
 	public void refresh(Object id) {
 		parentId = id;
 
@@ -225,26 +230,32 @@ public class RelatedInfoWindow implements EventListener<Event>, Sortable<Object>
 	}
 
 	/**
-	 * @return the cacheStart
+	 * @return the cacheStart index
 	 */
 	protected int getCacheStart() {
 		return cacheStart;
 	}
 
 	/**
-	 * @param cacheStart the cacheStart to set
+	 * @param cacheStart set cacheStart index
 	 */
 	private void setCacheStart(int cacheStart) {
 		this.cacheStart = cacheStart;
 	}
 
 	/**
-	 * @return the cacheEnd
+	 * @return the cacheEnd index
 	 */
 	protected int getCacheEnd() {
 		return cacheEnd;
 	}
 
+	/**
+	 * @param fromIndex
+	 * @param toIndex
+	 * @param line
+	 * @return sublist from line
+	 */
 	private List<Object> getSubList (int fromIndex, int toIndex, List<Object> line){
     	if (toIndex > line.size())
     		toIndex = line.size();
@@ -260,17 +271,17 @@ public class RelatedInfoWindow implements EventListener<Event>, Sortable<Object>
     }
 
 	/**
-     * when calculator value at bound, sometime value is overflow by data type
-     * this function calculator at high type for avoid it
+     * When calculate value at bound, sometime value is overflow by data type. <br/>
+     * This function calculate using higher type to workaround it.
      * @param overValue
-     * @return
+     * @return int value
      */
     private int getOverIntValue (long overValue){
     	return getOverIntValue (overValue, 0);
     }
 
     /**
-     * see {@link #getOverIntValue(long)}. when value over max_value set it near max_value.
+     * see {@link #getOverIntValue(long)}. when value over max_value set it to nearest max_value.
      * @param overValue
      * @param extra
      * @return
@@ -282,6 +293,12 @@ public class RelatedInfoWindow implements EventListener<Event>, Sortable<Object>
     	return (int)overValue;
     }
 
+    /**
+     * Loading of data from DB
+     * @param start
+     * @param end
+     * @return list of values read
+     */
 	private List<Object> readLine(int start, int end) {
 		int pageSize = parentInfoWindow.getPageSize();
 
@@ -572,9 +589,9 @@ public class RelatedInfoWindow implements EventListener<Event>, Sortable<Object>
 	}
 
 	/**
-     * after query from database, process validate.
-     * if end page include in cache, process calculate total record
-     * if current page is out of page (no record is query) process query count to detect end page
+     * After query from database, validate paging. <br/>
+     * If end page included in cache, calculate record total. <br/>
+     * If current page is out of cache (no record is query), process query count to detect end page
      */
     protected void validateEndPage (){
     	if (paging == null || info.getInfowin().isLoadPageNum())
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/WInfoPAttributeEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/WInfoPAttributeEditor.java
index 025f76bd8d..eb3e4483a9 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/WInfoPAttributeEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/WInfoPAttributeEditor.java
@@ -147,7 +147,5 @@ public class WInfoPAttributeEditor extends WEditor implements IWhereClauseEditor
 
 	@Override
 	public void dynamicDisplay() {
-		// int attributeSetId = Env.getContextAsInt(ctx, windowNo, Env.TAB_INFO, "M_AttributeSet_ID");
-		// setReadWrite(attributeSetId > 0);
 	}
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/listbox/renderer/AbstractListitemRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/listbox/renderer/AbstractListitemRenderer.java
index 0fbbd822ca..94ccabb73c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/listbox/renderer/AbstractListitemRenderer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/listbox/renderer/AbstractListitemRenderer.java
@@ -54,10 +54,10 @@ public abstract class AbstractListitemRenderer<T> implements ListitemRenderer<T>
     }
 	
 	/**
-	 * Renders the data to the specified list item.
+	 * Renders data to the specified list item.
 	 * @param item the listitem to render the result.
-	 * @param data data that is returned from {@link ListModel#getElementAt}
-	 * @param index the row/list index of the data that is currently being rendered
+	 * @param data data returned from {@link ListModel#getElementAt}
+	 * @param index the row/list index of data that is currently being rendered
 	 */
 	public abstract void renderListitem(Listitem item, T data, int index);
 	
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADForm.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADForm.java
index 681fa0abf2..ba75aacaec 100755
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADForm.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADForm.java
@@ -48,7 +48,7 @@ import org.zkoss.zk.ui.event.KeyEvent;
 public abstract class ADForm extends Window implements EventListener<Event>, IHelpContext
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -5381283117636286759L;
 
@@ -60,15 +60,14 @@ public abstract class ADForm extends Window implements EventListener<Event>, IHe
         logger = CLogger.getCLogger(ADForm.class);
     }
 
-    /** The unique identifier of the form type */
+    /** AD_Form_ID */
     private int m_adFormId;
-    /** The identifying number of the window in which the form is housed */
+    /** window number of desktop tab */
     protected int m_WindowNo;
 
-
+    /** Name of form */
 	private String m_name;
 
-
 	private ProcessInfo m_pi;
 
 	private IFormController m_customForm;
@@ -91,11 +90,17 @@ public abstract class ADForm extends Window implements EventListener<Event>, IHe
          this.setContentSclass("adform-content");
     }
 
+    /**
+     * @return window number
+     */
     public int getWindowNo()
     {
     	return m_WindowNo;
     }
 
+    /**
+     * @return AD_Form_ID
+     */
     protected int getAdFormId()
     {
     	return m_adFormId;
@@ -104,15 +109,15 @@ public abstract class ADForm extends Window implements EventListener<Event>, IHe
     /**
      * Initialise the form
      *
-     * @param adFormId	the Adempiere form identifier
-     * @param name		the name of the Adempiere form
+     * @param adFormId	AD_Form_ID
+     * @param name		Name of form
      */
 
     protected void init(int adFormId, String name)
     {
         if(adFormId <= 0)
         {
-	           throw new IllegalArgumentException("Form Id is invalid");
+        	throw new IllegalArgumentException("Form Id is invalid");
 	   	}
 
         m_adFormId = adFormId;
@@ -125,6 +130,9 @@ public abstract class ADForm extends Window implements EventListener<Event>, IHe
         addEventListener(WindowContainer.ON_WINDOW_CONTAINER_SELECTION_CHANGED_EVENT, this);
     }
 
+    /**
+     * Initialize form layout
+     */
     abstract protected void initForm();
 
 	/**
@@ -137,7 +145,7 @@ public abstract class ADForm extends Window implements EventListener<Event>, IHe
 	/**
 	 * Create a new form corresponding to the specified identifier
 	 *
-	 * @param adFormID		The unique identifier for the form type
+	 * @param adFormID	AD_Form_ID
 	 * @return The created form
 	 */
 	public static ADForm openForm (int adFormID)
@@ -188,6 +196,7 @@ public abstract class ADForm extends Window implements EventListener<Event>, IHe
      * @param gridTab
      * @param pi
      * @param predefinedContextVariables
+     * @param isSOTrx
      * @return The created form
      */
     public static ADForm openForm (int adFormID, GridTab gridTab, ProcessInfo pi, String predefinedContextVariables, boolean isSOTrx)
@@ -199,7 +208,7 @@ public abstract class ADForm extends Window implements EventListener<Event>, IHe
 
     	if (mform.get_ID() == 0 || formName == null)
     	{
-			throw new ApplicationException("There is no form associated with the specified selection");
+			throw new ApplicationException("There is no form associated with the specified form ID");
     	}
     	else
     	{
@@ -225,9 +234,7 @@ public abstract class ADForm extends Window implements EventListener<Event>, IHe
     	}
 	}	//	openForm
 
-    /**
-     *
-     */
+    @Override
 	public void onEvent(Event event) throws Exception
     {
 		if (event.getName().equals(WindowContainer.ON_WINDOW_CONTAINER_SELECTION_CHANGED_EVENT)) {
@@ -262,11 +269,17 @@ public abstract class ADForm extends Window implements EventListener<Event>, IHe
 		return m_pi;
 	}
 
+	/**
+	 * @param customForm
+	 */
 	public void setICustomForm(IFormController customForm)
 	{
 		m_customForm = customForm;
 	}
 
+	/**
+	 * @return IFormController
+	 */
 	public IFormController getICustomForm()
 	{
 		return m_customForm;
@@ -282,6 +295,9 @@ public abstract class ADForm extends Window implements EventListener<Event>, IHe
 	
 	private GridTab gridTab;
 	
+	/**
+	 * @return GridTab
+	 */
 	public GridTab getGridTab()
 	{
 		return gridTab;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractMenuPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractMenuPanel.java
index 8a0d983b9b..96e4ac5123 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractMenuPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractMenuPanel.java
@@ -57,28 +57,35 @@ import org.zkoss.zul.Treeitem;
 import org.zkoss.zul.Treerow;
 
 /**
- * Menu Panel Base
+ * Abstract base class for Menu Panel
  * @author Elaine
  * @date July 31, 2012
  */
 public abstract class AbstractMenuPanel extends Panel implements EventListener<Event> {
 
+	/** Treeitem attribute to store the type of menu item (report, window, etc) */
 	public static final String MENU_TYPE_ATTRIBUTE = "menu.type";
 	
+	/** Treeitem attribute to store the name of a menu item */
 	public static final String MENU_LABEL_ATTRIBUTE = "menu.label";
 
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -6160708371157917922L;
 	
+	/** Event queue name */
 	public static final String MENU_ITEM_SELECTED_QUEUE = "MENU_ITEM_SELECTED_QUEUE";
 	
 	private Properties ctx;
     private Tree menuTree;
 
+    /** Listener for {@link #MENU_ITEM_SELECTED_QUEUE} event queue */
 	private EventListener<Event> listener;
     
+	/**
+	 * @param parent
+	 */
     public AbstractMenuPanel(Component parent)
     {
     	if (parent != null)
@@ -86,6 +93,9 @@ public abstract class AbstractMenuPanel extends Panel implements EventListener<E
         init();            	
     }
     
+    /**
+     * Initialize {@link #menuTree}
+     */
     protected void init() {
 		ctx = Env.getCtx();
         int adRoleId = Env.getAD_Role_ID(ctx);
@@ -96,6 +106,9 @@ public abstract class AbstractMenuPanel extends Panel implements EventListener<E
         initMenu(rootNode);
     }
     
+    /**
+     * Create components
+     */
     protected void initComponents()
     {
     	this.setSclass("menu-panel");
@@ -109,6 +122,10 @@ public abstract class AbstractMenuPanel extends Panel implements EventListener<E
         menuTree.setPageSize(-1); // Due to bug in the new paging functionality
     }
     
+    /**
+     * Fill {@link #menuTree} from rootNode
+     * @param rootNode
+     */
     private void initMenu(MTreeNode rootNode)
     {
         Treecols treeCols = new Treecols();
@@ -123,6 +140,11 @@ public abstract class AbstractMenuPanel extends Panel implements EventListener<E
         generateMenu(rootTreeChildren, rootNode);
     }
     
+    /**
+     * @param ctx
+     * @param adRoleId
+     * @return AD_Tree_ID for role
+     */
     private int getTreeId(Properties ctx, int adRoleId)
     {
         int AD_Tree_ID = DB.getSQLValue(null,
@@ -135,6 +157,11 @@ public abstract class AbstractMenuPanel extends Panel implements EventListener<E
         return AD_Tree_ID;
     }
     
+    /**
+     * Fill treeChildren from mNode
+     * @param treeChildren
+     * @param mNode
+     */
     private void generateMenu(Treechildren treeChildren, MTreeNode mNode)
     {
         Enumeration<?> nodeEnum = mNode.children();
@@ -236,6 +263,10 @@ public abstract class AbstractMenuPanel extends Panel implements EventListener<E
         }
     }
     
+    /**
+     * Create new record button
+     * @return Toolbarbutton
+     */
     public Toolbarbutton createNewButton()
     {
     	Toolbarbutton newBtn = new Toolbarbutton(null, ThemeManager.getThemeResource("images/New10.png"));
@@ -248,6 +279,7 @@ public abstract class AbstractMenuPanel extends Panel implements EventListener<E
     	return newBtn;
     }
     
+    @Override
     public void onEvent(Event event)
     {
         Component comp = event.getTarget();
@@ -258,6 +290,11 @@ public abstract class AbstractMenuPanel extends Panel implements EventListener<E
         }
     }
     
+    /**
+     * Handle onClick and onOk event
+     * @param comp
+     * @param eventData
+     */
     private void doOnClick(Component comp, Object eventData) {
     	boolean newRecord = false;
 		if (comp instanceof A) {
@@ -311,10 +348,16 @@ public abstract class AbstractMenuPanel extends Panel implements EventListener<E
 		    else
 		    	selectedItem.setOpen(!selectedItem.isOpen());
 		    selectedItem.setSelected(true);
+		    
+		    //publish event to sync the selection of other menu tree (if any)
 	        EventQueues.lookup(MENU_ITEM_SELECTED_QUEUE, EventQueues.DESKTOP, true).publish(new Event(Events.ON_SELECT, null, selectedItem));
 		}
 	}
     
+    /**
+     * Handle new record event
+     * @param selectedItem
+     */
     private void onNewRecord(Treeitem selectedItem) {
     	try
         {
@@ -351,6 +394,10 @@ public abstract class AbstractMenuPanel extends Panel implements EventListener<E
 		
 	}
 
+    /**
+     * Handle onClick event of tree item
+     * @param selectedItem
+     */
 	protected void fireMenuSelectedEvent(Treeitem selectedItem) {
     	int nodeId = Integer.parseInt((String)selectedItem.getValue());
        
@@ -367,11 +414,17 @@ public abstract class AbstractMenuPanel extends Panel implements EventListener<E
         }		
 	}
 
+	/**
+	 * @return Tree
+	 */
 	public Tree getMenuTree() 
 	{
 		return menuTree;
 	}
 	
+	/**
+	 * @return ctx
+	 */
 	public Properties getCtx()
 	{
 		return ctx;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java
index 5ff31b35d4..a714c94f02 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java
@@ -49,14 +49,14 @@ import org.zkoss.zul.Separator;
 import org.zkoss.zul.South;
 
 /**
- * 
+ * Window to view and acknowledge messages from AD_BroadcastMessage
  * @author Vivek
  * @author Deepak Pansheriya
  *
  */
 public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup,EventListener<Event>{
 	/**
-	 *  
+	 *  generated serial id
 	 */
 	private static final long serialVersionUID = 1849434312706721390L;
 
@@ -65,20 +65,27 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup
 	public static final int PRESSED_NEXT = 2;
 	public static final int UPDATE_CurrMsg = 0;
 	
+	/** index of current show/render message in {@link #mbMessages} */
 	private int currMsg=0;
 	private Label textMsgNo = null;
 	private Html textMsgContent = null;
 	private North north =null;
+	/** Container for message navigation controls */
 	private Div swDiv =null;
 	private Button btnPrev = null;
 	private Button btnNext = null;
 	private Checkbox acknowledged = null;
 	private ArrayList<MBroadcastMessage> mbMessages = null;
+	/** AD_BroadcastMessage_ID:Processed */
 	private Hashtable<Integer, Boolean> hashMessages = new Hashtable<Integer, Boolean>();
+	/** Parent of window */
 	private HeaderPanel pnlHead = null;
 	private boolean isTest = false;
 	private boolean initialised = false;
 	
+	/**
+	 * @param pnlHead
+	 */
 	public BroadcastMessageWindow(HeaderPanel pnlHead) {
 		this.pnlHead = pnlHead;
 		textMsgNo = new Label();
@@ -88,6 +95,9 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup
 		btnNext = new Button(">");
 	}
 	
+	/**
+	 * Layout window
+	 */
 	private void init() {
 		Borderlayout layout = new Borderlayout();
 		this.appendChild(layout);
@@ -145,20 +155,20 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup
 		swDiv.setParent(leftCell);
 		acknowledged = new Checkbox();
 		
-			//createHashTable();
-			currMsg = 0;
-			btnPrev.addEventListener("onClick", this);
-			btnNext = new Button(">");
-			btnNext.addEventListener("onClick", this);
-			
-			swDiv.appendChild(btnPrev);
-			swDiv.appendChild(new Separator("vertical"));
-			swDiv.appendChild(textMsgNo);
-			swDiv.appendChild(new Separator("vertical"));
-			swDiv.appendChild(btnNext);
-			textMsgNo.setStyle("font-weight:bold;");
-			
-			renderMsg(UPDATE_CurrMsg);
+		//createHashTable();
+		currMsg = 0;
+		btnPrev.addEventListener("onClick", this);
+		btnNext = new Button(">");
+		btnNext.addEventListener("onClick", this);
+		
+		swDiv.appendChild(btnPrev);
+		swDiv.appendChild(new Separator("vertical"));
+		swDiv.appendChild(textMsgNo);
+		swDiv.appendChild(new Separator("vertical"));
+		swDiv.appendChild(btnNext);
+		textMsgNo.setStyle("font-weight:bold;");
+		
+		renderMsg(UPDATE_CurrMsg);
 		
 		if(mbMessages.size()<=0)
 			swDiv.setVisible(false);
@@ -183,6 +193,10 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup
 		}
 	}
 
+	/**
+	 * Process messages
+	 * @param arrMessages
+	 */
 	public void prepareMessage(ArrayList<MBroadcastMessage> arrMessages){
 		mbMessages = arrMessages;
 		createHashTable();
@@ -243,7 +257,7 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup
 	
 	/**
 	 * Update message on window
-	 * @param status
+	 * @param status next, previous or current
 	 */
 	public void renderMsg(int status) {
 		int msgToUpdate = currMsg-1;
@@ -367,7 +381,7 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup
 	}
 
 	/** Set the title for the panel using what is defined on the message or fallback to "Message" */
-	void setTitle(MBroadcastMessage bm) {
+	protected void setTitle(MBroadcastMessage bm) {
 		String title = bm.get_Translation(MBroadcastMessage.COLUMNNAME_Title);
 		setTitle(Util.isEmpty(title) ? Msg.getMsg(Env.getCtx(), "Message") : title);
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java
index 5d46ff37b5..1e7aa6f959 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java
@@ -57,14 +57,14 @@ import org.zkoss.zk.ui.util.Clients;
 import org.zkoss.zul.Image;
 
 /**
- * Change Password Panel
+ * Change Password dialog
  * @author Elaine
  * @date August 30, 2012
  */
 public class ChangePasswordPanel extends Window implements EventListener<Event>
 {
     /**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -4117126419866788951L;
 
@@ -93,6 +93,14 @@ public class ChangePasswordPanel extends Window implements EventListener<Event>
     protected Textbox txtRetypeNewPassword;
     protected Textbox txtAnswer;
 
+    /**
+     * @param ctx
+     * @param loginWindow
+     * @param userName
+     * @param userPassword
+     * @param show
+     * @param clientsKNPairs
+     */
     public ChangePasswordPanel(Properties ctx, LoginWindow loginWindow, String userName, String userPassword, boolean show, KeyNamePair[] clientsKNPairs) 
     {
     	this.wndLogin = loginWindow;
@@ -113,6 +121,9 @@ public class ChangePasswordPanel extends Window implements EventListener<Event>
     	createUI();
     }
 
+    /**
+     * Layout dialog
+     */
 	protected void createUI() {
 		Div div = new Div();
     	div.setSclass(ITheme.LOGIN_BOX_HEADER_CLASS);
@@ -211,6 +222,9 @@ public class ChangePasswordPanel extends Window implements EventListener<Event>
         this.appendChild(div);
 	}
 
+	/**
+	 * Create components
+	 */
     private void initComponents()
     {
     	lblOldPassword = new Label();
@@ -265,13 +279,13 @@ public class ChangePasswordPanel extends Window implements EventListener<Event>
         
     	txtAnswer = new Textbox();
     	txtAnswer.setId("txtAnswer");
-//        txtAnswer.setType("password");
         txtAnswer.setCols(25);
         ZKUpdateUtil.setWidth(txtAnswer, "220px");
    }
 
-    public void onEvent(Event event)
-    {
+   @Override
+   public void onEvent(Event event)
+   {
         if (event.getTarget().getId().equals(ConfirmPanel.A_OK))
         {
 			validateChangePassword();
@@ -279,7 +293,6 @@ public class ChangePasswordPanel extends Window implements EventListener<Event>
         else if (event.getTarget().getId().equals(ConfirmPanel.A_CANCEL))
         {
         	SessionManager.logoutSession();
-            //wndLogin.loginCancelled();
         }
         else if (event.getTarget() == txtNewPassword) {
         	MPasswordRule pwdrule = MPasswordRule.getRules(Env.getCtx(), null);
@@ -298,6 +311,9 @@ public class ChangePasswordPanel extends Window implements EventListener<Event>
         }
     }
     
+    /**
+     * Validate new password
+     */
     public void validateChangePassword()
     {
     	Clients.clearBusy();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChatPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChatPanel.java
index 4a886d0d57..c891c79910 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChatPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChatPanel.java
@@ -25,10 +25,11 @@ import org.adempiere.webui.component.Panel;
  * @date    Mar 2, 2007
  * @version $Revision: 0.10 $
  */
+@Deprecated(forRemoval = true, since = "11")
 public class ChatPanel extends Panel
 {
     /**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 3581014332386266757L;
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ConfigurationPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ConfigurationPanel.java
index 54a2f41394..afacef4764 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ConfigurationPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ConfigurationPanel.java
@@ -25,10 +25,11 @@ import org.adempiere.webui.component.Panel;
  * @date    Mar 2, 2007
  * @version $Revision: 0.10 $
  */
+@Deprecated(forRemoval = true, since = "11")
 public class ConfigurationPanel extends Panel
 {
     /**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 7604294587769974845L;
 
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 c4bbbfab28..4b2d782215 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
@@ -1,11 +1,32 @@
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ *                                                                     *
+ **********************************************************************/
 package org.adempiere.webui.panel;
 
 @org.idempiere.ui.zk.annotation.Form
 public class CustomForm extends ADForm
 {
-
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -8498084996736578534L;
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomizeGridViewPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomizeGridViewPanel.java
index 3bba8a3e64..9528113353 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomizeGridViewPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomizeGridViewPanel.java
@@ -70,25 +70,24 @@ import org.zkoss.zul.Separator;
 import org.zkoss.zul.South;
 
 /**
- * 
+ * Dialog to customize grid view (selected columns, column width, etc)
  * @author hengsin
  *
  */
 public class CustomizeGridViewPanel extends Panel
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -6200912526954948898L;
 
+	/** AD_Field_ID:Width */
 	private Map<Integer, String> m_columnsWidth;
-	ArrayList<Integer> tableSeqs;
-	GridView gridPanel = null;
-	MTabCustomization m_tabcust;
+	protected ArrayList<Integer> tableSeqs;
+	protected GridView gridPanel = null;
+	protected MTabCustomization m_tabcust;
 
 	/**
-	 *	Sort Tab Constructor
-	 *
 	 * @param WindowNo Window No
 	 * @param AD_Tab_ID
 	 * @param AD_User_ID
@@ -140,8 +139,8 @@ public class CustomizeGridViewPanel extends Panel
 	/* SysConfig USE_ESC_FOR_TAB_CLOSING */
 	private boolean isUseEscForTabClosing = MSysConfig.getBooleanValue(MSysConfig.USE_ESC_FOR_TAB_CLOSING, false, Env.getAD_Client_ID(Env.getCtx()));
 	
-/**
-	 * Static Layout
+	/**
+	 * Layout dialog
 	 * 
 	 * @throws Exception
 	 */
@@ -343,6 +342,9 @@ public class CustomizeGridViewPanel extends Panel
 		getParent().detach();
 	}
 	
+	/**
+	 * Load customization data
+	 */
 	public void loadData()
 	{
 		m_tabcust = MTabCustomization.get(Env.getCtx(), m_AD_User_ID, m_AD_Tab_ID, null);
@@ -434,7 +436,7 @@ public class CustomizeGridViewPanel extends Panel
 	/**
 	 * @param event
 	 */
-	void migrateValueAcrossLists (Event event)
+	protected void migrateValueAcrossLists (Event event)
 	{
 		Object source = event.getTarget();
 		if (source instanceof ListItem) {
@@ -450,7 +452,13 @@ public class CustomizeGridViewPanel extends Panel
 		migrateLists (listFrom,listTo,endIndex);	
 	}
 
-	void migrateLists (Listbox listFrom , Listbox listTo , int endIndex	)
+	/**
+	 * Move selected items from listFrom to listTo
+	 * @param listFrom
+	 * @param listTo
+	 * @param endIndex
+	 */
+	protected void migrateLists (Listbox listFrom , Listbox listTo , int endIndex	)
 	{
 		int index = 0;
 		SimpleListModel lmFrom = (SimpleListModel) listFrom.getModel();
@@ -477,10 +485,10 @@ public class CustomizeGridViewPanel extends Panel
 	}
 	
 	/**
-	 * 	Move within Yes List with Drag Event and Multiple Choice
+	 * 	Move selected items within Yes List
 	 *	@param event event
 	 */
-	void migrateValueWithinYesList (int endIndex, List<ListElement> selObjects)
+	protected void migrateValueWithinYesList (int endIndex, List<ListElement> selObjects)
 	{
 		int iniIndex =0;
 		Arrays.sort(selObjects.toArray());	
@@ -495,10 +503,10 @@ public class CustomizeGridViewPanel extends Panel
 	}
 
 	/**
-	 * 	Move within Yes List
+	 * 	Move selected items within Yes List
 	 *	@param event event
 	 */
-	void migrateValueWithinYesList (Event event)
+	protected void migrateValueWithinYesList (Event event)
 	{
 		Object[] selObjects = yesList.getSelectedItems().toArray();
 		
@@ -560,9 +568,13 @@ public class CustomizeGridViewPanel extends Panel
 		}
 	}	//	migrateValueWithinYesList
 
+	/**
+	 * Save changes
+	 */
 	public void saveData()
 	{
-		log.fine("");
+		if (log.isLoggable(Level.FINE))
+			log.fine("");
 		//	yesList
 		//int index = 0;
 		boolean ok = true;
@@ -678,7 +690,8 @@ public class CustomizeGridViewPanel extends Panel
 			return s;
 		}
 	}
-		/**
+	
+	/**
 	 * @author eslatis
 	 *
 	 */
@@ -686,7 +699,7 @@ public class CustomizeGridViewPanel extends Panel
 	{
 
 		/**
-		 * Creates a ADSortTab.DragListener.
+		 * Constructor
 		 */
 		public DragListener()
 		{
@@ -727,10 +740,16 @@ public class CustomizeGridViewPanel extends Panel
 		}
 	}
 
+	/**
+	 * @param b
+	 */
 	public void activate(boolean b) {
 		if (b && !uiCreated) createUI();
 	}
 
+	/**
+	 * Layout dialog
+	 */
 	public void createUI() {
 		if (uiCreated) return;
 		try
@@ -745,14 +764,23 @@ public class CustomizeGridViewPanel extends Panel
 		uiCreated = true;
 	}
 
+	/**
+	 * Load data
+	 */
 	public void query() {
 		loadData();
 	}
 
+	/**
+	 * @return true if changes have been saved
+	 */
 	public boolean isSaved() {
 		return m_saved;
 	}
 
+	/**
+	 * @param gridPanel
+	 */
 	public void setGridPanel(GridView gridPanel){
 		this.gridPanel = gridPanel;
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/FooterPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/FooterPanel.java
index f48f56b533..40ad89a50c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/FooterPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/FooterPanel.java
@@ -29,7 +29,7 @@ import org.zkoss.zul.Separator;
  * @date    Mar 3, 2007
  * @version $Revision: 0.10 $
  */
-
+@Deprecated(forRemoval = true, since = "11")
 public class FooterPanel extends Window
 {
     /**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java
index 15f35c014a..7588eb0c82 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java
@@ -45,7 +45,7 @@ import org.zkoss.zul.Popup;
 import org.zkoss.zul.impl.LabelImageElement;
 
 /**
- *
+ * Header panel of desktop
  * @author  <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
  * @author  <a href="mailto:hengsin@gmail.com">Low Heng Sin</a>
  * @date    Mar 2, 2007
@@ -55,14 +55,21 @@ import org.zkoss.zul.impl.LabelImageElement;
 
 public class HeaderPanel extends Panel implements EventListener<Event>
 {
+	/**
+	 * generated serial id
+	 */
 	private static final long serialVersionUID = -2351317624519209484L;
 
+	/** Logo */
 	protected Image image;
 	protected LabelImageElement btnMenu;
 	protected Popup popMenu;
 
 	private MenuTreePanel menuTreePanel;
 
+	/**
+	 * Default constructor
+	 */
     public HeaderPanel()
     {
         super();
@@ -70,6 +77,9 @@ public class HeaderPanel extends Panel implements EventListener<Event>
         addEventListener(ZoomEvent.EVENT_NAME, this);
     }
 
+    /**
+     * Layout panel
+     */
     protected void onCreate()
     {
     	image = (Image) getFellow("logo");
@@ -92,6 +102,9 @@ public class HeaderPanel extends Panel implements EventListener<Event>
     	SessionManager.getSessionApplication().getKeylistener().addEventListener(Events.ON_CTRL_KEY, this);
     }
 
+    /**
+     * Create pop up menu tree
+     */
 	protected void createPopupMenu() {
 		popMenu = new Popup();
     	popMenu.setId("menuTreePopup");
@@ -107,6 +120,9 @@ public class HeaderPanel extends Panel implements EventListener<Event>
 		popMenu.setAttribute(popMenu.getUuid(), System.currentTimeMillis());
 	}
 
+	/**
+	 * Create global search box
+	 */
 	protected void createSearchPanel() {
 		GlobalSearch globalSearch = new GlobalSearch(new MenuSearchController(menuTreePanel.getMenuTree()));
     	Component stub = getFellow("menuLookup");
@@ -115,6 +131,7 @@ public class HeaderPanel extends Panel implements EventListener<Event>
     	globalSearch.setId("menuLookup");
 	}
 
+	@Override
 	public void onEvent(Event event) throws Exception {
 		if (Events.ON_CLICK.equals(event.getName())) {
 			if(event.getTarget() == image)
@@ -174,16 +191,25 @@ public class HeaderPanel extends Panel implements EventListener<Event>
 			popMenu.setPage(null);
 	}
 	
+	/**
+	 * @return logo image
+	 */
 	public Image getLogo() {
 		return image;
 	}
 	
+	/**
+	 * Close popup for global search
+	 */
 	public void closeSearchPopup() {
 		Component c = getFellow("menuLookup");
 		if (c != null && c instanceof GlobalSearch)
 			((GlobalSearch)c).closePopup();
 	}
 	
+	/**
+	 * Handle onClientInfo event
+	 */
 	protected void onClientInfo() {
 		ZKUpdateUtil.setWindowWidthX(popMenu, 600);
 		Component c = getFellow("menuLookup");
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java
index 60a3f75c09..3118ad4503 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java
@@ -71,6 +71,9 @@ public class HelpController
 	private Panel pnlToolTip, pnlContextHelp, pnlQuickInfo;
 	private Html htmlToolTip, htmlContextHelp, htmlQuickInfo;
 	
+	/**
+	 * Default constructor
+	 */
 	public HelpController()
     {
 		dashboardLayout = new Anchorlayout();
@@ -79,6 +82,11 @@ public class HelpController
         ZKUpdateUtil.setHflex(dashboardLayout, "1");
     }
 
+	/**
+	 * Render tooltips, context help and quick info.
+	 * @param parent
+	 * @param desktopImpl
+	 */
 	public void render(Component parent, IDesktop desktopImpl)
     {
     	Style style = new Style();
@@ -160,6 +168,9 @@ public class HelpController
         renderQuickInfo(null);
     }
 
+	/**
+	 * Setup client side script for field tooltip
+	 */
 	public void setupFieldTooltip() {
 		Clients.response("helpControllerFieldTooltip", 
 				new AuScript(htmlToolTip, "(function(){let w=zk.Widget.$('#"+htmlToolTip.getUuid()
@@ -167,7 +178,7 @@ public class HelpController
 	}
     
 	/**
-	 * Make tooltip content for a field 
+	 * Render tooltip content for a field 
 	 * @param field
 	 */
     public void renderToolTip(GridField field)
@@ -198,7 +209,7 @@ public class HelpController
     }
     
     /**
-     * Make tooltip content, when  hdr == null, show otherContent
+     * Render tooltip content, when hdr == null, show otherContent
      * @param hdr
      * @param desc
      * @param help
@@ -219,9 +230,9 @@ public class HelpController
     			otherContent = Msg.getMsg(Env.getCtx(), "PlaceCursorIntoField");
     		}
     		
-    			sb.append("<i>(");
-    			sb.append (otherContent);
-    			sb.append (")</i>");
+			sb.append("<i>(");
+			sb.append (otherContent);
+			sb.append (")</i>");
     	}else{
     		sb.append("<b>");
     		sb.append(hdr);
@@ -244,6 +255,11 @@ public class HelpController
     	htmlToolTip.setContent(sb.toString());
     }
     
+    /**
+     * Render context help (AD_CtxHelpMsg)
+     * @param ctxType
+     * @param recordId
+     */
     public void renderCtxHelp(String ctxType, int recordId)
     {
     	if (ctxType != X_AD_CtxHelp.CTXTYPE_Home && ctxType != X_AD_CtxHelp.CTXTYPE_Tab && 
@@ -653,6 +669,12 @@ public class HelpController
     	htmlContextHelp.setContent(sb.toString());
     }
 
+    /**
+     * Add context help suggestion popup menu
+     * @param po
+     * @param baseContent
+     * @param translatedContent
+     */
     private void addContextHelpMenupopup(PO po, StringBuilder baseContent, StringBuilder translatedContent) {
     	if (!MRole.getDefault().isTableAccessExcluded(MCtxHelpSuggestion.Table_ID)) {
     		ContextHelpMenupopup popup = new ContextHelpMenupopup(po, baseContent.toString(), translatedContent.toString());
@@ -662,6 +684,10 @@ public class HelpController
     	}
     }
 
+    /**
+     * Render quick info (AD_StatusLine)
+     * @param obj
+     */
     public void renderQuickInfo(Object obj) {
     	if (obj == null) {
         	pnlQuickInfo.setVisible(false);
@@ -691,6 +717,11 @@ public class HelpController
     	}
 	}
 
+    /**
+     * @param htmlString
+     * @param all
+     * @return text after strip of html tag
+     */
     private String stripHtml(String htmlString, boolean all) 
     {
 		htmlString = htmlString
@@ -708,6 +739,11 @@ public class HelpController
 		return htmlString;
 	}
 
+    /**
+     * @param ctxType
+     * @param recordId
+     * @return MCtxHelpMsg
+     */
     private MCtxHelpMsg getCtxHelpMsg(String ctxType, int recordId)
     {
     	MCtxHelpMsg retValue = MCtxHelpMsg.get(ctxType, recordId);
@@ -716,7 +752,7 @@ public class HelpController
 
     /**
 	 * @param content content
-	 * @return masked content or empty string if the <code>content</code> is null
+	 * @return masked content or empty string if <code>content</code> is null
 	 */
 	public static String escapeJavascriptContent(String content)
 	{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/IFormController.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/IFormController.java
index bb46278bea..2eb52f89f9 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/IFormController.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/IFormController.java
@@ -1,3 +1,27 @@
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ *                                                                     *
+ * Contributors:                                                       *
+ * - hengsin                         								   *
+ **********************************************************************/
 package org.adempiere.webui.panel;
 
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/IHelpContext.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/IHelpContext.java
index 1ecec94fe2..170151c2f6 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/IHelpContext.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/IHelpContext.java
@@ -15,7 +15,8 @@
 package org.adempiere.webui.panel;
 
 /**
- * 
+ * Marker interface for component that wants to handle the update of context help by listening to the <br/>
+ * WindowContainer.ON_WINDOW_CONTAINER_SELECTION_CHANGED_EVENT event.
  * @author Elaine
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ITabOnCloseHandler.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ITabOnCloseHandler.java
index 36b1df1741..f16d34b17f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ITabOnCloseHandler.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ITabOnCloseHandler.java
@@ -16,12 +16,15 @@ package org.adempiere.webui.panel;
 import org.adempiere.webui.component.Tabpanel;
 
 /**
- * 
+ * Interface to handle the closing of a Tab.
  * @author hengsin
  *
  */
 public interface ITabOnCloseHandler {
 	
-	/* NOTE onClose method must implement the actual closing of the tab */
+	/**
+	 * NOTE onClose method must implement the actual closing of the tab
+	 * @param tabPanel 
+	 */
 	public void onClose(Tabpanel tabPanel);
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java
index d090f07aa7..9b58f978d9 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java
@@ -41,15 +41,14 @@ import org.zkoss.zul.South;
 import org.zkoss.zul.Div;
 
 /**
- * Display Product Attribute Instance Info
- * This class is based on org.compiere.apps.search.PAttributeInstance written by Jorg Janke
+ * Display Product Attribute Set Instance Info
  * @author Elaine
  *
  */
 public class InfoPAttributeInstancePanel extends Window implements EventListener<Event>, WTableModelListener
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -2883260173499157121L;
 
@@ -87,9 +86,10 @@ public class InfoPAttributeInstancePanel extends Window implements EventListener
 	 */
 	private void init (int M_Warehouse_ID, int M_Locator_ID, int M_Product_ID, int C_BPartner_ID)
 	{
-		log.info("M_Warehouse_ID=" + M_Warehouse_ID 
-			+ ", M_Locator_ID=" + M_Locator_ID
-			+ ", M_Product_ID=" + M_Product_ID);
+		if (log.isLoggable(Level.INFO))
+			log.info("M_Warehouse_ID=" + M_Warehouse_ID 
+				+ ", M_Locator_ID=" + M_Locator_ID
+				+ ", M_Product_ID=" + M_Product_ID);
 		m_M_Warehouse_ID = M_Warehouse_ID;
 		m_M_Locator_ID = M_Locator_ID;
 		m_M_Product_ID = M_Product_ID;
@@ -120,7 +120,7 @@ public class InfoPAttributeInstancePanel extends Window implements EventListener
 	private static final CLogger log = CLogger.getCLogger(InfoPAttributeInstancePanel.class);
 
 	/**
-	 * 	Static Init
+	 * 	layout window
 	 * 	@throws Exception
 	 */
 	private void jbInit() throws Exception
@@ -156,7 +156,7 @@ public class InfoPAttributeInstancePanel extends Window implements EventListener
 		confirmPanel.addActionListener(this);		
 	}	//	jbInit
 
-	/**	Table Column Layout Info			*/
+	/**	Column Layout Info			*/
 	private static ColumnInfo[] s_layout = new ColumnInfo[] 
 	{
 		new ColumnInfo(" ", "s.M_AttributeSetInstance_ID", IDColumn.class),
@@ -249,7 +249,7 @@ public class InfoPAttributeInstancePanel extends Window implements EventListener
 	}	//	dynInit
 
 	/**
-	 * 	Refresh Query
+	 * Execute Query
 	 */
 	private void refresh()
 	{
@@ -288,9 +288,10 @@ public class InfoPAttributeInstancePanel extends Window implements EventListener
 	}	//	refresh
 
 	/**
-	 * 	Action Listener
+	 * 	Handle events
 	 *	@param e event 
 	 */
+	@Override
 	public void onEvent(Event e) throws Exception 
 	{
 		if (e.getTarget().getId().equals(ConfirmPanel.A_OK))
@@ -315,6 +316,7 @@ public class InfoPAttributeInstancePanel extends Window implements EventListener
 	 * 	Table selection changed
 	 *	@param e event
 	 */
+	@Override
 	public void tableChanged(WTableModelEvent e) 
 	{
 		enableButtons();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java
index 3bf162bd10..4fd2c29173 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java
@@ -54,18 +54,17 @@ import org.zkoss.zul.Vbox;
 
 /**
  * Search by Product Attribute.
- * This class is based on org.compiere.apps.search.InfoPAttribute written by Jorg Janke
  * @author Elaine
  *
  */
 public class InfoPAttributePanel extends Window implements EventListener<Event>
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -4922961793415942591L;
 
-	/* the attribute set selected on the InfoProduct window */
+	/** the attribute set selected on the InfoProduct window */
 	private int p_M_AttributeSet_ID = 0;
 	
 	/**
@@ -106,7 +105,7 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
 	
 	/**	Resulting Query			*/
 	private String		m_query = "";
-	/**	Product Attribure Editors	*/
+	/**	Product Attribute Editors	*/
 	private ArrayList<Component>	m_productEditors = new ArrayList<Component>();
 	private ArrayList<Component>	m_productEditorsTo = new ArrayList<Component>();
 	/**	Instance Attribute Editors	*/
@@ -129,7 +128,7 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
 	//
 
 	/**
-	 * 	Static Init
+	 * 	Layout dialog
 	 *	@throws Exception
 	 */
 	private void jbInit() throws Exception
@@ -386,7 +385,7 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
 	/**
 	 *	Get Attribute List
 	 *	@param M_Attribute_ID attribure
-	 *	@return array
+	 *	@return [M_AttributeValue_ID:Name]
 	 */
 	private KeyNamePair[] getAttributeList(int M_Attribute_ID)
 	{
@@ -471,9 +470,10 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
 
 	
 	/**
-	 *	Action Listener
+	 *	Handle event
 	 *	@param e event
 	 */
+	@Override
 	public void onEvent(Event e) throws Exception 
 	{
 		if (e.getTarget().getId().equals(ConfirmPanel.A_OK))
@@ -486,16 +486,16 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
 			m_query = null;
 			dispose();
 		}
-	}	//	actionPerformed
+	}
 
 	/**
 	 * 	Create Query
-	 *  <code>
+	 *  <p>
 	 * 	Available synonyms:
-	 *		M_Product p
-	 *		M_ProductPrice pr
-	 *		M_AttributeSet pa
-	 *	</code>
+	 *	<ul>M_Product p</ul>
+	 *	<ul>M_ProductPrice pr</ul>
+	 *	<ul>M_AttributeSet pa</ul>
+	 *	</p>
 	 *	@return query
 	 */
 	private String createQuery()
@@ -698,12 +698,13 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
 		m_query = null;
 		if (sb.length() > 0)
 			m_query = sb.toString();
-		log.config(m_query);		
+		if (log.isLoggable(Level.CONFIG))
+			log.config(m_query);		
 		return m_query;
 	}	//	createQuery
 
 	/**
-	 * 	Get resulting Query WHERE
+	 * 	Get where clause
 	 *	@return query or null
 	 */
 	public String getWhereClause()
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 ec14837356..4be9bd52f0 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
@@ -122,21 +122,18 @@ import org.zkoss.zul.event.ZulEvents;
 import org.zkoss.zul.ext.Sortable;
 
 /**
- *	Search Information and return selection - Base Class.
- *  Based on Info written by Jorg Janke
+ * Search dialog that works in two mode. <br/>
+ * Lookup mode: Search and return selection to lookup field. <br/>
+ * Window mode: Search and view search results. Optional support for execution of process.
  *
- *  @author Sendy Yagambrum
- *
- * Zk Port 
+ * @author Sendy Yagambrum
  * @author Elaine
- * @version	Info.java Adempiere Swing UI 3.4.1
- * 
  * @contributor red1 IDEMPIERE-1711 with final review by HengSin 
  */
 public abstract class InfoPanel extends Window implements EventListener<Event>, WTableModelListener, Sortable<Object>, IHelpContext
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 8253708190979803268L;
 
@@ -149,6 +146,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	private final static int DEFAULT_PAGE_SIZE = 100;
 	private final static int DEFAULT_PAGE_PRELOAD = 4;
 	protected List<Button> btProcessList = new ArrayList<Button>();
+	/** Column:WEditor */
 	protected Map<String, WEditor> editorMap = new HashMap<String, WEditor>();
 	protected final static String PROCESS_ID_KEY = "processId";
 	protected final static String ON_RUN_PROCESS = "onRunProcess";
@@ -156,6 +154,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	// attribute key of info process
 	protected final static String ATT_INFO_PROCESS_KEY = "INFO_PROCESS";
 	protected int pageSize;
+	/** KeyNamePair/ValueNamePair:[Column:Value] */
 	public LinkedHashMap<NamePair,LinkedHashMap<String, Object>> m_values = null;
 	protected InfoRelatedVO[] relatedInfoList;
 	// for test disable load all record when num of record < 1000
@@ -165,8 +164,8 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	// max end index is integer.max_value - 1, not integer.max_value.
 	protected int extra_max_row = 1;
 	/**
-	 * MInfoColumn has isKey = true, play as key column in case non column has
-	 * isKey = true, this column is null and we use {@link #p_keyColumn}
+	 * MInfoColumn with isKey = true. In case no column has
+	 * isKey = true, keyColumnOfView will be null and we use {@link #p_keyColumn}
 	 */
 	protected MInfoColumn keyColumnOfView = null;
 	
@@ -179,22 +178,22 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	protected boolean hasRightQuickEntry = true;
 	protected boolean isHasNextPage = false;
 	/**
-	 * store selected record info
-	 * key of map is value of column play as keyView
-	 * in case has no key column of view, use value of {@link #p_keyColumn}
-	 * zk6.x listview don't provide event when click to checkbox select all, 
-	 * so we can't manage selectedRecord time by time. 
-	 * each time change page we will update this list with current
-	 * selected record of this page by call function
-	 * {@link #updateListSelected()} when move to zk7, just enough handle
-	 * onclick. because don't direct use recordSelectedData, call
-	 * {@link #getSelectedRowInfo()}
+	 * Value of Key Column:Values of Row.<br/>
+	 * Store selected rows.<br/>
+	 * If there's no key column of view, use value of {@link #p_keyColumn}.<br/>
+	 * Zk6.x listview deosn't send event when user click header checkbox to select all rows, 
+	 * so we can't manage selectedRecord all the time. <br/> 
+	 * Each time change page, we will update this list with current selected records of current page <br/> 
+	 * by calling function {@link #updateListSelected()}. 
+	 * When move to zk7, enough to just handle onclick only. <br/>
+	 * Because of the issue above, don't use recordSelectedData directly, call
+	 * {@link #getSelectedRowInfo()} instead.
 	 */
 	protected Map<Object, List<Object>> recordSelectedData = new HashMap<Object, List<Object>>();
 	
 	/**
-	 * when requery but don't clear selected record (example after run process)
-	 * set flag to true to run sync selected record, also
+	 * When re-query but don't want to clear selected record (example after run process), 
+	 * set this flag to true to run sync selected record. See also
 	 * {@link #syncSelectedAfterRequery()}
 	*/
 	protected boolean isRequeryByRunSuccessProcess = false;
@@ -217,7 +216,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
     }
 
 	/**
-	 * Show panel based on tablename (non modal)
+	 * Show panel based on tablename (non modal and not lookup)
 	 * @param tableName
 	 */
     public static void showPanel (String tableName)
@@ -230,21 +229,24 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 
 	/** Window Width                */
 	static final int        INFO_WIDTH = 800;
+	/** true for lookup mode */
 	protected boolean m_lookup;
+	/** AD_InfoWindow_ID */
 	protected int m_infoWindowID;
 	private boolean m_closeAfterExecutionOfProcess = false;
 
 	private Button btnSelectAll;
 	private Button btnDeSelectAll;
 
+	/** true if {@link #p_WindowNo} is not from caller/parent window */
 	private boolean registerWindowNo = false;
 	
-	/**************************************************
-     *  Detail Constructor
+	/**
      * @param WindowNo  WindowNo
      * @param tableName tableName
      * @param keyColumn keyColumn
-     * @param whereClause   whereClause
+     * @param multipleSelection
+     * @param whereClause  whereClause
 	 */
 	protected InfoPanel (int WindowNo,
 		String tableName, String keyColumn,boolean multipleSelection,
@@ -270,7 +272,6 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 	
 	/**
-	 * 
 	 * @param WindowNo
 	 * @param tableName
 	 * @param keyColumn
@@ -287,12 +288,14 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 				whereClause, lookup, ADInfoWindowID, null);
 	}
 	
-	/**************************************************
-     *  Detail Constructor
+	/**
      * @param WindowNo  WindowNo
      * @param tableName tableName
      * @param keyColumn keyColumn
-     * @param whereClause   whereClause
+     * @param multipleSelection
+     * @param whereClause  whereClause
+     * @param lookup
+     * @param ADInfoWindowID
      * @param queryValue
 	 */
 	protected InfoPanel (int WindowNo,
@@ -397,6 +400,9 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 		useQueryTimeoutFromSysConfig = false;
 	}
 
+	/**
+	 * Layout window
+	 */
 	private void init()
 	{
 		if (isLookup())
@@ -448,7 +454,6 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
         	}
         }
 
-        // Elaine 2008/12/16
 		confirmPanel.getButton(ConfirmPanel.A_CUSTOMIZE).setVisible(hasCustomize());
 		confirmPanel.getButton(ConfirmPanel.A_HISTORY).setVisible(hasHistory());
 		confirmPanel.getButton(ConfirmPanel.A_ZOOM).setVisible(hasZoom());
@@ -472,8 +477,9 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
         
         this.setSclass("info-panel");
 	}  //  init
+	
 	protected ConfirmPanel confirmPanel;
-	/** Master (owning) Window  */
+	/** Lookup mode: parent window number. Non lookup mode: register desktop tab number for this window */
 	protected int				p_WindowNo;
 	/** Table Name              */
 	protected String            p_tableName;
@@ -493,8 +499,9 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	/** Result IDs              */
 	private ArrayList<Object>	m_results = new ArrayList<Object>(3);
 
+	/** Model of {@link #contentPanel} */
     private ListModelTable model;
-	/** Layout of Grid          */
+	/** Layout of {@link #contentPanel}     */
 	protected ColumnInfo[]     p_layout;
 	/** Main SQL Statement      */
 	protected String              m_sqlMain;
@@ -503,8 +510,9 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	/** Order By Clause         */
 	protected String              m_sqlOrder;
 	private String              m_sqlUserOrder;
-	/* sql column of infocolumn (can be alias) */
+	
 	protected int              	  indexOrderColumn = -1;
+	/** sql column name of infocolumn (can be alias) */
 	protected String              sqlOrderColumn;
 	protected Boolean             isColumnSortAscending = null;
 	/**ValueChange listeners       */
@@ -533,26 +541,28 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	protected GridField m_gridfield;
 
 	/**
-	 * false, use saved where clause
+	 * If false, use saved where clause.
 	 * IDEMPIERE-1979
 	 */
 	protected boolean isQueryByUser = false;
 	
+	/** true for auto complete call from lookup field */
 	protected boolean isAutoComplete = false;
 	
 	protected int queryTimeout = 0;
 	protected boolean useQueryTimeoutFromSysConfig = true;
 	
+	/** column name for auto complete call */
 	protected String autoCompleteSearchColumn = null;
 	
 	protected String queryValue;
 	
 	/**
-	 * save where clause of prev requery
+	 * saved where clause of previous query
 	 */
 	protected String prevWhereClause = null;
 	/**
-	 * save value of parameter to set info query paramenter
+	 * saved value of previous query parameters
 	 */
 	protected List<Object> prevParameterValues = null;
 	protected List<String> prevQueryOperators = null;
@@ -560,7 +570,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	private static final String[] lISTENER_EVENTS = {};
 
 	/**
-	* All info process of this infoWindow
+	* Info processes of this infoWindow
 	*/
 	protected MInfoProcess [] infoProcessList;
 	/**
@@ -568,46 +578,45 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	*/
 	protected boolean haveProcess = false;
 	/**
-	* Info process have style is button
+	* Info process with style = button
 	*/
 	protected List<MInfoProcess> infoProcessBtList;
 	/**
-	* Info process have style is drop down list
+	* Info process with style = drop down list
 	*/
 	protected List<MInfoProcess> infoProcessDropList;
 	/**
-	* Info process have style is menu
+	* Info process with style = menu
 	*/
 	protected List<MInfoProcess> infoProcessMenuList;
 	/**
-	* save selected id and viewID
+	* saved selected id and viewID
 	*/
 	protected Collection<NamePair> m_viewIDMap = new ArrayList <NamePair>();
 	
 	/**
-	 * store index of infoColumn have data append. each infoColumn just append only one time.
-	 * index increase from 0.
+	 * AD_InfoColumn_ID:Index Column Sequence <br/>
+	 * Store index of infoColumn that have been added.Index increase from 0.
 	 */
 	protected Map <Integer, Integer> columnDataIndex = new HashMap <Integer, Integer> ();
 	/**
-	 * after load first record, set it to false. 
-	 * when need update index of column data append to end of list {@link #columnDataIndex}, set it to true 
+	 * After loading of first record, set this to false.<br/> 
+	 * When need to update {@link #columnDataIndex}, set this to true. 
 	 */
 	protected boolean isMustUpdateColumnIndex = true;
 	/**
-	 * When start update index of column data append to end of list {@link #columnDataIndex}, reset it to 0,
-	 * each read data for new append column, increase it up 1
+	 * Number of index column that have been added to {@link #columnDataIndex}.
 	 */
 	protected int indexColumnCount = 0;
 	/**
-	 * to prevent append duplicate data, when begin read each record reset this list, 
-	 * when read a column store id of infoColumn to list to check duplicate
+	 * Before the start of reading of a row, reset this list. <br/> 
+	 * After reading of each column, store id of infoColumn to this list to prevent duplicate.
 	 */
 	protected List <Integer> lsReadedColumn = new ArrayList <Integer> ();
 	
 	/**
 	 * IDEMPIERE-1334
-	 * button and combobox when layout process button as dropdow list
+	 * button and combobox when layout process button as dropdown list
 	 */
 	protected Button btCbbProcess;
 	protected Combobox cbbProcess;
@@ -627,6 +636,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	 */
 	protected int m_selectedCount = 0;
 	/** 
+	 * Parameter Name:Value
 	 * Values that will be put into the context on re-query 
 	 */
 	protected HashMap<String, Object> paraCtxValues = new HashMap<String, Object>();
@@ -651,8 +661,8 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}	//	setStatusLine
 
 	/**
-	 *	Set Status DB
-	 *  @param text text
+	 *	Set status text for DB
+	 *  @param text text 
 	 */
 	public void setStatusDB (String text)
 	{
@@ -660,7 +670,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}	//	setStatusDB
 
 	/**
-	 *	Set Status DB
+	 *	Set status text for selected rows
 	 */
 	public void setStatusSelected ()
 	{
@@ -691,7 +701,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 		statusBar.setSelectedRowNumber(msg);
 		btnSelectAll.setEnabled(m_count > 0 && selectedCount != m_count);
 		btnDeSelectAll.setEnabled(selectedCount > 0);
-	}	//	setStatusDB
+	}	//	setStatusSelected
 	
 	/**
 	 * set up list box and construct sql clause
@@ -721,12 +731,15 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 			m_sqlOrder = " ORDER BY " + orderBy;
 	}   //  prepareTable
 
+	/**
+	 * @return true if number of page will be determined through record count.
+	 */
 	protected boolean isLoadPageNumber(){
 		return infoWindow == null || infoWindow.isLoadPageNum();
 	}
 	
-	/**************************************************************************
-	 *  Execute Query
+	/**
+	 * Execute Query
 	 */
 	protected void executeQuery()
 	{
@@ -753,6 +766,11 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 		}
 	}
 
+	/**
+	 * Read row from result set
+	 * @param rs
+	 * @throws SQLException
+	 */
 	private void readData(ResultSet rs) throws SQLException {
 		int colOffset = 1;  //  columns start with 1
 		List<Object> data = new ArrayList<Object>();
@@ -843,12 +861,12 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 	
 	/**
-	 * save data of all viewID column in infoProcessList to end of data line
-	 * when override {@link #readData(ResultSet)} consider call this method 
+	 * Append viewID column in infoProcessList to data. <br/> 
+	 * When override {@link #readData(ResultSet)}, should include call to this method. 
 	 * IDEMPIERE-1970
-	 * @param rs record set to read data
+	 * @param rs result set to read data
 	 * @param data data line to append
-	 * @param listReadedColumn list column is appended
+	 * @param listReadedColumn list of columns appended
 	 * @throws SQLException
 	 */
 	protected void appendDataForViewID(ResultSet rs, List<Object> data, List<Integer> listReadedColumn) throws SQLException {
@@ -856,8 +874,8 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 	
 	/**
-	 * save data of all viewID column in infoProcessList to end of data line
-	 * when override {@link #readData(ResultSet)} consider call this method 
+	 * Append id column in related info list to data. <br/>
+	 * When override {@link #readData(ResultSet)}, should include call to this method.
 	 * IDEMPIERE-2152
 	 * @param rs
 	 * @param data
@@ -869,8 +887,8 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 	
 	/**
-	 * save data of all viewID column in infoProcessList to end of data line
-	 * when override {@link #readData(ResultSet)} consider call this method 
+	 * Append {@link #keyColumnOfView} to data. <br/>
+	 * When override {@link #readData(ResultSet)}, should include call to this method. 
 	 * IDEMPIERE-1970
 	 * @param rs record set to read data
 	 * @param data data line to append
@@ -883,11 +901,11 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 	
 	/**
-	 * save data of all infoColumn in listModelHaveInfoColumn to end of data line
+	 * Append value of infoColumn in listModelHaveInfoColumn to data. <br/>
 	 * @param rs record set to read data
 	 * @param data data line to append
 	 * @param listModelHasInfoColumn
-	 * @param listReadedColumn list column is appended
+	 * @param listReadedColumn list of columns appended
 	 * @throws SQLException
 	 */
 	protected void appendInfoColumnData(ResultSet rs, List<Object> data, IInfoColumn [] listModelHasInfoColumn, List<Integer> listReadedColumn) throws SQLException {
@@ -1082,6 +1100,12 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
         setStatusDB(no == Integer.MAX_VALUE?"?":Integer.toString(no));
     }
     
+	/**
+	 * Read rows from start to end
+	 * @param start
+	 * @param end
+	 * @return rows read
+	 */
     private List<Object> readLine(int start, int end) {
     	if (useQueryTimeoutFromSysConfig)
     		queryTimeout = MSysConfig.getIntValue(MSysConfig.ZK_INFO_QUERY_TIME_OUT, 0, Env.getAD_Client_ID(Env.getCtx()));
@@ -1222,9 +1246,9 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 
     /**
-     * after query from database, process validate.
-     * if end page include in cache, process calculate total record
-     * if current page is out of page (no record is query) process query count to detect end page
+     * After query from database, validate paging (when paging is dynamic, ie isLoadPageNumber()==false) <br/>
+     * If end page include in cache, calculate total record read. <br/>
+     * If current page is out of cache, process query count to detect end page.
      */
     protected void validateEndPage (){
     	if (paging == null || isLoadPageNumber())
@@ -1235,7 +1259,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
     		int pageInCache = line.size() / pageSize + extraPage;
     		
     		if (pageInCache == 0 || pageInCache <= numPagePreLoad){
-    			// selected page is out of page
+    			// selected page is out of cache
     			testCount();
     			extraPage = ((m_count  % pageSize > 0)?1:0);
         		pageInCache = m_count  / pageSize + extraPage;    			
@@ -1256,16 +1280,15 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
     }
     
     /**
-     * fromIndex and toIndex calculate with assume always query record as {@link #testCount()}
-     * example after testCount we get calculate 6page.
-     * when user navigate to page 4. something change in system (a batch record change become don't match with search query) 
-     * let we just get 5 page with current parameter.
-     * so when user navigate to page 6. user will face with index issue. (out of index or start index &gt; end index)
-     * this function is fix for it.
+     * fromIndex and toIndex is calculate base on result from {@link #testCount()}. <br/>
+     * For example after testCount, the calculated number of page is 6 page.<br/>
+     * When user navigate to page 4. something change in database and we just get 5 page with current query parameter. <br/>
+     * So when user navigate to page 6. user will face with index issue (out of index or start index &gt; end index). <br/>
+     * This function include fix for it.
      * @param fromIndex
      * @param toIndex
      * @param line
-     * @return
+     * @return sub list from line
      */
     protected List<Object> getSubList (int fromIndex, int toIndex, List<Object> line){
     	if (toIndex > line.size())
@@ -1282,26 +1305,26 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
     }
     
     /**
-     * when calculator value at bound, sometime value is overflow by data type
-     * this function calculator at high type for avoid it
-     * @param overValue
-     * @return
+     * When calculating value at bound of integer datatype, sometime value will overflow.
+     * This function calculate with higher data type to avoid the overflow issue.
+     * @param value
+     * @return int
      */
-    protected int getOverIntValue (long overValue){
-    	return getOverIntValue (overValue, 0);
+    protected int getOverIntValue (long value){
+    	return getOverIntValue (value, 0);
     }
     
     /**
-     * see {@link #getOverIntValue(long)}. when value over max_value set it near max_value.
-     * @param overValue
-     * @param extra
-     * @return
+     * see {@link #getOverIntValue(long)}. when value >= max_value, set it near or equal to max_value.
+     * @param value
+     * @param extra extra value to minus from max_value
+     * @return int
      */
-    protected int getOverIntValue (long overValue, int extra){
-    	if (overValue >= Integer.MAX_VALUE)
-    		overValue = Integer.MAX_VALUE - extra;
+    protected int getOverIntValue (long value, int extra){
+    	if (value >= Integer.MAX_VALUE)
+    		value = Integer.MAX_VALUE - extra;
     	
-    	return (int)overValue;
+    	return (int)value;
     }
     
     /**
@@ -1339,9 +1362,9 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 
 	/**
-	 * column of grid isn't fix, it can change by display logic of column each time load data
-	 * {@link InfoWindow#prepareTable(ColumnInfo[], String, String, String)}
-	 * so need to validate it by compare sql of current sort column
+	 * column index of grid isn't fix, it can change by display logic of column each time after loading of data
+	 * {@link InfoWindow#prepareTable(ColumnInfo[], String, String, String)}, 
+	 * so need to validate it by comparing the sql of current sort column
 	 */
 	protected void validateOrderIndex() {
 		if (indexOrderColumn > 0 && (indexOrderColumn + 1 > p_layout.length || !p_layout[indexOrderColumn].getColSQL().trim().equals(sqlOrderColumn))) {
@@ -1365,8 +1388,8 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 	
 	/**
-	 * build order clause of current sort order, and save it to m_sqlUserOrder
-	 * @return
+	 * build order clause of current sort column, and save it to m_sqlUserOrder
+	 * @return order clause
 	 */
 	protected String getUserOrderClause() {
 		validateOrderIndex();
@@ -1381,10 +1404,10 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 	
 	/**
-	 * build order clause of give column
-	 * if call that function before init list will raise a NPE. care about your code
+	 * Build order clause of given column index. <br/>
+	 * If call init list will raise NPE.
 	 * @param col
-	 * @return
+	 * @return order clause
 	 */
 	protected String getUserOrderClause(int col) {
 		ColumnInfo orderColumnInfo = p_layout[col];
@@ -1404,9 +1427,9 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 
 	/**
-	 * Get SQL SELECT clause for ORDER BY
+	 * Get SQL column clause for ORDER BY
 	 * @param colsql
-	 * @return String SELECT clause
+	 * @return sql column clause
 	 */
 	private String getSelectForOrderBy(String colsql) {
 		
@@ -1442,7 +1465,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 	
 	/**
-	 * Get SQL FROM clause for ORDER BY
+	 * Get SQL FROM clause for ORDER BY (table and join)
 	 * @param orderColumnInfo
 	 * @param displayColumn
 	 * @return String FROM clause
@@ -1496,6 +1519,9 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 		return whereClause;
 	}
 	
+	/**
+	 * Add current info panel instance as double click and on select listener of {@link #contentPanel}.
+	 */
     private void addDoubleClickListener() {
     	Iterator<EventListener<? extends Event>> i = contentPanel.getEventListeners(Events.ON_DOUBLE_CLICK).iterator();
 		while (i.hasNext()) {
@@ -1725,11 +1751,11 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 
 	/**
-	 * Save selected id, viewID of all process to map viewIDMap to save into T_Selection
-	 * @param infoCulumnId
+	 * Add view id column (infoColumnId) to {@link #m_viewIDMap}.
+	 * @param infoColumnId view id column
 	 */
-	public Collection<NamePair> getSaveKeys (int infoCulumnId){
-		// clear result from prev time
+	public Collection<NamePair> getSaveKeys (int infoColumnId){
+		// clear result from previous call
 		m_viewIDMap.clear();
 		
 		if (p_multipleSelection)
@@ -1741,9 +1767,9 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
             	// get key data column
             	Object keyData = selectedInfo.getKey();
                 
-                if (infoCulumnId > 0){
-                	// have viewID, get it
-                	int dataIndex = columnDataIndex.get(infoCulumnId) + p_layout.length;
+                if (infoColumnId > 0){
+                	// has viewID, get it
+                	int dataIndex = columnDataIndex.get(infoColumnId) + p_layout.length;
                 	
             		// get row data from model
 					Object viewIDValue = selectedInfo.getValue().get(dataIndex);
@@ -1752,7 +1778,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
                 	else
                 		m_viewIDMap.add (new KeyNamePair((Integer) keyData, viewIDValue == null?null:viewIDValue.toString()));
                 }else{
-                	// hasn't viewID, set viewID value is null
+                	// no viewID, set viewID value to null
                 	if (keyData instanceof String)
                 		m_viewIDMap.add (new ValueNamePair((String) keyData, null));
                 	else
@@ -1763,15 +1789,15 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
             
             return m_viewIDMap;
         }else{
-        	// never has this case, because when have process, p_multipleSelection always is true
+        	// should never reach here, when have process, p_multipleSelection is always true
         	return null;
         }
 
 	}
 	
 	/**
-	 * need overrider at infoWindow to check isDisplay
-	 * @return
+	 * need override at infoWindow to check isDisplay
+	 * @return true if need to append {@link #keyColumnOfView} to {@link #columnDataIndex}
 	 */
 	protected boolean isNeedAppendKeyViewData (){
 		return false;
@@ -1781,7 +1807,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	 * Check type of object is IDColumn
 	 * @param keyData
 	 * @param isCheckNull when true, raise exception when data is null
-	 * @return
+	 * @return true if keyData is instanceof IDColumn
 	 */
 	protected boolean isIDColumn(Object keyData, boolean isCheckNull){
 		if (isCheckNull && keyData == null){
@@ -1798,18 +1824,18 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 	
 	/**
-	 * call {@link #isIDColumn(Object, boolean)} without check null value
+	 * call {@link #isIDColumn(Object, boolean)} without null check
 	 * @param keyData
-	 * @return
+	 * @return true if keyData is instanceof IDColumn
 	 */
 	protected boolean isIDColumn(Object keyData){
 		return isIDColumn(keyData, false);
 	}
 	
 	/**
-	 * get all selected record of current page and update to {@link #recordSelectedData}
-	 * remove unselected record and add new selected record
-	 * we maintain value of key, and extra value append by {@link #appendInfoColumnData(ResultSet, List, IInfoColumn[], List)} 
+	 * Get all selected record of current page and update to {@link #recordSelectedData}.<br/>
+	 * Remove unselected record and add new selected record.<br/>
+	 * We maintain value of key, and extra value append by {@link #appendInfoColumnData(ResultSet, List, IInfoColumn[], List)} 
 	 */
 	protected void updateListSelected (){
 		for (int rowIndex = 0; rowIndex < contentPanel.getModel().getRowCount(); rowIndex++){			
@@ -1851,8 +1877,8 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 	
 	/**
-	 * get data index of keyView
-	 * @return
+	 * get column index of keyView
+	 * @return index of key column
 	 */
 	protected int getIndexKeyColumnOfView (){
 		if (keyColumnOfView == null){
@@ -1887,7 +1913,8 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 		contentPanel.getModel().setSelection(lsSelectionRecord);
 	}
 	
-	/** Hook to intercept 'restore selection' actions 
+	/** 
+	 * Hook to intercept 'restore selection' actions 
 	 * 
 	 * @param keyViewValue row view key
 	 * @param rowIndex row index
@@ -1905,10 +1932,10 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 		return new AdempiereException(errorMessage);
 	}
 	/**
-	 * get keyView value at rowIndex and columnIndex
-	 * also check in case value is null will raise an exception
+	 * Get keyView value at rowIndex.<br/>
+	 * Exception is raise if value is null.
 	 * @param rowIndex
-	 * @return
+	 * @return value of key column
 	 */
 	protected Object getColumnValue (int rowIndex){
 		
@@ -1947,13 +1974,9 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 	
 	/**
-	 * in case requery data, but want store selected record (example when run success a process)
-	 * we must sync selected row, because some selected row maybe not at data list (process make it change not map with query)
-	 * current 1000 line cache 
-	 * because in case query get more 1000 record we can't sync or maintain selected record (ever maintain for current page will make user confuse).
-	 * just clear selection
-	 * in case &lt; 1000 record is ok
-	 * TODO:rewrite
+	 * Maintain selected record after re-query (for example after success run of a process). <br/>
+	 * We must sync selected row, because some selected row maybe missing after re-query (change by process and no longer match with current query).
+	 * TODO:rewrite, current code just reset isRequeryByRunSuccessProcess flag and didn't do anything else.
 	 */
 	protected void syncSelectedAfterRequery (){
 		if (isRequeryByRunSuccessProcess){
@@ -1969,7 +1992,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 	
 	/**
-	 * update list column key value of selected record and return this list
+	 * Update {@link #recordSelectedData}
 	 * @return {@link #recordSelectedData} after update 
 	 */
 	public Map<Object, List<Object>> getSelectedRowInfo (){
@@ -2079,7 +2102,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
     }
 
 	/**
-	 * enable all control button or disable all rely to selected record 
+	 * enable all control button or disable all depends on whether there are selected records. 
 	 */
 	protected void enableButtons (){
 		boolean enable = (contentPanel.getSelectedCount() > 0 || getSelectedRowInfo().size() > 0);
@@ -2123,68 +2146,69 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}   //  enableButtons
 	//
 
-	/**************************************************************************
-	 *  Get dynamic WHERE part of SQL
-	 *	To be overwritten by concrete classes
-	 *  When override this method, please consider isQueryByUser and prevWhereClause 
+	/**
+	 *  Get dynamic WHERE part of SQL.<br/>
+	 *  When override this method, please take isQueryByUser and prevWhereClause into consideration. 
 	 *  @return WHERE clause
 	 */
 	protected abstract String getSQLWhere();
 
 	/**
-	 *  Set Parameters for Query
-	 *	To be overwritten by concrete classes
-	 *  When override this method, please consider isQueryByUser and prevWhereClause
+	 *  Set Parameters for Query. <br/>
+	 *  When override this method, please take isQueryByUser and prevWhereClause into consideration.
 	 *  @param pstmt statement
 	 *  @param forCount for counting records
 	 *  @throws SQLException
 	 */
 	protected abstract void setParameters (PreparedStatement pstmt, boolean forCount)
 		throws SQLException;
+	
     /**
-     * notify to search editor of a value change in the selection info
+     * Show history dialog
      */
 	protected void showHistory()					{}
+	
 	/**
-	 *  Has History (false)
-	 *	To be overwritten by concrete classes
+	 *  Has History (default false).
+	 *	Override this and {@link #showHistory()} method to add history dialog support.
 	 *  @return true if it has history (default false)
 	 */
 	protected boolean hasHistory()				{return false;}
+	
 	/**
-	 *  Customize dialog
-	 *	To be overwritten by concrete classes
+	 * @return true if support running of process.
 	 */
 	protected boolean hasProcess()				{return false;}
+	
 	/**
-	 *  Customize dialog
-	 *	To be overwritten by concrete classes
+	 *  Show Customize dialog
 	 */	
 	protected void customize()					{}
+	
 	/**
-	 *  Has Customize (false)
-	 *	To be overwritten by concrete classes
+	 *  Has Customize dialog (default false).
+	 *	Override this and {@link #customize()} method to add customize dialog support.
 	 *  @return true if it has customize (default false)
 	 */
 	protected boolean hasCustomize()				{return false;}
+	
 	/**
-	 *  Has Zoom (false)
-	 *	To be overwritten by concrete classes
-	 *  @return true if it has zoom (default false)
+	 *  Has Zoom support (default false)
+	 *  @return true if it has zoom support (default false)
 	 */
 	protected boolean hasZoom()					{return false;}
+	
 	/**
-	 *  Has new function for create new record (false)
-	 *	To be overwritten by concrete classes 
-	 * @return
+	 * Support create new record (default false)
+	 * @return true if support create new record
 	 */
 	protected boolean hasNew()					{return false;}
+	
 	/**
-	 *  Save Selection Details
-	 *	To be overwritten by concrete classes
-	 *  this function call when close info window.
-	 *  default infoWindow will set value of all column of current selected record to environment variable with {@link Env#TAB_INFO}
-	 *  class extends can do more by override it. 
+	 *  Save Selection Details. <br/>
+	 *  This method is call when user close an info window. <br/>
+	 *  By default, infoWindow will set value of all column of current selected record to environment context with {@link Env#TAB_INFO}. <br/>
+	 *  Sub class can override this method to do more. 
 	 */
 	protected void saveSelectionDetail()          {}
 
@@ -2293,7 +2317,6 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
     		recordSelectedData.clear();
         	resetParameters ();
         }
-        // Elaine 2008/12/16
         else if (event.getTarget().equals(confirmPanel.getButton(ConfirmPanel.A_HISTORY)))
         {
         	if (!contentPanel.getChildren().isEmpty() && contentPanel.getSelectedRowKey()!=null)
@@ -2371,7 +2394,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
         	Integer processId =  (Integer)btProcess.getAttribute(PROCESS_ID_KEY);
 
         	preRunProcess (processId);
-							}
+		}
         // IDEMPIERE-1334 handle event click into process button end
         else if (event.getTarget() == paging)
         {
@@ -2418,11 +2441,11 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
         else if (event.getName().equals(Events.ON_CTRL_KEY))
         {
     		KeyEvent keyEvent = (KeyEvent) event;
-		if (LayoutUtils.isReallyVisible(this))
+    		if (LayoutUtils.isReallyVisible(this))
     			this.onCtrlKeyEvent(keyEvent);
     	}else if (event.getName().equals(Events.ON_OK)){// on ok when focus at non parameter component. example grid result
         	if (m_lookup && contentPanel.getSelectedIndex() >= 0){
-    			// do nothing when parameter not change and at window mode, or at dialog mode but select non record    			
+    			// do nothing when parameter not change and at window mode, or at dialog mode but select no record    			
     			onOk();
     		}
         	else if (m_infoWindowID == 0 && event.getTarget() instanceof InfoGeneralPanel) {
@@ -2459,6 +2482,11 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 
     public static final int VK_ENTER          = '\r';
     public static final int VK_ESCAPE         = 0x1B;
+    
+    /**
+     * Handle ON_CTRL_KEY event
+     * @param keyEvent
+     */
 	private void onCtrlKeyEvent(KeyEvent keyEvent) {
 		if (keyEvent.isAltKey() && !keyEvent.isCtrlKey() && keyEvent.isShiftKey()) { // Shift+Alt
 			if (keyEvent.getKeyCode() == KeyEvent.DOWN) { // Shift+Alt+Down
@@ -2495,42 +2523,42 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
     }
     
     /**
-    * validate parameter before run query
-    * @return
-    */
+     * validate parameter before run query
+     * @return true if parameters pass validation
+     */
     public boolean validateParameters(){
     	return true;
     }
 
 	/**
-	 * Call after load parameter panel to set init value can call when reset
-	 * parameter implement this method at inheritance class
-	 * with each parameter, remember call Env.setContext to set new value to env  
+	 * Call after loading of parameter panel to set initial value. Can call to reset parameters.
 	 */
 	protected void initParameters() {
 
 	}
 	
 	/**
-	 * Update relate info when selection in main info change
+	 * Update related info when selection in {@link #contentPanel} change.
 	 */
 	protected void updateSubcontent (){ updateSubcontent(-1);};
 	
 	/**
-	 * Update relate info for a specific row, if targetRow &lt; 0 update using selected row
+	 * Update related info for a specific row. If targetRow &lt; 0, update using selected row.
 	 * @param targetRow
 	 */
 	protected void updateSubcontent (int targetRow){};
 
 
 	/**
-	 * Reset parameter to default value or to empty value? implement at
-	 * inheritance class when reset parameter maybe need init again parameter,
-	 * reset again default value
+	 * Reset parameter to default value or to empty value.
 	 */
 	protected void resetParameters() {
 	}
     
+	/**
+	 * Before running of process
+	 * @param processId
+	 */
     protected void preRunProcess (Integer processId){
     	// disable all control button when run process
     	enableButtons(false);
@@ -2539,10 +2567,9 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
     }
     
     /**
-     * Run a process.
-     * show process dialog,
-     * before start process, save id of record selected
-     * after run process, show message report result 
+     * Run a process.<br/>
+     * Before start process, save id of record selected. <br/>
+     * After run of process, show process message report result. 
      * @param processIdObj
      */
     protected void runProcess (Object processIdObj){
@@ -2652,7 +2679,8 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
    
     
     /**
-	 * save result values
+	 * Save selected rows to {@link #m_values}
+	 * @param infoColumnId AD_InfoProcess.AD_InfoColumn_ID. Use as key column if > 0
 	 */
 	protected void saveResultSelection(int infoColumnId) {
 		int m_keyColumnIndex = contentPanel.getKeyColumnIndex();
@@ -2702,7 +2730,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	} // saveResultSelection
 	
 	/**
-	 * Insert result values
+	 * Insert selected rows to T_Selection_InfoWindow
 	 * @param AD_PInstance_ID
 	 */
 	public void createT_Selection_InfoWindow(int AD_PInstance_ID)
@@ -2823,9 +2851,9 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	} // createT_Selection_InfoWindow
 	
     /**
-     * Get InfoColumnID of infoProcess have processID is processId
+     * Get InfoColumnID of infoProcess
      * @param processId
-     * @return value InfoColumnID, -1 when has not any map
+     * @return AD_InfoColumn_ID, -1 if processId not in {@link #infoProcessList}
      */
     protected int getInfoColumnIDFromProcess (int processId){
     	for (int i = 0; i < infoProcessList.length; i++){
@@ -2844,6 +2872,9 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 		Clients.clearBusy(this);
 	}
 
+	/**
+	 * Set sort direction indicator
+	 */
 	protected void correctHeaderOrderIndicator() {
 		Listhead listHead = contentPanel.getListHead();
 		if (listHead != null) {
@@ -2851,8 +2882,6 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 			for(Object obj : headers)
 			{
 				Listheader header = (Listheader) obj;
-				// idempiere use mix method. sometime call model method, sometime call component method
-				// so index can be difference on complicate case, just wait to fix
 				if (header.getColumnIndex() == indexOrderColumn)
 	              header.setSortDirection(isColumnSortAscending?"ascending":"descending");
 	            else
@@ -2906,9 +2935,9 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
     }
 
     /**
-    * evaluate display logic of button process
-    * empty method. implement at child class extend
-    */
+     * Evaluate display logic of processes.
+     * Implemented by sub class.
+     */
     protected void bindInfoProcess (){}
     
     /**
@@ -3007,7 +3036,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 
 	/**
-	 * Set and load the active page
+	 * Set and load pgNo as active page
 	 * @param pgNo
 	 */
 	private void setAndLoadActivePage(int pgNo) {
@@ -3054,7 +3083,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	}
 
     /**
-     * process action when user click to new button
+     * Handle user click on new record button.
      */
     protected void newRecordAction (){}
     
@@ -3073,7 +3102,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
     }
 
     /**
-     * 
+     * Fire ValueChangeEvent event.
      * @param event
      */
     public void fireValueChange(ValueChangeEvent event)
@@ -3085,7 +3114,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
     }
     /**
      *  Dispose and save Selection
-     *  @param ok OK pressed
+     *  @param ok true if OK pressed
      */
     public void dispose(boolean ok)
     {
@@ -3117,6 +3146,10 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
         }
     }   //  dispose
 
+    /**
+     * Save width of columns
+     * @param comp
+     */
     private void saveWlistBoxColumnWidth(Component comp){
 
         if(comp instanceof WListbox){
@@ -3176,7 +3209,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 	
 	/**
 	 * 
-	 * @return true if it is a lookup dialog
+	 * @return true if this is a lookup dialog
 	 */
     public boolean isLookup()
     {
@@ -3184,7 +3217,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
     }
 
     /**
-     * scroll selected row into view
+     * scroll selected row into view (i.e make sure it is visible)
      */
     public void scrollToSelectedRow()
     {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java
index fb84ff3411..95b5fb5f86 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java
@@ -54,20 +54,20 @@ import org.zkoss.zul.South;
 
 /**
  * Price History for BPartner/Product
- * This class is based on org.compiere.apps.search.InvoiceHistory written by Jorg Janke
  * @author <a href="mailto:elaine.tan@idalica.com">Elaine</a>
  */
 public class InvoiceHistory extends Window implements EventListener<Event>
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 8742214467478030802L;
 
-	boolean showDetailATP = false;
+	protected boolean showDetailATP = false;
 
 	/**
 	 *	Show History
+	 *  @param parent
 	 *	@param C_BPartner_ID partner
 	 *	@param M_Product_ID product
 	 *	@param M_Warehouse_ID warehouse
@@ -136,9 +136,9 @@ public class InvoiceHistory extends Window implements EventListener<Event>
 	private ListModelTable 	m_modelAtp = null;
 	
 	/**
-	 *	Ststic Init
+	 * Layout window
 	 */
-	void jbInit() throws Exception
+	protected void jbInit() throws Exception
 	{
 		label.setText("Label");
 		
@@ -264,7 +264,8 @@ public class InvoiceHistory extends Window implements EventListener<Event>
 
 
 	/**
-	 *	Get Info for Product for given Business Parner
+	 * Get invoiced product details for a given Business Partner.
+	 * @return invoiced product details
 	 */
 	private Vector<Vector<Object>> queryProduct ()
 	{
@@ -289,7 +290,8 @@ public class InvoiceHistory extends Window implements EventListener<Event>
 	}   //  queryProduct
 
 	/**
-	 *	Get Info for Business Partners for given Product
+	 * Get invoiced Business Partners details for a given Product
+	 * @return invoiced Business Partners details
 	 */
 	private Vector<Vector<Object>> queryBPartner ()
 	{
@@ -314,7 +316,10 @@ public class InvoiceHistory extends Window implements EventListener<Event>
 	}	//	qyeryBPartner
 
 	/**
-	 *	Fill Table
+	 * Fill list
+	 * @param sql
+	 * @param parameter
+	 * @return List of records
 	 */
 	private Vector<Vector<Object>> fillTable (String sql, int parameter)
 	{
@@ -369,8 +374,9 @@ public class InvoiceHistory extends Window implements EventListener<Event>
 	}	//	fillTable
 
 	/**
-	 *	Set Label
-	 *  to product or bp name
+	 * Set Label to product or bp name.
+	 * @param sql
+	 * @param parameter
 	 */
 	private void fillLabel (String sql, int parameter)
 	{
@@ -380,7 +386,7 @@ public class InvoiceHistory extends Window implements EventListener<Event>
 			label.setText(retValue);
 	}	//	fillLabel
 
-
+	@Override
 	public void onEvent(Event e) throws Exception {
 		Component component = e.getTarget();
 		
@@ -495,7 +501,7 @@ public class InvoiceHistory extends Window implements EventListener<Event>
 
 	
 	/**
-	 *	Query Unconfirmed
+	 *	Query Unconfirmed (Draft/In Progress M_InOut)
 	 */
 	private void initUnconfirmedTab ()
 	{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LabelsPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LabelsPanel.java
index df87064ce9..853aca2c11 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LabelsPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LabelsPanel.java
@@ -46,9 +46,12 @@ import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zul.Div;
 import org.zkoss.zul.Groupbox;
 
+/**
+ * Label for a record (AD_LabelAssignment)
+ */
 public class LabelsPanel extends Div implements EventListener<Event> {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 8776043844483214400L;
 
@@ -93,7 +96,7 @@ public class LabelsPanel extends Div implements EventListener<Event> {
 
 	/**
 	 * Get current table id
-	 * @return id
+	 * @return AD_Table_ID
 	 */
 	public int getAD_Table_ID() {
 		return AD_Table_ID;
@@ -101,7 +104,7 @@ public class LabelsPanel extends Div implements EventListener<Event> {
 
 	/**
 	 * Get current record id
-	 * @return
+	 * @return Record_ID
 	 */
 	public int getRecord_ID() {
 		return Record_ID;
@@ -109,7 +112,7 @@ public class LabelsPanel extends Div implements EventListener<Event> {
 
 	/**
 	 * Get current record uuid
-	 * @return
+	 * @return Record_UU
 	 */
 	public String getRecord_UU() {
 		return Record_UU;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
index 06aa36946d..45ca73f0d8 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
@@ -103,7 +103,7 @@ import org.zkoss.zul.Image;
 public class LoginPanel extends Window implements EventListener<Event>
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -7859522563172088496L;
 
@@ -133,6 +133,10 @@ public class LoginPanel extends Window implements EventListener<Event>
 	/* Number of failures to calculate an incremental delay on every trial */
 	private int failures = 0;
     
+	/**
+	 * @param ctx
+	 * @param loginWindow
+	 */
     public LoginPanel(Properties ctx, LoginWindow loginWindow)
     {
         this.ctx = ctx;
@@ -149,6 +153,9 @@ public class LoginPanel extends Window implements EventListener<Event>
         this.addEventListener(ON_LOAD_TOKEN, this);
     }
 
+    /**
+     * Layout panel
+     */
     private void init()
     {
     	createUI();
@@ -238,6 +245,9 @@ public class LoginPanel extends Window implements EventListener<Event>
         txtPassword.removeEventListener(Events.ON_FOCUS, txtPassword);
     }
 
+    /**
+     * Layout panel
+     */
 	protected void createUI() {
 		Form form = new Form();
 
@@ -364,6 +374,9 @@ public class LoginPanel extends Window implements EventListener<Event>
         this.appendChild(form);
 	}
 
+	/**
+	 * Create components
+	 */
     private void initComponents()
     {
         lblUserId = new Label();
@@ -383,14 +396,12 @@ public class LoginPanel extends Window implements EventListener<Event>
         txtUserId.setCols(25);
         txtUserId.setMaxlength(40);
         ZKUpdateUtil.setWidth(txtUserId, "220px");
-        //txtUserId.addEventListener(Events.ON_CHANGE, this); // Elaine 2009/02/06
         txtUserId.setClientAttribute("autocomplete", "username");
 
         txtPassword = new Textbox();
         txtPassword.setId("txtPassword");
         txtPassword.setType("password");
         txtPassword.setCols(25);
-//        txtPassword.setMaxlength(40);
         ZKUpdateUtil.setWidth(txtPassword, "220px");
         if (MSysConfig.getBooleanValue(MSysConfig.ZK_LOGIN_ALLOW_CHROME_SAVE_PASSWORD, true))
         	txtPassword.setClientAttribute("autocomplete", "current-password");
@@ -425,8 +436,9 @@ public class LoginPanel extends Window implements EventListener<Event>
         if (lstLanguage.getItems().size() > 0){
         	validLstLanguage = (String)lstLanguage.getItems().get(0).getLabel();
         }                 
-   }
+    }
 
+    @Override
     public void onEvent(Event event)
     {
         Component eventComp = event.getTarget();
@@ -455,16 +467,6 @@ public class LoginPanel extends Window implements EventListener<Event>
         {
         	btnResetPasswordClicked();
         }
-        /* code below commented per security issue IDEMPIERE-1797 reported
-        // Elaine 2009/02/06 - initial language
-        else if (event.getName().equals(Events.ON_CHANGE))
-        {
-        	if(eventComp.getId().equals(txtUserId.getId()))
-        	{
-        		onUserIdChange(-1);
-        	}
-        }        
-        */
         else if (event.getName().equals(ON_LOAD_TOKEN)) 
         {
         	BrowserToken.load(txtUserId);
@@ -498,6 +500,10 @@ public class LoginPanel extends Window implements EventListener<Event>
 		}
 	}
 
+	/**
+	 * User id from onUserToken event.
+	 * @param AD_User_ID
+	 */
 	private void onUserIdChange(int AD_User_ID) {
 		String userName = txtUserId.getValue();
 		if (userName != null && userName.length() > 0 && AD_User_ID < 0)
@@ -525,13 +531,17 @@ public class LoginPanel extends Window implements EventListener<Event>
 				if(li.getLabel().equals(initDefault))
 				{
 					lstLanguage.setSelectedIndex(i);
-					languageChanged(li.getLabel()); // Elaine 2009/04/17 language changed
+					languageChanged(li.getLabel());
 					break;
 				}
 			}
 		}
 	}
 
+	/**
+	 * Apply language change to UI elements
+	 * @param langName
+	 */
     private void languageChanged(String langName)
     {
     	Language language = findLanguage(langName);
@@ -550,6 +560,11 @@ public class LoginPanel extends Window implements EventListener<Event>
     	pnlButtons.getButton(ConfirmPanel.A_HELP).setLabel(Util.cleanAmp(Msg.getMsg(language, ConfirmPanel.A_HELP)));
     }
 
+    /**
+     * Find language by name
+     * @param langName
+     * @return Language
+     */
 	private Language findLanguage(String langName) {
 		Language tmp = Language.getLanguage(langName);
     	Language language = new Language(tmp.getName(), tmp.getAD_Language(), tmp.getLocale(), tmp.isDecimalPoint(),
@@ -559,20 +574,20 @@ public class LoginPanel extends Window implements EventListener<Event>
     	Env.setContext(ctx, AEnv.LOCALE, language.getLocale().toString());
 
     	//cph::erp added this in order to get the processing dialog in the correct language
-    	 Locale locale = language.getLocale();
-    	 try {
+    	Locale locale = language.getLocale();
+    	try {
 				Clients.reloadMessages(locale);
-			} catch (IOException e) {
-				logger.log(Level.WARNING, e.getLocalizedMessage(), e);
-			}
-         Locales.setThreadLocal(locale);
-    	// cph::erp end
+		} catch (IOException e) {
+			logger.log(Level.WARNING, e.getLocalizedMessage(), e);
+		}
+        Locales.setThreadLocal(locale);
+    	
 		return language;
 	}
+	
     /**
-     *  validates user name and password when logging in
-     *
-    **/
+     * Validates user name and password when logging in
+     */
     public void validateLogin()
     {
         Login login = new Login(ctx);
@@ -657,12 +672,11 @@ public class LoginPanel extends Window implements EventListener<Event>
             	Clients.response("browserTimeoutScript", new AuScript(null, timeoutText));
         }
 
-		// This temporary validation code is added to check the reported bug
+		// This validation code is added to check the reported bug
 		// [ adempiere-ZK Web Client-2832968 ] User context lost?
 		// https://sourceforge.net/p/adempiere/zk-web-client/303/
 		// it's harmless, if there is no bug then this must never fail        
         currSess.setAttribute(AdempiereWebUI.CHECK_AD_USER_ID_ATTR, Env.getAD_User_ID(ctx));
-		// End of temporary code for [ adempiere-ZK Web Client-2832968 ] User context lost?
 
         /* Check DB version */
         String version = DB.getSQLValueString(null, "SELECT Version FROM AD_System");
@@ -676,6 +690,9 @@ public class LoginPanel extends Window implements EventListener<Event>
 
     }
 
+    /**
+     * @return client side timeout script
+     */
 	private String getUpdateTimeoutTextScript() {
 		String msg = Msg.getMsg(Env.getCtx(), "SessionTimeoutText").trim();  //IDEMPIERE-847
 		String continueNsg = Msg.getMsg(Env.getCtx(), "continue").trim();   //IDEMPIERE-847
@@ -688,6 +705,9 @@ public class LoginPanel extends Window implements EventListener<Event>
 		return s;
 	}
 	
+	/**
+	 * Handle reset password event
+	 */
 	private void btnResetPasswordClicked()
 	{
 		String userId = Login.getAppUser(txtUserId.getValue());
@@ -725,7 +745,10 @@ public class LoginPanel extends Window implements EventListener<Event>
 		wndLogin.resetPassword(userId, users.size() == 0);
 	}
 
-	/** get default languages from the browser */
+	/**
+	 * Get default languages from the browser
+	 * @param header 
+	 */
 	private List<String> browserLanguages(String header) {
 		List<String> arrstr = new ArrayList<String>();
 		if (header == null)
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java
index ae151584a9..dfba51df8f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java
@@ -25,33 +25,45 @@ import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Toolbar;
 
 /**
- * Menu Search Panel
+ * Panel with {@link MenuTreeSearchPanel}. 
  * @author Elaine
  * @date July 31, 2012
  */
 public class MenuSearchPanel extends AbstractMenuPanel
 {
     /**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 5308522340852904168L;
 	
 	protected MenuTreeSearchPanel pnlSearch;
 
+	/** Listener for MENU_TREE_FILTER_CHECKED_QUEUE desktop event queue */
 	private EventListener<Event> listener;
     
+	/**
+	 * @param parent
+	 */
     public MenuSearchPanel(Component parent)
     {
     	super(parent);
     	this.setSclass("menu-search-panel-container");
     }
 
+    /**
+     * Layout panel
+     */
+    @Override
 	protected void init() 
 	{
 		super.init();
         pnlSearch.initialise();                       
 	}
     
+	/**
+	 * Create components
+	 */
+    @Override
     protected void initComponents()
     {
     	super.initComponents();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreeFilterPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreeFilterPanel.java
index 45e1a943eb..fe6620dc7e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreeFilterPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreeFilterPanel.java
@@ -1,3 +1,27 @@
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ *                                                                     *
+ * Contributors:                                                       *
+ * - Elaine Tan                         							   *
+ **********************************************************************/
 package org.adempiere.webui.panel;
 
 import java.util.List;
@@ -21,6 +45,9 @@ import org.zkoss.zul.Treechildren;
 import org.zkoss.zul.Treeitem;
 import org.zkoss.zul.Vbox;
 
+/**
+ * Popup panel with menu type filter and flat view toggle for a tree.
+ */
 public class MenuTreeFilterPanel extends Popup implements EventListener<Event>, IdSpace {
 
 	private static final String ORIGINAL_SIBLING = "original.sibling";
@@ -31,12 +58,17 @@ public class MenuTreeFilterPanel extends Popup implements EventListener<Event>,
 	
 	public static final String MENU_TREE_FILTER_CHECKED_QUEUE = "MENU_TREE_FILTER_CHECKED_QUEUE";
 	
+	/** Tree to apply menu type filter and flat view toggle */
 	private Tree tree;
 	@SuppressWarnings("unused")
 	private TreeSearchPanel searchPanel;
 
 	private Checkbox flatView;
 
+	/**
+	 * @param tree
+	 * @param panel
+	 */
 	public MenuTreeFilterPanel(Tree tree, TreeSearchPanel panel) {
 		super();
 		this.tree = tree;
@@ -114,6 +146,7 @@ public class MenuTreeFilterPanel extends Popup implements EventListener<Event>,
 		appendChild(box);
 	}
 
+	@Override
 	public void onEvent(Event event) throws Exception {
 		final Checkbox chk = (Checkbox) event.getTarget();
 		EventQueues.lookup(MENU_TREE_FILTER_CHECKED_QUEUE, EventQueues.DESKTOP, true).publish(new Event(Events.ON_CHECK, null, chk));
@@ -130,7 +163,7 @@ public class MenuTreeFilterPanel extends Popup implements EventListener<Event>,
 	}
 	
 	/**
-	 * 
+	 * Turn flat view on/off for tree
 	 * @param tree
 	 * @param chk checkbox for flat view toggle
 	 */
@@ -236,6 +269,11 @@ public class MenuTreeFilterPanel extends Popup implements EventListener<Event>,
 		});
 	}
 
+	/**
+	 * Put treeItem back to its original position in tree
+	 * @param treechildren
+	 * @param treeItem
+	 */
 	private static void reattachSibling(Treechildren treechildren, Treeitem treeItem) {
 		Treeitem sibling = (Treeitem) treeItem.getAttribute(ORIGINAL_SIBLING);
 		if (sibling != null)
@@ -245,6 +283,12 @@ public class MenuTreeFilterPanel extends Popup implements EventListener<Event>,
 		treechildren.insertBefore(treeItem, sibling);
 	}
 
+	/**
+	 * Find next sibling that's of same menu type (sorted by label).
+	 * @param treechildren
+	 * @param treeItem
+	 * @return Next sibling or null
+	 */
 	private static Component findFlatViewSibling(Treechildren treechildren, Treeitem treeItem) {
 		List<Component> childrens = treechildren.getChildren();
 		if (childrens.isEmpty()) {			
@@ -274,6 +318,11 @@ public class MenuTreeFilterPanel extends Popup implements EventListener<Event>,
 		return null;
 	}
 
+	/**
+	 * Handle menu type toggle
+	 * @param tree
+	 * @param chk
+	 */
 	public static void toggle(Tree tree, final Checkbox chk) {
 		TreeUtils.traverse(tree, new TreeItemAction() {
 			public void run(Treeitem treeItem) {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreePanel.java
index bfd59f87bb..40570f81f5 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreePanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreePanel.java
@@ -35,14 +35,15 @@ import org.zkoss.zul.Toolbar;
 import org.zkoss.zul.Toolbarbutton;
 
 /**
- * Menu Tree Panel
+ * Menu tree panel. <br/>
+ * Consist of Tree, expand toggle and {@link MenuTreeFilterPanel}.
  * @author Elaine
  * @date July 31, 2012
  */
 public class MenuTreePanel extends AbstractMenuPanel
 {
     /**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -911113870835089567L;
 	private static final String ON_EXPAND_MENU_EVENT = "onExpandMenu";
@@ -69,7 +70,6 @@ public class MenuTreePanel extends AbstractMenuPanel
         // Auto Expand Tree - nmicoud IDEMPIERE 195
      	if (MUser.get(getCtx()).isMenuAutoExpand())
      		expandAll();
-     	// Auto Expand Tree - nmicoud IDEMPIERE 195
      	
      	listener = new EventListener<Event>() {
 			public void onEvent(Event event) throws Exception {
@@ -104,7 +104,6 @@ public class MenuTreePanel extends AbstractMenuPanel
         this.appendChild(pc);
         pc.appendChild(getMenuTree());
         
-        // Elaine 2009/02/27 - expand tree
         Toolbar toolbar = new Toolbar();
         toolbar.setSclass("desktop-menu-toolbar");
         this.appendChild(toolbar);
@@ -135,7 +134,6 @@ public class MenuTreePanel extends AbstractMenuPanel
     	super.onEvent(event);
     	
         String eventName = event.getName();
-        // Elaine 2009/02/27 - expand tree
         if (eventName.equals(Events.ON_CHECK) && event.getTarget() == expandToggle)
         {
         	Clients.showBusy(null);
@@ -152,8 +150,8 @@ public class MenuTreePanel extends AbstractMenuPanel
     }
 	
 	/**
-	* expand all node
-	*/
+	 * expand all node
+	 */
 	public void expandAll()
 	{
 		if (!expandToggle.isChecked())
@@ -174,7 +172,7 @@ public class MenuTreePanel extends AbstractMenuPanel
 	}
 	
 	/**
-	 *  On check event for the expand checkbox
+	 * On check event for the expand checkbox
 	 */
 	private void expandOnCheck()
 	{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreeSearchPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreeSearchPanel.java
index 403598f400..e271948d35 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreeSearchPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreeSearchPanel.java
@@ -42,7 +42,7 @@ import org.zkoss.zul.Treeitem;
  */
 public class MenuTreeSearchPanel extends TreeSearchPanel {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 3127547233019932429L;
 
@@ -50,14 +50,27 @@ public class MenuTreeSearchPanel extends TreeSearchPanel {
 	protected Toolbarbutton openBtn;
 	protected boolean isNew = false;
 
+	/**
+	 * @param tree
+	 * @param event
+	 * @param windowno
+	 * @param tabno
+	 */
 	public MenuTreeSearchPanel(Tree tree, String event, int windowno, int tabno) {
 		super(tree, event, windowno, tabno);
 	}
 
+	/**
+	 * @param tree
+	 * @param event
+	 */
 	public MenuTreeSearchPanel(Tree tree, String event) {
 		super(tree, event);
 	}
 
+	/**
+	 * @param tree
+	 */
 	public MenuTreeSearchPanel(Tree tree) {
 		super(tree);
 	}
@@ -81,6 +94,9 @@ public class MenuTreeSearchPanel extends TreeSearchPanel {
 		layout.insertBefore(hlayout, layout.getFirstChild());
 	}
 
+	/**
+	 * Create toolbar button to launch a menu item 
+	 */
 	protected void createOpenButton() {
 		openBtn = new Toolbarbutton();
 		if (ThemeManager.isUseFontIconForImage())
@@ -103,6 +119,9 @@ public class MenuTreeSearchPanel extends TreeSearchPanel {
 		openBtn.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Open")));
 	}
 
+	/**
+	 * Create toolbar button to create new record for a menu item
+	 */
 	protected void createNewButton() {
 		newBtn = new Toolbarbutton();
 		if (ThemeManager.isUseFontIconForImage())
@@ -145,6 +164,9 @@ public class MenuTreeSearchPanel extends TreeSearchPanel {
 		refreshAutoComplete();
 	}
 
+	/**
+	 * Refresh auto complete items for {@link #cmbSearch}
+	 */
 	protected void refreshAutoComplete() {
 		List<String> valueList = new ArrayList<String>();
 		List<String> descriptionList = new ArrayList<String>();
@@ -228,6 +250,9 @@ public class MenuTreeSearchPanel extends TreeSearchPanel {
     	Events.echoEvent(ON_POST_FIRE_TREE_EVENT, this, null);
     }
 
+	/**
+	 * Sort the values, descriptions and images list for menu items
+	 */
 	protected void orderArrays()
 	{
 		String aux;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/QuickCustomizeGridViewPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/QuickCustomizeGridViewPanel.java
index c56f6fd397..486874d969 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/QuickCustomizeGridViewPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/QuickCustomizeGridViewPanel.java
@@ -69,15 +69,15 @@ import org.zkoss.zul.Vbox;
  */
 public class QuickCustomizeGridViewPanel extends Panel {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 7566420005952940208L;
 
 	static CLogger					log					= CLogger.getCLogger(QuickCustomizeGridViewPanel.class);
 
 	private Map <Integer, String>	m_columnsWidth;
-	ArrayList <Integer>				tableSeqs;
-	QuickGridView					gridview			= null;
+	protected ArrayList <Integer>	tableSeqs;
+	protected QuickGridView			gridview			= null;
 
 	private int						m_WindowNo;
 	private int						m_AD_Tab_ID;
@@ -91,15 +91,14 @@ public class QuickCustomizeGridViewPanel extends Panel {
 
 	private Checkbox				chkSaveWidth		= new Checkbox();
 
-	SimpleListModel					yesModel			= new SimpleListModel();
-	Listbox							yesList				= new Listbox();
+	protected SimpleListModel		yesModel			= new SimpleListModel();
+	protected Listbox				yesList				= new Listbox();
 
 	private boolean					uiCreated;
 	private boolean					m_saved				= false;
 	private ConfirmPanel			confirmPanel		= new ConfirmPanel(true, false, true, false, false, false);
 
 	/**
-	 * Sort Tab Constructor
 	 * @param WindowNo Window No
 	 * @param AD_Tab_ID
 	 * @param AD_User_ID
@@ -117,7 +116,7 @@ public class QuickCustomizeGridViewPanel extends Panel {
 	}
 
 	/**
-	 * Static Layout
+	 * Layout dialog
 	 * 
 	 * @throws Exception
 	 */
@@ -223,6 +222,9 @@ public class QuickCustomizeGridViewPanel extends Panel {
 
 	} // init
 
+	/**
+	 * Load fields
+	 */
 	public void loadData() {
 		MTabCustomization tabCust = MTabCustomization.get(Env.getCtx(), m_AD_User_ID, m_AD_Tab_ID, null,true);
 		boolean baseLanguage = Env.isBaseLanguage(Env.getCtx(), "AD_Field");
@@ -280,7 +282,13 @@ public class QuickCustomizeGridViewPanel extends Panel {
 			chkSaveWidth.setChecked(true);
 	} // loadData
 
-	void migrateLists(Listbox listFrom, Listbox listTo, int endIndex) {
+	/**
+	 * Move selected items from listFrom to listTo
+	 * @param listFrom
+	 * @param listTo
+	 * @param endIndex
+	 */
+	protected void migrateLists(Listbox listFrom, Listbox listTo, int endIndex) {
 		int index = 0;
 		SimpleListModel lmFrom = (SimpleListModel) listFrom.getModel();
 		SimpleListModel lmTo = (SimpleListModel) listTo.getModel();
@@ -309,7 +317,7 @@ public class QuickCustomizeGridViewPanel extends Panel {
 	 * 
 	 * @param event event
 	 */
-	void migrateValueWithinYesList(int endIndex, List<ListElement> selObjects) {
+	protected void migrateValueWithinYesList(int endIndex, List<ListElement> selObjects) {
 		int iniIndex = 0;
 		Arrays.sort(selObjects.toArray());
 		ListElement endObject = (ListElement) yesModel.getElementAt(endIndex);
@@ -327,7 +335,7 @@ public class QuickCustomizeGridViewPanel extends Panel {
 	 * 
 	 * @param event event
 	 */
-	void migrateValueWithinYesList(Event event) {
+	protected void migrateValueWithinYesList(Event event) {
 		Object[] selObjects = yesList.getSelectedItems().toArray();
 
 		if (selObjects == null)
@@ -385,6 +393,9 @@ public class QuickCustomizeGridViewPanel extends Panel {
 		}
 	} // migrateValueWithinYesList
 
+	/**
+	 * Save changes
+	 */
 	public void saveData() {
 		// yesList
 		// int index = 0;
@@ -429,11 +440,18 @@ public class QuickCustomizeGridViewPanel extends Panel {
 		}
 	} // saveData
 
+	/**
+	 * Activate dialog. Layout dialog during first activation.
+	 * @param b
+	 */
 	public void activate(boolean b) {
 		if (b && !uiCreated)
 			createUI();
 	}
 
+	/**
+	 * Layout dialog
+	 */
 	public void createUI() {
 		if (uiCreated)
 			return;
@@ -445,10 +463,16 @@ public class QuickCustomizeGridViewPanel extends Panel {
 		uiCreated = true;
 	}
 
+	/**
+	 * @return true if changes have been saved
+	 */
 	public boolean isSaved() {
 		return m_saved;
 	}
 
+	/**
+	 * @param quickGridView
+	 */
 	public void setGridPanel(QuickGridView quickGridView) {
 		this.gridview = quickGridView;
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RequestNoticePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RequestNoticePanel.java
index 09290cf435..84bd866c50 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RequestNoticePanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RequestNoticePanel.java
@@ -25,10 +25,11 @@ import org.adempiere.webui.component.Panel;
  * @date    Mar 3, 2007
  * @version $Revision: 0.10 $
  */
+@Deprecated(forRemoval = true, since = "11")
 public class RequestNoticePanel extends Panel
 {
     /**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 2530869089383947019L;
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java
index 755da2f340..a02bbd7a66 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java
@@ -65,7 +65,7 @@ import org.zkoss.zul.Image;
 public class ResetPasswordPanel extends Window implements EventListener<Event>
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -657724758165769510L;
 
@@ -98,6 +98,12 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
     protected Textbox txtUserId;
     protected Textbox txtEmail;
     
+    /**
+     * @param ctx
+     * @param loginWindow
+     * @param userName
+     * @param noSecurityQuestion
+     */
     public ResetPasswordPanel(Properties ctx, LoginWindow loginWindow, String userName, boolean noSecurityQuestion) 
     {
     	this.wndLogin = loginWindow;
@@ -114,11 +120,17 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
         loadData();
     }
 
+    /**
+     * Layout panel
+     */
     private void init()
     {
     	createUI();
     }
 
+    /**
+     * Layout panel
+     */
 	protected void createUI() {
 		Div div = new Div();
     	div.setSclass(ITheme.LOGIN_BOX_HEADER_CLASS);
@@ -216,6 +228,9 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
         this.appendChild(div);
 	}
 
+	/**
+	 * Create components
+	 */
     private void initComponents()
     {
     	lblEmail = new Label();
@@ -260,7 +275,6 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
 	    	txtAnswer = new Textbox();
 	    	txtAnswer.setType("password");
 	    	txtAnswer.setId("txtAnswer");
-	//        txtAnswer.setType("password");
 	        txtAnswer.setCols(25);
 	        ZKUpdateUtil.setWidth(txtAnswer, "220px");
 	        txtAnswer.setReadonly(true);
@@ -278,6 +292,9 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
     	}
     }
     
+    /**
+     * Load security question from AD_User
+     */
     protected void loadSecurityQuestion()
     {
     	String email = txtEmail.getValue();
@@ -313,6 +330,7 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
         txtAnswer.setVisible(true);
     }
 
+    @Override
     public void onEvent(Event event)
     {
         if (event.getTarget().getId().equals(ConfirmPanel.A_OK))
@@ -322,10 +340,12 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
         else if (event.getTarget().getId().equals(ConfirmPanel.A_CANCEL))
         {
         	SessionManager.logoutSession();
-            //wndLogin.loginCancelled();
         }
     }
     
+    /**
+     * Validate fields
+     */
     public void validate (){
     	Clients.clearBusy();
     	
@@ -335,6 +355,9 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
     		validateResetPassword();
     }
     
+    /**
+     * validate user name and email
+     */
     protected void validateEmail()
     {
     	String email = txtEmail.getValue();
@@ -365,6 +388,9 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
 		loadSecurityQuestion();
     }
     
+    /**
+     * validate fields and reset password
+     */
     protected void validateResetPassword()
     {
     	String email = txtEmail.getValue();
@@ -493,13 +519,18 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
 				@Override
 				public void onCallback(Integer result) {
 		        	SessionManager.logoutSession();
-		        	//wndLogin.loginCancelled();
 				}
 				
 			});
     	}    	
     }
     
+    /**
+     * Send reset password email to user
+     * @param to
+     * @param newPassword
+     * @return true if email successfully sent
+     */
     protected boolean sendEmail(MUser to, String newPassword)
     {
     	MClient client = MClient.get(m_ctx, 0);//change by: IDEMPIERE-1267 Temp password from "Forgot My Password" does not work
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
index 5620f687d4..0b458b6064 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
@@ -73,7 +73,7 @@ import org.zkoss.zul.Div;
 import org.zkoss.zul.Image;
 
 /**
- *
+ * Select role panel
  * @author  <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
  * @date    Feb 25, 2007
  * @version $Revision: 0.10 $
@@ -83,7 +83,7 @@ import org.zkoss.zul.Image;
 public class RolePanel extends Window implements EventListener<Event>, Deferrable
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -1159253307008488232L;
 
@@ -124,6 +124,14 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
 
 	private static final String ON_DEFER_LOGOUT = "onDeferLogout";
 
+	/**
+	 * @param ctx
+	 * @param loginWindow
+	 * @param userName
+	 * @param show
+	 * @param clientsKNPairs
+	 * @param isClientDefined
+	 */
 	public RolePanel(Properties ctx, LoginWindow loginWindow, String userName, boolean show, KeyNamePair[] clientsKNPairs, boolean isClientDefined) {
     	this.wndLogin = loginWindow;
     	m_ctx = ctx;
@@ -140,7 +148,6 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
         	m_userpreference.loadPreference(user.get_ID());        	
         }
     	
-
         initComponents();
         init();
         this.setId("rolePanel");
@@ -167,12 +174,18 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
         }
     }
 
+	/**
+	 * Layout panel
+	 */
     private void init()
     {
     	Clients.response(new AuScript("zAu.cmd0.clearBusy()"));
     	createUI();
     }
 
+    /**
+     * Layout panel
+     */
 	protected void createUI() {
 		Div div = new Div();
     	div.setSclass(ITheme.LOGIN_BOX_HEADER_CLASS);
@@ -293,6 +306,9 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
         this.appendChild(div);
 	}
 
+	/**
+	 * Create components
+	 */
     private void initComponents()
     {
     	Language language = Env.getLanguage(m_ctx);
@@ -406,6 +422,9 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
     	component.addEventListener(ON_DEFER_LOGOUT, this);
     }
 
+    /**
+     * Update roles available for selection (after selection of tenant)
+     */
     private void updateRoleList()
     {
 		lstRole.getItems().clear();
@@ -457,6 +476,9 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
         updateOrganisationList();
     }
 
+    /**
+     * After organizations available for selection (after selection of role)
+     */
     private void updateOrganisationList()
     {
         lstOrganisation.getItems().clear();
@@ -507,6 +529,9 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
         updateWarehouseList();
     }
 
+    /**
+     * Update list of warehouse available for selection (after selection of organization)
+     */
     private void updateWarehouseList()
     {
         lstWarehouse.getItems().clear();
@@ -542,6 +567,7 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
         }
     }
 
+    @Override
     public void onEvent(Event event)
     {
         String eventCompId = event.getTarget().getId();
@@ -603,6 +629,9 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
 		}
 	}
 
+	/**
+	 * Set user id to environment context
+	 */
     private void setUserID() {
     	if (lstClient.getSelectedItem() != null) {
         	Env.setContext(m_ctx, Env.AD_CLIENT_ID, (String) lstClient.getSelectedItem().getValue());
@@ -638,10 +667,10 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
     }
 
     /**
-     *  validate Roles
+     * Validate fields
      * @param isMFAValidated
      *
-    **/
+     */
     public void validateRoles(boolean isMFAValidated)
     {
     	Clients.clearBusy();
@@ -708,10 +737,14 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
 			wndLogin.validateMFA(orgKNPair, m_isClientDefined, m_userName, m_showRolePanel, m_clientKNPairs);
     }
 
+    @Override
 	public boolean isDeferrable() {
 		return false;
 	}
 
+    /**
+     * @return true if role selection panel will be shown to user
+     */
 	public boolean show() {
 		return m_showRolePanel;
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/StatusBarPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/StatusBarPanel.java
index d7200630a0..a0120860fc 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/StatusBarPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/StatusBarPanel.java
@@ -45,9 +45,6 @@ import org.zkoss.zul.West;
 import org.zkoss.zul.Borderlayout;
 
 /**
- * This class is based on org.compiere.apps.StatusBar written by Jorg Janke.
- * @author Jorg Janke
- *
  * @author  <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
  * @date    Mar 12, 2007
  * @version $Revision: 0.10 $
@@ -55,7 +52,7 @@ import org.zkoss.zul.Borderlayout;
 public class StatusBarPanel extends Panel implements EventListener<Event>, IStatusBar
 {
 	/**
-	 *
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 1217160210065925924L;
 
@@ -82,12 +79,18 @@ public class StatusBarPanel extends Panel implements EventListener<Event>, IStat
 	private Div popupContent;
 	private String popupStyle;
 
+	/**
+	 * Default constructor
+	 */
 	public StatusBarPanel()
 	{
         super();
         init();
     }
 
+	/**
+	 * Layout panel
+	 */
     private void init()
     {
     	setWidgetAttribute(AdempiereWebUI.WIDGET_INSTANCE_NAME, "statusBar");
@@ -239,6 +242,9 @@ public class StatusBarPanel extends Panel implements EventListener<Event>, IStat
    		return statusLine.getValue();
    	}
 
+    /**
+     * Create popup for status line
+     */
 	private void createPopup() {
 		popupContent = new Div();
 
@@ -250,11 +256,15 @@ public class StatusBarPanel extends Panel implements EventListener<Event>, IStat
         popup.setStyle("position: absolute; display: none");
 	}
 
+	/**
+	 * Show status line popup
+	 */
 	private void showPopup() {
 		popup.setVisible(true);
 		popup.setStyle(popupStyle);
 		if (getRoot() == null || !getRoot().isVisible() ) return;
 
+		//client side script to position popup
 		String script = "(function(){let d = zk.Widget.$('" + popup.getUuid() + "').$n();";
 		script += "d.style.display='block';d.style.visibility='hidden';";
 		script += "let dhs = document.defaultView.getComputedStyle(d, null).getPropertyValue('height');";
@@ -297,6 +307,9 @@ public class StatusBarPanel extends Panel implements EventListener<Event>, IStat
         invalidate();
 	}	//	setInfo
 
+	/**
+	 * @param rowNum
+	 */
 	public void setSelectedRowNumber (String rowNum){
 		selectedLine.setVisible(rowNum != null);
 		if (rowNum != null){
@@ -305,6 +318,7 @@ public class StatusBarPanel extends Panel implements EventListener<Event>, IStat
         invalidate();
 	}
 	
+	@Override
 	public void onEvent(Event event) throws Exception {
 		if (Events.ON_CLICK.equals(event.getName()) && event.getTarget() == statusDB)
 		{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TimeoutPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TimeoutPanel.java
index 1ce4228d6e..6a3f0e4bcc 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TimeoutPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TimeoutPanel.java
@@ -32,15 +32,18 @@ import org.zkoss.zul.South;
 import org.zkoss.zul.Timer;
 import org.zkoss.zul.Vlayout;
 import org.zkoss.zul.Window;
+
 /**
- * 
+ * session timeout counter window
  * @author Deepak Pansheriya
  *
  */
 public class TimeoutPanel extends Window implements
 		org.zkoss.zk.ui.event.EventListener<Event> {
 	
-	
+	/**
+	 * generated serial id
+	 */
 	private static final long serialVersionUID = -2734157789771800337L;
 	private Timer timer = null;
 	private int count = 0;
@@ -48,11 +51,14 @@ public class TimeoutPanel extends Window implements
 	private Label ltime = null;
 	private Timer timerJS = null;
 	
+	/**
+	 * @param pnlHead
+	 * @param timeInSecond
+	 */
 	public TimeoutPanel(HeaderPanel pnlHead, int timeInSecond) {
 		count = timeInSecond;
 		pnlHead.appendChild(this);
 		
-
 		Borderlayout layout = new Borderlayout();
 		layout.setParent(this);
 
@@ -79,17 +85,14 @@ public class TimeoutPanel extends Window implements
 		
 		Vlayout centerVlayout = new Vlayout();
 		centerVlayout.setParent(center);
-		centerVlayout.setStyle("height:100%; text-align: center;");
-		
+		centerVlayout.setStyle("height:100%; text-align: center;");		
 		
 		South south = new South();
-		south.setParent(layout);
-		
+		south.setParent(layout);		
 		
 		Div divSouth = new Div();
 		divSouth.setParent(south);
-		divSouth.setStyle("height:100%; text-align: center;");
-		
+		divSouth.setStyle("height:100%; text-align: center;");		
 		
 		timer = new Timer();
 		timer.setDelay((count * 1000));
@@ -97,7 +100,6 @@ public class TimeoutPanel extends Window implements
 		timer.setRepeats(true);
 		timer.start();
 		centerVlayout.appendChild(timer);
-
 		
 		Script jScript = new Script("var countJS = "+count+";");
 		jScript.setDynamicProperty("defer","true");
@@ -120,17 +122,14 @@ public class TimeoutPanel extends Window implements
 		ltime = new Label(minConverted +" : "+secConverted);
 		ltime.setParent(centerVlayout);
 		ltime.setStyle("text-align: center; font-size: 40px; color:red;");
-
 		
 		Html txtLbl = new Html(Msg.getMsg(Env.getCtx(),"Minutes")+"&nbsp;&nbsp;&nbsp;  &nbsp;&nbsp;"+Msg.getMsg(Env.getCtx(),"Seconds"));
 		txtLbl.setParent(centerVlayout);
 		txtLbl.setStyle("font-size: 12px;");
-
 		
 		Vlayout vLayout = new Vlayout();
 		vLayout.setParent(divSouth);
-		
-		
+				
 		Label saveLbl = new Label(Msg.getMsg(Env.getCtx(),"killsession.saveWorkMessage"));
 		saveLbl.setParent(vLayout);
 		saveLbl.setStyle("font-size: 20px;");
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java
index 0cb6caf7da..d173adef59 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java
@@ -22,6 +22,7 @@ import java.util.Set;
 import java.util.TreeMap;
 
 import org.adempiere.webui.ClientInfo;
+import org.adempiere.webui.adwindow.ADTreePanel;
 import org.adempiere.webui.apps.AEnv;
 import org.adempiere.webui.component.AutoComplete;
 import org.adempiere.webui.component.Label;
@@ -61,7 +62,8 @@ import org.zkoss.zul.impl.LabelElement;
 import org.zkoss.zul.impl.LabelImageElement;
 
 /**
- *
+ * Panel with combo search box for menu tree. <br/>
+ * Use by {@link ADTreePanel}.
  * @author  <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
  * @date    Mar 3, 2007
  * @version $Revision: 0.10 $
@@ -71,14 +73,16 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
 	public static final String TREE_ROW_MOVABLE = "tree.row.movable";
 
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -1659100374345282774L;
 
 	private static final String ON_COMBO_SELECT_ECHO_EVENT = "onComboSelectEcho";
 	private static final String ON_POST_SELECT_TREEITEM_EVENT = "onPostSelectTreeitem";
 	protected static final String ON_POST_FIRE_TREE_EVENT = "onPostFireTreeEvent";
+	/** <label>.<menuType> : TreeItem or Name : DefaultTreeNode */
 	protected TreeMap<String, Object> treeNodeItemMap = new TreeMap<String, Object>();
+	//values for combo auto complete
     protected String[] treeValues;
     protected String[] treeTypes;
     protected String[] treeDescription;
@@ -144,6 +148,9 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
     		+ "let evt = new zk.Event(panel, 'onComboSelectEcho', [comboitem.uuid, popupheight], {toServer: true});"
     		+ "zAu.send(evt);})()";
 	
+    /**
+     * Layout panel
+     */
     protected void init()
     {
     	layout = new Hlayout();
@@ -204,6 +211,10 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
         }
     }
 
+    /**
+     * Handle onSelect event (for mobile only)
+     * @param evt
+     */
     private void onSelect(Event evt) {
 		if (moveItemBox != null) {
 			Treeitem selected = tree.getSelectedItem();
@@ -219,6 +230,10 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
 		}
 	}
     
+    /**
+     * Handle onPostMove event (for mobile only)
+     * @param evt
+     */
     private void onPostMove(Event evt) {
     	Treeitem item = (Treeitem) evt.getData();
     	Treerow dragged = (Treerow) moveItemBtn.getAttribute("draggedComponent");
@@ -234,6 +249,9 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
     	}    	
     }
 
+    /**
+     * Handle onClick event of {@link #moveItemBtn} (for mobile only)
+     */
 	private void onMoveBtnClicked() {
 		if (moveItemBox != null) {
 			moveItemBox.detach();
@@ -274,12 +292,20 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
 		ti.focus();
 	}
 
+	/**
+	 * Add treeItem to {@link #treeNodeItemMap}
+	 * @param treeItem
+	 */
 	protected void addTreeItem(Treeitem treeItem)
     {
         StringBuilder key = new StringBuilder(getLabel(treeItem)).append(".").append(treeItem.getAttribute(AbstractMenuPanel.MENU_TYPE_ATTRIBUTE));
         treeNodeItemMap.put(key.toString(), treeItem);
     }
 
+	/**
+	 * Add DefaultTreeNode to {@link #treeNodeItemMap}
+	 * @param node
+	 */
     protected void addTreeItem(DefaultTreeNode<?> node) {
     	Object data = node.getData();
     	if (data instanceof MTreeNode) {
@@ -301,6 +327,9 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
         }
     }
 
+    /**
+     * Populate list for auto complete combo ({@link #cmbSearch})
+     */
 	public void refreshSearchList() {
 		treeNodeItemMap.clear();
 		if (tree.getModel() == null) {
@@ -371,6 +400,10 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
         cmbSearch.setContents(treeTypes);
 	}
 
+	/**
+	 * @param treeItem
+	 * @return true if treeItem is folder
+	 */
 	protected boolean isFolder(Treeitem treeItem) {
 		List<Component> list = treeItem.getChildren();
 		for (Component c : list) {
@@ -381,6 +414,10 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
 		return false;
 	}
 
+	/**
+	 * @param treeItem
+	 * @return label for treeItem
+	 */
 	protected String getLabel(Treeitem treeItem) {
 		String label = treeItem.getLabel();
         if (label == null || label.trim().length() == 0) 
@@ -395,6 +432,10 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
         return label;
 	}
 	
+	/**
+	 * @param treeItem
+	 * @return Image URL for treeItem
+	 */
 	protected String getImage(Treeitem treeItem) {
 		String image = treeItem.getImage();
         if (image == null || image.trim().length() == 0) 
@@ -413,6 +454,7 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
      * @param event
      * @see EventListener#onEvent(Event)
      */
+	@Override
     public void onEvent(Event event)
     {
         if (cmbSearch.equals(event.getTarget()))
@@ -487,6 +529,10 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
         }
     }
 
+	/**
+	 * Select tree item by value
+	 * @param value
+	 */
 	private void selectTreeitem(String value) {
 		if (Executions.getCurrent().getAttribute(getUuid()+".selectTreeitem") != null)
 			return;
@@ -515,6 +561,9 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
 		}
 	}
 
+	/**
+	 * Handle ON_POST_SELECT_TREEITEM_EVENT
+	 */
     protected void onPostSelectTreeitem() {
     	Clients.clearBusy();
     	Event event = null;
@@ -535,6 +584,10 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
     	Events.echoEvent(ON_POST_FIRE_TREE_EVENT, this, null);
     }
 
+    /**
+     * select selectedItem and make sure parent of selectedItem is open
+     * @param selectedItem
+     */
 	public static void select(Treeitem selectedItem) {
 		Treeitem parent = selectedItem.getParentItem();
 		while (parent != null) {
@@ -554,6 +607,9 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
 		refreshSearchList();
 	}
 	
+	/**
+	 * @return selected tree item
+	 */
 	public Treeitem getSelectedItem() {
 		return selectedItem;
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java
index 024a165741..ffa17cfaba 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java
@@ -82,12 +82,18 @@ public class UserPanel implements EventListener<Event>, Composer<Component>
 	private static final String ON_DEFER_CHANGE_ROLE = "onDeferChangeRole";
 	private static final String ON_DEFER_LOGOUT = "onDeferLogout";
 
+	/**
+	 * Default constructor
+	 */
 	public UserPanel()
     {
     	super();
         this.ctx = Env.getCtx();
     }
 
+	/**
+	 * Call when UI is compose from zul definition
+	 */
     protected void onCreate()
     {
     	String s = Msg.getMsg(Env.getCtx(), "CloseTabFromBrowser?").replace("\n", "<br>");
@@ -143,28 +149,43 @@ public class UserPanel implements EventListener<Event>, Composer<Component>
     	}
     }
 
+    /**
+     * @return true if client is mobile
+     */
     private boolean isMobile() {
 		return ClientInfo.isMobile();
 	}
 
+    /**
+     * @return name of user
+     */
 	private String getUserName()
     {
         MUser user = MUser.get(ctx);
         return user.getName();
     }
 
+	/**
+	 * @return name of role
+	 */
     private String getRoleName()
     {
         MRole role = MRole.getDefault(ctx, false);
         return role.getName();
     }
 
+    /**
+     * @return name of tenant
+     */
     private String getClientName()
     {
         MClient client = MClient.get(ctx);
         return client.getName();
     }
 
+    /**
+     * @return name of organization
+     */
     private String getOrgName()
     {
     	int orgId = Env.getAD_Org_ID(ctx);
@@ -179,6 +200,7 @@ public class UserPanel implements EventListener<Event>, Composer<Component>
     	}
     }
 
+    @Override
 	public void onEvent(Event event) throws Exception {
 		if (event == null)
 			return;
@@ -292,6 +314,9 @@ public class UserPanel implements EventListener<Event>, Composer<Component>
 
 	}
 
+    /**
+     * Open user panel popup for mobile client
+     */
 	protected void openMobileUserPanelPopup() {
 		if (popup != null) {
 			Object value = popup.removeAttribute(popup.getUuid());
@@ -339,11 +364,17 @@ public class UserPanel implements EventListener<Event>, Composer<Component>
 		
 	}
 
+	/**
+	 * @return email of user
+	 */
 	private String getUserEmail() {
 		 MUser user = MUser.get(ctx);
 		return user.getEMail();
 	}
 
+	/**
+	 * @return name of warehouse
+	 */
 	private String getWarehouseName() {
 		int id = Env.getContextAsInt(Env.getCtx(), Env.M_WAREHOUSE_ID);
 		if (id > 0) {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ValidateMFAPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ValidateMFAPanel.java
index cb19719de0..dc80df0726 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ValidateMFAPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ValidateMFAPanel.java
@@ -75,9 +75,12 @@ import org.zkoss.zk.ui.util.Clients;
 import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Image;
 
+/**
+ * Multi factor authentication panel
+ */
 public class ValidateMFAPanel extends Window implements EventListener<Event> {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 4777197666886479162L;
 
@@ -113,6 +116,15 @@ public class ValidateMFAPanel extends Window implements EventListener<Event> {
 	/* Number of failures to calculate an incremental delay on every trial */
 	private int failures = 0;
 
+	/**
+	 * @param ctx
+	 * @param loginWindow
+	 * @param orgKNPair
+	 * @param isClientDefined
+	 * @param userName
+	 * @param showRolePanel
+	 * @param clientsKNPairs
+	 */
 	public ValidateMFAPanel(Properties ctx, LoginWindow loginWindow, KeyNamePair orgKNPair, boolean isClientDefined, String userName, boolean showRolePanel, KeyNamePair[] clientsKNPairs) {
 		this.wndLogin = loginWindow;
 		m_ctx = ctx;
@@ -146,6 +158,9 @@ public class ValidateMFAPanel extends Window implements EventListener<Event> {
 
 	}
 
+	/**
+	 * Layout panel
+	 */
 	private void init() {
 		Div div = new Div();
 		div.setSclass(ITheme.LOGIN_BOX_HEADER_CLASS);
@@ -244,6 +259,10 @@ public class ValidateMFAPanel extends Window implements EventListener<Event> {
 		this.appendChild(div);
 	}
 
+	/**
+	 * Create components
+	 * @param hasCookie
+	 */
 	private void initComponents(boolean hasCookie) {
 		lblMFAMechanism = new Label();
 		lblMFAMechanism.setId("lblMFAMechanism");
@@ -298,6 +317,7 @@ public class ValidateMFAPanel extends Window implements EventListener<Event> {
 		txtValidationCode.setDisabled(true);
 	}
 
+	@Override
 	public void onEvent(Event event) {
 		if (event.getTarget().getId().equals(ConfirmPanel.A_OK)) {
 			validateMFAComplete(true);
@@ -306,6 +326,10 @@ public class ValidateMFAPanel extends Window implements EventListener<Event> {
 		}
 	}
 
+	/**
+	 * Validate completion of multi factor authentication
+	 * @param required
+	 */
 	public void validateMFAComplete(boolean required) {
 		Clients.clearBusy();
 
@@ -426,6 +450,9 @@ public class ValidateMFAPanel extends Window implements EventListener<Event> {
 		return null;
 	}
 
+	/**
+	 * @return true if panel is shown to user
+	 */
 	public boolean show() {
 		return m_showMFAPanel;
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
index fcd40b77e0..ce740aa283 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
@@ -86,14 +86,14 @@ import org.zkoss.zul.impl.Utils;
 import org.zkoss.zul.impl.XulElement;
 
 /**
- *
+ * Attachment window
  * @author Low Heng Sin
  *
  */
 public class WAttachment extends Window implements EventListener<Event>
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -8534334828539841412L;
 
@@ -207,7 +207,7 @@ public class WAttachment extends Window implements EventListener<Event>
 	 *  @param Record_ID record key
 	 *  @param Record_UU record UUID
 	 *  @param trxName transaction
-	 *  @param eventListener
+	 *  @param eventListener listener for ON_WINDOW_CLOSE event
 	 */
 	public WAttachment(	int WindowNo, int AD_Attachment_ID,
 						int AD_Table_ID, int Record_ID, String Record_UU, String trxName, EventListener<Event> eventListener)
@@ -246,13 +246,7 @@ public class WAttachment extends Window implements EventListener<Event>
 		{
 			setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED);
 			AEnv.showWindow(this);
-			if (autoPreview(0, true))
-			{
-				//String script = "setTimeout(\"zk.Widget.$('"+ preview.getUuid() + "').$n().src = zk.Widget.$('" +
-				//preview.getUuid() + "').$n().src\", 1000)";
-				//Clients.response(new AuScript(null, script));
-			}
-
+			autoPreview(0, true);
 		}
 		catch (Exception e)
 		{
@@ -270,7 +264,7 @@ public class WAttachment extends Window implements EventListener<Event>
 	} // WAttachment
 
 	/**
-	 *	Static setup.
+	 *	layout window
 	 *  <pre>
 	 *  - northPanel
 	 *      - toolBar
@@ -282,8 +276,7 @@ public class WAttachment extends Window implements EventListener<Event>
 	 *  </pre>
 	 *  @throws Exception
 	 */
-
-	void staticInit() throws Exception
+	protected void staticInit() throws Exception
 	{
 		this.setAttribute(AdempiereWebUI.WIDGET_INSTANCE_NAME, "attachment");
 		this.setMaximizable(true);
@@ -367,7 +360,6 @@ public class WAttachment extends Window implements EventListener<Event>
 			bLoad.setImage(ThemeManager.getThemeResource("images/Import24.png"));
 		bLoad.setSclass("img-btn");
 		bLoad.setId("bLoad");
-//		bLoad.setAttribute("org.zkoss.zul.image.preload", Boolean.TRUE);
 		bLoad.setTooltiptext(Msg.getMsg(Env.getCtx(), "Load"));
 		bLoad.setUpload("multiple=true," + AdempiereWebUI.getUploadSetting());
 		bLoad.addEventListener(Events.ON_UPLOAD, this);
@@ -390,7 +382,6 @@ public class WAttachment extends Window implements EventListener<Event>
 		
 		Center centerPane = new Center();
 		centerPane.setSclass("dialog-content");
-		//centerPane.setAutoscroll(true); // not required the preview has its own scroll bar
 		mainPanel.appendChild(centerPane);
 		centerPane.appendChild(previewPanel);
 		ZKUpdateUtil.setVflex(previewPanel, "1");
@@ -442,6 +433,9 @@ public class WAttachment extends Window implements EventListener<Event>
 		addEventListener(Events.ON_CANCEL, e -> onCancel());
 	}
 	
+	/**
+	 * Handle onClientInfo event
+	 */
 	protected void onClientInfo()
 	{		
 		if (getPage() != null)
@@ -458,9 +452,8 @@ public class WAttachment extends Window implements EventListener<Event>
 	}
 
 	/**
-	 * 	Dispose
+	 * Dispose
 	 */
-
 	public void dispose ()
 	{
 		preview = null;
@@ -468,12 +461,12 @@ public class WAttachment extends Window implements EventListener<Event>
 	} // dispose
 
 	/**
-	 *	Load Attachments
+	 * Load Attachment items
 	 */
-
 	private void loadAttachments()
 	{
-		log.config("");
+		if (log.isLoggable(Level.CONFIG))
+			log.config("");
 
 		//	Set Text/Description
 
@@ -498,6 +491,12 @@ public class WAttachment extends Window implements EventListener<Event>
 
 	} // loadAttachment
 
+	/**
+	 * auto preview attachment item
+	 * @param index
+	 * @param immediate
+	 * @return true if preview is available for attachment item
+	 */
 	private boolean autoPreview(int index, boolean immediate)
 	{
 		MAttachmentEntry entry = m_attachment.getEntry(index);
@@ -577,6 +576,11 @@ public class WAttachment extends Window implements EventListener<Event>
 		}
 	}
 
+	/**
+	 * Get file extension
+	 * @param name
+	 * @return file extension or empty string
+	 */
 	private String getExtension(String name) {
 		int index = name.lastIndexOf(".");
 		if (index > 0) {
@@ -586,7 +590,7 @@ public class WAttachment extends Window implements EventListener<Event>
 	}
 
 	/**
-	 *  Display gif or jpg in gifPanel
+	 *  Display attachment item
 	 * 	@param index index
 	 */
 
@@ -604,6 +608,9 @@ public class WAttachment extends Window implements EventListener<Event>
 		bPreview.setEnabled(false);
 	}   //  displayData
 
+	/**
+	 * Clear preview content ({@link #preview} and {@link #customPreviewComponent})
+	 */
 	private void clearPreview()
 	{
 		preview.setSrc(null);
@@ -649,11 +656,10 @@ public class WAttachment extends Window implements EventListener<Event>
 	}
 
 	/**
-	 * 	Get File Name with index
+	 * 	Get file Name by index
 	 *	@param index index
 	 *	@return file name or null
 	 */
-
 	private String getFileName (int index)
 	{
 		String fileName = null;
@@ -668,10 +674,10 @@ public class WAttachment extends Window implements EventListener<Event>
 	}	//	getFileName
 
 	/**
-	 *	Action Listener
+	 *	handle event
 	 *  @param e event
 	 */
-
+	@Override
 	public void onEvent(Event e)
 	{
 		//	Save and Close
@@ -735,6 +741,9 @@ public class WAttachment extends Window implements EventListener<Event>
 
 	}	//	onEvent
 
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {		
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -743,10 +752,13 @@ public class WAttachment extends Window implements EventListener<Event>
 		dispose();
 	}
 
+	/**
+	 * Process uploaded media
+	 * @param media
+	 */
 	private void processUploadMedia(Media media) {
 		if (media != null && ((media.isBinary() && media.getByteData().length>0) || (!media.isBinary() && media.getStringData().length() > 0)))
 		{
-//				pdfViewer.setContent(media);
 			;
 		}
 		else
@@ -781,6 +793,11 @@ public class WAttachment extends Window implements EventListener<Event>
 		}
 	}
 
+	/**
+	 * Get byte[] data from media
+	 * @param media
+	 * @return byte[] data
+	 */
 	private byte[] getMediaData(Media media)  {
 		byte[] bytes = null;
 		
@@ -813,11 +830,12 @@ public class WAttachment extends Window implements EventListener<Event>
 	}
 
 	/**
-	 *	Delete entire Attachment
+	 * Delete entire Attachment
 	 */
 	private void deleteAttachment()
 	{
-		log.info("");
+		if (log.isLoggable(Level.INFO))
+			log.info("");
 
 		Dialog.ask(m_WindowNo, "AttachmentDelete?", new Callback<Boolean>() {
 			
@@ -837,12 +855,12 @@ public class WAttachment extends Window implements EventListener<Event>
 	}	//	deleteAttachment
 
 	/**
-	 *	Delete Attachment Entry
+	 * Delete current Attachment Entry
 	 */
-
 	private void deleteAttachmentEntry()
 	{
-		log.info("");
+		if (log.isLoggable(Level.INFO))
+			log.info("");
 
 		final int index = cbContent.getSelectedIndex();
 		String fileName = getFileName(index);
@@ -870,13 +888,13 @@ public class WAttachment extends Window implements EventListener<Event>
 	}	//	deleteAttachment
 
 	/**
-	 *	Save Attachment to File
+	 * Save current Attachment entry to File
 	 */
-
 	private void saveAttachmentToFile()
 	{
 		int index = cbContent.getSelectedIndex();
-		log.info("index=" + index);
+		if (log.isLoggable(Level.INFO))
+			log.info("index=" + index);
 
 		if (m_attachment.getEntryCount() < index)
 			return;
@@ -896,7 +914,11 @@ public class WAttachment extends Window implements EventListener<Event>
 		}
 	}	//	saveAttachmentToFile
 	
-	
+	/**
+	 * Get charset from content type header. Fallback to UTF-8
+	 * @param contentType
+	 * @return charset
+	 */
 	static private String getCharset(String contentType) {
 		if (contentType != null) {
 			int j = contentType.indexOf("charset=");
@@ -908,6 +930,9 @@ public class WAttachment extends Window implements EventListener<Event>
 		return "UTF-8";
 	}	
 
+	/**
+	 * Save all attachment items as zip file
+	 */
 	private void saveAllAsZip() {
 		File zipFile = m_attachment.saveAsZip();
 		
@@ -923,6 +948,9 @@ public class WAttachment extends Window implements EventListener<Event>
 		}
 	}
 	
+	/**
+	 * Email current attachment entry
+	 */
 	private void sendMail()
 	{
 		int index = cbContent.getSelectedIndex();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java
index 9f8b4cf996..ac717b599d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java
@@ -60,12 +60,13 @@ import org.zkoss.zul.Listitem;
 import org.zkoss.zul.Space;
 import org.zkoss.zul.Vlayout;
 
-
-
+/**
+ * Document action dialog
+ */
 public class WDocActionPanel extends Window implements EventListener<Event>, DialogEvents
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -3218367479851088526L;
 
@@ -90,11 +91,18 @@ public class WDocActionPanel extends Window implements EventListener<Event>, Dia
         logger = CLogger.getCLogger(WDocActionPanel.class);
     }
 
+    /**
+     * @param mgridTab
+     */
 	public WDocActionPanel(GridTab mgridTab)
 	{
 		this(mgridTab, false);
 	}
 
+	/**
+	 * @param mgridTab
+	 * @param fromMenu
+	 */
 	public WDocActionPanel(GridTab mgridTab, boolean fromMenu)
 	{
 		gridTab = mgridTab;
@@ -111,12 +119,11 @@ public class WDocActionPanel extends Window implements EventListener<Event>, Dia
 	}
 
 	/**
-	 *	Dynamic Init - determine valid DocActions based on DocStatus for the different documents.
+	 * Dynamic Init - determine valid DocActions based on DocStatus for the different documents.
 	 * @param fromMenu 
 	 */
 	private void dynInit(boolean fromMenu)
 	{
-
 		//
 		Object Processing = gridTab.getValue("Processing");
 		String OrderType = Env.getContext(Env.getCtx(), gridTab.getWindowNo(), "OrderType");
@@ -124,7 +131,6 @@ public class WDocActionPanel extends Window implements EventListener<Event>, Dia
 
 		if (DocStatus == null)
 		{
-			//message.setText("*** ERROR ***");
 			return;
 		}
 
@@ -235,10 +241,19 @@ public class WDocActionPanel extends Window implements EventListener<Event>, Dia
 			DocAction = DocumentEngine.ACTION_Close;
 	}
 
+	/**
+	 * @return available document action items
+	 */
 	public List<Listitem> getDocActionItems() {
 		return (List<Listitem>)lstDocAction.getItems();
 	}
 	
+	/**
+	 * @param TableName
+	 * @param Record_ID
+	 * @param DocStatus
+	 * @return true if DocStatus match DocStatus from DB
+	 */
 	private boolean checkStatus (String TableName, int Record_ID, String DocStatus)
 	{
 		String sql = "SELECT 2 FROM " + TableName
@@ -248,6 +263,9 @@ public class WDocActionPanel extends Window implements EventListener<Event>, Dia
 		return result == 2;
 	}
 
+	/**
+	 * Create components
+	 */
 	private void initComponents()
 	{
 		lblDocAction = new Label();
@@ -267,6 +285,9 @@ public class WDocActionPanel extends Window implements EventListener<Event>, Dia
         ZKUpdateUtil.setVflex(confirmPanel, "true");
 	}
 
+	/**
+	 * Layout dialog
+	 */
 	private void init()
 	{
 		setSclass("popup-dialog doc-action-dialog");
@@ -322,6 +343,7 @@ public class WDocActionPanel extends Window implements EventListener<Event>, Dia
 		return m_OKpressed;
 	}	//	isStartProcess
 
+	@Override
 	public void onEvent(Event event)
 	{
 
@@ -347,6 +369,10 @@ public class WDocActionPanel extends Window implements EventListener<Event>, Dia
 		}
 	}
 
+	/**
+	 * Set selected document action item by value
+	 * @param value
+	 */
 	public void setSelectedItem(String value) {
 		lstDocAction.setSelectedIndex(-1);
 		List<Listitem> lst = (List<Listitem>)lstDocAction.getItems();
@@ -358,6 +384,10 @@ public class WDocActionPanel extends Window implements EventListener<Event>, Dia
 		}
 	}
 	
+	/**
+	 * Handle onOk event
+	 * @param callback
+	 */
 	public void onOk(final Callback<Boolean> callback) {
 		MClientInfo clientInfo = MClientInfo.get(Env.getCtx());
 		if(clientInfo.isConfirmOnDocClose() || clientInfo.isConfirmOnDocVoid())
@@ -404,6 +434,9 @@ public class WDocActionPanel extends Window implements EventListener<Event>, Dia
 		}		
 	}
 
+	/**
+	 * Validate DocStatus not change by other, update GridTab and close dialog
+	 */
 	private void setValueAndClose() {
 		String statusSql = "SELECT DocStatus FROM " + gridTab.getTableName() 
 				+ " WHERE " + gridTab.getKeyColumnName() + " = ? ";
@@ -416,6 +449,9 @@ public class WDocActionPanel extends Window implements EventListener<Event>, Dia
 		detach();
 	}
 
+	/**
+	 * Update GridTab with selected DocAction value
+	 */
 	private void setValue()
 	{
 		int index = getSelectedIndex();
@@ -424,8 +460,11 @@ public class WDocActionPanel extends Window implements EventListener<Event>, Dia
 		gridTab.setValue("DocAction", s_value[index]);
 	}	//	save
 
-	 private void readReference()
-	 {
+	/**
+	 * Load document action list from AD_Ref_List  
+	 */
+	private void readReference()
+	{
 	        ArrayList<String> v_value = new ArrayList<String>();
     		ArrayList<String> v_name = new ArrayList<String>();
     		ArrayList<String> v_description = new ArrayList<String>();
@@ -445,6 +484,9 @@ public class WDocActionPanel extends Window implements EventListener<Event>, Dia
 			}
 	 }   //  readReference
 
+	/**
+	 * @return selected index
+	 */
 	 public int getSelectedIndex()
 	 {
 		int index = 0;
@@ -464,6 +506,9 @@ public class WDocActionPanel extends Window implements EventListener<Event>, Dia
 		return index;
 	}	//	getSelectedIndex
 
+	 /**
+	  * @return number of document action items
+	  */
 	public int getNumberOfOptions() {
 		return lstDocAction != null ? lstDocAction.getItemCount() : 0;
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WOnlyCurrentDays.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WOnlyCurrentDays.java
index f248b3b086..df3c074144 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WOnlyCurrentDays.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WOnlyCurrentDays.java
@@ -32,18 +32,16 @@ import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zul.Hbox;
 import org.zkoss.zul.Separator;
 
-
 /**
- *	Queries how many days back history is displayed as current
+ *	Dialog to select how many days back history is included as part of query
  *
  * 	@author 	Niraj Sohun
  * 	@date		September 24, 2007
  */
-
 public class WOnlyCurrentDays extends Window implements EventListener<Event>, DialogEvents
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 2464266193433220449L;
 
@@ -81,10 +79,9 @@ public class WOnlyCurrentDays extends Window implements EventListener<Event>, Di
 	private static final CLogger log = CLogger.getCLogger(WOnlyCurrentDays.class);
 
 	/**
-	 * 	Static Initializer
+	 * 	Layout dialog
 	 * 	@throws Exception
-	 */
-	
+	 */	
 	private void jbInit() throws Exception
 	{
 		bShowAll.setLabel(Msg.getMsg(Env.getCtx(), "All"));
@@ -123,13 +120,13 @@ public class WOnlyCurrentDays extends Window implements EventListener<Event>, Di
 	/**
 	 * 	Get selected number of days
 	 * 	@return days or -1 for all
-	 */
-	
+	 */	
 	public int getCurrentDays()
 	{
 		return m_days;
 	}	//	getCurrentDays
 
+	@Override
 	public void onEvent(Event event) throws Exception 
 	{
 		if (event.getTarget() == bShowDay)
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WProcessParameterForm.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WProcessParameterForm.java
index 08009a6fcd..b95680261c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WProcessParameterForm.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WProcessParameterForm.java
@@ -46,14 +46,18 @@ import org.zkoss.zul.Hbox;
 import org.zkoss.zul.Html;
 import org.zkoss.zul.Vlayout;
 
+/**
+ * Form to capture process parameters for scheduler, etc
+ */
 @org.idempiere.ui.zk.annotation.Form
 public class WProcessParameterForm extends ADForm
 {
 	/**
-	 *
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -2533099650671242190L;
 
+	/** Form Controller */
 	private WProcessParameter pp;
 
 	private VerticalBox dialogBody;
@@ -77,6 +81,9 @@ public class WProcessParameterForm extends ADForm
 	
 	private final static CLogger log = CLogger.getCLogger(WProcessParameterForm.class);
 
+	/**
+	 * @param wpp
+	 */
 	public WProcessParameterForm(WProcessParameter wpp) {
 		pp = wpp;
 		initComponents();
@@ -110,6 +117,9 @@ public class WProcessParameterForm extends ADForm
 		}
 	}
 	
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -118,6 +128,9 @@ public class WProcessParameterForm extends ADForm
 		this.dispose();
 	}
 
+	/**
+	 * Handle onOk event
+	 */
 	private void onOK() {
 		MPInstancePara[] paras = parameterPanel.getParameters();
 		GridTab gridTab = super.getGridTab();
@@ -157,6 +170,9 @@ public class WProcessParameterForm extends ADForm
 		ZKUpdateUtil.setVflex(this, "min");
 	}
 
+	/**
+	 * Create components
+	 */
 	private void initComponents() {
 		this.setBorder("normal");		
 		dialogBody = new VerticalBox();
@@ -194,8 +210,8 @@ public class WProcessParameterForm extends ADForm
 	}
 	
 	/**
-	 *	Dynamic Init
-	 *  @return true, if there is something to process (start from menu)
+	 * Init {@link #parameterPanel}
+	 * @return true if init ok
 	 */
 	private boolean init()
 	{
@@ -252,7 +268,6 @@ public class WProcessParameterForm extends ADForm
 		this.setTitle(m_Name);
 		message.setContent(m_messageText.toString());
 
-		//	Move from APanel.actionButton
 		processInfo.setAD_User_ID (Env.getAD_User_ID(Env.getCtx()));
 		processInfo.setAD_Client_ID(Env.getAD_Client_ID(Env.getCtx()));
 		processInfo.setTitle(m_Name);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC1DisplayFieldsPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC1DisplayFieldsPanel.java
index 1d54936167..3de4b50b62 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC1DisplayFieldsPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC1DisplayFieldsPanel.java
@@ -35,33 +35,47 @@ import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zul.Center;
 import org.zkoss.zul.Div;
 
-
+/**
+ * Panel to select printed print format items 
+ */
 public class WRC1DisplayFieldsPanel extends WRCTabPanel implements EventListener<Event>
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -4595966853507636969L;
 
 	private static final int RENDER_IN_COLUMNS=4;
 	private MPrintFormat m_printFormat;
-	Checkbox m_chkboxes[]=null;
-	Textbox m_textBoxes[]=null;
-	String m_oldLabel[]=null;
+	protected Checkbox m_chkboxes[]=null;
+	protected Textbox m_textBoxes[]=null;
+	protected String m_oldLabel[]=null;
 
+	/**
+	 * Default constructor
+	 */
 	public WRC1DisplayFieldsPanel() {
 		super();
 	}
 	
+	/**
+	 * @param pf
+	 */
 	public WRC1DisplayFieldsPanel(MPrintFormat pf){
 		super();
 		m_printFormat=pf;
 	}
 
+	/**
+	 * @return print format
+	 */
 	public MPrintFormat getM_printFormat() {
 		return m_printFormat;
 	}
 
+	/**
+	 * Layout panel
+	 */
 	public void init() {
 
 		m_chkboxes = new Checkbox[m_pfi.size()];
@@ -138,6 +152,9 @@ public class WRC1DisplayFieldsPanel extends WRCTabPanel implements EventListener
 		}
 	}
 	
+	/**
+	 * Save changes
+	 */
 	public void save(){
 		 int i=0;
 		 for (MPrintFormatItem item : m_pfi){
@@ -148,6 +165,10 @@ public class WRC1DisplayFieldsPanel extends WRCTabPanel implements EventListener
 		 }
 	}
 	
+	/**
+	 * Get selected print format items
+	 * @return [AD_PrintFormatItem_ID, Name]
+	 */
 	public KeyNamePair[] getChecked(){
 		KeyNamePair [] listcheck=new KeyNamePair[m_pfi.size()];
 		for(int i=0;i<m_chkboxes.length;i++){
@@ -182,6 +203,10 @@ public class WRC1DisplayFieldsPanel extends WRCTabPanel implements EventListener
 		}
 	}
 	
+	/**
+	 * Update IsPrinted with value
+	 * @param value
+	 */
 	public void updatePrinted(boolean value){
 		for(int j=0 ; j< m_pfi.size() ; j++){
 			m_pfi.get(j).setIsPrinted(value);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC2FieldOrderPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC2FieldOrderPanel.java
index d3e3704446..56ddac9820 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC2FieldOrderPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC2FieldOrderPanel.java
@@ -41,27 +41,32 @@ import org.zkoss.zk.ui.util.Clients;
 import org.zkoss.zul.Hlayout;
 import org.zkoss.zul.Vbox;
 
-
+/**
+ * Panel to edit order of printed print format items
+ */
 public class WRC2FieldOrderPanel extends WRCTabPanel implements EventListener<Event> {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -7732332384947376101L;
 
-	/**
-	 * 
-	 */
 	private Button bUp = new Button();
 	private Button bDown = new Button();
 	
 	private ArrayList<MPrintFormatItem> listColumns=new ArrayList<MPrintFormatItem>();
-	SimpleListModel sortModel;
+	protected SimpleListModel sortModel;
 	private Listbox sortList;
 	
+	/**
+	 * default constructor
+	 */
 	public WRC2FieldOrderPanel() {
 		super();	
 	}
 
+	/**
+	 * Populate {@link #listColumns} with printed MPrintFormatItem
+	 */
 	public void setListColumns() {
 		listColumns = new ArrayList<MPrintFormatItem>();
 		for (MPrintFormatItem item : m_pfi)
@@ -69,9 +74,11 @@ public class WRC2FieldOrderPanel extends WRCTabPanel implements EventListener<Ev
 		       listColumns.add(item);
 	}
 	
+	/**
+	 * Layout panel
+	 */
 	public void init()
 	{
-
 		Hlayout hlayout = new Hlayout();
 		ZKUpdateUtil.setVflex(hlayout, "true");
 		ZKUpdateUtil.setHflex(hlayout, "true");
@@ -163,10 +170,10 @@ public class WRC2FieldOrderPanel extends WRCTabPanel implements EventListener<Ev
 	}
 	
 	/**
-	 * 	Move within Yes List with Drag Event and Multiple Choice
+	 * 	Move selected items within Yes List
 	 *	@param event event
 	 */
-	void migrateValueWithinYesList (int endIndex, List<ListElement> selObjects)
+	protected void migrateValueWithinYesList (int endIndex, List<ListElement> selObjects)
 	{
 		int iniIndex =0;
 		Arrays.sort(selObjects.toArray());	
@@ -227,10 +234,10 @@ public class WRC2FieldOrderPanel extends WRCTabPanel implements EventListener<Ev
 	}
 	
 	/**
-	 * 	Move within Yes List
+	 * 	Move selected items within Yes List
 	 *	@param event event
 	 */
-	void migrateValueWithinSortList (Event event)
+	protected void migrateValueWithinSortList (Event event)
 	{
 		Object[] selObjects = sortList.getSelectedItems().toArray();
 		if (selObjects == null)
@@ -304,7 +311,7 @@ public class WRC2FieldOrderPanel extends WRCTabPanel implements EventListener<Ev
 	 */
 	public static class ListElement extends NamePair {
 		/**
-		 *
+		 * generated serial id
 		 */
 		private static final long serialVersionUID = -5645910649588308798L;
 		private int		m_key;
@@ -313,7 +320,13 @@ public class WRC2FieldOrderPanel extends WRCTabPanel implements EventListener<Ev
 		/** Initial seq number */
 		private int		m_sortNo;
 		
-
+		/**
+		 * @param key
+		 * @param name
+		 * @param sortNo
+		 * @param AD_Client_ID
+		 * @param AD_Org_ID
+		 */
 		public ListElement(int key, String name, int sortNo, int AD_Client_ID, int AD_Org_ID) {
 			super(name);
 			this.m_key = key;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC3SortCriteriaPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC3SortCriteriaPanel.java
index 3c1faed8ea..ef9791a3d9 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC3SortCriteriaPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC3SortCriteriaPanel.java
@@ -51,10 +51,13 @@ import org.zkoss.zul.Menuitem;
 import org.zkoss.zul.Menupopup;
 import org.zkoss.zul.Vbox;
 
+/**
+ * Panel to edit sorting of print format
+ */
 public class WRC3SortCriteriaPanel extends WRCTabPanel implements  EventListener<Event>
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 6470498382547293013L;
 	//	UI variables
@@ -65,18 +68,26 @@ public class WRC3SortCriteriaPanel extends WRCTabPanel implements  EventListener
 	private Button bUp = new Button();
 	private Button bDown = new Button();
 	//
-	SimpleListModel noModel = new SimpleListModel();
-	SimpleListModel yesModel = new SimpleListModel();
-	Listbox noList = new Listbox();
-	Listbox yesList = new Listbox();
-	ArrayList<MPrintFormatItem> yesItems =new ArrayList<MPrintFormatItem>();
-	ArrayList<MPrintFormatItem> noItems =new ArrayList<MPrintFormatItem>();
+	protected SimpleListModel noModel = new SimpleListModel();
+	protected SimpleListModel yesModel = new SimpleListModel();
+	protected Listbox noList = new Listbox();
+	protected Listbox yesList = new Listbox();
+	/** List of print format items selected for ordering */
+	protected ArrayList<MPrintFormatItem> yesItems =new ArrayList<MPrintFormatItem>();
+	/** List of print format items not selected for ordering */
+	protected ArrayList<MPrintFormatItem> noItems =new ArrayList<MPrintFormatItem>();
 	private final String asc_desc = "asc_desc";
 
+	/**
+	 * default constructor
+	 */
 	public WRC3SortCriteriaPanel() {
 		super();
 	}
 
+	/**
+	 * Layout panel
+	 */
 	public void init()
 	{
 		//
@@ -210,6 +221,9 @@ public class WRC3SortCriteriaPanel extends WRCTabPanel implements  EventListener
 		}
 	}
 	
+	/**
+	 * Populate {@link #yesItems} and {@link #noItems} from print format items
+	 */
 	public void setListsColumns() {
 		yesItems =new ArrayList<MPrintFormatItem>();
 		noItems =new ArrayList<MPrintFormatItem>();
@@ -261,17 +275,23 @@ public class WRC3SortCriteriaPanel extends WRCTabPanel implements  EventListener
 		}
 	}
 
-	String getName(MPrintFormatItem pfi) {
+	protected String getName(MPrintFormatItem pfi) {
 		StringBuilder name = new StringBuilder(Util.isEmpty(pfi.getPrintName()) ? pfi.getName() : pfi.getPrintName())
 		.append(" (").append(pfi.isDesc() ? getOrderByDesc() : getOrderByAsc()).append(")");
 		return name.toString();
 	}
 
-	String getOrderByAsc() {
+	/**
+	 * @return translated text for ascending
+	 */
+	protected String getOrderByAsc() {
 		return MRefList.getListName(Env.getCtx(), REFERENCE_SQLORDERBY, "A");
 	}
 
-	String getOrderByDesc() {
+	/**
+	 * @return translated text for descending
+	 */
+	protected String getOrderByDesc() {
 		return MRefList.getListName(Env.getCtx(), REFERENCE_SQLORDERBY, "D");
 	}
 
@@ -283,7 +303,7 @@ public class WRC3SortCriteriaPanel extends WRCTabPanel implements  EventListener
 	/**
 	 * @param event
 	 */
-	void migrateValueAcrossLists (Event event)
+	protected void migrateValueAcrossLists (Event event)
 	{
 		Object source = event.getTarget();
 		if (source instanceof ListItem) {
@@ -300,7 +320,13 @@ public class WRC3SortCriteriaPanel extends WRCTabPanel implements  EventListener
 		migrateLists (listFrom,listTo,endIndex);
 	}	//	migrateValueAcrossLists
 	
-	void migrateLists (Listbox listFrom , Listbox listTo , int endIndex)
+	/**
+	 * Move selected items from listFrom to listTo
+	 * @param listFrom
+	 * @param listTo
+	 * @param endIndex
+	 */
+	protected void migrateLists (Listbox listFrom , Listbox listTo , int endIndex)
 	{
 		int index = 0; 
 		SimpleListModel lmFrom = (listFrom == yesList) ? yesModel:noModel;
@@ -362,10 +388,10 @@ public class WRC3SortCriteriaPanel extends WRCTabPanel implements  EventListener
 	}
 	
 	/**
-	 * 	Move within Yes List with Drag Event and Multiple Choice
+	 * 	Move selected items within Yes List
 	 *	@param event event
 	 */
-	void migrateValueWithinYesList (int endIndex, List<ListElement> selObjects)
+	protected void migrateValueWithinYesList (int endIndex, List<ListElement> selObjects)
 	{
 		int iniIndex =0;
 		Arrays.sort(selObjects.toArray());	
@@ -391,7 +417,7 @@ public class WRC3SortCriteriaPanel extends WRCTabPanel implements  EventListener
 	}
 	
 	/**
-	 * 	Move within Yes List
+	 * 	Move selected items within Yes List
 	 *	@param event event
 	 */
 	private void migrateValueWithinYesList (Event event)
@@ -481,10 +507,10 @@ public class WRC3SortCriteriaPanel extends WRCTabPanel implements  EventListener
 			}
 		}
 	}	//	migrateValueWithinYesList
-	
-	
+		
    /**	
-	*	@param int selIndexPI,int targetIndexPI
+	* @param selIndexPI
+	* @param targetIndexPI
 	*/
 	private void updateSortNo(int selIndexPI,int targetIndexPI)
 	{
@@ -498,7 +524,7 @@ public class WRC3SortCriteriaPanel extends WRCTabPanel implements  EventListener
 	 */
 	public static class ListElement extends NamePair {
 		/**
-		 *
+		 * generated serial id
 		 */
 		private static final long serialVersionUID = -5645910649588308798L;
 		private int		m_key;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC4GroupingCriteriaPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC4GroupingCriteriaPanel.java
index 09fd2b933f..c8498eec27 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC4GroupingCriteriaPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC4GroupingCriteriaPanel.java
@@ -30,23 +30,32 @@ import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 
-
+/**
+ * Panel to edit grouping of print format
+ */
 public class WRC4GroupingCriteriaPanel extends WRCTabPanel implements EventListener<Event> {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -3142169077710161360L;
 
 	private static final int RENDER_IN_COLUMNS=2;
-	Checkbox m_chkboxes[]=null;
-	String m_oldLabel[]=null;
-	ArrayList<MPrintFormatItem> orderfield=new ArrayList<MPrintFormatItem>();
-	Grid grid = new Grid();
+	protected Checkbox m_chkboxes[]=null;
+	protected String m_oldLabel[]=null;
+	/** print format items with IsOrderBy=Y */
+	protected ArrayList<MPrintFormatItem> orderfield=new ArrayList<MPrintFormatItem>();
+	protected Grid grid = new Grid();
 	
+	/**
+	 * Default constructor
+	 */
 	public WRC4GroupingCriteriaPanel() {
 		super();
 	}
 
+	/**
+	 * Add order by print format items to {@link #orderfield}
+	 */
 	@Override
 	public void refresh() {
 		orderfield = new ArrayList<MPrintFormatItem>();
@@ -58,6 +67,9 @@ public class WRC4GroupingCriteriaPanel extends WRCTabPanel implements EventListe
 		dynamicInit();
 	}
 
+	/**
+	 * Update IsGroupBy of print format items
+	 */
 	@Override
 	public void updatePFI() {
 		for(int i=0 ; i<orderfield.size() ; i++){
@@ -73,6 +85,9 @@ public class WRC4GroupingCriteriaPanel extends WRCTabPanel implements EventListe
 		}
 	}
 	
+	/**
+	 * Layout panel
+	 */
 	public void init(){
 		
 		Window wind=new Window();
@@ -105,6 +120,9 @@ public class WRC4GroupingCriteriaPanel extends WRCTabPanel implements EventListe
 		wind.appendChild(grid);
 	}
 	
+	/**
+	 * Add {@link #orderfield} to {@link #grid}
+	 */
 	public void dynamicInit()
 	{
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC5SummaryFieldsPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC5SummaryFieldsPanel.java
index e4942434ef..869dd07a06 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC5SummaryFieldsPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC5SummaryFieldsPanel.java
@@ -35,27 +35,37 @@ import org.zkoss.zul.Center;
 import org.zkoss.zul.Div;
 import org.zkoss.zul.Row;
 
+/**
+ * Panel to edit summary related properties of print format items (IsSummary, IsCounted, IsAveraged, etc)
+ */
 public class WRC5SummaryFieldsPanel extends WRCTabPanel implements EventListener<Event> {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 4660623126634851224L;
 
 	private static final int RENDER_IN_COLUMNS=10;
-	Checkbox m_chkSum[]=null;
-	Checkbox m_chkCount[]=null;
-	Checkbox m_chkMin[]=null;
-	Checkbox m_chkMax[]=null;
-	Checkbox m_chkMean[]=null;
-	Checkbox m_chkVariance[]=null;
-	Checkbox m_chkDesviation[]=null;
-	private ArrayList<MPrintFormatItem> DisplayItems=new ArrayList<MPrintFormatItem>();
-	Grid grid = new Grid();
+	protected Checkbox m_chkSum[]=null;
+	protected Checkbox m_chkCount[]=null;
+	protected Checkbox m_chkMin[]=null;
+	protected Checkbox m_chkMax[]=null;
+	protected Checkbox m_chkMean[]=null;
+	protected Checkbox m_chkVariance[]=null;
+	protected Checkbox m_chkDeviation[]=null;
+	/** printed print format items */
+	private ArrayList<MPrintFormatItem> displayItems=new ArrayList<MPrintFormatItem>();
+	protected Grid grid = new Grid();
 
+	/**
+	 * default constructor
+	 */
 	public WRC5SummaryFieldsPanel() {
 		super();		
 	}
 	
+	/**
+	 * Layout panel
+	 */
 	public void init(){
 		Window wind=new Window();
 		ZKUpdateUtil.setWidth(wind, "90%");
@@ -94,26 +104,29 @@ public class WRC5SummaryFieldsPanel extends WRCTabPanel implements EventListener
 
 	@Override
 	public void refresh() {
-		DisplayItems = new ArrayList<MPrintFormatItem>();
+		displayItems = new ArrayList<MPrintFormatItem>();
 		for(int i=0 ; i<m_pfi.size() ; i ++){
 			if(m_pfi.get(i) != null && m_pfi.get(i).isPrinted()){
-				DisplayItems.add(m_pfi.get(i));
+				displayItems.add(m_pfi.get(i));
 			}
 		}
 		dynamicInit();
 	}
 
+	/**
+	 * Update print format items
+	 */
 	@Override
 	public void updatePFI() {
-		for(int i=0 ;i<DisplayItems.size() ; i++){
-			int j = m_pfi.indexOf(getPrintFormatItem(DisplayItems.get(i).get_ID()));
+		for(int i=0 ;i<displayItems.size() ; i++){
+			int j = m_pfi.indexOf(getPrintFormatItem(displayItems.get(i).get_ID()));
 			m_pfi.get(j).setIsSummarized(m_chkSum[i].isChecked());
 			m_pfi.get(j).setIsCounted(m_chkCount[i].isChecked());
 			m_pfi.get(j).setIsMinCalc(m_chkMin[i].isChecked());
 			m_pfi.get(j).setIsMaxCalc(m_chkMax[i].isChecked());
 			m_pfi.get(j).setIsAveraged(m_chkMean[i].isChecked());
 			m_pfi.get(j).setIsVarianceCalc(m_chkVariance[i].isChecked());
-			m_pfi.get(j).setIsDeviationCalc(m_chkDesviation[i].isChecked());
+			m_pfi.get(j).setIsDeviationCalc(m_chkDeviation[i].isChecked());
 		}
 	}
 
@@ -150,50 +163,50 @@ public class WRC5SummaryFieldsPanel extends WRCTabPanel implements EventListener
 
 		rows.appendChild(row);
 		
-		m_chkSum =new Checkbox[DisplayItems.size()];
-		m_chkCount=new Checkbox[DisplayItems.size()];
-		m_chkMin=new Checkbox[DisplayItems.size()];
-		m_chkMax=new Checkbox[DisplayItems.size()];
-		m_chkMean=new Checkbox[DisplayItems.size()];
-		m_chkVariance=new Checkbox[DisplayItems.size()];
-		m_chkDesviation=new Checkbox[DisplayItems.size()];
+		m_chkSum =new Checkbox[displayItems.size()];
+		m_chkCount=new Checkbox[displayItems.size()];
+		m_chkMin=new Checkbox[displayItems.size()];
+		m_chkMax=new Checkbox[displayItems.size()];
+		m_chkMean=new Checkbox[displayItems.size()];
+		m_chkVariance=new Checkbox[displayItems.size()];
+		m_chkDeviation=new Checkbox[displayItems.size()];
 		
-		for(int i=0 ;i<DisplayItems.size(); i++){
+		for(int i=0 ;i<displayItems.size(); i++){
 			row=new Row();
-			String strValue = DisplayItems.get(i).getPrintName(Language.getLoginLanguage());
+			String strValue = displayItems.get(i).getPrintName(Language.getLoginLanguage());
 			if(strValue ==null || strValue.length()==0){
-				strValue = DisplayItems.get(i).getName();
+				strValue = displayItems.get(i).getName();
 			}
 			Label field=new Label(strValue);
 			row.appendChild(field);
 			m_chkSum[i]=new Checkbox();
-			m_chkSum[i].setChecked(DisplayItems.get(i).isSummarized());
+			m_chkSum[i].setChecked(displayItems.get(i).isSummarized());
 			m_chkSum[i].addEventListener(Events.ON_CHECK, this);
 			row.appendChild(m_chkSum[i]);
 			m_chkCount[i]=new Checkbox();
-			m_chkCount[i].setChecked(DisplayItems.get(i).isCounted());
+			m_chkCount[i].setChecked(displayItems.get(i).isCounted());
 			m_chkCount[i].addEventListener(Events.ON_CHECK, this);
 			row.appendChild(m_chkCount[i]);
 			m_chkMin[i]=new Checkbox();
-			m_chkMin[i].setChecked(DisplayItems.get(i).isMinCalc());
+			m_chkMin[i].setChecked(displayItems.get(i).isMinCalc());
 			m_chkMin[i].addEventListener(Events.ON_CHECK, this);
 			row.appendChild(m_chkMin[i]);
 			m_chkMax[i]=new Checkbox();
-			m_chkMax[i].setChecked(DisplayItems.get(i).isMaxCalc());
+			m_chkMax[i].setChecked(displayItems.get(i).isMaxCalc());
 			m_chkMax[i].addEventListener(Events.ON_CHECK, this);
 			row.appendChild(m_chkMax[i]);
 			m_chkMean[i]=new Checkbox();
-			m_chkMean[i].setChecked(DisplayItems.get(i).isAveraged());
+			m_chkMean[i].setChecked(displayItems.get(i).isAveraged());
 			m_chkMean[i].addEventListener(Events.ON_CHECK, this);
 			row.appendChild(m_chkMean[i]);
 			m_chkVariance[i]=new Checkbox();
-			m_chkVariance[i].setChecked(DisplayItems.get(i).isVarianceCalc());
+			m_chkVariance[i].setChecked(displayItems.get(i).isVarianceCalc());
 			m_chkVariance[i].addEventListener(Events.ON_CHECK, this);
 			row.appendChild(m_chkVariance[i]);
-			m_chkDesviation[i]=new Checkbox();
-			m_chkDesviation[i].setChecked(DisplayItems.get(i).isDeviationCalc());
-			m_chkDesviation[i].addEventListener(Events.ON_CHECK, this);
-			row.appendChild(m_chkDesviation[i]);
+			m_chkDeviation[i]=new Checkbox();
+			m_chkDeviation[i].setChecked(displayItems.get(i).isDeviationCalc());
+			m_chkDeviation[i].addEventListener(Events.ON_CHECK, this);
+			row.appendChild(m_chkDeviation[i]);
 			rows.appendChild(row);
 		}
 		grid.appendChild(rows);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRCTabPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRCTabPanel.java
index 824e650590..99cc525c06 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRCTabPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRCTabPanel.java
@@ -23,21 +23,35 @@ import org.adempiere.webui.component.Tabpanel;
 import org.compiere.print.MPrintFormat;
 import org.compiere.print.MPrintFormatItem;
 
+/**
+ * Abstract base class to create tab panel to edit properties of print format items
+ */
 public abstract class WRCTabPanel extends Tabpanel {
 	/**
-	 * 
+	 * generated serial items
 	 */
 	private static final long serialVersionUID = -6858669581232541371L;
 
-	public ArrayList<MPrintFormatItem> m_pfi;	
-	public MPrintFormat m_pf;
-	public WReportCustomization wc;
-	public Map<Integer, MPrintFormatItem> mapPFormatItem = new HashMap<Integer, MPrintFormatItem>();
+	protected ArrayList<MPrintFormatItem> m_pfi;	
+	protected MPrintFormat m_pf;
+	/** Customization window that own this tab panel */
+	protected WReportCustomization wc;
+	/** AD_PrintFormatItem_ID:MPrintFormatItem */
+	protected Map<Integer, MPrintFormatItem> mapPFormatItem = new HashMap<Integer, MPrintFormatItem>();
 	
+	/**
+	 * Refresh UI from loaded print format items
+	 */
 	public abstract void refresh();
 	
+	/**
+	 * Update print format items
+	 */
 	public abstract void updatePFI();
 	
+	/**
+	 * @param pf
+	 */
 	public void setMPrintFormat(MPrintFormat pf) {
 		m_pf=pf;
 	    for (MPrintFormatItem item : m_pf.getAllItems() ){
@@ -45,14 +59,24 @@ public abstract class WRCTabPanel extends Tabpanel {
 	    }
 	}
 	
+	/**
+	 * @param pfis
+	 */
 	public void setPrintFormatItems(ArrayList<MPrintFormatItem> pfis) {
 		m_pfi = pfis;
 	}
 	
+	/**
+	 * @param parent
+	 */
 	public void setWReportCustomization(WReportCustomization parent){
 		wc=parent;
 	}
 	
+	/**
+	 * @param AD_PrintFormatItem_ID
+	 * @return MPrintFormatItem
+	 */
 	public MPrintFormatItem getPrintFormatItem(int AD_PrintFormatItem_ID) {
 		return 	mapPFormatItem.get(AD_PrintFormatItem_ID);
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WSchedule.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WSchedule.java
index a7ba3f43f5..169a010a00 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WSchedule.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WSchedule.java
@@ -57,8 +57,7 @@ import org.zkoss.zul.North;
 import org.zkoss.zul.South;
 
 /**
- *	Visual and Control Part of Schedule.
- *  Contains Time and Schedule Panels
+ *	Window to view and manage scheduling of resources (S_Resource and S_ResourceAssignment)
  *
  * 	@author 	Jorg Janke
  * 	@version 	$Id: VSchedule.java,v 1.3 2006/07/30 00:51:27 jjanke Exp $
@@ -69,7 +68,7 @@ import org.zkoss.zul.South;
 public class WSchedule extends Window implements EventListener<Event>
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -4819513326165148245L;
 	private static final String ON_MOBILE_SET_SELECTED_TAB_ECHO = "onMobileSetSelectedTabEcho";
@@ -131,10 +130,10 @@ public class WSchedule extends Window implements EventListener<Event>
 	private Component btnRefresh;
 	
 	/**
-	 * 	Static init
+	 * 	Layout window
 	 *  <pre>
-	 * 	timePanel (West)
-	 *  schedlePanel (in schedulePane - Center)
+	 *  timePanel (West)
+	 *  schedulePanel (in schedulePane - Center)
 	 *  </pre>
 	 * 	@throws Exception
 	 */
@@ -242,6 +241,9 @@ public class WSchedule extends Window implements EventListener<Event>
 		Events.echoEvent("onAfterReCreate", this, null);
 	}	//	recreate
 
+	/**
+	 * Update calendar model ({@link #scm})
+	 */
 	private void updateModel() {
 		ScheduleUtil m_model = new ScheduleUtil (Env.getCtx());
 		
@@ -281,10 +283,14 @@ public class WSchedule extends Window implements EventListener<Event>
 		calendars.setModel(scm);
 	}
 	
+	/**
+	 * @return SimpleCalendarModel
+	 */
 	public SimpleCalendarModel getModel() {
 		return scm;
 	}
 	
+	@Override
 	public void onEvent(Event event) throws Exception {
 		String type = event.getName();
 		if (type.equals(Events.ON_CLICK)) {
@@ -312,12 +318,18 @@ public class WSchedule extends Window implements EventListener<Event>
 		}
 	}
 	
+	/**
+	 * Select current day
+	 */
 	private void btnCurrentDateClicked() {
 		calendars.setCurrentDate(Calendar.getInstance(calendars.getDefaultTimeZone()).getTime());
 		updateDateLabel();
 		updateModel();
 	}
 	
+	/**
+	 * Update label after calendar selection change
+	 */
 	private void updateDateLabel() {
 		Date b = calendars.getBeginDate();
 		Date e = calendars.getEndDate();
@@ -326,6 +338,10 @@ public class WSchedule extends Window implements EventListener<Event>
 		lblDate.setValue(sdfV.format(b) + " - " + sdfV.format(e));
 	}
 	
+	/**
+	 * Move to next/previous calendar page
+	 * @param isNext
+	 */
 	private void divArrowClicked(boolean isNext) {
 		if (isNext)
 			calendars.nextPage();
@@ -335,6 +351,10 @@ public class WSchedule extends Window implements EventListener<Event>
 		updateModel();
 	}
 	
+	/**
+	 * select different calendar tab/presentation
+	 * @param days
+	 */
 	private void divTabClicked(int days) {		
 		if (days > 0) {
 			calendars.setMold("default");
@@ -346,6 +366,10 @@ public class WSchedule extends Window implements EventListener<Event>
 		updateModel();
 	}
 
+	/**
+	 * Add pane to north of {@link #borderlayout}
+	 * @param pane
+	 */
 	public void addNorthPane(Component pane) {
 		if (borderlayout != null) {
 			if (borderlayout.getNorth() != null) {
@@ -357,6 +381,11 @@ public class WSchedule extends Window implements EventListener<Event>
 		}
 	}
 	
+	/**
+	 * Add pane to south of {@link #borderlayout}
+	 * @param pane
+	 * @param height
+	 */
 	public void addSouthPane(Component pane, String height) {
 		if (borderlayout != null) {
 			if (borderlayout.getSouth() != null) {
@@ -371,6 +400,9 @@ public class WSchedule extends Window implements EventListener<Event>
 		}
 	}
 	
+	/**
+	 * Remove {@link #btnRefresh}
+	 */
 	public void removeRefreshButton() {
 		if (btnRefresh != null) {
 			btnRefresh.detach();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WTabEditorForm.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WTabEditorForm.java
index f608433eef..7e2e5c9fa2 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WTabEditorForm.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WTabEditorForm.java
@@ -16,14 +16,18 @@ package org.adempiere.webui.panel;
 
 import org.adempiere.webui.apps.form.WTabEditor;
 
+/**
+ * Form to visually layout AD_Tab
+ */
 @org.idempiere.ui.zk.annotation.Form
 public class WTabEditorForm extends ADForm
 {
 	/**
-	 *
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -2533099650671242190L;
 
+	/** Controller */
 	private WTabEditor te;
 
 	public WTabEditorForm(WTabEditor wTabEditor) {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/CSVImportAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/CSVImportAction.java
index a854137e94..85517c49cc 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/CSVImportAction.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/CSVImportAction.java
@@ -76,7 +76,7 @@ import org.zkoss.zul.Vbox;
 import org.zkoss.zul.Vlayout;
 
 /**
- *
+ * Action to import data from csv file to GridTab
  * @author Carlos Ruiz
  *
  */
@@ -85,6 +85,7 @@ public class CSVImportAction implements EventListener<Event>
 
 	private AbstractADWindowContent panel;
 
+	/** GridTab Importer for csv file */
 	IGridTabImporter theCSVImporter = null;
 	MImportTemplate theTemplate = null;
 
@@ -106,7 +107,7 @@ public class CSVImportAction implements EventListener<Event>
 	}
 
 	/**
-	 * execute import action
+	 * Execute import action.
 	 */
 	public void fileImport()
 	{
@@ -303,6 +304,9 @@ public class CSVImportAction implements EventListener<Event>
 		bFile.setLabel(media.getName());
 	}
 
+	/**
+	 * Import uploaded csv file
+	 */
 	private void importFile() {
 		try {
 			MQuery query = panel.getActiveGridTab().getQuery();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java
index 9448c69725..4c0e9865dc 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java
@@ -95,7 +95,7 @@ public class ExportAction implements EventListener<Event>
 	}
 
 	/**
-	 * execute export action
+	 * Execute export action
 	 */
 	public void export()
 	{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java
index 6eddad4e7b..bc19721487 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java
@@ -74,7 +74,7 @@ import org.zkoss.zul.Vbox;
 import org.zkoss.zul.Vlayout;
 
 /**
- *
+ * Action to import data from uploaded file to GridTab
  * @author Carlos Ruiz
  *
  */
@@ -82,7 +82,9 @@ public class FileImportAction implements EventListener<Event>
 {
 	private AbstractADWindowContent panel;
 
+	/** File Extension:IGridTabImporter */
 	private Map<String, IGridTabImporter> importerMap = null;
+	/** File Extension:Label */
 	private Map<String, String> extensionMap = null;
 
 	private Window winImportFile = null;
@@ -104,7 +106,7 @@ public class FileImportAction implements EventListener<Event>
 	}
 
 	/**
-	 * execute import action
+	 * Execute import action
 	 */
 	public void fileImport()
 	{
@@ -288,6 +290,9 @@ public class FileImportAction implements EventListener<Event>
 		bFile.setLabel(media.getName());
 	}
 	
+	/**
+	 * Import uploaded file
+	 */
 	private void importFile() {
 		try {
 			ListItem li = cboType.getSelectedItem();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
index 872b2527ff..7728bafc04 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
@@ -67,6 +67,7 @@ import org.zkoss.zul.Tabpanel;
 import org.zkoss.zul.impl.LabelImageElement;
 
 /**
+ * Action for Report toolbar button
  * @author Elaine
  * @date September 6, 2012
  */
@@ -86,12 +87,18 @@ public class ReportAction implements EventListener<Event>
 	
 	private List<KeyNamePair>	printFormatList = new ArrayList<KeyNamePair>();
 
+	/**
+	 * @param panel
+	 */
 	public ReportAction(AbstractADWindowContent panel)
 	{
 		this.panel = panel;		
 		getPrintFormats(panel.getActiveGridTab().getAD_Table_ID(), panel.getActiveGridTab().getAD_Window_ID());
 	}
 	
+	/**
+	 * Show report (print format) selection popup
+	 */
 	public void show() 
 	{
 		int AD_Table_ID=panel.getActiveGridTab().getAD_Table_ID();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/AbstractUIPart.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/AbstractUIPart.java
index 9ddd5ccd8e..f4278e3c87 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/AbstractUIPart.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/AbstractUIPart.java
@@ -23,7 +23,7 @@ import org.zkoss.zk.ui.Page;
 import org.zkoss.zul.Borderlayout;
 
 /**
- * 
+ * Abstract base class for UI block controller
  * @author Low Heng Sin
  *
  */
@@ -33,6 +33,10 @@ public abstract class AbstractUIPart implements UIPart, ISupportMask {
 	
 	protected ShowMaskWrapper showMaskWrapper = new ShowMaskWrapper(this);
 	
+	/**
+	 * Create UI block hosted by parent
+	 * @param parent Component or Page
+	 */
 	public Component createPart(Object parent) {
 		if (parent == null)
 			throw new IllegalArgumentException("Null parent.");
@@ -50,6 +54,11 @@ public abstract class AbstractUIPart implements UIPart, ISupportMask {
 		return doCreatePart(component);
 	}
 	
+	/**
+	 * Sub class override this to create root UI block or child UI block
+	 * @param parent parent Component or null for root UI block
+	 * @return Component
+	 */
 	protected abstract Component doCreatePart(Component parent);
 
 	/**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/ITabOnSelectHandler.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/ITabOnSelectHandler.java
index a2ab4770f9..edcc4f11d7 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/ITabOnSelectHandler.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/ITabOnSelectHandler.java
@@ -14,7 +14,7 @@
 package org.adempiere.webui.part;
 
 /**
- * 
+ * Interface to handle onSelect event for tab
  * @author hengsin
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/MultiTabPart.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/MultiTabPart.java
index 740a73399d..db7366f336 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/MultiTabPart.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/MultiTabPart.java
@@ -21,7 +21,7 @@ import org.adempiere.webui.component.Tabs;
 import org.zkoss.zk.ui.Component;
 
 /**
- * 
+ * Tabbox based UI block 
  * @author Low Heng Sin
  *
  */
@@ -33,10 +33,10 @@ public class MultiTabPart extends AbstractUIPart
     {
     }
     
+    @Override
     protected Component doCreatePart(Component parent)
     {
         tabbox = new Tabbox();
-//        tabbox.setSclass("lite");
         
         Tabpanels tabpanels = new Tabpanels();
         Tabs tabs = new Tabs();
@@ -52,11 +52,24 @@ public class MultiTabPart extends AbstractUIPart
         return tabbox;
     }
 
+    /**
+     * Add comp as new tab
+     * @param comp
+     * @param title
+     * @param closeable
+     */
     public void addTab(Component comp, String title, boolean closeable)
     {
         addTab(comp, title, closeable, true);
     }
 
+    /**
+     * Add comp as new tab
+     * @param comp
+     * @param title
+     * @param closeable
+     * @param enable
+     */
     public void addTab(Component comp, String title, boolean closeable, boolean enable)
     {
         Tab tab = new Tab();
@@ -78,16 +91,26 @@ public class MultiTabPart extends AbstractUIPart
         	setSelectedTab(tab);        
     }
 
+    /**
+     * Set selected tab
+     * @param tab
+     */
     public void setSelectedTab(Tab tab)
     {
     	tabbox.setSelectedTab(tab);
     }
 
+    /**
+     * Close selected tab
+     */
     public void removeTab()
     {
     	tabbox.getSelectedTab().onClose();
     }
 
+    /**
+     * @return Tabbox 
+     */
 	public Tabbox getComponent() {
 		return tabbox;
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/UIPart.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/UIPart.java
index f8ce67782e..595d45b75d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/UIPart.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/UIPart.java
@@ -15,14 +15,22 @@ package org.adempiere.webui.part;
 import org.zkoss.zk.ui.Component;
 
 /**
- * 
+ * Interface for UI block
  * @author Low Heng Sin
  *
  */
 public interface UIPart {
 	
+	/**
+	 * Create child or root UI block
+	 * @param parent
+	 * @return Component
+	 */
 	public Component createPart(Object parent);
 	
+	/**
+	 * @return Component
+	 */
 	public Component getComponent();
 	
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java
index bd46e3d801..f7f6859b78 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java
@@ -51,7 +51,7 @@ import org.zkoss.zul.Menuitem;
 import org.zkoss.zul.Style;
 
 /**
- * Controller for open desktop windows. <br/>
+ * Controller for multiple desktop windows. <br/>
  * Implemented using {@link Tabbox}. 
  * @author Low Heng Sin
  */
@@ -86,7 +86,6 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
     }
     
     /**
-     * 
      * @param tb
      * @return WindowContainer
      */
@@ -98,6 +97,7 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
     	return wc;
     }
 
+    @Override
     protected Component doCreatePart(Component parent)
     {
     	if (isDesktopAutoShrinkTabTitle())
@@ -243,6 +243,10 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
         return tabbox;
     }
     
+    /**
+     * Handle ON_CTRL_KEY event
+     * @param e
+     */
     private void onCtrlKey(KeyEvent e) {
     	//alt+w
 		if (e.isAltKey() && !e.isCtrlKey() && !e.isShiftKey()) {
@@ -253,26 +257,44 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
 		}
 	}
 
+    /**
+     * @return true if home button should be visible
+     */
 	private boolean isShowHomeButton() {
 		return isMobile() || isDesktopShowHomeButton();
 	}
 
+	/**
+	 * @return true to show home button for desktop browser
+	 */
 	private boolean isDesktopShowHomeButton() {
 		return MSysConfig.getBooleanValue(MSysConfig.ZK_DESKTOP_SHOW_HOME_BUTTON, true, Env.getAD_Client_ID(Env.getCtx()));
 	}
 
+	/**
+	 * @return true to show tabs drop down list
+	 */
 	private boolean isShowTabList() {
 		return isMobile() || isDesktopAutoShrinkTabTitle() || isDesktopShowTabList();
 	}
 
+	/**
+	 * @return true to show tabs drop down list for desktop browser
+	 */
 	private boolean isDesktopShowTabList() {
 		return MSysConfig.getBooleanValue(MSysConfig.ZK_DESKTOP_SHOW_TAB_LIST_BUTTON, true, Env.getAD_Client_ID(Env.getCtx()));
 	}
 
+	/**
+	 * @return true to auto shrink title of tab to fit in more tabs without scrolling
+	 */
 	private boolean isDesktopAutoShrinkTabTitle() {
 		return MSysConfig.getBooleanValue(MSysConfig.ZK_DESKTOP_TAB_AUTO_SHRINK_TO_FIT, false, Env.getAD_Client_ID(Env.getCtx()));
 	}
 
+	/**
+	 * Show tabs drop down list
+	 */
 	private void showTabList() {
 		org.zkoss.zul.Tabs tabs = tabbox.getTabs();
 		List<Component> list = tabs.getChildren();
@@ -304,6 +326,7 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
      * @param closeable
      * @return
      */
+	@Deprecated(forRemoval = true, since = "11")
     public Tab addWindow(Component comp, String title, boolean closeable){
     	return addWindow(comp, title, closeable, true, null);
     }
@@ -316,6 +339,7 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
      * @param enable
      * @return
      */
+	@Deprecated(forRemoval = true, since = "11")
     public Tab addWindow(Component comp, String title, boolean closeable, boolean enable) {
     	return addWindow(comp, title, closeable, true, null);
     }
@@ -329,6 +353,7 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
      * @param enable
      * @return
      */
+    @Deprecated(forRemoval = true, since = "11")
     public Tab insertBefore(Tab refTab, Component comp, String title, boolean closeable, boolean enable){
     	return insertBefore(refTab, comp, title, closeable, enable, null);
     }
@@ -342,14 +367,18 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
      * @param enable
      * @return
      */
+    @Deprecated(forRemoval = true,since = "11")
     public Tab insertAfter(Tab refTab, Component comp, String title, boolean closeable, boolean enable){
     	return insertAfter(refTab, comp, title, closeable, enable, null);
     }
+    
     /**
-     * 
+     * Add comp as new tab
      * @param comp
      * @param title
      * @param closeable
+     * @param decorateInfo
+     * @return new tab
      */
     public Tab addWindow(Component comp, String title, boolean closeable, DecorateInfo decorateInfo)
     {
@@ -357,11 +386,13 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
     }
     
     /**
-     * 
+     * Add comp as new tab
      * @param comp
      * @param title
      * @param closeable
      * @param enable
+     * @param decorateInfo
+     * @return new tab
      */
     public Tab addWindow(Component comp, String title, boolean closeable, boolean enable, DecorateInfo decorateInfo) 
     {
@@ -369,19 +400,21 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
     }
     
     /**
-     * 
+     * Insert comp as new tab before refTab
      * @param refTab
      * @param comp
      * @param title
      * @param closeable
      * @param enable
+     * @param decorateInfo
+     * @return new tab
      */
     public Tab insertBefore(Tab refTab, Component comp, String title, boolean closeable, boolean enable, DecorateInfo decorateInfo)
     {
         final Menupopup popupClose = new Menupopup();
         final Tab tab = new Tab() {
         	/**
-			 * 
+			 * generated serial id
 			 */
 			private static final long serialVersionUID = 2387473442130217806L;
 
@@ -551,6 +584,13 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
         return tab;
     }
 
+    /**
+     * Close tabs from start to end, set focus to focus index parameter.
+     * @param tab
+     * @param start
+     * @param end
+     * @param focus
+     */
     protected void closeTabs(Tab tab, int start, int end, int focus) {
     	List<Component> tabs = tabbox.getTabs().getChildren();
     	if (end == -1) {
@@ -564,6 +604,9 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
     	Events.postEvent(ON_AFTER_TAB_CLOSE, tabbox, null);
     }
 
+    /**
+     * Update label and visibility of tabs drop down list button.
+     */
 	private void updateTabListButton() {
 		if (isShowTabList() && tabListBtn != null) {
 			int cnt = tabbox.getTabs().getChildren().size()-1;
@@ -577,12 +620,17 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
 		}
 	}
 
+	/**
+	 * Set tab title by windowNo
+	 * @param title
+	 * @param windowNo
+	 */
 	public void setTabTitle(String title, int windowNo) {
 		setTabTitle(title, getTab(windowNo));
 	}
 
 	/**
-	 * IDEMPIERE-2333 / getTab - get the tab based on the windowNo
+	 * IDEMPIERE-2333 / getTab - get tab by windowNo
 	 * @param windowNo
 	 * @return org.zkoss.zul.Tab
 	 */
@@ -606,6 +654,11 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
 		return null;
 	}
 
+	/**
+	 * Set title of tab 
+	 * @param title
+	 * @param tab
+	 */
 	public void setTabTitle(String title, org.zkoss.zul.Tab tab) {
 		if (tab == null)
 			return;
@@ -622,17 +675,22 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
 		}
 	}
     
+	/**
+	 * @return max length of tab title
+	 */
     private int getMaxTitleLength() {
 		return MSysConfig.getIntValue(MSysConfig.ZK_DESKTOP_TAB_MAX_TITLE_LENGTH, DEFAULT_MAX_TITLE_LENGTH, Env.getAD_Client_ID(Env.getCtx()));
 	}
 
 	/**
-     * 
+     * Insert comp as new tab after refTab.
      * @param refTab
      * @param comp
      * @param title
      * @param closeable
      * @param enable
+     * @param decorateInfo
+     * @return new tab
      */
     public Tab insertAfter(Tab refTab, Component comp, String title, boolean closeable, boolean enable, DecorateInfo decorateInfo)
     {
@@ -643,11 +701,12 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
     }
 
     /**
-     * IDEMPIERE-5275 - Tabular Report Re-Run button/close parameter window
+     * IDEMPIERE-5275 - Tabular Report Re-Run button/close parameter window. <br/>
+     * Replace content of refTab with comp.
      * @param refTab 
      * @param comp
      * @param title
-     * @return
+     * @return org.zkoss.zul.Tab
      */
     public org.zkoss.zul.Tab replace(org.zkoss.zul.Tab refTab, Window comp, String title) {
     	 
@@ -680,8 +739,9 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
          }
         return refTab;
     }
+    
     /**
-     * 
+     * Set tab as selected tab.
      * @param tab
      */
     public void setSelectedTab(org.zkoss.zul.Tab tab)
@@ -691,6 +751,10 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
     	tabbox.setSelectedTab(tab); 
     }
 
+    /**
+     * Set tab to visible, other tabs to invisible.
+     * @param tab  new selected tab to be set as visible 
+     */
 	private void updateMobileTabState(org.zkoss.zul.Tab tab) {
 		if (isMobile() && tabListBtn != null)
     	{
@@ -708,12 +772,15 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
     	}
 	}
 
+	/**
+	 * @return true if browser client is visible
+	 */
     private boolean isMobile() {
 		return ClientInfo.isMobile();
 	}
 
 	/**
-     * 
+     * Close current active window (tab)
      * @return true if successfully close the active window
      */
     public boolean closeActiveWindow()
@@ -727,14 +794,13 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
     }
     
     /**
-     * 
+     * Get current selected tab
      * @return Tab
      */
     public Tab getSelectedTab() {
     	return (Tab) tabbox.getSelectedTab();
     }
     
-    // Elaine 2008/07/21
     /**
      * @param tabNo
      * @param title
@@ -753,7 +819,6 @@ public class WindowContainer extends AbstractUIPart implements EventListener<Eve
     		tab.setTooltiptext(tooltip);
     	}
     }
-    //
 
 	/**
 	 * @return Tabbox
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/AddAuthorizationProcess.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/AddAuthorizationProcess.java
index ae12def54f..0a3ece2cc4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/AddAuthorizationProcess.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/AddAuthorizationProcess.java
@@ -36,7 +36,7 @@ import org.compiere.model.SystemIDs;
 import org.zkoss.zk.ui.Desktop;
 
 /**
- *	IDEMPIERE-3101
+ *	IDEMPIERE-3101, process to add OAuth2 authorization
  * 	@author Carlos Ruiz - globalqss
  */
 @org.adempiere.base.annotation.Process
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/BankTransferParameterListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/BankTransferParameterListener.java
index 10bb31a5c0..e26c423d13 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/BankTransferParameterListener.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/BankTransferParameterListener.java
@@ -32,6 +32,9 @@ import org.compiere.util.Env;
 import org.compiere.util.Msg;
 import org.zkoss.zk.ui.WrongValueException;
 
+/**
+ * Parameter listener for bank transfer process
+ */
 public class BankTransferParameterListener implements IProcessParameterListener {
 
 	@Override
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/CacheReset.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/CacheReset.java
index ae3ec65028..a1a06b8c71 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/CacheReset.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/CacheReset.java
@@ -37,8 +37,8 @@ public class CacheReset extends SvrProcess
 
 
 	/**
-	 *  Perform process.
-	 *  @return Message to be translated
+	 *  Perform cache reset.
+	 *  @return message for number of cache entries evicted
 	 *  @throws Exception
 	 */
 	protected String doIt() throws java.lang.Exception
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/CreateTableParameterListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/CreateTableParameterListener.java
index de2823f526..c2a7e71a59 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/CreateTableParameterListener.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/CreateTableParameterListener.java
@@ -30,6 +30,9 @@ import org.adempiere.webui.apps.ProcessParameterPanel;
 import org.adempiere.webui.editor.WEditor;
 import org.idempiere.process.CreateTable;
 
+/**
+ * Parameter listener for create table process
+ */
 public class CreateTableParameterListener implements IProcessParameterListener {
 
 	@Override
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DefaultPrintShippingLabel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DefaultPrintShippingLabel.java
index 5a23fbfd3d..179c6437e0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DefaultPrintShippingLabel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DefaultPrintShippingLabel.java
@@ -33,11 +33,22 @@ import org.compiere.model.MShipperLabels;
  */
 public class DefaultPrintShippingLabel implements IPrintShippingLabel
 {
+	/**
+	 * @param attachment
+	 * @param labelType
+	 */
+	@Override
 	public String printToLabelPrinter(MAttachment attachment, MShipperLabels labelType) throws Exception
 	{
 		throw new UnsupportedOperationException();
 	}
 
+	/**
+	 * @param attachment
+	 * @param labelType
+	 * @param title
+	 */
+	@Override
 	public String printImageLabel(MAttachment attachment, MShipperLabels labelType, String title) throws Exception
 	{
 		MAttachmentEntry[] entries = attachment.getEntries();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DunningPrint.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DunningPrint.java
index e0560a20e0..9fa4f3dae3 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DunningPrint.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DunningPrint.java
@@ -104,14 +104,12 @@ public class DunningPrint extends SvrProcess
 		//	Need to have Template
 		if (p_EMailPDF && p_R_MailText_ID == 0)
 			throw new AdempiereUserError ("@NotFound@: @R_MailText_ID@");
-//		String subject = "";
 		MMailText mText = null;
 		if (p_EMailPDF)
 		{
 			mText = new MMailText (getCtx(), p_R_MailText_ID, get_TrxName());
 			if (p_EMailPDF && mText.get_ID() == 0)
 				throw new AdempiereUserError ("@NotFound@: @R_MailText_ID@ - " + p_R_MailText_ID);
-//			subject = mText.getMailHeader();
 		}
 		//
 		MDunningRun run = new MDunningRun (getCtx(), p_C_DunningRun_ID, get_TrxName());
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/GenerateModelParameterListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/GenerateModelParameterListener.java
index ebc798d82d..d4cd01a300 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/GenerateModelParameterListener.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/GenerateModelParameterListener.java
@@ -32,6 +32,9 @@ import org.compiere.model.MModelGeneratorTemplate;
 import org.compiere.util.Env;
 import org.compiere.util.Util;
 
+/**
+ * Parameter listener for generate model process
+ */
 public class GenerateModelParameterListener implements IProcessParameterListener {
 
 	private static final String[] parameters = {"Folder", "PackageName", "TableLike", "TableEntityType", "ColumnEntityType"};
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/KillAllSession.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/KillAllSession.java
index 4b0e2e0653..52c6e522a9 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/KillAllSession.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/KillAllSession.java
@@ -28,7 +28,7 @@ import org.idempiere.broadcast.BroadCastUtil;
 import org.idempiere.broadcast.BroadcastMsgUtil;
 
 /**
- * 
+ * Process to kill a session by Record_ID parameter (for AD_Session_ID)
  * @author Deepak Pansheriya
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/KillCurrentSession.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/KillCurrentSession.java
index 757ac90b6c..e26b941750 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/KillCurrentSession.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/KillCurrentSession.java
@@ -22,7 +22,7 @@ import org.idempiere.broadcast.BroadCastUtil;
 import org.idempiere.broadcast.BroadcastMsgUtil;
 
 /**
- * 
+ * Process to kill current session
  * @author Deepak Pansheriya
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/WProcessInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/WProcessInfo.java
index 1bda5882fd..a0fbe25319 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/WProcessInfo.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/WProcessInfo.java
@@ -23,7 +23,7 @@ import org.compiere.process.ProcessInfo;
 public class WProcessInfo extends ProcessInfo {
 
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 2034681838152013686L;
 
@@ -61,6 +61,11 @@ public class WProcessInfo extends ProcessInfo {
 		super.setClassName(zkName);
 	}
 
+	/**
+	 * Translate swing client class name to Zk equivalent
+	 * @param className
+	 * @return class name
+	 */
 	private String dynamicTranslate(String className) {
 		String zkName = null;
 		String tail = null;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/report/HTMLExtension.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/report/HTMLExtension.java
index 4412235d7c..affe0d2104 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/report/HTMLExtension.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/report/HTMLExtension.java
@@ -59,6 +59,7 @@ public class HTMLExtension implements IHTMLExtension {
 	 * @param contextPath
 	 * @param classPrefix
 	 * @param componentId
+	 * @param processID
 	 */
 	public HTMLExtension(String contextPath, String classPrefix, String componentId, String processID) {
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/report/LinkWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/report/LinkWindow.java
index 349c9acdd7..475330d750 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/report/LinkWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/report/LinkWindow.java
@@ -32,6 +32,7 @@ import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zul.A;
 
 /**
+ * Dialog for web link.
  * @author hengsin
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/scheduler/ChangeStateAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/scheduler/ChangeStateAction.java
index 13d5201dc8..07922a72a0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/scheduler/ChangeStateAction.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/scheduler/ChangeStateAction.java
@@ -54,6 +54,7 @@ import org.zkoss.zul.Popup;
 import org.zkoss.zul.Toolbarbutton;
 
 /**
+ * Toolbar action to modify state of scheduler (AD_Scheduler) process.
  * @author hengsin
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/scheduler/SchedulerStateEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/scheduler/SchedulerStateEditor.java
index 9b6d330a05..0f7e80a4d4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/scheduler/SchedulerStateEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/scheduler/SchedulerStateEditor.java
@@ -38,6 +38,7 @@ import org.compiere.model.StateChangeEvent;
 import org.compiere.model.StateChangeListener;
 import org.compiere.server.AdempiereServerMgr;
 import org.compiere.server.IServerManager;
+import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
 import org.idempiere.distributed.IClusterService;
@@ -47,6 +48,7 @@ import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.util.Clients;
 
 /**
+ * Field editor for state ({@link DisplayType#SchedulerState}) of scheduler (AD_Scheduler).
  * @author hengsin
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/scheduler/SchedulerStateEditorFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/scheduler/SchedulerStateEditorFactory.java
index 31db46e33c..1f6a0c788a 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/scheduler/SchedulerStateEditorFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/scheduler/SchedulerStateEditorFactory.java
@@ -34,6 +34,7 @@ import org.compiere.util.DisplayType;
 import org.osgi.service.component.annotations.Component;
 
 /**
+ * Field editor factory for {@link DisplayType#SchedulerState}
  * @author hengsin
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionContextListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionContextListener.java
index 2a586ddd98..870671cdf7 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionContextListener.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionContextListener.java
@@ -47,7 +47,7 @@ import org.zkoss.zk.ui.util.ExecutionCleanup;
 import org.zkoss.zk.ui.util.ExecutionInit;
 
 /**
- *
+ * Zk listener to manage environment context for execution and session
  * @author <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
  * @date Feb 25, 2007
  * @version $Revision: 0.10 $
@@ -59,7 +59,7 @@ public class SessionContextListener implements ExecutionInit,
     public static final String SESSION_CTX = "WebUISessionContext";
 
     /**
-     * get servlet thread local context from session
+     * Get environment context from session cache or create a new one (no cache context or cache context is invalid)
      * @param exec
      */
     public static void setupExecutionContextFromSession(Execution exec) {
@@ -183,6 +183,9 @@ public class SessionContextListener implements ExecutionInit,
 		return true;
     }
 
+    /**
+     * @return true if session context is valid
+     */
 	public static boolean isContextValid() {
 		Execution exec = Executions.getCurrent();
 		Properties ctx = ServerContext.getCurrentInstance();
@@ -275,6 +278,11 @@ public class SessionContextListener implements ExecutionInit,
 		}
 	}
 
+	/**
+	 * @param list
+	 * @param session
+	 * @return true if session has no active desktop
+	 */
 	private boolean isEmpty(List<String> list, Session session) {
 		if (list.isEmpty())
 			return true;
@@ -329,6 +337,11 @@ public class SessionContextListener implements ExecutionInit,
 		} 
 	}
 	
+	/**
+	 * Add dtid to session context
+	 * @param AD_Session_ID
+	 * @param dtid desktop id
+	 */
 	public static synchronized void addDesktopId(int AD_Session_ID, String dtid)
 	{
 		String key = getSessionDesktopListKey(AD_Session_ID);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionManager.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionManager.java
index 1de9f24fb1..0aeac38a29 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionManager.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionManager.java
@@ -20,15 +20,17 @@ package org.adempiere.webui.session;
 import java.lang.ref.WeakReference;
 import java.util.Properties;
 
+import org.adempiere.webui.AdempiereWebUI;
 import org.adempiere.webui.IWebClient;
 import org.adempiere.webui.apps.AEnv;
+import org.adempiere.webui.desktop.DefaultDesktop;
 import org.adempiere.webui.desktop.IDesktop;
 import org.compiere.model.MUser;
 import org.compiere.util.Env;
 import org.zkoss.zk.ui.Desktop;
 
 /**
- * 
+ * Zk session related static methods
  * @author <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
  * @date Feb 25, 2007
  * @version $Revision: 0.10 $
@@ -37,6 +39,10 @@ public class SessionManager
 {
     public static final String SESSION_APPLICATION = "SessionApplication";
     
+    /**
+     * @param ctx
+     * @return true if user has logged in
+     */
     public static boolean isUserLoggedIn(Properties ctx)
     {
         String adUserId = Env.getContext(ctx, Env.AD_USER_ID);
@@ -52,6 +58,9 @@ public class SessionManager
         		&& !"".equals(adClientId));
     }
     
+    /**
+     * @param app
+     */
     public static void setSessionApplication(IWebClient app)
     {
     	Desktop desktop = AEnv.getDesktop();
@@ -59,12 +68,20 @@ public class SessionManager
     		desktop.setAttribute(SESSION_APPLICATION, new WeakReference<IWebClient>(app));
     }
     
+    /**
+     * @see DefaultDesktop
+     * @return IDesktop instance
+     */
     public static IDesktop getAppDesktop()
     {
     	IWebClient webClient = getSessionApplication();
     	return webClient != null ? webClient.getAppDeskop() : null;
     }
     
+    /**
+     * @see AdempiereWebUI
+     * @return IWebClient instance
+     */
     public static IWebClient getSessionApplication()
     {
     	Desktop desktop = AEnv.getDesktop();
@@ -78,6 +95,9 @@ public class SessionManager
         return app;
     }
     
+    /**
+     * Logout current session
+     */
     public static void logoutSession()
     {
     	IWebClient app = getSessionApplication();
@@ -86,7 +106,7 @@ public class SessionManager
     }
     
     /**
-	 * Perform logout after user close a browser tab without first logging out.
+	 * Perform logout after user close a browser tab without first logging out.<br/>
 	 * Usually this is invoke from {@link SessionContextListener} and developer shouldn't call this directly.
 	 */
     public static void logoutSessionAfterBrowserDestroyed()
@@ -97,7 +117,6 @@ public class SessionManager
     }
     
     /**
-     * 
      * @param user
      */
     public static void changeRole(MUser user){
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/ValidateReadonlyComponent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/ValidateReadonlyComponent.java
index 65968e8489..eed2198837 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/ValidateReadonlyComponent.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/ValidateReadonlyComponent.java
@@ -31,9 +31,7 @@ import org.zkoss.zul.impl.InputElement;
 
 
 /**
- * 
- * this service is interception into desktop process,
- * it will deny request to modify a readonly field or action on readonly button  
+ * Zk dekstop listener to deny request to modify a readonly field or perform action using a readonly button.  
  * @author hieplq
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ITheme.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ITheme.java
index 9f49a34252..0963c62a98 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ITheme.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ITheme.java
@@ -14,7 +14,7 @@
 package org.adempiere.webui.theme;
 
 /**
- * Interface to hold global theme constant
+ * Interface to hold web client theme constant
  * @author hengsin
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java
index d54910cd1c..9df8cc169c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/theme/ThemeManager.java
@@ -27,7 +27,7 @@ import org.compiere.util.Util;
 import org.zkoss.image.AImage;
 
 /**
- *
+ * Static methods for web client theme.
  * @author hengsin
  *
  */
@@ -125,7 +125,7 @@ public final class ThemeManager {
 	}
 	
 	/**
-	 * @return title text for the browser window
+	 * @return title text for browser tab
 	 */
 	public static String getBrowserTitle() {		
 		return AEnv.getDesktop().getWebApp().getAppName();
@@ -165,36 +165,17 @@ public final class ThemeManager {
 			if (mImage.getData() != null)
 				return new AImage(mImage.getName(), mImage.getData());
 			else
-				return null;
-	    	
-			/* Using different approach: ImageEncoder supports only PNG and JPEG
-			Image image = mImage.getImage();
-			if (image instanceof RenderedImage) {
-				RenderedImage rImage = (RenderedImage)image;
-				return Images.encode(mImage.getName(), rImage);
-			} else {
-				BufferedImage bImage = new BufferedImage(image.getWidth(null),
-	                    image.getHeight(null),
-	                    BufferedImage.TYPE_INT_ARGB);
-				Graphics2D bImageGraphics = bImage.createGraphics();
-				bImageGraphics.drawImage(image, null, null);
-				RenderedImage rImage = (RenderedImage)bImage;
-				String name = mImage.getName();
-				if (name.endsWith("jpg")) {
-					name = name.replace("jpg", "jpeg");
-				}
-				return Images.encode(name, rImage);
-			}
-			*/			
+				return null;	    	
 		} else {
 			return null;
 		}
 	}
 
+	/** Theme Name:Boolean */
 	private static final CCache<String, Boolean> s_themeHasCustomCSSCache = new CCache<String, Boolean>(null, "ThemeHasCustomCSSCache", 2, -1, false);
 
 	/**
-	 * @return true if custom css exists
+	 * @return true if custom css ({theme}/css/fragment/custom.css.dsp) exists
 	 */
 	public static Boolean isThemeHasCustomCSSFragment() {
 		String theme = getTheme();
@@ -211,10 +192,16 @@ public final class ThemeManager {
 		return flag;
 	}
 
+	/**
+	 * @return true if css is use to define size of dialog
+	 */
 	public static boolean isUseCSSForWindowSize() {
 		return "Y".equals(Env.getContext(Env.getCtx(), ITheme.USE_CSS_FOR_WINDOW_SIZE));
 	}	
 	
+	/**
+	 * @return true if use font icon instead of image 
+	 */
 	public static boolean isUseFontIconForImage() {
 		return "Y".equals(Env.getContext(Env.getCtx(), ITheme.USE_FONT_ICON_FOR_IMAGE));
 	}
@@ -233,6 +220,11 @@ public final class ThemeManager {
 		return ZK_PREFIX_FOR_CLASSPATH_RESOURCE+zkResourceURL.substring(2);
 	}
 	
+	/**
+	 * Translate image name to font icon name
+	 * @param imagePath
+	 * @return font icon css class name
+	 */
 	public static String getIconSclass(String imagePath) {
 		String iconSclass = null;
 		if (!Util.isEmpty(imagePath, true)) {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ADClassNameMap.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ADClassNameMap.java
index 54be1b7a1f..df4310b5a9 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ADClassNameMap.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ADClassNameMap.java
@@ -3,8 +3,12 @@ package org.adempiere.webui.util;
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * Class name mapping between Swing client and Zk Web Client
+ */
 public class ADClassNameMap {
 
+	/** Swing Class Name:Zk Class Name */
 	private static Map<String, String> map = new HashMap<String, String>();
 	
 	static {
@@ -13,8 +17,8 @@ public class ADClassNameMap {
 	
 	/**
 	 * 
-	 * @param src
-	 * @return String
+	 * @param src swing client class name
+	 * @return zk class name
 	 */
 	public static String get(String src) {
 		return map.get(src);
@@ -22,8 +26,8 @@ public class ADClassNameMap {
 	
 	/**
 	 * 
-	 * @param src
-	 * @param target
+	 * @param src swing class name
+	 * @param target zk class name
 	 */
 	public static void add(String src, String target) {
 		map.put(src, target);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/BrowserToken.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/BrowserToken.java
index b3607be6e7..024aefb871 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/BrowserToken.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/BrowserToken.java
@@ -30,7 +30,7 @@ import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.util.Clients;
 
 /**
- * class to manage browser token for auto authentication
+ * Class to manage browser token (store using local storage) for authentication
  * @author hengsin
  *
  */
@@ -61,7 +61,7 @@ public final class BrowserToken {
 	}
 
 	/**
-	 * remove client side token for auto login
+	 * remove client side token for login
 	 */
 	public static void remove() {
 		try {
@@ -75,7 +75,7 @@ public final class BrowserToken {
 	}
 
 	/**
-	 * load stored client side token for auto login
+	 * load stored client side token for login
 	 * @param component
 	 */
 	public static void load(Component component) {
@@ -113,6 +113,10 @@ public final class BrowserToken {
 		return false;
 	}
 
+	/**
+	 * @return Base 64 encoded iDempiere home path
+	 * @throws UnsupportedEncodingException
+	 */
 	private static String getHomeToken() throws UnsupportedEncodingException {
 		String home = Adempiere.getAdempiereHome();
 		Base64 encoder = new Base64();
@@ -121,6 +125,13 @@ public final class BrowserToken {
 		return home;
 	}
 
+	/**
+	 * @param session
+	 * @param user
+	 * @return hashed user password (base 64 encoded)
+	 * @throws UnsupportedEncodingException
+	 * @throws NoSuchAlgorithmException
+	 */
 	private static String getPasswordHash(MSession session, MUser user) throws UnsupportedEncodingException, NoSuchAlgorithmException {
 		MessageDigest digest = MessageDigest.getInstance("SHA-512");
 		Base64 encoder = new Base64();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/FeedbackManager.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/FeedbackManager.java
index 1d6bff797e..fdf1469218 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/FeedbackManager.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/FeedbackManager.java
@@ -33,7 +33,7 @@ public class FeedbackManager {
 	/**
 	 * 
 	 * @param errorOnly
-	 * @return attachment datasource
+	 * @return attachment DataSource
 	 */
 	public static DataSource getLogAttachment(boolean errorOnly)
 	{
@@ -49,7 +49,8 @@ public class FeedbackManager {
 	}
 	
 	/**
-	 * 	EMail Support
+	 * EMail Support
+	 * @param errorOnly
 	 */
 	public static void emailSupport(boolean errorOnly)
 	{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/GridTabDataBinder.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/GridTabDataBinder.java
index 64cdf39bff..1baba5b972 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/GridTabDataBinder.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/GridTabDataBinder.java
@@ -51,12 +51,11 @@ public class GridTabDataBinder implements ValueChangeListener {
 	 */
 	public void valueChange(ValueChangeEvent e)
     {
-        if (gridTab.isProcessed())       //  only active records
+        if (gridTab.isProcessed())       //  only editable records
         {
             Object source = e.getSource();
             if (source instanceof WEditor)
             {
-            	// Elaine 2009/05/06
             	WEditor editor = (WEditor) source;
             	GridField gridField = editor.getGridField();
             	
@@ -92,12 +91,11 @@ public class GridTabDataBinder implements ValueChangeListener {
         //
         if (e.getNewValue() == null && e.getOldValue() != null 
             && e.getOldValue().toString().length() > 0)     //  some editors return "" instead of null
-//        	  this is the original code from GridController, don't know what it does there but it breaks ignore button for web ui        
-//            mTable.setChanged (true);  
-        	mTable.setValueAt (e.getNewValue(), row, col);
-        else
         {
-        	
+        	mTable.setValueAt (e.getNewValue(), row, col);
+        }
+        else
+        {        	
         	Object newValue = e.getNewValue();
 			Integer newValues[] = null;
 			
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/IServerPushCallback.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/IServerPushCallback.java
index 34dc5e11f4..52963a1d98 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/IServerPushCallback.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/IServerPushCallback.java
@@ -14,7 +14,7 @@
 package org.adempiere.webui.util;
 
 /**
- * Callback interface to perform UI update inside the UI thread or server push thread.
+ * Callback interface to perform UI update inside UI (Event Listener) thread
  * @author hengsin
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/LogEventInterceptor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/LogEventInterceptor.java
index d045d8e02b..90f9489b7d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/LogEventInterceptor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/LogEventInterceptor.java
@@ -1,6 +1,27 @@
-/**
- * 
- */
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ *                                                                     *
+ * Contributors:                                                       *
+ * - hengsin                         								   *
+ **********************************************************************/
 package org.adempiere.webui.util;
 
 import org.zkoss.zk.ui.Execution;
@@ -9,6 +30,8 @@ import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.util.EventInterceptor;
 
 /**
+ * Zk event interceptor for event tracing/debugging use.
+ * To use this, follow the instruction in WEB-INF/zk.xml
  * @author hengsin
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/MUserPreference.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/MUserPreference.java
index 418d79cdf6..ed1259629e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/MUserPreference.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/MUserPreference.java
@@ -26,6 +26,11 @@ public class MUserPreference extends MPreference {
 
 	private static final long serialVersionUID = -3424015890197944847L;
 
+	/**
+	 * @param ctx
+	 * @param AD_Preference_ID
+	 * @param trxName
+	 */
 	public MUserPreference(Properties ctx, int AD_Preference_ID, String trxName) {
 		super(ctx, AD_Preference_ID, trxName);
 		setClientOrg(0, 0);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ManageImageCache.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ManageImageCache.java
index 0d517c97f9..de8acdafcd 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ManageImageCache.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ManageImageCache.java
@@ -38,9 +38,9 @@ import org.zkoss.image.AImage;
 import org.zkoss.image.Image;
 
 /**
- * Normal image can come from inside system or from outside system.
- * with image from outside for performance we will cache it.
- * this class for manage image cache and provide help function relate
+ * Images can come from inside system or from outside system. <br/>
+ * For images from outside, we will cache it for better performance. <br/>
+ * This class is for management of image cache and provide related helper function.
  * @author hieplq
  *
  */
@@ -48,16 +48,15 @@ public class ManageImageCache {
 	
 	protected static final CLogger	log = CLogger.getCLogger (ManageImageCache.class);
 	/**
-	 * this cache is don't expire, if must restart cache when has update image.
-	 * better use a timer, example reset cache after 10 minute has update. it help user can change a batch of image and reset one time.
+	 * This cache don't expire, you must reset cache when there are update of images.
 	 */
 	private final CCache<String, Image> imageCache = new CCache<String, Image>(null, "WindowImageCache", 50, 0, false);
 	
 	private static ManageImageCache instance;
 	
 	/**
-	 * get instance
-	 * @return
+	 * Get singleton instance
+	 * @return ManageImageCache instance
 	 */
 	public static ManageImageCache instance(){
 		if (instance == null){
@@ -71,9 +70,9 @@ public class ManageImageCache {
 	}
 	
 	/**
-	 * investigate image path of MImage, if path is a internal return internal url other return null
+	 * 	nvestigate path of MImage, if path is internal return internal url, otherwise return null.
 	 * @param image
-	 * @return
+	 * @return URL of image or null
 	 */
 	public static URL getImageInternalUrl (MImage image){
 		if (image == null)
@@ -82,9 +81,9 @@ public class ManageImageCache {
 	}
 	
 	/**
-	 * investigate image path, if path is a internal return internal url other return null
+	 * Investigate image path, if path is internal return internal url, otherwise return null.
 	 * @param url
-	 * @return
+	 * @return URL of image or null
 	 */
 	public static URL getImageInternalUrl (String url){
 		if (url == null || url.trim().length() == 0 || url.indexOf("://") > 0)
@@ -97,7 +96,7 @@ public class ManageImageCache {
 	/**
 	 * Load image from url
 	 * @param imagePath
-	 * @return
+	 * @return image data
 	 */
 	protected static byte [] loadImageData (String imagePath){
 		byte [] data = null;
@@ -125,9 +124,9 @@ public class ManageImageCache {
 	}
 	
 	/**
-	 * if image is don't in cache, load it (imagePath can id of MImage)
+	 * If image is not in cache, load it (imagePath can be id of MImage).
 	 * @param imagePath
-	 * @return image load from path. null when has any exception
+	 * @return image from cache or loaded from path. null if there is exception in loading.
 	 */
 	public Image getImage(String imagePath){
 		if (imagePath == null || imagePath.trim().length() == 0)
@@ -157,7 +156,7 @@ public class ManageImageCache {
 	}
 	
 	/**
-	 * 
+	 * Get image from URL or cache.
 	 * @param url
 	 * @return {@link Image}
 	 */
@@ -188,7 +187,7 @@ public class ManageImageCache {
 	}
 	
 	/**
-	 * if MImage contain extend image or binary image data, load it into cache and return key
+	 * If MImage has image URL or binary image data, load it into cache and return key (id or url).
 	 * other return null
 	 * @param mImage
 	 * @return
@@ -232,13 +231,13 @@ public class ManageImageCache {
 	}
 
 	/**
-	 * load extend image into cache
+	 * load external image into cache
 	 * @param imagePath
 	 */
 	protected void loadExtend (String imagePath){
 		byte[] data = loadImageData(imagePath);
 		AImage aImage = null;
-		// when can't load image (by incorrect url or disconnect or any exception, just set image as null
+		// when can't load image (due to incorrect url or disconnect or any exception), just set image as null
 		if (data != null)
 			try {
 				aImage = new AImage(imagePath, data);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/OSTask.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/OSTask.java
index 7cdee9ff92..160d5d5fa3 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/OSTask.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/OSTask.java
@@ -38,7 +38,9 @@ public class OSTask extends Thread
 	private String          m_cmd;
 	private Process         m_child = null;
 
+	/** standard output buffer for os task */
 	private StringBuffer    m_out = new StringBuffer();
+	/** error output buffer for os task */
 	private StringBuffer    m_err = new StringBuffer();
 
 	/** The Output Stream of process        */
@@ -51,12 +53,13 @@ public class OSTask extends Thread
 	/**	Logger			*/
 	private static final CLogger log = CLogger.getCLogger(OSTask.class);
 
-	/** Read Out                            */
+	/** Read standard output from process */
 	private Thread          m_outReader = new Thread()
 	{
 		public void run()
 		{
-			log.fine("outReader");
+			if (log.isLoggable(Level.FINE))
+				log.fine("outReader");
 			try
 			{
 				int c;
@@ -70,16 +73,18 @@ public class OSTask extends Thread
 			{
 				log.log(Level.SEVERE, "outReader", ioe);
 			}
-			log.fine("outReader - done");
+			if (log.isLoggable(Level.FINE))
+				log.fine("outReader - done");
 		}   //  run
 	};   //  m_outReader
 
-	/** Read Out                            */
+	/** Read error output from process */
 	private Thread          m_errReader = new Thread()
 	{
 		public void run()
 		{
-			log.fine("errReader");
+			if (log.isLoggable(Level.FINE))
+				log.fine("errReader");
 			try
 			{
 				int c;
@@ -93,17 +98,19 @@ public class OSTask extends Thread
 			{
 				log.log(Level.SEVERE, "errReader", ioe);
 			}
-			log.fine("errReader - done");
+			if (log.isLoggable(Level.FINE))
+				log.fine("errReader - done");
 		}   //  run
 	};   //  m_errReader
 
 
 	/**
-	 *  Execute it
+	 * Execute it
 	 */
 	public void run()
 	{
-		log.info(m_cmd);
+		if (log.isLoggable(Level.INFO))
+			log.info(m_cmd);
 		try
 		{
 			m_child = Runtime.getRuntime().exec(m_cmd);
@@ -134,7 +141,8 @@ public class OSTask extends Thread
 					if (log.isLoggable(Level.INFO))log.log(Level.INFO, "(ie) - " + ie);
 				}
 				//  ExitValue
-				log.config("done");
+				if (log.isLoggable(Level.CONFIG))
+					log.config("done");
 			}
 		}
 		catch (IOException ioe)
@@ -145,14 +153,15 @@ public class OSTask extends Thread
 	}   //  run
 
 	/**
-	 *  Check if interrupted
-	 *  @return true if interrupted
+	 * Check if interrupted
+	 * @return true if interrupted
 	 */
 	private boolean checkInterrupted()
 	{
 		if (isInterrupted())
 		{
-			log.config("interrupted");
+			if (log.isLoggable(Level.CONFIG))
+				log.config("interrupted");
 			//  interrupt child processes
 			if (m_child != null)
 				m_child.destroy();
@@ -180,7 +189,7 @@ public class OSTask extends Thread
 	}   //  checkInterrupted
 
 	/**
-	 *  Get Out Info
+	 *  Get standard output buffer
 	 *  @return StringBuffer
 	 */
 	public StringBuffer getOut()
@@ -189,7 +198,7 @@ public class OSTask extends Thread
 	}   //  getOut
 
 	/**
-	 *  Get Err Info
+	 *  Get error output buffer
 	 *  @return StringBuffer
 	 */
 	public StringBuffer getErr()
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ServerPushTemplate.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ServerPushTemplate.java
index fe0a0e3179..d7568648bb 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ServerPushTemplate.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ServerPushTemplate.java
@@ -22,8 +22,8 @@ import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 
 /**
- * Zk UI update must be done in either UI thread or using server push. This class help to implement
- * that base on spring's jdbctemplate pattern.
+ * Zk UI update must be done in UI (event listener) thread. This class help to implement
+ * that base on spring's jdbc template pattern.
  * @author hengsin
  *
  */
@@ -40,8 +40,8 @@ public class ServerPushTemplate {
 	}
 
 	/**
-	 * Execute asynchronous task in UI thread. This is implemented
-	 * using Executions.schedule and will return immediately
+	 * Execute asynchronous task in UI (event listener) thread. This is implemented
+	 * using Executions.schedule and will return immediately.
 	 * @param callback
 	 */
 	public void executeAsync(final IServerPushCallback callback) {
@@ -67,7 +67,7 @@ public class ServerPushTemplate {
 	}
 
 	/**
-	 * Execute synchronous task in UI thread. This is implemented
+	 * Execute synchronous task in UI (event listener) thread. This is implemented
 	 * using Executions.activate/deactivate and will only return after the
 	 * invoked task have ended. For better scalability, if possible, you
 	 * should use executeAsync instead. 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/SortComparator.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/SortComparator.java
index 7e7b7c25f9..5fa494686d 100755
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/SortComparator.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/SortComparator.java
@@ -26,13 +26,13 @@ import org.compiere.util.Language;
 import org.compiere.util.NamePair;
 
 /**
- * Default comparator, adapted from MSort
+ * Default sort comparator, adapted from MSort
  * @author hengsin
  */
 public final class SortComparator implements Comparator<Object>, Serializable
 {
 	/**
-	 * generated
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 1265701980018071753L;
 
@@ -72,7 +72,7 @@ public final class SortComparator implements Comparator<Object>, Serializable
 	}	//	setSortAsc
 
 	
-	/**************************************************************************
+	/**
 	 *	Compare Data of two entities
 	 *  @param o1 object
 	 *  @param o2 object
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeUtils.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeUtils.java
index af054db5f9..06f8e50c23 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeUtils.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/TreeUtils.java
@@ -26,7 +26,7 @@ import org.zkoss.zul.Treeitem;
 import org.zkoss.zul.ext.TreeOpenableModel;
 
 /**
- * 
+ * Helper methods for working with tree nodes
  * @author hengsin
  *
  */
@@ -137,6 +137,10 @@ public class TreeUtils {
 		}
 	}
 	
+	/**
+	 * @param tree
+	 * @return true if onInitRender event have been posted
+	 */
 	public static boolean isOnInitRenderPosted(Tree tree) {
 		if (tree.getAttribute(ATTR_ON_INIT_RENDER_POSTED) != null) {
 			return ((Boolean)tree.getAttribute(ATTR_ON_INIT_RENDER_POSTED)).booleanValue();
@@ -146,7 +150,7 @@ public class TreeUtils {
 
 	/**
 	 * travel all node of tree, at selected node, call callback function
-	 * @param treeObject
+	 * @param treeObject Tree or parent of Tree
 	 * @param isOpen
 	 */
 	static public void collapseTree (Component treeObject, boolean isOpen){
@@ -171,26 +175,33 @@ public class TreeUtils {
 		}
 	}
 
+	/**
+	 * Collapse or expand tree nodes
+	 * @param <T>
+	 * @param treeModelOpenable
+	 * @param isOpen true to expand, false to collapse
+	 * @param treeNode node to expand from, null to expand from root node
+	 */
 	static protected <T> void collapseTreeModel (TreeOpenableModel treeModelOpenable, boolean isOpen, T treeNode){
 		if (!isOpen){
 			treeModelOpenable.clearOpen();
 			return;//done, easy to close all node
 		}else{
 			if (!(treeModelOpenable instanceof TreeModel<?>)){
-				return;//model have to be a instance of TreeModel. because it provide method to add open object
+				return;//model have to be an instance of TreeModel. because it provide method to add open path
 			}
 
 			if (treeNode != null && !(treeNode instanceof TreeNode<?>)){
-				return; //don't support, at least it's TreeNode to travel child node
+				return; //don't support
 			}
 
 			@SuppressWarnings("unchecked")
 			TreeModel<T> treeModel = (TreeModel<T>)treeModelOpenable;
 
-			if (treeNode == null){// get from model
+			if (treeNode == null){// use root node from model
 				Object rootNode = treeModel.getRoot();
 				if (!(rootNode instanceof TreeNode<?>)){
-					return;//don't support, at least it's TreeNode to travel child node 
+					return;//don't support 
 				}
 
 				@SuppressWarnings("unchecked")
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/UserPreference.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/UserPreference.java
index a7caa18aa4..e6241a2cf6 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/UserPreference.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/UserPreference.java
@@ -35,7 +35,7 @@ import org.compiere.util.Util;
  */
 public final class UserPreference implements Serializable {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -2619860653017483658L;
 
@@ -178,8 +178,8 @@ public final class UserPreference implements Serializable {
 		}
 	}
 
-	/***************************************************************************
-	 * Set Property
+	/**
+	 * Set value for user preference property
 	 *
 	 * @param key
 	 *            Key
@@ -196,7 +196,7 @@ public final class UserPreference implements Serializable {
 	} // setProperty
 
 	/**
-	 * Set Property
+	 * Set value for user preference property
 	 *
 	 * @param key
 	 *            Key
@@ -208,7 +208,7 @@ public final class UserPreference implements Serializable {
 	} // setProperty
 
 	/**
-	 * Set Property
+	 * Set value for user preference property
 	 *
 	 * @param key
 	 *            Key
@@ -220,7 +220,7 @@ public final class UserPreference implements Serializable {
 	} // setProperty
 
 	/**
-	 * Get Propery
+	 * Get user preference property value
 	 *
 	 * @param key
 	 *            Key
@@ -237,7 +237,7 @@ public final class UserPreference implements Serializable {
 	} // getProperty
 
 	/**
-	 * Get Propery as Boolean
+	 * Get Property as Boolean (Y/N)
 	 *
 	 * @param key
 	 *            Key
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java
index 04b2a8f39c..a78e4d5e6f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java
@@ -28,6 +28,11 @@ import org.adempiere.webui.theme.ThemeManager;
  */
 public class WebUIResourceFinder implements IResourceFinder {
 
+	/**
+	 * Find entries from bundle
+	 * @param name
+	 * @return entries found
+	 */
 	private Enumeration<URL> find(String name) {
 		int pathIndex = name.lastIndexOf("/");
 		String path = "/";
@@ -42,6 +47,7 @@ public class WebUIResourceFinder implements IResourceFinder {
 	}
 	
 	protected Pattern patternOnlyName = Pattern.compile("\\w+\\.\\w+"); 
+	
 	@Override
 	public URL getResource(String name) {
 		if ("images/iDempiereHR.png".equals(name) || "images/iDempiere.png".equals(name)) {
@@ -68,6 +74,11 @@ public class WebUIResourceFinder implements IResourceFinder {
 		return url;
 	}
 	
+	/**
+	 * Find resource from classpath (if prefix with "~./") or bundle
+	 * @param name
+	 * @return URL or null
+	 */
 	private URL findResource(String name) {
 		Enumeration<URL> e;
 		URL url;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ZKUpdateUtil.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ZKUpdateUtil.java
index 337b33e5b6..8526fc951c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ZKUpdateUtil.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ZKUpdateUtil.java
@@ -22,52 +22,85 @@ import org.zkoss.zul.Listbox;
 import org.zkoss.zul.Tree;
 
 /**
+ * Helper method to set width and height of component.
  * @author hieplq
  *
  */
 public class ZKUpdateUtil {
+	/**
+	 * @param comp
+	 * @param value
+	 */
 	public static void setHeight (HtmlBasedComponent comp, String value){
 		if (comp.getVflex() != null)
 			comp.setVflex(null);
 		comp.setHeight(value);
 	}
 	
+	/**
+	 * @param comp
+	 * @param value
+	 */
 	public static void setWidth (HtmlBasedComponent comp, String value){
 		if (comp.getHflex() != null)
 			comp.setHflex(null);
 		comp.setWidth(value);
 	}
 
+	/**
+	 * @param comp
+	 * @param value
+	 */
 	public static void setHflex (HtmlBasedComponent comp, String value){
 		if (comp.getWidth() != null)
 			comp.setWidth(null);
 		comp.setHflex(value);
 	}
 
+	/**
+	 * @param comp
+	 * @param value
+	 */
 	public static void setVflex (HtmlBasedComponent comp, String value){
 		if (comp.getHeight() != null)
 			comp.setHeight(null);
 		comp.setVflex(value);
 	}
 	
+	/**
+	 * @param comp
+	 * @param value
+	 */
 	public static void setVflex (Listbox comp, boolean value){
 		if (comp.getHeight() != null)
 			comp.setHeight(null);
 		comp.setVflex(value);
 	}
 	
+	/**
+	 * @param comp
+	 * @param value
+	 */
 	public static void setVflex (Grid comp, boolean value){
 		if (comp.getHeight() != null)
 			comp.setHeight(null);
 		comp.setVflex(value);
 	}
 	
+	/**
+	 * @param comp
+	 * @param value
+	 */
 	public static void setVflex (Tree comp, boolean value){
 		if (comp.getHeight() != null)
 			comp.setHeight(null);
 		comp.setVflex(value);
 	}
 	
+	/**
+	 * Use client side script to set height of component to the corresponding height define in css. 
+	 * @param component
+	 */
 	public static void setCSSHeight(HtmlBasedComponent component) {
 		String script = "setTimeout(function() { let e = jq('#" + component.getUuid() + "');";
 		script = script + "let b=zk.Widget.$('#" + component.getUuid() + "'); ";
@@ -75,6 +108,10 @@ public class ZKUpdateUtil {
 		Clients.response(new AuScript(script));
 	}
 	
+	/**
+	 * Use client side script to set width of component to the corresponding width define in css.
+	 * @param component
+	 */
 	public static void setCSSWidth(HtmlBasedComponent component) {
 		String script = "setTimeout(function() { let e = jq('#" + component.getUuid() + "');";
 		script = script + "let b=zk.Widget.$('#" + component.getUuid() + "'); ";
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
index f6963a545a..18717dc075 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java
@@ -85,7 +85,7 @@ import org.zkoss.zul.Vbox;
  */
 public class AboutWindow extends Window implements EventListener<Event> {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -4235323239552159150L;
 
@@ -107,11 +107,17 @@ public class AboutWindow extends Window implements EventListener<Event> {
 
 	private Listbox levelListBox;
 
+	/**
+	 * Default constructor
+	 */
 	public AboutWindow() {
 		super();
 		init();
 	}
 
+	/**
+	 * Layout dialog
+	 */
 	private void init() {
 
 		System.runFinalization();
@@ -173,6 +179,10 @@ public class AboutWindow extends Window implements EventListener<Event> {
 		this.setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED);
 	}
 	
+	/**
+	 * Create tab panels
+	 * @param tabs
+	 */
 	protected void initTabs(Tabs tabs) {
 		//about
 		Tab tab = new Tab();
@@ -205,6 +215,10 @@ public class AboutWindow extends Window implements EventListener<Event> {
 
 	}
 
+	/**
+	 * Tab panel for trace levels and list of messages for the selected trace level
+	 * @return tab panel
+	 */
 	protected Tabpanel createTrace() {
 		Tabpanel tabPanel = new Tabpanel();
 		Vbox vbox = new Vbox();
@@ -317,6 +331,9 @@ public class AboutWindow extends Window implements EventListener<Event> {
 		return tabPanel;
 	}
 
+	/**
+	 * Update log messages table for trace tab.
+	 */
 	private void updateLogTable() {
 		Vector<Vector<Object>> data = CLogErrorBuffer.get(true).getLogData(bErrorsOnly.isChecked());
 		SimpleListModel model = new SimpleListModel(data);
@@ -329,6 +346,10 @@ public class AboutWindow extends Window implements EventListener<Event> {
 			tabLog.setLabel(Msg.getMsg(Env.getCtx(), "TraceInfo") + " (" + data.size() + ")");
 	}
 
+	/**
+	 * Tab panel for system info
+	 * @return tab panel
+	 */
 	protected Tabpanel createInfo() {
 		Tabpanel tabPanel = new Tabpanel();
 		Div div = new Div();
@@ -359,6 +380,10 @@ public class AboutWindow extends Window implements EventListener<Event> {
 		return tabPanel;
 	}
 
+	/**
+	 * Tab panel for credit
+	 * @return tab panel
+	 */
 	protected Tabpanel createCredit() {
 		Tabpanel tabPanel = new Tabpanel();
 		String fileName = Adempiere.getAdempiereHome() + File.separator + "Credits.html";
@@ -382,6 +407,10 @@ public class AboutWindow extends Window implements EventListener<Event> {
 		return tabPanel;
 	}
 
+	/**
+	 * Tab panel for general info and links
+	 * @return tab panel
+	 */
 	protected Tabpanel createAbout() {
 		Tabpanel tabPanel = new Tabpanel();
 
@@ -456,6 +485,7 @@ public class AboutWindow extends Window implements EventListener<Event> {
 		return tabPanel;
 	}
 
+	@Override
 	public void onEvent(Event event) throws Exception {
 		if (event.getTarget() == bErrorsOnly) {
 			this.updateLogTable();
@@ -476,6 +506,9 @@ public class AboutWindow extends Window implements EventListener<Event> {
 			this.detach();
 	}
 
+	/**
+	 * Reload log properties
+	 */
 	private void reloadLogProps() {
 		Properties props = new Properties();
 		String propertyFileName = Ini.getFileName(false);
@@ -523,6 +556,9 @@ public class AboutWindow extends Window implements EventListener<Event> {
 		}
 	}
 
+	/**
+	 * Change trace/log level
+	 */
 	private void setTraceLevel() {
 		Listitem item = levelListBox.getSelectedItem();
 		if (item != null && item.getValue() != null) {
@@ -533,6 +569,9 @@ public class AboutWindow extends Window implements EventListener<Event> {
 		}
 	}
 
+	/**
+	 * Download iDempiere log file
+	 */
 	private void downloadAdempiereLogFile() {
 		String path = Ini.getAdempiereHome() + File.separator + "log";
 		final FolderBrowser fileBrowser = new FolderBrowser(path, false);
@@ -554,12 +593,18 @@ public class AboutWindow extends Window implements EventListener<Event> {
 		});
 	}
 
+	/**
+	 * Download current log messages
+	 */
 	private void downloadLog() {
 		String log = CLogErrorBuffer.get(true).getErrorInfo(Env.getCtx(), bErrorsOnly.isChecked());
 		AMedia media = new AMedia("trace.log", null, "text/plain", log.getBytes());
 		Filedownload.save(media);
 	}
 
+	/**
+	 * View current log messages
+	 */
 	private void viewLog() {
 		String log = CLogErrorBuffer.get(true).getErrorInfo(Env.getCtx(), bErrorsOnly.isChecked());
 		Window w = new Window();
@@ -580,7 +625,7 @@ public class AboutWindow extends Window implements EventListener<Event> {
 	}
 
 	/**
-	 * 	EMail Errors
+	 * 	EMail errors to support
 	 */
 	private void cmd_errorEMail()
 	{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/CustomizeGridViewDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/CustomizeGridViewDialog.java
index 2d75d0c9b0..45fdd95ecd 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/CustomizeGridViewDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/CustomizeGridViewDialog.java
@@ -1,3 +1,28 @@
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ *                                                                     *
+ * Contributors:                                                       *
+ * - deepak															   *
+ * - hengsin                         								   *
+ **********************************************************************/
 package org.adempiere.webui.window;
 
 import java.util.ArrayList;
@@ -26,7 +51,7 @@ import org.zkoss.zul.Columns;
 public class CustomizeGridViewDialog extends Window {
 
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -138153049225192685L;
 
@@ -50,6 +75,14 @@ public class CustomizeGridViewDialog extends Window {
 		initComponent(windowNo, AD_Tab_ID, AD_User_ID, columnsWidth, gridFieldIds);
 	}
 	
+	/**
+	 * Create components and layout dialog
+	 * @param windowNo
+	 * @param AD_Tab_ID
+	 * @param AD_User_ID
+	 * @param columnsWidth
+	 * @param gridFieldIds
+	 */
 	private void initComponent(int windowNo, int AD_Tab_ID, int AD_User_ID, Map<Integer, String> columnsWidth, ArrayList<Integer> gridFieldIds) {
 		if (isQuickForm)
 		{
@@ -102,6 +135,9 @@ public class CustomizeGridViewDialog extends Window {
 			return customizePanel.isSaved();
 	}
 	
+	/**
+	 * @param gridPanel
+	 */
 	public void setGridPanel(GridView gridPanel){
 		customizePanel.setGridPanel(gridPanel);
 	}
@@ -112,6 +148,7 @@ public class CustomizeGridViewDialog extends Window {
 	 * @return ignore the return value, it is not working correctly
 	 * @deprecated
 	 */
+	@Deprecated(forRemoval = true, since = "11")
 	public static boolean onCustomize(ADTabpanel tabPanel) {
 		onCustomize(tabPanel, null);
 		return true;
@@ -157,6 +194,7 @@ public class CustomizeGridViewDialog extends Window {
 	 * @return ignore the return value, it is not working correctly
 	 * @deprecated 
 	 */
+	@Deprecated(forRemoval = true, since = "11")
 	public static boolean showCustomize(int WindowNo, int AD_Tab_ID, Map <Integer, String> columnsWidth, ArrayList <Integer> gridFieldIds, GridView gridPanel,
 		QuickGridView quickGridView, boolean isQuickForm)
 	{
@@ -165,11 +203,11 @@ public class CustomizeGridViewDialog extends Window {
 	}
 	
 	/**
-	 * Show User customize (modal)
+	 * Show customize grid view dialog
 	 * @param WindowNo window no
 	 * @param AD_Tab_ID
 	 * @param columnsWidth 
-	 * @param gridFieldIds list fieldId current display in gridview
+	 * @param gridFieldIds list of fieldId currently display in gridview
 	 * @param gridPanel
 	 * @param quickGridView
 	 * @param isQuickForm
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangeButton.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangeButton.java
index 6ac7214fbb..05d5c57e00 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangeButton.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangeButton.java
@@ -35,14 +35,14 @@ import org.compiere.util.Env;
 import org.zkoss.zk.ui.event.Events;
 
 /**
-*
-* @author Peter Takacs, Cloudempiere
-*
-*/
+ * Button for range date field editor. Open {@link DateRangePicker} dialog to set the from and to value.
+ * @author Peter Takacs, Cloudempiere
+ *
+ */
 public class DateRangeButton extends ToolBarButton implements WEditor.DynamicDisplayListener {
 
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -4404182204288841866L;
 
@@ -53,6 +53,8 @@ public class DateRangeButton extends ToolBarButton implements WEditor.DynamicDis
 	
 	/**
 	 * Constructor
+	 * @param editor
+	 * @param editor2
 	 */
 	public DateRangeButton(WEditor editor, WEditor editor2) {
 		super();
@@ -61,6 +63,9 @@ public class DateRangeButton extends ToolBarButton implements WEditor.DynamicDis
 		init();
 	}
 	
+	/**
+	 * Setup component and create {@link DateRangePicker}
+	 */
 	private void init() {
 		
 		if (ThemeManager.isUseFontIconForImage())
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangePicker.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangePicker.java
index 8ce7f1bf01..ab1313595a 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangePicker.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangePicker.java
@@ -75,13 +75,13 @@ import org.zkoss.zul.Popup;
 import org.zkoss.zul.Spinner;
 
 /**
-*
-* @author Peter Takacs, Cloudempiere
-*
-*/
+ * Dialog to set from and to value of range date field editor
+ * @author Peter Takacs, Cloudempiere
+ *
+ */
 public class DateRangePicker extends Popup implements EventListener<Event>, ValueChangeListener {
 	/**
-	 * 
+	 * generated serial id 
 	 */
 	private static final long serialVersionUID = -1674676283499219325L;
 	
@@ -140,6 +140,8 @@ public class DateRangePicker extends Popup implements EventListener<Event>, Valu
 	
     /**
      * Constructor
+     * @param editor
+     * @param editor2
      */
 	public DateRangePicker(WEditor editor, WEditor editor2) {
 		super();
@@ -590,7 +592,7 @@ public class DateRangePicker extends Popup implements EventListener<Event>, Valu
 	 * Auto-detect the time unit based on the default date values set, and correct the detected mode if necessary
 	 * @param today
 	 * @param predictedMode
-	 * @return
+	 * @return [detectedUnit, correctedMode]
 	 */
 	private String[] autodetectUnitAndCorrectMode(Timestamp today, String predictedMode) {
 		// use case: modes Before, After, On - unit is not needed
@@ -683,8 +685,8 @@ public class DateRangePicker extends Popup implements EventListener<Event>, Valu
 	/**
 	 * Auto-detect the time offset based on the default date values set
 	 * @param mode
-	 * @param unit
-	 * @return
+	 * @param unit Year (Y), Quarter (Q), Month (M) or Week (W)
+	 * @return difference between from and to date (in unit)
 	 */
 	private int autodetectOffset(String mode, String unit) {
 		Date date = dateFrom;
@@ -714,7 +716,7 @@ public class DateRangePicker extends Popup implements EventListener<Event>, Valu
 	
 	/**
 	 * Get the currently selected date interval
-	 * @return String dates separated by " - "
+	 * @return from and to dates separated by " - "
 	 */
 	private String getIntervalAsString() {
 		
@@ -793,7 +795,7 @@ public class DateRangePicker extends Popup implements EventListener<Event>, Valu
 	 * @param isToDate - if false, set date from and to to the beginning and end of the given time interval
 	 * @param includeThis - if true, it will include the current date (e.g. return from the beginning of last month until today/until end of last month)
 	 * @param dateFrom - define date from (default now)
-	 * @return array of dates: {DateFrom, DateTo}
+	 * @return array of dates: [DateFrom, DateTo]
 	 */
 	private Date[] getInterval(String timeUnit, String timeUnitForRange, int offset, boolean isToDate, boolean includeThis, Date dateFrom) {
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/Dialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/Dialog.java
index a4c6cd0783..672e7a4e7a 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/Dialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/Dialog.java
@@ -51,6 +51,9 @@ import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 
+/**
+ * Static method for message and input dialog
+ */
 public final class Dialog {
 	
     private static final CLogger logger = CLogger.getCLogger(Dialog.class);
@@ -81,6 +84,11 @@ public final class Dialog {
 		return out.toString();
 	}
     
+    /**
+     * @param adMessage
+     * @param args
+     * @return translated message
+     */
     private static String getADMessage(String adMessage, Object ... args) {
     	String message;
 
@@ -96,8 +104,7 @@ public final class Dialog {
 	 *	Display dialog with a warning icon
 	 *	@param	windowNo	Number of Window
 	 *	@param	adMessage	Message to be translated
-	 */
-    
+	 */    
     public static void warn(int windowNo, String adMessage) {
         warn(windowNo, adMessage, null, null);
     }
@@ -108,8 +115,7 @@ public final class Dialog {
 	 *	@param	windowNo	Number of Window
 	 *	@param	adMessage	Message to be translated
 	 *	@param	title		Message box title
-	 */
-    
+	 */    
     public static void warn(int windowNo, String adMessage, String title) {
         warn(windowNo, adMessage, null, title);
     }
@@ -132,10 +138,20 @@ public final class Dialog {
 		Messagebox.showDialog(message, dialogTitle, Messagebox.OK, Messagebox.EXCLAMATION);
     }
     
+    /**
+     * @param title
+     * @param windowNo
+     * @return title for dialog
+     */
     private static String getDialogTitle(String title, int windowNo) {
     	return title == null ? AEnv.getDialogHeader(Env.getCtx(), windowNo) : title;
     }
 
+    /**
+     * Replace "\n" with "&lt;br&gt;" tag.
+     * @param originalMessage
+     * @return message
+     */
     private static String formatDialogMessage(String originalMessage) {
     	return originalMessage.replace("\n", "<br>");
     }
@@ -208,55 +224,58 @@ public final class Dialog {
 		Messagebox.showDialog(message, dialogTitle, Messagebox.OK, Messagebox.ERROR, callback);
     }
 
-    /**************************************************************************
-	 *	Ask Question with question icon and (OK) (Cancel) buttons
-	 *
-	 *	@param	windowNo	Number of Window
-	 *	@param	adMessage	Message to be translated
-	 *	@return true, if OK
+    /**
+	 * Ask Question with question icon and (OK) (Cancel) buttons
+	 * @deprecated 
+	 * @param	windowNo	Number of Window
+	 * @param	adMessage	Message to be translated
+	 * @return true, if OK
 	 */
+    @Deprecated(forRemoval = true, since = "11")
     public static boolean ask(int windowNo, String adMessage) {
     	return ask(windowNo, adMessage, "");
     }
     
-    /**************************************************************************
+    /**
 	 *	Ask Question with question icon and (OK) (Cancel) buttons
 	 *
 	 *	@param	windowNo	Number of Window
 	 *	@param	adMessage	Message to be translated
 	 *	@param	callback
-	 *	@return true, if OK
+	 *	@return ignore, use callback instead.
 	 */    
     public static boolean ask(int windowNo, String adMessage, final Callback<Boolean> callback) {
     	return ask(null, windowNo, adMessage, callback);
     }
 
-    /**************************************************************************
-	 *	Ask Question with question icon and (OK) (Cancel) buttons
+    /**
+	 * Ask Question with question icon and (OK) (Cancel) buttons
 	 *
-	 *	@param	windowNo	Number of Window
-	 *	@param	adMessage	Message to be translated
-	 *	@param	additionalMessage			Additional clear text message
-	 *	@return true, if OK
-	 */    
+	 * @deprecated
+	 * @param	windowNo	Number of Window
+	 * @param	adMessage	Message to be translated
+	 * @param	additionalMessage			Additional clear text message
+	 * @return true, if OK
+	 */
+    @Deprecated(forRemoval = true, since = "11")
     public static boolean ask(int windowNo, String adMessage, String additionalMessage) {
     	return ask(windowNo, adMessage, additionalMessage, (Callback<Boolean>)null);
     }
     
-    /**************************************************************************
+    /**
 	 *	Ask Question with question icon and (OK) (Cancel) buttons
 	 *
 	 *	@param	windowNo	Number of Window
 	 *	@param	adMessage	Message to be translated
 	 *	@param	additionalMessage			Additional clear text message
      *  @param callback
-	 *	@return true, if OK
+	 *	@return ignore, use callback instead.
 	 */    
     public static boolean ask(int windowNo, String adMessage, String additionalMessage, final Callback<Boolean> callback) {
     	return ask(null, windowNo, adMessage, additionalMessage, callback);
     }
     
-    /**************************************************************************
+    /**
 	 *	Ask Question with question icon and (OK) (Cancel) buttons
 	 *
      *  @param  title
@@ -264,27 +283,27 @@ public final class Dialog {
 	 *	@param	adMessage	Message to be translated
      *  @param  callback
      *  @param  args
-	 *	@return true, if OK
+	 *	@return ignore, use callback instead.
 	 */
     public static boolean ask(String title, int windowNo, String adMessage, final Callback<Boolean> callback, Object ... args) {
     	return ask(title, windowNo, adMessage, null, callback, args);
     }
     
-    /**************************************************************************
+    /**
 	 *	Ask Question with question icon and (OK) (Cancel) buttons
 	 *
 	 *	@param	windowNo	Number of Window
 	 *	@param	title		Title of the dialog panel
 	 *	@param	adMessage   Message to be translated
 	 *	@param	msg			Additional clear text message
-     *  @param callback
-	 *	@return true, if OK
+     *  @param  callback
+	 *	@return ignore, use callback instead.
 	 */        
     public static boolean ask(int windowNo, String title, String adMessage, String msg, final Callback<Boolean> callback) {
     	return ask(title, windowNo, adMessage, msg, callback);
     }
     
-    /**************************************************************************
+    /**
 	 *	Ask Question with question icon and (OK) (Cancel) buttons
 	 *
      *  @param  title
@@ -293,7 +312,7 @@ public final class Dialog {
 	 *	@param	additionalMessage			Additional clear text message
      *  @param  callback
      *  @param  args
-	 *	@return true, if OK
+	 *	@return ignore, use callback instead.
 	 */
     public static boolean ask(String title, int windowNo, String adMessage, String additionalMessage, final Callback<Boolean> callback, Object ... args) {
     	Callback<Integer> msgCallback = getMessageCallback(callback);
@@ -308,6 +327,11 @@ public final class Dialog {
         return (response == Messagebox.OK);
     }
     
+    /**
+     * Create Callback<Integer> instance that will act as proxy for the "Callback&lt;Boolean&gt;" parameter.
+     * @param callback
+     * @return Callback<Integer> instance
+     */
     private static Callback<Integer> getMessageCallback(final Callback<Boolean> callback) {
     	Callback<Integer> msgCallback = null;
     	if (callback != null) {
@@ -323,10 +347,28 @@ public final class Dialog {
     	return msgCallback;
     }
     
+    /**
+     * @param message
+     * @param lookup
+     * @param editorType
+     * @param callback
+     * @param desktop
+     * @param windowNo
+     */
 	public static void askForInput(final String message, MLookup lookup, int editorType, final Callback<Object> callback, Desktop desktop, int windowNo) {
 		askForInput(message, lookup, editorType, callback, desktop, windowNo, "", null);
 	}
 	
+	/**
+	 * @param message
+	 * @param lookup
+	 * @param editorType
+	 * @param callback
+	 * @param desktop
+	 * @param windowNo
+	 * @param title
+	 * @param defaultValue
+	 */
 	public static void askForInput(final String message, MLookup lookup, int editorType, final Callback<Object> callback, Desktop desktop, int windowNo, String title, Object defaultValue) {
 		
 		final WEditor weditor = getEditor(lookup, editorType);
@@ -341,6 +383,11 @@ public final class Dialog {
 		}, new Event("onAskForInput"));
 	}
 	
+	/**
+	 * @param lookup
+	 * @param editorType
+	 * @return WEditor
+	 */
 	private static WEditor getEditor(MLookup lookup, int editorType) {
 		switch (editorType) {
 		case DisplayType.String:
@@ -365,10 +412,23 @@ public final class Dialog {
 		}
 	}
 
+	/**
+	 * @param windowNo
+	 * @param weditor
+	 * @param adMessage
+	 * @param callback
+	 */
     public static void askForInput(int windowNo, WEditor weditor, String adMessage, final Callback<Object> callback) {
     	askForInput(windowNo, weditor, adMessage, "", callback);
     }
     
+    /**
+     * @param windowNo
+     * @param weditor
+     * @param adMessage
+     * @param title
+     * @param callback
+     */
     public static void askForInput(int windowNo, WEditor weditor, String adMessage, String title, final Callback<Object> callback) {
     	Callback<Object> msgCallback = null;
     	if (callback != null) {
@@ -388,10 +448,21 @@ public final class Dialog {
         		Messagebox.OK | Messagebox.INPUT, Messagebox.QUESTION, weditor, msgCallback, (msgCallback == null));
     }
     
+    /**
+     * @param windowNo
+     * @param adMessage
+     * @param callback
+     */
     public static void askForInput(int windowNo, String adMessage, final Callback<String> callback) {
     	askForInput(windowNo, adMessage, "", callback);
     }
     
+    /**
+     * @param windowNo
+     * @param adMessage
+     * @param title
+     * @param callback
+     */
     public static void askForInput(int windowNo, String adMessage, String title, final Callback<String> callback) {
     	Callback<String> msgCallback = null;
     	if (callback != null) 
@@ -411,6 +482,12 @@ public final class Dialog {
         		Messagebox.OK | Messagebox.INPUT, Messagebox.QUESTION, msgCallback, (msgCallback == null));
     }
     
+    /**
+     * Same as askForInput but uses password editor for input field.
+     * @param windowNo
+     * @param adMessage
+     * @param callback
+     */
     public static void askForSecretInput(int windowNo, String adMessage, final Callback<String> callback) {
     	Callback<String> msgCallback = null;
     	if (callback != null) 
@@ -456,6 +533,13 @@ public final class Dialog {
         		Messagebox.OK | Messagebox.CANCEL | Messagebox.INPUT, Messagebox.QUESTION, weditor, msgCallback, (msgCallback == null));
     }
     
+    /**
+     * @param windowNo
+     * @param weditor
+     * @param adMessage
+     * @param title
+     * @param callback
+     */
     public static void askForInputWithCancel(int windowNo, WEditor weditor, String adMessage, String title, final Callback<Map.Entry<Boolean, Object>> callback) {
     	Callback<Map.Entry<Boolean, Object>> msgCallback = null;
     	if (callback != null) 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
index cd89c39174..c033b27123 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
@@ -160,8 +160,8 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
 	private static final String HISTORY_DAY_YEAR = "Year";
 	private static final String HISTORY_DAY_MONTH = "Month";
 	private static final String HISTORY_DAY_WEEK = "Week";
-	private static final String HISTORY_DAY_DAY = "Day";
-	ValueNamePair[] historyItems = new ValueNamePair[] {
+	private static final String HISTORY_DAY_DAY = "Day";	
+	protected ValueNamePair[] historyItems = new ValueNamePair[] {
 			new ValueNamePair("",                " "),
 			new ValueNamePair(HISTORY_DAY_ALL,   Msg.getMsg(Env.getCtx(), HISTORY_DAY_ALL)),
 			new ValueNamePair(HISTORY_DAY_YEAR,  Msg.getMsg(Env.getCtx(), HISTORY_DAY_YEAR)),
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 d33de7316c..dffa9e3d83 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
@@ -65,29 +65,23 @@ import org.zkoss.zul.Vbox;
 
 
 /**
- *	Schedule - Resource availability and assigment.
+ *	Schedule - Resource availability and assignment.
  *
  * 	@author 	Jorg Janke
  * 	@version 	$Id: InfoSchedule.java,v 1.2 2006/07/30 00:51:27 jjanke Exp $
  * 
  *  Zk Port
  *  @author Low Heng Sin
- *  
- *  Zk Port
  *  @author		Elaine
  *  @version	InfoSchedule.java Adempiere Swing UI 3.4.1 
  */
 public class InfoSchedule extends Window implements EventListener<Event>
 {
 	/**
-	 *
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 3349721592479638482L;
 
-	/**
-	 *  @param mAssignment optional assignment
-	 *  @param createNew if true, allows to create new assignments
-	 */
 	private Callback<MResourceAssignment> m_callback;
 	private Component m_parent;
 	/** Window No */
@@ -108,6 +102,11 @@ public class InfoSchedule extends Window implements EventListener<Event>
 		this(mAssignment, createNew, (Callback<MResourceAssignment>)null);
 	}
 	
+	/**
+	 * @param mAssignment
+	 * @param createNew
+	 * @param callback
+	 */
 	public InfoSchedule (MResourceAssignment mAssignment, boolean createNew, Callback<MResourceAssignment> callback)
 	{
 		this(mAssignment, createNew, (Component)null, callback);
@@ -183,7 +182,7 @@ public class InfoSchedule extends Window implements EventListener<Event>
 	}	//	InfoSchedule
 
 	/**
-	 * 	IDE Constructor
+	 * Default Constructor
 	 */
 	public InfoSchedule()
 	{
@@ -216,8 +215,8 @@ public class InfoSchedule extends Window implements EventListener<Event>
 	private Mask mask;
 
 	/**
-	 * 	Static Layout
-	 * 	@throws Exception
+	 * Layout dialog
+	 * @throws Exception
 	 */
 	private void init() throws Exception
 	{
@@ -262,8 +261,8 @@ public class InfoSchedule extends Window implements EventListener<Event>
 	}	//	jbInit
 
 	/**
-	 * 	Dynamic Init
-	 *  @param createNew if true, allows to create new assignments
+	 * Load resource and resource type
+	 * @param createNew if true, allows to create new assignments
 	 */
 	private void dynInit (boolean createNew) 
 	{
@@ -439,16 +438,14 @@ public class InfoSchedule extends Window implements EventListener<Event>
 		invalidate();
 	}	//	displayCalendar
 
-	/**************************************************************************
-	 * 	Dispose.
+	/**
+	 * Close dialog
 	 */
 	public void dispose()
 	{
 		this.detach();
 	}	//	dispose
 
-	/*************************************************************************/
-
 	/**
 	 * 	Callback.
 	 * 	Called from WSchedule after WAssignmentDialog finished
@@ -480,6 +477,7 @@ public class InfoSchedule extends Window implements EventListener<Event>
 		return m_mAssignment;
 	}	//	getMResourceAssignment
 
+	@Override
 	public void onEvent(Event event) throws Exception {
 		if (m_loading)
 			return;
@@ -515,6 +513,9 @@ public class InfoSchedule extends Window implements EventListener<Event>
 		//
 	}
 
+	/**
+	 * onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -524,6 +525,10 @@ public class InfoSchedule extends Window implements EventListener<Event>
 		dispose();
 	}
 	
+	/**
+	 * Edit or create calendar event (for S_ResourceAssignment)
+	 * @param event
+	 */
 	private void doEdit(CalendarsEvent event) {
 		ListItem listItem = fieldResource.getSelectedItem();
 		if (listItem == null)
@@ -656,6 +661,9 @@ public class InfoSchedule extends Window implements EventListener<Event>
 		}
 	}
 
+	/**
+	 * @return true if create new assignment is enable
+	 */
 	public boolean isCreateNew() {
 		return m_createNew;
 	}
@@ -680,6 +688,9 @@ public class InfoSchedule extends Window implements EventListener<Event>
 		}
 	}
 
+	/**
+	 * @return busy mask
+	 */
 	private Div getMask() {
 		if (mask == null) {
 			mask = new Mask();
@@ -687,10 +698,16 @@ public class InfoSchedule extends Window implements EventListener<Event>
 		return mask;
 	}
 	
+	/**
+	 * Show busy mask
+	 */
 	protected void showBusyMask() {
 		appendChild(getMask());
 	}
 	
+	/**
+	 * Hide busy mask
+	 */
 	protected void hideBusyMask() {
 		if (mask != null && mask.getParent() != null) {
 			mask.detach();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LabelAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LabelAction.java
index ad17f67da8..e21f812c18 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LabelAction.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LabelAction.java
@@ -37,6 +37,9 @@ import org.adempiere.webui.util.ZKUpdateUtil;
 import org.zkoss.zul.Popup;
 import org.zkoss.zul.impl.LabelImageElement;
 
+/**
+ * Toolbar action for labelling of record (AD_labelAssignment)
+ */
 public class LabelAction {
 	private AbstractADWindowContent panel;	
 	private Window window = null;	
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LoginWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LoginWindow.java
index 9eb0dd100b..f9a9218f03 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LoginWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LoginWindow.java
@@ -71,7 +71,7 @@ import org.zkoss.zk.ui.util.Clients;
 public class LoginWindow extends Window implements EventListener<Event>
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 8570332386555237381L;
 
@@ -87,6 +87,10 @@ public class LoginWindow extends Window implements EventListener<Event>
 
     public LoginWindow() {}
 
+    /**
+     * Layout window
+     * @param app
+     */
     public void init(IWebClient app)
     {
     	this.ctx = Env.getCtx();
@@ -100,15 +104,27 @@ public class LoginWindow extends Window implements EventListener<Event>
         setWidgetListener("onOK", "zAu.cmd0.showBusy(null)");
     }
 
+    /**
+     * Create login panel
+     */
     private void initComponents()
     {
         createLoginPanel();
     }
 
+    /**
+     * Create login panel
+     */
 	protected void createLoginPanel() {
 		pnlLogin = new LoginPanel(ctx, this);
 	}
 
+	/**
+	 * After verification of user name and password. 
+	 * @param userName
+	 * @param show
+	 * @param clientsKNPairs
+	 */
     public void loginOk(String userName, boolean show, KeyNamePair[] clientsKNPairs)
     {
     	boolean isClientDefined = (clientsKNPairs.length == 1 || ! Util.isEmpty(Env.getContext(ctx, Env.AD_USER_ID)));
@@ -123,6 +139,14 @@ public class LoginWindow extends Window implements EventListener<Event>
     	}
     }
 
+    /**
+     * Show role selection panel
+     * @param userName
+     * @param show
+     * @param clientsKNPairs
+     * @param isClientDefined
+     * @param isMFAValidated
+     */
 	public void showRolePanel(String userName, boolean show, KeyNamePair[] clientsKNPairs, boolean isClientDefined, boolean isMFAValidated) {
         this.getChildren().clear();
         if (pnlRole.show()) {
@@ -138,6 +162,13 @@ public class LoginWindow extends Window implements EventListener<Event>
         }
 	}
     
+	/**
+	 * Show change password panel
+	 * @param userName
+	 * @param userPassword
+	 * @param show
+	 * @param clientsKNPairs
+	 */
     public void changePassword(String userName, String userPassword, boolean show, KeyNamePair[] clientsKNPairs)
     {
     	Clients.clearBusy();
@@ -146,11 +177,23 @@ public class LoginWindow extends Window implements EventListener<Event>
         this.appendChild(pnlChangePassword);
     }
 
+    /**
+     * Create change password panel
+     * @param userName
+     * @param userPassword
+     * @param show
+     * @param clientsKNPairs
+     */
 	protected void createChangePasswordPanel(String userName,
 			String userPassword, boolean show, KeyNamePair[] clientsKNPairs) {
 		pnlChangePassword = new ChangePasswordPanel(ctx, this, userName, userPassword, show, clientsKNPairs);
 	}
     
+	/**
+	 * Show reset password panel
+	 * @param userName
+	 * @param noSecurityQuestion
+	 */
     public void resetPassword(String userName, boolean noSecurityQuestion)
     {
     	createResetPasswordPanel(userName, noSecurityQuestion);
@@ -158,16 +201,37 @@ public class LoginWindow extends Window implements EventListener<Event>
         this.appendChild(pnlResetPassword);
     }
 
+    /**
+     * Create reset password panel
+     * @param userName
+     * @param noSecurityQuestion
+     */
 	protected void createResetPasswordPanel(String userName,
 			boolean noSecurityQuestion) {
 		pnlResetPassword = new ResetPasswordPanel(ctx, this, userName, noSecurityQuestion);
 	}
 
+	/**
+	 * Show MFA panel
+	 * @param orgKNPair
+	 * @param isClientDefined
+	 * @param userName
+	 * @param show
+	 * @param clientsKNPairs
+	 */
 	public void validateMFA(KeyNamePair orgKNPair, boolean isClientDefined, String userName, boolean show, KeyNamePair[] clientsKNPairs) {
     	Clients.clearBusy();
 		createValidateMFAPanel(orgKNPair, isClientDefined, userName, show, clientsKNPairs);
 	}
 
+	/**
+	 * Create and show MFA panel
+	 * @param orgKNPair
+	 * @param isClientDefined
+	 * @param userName
+	 * @param show
+	 * @param clientsKNPairs
+	 */
 	private void createValidateMFAPanel(KeyNamePair orgKNPair, boolean isClientDefined, String userName, boolean show, KeyNamePair[] clientsKNPairs) {
 		if (pnlValidateMFA == null)
 			pnlValidateMFA = new ValidateMFAPanel(ctx, this, orgKNPair, isClientDefined, userName, show, clientsKNPairs);
@@ -177,6 +241,12 @@ public class LoginWindow extends Window implements EventListener<Event>
 		}
 	}
 
+	/**
+	 * Complete login process
+	 * @param login
+	 * @param m_orgKNPair
+	 * @param component
+	 */
 	public void loginCompleted(Login login, KeyNamePair m_orgKNPair, Window component)
     {
 		Session currSess = Executions.getCurrent().getDesktop().getSession();
@@ -215,13 +285,17 @@ public class LoginWindow extends Window implements EventListener<Event>
         app.loginCompleted();
     }
 
+	/**
+	 * Login cancel by user. Show login panel again.
+	 */
     public void loginCancelled()
     {
         createLoginPanel();
         this.getChildren().clear();
         this.appendChild(pnlLogin);
     }
-
+    
+    @Override
     public void onEvent(Event event)
     {
        // check that 'ENTER' key is pressed
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/MultiFileDownloadDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/MultiFileDownloadDialog.java
index 57589775cb..a1ddd4bafb 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/MultiFileDownloadDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/MultiFileDownloadDialog.java
@@ -26,6 +26,7 @@ import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zul.Vlayout;
 
 /**
+ * Dialog to download multiple files
  * @author hengsin
  *
  */
@@ -38,6 +39,9 @@ public class MultiFileDownloadDialog extends Window {
 	private static final long serialVersionUID = -6078788264410182680L;
 	private File[] files;
 
+	/**
+	 * @param files
+	 */
 	public MultiFileDownloadDialog(File[] files) {
 		super();
 		this.files = files;
@@ -49,6 +53,9 @@ public class MultiFileDownloadDialog extends Window {
 		});
 	}
 
+	/**
+	 * Show dialog with link for each file
+	 */
 	private void show() {
 		Vlayout layout = new Vlayout();
 		layout.setStyle("padding-top: 10px; padding-bottom: 10px;");
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/RecordTimeLinePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/RecordTimeLinePanel.java
index 7923476f42..bf50b8ae96 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/RecordTimeLinePanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/RecordTimeLinePanel.java
@@ -56,6 +56,7 @@ import org.zkoss.zul.Html;
 import org.zkoss.zul.Vlayout;
 
 /**
+ * Panel to present record change log in time line format.
  * @author hengsin
  *
  */
@@ -83,137 +84,155 @@ public class RecordTimeLinePanel extends Vlayout {
 		(DisplayType.Integer, Env.getLanguage(Env.getCtx()));
 	
 	/**
-	 * 
+	 * default constructor
 	 */
 	public RecordTimeLinePanel() {
 		setStyle("height:100%;width:100%;overflow:auto");
 	}
 
+	/**
+	 * Render change log time line for current record of gridTab.
+	 * @param gridTab
+	 */
 	public void render(GridTab gridTab) {
 		getChildren().clear();
 		if (gridTab == null) {			
 			return;
 		}
 		
-			if (gridTab.getRowCount() == 0 || gridTab.isNew()) {
-				return;
-			}
-			int recordId = gridTab.getRecord_ID();
-			String recordUU = gridTab.getRecord_UU();
-			int tableId = gridTab.getAD_Table_ID();
-			ArrayList<String> docActionValues = new ArrayList<String>();
-			ArrayList<String> docActionNames = new ArrayList<String>();
-			DocumentEngine.readReferenceList(docActionValues, docActionNames, new ArrayList<String>());
-			
-			ArrayList<String> docStatusValues = new ArrayList<String>();
-			ArrayList<String> docStatusNames = new ArrayList<String>();
-			DocumentEngine.readStatusReferenceList(docStatusValues, docStatusNames, new ArrayList<String>());
-			String reversedStatusName = null;
-			for(int i = 0; i < docStatusValues.size(); i++) {
-				if (DocAction.STATUS_Reversed.equals(docStatusValues.get(i)))
-					reversedStatusName = docStatusNames.get(i);
-			}
-			StringBuilder sql = new StringBuilder("SELECT u.AD_User_ID, l.created, c.columnName, l.oldValue, l.newValue, l.trxname, l.AD_Column_ID ") 
-					.append("FROM AD_ChangeLog l ")
-					.append("JOIN AD_Column c ON l.ad_column_id=c.ad_column_id ")
-					.append("JOIN AD_User u ON l.createdby=u.ad_user_id ")
-					.append("WHERE l.AD_Table_ID=? ")
-					.append("AND (l.Record_ID=? OR l.Record_UU=?) ")
-					.append("ORDER BY l.created desc, l.trxName ");
-			PreparedStatement stmt = null;
-			ResultSet rs = null;
-			try {
-				stmt = DB.prepareStatement(sql.toString(), (String)null);
-				stmt.setInt(1, tableId);
-				stmt.setInt(2, recordId);
-				stmt.setString(3, recordUU);
-				rs = stmt.executeQuery();
-				List<String> columns = null;
-				List<Integer> columnIds = null;
-				List<Pair<String, String>> changes = null;
-				String currentTrx = null;
-				String currentDocStatusOld = null;
-				String currentDocStatusNew = null;
-				Timestamp updated = null;
-				int userId = -1;
-				while (rs.next()) {					
-					String columnName = rs.getString(3);
-					String trxName = rs.getString(6);
-					String oldValue = rs.getString(4);
-					String newValue = rs.getString(5);
-					int AD_Column_ID = rs.getInt(7);
-					if (columns == null) {
-						columns = new ArrayList<String>();
-						changes = new ArrayList<>();
-						columnIds = new ArrayList<>();
-					}
-					if (currentTrx == null || currentTrx.equals(trxName)) {
-						if (currentTrx == null)
-							currentTrx = trxName;
-						if (columnName.equals("DocAction")) {
-							continue;
-						} else if (columnName.equals("DocStatus")) {							
-							if (currentDocStatusNew == null)
-								currentDocStatusNew = newValue;
-							currentDocStatusOld = oldValue;
-						} else {
-							GridField field = gridTab.getField(columnName);
-							if (field != null && field.isDisplayed(true)) {
-								columns.add(field.getHeader());
-								changes.add(new Pair<String, String>(oldValue, newValue));
-								columnIds.add(AD_Column_ID);
-							}
-						}
-					} else {						
-						buildChangeLogMessage(gridTab, docActionValues,
-								docActionNames, reversedStatusName, columns,
-								currentDocStatusOld, currentDocStatusNew,
-								updated, userId, changes, columnIds);												
-						currentTrx = trxName;						
-						currentDocStatusOld = null;
-						currentDocStatusNew = null;
-						columns = new ArrayList<String>();
-						changes = new ArrayList<>();
-						columnIds = new ArrayList<>();
-						if (columnName.equals("DocAction")) {
-							continue;
-						} else if (columnName.equals("DocStatus")) {
-							if (currentDocStatusOld == null)
-								currentDocStatusOld = oldValue;
+		if (gridTab.getRowCount() == 0 || gridTab.isNew()) {
+			return;
+		}
+		int recordId = gridTab.getRecord_ID();
+		String recordUU = gridTab.getRecord_UU();
+		int tableId = gridTab.getAD_Table_ID();
+		ArrayList<String> docActionValues = new ArrayList<String>();
+		ArrayList<String> docActionNames = new ArrayList<String>();
+		DocumentEngine.readReferenceList(docActionValues, docActionNames, new ArrayList<String>());
+		
+		ArrayList<String> docStatusValues = new ArrayList<String>();
+		ArrayList<String> docStatusNames = new ArrayList<String>();
+		DocumentEngine.readStatusReferenceList(docStatusValues, docStatusNames, new ArrayList<String>());
+		String reversedStatusName = null;
+		for(int i = 0; i < docStatusValues.size(); i++) {
+			if (DocAction.STATUS_Reversed.equals(docStatusValues.get(i)))
+				reversedStatusName = docStatusNames.get(i);
+		}
+		StringBuilder sql = new StringBuilder("SELECT u.AD_User_ID, l.created, c.columnName, l.oldValue, l.newValue, l.trxname, l.AD_Column_ID ") 
+				.append("FROM AD_ChangeLog l ")
+				.append("JOIN AD_Column c ON l.ad_column_id=c.ad_column_id ")
+				.append("JOIN AD_User u ON l.createdby=u.ad_user_id ")
+				.append("WHERE l.AD_Table_ID=? ")
+				.append("AND (l.Record_ID=? OR l.Record_UU=?) ")
+				.append("ORDER BY l.created desc, l.trxName ");
+		PreparedStatement stmt = null;
+		ResultSet rs = null;
+		try {
+			stmt = DB.prepareStatement(sql.toString(), (String)null);
+			stmt.setInt(1, tableId);
+			stmt.setInt(2, recordId);
+			stmt.setString(3, recordUU);
+			rs = stmt.executeQuery();
+			List<String> columns = null;
+			List<Integer> columnIds = null;
+			List<Pair<String, String>> changes = null;
+			String currentTrx = null;
+			String currentDocStatusOld = null;
+			String currentDocStatusNew = null;
+			Timestamp updated = null;
+			int userId = -1;
+			while (rs.next()) {					
+				String columnName = rs.getString(3);
+				String trxName = rs.getString(6);
+				String oldValue = rs.getString(4);
+				String newValue = rs.getString(5);
+				int AD_Column_ID = rs.getInt(7);
+				if (columns == null) {
+					columns = new ArrayList<String>();
+					changes = new ArrayList<>();
+					columnIds = new ArrayList<>();
+				}
+				if (currentTrx == null || currentTrx.equals(trxName)) {
+					if (currentTrx == null)
+						currentTrx = trxName;
+					if (columnName.equals("DocAction")) {
+						continue;
+					} else if (columnName.equals("DocStatus")) {							
+						if (currentDocStatusNew == null)
 							currentDocStatusNew = newValue;
-						} else {
-							GridField field = gridTab.getField(columnName);
-							if (field != null && field.isDisplayed(true)) {
-								columns.add(field.getHeader());
-								changes.add(new Pair<String, String>(oldValue, newValue));
-								columnIds.add(AD_Column_ID);
-							}
+						currentDocStatusOld = oldValue;
+					} else {
+						GridField field = gridTab.getField(columnName);
+						if (field != null && field.isDisplayed(true)) {
+							columns.add(field.getHeader());
+							changes.add(new Pair<String, String>(oldValue, newValue));
+							columnIds.add(AD_Column_ID);
 						}
 					}
-					userId = rs.getInt(1);
-					updated = rs.getTimestamp(2);
-				}
-				buildChangeLogMessage(gridTab, docActionValues, docActionNames,
-						reversedStatusName, columns, currentDocStatusOld,
-						currentDocStatusNew, updated, userId, changes, columnIds);
-				if (gridTab != null && gridTab.getValue("CreatedBy") != null) {
-					MUser createdBy = MUser.get(Env.getCtx(), (int) gridTab.getValue("CreatedBy"));
-					StringBuilder sb = new StringBuilder(" ")
-							.append(Msg.getMsg(Env.getCtx(), "Created")).append(" ");
-					if (gridTab.getTabNo() == 0) {
-						sb.append(Env.getContext(Env.getCtx(), gridTab.getWindowNo(), "_WinInfo_WindowName", true));
+				} else {						
+					buildChangeLogMessage(gridTab, docActionValues,
+							docActionNames, reversedStatusName, columns,
+							currentDocStatusOld, currentDocStatusNew,
+							updated, userId, changes, columnIds);												
+					currentTrx = trxName;						
+					currentDocStatusOld = null;
+					currentDocStatusNew = null;
+					columns = new ArrayList<String>();
+					changes = new ArrayList<>();
+					columnIds = new ArrayList<>();
+					if (columnName.equals("DocAction")) {
+						continue;
+					} else if (columnName.equals("DocStatus")) {
+						if (currentDocStatusOld == null)
+							currentDocStatusOld = oldValue;
+						currentDocStatusNew = newValue;
 					} else {
-						sb.append(gridTab.getName());
+						GridField field = gridTab.getField(columnName);
+						if (field != null && field.isDisplayed(true)) {
+							columns.add(field.getHeader());
+							changes.add(new Pair<String, String>(oldValue, newValue));
+							columnIds.add(AD_Column_ID);
+						}
 					}
-					buildActivityMessage((Timestamp) gridTab.getValue("Created"), sb.toString(), createdBy);
 				}
-			} catch (SQLException e) {
-				e.printStackTrace();
-			} finally {
-				DB.close(rs, stmt);
+				userId = rs.getInt(1);
+				updated = rs.getTimestamp(2);
 			}
+			buildChangeLogMessage(gridTab, docActionValues, docActionNames,
+					reversedStatusName, columns, currentDocStatusOld,
+					currentDocStatusNew, updated, userId, changes, columnIds);
+			if (gridTab != null && gridTab.getValue("CreatedBy") != null) {
+				MUser createdBy = MUser.get(Env.getCtx(), (int) gridTab.getValue("CreatedBy"));
+				StringBuilder sb = new StringBuilder(" ")
+						.append(Msg.getMsg(Env.getCtx(), "Created")).append(" ");
+				if (gridTab.getTabNo() == 0) {
+					sb.append(Env.getContext(Env.getCtx(), gridTab.getWindowNo(), "_WinInfo_WindowName", true));
+				} else {
+					sb.append(gridTab.getName());
+				}
+				buildActivityMessage((Timestamp) gridTab.getValue("Created"), sb.toString(), createdBy);
+			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		} finally {
+			DB.close(rs, stmt);
+		}
 	}
 
+	/**
+	 * Add change log message
+	 * @param gridTab
+	 * @param docActionValues
+	 * @param docActionNames
+	 * @param reversedStatusName
+	 * @param columns
+	 * @param currentDocStatusOld
+	 * @param currentDocStatusNew
+	 * @param updated
+	 * @param userId
+	 * @param changes
+	 * @param columnIds
+	 */
 	public void buildChangeLogMessage(GridTab gridTab,
 			ArrayList<String> docActionValues,
 			ArrayList<String> docActionNames, String reversedStatusName,
@@ -342,6 +361,17 @@ public class RecordTimeLinePanel extends Vlayout {
 		}
 	}
 
+	/**
+	 * Add document action message
+	 * @param docActionValues
+	 * @param docActionNames
+	 * @param reversedStatusName
+	 * @param updated
+	 * @param user
+	 * @param fromStatus
+	 * @param toStatus
+	 * @param windowNo
+	 */
 	private void buildDocActionMessage(ArrayList<String> docActionValues,
 			ArrayList<String> docActionNames, String reversedStatusName, Timestamp updated,
 			MUser user, String fromStatus, String toStatus, int windowNo) {
@@ -387,6 +417,12 @@ public class RecordTimeLinePanel extends Vlayout {
 		buildActivityMessage(updated, sb.toString(), user);
 	}
 
+	/**
+	 * Add message from change log or document action
+	 * @param activityDate
+	 * @param activityMessage
+	 * @param user
+	 */
 	private void buildActivityMessage(Timestamp activityDate, String activityMessage, MUser user) {		
 		StringBuilder sb = new StringBuilder();		
 		sb.append("<div class=\"help-content\">\n");		
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/SimplePDFViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/SimplePDFViewer.java
index 5b03bb52f7..fa78eaf487 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/SimplePDFViewer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/SimplePDFViewer.java
@@ -28,19 +28,23 @@ import org.zkoss.zul.impl.Utils;
 import org.zkoss.zul.impl.XulElement;
 
 /**
- * 
+ * Simple dialog to show PDF document
  * @author Low Heng Sin
  *
  */
 public class SimplePDFViewer extends Window {
 
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -6417954023873414350L;
 	private AMedia media;
 	private int mediaVersion = 0;
 
+	/**
+	 * @param title
+	 * @param pdfInput
+	 */
 	public SimplePDFViewer(String title, InputStream pdfInput) {
 		Iframe iframe = new Iframe();
 		iframe.setId("reportFrame");
@@ -83,6 +87,10 @@ public class SimplePDFViewer extends Window {
 		ZKUpdateUtil.setWidth(this, width + "px");
 	}
 
+	/**
+	 * Show pdf using viewer for mobile client
+	 * @param iframe
+	 */
 	protected void showMobileViewer(Iframe iframe) {
 		mediaVersion++;
 		String url = Utils.getDynamicMediaURI(this, mediaVersion, media.getName(), media.getFormat());	
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
index 63f70b1c4d..f861ea787c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
@@ -86,7 +86,7 @@ public final class WAccountDialog extends Window
 	implements EventListener<Event>, DataStatusListener, ValueChangeListener
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 3041802296879719489L;
 
@@ -99,6 +99,7 @@ public final class WAccountDialog extends Window
 	 *  @param title title
 	 *  @param mAccount account info
 	 *  @param C_AcctSchema_ID as
+	 *  @param callback
 	 */
 	public WAccountDialog (String title,
 		MAccountLookup mAccount, int C_AcctSchema_ID, Callback<Integer> callback)
@@ -201,7 +202,7 @@ public final class WAccountDialog extends Window
 
 
 	/**
-	 *	Static component init.
+	 *	Create components and layout dialog
 	 *  <pre>
 	 *  - north
 	 *    - parameterPanel
@@ -214,7 +215,7 @@ public final class WAccountDialog extends Window
 	 *  </pre>
 	 *  @throws Exception
 	 */
-	void init() throws Exception
+	protected void init() throws Exception
 	{
 		//
 		Caption caption = new Caption(Msg.getMsg(Env.getCtx(),"Parameter"));
@@ -313,12 +314,10 @@ public final class WAccountDialog extends Window
 		}
 		
 		addEventListener(Events.ON_CANCEL, e -> onCancel());
-	}	//	jbInit
+	}	//	init
 
 	/**
-	 *	Dyanmic Init.
-	 *  When a row is selected, the editor values are set
-	 *  (editors do not change grid)
+	 *  Load account (valid combination) details
 	 *  @return true if initialized
 	 */
 	private boolean initAccount()
@@ -375,8 +374,6 @@ public final class WAccountDialog extends Window
 		//	Finish
 		m_query = new MQuery();
 		m_query.addRestriction("C_AcctSchema_ID", MQuery.EQUAL, m_C_AcctSchema_ID);
-		//action_save doesn't filter by IsFullyQualified
-//		m_query.addRestriction("IsFullyQualified", MQuery.EQUAL, "Y");
 		if (m_mAccount.C_ValidCombination_ID == 0)
 			m_mTab.setQuery(MQuery.getEqualQuery("1", "2"));
 		else
@@ -407,10 +404,12 @@ public final class WAccountDialog extends Window
 			}
 		}
 
-		log.config("fini");
 		return true;
 	}	//	initAccount
 
+	/**
+	 * Layout parameter panel
+	 */
 	protected void layoutParameters() {
 		m_smallWidth = ClientInfo.maxWidth(ClientInfo.SMALL_WIDTH-1);
 		
@@ -560,8 +559,8 @@ public final class WAccountDialog extends Window
 	}
 
 	/**
-	 *	Add Editor to parameterPanel alernative right/left depending on m_newRow.
-	 *  Field Value changes update Editors
+	 *	Add Editor to parameterPanel alternate right/left depending on m_newRow.<br/>
+	 *  Editor will listen to value change event of field.
 	 *  @param field field
 	 *  @param editor editor
 	 *  @param mandatory mandatory
@@ -727,6 +726,7 @@ public final class WAccountDialog extends Window
 		}
 	}	//	saveSelection
 
+	@Override
 	public void onEvent(Event event) throws Exception {
 		if (event.getTarget().getId().equals("Ok"))
 		{
@@ -793,6 +793,9 @@ public final class WAccountDialog extends Window
 			action_Find (true);
 	}
 
+	/**
+	 * onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -802,7 +805,12 @@ public final class WAccountDialog extends Window
 		dispose();
 	}
 
-	boolean needConfirm(WEditor editor, MAccount combiOrg)
+	/**
+	 * @param editor
+	 * @param combiOrg
+	 * @return true if value has change
+	 */
+	protected boolean needConfirm(WEditor editor, MAccount combiOrg)
 	{
 		if (editor != null ) {
 			String columnName = editor.getColumnName();
@@ -822,6 +830,7 @@ public final class WAccountDialog extends Window
 	 *	Status Change Listener
 	 *  @param e event
 	 */
+	@Override
 	public void dataStatusChanged (DataStatusEvent e)
 	{
 		if (log.isLoggable(Level.CONFIG)) log.config(e.toString());
@@ -832,15 +841,13 @@ public final class WAccountDialog extends Window
 
 
 	/**
-	 *	Action Find.
-	 *	- create where clause
+	 *	Action Find.<br/>
+	 *	- create where clause<br/>
 	 *	- query database
 	 *  @param includeAliasCombination include alias combination
 	 */
 	private void action_Find (boolean includeAliasCombination)
 	{
-		log.info("");
-
 		//	Create where Clause
 		MQuery query = null;
 		if (m_query != null)
@@ -918,7 +925,6 @@ public final class WAccountDialog extends Window
 	 */
 	private boolean action_Save()
 	{
-		log.info("");
 		/**
 		 *	Check completeness (mandatory fields) ... and for duplicates
 		 */
@@ -1084,7 +1090,6 @@ public final class WAccountDialog extends Window
 			return false;
 		}
 
-
 		/**
 		 *	Check if already exists
 		 */
@@ -1160,7 +1165,8 @@ public final class WAccountDialog extends Window
 			return true;
 		}
 
-		log.config("New");
+		if (log.isLoggable(Level.CONFIG))
+			log.config("New");
 		Alias = null;
 		if (f_Alias != null)
 			Alias = f_Alias.getValue().toString();
@@ -1230,6 +1236,10 @@ public final class WAccountDialog extends Window
 		return true;
 	}	//	action_Save
 
+	/**
+	 * @param value
+	 * @return true if value is null or empty string
+	 */
 	private boolean isEmpty(Object value) {
 		if (value == null)
 			return true;
@@ -1242,7 +1252,7 @@ public final class WAccountDialog extends Window
 
 
 	/**
-	 *	Ignore
+	 * Ignore changes
 	 */
 	private void action_Ignore()
 	{
@@ -1295,7 +1305,7 @@ public final class WAccountDialog extends Window
 
 	/**
 	 *	Get selected account
-	 *  @return account
+	 *  @return account (C_ValidCombination_ID)
 	 */
 	public Integer getValue()
 	{
@@ -1309,6 +1319,7 @@ public final class WAccountDialog extends Window
 	 * 	valueChange - Account Changed
 	 *	@param evt event
 	 */
+	@Override
 	public void valueChange(ValueChangeEvent evt) {
 		Object newValue = evt.getNewValue();
 		if (newValue instanceof Integer) {
@@ -1321,6 +1332,9 @@ public final class WAccountDialog extends Window
 		}
 	}
 		
+	/**
+	 * onClientInfo event
+	 */
 	protected void onClientInfo() {
 		if (parameterLayout != null && parameterLayout.getRows() != null) {
 			boolean smallWidth = ClientInfo.maxWidth(ClientInfo.SMALL_WIDTH-1);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java
index b63622ab4e..28b176d131 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAssignmentDialog.java
@@ -75,7 +75,7 @@ import org.zkoss.zul.Listitem;
 public class WAssignmentDialog extends Window implements EventListener<Event>
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -1762339564864115852L;
 	
@@ -85,10 +85,10 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
 	/**
 	 * 	Assignment Dialog.
 	 * 	<pre>
-	 * 		Creates a new assignment oor displays an assignment
+	 * 		Creates a new assignment or displays an assignment
 	 * 		Create new:	(ID == 0)
 	 * 			check availability and create assignment
-	 * 			(confirmed when order/incoice/timeExpense is processed)
+	 * 			(confirmed when order/invoice/timeExpense is processed)
 	 * 			alternatively let InfoResource do the assignment
 	 * 			return ID
 	 * 		Existing assignment: (ID != 0)
@@ -98,7 +98,7 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
 	 * 	</pre>
 	 *  @param mAssignment Assignment
 	 *  @param allowZoom allow to zoom to schedule
-	 *  @param allowDelete allow to delete recorde
+	 *  @param allowDelete allow to delete record
 	 */
 	public WAssignmentDialog (MResourceAssignment mAssignment, 
 		boolean allowZoom, boolean allowDelete)
@@ -136,8 +136,7 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
 	/**	Logger							*/
 	private static final CLogger log = CLogger.getCLogger(WAssignmentDialog.class);
 	/**	Lookup with Resource and UOM		*/
-	private HashMap<KeyNamePair,KeyNamePair>	m_lookup = new HashMap<KeyNamePair,KeyNamePair>();
-	
+	private HashMap<KeyNamePair,KeyNamePair>	m_lookup = new HashMap<KeyNamePair,KeyNamePair>();	
 	//
 	private Grid mainPanel = new Grid();
 	private Label lResource = new Label(Msg.translate(Env.getCtx(), "S_Resource_ID"));
@@ -158,7 +157,7 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
 	private boolean m_zoom;
 
 	/**
-	 * 	Static Init
+	 * 	Layout dialog
 	 * 	@throws Exception
 	 */
 	private void init() throws Exception
@@ -223,7 +222,7 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
 		
 		addEventListener(Events.ON_CANCEL, e -> onCancel());
 		//
-	}	//	jbInit
+	}	//	init
 
 	/**
 	 * 	Initialize component & values from m_mAssignment
@@ -271,9 +270,9 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
 		fQty.setEnabled(readWrite);
 
 		m_setting = false;
-	}	//	dynInit
+	}	//	setDisplay
 
-	/**************************************************************************
+	/**
 	 * 	Get Assignment
 	 * 	@return Assignment
 	 */
@@ -282,14 +281,12 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
 		return m_mAssignment;
 	}	//	getMResourceAssignment
 
-
 	/**
 	 * 	Check availability and insert record
 	 *  @return true if saved/updated
 	 */
 	private boolean cmd_save()
 	{
-		log.config("");
 		//	Set AssignDateTo
 		Calendar date = new GregorianCalendar();
 		getDateAndTimeFrom(date);
@@ -302,14 +299,12 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
 		Timestamp assignDateTo = TimeUtil.addMinutess(assignDateFrom, minutes);
 		m_mAssignment.setAssignDateTo (assignDateTo);
 		//
-	//	m_mAssignment.dump();
 		return m_mAssignment.save();
 	}	//	cmdSave
 
 	
-	/**************************************************************************
+	/**
 	 * 	Load Resources.
-	 *  called from variable constructor
 	 * 	@return Array with resources
 	 */
 	private KeyNamePair[] getResources()
@@ -358,6 +353,7 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
 		return retValue;
 	}	//	getResources
 
+	@Override
 	public void onEvent(Event e) throws Exception {
 		if (m_setting)
 			return;
@@ -428,6 +424,9 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
 		}		
 	}
 
+	/**
+	 * onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -437,6 +436,9 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
 		detach();
 	}
 
+	/**
+	 * Open info schedule window
+	 */
 	public void onShowSchedule() 
 	{
 		InfoSchedule is = new InfoSchedule (m_mAssignment, true, this, new Callback<MResourceAssignment>() {			
@@ -456,6 +458,10 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
 		is.focus();
 	}
 	
+	/**
+	 * Set date and time from to date calendar
+	 * @param date
+	 */
 	private void getDateAndTimeFrom(Calendar date) {
 		Date dateFrom = fDateFrom.getValue();
 		Date timeFrom = fTimeFrom.getValue();		
@@ -466,10 +472,16 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
 		date.set(Calendar.MINUTE, time.get(Calendar.MINUTE));
 	}
 
+	/**
+	 * @return true if cancel by user
+	 */
 	public boolean isCancelled() {
 		return m_cancel;
 	}
 	
+	/**
+	 * @return from Datebox
+	 */
 	public Datebox getDateFrom() {
 		return fDateFrom;
 	}
@@ -483,7 +495,5 @@ public class WAssignmentDialog extends Window implements EventListener<Event>
 			}
 		}
 		return b;
-	}
-	
-	
-}	//	VAssignmentDialog
+	}		
+}	//	WAssignmentDialog
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAutoCompleterCity.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAutoCompleterCity.java
index a0775bdaaa..fe2d7c8af6 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAutoCompleterCity.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAutoCompleterCity.java
@@ -31,16 +31,14 @@ import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.event.InputEvent;
 import org.zkoss.zul.Timer;
 
-
-
 /**
+ * Auto complete for city
  * @author Cristina Ghita - www.arhipac.ro
- *
  */
 public class WAutoCompleterCity extends AutoComplete implements EventListener<Event>
 {
 	/**
-	 * 
+	 * generated serial id 
 	 */
 	private static final long serialVersionUID = -5130826429569842714L;
 
@@ -60,6 +58,9 @@ public class WAutoCompleterCity extends AutoComplete implements EventListener<Ev
 
 	private final int m_windowNo;
 
+	/**
+	 * @param m_windowNo
+	 */
 	public WAutoCompleterCity(int m_windowNo)
 	{ 
 		super();
@@ -81,6 +82,10 @@ public class WAutoCompleterCity extends AutoComplete implements EventListener<Ev
 		super.onChanging(evt);
 	}
 
+	/**
+	 * Filter list by val (case insensitive starts with)
+	 * @param val
+	 */
 	public void refreshData(String val) 
 	{
 		String search = val;
@@ -143,6 +148,9 @@ public class WAutoCompleterCity extends AutoComplete implements EventListener<Ev
 		this.setDescription(cityDesc);
 	}
 
+	/**
+	 * Load records from C_City
+	 */
 	public void fillList()
 	{
 		// Carlos Ruiz - globalqss - improve to avoid going to the database on every keystroke
@@ -198,28 +206,47 @@ public class WAutoCompleterCity extends AutoComplete implements EventListener<Ev
 		refreshData("");
 	}
 
+	/**
+	 * @param vo
+	 */
 	private void setCity(CityVO vo)
 	{
 		m_city = vo;
 	}
+	
+	/**
+	 * @return C_City_ID
+	 */
 	public int getC_City_ID()
 	{
 		return m_city != null ? m_city.C_City_ID : -1;
 	}
+	
+	/**
+	 * @return AD_Client_ID of current session
+	 */
 	public int getAD_Client_ID()
 	{
 		return Env.getAD_Client_ID(Env.getCtx());
 	}
+	
+	/**
+	 * @return C_Country_ID from window context
+	 */
 	public int getC_Country_ID()
 	{
 		return Env.getContextAsInt(Env.getCtx(), m_windowNo, Env.TAB_INFO, "C_Country_ID");
 	}
+	
+	/**
+	 * @return C_Region_ID from window context
+	 */
 	public int getC_Region_ID()
 	{
 		return Env.getContextAsInt(Env.getCtx(), m_windowNo, Env.TAB_INFO, "C_Region_ID");
 	}
 
-
+	@Override
 	public void onEvent(Event event) throws Exception 
 	{
 		int index = this.getSelectedIndex();
@@ -238,5 +265,4 @@ public class WAutoCompleterCity extends AutoComplete implements EventListener<Ev
 			this.setText(city.CityName);
 		}
 	}
-
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java
index d598426768..f2b77aa500 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java
@@ -58,7 +58,7 @@ import org.zkoss.zul.Treerow;
 import org.zkoss.zul.Vlayout;
 
 /**
- * 	Application Chat
+ * 	Chat dialog (CM_Chat)
  *
  *  @author Jorg Janke
  *  @version $Id: AChat.java,v 1.3 2006/07/30 00:51:27 jjanke Exp $
@@ -66,7 +66,7 @@ import org.zkoss.zul.Vlayout;
 public class WChat extends Window implements EventListener<Event>, DialogEvents
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 8839053486411714175L;
 
@@ -78,7 +78,7 @@ public class WChat extends Window implements EventListener<Event>, DialogEvents
 
 	/**
 	 *	Constructor.
-	 *	loads Chat, if ID &lt;&gt; 0
+	 *	loads Chat, if CM_Chat_ID &gt; 0
 	 *  @param WindowNo window no
 	 *  @param CM_Chat_ID chat
 	 *  @param AD_Table_ID table
@@ -138,7 +138,7 @@ public class WChat extends Window implements EventListener<Event>, DialogEvents
 	private String orientation;
 
 	/**
-	 * 	Static Init.
+	 * 	Layout dialog
 	 *	@throws Exception
 	 */
 	private void staticInit () throws Exception
@@ -148,8 +148,7 @@ public class WChat extends Window implements EventListener<Event>, DialogEvents
 		this.setAttribute(AdempiereWebUI.WIDGET_INSTANCE_NAME, "chat");
 		this.appendChild(mainPanel);
 		mainPanel.setStyle("border: none; background-color: white;");
-		//
-		
+		//		
 		Center center = new Center();
 		center.setSclass("dialog-content");
 		Vlayout content = new Vlayout();
@@ -200,6 +199,9 @@ public class WChat extends Window implements EventListener<Event>, DialogEvents
 		addEventListener(Events.ON_CANCEL, e -> onCancel());
 	}
 	
+	/**
+	 * Handle onClientInfo event
+	 */
 	protected void onClientInfo()
 	{		
 		if (getPage() != null)
@@ -216,7 +218,7 @@ public class WChat extends Window implements EventListener<Event>, DialogEvents
 	}
 	
 	/**
-	 * 	Load Chat
+	 * 	Load chat entries (CM_ChatEntry)
 	 */
 	private void loadChat()
 	{
@@ -235,6 +237,10 @@ public class WChat extends Window implements EventListener<Event>, DialogEvents
 		}
 	}	//	loadChat
 
+	/**
+	 * Add entry to UI and {@link #entryMap}
+	 * @param entry
+	 */
 	protected void addEntry(MChatEntry entry) {
 		if (entry.getCM_ChatEntryParent_ID() == 0) {
 			Treechildren treeChildren = messageTree.getTreechildren();
@@ -297,6 +303,10 @@ public class WChat extends Window implements EventListener<Event>, DialogEvents
 		}
 	}
 
+	/**
+	 * @param entry
+	 * @return time stamp label
+	 */
 	protected Label createTimestampLabel(MChatEntry entry) {
 		Timestamp created = entry.getCreated();
 		if (m_format == null)
@@ -306,6 +316,10 @@ public class WChat extends Window implements EventListener<Event>, DialogEvents
 		return timeLabel;
 	}
 
+	/**
+	 * @param entry
+	 * @return user name label
+	 */
 	protected Label createUserNameLabel(MChatEntry entry) {
 		Label userLabel;
 		MUser user = MUser.get(Env.getCtx(), entry.getCreatedBy());
@@ -322,9 +336,8 @@ public class WChat extends Window implements EventListener<Event>, DialogEvents
 		return button;
 	}
 
-
 	/**
-	 * 	Action Performed
+	 * 	Handle event
 	 *	@param e event
 	 */
 	public void actionPerformed (Event e)
@@ -383,10 +396,14 @@ public class WChat extends Window implements EventListener<Event>, DialogEvents
 		
 	}	//	actionPerformed
 
+	@Override
 	public void onEvent(Event event) throws Exception {
 		actionPerformed(event);
 	}
 
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WCtxHelpSuggestion.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WCtxHelpSuggestion.java
index 6f3ea60aa2..b26f040b27 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WCtxHelpSuggestion.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WCtxHelpSuggestion.java
@@ -43,8 +43,8 @@ import org.zkoss.zul.South;
 import org.zkoss.zul.Vbox;
 
 /**
+ * Dialog to capture suggestion for context help (AD_CtxHelp)
  * @author hengsin
- *
  */
 public class WCtxHelpSuggestion extends Window implements EventListener<Event> {
 
@@ -68,13 +68,18 @@ public class WCtxHelpSuggestion extends Window implements EventListener<Event> {
 	private boolean isUseEscForTabClosing = MSysConfig.getBooleanValue(MSysConfig.USE_ESC_FOR_TAB_CLOSING, false, Env.getAD_Client_ID(Env.getCtx()));
 
 	/**
-	 * default constructor
+	 * @param ctxHelpMsg
 	 */
 	public WCtxHelpSuggestion(MCtxHelpMsg ctxHelpMsg) {
 		this.ctxHelpMsg = new MCtxHelpMsg(ctxHelpMsg.getCtx(), ctxHelpMsg.getAD_CtxHelpMsg_ID(), ctxHelpMsg.get_TrxName());
 		layout();
 	}
 
+	/**
+	 * @param po
+	 * @param baseContent
+	 * @param translatedContent
+	 */
 	public WCtxHelpSuggestion(PO po, String baseContent, String translatedContent) {
 		this.po = po;
 		this.baseContent = baseContent;
@@ -82,6 +87,9 @@ public class WCtxHelpSuggestion extends Window implements EventListener<Event> {
 		layout();
 	}
 
+	/**
+	 * Layout dialog
+	 */
 	private void layout() {
 		Borderlayout borderlayout = new Borderlayout();
 		appendChild(borderlayout);
@@ -175,6 +183,9 @@ public class WCtxHelpSuggestion extends Window implements EventListener<Event> {
 		}		
 	}
 
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -183,6 +194,9 @@ public class WCtxHelpSuggestion extends Window implements EventListener<Event> {
 		this.detach();
 	}
 
+	/**
+	 * Save changes to AD_CtxHelpMsg or AD_CtxHelpSuggestion
+	 */
 	private void onSave() {
 		String trxName = Trx.createTrxName();
 		Trx trx = Trx.get(trxName, true);
@@ -206,6 +220,10 @@ public class WCtxHelpSuggestion extends Window implements EventListener<Event> {
 		}
 	}
 	
+	/**
+	 * Save changes to AD_CtxHelpMsg or AD_CtxHelpSuggestion
+	 * @param trx
+	 */
 	private void onSave0(Trx trx) {
 		if (ctxHelpMsg != null && ctxHelpMsg.getAD_Client_ID() == Env.getAD_Client_ID(Env.getCtx())) {
 			if (Env.isBaseLanguage(Env.getCtx(), I_AD_CtxHelpMsg.Table_Name)) {
@@ -291,6 +309,11 @@ public class WCtxHelpSuggestion extends Window implements EventListener<Event> {
 		this.detach();
 	}
 	
+	/**
+	 * remove html header tag
+	 * @param htmlString
+	 * @return alter string
+	 */
 	private String removeHeaderTag(String htmlString) {
 		htmlString = htmlString
 				.replace("<html>", "")
@@ -302,6 +325,10 @@ public class WCtxHelpSuggestion extends Window implements EventListener<Event> {
 		return htmlString;
 	}
 	
+	/**
+	 * @param po
+	 * @return context help name for po
+	 */
 	private String getContextHelpName(PO po) {
 		if (po == null) {
 			return "Home";
@@ -337,6 +364,10 @@ public class WCtxHelpSuggestion extends Window implements EventListener<Event> {
 		}
 	}
 	
+	/**
+	 * @param po
+	 * @param ctxHelp
+	 */
 	private void setContextHelpInfo(PO po, MCtxHelp ctxHelp) {
 		if (po == null) {
 			ctxHelp.setName("Home");
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
index 09acf5af10..139dc1b559 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WEMailDialog.java
@@ -90,7 +90,7 @@ import org.zkoss.zul.North;
 import org.zkoss.zul.South;
 
 /**
- *	EMail Dialog
+ *	Send EMail Dialog
  *
  *  @author 	Jorg Janke
  *  @version 	$Id: EMailDialog.java,v 1.2 2006/07/30 00:51:27 jjanke Exp $
@@ -106,7 +106,7 @@ import org.zkoss.zul.South;
 public class WEMailDialog extends Window implements EventListener<Event>, ValueChangeListener
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 556391720307848225L;
 
@@ -294,7 +294,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 	}
 
 	/**
-	 *	Static Init
+	 * Layout dialog
 	 */
 	protected void render() throws Exception
 	{
@@ -305,8 +305,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 		lAttachment.setValue(Msg.getMsg(Env.getCtx(), "Attachment") + ":");
 		fFrom.setReadonly(true);
 		isAcknowledgmentReceipt.setLabel(Msg.getMsg(Env.getCtx(), "RequestReadReceipt"));
-		//
-				
+		//				
 		Grid grid = new Grid();
 		ZKUpdateUtil.setWidth(grid, "100%");
         grid.setStyle("margin:0; padding:0; align: center; valign: center; border:0");
@@ -452,7 +451,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 	}	//	render
 
 	/**
-	 *	Set all properties
+	 *  Set value of fields
 	 */
 	public void set (MUser from, String to, String subject, String message)
 	{
@@ -464,7 +463,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 	}	//	set
 
 	/**
-	 *  Set Address
+	 *  Set to Address
 	 */
 	public void setTo(String newTo)
 	{
@@ -482,7 +481,8 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 	}	//	setCc
 
 	/**
-	 *  Get Address
+	 *  Get to Address
+	 *  @return to address
 	 */
 	public String getTo()
 	{
@@ -492,6 +492,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 
 	/**
 	 *  Get CC Address
+	 *  @return cc address
 	 */
 	public String getCc()
 	{
@@ -500,7 +501,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 	}	//	getCc
 
 	/**
-	 *  Set Sender
+	 *  Set Sender (from)
 	 */
 	public void setFrom(MUser newFrom)
 	{
@@ -517,6 +518,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 
 	/**
 	 *  Get Sender
+	 *  @return from user
 	 */
 	public MUser getFrom()
 	{
@@ -525,6 +527,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 
 	/**
 	 *  Set Subject
+	 *  @param newSubject
 	 */
 	public void setSubject(String newSubject)
 	{
@@ -534,6 +537,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 
 	/**
 	 *  Get Subject
+	 *  @return subject
 	 */
 	public String getSubject()
 	{
@@ -543,16 +547,17 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 
 	/**
 	 *  Set Message
+	 *  @param newMessage
 	 */
 	public void setMessage(String newMessage)
 	{
 		m_message = newMessage;
 		fMessage.setValue(m_message);
-//		fMessage.setCaretPosition(0);
 	}   //  setMessage
 
 	/**
 	 *  Get Message
+	 *  @return message
 	 */
 	public String getMessage()
 	{
@@ -562,6 +567,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 
 	/**
 	 *  Set Attachment
+	 *  @param attachment
 	 */
 	public void setAttachment (DataSource attachment)
 	{
@@ -572,15 +578,17 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 
 	/**
 	 *  Get Attachment
+	 *  @return attachment data source
 	 */
 	public DataSource getAttachment()
 	{
 		return m_attachment;
 	}	//	getAttachment
 
-	/**************************************************************************
+	/**
 	 * 	Action Listener - Send email
 	 */
+	@Override	
 	public void onEvent(Event event) throws Exception {		
 		if (event.getTarget().getId().equals(ConfirmPanel.A_CANCEL))
 			onCancel();
@@ -649,6 +657,9 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 			addMailText();
 	}
 
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -657,6 +668,9 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 		onClose();
 	}
 	
+	/**
+	 * Handle onSize event
+	 */
 	private void onSize() {
 		fMessage.invalidate();
 	}
@@ -672,6 +686,11 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 		getFirstChild().invalidate();
 	}
 
+	/**
+	 * Get content of media
+	 * @param media
+	 * @return byte[] content
+	 */
 	private byte[] getMediaData(Media media) {
 		byte[] bytes = null;
 		
@@ -703,6 +722,11 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 		return bytes;
 	}
 	
+	/**
+	 * Get charset from content type header
+	 * @param contentType
+	 * @return charset
+	 */
 	private String getCharset(String contentType) {
 		if (contentType != null) {
 			int j = contentType.indexOf("charset=");
@@ -715,15 +739,16 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 	}
 	
 	/**
-	 * 	Vetoable Change - User selected 
 	 *	@param evt
 	 *	@throws PropertyVetoException
 	 */
+	@Override
 	public void valueChange(ValueChangeEvent evt) {
 		WSearchEditor source = (WSearchEditor) evt.getSource();
         Object value = evt.getNewValue();
 
-		log.info("Value=" + value);
+        if (log.isLoggable(Level.INFO))
+        	log.info("Value=" + value);
 
         if (value == null)
         {
@@ -765,6 +790,11 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
         return;
 	}
 	
+	/**
+	 * Add to email address
+	 * @param email
+	 * @param first
+	 */
 	public void addTo(String email, boolean first) {
 		if (Util.isEmpty(email))
 			return;
@@ -777,6 +807,11 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 		}
 	}
 	
+	/**
+	 * Add cc email address
+	 * @param email
+	 * @param first
+	 */
 	public void addCC(String email, boolean first) {
 		if (Util.isEmpty(email))
 			return;
@@ -793,7 +828,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 	 * convert attach image as base64 and embed to message content for preview in cfEditor
 	 * @param mt
 	 * @param attachment
-	 * @return
+	 * @return encoded image data
 	 */
 	public static String embedImgToEmail (MMailText mt, MAttachment attachment){
 
@@ -886,7 +921,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 	/**
 	 * remove base64 image encode in message content before sent email 
 	 * @param base64
-	 * @return
+	 * @return alter string
 	 */
 	public static String replaceBASE64Img (String base64){
 		// pattern map base64 in image
@@ -910,7 +945,9 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 		
 	}
 	
-	
+	/**
+	 * Add attachment from sender's default MMailText (if any)s
+	 */
 	private void addMailText()
 	{
 		MMailText mt = (MMailText) MUser.get(Env.getCtx()).getR_DefaultMailText();
@@ -946,7 +983,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 	}
 
 	/**
-	 * Set the user to editor and trigger the event change
+	 * Update user to editor and fire value change event
 	 * @param newUserTo
 	 */
 	public void setUserTo(int newUserTo) {
@@ -955,7 +992,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 	}
 
 	/**
-	 * Set the user Cc editor and trigger the event change
+	 * Update user cc editor and fire value change event
 	 * @param newUserCc
 	 */
 	public void setUserCc(int newUserCc) {
@@ -964,7 +1001,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 	}
 
 	/**
-	 * Clear the window context variables to prefill the dialog
+	 * Clear window context variables
 	 * @param m_WindowNo
 	 */
 	private void clearEMailContext(int m_WindowNo) {
@@ -977,7 +1014,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 	}
 
 	/**
-	 * Send the event to listeners that prefill dialog variables
+	 * Send REPORT_SEND_EMAIL OSGi event to initialize window context variables for dialog
 	 * @param windowNo
 	 * @param tableId
 	 * @param recordId
@@ -992,7 +1029,7 @@ public class WEMailDialog extends Window implements EventListener<Event>, ValueC
 	}
 
 	/**
-	 * Set the default dialog values from context
+	 * Set default fields value from window context
 	 * @param windowNo
 	 */
 	private void setValuesFromContext(int windowNo) {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java
index 0f1295a4f7..e68bd96be7 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java
@@ -60,13 +60,13 @@ import org.zkoss.zul.Menuitem;
 import org.zkoss.zul.South;
 
 /**
- * Change History for field
+ * Dialog to view field change log history
  * @author Low Heng Sin
  */
 public class WFieldRecordInfo extends Window implements EventListener<Event>
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 439310027130417727L;
 
@@ -78,7 +78,7 @@ public class WFieldRecordInfo extends Window implements EventListener<Event>
 	private boolean isUseEscForTabClosing = MSysConfig.getBooleanValue(MSysConfig.USE_ESC_FOR_TAB_CLOSING, false, Env.getAD_Client_ID(Env.getCtx()));
 
 	/**
-	 *	Record Info
+	 *	Field Info
 	 *	@param title title
 	 *	@param AD_Table_ID
 	 *  @param AD_Column_ID
@@ -123,13 +123,13 @@ public class WFieldRecordInfo extends Window implements EventListener<Event>
 		AEnv.showCenterScreen(this);
 	}	//	WFieldRecordInfo
 
-
+	/** table for change log history */
 	private Listbox table = new Listbox();
 	private ConfirmPanel confirmPanel = new ConfirmPanel (false);
 
 	/**	Logger			*/
 	private static final CLogger	log = CLogger.getCLogger(WFieldRecordInfo.class);
-	/** The Data		*/
+	/** Data for {@link #table}		*/
 	private Vector<Vector<String>>	m_data = new Vector<Vector<String>>();
 
 	/** Date Time Format		*/
@@ -149,12 +149,11 @@ public class WFieldRecordInfo extends Window implements EventListener<Event>
 		(DisplayType.Integer, Env.getLanguage(Env.getCtx()));
 
 	/**
-	 * 	Static Layout
+	 * 	Layout dialog
 	 *	@throws Exception
 	 */
 	private void init (boolean showTable) throws Exception
 	{
-
 		Borderlayout layout = new Borderlayout();
 		layout.setParent(this);
 		ZKUpdateUtil.setWidth(layout, "100%");
@@ -178,12 +177,11 @@ public class WFieldRecordInfo extends Window implements EventListener<Event>
 		addEventListener(Events.ON_CANCEL, e -> onCancel());
 		setSclass("field-record-info-dialog");
 	}	//	init
-	
-	
+		
 	/**
-	 * 	Dynamic Init
+	 * 	Init components and variables
 	 *	@param title title
-	 *	@return true if table initialized
+	 *	@return true if initialized ok
 	 */
 	private boolean dynInit(String title)
 	{
@@ -256,7 +254,7 @@ public class WFieldRecordInfo extends Window implements EventListener<Event>
 	}	//	dynInit
 	
 	/**
-	 * 	Add Line
+	 * 	Add new line to {@link #m_data}
 	 *	@param AD_Column_ID column
 	 *	@param Updated updated
 	 *	@param UpdatedBy user
@@ -375,11 +373,14 @@ public class WFieldRecordInfo extends Window implements EventListener<Event>
 	/**
 	 * @param event
 	 */
+	@Override
 	public void onEvent(Event event) throws Exception {
 		onCancel();
 	}
 
-
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -388,7 +389,6 @@ public class WFieldRecordInfo extends Window implements EventListener<Event>
 		this.detach();
 	}
 
-
 	/**
 	 * Open field record info dialog
 	 * @param gridField
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldSuggestion.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldSuggestion.java
index 4422a5e173..6d1c8b411c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldSuggestion.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldSuggestion.java
@@ -29,8 +29,8 @@ import org.zkoss.zul.South;
 import org.zkoss.zul.Textbox;
 
 /**
+ * Dialog to submit field suggestion (AD_FieldSuggestion)
  * @author hengsin
- *
  */
 public class WFieldSuggestion extends Window implements EventListener<Event> {
 
@@ -53,12 +53,16 @@ public class WFieldSuggestion extends Window implements EventListener<Event> {
 
 	/**
 	 * default constructor
+	 * @param AD_Field_ID
 	 */
 	public WFieldSuggestion(int AD_Field_ID) {
 		field = new MField(Env.getCtx(), AD_Field_ID, null);
 		layout();
 	}
 
+	/**
+	 * Layout dialog
+	 */
 	private void layout() {
 		Borderlayout borderlayout = new Borderlayout();
 		appendChild(borderlayout);
@@ -142,6 +146,9 @@ public class WFieldSuggestion extends Window implements EventListener<Event> {
 		}		
 	}
 
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -150,6 +157,9 @@ public class WFieldSuggestion extends Window implements EventListener<Event> {
 		this.detach();
 	}
 
+	/**
+	 * Save changes to AD_FieldSuggestion
+	 */
 	private void onSave() {
 		MFieldSuggestion suggestion = new MFieldSuggestion(Env.getCtx(), 0, null);
 		suggestion.setClientOrg(0, 0);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WGadgets.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WGadgets.java
index b56f765356..a708f971c5 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WGadgets.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WGadgets.java
@@ -61,12 +61,13 @@ import org.zkoss.zul.Vbox;
 import org.zkoss.zul.Vlayout;
 
 /**
+ * Dialog to select dashboard content for user
  * @author juliana
  * @author hengsin
  */
 public class WGadgets extends Window implements  EventListener<Event>{
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -4466888491090717617L;
 
@@ -84,12 +85,13 @@ public class WGadgets extends Window implements  EventListener<Event>{
 	protected ArrayList<MDashboardContent> yesItems =new ArrayList<MDashboardContent>();
 	protected ArrayList<MDashboardContent> noItems =new ArrayList<MDashboardContent>();
 
+	/** PA_DashboardContent_ID:MDashboardPreference */
 	protected Map<Integer, MDashboardPreference> dirtyList = new LinkedHashMap<Integer, MDashboardPreference>();
 	/* SysConfig USE_ESC_FOR_TAB_CLOSING */
 	private boolean isUseEscForTabClosing = MSysConfig.getBooleanValue(MSysConfig.USE_ESC_FOR_TAB_CLOSING, false, Env.getAD_Client_ID(Env.getCtx()));
 	
 	/**
-	 * 
+	 * default constructor
 	 */
 	public WGadgets() {			
 		init();
@@ -128,6 +130,9 @@ public class WGadgets extends Window implements  EventListener<Event>{
 		
 	}
 
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -136,6 +141,9 @@ public class WGadgets extends Window implements  EventListener<Event>{
 		this.detach();
 	}
 	
+	/**
+	 * Layout dialog
+	 */
 	public void init()
 	{
 		setSclass("popup-dialog");			
@@ -243,7 +251,9 @@ public class WGadgets extends Window implements  EventListener<Event>{
 		addEventListener(Events.ON_CANCEL, e -> onCancel());
 	}
 	
-	
+	/**
+	 * Load user dashboard contents from PA_DashboardContent and PA_DashboardPreference
+	 */
 	public void loadItems()
 	{
 		Properties ctx = Env.getCtx();
@@ -356,6 +366,7 @@ public class WGadgets extends Window implements  EventListener<Event>{
     }
 
 	/**
+	 * Move selected items from one list to another
 	 * @param event
 	 */
 	protected void migrateValueAcrossLists (Event event)
@@ -370,6 +381,11 @@ public class WGadgets extends Window implements  EventListener<Event>{
 		migrateLists (listFrom,listTo); //,endIndex);
 	}	//	migrateValueAcrossLists
 	
+	/**
+	 * Move selected items from listFrom to listTo
+	 * @param listFrom
+	 * @param listTo
+	 */
 	protected void migrateLists (Listbox listFrom , Listbox listTo) // , int endIndex)
 	{
 		int index = 0; 
@@ -445,6 +461,9 @@ public class WGadgets extends Window implements  EventListener<Event>{
 		}
 	}
 	
+	/**
+	 * Reload data and refresh UI
+	 */
     public void refresh() {		
 		
 		this.loadItems();
@@ -472,13 +491,12 @@ public class WGadgets extends Window implements  EventListener<Event>{
 		}
 	}
 
-
 	/**
 	 * List Item
 	 */
 	public static class ListElement extends NamePair {
 		/**
-		 *
+		 * generated serial id
 		 */
 		private static final long serialVersionUID = -5645910649588308798L;
 		private int		m_key;
@@ -489,7 +507,14 @@ public class WGadgets extends Window implements  EventListener<Event>{
 		/** Initial selection flag */
 		private boolean m_isYes;
 	
-	
+		/**
+		 * @param key
+		 * @param name
+		 * @param namecontent
+		 * @param isYes
+		 * @param AD_Client_ID
+		 * @param AD_Org_ID
+		 */
 		public ListElement(int key, String name, String namecontent, boolean isYes, int AD_Client_ID, int AD_Org_ID) {
 			super(name);
 			this.m_key = key;
@@ -500,27 +525,51 @@ public class WGadgets extends Window implements  EventListener<Event>{
 	
 		}
 		
+		/**
+		 * @return key
+		 */
 		public int getKey() {
 			return m_key;
 		}
-				
+			
+		/**
+		 * @return name
+		 */
 		public String getM_namecontent() {
 			return m_namecontent;
 		}
 	
+		/**
+		 * @param m_namecontent
+		 */
 		public void setM_namecontent(String m_namecontent) {
 			this.m_namecontent = m_namecontent;
 		}
 	
+		/**
+		 * @param value
+		 */
 		public void setIsYes(boolean value) {
 			m_isYes = value;
 		}
+		
+		/**
+		 * @return true if it is in yes list, false otherwise
+		 */
 		public boolean isYes() {
 			return m_isYes;
 		}
+		
+		/**
+		 * @return AD_Client_ID
+		 */
 		public int getAD_Client_ID() {
 			return m_AD_Client_ID;
 		}
+		
+		/**
+		 * @return AD_Org_ID
+		 */
 		public int getAD_Org_ID() {
 			return m_AD_Org_ID;
 		}
@@ -529,10 +578,12 @@ public class WGadgets extends Window implements  EventListener<Event>{
 		public String getID() {
 			return m_key != -1 ? String.valueOf(m_key) : null;
 		}
+		
 		@Override
 		public int hashCode() {
 			return m_key;
 		}
+		
 		@Override
 		public boolean equals(Object obj)
 		{
@@ -549,6 +600,7 @@ public class WGadgets extends Window implements  EventListener<Event>{
 			return false;
 		}	//	equals
 	
+		@Override
 		public String toString() {
 			String s = super.toString();
 			if (s == null || s.trim().length() == 0)
@@ -558,19 +610,17 @@ public class WGadgets extends Window implements  EventListener<Event>{
 	}
 
 	/**
+	 * Listener for onDrop and onDoubleClick event
 	 * @author eslatis
-	 *
 	 */
 	private class MoveListener implements EventListener<Event>
 	{
 
-		/**
-		 * Creates a ADSortTab.DragListener.
-		 */
 		public MoveListener()
 		{
 		}
 
+		@Override
 		public void onEvent(Event event) throws Exception {
 			if (event instanceof DropEvent)
 			{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
index 757b9ffbdd..11b7d5a451 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
@@ -60,17 +60,14 @@ import org.zkoss.zul.South;
 import org.zkoss.zul.Space;
 
 /**
- *  Base on the original Swing Image Dialog.
- *  @author   Jorg Janke
- *  
- *  Zk Port
+ *  Dialog to view, remove or upload new image
  *  @author Low Heng Sin 
  *  
  */
 public class WImageDialog extends Window implements EventListener<Event>
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -5048907034691374834L;
 
@@ -121,7 +118,7 @@ public class WImageDialog extends Window implements EventListener<Event>
 	/**	Logger					*/
 	private static final CLogger log = CLogger.getCLogger(WImageDialog.class);
 
-	/** */
+	/** Main layout */
 	private Borderlayout mainLayout = new Borderlayout();
 	private Panel parameterPanel = new Panel();
 	private Button fileButton = new Button();
@@ -150,10 +147,10 @@ public class WImageDialog extends Window implements EventListener<Event>
 	}
 
 	/**
-	 *  Static Init
+	 *  Layout dialog
 	 *  @throws Exception
 	 */
-	void init() throws Exception
+	protected void init() throws Exception
 	{
 		this.setSclass("popup-dialog image-dialog");
 		this.setBorder("normal");
@@ -247,6 +244,7 @@ public class WImageDialog extends Window implements EventListener<Event>
 		addEventListener(Events.ON_CANCEL, e -> onCancel());
 	}   //  init
 
+	@Override
 	public void onEvent(Event e) throws Exception {
 		if (e instanceof UploadEvent) 
 		{
@@ -330,6 +328,9 @@ public class WImageDialog extends Window implements EventListener<Event>
 		}
 	}
 
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -339,6 +340,9 @@ public class WImageDialog extends Window implements EventListener<Event>
 		detach();
 	}
 
+	/**
+	 * Save changes
+	 */
 	private void onSave() {
 		if (image.getContent() != null)
 		{
@@ -362,6 +366,10 @@ public class WImageDialog extends Window implements EventListener<Event>
 		return cancel;
 	}
 
+	/**
+	 * Process uploaded image file
+	 * @param imageFile
+	 */
 	private void processUploadMedia(Media imageFile) {
 		if (imageFile == null)
 			return;
@@ -412,7 +420,7 @@ public class WImageDialog extends Window implements EventListener<Event>
 
 	/**
 	 * 	Get Image ID
-	 *	@return ID or 0
+	 *	@return AD_Image_ID or 0
 	 */
 	public int getAD_Image_ID()
 	{
@@ -440,7 +448,5 @@ public class WImageDialog extends Window implements EventListener<Event>
 		super.focus();
 		if (fileButton != null)
 			fileButton.focus();
-	}	
-	
-	
+	}			
 }   //  WImageDialog
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java
index 6503dfd795..7d94aeb990 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java
@@ -72,10 +72,9 @@ import org.zkoss.zul.South;
 import org.zkoss.zul.Vbox;
 
 /**
+ * Dialog to view and edit location address
  * @author Sendy Yagambrum
  * @date July 16, 2007
- * Location Dialog Box
- * This class is based upon VLocationDialog, written by Jorg Janke
  * @author Cristina Ghita, www.arhipac.ro
  * 			<li>FR [ 2794312 ] Location AutoComplete
  * @author Teo Sarca, teo.sarca@gmail.com
@@ -91,7 +90,7 @@ import org.zkoss.zul.Vbox;
 public class WLocationDialog extends Window implements EventListener<Event>
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -9116270523919373406L;
 	/** Logger          */
@@ -158,13 +157,21 @@ public class WLocationDialog extends Window implements EventListener<Event>
 	private boolean onSaveError = false;
 	/* SysConfig USE_ESC_FOR_TAB_CLOSING */
 	private boolean isUseEscForTabClosing = MSysConfig.getBooleanValue(MSysConfig.USE_ESC_FOR_TAB_CLOSING, false, Env.getAD_Client_ID(Env.getCtx()));
-	//END
-
+	
+	/**
+	 * @param title
+	 * @param location
+	 */
 	public WLocationDialog(String title, MLocation location)
 	{
 		this (title, location, null);
 	}
 
+	/**
+	 * @param title
+	 * @param location
+	 * @param gridField
+	 */
 	public WLocationDialog(String title, MLocation location, GridField gridField) {
 		m_GridField  = gridField;
 		m_location = location;
@@ -227,6 +234,9 @@ public class WLocationDialog extends Window implements EventListener<Event>
 		this.setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED);
 	}
 
+	/**
+	 * Create components
+	 */
 	private void initComponents()
 	{
 		lblAddress1     = new Label(Msg.getElement(Env.getCtx(), "Address1"));
@@ -338,6 +348,9 @@ public class WLocationDialog extends Window implements EventListener<Event>
 		}
 	}
 
+	/**
+	 * Layout dialog
+	 */
 	private void init()
 	{
 		Columns columns = new Columns();
@@ -517,10 +530,10 @@ public class WLocationDialog extends Window implements EventListener<Event>
 		addEventListener("onSaveError", this);
 		addEventListener(Events.ON_CANCEL, e -> onCancel());
 	}
+	
 	/**
-	 * Dynamically add fields to the Location dialog box
-	 * @param panel panel to add
-	 *
+	 * Add a new row of components to {@link #mainPanel}
+	 * @param row Row of components
 	 */
 	private void addComponents(Row row)
 	{
@@ -530,6 +543,9 @@ public class WLocationDialog extends Window implements EventListener<Event>
 			mainPanel.newRows().appendChild(row);
 	}
 
+	/**
+	 * Load location details
+	 */
 	private void initLocation()
 	{
 		if (mainPanel.getRows() != null)
@@ -661,6 +677,10 @@ public class WLocationDialog extends Window implements EventListener<Event>
 			setCountry();
 		}
 	}
+	
+	/**
+	 * Set selected country from {@link #m_location}
+	 */
 	private void setCountry()
 	{
 		List<?> listCountry = lstCountry.getChildren();
@@ -675,6 +695,9 @@ public class WLocationDialog extends Window implements EventListener<Event>
 		}
 	}
 
+	/**
+	 * Set selected region from {@link #m_location}
+	 */
 	private void setRegion()
 	{
 		if (m_location.getRegion() != null) 
@@ -695,16 +718,16 @@ public class WLocationDialog extends Window implements EventListener<Event>
 			lstRegion.setSelectedItem(null);
 		}        
 	}
+	
 	/**
-	 *  Get result
-	 *  @return true, if changed
+	 *  @return true if changed
 	 */
 	public boolean isChanged()
 	{
 		return m_change;
-	}   //  getChange
+	}   //  isChanged
+	
 	/**
-	 *  Get edited Value (MLocation)
 	 *  @return location
 	 */
 	public MLocation getValue()
@@ -712,6 +735,7 @@ public class WLocationDialog extends Window implements EventListener<Event>
 		return m_location;
 	}   
 
+	@Override
 	public void onEvent(Event event) throws Exception
 	{
 		if (event.getTarget() == confirmPanel.getButton(ConfirmPanel.A_OK)) 
@@ -933,6 +957,9 @@ public class WLocationDialog extends Window implements EventListener<Event>
 		}
 	}
 
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -941,9 +968,12 @@ public class WLocationDialog extends Window implements EventListener<Event>
 		m_change = false;
 		this.dispose();
 	}
-
 	
-	// LCO - address 1, region and city required
+	/**
+	 * Validate mandatory fields.<br/>
+	 * LCO - address 1, region and city required
+	 * @return error messages or null
+	 */	
 	private String validate_OK() {
 		String fields = "";
 		if (isAddress1Mandatory && txtAddress1.getText().trim().length() == 0) {
@@ -984,7 +1014,7 @@ public class WLocationDialog extends Window implements EventListener<Event>
 	}
 
 	/**
-	 *  OK - check for changes (save them) & Exit
+	 * Handle OK button event - check for changes (save them) & Exit
 	 */
 	private boolean action_OK()
 	{
@@ -1070,6 +1100,9 @@ public class WLocationDialog extends Window implements EventListener<Event>
 		return success;
 	}   //  actionOK
 
+	/**
+	 * @return true if there's error saving changes
+	 */
 	public boolean isOnSaveError() {
 		return onSaveError;
 	}
@@ -1084,8 +1117,10 @@ public class WLocationDialog extends Window implements EventListener<Event>
 		super.dispose();
 	}
 	
-	/** returns a string that contains all fields of current form */
-	String getFullAdress()
+	/**
+	 * @return string that contains all fields of current form  
+	 */
+	protected String getFullAdress()
 	{
 		MRegion region = null;
 
@@ -1107,7 +1142,10 @@ public class WLocationDialog extends Window implements EventListener<Event>
 		return address.replace(" ", "+");
 	}	
 
-	void setPlaceholders() {
+	/**
+	 * set place holder text for fields
+	 */
+	protected void setPlaceholders() {
 		txtAddress1.setPlaceholder(MCountry.get(Env.getCtx(), s_oldCountry_ID).get_Translation("PlaceholderAddress1"));
 		txtAddress2.setPlaceholder(MCountry.get(Env.getCtx(), s_oldCountry_ID).get_Translation("PlaceholderAddress2"));
 		txtAddress3.setPlaceholder(MCountry.get(Env.getCtx(), s_oldCountry_ID).get_Translation("PlaceholderAddress3"));
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java
index f3036c90f1..465c43c399 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java
@@ -65,7 +65,7 @@ import org.zkoss.zul.South;
 import org.zkoss.zul.Space;
 
 /**
- * Location Dialog : Based on VLocationDialog
+ * Dialog for warehouse locator
  * 
  * @author  Niraj Sohun
  * @date    Jul 24, 2007
@@ -74,7 +74,7 @@ import org.zkoss.zul.Space;
 public class WLocatorDialog extends Window implements EventListener<Event> 
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -2441739966645819543L;
 
@@ -139,8 +139,7 @@ public class WLocatorDialog extends Window implements EventListener<Event>
 	 * 	@param mandatory mandatory
 	 * 	@param only_Warehouse_ID of not 0 restrict warehouse
 	 *  @param windowNo
-	 */
-	
+	 */	
 	public WLocatorDialog (	String title, MLocatorLookup mLocator,
 							int M_Locator_ID, boolean mandatory, int only_Warehouse_ID, 
 							int windowNo)
@@ -160,6 +159,9 @@ public class WLocatorDialog extends Window implements EventListener<Event>
 		initLocator();
 	} // WLocatorDialog
 	
+	/**
+	 * Layout dialog
+	 */
 	private void initComponents()
 	{
 		lblLocator.setValue(Msg.translate(Env.getCtx(), "M_Locator_ID"));
@@ -307,12 +309,12 @@ public class WLocatorDialog extends Window implements EventListener<Event>
 		addEventListener(Events.ON_CANCEL, e -> onCancel());
 	}
 	
+	/**
+	 * Load warehouse and locators
+	 */
 	private void initLocator()
 	{
-		log.fine("");
-
-		//	Load Warehouse
-		
+		//	Load Warehouse		
 		String sql = "SELECT M_Warehouse_ID, Name FROM M_Warehouse";
 		
 		if (m_only_Warehouse_ID != 0)
@@ -416,13 +418,11 @@ public class WLocatorDialog extends Window implements EventListener<Event>
 		txtAisleX.addEventListener(Events.ON_CHANGE, this);
 		txtBinY.addEventListener(Events.ON_CHANGE, this);
 		txtLevelZ.addEventListener(Events.ON_CHANGE, this);
-		
-		//	Update UI
-		
-		//pack();
-		
 	} // initLocator
 
+	/**
+	 * Set field editor values from selected locator
+	 */
 	private void displayLocator()
 	{
 		MLocator l = null;
@@ -484,8 +484,7 @@ public class WLocatorDialog extends Window implements EventListener<Event>
 	
 	/**
 	 *	Enable/disable New data entry
-	 */
-	
+	 */	
 	private void enableNew()
 	{
 		boolean sel = chkCreateNew.isChecked();
@@ -560,9 +559,8 @@ public class WLocatorDialog extends Window implements EventListener<Event>
 	} // getWarehouseInfo
 
 	/**
-	 *	Create Locator-Value
-	 */
-	
+	 * Create M_Locator.Value for new M_Locator record
+	 */	
 	private void createValue()
 	{
 		// Get Warehouse Info
@@ -584,9 +582,8 @@ public class WLocatorDialog extends Window implements EventListener<Event>
 	} // createValue
 
 	/**
-	 * 	OK - check for changes (save them) & Exit
-	 */
-	
+	 * 	Handle OK button event - check for changes (save them) & Exit
+	 */	
 	private void actionOK()
 	{
 		if (chkCreateNew.isChecked())
@@ -647,20 +644,17 @@ public class WLocatorDialog extends Window implements EventListener<Event>
 	} // actionOK
 
 	/**
-	 *	Get Selected value
-	 *  @return value as Integer
-	 */
-	
+	 *	Get Selected locator id
+	 *  @return M_Locator_IDD as Integer
+	 */	
 	public Integer getValue()
 	{
 		return (Integer) locatorField.getValue();
 	} // getValue
 
 	/**
-	 *	Get result
 	 *  @return true if changed
-	 */
-	
+	 */	
 	public boolean isChanged()
 	{
 		if (m_change)
@@ -670,9 +664,9 @@ public class WLocatorDialog extends Window implements EventListener<Event>
 				return locator_id == m_M_Locator_ID;
 		}
 		return m_change;
-	} // getChange
+	} // isChanged
 
-	
+	@Override
 	public void onEvent(Event event) throws Exception 
 	{
 		if (event == null)
@@ -698,6 +692,9 @@ public class WLocatorDialog extends Window implements EventListener<Event>
 			createValue();
 	}
 
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
index 77ef16eb27..546ba10cf3 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java
@@ -49,14 +49,14 @@ import org.zkoss.zul.Iframe;
 
 
 /**
- * 
+ * Dialog to view, upload new, remove or download media 
  * @author Low Heng Sin
  *
  */
 public class WMediaDialog extends Window implements EventListener<Event>
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -329919930778203892L;
 
@@ -92,8 +92,7 @@ public class WMediaDialog extends Window implements EventListener<Event>
 	 *	Constructor.
 	 *  @param title
 	 *  @param data
-	 */
-	
+	 */	
 	public WMediaDialog(String title, Object data)
 	{
 		super();
@@ -112,7 +111,7 @@ public class WMediaDialog extends Window implements EventListener<Event>
 	} // WMediaDialog
 
 	/**
-	 *	Static setup.
+	 *	Layout dialog.
 	 *  <pre>
 	 *  - northPanel
 	 *      - toolBar
@@ -127,7 +126,7 @@ public class WMediaDialog extends Window implements EventListener<Event>
 	 *  @throws Exception
 	 */
 	
-	void staticInit() throws Exception
+	protected void staticInit() throws Exception
 	{
 		if (!ThemeManager.isUseCSSForWindowSize())
 		{
@@ -146,8 +145,7 @@ public class WMediaDialog extends Window implements EventListener<Event>
 		this.appendChild(mainPanel);
 		ZKUpdateUtil.setHeight(mainPanel, "100%");
 		ZKUpdateUtil.setWidth(mainPanel, "100%");
-		
-		
+				
 		North northPanel = new North();
 		northPanel.setCollapsible(false);
 		northPanel.setSplittable(false);
@@ -159,7 +157,6 @@ public class WMediaDialog extends Window implements EventListener<Event>
 		mainPanel.appendChild(northPanel);
 		northPanel.appendChild(toolBar);
 		
-
 		bSave.setEnabled(false);
 		if (ThemeManager.isUseFontIconForImage())
 			bSave.setIconSclass("z-icon-Export");
@@ -220,14 +217,12 @@ public class WMediaDialog extends Window implements EventListener<Event>
 	
 	private void  afterPageAttached() {
 		ZKUpdateUtil.setCSSHeight(this);
-		ZKUpdateUtil.setCSSWidth(this);
-		
+		ZKUpdateUtil.setCSSWidth(this);		
 	}
 
 	/**
-	 * 	Dispose
-	 */
-	
+	 * Close dialog
+	 */	
 	public void dispose ()
 	{
 		preview = null;
@@ -235,10 +230,8 @@ public class WMediaDialog extends Window implements EventListener<Event>
 	} // dispose
 	
 	/**
-	 *  Display gif or jpg in gifPanel
-	 * 	@param index index
-	 */
-	
+	 *  Display media
+	 */	
 	private void displayData ()
 	{
 		//	Reset UI		
@@ -268,6 +261,11 @@ public class WMediaDialog extends Window implements EventListener<Event>
 		}		
 	}   //  displayData
 
+	/**
+	 * Create media from {@link #m_data}
+	 * @return media
+	 * @throws SQLException
+	 */
 	private AMedia createMedia() throws SQLException {
 		AMedia media;
 		String contentType = null;
@@ -303,29 +301,25 @@ public class WMediaDialog extends Window implements EventListener<Event>
 	}
 	
 	/**
-	 *	Action Listener
+	 *	Handle event
 	 *  @param e event
 	 */
-	
+	@Override
 	public void onEvent(Event e)
 	{
-		//	log.config(e.getActionCommand());
-		//	Save and Close
-		
+		//	Close		
 		if (e.getTarget() == bOk)
 		{
 			dispose();
 		}
 	
-		//	Cancel
-		
+		//	Cancel		
 		else if (e.getTarget() == bCancel)
 		{
 			onCancel();
 		}
 		
-		//	clear data
-		
+		//	Clear data		
 		else if (e.getTarget() == bDelete)
 		{
 			m_data = null;
@@ -333,12 +327,13 @@ public class WMediaDialog extends Window implements EventListener<Event>
 			displayData();
 		}
 		
-		//	Open Attachment
-		
+		//	Download		
 		else if (e.getTarget() == bSave)
 		{
 			save();
 		}
+		
+		// Upload new media
 		else if (e instanceof UploadEvent)
 		{
 			UploadEvent ue = (UploadEvent) e;
@@ -346,6 +341,9 @@ public class WMediaDialog extends Window implements EventListener<Event>
 		}
 	}	//	onEvent
 
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -355,12 +353,17 @@ public class WMediaDialog extends Window implements EventListener<Event>
 		dispose();
 	}
 	
+	/**
+	 * Process uploaded media
+	 * @param media
+	 */
 	private void processUploadMedia(Media media) {
 		if (media == null)
 			return;
 	
-		String fileName = media.getName(); 
-		log.config(fileName);
+		String fileName = media.getName();
+		if (log.isLoggable(Level.CONFIG))
+			log.config(fileName);
 		//update		
 		m_change = true;
 		m_data = media.getByteData();
@@ -368,9 +371,8 @@ public class WMediaDialog extends Window implements EventListener<Event>
 	}
 
 	/**
-	 *	download
-	 */
-	
+	 * download media
+	 */	
 	private void save()
 	{
 		if (m_data == null)
@@ -385,16 +387,25 @@ public class WMediaDialog extends Window implements EventListener<Event>
 		{
 			log.log(Level.SEVERE, "Failed to export content.", e);
 		}
-	}	//	saveAttachmentToFile
+	}
 	
+	/**
+	 * @return true if cancel by user
+	 */
 	public boolean isCancel() {
 		return m_cancel;
 	}
 	
+	/**
+	 * @return true if there's changes
+	 */
 	public boolean isChange() {
 		return m_change;
 	}
 	
+	/**
+	 * @return data
+	 */
 	public Object getData() {
 		return m_data;
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java
index 4598853ce0..06548a7f27 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java
@@ -92,18 +92,13 @@ import org.zkoss.zul.South;
 import org.zkoss.zul.Space;
 
 /**
- *  Product Attribute Set Product/Instance Dialog Editor.
- * 	Called from VPAttribute.actionPerformed
- *
- *  @author Jorg Janke
- *  
- *  ZK Port
- *  @author Low Heng Sin
+ *  Product Instance/Non-Instance attribute Dialog.
+ *  @author hengsin
  */
 public class WPAttributeDialog extends Window implements EventListener<Event>
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -7810825026970615029L;
 
@@ -167,7 +162,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 			return;
 		}
 		AEnv.showCenterScreen(this);
-	}	//	VPAttributeDialog
+	}	//	WPAttributeDialog
 
 	protected int						m_WindowNo;
 	protected MAttributeSetInstance	m_masi;
@@ -178,9 +173,9 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 	protected int						m_C_BPartner_ID;
 	protected int						m_AD_Column_ID;
 	protected int						m_WindowNoParent;
-	/**	Enter Product Attributes		*/
+	/**	true if open from product window		*/
 	protected boolean					m_productWindow = false;
-	/**	Change							*/
+	/**	true if user has make changes			*/
 	protected boolean					m_changed = false;
 	
 	private static final CLogger	log = CLogger.getCLogger(WPAttributeDialog.class);
@@ -191,6 +186,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 
 	protected Checkbox	cbNewEdit = new Checkbox();
 	protected Button		bNewRecord = new Button(Msg.getMsg(Env.getCtx(), "NewRecord"));
+	/** Listbox for existing non-instance ASI records */
 	protected Listbox		existingCombo = new Listbox();
 	protected Button		bSelect = new Button(); 
 	//	Lot
@@ -198,7 +194,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 	protected Listbox fieldLot = new Listbox();
 	protected Button bLot = new Button(Msg.getMsg (Env.getCtx(), "New"));
 	//	Lot Popup
-	protected Menupopup 					popupMenu = new Menupopup();
+	protected Menupopup 		popupMenu = new Menupopup();
 	protected Menuitem 			mZoom;
 	//	Ser No
 	protected Textbox fieldSerNo = new Textbox();
@@ -222,7 +218,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 	protected boolean isAllowedToCreateAndUpdate = false;
 
 	/**
-	 *	Layout
+	 *	Layout dialog
 	 * 	@throws Exception
 	 */
 	private void init () throws Exception
@@ -231,7 +227,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 		ZKUpdateUtil.setHflex(mainLayout, "1");
 		ZKUpdateUtil.setVflex(mainLayout, "min");
 		if (ClientInfo.maxHeight(600)) 
-				mainLayout.setStyle("max-height: 100%;"); 
+			mainLayout.setStyle("max-height: 100%;"); 
 		else 
 			mainLayout.setStyle("max-height: 600px;");
 		
@@ -265,8 +261,8 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 	}	//	init
 
 	/**
-	 *	Dyanmic Init.
-	 *  @return true if initialized
+	 *	Load attribute set and ASI details
+	 *  @return true if initialized ok
 	 */
 	private boolean initAttributes ()
 	{
@@ -326,7 +322,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 			return false;
 		}
 
-		//	Show Product Attributes
+		//	Show Product (Non Instance) Attributes
 		if (m_productWindow)
 		{
 			Row row = new Row();
@@ -563,6 +559,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 
 	/**
 	 * 	Add Attribute Line
+	 *  @param rows
 	 *	@param attribute attribute
 	 * 	@param product product level attribute
 	 * 	@param readOnly value is read only
@@ -636,6 +633,11 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 		}
 	}	//	addAttributeLine
 
+	/**
+	 * Create GridField for attribute
+	 * @param attribute
+	 * @return GridField
+	 */
 	public GridField getGridField(MAttribute attribute)
 	{
 		GridFieldVO vo = GridFieldVO.createParameter(Env.getCtx(), m_WindowNo, AEnv.getADWindowID(m_WindowNo), 0, 0, attribute.getName(),
@@ -655,6 +657,10 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 		return createGridField(attribute, vo);
 	} // getGridField
 
+	/**
+	 * @param attribute
+	 * @return GridField for DisplayType.String
+	 */
 	public GridField getStringGridField(MAttribute attribute)
 	{
 		GridFieldVO vo = GridFieldVO.createParameter(Env.getCtx(), m_WindowNo, AEnv.getADWindowID(m_WindowNo), 0, 0, attribute.getName(),
@@ -663,6 +669,10 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 		return createGridField(attribute, vo);
 	} // getStringGridField
 
+	/**
+	 * @param attribute
+	 * @return GridField for DisplayType.Number
+	 */
 	public GridField getNumberGridField(MAttribute attribute)
 	{
 		GridFieldVO vo = GridFieldVO.createParameter(Env.getCtx(), m_WindowNo, AEnv.getADWindowID(m_WindowNo), 0, 0, attribute.getName(),
@@ -671,6 +681,10 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 		return createGridField(attribute, vo);
 	} // getNumberGridField
 
+	/**
+	 * @param attribute
+	 * @return GridField for DisplayType.Date
+	 */
 	public GridField getDateGridField(MAttribute attribute)
 	{
 		GridFieldVO vo = GridFieldVO.createParameter(Env.getCtx(), m_WindowNo, AEnv.getADWindowID(m_WindowNo), 0, 0, attribute.getName(), 
@@ -679,6 +693,10 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 		return createGridField(attribute, vo);
 	} // getDateGridField
 
+	/**
+	 * @param attribute
+	 * @return GridField for DisplayType.TableDir
+	 */
 	public GridField getListTypeGridField(MAttribute attribute)
 	{
 		GridFieldVO vo = GridFieldVO.createParameter(Env.getCtx(), m_WindowNo, AEnv.getADWindowID(m_WindowNo), 0, 0,
@@ -692,6 +710,12 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 		return createGridField(attribute, vo);
 	} // getListTypeGridField
 
+	/**
+	 * Create GridField
+	 * @param attribute
+	 * @param vo
+	 * @return GridField
+	 */
 	private GridField createGridField(MAttribute attribute, GridFieldVO vo)
 	{
 		String desc = attribute.get_Translation("Description");
@@ -699,6 +723,11 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 		return new GridField(vo);
 	} // createGridField
 
+	/**
+	 * Update value of editor
+	 * @param attribute
+	 * @param index index of editor
+	 */
 	public void updateAttributeEditor(MAttribute attribute, int index)
 	{
 		WEditor editor = m_editors.get(index);
@@ -706,6 +735,11 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 			setEditorAttribute(attribute, editor);
 	} // updateAttributeEditor
 
+	/**
+	 * Set value of editor from M_AttributeInstance
+	 * @param attribute
+	 * @param editor
+	 */
 	public void setEditorAttribute(MAttribute attribute, WEditor editor)
 	{
 		MAttributeInstance instance = attribute.getMAttributeInstance(m_M_AttributeSetInstance_ID);
@@ -767,6 +801,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 		this.detach();
 	}	//	dispose
 
+	@Override
 	public void onEvent(Event e) throws Exception 
 	{
 		//	Select Instance
@@ -849,6 +884,9 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 			log.log(Level.SEVERE, "not found - " + e);
 	}	//	actionPerformed
 
+	/**
+	 * Handle onCancel event
+	 */
 	protected void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -860,6 +898,9 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 		dispose();
 	}
 
+	/**
+	 * Handle onSelect event for {@link #existingCombo}
+	 */
 	protected void cmd_existingCombo() {
 		ListItem pp = existingCombo.getSelectedItem();
 		if (pp != null && (Integer)pp.getValue() != -1)
@@ -880,6 +921,9 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 		}
 	}
 
+	/**
+	 * Handle onClick event for {@link #bNewRecord}
+	 */
 	protected void cmd_newRecord() {
 		cbNewEdit.setSelected(false);
 		cbNewEdit.setEnabled(false);
@@ -898,6 +942,9 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 		fieldDescription.setText("");
 	}
 
+	/**
+	 * Handle event for {@link #cbNewEdit} (for non-instance ASI)
+	 */
 	protected void cmd_edit() {
 		boolean check = cbNewEdit.isSelected();
 		for (int i = 0; i < m_editors.size(); i++)
@@ -913,8 +960,6 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 	 */
 	protected void cmd_select()
 	{
-		log.config("");
-		
 		int M_Warehouse_ID = Env.getContextAsInt(Env.getCtx(), m_WindowNoParent, "M_Warehouse_ID");
 		
 		int C_DocType_ID = Env.getContextAsInt(Env.getCtx(), m_WindowNoParent, "C_DocType_ID");
@@ -1022,8 +1067,6 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 	 */
 	protected boolean saveSelection()
 	{
-		log.info("");
-		
 		MAttributeSet as = m_masi.getMAttributeSet();
 		
 		if (as == null)
@@ -1079,7 +1122,7 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 				m_M_AttributeSetInstanceName = m_masi.getDescription();
 			}
 			
-			//	Save Instance Attributes
+			//	Save Instance Attributes (M_AttributeInstance)
 			MAttribute[] attributes = as.getMAttributes(!m_productWindow);
 			MAttribute.set_TrxName(attributes, trxName);
 			for (int i = 0; i < attributes.length; i++)
@@ -1165,6 +1208,12 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 		return true;
 	}	//	saveSelection
 
+	/**
+	 * @param mandatory
+	 * @param attributes
+	 * @param editor
+	 * @return error message (if any)
+	 */
 	public String setEditorValue(String mandatory, MAttribute attributes, WEditor editor)
 	{
 		int displayType = editor.getGridField().getDisplayType();
@@ -1225,9 +1274,9 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 		return mandatory;
 	} // setEditorValue
 	
-	/**************************************************************************
+	/**
 	 * 	Get Instance ID
-	 * 	@return Instance ID
+	 * 	@return M_AttributeSetInstance_ID
 	 */
 	public int getM_AttributeSetInstance_ID()
 	{
@@ -1262,9 +1311,9 @@ public class WPAttributeDialog extends Window implements EventListener<Event>
 	}	//	isChanged
 
 	/**
-	 * This method searches for User's Window Access to determinate if it is
-	 * possible to create new ASI records (when IsReadWrite = true), only read
-	 * existing ASI records (when IsReadWrite = false) or open the ASI dialog (when
+	 * This method searches for User's Window Access to determinate if user has 
+	 * permission to create new ASI records (when IsReadWrite = true), only read
+	 * existing ASI records (when IsReadWrite = false) or can't open the ASI dialog (when
 	 * there is no Window Access for Attribute Set Instance window).
 	 */
 	private void validadeRoleAccess() {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeInstance.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeInstance.java
index 2cbef58be2..986c1fb61d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeInstance.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeInstance.java
@@ -49,7 +49,7 @@ import org.zkoss.zul.Hbox;
 
 
 /**
- *	Display Product Attribute Instance Info
+ *	Product Attribute Set Instance (for instance attributes) view and selection dialog
  *
  *  @author     Jorg Janke
  *  @version    $Id: PAttributeInstance.java,v 1.3 2006/07/30 00:51:27 jjanke Exp $
@@ -57,7 +57,7 @@ import org.zkoss.zul.Hbox;
 public class WPAttributeInstance extends Window implements EventListener<Event> 
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -4052029122256207113L;
 
@@ -93,7 +93,7 @@ public class WPAttributeInstance extends Window implements EventListener<Event>
 		
 		init (M_Warehouse_ID, M_Locator_ID, M_Product_ID, C_BPartner_ID);
 		AEnv.showCenterScreen(this);
-	}	//	PAttributeInstance
+	}	//	WPAttributeInstance
 	
 	/**
 	 * 	Initialization
@@ -141,7 +141,7 @@ public class WPAttributeInstance extends Window implements EventListener<Event>
 	private static final CLogger log = CLogger.getCLogger(WPAttributeInstance.class);
 
 	/**
-	 * 	Static Init
+	 * 	Layout dialog
 	 * 	@throws Exception
 	 */
 	private void init() throws Exception
@@ -176,7 +176,7 @@ public class WPAttributeInstance extends Window implements EventListener<Event>
 		addEventListener(Events.ON_CANCEL, e -> onCancel());
 	}	//	jbInit
 
-	/**	Table Column Layout Info			*/
+	/**	Column Layout Info	for {@link #m_table}		*/
 	private static ColumnInfo[] s_layout = new ColumnInfo[] 
 	{
 		new ColumnInfo(" ", "s.M_AttributeSetInstance_ID", IDColumn.class),
@@ -207,7 +207,7 @@ public class WPAttributeInstance extends Window implements EventListener<Event>
 	private String	m_sqlMinLife = "";
 
 	/**
-	 * 	Dynamic Init
+	 * 	Init components and variables
 	 * 	@param C_BPartner_ID BP
 	 */
 	private void dynInit(int C_BPartner_ID)
@@ -308,6 +308,7 @@ public class WPAttributeInstance extends Window implements EventListener<Event>
 		enableButtons();
 	}	//	refresh
 
+	@Override
 	public void onEvent(Event e) throws Exception 
 	{
 		if (e.getTarget().getId().equals("Ok"))
@@ -326,6 +327,9 @@ public class WPAttributeInstance extends Window implements EventListener<Event>
 		}
 	}	//	actionPerformed
 
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -395,4 +399,4 @@ public class WPAttributeInstance extends Window implements EventListener<Event>
 		return m_M_Locator_ID;
 	}	//	getM_Locator_ID
 
-}	//	PAttributeInstance
\ No newline at end of file
+}	//	WPAttributeInstance
\ No newline at end of file
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPostIt.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPostIt.java
index ea30cf1948..09bf51f1fc 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPostIt.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPostIt.java
@@ -38,13 +38,13 @@ import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zul.Separator;
 
 /**
- * bas� sur WTextEditorDialog
+ * Dialog for post it note
  * @author Nico
  *
  */
 public class WPostIt extends Window implements EventListener<Event>{
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -9092535255629718710L;
 
@@ -94,6 +94,9 @@ public class WPostIt extends Window implements EventListener<Event>{
 		init();
 	}
 
+	/**
+	 * Layout dialog
+	 */
 	private void init() {
 		setBorder("normal");
 		setMaximizable(true);
@@ -182,6 +185,7 @@ public class WPostIt extends Window implements EventListener<Event>{
 	/**
 	 * @param event
 	 */
+	@Override
 	public void onEvent(Event event) throws Exception {
 		if (event.getTarget().getId().equals(ConfirmPanel.A_CANCEL)) {
 			onCancel();
@@ -211,6 +215,9 @@ public class WPostIt extends Window implements EventListener<Event>{
 		}		
 	}
 
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -219,6 +226,10 @@ public class WPostIt extends Window implements EventListener<Event>{
 		detach();
 	}
 
+	/**
+	 * Update status text (for length)
+	 * @param newLength
+	 */
 	private void updateStatus(int newLength) {
 		if (status != null && maxSize > 0) {
 			StringBuffer msg = new StringBuffer();
@@ -235,6 +246,9 @@ public class WPostIt extends Window implements EventListener<Event>{
 		}
 	}
 
+	/**
+	 * On opening of dialog. 
+	 */
 	public void showWindow() 
 	{		
 		textBox.focus();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPreference.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPreference.java
index 6f1b9d2a95..b8d42919f9 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPreference.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPreference.java
@@ -45,14 +45,14 @@ import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zul.A;
 import org.zkoss.zul.Div;
 import org.zkoss.zul.Space;
+
 /**
- *
+ * User preference dialog
  * @author hengsin
- *
  */
 public class WPreference extends WQuickEntry implements EventListener<Event>, ValueChangeListener {	
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 3259434079666571595L;
 	private static final CLogger log = CLogger.getCLogger(WPreference.class);
@@ -68,7 +68,9 @@ public class WPreference extends WQuickEntry implements EventListener<Event>, Va
 	private MUserPreference preferences = null;
 	private int             recordId    = 0;
 
-
+	/**
+	 * Default constructor
+	 */
 	public WPreference() {
 		super(Env.getZoomWindowID(MUserPreference.Table_ID, 0));
 
@@ -91,6 +93,9 @@ public class WPreference extends WQuickEntry implements EventListener<Event>, Va
 		this.setTitle("");
 	} //WPreference
 
+	/**
+	 * Load user preferences
+	 */
 	private void loadPreferences(){
 		preferences = MUserPreference.getUserPreference(Env.getAD_User_ID(Env.getCtx()), Env.getAD_Client_ID(Env.getCtx()));
 		recordId = preferences.get_ID();
@@ -98,6 +103,10 @@ public class WPreference extends WQuickEntry implements EventListener<Event>, Va
 		loadRecord(recordId);
 	} //loadPreferences
 
+	/**
+	 * Layout dialog
+	 * @throws Exception
+	 */
 	protected void jbInit() throws Exception
 	{
 		ZKUpdateUtil.setWidth(this, "230px");
@@ -108,6 +117,9 @@ public class WPreference extends WQuickEntry implements EventListener<Event>, Va
 		init();
 	} //jbInit
 
+	/**
+	 * Layout dialog
+	 */
 	private void init() {
 
 		Div div = new Div();
@@ -176,6 +188,9 @@ public class WPreference extends WQuickEntry implements EventListener<Event>, Va
 
 	} //init
 
+	/**
+	 * Move field editor for migration script comment next to {@link #logMigrationScript}.
+	 */
 	private void moveMigrationScriptComment() {
 		if (logMigrationScript == null)
 			return;
@@ -208,6 +223,7 @@ public class WPreference extends WQuickEntry implements EventListener<Event>, Va
 		}
 	}
 
+	@Override
 	public void onEvent(Event event) throws Exception {
 		String nameEvent=event.getName();
 		Component com =event.getTarget();
@@ -246,6 +262,9 @@ public class WPreference extends WQuickEntry implements EventListener<Event>, Va
 		}
 	} //onEvent
 
+	/**
+	 * Save changes
+	 */
 	private void onSave() {
 		actionSave();
 
@@ -262,6 +281,7 @@ public class WPreference extends WQuickEntry implements EventListener<Event>, Va
 		this.detach();
 	} //onSave
 
+	@Override
 	public void valueChange(ValueChangeEvent evt) {
 		if (evt.getSource() instanceof WYesNoEditor) {
 			// Log Migration Script and AdempiereSys are just in-memory preferences, set them without need to save
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java
index fdfe8de217..fe8102cfa1 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordAccessDialog.java
@@ -43,14 +43,14 @@ import org.zkoss.zul.Space;
 import org.zkoss.zul.Toolbarbutton;
 
 /**
- *  Record Access Dialog
+ *  Record Access Dialog (AD_Record_Access)
  *  @author <a href="mailto:elaine.tan@idalica.com">Elaine</a>
  *  @date December 9, 2008
  */
 public class WRecordAccessDialog extends Window implements EventListener<Event> 
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -3591753244744022795L;
 
@@ -68,7 +68,8 @@ public class WRecordAccessDialog extends Window implements EventListener<Event>
 		setBorder("normal");		
 		setSizable(true);
 		
-		log.info("AD_Table_ID=" + AD_Table_ID + ", Record_ID=" + Record_ID);
+		if (log.isLoggable(Level.INFO))
+			log.info("AD_Table_ID=" + AD_Table_ID + ", Record_ID=" + Record_ID);
 		m_AD_Table_ID = AD_Table_ID;
 		m_Record_ID = Record_ID;
 		try
@@ -80,7 +81,7 @@ public class WRecordAccessDialog extends Window implements EventListener<Event>
 		{
 			log.log(Level.SEVERE, "", e);
 		}		
-	}	//	RecordAccessDialog
+	}	//	WRecordAccessDialog
 
 	private int				m_AD_Table_ID;
 	private int				m_Record_ID;
@@ -105,7 +106,7 @@ public class WRecordAccessDialog extends Window implements EventListener<Event>
 	private ConfirmPanel confirmPanel = new ConfirmPanel(true);
 
 	/**
-	 * 	Dynamic Init
+	 * 	Load role and record access (AD_Record_Access) details
 	 */
 	private void dynInit()
 	{
@@ -146,7 +147,7 @@ public class WRecordAccessDialog extends Window implements EventListener<Event>
 	}	//	dynInit
 
 	/**
-	 * 	Static Init
+	 * 	Layout dialog
 	 *	@throws Exception
 	 */
 	private void jbInit() throws Exception
@@ -233,8 +234,8 @@ public class WRecordAccessDialog extends Window implements EventListener<Event>
 
 	/**
 	 * 	Set Line
-	 *	@param rowDelta delta to current row
-	 *	@param newRecord new
+	 *	@param rowDelta offset to current row
+	 *	@param newRecord true for new record, false otherwise
 	 */
 	private void setLine (int rowDelta, boolean newRecord)
 	{
@@ -279,7 +280,7 @@ public class WRecordAccessDialog extends Window implements EventListener<Event>
 	}	//	setLine
 
 	/**
-	 * 	Set Selection
+	 * 	Set selected role and current MRecordAccess record
 	 *	@param ra record access
 	 */
 	private void setLine (MRecordAccess ra)
@@ -325,9 +326,10 @@ public class WRecordAccessDialog extends Window implements EventListener<Event>
 	}	//	setLine
 
 	/**
-	 * 	Action Listener
+	 * 	Event Listener
 	 *	@param e event
 	 */
+	@Override
 	public void onEvent(Event e) throws Exception 
 	{
 		if (e.getTarget() == bUp)
@@ -350,7 +352,7 @@ public class WRecordAccessDialog extends Window implements EventListener<Event>
 	}
 
 	/**
-	 * 	Save Command
+	 * 	Save changes for MRecordAccess
 	 *	@return true if saved
 	 */
 	private boolean cmd_save()
@@ -382,7 +384,7 @@ public class WRecordAccessDialog extends Window implements EventListener<Event>
 	}	//	cmd_save
 
 	/**
-	 * 	Delete Command
+	 * 	Delete current MRecordAccess record
 	 *	@return true if deleted
 	 */
 	private boolean cmd_delete()
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordIDDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordIDDialog.java
index e79c9c536d..41223dc087 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordIDDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordIDDialog.java
@@ -56,7 +56,7 @@ import org.zkoss.zul.Div;
 import org.zkoss.zul.Vlayout;
 
 /**
- * 
+ * Dialog to edit Record_ID or Record_UU field
  * @author Peter Takacs, Cloudempiere
  *
  */
@@ -114,6 +114,10 @@ public class WRecordIDDialog extends Window implements EventListener<Event>, Val
 		init(page);
 	}
 	
+	/**
+	 * Layout dialog
+	 * @param page
+	 */
 	private void init(Page page) {
 		Vlayout vLayout = new Vlayout();
 		labelsDiv = new Div();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java
index d4d1e0b7a9..2fbbadcb44 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java
@@ -92,7 +92,7 @@ import org.zkoss.zul.Toolbarbutton;
 public class WRecordInfo extends Window implements EventListener<Event>
 {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -7436682051825360216L;
 
@@ -137,14 +137,15 @@ public class WRecordInfo extends Window implements EventListener<Event>
 		AEnv.showCenterScreen(this);
 	}	//	RecordInfo
 
-
+	/** listbox for change logs */
 	private Listbox table = new Listbox();
+	/** timeline view */
 	private RecordTimeLinePanel timeLinePanel = new RecordTimeLinePanel();
 	private ConfirmPanel confirmPanel = new ConfirmPanel (false);
 
 	/**	Logger			*/
 	private static final CLogger	log = CLogger.getCLogger(WRecordInfo.class);
-	/** The Data		*/
+	/** Change Log Data		*/
 	private Vector<Vector<String>>	m_data = new Vector<Vector<String>>();
 	/** Info			*/
 	private StringBuffer	m_info = new StringBuffer();
@@ -172,12 +173,12 @@ public class WRecordInfo extends Window implements EventListener<Event>
 		(DisplayType.Integer, Env.getLanguage(Env.getCtx()));
 
 	/**
-	 * 	Static Layout
+	 * 	Layout dialog
+	 *  @param showTable
 	 *	@throws Exception
 	 */
 	private void init (boolean showTable) throws Exception
 	{
-
 		Div div = new Div();
 		div.setStyle("width: 100%; height: 100%");
 		Pre pre = new Pre();
@@ -263,12 +264,12 @@ public class WRecordInfo extends Window implements EventListener<Event>
 		
 		confirmPanel.addActionListener(Events.ON_CLICK, this);
 		addEventListener(Events.ON_CANCEL, e -> onCancel());
-	}	//	jbInit
+	}	//	init
 	
 	
 	/**
-	 * 	Dynamic Init
-	 * @param gridTab 
+	 * 	Load change logs
+	 *  @param gridTab 
 	 *	@param dse data status event
 	 *	@param title title
 	 *	@return true if table initialized
@@ -447,7 +448,7 @@ public class WRecordInfo extends Window implements EventListener<Event>
 	}	//	dynInit
 	
 	/**
-	 * 	Add Line
+	 * 	Add change log line to {@link #m_data}
 	 *	@param AD_Column_ID column
 	 *	@param Updated updated
 	 *	@param UpdatedBy user
@@ -566,12 +567,14 @@ public class WRecordInfo extends Window implements EventListener<Event>
 		m_data.add(line);
 	}	//	addLine
 	
-	
+	@Override
 	public void onEvent(Event event) throws Exception {
 		onCancel();
 	}
 
-
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WReportExportDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WReportExportDialog.java
index f43aecf747..2785304970 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WReportExportDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WReportExportDialog.java
@@ -49,8 +49,8 @@ import org.zkoss.zul.Hbox;
 import org.zkoss.zul.Vbox;
 
 /**
+ * Dialog to export and download report
  * @author hengsin
- *
  */
 public class WReportExportDialog extends Window implements EventListener<Event> {
 
@@ -68,7 +68,6 @@ public class WReportExportDialog extends Window implements EventListener<Event>
 	private static final CLogger log = CLogger.getCLogger(WReportExportDialog.class);
 	
 	/**
-	 * 
 	 * @param viewer
 	 */
 	public WReportExportDialog(IReportViewerExportSource viewer) {
@@ -135,6 +134,9 @@ public class WReportExportDialog extends Window implements EventListener<Event>
 			exportFile();
 	}
 
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -143,6 +145,9 @@ public class WReportExportDialog extends Window implements EventListener<Event>
 		onClose();
 	}
 
+	/**
+	 * Export report as file for download by user
+	 */
 	private void exportFile()
 	{
 		try
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WReportUploadDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WReportUploadDialog.java
index 1c12fcc949..48a3f7537c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WReportUploadDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WReportUploadDialog.java
@@ -59,7 +59,6 @@ import org.zkoss.zul.Vlayout;
 
 /**
  * @author hengsin
- *
  */
 public class WReportUploadDialog extends Window implements EventListener<Event> {
 
@@ -78,7 +77,6 @@ public class WReportUploadDialog extends Window implements EventListener<Event>
 	private static final CLogger log = CLogger.getCLogger(WReportUploadDialog.class);
 	
 	/**
-	 * 
 	 * @param viewer
 	 */
 	public WReportUploadDialog(IReportViewerExportSource viewer) {
@@ -171,6 +169,9 @@ public class WReportUploadDialog extends Window implements EventListener<Event>
 		}
 	}
 
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -179,6 +180,9 @@ public class WReportUploadDialog extends Window implements EventListener<Event>
 		onClose();
 	}
 
+	/**
+	 * Handle output type selection change (from {@link #cboActions})
+	 */
 	private void onOutputTypeSelectionChanged() {
 		Listitem li = cboType.getSelectedItem();
 		String ext = li.getValue().toString();
@@ -205,6 +209,10 @@ public class WReportUploadDialog extends Window implements EventListener<Event>
 		}
 	}
 	
+	/**
+	 * @param ext file extension
+	 * @return mime type for file extension
+	 */
 	private String toContentType(String ext) {
 		if (ext.equals(IReportViewerExportSource.PDF_FILE_EXT))
 		{
@@ -246,6 +254,9 @@ public class WReportUploadDialog extends Window implements EventListener<Event>
 		return null;
 	}
 
+	/**
+	 * Export file and upload to destination via selected upload handler ({@link #cboActions})
+	 */
 	private void uploadFile()
 	{
 		try
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTask.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTask.java
index d7e79f50b5..b511428839 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTask.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTask.java
@@ -42,7 +42,7 @@ import org.zkoss.zul.Html;
 import org.zkoss.zul.South;
 
 /**
- *  Application Task
+ *  Dialog to execute OS Task
  *
  *  @author     Jorg Janke
  *  @version    $Id: ATask.java,v 1.2 2006/07/30 00:51:27 jjanke Exp $
@@ -52,11 +52,10 @@ import org.zkoss.zul.South;
 public class WTask extends Window implements EventListener<Event>, IHelpContext
 {
 	/**
-	 *
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -1235619876719378703L;
 
-
 	/**
 	 *  Start Application Task
 	 *  @param task task model
@@ -70,9 +69,7 @@ public class WTask extends Window implements EventListener<Event>, IHelpContext
 
 	private Thread taskThread;
 
-
-	/**************************************************************************
-	 *  Full Constructor
+	/**
 	 *  @param title title
 	 *  @param task task
 	 */
@@ -108,7 +105,9 @@ public class WTask extends Window implements EventListener<Event>, IHelpContext
 		}
 	}   //  ATask
 
-
+	/**
+	 * Execute OS task.
+	 */
 	public void executeTask() {
 		Runnable runnable = new Runnable() {
 			public void run() {
@@ -165,7 +164,7 @@ public class WTask extends Window implements EventListener<Event>, IHelpContext
 	private Html info = new Html();
 
 	/**
-	 *  Static Layout
+	 *  Layout dialog
 	 *  @throws Exception
 	 */
 	private void zkInit() throws Exception
@@ -197,9 +196,10 @@ public class WTask extends Window implements EventListener<Event>, IHelpContext
 
 
 	/**
-	 *  Action Listener
+	 *  Event Listener
 	 *  @param e
 	 */
+	@Override
 	public void onEvent(Event e)
 	{
 		if (taskThread != null && taskThread.isAlive())
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java
index 7d93ba272d..366fc455d0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java
@@ -47,13 +47,13 @@ import org.zkoss.zul.Separator;
 import org.zkoss.zul.Vlayout;
 
 /**
- * 
+ * Text editor dialog with plain text and HTML editor tab
  * @author Low Heng Sin
  *
  */
 public class WTextEditorDialog extends Window implements EventListener<Event>{
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -1857623453350849161L;
 
@@ -71,7 +71,6 @@ public class WTextEditorDialog extends Window implements EventListener<Event>{
 	private boolean isUseEscForTabClosing = MSysConfig.getBooleanValue(MSysConfig.USE_ESC_FOR_TAB_CLOSING, false, Env.getAD_Client_ID(Env.getCtx()));
 
 	/**
-	 * 
 	 * @param title
 	 * @param text
 	 * @param editable
@@ -88,7 +87,7 @@ public class WTextEditorDialog extends Window implements EventListener<Event>{
 	 * @param editable
 	 * @param maxSize
 	 * @param IsHtml - select the html tab at start
-	 * @param IsShowHTMLTab - Is to shown HTML tab
+	 * @param IsShowHTMLTab - true to shown HTML tab
 	 */
 	public WTextEditorDialog(String title, String text, boolean editable, int maxSize,boolean IsHtml, boolean IsShowHTMLTab) {
 		super();
@@ -103,10 +102,19 @@ public class WTextEditorDialog extends Window implements EventListener<Event>{
 			tabbox.setSelectedTab(htmlTab);
 	}
 
+	/**
+	 * @param title
+	 * @param text
+	 * @param editable
+	 * @param maxSize
+	 */
 	public WTextEditorDialog(String title, String text, boolean editable, int maxSize) {
 		this(title, text, editable, maxSize, false);
 	}
 
+	/**
+	 * Layout dialog
+	 */
 	private void init() {
 		setBorder("normal");
 		if (!ThemeManager.isUseCSSForWindowSize()) {
@@ -202,6 +210,10 @@ public class WTextEditorDialog extends Window implements EventListener<Event>{
 		addEventListener(Events.ON_MAXIMIZE, e -> onSize());
 	}
 
+	/**
+	 * Create html editor (ckeditor) and add it to tabPanel
+	 * @param tabPanel
+	 */
 	private void createEditor(org.zkoss.zul.Tabpanel tabPanel) {		
 		editor = new CKeditor();
 		if (ClientInfo.isMobile())
@@ -218,6 +230,10 @@ public class WTextEditorDialog extends Window implements EventListener<Event>{
 		editor.setValue(text);
 	}
 
+	/**
+	 * Call back event for Ok button (from html editor)
+	 * @param event
+	 */
 	public void onEditorCallback(Event event) {
 		text = sanitize((String) event.getData());
 		detach();
@@ -231,7 +247,6 @@ public class WTextEditorDialog extends Window implements EventListener<Event>{
 			onCancel();
 		} else if (event.getTarget().getId().equals(ConfirmPanel.A_OK)) {
 			if (editable) {
-
 				if (maxSize > 0) {
 					int currentSize = 0;
 					if (tabbox.getSelectedIndex() == 0)
@@ -287,6 +302,9 @@ public class WTextEditorDialog extends Window implements EventListener<Event>{
 		}
 	}
 
+	/**
+	 * Handle onCancel event
+	 */
 	private void onCancel() {
 		// do not allow to close tab for Events.ON_CTRL_KEY event
 		if(isUseEscForTabClosing)
@@ -296,11 +314,18 @@ public class WTextEditorDialog extends Window implements EventListener<Event>{
 		detach();
 	}
 	
+	/**
+	 * Handle onSize event
+	 */
 	private void onSize() {
 		if(editor != null)
 			editor.invalidate();
 	}
 	
+	/**
+	 * Update status text (for text length)
+	 * @param newLength
+	 */
 	private void updateStatus(int newLength) {
 		if (status != null && maxSize > 0) {
 			StringBuilder msg = new StringBuilder();
@@ -318,21 +343,23 @@ public class WTextEditorDialog extends Window implements EventListener<Event>{
 	}
 	
 	/**
-	 * 
-	 * @return boolean
+	 * @return true if dialog is cancel by user
 	 */
 	public boolean isCancelled() {
 		return cancelled;
 	}
 	
 	/**
-	 * 
 	 * @return text
 	 */
 	public String getText() {
 		return text;
 	}
 
+	/**
+	 * @param untrustedHTML
+	 * @return sanitized html content
+	 */
 	public static String sanitize(String untrustedHTML) {
 		final PolicyFactory policy = Sanitizers.BLOCKS
 				.and(Sanitizers.FORMATTING)
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 d224618e74..357fe60c38 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
@@ -1,3 +1,24 @@
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ **********************************************************************/
 package org.adempiere.webui.window;
 
 import java.io.File;
@@ -89,9 +110,12 @@ import net.sf.jasperreports.export.SimpleWriterExporterOutput;
 import net.sf.jasperreports.export.SimpleXlsReportConfiguration;
 import net.sf.jasperreports.export.SimpleXlsxReportConfiguration;
 
+/**
+ * Viewer for jasper report
+ */
 public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCloseHandler, IReportViewerExportSource {
 	/**
-	 * 
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = -8782402996207677811L;
 
@@ -144,6 +168,11 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 
 	private Center center;
 	
+	/**
+	 * @param jasperPrint
+	 * @param title
+	 * @param printInfo
+	 */
 	public ZkJRViewer(JasperPrint jasperPrint, String title, PrintInfo printInfo) {
 		super();
 		this.setTitle(title);
@@ -156,6 +185,11 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 		init();
 	}
 
+	/**
+	 * @param jasperPrintList
+	 * @param title
+	 * @param printInfo
+	 */
 	public ZkJRViewer(java.util.List<JasperPrint> jasperPrintList, String title, PrintInfo printInfo) {
 		super();
 		this.setTitle(title);
@@ -186,6 +220,9 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 		} catch (Exception e) {}
 	}
 
+	/**
+	 * Layout viewer
+	 */
 	private void init() {
 		final boolean isCanExport=MRole.getDefault().isCanExport();
 		defaultType = jasperPrint == null ? null : jasperPrint.getProperty(ReportStarter.IDEMPIERE_REPORT_TYPE);
@@ -342,6 +379,12 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 	}
 
 	private boolean ToolBarMenuRestictionLoaded = false;
+	
+	/**
+	 * Hide not accessible toolbar button
+	 * @param AD_Window_ID
+	 * @param AD_Process_ID
+	 */
 	public void updateToolbarAccess(int AD_Window_ID, int AD_Process_ID) {
 		if (ToolBarMenuRestictionLoaded)
 			return;
@@ -377,6 +420,9 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 		ToolBarMenuRestictionLoaded = true;
 	}//updateToolbarAccess
 
+	/**
+	 * Create exporter for supported format type (html, pdf, etc)
+	 */
 	private void initMediaSuppliers() {
 		mediaSuppliers.put(toMediaType(PDF_MIME_TYPE, PDF_FILE_EXT), () -> {
 			try {
@@ -584,10 +630,20 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 		});
 	}
 	
+	/**
+	 * @param contentType
+	 * @param fileExtension
+	 * @return contentType + ; + fileExtension
+	 */
 	private String toMediaType(String contentType, String fileExtension) {
 		return contentType + ";" + fileExtension;
 	}
 	
+	/**
+	 * Create file name prefix from name
+	 * @param name
+	 * @return file name prefix
+	 */
 	private String makePrefix(String name) {
 		StringBuilder prefix = new StringBuilder();
 		char[] nameArray = name.toCharArray();
@@ -600,8 +656,8 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 		}
 		return prefix.toString();
 	}
-	/**************************************************************************
-	 * 	Action Listener
+	/**
+	 * 	Handle event
 	 * 	@param e event
 	 */
 	public void actionPerformed (Event e)
@@ -621,6 +677,9 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 			cmd_upload();
 	}	//	actionPerformed
 
+	/**
+	 * Render report
+	 */
 	private void cmd_render() {
 		try {
 			renderReport();
@@ -629,7 +688,9 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 		}
 	}
 
-	// Added by Martin Augustine - Ntier Software Services 09/10/2013
+	/**
+	 * Email report as pdf attachment
+	 */
 	private void cmd_sendMail()
 	{
 
@@ -653,6 +714,7 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 		AEnv.showWindow(dialog);
 	}	//	cmd_sendMail
 
+	@Override
 	public void onEvent(Event event) throws Exception {
 		if (event.getName().equals(Events.ON_CLICK) || event.getName().equals(Events.ON_SELECT)) {
 			actionPerformed(event);
@@ -670,6 +732,10 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
         }
 	}
 
+	/**
+	 * Handle key event
+	 * @param keyEvent
+	 */
 	private void onCtrlKeyEvent(KeyEvent keyEvent) {
 		if ((keyEvent.isAltKey() && keyEvent.getKeyCode() == 0x58)	// Alt-X
 				|| (keyEvent.getKeyCode() == 0x1B && isUseEscForTabClosing)) {	// ESC
@@ -678,6 +744,10 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 		}
 	}
 
+	/**
+	 * Render report
+	 * @throws Exception
+	 */
 	private void renderReport() throws Exception {
 		String reportType;
 		ClassLoader cl = Thread.currentThread().getContextClassLoader();
@@ -704,6 +774,11 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 		Events.echoEvent("onRenderReport", this, null);
 	}
 
+	/**
+	 * @return PDF file
+	 * @throws IOException
+	 * @throws JRException
+	 */
 	private File getPDF() throws IOException, JRException {
 		String path = System.getProperty("java.io.tmpdir");
 
@@ -730,6 +805,9 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 		return file;
 	}
 
+	/**
+	 * Handle onRenderReport event
+	 */
 	public void onRenderReport() {
 		Listitem selected = previewType.getSelectedItem();
 		String reportType=selected.getValue();
@@ -798,6 +876,9 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 		}
 	}
 
+	/**
+	 * Open report using javascript pdf viewer (pdf.js from Mozilla)
+	 */
 	protected void openWithPdfJsViewer() {
 		attachIFrame();
 		mediaVersion++;
@@ -892,7 +973,7 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 	} // cmd_archive
 
 	/**
-	 * Create archive for jasper report
+	 * Save jasper report as attachment of a record (AD_Table_ID and Record_ID from {@link #m_printInfo})
 	 */
 	protected void cmd_attachment()
 	{
@@ -915,9 +996,9 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 	} // cmd_archive
 
 	/** 
-	 * convert File data into Byte Data
+	 * convert File data into byte[]
 	 * @param tempFile
-	 * @return file in ByteData 
+	 * @return content of file in byte[]
 	 */
 	private byte[] getFileByteData(File tempFile)
 	{
@@ -951,6 +1032,9 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 		AEnv.showWindow(winExportFile);
 	}	//	cmd_export
 	
+	/**
+	 * Upload to external destination
+	 */
 	private void cmd_upload() {
 		if (media == null)
 			return;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java
index a11b6cba84..2278d9b864 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java
@@ -1,3 +1,24 @@
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ **********************************************************************/
 package org.adempiere.webui.window;
 
 import java.util.List;
@@ -13,8 +34,12 @@ import org.compiere.model.PrintInfo;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperPrint;
 
+/**
+ * Jasper report viewer provider
+ */
 public class ZkJRViewerProvider implements JRViewerProvider, JRViewerProviderList {
 
+	@Override
 	public void openViewer(final JasperPrint jasperPrint, final String title, final PrintInfo printInfo)
 			throws JRException {
 		Runnable runnable = new Runnable() {
@@ -32,6 +57,7 @@ public class ZkJRViewerProvider implements JRViewerProvider, JRViewerProviderLis
 		AEnv.executeAsyncDesktopTask(runnable);
 	}
 
+	@Override
 	public void openViewer(final List<JasperPrint> jasperPrintList, final String title , final PrintInfo printInfo)
 			throws JRException {
 		Runnable runnable = new Runnable() {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
index fd7bfbd664..1e7a960476 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
@@ -137,7 +137,7 @@ import org.zkoss.zul.impl.Utils;
 import org.zkoss.zul.impl.XulElement;
 
 /**
- *	Print View Frame
+ *	Report Viewer.
  *
  * 	@author 	Jorg Janke
  * 	@version 	$Id: Viewer.java,v 1.2 2006/07/30 00:51:28 jjanke Exp $
@@ -155,7 +155,7 @@ import org.zkoss.zul.impl.XulElement;
  */
 public class ZkReportViewer extends Window implements EventListener<Event>, IReportViewerExportSource {
 	/**
-	 *
+	 * generated serial id
 	 */
 	private static final long serialVersionUID = 3732290698059632847L;
 
@@ -200,6 +200,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 	private Listbox comboReport = new Listbox();
 	private Listitem previousSelected = new Listitem();
 	private WTableDirEditor wLanguage;
+	/** List box for preview type (pdf, html, etc) */
 	protected Listbox previewType = new Listbox();
 	
 	private ToolBarButton bRefresh = new ToolBarButton();
@@ -250,8 +251,8 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 	private boolean isUseEscForTabClosing = MSysConfig.getBooleanValue(MSysConfig.USE_ESC_FOR_TAB_CLOSING, false, Env.getAD_Client_ID(Env.getCtx()));
 
 	/**
-	 * 	Static Layout
-	 * 	@throws Exception
+	 * @param re
+	 * @param title
 	 */
 	public ZkReportViewer(ReportEngine re, String title) {		
 		super();
@@ -280,10 +281,18 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 		initMediaSuppliers();
 	}
 
+	/**
+	 * @param contentType
+	 * @param fileExtension
+	 * @return contentType + ; + fileExtension
+	 */
 	private String toMediaType(String contentType, String fileExtension) {
 		return contentType + ";" + fileExtension;
 	}
 	
+	/**
+	 * Create media supplier for supported format (pdf, html, etc)
+	 */
 	private void initMediaSuppliers() {
 		mediaSuppliers.put(toMediaType(PDF_MIME_TYPE, PDF_FILE_EXT), () -> {
 			try {
@@ -438,6 +447,9 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 		cleanUp();
 	}
 
+	/**
+	 * Layout viewer
+	 */
 	private void init() {
 		Borderlayout layout = new Borderlayout();
 		layout.setWidth("100%");
@@ -871,6 +883,9 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 		setTabOnCloseHandler();
 	}
 
+	/**
+	 * Set dummy onCloseHandler for parent tab
+	 */
 	private void setTabOnCloseHandler() {
 		Component parent = this.getParent();
 		while (parent != null) {
@@ -900,6 +915,9 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 		return AD_Tab_ID;
 	}
 
+	/**
+	 * Render report
+	 */
 	private void renderReport() {
 		media = null;
 		Listitem selected = previewType.getSelectedItem();
@@ -916,6 +934,9 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 		}		
 	}
 	
+	/**
+	 * Call from renderer runnable to show report output
+	 */
 	private void onPreviewReport() {
 		if(media == null)
 			return;
@@ -1006,10 +1027,16 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 		}
 	}
 
+	/**
+	 * Remove iframe
+	 */
 	private void detachIFrame() {
 		center.getChildren().clear();
 	}
 
+	/**
+	 * Add iframe to center
+	 */
 	private void attachIFrame() {
 		if (iframe != null && iframe.getPage() == null) {
 			center.getChildren().clear();
@@ -1017,6 +1044,11 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 		}
 	}
 
+	/**
+	 * Create file name prefix from name
+	 * @param name
+	 * @return file name prefix from name
+	 */
 	private String makePrefix(String name) {
 		StringBuilder prefix = new StringBuilder();
 		char[] nameArray = name.toCharArray();
@@ -1050,6 +1082,10 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 		}
 	}	//	dynInit
 
+	/**
+	 * Open {@link ProcessInfoDialog} if pi has error or logs
+	 * @param pi
+	 */
 	private void checkProcessInfo(ProcessInfo pi) {
 		ProcessInfoUtil.setLogFromDB(pi);
 		if (pi.isError() || (pi.getLogs() != null && pi.getLogs().length > 0)) {
@@ -1061,7 +1097,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 	}
 	
 	/**
-	 * 	Fill ComboBox comboReport (report options)
+	 * 	Fill ComboBox comboReport with print formats available and option to create new print format.
 	 *  @param AD_PrintFormat_ID item to be selected
 	 */
 	private void fillComboReport(int AD_PrintFormat_ID)
@@ -1142,7 +1178,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 	}	//	fillComboReport
 
 	/**
-	 * 	Revalidate settings after change of environment
+	 * Update title, status text and state of {@link #bWizard}
 	 */
 	private void revalidate()
 	{
@@ -1164,7 +1200,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 	}	//	revalidate
 
 	/**
-	 * 	Dispose
+	 * Close viewer
 	 */
 	public void onClose()
 	{
@@ -1182,6 +1218,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 		}
 	}
 	
+	@Override
 	public void onEvent(Event event) throws Exception {				
 		if(event.getName().equals(Events.ON_CLICK) || event.getName().equals(Events.ON_SELECT)) 
 			actionPerformed(event);
@@ -1223,6 +1260,9 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
         }
 	}
 
+	/**
+	 * Open {@link WReportUploadDialog} to upload report to external destination
+	 */
 	private void cmd_upload() {
 		if (media == null)
 			return;
@@ -1233,6 +1273,10 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 		AEnv.showWindow(winUploadFile);
 	}
 
+	/**
+	 * Handle key event
+	 * @param keyEvent
+	 */
 	private void onCtrlKeyEvent(KeyEvent keyEvent) {
 		if ((keyEvent.isAltKey() && keyEvent.getKeyCode() == 0x58)	// Alt-X
 				|| (keyEvent.getKeyCode() == 0x1B && isUseEscForTabClosing)) {	// ESC
@@ -1243,12 +1287,15 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 		}
 	}
 
+	/**
+	 * Handle onRenderReportEvent
+	 */
 	private void onRenderReportEvent() {
     	renderReport();
 	}
 
-	/**************************************************************************
-	 * 	Action Listener
+	/**
+	 * 	Handle event
 	 * 	@param e event
 	 */
 	public void actionPerformed (Event e)
@@ -1288,6 +1335,9 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 			cmd_upload();
 	}	//	actionPerformed
 	
+	/**
+	 * Handle onSelect event from {@link #previewType}
+	 */
 	private void cmd_render() {
 		postRenderReportEvent();		
 	}
@@ -1313,7 +1363,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 	}	//	executeDrill
 
 	/**
-	 * 	Open Window
+	 * 	Zoom to window
 	 *	@param query query
 	 */
 	private void cmd_window (MQuery query)
@@ -1397,11 +1447,10 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 	}	//	cmd_attachment
 
 	/**
-	 * 	Export
+	 * Open {@link WReportExportDialog} to export report
 	 */
 	private void cmd_export()
 	{		
-		log.config("");
 		if (!m_isCanExport)
 		{
 			Dialog.error(m_WindowNo, "AccessCannotExport", getTitle());
@@ -1573,15 +1622,15 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 	}
 	
 	/**
-	 * Refresh With Parameters
+	 * Rerun report
 	 */
 	private void cmd_reRun() {
 		this.cmd_reRun(null);
 	}
 	
 	/**
-	 * Refresh With Parameters
-	 * @param showHelp
+	 * Rerun report
+	 * @param showHelp if SHOWHELP_RunSilently_TakeDefaults, re-run with same parameter (i.e just refresh)
 	 */
 	private void cmd_reRun(String showHelp) {
 		int AD_Process_ID = m_reportEngine.getPrintInfo() != null ? m_reportEngine.getPrintInfo().getAD_Process_ID() : 0;
@@ -1616,8 +1665,11 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 			LayoutUtils.openOverlappedWindow(this, processModalDialog, "middle_center");
 		}
 		processModalDialog.focus();
-}	// cmd_reRun
+	}	// cmd_reRun
 	
+	/**
+	 * Set language to {@link #m_reportEngine}
+	 */
 	protected void setLanguage (){
 		if (MClient.get(m_ctx).isMultiLingualDocument() && wLanguage != null && wLanguage.getValue() != null){
 			MLanguage language = new MLanguage (m_ctx, (int)wLanguage.getValue(), null);
@@ -1628,6 +1680,9 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 		}
 	}
 	
+	/**
+	 * Set preview type to {@link #m_reportEngine}
+	 */
 	protected void setPreviewType() {
 		String type = Objects.toString(previewType.getValue());
 		
@@ -1639,7 +1694,10 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 		}
 		m_reportEngine.setReportType(type);
 	}
-	
+
+	/**
+	 * Echo {@link #ON_RENDER_REPORT_EVENT} event
+	 */
 	private void postRenderReportEvent() {
 		showBusyDialog();
 		setLanguage();
@@ -1648,8 +1706,6 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 		updateRowCount();
 	}
 
-
-
 	/**
 	 * 	Query Report
 	 */
@@ -1766,7 +1822,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 	}	//	cmd_find
 
 	/**
-	 * 	Call Customize
+	 * Open print format window
 	 */
 	private void cmd_customize()
 	{
@@ -1775,7 +1831,9 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 		AEnv.zoom(pfAD_Window_ID, MQuery.getEqualQuery("AD_PrintFormat_ID", AD_PrintFormat_ID));
 	}	//	cmd_customize
 	
-	/*IDEMPIERE -379*/
+	/**
+	 * IDEMPIERE-379 Report customization wizard
+	 */
 	private void cmd_Wizard()
 	{
 	    ADForm form = ADForm.openForm(SystemIDs.FORM_REPORT_WIZARD);
@@ -1814,6 +1872,11 @@ public class ZkReportViewer extends Window implements EventListener<Event>, IRep
 	
 	private boolean ToolBarMenuRestictionLoaded = false;
 
+	/**
+	 * Hide not accessible toolbar
+	 * @param AD_Window_ID
+	 * @param AD_Process_ID
+	 */
 	public void updateToolbarAccess(int AD_Window_ID, int AD_Process_ID) {
 		if (ToolBarMenuRestictionLoaded)
 			return;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewerProvider.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewerProvider.java
index c8c047c2f9..1a12f53e6b 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewerProvider.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewerProvider.java
@@ -28,7 +28,7 @@ import org.compiere.util.Util;
 import org.zkoss.zk.ui.Executions;
 
 /**
- * 
+ * Report viewer provider
  * @author Low Heng Sin
  *
  */
@@ -50,6 +50,10 @@ public class ZkReportViewerProvider implements ReportViewerProvider {
 		}
 	}
 
+	/**
+	 * Open report viewer
+	 * @param report
+	 */
 	protected void openReportViewWindow (ReportEngine report) {
 		ZkReportViewer viewer = new ZkReportViewer(report, report.getName());
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/media/IMediaView.java b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/media/IMediaView.java
index d2fb3d324e..ede5131592 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/media/IMediaView.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/media/IMediaView.java
@@ -28,10 +28,16 @@ import org.zkoss.util.media.AMedia;
 import org.zkoss.zk.ui.Component;
 
 /**
+ * Interface to provider custom viewer component for media
  * @author hengsin
- *
  */
 public interface IMediaView {
 
+	/**
+	 * @param container parent container
+	 * @param media media to render
+	 * @param readOnly
+	 * @return Component
+	 */
 	public Component renderMediaView(Component container, AMedia media, boolean readOnly);
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/media/IMediaViewProvider.java b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/media/IMediaViewProvider.java
index d0ac70ab4f..f1d1032538 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/media/IMediaViewProvider.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/media/IMediaViewProvider.java
@@ -25,16 +25,15 @@
 package org.idempiere.ui.zk.media;
 
 /**
+ * Provider interface for {@link IMediaView}
  * @author hengsin
- *
  */
 public interface IMediaViewProvider {
 	
 	/**
-	 * 
 	 * @param contentType mime type
 	 * @param extension file extension
-	 * @param mobile
+	 * @param mobile true for mobile client, false otherwise
 	 * @return {@link IMediaView} instance or null
 	 */
 	public IMediaView getMediaView(String contentType, String extension, boolean mobile);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/media/Medias.java b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/media/Medias.java
index 4ed74bc00f..3fa2c43860 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/media/Medias.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/media/Medias.java
@@ -27,7 +27,7 @@ package org.idempiere.ui.zk.media;
 import com.google.common.net.MediaType;
 
 /**
- * 
+ * Constants for media mime type and file extension
  * @author hengsin
  *
  */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/media/WMediaOptions.java b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/media/WMediaOptions.java
index 3e4954d893..fbdad316e6 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/media/WMediaOptions.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/media/WMediaOptions.java
@@ -49,6 +49,7 @@ import org.zkoss.zul.Filedownload;
 import org.zkoss.zul.Vlayout;
 
 /**
+ * Dialog to provide option to upload or view media
  * @author hengsin
  *
  */
@@ -60,7 +61,6 @@ public class WMediaOptions extends Window {
 	private static final long serialVersionUID = 1642315087176748005L;
 
 	/**
-	 * 
 	 * @param media
 	 * @param preview
 	 * @param uploadServicesMap
@@ -121,6 +121,13 @@ public class WMediaOptions extends Window {
 		}
 	}
 	
+	/**
+	 * Upload media via handler
+	 * @param media
+	 * @param account
+	 * @param handler
+	 * @param page
+	 */
 	private void uploadMedia(AMedia media, MAuthorizationAccount account, IUploadHandler handler, Page page) {
 		UploadResponse response = handler.uploadMedia(new UploadMedia(media.getName(), media.getContentType(),
 				media.isBinary() ? media.getStreamData() : new ReaderInputStream(media.getReaderData(), StandardCharsets.UTF_8.name()), 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/websocket/ServerPushEndPoint.java b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/websocket/ServerPushEndPoint.java
index 10aab10730..0da443b8e3 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/websocket/ServerPushEndPoint.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/websocket/ServerPushEndPoint.java
@@ -39,8 +39,8 @@ import org.compiere.util.CLogger;
 import org.compiere.util.Util;
 
 /**
+ * web socket end point for server push
  * @author hengsin
- *
  */
 @ServerEndpoint(value="/serverpush/{dtid}")
 public class ServerPushEndPoint {
@@ -49,11 +49,10 @@ public class ServerPushEndPoint {
 	private String dtid;
 
 	/**
-	 * 
+	 * default constructor
 	 */
 	public ServerPushEndPoint() {
 	}
-
 	
 	@OnClose
 	public void onClose(Session sess) throws IOException {
@@ -63,7 +62,6 @@ public class ServerPushEndPoint {
 		}
 	}
 
-
 	@OnOpen
 	public void onOpen(Session sess, @PathParam("dtid") String dtid) throws IOException {
 		if (!Util.isEmpty(dtid, true) && WebSocketServerPush.isValidDesktopId(dtid)) {			
@@ -73,13 +71,16 @@ public class ServerPushEndPoint {
 		}
 	}
 
-
 	@OnError
 	public void onError(Session sess, Throwable throwable) {
 		CLogger.getCLogger(getClass()).log(Level.WARNING, throwable.getMessage(), throwable);	
 	}
 
-
+	/**
+	 * Handle ping from client
+	 * @param session
+	 * @param message
+	 */
 	@OnMessage
 	public void onMessage(Session session, String message) { 
 		if (session == this.session && !Util.isEmpty(message)) {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/websocket/WebSocketServerPush.java b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/websocket/WebSocketServerPush.java
index 1d4f9bb483..dc37006b8e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/websocket/WebSocketServerPush.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/websocket/WebSocketServerPush.java
@@ -46,7 +46,7 @@ import org.zkoss.zk.ui.sys.ServerPush;
 import org.zkoss.zk.ui.util.Clients;
 
 /**
- * 
+ * Server push implementation using web socket
  * @author hengsin
  *
  */
@@ -174,7 +174,8 @@ public class WebSocketServerPush implements ServerPush {
     		//has pending serverpush echo, wait for next execution piggyback trigger by the pending serverpush echo
     		return;
     	}
-    	    	
+
+    	//Process pending schedule event
     	Schedule<Event>[] pendings = null;
     	synchronized (schedules) {
     		if (!schedules.isEmpty()) {
@@ -211,7 +212,7 @@ public class WebSocketServerPush implements ServerPush {
     		scheduler.schedule(task, event);
 	        echo();
     	} else {
-    		// in event listener thread, use echo to execute async
+    		// in event listener thread, use echo to process this asynchronously in onPiggyback
     		synchronized (schedules) {
 				schedules.add(new Schedule(task, event, scheduler));
 			}
@@ -321,7 +322,6 @@ public class WebSocketServerPush implements ServerPush {
 	}
 	
 	/**
-	 * 
 	 * @param dtid desktop id
 	 * @return true if serverpush started for dtid, false otherwise
 	 */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/zkforge/keylistener/Keylistener.java b/org.adempiere.ui.zk/WEB-INF/src/org/zkforge/keylistener/Keylistener.java
index 3c9f1b07c8..d518c29ad8 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/zkforge/keylistener/Keylistener.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/zkforge/keylistener/Keylistener.java
@@ -24,21 +24,21 @@ public class Keylistener extends HtmlBasedComponent {
 	private boolean _autoBlur = true;
 
 	/**
-	 * Auto generated serial UID
+	 * generated serial UID
 	 */
 	private static final long serialVersionUID = 4611014738053691844L;
 
 	/**
 	 * Is auto blur active
 	 *
-	 * @return the autoBlur
+	 * @return true if autoBlur is enable, false otherwise
 	 */
 	public boolean isAutoBlur() {
 		return _autoBlur;
 	}
 
 	/**
-	 * Set auto blur. If auto blur is set focus will be moved to keylistener
+	 * Set auto blur. If auto blur is set, focus will be moved to keylistener
 	 * component before onCtrlKey event is triggered. This is used to force any
 	 * pending onChange events to be triggered first.
 	 *
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/zkoss/addon/chosenbox/Chosenbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/zkoss/addon/chosenbox/Chosenbox.java
index 8aede628b1..045564384b 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/zkoss/addon/chosenbox/Chosenbox.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/zkoss/addon/chosenbox/Chosenbox.java
@@ -120,6 +120,9 @@ public class Chosenbox<T> extends HtmlBasedComponent {
 		}
 	}
 	
+	/**
+	 * Post onOk event to first parent component that listen to it
+	 */
 	private void postOnOk() {
 		Component p = getParent();
 		while (p != null) {
@@ -159,6 +162,7 @@ public class Chosenbox<T> extends HtmlBasedComponent {
 
 	/**
 	 * Sets the tab order of the input node of this component.
+	 * @param tabindex
 	 */
 	public void setTabindex(int tabindex) throws WrongValueException {
 		if (_tabindex != tabindex) {