WebSVN - OpenConcerto - Diff - Rev 149 and 156 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/invoice/component/SaisieVenteFactureSQLComponent.java

 import org.openconcerto.sql.sqlobject.ElementComboBox;
 import org.openconcerto.sql.sqlobject.JUniqueTextField;
 import org.openconcerto.sql.sqlobject.SQLRequestComboBox;
 import org.openconcerto.sql.sqlobject.SQLTextCombo;
 import org.openconcerto.sql.users.UserManager;
+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.RowValuesTable;
 import org.openconcerto.sql.view.list.RowValuesTableModel;
 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.component.InteractionMode;
 import org.openconcerto.utils.ExceptionHandler;
 import org.openconcerto.utils.GestionDevise;
-import org.openconcerto.utils.ProductInfo;
 import org.openconcerto.utils.cc.IFactory;
 import org.openconcerto.utils.text.SimpleDocumentListener;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.SQLException;
     private PropertyChangeListener listenerModeReglDefaut = new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent arg0) {
             int idCli = SaisieVenteFactureSQLComponent.this.comboClient.getWantedID();
             if (idCli > 1) {
                 SQLRow rowCli = SaisieVenteFactureSQLComponent.this.client.getTable().getRow(idCli);
-                if (!rowCli.isForeignEmpty("ID_COMMERCIAL")) {
+                if (!isFilling() && !rowCli.isForeignEmpty("ID_COMMERCIAL")) {
                     comboCommercial.setValue(rowCli.getForeignID("ID_COMMERCIAL"));
+                }
+                if (rowCli.getFields().contains("ID_CATEGORIE_COMPTABLE") && rowCli.getObject("ID_CATEGORIE_COMPTABLE") != null && !rowCli.isForeignEmpty("ID_CATEGORIE_COMPTABLE")) {
+                    totalTTC.setCategorieComptable(rowCli.getForeign("ID_CATEGORIE_COMPTABLE"));
+                    tableFacture.setRowCatComptable(rowCli.getForeign("ID_CATEGORIE_COMPTABLE"));
+                } else {
+                    totalTTC.setCategorieComptable(null);
+                    tableFacture.setRowCatComptable(null);
+                }
                 if (getMode() == SQLComponent.Mode.INSERTION || !isFilling()) {
                     SQLElement sqleltModeRegl = Configuration.getInstance().getDirectory().getElement("MODE_REGLEMENT");
                     int idModeRegl = rowCli.getInt("ID_MODE_REGLEMENT");
                     if (idModeRegl > 1) {
                         SQLRow rowModeRegl = sqleltModeRegl.getTable().getRow(idModeRegl);
                         SQLRowValues rowValsModeRegl = rowModeRegl.createUpdateRow();
                         rowValsModeRegl.clearPrimaryKeys();
                         SaisieVenteFactureSQLComponent.this.eltModeRegl.setValue(rowValsModeRegl);
+                    }
+                }
+            } else {
+                totalTTC.setCategorieComptable(null);
+                tableFacture.setRowCatComptable(null);
+            }
             Where w = new Where(SaisieVenteFactureSQLComponent.this.tableAvoir.getField("SOLDE"), "=", Boolean.FALSE);
             if (SaisieVenteFactureSQLComponent.this.comboClient.isEmpty()) {
                 w = w.and(new Where(getTable().getBase().getTable("AVOIR_CLIENT").getField("ID_CLIENT"), "=", -1));
     private PropertyChangeListener changeCompteListener;
     private PropertyChangeListener changeClientListener;
     private ISQLCompteSelector compteSelService;
     private JLabel labelCompteServ;
-    private ElementComboBox comboCommercial;
+    private ElementComboBox comboCommercial, comboPoleProduit;
     private ElementComboBox comboVerificateur = new ElementComboBox();;
     private SQLTable tableBanque = getTable().getTable(BanqueSQLElement.TABLENAME);
     private final SQLRowAccessor defaultNum;
         this.add(addP, c);
         c.gridy++;
         c.gridwidth = 1;
-            if (getTable().contains("ID_POLE_PRODUIT")) {
-                JLabel labelPole = new JLabel(getLabelFor("ID_POLE_PRODUIT"));
-                labelPole.setHorizontalAlignment(SwingConstants.RIGHT);
-                this.add(labelPole, c);
-                c.gridx++;
-                ElementComboBox pole = new ElementComboBox();
-                this.add(pole, c);
-                this.addSQLObject(pole, "ID_POLE_PRODUIT");
-                c.gridy++;
-                c.gridwidth = 1;
-                c.gridx = 0;
-            }
         /*******************************************************************************************
          * * RENSEIGNEMENTS
          ******************************************************************************************/
         // Ligne 1 : Numero de facture
         JLabel labelNum = new JLabel(getLabelFor("NUMERO"));
         this.addSQLObject(textLibelle, "NOM");
         c.fill = GridBagConstraints.HORIZONTAL;
         this.comboCommercial = new ElementComboBox(false);
         // Commercial
-        String field;
-            field = "ID_COMMERCIAL";
+            this.addRequiredSQLObject(this.comboCommercial, "ID_COMMERCIAL");
         c.gridx++;
         c.weightx = 0;
         c.fill = GridBagConstraints.HORIZONTAL;
-        this.add(new JLabel(getLabelFor(field), SwingConstants.RIGHT), c);
+        this.add(new JLabel(getLabelFor("ID_COMMERCIAL"), SwingConstants.RIGHT), c);
         c.gridx++;
         c.weightx = 1;
         c.fill = GridBagConstraints.NONE;
         this.add(this.comboCommercial, c);
-        this.addRequiredSQLObject(this.comboCommercial, field);
         // Client
         c.gridx = 0;
         c.gridy++;
         c.weightx = 0;
         c.fill = GridBagConstraints.HORIZONTAL;
+                }
             });
+        }
+        if (getTable().contains("ID_POLE_PRODUIT")) {
+            JLabel labelPole = new JLabel(getLabelFor("ID_POLE_PRODUIT"));
+            labelPole.setHorizontalAlignment(SwingConstants.RIGHT);
+            c.gridx++;
+            this.add(labelPole, c);
+            c.gridx++;
+            this.comboPoleProduit = new ElementComboBox();
+            this.add(this.comboPoleProduit, c);
+            this.addSQLObject(this.comboPoleProduit, "ID_POLE_PRODUIT");
+            DefaultGridBagConstraints.lockMinimumSize(this.comboPoleProduit);
+        }
         if (
         getTable().contains("ID_ECHEANCIER_CCI")) {
             // Echeancier
             c.gridy++;
                     if (selAffaire.getSelectedRow() != null) {
                         echeancier.getRequest().setWhere(new Where(contactElement.getTable().getField("ID_AFFAIRE"), "=", selAffaire.getSelectedRow().getID()));
                         if (!isFilling()) {
                             SQLRow rowPole = selAffaire.getSelectedRow().getForeignRow("ID_POLE_PRODUIT");
-                            comboCommercial.setValue(rowPole);
+                            comboPoleProduit.setValue(rowPole);
+                        }
                     } else {
                         echeancier.getRequest().setWhere(null);
+                    }
+                }
                     // TODO Raccord de méthode auto-généré
                     totalTTC.updateTotal();
+                }
             });
+        }
+        final DeviseField textFraisDocHT = new DeviseField();
+        final SQLRequestComboBox boxTaxeFraisDoc = new SQLRequestComboBox(false, 8);
+        SQLPreferences prefs = SQLPreferences.getMemCached(getTable().getDBRoot());
+        final boolean showFrais = prefs.getBoolean(GestionCommercialeGlobalPreferencePanel.FRAIS_DOCUMENT, false);
+        if (showFrais) {
+            JLabel labelFraisDocHT = new JLabel(getLabelFor("FRAIS_DOCUMENT_HT"));
+            labelFraisDocHT.setHorizontalAlignment(SwingConstants.RIGHT);
+            cFrais.gridx = 1;
+            cFrais.gridy++;
+            panelFrais.add(labelFraisDocHT, cFrais);
+            cFrais.gridx++;
+            panelFrais.add(textFraisDocHT, cFrais);
+            addView(textFraisDocHT, "FRAIS_DOCUMENT_HT");
+            JLabel labelTaxeFraisDocHT = new JLabel(getLabelFor("ID_TAXE_FRAIS_DOCUMENT"));
+            labelTaxeFraisDocHT.setHorizontalAlignment(SwingConstants.RIGHT);
+            cFrais.gridx = 1;
+            cFrais.gridy++;
+            panelFrais.add(labelTaxeFraisDocHT, cFrais);
+            cFrais.gridx++;
+            panelFrais.add(boxTaxeFraisDoc, cFrais);
+            this.addView(boxTaxeFraisDoc, "ID_TAXE_FRAIS_DOCUMENT", REQ);
+            boxTaxeFraisDoc.addValueListener(new PropertyChangeListener() {
+                @Override
+                public void propertyChange(PropertyChangeEvent evt) {
+                    totalTTC.updateTotal();
+                }
+            });
+            textFraisDocHT.getDocument().addDocumentListener(new SimpleDocumentListener() {
+                @Override
+                public void update(final DocumentEvent e) {
+                    totalTTC.updateTotal();
+                }
+            });
+            comboClient.addModelListener("wantedID", new PropertyChangeListener() {
+                @Override
+                public void propertyChange(PropertyChangeEvent evt) {
+                    if (!isFilling()) {
+                        final int wantedID = comboClient.getWantedID();
+                        long l = 0;
+                        if (wantedID != SQLRow.NONEXISTANT_ID && wantedID >= SQLRow.MIN_VALID_ID) {
+                            final SQLRow rowClient = getTable().getForeignTable("ID_CLIENT").getRow(wantedID);
+                            SQLRow rowFrais = rowClient.getForeign("ID_FRAIS_DOCUMENT");
+                            if (rowFrais != null && !rowFrais.isUndefined()) {
+                                l = rowFrais.getLong("MONTANT_HT");
+                                boxTaxeFraisDoc.setValue(rowFrais.getForeignID("ID_TAXE"));
+                            }
+                            textFraisDocHT.setValue(l);
+                        }
+                    }
+                }
+            });
+        }
         // Remise
         JLabel labelRemiseHT = new JLabel(getLabelFor("REMISE_HT"));
         labelRemiseHT.setHorizontalAlignment(SwingConstants.RIGHT);
         cFrais.gridy++;
         this.allowEditable("T_SERVICE", false);
         this.allowEditable("T_POIDS", false);
         totalTTC = new TotalPanel(this.tableFacture, fieldTEco, fieldHT, fieldTVA, this.fieldTTC, this.textPortHT, this.textRemiseHT, fieldService, fieldTHA, fieldDevise, poids, null,
                 (getTable().contains("ID_TAXE_PORT") ? boxTaxePort : null), null);
+        totalTTC.setTextFraisDoc(textFraisDocHT, boxTaxeFraisDoc);
         DefaultGridBagConstraints.lockMinimumSize(totalTTC);
         cBottom.gridx++;
         cBottom.weightx = 1;
         cBottom.anchor = GridBagConstraints.EAST;
         cBottom.fill = GridBagConstraints.HORIZONTAL;
     public int insert(SQLRow order) {
         return commit(order);
+    }
     private void createCompteServiceAuto(int id) throws SQLException {
-        SQLRow rowPole = this.comboCommercial.getSelectedRow();
+        SQLRow rowPole = this.comboPoleProduit.getSelectedRow();
         SQLRow rowVerif = this.comboVerificateur.getSelectedRow();
         String verifInitiale = getInitialesFromVerif(rowVerif);
         int idCpt = ComptePCESQLElement.getId("706" + rowPole.getString("CODE") + verifInitiale, "Service " + rowPole.getString("NOM") + " " + rowVerif.getString("NOM"));
         SQLRowValues rowVals = this.getTable().getRow(id).createEmptyUpdateRow();
         rowVals.put("ID_COMPTE_PCE_SERVICE", idCpt);
+        }
         if (getTable().contains("ID_TAXE_PORT")) {
             SQLRow taxeDefault = TaxeCache.getCache().getFirstTaxe();
             vals.put("ID_TAXE_PORT", taxeDefault.getID());
+        }
+        if (getTable().contains("ID_TAXE_FRAIS_DOCUMENT")) {
+            SQLRow taxeDefault = TaxeCache.getCache().getFirstTaxe();
+            vals.put("ID_TAXE_FRAIS_DOCUMENT", taxeDefault.getID());
+        }
         vals.put("ID_COMPTE_PCE_SERVICE", idCompteVenteService);
         System.err.println("Defaults " + vals);
         return vals;
+    }

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/component/SaisieVenteFactureSQLComponent.java - Rev 149 → 156