Integrate revision 11223
Fix Bug: Generate Invoices (manual) broke for Customer RMA Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2925697
This commit is contained in:
parent
31904d9a6b
commit
25596ca6c5
|
@ -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;
|
||||
|
||||
|
|
|
@ -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"));//@@
|
||||
|
|
|
@ -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"));//@@
|
||||
|
|
Loading…
Reference in New Issue