WebSVN - OpenConcerto - Diff - Rev 180 and 182 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/quote/component/DevisSQLComponent.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.
 import org.openconcerto.sql.preferences.SQLPreferences;
 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.sqlobject.itemview.SimpleRowItemView;
 import org.openconcerto.sql.ui.RadioButtons;
 import org.openconcerto.sql.users.UserManager;
 import org.openconcerto.sql.users.rights.UserRightsManager;
 import org.openconcerto.sql.view.EditFrame;
 import org.openconcerto.ui.DefaultGridBagConstraints;
 import org.openconcerto.ui.FormLayouter;
 import org.openconcerto.ui.JDate;
 import org.openconcerto.ui.TitledSeparator;
 import org.openconcerto.ui.VFlowLayout;
 import org.openconcerto.ui.component.ITextArea;
+import org.openconcerto.ui.valuewrapper.ValidatedValueWrapper;
 import org.openconcerto.utils.ExceptionHandler;
 import org.openconcerto.utils.GestionDevise;
 import org.openconcerto.utils.cc.ITransformer;
 import org.openconcerto.utils.checks.ValidState;
 import org.openconcerto.utils.text.SimpleDocumentListener;
         c.weightx = 0;
         c.gridwidth = 1;
         c.fill = GridBagConstraints.HORIZONTAL;
         this.add(labelClient, c);
+        final ValidatedValueWrapper<Integer> clientValidatedValueWrapper = ValidatedValueWrapper.add(new ElementComboBox(), new ITransformer<Integer, ValidState>() {
+            @Override
+            public ValidState transformChecked(Integer t) {
+                ElementComboBox boxClient = (ElementComboBox) getView("ID_CLIENT").getComp();
+                if (getMode() == Mode.INSERTION && boxClient != null && !boxClient.isEmpty() && boxClient.getSelectedRow().getBoolean("BLOQUE")) {
+                    return ValidState.create(false, "Les intéractions avec ce client sont verrouillées.");
+                } else {
+                    return ValidState.getTrueInstance();
+                }
+            }
+        });
-        final ElementComboBox comboClient = new ElementComboBox();
+        final ElementComboBox comboClient = (ElementComboBox) clientValidatedValueWrapper.getComp();
+        addView(new SimpleRowItemView<Integer>(clientValidatedValueWrapper), "ID_CLIENT", REQ);
         c.gridx++;
         c.gridwidth = 1;
         c.weightx = 0;
         c.weighty = 0;
         c.fill = GridBagConstraints.NONE;
         this.add(comboClient, c);
-        addRequiredSQLObject(comboClient, "ID_CLIENT");
         comboClient.addModelListener("wantedID", new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
                 if (wantedID != SQLRow.NONEXISTANT_ID && wantedID >= SQLRow.MIN_VALID_ID) {
                     final SQLRow rowClient = getTable().getForeignTable("ID_CLIENT").getRow(wantedID);
                     if (!rowClient.isForeignEmpty("ID_COMMERCIAL")) {
                         comboCommercial.setValue(rowClient.getForeignID("ID_COMMERCIAL"));
+                    }
+                    String alerte = rowClient.getString("ALERTE");
+                    if (!isFilling() && alerte != null && alerte.trim().length() > 0) {
+                        JOptionPane.showMessageDialog(comboClient, alerte);
+                    }
+                }
+            }
         });
         if (this.displayDpt) {
             c.gridx++;
             JDate dateValidite = new JDate();
             this.add(dateValidite, c);
             this.addView(dateValidite, "DATE_VALIDITE");
+        }
+        if (getTable().getFieldsName().contains("DATE_LIVRAISON")) {
+            c.gridy++;
+            c.gridx = 0;
+            final JLabel labelTrans = new JLabel(getLabelFor("TRANSFORMATION"));
+            labelTrans.setHorizontalAlignment(SwingConstants.RIGHT);
+            this.add(labelTrans, c);
+            final SQLTextCombo textTrans = new SQLTextCombo();
+            c.gridx++;
+            c.weightx = 1;
+            c.gridwidth = 1;
+            c.fill = GridBagConstraints.BOTH;
+            this.add(textTrans, c);
+            this.addView(textTrans, "TRANSFORMATION");
+            c.gridx++;
+            c.fill = GridBagConstraints.HORIZONTAL;
+            this.add(new JLabel(getLabelFor("DATE_LIVRAISON"), SwingConstants.RIGHT), c);
+            c.fill = GridBagConstraints.NONE;
+            c.gridx++;
+            JDate dateLivraison = new JDate();
+            this.add(dateLivraison, c);
+            this.addView(dateLivraison, "DATE_LIVRAISON");
+        }
         // Tarif
         if (this.getTable().getFieldsName().contains("ID_TARIF")) {
             // TARIF
             c.gridy++;
             c.gridx = 0;
         addSQLObject(this.infos, "INFOS");
         comboClient.addModelListener("wantedID", new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent arg0) {
-                if (!isFilling()) {
-                    Integer id = comboClient.getWantedID();
+                Integer id = comboClient.getWantedID();
-                    if (id > 1) {
+                if (id > 1) {
+                    SQLRow rowClient = comboClient.getElement().getTable().getRow(id);
+                    if (rowClient.getObject("ID_CATEGORIE_COMPTABLE") != null && !rowClient.isForeignEmpty("ID_CATEGORIE_COMPTABLE")) {
+                        totalTTC.setCategorieComptable(rowClient.getForeign("ID_CATEGORIE_COMPTABLE"));
+                        table.setRowCatComptable(rowClient.getForeign("ID_CATEGORIE_COMPTABLE"));
+                    } else {
+                        totalTTC.setCategorieComptable(null);
+                        table.setRowCatComptable(null);
+                    }
+                }
+                if (!isFilling()) {
+                    if (id > 1) {
                         SQLRow row = comboClient.getElement().getTable().getRow(id);
                         if (comboClient.getElement().getTable().getFieldsName().contains("ID_TARIF")) {
                             SQLRowAccessor foreignRow = row.getForeignRow("ID_TARIF");
                             if (!foreignRow.isUndefined() && (boxTarif.getSelectedRow() == null || boxTarif.getSelectedId() != foreignRow.getID())
         DefaultGridBagConstraints.lockMinimumSize(comboClient);
+    }
     private enum Type_Diff {
         SITE("SITE"), DONNEUR_ORDRE("DONNEUR");
         private final String name;
         private Type_Diff(String name) {
             this.name = name;
+        }
             // generation du document
             try {
                 final DevisXmlSheet sheet = new DevisXmlSheet(getTable().getRow(idDevis));
                 sheet.createDocumentAsynchronous();
-                sheet.showPrintAndExportAsynchronous(DevisSQLComponent.this.panelOO.isVisualisationSelected(), DevisSQLComponent.this.panelOO.isImpressionSelected(), true);
+                sheet.showPrintAndExportAsynchronous(DevisSQLComponent.this.panelOO.isVisualisationSelected(), DevisSQLComponent.this.panelOO.isImpressionSelected(), true, getElement(),
+                        getElement().getTable().getRow(idDevis));
             } catch (Exception e) {
                 ExceptionHandler.handle("Impossible de créer le devis", e);
+            }
             // incrémentation du numéro auto
         this.table.createArticle(getSelectedID(), getElement());
         // generation du document
         try {
+            final SQLRow row = getTable().getRow(getSelectedID());
-            final DevisXmlSheet sheet = new DevisXmlSheet(getTable().getRow(getSelectedID()));
+            final DevisXmlSheet sheet = new DevisXmlSheet(row);
             sheet.createDocumentAsynchronous();
-            sheet.showPrintAndExportAsynchronous(DevisSQLComponent.this.panelOO.isVisualisationSelected(), DevisSQLComponent.this.panelOO.isImpressionSelected(), true);
+            sheet.showPrintAndExportAsynchronous(DevisSQLComponent.this.panelOO.isVisualisationSelected(), DevisSQLComponent.this.panelOO.isImpressionSelected(), true, getElement(), row);
         } catch (Exception e) {
             ExceptionHandler.handle("Impossible de créer le devis", e);
+        }
+    }
             for (final SQLRow rowElt : myListItem) {
                 final SQLRowValues rowVals = rowElt.createUpdateRow();
                 rowVals.clearPrimaryKeys();
-                this.table.getModel().addRow(rowVals);
+                this.table.getModel().addRow(rowVals, false);
                 final int rowIndex = this.table.getModel().getRowCount() - 1;
                 this.table.getModel().fireTableModelModified(rowIndex);
+            }
         } else {
             this.table.getModel().clearRows();

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/quote/component/DevisSQLComponent.java - Rev 180 → 182