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

Fix [ 2015349 ] Changes to Payment Selection and Print

This commit is contained in:
Carlos Ruiz 2008-07-11 08:26:34 +00:00
parent 9b8f2ac877
commit 6da7b54dd9
3 changed files with 788 additions and 693 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
client/src/org/compiere/apps/form/VPaySelect.java
View File

@ -1,5 +1,5 @@
/****************************************************************************** /******************************************************************************
* Product: Adempiere ERP & CRM Smart Business Solution * * Product: Adempiere ERP & CRM Smart Business Solution *
* Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved. * * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved. *
* This program is free software; you can redistribute it and/or modify it * * This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published * * under the terms version 2 of the GNU General Public License as published *
@ -18,23 +18,59 @@
*****************************************************************************/ *****************************************************************************/
package org.compiere.apps.form; package org.compiere.apps.form;
import java.awt.*; import java.awt.BorderLayout;
import java.awt.event.*; import java.awt.FlowLayout;
import java.math.*; import java.awt.GridBagConstraints;
import java.sql.*; import java.awt.GridBagLayout;
import java.text.*; import java.awt.Insets;
import java.util.*; import java.awt.event.ActionEvent;
import java.util.logging.*; import java.awt.event.ActionListener;
import javax.swing.*; import java.math.BigDecimal;
import javax.swing.event.*; import java.sql.PreparedStatement;
import org.compiere.apps.*; import java.sql.ResultSet;
import org.compiere.grid.ed.*; import java.sql.SQLException;
import org.compiere.minigrid.*; import java.sql.Timestamp;
import org.compiere.model.*; import java.text.DecimalFormat;
import org.compiere.plaf.*; import java.util.Properties;
import org.compiere.process.*; import java.util.logging.Level;
import org.compiere.swing.*;
import org.compiere.util.*; import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JScrollPane;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
import org.compiere.apps.ADialog;
import org.compiere.apps.AEnv;
import org.compiere.apps.ConfirmPanel;
import org.compiere.apps.ProcessCtl;
import org.compiere.grid.ed.VCheckBox;
import org.compiere.grid.ed.VComboBox;
import org.compiere.grid.ed.VDate;
import org.compiere.minigrid.ColumnInfo;
import org.compiere.minigrid.IDColumn;
import org.compiere.minigrid.MiniTable;
import org.compiere.model.MLookupFactory;
import org.compiere.model.MLookupInfo;
import org.compiere.model.MPaySelection;
import org.compiere.model.MPaySelectionLine;
import org.compiere.model.MRole;
import org.compiere.model.X_C_Order;
import org.compiere.model.X_C_PaySelection;
import org.compiere.plaf.CompiereColor;
import org.compiere.process.ProcessInfo;
import org.compiere.swing.CLabel;
import org.compiere.swing.CPanel;
import org.compiere.util.ASyncProcess;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
import org.compiere.util.KeyNamePair;
import org.compiere.util.Language;
import org.compiere.util.Msg;
import org.compiere.util.Trx;
import org.compiere.util.ValueNamePair;
/** /**
* Create Manual Payments From (AP) Invoices or (AR) Credit Memos. * Create Manual Payments From (AP) Invoices or (AR) Credit Memos.
@ -43,7 +79,7 @@ import org.compiere.util.*;
* and optionally posted/generated and printed * and optionally posted/generated and printed
* *
* @author Jorg Janke * @author Jorg Janke
* @version $Id: VPaySelect.java,v 1.3 2006/07/30 00:51:28 jjanke Exp $ * @version $Id: VPaySelect.java,v 1.2 2008/07/11 08:20:12 cruiz Exp $
*/ */
public class VPaySelect extends CPanel public class VPaySelect extends CPanel
implements FormPanel, ActionListener, TableModelListener, ASyncProcess implements FormPanel, ActionListener, TableModelListener, ASyncProcess
@ -108,6 +144,9 @@ public class VPaySelect extends CPanel
private VCheckBox onlyDue = new VCheckBox(); private VCheckBox onlyDue = new VCheckBox();
private CLabel labelBPartner = new CLabel(); private CLabel labelBPartner = new CLabel();
private VComboBox fieldBPartner = new VComboBox(); private VComboBox fieldBPartner = new VComboBox();
private CLabel labelDtype = new CLabel();
private VComboBox fieldDtype = new VComboBox();
private JLabel dataStatus = new JLabel(); private JLabel dataStatus = new JLabel();
private JScrollPane dataPane = new JScrollPane(); private JScrollPane dataPane = new JScrollPane();
private MiniTable miniTable = new MiniTable(); private MiniTable miniTable = new MiniTable();
@ -137,6 +176,8 @@ public class VPaySelect extends CPanel
labelBPartner.setText(Msg.translate(Env.getCtx(), "C_BPartner_ID")); labelBPartner.setText(Msg.translate(Env.getCtx(), "C_BPartner_ID"));
fieldBPartner.addActionListener(this); fieldBPartner.addActionListener(this);
bRefresh.addActionListener(this); bRefresh.addActionListener(this);
labelDtype.setText(Msg.translate(Env.getCtx(), "C_DocType_ID"));
fieldDtype.addActionListener(this);
labelPayDate.setText(Msg.translate(Env.getCtx(), "PayDate")); labelPayDate.setText(Msg.translate(Env.getCtx(), "PayDate"));
labelPaymentRule.setText(Msg.translate(Env.getCtx(), "PaymentRule")); labelPaymentRule.setText(Msg.translate(Env.getCtx(), "PaymentRule"));
fieldPaymentRule.addActionListener(this); fieldPaymentRule.addActionListener(this);
@ -154,26 +195,38 @@ public class VPaySelect extends CPanel
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
parameterPanel.add(fieldBankAccount, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0 parameterPanel.add(fieldBankAccount, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0));
parameterPanel.add(labelBankBalance, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0 parameterPanel.add(labelBankBalance, new GridBagConstraints(2, 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));
parameterPanel.add(labelCurrency, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0 parameterPanel.add(labelCurrency, new GridBagConstraints(4, 0, 1, 1, 0.0, 0.0
,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(5, 0, 5, 5), 0, 0)); ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(5, 0, 5, 5), 0, 0));
parameterPanel.add(labelBalance, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0 parameterPanel.add(labelBalance, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
parameterPanel.add(labelBPartner, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0 parameterPanel.add(labelBPartner, new GridBagConstraints(0, 1, 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));
parameterPanel.add(fieldBPartner, new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0 parameterPanel.add(fieldBPartner, new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0));
parameterPanel.add(bRefresh, new GridBagConstraints(4, 2, 1, 1, 0.0, 0.0
,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0)); parameterPanel.add(labelDtype, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0
parameterPanel.add(labelPayDate, new GridBagConstraints(0, 2, 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));
parameterPanel.add(fieldPayDate, new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0 parameterPanel.add(fieldDtype, new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0));
parameterPanel.add(labelPaymentRule, new GridBagConstraints(2, 2, 1, 1, 0.0, 0.0
parameterPanel.add(bRefresh, new GridBagConstraints(4, 3, 1, 1, 0.0, 0.0
,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
parameterPanel.add(labelPayDate, new GridBagConstraints(0, 3, 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));
parameterPanel.add(fieldPaymentRule, new GridBagConstraints(3, 2, 1, 1, 0.0, 0.0 parameterPanel.add(fieldPayDate, new GridBagConstraints(1, 3, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0));
parameterPanel.add(labelPaymentRule, new GridBagConstraints(2, 3, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
parameterPanel.add(fieldPaymentRule, new GridBagConstraints(3, 3, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
parameterPanel.add(onlyDue, new GridBagConstraints(3, 1, 1, 1, 0.0, 0.0 parameterPanel.add(onlyDue, new GridBagConstraints(3, 1, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
mainPanel.add(dataStatus, BorderLayout.SOUTH); mainPanel.add(dataStatus, BorderLayout.SOUTH);
@ -191,12 +244,14 @@ public class VPaySelect extends CPanel
* Dynamic Init. * Dynamic Init.
* - Load Bank Info * - Load Bank Info
* - Load BPartner * - Load BPartner
* - Load Document Type
* - Init Table * - Init Table
*/ */
private void dynInit() private void dynInit()
{ {
Properties ctx = Env.getCtx(); Properties ctx = Env.getCtx();
//
m_AD_Client_ID = Env.getAD_Client_ID(Env.getCtx());
// Bank Account Info // Bank Account Info
String sql = MRole.getDefault().addAccessSQL( String sql = MRole.getDefault().addAccessSQL(
"SELECT ba.C_BankAccount_ID," // 1 "SELECT ba.C_BankAccount_ID," // 1
@ -263,6 +318,32 @@ public class VPaySelect extends CPanel
} }
fieldBPartner.setSelectedIndex(0); fieldBPartner.setSelectedIndex(0);
/**Document type**/
try
{
sql = MRole.getDefault().addAccessSQL(
"SELECT doc.c_doctype_id,doc.name FROM c_doctype doc WHERE doc.ad_client_id = ? AND doc.docbasetype in ('API','APC') ORDER BY 2", "doc",
MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO);
KeyNamePair dt = new KeyNamePair(0, "");
fieldDtype.addItem(dt);
PreparedStatement pstmt = DB.prepareStatement(sql, null);
pstmt.setInt(1, m_AD_Client_ID); // Client
ResultSet rs = pstmt.executeQuery();
while (rs.next())
{
dt = new KeyNamePair(rs.getInt(1), rs.getString(2));
fieldDtype.addItem(dt);
}
rs.close();
pstmt.close();
}
catch (SQLException e)
{
log.log(Level.SEVERE, sql, e);
}
/** prepare MiniTable /** prepare MiniTable
* *
SELECT i.C_Invoice_ID, i.DateInvoiced+p.NetDays AS DateDue, SELECT i.C_Invoice_ID, i.DateInvoiced+p.NetDays AS DateDue,
@ -313,8 +394,7 @@ public class VPaySelect extends CPanel
// //
fieldPayDate.setMandatory(true); fieldPayDate.setMandatory(true);
fieldPayDate.setValue(new Timestamp(System.currentTimeMillis())); fieldPayDate.setValue(new Timestamp(System.currentTimeMillis()));
//
m_AD_Client_ID = Env.getAD_Client_ID(Env.getCtx());
} // dynInit } // dynInit
/** /**
@ -392,10 +472,14 @@ public class VPaySelect extends CPanel
int C_BPartner_ID = pp.getKey(); int C_BPartner_ID = pp.getKey();
if (C_BPartner_ID != 0) if (C_BPartner_ID != 0)
sql += " AND i.C_BPartner_ID=?"; sql += " AND i.C_BPartner_ID=?";
//Document Type
KeyNamePair dt = (KeyNamePair)fieldDtype.getSelectedItem();
int c_doctype_id = dt.getKey();
if (c_doctype_id != 0)
sql += " AND i.c_doctype_id =?";
sql += " ORDER BY 2,3"; sql += " ORDER BY 2,3";
//
log.finest(sql + " - C_Currecny_ID=" + bi.C_Currency_ID + ", C_BPartner_ID=" + C_BPartner_ID);
log.finest(sql + " - C_Currency_ID=" + bi.C_Currency_ID + ", C_BPartner_ID=" + C_BPartner_ID + ", C_doctype_id=" + c_doctype_id );
// Get Open Invoices // Get Open Invoices
try try
{ {
@ -413,6 +497,8 @@ public class VPaySelect extends CPanel
pstmt.setTimestamp(index++, payDate); pstmt.setTimestamp(index++, payDate);
if (C_BPartner_ID != 0) if (C_BPartner_ID != 0)
pstmt.setInt(index++, C_BPartner_ID); pstmt.setInt(index++, C_BPartner_ID);
if (c_doctype_id != 0) //Document type
pstmt.setInt(index++, c_doctype_id );
// //
ResultSet rs = pstmt.executeQuery(); ResultSet rs = pstmt.executeQuery();
miniTable.loadTable(rs); miniTable.loadTable(rs);
@ -458,7 +544,7 @@ public class VPaySelect extends CPanel
dispose(); dispose();
// Update Open Invoices // Update Open Invoices
else if (e.getSource() == fieldBPartner || e.getSource() == bRefresh) else if (e.getSource() == fieldBPartner || e.getSource() == bRefresh || e.getSource() == fieldDtype)
loadTableInfo(); loadTableInfo();
} // actionPerformed } // actionPerformed

5
migration/351a-trunk/227_MessageVPayPrintPrintCheck.sql Normal file
View File

@ -0,0 +1,5 @@
-- Jul 11, 2008 3:04:33 AM COT
-- Changes to Payment Selection and Print
UPDATE AD_Column SET AD_Reference_Value_ID=343,Updated=TO_DATE('2008-07-11 03:04:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7719
;

4
migration/351a-trunk/postgresql/227_MessageVPayPrintPrintCheck.sql Normal file
View File

@ -0,0 +1,4 @@
-- Jul 11, 2008 3:04:33 AM COT
-- Changes to Payment Selection and Print
UPDATE AD_Column SET AD_Reference_Value_ID=343,Updated=TO_TIMESTAMP('2008-07-11 03:04:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7719
;