WebSVN - OpenConcerto - Diff - Rev 177 and 180 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/supplychain/order/component/FactureFournisseurSQLComponent.java

  package org.openconcerto.erp.core.supplychain.order.component;
 import org.openconcerto.erp.config.ComptaPropsConfiguration;
 import org.openconcerto.erp.core.common.component.TransfertBaseSQLComponent;
 import org.openconcerto.erp.core.common.element.ComptaSQLConfElement;
+import org.openconcerto.erp.core.common.element.NumerotationAutoSQLElement;
 import org.openconcerto.erp.core.common.ui.AbstractVenteArticleItemTable;
 import org.openconcerto.erp.core.common.ui.DeviseField;
 import org.openconcerto.erp.core.common.ui.TotalPanel;
 import org.openconcerto.erp.core.finance.accounting.element.EcritureSQLElement;
 import org.openconcerto.erp.core.finance.accounting.model.CurrencyConverter;
 import org.openconcerto.erp.generationDoc.gestcomm.FactureFournisseurXmlSheet;
 import org.openconcerto.erp.generationEcritures.GenerationMvtFactureFournisseur;
 import org.openconcerto.erp.panel.PanelOOSQLComponent;
 import org.openconcerto.erp.preferences.DefaultNXProps;
 import org.openconcerto.sql.Configuration;
-import org.openconcerto.sql.element.DefaultElementSQLObject;
 import org.openconcerto.sql.element.ElementSQLObject;
 import org.openconcerto.sql.element.SQLElement;
 import org.openconcerto.sql.model.SQLBackgroundTableCache;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowAccessor;
 import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.model.Where;
 import org.openconcerto.sql.preferences.SQLPreferences;
 import org.openconcerto.sql.request.ComboSQLRequest;
 import org.openconcerto.sql.sqlobject.ElementComboBox;
+import org.openconcerto.sql.sqlobject.JUniqueTextField;
+import org.openconcerto.sql.sqlobject.SQLRequestComboBox;
 import org.openconcerto.sql.users.UserManager;
 import org.openconcerto.sql.view.list.RowValuesTable;
+import org.openconcerto.sql.view.list.RowValuesTableModel;
 import org.openconcerto.ui.AutoHideListener;
 import org.openconcerto.ui.DefaultGridBagConstraints;
 import org.openconcerto.ui.FormLayouter;
 import org.openconcerto.ui.JDate;
-import org.openconcerto.ui.TitledSeparator;
 import org.openconcerto.ui.component.ITextArea;
 import org.openconcerto.ui.preferences.DefaultProps;
 import org.openconcerto.utils.ExceptionHandler;
+import org.openconcerto.utils.checks.ValidState;
 import org.openconcerto.utils.text.SimpleDocumentListener;
 import java.awt.Color;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.math.BigDecimal;
 import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
 import javax.swing.JTextField;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
     private FactureFournisseurItemTable table = new FactureFournisseurItemTable();
     private final ITextArea infos = new ITextArea(3, 3);
     private ElementComboBox fourn = new ElementComboBox();
     private ElementComboBox comptePCE = new ElementComboBox();
     private ElementComboBox avoirFourn = new ElementComboBox();
-    private DefaultElementSQLObject compAdr;
+    private ElementComboBox avoirFourn2 = new ElementComboBox();
     private PanelOOSQLComponent panelOO;
     final JPanel panelAdrSpec = new JPanel(new GridBagLayout());
     private JDate dateCommande = new JDate();
     private final JTextField fieldTaux = new JTextField(15);
     private final DeviseField textNetAPayer = new DeviseField(15);
     DeviseField avoirTTC = new DeviseField();
     private PropertyChangeListener listenerModeReglDefaut = new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-            SQLRow rowFourn = fourn.getRequest().getPrimaryTable().getRow(fourn.getWantedID());
+            final SQLRow rowFourn = FactureFournisseurSQLComponent.this.fourn.getRequest().getPrimaryTable().getRow(FactureFournisseurSQLComponent.this.fourn.getWantedID());
-            if (!isFilling() && rowFourn != null && !rowFourn.isUndefined()) {
+            if ((getMode() == Mode.INSERTION || !isFilling()) && rowFourn != null && !rowFourn.isUndefined()) {
-                // SQLRow rowCharge = rowFourn.getForeign("ID_COMPTE_PCE_CHARGE");
-                // if (rowCharge != null && !rowCharge.isUndefined()) {
-                // compteSel.setValue(rowCharge);
-                // }
                 int idModeRegl = rowFourn.getInt("ID_MODE_REGLEMENT");
                 if (idModeRegl > 1 && FactureFournisseurSQLComponent.this.eltModeRegl != null && getMode() == Mode.INSERTION) {
                     SQLElement sqlEltModeRegl = getElement().getDirectory().getElement("MODE_REGLEMENT");
                     SQLRow rowModeRegl = sqlEltModeRegl.getTable().getRow(idModeRegl);
                     SQLRowValues rowVals = rowModeRegl.createUpdateRow();
                     rowVals.clearPrimaryKeys();
                     FactureFournisseurSQLComponent.this.eltModeRegl.setValue(rowVals);
-                    System.err.println("Select Mode regl " + idModeRegl);
+                }
-                // }
+            }
+        }
     };
             s.add("ID_TYPE_CMD");
+        }
         return s;
+    }
+    @Override
+    public synchronized ValidState getValidState() {
+        if (getTable().contains("ID_COMPTE_PCE") && getTable().contains("ID_TYPE_CMD") && getTable().getTable("FACTURE_FOURNISSEUR_ELEMENT").contains("ID_COMPTE_PCE")) {
+            SQLRequestComboBox boxCpt = (SQLRequestComboBox) getView("ID_COMPTE_PCE").getComp();
+            final SQLRow selectedCpt = boxCpt.getSelectedRow();
+            if (selectedCpt == null || selectedCpt.isUndefined()) {
+                RowValuesTableModel tableRow = this.table.getRowValuesTable().getRowValuesTableModel();
+                for (int i = 0; i < tableRow.getRowCount(); i++) {
+                    SQLRowValues rowVals = tableRow.getRowValuesAt(i);
+                    if (rowVals.getInt("QTE") != 0 && (rowVals.getObject("ID_COMPTE_PCE") == null || rowVals.isForeignEmpty("ID_COMPTE_PCE"))) {
+                        return ValidState.create(false, "Aucun compte global sélectionné et une ligne avec une quantité > 0 n'est pas affectée à un compte!");
+                    }
+                }
+            }
+        }
+        return super.getValidState();
+    }
+    private JUniqueTextField numero;
     public void addViews() {
         this.setLayout(new GridBagLayout());
         final GridBagConstraints c = new DefaultGridBagConstraints();
+        if (getTable().getTable("NUMEROTATION_AUTO").contains("FACTURE_FOURNISSEUR_START")) {
+            this.numero = new JUniqueTextField(35) {
+                @Override
+                public String getAutoRefreshNumber() {
+                    if (getMode() == Mode.INSERTION) {
+                        final Date date = FactureFournisseurSQLComponent.this.dateCommande.getDate();
+                        return NumerotationAutoSQLElement.getNextNumero(getElement().getClass(), date == null ? new Date() : date);
+                    } else {
+                        return null;
+                    }
+                }
+            };
+            this.dateCommande.addValueListener(new PropertyChangeListener() {
+                @Override
+                public void propertyChange(PropertyChangeEvent evt) {
+                    if (!isFilling() && FactureFournisseurSQLComponent.this.dateCommande.getValue() != null) {
+                        final String nextNumero = NumerotationAutoSQLElement.getNextNumero(getElement().getClass(), FactureFournisseurSQLComponent.this.dateCommande.getValue());
+                        if (FactureFournisseurSQLComponent.this.numero.getText().trim().length() > 0 && !nextNumero.equalsIgnoreCase(FactureFournisseurSQLComponent.this.numero.getText())) {
+                            int answer = JOptionPane.showConfirmDialog(FactureFournisseurSQLComponent.this, "Voulez vous actualiser le numéro de la facture?", "Changement du numéro de facture",
+                                    JOptionPane.YES_NO_OPTION);
+                            if (answer == JOptionPane.NO_OPTION) {
+                                return;
+                            }
+                        }
+                        FactureFournisseurSQLComponent.this.numero.setText(nextNumero);
+                    }
+                }
+            });
+        } else {
+            this.numero = new JUniqueTextField(35);
+        }
         // Numero du commande
         c.gridx = 0;
         c.weightx = 0;
         this.add(new JLabel(getLabelFor("NUMERO"), SwingConstants.RIGHT), c);
-        JTextField numero = new JTextField(25);
         c.gridx++;
         c.weightx = 1;
         c.fill = GridBagConstraints.NONE;
-        DefaultGridBagConstraints.lockMinimumSize(numero);
+        DefaultGridBagConstraints.lockMinimumSize(this.numero);
-        this.add(numero, c);
+        this.add(this.numero, c);
         // Date
         JLabel labelDate = new JLabel(getLabelFor("DATE"));
         labelDate.setHorizontalAlignment(SwingConstants.RIGHT);
         c.gridx = 2;
         c.fill = GridBagConstraints.HORIZONTAL;
         this.add(labelDate, c);
         c.gridx++;
         c.fill = GridBagConstraints.NONE;
-        this.add(dateCommande, c);
+        this.add(this.dateCommande, c);
         this.dateCommande.addValueListener(new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
-                if (!isFilling() && dateCommande.getValue() != null) {
+                if (!isFilling() && FactureFournisseurSQLComponent.this.dateCommande.getValue() != null) {
-                    table.setDateDevise(dateCommande.getValue());
+                    FactureFournisseurSQLComponent.this.table.setDateDevise(FactureFournisseurSQLComponent.this.dateCommande.getValue());
                     updateLabelTauxConversion();
+                }
+            }
         });
         c.weighty = 0;
         c.fill = GridBagConstraints.NONE;
         this.add(this.fourn, c);
         addRequiredSQLObject(this.fourn, "ID_FOURNISSEUR");
-        fourn.addModelListener("wantedID", new PropertyChangeListener() {
+        this.fourn.addModelListener("wantedID", new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
-                int wantedID = fourn.getWantedID();
+                int wantedID = FactureFournisseurSQLComponent.this.fourn.getWantedID();
                 if (wantedID != SQLRow.NONEXISTANT_ID && wantedID >= SQLRow.MIN_VALID_ID) {
                     final SQLRow rowF = getTable().getForeignTable("ID_FOURNISSEUR").getRow(wantedID);
                     if (rowF.getObject("ID_CATEGORIE_COMPTABLE") != null && !rowF.isForeignEmpty("ID_CATEGORIE_COMPTABLE")) {
-                        table.setRowCatComptable(rowF.getForeign("ID_CATEGORIE_COMPTABLE"));
+                        FactureFournisseurSQLComponent.this.table.setRowCatComptable(rowF.getForeign("ID_CATEGORIE_COMPTABLE"));
                     } else {
-                        table.setRowCatComptable(null);
+                        FactureFournisseurSQLComponent.this.table.setRowCatComptable(null);
+                    }
                 } else {
-                    table.setRowCatComptable(null);
+                    FactureFournisseurSQLComponent.this.table.setRowCatComptable(null);
+                }
+            }
         });
         this.fourn.addModelListener("wantedID", this.listenerModeReglDefaut);
             this.fourn.addModelListener("wantedID", new PropertyChangeListener() {
                 @Override
                 public void propertyChange(PropertyChangeEvent evt) {
-                    table.setFournisseur(fourn.getSelectedRow());
+                    FactureFournisseurSQLComponent.this.table.setFournisseur(FactureFournisseurSQLComponent.this.fourn.getSelectedRow());
-                    SQLRow row = fourn.getSelectedRow();
+                    SQLRow row = FactureFournisseurSQLComponent.this.fourn.getSelectedRow();
                     if (!isFilling()) {
                         if (row != null && !row.isUndefined() && !row.isForeignEmpty("ID_DEVISE")) {
                             boxDevise.setValue(row.getForeignID("ID_DEVISE"));
+                        }
+                    }
                     if (row != null && !row.isUndefined()) {
+                        FactureFournisseurSQLComponent.this.avoirFourn.getRequest()
-                        avoirFourn.getRequest().setWhere(new Where(avoirFourn.getRequest().getPrimaryTable().getField("ID_FOURNISSEUR"), "=", row.getID()));
+                                .setWhere(new Where(FactureFournisseurSQLComponent.this.avoirFourn.getRequest().getPrimaryTable().getField("ID_FOURNISSEUR"), "=", row.getID()));
                     } else {
-                        avoirFourn.getRequest().setWhere(null);
+                        FactureFournisseurSQLComponent.this.avoirFourn.getRequest().setWhere(null);
+                    }
+                }
             });
             if (getTable().contains("TAUX_APPLIQUE")) {
             boxDevise.addValueListener(new PropertyChangeListener() {
                 @Override
                 public void propertyChange(PropertyChangeEvent evt) {
-                    table.setDevise(boxDevise.getSelectedRow());
+                    FactureFournisseurSQLComponent.this.table.setDevise(boxDevise.getSelectedRow());
                     updateLabelTauxConversion();
+                }
             });
-            fieldTaux.getDocument().addDocumentListener(new SimpleDocumentListener() {
+            this.fieldTaux.getDocument().addDocumentListener(new SimpleDocumentListener() {
                 @Override
                 public void update(DocumentEvent e) {
                     BigDecimal tauxConversion = null;
-                    if (fieldTaux.getText().trim().length() > 0) {
+                    if (FactureFournisseurSQLComponent.this.fieldTaux.getText().trim().length() > 0) {
-                        tauxConversion = new BigDecimal(fieldTaux.getText());
+                        tauxConversion = new BigDecimal(FactureFournisseurSQLComponent.this.fieldTaux.getText());
+                    }
-                    table.setTauxConversion(tauxConversion);
+                    FactureFournisseurSQLComponent.this.table.setTauxConversion(tauxConversion);
                     updateLabelTauxConversion();
+                }
             });
+        }
         this.fourn.addModelListener("wantedID", new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
-                table.setFournisseur(fourn.getSelectedRow());
+                FactureFournisseurSQLComponent.this.table.setFournisseur(FactureFournisseurSQLComponent.this.fourn.getSelectedRow());
                 if (!isFilling()) {
-                    SQLRow row = fourn.getSelectedRow();
+                    SQLRow row = FactureFournisseurSQLComponent.this.fourn.getSelectedRow();
                     if (row != null && !row.isUndefined()) {
                         row.fetchValues();
                         if (!row.isForeignEmpty("ID_COMPTE_PCE_CHARGE")) {
-                            comptePCE.setValue(row.getForeign("ID_COMPTE_PCE_CHARGE"));
+                            FactureFournisseurSQLComponent.this.comptePCE.setValue(row.getForeign("ID_COMPTE_PCE_CHARGE"));
+                        }
+                    }
+                }
+            }
         });
         // Bottom
         c.gridy++;
         c.weighty = 0;
         this.add(getBottomPanel(), c);
-        ModeDeReglementSQLComponent modeReglComp;
-        modeReglComp = (ModeDeReglementSQLComponent) this.eltModeRegl.getSQLChild();
+        ModeDeReglementSQLComponent modeReglComp = (ModeDeReglementSQLComponent) this.eltModeRegl.getSQLChild();
         modeReglComp.addDateCompListener(this.dateCommande);
-        c.gridx = 0;
-        c.gridy++;
-        c.fill = GridBagConstraints.HORIZONTAL;
-        c.anchor = GridBagConstraints.WEST;
+        // Modèle, visualiser, imprimer..
         c.gridx = 0;
         c.gridy++;
         c.fill = GridBagConstraints.NONE;
         c.anchor = GridBagConstraints.SOUTHEAST;
         c.gridwidth = GridBagConstraints.REMAINDER;
         this.panelOO = new PanelOOSQLComponent(this);
         this.add(this.panelOO, c);
         addSQLObject(textNom, "NOM");
-        addRequiredSQLObject(dateCommande, "DATE");
+        addRequiredSQLObject(this.dateCommande, "DATE");
-        addRequiredSQLObject(numero, "NUMERO");
+        addRequiredSQLObject(this.numero, "NUMERO");
         addSQLObject(this.infos, "INFOS");
         DefaultGridBagConstraints.lockMinimumSize(this.fourn);
         DefaultGridBagConstraints.lockMinimumSize(commSel);
+    }
     private JPanel getBottomPanel() {
         final JPanel panel = new JPanel(new GridBagLayout());
         final GridBagConstraints c = new DefaultGridBagConstraints();
+        JTabbedPane tabs = new JTabbedPane();
+        JPanel mainBottomPanel = new JPanel();
+        mainBottomPanel.setOpaque(false);
+        tabs.add(mainBottomPanel, "Règlements et caractéristiques");
+        final JScrollPane scrollPane = new JScrollPane(this.infos);
-        // Colonne 1 : Infos
+        scrollPane.setBorder(null);
+        tabs.add(scrollPane, getLabelFor("INFOS"));
         c.gridx = 0;
         c.weightx = 1;
         c.anchor = GridBagConstraints.WEST;
-        c.fill = GridBagConstraints.HORIZONTAL;
+        c.fill = GridBagConstraints.BOTH;
+        panel.add(tabs, c);
-        panel.add(new TitledSeparator(getLabelFor("INFOS")), c);
+        mainBottomPanel.setLayout(new GridBagLayout());
+        GridBagConstraints cMainBottomPanel = new DefaultGridBagConstraints();
-        c.gridy++;
+        // Colonne 1 : Infos
-        c.weighty = 0;
+        cMainBottomPanel.weighty = 0;
-        c.weightx = 1;
+        cMainBottomPanel.weightx = 0;
-        c.fill = GridBagConstraints.BOTH;
+        cMainBottomPanel.fill = GridBagConstraints.BOTH;
-        final JScrollPane scrollPane = new JScrollPane(this.infos);
-        scrollPane.setBorder(null);
-        panel.add(scrollPane, c);
         this.addView("ID_MODE_REGLEMENT", REQ + ";" + DEC + ";" + SEP);
         this.eltModeRegl = (ElementSQLObject) this.getView("ID_MODE_REGLEMENT");
         c.gridx++;
         c.fill = GridBagConstraints.NONE;
+        c.weightx = 1;
         c.weighty = 1;
-        eltModeRegl.setOpaque(false);
+        this.eltModeRegl.setOpaque(false);
-        panel.add(eltModeRegl, c);
+        mainBottomPanel.add(this.eltModeRegl, cMainBottomPanel);
         // Colonne 2 : Poids & autres
+        JPanel column2 = new JPanel();
+        column2.setOpaque(false);
+        cMainBottomPanel.gridx++;
+        cMainBottomPanel.weightx = 0;
+        mainBottomPanel.add(column2, cMainBottomPanel);
+        column2.setLayout(new GridBagLayout());
+        GridBagConstraints c2 = new DefaultGridBagConstraints();
+        c2.weightx = 0;
+        c2.weighty = 0;
+        c2.gridwidth = 1;
+        c2.gridheight = 1;
+        c2.fill = GridBagConstraints.HORIZONTAL;
+        c2.anchor = GridBagConstraints.NORTHEAST;
+        // Poids
         DefaultProps props = DefaultNXProps.getInstance();
-        Boolean b = props.getBooleanValue("ArticleShowPoids");
+        Boolean poidsVisible = props.getBooleanValue("ArticleShowPoids");
+        if (poidsVisible) {
+            column2.add(new JLabel(getLabelFor("T_POIDS"), SwingConstants.RIGHT), c2);
-        final JTextField textPoidsTotal = new JTextField(8);
+            final JTextField textPoidsTotal = new JTextField(8);
-        JTextField poids = new JTextField();
-        if (b) {
-            final JPanel panelPoids = new JPanel();
-            panelPoids.add(new JLabel(getLabelFor("T_POIDS")), c);
             textPoidsTotal.setEnabled(false);
             textPoidsTotal.setHorizontalAlignment(JTextField.RIGHT);
             textPoidsTotal.setDisabledTextColor(Color.BLACK);
+            c2.weightx = 1;
+            c2.gridx++;
+            column2.add(textPoidsTotal, c2);
+            DefaultGridBagConstraints.lockMinimumSize(textPoidsTotal);
+            addSQLObject(textPoidsTotal, "T_POIDS");
+            this.table.getModel().addTableModelListener(new TableModelListener() {
-            panelPoids.add(textPoidsTotal, c);
+                public void tableChanged(TableModelEvent e) {
+                    textPoidsTotal.setText(String.valueOf(FactureFournisseurSQLComponent.this.table.getPoidsTotal()));
+                }
+            });
-            c.gridx++;
-            c.gridy = 0;
-            c.weightx = 0;
-            c.weighty = 0;
-            c.gridwidth = 1;
-            c.gridheight = 2;
-            c.fill = GridBagConstraints.NONE;
-            c.anchor = GridBagConstraints.NORTHEAST;
-            panel.add(panelPoids, c);
-            DefaultGridBagConstraints.lockMinimumSize(panelPoids);
-            addSQLObject(textPoidsTotal, "T_POIDS");
         } else {
-            addSQLObject(poids, "T_POIDS");
+            addSQLObject(new JTextField(), "T_POIDS");
+        }
         DeviseField textPortHT = new DeviseField();
         ElementComboBox comboTaxePort = new ElementComboBox();
         DeviseField textRemiseHT = new DeviseField();
-        final JPanel panelPoids = new JPanel(new GridBagLayout());
-        GridBagConstraints cPort = new DefaultGridBagConstraints();
         if (getTable().contains("PORT_HT")) {
+            // Port HT
             addSQLObject(textPortHT, "PORT_HT");
-            cPort.gridx = 0;
+            c2.gridx = 0;
+            c2.gridy++;
-            cPort.weightx = 0;
+            c2.weightx = 0;
-            panelPoids.add(new JLabel(getLabelFor("PORT_HT")), cPort);
+            column2.add(new JLabel(getLabelFor("PORT_HT"), SwingConstants.RIGHT), c2);
             textPortHT.setHorizontalAlignment(JTextField.RIGHT);
-            cPort.gridx++;
+            c2.gridx++;
-            cPort.weightx = 1;
+            c2.weightx = 1;
-            panelPoids.add(textPortHT, cPort);
+            column2.add(textPortHT, c2);
+            // TVA sur port
-            cPort.gridy++;
+            c2.gridy++;
-            cPort.gridx = 0;
+            c2.gridx = 0;
-            cPort.weightx = 0;
+            c2.weightx = 0;
             addRequiredSQLObject(comboTaxePort, "ID_TAXE_PORT");
-            panelPoids.add(new JLabel(getLabelFor("ID_TAXE_PORT")), cPort);
+            column2.add(new JLabel(getLabelFor("ID_TAXE_PORT"), SwingConstants.RIGHT), c2);
-            cPort.gridx++;
+            c2.gridx++;
-            cPort.weightx = 0;
+            c2.weightx = 0;
-            panelPoids.add(comboTaxePort, cPort);
+            column2.add(comboTaxePort, c2);
-            c.gridx++;
-            c.gridy = 0;
+            // Remise HT
-            c.weightx = 0;
-            c.weighty = 0;
-            c.gridwidth = 1;
-            c.gridheight = 2;
-            c.fill = GridBagConstraints.NONE;
-            c.anchor = GridBagConstraints.NORTHEAST;
-            panel.add(panelPoids, c);
-            DefaultGridBagConstraints.lockMinimumSize(panelPoids);
             addSQLObject(textRemiseHT, "REMISE_HT");
-            cPort.gridy++;
+            c2.gridx = 0;
-            cPort.gridx = 0;
+            c2.gridy++;
-            cPort.fill = GridBagConstraints.NONE;
-            cPort.weightx = 0;
+            c2.weightx = 0;
-            panelPoids.add(new JLabel(getLabelFor("REMISE_HT")), cPort);
+            column2.add(new JLabel(getLabelFor("REMISE_HT"), SwingConstants.RIGHT), c2);
             textRemiseHT.setHorizontalAlignment(JTextField.RIGHT);
-            cPort.gridx++;
+            c2.gridx++;
-            cPort.weightx = 1;
+            c2.weightx = 1;
-            panelPoids.add(textRemiseHT, cPort);
+            column2.add(textRemiseHT, c2);
+        }
+        final JTextField textTvaAdujs;
+        if (getTable().contains("TVA_ADJUSTMENT")) {
+            textTvaAdujs = new JTextField(15);
+            final JLabel labelTvaAdujst = new JLabel(getLabelFor("TVA_ADJUSTMENT"), SwingConstants.RIGHT);
+            c2.gridx = 0;
+            c2.gridy++;
+            c2.weightx = 0;
+            column2.add(labelTvaAdujst, c2);
+            c2.gridx++;
+            c2.weightx = 1;
+            column2.add(textTvaAdujs, c2);
+            addView(textTvaAdujs, "TVA_ADJUSTMENT");
+            DefaultGridBagConstraints.lockMinimumSize(textTvaAdujs);
+        } else {
+            textTvaAdujs = null;
+        }
+        c2.gridy++;
+        c2.gridx = 0;
+        column2.add(new JLabel("Avoirs", SwingConstants.RIGHT), c2);
+        c2.gridx++;
+        c2.fill = GridBagConstraints.NONE;
+        c2.anchor = GridBagConstraints.EAST;
+        column2.add(createPanelAvoir(), c2);
+        c2.gridy++;
+        column2.add(getModuleTotalPanel(), c2);
+        c2.gridy++;
+        JPanel filler = new JPanel();
+        filler.setOpaque(false);
+        c2.weighty = 1;
+        column2.add(filler, c2);
-        // Total
+        // Colonne 4 Total
         DeviseField fieldHT = new DeviseField();
         DeviseField fieldEco = new DeviseField();
         DeviseField fieldTVA = new DeviseField();
         DeviseField fieldDevise = new DeviseField();
         DeviseField fieldService = new DeviseField();
         fieldHT.setOpaque(false);
         fieldTVA.setOpaque(false);
-        fieldTTC.setOpaque(false);
+        this.fieldTTC.setOpaque(false);
         fieldService.setOpaque(false);
         addRequiredSQLObject(fieldDevise, "T_DEVISE");
         addRequiredSQLObject(fieldEco, "T_ECO_CONTRIBUTION");
         addRequiredSQLObject(fieldHT, "T_HT");
         addRequiredSQLObject(fieldTVA, "T_TVA");
-        addRequiredSQLObject(fieldTTC, "T_TTC");
+        addRequiredSQLObject(this.fieldTTC, "T_TTC");
         addRequiredSQLObject(fieldService, "T_SERVICE");
-        fieldTTC.getDocument().addDocumentListener(new SimpleDocumentListener() {
+        this.fieldTTC.getDocument().addDocumentListener(new SimpleDocumentListener() {
             @Override
             public void update(DocumentEvent e) {
                 refreshText();
+            }
         this.allowEditable("T_TVA", false);
         this.allowEditable("T_TTC", false);
         this.allowEditable("T_SERVICE", false);
         this.allowEditable("T_POIDS", false);
-        final TotalPanel totalTTC = new TotalPanel(this.table, fieldEco, fieldHT, fieldTVA, fieldTTC, textPortHT, textRemiseHT, fieldService, null, fieldDevise, null, null,
+        final TotalPanel totalTTC = new TotalPanel(this.table, fieldEco, fieldHT, fieldTVA, this.fieldTTC, textPortHT, textRemiseHT, fieldService, null, fieldDevise, null, null,
                 (getTable().contains("ID_TAXE_PORT") ? comboTaxePort : null), null);
-        if (getTable().contains("TVA_ADJUSTMENT")) {
-            final JTextField textTvaAdujs = new JTextField(15);
-            JLabel labelTvaAdujst = new JLabel(getLabelFor("TVA_ADJUSTMENT"));
-            labelTvaAdujst.setHorizontalAlignment(SwingConstants.RIGHT);
-            cPort.gridx = 0;
-            cPort.gridy++;
-            panelPoids.add(labelTvaAdujst, cPort);
-            cPort.gridx++;
-            panelPoids.add(textTvaAdujs, cPort);
+        if (textTvaAdujs != null) {
-            addView(textTvaAdujs, "TVA_ADJUSTMENT");
             totalTTC.setTextFixTVA(textTvaAdujs);
             textTvaAdujs.getDocument().addDocumentListener(new SimpleDocumentListener() {
                 @Override
                 public void update(final DocumentEvent e) {
                     final String text = textTvaAdujs.getText();
+                        }
+                    }
                     totalTTC.updateTotal();
+                }
             });
-            DefaultGridBagConstraints.lockMinimumSize(textTvaAdujs);
+        }
         c.gridx++;
-        c.gridy--;
+        c.gridy = 0;
-        c.gridwidth = GridBagConstraints.REMAINDER;
+        c.gridwidth = 1;
-        c.gridheight = 2;
+        c.gridheight = 1;
         c.anchor = GridBagConstraints.NORTHEAST;
-        c.fill = GridBagConstraints.BOTH;
+        c.fill = GridBagConstraints.HORIZONTAL;
         c.weighty = 0;
         DefaultGridBagConstraints.lockMinimumSize(totalTTC);
         panel.add(totalTTC, c);
-        c.gridy += 3;
-        c.gridheight = 1;
-        c.fill = GridBagConstraints.NONE;
-        c.anchor = GridBagConstraints.EAST;
-        panel.add(createPanelAvoir(), c);
-        c.gridy += 4;
-        c.gridheight = 2;
-        c.fill = GridBagConstraints.NONE;
-        c.anchor = GridBagConstraints.EAST;
-        panel.add(getModuleTotalPanel(), c);
-        table.getModel().addTableModelListener(new TableModelListener() {
-            public void tableChanged(TableModelEvent e) {
-                textPoidsTotal.setText(String.valueOf(table.getPoidsTotal()));
-            }
-        });
         this.fourn.addModelListener("wantedID", new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
-                final SQLRow selectedRow2 = fourn.getSelectedRow();
+                final SQLRow selectedRow2 = FactureFournisseurSQLComponent.this.fourn.getSelectedRow();
                 if (selectedRow2 != null && !selectedRow2.isUndefined()) {
                     totalTTC.setIntraComm(selectedRow2.getBoolean("UE"));
                 } else {
                     totalTTC.setIntraComm(false);
+                }
         comboTaxePort.addValueListener(new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
-                // TODO Raccord de méthode auto-généré
                 totalTTC.updateTotal();
+            }
         });
         textRemiseHT.getDocument().addDocumentListener(new DocumentListener() {
         return AutoHideListener.listen(new JPanel());
+    }
     public int insert(SQLRow order) {
+        final SQLTable tableNum = getTable().getTable("NUMEROTATION_AUTO");
+        // incrémentation du numéro auto
+        if (tableNum.contains("FACTURE_FOURNISSEUR_START") && NumerotationAutoSQLElement.getNextNumero(getElement().getClass(), new Date()).equalsIgnoreCase(this.numero.getText().trim())) {
+            SQLRowValues rowVals = new SQLRowValues(tableNum);
+            final SQLRow rowNumAuto = tableNum.getRow(2);
+            if (rowNumAuto.getObject("FACTURE_FOURNISSEUR_START") != null) {
+                int val = rowNumAuto.getInt("FACTURE_FOURNISSEUR_START");
+                val++;
+                rowVals.put("FACTURE_FOURNISSEUR_START", new Integer(val));
+                try {
+                    rowVals.update(2);
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
         int idFacture = getSelectedID();
         idFacture = super.insert(order);
         this.table.updateField("ID_FACTURE_FOURNISSEUR", idFacture);
         // Création des articles
         sheet.showPrintAndExportAsynchronous(this.panelOO.isVisualisationSelected(), this.panelOO.isImpressionSelected(), true);
         commitAvoir(rowFactureOld, row);
+    }
     public void commitAvoir(SQLRow rowFactureOld, SQLRow rowFacture) {
         try {
+            List<String> fieldsAvoir = Arrays.asList("ID_AVOIR_FOURNISSEUR", "ID_AVOIR_FOURNISSEUR_2");
+            for (String field : fieldsAvoir) {
-            if (rowFactureOld != null && rowFactureOld.getObject("ID_AVOIR_FOURNISSEUR") != null && !rowFactureOld.isForeignEmpty("ID_AVOIR_FOURNISSEUR")
+                if (rowFactureOld != null && rowFactureOld.getObject(field) != null && !rowFactureOld.isForeignEmpty(field)
-                    && (rowFacture.getObject("ID_AVOIR_FOURNISSEUR") == null || rowFacture.isForeignEmpty("ID_AVOIR_FOURNISSEUR"))) {
+                        && (rowFacture.getObject(field) == null || rowFacture.isForeignEmpty(field))) {
-                SQLRow rowAvoir = rowFactureOld.getForeignRow("ID_AVOIR_FOURNISSEUR");
+                    SQLRow rowAvoir = rowFactureOld.getForeignRow(field);
-                SQLRowValues rowVals = rowAvoir.createEmptyUpdateRow();
+                    SQLRowValues rowVals = rowAvoir.createEmptyUpdateRow();
-                // Soldé
+                    // Soldé
-                rowVals.put("SOLDE", Boolean.FALSE);
+                    rowVals.put("SOLDE", Boolean.FALSE);
-                rowVals.update();
+                    rowVals.update();
+                }
-            // on solde l'avoir
+                // on solde l'avoir
-            if (rowFacture.getObject("ID_AVOIR_FOURNISSEUR") != null && !rowFacture.isForeignEmpty("ID_AVOIR_FOURNISSEUR")) {
+                if (rowFacture.getObject(field) != null && !rowFacture.isForeignEmpty(field)) {
-                SQLRow rowAvoir = rowFacture.getForeignRow("ID_AVOIR_FOURNISSEUR");
+                    SQLRow rowAvoir = rowFacture.getForeignRow(field);
-                SQLRowValues rowVals = rowAvoir.createEmptyUpdateRow();
+                    SQLRowValues rowVals = rowAvoir.createEmptyUpdateRow();
-                rowVals.put("SOLDE", Boolean.TRUE);
+                    rowVals.put("SOLDE", Boolean.TRUE);
-                rowVals.update();
+                    rowVals.update();
+                }
+            }
         } catch (SQLException e) {
             ExceptionHandler.handle("Erreur lors la mise à jour de l'avoir associée!", e);
+        }
+    }
         SQLRow rowsComm = SQLBackgroundTableCache.getInstance().getCacheForTable(eltComm.getTable()).getFirstRowContains(idUser, eltComm.getTable().getField("ID_USER_COMMON"));
         if (rowsComm != null) {
             rowVals.put("ID_COMMERCIAL", rowsComm.getID());
+        }
+        if (getTable().getTable("NUMEROTATION_AUTO").contains("FACTURE_FOURNISSEUR_START")) {
+            rowVals.put("NUMERO", NumerotationAutoSQLElement.getNextNumero(getElement().getClass(), new Date()));
+        }
         rowVals.put("T_HT", Long.valueOf(0));
         rowVals.put("T_SERVICE", Long.valueOf(0));
         rowVals.put("T_DEVISE", Long.valueOf(0));
         rowVals.put("T_TVA", Long.valueOf(0));
         rowVals.put("T_TTC", Long.valueOf(0));
         cA.weightx = 0;
         panelAvoir.add(labelTotalAvoir, cA);
         cA.gridx++;
         cA.weightx = 0;
         panelAvoir.add(this.textNetAPayer, cA);
-        addView(textNetAPayer, "NET_A_PAYER");
+        addView(this.textNetAPayer, "NET_A_PAYER");
         this.textNetAPayer.setHorizontalAlignment(SwingConstants.RIGHT);
+        JLabel labelAvoir2 = new JLabel(getLabelFor("ID_AVOIR_FOURNISSEUR_2"));
+        labelAvoir.setHorizontalAlignment(SwingConstants.RIGHT);
+        cA.gridx = 0;
+        cA.gridy++;
+        cA.weightx = 1;
+        labelAvoir.setHorizontalAlignment(SwingConstants.RIGHT);
+        panelAvoir.add(labelAvoir2, cA);
+        cA.weightx = 0;
+        cA.gridx++;
+        this.avoirFourn2 = new ElementComboBox();
+        this.avoirFourn2.setAddIconVisible(false);
+        panelAvoir.add(this.avoirFourn2, cA);
+        addView(this.avoirFourn2, "ID_AVOIR_FOURNISSEUR_2");
         addView(this.avoirFourn, "ID_AVOIR_FOURNISSEUR");
-        addView(avoirTTC, "AVOIR_TTC");
+        addView(this.avoirTTC, "AVOIR_TTC");
-        this.avoirFourn.addValueListener(new PropertyChangeListener() {
+        this.avoirFourn.addModelListener("wantedID", new PropertyChangeListener() {
             public void propertyChange(PropertyChangeEvent evt) {
+                if (!isFilling()) {
-                refreshText();
+                    refreshText();
+                }
+            }
         });
+        this.avoirFourn2.addModelListener("wantedID", new PropertyChangeListener() {
+            public void propertyChange(PropertyChangeEvent evt) {
+                if (!isFilling()) {
+                    refreshText();
+                }
+            }
+        });
         return panelAvoir;
+    }
     private void refreshText() {
         Number n = this.fieldTTC.getValue();
         long totalAvoirTTC = 0;
         long netAPayer = 0;
-        long ttc = 0;
         if (n != null) {
             netAPayer = n.longValue();
-            ttc = n.longValue();
+        }
+        List<ElementComboBox> boxAvoir = Arrays.asList(this.avoirFourn, this.avoirFourn2);
+        for (ElementComboBox elementComboBox : boxAvoir) {
-        if (this.avoirFourn.getSelectedId() > 1) {
+            if (elementComboBox.getWantedID() > 1) {
-            SQLTable tableAvoir = getTable().getForeignTable("ID_AVOIR_FOURNISSEUR");
+                SQLTable tableAvoir = getTable().getForeignTable("ID_AVOIR_FOURNISSEUR");
-            if (n != null) {
+                if (n != null) {
-                SQLRow rowAvoir = tableAvoir.getRow(this.avoirFourn.getSelectedId());
+                    SQLRow rowAvoir = tableAvoir.getRow(elementComboBox.getWantedID());
-                long totalAvoir = ((Number) rowAvoir.getObject("MONTANT_TTC")).longValue();
+                    long totalAvoir = ((Number) rowAvoir.getObject("MONTANT_TTC")).longValue();
-                if (getSelectedID() > 1) {
+                    if (getSelectedID() > 1) {
-                    SQLRow row = getTable().getRow(getSelectedID());
+                        SQLRow row = getTable().getRow(getSelectedID());
-                    int idAvoirOld = row.getInt("ID_AVOIR_FOURNISSEUR");
+                        int idAvoirOld = row.getInt("ID_AVOIR_FOURNISSEUR");
-                    if (idAvoirOld == rowAvoir.getID()) {
+                        if (idAvoirOld == rowAvoir.getID()) {
-                        totalAvoir += Long.valueOf(row.getObject("AVOIR_TTC").toString());
+                            totalAvoir += Long.valueOf(row.getObject("AVOIR_TTC").toString());
+                        }
+                    }
-                long l = ttc - totalAvoir;
+                    long l = netAPayer - totalAvoir;
-                if (l < 0) {
+                    if (l < 0) {
-                    l = 0;
+                        l = 0;
-                    totalAvoirTTC = ttc;
+                        totalAvoirTTC = netAPayer;
-                } else {
+                    } else {
-                    totalAvoirTTC = totalAvoir;
+                        totalAvoirTTC = totalAvoir;
+                    }
-                netAPayer = l;
+                    netAPayer = l;
+                }
+            }
+        }
         this.textNetAPayer.setValue(netAPayer);
         this.avoirTTC.setValue(totalAvoirTTC);
+    }
             SQLRowValues rowVals = new SQLRowValues(fact.getTable());
             rowVals.put("ID_FOURNISSEUR", row.getForeignID("ID_FOURNISSEUR"));
             if (!row.isForeignEmpty("ID_COMPTE_PCE")) {
                 rowVals.put("ID_COMPTE_PCE", row.getForeignID("ID_COMPTE_PCE"));
+            }
-            // if (getTable().contains("ID_NUMEROTATION_AUTO")) {
-            // rowVals.put("NUMERO",
-            // NumerotationAutoSQLElement.getNextNumero(SaisieVenteFactureSQLElement.class, new
-            // Date(), row.getForeign("ID_NUMEROTATION_AUTO")));
-            // } else {
-            // rowVals.put("NUMERO",
-            // NumerotationAutoSQLElement.getNextNumero(SaisieVenteFactureSQLElement.class, new
-            // Date()));
-            // }
             rowVals.put("NOM", row.getObject("NOM"));
             this.select(rowVals);
+        }
         // On duplique les elements de facture
             for (SQLRow rowElt : myListItem) {
                 SQLRowValues rowVals = rowElt.createUpdateRow();
                 rowVals.clearPrimaryKeys();
+                if (rowVals.getTable().contains("ID_COMMANDE_ELEMENT")) {
+                    rowVals.putEmptyLink("ID_COMMANDE_ELEMENT");
+                }
+                if (rowVals.getTable().contains("ID_BON_RECEPTION_ELEMENT")) {
+                    rowVals.putEmptyLink("ID_BON_RECEPTION_ELEMENT");
+                }
                 this.table.getModel().addRow(rowVals);
                 int rowIndex = this.table.getModel().getRowCount() - 1;
                 this.table.getModel().fireTableModelModified(rowIndex);
+            }
         } else {

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/supplychain/order/component/FactureFournisseurSQLComponent.java - Rev 177 → 180