From 73cb6d88f58747de87a99a36c43d60c095473932 Mon Sep 17 00:00:00 2001 From: vpj-cd Date: Wed, 10 Oct 2007 19:43:33 +0000 Subject: [PATCH] [ 1811114 ] Is necessary add the payment authorization code as filter http://sourceforge.net/tracker/index.php?func=detail&aid=1811114&group_id=176962&atid=879335 --- client/src/org/compiere/grid/VCreateFrom.java | 26 ++++++++++++++++--- .../compiere/grid/VCreateFromShipment.java | 8 +++--- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/client/src/org/compiere/grid/VCreateFrom.java b/client/src/org/compiere/grid/VCreateFrom.java index c399765fd4..bbf1b96b54 100644 --- a/client/src/org/compiere/grid/VCreateFrom.java +++ b/client/src/org/compiere/grid/VCreateFrom.java @@ -36,10 +36,12 @@ import org.compiere.util.*; * CreateFrom (Called from GridController.startProcess) * * @author Jorg Janke - * @version $Id: VCreateFrom.java,v 1.4 2006/10/11 09:52:23 comdivision Exp $ - * + * @version $Id: VCreateFrom.java,v 1.4 2006/10/11 09:52:23 comdivision Exp $ + * * @author Teo Sarca, SC ARHIPAC SERVICE SRL *
  • FR [ 1794050 ] Usability: VCreateFrom OK button always enabled + * @author Victor Perez, e-Evolucion + *
  • RF [1811114] http://sourceforge.net/tracker/index.php?func=detail&aid=1811114&group_id=176962&atid=879335 */ public abstract class VCreateFrom extends CDialog implements ActionListener, TableModelListener @@ -124,6 +126,9 @@ public abstract class VCreateFrom extends CDialog protected CPanel parameterStdPanel = new CPanel(); private JLabel bPartnerLabel = new JLabel(); protected VLookup bankAccountField; + //RF [1811114] + private JLabel authorizationLabel = new JLabel(); + protected VString authorizationField = new VString(); private GridBagLayout parameterStdLayout = new GridBagLayout(); private GridBagLayout parameterBankLayout = new GridBagLayout(); protected VLookup bPartnerField; @@ -169,6 +174,8 @@ public abstract class VCreateFrom extends CDialog parameterBankPanel.setLayout(parameterBankLayout); // bankAccountLabel.setText(Msg.translate(Env.getCtx(), "C_BankAccount_ID")); + //RF [1811114] + authorizationLabel.setText(Msg.translate(Env.getCtx(), "R_AuthCode")); bPartnerLabel.setText(Msg.getElement(Env.getCtx(), "C_BPartner_ID")); orderLabel.setText(Msg.getElement(Env.getCtx(), "C_Order_ID", false)); invoiceLabel.setText(Msg.getElement(Env.getCtx(), "C_Invoice_ID", false)); @@ -178,6 +185,17 @@ public abstract class VCreateFrom extends CDialog // this.getContentPane().add(parameterPanel, BorderLayout.NORTH); parameterPanel.add(parameterBankPanel, BorderLayout.NORTH); + //RF [1811114] + parameterBankPanel.add(authorizationLabel, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0 + ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0)); + parameterStdPanel.add(orderField, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0 + ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 1, 5, 5), 0, 0)); + parameterBankPanel.add(authorizationField, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0 + ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 0, 5, 5), 0, 0)); + parameterStdPanel.add(invoiceLabel, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0 + ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0)); + parameterStdPanel.add(invoiceField, new GridBagConstraints(3, 1, 1, 1, 0.0, 0.0 + ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 1, 5, 5), 0, 0)); parameterBankPanel.add(bankAccountLabel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0 ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0)); if (bankAccountField != null) @@ -516,8 +534,8 @@ public abstract class VCreateFrom extends CDialog dataTable.setColumnClass(7, String.class, true); // 7-Invoice // Table UI dataTable.autoSize(); - } // loadOrder - + } // loadOrder + /** * Set form status line. * Please note, will enable/disable the OK button if the selectedRowCount > 0. diff --git a/client/src/org/compiere/grid/VCreateFromShipment.java b/client/src/org/compiere/grid/VCreateFromShipment.java index 6bdaf3b796..6fb19c8beb 100644 --- a/client/src/org/compiere/grid/VCreateFromShipment.java +++ b/client/src/org/compiere/grid/VCreateFromShipment.java @@ -599,7 +599,7 @@ public class VCreateFromShipment extends VCreateFrom implements VetoableChangeLi iol.setUser1_ID(il.getUser1_ID()); iol.setUser2_ID(il.getUser2_ID()); } - else if (M_RMALine_ID != 0) + /*else if (M_RMALine_ID != 0) { rmal = new MRMALine(Env.getCtx(), M_RMALine_ID, null); iol.setM_RMALine_ID(M_RMALine_ID); @@ -624,7 +624,7 @@ public class VCreateFromShipment extends VCreateFrom implements VetoableChangeLi iol.setC_Charge_ID(il.getC_Charge_ID()); else if (rmal != null && rmal.getC_Charge_ID() != 0) // from rma iol.setC_Charge_ID(rmal.getC_Charge_ID()); - } + }*/ // iol.setM_Locator_ID(M_Locator_ID); if (!iol.save()) @@ -665,7 +665,7 @@ public class VCreateFromShipment extends VCreateFrom implements VetoableChangeLi inout.setUser1_ID(m_invoice.getUser1_ID()); inout.setUser2_ID(m_invoice.getUser2_ID()); } - if (m_rma != null && m_rma.getM_RMA_ID() != 0) + /*if (m_rma != null && m_rma.getM_RMA_ID() != 0) { MInOut originalIO = m_rma.getShipment(); inout.setIsSOTrx(!m_rma.isSOTrx()); @@ -678,7 +678,7 @@ public class VCreateFromShipment extends VCreateFrom implements VetoableChangeLi inout.setC_Activity_ID(originalIO.getC_Activity_ID()); inout.setUser1_ID(originalIO.getUser1_ID()); inout.setUser2_ID(originalIO.getUser2_ID()); - } + }*/ inout.save(); return true; } // save