zkwebui/WEB-INF/src/org/adempiere/webui/Desktop.java

@@ -18,20 +18,24 @@
 package org.adempiere.webui;
 
 import java.io.Serializable;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.logging.Level;
 
+import org.adempiere.webui.apps.AEnv;
 import org.adempiere.webui.apps.ProcessDialog;
-import org.adempiere.webui.component.Grid;
-import org.adempiere.webui.component.Row;
-import org.adempiere.webui.component.Rows;
+import org.adempiere.webui.component.Button;
 import org.adempiere.webui.component.Tabpanel;
+import org.adempiere.webui.component.ToolBarButton;
 import org.adempiere.webui.component.Window;
 import org.adempiere.webui.event.MenuListener;
 import org.adempiere.webui.exception.ApplicationException;
 import org.adempiere.webui.panel.ADForm;
 import org.adempiere.webui.panel.HeaderPanel;
+import org.adempiere.webui.panel.InfoPanel;
 import org.adempiere.webui.panel.SidePanel;
 import org.adempiere.webui.part.AbstractUIPart;
 import org.adempiere.webui.part.WindowContainer;
@@ -39,20 +43,34 @@ import org.adempiere.webui.window.ADWindow;
 import org.compiere.model.MClient;
 import org.compiere.model.MMenu;
 import org.compiere.model.MQuery;
+import org.compiere.model.MRole;
+import org.compiere.model.MTree;
+import org.compiere.model.MTreeNode;
 import org.compiere.util.CLogger;
+import org.compiere.util.DB;
 import org.compiere.util.Env;
+import org.compiere.util.Msg;
 import org.compiere.util.WebDoc;
+import org.zkoss.lang.Threads;
 import org.zkoss.util.media.AMedia;
 import org.zkoss.zk.ui.Component;
+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;
 import org.zkoss.zkex.zul.Borderlayout;
 import org.zkoss.zkex.zul.Center;
 import org.zkoss.zkex.zul.North;
+import org.zkoss.zkex.zul.South;
 import org.zkoss.zkex.zul.West;
+import org.zkoss.zul.Box;
 import org.zkoss.zul.Caption;
 import org.zkoss.zul.Groupbox;
+import org.zkoss.zul.Hbox;
 import org.zkoss.zul.Iframe;
-import org.zkoss.zul.Label;
+import org.zkoss.zul.Separator;
+import org.zkoss.zul.Vbox;
 
 /**
  * 
@@ -61,7 +79,7 @@ import org.zkoss.zul.Label;
  * @date Mar 2, 2007
  * @version $Revision: 0.10 $
  */
-public class Desktop extends AbstractUIPart implements MenuListener, Serializable, IDesktop
+public class Desktop extends AbstractUIPart implements MenuListener, Serializable, IDesktop, EventListener
 {
 
 	private static final long serialVersionUID = 9056511175189603883L;
@@ -78,6 +96,8 @@ public class Desktop extends AbstractUIPart implements MenuListener, Serializabl
 
 	private WindowContainer windowContainer;
 	
+	private Button btnNotice, btnRequest, btnWorkflow;
+
     public Desktop()
     {
     	windows = new ArrayList<Object>();
@@ -122,35 +142,403 @@ public class Desktop extends AbstractUIPart implements MenuListener, Serializabl
     }
 
 	private void createHomeTab() {
-		//TODO: dashboard
         Tabpanel homeTab = new Tabpanel();
         windowContainer.addWindow(homeTab, "Home", false);
 
-        Grid grid = new Grid();
-        grid.setOddRowSclass("even");
-        grid.setSclass("grid-no-striped");
-        grid.setWidth("100%");
-        grid.setHeight("100%");
-        homeTab.appendChild(grid);
+        Groupbox gbxFav = new Groupbox();
+        gbxFav.setMold("3d");
+        gbxFav.setClosable(true);
+        gbxFav.setHeight("100%");
+        gbxFav.appendChild(new Caption("Favourites"));
+        gbxFav.appendChild(createFavouritesPanel());
         
-        Rows rows = new Rows();
-        grid.appendChild(rows);
+        Groupbox gbxView = new Groupbox();
+        gbxView.setMold("3d");
+        gbxView.setClosable(true);
+        gbxView.setHeight("100%");
+        gbxView.appendChild(new Caption("Views"));
+        gbxView.appendChild(createViewPanel());
 		
-        Row row = new Row();
-        rows.appendChild(row);
+		final Hbox hbox = new Hbox();
 		
-        Groupbox groupBox = new Groupbox();
-        row.appendChild(groupBox);
-        Caption caption = new Caption("Favourites");
-        groupBox.appendChild(caption);
-        groupBox.setMold("3d");
-        groupBox.appendChild(new Label("My Favourites!"));
-        groupBox.setClosable(true);
+        btnNotice = new Button();
+        hbox.appendChild(btnNotice);
+        btnNotice.setLabel("Notice : 0");
+        btnNotice.setTooltiptext("Notice");
+        btnNotice.setImage("/images/GetMail16.gif");
+        int AD_Menu_ID = DB.getSQLValue(null, "SELECT MAX(AD_Menu_ID) FROM AD_Menu WHERE Name = 'Notice'");
+        btnNotice.setName(String.valueOf(AD_Menu_ID));
+        btnNotice.addEventListener(Events.ON_CLICK, this);
+        
+        btnRequest = new Button();
+        hbox.appendChild(btnRequest);
+        btnRequest.setLabel("Request : 0");
+        btnRequest.setTooltiptext("Request");
+        btnRequest.setImage("/images/Request16.gif");
+        AD_Menu_ID = DB.getSQLValue(null, "SELECT MAX(AD_Menu_ID) FROM AD_Menu WHERE Name = 'Request'");
+        btnRequest.setName(String.valueOf(AD_Menu_ID));
+        btnRequest.addEventListener(Events.ON_CLICK, this);
+        
+        btnWorkflow = new Button();
+        hbox.appendChild(btnWorkflow);
+        btnWorkflow.setLabel("Workflow Activities : 0");
+        btnWorkflow.setTooltiptext("Workflow Activities");
+        btnWorkflow.setImage("/images/Assignment16.gif");
+        AD_Menu_ID = DB.getSQLValue(null, "SELECT MAX(AD_Menu_ID) FROM AD_Menu WHERE Name = 'Workflow Activities'");
+        btnWorkflow.setName(String.valueOf(AD_Menu_ID));
+        btnWorkflow.addEventListener(Events.ON_CLICK, this);
+
+        Borderlayout borderlayout = new Borderlayout();
+		homeTab.appendChild(borderlayout);
+        borderlayout.setWidth("100%");
+        borderlayout.setHeight("100%");
+        borderlayout.setStyle("background-color: transparent; position: absolute;");
+
+        West west = new West();
+        west.appendChild(gbxFav);
+        borderlayout.appendChild(west);
+        west.setSplittable(true);
+        west.setStyle("background-color: transparent");
+        
+        Center center = new Center();
+        center.appendChild(gbxView);
+        borderlayout.appendChild(center);
+        center.setStyle("background-color: transparent");
+
+		South south = new South();
+		south.appendChild(hbox);
+		borderlayout.appendChild(south);
+		south.setStyle("background-color: transparent");
 
         //register as 0
         registerWindow(homeTab);
+        
+        // enable server push for this desktop
+        if (!hbox.getDesktop().isServerPushEnabled())
+        	hbox.getDesktop().enableServerPush(true);
+        
+        updateInfo();
+        
+        new Thread(new Runnable() {
+			public void run() {
+				try {
+					// get full control of desktop
+					Executions.activate(hbox.getDesktop());
+					try {
+						updateInfo();
+						Threads.sleep(500);// Update each 0.5 seconds
+					} catch (Error ex) {
+						throw ex;
+					} finally {
+						// release full control of desktop
+						Executions.deactivate(hbox.getDesktop());
+					}
+				} catch (Exception e) {
+					logger.log(Level.WARNING, "Failed to run NRW", e);
+				}
+			}
+		}).start();
 	}
 	
+	private Box createFavouritesPanel()
+	{
+		Vbox vbox = new Vbox();
+		
+		int AD_Role_ID = Env.getAD_Role_ID(Env.getCtx());
+		int AD_Tree_ID = DB.getSQLValue(null,
+			"SELECT COALESCE(r.AD_Tree_Menu_ID, ci.AD_Tree_Menu_ID)" 
+			+ "FROM AD_ClientInfo ci" 
+			+ " INNER JOIN AD_Role r ON (ci.AD_Client_ID=r.AD_Client_ID) "
+			+ "WHERE AD_Role_ID=?", AD_Role_ID);
+		if (AD_Tree_ID <= 0)
+			AD_Tree_ID = 10;	//	Menu
+		
+		MTree vTree = new MTree(Env.getCtx(), AD_Tree_ID, false, true, null);
+		MTreeNode m_root = vTree.getRoot();
+		Enumeration enTop = m_root.children();		
+		while(enTop.hasMoreElements())
+		{
+			MTreeNode ndTop = (MTreeNode)enTop.nextElement();
+			Enumeration en = ndTop.preorderEnumeration();
+			while (en.hasMoreElements())
+			{
+				MTreeNode nd = (MTreeNode)en.nextElement();
+				if (nd.isOnBar()) {				
+					String label = nd.toString().trim();
+					ToolBarButton btnFavItem = new ToolBarButton(String.valueOf(nd.getNode_ID()));
+					btnFavItem.setLabel(label);
+					btnFavItem.addEventListener(Events.ON_CLICK, this);
+					vbox.appendChild(btnFavItem);
+				}
+			}
+		}
+		
+		return vbox;
+	}
+	
+	private Box createViewPanel()
+	{
+		Vbox vbox = new Vbox();
+				
+		if (MRole.getDefault().isAllow_Info_Product())
+		{
+			ToolBarButton btnViewItem = new ToolBarButton("InfoProduct");
+			btnViewItem.setLabel(Msg.getMsg(Env.getCtx(), "InfoProduct"));
+			btnViewItem.addEventListener(Events.ON_CLICK, this);
+			vbox.appendChild(btnViewItem);
+		}
+		if (MRole.getDefault().isAllow_Info_BPartner())
+		{
+			ToolBarButton btnViewItem = new ToolBarButton("InfoBPartner");
+			btnViewItem.setLabel(Msg.getMsg(Env.getCtx(), "InfoBPartner"));
+			btnViewItem.addEventListener(Events.ON_CLICK, this);
+			vbox.appendChild(btnViewItem);
+		}
+		if (MRole.getDefault().isShowAcct() && MRole.getDefault().isAllow_Info_Account())
+		{
+			ToolBarButton btnViewItem = new ToolBarButton("InfoAccount");
+			btnViewItem.setLabel(Msg.getMsg(Env.getCtx(), "InfoAccount"));
+			btnViewItem.addEventListener(Events.ON_CLICK, this);
+			vbox.appendChild(btnViewItem);
+		}
+		if (MRole.getDefault().isAllow_Info_Schedule())
+		{
+			ToolBarButton btnViewItem = new ToolBarButton("InfoSchedule");
+			btnViewItem.setLabel(Msg.getMsg(Env.getCtx(), "InfoSchedule"));
+			btnViewItem.addEventListener(Events.ON_CLICK, this);
+			vbox.appendChild(btnViewItem);
+		}
+		vbox.appendChild(new Separator("horizontal"));
+		if (MRole.getDefault().isAllow_Info_Order())
+		{
+			ToolBarButton btnViewItem = new ToolBarButton("InfoOrder");
+			btnViewItem.setLabel(Msg.getMsg(Env.getCtx(), "InfoOrder"));
+			btnViewItem.addEventListener(Events.ON_CLICK, this);
+			vbox.appendChild(btnViewItem);
+		}
+		if (MRole.getDefault().isAllow_Info_Invoice())
+		{
+			ToolBarButton btnViewItem = new ToolBarButton("InfoInvoice");
+			btnViewItem.setLabel(Msg.getMsg(Env.getCtx(), "InfoInvoice"));
+			btnViewItem.addEventListener(Events.ON_CLICK, this);
+			vbox.appendChild(btnViewItem);
+		}
+		if (MRole.getDefault().isAllow_Info_InOut())
+		{
+			ToolBarButton btnViewItem = new ToolBarButton("InfoInOut");
+			btnViewItem.setLabel(Msg.getMsg(Env.getCtx(), "InfoInOut"));
+			btnViewItem.addEventListener(Events.ON_CLICK, this);
+			vbox.appendChild(btnViewItem);
+		}
+		if (MRole.getDefault().isAllow_Info_Payment())
+		{
+			ToolBarButton btnViewItem = new ToolBarButton("InfoPayment");
+			btnViewItem.setLabel(Msg.getMsg(Env.getCtx(), "InfoPayment"));
+			btnViewItem.addEventListener(Events.ON_CLICK, this);
+			vbox.appendChild(btnViewItem);
+		}
+		if (MRole.getDefault().isAllow_Info_CashJournal())
+		{
+			ToolBarButton btnViewItem = new ToolBarButton("InfoCashLine");
+			btnViewItem.setLabel(Msg.getMsg(Env.getCtx(), "InfoCashLine"));
+			btnViewItem.addEventListener(Events.ON_CLICK, this);
+			vbox.appendChild(btnViewItem);
+		}
+		if (MRole.getDefault().isAllow_Info_Resource())
+		{
+			ToolBarButton btnViewItem = new ToolBarButton("InfoAssignment");
+			btnViewItem.setLabel(Msg.getMsg(Env.getCtx(), "InfoAssignment"));
+			btnViewItem.addEventListener(Events.ON_CLICK, this);
+			vbox.appendChild(btnViewItem);
+		}
+		if (MRole.getDefault().isAllow_Info_Asset())
+		{
+			ToolBarButton btnViewItem = new ToolBarButton("InfoAsset");
+			btnViewItem.setLabel(Msg.getMsg(Env.getCtx(), "InfoAsset"));
+			btnViewItem.addEventListener(Events.ON_CLICK, this);
+			vbox.appendChild(btnViewItem);
+		}
+		
+		return vbox;
+	}
+	
+	private int getNoticeCount()
+	{
+		String sql = "SELECT COUNT(1) FROM AD_Note "
+			+ "WHERE AD_Client_ID=? AND AD_User_ID IN (0,?)"
+			+ " AND Processed='N'";
+		int retValue = DB.getSQLValue(null, sql, Env.getAD_Client_ID(Env.getCtx()), Env.getAD_User_ID(Env.getCtx()));
+		return retValue;
+	}
+	
+	private int getRequestCount()
+	{
+		String sql = MRole.getDefault().addAccessSQL ("SELECT COUNT(1) FROM R_Request "
+				+ "WHERE (SalesRep_ID=? OR AD_Role_ID=?) AND Processed='N'"
+				+ " AND (DateNextAction IS NULL OR TRUNC(DateNextAction) <= TRUNC(SysDate))"
+				+ " AND (R_Status_ID IS NULL OR R_Status_ID IN (SELECT R_Status_ID FROM R_Status WHERE IsClosed='N'))",
+					"R_Request", false, true);	//	not qualified - RW
+		int retValue = DB.getSQLValue(null, sql, Env.getAD_User_ID(Env.getCtx()), Env.getAD_Role_ID(Env.getCtx())); 
+		return retValue;
+	}
+	
+	public int getWorkflowCount() 
+	{
+		int count = 0;
+		
+		String sql = "SELECT count(*) FROM AD_WF_Activity a "
+			+ "WHERE a.Processed='N' AND a.WFState='OS' AND ("
+			//	Owner of Activity
+			+ " a.AD_User_ID=?"	//	#1
+			//	Invoker (if no invoker = all)
+			+ " OR EXISTS (SELECT * FROM AD_WF_Responsible r WHERE a.AD_WF_Responsible_ID=r.AD_WF_Responsible_ID"
+			+ " AND COALESCE(r.AD_User_ID,0)=0 AND COALESCE(r.AD_Role_ID,0)=0 AND (a.AD_User_ID=? OR a.AD_User_ID IS NULL))"	//	#2
+			// Responsible User
+			+ " OR EXISTS (SELECT * FROM AD_WF_Responsible r WHERE a.AD_WF_Responsible_ID=r.AD_WF_Responsible_ID"
+			+ " AND r.AD_User_ID=?)"		//	#3
+			//	Responsible Role
+			+ " OR EXISTS (SELECT * FROM AD_WF_Responsible r INNER JOIN AD_User_Roles ur ON (r.AD_Role_ID=ur.AD_Role_ID)"
+			+ " WHERE a.AD_WF_Responsible_ID=r.AD_WF_Responsible_ID AND ur.AD_User_ID=?))";	//	#4
+			//
+			//+ ") ORDER BY a.Priority DESC, Created";
+		int AD_User_ID = Env.getAD_User_ID(Env.getCtx());
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			pstmt = DB.prepareStatement (sql, null);
+			pstmt.setInt (1, AD_User_ID);
+			pstmt.setInt (2, AD_User_ID);
+			pstmt.setInt (3, AD_User_ID);
+			pstmt.setInt (4, AD_User_ID);
+			rs = pstmt.executeQuery ();
+			if (rs.next ()) {
+				count = rs.getInt(1);
+			}
+		}
+		catch (Exception e)
+		{
+			logger.log(Level.SEVERE, sql, e);
+		}
+		finally
+		{
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
+		}
+		
+		return count;
+	}
+	
+    private void updateInfo()
+	{
+    	int noOfNotice = getNoticeCount();
+    	int noOfRequest = getRequestCount();
+    	int noOfWorkflow = getWorkflowCount();
+    	int total = noOfNotice + noOfRequest + noOfWorkflow;
+    	
+		btnNotice.setLabel("Notice : " + noOfNotice);
+		btnRequest.setLabel("Request : " + noOfRequest);
+		btnWorkflow.setLabel("Workflow Activities : " + noOfWorkflow);
+		windowContainer.setTabTitle(0, "Home (" + total + ")", 
+				"Notice : " + noOfNotice + ", Request : " + noOfRequest + ", Workflow Activities : " + noOfWorkflow);
+	}
+	
+    public void onEvent(Event event)
+    {
+        Component comp = event.getTarget();
+        String eventName = event.getName();
+        
+        if(eventName.equals(Events.ON_CLICK))
+        {
+            if(comp instanceof ToolBarButton)
+            {
+            	ToolBarButton btn = (ToolBarButton) comp;
+            	
+            	int menuId = 0;
+            	try
+            	{
+            		menuId = Integer.valueOf(btn.getName());            		
+            	}
+            	catch (Exception e) {
+					
+				}
+            	
+            	if(menuId > 0) onMenuSelected(menuId);
+            	else
+            	{
+            		String actionCommand = btn.getName();
+            		int WindowNo = 0;
+            		
+            		if (actionCommand.equals("InfoProduct") && AEnv.canAccessInfo("PRODUCT"))
+            		{
+            			InfoPanel.showProduct(WindowNo);
+            		}
+            		else if (actionCommand.equals("InfoBPartner") && AEnv.canAccessInfo("BPARTNER"))
+            		{
+            			InfoPanel.showBPartner(WindowNo);
+            		}
+            		else if (actionCommand.equals("InfoAsset") && AEnv.canAccessInfo("ASSET"))
+            		{
+            			InfoPanel.showAsset(WindowNo);
+            		}
+            		else if (actionCommand.equals("InfoAccount") && 
+            				  MRole.getDefault().isShowAcct() &&
+            				  AEnv.canAccessInfo("ACCOUNT"))
+            		{
+            			new org.adempiere.webui.acct.WAcctViewer();
+            		}
+            		else if (actionCommand.equals("InfoSchedule") && AEnv.canAccessInfo("SCHEDULE"))
+            		{
+            			// TODO: Schedule Info Panel
+//            			new org.compiere.apps.search.InfoSchedule (Env.getFrame(c), null, false);
+            		}
+            		else if (actionCommand.equals("InfoOrder") && AEnv.canAccessInfo("ORDER"))
+            		{
+            			InfoPanel.showOrder(WindowNo, "");
+            		}
+            		else if (actionCommand.equals("InfoInvoice") && AEnv.canAccessInfo("INVOICE"))
+            		{
+            			InfoPanel.showInvoice(WindowNo, "");
+            		}
+            		else if (actionCommand.equals("InfoInOut") && AEnv.canAccessInfo("INOUT"))
+            		{
+            			InfoPanel.showInOut(WindowNo, "");
+            		}
+            		else if (actionCommand.equals("InfoPayment") && AEnv.canAccessInfo("PAYMENT"))
+            		{
+            			InfoPanel.showPayment(WindowNo, "");
+            		}
+            		else if (actionCommand.equals("InfoCashLine") && AEnv.canAccessInfo("CASHJOURNAL"))
+            		{
+            			InfoPanel.showCashLine(WindowNo, "");
+            		}
+            		else if (actionCommand.equals("InfoAssignment") && AEnv.canAccessInfo("RESOURCE"))
+            		{
+            			InfoPanel.showAssignment(WindowNo, "");
+            		}
+            	}
+            }
+            else if(comp instanceof Button)
+            {
+            	Button btn = (Button) comp;
+            	
+//        		int AD_Window_ID = Integer.valueOf(btn.getName());
+//        		if (AD_Window_ID > 0) AEnv.zoom(AD_Window_ID, new MQuery());
+        		
+        		int menuId = 0;
+            	try
+            	{
+            		menuId = Integer.valueOf(btn.getName());            		
+            	}
+            	catch (Exception e) {
+					
+				}
+            	
+            	if(menuId > 0) onMenuSelected(menuId);
+            }
+        }
+    }
+    
     /**
      * Retrieves the Client website url
      * @return website url

zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADForm.java

@@ -148,11 +148,7 @@ public abstract class ADForm extends Window implements EventListener
 		 */		
 		if (matcher.find()== false)
 		{
-			// What to do with those that do not have .compiere. in it
-			throw new ApplicationException("The selected custom form '" + 
-					originalName + 
-					"' is not part of the core distribution and " +
-					"has not been implemented for the web based user interface");			
+			return originalName;
 		}
 		
 		/*

zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java

@@ -186,7 +186,7 @@ public class InfoAssetPanel extends InfoPanel implements ValueChangeListener, Ev
 		mainBox.appendChild(boxCol2);
 		
 		this.setWidth("850px");
-		this.setTitle("Info Asset");
+//		this.setTitle("Info Asset");
 		this.setClosable(true);
 		this.setBorder("normal");
 		this.appendChild(mainBox);

zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java

@@ -198,7 +198,7 @@ public class InfoAssignmentPanel extends InfoPanel implements EventListener, Val
 		//	parameterPanel.add(checkCustomer, null);
 		
 		this.setWidth("850px");
-		this.setTitle("Info Asset");
+//		this.setTitle("Info Asset");
 		this.setClosable(true);
 		this.setBorder("normal");
 		this.appendChild(mainBox);

zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java

@@ -115,6 +115,7 @@ public class InfoBPartnerPanel extends InfoPanel implements EventListener, WTabl
         initComponents();
         init();
 		initInfo(queryValue, whereClause);
+		setTitle(Msg.getMsg(Env.getCtx(), "InfoBPartner"));
         
         int no = contentPanel.getRowCount();
         setStatusLine(Integer.toString(no) + " " + Msg.getMsg(Env.getCtx(), "SearchRows_EnterQuery"), false);

zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java

@@ -276,7 +276,7 @@ public class InfoCashLinePanel extends InfoPanel implements ValueChangeListener,
 		mainBox.appendChild(boxCol3);
 		
 		this.setWidth("850px");
-		this.setTitle("CashLine Info");
+//		this.setTitle("CashLine Info");
 		this.setClosable(true);
 		this.setBorder("normal");
 		this.appendChild(mainBox);

zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java

@@ -231,7 +231,7 @@ public class InfoInOutPanel extends InfoPanel implements ValueChangeListener, Ev
 		mainBox.appendChild(boxCol3);
 		
 		this.setWidth("850px");
-		this.setTitle("InOut Info");
+//		this.setTitle("InOut Info");
 		this.setClosable(true);
 		this.setBorder("normal");
 		this.appendChild(mainBox);

zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java

@@ -124,42 +124,39 @@ public abstract class InfoPanel extends Window implements EventListener, WTableM
 	 * @param frame Parent Frame
 	 * @param WindowNo window no
 	 */
-	/*public static void showProduct (Frame frame, int WindowNo)
+	public static void showProduct (int WindowNo)
 	{
-		Info info = new InfoProduct (frame, false, WindowNo,
-			Env.getContextAsInt(Env.getCtx(), WindowNo, "M_Warehouse_ID"),
-			Env.getContextAsInt(Env.getCtx(), WindowNo, "M_PriceList_ID"), 
-			"",		//	value 
-			false, "");
-		AEnv.showCenterWindow(frame, info);
+		InfoPanel info = new InfoProductPanel(WindowNo, 
+				Env.getContextAsInt(Env.getCtx(), WindowNo, "M_Warehouse_ID"),
+				Env.getContextAsInt(Env.getCtx(), WindowNo, "M_PriceList_ID"),
+				false, "", "");
+		AEnv.showWindow(info);
 	}   //  showProduct
-*/
+	
 	/**
 	 * Show Order Info (non modal)
 	 * @param frame Parent Frame
 	 * @param WindowNo window no
 	 * @param value query value
 	 */
-	/*public static void showOrder (Frame frame, int WindowNo, String value)
+	public static void showOrder (int WindowNo, String value)
 	{
-		Info info = new InfoOrder (frame, false, WindowNo, value,
-			false, "");
-		AEnv.showCenterWindow(frame, info);
+		InfoPanel info = new InfoOrderPanel(WindowNo, "", false, "");
+		AEnv.showWindow(info);
 	}   //  showOrder
-*/
+
 	/**
 	 * Show Invoice Info (non modal)
 	 * @param frame Parent Frame
 	 * @param WindowNo window no
 	 * @param value query value
 	 */
-	/*public static void showInvoice (Frame frame, int WindowNo, String value)
+	public static void showInvoice (int WindowNo, String value)
 	{
-		Info info = new InfoInvoice (frame, false, WindowNo, value,
-			false, "");
-		AEnv.showCenterWindow(frame, info);
+		InfoPanel info = new InfoInvoicePanel(WindowNo, "", false, "");
+		AEnv.showWindow(info);
 	}   //  showInvoice
-*/
+
 	/**
 	 * Show Shipment Info (non modal)
 	 * @param frame Parent Frame

zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java

@@ -248,7 +248,7 @@ public class InfoPaymentPanel extends InfoPanel implements ValueChangeListener,
 		mainBox.appendChild(boxCol3);
 		
 		this.setWidth("850px");
-		this.setTitle("Payment Info");
+//		this.setTitle("Payment Info");
 		this.setClosable(true);
 		this.setBorder("normal");
 		this.appendChild(mainBox);

zkwebui/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java

@@ -123,6 +123,16 @@ public class WindowContainer extends AbstractUIPart implements EventListener
     	return (Tab) tabbox.getSelectedTab();
     }
     
+    // Elaine 2008/07/21
+    public void setTabTitle(int tabNo, String title, String tooltip)
+    {
+    	org.zkoss.zul.Tabs tabs = tabbox.getTabs();
+    	Tab tab = (Tab) tabs.getChildren().get(tabNo);
+    	tab.setLabel(title);
+    	tab.setTooltiptext(tooltip);
+    }
+    //
+
 	public void onEvent(Event event) throws Exception {
 		if (Events.ON_SELECT.equals(event.getName()))
 			deferLayout();