diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
index 2032ee4bb4..f6a0ae9668 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java
@@ -47,6 +47,8 @@ import org.compiere.util.CLogger;
 import org.compiere.util.DB;
 import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
+import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.Page;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
@@ -67,12 +69,15 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
 	private String 				columnName;
     private Object              value;
     private InfoPanel			infoPanel = null;
+	private String imageUrl;
 
 	private static CLogger log = CLogger.getCLogger(WSearchEditor.class);
 
+	private static final String IN_PROGRESS_IMAGE = "~./zk/img/progress3.gif";
+	
 	public WSearchEditor (GridField gridField)
 	{
-		super(new Searchbox(), gridField);
+		super(new CustomSearchBox(), gridField);
 
 		lookup = gridField.getLookup();
 
@@ -150,21 +155,22 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
 	{
 
 		columnName = this.getColumnName();
+		imageUrl = "/images/PickOpen10.png";
 		if (columnName.equals("C_BPartner_ID"))
 		{
 			popupMenu = new WEditorPopupMenu(true, true, isShowPreference(), true, true, false, lookup);
-			getComponent().setButtonImage("/images/BPartner10.png");
+			imageUrl = "/images/BPartner10.png";
 		}
 		else if (columnName.equals("M_Product_ID"))
 		{
 			popupMenu = new WEditorPopupMenu(true, true, isShowPreference(), false, false, false, lookup);
-			getComponent().setButtonImage("/images/Product10.png");
+			imageUrl = "/images/Product10.png";
 		}
 		else
 		{
 			popupMenu = new WEditorPopupMenu(true, true, isShowPreference(), false, false, false, lookup);
-			getComponent().setButtonImage("/images/PickOpen10.png");
 		}
+		getComponent().getButton().setImage(imageUrl);
 
 		addChangeLogMenu(popupMenu);
 
@@ -319,6 +325,7 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
 		if (text == null || text.length() == 0 || text.equals("%"))
 		{
 			actionButton(text);
+			resetButtonState();
 			return;
 		}
 		if (log.isLoggable(Level.CONFIG))
@@ -351,16 +358,25 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
 			{
 				actionButton(getComponent().getText());
 			}
+			resetButtonState();
 			return;
 		}
 		if (log.isLoggable(Level.FINE))
 			log.fine(getColumnName() + " - Unique ID=" + id);
 
 		actionCombo(new Integer(id));          //  data binding
-		//m_text.requestFocus();
+		
+		resetButtonState();
 	}	//	actionText
 
 
+	private void resetButtonState() {
+		getComponent().getButton().setEnabled(true);
+		getComponent().getButton().setImage(imageUrl);
+		getComponent().invalidate();
+	}
+
+
 	private void actionCombo (Object value)
 	{
 		if (log.isLoggable(Level.FINE))
@@ -533,7 +549,6 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
 		m_tableName = m_columnName.substring(0, m_columnName.length()-3);
 		m_keyColumnName = m_columnName;
 
-		//TODO: check info window definition
 		if (m_columnName.equals("M_Product_ID"))
 		{
 			//	Reset
@@ -849,4 +864,24 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value
 		}
 		return null;
 	}
+	
+	static class CustomSearchBox extends Searchbox {
+
+		/**
+		 * generated serial id
+		 */
+		private static final long serialVersionUID = 7490301044763375829L;
+
+		@Override
+		public void onPageAttached(Page newpage, Page oldpage) {
+			super.onPageAttached(newpage, oldpage);
+			if (newpage != null) {
+				String w = "var btn=jq('#'+this.parent.uuid+' @button').zk.$();";
+				getTextbox().setWidgetListener("onChange", "try{"+w+"btn.setImage(\""
+						+ Executions.getCurrent().encodeURL(IN_PROGRESS_IMAGE)+"\");"
+						+ "btn.setDisabled(true, {adbs: false, skip: false});}catch(err){}");
+			}
+		}
+		
+	}
 }
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 1aabe7428b..bf66331cca 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
@@ -3,6 +3,8 @@
  */
 package org.adempiere.webui.info;
 
+import org.adempiere.webui.panel.InvoiceHistory;
+
 /**
  * @author hengsin
  *
@@ -49,4 +51,30 @@ public class InfoBPartnerWindow extends InfoWindow {
 		// TODO Auto-generated constructor stub
 	}
 
+	/**
+	 *	Has History
+	 *  @return true
+	 */
+	@Override
+	protected boolean hasHistory()
+	{
+		return true;
+	}	//	hasHistory
+	
+	// Elaine 2008/12/16
+	/**************************************************************************
+	 *	Show History
+	 */
+	@Override
+	protected void showHistory()
+	{
+		log.info("");
+		Integer C_BPartner_ID = getSelectedRowKey();
+		if (C_BPartner_ID == null)
+			return;
+		InvoiceHistory ih = new InvoiceHistory (this, C_BPartner_ID.intValue(), 
+			0, 0, 0);
+		ih.setVisible(true);
+		ih = null;
+	}	//	showHistory
 }
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 d074903064..f347d4ed1c 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
@@ -114,6 +114,12 @@ public class InfoProductWindow extends InfoWindow {
 	@Override
 	protected String getSQLWhere() {
 		StringBuilder where = new StringBuilder(super.getSQLWhere());
+		if (getSelectedWarehouseId() > 0) {
+			if (where.length() > 0) {
+				where.append(" AND ");
+			}
+			where.append("p.IsSummary='N' ");
+		}
 		return where.toString();
 	}
 
@@ -801,4 +807,14 @@ public class InfoProductWindow extends InfoWindow {
 				String.valueOf(m_M_Locator_ID));
 		}
 	}
+
+	@Override
+	protected void prepareTable(ColumnInfo[] layout, String from, String where,
+			String orderBy) {
+		if (getSelectedWarehouseId() > 0)
+		{
+			orderBy = "QtyAvailable DESC";
+		}
+		super.prepareTable(layout, from, where, orderBy);
+	}
 }
diff --git a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
index 66f7607c5b..a4c04a101a 100644
--- a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
+++ b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
@@ -772,6 +772,8 @@ span.z-tree-tee, span.z-tree-last {
 .editor-box .editor-button img {
 	vertical-align: middle;
 	text-align: center;
+	width: 10px;
+	height: 10px;
 }
 
 .editor-box .editor-button-column {