WebSVN - OpenConcerto - Diff - Rev 144 and 156 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/payment/ui/ListeDesChequesAEncaisserPanel.java

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
  * Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
+ *
  * The contents of this file are subject to the terms of the GNU General Public License Version 3
  * only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
  * copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
  * language governing permissions and limitations under the License.
+ *
  * When distributing the software, include this License Header Notice in each file.
  */
  package org.openconcerto.erp.core.finance.payment.ui;
 import org.openconcerto.erp.config.ComptaPropsConfiguration;
 import org.openconcerto.erp.core.finance.payment.element.ChequeAEncaisserSQLElement;
 import org.openconcerto.erp.rights.ComptaTotalUserRight;
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowValues;
 import org.openconcerto.sql.sqlobject.SQLRequestComboBox;
 import org.openconcerto.sql.users.rights.UserRightsManager;
+import org.openconcerto.sql.view.EditFrame;
+import org.openconcerto.sql.view.EditPanel.EditMode;
 import org.openconcerto.sql.view.list.IListe;
 import org.openconcerto.ui.JDate;
 import org.openconcerto.utils.GestionDevise;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.sql.SQLException;
+import java.util.List;
 import javax.swing.AbstractAction;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JOptionPane;
 import javax.swing.JTextField;
 import javax.swing.text.JTextComponent;
 public class ListeDesChequesAEncaisserPanel extends ChequeListPanel {
+    private JTextField fieldLabel;
     public ListeDesChequesAEncaisserPanel(final ChequeAEncaisserSQLElement elem) {
         super(elem);
+    }
     @Override
     protected JButton createPreviewBtn() {
         return new JButton("Aperçu du relevé");
+    }
     @Override
     protected JTextComponent createLabelText() {
+        if (fieldLabel == null) {
+            this.fieldLabel = new JTextField();
+        }
-        return new JTextField();
+        return fieldLabel;
+    }
     @Override
     protected JButton createSubmitBtn(final SQLRequestComboBox banqueSelect, final JDate dateDepot, final JCheckBox checkImpression, final JTextComponent text) {
         final JButton res = new JButton("Valider le dépôt");
         res.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 final String s = text.getText();
+                SQLRowValues rowValsDepot = new SQLRowValues(element.getTable().getTable("DEPOT_CHEQUE"));
+                rowValsDepot.put("DATE", dateDepot.getValue());
+                rowValsDepot.put("NOM", fieldLabel.getText());
+                final SQLRow selectedBanque = banqueSelect.getSelectedRow();
+                if (selectedBanque != null) {
-                getModel().valideDepot(banqueSelect.getSelectedRow(), dateDepot.getDate(), checkImpression.isSelected(), s);
+                    rowValsDepot.put("ID_" + selectedBanque.getTable().getName(), selectedBanque.getID());
+                }
+                List<SQLRowValues> chq = getListe().getSelectedRows();
+                for (SQLRowValues sqlRowValues : chq) {
+                    SQLRow rowChq = sqlRowValues.asRow();
+                    rowChq.fetchValues();
+                    SQLRowValues rowValsDepotElt = new SQLRowValues(element.getTable().getTable("DEPOT_CHEQUE_ELEMENT"));
+                    rowValsDepotElt.put("ID_DEPOT_CHEQUE", rowValsDepot);
+                    if (rowChq.getObject("ID_CLIENT") != null && !rowChq.isForeignEmpty("ID_CLIENT")) {
+                        rowValsDepotElt.put("ID_CLIENT", rowChq.getForeignID("ID_CLIENT"));
+                    }
+                    rowValsDepotElt.put("TIERS", rowChq.getString("TIERS"));
+                    rowValsDepotElt.put("ID_CHEQUE_A_ENCAISSER", rowChq.getID());
+                    if (rowChq.getObject("DATE") != null) {
+                        rowValsDepotElt.put("DATE", rowChq.getObject("DATE"));
+                    } else if (rowChq.getObject("DATE_VENTE") != null) {
+                        rowValsDepotElt.put("DATE", rowChq.getObject("DATE_VENTE"));
+                    }
+                    rowValsDepotElt.put("BANQUE", (rowChq.getObject("ETS") == null ? "" : rowChq.getObject("ETS")));
+                    if (rowChq.getObject("ID_MOUVEMENT") != null && !rowChq.isForeignEmpty("ID_MOUVEMENT")) {
+                        rowValsDepotElt.put("PIECE", rowChq.getForeign("ID_MOUVEMENT").getForeign("ID_PIECE").getString("NOM"));
+                    }
+                    rowValsDepotElt.put("NUMERO", (rowChq.getObject("NUMERO") == null ? "" : rowChq.getObject("NUMERO")));
+                    rowValsDepotElt.put("MONTANT", rowChq.getObject("MONTANT"));
+                }
+                EditFrame frame = new EditFrame(element.getDirectory().getElement("DEPOT_CHEQUE"), EditMode.CREATION);
+                frame.getSQLComponent().select(rowValsDepot);
+                frame.setVisible(true);
                 text.setText("");
+            }
         });
         return res;
+    }
     @Override
     protected void actionDroitTable() {
         super.actionDroitTable();
         if (UserRightsManager.getCurrentUserRights().haveRight(ComptaTotalUserRight.MENU)) {
             getListe().addRowAction(new AbstractAction("Régularisation en comptabilité") {
                 public void actionPerformed(ActionEvent e) {
                     final SQLRow rowCheque = IListe.get(e).fetchSelectedRow();
                     String price = GestionDevise.currencyToString(rowCheque.getLong("MONTANT"));
                     SQLRow rowClient = rowCheque.getForeignRow("ID_CLIENT");
-                    String nomClient = rowClient.getString("NOM");
+                    String nomClient = rowClient == null ? rowCheque.getString("TIERS") : rowClient.getString("NOM");
                     String piece = "";
                     SQLRow rowMvt = rowCheque.getForeignRow("ID_MOUVEMENT");
                     if (rowMvt != null) {
                         SQLRow rowPiece = rowMvt.getForeignRow("ID_PIECE");
                         piece = rowPiece.getString("NOM");
+                    }
                     int answer = JOptionPane.showConfirmDialog(ListeDesChequesAEncaisserPanel.this, "Etes vous sûr de vouloir régulariser ce cheque de " + nomClient + " d'un montant de " + price
                             + "€ avec une saisie au kilometre?\nNom de la piéce : " + piece + "\nAttention, cette opération est irréversible.");
                     if (answer == JOptionPane.YES_OPTION) {
                         SQLRowValues rowVals = rowCheque.asRowValues();
                         rowVals.put("REG_COMPTA", Boolean.TRUE);
                         try {
                             rowVals.commit();
                         } catch (SQLException e1) {
                             e1.printStackTrace();
+                        }
+                    }
+                }
             });
+        }
+    }
     @Override
     protected String getDepositLabel() {
         return "Sélectionner les chéques à déposer, en date du ";
+    }
+}

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/payment/ui/ListeDesChequesAEncaisserPanel.java - Rev 144 → 156