WebSVN - OpenConcerto - Diff - Rev 156 and 177 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/invoice/ui/ListeDesVentesPanel.java

 import org.openconcerto.erp.core.finance.payment.element.SDDMessageSQLElement.IgnoreReason;
 import org.openconcerto.erp.core.sales.invoice.element.SaisieVenteFactureSQLElement;
 import org.openconcerto.erp.core.sales.pos.POSConfiguration;
 import org.openconcerto.erp.core.sales.pos.ui.TextAreaTicketPanel;
 import org.openconcerto.erp.utils.TM;
-import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.element.SQLElement;
+import org.openconcerto.sql.element.SQLElementDirectory;
 import org.openconcerto.sql.model.FieldPath;
 import org.openconcerto.sql.model.SQLField;
 import org.openconcerto.sql.model.SQLRowAccessor;
 import org.openconcerto.sql.model.SQLRowValues;
 import org.openconcerto.sql.model.Where;
     private ListeGestCommEltPanel listeFact;
     // private JButton buttonEnvoye, buttonRegle, buttonDupliquer;
     private JLabelBold textField = new JLabelBold("0");
     private JLabelBold textField2 = new JLabelBold("0");
-    public ListeDesVentesPanel() {
+    public ListeDesVentesPanel(final ComptaPropsConfiguration conf) {
         this.setLayout(new GridBagLayout());
         GridBagConstraints c = new GridBagConstraints();
         c.insets = new Insets(2, 2, 1, 2);
         c.fill = GridBagConstraints.BOTH;
         c.anchor = GridBagConstraints.NORTHWEST;
         c.weightx = 1;
         c.weighty = 1;
         JTabbedPane tabbedPane = new JTabbedPane();
+        final SQLElementDirectory dir = conf.getDirectory();
-        final SQLElement elementVF = Configuration.getInstance().getDirectory().getElement("SAISIE_VENTE_FACTURE");
+        final SQLElement elementVF = dir.getElement("SAISIE_VENTE_FACTURE");
         // tab Vente facture
         final SQLElement eltFacture = elementVF;
         final SQLTableModelSourceOnline src = eltFacture.getTableSource(true);
         // Filter
         Where wPrev = new Where(eltFacture.getTable().getField("PREVISIONNELLE"), "=", Boolean.FALSE);
+        }
         src.getColumns().add(new SQLTableModelColumnPath(new FieldPath(new Path(eltFacture.getTable()).addForeignField(SaisieVenteFactureSQLElement.MESSAGE_FIELD_NAME), "MessageIdentification")));
         this.listeFact = new ListeGestCommEltPanel(eltFacture, new IListe(src), true);
-        final SDDMessageSQLElement sepaMsgElem = eltFacture.getDirectory().getElement(SDDMessageSQLElement.class);
-        final String aMessageLabel = sepaMsgElem.getName().getVariant(Grammar_fr.INDEFINITE_ARTICLE_SINGULAR);
-        this.listeFact.getListe().addIListeAction(new RowAction.PredicateRowAction(new AbstractAction("Générer " + aMessageLabel, null) {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                final IListe l = IListe.get(e);
-                final List<Integer> selectedIDs = l.getSelection().getSelectedIDs();
-                // TODO dialog with label informing of the successful creation of message for n
-                // invoices/n2 messages too far in the future/n3 messages with collection date
-                // changed and having a button to open the file chooser
-                new SwingWorker<GenerationResult, Void>() {
-                    @Override
-                    protected GenerationResult doInBackground() throws Exception {
-                        return sepaMsgElem.generateXML(selectedIDs);
-                    }
-                    @Override
-                    protected void done() {
-                        final GenerationResult genRes;
-                        try {
-                            genRes = this.get();
-                        } catch (Exception e) {
-                            ExceptionHandler.handle(l, "Impossible de générer " + aMessageLabel, e);
-                            return;
-                        }
-                        final int includedInvoicesCount = genRes.getIncludedInvoicesCount();
-                        final Map<String, Object> tmMap = new HashMap<>();
-                        tmMap.put("msgElem", sepaMsgElem.getName());
-                        tmMap.put("invoiceElem", elementVF.getName());
-                        tmMap.put("invoiceElemCount", includedInvoicesCount);
-                        if (genRes.getDDInvoicesWithoutMessage().isEmpty()) {
-                            JOptionPane.showMessageDialog(l, TM.getTM().trM("sddMessage.generation.noneNeeded", tmMap));
-                        } else if (genRes.getIgnoredInvoices().isEmpty()) {
-                            JOptionPane.showMessageDialog(l, TM.getTM().trM("sddMessage.generation.noneIgnored", tmMap));
-                        } else {
-                            final int futureCount = genRes.getIgnoredInvoices().getNonNull(IgnoreReason.TOO_FAR_IN_FUTURE).size();
-                            final int duplicateCount = genRes.getIgnoredInvoices().getNonNull(IgnoreReason.DUPLICATE_MANDATE).size();
-                            final int missingInfoCount = genRes.getIgnoredInvoices().getNonNull(IgnoreReason.MISSING_INFO).size();
-                            tmMap.put("futureCount", futureCount);
-                            tmMap.put("duplicateCount", duplicateCount);
-                            tmMap.put("missingInfoCount", missingInfoCount);
-                            final StringBuilder msg = new StringBuilder(256);
-                            msg.append(TM.getTM().trM("sddMessage.generation.someIgnored", tmMap));
-                            if (futureCount > 0) {
-                                msg.append("\n- ");
-                                msg.append(TM.getTM().trM("sddMessage.generation.someIgnored.future", tmMap));
-                            }
-                            if (duplicateCount > 0) {
-                                msg.append("\n- ");
-                                msg.append(TM.getTM().trM("sddMessage.generation.someIgnored.duplicateMandate", tmMap));
-                            }
-                            if (missingInfoCount > 0) {
-                                msg.append("\n- ");
-                                msg.append(TM.getTM().trM("sddMessage.generation.someIgnored.missingInfo", tmMap));
-                            }
-                            final int messageType = duplicateCount == 0 ? JOptionPane.WARNING_MESSAGE : JOptionPane.ERROR_MESSAGE;
-                            JOptionPane.showMessageDialog(l, msg.toString(), null, messageType);
-                        }
-                        if (genRes.getInsertedMessage() != null) {
-                            sepaMsgElem.exportXML(l, Collections.singletonList(genRes.getInsertedMessage()));
-                        }
-                    }
-                }.execute();
-            }
-        }, false, true).setPredicate(IListeEvent.getNonEmptySelectionPredicate()));
-        // TODO remove once we have a join with {SENT, OK, DEFINITIVE_ERROR, TRANSIENT_ERROR}
-        this.listeFact.getListe().addIListeAction(new RowAction.PredicateRowAction(new AbstractAction("Prélever à nouveau", null) {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                final IListe l = IListe.get(e);
-                if (JOptionPane.showConfirmDialog(l, "Voulez-vous vraiment prélever à nouveau les factures sélectionnées ? Cette action est définitive.", "Prélever à nouveau",
-                        JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) != JOptionPane.OK_OPTION)
-                    return;
-                final List<Integer> selectedIDs = l.getSelection().getSelectedIDs();
-                final UpdateBuilder upd = new UpdateBuilder(l.getSource().getPrimaryTable());
-                upd.setObject(SaisieVenteFactureSQLElement.MESSAGE_FIELD_NAME, upd.getTable().getForeignTable(SaisieVenteFactureSQLElement.MESSAGE_FIELD_NAME).getUndefinedIDNumber());
-                upd.setObject(SaisieVenteFactureSQLElement.END2END_FIELD_NAME, "");
-                // don't allow to debit already payed invoices
-                upd.setWhere(new Where(upd.getTable().getKey(), selectedIDs).and(Where.isNull(upd.getTable().getField("DATE_REGLEMENT"))));
-                upd.getTable().getDBSystemRoot().getDataSource().execute(upd.asString());
-                for (final Integer id : selectedIDs)
-                    upd.getTable().fireTableModified(id, upd.getFieldsNames());
-            }
-        }, false, true).setPredicate(IListeEvent.getNonEmptySelectionPredicate()));
         this.listeFact.setOpaque(false);
         this.listeFact.getListe().setModificationAllowed(true);
         final JTable tableFact = this.listeFact.getListe().getJTable();
         final SQLTableModelColumn numeroCol = src.getColumn(eltFacture.getTable().getField("NUMERO"));
         ((TableSorter) tableFact.getModel()).setSortingStatus(src.getColumns().indexOf(numeroCol), TableSorter.ASCENDING);
         this.listeFact.getListe().addIListeAction(actionEnvoye);
+            {
                 // Tab Vente caisse
-                ListeViewPanel panelTicket = new ListeViewPanel(Configuration.getInstance().getDirectory().getElement("TICKET_CAISSE")) {
+                ListeViewPanel panelTicket = new ListeViewPanel(dir.getElement("TICKET_CAISSE")) {
                     @Override
                     protected void handleAction(JButton source, ActionEvent evt) {
                         if (source == this.buttonModifier) {
                             POSConfiguration posConf = POSConfiguration.getInstance();
                             try {
                 tabbedPane.add("Ventes caisse", panel);
+            }
             // Tab Vente comptoir
+            {
-                final ListeGestCommEltPanel listeVC = new ListeGestCommEltPanel(Configuration.getInstance().getDirectory().getElement("SAISIE_VENTE_COMPTOIR"), true);
+                final ListeGestCommEltPanel listeVC = new ListeGestCommEltPanel(dir.getElement("SAISIE_VENTE_COMPTOIR"), true);
                 listeVC.getListe().setModificationAllowed(false);
                 listeVC.setOpaque(false);
                 final JTable table = listeVC.getListe().getJTable();
                 for (int i = 0; i < table.getColumnCount(); i++) {

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/invoice/ui/ListeDesVentesPanel.java - Rev 156 → 177