WebSVN - OpenConcerto - Diff - Rev 180 and 182 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/AbstractAchatArticleItemTable.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.view.list.RowValuesTableModel;
 import org.openconcerto.sql.view.list.SQLTableElement;
 import org.openconcerto.sql.view.list.ValidStateChecker;
 import org.openconcerto.ui.preferences.DefaultProps;
 import org.openconcerto.utils.DecimalUtils;
+import org.openconcerto.utils.ExceptionHandler;
 import org.openconcerto.utils.Tuple3;
 import org.openconcerto.utils.i18n.TranslationManager;
 import java.awt.Component;
 import java.awt.event.ActionEvent;
     public AbstractAchatArticleItemTable() {
         super();
+    }
     @Override
+    public AutoCompletionManager getCodeCompletionManager() {
+        return this.m;
+    }
+    @Override
     protected void setModel(RowValuesTableModel model) {
         super.setModel(model);
         model.addTableModelListener(new TableModelListener() {
             @Override
         final boolean createAuto = prefs.getBoolean(GestionArticleGlobalPreferencePanel.CREATE_ARTICLE_AUTO, true);
         final boolean showEco = prefs.getBoolean(AbstractVenteArticleItemTable.SHOW_ECO_CONTRIBUTION_COLUMNS, false);
         final boolean showDmdAchat = prefs.getBoolean(GestionArticleGlobalPreferencePanel.ACTIVE_DEMANDE_ACHAT, false);
         final boolean showDevise = prefs.getBoolean(AbstractVenteArticleItemTable.ARTICLE_SHOW_DEVISE, false);
         this.supplierCode = prefs.getBoolean(GestionArticleGlobalPreferencePanel.SUPPLIER_PRODUCT_CODE, false);
+        final boolean withDeclinaison = prefs.getBoolean(GestionArticleGlobalPreferencePanel.ACTIVER_DECLINAISON, false);
         final List<SQLTableElement> list = new Vector<SQLTableElement>();
         final SQLTableElement eNiveau = new SQLTableElement(e.getTable().getField("NIVEAU")) {
             @Override
             public void setValueFrom(SQLRowValues row, Object value) {
         // Article
         SQLTableElement tableElementDepot = new SQLTableElement(e.getTable().getField("ID_DEPOT_STOCK"), true, true, true);
         list.add(tableElementDepot);
+        Set<String> fieldsName = e.getTable().getFieldsName();
-        if (e.getTable().getFieldsName().contains("ID_FAMILLE_ARTICLE")) {
+        if (fieldsName.contains("ID_FAMILLE_ARTICLE")) {
             final SQLTableElement tableFamille = new SQLTableElement(e.getTable().getField("ID_FAMILLE_ARTICLE"));
             list.add(tableFamille);
+        }
-        if (e.getTable().getFieldsName().contains("ID_ECO_CONTRIBUTION")) {
+        if (fieldsName.contains("ID_ECO_CONTRIBUTION")) {
             this.tableElementEcoID = new SQLTableElement(e.getTable().getField("ID_ECO_CONTRIBUTION"));
             list.add(this.tableElementEcoID);
+        }
-        if (e.getTable().getFieldsName().contains("INCOTERM")) {
+        if (fieldsName.contains("INCOTERM")) {
             final SQLTableElement tableElementInco = new SQLTableElement(e.getTable().getField("INCOTERM"));
             tableElementInco.setEditable(false);
             list.add(tableElementInco);
+        }
-        if (e.getTable().getFieldsName().contains("PREBILAN")) {
+        if (fieldsName.contains("PREBILAN")) {
             final SQLTableElement tableElementPre = new SQLTableElement(e.getTable().getField("PREBILAN"), BigDecimal.class);
             tableElementPre.setRenderer(new DeviseTableCellRenderer());
             list.add(tableElementPre);
+        }
         // Code article
         final SQLTableElement tableElementCode = new SQLTableElement(e.getTable().getField("CODE"), String.class,
-                new ITextArticleWithCompletionCellEditor(e.getTable().getTable("ARTICLE"), e.getTable().getTable("ARTICLE_FOURNISSEUR"))) {
+                new ITextArticleWithCompletionCellEditor(e.getTable().getTable("ARTICLE"), e.getTable().getTable("ARTICLE_FOURNISSEUR"), withDeclinaison)) {
             @Override
             public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
                 boolean b = super.isCellEditable(vals, rowIndex, columnIndex);
                 return b && !isFromTranferred(vals);
+            }
         };
         list.add(tableElementNom);
+        List<String> fieldDecl = new ArrayList<>();
+        if (withDeclinaison) {
+            for (String string : fieldsName) {
+                if (string.startsWith("ID_ARTICLE_DECLINAISON")) {
+                    final SQLTableElement tableElementDeclinaison = new SQLTableElement(e.getTable().getField(string));
+                    tableElementDeclinaison.setEditable(false);
+                    fieldDecl.add(string);
+                    list.add(tableElementDeclinaison);
+                }
+            }
+        }
-        if (e.getTable().getFieldsName().contains("DESCRIPTIF")) {
+        if (fieldsName.contains("DESCRIPTIF")) {
             final SQLTableElement tableElementDesc = new SQLTableElement(e.getTable().getField("DESCRIPTIF"));
             list.add(tableElementDesc);
+        }
-        if (e.getTable().getFieldsName().contains("COLORIS")) {
+        if (fieldsName.contains("COLORIS")) {
             final SQLTableElement tableElementColoris = new SQLTableElement(e.getTable().getField("COLORIS"));
             list.add(tableElementColoris);
+        }
+        if (fieldsName.contains("ID_FABRICANT")) {
+            SQLTableElement fab = new SQLTableElement(e.getTable().getField("ID_FABRICANT"));
+            list.add(fab);
+        }
         // Valeur des métriques
         final SQLTableElement tableElement_ValeurMetrique2 = new SQLTableElement(e.getTable().getField("VALEUR_METRIQUE_2"), Float.class);
         list.add(tableElement_ValeurMetrique2);
         final SQLTableElement tableElement_ValeurMetrique3 = new SQLTableElement(e.getTable().getField("VALEUR_METRIQUE_3"), Float.class);
         list.add(tableElement_ValeurMetrique3);
         final DeviseNumericHTConvertorCellEditor editorPAHT = new DeviseNumericHTConvertorCellEditor(e.getTable().getField("PRIX_METRIQUE_HA_1"));
         final SQLTableElement tableElement_PrixMetrique1_AchatHT = new SQLTableElement(e.getTable().getField("PRIX_METRIQUE_HA_1"), BigDecimal.class, editorPAHT);
         tableElement_PrixMetrique1_AchatHT.setRenderer(new CurrencyWithSymbolRenderer());
         list.add(tableElement_PrixMetrique1_AchatHT);
-        if (e.getTable().getFieldsName().contains("ECO_CONTRIBUTION")) {
+        if (fieldsName.contains("ECO_CONTRIBUTION")) {
             this.tableElementEco = new SQLTableElement(e.getTable().getField("ECO_CONTRIBUTION"));
             list.add(this.tableElementEco);
+        }
         final SQLTableElement tableElement_Devise = new SQLTableElement(e.getTable().getField("ID_DEVISE"));
             tableBrElt = new SQLTableElement(e.getTable().getField("ID_BON_RECEPTION_ELEMENT"));
             tableBrElt.setEditable(false);
             list.add(tableBrElt);
+        }
-        if (e.getTable().getFieldsName().contains("QTE_ORIGINE")) {
+        if (fieldsName.contains("QTE_ORIGINE")) {
             final SQLTableElement tableQteO = new SQLTableElement(e.getTable().getField("QTE_ORIGINE"));
             tableQteO.setEditable(false);
             list.add(tableQteO);
+        }
         final SQLTableElement qteElement = new SQLTableElement(e.getTable().getField("QTE"), Integer.class) {
             protected Object getDefaultNullValue() {
                 return Integer.valueOf(0);
+            }
         };
-        if (e.getTable().getFieldsName().contains("QTE_ORIGINE")) {
+        if (fieldsName.contains("QTE_ORIGINE")) {
             qteElement.setRenderer(new DeliveredQtyRowValuesRenderer(false));
+        }
         list.add(qteElement);
         // TVA
         this.tableElementTVA = new SQLTableElement(e.getTable().getField("ID_TAXE"));
         if (e.getTable().contains("POURCENT_REMISE")) {
             tableElementRemise = new SQLTableElement(e.getTable().getField("POURCENT_REMISE"));
             list.add(tableElementRemise);
+        }
-        if (e.getTable().getFieldsName().contains("T_ECO_CONTRIBUTION")) {
+        if (fieldsName.contains("T_ECO_CONTRIBUTION")) {
             this.tableElementEcoTotal = new SQLTableElement(e.getTable().getField("T_ECO_CONTRIBUTION"));
             list.add(this.tableElementEcoTotal);
+        }
         // Total HT
             AutoCompletionManager dmd = new AutoCompletionManager(dmdElt, ((ComptaPropsConfiguration) Configuration.getInstance()).getSQLBaseSociete().getField("DEMANDE_ACHAT_ELEMENT.ID"), this.table,
                     this.table.getRowValuesTableModel(), ITextWithCompletion.MODE_CONTAINS, true, true, new ValidStateChecker());
             dmd.fill("ID_FAMILLE_ARTICLE", "ID_FAMILLE_ARTICLE");
+        }
         List<String> completionFields = new ArrayList<String>();
-        if (e.getTable().getFieldsName().contains("INCOTERM")) {
+        if (fieldsName.contains("INCOTERM")) {
             completionFields.add("INCOTERM");
+        }
-        if (e.getTable().getFieldsName().contains("ID_ECO_CONTRIBUTION")) {
+        if (fieldsName.contains("ID_ECO_CONTRIBUTION")) {
             completionFields.add("ID_ECO_CONTRIBUTION");
+        }
         completionFields.add("ID_UNITE_VENTE");
         completionFields.add("QTE_UNITAIRE");
         completionFields.add("PA_HT");
         completionFields.add("PRIX_METRIQUE_VT_2");
         completionFields.add("PRIX_METRIQUE_VT_3");
         completionFields.add("SERVICE");
         completionFields.add("ID_DEVISE");
         completionFields.add("PA_DEVISE");
+        completionFields.addAll(fieldDecl);
-        if (e.getTable().getFieldsName().contains("COLORIS")) {
+        if (fieldsName.contains("COLORIS")) {
             completionFields.add("COLORIS");
+        }
-        if (e.getTable().getFieldsName().contains("DESCRIPTIF")) {
+        if (fieldsName.contains("DESCRIPTIF")) {
             completionFields.add("DESCRIPTIF");
+        }
-        if (e.getTable().getFieldsName().contains("ID_FAMILLE_ARTICLE")) {
+        if (fieldsName.contains("ID_FAMILLE_ARTICLE")) {
             completionFields.add("ID_FAMILLE_ARTICLE");
+        }
         final SQLTable sqlTableArticle = e.getTable().getTable("ARTICLE");
         if (getSQLElement().getTable().getFieldsName().contains("POIDS_COLIS_NET") && sqlTableArticle.getTable().getFieldsName().contains("POIDS_COLIS_NET")) {
             completionFields.add("POIDS_COLIS_NET");
         this.m = new AutoCompletionManager(tableElementCode, sqlTableArticle.getField("CODE"), this.table, this.table.getRowValuesTableModel()) {
             @Override
             protected Object getValueFrom(SQLRow row, String field, SQLRowAccessor rowDest) {
                 Object res = tarifCompletion(row, field);
                 if (res == null) {
+                    if (field.equalsIgnoreCase("ID_CODE_FOURNISSEUR")) {
+                        return null;
+                    } else {
-                    return super.getValueFrom(row, field, rowDest);
+                        return super.getValueFrom(row, field, rowDest);
+                    }
                 } else {
                     return res;
+                }
+            }
         };
                 tableElement_PA_Devise.setModifier(new CellDynamicModifier() {
                     public Object computeValueFrom(SQLRowValues row, SQLTableElement source) {
                         if (source != null && source.getField().getName().equals("PA_DEVISE")) {
                             return row.getObject("PA_DEVISE");
                         } else {
-                            if (!row.isForeignEmpty("ID_DEVISE") && row.getForeign("ID_DEVISE") != null) {
+                            if (row.contains("ID_DEVISE") && !row.isForeignEmpty("ID_DEVISE")) {
                                 String devCode = row.getForeign("ID_DEVISE").getString("CODE");
                                 BigDecimal bigDecimal = (BigDecimal) row.getObject("PRIX_METRIQUE_HA_1");
                                 CurrencyConverter c = new CurrencyConverter();
                                 BigDecimal result = convert(bigDecimal, devCode, true);
             public Object computeValueFrom(SQLRowValues row, SQLTableElement source) {
                 if (source != null && source.getField().getName().equals("PRIX_METRIQUE_HA_1")) {
                     return row.getObject("PRIX_METRIQUE_HA_1");
                 } else {
                     if (source != null && source.getField().getName().equals("PA_DEVISE")) {
-                        if (!row.isForeignEmpty("ID_DEVISE") && row.getForeign("ID_DEVISE") != null) {
+                        if (row.contains("ID_DEVISE") && !row.isForeignEmpty("ID_DEVISE")) {
                             String devCode = row.getForeign("ID_DEVISE").getString("CODE");
                             BigDecimal bigDecimal = (BigDecimal) row.getObject("PA_DEVISE");
                             return convert(bigDecimal, devCode, false);
                         } else {
+            }
             JButton buttonStock = new JButton("Consulter le stock");
             buttonStock.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent event) {
+                    try {
-                    SQLRowValues rowValsSel = table.getSelectedRowValues();
+                        SQLRowValues rowValsSel = table.getSelectedRowValues();
-                    if (rowValsSel != null) {
+                        if (rowValsSel != null) {
-                        SQLRowAccessor foreignArt = rowValsSel.getForeign("ID_ARTICLE");
+                            SQLRowAccessor foreignArt = rowValsSel.getForeign("ID_ARTICLE");
-                        if (foreignArt != null && !foreignArt.isUndefined()) {
+                            if (foreignArt != null && !foreignArt.isUndefined()) {
-                            SQLRowAccessor rowValsStock = StockSQLElement.getStock(rowValsSel);
+                                SQLRowAccessor rowValsStock = StockSQLElement.getStock(rowValsSel);
-                                frame.selectionId(rowValsStock.getID());
+                                    frame.selectionId(rowValsStock.getID());
-                                frame.setVisible(true);
+                                    frame.setVisible(true);
+                                }
+                            }
+                        }
+                    } catch (Exception e) {
+                        ExceptionHandler.handle("Erreur d'accès au stock", e);
+                    }
+                }
             });
             this.buttons.add(buttonStock);
         final SQLTable tTarifFournisseur = this.getSQLElement().getTable().getDBRoot().getTable("ARTICLE_TARIF_FOURNISSEUR");
         if (row != null && !row.isUndefined() && (field.equalsIgnoreCase("ID_CODE_FOURNISSEUR")) && this.rowFournisseur != null && !this.rowFournisseur.isUndefined()) {
             final SQLTable foreignTableCodeF = getSQLElement().getTable().getForeignTable("ID_CODE_FOURNISSEUR");
             List<SQLRow> resultCode = row.getReferentRows(foreignTableCodeF);
-            int idCode = foreignTableCodeF.getUndefinedID();
             for (SQLRow sqlRow : resultCode) {
                 if (sqlRow.getForeignID("ID_FOURNISSEUR") == this.rowFournisseur.getID()) {
                     return sqlRow.getID();
+                }
+            }
-            return idCode;
+            return foreignTableCodeF.getUndefinedIDNumber();
+        }
         if (field.equalsIgnoreCase("ID_CODE_FOURNISSEUR")) {
             final SQLTable foreignTableCodeF = getSQLElement().getTable().getForeignTable("ID_CODE_FOURNISSEUR");
-            return foreignTableCodeF.getUndefinedID();
+            return foreignTableCodeF.getUndefinedIDNumber();
+        }
         if (row != null && !row.isUndefined() && (field.equalsIgnoreCase("PRIX_METRIQUE_HA_1") || field.equalsIgnoreCase("PA_HT")) && tTarifFournisseur != null) {
             List<String> incoTerms;

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/AbstractAchatArticleItemTable.java - Rev 180 → 182