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

 import org.openconcerto.erp.core.finance.accounting.ui.ListeGestCommEltPanel;
 import org.openconcerto.erp.core.finance.payment.element.SDDMessageSQLElement;
 import org.openconcerto.erp.core.finance.payment.element.SDDMessageSQLElement.GenerationResult;
 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.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;
 import org.openconcerto.sql.model.graph.Path;
+import org.openconcerto.sql.request.UpdateBuilder;
 import org.openconcerto.sql.view.list.IListe;
 import org.openconcerto.sql.view.list.IListeAction.IListeEvent;
 import org.openconcerto.sql.view.list.ITableModel;
 import org.openconcerto.sql.view.list.RowAction;
 import org.openconcerto.sql.view.list.RowAction.PredicateRowAction;
                 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, Object>() {
+                new SwingWorker<GenerationResult, Void>() {
                     @Override
                     protected GenerationResult doInBackground() throws Exception {
                         return sepaMsgElem.generateXML(selectedIDs);
+                    }
                             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));
-                            msg.append('\n');
                             if (futureCount > 0) {
-                                msg.append("- ");
+                                msg.append("\n- ");
                                 msg.append(TM.getTM().trM("sddMessage.generation.someIgnored.future", tmMap));
+                            }
                             if (duplicateCount > 0) {
-                                msg.append("- ");
+                                msg.append("\n- ");
                                 msg.append(TM.getTM().trM("sddMessage.generation.someIgnored.duplicateMandate", tmMap));
+                            }
                             if (missingInfoCount > 0) {
-                                msg.append("- ");
+                                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);
+                        }
+                        }
+                    }
                 }.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);
                 // Tab Vente caisse
                 ListeViewPanel panelTicket = new ListeViewPanel(Configuration.getInstance().getDirectory().getElement("TICKET_CAISSE")) {
                     @Override
                     protected void handleAction(JButton source, ActionEvent evt) {
                         if (source == this.buttonModifier) {
+                            POSConfiguration posConf = POSConfiguration.getInstance();
+                            try {
+                                if (posConf == null)
+                                    posConf = POSConfiguration.setInstance();
+                            } catch (Exception e) {
+                                ExceptionHandler.handle(source, "Impossible d'initialiser la configuration de la caisse", e);
+                                return;
+                            }
-                            new PanelFrame(new TextAreaTicketPanel(this.getListe().fetchSelectedRow()), "Ticket").setVisible(true);
+                            new PanelFrame(new TextAreaTicketPanel(posConf, this.getListe().fetchSelectedRow()), "Ticket").setVisible(true);
                         } else {
                             super.handleAction(source, evt);
+                        }
+                    }
                 };

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 151 → 156