diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultInfoFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultInfoFactory.java
index b868cbaebc..08d7e727a7 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultInfoFactory.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultInfoFactory.java
@@ -44,6 +44,7 @@ import org.compiere.util.Env;
  * @author hengsin
  *
  */
+@SuppressWarnings("deprecation")
 public class DefaultInfoFactory implements IInfoFactory {
 
 	@Override
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java
index d074d41cb1..1576cb398f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java
@@ -63,6 +63,7 @@ import org.zkoss.zul.Vbox;
 * @version	InfoAsset.java Adempiere Swing UI 3.4.1 
 */
 
+@Deprecated // replaced with InfoAssetWindow IDEMPIERE-325
 public class InfoAssetPanel extends InfoPanel implements ValueChangeListener, EventListener<Event>
 {
 	/**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java
index 40cc57ff28..aa46bcfb20 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java
@@ -68,6 +68,7 @@ import org.zkoss.zul.Vbox;
 * @version	InfoAssignment.java Adempiere Swing UI 3.4.1
 */
 
+@Deprecated // replaced with InfoAssignmentWindow IDEMPIERE-325
 public class InfoAssignmentPanel extends InfoPanel implements EventListener<Event>, ValueChangeListener
 {
 	/**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java
index a02e9ef782..6e784a32b2 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java
@@ -63,7 +63,7 @@ import org.zkoss.zul.Vbox;
 * 	@version	InfoBPartner.java Adempiere Swing UI 3.4.1 
 */
 
-
+@Deprecated // replaced with InfoBPartnerWindow IDEMPIERE-325
 public class InfoBPartnerPanel extends InfoPanel implements EventListener<Event>, WTableModelListener
 {
 	/**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java
index 143029c265..516dec0b53 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java
@@ -68,6 +68,7 @@ import org.zkoss.zul.Vbox;
 * @version	InfoCashLine.java Adempiere Swing UI 3.4.1
 */
 
+@Deprecated // IDEMPIERE-170 IDEMPIERE-325
 public class InfoCashLinePanel extends InfoPanel implements ValueChangeListener, EventListener<Event>
 {
 	/**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java
index 2fbebc845e..ec0fa70e77 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java
@@ -69,6 +69,7 @@ import org.zkoss.zul.Vbox;
 * @version	InfoInOut.java Adempiere Swing UI 3.4.1
 */
 
+@Deprecated // replaced with InfoInOutWindow IDEMPIERE-325
 public class InfoInOutPanel extends InfoPanel implements ValueChangeListener, EventListener<Event>
 {
 	/**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java
index c0a3c79ee2..f7b95c7f3d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java
@@ -69,6 +69,8 @@ import org.zkoss.zul.Vbox;
  * @author Elaine
  * @version	InfoInvoice.java Adempiere Swing UI 3.4.1
  **/
+
+@Deprecated // replaced with InfoInvoiceWindow IDEMPIERE-325
 public class InfoInvoicePanel extends InfoPanel implements ValueChangeListener
 {
     /**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java
index b3c00f12e2..45812c2a07 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java
@@ -69,6 +69,8 @@ import org.zkoss.zul.Vbox;
  * @author Elaine
  * @version	InfoOrder.java Adempiere Swing UI 3.4.1
  **/
+
+@Deprecated // replaced with InfoOrderWindow IDEMPIERE-325
 public class InfoOrderPanel extends InfoPanel implements ValueChangeListener
 {
     /**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java
index 0e4610e59f..ceacf873a8 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java
@@ -71,6 +71,7 @@ public class InfoPAttributePanel extends Window implements EventListener<Event>
 	 * 	Called from InfoProduct,cmd_InfoPAttribute
 	 *	@param parent
 	 */
+	@SuppressWarnings("deprecation")
 	public InfoPAttributePanel(Object input)
 	{
 		super();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java
index 028ab63fa6..330ee22bc5 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java
@@ -69,6 +69,7 @@ import org.zkoss.zul.Vbox;
 * @version	InfoPayment.java Adempiere Swing UI 3.4.1
 */
 
+@Deprecated // replaced with InfoPaymentWindow IDEMPIERE-325
 public class InfoPaymentPanel extends InfoPanel implements ValueChangeListener, EventListener<Event>
 {
 	/**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java
index acd6244bea..032faecdd4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java
@@ -94,6 +94,8 @@ import org.zkoss.zul.South;
  * @author Elaine
  * @version	InfoPayment.java Adempiere Swing UI 3.4.1
  */
+
+@Deprecated // replaced with InfoProductWindow IDEMPIERE-325
 public class InfoProductPanel extends InfoPanel implements EventListener<Event>
 {
 	/**