diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java
index bc1378c524..c4c98c37ac 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java
@@ -16,7 +16,6 @@ package org.adempiere.webui.apps.form;
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.ArrayList;
-import java.util.EventListener;
 import java.util.List;
 import java.util.logging.Level;
 
@@ -56,6 +55,7 @@ import org.zkoss.zk.au.out.AuEcho;
 import org.zkoss.zk.ui.DesktopUnavailableException;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.util.Clients;
 import org.zkoss.zkex.zul.Borderlayout;
@@ -71,7 +71,10 @@ import org.zkoss.zul.Html;
  */
 public class WGenForm extends ADForm implements EventListener, WTableModelListener
 {
-	private static final long serialVersionUID = 1L;
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8669256486969882958L;
 
 	private GenForm genForm;
 	
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WInOutGen.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WInOutGen.java
index c3cee1face..b38c712330 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WInOutGen.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WInOutGen.java
@@ -14,7 +14,6 @@
 package org.adempiere.webui.apps.form;
 
 import java.util.ArrayList;
-import java.util.EventListener;
 import java.util.logging.Level;
 
 import org.adempiere.webui.component.Label;
@@ -40,6 +39,7 @@ import org.compiere.util.KeyNamePair;
 import org.compiere.util.Msg;
 import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zul.Space;
 
 /**
@@ -147,7 +147,7 @@ public class WInOutGen extends InOutGen implements IFormController, EventListene
 		lDocType.setText(Msg.translate(Env.getCtx(), "C_DocType_ID"));
 		cmbDocType.addItem(new KeyNamePair(MOrder.Table_ID, Msg.translate(Env.getCtx(), "Order")));
 		cmbDocType.addItem(new KeyNamePair(MRMA.Table_ID, Msg.translate(Env.getCtx(), "VendorRMA")));
-		cmbDocType.addActionListener(form);
+		cmbDocType.addActionListener(this);
 		cmbDocType.setSelectedIndex(0);
 		
 		form.getStatusBar().setStatusLine(Msg.getMsg(Env.getCtx(), "InOutGenerateSel"));//@@
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WInvoiceGen.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WInvoiceGen.java
index 71f0af9c17..95379d3db0 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WInvoiceGen.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WInvoiceGen.java
@@ -14,7 +14,6 @@
 package org.adempiere.webui.apps.form;
 
 import java.util.ArrayList;
-import java.util.EventListener;
 import java.util.logging.Level;
 
 import org.adempiere.webui.component.Label;
@@ -39,6 +38,7 @@ import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 import org.compiere.util.Msg;
 import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zul.Space;
 
 /**
@@ -145,7 +145,7 @@ public class WInvoiceGen extends InvoiceGen implements IFormController, EventLis
         lDocType.setText(Msg.translate(Env.getCtx(), "C_DocType_ID"));
         cmbDocType.addItem(new KeyNamePair(MOrder.Table_ID, Msg.translate(Env.getCtx(), "Order")));
         cmbDocType.addItem(new KeyNamePair(MRMA.Table_ID, Msg.translate(Env.getCtx(), "CustomerRMA")));
-        cmbDocType.addActionListener(form);
+        cmbDocType.addActionListener(this);
         cmbDocType.setSelectedIndex(0);
         
         form.getStatusBar().setStatusLine(Msg.getMsg(Env.getCtx(), "InvGenerateSel"));//@@