WebSVN - OpenConcerto - Diff - Rev 174 and 177 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/shipment/ui/BonDeLivraisonItemTable.java

 import org.openconcerto.erp.core.finance.accounting.model.CurrencyConverter;
 import org.openconcerto.erp.core.finance.tax.model.TaxeCache;
 import org.openconcerto.erp.core.sales.pos.io.BarcodeReader;
 import org.openconcerto.erp.core.sales.pos.ui.BarcodeListener;
 import org.openconcerto.erp.core.sales.product.element.ReferenceArticleSQLElement;
+import org.openconcerto.erp.core.sales.product.element.UniteVenteArticleSQLElement;
 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.DeliveredQtyRowValuesRenderer;
 import org.openconcerto.erp.core.sales.product.ui.QteUnitRowValuesRenderer;
 import org.openconcerto.erp.core.sales.product.ui.QtyToDeliverRowValuesRenderer;
 import org.openconcerto.erp.core.sales.product.ui.ReliquatRowValuesTable;
+import org.openconcerto.erp.core.supplychain.stock.element.StockSQLElement;
 import org.openconcerto.erp.preferences.DefaultNXProps;
 import org.openconcerto.erp.preferences.GestionArticleGlobalPreferencePanel;
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.element.SQLElement;
 import org.openconcerto.sql.model.SQLField;
 import org.openconcerto.sql.preferences.SQLPreferences;
 import org.openconcerto.sql.sqlobject.ITextArticleWithCompletionCellEditor;
 import org.openconcerto.sql.sqlobject.ITextWithCompletion;
 import org.openconcerto.sql.users.rights.UserRights;
 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.AutoCompletionManager;
 import org.openconcerto.sql.view.list.CellDynamicModifier;
 import org.openconcerto.sql.view.list.RowValuesTable;
 import org.openconcerto.sql.view.list.RowValuesTableModel;
 import org.openconcerto.sql.view.list.SQLTableElement;
 import org.openconcerto.utils.cc.ITransformer;
 import org.openconcerto.utils.i18n.TranslationManager;
 import java.awt.Component;
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.HierarchyEvent;
 import java.awt.event.HierarchyListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Vector;
 import javax.swing.AbstractAction;
 import javax.swing.JButton;
 import javax.swing.JFrame;
     public void setReliquatTable(ReliquatRowValuesTable reliquatTable) {
         this.reliquatTable = reliquatTable;
+    }
+    public static Map<String, Boolean> customVisibilityMap = new HashMap<String, Boolean>();
+    @Override
+    protected Map<String, Boolean> getCustomVisibilityMap() {
+        return customVisibilityMap;
+    }
     @Override
     protected void init() {
         final SQLElement e = getSQLElement();
         SQLPreferences prefs = new SQLPreferences(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 createAuto = prefs.getBoolean(GestionArticleGlobalPreferencePanel.CREATE_ARTICLE_AUTO, true);
         final boolean filterFamilleArticle = prefs.getBoolean(GestionArticleGlobalPreferencePanel.FILTER_BY_FAMILY, false);
         final boolean showEco = prefs.getBoolean(AbstractVenteArticleItemTable.SHOW_ECO_CONTRIBUTION_COLUMNS, false);
         final boolean showDevise = prefs.getBoolean(AbstractVenteArticleItemTable.ARTICLE_SHOW_DEVISE, false);
         final List<SQLTableElement> list = new Vector<SQLTableElement>();
         list.add(new SQLTableElement(e.getTable().getField("ID_STYLE")));
         final SQLTableElement tableFamille = new SQLTableElement(e.getTable().getField("ID_FAMILLE_ARTICLE"));
         list.add(tableFamille);
+        // Article
+        SQLTableElement tableElementDepot = new SQLTableElement(e.getTable().getField("ID_DEPOT_STOCK"), true, true, true);
+        list.add(tableElementDepot);
         // Article
         final SQLTableElement tableElementArticle = new SQLTableElement(e.getTable().getField("ID_ARTICLE"), true, true, true) {
             @Override
             public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
                 boolean b = super.isCellEditable(vals, rowIndex, columnIndex);
             };
             eltUnitDevise.setRenderer(new DeviseTableCellRenderer());
             list.add(eltUnitDevise);
+        }
+        SQLTableElement eltLongueur = new SQLTableElement(e.getTable().getField("LONGUEUR")) {
+            @Override
+            public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
+                int idUv = vals.getForeignID("ID_UNITE_VENTE");
+                return idUv == UniteVenteArticleSQLElement.M2;
+            }
+        };
+        list.add(eltLongueur);
+        SQLTableElement eltLargeur = new SQLTableElement(e.getTable().getField("LARGEUR")) {
+            @Override
+            public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
+                int idUv = vals.getForeignID("ID_UNITE_VENTE");
+                return idUv == UniteVenteArticleSQLElement.M2;
+            }
+        };
+        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);
+                }
+            }
                         rowVals.put("PV_U_DEVISE", rowVals.getObject("PRIX_METRIQUE_VT_1"));
                         final BigDecimal globalQty = rowVals.getBigDecimal("QTE_UNITAIRE").multiply(new BigDecimal(rowVals.getInt("QTE")));
                         rowVals.put("PV_T_DEVISE", rowVals.getBigDecimal("PRIX_METRIQUE_VT_1").multiply(globalQty));
+                    }
+                }
-                super.commitData();
+                super.commitData(true);
+            }
         };
         this.setModel(model);
         this.table = new RowValuesTable(model, getConfigurationFile());
         ToolTipManager.sharedInstance().unregisterComponent(this.table);
         ToolTipManager.sharedInstance().unregisterComponent(this.table.getTableHeader());
+        this.table.getClearCloneTableElement().add("ID_COMMANDE_CLIENT_ELEMENT");
         if (filterFamilleArticle) {
             ((SQLTextComboTableCellEditor) tableElementArticle.getTableCellEditor(this.table)).setDynamicWhere(e.getTable().getTable("ARTICLE").getField("ID_FAMILLE_ARTICLE"));
+        }
         completionField.add("PRIX_METRIQUE_VT_1");
         completionField.add("PRIX_METRIQUE_VT_2");
         completionField.add("PRIX_METRIQUE_VT_3");
         completionField.add("SERVICE");
         completionField.add("ID_FAMILLE_ARTICLE");
+        completionField.add("LONGUEUR");
+        completionField.add("LARGEUR");
+        completionField.add("HAUTEUR");
         if (getSQLElement().getTable().getFieldsName().contains("DESCRIPTIF")) {
             completionField.add("DESCRIPTIF");
+        }
         if (showDevise) {
             completionField.add("ID_DEVISE");
                     return tableArticle.getUndefinedID();
+                }
+            }
         });
+        uniteVente.addModificationListener(qteU);
+        eltLargeur.addModificationListener(qteU);
+        eltLongueur.addModificationListener(qteU);
+        qteU.setModifier(new CellDynamicModifier() {
+            public Object computeValueFrom(SQLRowValues row, SQLTableElement source) {
+                SQLRowAccessor rowUnite = row.getForeign("ID_UNITE_VENTE");
+                if (rowUnite != null && !rowUnite.isUndefined() && rowUnite.getBoolean("A_LA_PIECE")) {
+                    return BigDecimal.ONE;
+                } else if (activeCalculM2 && rowUnite != null && !rowUnite.isUndefined() && rowUnite.getID() == UniteVenteArticleSQLElement.M2) {
+                    BigDecimal longueur = row.getBigDecimal("LONGUEUR");
+                    BigDecimal largeur = row.getBigDecimal("LARGEUR");
+                    if (longueur == null || largeur == null) {
+                        return BigDecimal.ONE;
+                    }
+                    return longueur.multiply(largeur);
+                } else {
+                    return row.getObject("QTE_UNITAIRE");
+                }
+            }
+        });
         // Mode Gestion article avancé
         String valModeAvanceVt = DefaultNXProps.getInstance().getStringProperty("ArticleModeVenteAvance");
         Boolean bModeAvance = Boolean.valueOf(valModeAvanceVt);
         if (bModeAvance != null && !bModeAvance.booleanValue()) {
             hideColumn(model.getColumnForField("VALEUR_METRIQUE_1"));
         // Packaging
         if (prefs.getBoolean(GestionArticleGlobalPreferencePanel.ITEM_PACKAGING, false)) {
             setColumnVisible(model.getColumnForField("T_POIDS_COLIS_NET"), false);
+        }
+        // ACtivation calcul m2
+        setColumnVisible(model.getColumnForField("HAUTEUR"), false);
+        setColumnVisible(model.getColumnForField("LARGEUR"), activeCalculM2);
+        setColumnVisible(model.getColumnForField("LONGUEUR"), activeCalculM2);
         setColumnVisible(model.getColumnForField("ID_ARTICLE"), selectArticle);
         setColumnVisible(model.getColumnForField("CODE"), !selectArticle || (selectArticle && createAuto));
         setColumnVisible(model.getColumnForField("NOM"), !selectArticle || (selectArticle && createAuto));
         setColumnVisible(getModel().getColumnForField("ID_FAMILLE_ARTICLE"), filterFamilleArticle);
         setColumnVisible(model.getColumnForField("ID_UNITE_VENTE"), gestionUV);
         setColumnVisible(model.getColumnForField("PRIX_METRIQUE_HA_1"), showHAPrice);
         setColumnVisible(model.getColumnForField("MARGE_HT"), showHAPrice);
         setColumnVisible(model.getColumnForField("T_PA_HT"), showHAPrice);
+        setColumnVisible(model.getColumnForField("ID_DEPOT_STOCK"), prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_MULTI_DEPOT, false));
         if (e.getTable().contains("ID_COMMANDE_CLIENT_ELEMENT")) {
             setColumnVisible(model.getColumnForField("ID_COMMANDE_CLIENT_ELEMENT"), false);
+        }
+        for (String string : AbstractVenteArticleItemTable.getVisibilityMap().keySet()) {
+            setColumnVisible(model.getColumnForField(string), AbstractVenteArticleItemTable.getVisibilityMap().get(string));
+        }
+        Map<String, Boolean> mapCustom = getCustomVisibilityMap();
+        if (mapCustom != null) {
+            for (String string : mapCustom.keySet()) {
+                setColumnVisible(model.getColumnForField(string), mapCustom.get(string));
+            }
+        }
         // Barcode reader
         final BarcodeReader barcodeReader = ComptaPropsConfiguration.getInstanceCompta().getBarcodeReader();
         if (barcodeReader != null) {
             final BarcodeListener l = new BarcodeListener() {
+                }
             });
+        }
+        if (this.table.getRowValuesTableModel().getColumnForField("ID_DEPOT_STOCK") >= 0 && this.table.getRowValuesTableModel().getColumnForField("ID_ARTICLE") >= 0) {
+            if (this.buttons == null) {
+                this.buttons = new ArrayList<>();
+            }
+            JButton buttonStock = new JButton("Consulter le stock");
+            buttonStock.addActionListener(new ActionListener() {
+                public void actionPerformed(ActionEvent event) {
+                    SQLRowValues rowValsSel = table.getSelectedRowValues();
+                    if (rowValsSel != null) {
+                        SQLRowAccessor foreignArt = rowValsSel.getForeign("ID_ARTICLE");
+                        if (foreignArt != null && !foreignArt.isUndefined()) {
+                            SQLRowAccessor rowValsStock = StockSQLElement.getStock(rowValsSel);
+                            if (rowValsStock != null && !rowValsStock.isUndefined()) {
+                                EditFrame frame = new EditFrame(table.getRowValuesTableModel().getSQLElement().getDirectory().getElement("STOCK"), EditMode.READONLY);
+                                frame.selectionId(rowValsStock.getID());
+                                frame.setVisible(true);
+                            }
+                        }
+                    }
+                }
+            });
+            this.buttons.add(buttonStock);
+        }
         // On réécrit la configuration au cas ou les preferences aurait changé
         this.table.writeState();
+    }

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/shipment/ui/BonDeLivraisonItemTable.java @ 174 - Rev 174 → 177