adempiere#114 Change "Create From" UI for Form like Dialog in window …

…without "hardcode"
mckayERP · Jan 22, 2016 · 9a15257 · 9a15257
1 parent a7dc9aa
commit 9a15257
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 24 deletions.
diff --git a/client/src/org/compiere/apps/form/FormFrame.java b/client/src/org/compiere/apps/form/FormFrame.java
@@ -54,8 +54,8 @@
 import org.compiere.util.DB;
 import org.compiere.util.Env;
 import org.compiere.util.Trace;
-
-
+
+
 /**
  *	Form Framework
  *
@@ -100,13 +100,15 @@ public void windowOpened(java.awt.event.WindowEvent evt)
 				}
 			});
 			m_MainContent = frame;
+			m_WindowNo = Env.createWindowNo (m_MainContent);
 		} else {
 			CDialog dialog = new CDialog(owner, true);
 			dialog.setModalityType(ModalityType.DOCUMENT_MODAL);
 			m_MainContent = dialog;
+			m_WindowNo = p_ParentWindowNo;
 		}
 
-		m_WindowNo = Env.createWindowNo (m_MainContent);
+
 		try
 		{
 			jbInit();
@@ -136,8 +138,8 @@ public FormFrame(GraphicsConfiguration gc) {
 		this(0);
 	}
 
-	private ProcessInfo  m_pi;
-
+	private ProcessInfo  m_pi;
+
 	/**	WindowNo					*/
 	private int			m_WindowNo;
 	/** The GlassPane           	*/
@@ -462,21 +464,21 @@ private void formWindowOpened(java.awt.event.WindowEvent evt)
 		}
    }	//	formWindowOpened
 
-// Add window and tab no called from
-
-	public void setProcessInfo(ProcessInfo pi)
-	{
-		m_pi = pi;
-
-	}
-
-	public ProcessInfo getProcessInfo()
-	{
-		return m_pi;
-	}
-
-	// End
-
+// Add window and tab no called from
+
+	public void setProcessInfo(ProcessInfo pi)
+	{
+		m_pi = pi;
+
+	}
+
+	public ProcessInfo getProcessInfo()
+	{
+		return m_pi;
+	}
+
+	// End
+
 	/**
 	 * 	Start Batch
 	 *	@param process

diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java
@@ -68,7 +68,7 @@ public WCreateFromInvoiceUI() {
 				private static final long serialVersionUID = -6022139819209111460L;
 
 				public void setProcessInfo(ProcessInfo pi) {
-					p_WindowNo = getWindowNo();
+					p_WindowNo = pi.getWindowNo();
 					try {
 						//	Valid for launched from a window
 						if(pi != null) {

diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java
@@ -65,7 +65,7 @@ public WCreateFromRMAUI() {
 				private static final long serialVersionUID = -3454354880167040226L;
 
 				public void setProcessInfo(ProcessInfo pi) {
-					p_WindowNo = getWindowNo();
+					p_WindowNo = pi.getWindowNo();
 					try {
 						//	Valid for launched from a window
 						if(pi != null) {

diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java
@@ -76,7 +76,7 @@ public WCreateFromShipmentUI() {
 				private static final long serialVersionUID = -3454354880167040226L;
 
 				public void setProcessInfo(ProcessInfo pi) {
-					p_WindowNo = getWindowNo();
+					p_WindowNo = pi.getWindowNo();
 					try {
 						//	Valid for launched from a window
 						if(pi != null) {

diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java b/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java
@@ -78,7 +78,7 @@ public WCreateFromStatementUI() {
 				private static final long serialVersionUID = -6022139819209111460L;
 
 				public void setProcessInfo(ProcessInfo pi) {
-					p_WindowNo = getWindowNo();
+					p_WindowNo = pi.getWindowNo();
 					try {
 						//	Valid for launched from a window
 						if(pi != null) {

diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
@@ -2223,6 +2223,7 @@ else if (col.equals("Posted") && MRole.getDefault().isShowAcct())
 			if (title == null || title.length() == 0)
 				title = wButton.getDisplay();
 			ProcessInfo pi = new ProcessInfo (title, wButton.getProcess_ID(), table_ID, record_ID);
+			pi.setWindowNo(curWindowNo);
 			pi.setAD_User_ID (Env.getAD_User_ID(ctx));
 			pi.setAD_Client_ID (Env.getAD_Client_ID(ctx));
 			ADForm form = ADForm.openForm(adFormID);