WebSVN - OpenConcerto - Diff - Rev 156 and 174 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/supplychain/order/component/CommandeSQLComponent.java

 import org.openconcerto.erp.core.supplychain.stock.element.StockItemsUpdater.TypeStockUpdate;
 import org.openconcerto.erp.core.supplychain.stock.element.StockLabel;
 import org.openconcerto.erp.generationDoc.gestcomm.CommandeXmlSheet;
 import org.openconcerto.erp.panel.PanelOOSQLComponent;
 import org.openconcerto.erp.preferences.DefaultNXProps;
+import org.openconcerto.erp.preferences.GestionCommercialeGlobalPreferencePanel;
 import org.openconcerto.erp.utils.TM;
 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.Where;
 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.users.UserManager;
 import org.openconcerto.sql.view.EditFrame;
 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.component.ITextCombo;
 import org.openconcerto.ui.component.InteractionMode;
 import org.openconcerto.ui.preferences.DefaultProps;
 import org.openconcerto.utils.ExceptionHandler;
+import org.openconcerto.utils.checks.ValidState;
 import java.awt.Color;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.sql.SQLException;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
     public ElementComboBox getBoxFournisseur() {
         return this.fourn;
+    }
+    @Override
+    protected Set<String> createRequiredNames() {
+        final Set<String> s = new HashSet<>(4);
+        if (getTable().contains("ID_TYPE_CMD")) {
+            s.add("ID_TYPE_CMD");
+            s.add("DA1");
+            s.add("ID_POLE_PRODUIT");
+        }
+        return s;
+    }
     public void addViews() {
         this.setLayout(new GridBagLayout());
         final GridBagConstraints c = new DefaultGridBagConstraints();
         // Numero du commande
                     if (rowF.getObject("ID_CATEGORIE_COMPTABLE") != null && !rowF.isForeignEmpty("ID_CATEGORIE_COMPTABLE")) {
                         table.setRowCatComptable(rowF.getForeign("ID_CATEGORIE_COMPTABLE"));
                     } else {
                         table.setRowCatComptable(null);
+                    }
+                    if (getTable().contains("OFFRE_COM")) {
+                        ((SQLTextCombo) getView("OFFRE_COM").getComp()).setValue(rowF.getString("RESPONSABLE"));
+                    }
                 } else {
                     table.setRowCatComptable(null);
+                }
+            }
         });
+        Boolean useCommandeEnCours = SQLPreferences.getMemCached(getElement().getTable().getDBRoot()).getBoolean(GestionCommercialeGlobalPreferencePanel.COMMANDE_FOURNISSEUR_EN_COURS, false);
-        if (!getTable().getFieldsName().contains("LIVRER")) {
+        if (!getTable().getFieldsName().contains("LIVRER") && useCommandeEnCours) {
             // Commande en cours
             JCheckBox boxEnCours = new JCheckBox(getLabelFor("EN_COURS"));
             c.gridx += 2;
             c.weightx = 0;
             c.fill = GridBagConstraints.HORIZONTAL;
         }, row, row.getReferentRows(getTable().getTable("COMMANDE_ELEMENT")), TypeStockUpdate.VIRTUAL_RECEPT);
         stockUpdater.update();
+    }
+    @Override
+    public synchronized ValidState getValidState() {
+        if (getTable().contains("ID_TYPE_CMD") && getTable().contains("ID_AFFAIRE") && getTable().getTable("COMMANDE_ELEMENT").contains("ID_AFFAIRE")) {
+            SQLRequestComboBox boxAff = (SQLRequestComboBox) getView("ID_AFFAIRE").getComp();
+            final SQLRow selectedAff = boxAff.getSelectedRow();
+            if (selectedAff == null || selectedAff.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_AFFAIRE") == null || rowVals.isForeignEmpty("ID_AFFAIRE"))) {
+                        return ValidState.create(false, "Aucune affaire globale sélectionnée et une ligne avec une quantité > 0 n'est pas affectée à une affaire!");
+                    }
+                }
+            } else {
+                ValidState.create(false, "Aucune affaire globale sélectionnée!");
+            }
+        }
+        return super.getValidState();
+    }
     public void setDefaults() {
         this.resetValue();
         this.numeroUniqueCommande.setText(NumerotationAutoSQLElement.getNextNumero(getElement().getClass()));
         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/supplychain/order/component/CommandeSQLComponent.java @ 156 - Rev 156 → 174