* Refactor custom form - ID: 2787613

* Renamed ICustomForm.java to IFormController.java

client/src/org/compiere/apps/form/Match.java

@@ -0,0 +1,462 @@
+/******************************************************************************
+ * Copyright (C) 2009 Low Heng Sin                                            *
+ * Copyright (C) 2009 Idalica Corporation                                     *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. 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.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.compiere.apps.form;
+
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.util.Vector;
+import java.util.logging.Level;
+
+import org.compiere.minigrid.IDColumn;
+import org.compiere.minigrid.IMiniTable;
+import org.compiere.model.MInOutLine;
+import org.compiere.model.MInvoiceLine;
+import org.compiere.model.MMatchInv;
+import org.compiere.model.MMatchPO;
+import org.compiere.model.MOrderLine;
+import org.compiere.model.MRole;
+import org.compiere.model.MStorage;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.Msg;
+
+public class Match
+{
+
+	/**	Logger			*/
+	private static CLogger log = CLogger.getCLogger(Match.class);
+
+	/** Match Options           */
+	private String[] m_matchOptions = new String[] {
+		Msg.getElement(Env.getCtx(), "C_Invoice_ID", false),
+		Msg.getElement(Env.getCtx(), "M_InOut_ID", false),
+		Msg.getElement(Env.getCtx(), "C_Order_ID", false) };
+	private static final int		MATCH_INVOICE = 0;
+	private static final int		MATCH_SHIPMENT = 1;
+	private static final int		MATCH_ORDER = 2;
+
+	private static final int		MODE_NOTMATCHED = 0;
+	private static final int		MODE_MATCHED = 1;
+
+	/**	Indexes in Table			*/
+	private static final int		I_BPartner = 3;
+	private static final int		I_Line = 4;
+	private static final int		I_Product = 5;
+	private static final int		I_QTY = 6;
+	private static final int		I_MATCHED = 7;
+	private static final int        I_Org = 8; //JAVIER 
+	
+
+
+	private StringBuffer    m_sql = null;
+	private String          m_dateColumn = "";
+	private String          m_qtyColumn = "";
+	private String          m_groupBy = "";
+	private StringBuffer	m_linetype = null;
+	//private BigDecimal      m_xMatched = Env.ZERO;
+	//private BigDecimal      m_xMatchedTo = Env.ZERO;
+
+	
+	/**
+	 *  Match From Changed - Fill Match To
+	 */
+	protected Vector<String> cmd_matchFrom(String selection)
+	{
+	//	log.fine( "VMatch.cmd_matchFrom");
+		//String selection = (String)matchFrom.getSelectedItem();
+		Vector<String> vector = new Vector<String>(2);
+		if (selection.equals(m_matchOptions[MATCH_INVOICE]))
+			vector.add(m_matchOptions[MATCH_SHIPMENT]);
+		else if (selection.equals(m_matchOptions[MATCH_ORDER]))
+			vector.add(m_matchOptions[MATCH_SHIPMENT]);
+		else    //  shipment
+		{
+			vector.add(m_matchOptions[MATCH_INVOICE]);
+			vector.add(m_matchOptions[MATCH_ORDER]);
+		}
+		return vector;
+	}   //  cmd_matchFrom
+
+	
+	/**
+	 *  Search Button Pressed - Fill xMatched
+	 */
+	protected IMiniTable cmd_search(IMiniTable xMatchedTable, int display, String matchToString, Integer Product, Integer Vendor, Timestamp from, Timestamp to, boolean matched)
+	{
+		//  ** Create SQL **
+		//int display = matchFrom.getSelectedIndex();
+		//String matchToString = (String)matchTo.getSelectedItem();
+		int matchToType = MATCH_INVOICE;
+		if (matchToString.equals(m_matchOptions[MATCH_SHIPMENT]))
+			matchToType = MATCH_SHIPMENT;
+		else if (matchToString.equals(m_matchOptions[MATCH_ORDER]))
+			matchToType = MATCH_ORDER;
+		//
+		tableInit(display, matchToType, matched);	//	sets m_sql
+
+		//  ** Add Where Clause **
+		//  Product
+		if (Product != null)
+		{
+			//Integer Product = (Integer)onlyProduct.getValue();
+			m_sql.append(" AND lin.M_Product_ID=").append(Product);
+		}
+		//  BPartner
+		if (Vendor != null)
+		{
+			//Integer Vendor = (Integer)onlyVendor.getValue();
+			m_sql.append(" AND hdr.C_BPartner_ID=").append(Vendor);
+		}
+		//  Date
+		//Timestamp from = (Timestamp)dateFrom.getValue();
+		//Timestamp to = (Timestamp)dateTo.getValue();
+		if (from != null && to != null)
+			m_sql.append(" AND ").append(m_dateColumn).append(" BETWEEN ")
+				.append(DB.TO_DATE(from)).append(" AND ").append(DB.TO_DATE(to));
+		else if (from != null)
+			m_sql.append(" AND ").append(m_dateColumn).append(" >= ").append(DB.TO_DATE(from));
+		else if (to != null)
+			m_sql.append(" AND ").append(m_dateColumn).append(" <= ").append(DB.TO_DATE(to));
+		
+		//  ** Load Table **
+		tableLoad (xMatchedTable);
+		return xMatchedTable;
+
+	}   //  cmd_search
+
+
+	/**
+	 *  Process Button Pressed - Process Matching
+	 */
+	protected void cmd_process(IMiniTable xMatchedTable, IMiniTable xMatchedToTable, int matchMode, int matchFrom, Object matchTo, BigDecimal m_xMatched)
+	{
+		log.config("");
+		//  Matched From
+		int matchedRow = xMatchedTable.getSelectedRow();
+		if (matchedRow < 0)
+			return;
+	//	KeyNamePair BPartner = (KeyNamePair)xMatchedTable.getValueAt(matchedRow, I_BPartner);
+		KeyNamePair lineMatched = (KeyNamePair)xMatchedTable.getValueAt(matchedRow, I_Line);
+		KeyNamePair Product = (KeyNamePair)xMatchedTable.getValueAt(matchedRow, I_Product);
+
+		double totalQty = m_xMatched.doubleValue();
+
+		//  Matched To
+		for (int row = 0; row < xMatchedToTable.getRowCount(); row++)
+		{
+			IDColumn id = (IDColumn)xMatchedToTable.getValueAt(row, 0);
+			if (id != null && id.isSelected())
+			{
+				//  need to be the same product
+				KeyNamePair ProductCompare = (KeyNamePair)xMatchedToTable.getValueAt(row, I_Product);
+				if (Product.getKey() != ProductCompare.getKey())
+					continue;
+
+				KeyNamePair lineMatchedTo = (KeyNamePair)xMatchedToTable.getValueAt(row, I_Line);
+
+				//	Qty
+				double qty = 0.0;
+				if (matchMode == MODE_NOTMATCHED)
+					qty = ((Double)xMatchedToTable.getValueAt(row, I_QTY)).doubleValue();	//  doc
+				qty -= ((Double)xMatchedToTable.getValueAt(row, I_MATCHED)).doubleValue();  //  matched
+				if (qty > totalQty)
+					qty = totalQty;
+				totalQty -= qty;
+
+				//  Invoice or PO
+				boolean invoice = true;
+				if (matchFrom == MATCH_ORDER ||
+						matchTo.equals(m_matchOptions[MATCH_ORDER]))
+					invoice = false;
+				//  Get Shipment_ID
+				int M_InOutLine_ID = 0;
+				int Line_ID = 0;
+				if (matchFrom == MATCH_SHIPMENT)
+				{
+					M_InOutLine_ID = lineMatched.getKey();      //  upper table
+					Line_ID = lineMatchedTo.getKey();
+				}
+				else
+				{
+					M_InOutLine_ID = lineMatchedTo.getKey();    //  lower table
+					Line_ID = lineMatched.getKey();
+				}
+
+				//  Create it
+				createMatchRecord(invoice, M_InOutLine_ID, Line_ID, new BigDecimal(qty));
+			}
+		}
+		//  requery
+		//cmd_search();
+	}   //  cmd_process
+	
+
+	/**
+	 *  Fill xMatchedTo
+	 */
+	protected IMiniTable cmd_searchTo(IMiniTable xMatchedTable, IMiniTable xMatchedToTable, String displayString, int matchToType, boolean sameBPartner, boolean sameProduct, boolean sameQty, boolean matched)
+	{
+		int row = xMatchedTable.getSelectedRow();
+		log.config("Row=" + row);
+
+		//  ** Create SQL **
+		//String displayString = (String)matchTo.getSelectedItem();
+		int display = MATCH_INVOICE;
+		if (displayString.equals(m_matchOptions[MATCH_SHIPMENT]))
+			display = MATCH_SHIPMENT;
+		else if (displayString.equals(m_matchOptions[MATCH_ORDER]))
+			display = MATCH_ORDER;
+		//int matchToType = matchFrom.getSelectedIndex();
+		tableInit (display, matchToType, matched);	//	sets m_sql
+		//  ** Add Where Clause **
+		KeyNamePair BPartner = (KeyNamePair)xMatchedTable.getValueAt(row, I_BPartner);
+		//KeyNamePair Org = (KeyNamePair)xMatchedTable.getValueAt(row, I_Org); //JAVIER
+		KeyNamePair Product = (KeyNamePair)xMatchedTable.getValueAt(row, I_Product);
+		log.fine("BPartner=" + BPartner + " - Product=" + Product);
+		//
+		if (sameBPartner)
+			m_sql.append(" AND hdr.C_BPartner_ID=").append(BPartner.getKey());
+		if (sameProduct)
+			m_sql.append(" AND lin.M_Product_ID=").append(Product.getKey());
+
+		//  calculate qty
+		double docQty = ((Double)xMatchedTable.getValueAt(row, I_QTY)).doubleValue();
+		if (sameQty)
+			m_sql.append(" AND ").append(m_qtyColumn).append("=").append(docQty);
+		//  ** Load Table **
+		tableLoad (xMatchedToTable);
+
+		return xMatchedToTable;
+	}   //  cmd_seachTo
+	
+	/**************************************************************************
+	 *  Initialize Table access - create SQL, dateColumn.
+	 *  <br>
+	 *  The driving table is "hdr", e.g. for hdr.C_BPartner_ID=..
+	 *  The line table is "lin", e.g. for lin.M_Product_ID=..
+	 *  You use the dateColumn/qtyColumn variable directly as it is table specific.
+	 *  <br>
+	 *  The sql is dependent on MatchMode:
+	 *  - If Matched - all (fully or partially) matched records are listed
+	 *  - If Not Matched - all not fully matched records are listed
+	 *  @param display (Invoice, Shipment, Order) see MATCH_*
+	 *  @param matchToType (Invoice, Shipment, Order) see MATCH_*
+	 */
+	protected void tableInit (int display, int matchToType, boolean matched)
+	{
+		//boolean matched = matchMode.getSelectedIndex() == MODE_MATCHED;
+		log.config("Display=" + m_matchOptions[display]
+			+ ", MatchTo=" + m_matchOptions[matchToType]
+			+ ", Matched=" + matched);
+
+		m_sql = new StringBuffer ();
+		if (display == MATCH_INVOICE)
+		{
+			m_dateColumn = "hdr.DateInvoiced";
+			m_qtyColumn = "lin.QtyInvoiced";
+			m_sql.append("SELECT hdr.C_Invoice_ID,hdr.DocumentNo, hdr.DateInvoiced, bp.Name,hdr.C_BPartner_ID,"
+				+ " lin.Line,lin.C_InvoiceLine_ID, p.Name,lin.M_Product_ID,"
+				+ " lin.QtyInvoiced,SUM(NVL(mi.Qty,0)), org.Name, hdr.AD_Org_ID "  //JAVIER
+				+ "FROM C_Invoice hdr"
+				+ " INNER JOIN AD_Org org ON (hdr.AD_Org_ID=org.AD_Org_ID)" //JAVIER
+				+ " INNER JOIN C_BPartner bp ON (hdr.C_BPartner_ID=bp.C_BPartner_ID)"
+				+ " INNER JOIN C_InvoiceLine lin ON (hdr.C_Invoice_ID=lin.C_Invoice_ID)"
+				+ " INNER JOIN M_Product p ON (lin.M_Product_ID=p.M_Product_ID)"
+				+ " INNER JOIN C_DocType dt ON (hdr.C_DocType_ID=dt.C_DocType_ID AND dt.DocBaseType IN ('API','APC'))"
+				+ " FULL JOIN M_MatchInv mi ON (lin.C_InvoiceLine_ID=mi.C_InvoiceLine_ID) "
+				+ "WHERE hdr.DocStatus IN ('CO','CL')");
+			m_groupBy = " GROUP BY hdr.C_Invoice_ID,hdr.DocumentNo,hdr.DateInvoiced,bp.Name,hdr.C_BPartner_ID,"
+				+ " lin.Line,lin.C_InvoiceLine_ID,p.Name,lin.M_Product_ID,lin.QtyInvoiced, org.Name, hdr.AD_Org_ID " //JAVIER
+				+ "HAVING "
+				+ (matched ? "0" : "lin.QtyInvoiced")
+				+ "<>SUM(NVL(mi.Qty,0))";
+		}
+		else if (display == MATCH_ORDER)
+		{
+			m_dateColumn = "hdr.DateOrdered";
+			m_qtyColumn = "lin.QtyOrdered";
+			m_sql.append("SELECT hdr.C_Order_ID,hdr.DocumentNo, hdr.DateOrdered, bp.Name,hdr.C_BPartner_ID,"
+				+ " lin.Line,lin.C_OrderLine_ID, p.Name,lin.M_Product_ID,"
+				+ " lin.QtyOrdered,SUM(COALESCE(mo.Qty,0)), org.Name, hdr.AD_Org_ID " //JAVIER
+				+ "FROM C_Order hdr"
+				+ " INNER JOIN AD_Org org ON (hdr.AD_Org_ID=org.AD_Org_ID)" //JAVIER
+				+ " INNER JOIN C_BPartner bp ON (hdr.C_BPartner_ID=bp.C_BPartner_ID)"
+				+ " INNER JOIN C_OrderLine lin ON (hdr.C_Order_ID=lin.C_Order_ID)"
+				+ " INNER JOIN M_Product p ON (lin.M_Product_ID=p.M_Product_ID)"
+				+ " INNER JOIN C_DocType dt ON (hdr.C_DocType_ID=dt.C_DocType_ID AND dt.DocBaseType='POO')"
+				+ " FULL JOIN M_MatchPO mo ON (lin.C_OrderLine_ID=mo.C_OrderLine_ID) "
+				+ " WHERE " ) ; //[ 1876972 ] Can't match partially matched PO with an unmatched receipt SOLVED BY BOJANA, AGENDA_GM
+			m_linetype = new StringBuffer();
+			m_linetype.append( matchToType == MATCH_SHIPMENT ? "M_InOutLine_ID" : "C_InvoiceLine_ID") ;
+			if ( matched ) {
+				m_sql.append( " mo." + m_linetype + " IS NOT NULL " ) ; 
+			} else {
+ 				m_sql.append( " ( mo." + m_linetype + " IS NULL OR "
+				+ " (lin.QtyOrdered <>  (SELECT sum(mo1.Qty) AS Qty" 
+				+ " FROM m_matchpo mo1 WHERE "
+				+ " mo1.C_ORDERLINE_ID=lin.C_ORDERLINE_ID AND "
+				+ " hdr.C_ORDER_ID=lin.C_ORDER_ID AND "
+				+ " mo1." + m_linetype
+				+ " IS NOT NULL group by mo1.C_ORDERLINE_ID))) " );	
+			}
+			m_sql.append( " AND hdr.DocStatus IN ('CO','CL')" );
+			m_groupBy = " GROUP BY hdr.C_Order_ID,hdr.DocumentNo,hdr.DateOrdered,bp.Name,hdr.C_BPartner_ID,"
+				+ " lin.Line,lin.C_OrderLine_ID,p.Name,lin.M_Product_ID,lin.QtyOrdered, org.Name, hdr.AD_Org_ID " //JAVIER
+				+ "HAVING "
+				+ (matched ? "0" : "lin.QtyOrdered")
+				+ "<>SUM(COALESCE(mo.Qty,0))";
+		}
+		else    //  Shipment
+		{
+			m_dateColumn = "hdr.MovementDate";
+			m_qtyColumn = "lin.MovementQty";
+			m_sql.append("SELECT hdr.M_InOut_ID,hdr.DocumentNo, hdr.MovementDate, bp.Name,hdr.C_BPartner_ID,"
+				+ " lin.Line,lin.M_InOutLine_ID, p.Name,lin.M_Product_ID,"
+				+ " lin.MovementQty,SUM(NVL(m.Qty,0)),org.Name, hdr.AD_Org_ID " //JAVIER
+				+ "FROM M_InOut hdr"
+				+ " INNER JOIN AD_Org org ON (hdr.AD_Org_ID=org.AD_Org_ID)" //JAVIER
+				+ " INNER JOIN C_BPartner bp ON (hdr.C_BPartner_ID=bp.C_BPartner_ID)"
+				+ " INNER JOIN M_InOutLine lin ON (hdr.M_InOut_ID=lin.M_InOut_ID)"
+				+ " INNER JOIN M_Product p ON (lin.M_Product_ID=p.M_Product_ID)"
+				+ " INNER JOIN C_DocType dt ON (hdr.C_DocType_ID = dt.C_DocType_ID AND dt.DocBaseType='MMR')"
+				+ " FULL JOIN ")
+				.append(matchToType == MATCH_ORDER ? "M_MatchPO" : "M_MatchInv")
+				.append(" m ON (lin.M_InOutLine_ID=m.M_InOutLine_ID) "
+				+ "WHERE hdr.DocStatus IN ('CO','CL')");
+			m_groupBy = " GROUP BY hdr.M_InOut_ID,hdr.DocumentNo,hdr.MovementDate,bp.Name,hdr.C_BPartner_ID,"
+				+ " lin.Line,lin.M_InOutLine_ID,p.Name,lin.M_Product_ID,lin.MovementQty, org.Name, hdr.AD_Org_ID " //JAVIER
+				+ "HAVING "
+				+ (matched ? "0" : "lin.MovementQty")
+				+ "<>SUM(NVL(m.Qty,0))";
+		}
+	//	Log.trace(7, "VMatch.tableInit", m_sql + "\n" + m_groupBy);
+	}   //  tableInit
+
+
+	/**
+	 *  Fill the table using m_sql
+	 *  @param table table
+	 */
+	protected void tableLoad (IMiniTable table)
+	{
+		//	log.finest(m_sql + " - " +  m_groupBy);
+		String sql = MRole.getDefault().addAccessSQL(
+			m_sql.toString(), "hdr", MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO)
+			+ m_groupBy;
+		log.finest(sql);
+		try
+		{
+			Statement stmt = DB.createStatement();
+			ResultSet rs = stmt.executeQuery(sql);
+			table.loadTable(rs);
+			stmt.close();
+		}
+		catch (SQLException e)
+		{
+			log.log(Level.SEVERE, sql, e);
+		}
+	}   //  tableLoad
+
+	/**
+	 *  Create Matching Record
+	 *  @param invoice true if matching invoice false if matching PO
+	 *  @param M_InOutLine_ID shipment line
+	 *  @param Line_ID C_InvoiceLine_ID or C_OrderLine_ID
+	 *  @param qty quantity
+	 *  @return true if created
+	 */
+	protected boolean createMatchRecord (boolean invoice, int M_InOutLine_ID, int Line_ID,
+		BigDecimal qty)
+	{
+		if (qty.compareTo(Env.ZERO) == 0)
+			return true;
+		log.fine("IsInvoice=" + invoice
+			+ ", M_InOutLine_ID=" + M_InOutLine_ID + ", Line_ID=" + Line_ID
+			+ ", Qty=" + qty);
+		//
+		boolean success = false;
+		MInOutLine sLine = new MInOutLine (Env.getCtx(), M_InOutLine_ID, null);
+		if (invoice)	//	Shipment - Invoice
+		{
+			//	Update Invoice Line
+			MInvoiceLine iLine = new MInvoiceLine (Env.getCtx(), Line_ID, null);
+			iLine.setM_InOutLine_ID(M_InOutLine_ID);
+			if (sLine.getC_OrderLine_ID() != 0)
+				iLine.setC_OrderLine_ID(sLine.getC_OrderLine_ID());
+			iLine.save();
+			//	Create Shipment - Invoice Link
+			if (iLine.getM_Product_ID() != 0)
+			{
+				MMatchInv match = new MMatchInv (iLine, null, qty);
+				match.setM_InOutLine_ID(M_InOutLine_ID);
+				if (match.save())
+					success = true;
+				else
+					log.log(Level.SEVERE, "Inv Match not created: " + match);
+			}
+			else
+				success = true;
+			//	Create PO - Invoice Link = corrects PO
+			if (iLine.getC_OrderLine_ID() != 0 && iLine.getM_Product_ID() != 0)
+			{
+				MMatchPO matchPO = MMatchPO.create(iLine, sLine, null, qty);
+				matchPO.setC_InvoiceLine_ID(iLine);
+				matchPO.setM_InOutLine_ID(M_InOutLine_ID);
+				if (!matchPO.save())
+					log.log(Level.SEVERE, "PO(Inv) Match not created: " + matchPO);
+			}
+		}
+		else	//	Shipment - Order
+		{
+			//	Update Shipment Line
+			sLine.setC_OrderLine_ID(Line_ID);
+			sLine.save();
+			//	Update Order Line
+			MOrderLine oLine = new MOrderLine(Env.getCtx(), Line_ID, null);
+			if (oLine.get_ID() != 0)	//	other in MInOut.completeIt
+			{
+				oLine.setQtyReserved(oLine.getQtyReserved().subtract(qty));
+				if(!oLine.save())
+					log.severe("QtyReserved not updated - C_OrderLine_ID=" + Line_ID);
+			}
+
+			//	Create PO - Shipment Link
+			if (sLine.getM_Product_ID() != 0)
+			{
+				MMatchPO match = new MMatchPO (sLine, null, qty);
+				if (!match.save())
+					log.log(Level.SEVERE, "PO Match not created: " + match);
+				else
+				{
+					success = true;
+					//	Correct Ordered Qty for Stocked Products (see MOrder.reserveStock / MInOut.processIt)
+					if (sLine.getProduct() != null && sLine.getProduct().isStocked())
+						success = MStorage.add (Env.getCtx(), sLine.getM_Warehouse_ID(), 
+							sLine.getM_Locator_ID(), 
+							sLine.getM_Product_ID(), 
+							sLine.getM_AttributeSetInstance_ID(), oLine.getM_AttributeSetInstance_ID(), 
+							null, null, qty.negate(), null);
+				}
+			}
+			else
+				success = true;
+		}
+		return success;
+	}   //  createMatchRecord
+}

client/src/org/compiere/apps/form/VMatch.java

@@ -1,5 +1,5 @@
 /******************************************************************************
- * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Product: Adempiere ERP & CRM Smart Business Solution                        *
  * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
  * This program is free software; you can redistribute it and/or modify it    *
  * under the terms version 2 of the GNU General Public License as published   *
@@ -26,13 +26,8 @@ import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
 import java.sql.Timestamp;
-import java.util.Vector;
 import java.util.logging.Level;
-
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JCheckBox;
 import javax.swing.JScrollPane;
@@ -41,7 +36,6 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
-
 import org.compiere.apps.StatusBar;
 import org.compiere.grid.ed.VDate;
 import org.compiere.grid.ed.VLookup;
@@ -49,20 +43,13 @@ import org.compiere.grid.ed.VNumber;
 import org.compiere.minigrid.ColumnInfo;
 import org.compiere.minigrid.IDColumn;
 import org.compiere.minigrid.MiniTable;
-import org.compiere.model.MInOutLine;
-import org.compiere.model.MInvoiceLine;
-import org.compiere.model.MMatchInv;
 import org.compiere.model.MMatchPO;
-import org.compiere.model.MOrderLine;
-import org.compiere.model.MRole;
-import org.compiere.model.MStorage;
 import org.compiere.plaf.CompiereColor;
 import org.compiere.swing.CButton;
 import org.compiere.swing.CComboBox;
 import org.compiere.swing.CLabel;
 import org.compiere.swing.CPanel;
 import org.compiere.util.CLogger;
-import org.compiere.util.DB;
 import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -74,13 +61,15 @@ import org.compiere.util.Msg;
  *  @author     Jorg Janke
  *  @version    $Id: VMatch.java,v 1.2 2006/07/30 00:51:28 jjanke Exp $
  */
-public class VMatch extends CPanel
+public class VMatch extends Match
 	implements FormPanel, ActionListener, TableModelListener, ListSelectionListener
 {
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 6381583335194660502L;
+	
+	private CPanel panel = new CPanel();
 
 	/**
 	 *	Initialize Panel
@@ -103,7 +92,7 @@ public class VMatch extends CPanel
 			jbInit();
 			//
 			dynInit();
-			frame.getContentPane().add(mainPanel, BorderLayout.CENTER);
+			frame.getContentPane().add(panel, BorderLayout.CENTER);
 			frame.getContentPane().add(statusBar, BorderLayout.SOUTH);
 			//
 			new Thread()
@@ -138,9 +127,6 @@ public class VMatch extends CPanel
 		Msg.getElement(Env.getCtx(), "C_Invoice_ID", false),
 		Msg.getElement(Env.getCtx(), "M_InOut_ID", false),
 		Msg.getElement(Env.getCtx(), "C_Order_ID", false) };
-	private static final int		MATCH_INVOICE = 0;
-	private static final int		MATCH_SHIPMENT = 1;
-	private static final int		MATCH_ORDER = 2;
 
 	/** Match Mode              	*/
 	private String[] m_matchMode = new String[] {
@@ -150,25 +136,13 @@ public class VMatch extends CPanel
 	private static final int		MODE_MATCHED = 1;
 
 	/**	Indexes in Table			*/
-	private static final int		I_BPartner = 3;
-	private static final int		I_Line = 4;
-	private static final int		I_Product = 5;
 	private static final int		I_QTY = 6;
 	private static final int		I_MATCHED = 7;
-	private static final int        I_Org = 8; //JAVIER 
 	
-
-
-	private StringBuffer    m_sql = null;
-	private String          m_dateColumn = "";
-	private String          m_qtyColumn = "";
-	private String          m_groupBy = "";
-	private StringBuffer	m_linetype = null;
 	private BigDecimal      m_xMatched = Env.ZERO;
 	private BigDecimal      m_xMatchedTo = Env.ZERO;
 
 	//
-	private CPanel mainPanel = new CPanel();
 	private StatusBar statusBar = new StatusBar();
 	private BorderLayout mainLayout = new BorderLayout();
 	private CPanel northPanel = new CPanel();
@@ -226,7 +200,7 @@ public class VMatch extends CPanel
 	 */
 	private void jbInit() throws Exception
 	{
-		mainPanel.setLayout(mainLayout);
+		panel.setLayout(mainLayout);
 		northPanel.setLayout(northLayout);
 		matchFromLabel.setText(Msg.translate(Env.getCtx(), "MatchFrom"));
 		matchToLabel.setText(Msg.translate(Env.getCtx(), "MatchTo"));
@@ -253,7 +227,7 @@ public class VMatch extends CPanel
 		sameQty.setSelected(false);
 		sameQty.setText(Msg.translate(Env.getCtx(), "SameQty"));
 		xPanel.setLayout(xLayout);
-		mainPanel.add(northPanel,  BorderLayout.NORTH);
+		panel.add(northPanel,  BorderLayout.NORTH);
 		northPanel.add(matchFromLabel,    new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0
 			,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(12, 12, 5, 5), 0, 0));
 		northPanel.add(matchFrom,        new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0
@@ -284,7 +258,7 @@ public class VMatch extends CPanel
 			,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 5, 0), 0, 0));
 		northPanel.add(bSearch,   new GridBagConstraints(4, 3, 1, 1, 0.0, 0.0
 			,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 12, 5, 12), 0, 0));
-		mainPanel.add(southPanel,  BorderLayout.SOUTH);
+		panel.add(southPanel,  BorderLayout.SOUTH);
 		southPanel.add(xMatchedLabel,        new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0
 			,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 12, 5, 5), 0, 0));
 		southPanel.add(xMatched,         new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0
@@ -295,7 +269,7 @@ public class VMatch extends CPanel
 			,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(5, 12, 5, 12), 0, 0));
 		southPanel.add(differenceLabel,      new GridBagConstraints(4, 0, 1, 1, 0.0, 0.0
 			,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 10, 5, 5), 0, 0));
-		mainPanel.add(centerPanel, BorderLayout.CENTER);
+		panel.add(centerPanel, BorderLayout.CENTER);
 		centerPanel.add(xMatchedScrollPane,  BorderLayout.NORTH);
 		xMatchedScrollPane.getViewport().add(xMatchedTable, null);
 		centerPanel.add(xMatchedToScrollPane,  BorderLayout.SOUTH);
@@ -332,7 +306,7 @@ public class VMatch extends CPanel
 		xMatchedToTable.prepareTable(layout, "", "", true, "");
 
 		//  Visual
-		CompiereColor.setBackground (this);
+		CompiereColor.setBackground (panel);
 
 		//  Listener
 		matchFrom.addActionListener(this);
@@ -345,7 +319,14 @@ public class VMatch extends CPanel
 		sameProduct.addActionListener(this);
 		sameQty.addActionListener(this);
 		//  Init
-		cmd_matchFrom();
+		matchTo.setModel(new DefaultComboBoxModel(cmd_matchFrom((String)matchFrom.getSelectedItem())));
+		//  Set Title
+		xMatchedBorder.setTitle((String)matchFrom.getSelectedItem());
+		xMatchedScrollPane.repaint();
+		//  Reset Table
+		xMatchedTable.setRowCount(0);
+		
+		cmd_matchTo();
 		statusBar.setStatusLine("");
 		statusBar.setStatusDB(0);
 	}   //  dynInit
@@ -367,49 +348,52 @@ public class VMatch extends CPanel
 	 */
 	public void actionPerformed (ActionEvent e)
 	{
-		setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+		panel.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-		if (e.getSource() == matchFrom)
+		Integer product = onlyProduct.getValue()!=null?(Integer)onlyProduct.getValue():null;
-			cmd_matchFrom();
+		Integer vendor = onlyVendor.getValue()!=null?(Integer)onlyVendor.getValue():null;
+		Timestamp from = dateFrom.getValue()!=null?(Timestamp)dateFrom.getValue():null;
+		Timestamp to = dateTo.getValue()!=null?(Timestamp)dateTo.getValue():null;
+		if (e.getSource() == matchFrom) {
+			String selection = (String)matchFrom.getSelectedItem();
+			matchTo.setModel(new DefaultComboBoxModel(cmd_matchFrom(selection)));
+			//  Set Title
+			xMatchedBorder.setTitle(selection);
+			xMatchedScrollPane.repaint();
+			//  Reset Table
+			xMatchedTable.setRowCount(0);
+			//  sync To
+			cmd_matchTo();
+			
+		}
 		else if (e.getSource() == matchTo)
 			cmd_matchTo();
-		else if (e.getSource() == bSearch)
+		else if (e.getSource() == bSearch) {
-			cmd_search();
+			xMatchedTable = (MiniTable) cmd_search(xMatchedTable, matchFrom.getSelectedIndex(), (String)matchTo.getSelectedItem(), product, vendor, from, to, matchMode.getSelectedIndex() == MODE_MATCHED);
-		else if (e.getSource() == bProcess)
+			xMatched.setValue(Env.ZERO);
-			cmd_process();
+			//  Status Info
+			statusBar.setStatusLine(matchFrom.getSelectedItem().toString()
+				+ "# = " + xMatchedTable.getRowCount(),
+				xMatchedTable.getRowCount() == 0);
+			statusBar.setStatusDB(0);
+		}
+		else if (e.getSource() == bProcess) {
+			cmd_process(xMatchedTable, xMatchedToTable, matchMode.getSelectedIndex(), matchFrom.getSelectedIndex(), matchTo.getSelectedItem(), m_xMatched);
+			xMatchedTable = (MiniTable) cmd_search(xMatchedTable, matchFrom.getSelectedIndex(), (String)matchTo.getSelectedItem(), product, vendor, from, to, matchMode.getSelectedIndex() == MODE_MATCHED);
+			xMatched.setValue(Env.ZERO);
+			//  Status Info
+			statusBar.setStatusLine(matchFrom.getSelectedItem().toString()
+				+ "# = " + xMatchedTable.getRowCount(),
+				xMatchedTable.getRowCount() == 0);
+			statusBar.setStatusDB(0);
+		}
 		else if (e.getSource() == sameBPartner
 			|| e.getSource() == sameProduct
 			|| e.getSource() == sameQty)
-			cmd_searchTo();
+			xMatchedTable = (MiniTable) cmd_search(xMatchedTable, matchFrom.getSelectedIndex(), (String)matchTo.getSelectedItem(), product, vendor, from, to, matchMode.getSelectedIndex() == MODE_MATCHED);
-		setCursor(Cursor.getDefaultCursor());
+		panel.setCursor(Cursor.getDefaultCursor());
 	}   //  actionPerformed
 
-	/**
+	
-	 *  Match From Changed - Fill Match To
-	 */
-	private void cmd_matchFrom()
-	{
-	//	log.fine( "VMatch.cmd_matchFrom");
-		String selection = (String)matchFrom.getSelectedItem();
-		Vector<String> vector = new Vector<String>(2);
-		if (selection.equals(m_matchOptions[MATCH_INVOICE]))
-			vector.add(m_matchOptions[MATCH_SHIPMENT]);
-		else if (selection.equals(m_matchOptions[MATCH_ORDER]))
-			vector.add(m_matchOptions[MATCH_SHIPMENT]);
-		else    //  shipment
-		{
-			vector.add(m_matchOptions[MATCH_INVOICE]);
-			vector.add(m_matchOptions[MATCH_ORDER]);
-		}
-		matchTo.setModel(new DefaultComboBoxModel(vector));
-		//  Set Title
-		xMatchedBorder.setTitle(selection);
-		xMatchedScrollPane.repaint();
-		//  Reset Table
-		xMatchedTable.setRowCount(0);
-		//  sync To
-		cmd_matchTo();
-	}   //  cmd_matchFrom
-
 	/**
 	 *  Match To Changed - set Title
 	 */
@@ -422,124 +406,8 @@ public class VMatch extends CPanel
 		//  Reset Table
 		xMatchedToTable.setRowCount(0);
 	}   //  cmd_matchTo
-
-	/**
-	 *  Search Button Pressed - Fill xMatched
-	 */
-	private void cmd_search()
-	{
-		//  ** Create SQL **
-		int display = matchFrom.getSelectedIndex();
-		String matchToString = (String)matchTo.getSelectedItem();
-		int matchToType = MATCH_INVOICE;
-		if (matchToString.equals(m_matchOptions[MATCH_SHIPMENT]))
-			matchToType = MATCH_SHIPMENT;
-		else if (matchToString.equals(m_matchOptions[MATCH_ORDER]))
-			matchToType = MATCH_ORDER;
-		//
-		tableInit(display, matchToType);	//	sets m_sql
-
-		//  ** Add Where Clause **
-		//  Product
-		if (onlyProduct.getValue() != null)
-		{
-			Integer Product = (Integer)onlyProduct.getValue();
-			m_sql.append(" AND lin.M_Product_ID=").append(Product);
-		}
-		//  BPartner
-		if (onlyVendor.getValue() != null)
-		{
-			Integer Vendor = (Integer)onlyVendor.getValue();
-			m_sql.append(" AND hdr.C_BPartner_ID=").append(Vendor);
-		}
-		//  Date
-		Timestamp from = (Timestamp)dateFrom.getValue();
-		Timestamp to = (Timestamp)dateTo.getValue();
-		if (from != null && to != null)
-			m_sql.append(" AND ").append(m_dateColumn).append(" BETWEEN ")
-				.append(DB.TO_DATE(from)).append(" AND ").append(DB.TO_DATE(to));
-		else if (from != null)
-			m_sql.append(" AND ").append(m_dateColumn).append(" >= ").append(DB.TO_DATE(from));
-		else if (to != null)
-			m_sql.append(" AND ").append(m_dateColumn).append(" <= ").append(DB.TO_DATE(to));
-
-		//  ** Load Table **
-		tableLoad (xMatchedTable);
-		xMatched.setValue(Env.ZERO);
-		//  Status Info
-		statusBar.setStatusLine(matchFrom.getSelectedItem().toString()
-			+ "# = " + xMatchedTable.getRowCount(),
-			xMatchedTable.getRowCount() == 0);
-		statusBar.setStatusDB(0);
-	}   //  cmd_search
-
-	/**
-	 *  Process Button Pressed - Process Matching
-	 */
-	private void cmd_process()
-	{
-		log.config("");
-		//  Matched From
-		int matchedRow = xMatchedTable.getSelectedRow();
-		if (matchedRow < 0)
-			return;
-	//	KeyNamePair BPartner = (KeyNamePair)xMatchedTable.getValueAt(matchedRow, I_BPartner);
-		KeyNamePair lineMatched = (KeyNamePair)xMatchedTable.getValueAt(matchedRow, I_Line);
-		KeyNamePair Product = (KeyNamePair)xMatchedTable.getValueAt(matchedRow, I_Product);
-
-		int M_Product_ID = Product.getKey();
-		double totalQty = m_xMatched.doubleValue();
-
-		//  Matched To
-		for (int row = 0; row < xMatchedToTable.getRowCount(); row++)
-		{
-			IDColumn id = (IDColumn)xMatchedToTable.getValueAt(row, 0);
-			if (id != null && id.isSelected())
-			{
-				//  need to be the same product
-				KeyNamePair ProductCompare = (KeyNamePair)xMatchedToTable.getValueAt(row, I_Product);
-				if (Product.getKey() != ProductCompare.getKey())
-					continue;
-
-				KeyNamePair lineMatchedTo = (KeyNamePair)xMatchedToTable.getValueAt(row, I_Line);
-
-				//	Qty
-				double qty = 0.0;
-				if (matchMode.getSelectedIndex() == MODE_NOTMATCHED)
-					qty = ((Double)xMatchedToTable.getValueAt(row, I_QTY)).doubleValue();	//  doc
-				qty -= ((Double)xMatchedToTable.getValueAt(row, I_MATCHED)).doubleValue();  //  matched
-				if (qty > totalQty)
-					qty = totalQty;
-				totalQty -= qty;
-
-				//  Invoice or PO
-				boolean invoice = true;
-				if (matchFrom.getSelectedIndex() == MATCH_ORDER ||
-						matchTo.getSelectedItem().equals(m_matchOptions[MATCH_ORDER]))
-					invoice = false;
-				//  Get Shipment_ID
-				int M_InOutLine_ID = 0;
-				int Line_ID = 0;
-				if (matchFrom.getSelectedIndex() == MATCH_SHIPMENT)
-				{
-					M_InOutLine_ID = lineMatched.getKey();      //  upper table
-					Line_ID = lineMatchedTo.getKey();
-				}
-				else
-				{
-					M_InOutLine_ID = lineMatchedTo.getKey();    //  lower table
-					Line_ID = lineMatched.getKey();
-				}
-
-				//  Create it
-				createMatchRecord(invoice, M_InOutLine_ID, Line_ID, new BigDecimal(qty));
-			}
-		}
-		//  requery
-		cmd_search();
-	}   //  cmd_process
-
 	
+
 	/**************************************************************************
 	 *  List Selection Listener - get Info and fill xMatchedTo
 	 *  @param e event
@@ -549,9 +417,9 @@ public class VMatch extends CPanel
 		if (e.getValueIsAdjusting())
 			return;
 	//	log.config( "VMatch.valueChanged");
-		setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+		panel.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
 		cmd_searchTo();
-		setCursor(Cursor.getDefaultCursor());
+		panel.setCursor(Cursor.getDefaultCursor());
 	}   //  valueChanged
 
 	/**
@@ -571,32 +439,12 @@ public class VMatch extends CPanel
 		{
 			//  ** Create SQL **
 			String displayString = (String)matchTo.getSelectedItem();
-			int display = MATCH_INVOICE;
-			if (displayString.equals(m_matchOptions[MATCH_SHIPMENT]))
-				display = MATCH_SHIPMENT;
-			else if (displayString.equals(m_matchOptions[MATCH_ORDER]))
-				display = MATCH_ORDER;
 			int matchToType = matchFrom.getSelectedIndex();
-			tableInit (display, matchToType);	//	sets m_sql
-			//  ** Add Where Clause **
-			KeyNamePair BPartner = (KeyNamePair)xMatchedTable.getValueAt(row, I_BPartner);
-			KeyNamePair Org = (KeyNamePair)xMatchedTable.getValueAt(row, I_Org); //JAVIER
-			KeyNamePair Product = (KeyNamePair)xMatchedTable.getValueAt(row, I_Product);
-			log.fine("BPartner=" + BPartner + " - Product=" + Product);
-			//
-			if (sameBPartner.isSelected())
-				m_sql.append(" AND hdr.C_BPartner_ID=").append(BPartner.getKey());
-			if (sameProduct.isSelected())
-				m_sql.append(" AND lin.M_Product_ID=").append(Product.getKey());
-
-			//  calculate qty
 			double docQty = ((Double)xMatchedTable.getValueAt(row, I_QTY)).doubleValue();
 			double matchedQty = ((Double)xMatchedTable.getValueAt(row, I_MATCHED)).doubleValue();
 			qty = docQty - matchedQty;
-			if (sameQty.isSelected())
+			xMatchedToTable = (MiniTable)cmd_searchTo(xMatchedTable, xMatchedToTable, displayString, matchToType, sameBPartner.isSelected(), sameProduct.isSelected(), sameQty.isSelected(), matchMode.getSelectedIndex() == MODE_MATCHED);
-				m_sql.append(" AND ").append(m_qtyColumn).append("=").append(docQty);
+
-			//  ** Load Table **
-			tableLoad (xMatchedToTable);
 		}
 		//  Display To be Matched Qty
 		m_xMatched = new BigDecimal (qty);
@@ -611,7 +459,6 @@ public class VMatch extends CPanel
 			xMatchedToTable.getRowCount() == 0);
 		statusBar.setStatusDB(0);
 	}   //  cmd_seachTo
-
 	
 	/***************************************************************************
 	 *  Table Model Listener - calculate matchd Qty
@@ -623,7 +470,7 @@ public class VMatch extends CPanel
 			return;
 		log.config("Row=" + e.getFirstRow() + "-" + e.getLastRow() + ", Col=" + e.getColumn()
 			+ ", Type=" + e.getType());
-		setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+		panel.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
 
 		//  Matched From
 		int matchedRow = xMatchedTable.getSelectedRow();
@@ -656,225 +503,9 @@ public class VMatch extends CPanel
 		xMatchedTo.setValue(m_xMatchedTo);
 		difference.setValue(m_xMatched.subtract(m_xMatchedTo));
 		bProcess.setEnabled(noRows != 0);
-		setCursor(Cursor.getDefaultCursor());
+		panel.setCursor(Cursor.getDefaultCursor());
 		//  Status
 		statusBar.setStatusDB(noRows);
 	}   //  tableChanged
 
-	
-	/**************************************************************************
-	 *  Initialize Table access - create SQL, dateColumn.
-	 *  <br>
-	 *  The driving table is "hdr", e.g. for hdr.C_BPartner_ID=..
-	 *  The line table is "lin", e.g. for lin.M_Product_ID=..
-	 *  You use the dateColumn/qtyColumn variable directly as it is table specific.
-	 *  <br>
-	 *  The sql is dependent on MatchMode:
-	 *  - If Matched - all (fully or partially) matched records are listed
-	 *  - If Not Matched - all not fully matched records are listed
-	 *  @param display (Invoice, Shipment, Order) see MATCH_*
-	 *  @param matchToType (Invoice, Shipment, Order) see MATCH_*
-	 */
-	private void tableInit (int display, int matchToType)
-	{
-		boolean matched = matchMode.getSelectedIndex() == MODE_MATCHED;
-		log.config("Display=" + m_matchOptions[display]
-			+ ", MatchTo=" + m_matchOptions[matchToType]
-			+ ", Matched=" + matched);
-
-		m_sql = new StringBuffer ();
-		if (display == MATCH_INVOICE)
-		{
-			m_dateColumn = "hdr.DateInvoiced";
-			m_qtyColumn = "lin.QtyInvoiced";
-			m_sql.append("SELECT hdr.C_Invoice_ID,hdr.DocumentNo, hdr.DateInvoiced, bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.C_InvoiceLine_ID, p.Name,lin.M_Product_ID,"
-				+ " lin.QtyInvoiced,SUM(NVL(mi.Qty,0)), org.Name, hdr.AD_Org_ID "  //JAVIER
-				+ "FROM C_Invoice hdr"
-				+ " INNER JOIN AD_Org org ON (hdr.AD_Org_ID=org.AD_Org_ID)" //JAVIER
-				+ " INNER JOIN C_BPartner bp ON (hdr.C_BPartner_ID=bp.C_BPartner_ID)"
-				+ " INNER JOIN C_InvoiceLine lin ON (hdr.C_Invoice_ID=lin.C_Invoice_ID)"
-				+ " INNER JOIN M_Product p ON (lin.M_Product_ID=p.M_Product_ID)"
-				+ " INNER JOIN C_DocType dt ON (hdr.C_DocType_ID=dt.C_DocType_ID AND dt.DocBaseType IN ('API','APC'))"
-				+ " FULL JOIN M_MatchInv mi ON (lin.C_InvoiceLine_ID=mi.C_InvoiceLine_ID) "
-				+ "WHERE hdr.DocStatus IN ('CO','CL')");
-			m_groupBy = " GROUP BY hdr.C_Invoice_ID,hdr.DocumentNo,hdr.DateInvoiced,bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.C_InvoiceLine_ID,p.Name,lin.M_Product_ID,lin.QtyInvoiced, org.Name, hdr.AD_Org_ID " //JAVIER
-				+ "HAVING "
-				+ (matched ? "0" : "lin.QtyInvoiced")
-				+ "<>SUM(NVL(mi.Qty,0))";
-		}
-		else if (display == MATCH_ORDER)
-		{
-			m_dateColumn = "hdr.DateOrdered";
-			m_qtyColumn = "lin.QtyOrdered";
-			m_sql.append("SELECT hdr.C_Order_ID,hdr.DocumentNo, hdr.DateOrdered, bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.C_OrderLine_ID, p.Name,lin.M_Product_ID,"
-				+ " lin.QtyOrdered,SUM(COALESCE(mo.Qty,0)), org.Name, hdr.AD_Org_ID " //JAVIER
-				+ "FROM C_Order hdr"
-				+ " INNER JOIN AD_Org org ON (hdr.AD_Org_ID=org.AD_Org_ID)" //JAVIER
-				+ " INNER JOIN C_BPartner bp ON (hdr.C_BPartner_ID=bp.C_BPartner_ID)"
-				+ " INNER JOIN C_OrderLine lin ON (hdr.C_Order_ID=lin.C_Order_ID)"
-				+ " INNER JOIN M_Product p ON (lin.M_Product_ID=p.M_Product_ID)"
-				+ " INNER JOIN C_DocType dt ON (hdr.C_DocType_ID=dt.C_DocType_ID AND dt.DocBaseType='POO')"
-				+ " FULL JOIN M_MatchPO mo ON (lin.C_OrderLine_ID=mo.C_OrderLine_ID) "
-				+ " WHERE " ) ; //[ 1876972 ] Can't match partially matched PO with an unmatched receipt SOLVED BY BOJANA, AGENDA_GM
-			m_linetype = new StringBuffer();
-			m_linetype.append( matchToType == MATCH_SHIPMENT ? "M_InOutLine_ID" : "C_InvoiceLine_ID") ;
-			if ( matched ) {
-				m_sql.append( " mo." + m_linetype + " IS NOT NULL " ) ; 
-			} else {
- 				m_sql.append( " ( mo." + m_linetype + " IS NULL OR "
-				+ " (lin.QtyOrdered <>  (SELECT sum(mo1.Qty) AS Qty" 
-				+ " FROM m_matchpo mo1 WHERE "
-				+ " mo1.C_ORDERLINE_ID=lin.C_ORDERLINE_ID AND "
-				+ " hdr.C_ORDER_ID=lin.C_ORDER_ID AND "
-				+ " mo1." + m_linetype
-				+ " IS NOT NULL group by mo1.C_ORDERLINE_ID))) " );	
-			}
-			m_sql.append( " AND hdr.DocStatus IN ('CO','CL')" );
-			m_groupBy = " GROUP BY hdr.C_Order_ID,hdr.DocumentNo,hdr.DateOrdered,bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.C_OrderLine_ID,p.Name,lin.M_Product_ID,lin.QtyOrdered, org.Name, hdr.AD_Org_ID " //JAVIER
-				+ "HAVING "
-				+ (matched ? "0" : "lin.QtyOrdered")
-				+ "<>SUM(COALESCE(mo.Qty,0))";
-		}
-		else    //  Shipment
-		{
-			m_dateColumn = "hdr.MovementDate";
-			m_qtyColumn = "lin.MovementQty";
-			m_sql.append("SELECT hdr.M_InOut_ID,hdr.DocumentNo, hdr.MovementDate, bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.M_InOutLine_ID, p.Name,lin.M_Product_ID,"
-				+ " lin.MovementQty,SUM(NVL(m.Qty,0)),org.Name, hdr.AD_Org_ID " //JAVIER
-				+ "FROM M_InOut hdr"
-				+ " INNER JOIN AD_Org org ON (hdr.AD_Org_ID=org.AD_Org_ID)" //JAVIER
-				+ " INNER JOIN C_BPartner bp ON (hdr.C_BPartner_ID=bp.C_BPartner_ID)"
-				+ " INNER JOIN M_InOutLine lin ON (hdr.M_InOut_ID=lin.M_InOut_ID)"
-				+ " INNER JOIN M_Product p ON (lin.M_Product_ID=p.M_Product_ID)"
-				+ " INNER JOIN C_DocType dt ON (hdr.C_DocType_ID = dt.C_DocType_ID AND dt.DocBaseType='MMR')"
-				+ " FULL JOIN ")
-				.append(matchToType == MATCH_ORDER ? "M_MatchPO" : "M_MatchInv")
-				.append(" m ON (lin.M_InOutLine_ID=m.M_InOutLine_ID) "
-				+ "WHERE hdr.DocStatus IN ('CO','CL')");
-			m_groupBy = " GROUP BY hdr.M_InOut_ID,hdr.DocumentNo,hdr.MovementDate,bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.M_InOutLine_ID,p.Name,lin.M_Product_ID,lin.MovementQty, org.Name, hdr.AD_Org_ID " //JAVIER
-				+ "HAVING "
-				+ (matched ? "0" : "lin.MovementQty")
-				+ "<>SUM(NVL(m.Qty,0))";
-		}
-	//	Log.trace(7, "VMatch.tableInit", m_sql + "\n" + m_groupBy);
-	}   //  tableInit
-
-
-	/**
-	 *  Fill the table using m_sql
-	 *  @param table table
-	 */
-	private void tableLoad (MiniTable table)
-	{
-	//	log.finest(m_sql + " - " +  m_groupBy);
-		String sql = MRole.getDefault().addAccessSQL(
-			m_sql.toString(), "hdr", MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO)
-			+ m_groupBy;
-		log.finest(sql);
-		try
-		{
-			Statement stmt = DB.createStatement();
-			ResultSet rs = stmt.executeQuery(sql);
-			table.loadTable(rs);
-			stmt.close();
-		}
-		catch (SQLException e)
-		{
-			log.log(Level.SEVERE, sql, e);
-		}
-	}   //  tableLoad
-
-	/**
-	 *  Create Matching Record
-	 *  @param invoice true if matching invoice false if matching PO
-	 *  @param M_InOutLine_ID shipment line
-	 *  @param Line_ID C_InvoiceLine_ID or C_OrderLine_ID
-	 *  @param qty quantity
-	 *  @return true if created
-	 */
-	private boolean createMatchRecord (boolean invoice, int M_InOutLine_ID, int Line_ID,
-		BigDecimal qty)
-	{
-		if (qty.compareTo(Env.ZERO) == 0)
-			return true;
-		log.fine("IsInvoice=" + invoice
-			+ ", M_InOutLine_ID=" + M_InOutLine_ID + ", Line_ID=" + Line_ID
-			+ ", Qty=" + qty);
-		//
-		boolean success = false;
-		MInOutLine sLine = new MInOutLine (Env.getCtx(), M_InOutLine_ID, null);
-		if (invoice)	//	Shipment - Invoice
-		{
-			//	Update Invoice Line
-			MInvoiceLine iLine = new MInvoiceLine (Env.getCtx(), Line_ID, null);
-			iLine.setM_InOutLine_ID(M_InOutLine_ID);
-			if (sLine.getC_OrderLine_ID() != 0)
-				iLine.setC_OrderLine_ID(sLine.getC_OrderLine_ID());
-			iLine.save();
-			//	Create Shipment - Invoice Link
-			if (iLine.getM_Product_ID() != 0)
-			{
-				MMatchInv match = new MMatchInv (iLine, null, qty);
-				match.setM_InOutLine_ID(M_InOutLine_ID);
-				if (match.save())
-					success = true;
-				else
-					log.log(Level.SEVERE, "Inv Match not created: " + match);
-			}
-			else
-				success = true;
-			//	Create PO - Invoice Link = corrects PO
-			if (iLine.getC_OrderLine_ID() != 0 && iLine.getM_Product_ID() != 0)
-			{
-				MMatchPO matchPO = MMatchPO.create(iLine, sLine, null, qty);
-				matchPO.setC_InvoiceLine_ID(iLine);
-				matchPO.setM_InOutLine_ID(M_InOutLine_ID);
-				if (!matchPO.save())
-					log.log(Level.SEVERE, "PO(Inv) Match not created: " + matchPO);
-			}
-		}
-		else	//	Shipment - Order
-		{
-			//	Update Shipment Line
-			sLine.setC_OrderLine_ID(Line_ID);
-			sLine.save();
-			//	Update Order Line
-			MOrderLine oLine = new MOrderLine(Env.getCtx(), Line_ID, null);
-			if (oLine.get_ID() != 0)	//	other in MInOut.completeIt
-			{
-				oLine.setQtyReserved(oLine.getQtyReserved().subtract(qty));
-				if(!oLine.save())
-					log.severe("QtyReserved not updated - C_OrderLine_ID=" + Line_ID);
-			}
-
-			//	Create PO - Shipment Link
-			if (sLine.getM_Product_ID() != 0)
-			{
-				MMatchPO match = new MMatchPO (sLine, null, qty);
-				if (!match.save())
-					log.log(Level.SEVERE, "PO Match not created: " + match);
-				else
-				{
-					success = true;
-					//	Correct Ordered Qty for Stocked Products (see MOrder.reserveStock / MInOut.processIt)
-					if (sLine.getProduct() != null && sLine.getProduct().isStocked())
-						success = MStorage.add (Env.getCtx(), sLine.getM_Warehouse_ID(), 
-							sLine.getM_Locator_ID(), 
-							sLine.getM_Product_ID(), 
-							sLine.getM_AttributeSetInstance_ID(), oLine.getM_AttributeSetInstance_ID(), 
-							null, null, qty.negate(), null);
-				}
-			}
-			else
-				success = true;
-		}
-		return success;
-	}   //  createMatchRecord
-
 }   //  VMatch

zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java

@@ -41,7 +41,7 @@ import org.adempiere.webui.event.WTableModelEvent;
 import org.adempiere.webui.event.WTableModelListener;
 import org.adempiere.webui.panel.ADForm;
 import org.adempiere.webui.panel.CustomForm;
-import org.adempiere.webui.panel.ICustomForm;
+import org.adempiere.webui.panel.IFormController;
 import org.adempiere.webui.panel.StatusBarPanel;
 import org.adempiere.webui.window.FDialog;
 import org.compiere.apps.form.Allocation;
@@ -69,7 +69,7 @@ import org.zkoss.zul.Space;
  * Contributor : Fabian Aguilar - OFBConsulting - Multiallocation
  */
 public class WAllocation extends Allocation
-	implements ICustomForm, EventListener, WTableModelListener, ValueChangeListener
+	implements IFormController, EventListener, WTableModelListener, ValueChangeListener
 {
 	
 	/**

zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java

@@ -45,7 +45,7 @@ import org.adempiere.webui.component.Textbox;
 import org.adempiere.webui.editor.WSearchEditor;
 import org.adempiere.webui.panel.ADForm;
 import org.adempiere.webui.panel.CustomForm;
-import org.adempiere.webui.panel.ICustomForm;
+import org.adempiere.webui.panel.IFormController;
 import org.adempiere.webui.session.SessionManager;
 import org.compiere.apps.form.Archive;
 import org.compiere.model.MArchive;
@@ -70,7 +70,7 @@ import org.zkoss.zul.Iframe;
  * @date	September 28, 2007
 */
 
-public class WArchiveViewer extends Archive implements ICustomForm, EventListener
+public class WArchiveViewer extends Archive implements IFormController, EventListener
 {
 	/**
 	 * 

zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java

@@ -38,7 +38,7 @@ import org.adempiere.webui.component.Textbox;
 import org.adempiere.webui.component.WListbox;
 import org.adempiere.webui.panel.ADForm;
 import org.adempiere.webui.panel.CustomForm;
-import org.adempiere.webui.panel.ICustomForm;
+import org.adempiere.webui.panel.IFormController;
 import org.adempiere.webui.session.SessionManager;
 import org.adempiere.webui.window.FDialog;
 import org.compiere.apps.form.Charge;
@@ -65,7 +65,7 @@ import org.zkoss.zul.Separator;
  * @author Andrew Kimball
  *
  */
-public class WCharge extends Charge implements ICustomForm, EventListener
+public class WCharge extends Charge implements IFormController, EventListener
 {
     /**
 	 *

zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java

@@ -143,9 +143,6 @@ public class WCreateFromStatementUI extends CreateFromStatement implements Event
 		
 		window.setTitle(getTitle());
 		
-		authorizationField = new WStringEditor ("authorization", false, false, true, 10, 30, null, null);
-		authorizationField.getComponent().addEventListener(Events.ON_CHANGE, this);
-		
 		int AD_Column_ID = 4917;        //  C_BankStatement.C_BankAccount_ID
 		MLookup lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, AD_Column_ID, DisplayType.TableDir);
 		bankAccountField = new WTableDirEditor ("C_BankAccount_ID", true, false, true, lookup);

zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WInOutGen.java

@@ -26,7 +26,7 @@ import org.adempiere.webui.editor.WTableDirEditor;
 import org.adempiere.webui.event.ValueChangeEvent;
 import org.adempiere.webui.event.ValueChangeListener;
 import org.adempiere.webui.panel.ADForm;
-import org.adempiere.webui.panel.ICustomForm;
+import org.adempiere.webui.panel.IFormController;
 import org.compiere.apps.form.InOutGen;
 import org.compiere.model.MLookup;
 import org.compiere.model.MLookupFactory;
@@ -46,7 +46,7 @@ import org.zkoss.zul.Space;
  * Generate Shipment (manual) view class
  * 
  */
-public class WInOutGen extends InOutGen implements ICustomForm, EventListener, ValueChangeListener
+public class WInOutGen extends InOutGen implements IFormController, EventListener, ValueChangeListener
 {
 	private static WGenForm form;
 	

zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WInvoiceGen.java

@@ -26,7 +26,7 @@ import org.adempiere.webui.editor.WTableDirEditor;
 import org.adempiere.webui.event.ValueChangeEvent;
 import org.adempiere.webui.event.ValueChangeListener;
 import org.adempiere.webui.panel.ADForm;
-import org.adempiere.webui.panel.ICustomForm;
+import org.adempiere.webui.panel.IFormController;
 import org.compiere.apps.form.InvoiceGen;
 import org.compiere.model.MLookup;
 import org.compiere.model.MLookupFactory;
@@ -45,7 +45,7 @@ import org.zkoss.zul.Space;
  * Generate Invoice (manual) view class
  * 
  */
-public class WInvoiceGen extends InvoiceGen implements ICustomForm, EventListener, ValueChangeListener
+public class WInvoiceGen extends InvoiceGen implements IFormController, EventListener, ValueChangeListener
 {
 	private static WGenForm form;
 	

zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java

@@ -1,5 +1,5 @@
 /******************************************************************************
- * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Product: Adempiere ERP & CRM Smart Business Solution                        *
  * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
  * This program is free software; you can redistribute it and/or modify it    *
  * under the terms version 2 of the GNU General Public License as published   *
@@ -21,7 +21,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Timestamp;
-import java.util.Vector;
 import java.util.logging.Level;
 
 import org.adempiere.webui.LayoutUtils;
@@ -44,17 +43,15 @@ import org.adempiere.webui.editor.WSearchEditor;
 import org.adempiere.webui.event.WTableModelEvent;
 import org.adempiere.webui.event.WTableModelListener;
 import org.adempiere.webui.panel.ADForm;
+import org.adempiere.webui.panel.CustomForm;
+import org.adempiere.webui.panel.IFormController;
 import org.adempiere.webui.panel.StatusBarPanel;
 import org.adempiere.webui.session.SessionManager;
+import org.compiere.apps.form.Match;
 import org.compiere.minigrid.ColumnInfo;
 import org.compiere.minigrid.IDColumn;
-import org.compiere.model.MInOutLine;
-import org.compiere.model.MInvoiceLine;
-import org.compiere.model.MMatchInv;
 import org.compiere.model.MMatchPO;
-import org.compiere.model.MOrderLine;
 import org.compiere.model.MRole;
-import org.compiere.model.MStorage;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
 import org.compiere.util.DisplayType;
@@ -77,18 +74,19 @@ import org.zkoss.zul.Space;
  *  @author     Jorg Janke
  *  @version    $Id: VMatch.java,v 1.2 2006/07/30 00:51:28 jjanke Exp $
  */
-public class WMatch extends ADForm
+public class WMatch extends Match
-	implements EventListener, WTableModelListener
+	implements IFormController, EventListener, WTableModelListener
 {
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = -6383121932802974801L;
+	private CustomForm form = new CustomForm();
 
 	/**
 	 *	Initialize Panel
 	 */
-	protected void initForm()
+	public WMatch()
 	{
 		log.info("WinNo=" + m_WindowNo
 			+ " - AD_Client_ID=" + m_AD_Client_ID + ", AD_Org_ID=" + m_AD_Org_ID + ", By=" + m_by);
@@ -100,12 +98,13 @@ public class WMatch extends ADForm
 			onlyVendor = WSearchEditor.createBPartner(m_WindowNo); 
 			onlyProduct = WSearchEditor.createProduct(m_WindowNo);
 			zkInit();
-			//
 			dynInit();
+
 			southPanel.appendChild(new Separator());
 			southPanel.appendChild(statusBar);
 			LayoutUtils.addSclass("status-border", statusBar);
 			//
+			
 			new Thread()
 			{
 				public void run()
@@ -115,6 +114,7 @@ public class WMatch extends ADForm
 					log.info("... Done");
 				}
 			}.start();
+			cmd_matchTo();
 		}
 		catch(Exception e)
 		{
@@ -122,6 +122,8 @@ public class WMatch extends ADForm
 		}
 	}	//	init
 
+	/**	Window No			*/
+	private int         	m_WindowNo = 0;
 	/**	Logger			*/
 	private static CLogger log = CLogger.getCLogger(WMatch.class);
 
@@ -134,9 +136,6 @@ public class WMatch extends ADForm
 		Msg.getElement(Env.getCtx(), "C_Invoice_ID", false),
 		Msg.getElement(Env.getCtx(), "M_InOut_ID", false),
 		Msg.getElement(Env.getCtx(), "C_Order_ID", false) };
-	private static final int		MATCH_INVOICE = 0;
-	private static final int		MATCH_SHIPMENT = 1;
-	private static final int		MATCH_ORDER = 2;
 
 	/** Match Mode              	*/
 	private String[] m_matchMode = new String[] {
@@ -146,18 +145,12 @@ public class WMatch extends ADForm
 	private static final int		MODE_MATCHED = 1;
 
 	/**	Indexes in Table			*/
-	private static final int		I_BPartner = 3;
-	private static final int		I_Line = 4;
-	private static final int		I_Product = 5;
 	private static final int		I_QTY = 6;
 	private static final int		I_MATCHED = 7;
 
 
 	private StringBuffer    m_sql = null;
-	private String          m_dateColumn = "";
-	private String          m_qtyColumn = "";
 	private String          m_groupBy = "";
-	private StringBuffer			m_linetype = null;
 	private BigDecimal      m_xMatched = Env.ZERO;
 	private BigDecimal      m_xMatchedTo = Env.ZERO;
 
@@ -220,7 +213,7 @@ public class WMatch extends ADForm
 	 */
 	private void zkInit() throws Exception
 	{
-		this.appendChild(mainPanel);
+		form.appendChild(mainPanel);
 		mainPanel.setStyle("width: 99%; height: 100%; padding: 0; margin: 0");
 		mainPanel.appendChild(mainLayout);
 		mainLayout.setWidth("100%");
@@ -372,8 +365,20 @@ public class WMatch extends ADForm
 		sameBPartner.addActionListener(this);
 		sameProduct.addActionListener(this);
 		sameQty.addActionListener(this);
-		//  Init
+		
-		cmd_matchFrom();
+		//  Init Yvonne
+		String selection = (String)matchFrom.getSelectedItem().getValue();
+		SimpleListModel model = new SimpleListModel(cmd_matchFrom((String)matchFrom.getSelectedItem().getLabel()));
+		matchTo.setItemRenderer(model);
+		matchTo.setModel(model);		
+		//  Set Title
+		xMatchedBorder.setValue(selection);
+		//  Reset Table
+		xMatchedTable.setRowCount(0);
+		//  sync To
+		matchTo.setSelectedIndex(0);
+		cmd_matchTo();
+
 		statusBar.setStatusLine("");
 		statusBar.setStatusDB("0");
 	}   //  dynInit
@@ -393,14 +398,54 @@ public class WMatch extends ADForm
 	 */
 	public void onEvent (Event e)
 	{
-		if (e.getTarget() == matchFrom)
+		Integer product = onlyProduct.getValue()!=null?(Integer)onlyProduct.getValue():null;
-			cmd_matchFrom();
+		Integer vendor = onlyVendor.getValue()!=null?(Integer)onlyVendor.getValue():null;
+		Timestamp from = dateFrom.getValue()!=null?(Timestamp)dateFrom.getValue():null;
+		Timestamp to = dateTo.getValue()!=null?(Timestamp)dateTo.getValue():null;
+		
+		if (e.getTarget() == matchFrom) {
+			//cmd_matchFrom((String)matchFrom.getSelectedItem().getLabel());
+			String selection = (String)matchFrom.getSelectedItem().getValue();
+			SimpleListModel model = new SimpleListModel(cmd_matchFrom((String)matchFrom.getSelectedItem().getLabel()));
+			matchTo.setItemRenderer(model);
+			matchTo.setModel(model);		
+			//  Set Title
+			xMatchedBorder.setValue(selection);
+			//  Reset Table
+			xMatchedTable.setRowCount(0);
+			//  sync To
+			matchTo.setSelectedIndex(0);
+			cmd_matchTo();
+			
+		}
 		else if (e.getTarget() == matchTo)
 			cmd_matchTo();
 		else if (e.getTarget() == bSearch)
-			cmd_search();
+		{
+			//cmd_search();
+			xMatchedTable = (WListbox)cmd_search(xMatchedTable, matchFrom.getSelectedIndex(), (String)matchTo.getSelectedItem().getLabel(), product, vendor, from, to, matchMode.getSelectedIndex() == MODE_MATCHED);
+
+			xMatched.setValue(Env.ZERO);
+			//  Status Info
+			statusBar.setStatusLine(matchFrom.getSelectedItem().getLabel()
+				+ "# = " + xMatchedTable.getRowCount(),
+				xMatchedTable.getRowCount() == 0);
+			statusBar.setStatusDB("0");
+			cmd_searchTo();
+		}
 		else if (e.getTarget() == bProcess)
-			cmd_process();
+		{
+			//cmd_process();
+			cmd_process(xMatchedTable, xMatchedToTable, matchMode.getSelectedIndex(), matchFrom.getSelectedIndex(), matchTo.getSelectedItem(), m_xMatched);
+			xMatchedTable = (WListbox) cmd_search(xMatchedTable, matchFrom.getSelectedIndex(), (String)matchTo.getSelectedItem().getLabel(), product, vendor, from, to, matchMode.getSelectedIndex() == MODE_MATCHED);
+			xMatched.setValue(Env.ZERO);
+			//  Status Info
+			statusBar.setStatusLine(matchFrom.getSelectedItem().getLabel()
+				+ "# = " + xMatchedTable.getRowCount(),
+				xMatchedTable.getRowCount() == 0);
+			statusBar.setStatusDB("0");
+			cmd_searchTo();
+		}
 		else if (e.getTarget() == sameBPartner
 			|| e.getTarget() == sameProduct
 			|| e.getTarget() == sameQty)
@@ -409,35 +454,7 @@ public class WMatch extends ADForm
 			cmd_searchTo();
 	}   //  actionPerformed
 
-	/**
+	
-	 *  Match From Changed - Fill Match To
-	 */
-	private void cmd_matchFrom()
-	{
-	//	log.fine( "VMatch.cmd_matchFrom");
-		String selection = (String)matchFrom.getSelectedItem().getValue();
-		Vector<String> vector = new Vector<String>(2);
-		if (selection.equals(m_matchOptions[MATCH_INVOICE]))
-			vector.add(m_matchOptions[MATCH_SHIPMENT]);
-		else if (selection.equals(m_matchOptions[MATCH_ORDER]))
-			vector.add(m_matchOptions[MATCH_SHIPMENT]);
-		else    //  shipment
-		{
-			vector.add(m_matchOptions[MATCH_INVOICE]);
-			vector.add(m_matchOptions[MATCH_ORDER]);
-		}
-		SimpleListModel model = new SimpleListModel(vector);
-		matchTo.setItemRenderer(model);
-		matchTo.setModel(model);		
-		//  Set Title
-		xMatchedBorder.setValue(selection);
-		//  Reset Table
-		xMatchedTable.setRowCount(0);
-		//  sync To
-		matchTo.setSelectedIndex(0);
-		cmd_matchTo();
-	}   //  cmd_matchFrom
-
 	/**
 	 *  Match To Changed - set Title
 	 */
@@ -450,124 +467,8 @@ public class WMatch extends ADForm
 		//  Reset Table
 		xMatchedToTable.setRowCount(0);
 	}   //  cmd_matchTo
-
-	/**
-	 *  Search Button Pressed - Fill xMatched
-	 */
-	private void cmd_search()
-	{
-		//  ** Create SQL **
-		int display = matchFrom.getSelectedIndex();
-		String matchToString = (String)matchTo.getSelectedItem().getLabel();
-		int matchToType = MATCH_INVOICE;
-		if (matchToString.equals(m_matchOptions[MATCH_SHIPMENT]))
-			matchToType = MATCH_SHIPMENT;
-		else if (matchToString.equals(m_matchOptions[MATCH_ORDER]))
-			matchToType = MATCH_ORDER;
-		//
-		tableInit(display, matchToType);	//	sets m_sql
-
-		//  ** Add Where Clause **
-		//  Product
-		if (onlyProduct.getValue() != null)
-		{
-			Integer Product = (Integer)onlyProduct.getValue();
-			m_sql.append(" AND lin.M_Product_ID=").append(Product);
-		}
-		//  BPartner
-		if (onlyVendor.getValue() != null)
-		{
-			Integer Vendor = (Integer)onlyVendor.getValue();
-			m_sql.append(" AND hdr.C_BPartner_ID=").append(Vendor);
-		}
-		//  Date
-		Timestamp from = (Timestamp)dateFrom.getValue();
-		Timestamp to = (Timestamp)dateTo.getValue();
-		if (from != null && to != null)
-			m_sql.append(" AND ").append(m_dateColumn).append(" BETWEEN ")
-				.append(DB.TO_DATE(from)).append(" AND ").append(DB.TO_DATE(to));
-		else if (from != null)
-			m_sql.append(" AND ").append(m_dateColumn).append(" >= ").append(DB.TO_DATE(from));
-		else if (to != null)
-			m_sql.append(" AND ").append(m_dateColumn).append(" <= ").append(DB.TO_DATE(to));
-
-		//  ** Load Table **
-		tableLoad (xMatchedTable);
-		xMatched.setValue(Env.ZERO);
-		//  Status Info
-		statusBar.setStatusLine(matchFrom.getSelectedItem().getLabel()
-			+ "# = " + xMatchedTable.getRowCount(),
-			xMatchedTable.getRowCount() == 0);
-		statusBar.setStatusDB("0");
-	}   //  cmd_search
-
-	/**
-	 *  Process Button Pressed - Process Matching
-	 */
-	private void cmd_process()
-	{
-		log.config("");
-		//  Matched From
-		int matchedRow = xMatchedTable.getSelectedRow();
-		if (matchedRow < 0)
-			return;
-	//	KeyNamePair BPartner = (KeyNamePair)xMatchedTable.getValueAt(matchedRow, I_BPartner);
-		KeyNamePair lineMatched = (KeyNamePair)xMatchedTable.getValueAt(matchedRow, I_Line);
-		KeyNamePair Product = (KeyNamePair)xMatchedTable.getValueAt(matchedRow, I_Product);
-
-		int M_Product_ID = Product.getKey();
-		double totalQty = m_xMatched.doubleValue();
-
-		//  Matched To
-		for (int row = 0; row < xMatchedToTable.getRowCount(); row++)
-		{
-			IDColumn id = (IDColumn)xMatchedToTable.getValueAt(row, 0);
-			if (id != null && id.isSelected())
-			{
-				//  need to be the same product
-				KeyNamePair ProductCompare = (KeyNamePair)xMatchedToTable.getValueAt(row, I_Product);
-				if (Product.getKey() != ProductCompare.getKey())
-					continue;
-
-				KeyNamePair lineMatchedTo = (KeyNamePair)xMatchedToTable.getValueAt(row, I_Line);
-
-				//	Qty
-				double qty = 0.0;
-				if (matchMode.getSelectedIndex() == MODE_NOTMATCHED)
-					qty = ((Double)xMatchedToTable.getValueAt(row, I_QTY)).doubleValue();	//  doc
-				qty -= ((Double)xMatchedToTable.getValueAt(row, I_MATCHED)).doubleValue();  //  matched
-				if (qty > totalQty)
-					qty = totalQty;
-				totalQty -= qty;
-
-				//  Invoice or PO
-				boolean invoice = true;
-				if (matchFrom.getSelectedIndex() == MATCH_ORDER ||
-						matchTo.getSelectedItem().equals(m_matchOptions[MATCH_ORDER]))
-					invoice = false;
-				//  Get Shipment_ID
-				int M_InOutLine_ID = 0;
-				int Line_ID = 0;
-				if (matchFrom.getSelectedIndex() == MATCH_SHIPMENT)
-				{
-					M_InOutLine_ID = lineMatched.getKey();      //  upper table
-					Line_ID = lineMatchedTo.getKey();
-				}
-				else
-				{
-					M_InOutLine_ID = lineMatchedTo.getKey();    //  lower table
-					Line_ID = lineMatched.getKey();
-				}
-
-				//  Create it
-				createMatchRecord(invoice, M_InOutLine_ID, Line_ID, new BigDecimal(qty));
-			}
-		}
-		//  requery
-		cmd_search();
-		cmd_searchTo();
-	}   //  cmd_process
 	
+
 	/**
 	 *  Fill xMatchedTo
 	 */
@@ -585,31 +486,11 @@ public class WMatch extends ADForm
 		{
 			//  ** Create SQL **
 			String displayString = (String)matchTo.getSelectedItem().getLabel();
-			int display = MATCH_INVOICE;
-			if (displayString.equals(m_matchOptions[MATCH_SHIPMENT]))
-				display = MATCH_SHIPMENT;
-			else if (displayString.equals(m_matchOptions[MATCH_ORDER]))
-				display = MATCH_ORDER;
 			int matchToType = matchFrom.getSelectedIndex();
-			tableInit (display, matchToType);	//	sets m_sql
-			//  ** Add Where Clause **
-			KeyNamePair BPartner = (KeyNamePair)xMatchedTable.getValueAt(row, I_BPartner);
-			KeyNamePair Product = (KeyNamePair)xMatchedTable.getValueAt(row, I_Product);
-			log.fine("BPartner=" + BPartner + " - Product=" + Product);
-			//
-			if (sameBPartner.isSelected())
-				m_sql.append(" AND hdr.C_BPartner_ID=").append(BPartner.getKey());
-			if (sameProduct.isSelected())
-				m_sql.append(" AND lin.M_Product_ID=").append(Product.getKey());
-
-			//  calculate qty
 			double docQty = ((Double)xMatchedTable.getValueAt(row, I_QTY)).doubleValue();
 			double matchedQty = ((Double)xMatchedTable.getValueAt(row, I_MATCHED)).doubleValue();
 			qty = docQty - matchedQty;
-			if (sameQty.isSelected())
+			xMatchedToTable = (WListbox) cmd_searchTo(xMatchedTable, xMatchedToTable, displayString, matchToType, sameBPartner.isSelected(), sameProduct.isSelected(), sameQty.isSelected(), matchMode.getSelectedIndex() == MODE_MATCHED);
-				m_sql.append(" AND ").append(m_qtyColumn).append("=").append(docQty);
-			//  ** Load Table **
-			tableLoad (xMatchedToTable);
 		}
 		//  Display To be Matched Qty
 		m_xMatched = new BigDecimal (qty);
@@ -624,7 +505,6 @@ public class WMatch extends ADForm
 			xMatchedToTable.getRowCount() == 0);
 		statusBar.setStatusDB("0");
 	}   //  cmd_seachTo
-
 	
 	private String getMatchToLabel() {
 		int index = matchTo.getSelectedIndex();
@@ -677,107 +557,6 @@ public class WMatch extends ADForm
 		statusBar.setStatusDB(noRows + "");
 	}   //  tableChanged
 
-	
-	/**************************************************************************
-	 *  Initialise Table access - create SQL, dateColumn.
-	 *  <br>
-	 *  The driving table is "hdr", e.g. for hdr.C_BPartner_ID=..
-	 *  The line table is "lin", e.g. for lin.M_Product_ID=..
-	 *  You use the dateColumn/qtyColumn variable directly as it is table specific.
-	 *  <br>
-	 *  The sql is dependent on MatchMode:
-	 *  - If Matched - all (fully or partially) matched records are listed
-	 *  - If Not Matched - all not fully matched records are listed
-	 *  @param display (Invoice, Shipment, Order) see MATCH_*
-	 *  @param matchToType (Invoice, Shipment, Order) see MATCH_*
-	 */
-	private void tableInit (int display, int matchToType)
-	{
-		boolean matched = matchMode.getSelectedIndex() == MODE_MATCHED;
-		log.config("Display=" + m_matchOptions[display]
-			+ ", MatchTo=" + m_matchOptions[matchToType]
-			+ ", Matched=" + matched);
-
-		m_sql = new StringBuffer ();
-		if (display == MATCH_INVOICE)
-		{
-			m_dateColumn = "hdr.DateInvoiced";
-			m_qtyColumn = "lin.QtyInvoiced";
-			m_sql.append("SELECT hdr.C_Invoice_ID,hdr.DocumentNo, hdr.DateInvoiced, bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.C_InvoiceLine_ID, p.Name,lin.M_Product_ID,"
-				+ " lin.QtyInvoiced,SUM(NVL(mi.Qty,0)) "
-				+ "FROM C_Invoice hdr"
-				+ " INNER JOIN C_BPartner bp ON (hdr.C_BPartner_ID=bp.C_BPartner_ID)"
-				+ " INNER JOIN C_InvoiceLine lin ON (hdr.C_Invoice_ID=lin.C_Invoice_ID)"
-				+ " INNER JOIN M_Product p ON (lin.M_Product_ID=p.M_Product_ID)"
-				+ " INNER JOIN C_DocType dt ON (hdr.C_DocType_ID=dt.C_DocType_ID AND dt.DocBaseType IN ('API','APC'))"
-				+ " FULL JOIN M_MatchInv mi ON (lin.C_InvoiceLine_ID=mi.C_InvoiceLine_ID) "
-				+ "WHERE hdr.DocStatus IN ('CO','CL')");
-			m_groupBy = " GROUP BY hdr.C_Invoice_ID,hdr.DocumentNo,hdr.DateInvoiced,bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.C_InvoiceLine_ID,p.Name,lin.M_Product_ID,lin.QtyInvoiced "
-				+ "HAVING "
-				+ (matched ? "0" : "lin.QtyInvoiced")
-				+ "<>SUM(NVL(mi.Qty,0))";
-		}
-		else if (display == MATCH_ORDER)
-		{
-			m_dateColumn = "hdr.DateOrdered";
-			m_qtyColumn = "lin.QtyOrdered";
-			m_sql.append("SELECT hdr.C_Order_ID,hdr.DocumentNo, hdr.DateOrdered, bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.C_OrderLine_ID, p.Name,lin.M_Product_ID,"
-				+ " lin.QtyOrdered,SUM(COALESCE(mo.Qty,0)) "
-				+ "FROM C_Order hdr"
-				+ " INNER JOIN C_BPartner bp ON (hdr.C_BPartner_ID=bp.C_BPartner_ID)"
-				+ " INNER JOIN C_OrderLine lin ON (hdr.C_Order_ID=lin.C_Order_ID)"
-				+ " INNER JOIN M_Product p ON (lin.M_Product_ID=p.M_Product_ID)"
-				+ " INNER JOIN C_DocType dt ON (hdr.C_DocType_ID=dt.C_DocType_ID AND dt.DocBaseType='POO')"
-				+ " FULL JOIN M_MatchPO mo ON (lin.C_OrderLine_ID=mo.C_OrderLine_ID) "
-				+ " WHERE " ) ; //[ 1876972 ] Can't match partially matched PO with an unmatched receipt SOLVED BY BOJANA, AGENDA_GM
-			m_linetype = new StringBuffer();
-			m_linetype.append( matchToType == MATCH_SHIPMENT ? "M_InOutLine_ID" : "C_InvoiceLine_ID") ;
-			if ( matched ) {
-				m_sql.append( " mo." + m_linetype + " IS NOT NULL " ) ; 
-			} else {
- 				m_sql.append( " ( mo." + m_linetype + " IS NULL OR "
-				+ " (lin.QtyOrdered <>  (SELECT sum(mo1.Qty) AS Qty" 
-				+ " FROM m_matchpo mo1 WHERE "
-				+ " mo1.C_ORDERLINE_ID=lin.C_ORDERLINE_ID AND "
-				+ " hdr.C_ORDER_ID=lin.C_ORDER_ID AND "
-				+ " mo1." + m_linetype
-				+ " IS NOT NULL group by mo1.C_ORDERLINE_ID))) " );	
-			}
-			m_sql.append( " AND hdr.DocStatus IN ('CO','CL')" );
-			m_groupBy = " GROUP BY hdr.C_Order_ID,hdr.DocumentNo,hdr.DateOrdered,bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.C_OrderLine_ID,p.Name,lin.M_Product_ID,lin.QtyOrdered "
-				+ "HAVING "
-				+ (matched ? "0" : "lin.QtyOrdered")
-				+ "<>SUM(COALESCE(mo.Qty,0))";
-		}
-		else    //  Shipment
-		{
-			m_dateColumn = "hdr.MovementDate";
-			m_qtyColumn = "lin.MovementQty";
-			m_sql.append("SELECT hdr.M_InOut_ID,hdr.DocumentNo, hdr.MovementDate, bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.M_InOutLine_ID, p.Name,lin.M_Product_ID,"
-				+ " lin.MovementQty,SUM(NVL(m.Qty,0)) "
-				+ "FROM M_InOut hdr"
-				+ " INNER JOIN C_BPartner bp ON (hdr.C_BPartner_ID=bp.C_BPartner_ID)"
-				+ " INNER JOIN M_InOutLine lin ON (hdr.M_InOut_ID=lin.M_InOut_ID)"
-				+ " INNER JOIN M_Product p ON (lin.M_Product_ID=p.M_Product_ID)"
-				+ " INNER JOIN C_DocType dt ON (hdr.C_DocType_ID = dt.C_DocType_ID AND dt.DocBaseType='MMR')"
-				+ " FULL JOIN ")
-				.append(matchToType == MATCH_ORDER ? "M_MatchPO" : "M_MatchInv")
-				.append(" m ON (lin.M_InOutLine_ID=m.M_InOutLine_ID) "
-				+ "WHERE hdr.DocStatus IN ('CO','CL')");
-			m_groupBy = " GROUP BY hdr.M_InOut_ID,hdr.DocumentNo,hdr.MovementDate,bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.M_InOutLine_ID,p.Name,lin.M_Product_ID,lin.MovementQty "
-				+ "HAVING "
-				+ (matched ? "0" : "lin.MovementQty")
-				+ "<>SUM(NVL(m.Qty,0))";
-		}
-	//	Log.trace(7, "VMatch.tableInit", m_sql + "\n" + m_groupBy);
-	}   //  tableInit
-
 
 	/**
 	 *  Fill the table using m_sql
@@ -803,91 +582,9 @@ public class WMatch extends ADForm
 		}
 	}   //  tableLoad
 
-	/**
-	 *  Create Matching Record
-	 *  @param invoice true if matching invoice false if matching PO
-	 *  @param M_InOutLine_ID shipment line
-	 *  @param Line_ID C_InvoiceLine_ID or C_OrderLine_ID
-	 *  @param qty quantity
-	 *  @return true if created
-	 */
-	private boolean createMatchRecord (boolean invoice, int M_InOutLine_ID, int Line_ID,
-		BigDecimal qty)
-	{
-		if (qty.compareTo(Env.ZERO) == 0)
-			return true;
-		log.fine("IsInvoice=" + invoice
-			+ ", M_InOutLine_ID=" + M_InOutLine_ID + ", Line_ID=" + Line_ID
-			+ ", Qty=" + qty);
-		//
-		boolean success = false;
-		MInOutLine sLine = new MInOutLine (Env.getCtx(), M_InOutLine_ID, null);
-		if (invoice)	//	Shipment - Invoice
-		{
-			//	Update Invoice Line
-			MInvoiceLine iLine = new MInvoiceLine (Env.getCtx(), Line_ID, null);
-			iLine.setM_InOutLine_ID(M_InOutLine_ID);
-			if (sLine.getC_OrderLine_ID() != 0)
-				iLine.setC_OrderLine_ID(sLine.getC_OrderLine_ID());
-			iLine.save();
-			//	Create Shipment - Invoice Link
-			if (iLine.getM_Product_ID() != 0)
-			{
-				MMatchInv match = new MMatchInv (iLine, null, qty);
-				match.setM_InOutLine_ID(M_InOutLine_ID);
-				if (match.save())
-					success = true;
-				else
-					log.log(Level.SEVERE, "Inv Match not created: " + match);
-			}
-			else
-				success = true;
-			//	Create PO - Invoice Link = corrects PO
-			if (iLine.getC_OrderLine_ID() != 0 && iLine.getM_Product_ID() != 0)
-			{
-				MMatchPO matchPO = MMatchPO.create(iLine, sLine, null, qty);
-				matchPO.setC_InvoiceLine_ID(iLine);
-				matchPO.setM_InOutLine_ID(M_InOutLine_ID);
-				if (!matchPO.save())
-					log.log(Level.SEVERE, "PO(Inv) Match not created: " + matchPO);
-			}
-		}
-		else	//	Shipment - Order
-		{
-			//	Update Shipment Line
-			sLine.setC_OrderLine_ID(Line_ID);
-			sLine.save();
-			//	Update Order Line
-			MOrderLine oLine = new MOrderLine(Env.getCtx(), Line_ID, null);
-			if (oLine.get_ID() != 0)	//	other in MInOut.completeIt
-			{
-				oLine.setQtyReserved(oLine.getQtyReserved().subtract(qty));
-				if(!oLine.save())
-					log.severe("QtyReserved not updated - C_OrderLine_ID=" + Line_ID);
-			}
 
-			//	Create PO - Shipment Link
+	public ADForm getForm() {
-			if (sLine.getM_Product_ID() != 0)
+		return form;
-			{
+	}
-				MMatchPO match = new MMatchPO (sLine, null, qty);
+	
-				if (!match.save())
+}
-					log.log(Level.SEVERE, "PO Match not created: " + match);
-				else
-				{
-					success = true;
-					//	Correct Ordered Qty for Stocked Products (see MOrder.reserveStock / MInOut.processIt)
-					if (sLine.getProduct() != null && sLine.getProduct().isStocked())
-						success = MStorage.add (Env.getCtx(), sLine.getM_Warehouse_ID(), 
-							sLine.getM_Locator_ID(), 
-							sLine.getM_Product_ID(), 
-							sLine.getM_AttributeSetInstance_ID(), oLine.getM_AttributeSetInstance_ID(), 
-							null, null, qty.negate(), null);
-				}
-			}
-			else
-				success = true;
-		}
-		return success;
-	}   //  createMatchRecord
-
-}   //  VMatch

zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WMerge.java

@@ -30,7 +30,7 @@ import org.adempiere.webui.editor.WSearchEditor;
 import org.adempiere.webui.editor.WTableDirEditor;
 import org.adempiere.webui.panel.ADForm;
 import org.adempiere.webui.panel.CustomForm;
-import org.adempiere.webui.panel.ICustomForm;
+import org.adempiere.webui.panel.IFormController;
 import org.adempiere.webui.session.SessionManager;
 import org.adempiere.webui.window.FDialog;
 import org.compiere.apps.form.Merge;
@@ -57,7 +57,7 @@ import org.zkoss.zkex.zul.South;
  *	@author Jorg Janke
  *	@version $Id: VMerge.java,v 1.2 2006/07/30 00:51:28 jjanke Exp $
  */
-public class WMerge extends Merge implements ICustomForm, EventListener
+public class WMerge extends Merge implements IFormController, EventListener
 {
 	/**
 	 * 

zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java

@@ -37,7 +37,7 @@ import org.adempiere.webui.component.Window;
 import org.adempiere.webui.editor.WNumberEditor;
 import org.adempiere.webui.panel.ADForm;
 import org.adempiere.webui.panel.CustomForm;
-import org.adempiere.webui.panel.ICustomForm;
+import org.adempiere.webui.panel.IFormController;
 import org.adempiere.webui.session.SessionManager;
 import org.adempiere.webui.window.FDialog;
 import org.adempiere.webui.window.SimplePDFViewer;
@@ -63,7 +63,7 @@ import org.zkoss.zul.Filedownload;
  * 	@author 	Jorg Janke
  * 	@version 	$Id: VPayPrint.java,v 1.2 2006/07/30 00:51:28 jjanke Exp $
  */
-public class WPayPrint extends PayPrint implements ICustomForm, EventListener
+public class WPayPrint extends PayPrint implements IFormController, EventListener
 {
 	/**
 	 * 

zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPaySelect.java

@@ -40,7 +40,7 @@ import org.adempiere.webui.event.WTableModelEvent;
 import org.adempiere.webui.event.WTableModelListener;
 import org.adempiere.webui.panel.ADForm;
 import org.adempiere.webui.panel.CustomForm;
-import org.adempiere.webui.panel.ICustomForm;
+import org.adempiere.webui.panel.IFormController;
 import org.adempiere.webui.session.SessionManager;
 import org.adempiere.webui.window.FDialog;
 import org.compiere.apps.form.PaySelect;
@@ -72,7 +72,7 @@ import org.zkoss.zul.Space;
  *  @version $Id: VPaySelect.java,v 1.3 2006/07/30 00:51:28 jjanke Exp $
  */
 public class WPaySelect extends PaySelect
-	implements ICustomForm, EventListener, WTableModelListener, ASyncProcess
+	implements IFormController, EventListener, WTableModelListener, ASyncProcess
 {
 	/** @todo withholding */
 	

zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java

@@ -29,7 +29,7 @@ import org.adempiere.webui.component.SimpleListModel;
 import org.adempiere.webui.component.SimpleTreeModel;
 import org.adempiere.webui.panel.ADForm;
 import org.adempiere.webui.panel.CustomForm;
-import org.adempiere.webui.panel.ICustomForm;
+import org.adempiere.webui.panel.IFormController;
 import org.adempiere.webui.session.SessionManager;
 import org.adempiere.webui.window.FDialog;
 import org.compiere.apps.form.TreeMaintenance;
@@ -58,7 +58,7 @@ import org.zkoss.zul.Treeitem;
  *  @author Jorg Janke
  *  @version $Id: VTreeMaintenance.java,v 1.3 2006/07/30 00:51:28 jjanke Exp $
  */
-public class WTreeMaintenance extends TreeMaintenance implements ICustomForm, EventListener
+public class WTreeMaintenance extends TreeMaintenance implements IFormController, EventListener
 {
 	/**
 	 * 

zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WTrxMaterial.java

@@ -38,7 +38,7 @@ import org.adempiere.webui.event.ValueChangeListener;
 import org.adempiere.webui.panel.ADForm;
 import org.adempiere.webui.panel.ADTabpanel;
 import org.adempiere.webui.panel.CustomForm;
-import org.adempiere.webui.panel.ICustomForm;
+import org.adempiere.webui.panel.IFormController;
 import org.adempiere.webui.panel.StatusBarPanel;
 import org.adempiere.webui.session.SessionManager;
 import org.compiere.apps.form.TrxMaterial;
@@ -63,7 +63,7 @@ import org.zkoss.zul.Separator;
  * @version $Id: VTrxMaterial.java,v 1.3 2006/07/30 00:51:28 jjanke Exp $
  */
 public class WTrxMaterial extends TrxMaterial
-	implements ICustomForm, EventListener, ValueChangeListener
+	implements IFormController, EventListener, ValueChangeListener
 {
 	/**
 	 * 

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

@@ -63,7 +63,7 @@ public abstract class ADForm extends Window implements EventListener
 
 	private ProcessInfo m_pi;
 	
-	private ICustomForm m_customForm;
+	private IFormController m_customForm;
 
     /**
      * Constructor
@@ -222,9 +222,9 @@ public abstract class ADForm extends Window implements EventListener
     				form.init(adFormID, name);
     				return form;
         		}
-        		else if (obj instanceof ICustomForm)
+        		else if (obj instanceof IFormController)
         		{
-        			ICustomForm customForm = (ICustomForm)obj;
+        			IFormController customForm = (IFormController)obj;
         			Object o = customForm.getForm();
         			if(o instanceof ADForm)
         			{
@@ -278,12 +278,12 @@ public abstract class ADForm extends Window implements EventListener
 		return m_pi;
 	}
 	
-	public void setICustomForm(ICustomForm customForm)
+	public void setICustomForm(IFormController customForm)
 	{
 		m_customForm = customForm;
 	}
 	
-	public ICustomForm getICustomForm()
+	public IFormController getICustomForm()
 	{
 		return m_customForm;
 	}

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

@@ -1,7 +1,7 @@
 package org.adempiere.webui.panel;
 
 
-public interface ICustomForm 
+public interface IFormController 
 {
 	/**
 	 * Called by org.adempiere.webui.panel.ADForm.openForm(int)