From 1f0d78aba4d564dd7b8e6e36b0ffecabeb5c40c2 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Wed, 18 Mar 2009 09:21:09 +0000 Subject: [PATCH] Port swing client's docAction parameter enhancement to zk client --- .../adempiere/webui/apps/form/WInOutGen.java | 30 ++++++++++++++++++- .../webui/apps/form/WInvoiceGen.java | 22 +++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) 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 2e9d8e7c56..af2c275616 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 @@ -65,6 +65,7 @@ import org.compiere.model.MPInstancePara; import org.compiere.model.MPrivateAccess; import org.compiere.model.MRMA; import org.compiere.print.ReportEngine; +import org.compiere.process.DocAction; import org.compiere.process.ProcessInfo; import org.compiere.process.ProcessInfoUtil; import org.compiere.util.CLogger; @@ -97,6 +98,8 @@ import org.zkoss.zul.Space; */ public class WInOutGen extends ADForm implements EventListener, ValueChangeListener, WTableModelListener { + private static final long serialVersionUID = 1L; + @Override protected void initForm() { @@ -155,6 +158,8 @@ public class WInOutGen extends ADForm implements EventListener, ValueChangeListe private Label lDocType = new Label(); private Listbox cmbDocType = ListboxFactory.newDropdownListbox(); + private Label lDocAction = new Label(); + private WTableDirEditor docAction; /** User selection */ private ArrayList selection = null; @@ -234,6 +239,10 @@ public class WInOutGen extends ADForm implements EventListener, ValueChangeListe selNorthPanel.getRows().appendChild(row); row.appendChild(lDocType.rightAlign()); row.appendChild(cmbDocType); + row.appendChild(new Space()); + row.appendChild(lDocAction.rightAlign()); + row.appendChild(docAction.getComponent()); + row.appendChild(new Space()); } // jbInit /** @@ -250,6 +259,14 @@ public class WInOutGen extends ADForm implements EventListener, ValueChangeListe fWarehouse.addValueChangeListener(this); fWarehouse.setValue(Env.getContextAsInt(Env.getCtx(), "#M_Warehouse_ID")); m_M_Warehouse_ID = fWarehouse.getValue(); + // Document Action Prepared/ Completed + lDocAction.setText(Msg.translate(Env.getCtx(), "DocAction")); + MLookup docActionL = MLookupFactory.get(Env.getCtx(), m_WindowNo, 4324 /* M_InOut.DocStatus */, + DisplayType.List, Env.getLanguage(Env.getCtx()), "DocAction", 135 /* _Document Action */, + false, "AD_Ref_List.Value IN ('CO','PR')"); + docAction = new WTableDirEditor("DocAction", true, false, true,docActionL); + docAction.setValue(DocAction.ACTION_Complete); + docAction.addValueChangeListener(this); // C_Order.C_BPartner_ID MLookup bpL = MLookupFactory.get (Env.getCtx(), m_WindowNo, 0, 2762, DisplayType.Search); fBPartner = new WSearchEditor("C_BPartner_ID", false, false, true, bpL); @@ -653,8 +670,19 @@ public class WInOutGen extends ADForm implements EventListener, ValueChangeListe log.log(Level.SEVERE, msg); return; } - // Add Parameter - M_Warehouse_ID=x + //Add Document action parameter ip = new MPInstancePara(instance, 20); + String docActionSelected = (String)docAction.getValue(); + ip.setParameter("DocAction", docActionSelected); + if(!ip.save()) + { + String msg = "No DocAction Parameter added"; + info.setContent(msg); + log.log(Level.SEVERE, msg); + return; + } + // Add Parameter - M_Warehouse_ID=x + ip = new MPInstancePara(instance, 30); ip.setParameter("M_Warehouse_ID", Integer.parseInt(m_M_Warehouse_ID.toString())); if (!ip.save()) { 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 57085d199e..9cbce1ca62 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 @@ -64,6 +64,7 @@ import org.compiere.model.MPInstancePara; import org.compiere.model.MPrivateAccess; import org.compiere.model.MRMA; import org.compiere.print.ReportEngine; +import org.compiere.process.DocAction; import org.compiere.process.ProcessInfo; import org.compiere.process.ProcessInfoUtil; import org.compiere.util.CLogger; @@ -98,6 +99,8 @@ import org.zkoss.zul.Space; public class WInvoiceGen extends ADForm implements EventListener, ValueChangeListener, WTableModelListener { + private static final long serialVersionUID = 1L; + /** * Initialize Panel */ @@ -155,6 +158,8 @@ public class WInvoiceGen extends ADForm private Label lDocType = new Label(); private Listbox cmbDocType = ListboxFactory.newDropdownListbox(); + private Label lDocAction = new Label(); + private WTableDirEditor docAction; private ProcessInfo m_pi; private int[] m_ids; @@ -193,6 +198,7 @@ public class WInvoiceGen extends ADForm Row row = selNorthPanel.newRows().newRow(); row.appendChild(lOrg.rightAlign()); row.appendChild(fOrg.getComponent()); + row.appendChild(new Space()); row.appendChild(lBPartner.rightAlign()); row.appendChild(fBPartner.getComponent()); row.appendChild(new Space()); @@ -231,6 +237,10 @@ public class WInvoiceGen extends ADForm selNorthPanel.getRows().appendChild(row); row.appendChild(lDocType.rightAlign()); row.appendChild(cmbDocType); + row.appendChild(new Space()); + row.appendChild(lDocAction.rightAlign()); + row.appendChild(docAction.getComponent()); + row.appendChild(new Space()); } // jbInit /** @@ -249,6 +259,14 @@ public class WInvoiceGen extends ADForm fBPartner = new WSearchEditor ("C_BPartner_ID", false, false, true, bpL); // lBPartner.setText(Msg.translate(Env.getCtx(), "C_BPartner_ID")); fBPartner.addValueChangeListener(this); + // Document Action Prepared/ Completed + lDocAction.setText(Msg.translate(Env.getCtx(), "DocAction")); + MLookup docActionL = MLookupFactory.get(Env.getCtx(), m_WindowNo, 4324 /* M_InOut.DocStatus */, + DisplayType.List, Env.getLanguage(Env.getCtx()), "DocAction", 135 /* _Document Action */, + false, "AD_Ref_List.Value IN ('CO','PR')"); + docAction = new WTableDirEditor("DocAction", true, false, true,docActionL); + docAction.setValue(DocAction.ACTION_Complete); + docAction.addValueChangeListener(this); // Document Type Sales Order/Vendor RMA lDocType.setText(Msg.translate(Env.getCtx(), "C_DocType_ID")); @@ -626,8 +644,10 @@ public class WInvoiceGen extends ADForm log.log(Level.SEVERE, msg); return; } + //Add Document action parameter para = new MPInstancePara(instance, 20); - para.setParameter("DocAction", "CO"); + String docActionSelected = (String)docAction.getValue(); + para.setParameter("DocAction", docActionSelected); if (!para.save()) { String msg = "No DocAction Parameter added"; // not translated