WebSVN - OpenConcerto - Diff - Rev 180 and 182 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/AbstractVenteArticleItemTable.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.erp.core.sales.product.model.ProductHelper.TypePrice;
 import org.openconcerto.erp.core.sales.product.ui.ArticleRowValuesRenderer;
 import org.openconcerto.erp.core.sales.product.ui.CurrencyWithSymbolRenderer;
 import org.openconcerto.erp.core.sales.product.ui.QteMultipleRowValuesRenderer;
 import org.openconcerto.erp.core.sales.product.ui.QteUnitRowValuesRenderer;
+import org.openconcerto.erp.core.sales.product.ui.QteUnitairePieceRowValuesRenderer;
 import org.openconcerto.erp.core.supplychain.stock.element.DepotStockSQLElement;
 import org.openconcerto.erp.core.supplychain.stock.element.StockSQLElement;
 import org.openconcerto.erp.importer.ArrayTableModel;
 import org.openconcerto.erp.importer.DataImporter;
 import org.openconcerto.erp.preferences.DefaultNXProps;
 import org.openconcerto.sql.model.SQLField;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowAccessor;
 import org.openconcerto.sql.model.SQLRowListRSH;
 import org.openconcerto.sql.model.SQLRowValues;
+import org.openconcerto.sql.model.SQLRowValuesListFetcher;
 import org.openconcerto.sql.model.SQLSelect;
 import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.model.UndefinedRowValuesCache;
 import org.openconcerto.sql.model.Where;
 import org.openconcerto.sql.model.graph.Path;
 import org.openconcerto.sql.view.list.SQLTextComboTableCellEditor;
 import org.openconcerto.sql.view.list.ValidStateChecker;
 import org.openconcerto.ui.preferences.DefaultProps;
 import org.openconcerto.utils.CompareUtils;
 import org.openconcerto.utils.DecimalUtils;
+import org.openconcerto.utils.ExceptionHandler;
 import org.openconcerto.utils.StringUtils;
 import org.openconcerto.utils.Tuple3;
 import org.openconcerto.utils.cc.ITransformer;
 import org.openconcerto.utils.i18n.TranslationManager;
 import java.awt.event.MouseEvent;
 import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
         return visibilityMap;
+    }
     private SQLTable tableArticleTarif = Configuration.getInstance().getBase().getTable("ARTICLE_TARIF");
     private SQLTable tableArticle = Configuration.getInstance().getBase().getTable("ARTICLE");
+    protected AutoCompletionManager codeCompletionManager;
     protected void init() {
         SQLPreferences prefs = SQLPreferences.getMemCached(getSQLElement().getTable().getDBRoot());
         final boolean selectArticle = prefs.getBoolean(GestionArticleGlobalPreferencePanel.USE_CREATED_ARTICLE, false);
         final boolean activeCalculM2 = prefs.getBoolean(GestionArticleGlobalPreferencePanel.ACTIVE_CALCUL_M2, false);
         final boolean filterFamilleArticle = prefs.getBoolean(GestionArticleGlobalPreferencePanel.FILTER_BY_FAMILY, false);
         final boolean createAuto = prefs.getBoolean(GestionArticleGlobalPreferencePanel.CREATE_ARTICLE_AUTO, true);
         final boolean showEco = prefs.getBoolean(AbstractVenteArticleItemTable.SHOW_ECO_CONTRIBUTION_COLUMNS, false);
         final boolean showDevise = prefs.getBoolean(AbstractVenteArticleItemTable.ARTICLE_SHOW_DEVISE, false);
+        final boolean withDeclinaison = prefs.getBoolean(GestionArticleGlobalPreferencePanel.ACTIVER_DECLINAISON, false);
         final UserRights rights = UserRightsManager.getCurrentUserRights();
         final boolean editVTPrice = rights.haveRight(EDIT_PRIX_VENTE_CODE);
         final boolean showHAPrice = rights.haveRight(SHOW_PRIX_ACHAT_CODE);
         final boolean lockVTMinPrice = rights.haveRight(LOCK_PRIX_MIN_VENTE_CODE);
         // Article
         SQLTableElement tableElementArticle = new SQLTableElement(e.getTable().getField("ID_ARTICLE"), true, true, true);
         list.add(tableElementArticle);
+        Set<String> fieldsName = e.getTable().getFieldsName();
-        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);
+        }
         // 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));
         list.add(tableElementCode);
         // Désignation de l'article
         final SQLTableElement tableElementNom = new SQLTableElement(e.getTable().getField("NOM"));
         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("COLORIS")) {
+        if (fieldsName.contains("COLORIS")) {
             final SQLTableElement tableElementColoris = new SQLTableElement(e.getTable().getField("COLORIS"));
             list.add(tableElementColoris);
+        }
-        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("DELAI")) {
+        if (fieldsName.contains("DELAI")) {
             final SQLTableElement tableElementDelai = new SQLTableElement(e.getTable().getField("DELAI"));
             list.add(tableElementDelai);
+        }
         if (showDevise) {
             list.add(tableElementCodeDouane);
             final SQLTableElement tableElementPays = new SQLTableElement(e.getTable().getField("ID_PAYS"));
             list.add(tableElementPays);
+        }
+        SQLTableElement qteU = new SQLTableElement(e.getTable().getField("QTE_UNITAIRE"), BigDecimal.class) {
+            @Override
+            public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
+                SQLRowAccessor row = vals.getForeign("ID_UNITE_VENTE");
+                if (row != null && !row.isUndefined() && row.getBoolean("A_LA_PIECE")) {
+                    return false;
+                } else if (activeCalculM2 && row != null && !row.isUndefined() && row.getID() == UniteVenteArticleSQLElement.M2) {
+                    return false;
+                } else {
+                    return super.isCellEditable(vals, rowIndex, columnIndex);
+                }
+            }
+            @Override
+            public TableCellRenderer getTableCellRenderer() {
+                return new QteUnitairePieceRowValuesRenderer();
+            }
+            protected Object getDefaultNullValue() {
+                return BigDecimal.ZERO;
+            }
+        };
+        list.add(qteU);
+        SQLTableElement uniteVente = new SQLTableElement(e.getTable().getField("ID_UNITE_VENTE"));
+        list.add(uniteVente);
+        // Quantité
+        this.qte = new SQLTableElement(e.getTable().getField("QTE"), Integer.class, new QteCellEditor()) {
+            protected Object getDefaultNullValue() {
+                return Integer.valueOf(0);
+            }
+            public TableCellRenderer getTableCellRenderer() {
+                if (getSQLElement().getTable().getFieldsName().contains("QTE_ACHAT")) {
+                    return new QteMultipleRowValuesRenderer();
+                } else {
+                    return super.getTableCellRenderer();
+                }
+            }
+        };
+        this.qte.setPreferredSize(20);
+        list.add(this.qte);
         // Valeur des métriques
         final SQLTableElement tableElement_ValeurMetrique2 = new SQLTableElement(e.getTable().getField("VALEUR_METRIQUE_2"), Float.class) {
             @Override
             public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
                 Number modeNumber = (Number) vals.getObject("ID_MODE_VENTE_ARTICLE");
         };
         list.add(tableElement_ValeurMetrique1);
         // Prébilan
-        if (e.getTable().getFieldsName().contains("PREBILAN")) {
+        if (fieldsName.contains("PREBILAN")) {
             prebilan = new SQLTableElement(e.getTable().getField("PREBILAN"), BigDecimal.class) {
                 protected Object getDefaultNullValue() {
                     return BigDecimal.ZERO;
+                }
+            }
         };
         tableElement_PrixMetrique1_VenteHT.setRenderer(new CurrencyWithSymbolRenderer());
         list.add(tableElement_PrixMetrique1_VenteHT);
-        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);
+        }
         SQLTableElement eltLongueur = new SQLTableElement(e.getTable().getField("LONGUEUR")) {
         list.add(eltLargeur);
         SQLTableElement eltHauteur = new SQLTableElement(e.getTable().getField("HAUTEUR"));
         list.add(eltHauteur);
-        SQLTableElement qteU = new SQLTableElement(e.getTable().getField("QTE_UNITAIRE"), BigDecimal.class) {
-            @Override
-            public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
-                SQLRowAccessor row = vals.getForeign("ID_UNITE_VENTE");
-                if (row != null && !row.isUndefined() && row.getBoolean("A_LA_PIECE")) {
-                    return false;
-                } else if (activeCalculM2 && row != null && !row.isUndefined() && row.getID() == UniteVenteArticleSQLElement.M2) {
-                    return false;
-                } else {
-                    return super.isCellEditable(vals, rowIndex, columnIndex);
-                }
-            }
-            @Override
-            public TableCellRenderer getTableCellRenderer() {
-                return new QteUnitRowValuesRenderer();
-            }
-            protected Object getDefaultNullValue() {
-                return BigDecimal.ZERO;
-            }
-        };
-        list.add(qteU);
-        SQLTableElement uniteVente = new SQLTableElement(e.getTable().getField("ID_UNITE_VENTE"));
-        list.add(uniteVente);
-        // Quantité
-        this.qte = new SQLTableElement(e.getTable().getField("QTE"), Integer.class, new QteCellEditor()) {
-            protected Object getDefaultNullValue() {
-                return Integer.valueOf(0);
-            }
-            public TableCellRenderer getTableCellRenderer() {
-                if (getSQLElement().getTable().getFieldsName().contains("QTE_ACHAT")) {
-                    return new QteMultipleRowValuesRenderer();
-                } else {
-                    return super.getTableCellRenderer();
-                }
-            }
-        };
-        this.qte.setPreferredSize(20);
-        list.add(this.qte);
         if (e.getTable().contains("RETOUR_STOCK")) {
             list.add(new SQLTableElement(e.getTable().getField("RETOUR_STOCK")));
+        }
         // Mode de vente
         totalRenderer.setHideZeroValue(true);
         this.totalHT.setRenderer(totalRenderer);
         this.totalHT.setEditable(false);
         this.totalHA = new SQLTableElement(e.getTable().getField("T_PA_HT"), BigDecimal.class);
-        if (e.getTable().getFieldsName().contains("MONTANT_FACTURABLE")) {
+        if (fieldsName.contains("MONTANT_FACTURABLE")) {
             // SQLTableElement tableElementAcompte = new
             // SQLTableElement(e.getTable().getField("POURCENT_ACOMPTE"));
             // list.add(tableElementAcompte);
             this.tableElementFacturable = new SQLTableElement(e.getTable().getField("POURCENT_FACTURABLE"), Acompte.class, new AcompteCellEditor("POURCENT_FACTURABLE", "MONTANT_FACTURABLE")) {
             list.add(tableElementFacturable);
+        }
         final SQLField fieldRemise = e.getTable().getField("POURCENT_REMISE");
-        if (e.getTable().getFieldsName().contains("MONTANT_REMISE")) {
+        if (fieldsName.contains("MONTANT_REMISE")) {
             tableElementRemise = new SQLTableElement(e.getTable().getField("POURCENT_REMISE"), Acompte.class, new AcompteCellEditor("POURCENT_REMISE", "MONTANT_REMISE")) {
                 @Override
                 public void setValueFrom(SQLRowValues row, Object value) {
                     if (value != null) {
+                }
             };
+        }
         list.add(tableElementRemise);
         SQLTableElement tableElementRG = null;
-        if (e.getTable().getFieldsName().contains("POURCENT_RG")) {
+        if (fieldsName.contains("POURCENT_RG")) {
             tableElementRG = new SQLTableElement(e.getTable().getField("POURCENT_RG"));
             list.add(tableElementRG);
+        }
         // Total HT
             this.tableElementTotalDevise.setRenderer(currencyRenderer);
             list.add(this.tableElementTotalDevise);
+        }
         // Marge HT
-        if (e.getTable().getFieldsName().contains("MARGE_HT")) {
+        if (fieldsName.contains("MARGE_HT")) {
             final SQLTableElement marge = new SQLTableElement(e.getTable().getField("MARGE_HT"), BigDecimal.class) {
                 protected Object getDefaultNullValue() {
                     return BigDecimal.ZERO;
+                }
             });
+        }
-        if (e.getTable().getFieldsName().contains("MARGE_PREBILAN_HT")) {
+        if (fieldsName.contains("MARGE_PREBILAN_HT")) {
             final SQLTableElement marge = new SQLTableElement(e.getTable().getField("MARGE_PREBILAN_HT"), BigDecimal.class) {
                 protected Object getDefaultNullValue() {
                     return BigDecimal.ZERO;
+                }
             });
+        }
-        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
         this.table = new RowValuesTable(model, getConfigurationFile());
         ToolTipManager.sharedInstance().unregisterComponent(this.table);
         ToolTipManager.sharedInstance().unregisterComponent(this.table.getTableHeader());
         if (getSQLElement().getTable().getName().equals("COMMANDE_CLIENT_ELEMENT")) {
+            this.table.getClearCloneTableElement().add("ID_MISSION");
+            this.table.getClearCloneTableElement().add("ID_DEVIS_ELEMENT");
             this.table.getClearCloneTableElement().add("QTE_LIVREE");
             this.table.getClearCloneTableElement().add("LIVRE");
             this.table.getClearCloneTableElement().add("LIVRE_FORCED");
+        }
+        }
         // Autocompletion
         final SQLTable sqlTableArticle = ((ComptaPropsConfiguration) Configuration.getInstance()).getRootSociete().getTable("ARTICLE");
         List<String> completionField = new ArrayList<String>();
-        if (e.getTable().getFieldsName().contains("ID_ECO_CONTRIBUTION")) {
+        if (fieldsName.contains("ID_ECO_CONTRIBUTION")) {
             completionField.add("ID_ECO_CONTRIBUTION");
+        }
         if (showDevise) {
             completionField.add("CODE_DOUANIER");
             completionField.add("ID_PAYS");
+        }
         completionField.add("POURCENT_REMISE");
         completionField.add("ID_UNITE_VENTE");
         completionField.add("QTE_UNITAIRE");
+        completionField.add("QTE");
         completionField.add("PA_HT");
         completionField.add("PV_HT");
         completionField.add("ID_TAXE");
         completionField.add("POIDS");
         completionField.add("PRIX_METRIQUE_HA_1");
         completionField.add("SERVICE");
         completionField.add("ID_FAMILLE_ARTICLE");
         completionField.add("LONGUEUR");
         completionField.add("LARGEUR");
         completionField.add("HAUTEUR");
+        completionField.addAll(fieldDecl);
         if (getSQLElement().getTable().getFieldsName().contains("DESCRIPTIF")) {
             completionField.add("DESCRIPTIF");
+        }
         if (showDevise) {
             completionField.add("ID_DEVISE");
+        }
         if (getSQLElement().getTable().getFieldsName().contains("TARE") && sqlTableArticle.getTable().getFieldsName().contains("TARE")) {
             completionField.add("TARE");
+        }
-        final AutoCompletionManager m = new AutoCompletionManager(tableElementCode, sqlTableArticle.getField("CODE"), this.table, this.table.getRowValuesTableModel()) {
+        this.codeCompletionManager = new ItemAutoCompletionManager(this, tableElementCode, sqlTableArticle.getField("CODE"), this.table, this.table.getRowValuesTableModel());
-            @Override
-            protected Object getValueFrom(SQLRow row, String field, SQLRowAccessor rowDest) {
-                Object res = tarifCompletion(row, field, rowDest, true);
-                if (res == null) {
-                    res = super.getValueFrom(row, field, rowDest);
-                }
-                if (field.equals("POURCENT_REMISE")) {
-                    return getRemiseClient(row);
-                }
-                return res;
-            }
-        };
-        m.fill("NOM", "NOM");
+        this.codeCompletionManager.fill("NOM", "NOM");
-        m.fill("ID", "ID_ARTICLE");
+        this.codeCompletionManager.fill("ID", "ID_ARTICLE");
         for (String string : completionField) {
-            m.fill(string, string);
+            this.codeCompletionManager.fill(string, string);
+        }
         ITransformer<SQLSelect, SQLSelect> selTrans = new ITransformer<SQLSelect, SQLSelect>() {
             @Override
             public SQLSelect transformChecked(SQLSelect input) {
                 input.asString();
                 return input;
+            }
         };
-        m.setSelectTransformer(selTrans);
+        this.codeCompletionManager.setSelectTransformer(selTrans);
         this.table.setDropTarget(new DropTarget() {
             @Override
             public synchronized void drop(DropTargetDropEvent dtde) {
-                dropInTable(dtde, m);
+                dropInTable(dtde, AbstractVenteArticleItemTable.this.codeCompletionManager);
                 // super.drop(dtde);
+            }
         });
         if (prefs.getBoolean(GestionArticleGlobalPreferencePanel.CAN_EXPAND_NOMENCLATURE_VT, true)) {
                         JPopupMenu popup = new JPopupMenu();
                         popup.add(new AbstractAction(TranslationManager.getInstance().getTranslationForItem("product.bom.expand")) {
                             @Override
                             public void actionPerformed(ActionEvent arg0) {
-                                expandNomenclature(rowindex, m, EXPAND_TYPE.EXPAND);
+                                expandNomenclature(rowindex, codeCompletionManager, EXPAND_TYPE.EXPAND);
+                            }
                         });
                         popup.add(new AbstractAction(TranslationManager.getInstance().getTranslationForItem("product.bom.expose")) {
                             @Override
                             public void actionPerformed(ActionEvent arg0) {
-                                expandNomenclature(rowindex, m, EXPAND_TYPE.VIEW_ONLY);
+                                expandNomenclature(rowindex, codeCompletionManager, EXPAND_TYPE.VIEW_ONLY);
+                            }
                         });
                         for (AbstractAction action : getAdditionnalMouseAction(rowindex)) {
                             popup.add(action);
                         popup.show(e.getComponent(), e.getX(), e.getY());
+                    }
+                }
             });
+        }
-        final AutoCompletionManager m2 = new AutoCompletionManager(tableElementNom, sqlTableArticle.getField("NOM"), this.table, this.table.getRowValuesTableModel()) {
+        final AutoCompletionManager m2 = new ItemAutoCompletionManager(this, tableElementNom, sqlTableArticle.getField("NOM"), this.table, this.table.getRowValuesTableModel());
-            @Override
-            protected Object getValueFrom(SQLRow row, String field, SQLRowAccessor rowDest) {
-                Object res = tarifCompletion(row, field, rowDest, true);
-                if (res == null) {
-                    res = super.getValueFrom(row, field, rowDest);
-                }
-                if (field.equals("POURCENT_REMISE")) {
-                    return getRemiseClient(row);
-                }
-                return res;
-            }
-        };
         m2.fill("CODE", "CODE");
         m2.fill("ID", "ID_ARTICLE");
         for (String string : completionField) {
             m2.fill(string, string);
+        }
         m2.setSelectTransformer(selTrans);
-        final AutoCompletionManager m3 = new AutoCompletionManager(tableElementArticle, sqlTableArticle.getField("NOM"), this.table, this.table.getRowValuesTableModel(),
+        final AutoCompletionManager m3 = new ItemAutoCompletionManager(this, tableElementArticle, sqlTableArticle.getField("NOM"), this.table, this.table.getRowValuesTableModel(),
-                ITextWithCompletion.MODE_CONTAINS, true, true, new ValidStateChecker()) {
+                ITextWithCompletion.MODE_CONTAINS, true, true, new ValidStateChecker());
-            @Override
-            protected Object getValueFrom(SQLRow row, String field, SQLRowAccessor rowDest) {
-                Object res = tarifCompletion(row, field, rowDest, true);
-                if (res == null) {
-                    res = super.getValueFrom(row, field, rowDest);
-                }
-                if (field.equals("POURCENT_REMISE")) {
-                    return getRemiseClient(row);
-                }
-                return res;
-            }
-        };
         m3.fill("CODE", "CODE");
         m3.fill("NOM", "NOM");
         for (String string : completionField) {
             m3.fill(string, string);
+        }
             @Override
             public Object computeValueFrom(SQLRowValues row, SQLTableElement source) {
                 try {
                     if (filterFamilleArticle) {
                         if (row.isForeignEmpty("ID_FAMILLE_ARTICLE")) {
-                            m.setWhere(null);
+                            codeCompletionManager.setWhere(null);
                             m2.setWhere(null);
                         } else {
-                            m.setWhere(new Where(sqlTableArticle.getField("ID_FAMILLE_ARTICLE"), "=", row.getForeignID("ID_FAMILLE_ARTICLE")));
+                            codeCompletionManager.setWhere(new Where(sqlTableArticle.getField("ID_FAMILLE_ARTICLE"), "=", row.getForeignID("ID_FAMILLE_ARTICLE")));
                             m2.setWhere(new Where(sqlTableArticle.getField("ID_FAMILLE_ARTICLE"), "=", row.getForeignID("ID_FAMILLE_ARTICLE")));
+                        }
+                    }
                     SQLRowAccessor foreign = row.getForeign("ID_ARTICLE");
                     if (foreign != null && !foreign.isUndefined() && foreign.getObject("CODE") != null && foreign.getString("CODE").equals(row.getString("CODE"))) {
                         if (l2.size() > 0) {
                             System.err.println("ARTICLE " + l2.get(0).getString("NOM"));
                             Tuple3<Double, String, String> art = Tuple3.create(1.0D, l2.get(0).getString("CODE"), l2.get(0).getString("NOM"));
                             List<Tuple3<Double, String, String>> l = new ArrayList<Tuple3<Double, String, String>>();
                             l.add(art);
-                            insertFromDrop(l, m);
+                            insertFromDrop(l, codeCompletionManager);
                         } else {
                             System.err.println("ARTICLE NOT FOUND !");
+                        }
+                    }
+            }
             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);
+            }
+        }
         return pv;
+    }
-    protected Acompte getRemiseClient(SQLRowAccessor article) {
+    protected Acompte getRemiseClient(SQLRowAccessor article, Acompte acompteTarif) {
         Acompte remise = null;
         if (this.cacheRemiseFamille != null) {
             if (getRowClient() != null && !getRowClient().isUndefined() && article != null && !article.isUndefined()) {
                 if (article.getForeign("ID_FAMILLE_ARTICLE") != null && !article.isForeignEmpty("ID_FAMILLE_ARTICLE")) {
                     Integer fID = article.getForeignID("ID_FAMILLE_ARTICLE");
                             if (remise == null) {
                                 SQLRow rowFamille2 = cacheTableFamille.getRowFromId(fIDPere);
                                 if (rowFamille2 != null && rowFamille2.getObject("ID_FAMILLE_ARTICLE_PERE") != null && !rowFamille2.isForeignEmpty("ID_FAMILLE_ARTICLE_PERE")) {
                                     Integer fIDPere2 = rowFamille2.getForeignID("ID_FAMILLE_ARTICLE_PERE");
                                     remise = getRemiseFamille(fIDPere2);
+                                    if (remise == null) {
+                                        SQLRow rowFamille3 = cacheTableFamille.getRowFromId(fIDPere2);
+                                        if (rowFamille3 != null && rowFamille3.getObject("ID_FAMILLE_ARTICLE_PERE") != null && !rowFamille3.isForeignEmpty("ID_FAMILLE_ARTICLE_PERE")) {
+                                            Integer fIDPere3 = rowFamille3.getForeignID("ID_FAMILLE_ARTICLE_PERE");
+                                            remise = getRemiseFamille(fIDPere3);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    }
+                }
+            }
+        }
         if (remise == null) {
+            if (acompteTarif == null) {
-            return new Acompte(BigDecimal.ZERO, BigDecimal.ZERO);
+                return new Acompte(BigDecimal.ZERO, BigDecimal.ZERO);
-        } else {
+            } else {
+                return acompteTarif;
+            }
+        } else {
+            if (acompteTarif != null && acompteTarif.getPercent() != null && remise.getPercent().compareTo(acompteTarif.percent) > 0) {
-            return remise;
+                return remise;
+            } else {
+                return acompteTarif;
+            }
+        }
+    }
     private Acompte getRemiseFamille(int fID) {
         Acompte remise = null;
                 return ha.multiply(percent.movePointLeft(2).add(BigDecimal.ONE)).setScale(ha.precision(), RoundingMode.HALF_UP);
+            }
+        }
         if (getTarif() != null && !getTarif().isUndefined()) {
-            Collection<? extends SQLRowAccessor> rows = row.getReferentRows(tableArticleTarif);
+            SQLRowValues rowValsTarif = new SQLRowValues(this.tableArticleTarif);
+            rowValsTarif.putNulls(this.tableArticleTarif.getFieldsName());
+            Where where = new Where(this.tableArticleTarif.getField("ID_TARIF"), "=", getTarif().getID()).and(new Where(this.tableArticleTarif.getField("ID_ARTICLE"), "=", row.getID()));
+            if (this.tableArticleTarif.contains("OBSOLETE")) {
+                where = where.and(new Where(this.tableArticleTarif.getField("OBSOLETE"), "=", Boolean.FALSE));
+            }
+            List<SQLRowValues> fetchRows = SQLRowValuesListFetcher.create(rowValsTarif).fetch(where);
+            if (fetchRows.isEmpty() && row.getObject("ID_ARTICLE_VIRTUEL_PERE") != null && !row.isForeignEmpty("ID_ARTICLE_VIRTUEL_PERE")) {
+                Where where2 = new Where(this.tableArticleTarif.getField("ID_TARIF"), "=", getTarif().getID())
+                        .and(new Where(this.tableArticleTarif.getField("ID_ARTICLE"), "=", row.getForeignID("ID_ARTICLE_VIRTUEL_PERE")));
+                if (this.tableArticleTarif.contains("OBSOLETE")) {
+                    where2 = where2.and(new Where(this.tableArticleTarif.getField("OBSOLETE"), "=", Boolean.FALSE));
+                }
+                fetchRows = SQLRowValuesListFetcher.create(rowValsTarif).fetch(where2);
+            }
             // Récupération du tarif associé à la quantité
             int quantite = 0;
             BigDecimal b = rowDest.getBigDecimal("QTE_UNITAIRE");
             int q = rowDest.getInt("QTE");
             BigDecimal qteTotal = b.multiply(new BigDecimal(q), DecimalUtils.HIGH_PRECISION);
             SQLRowAccessor rowTarif = null;
-            for (SQLRowAccessor sqlRowAccessor : rows) {
+            for (SQLRowValues sqlRowAccessor : fetchRows) {
                 if (!sqlRowAccessor.getTable().contains("OBSOLETE") || !sqlRowAccessor.getBoolean("OBSOLETE")) {
                     // FIXME BigDecimal??
                     // BigDecimal bigDecimal = sqlRowAccessor.getBigDecimal("QTE");
                     int qteTarif = sqlRowAccessor.getInt("QTE");
         if (field.equalsIgnoreCase("ID_TAXE_VENTE") && this.rowCatComptable != null) {
             return this.rowCatComptable.getForeignID("ID_TAXE_VENTE");
+        }
+        if (field.equalsIgnoreCase("ID_TAXE") && this.rowCatComptable != null) {
+            if (!this.rowCatComptable.isForeignEmpty("ID_TAXE_VENTE")) {
+                return this.rowCatComptable.getForeignID("ID_TAXE_VENTE");
+            }
+        }
         if ((field.equalsIgnoreCase("POURCENT_REMISE"))) {
             return new Acompte(BigDecimal.ZERO, BigDecimal.ZERO);
+        }
         if ((field.equalsIgnoreCase("PRIX_METRIQUE_VT_1"))) {
                         result = sqlRowAccessor.getBigDecimal("PRIX");
+                    }
+                }
+            }
+        }
+        BigDecimal promoRemise = null;
+        BigDecimal promoTarif = null;
+        if (rowA != null && !rowA.isUndefined() && rowA.getTable().getDBRoot().contains("ARTICLE_TARIF_PROMOTION")) {
+            Collection<? extends SQLRowAccessor> col = rowA.getReferentRows(rowA.getTable().getTable("ARTICLE_TARIF_PROMOTION"));
+            BigDecimal quantite = BigDecimal.ZERO;
+            int q = row.getInt("QTE");
+            BigDecimal b = row.getBigDecimal("QTE_UNITAIRE");
+            BigDecimal qteTotal = b.multiply(new BigDecimal(q), DecimalUtils.HIGH_PRECISION);
+            Calendar c = Calendar.getInstance();
+            for (SQLRowAccessor sqlRowAccessor : col) {
+                final SQLRowAccessor foreignPromotion = sqlRowAccessor.getForeign("ID_TARIF_PROMOTION");
+                Calendar start = foreignPromotion.getDate("START");
+                Calendar end = foreignPromotion.getDate("END");
+                BigDecimal bigDecimal = new BigDecimal(sqlRowAccessor.getInt("QTE"));
+                if (CompareUtils.compare(bigDecimal, qteTotal) <= 0 && CompareUtils.compare(bigDecimal, quantite) > 0 && (start != null && c.after(start)) && (end != null && c.before(end))) {
+                    quantite = bigDecimal;
+                    if (sqlRowAccessor.getBigDecimal("PRIX_METRIQUE_VT_1") != null) {
+                        promoTarif = sqlRowAccessor.getBigDecimal("PRIX_METRIQUE_VT_1");
+                        promoRemise = null;
+                    } else {
+                        promoTarif = null;
+                        promoRemise = sqlRowAccessor.getBigDecimal("POURCENT_REMISE");
+                    }
+                }
+            }
+        }
-        BigDecimal remise = null;
+        BigDecimal remise = BigDecimal.ZERO;
         if (rowA != null && !rowA.isUndefined() && rowA.getTable().getDBRoot().contains("TARIF_QUANTITE")) {
             Collection<? extends SQLRowAccessor> col = rowA.getReferentRows(rowA.getTable().getTable("TARIF_QUANTITE"));
             BigDecimal quantite = BigDecimal.ZERO;
             BigDecimal b = row.getBigDecimal("QTE_UNITAIRE");
                 BigDecimal bigDecimal = sqlRowAccessor.getBigDecimal("QUANTITE");
                 if (CompareUtils.compare(bigDecimal, qteTotal) <= 0 && CompareUtils.compare(bigDecimal, quantite) > 0) {
                     quantite = bigDecimal;
                     if (sqlRowAccessor.getBigDecimal("PRIX_METRIQUE_VT_1") != null) {
                         result = sqlRowAccessor.getBigDecimal("PRIX_METRIQUE_VT_1");
-                        remise = null;
+                        remise = BigDecimal.ZERO;
                     } else {
                         result = null;
                         remise = sqlRowAccessor.getBigDecimal("POURCENT_REMISE");
+                    }
+                }
+            }
-            if (!col.isEmpty() && result == null && remise == null) {
+            if (!col.isEmpty() && result == null && (remise == null || remise.signum() == 0)) {
                 result = rowA.getBigDecimal("PRIX_METRIQUE_VT_1");
+            }
+            Acompte remiseClient = getRemiseClient(rowA, new Acompte(BigDecimal.ZERO, null));
+            if (remiseClient != null && remiseClient.getPercent() != null) {
+                if (remise == null || remise.compareTo(remiseClient.getPercent()) < 0) {
+                    remise = remiseClient.getPercent();
+                }
+            }
+        }
+        // Application de la promotion si elle est inférieure au tarif
+        if (promoRemise != null) {
+            if (remise == null || remise.compareTo(promoRemise) < 0) {
+                remise = promoRemise;
+            }
+        }
+        if (promoTarif != null) {
+            if (result == null || result.compareTo(promoTarif) > 0) {
+                result = promoTarif;
+            }
+        }
         int index = getRowValuesTable().getRowValuesTableModel().row2index(row);
         if (result == null && remise == null) {
+            if (fromCompletion) {
+                return null;
+            } else if (rowA != null) {
-            // getRowValuesTable().getRowValuesTableModel().putValue(BigDecimal.ZERO, index,
+                return rowA.getObject("PRIX_METRIQUE_VT_1");
-            // "POURCENT_REMISE");
+            } else {
-            return (fromCompletion ? null : row.getObject("PRIX_METRIQUE_VT_1"));
+                return row.getObject("PRIX_METRIQUE_VT_1");
+            }
         } else {
             if (result != null) {
-                // getRowValuesTable().getRowValuesTableModel().putValue(BigDecimal.ZERO, index,
+                getRowValuesTable().getRowValuesTableModel().putValue(remise, index, "POURCENT_REMISE");
-                // "POURCENT_REMISE");
                 return result;
             } else {
                 getRowValuesTable().getRowValuesTableModel().putValue(remise, index, "POURCENT_REMISE");
+                final BigDecimal prixVT = row.getBigDecimal("PRIX_METRIQUE_VT_1");
+                if (rowA != null && !rowA.isUndefined()) {
+                    // TODO si le prix est différent de celui la rowvalues, afficher une popup pour
+                    // prévenir l'utilisateur
-                return row.getBigDecimal("PRIX_METRIQUE_VT_1");
+                    return rowA.getObject("PRIX_METRIQUE_VT_1");
+                } else if (fromCompletion) {
+                    return null;
+                } else {
+                    return prixVT;
+                }
+            }
+        }
+    }
         // File f = (File)fileList.get(0);
         // table.setValueAt(f.getAbsolutePath(), row, column);
         // table.setValueAt(f.length(), row, column+1);
+    }
+    @Override
+    public AutoCompletionManager getCodeCompletionManager() {
+        return this.codeCompletionManager;
+    }
     protected void insertFromDrop(List<Tuple3<Double, String, String>> articles, AutoCompletionManager m) {
         List<String> code = new ArrayList<String>(articles.size());
         for (int i = articles.size() - 1; i >= 0; i--) {
                 // row2Insert.put("ID_STYLE", allStyleByName.get("Composant"));
                 getRowValuesTable().getRowValuesTableModel().addRowAt(0, row2Insert);
+            }
+        }
+    }
+}

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/AbstractVenteArticleItemTable.java - Rev 180 → 182