midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-1881 Payment Selection Manual is not working / IDEMPIERE-2134

This commit is contained in:
Carlos Ruiz 2014-08-11 18:02:05 +02:00
parent 2c04735527
commit 5a4654e649
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaySelect.java
View File

@ -18,6 +18,9 @@
*****************************************************************************/ *****************************************************************************/
package org.adempiere.webui.apps.form; package org.adempiere.webui.apps.form;
import static org.compiere.model.SystemIDs.FORM_PAYMENT_PRINT_EXPORT;
import static org.compiere.model.SystemIDs.PROCESS_C_PAYSELECTION_CREATEPAYMENT;
import java.io.File; import java.io.File;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
@ -39,6 +42,7 @@ import org.adempiere.webui.component.Row;
import org.adempiere.webui.component.Rows; import org.adempiere.webui.component.Rows;
import org.adempiere.webui.component.WListbox; import org.adempiere.webui.component.WListbox;
import org.adempiere.webui.editor.WDateEditor; import org.adempiere.webui.editor.WDateEditor;
import org.adempiere.webui.event.DialogEvents;
import org.adempiere.webui.event.ValueChangeEvent; import org.adempiere.webui.event.ValueChangeEvent;
import org.adempiere.webui.event.ValueChangeListener; import org.adempiere.webui.event.ValueChangeListener;
import org.adempiere.webui.event.WTableModelEvent; import org.adempiere.webui.event.WTableModelEvent;
@ -49,7 +53,6 @@ import org.adempiere.webui.panel.IFormController;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.window.FDialog; import org.adempiere.webui.window.FDialog;
import org.compiere.apps.form.PaySelect; import org.compiere.apps.form.PaySelect;
import static org.compiere.model.SystemIDs.*;
import org.compiere.model.X_C_PaySelection; import org.compiere.model.X_C_PaySelection;
import org.compiere.process.ProcessInfo; import org.compiere.process.ProcessInfo;
import org.compiere.util.Env; import org.compiere.util.Env;
@ -64,8 +67,8 @@ import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Borderlayout; import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center; import org.zkoss.zul.Center;
import org.zkoss.zul.North; import org.zkoss.zul.North;
import org.zkoss.zul.South;
import org.zkoss.zul.Separator; import org.zkoss.zul.Separator;
import org.zkoss.zul.South;
import org.zkoss.zul.Space; import org.zkoss.zul.Space;
/** /**
@ -330,6 +333,29 @@ public class WPaySelect extends PaySelect
|| e.getTarget() == fieldPaymentRule || e.getTarget() == onlyDue) || e.getTarget() == fieldPaymentRule || e.getTarget() == onlyDue)
loadTableInfo(); loadTableInfo();
else if (DialogEvents.ON_WINDOW_CLOSE.equals(e.getName())) {
// Ask to Open Print Form
FDialog.ask(m_WindowNo, form, "VPaySelectPrint?", new Callback<Boolean>() {
@Override
public void onCallback(Boolean result)
{
if (result)
{
// Start PayPrint
int AD_Form_ID = FORM_PAYMENT_PRINT_EXPORT; // Payment Print/Export
ADForm form = SessionManager.getAppDesktop().openForm(AD_Form_ID);
if (m_ps != null)
{
WPayPrint pp = (WPayPrint) form.getICustomForm();
pp.setPaySelection(m_ps.getC_PaySelection_ID());
}
}
}
});
}
} // actionPerformed } // actionPerformed
@Override @Override
@ -382,7 +408,7 @@ public class WPaySelect extends PaySelect
} }
// Ask to Post it // Ask to Post it
FDialog.ask(m_WindowNo, form, "VPaySelectGenerate?", "(" + m_ps.getName() + ")", new Callback<Boolean>() { FDialog.ask(m_WindowNo, form, "VPaySelectGenerate?", new Callback<Boolean>() {
@Override @Override
public void onCallback(Boolean result) public void onCallback(Boolean result)
@ -433,23 +459,7 @@ public class WPaySelect extends PaySelect
m_pi = pi; m_pi = pi;
Clients.clearBusy(); Clients.clearBusy();
//TODO: The response returned is always Cancel
// if (!FDialog.ask(0, form, "VPaySelectPrint?", "(" + m_pi.getSummary() + ")"))
// {
// dispose();
// return;
// }
this.dispose(); this.dispose();
// Start PayPrint
int AD_Form_ID = FORM_PAYMENT_PRINT_EXPORT; // Payment Print/Export
ADForm form = SessionManager.getAppDesktop().openForm(AD_Form_ID);
if (m_ps != null)
{
WPayPrint pp = (WPayPrint) form.getICustomForm();
pp.setPaySelection(m_ps.getC_PaySelection_ID());
}
} }
public void executeASync(ProcessInfo pi) { public void executeASync(ProcessInfo pi) {