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

[ 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
This commit is contained in:
vpj-cd 2007-10-10 19:43:33 +00:00
parent 549ef12574
commit 73cb6d88f5
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/src/org/compiere/grid/VCreateFrom.java
View File

@ -40,6 +40,8 @@ import org.compiere.util.*;
* *
* @author Teo Sarca, SC ARHIPAC SERVICE SRL * @author Teo Sarca, SC ARHIPAC SERVICE SRL
* <li>FR [ 1794050 ] Usability: VCreateFrom OK button always enabled * <li>FR [ 1794050 ] Usability: VCreateFrom OK button always enabled
* @author Victor Perez, e-Evolucion
* <li> RF [1811114] http://sourceforge.net/tracker/index.php?func=detail&aid=1811114&group_id=176962&atid=879335
*/ */
public abstract class VCreateFrom extends CDialog public abstract class VCreateFrom extends CDialog
implements ActionListener, TableModelListener implements ActionListener, TableModelListener
@ -124,6 +126,9 @@ public abstract class VCreateFrom extends CDialog
protected CPanel parameterStdPanel = new CPanel(); protected CPanel parameterStdPanel = new CPanel();
private JLabel bPartnerLabel = new JLabel(); private JLabel bPartnerLabel = new JLabel();
protected VLookup bankAccountField; protected VLookup bankAccountField;
//RF [1811114]
private JLabel authorizationLabel = new JLabel();
protected VString authorizationField = new VString();
private GridBagLayout parameterStdLayout = new GridBagLayout(); private GridBagLayout parameterStdLayout = new GridBagLayout();
private GridBagLayout parameterBankLayout = new GridBagLayout(); private GridBagLayout parameterBankLayout = new GridBagLayout();
protected VLookup bPartnerField; protected VLookup bPartnerField;
@ -169,6 +174,8 @@ public abstract class VCreateFrom extends CDialog
parameterBankPanel.setLayout(parameterBankLayout); parameterBankPanel.setLayout(parameterBankLayout);
// //
bankAccountLabel.setText(Msg.translate(Env.getCtx(), "C_BankAccount_ID")); 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")); bPartnerLabel.setText(Msg.getElement(Env.getCtx(), "C_BPartner_ID"));
orderLabel.setText(Msg.getElement(Env.getCtx(), "C_Order_ID", false)); orderLabel.setText(Msg.getElement(Env.getCtx(), "C_Order_ID", false));
invoiceLabel.setText(Msg.getElement(Env.getCtx(), "C_Invoice_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); this.getContentPane().add(parameterPanel, BorderLayout.NORTH);
parameterPanel.add(parameterBankPanel, 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 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)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
if (bankAccountField != null) if (bankAccountField != null)

8
client/src/org/compiere/grid/VCreateFromShipment.java
View File

@ -599,7 +599,7 @@ public class VCreateFromShipment extends VCreateFrom implements VetoableChangeLi
iol.setUser1_ID(il.getUser1_ID()); iol.setUser1_ID(il.getUser1_ID());
iol.setUser2_ID(il.getUser2_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); rmal = new MRMALine(Env.getCtx(), M_RMALine_ID, null);
iol.setM_RMALine_ID(M_RMALine_ID); 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()); iol.setC_Charge_ID(il.getC_Charge_ID());
else if (rmal != null && rmal.getC_Charge_ID() != 0) // from rma else if (rmal != null && rmal.getC_Charge_ID() != 0) // from rma
iol.setC_Charge_ID(rmal.getC_Charge_ID()); iol.setC_Charge_ID(rmal.getC_Charge_ID());
} }*/
// //
iol.setM_Locator_ID(M_Locator_ID); iol.setM_Locator_ID(M_Locator_ID);
if (!iol.save()) if (!iol.save())
@ -665,7 +665,7 @@ public class VCreateFromShipment extends VCreateFrom implements VetoableChangeLi
inout.setUser1_ID(m_invoice.getUser1_ID()); inout.setUser1_ID(m_invoice.getUser1_ID());
inout.setUser2_ID(m_invoice.getUser2_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(); MInOut originalIO = m_rma.getShipment();
inout.setIsSOTrx(!m_rma.isSOTrx()); 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.setC_Activity_ID(originalIO.getC_Activity_ID());
inout.setUser1_ID(originalIO.getUser1_ID()); inout.setUser1_ID(originalIO.getUser1_ID());
inout.setUser2_ID(originalIO.getUser2_ID()); inout.setUser2_ID(originalIO.getUser2_ID());
} }*/
inout.save(); inout.save();
return true; return true;
} // save } // save