WebSVN - OpenConcerto - Diff - Rev 132 and 182 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/ui/ImpressionJournauxPanel.java

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
- * Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
+ * Copyright 2011-2019 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.
  package org.openconcerto.erp.core.finance.accounting.ui;
 import org.openconcerto.erp.config.ComptaPropsConfiguration;
 import org.openconcerto.erp.config.Gestion;
 import org.openconcerto.erp.core.finance.accounting.model.SelectJournauxModel;
-import org.openconcerto.erp.core.finance.accounting.report.GrandLivreSheet;
+import org.openconcerto.erp.core.finance.accounting.report.GrandLivrePDF;
 import org.openconcerto.erp.core.finance.accounting.report.JournauxMoisSheet;
 import org.openconcerto.erp.core.finance.accounting.report.JournauxSheet;
 import org.openconcerto.erp.core.finance.accounting.report.JournauxSheetXML;
 import org.openconcerto.erp.generationDoc.SpreadSheetGeneratorCompta;
 import org.openconcerto.erp.generationDoc.SpreadSheetGeneratorListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.io.File;
 import java.util.Calendar;
 import java.util.Date;
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
     private JTable tableJrnl;
     private JButton valid;
     private JButton annul;
     private JCheckBox checkCentralMois;
     private JCheckBox checkAncienModele;
+    private JTextField compteDeb;
-    private JTextField compteDeb, compteEnd;
+    private JTextField compteEnd;
-    private int mode = GrandLivreSheet.MODEALL;
+    private int mode = GrandLivrePDF.MODEALL;
     private JProgressBar bar = new JProgressBar(0, 3);
     public ImpressionJournauxPanel() {
         this.setLayout(new GridBagLayout());
         final GridBagConstraints c = new DefaultGridBagConstraints();
         SQLRow rowSociete = ((ComptaPropsConfiguration) Configuration.getInstance()).getRowSociete();
         SQLRow rowExercice = Configuration.getInstance().getBase().getTable("EXERCICE_COMMON").getRow(rowSociete.getInt("ID_EXERCICE_COMMON"));
-        // this.isValidated = false;
         this.dateDeb = new JDate();
         this.dateEnd = new JDate();
         this.tableJrnl = new JTable(new SelectJournauxModel());
         this.add(new JLabel("Période du", SwingConstants.RIGHT), c);
         this.annul = new JButton("Fermer");
         // Radio mode
         JRadioButton radioAll = new JRadioButton(new AbstractAction("Toutes") {
             public void actionPerformed(ActionEvent e) {
-                // TODO Auto-generated method stub
-                mode = GrandLivreSheet.MODEALL;
+                ImpressionJournauxPanel.this.mode = GrandLivrePDF.MODEALL;
+            }
         });
         JRadioButton radioLettree = new JRadioButton(new AbstractAction("Lettrées") {
             public void actionPerformed(ActionEvent e) {
-                // TODO Auto-generated method stub
-                mode = GrandLivreSheet.MODELETTREE;
+                ImpressionJournauxPanel.this.mode = GrandLivrePDF.MODELETTREE;
+            }
         });
         JRadioButton radioNonLettree = new JRadioButton(new AbstractAction("Non lettrées") {
             public void actionPerformed(ActionEvent e) {
-                // TODO Auto-generated method stub
-                mode = GrandLivreSheet.MODENONLETTREE_PERIODE;
+                ImpressionJournauxPanel.this.mode = GrandLivrePDF.MODENONLETTREE_PERIODE;
+            }
         });
         JPanel panelMode = new JPanel();
         panelMode.add(radioAll);
         panelMode.add(radioLettree);
         c.gridwidth = GridBagConstraints.REMAINDER;
         this.add(this.checkCentralMois, c);
         // Ancien modele
         this.checkAncienModele = new JCheckBox("Ancien modèle");
-        // c.gridy++;
-        // c.gridx += 2;
-        // c.gridwidth = GridBagConstraints.REMAINDER;
-        // this.add(this.checkAncienModele, c);
         // Progress bar
         c.gridwidth = GridBagConstraints.REMAINDER;
         c.gridy++;
         c.gridx = 0;
+                                }
                             });
                         } else if (checkCentralMois.isSelected()) {
                             JournauxSheet bSheet;
                             bSheet = new JournauxMoisSheet(idS, dateDeb.getDate(), dateEnd.getDate(), mode);
                             final SpreadSheetGeneratorCompta generator = new SpreadSheetGeneratorCompta(bSheet, "Journal_" + Calendar.getInstance().getTimeInMillis(), false, true);
                             SwingUtilities.invokeLater(new Runnable() {
                                 public void run() {
                                     bar.setValue(2);
                                     generator.addGenerateListener(ImpressionJournauxPanel.this);
+                                }
                             });
                         } else {
                             for (int i = 0; i < idS.length; i++) {
                                 final JournauxSheetXML xmlSheet = new JournauxSheetXML(idS[i], dateDeb.getDate(), dateEnd.getDate(), mode, compteDeb.getText().trim(), compteEnd.getText().trim());
                                 SwingUtilities.invokeLater(new Runnable() {
                                     public void run() {
                                         bar.setValue(2);
+                                    }
                                 });
                                 try {
                                     xmlSheet.createDocument();
                                     xmlSheet.getOrCreatePDFDocumentFile(false, true);
+                                    final File generatedPDFFile = xmlSheet.getGeneratedPDFFile();
+                                    if (generatedPDFFile != null)
-                                    Gestion.openPDF(xmlSheet.getGeneratedPDFFile());
+                                        Gestion.openPDF(generatedPDFFile);
                                 } catch (Exception exn) {
                                     ExceptionHandler.handle("Erreur lors de la création du journal !", exn);
+                                }
+                            }

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/accounting/ui/ImpressionJournauxPanel.java - Rev 132 → 182