WebSVN - OpenConcerto - Diff - Rev 174 and 177 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/AbstractVenteArticleItemTable.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.model.ProductComponent;
 import org.openconcerto.erp.core.sales.product.model.ProductHelper;
 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.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.erp.preferences.GestionArticleGlobalPreferencePanel;
 import org.openconcerto.sql.view.list.RowValuesTable;
 import org.openconcerto.sql.view.list.RowValuesTableModel;
 import org.openconcerto.sql.view.list.SQLTableElement;
 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.StringUtils;
 import org.openconcerto.utils.Tuple3;
 import org.openconcerto.utils.cc.ITransformer;
     SQLTableElement tableElementFacturable;
     protected SQLTableElement tableElementRemise;
     public enum TypeCalcul {
-        CALCUL_FACTURABLE("MONTANT_FACTURABLE", "POURCENT_FACTURABLE"), CALCUL_REMISE("MONTANT_REMISE", "POURCENT_REMISE");
+        CALCUL_MONTANT_TOTAL("MONTANT_FACTURABLE", "POURCENT_FACTURABLE"), CALCUL_FACTURABLE("MONTANT_FACTURABLE", "POURCENT_FACTURABLE"), CALCUL_REMISE("MONTANT_REMISE", "POURCENT_REMISE");
         String fieldMontant, fieldPourcent;
         TypeCalcul(String fieldMontant, String fieldPourcent) {
             this.fieldMontant = fieldMontant;
         public String getFieldPourcent() {
             return fieldPourcent;
+        }
     };
+    private Acompte acompteFacturer = null;
     public void calculPourcentage(final Acompte a, final TypeCalcul type) {
+        this.acompteFacturer = a;
         Runnable r = new Runnable() {
             @Override
             public void run() {
                 SwingUtilities.invokeLater(new Runnable() {
                                 model.putValue(a.getPercent(), i, type.getFieldPourcent());
                                 model.putValue(null, i, type.getFieldMontant());
                                 tableElement.fireModification(model.getRowValuesAt(i));
+                            }
                         } else {
-                            // FIXME repartition du montant sur chaque ligne
-                            BigDecimal totalHT = BigDecimal.ZERO;
+                            BigDecimal totalHT = getTotalHT(type);
-                            for (SQLRowValues rowVals : getRowValuesAtLevel(1)) {
-                                int qte = rowVals.getInt("QTE");
-                                BigDecimal qteU = rowVals.getBigDecimal("QTE_UNITAIRE");
-                                BigDecimal pU = rowVals.getBigDecimal("PV_HT");
-                                BigDecimal totalLine = pU.multiply(qteU, DecimalUtils.HIGH_PRECISION).multiply(new BigDecimal(qte), DecimalUtils.HIGH_PRECISION).setScale(2, RoundingMode.HALF_UP);
-                                // BigDecimal lremise = (type == TypeCalcul.CALCUL_FACTURABLE ?
-                                // rowVals.getBigDecimal("POURCENT_REMISE") : BigDecimal.ZERO);
-                                //
-                                // if (lremise.compareTo(BigDecimal.ZERO) > 0 &&
-                                // lremise.compareTo(BigDecimal.valueOf(100)) < 100) {
-                                // totalLine =
-                                // totalLine.multiply(BigDecimal.valueOf(100).subtract(lremise),
-                                // DecimalUtils.HIGH_PRECISION).movePointLeft(2);
-                                // }
-                                if (type == TypeCalcul.CALCUL_FACTURABLE) {
-                                    if (rowVals.getTable().getFieldsName().contains("MONTANT_REMISE")) {
-                                        final BigDecimal acomptePercent = rowVals.getBigDecimal("POURCENT_REMISE");
-                                        final BigDecimal acompteMontant = rowVals.getBigDecimal("MONTANT_REMISE");
-                                        Remise remise = new Remise(acomptePercent, acompteMontant);
-                                        totalLine = remise.getResultFrom(totalLine);
-                                    }
-                                }
-                                totalHT = totalHT.add(totalLine);
-                            }
-                            // BigDecimal percent = (totalHT.signum() != 0 ?
-                            // a.getMontant().divide(totalHT, DecimalUtils.HIGH_PRECISION) :
-                            // BigDecimal.ZERO);
                             for (int i = 0; i < model.getRowCount(); i++) {
                                 // Restrict to level 1
                                 if (model.getRowValuesAt(i).getInt("NIVEAU") != 1) {
                                     continue;
                                 BigDecimal qteU = rowVals.getBigDecimal("QTE_UNITAIRE");
                                 BigDecimal pU = rowVals.getBigDecimal("PV_HT");
                                 BigDecimal totalLine = pU.multiply(qteU, DecimalUtils.HIGH_PRECISION).multiply(new BigDecimal(qte), DecimalUtils.HIGH_PRECISION).setScale(2, RoundingMode.HALF_UP);
-                                // BigDecimal lremise = (type == TypeCalcul.CALCUL_FACTURABLE ?
-                                // rowVals.getBigDecimal("POURCENT_REMISE") : BigDecimal.ZERO);
-                                //
-                                // if (lremise.compareTo(BigDecimal.ZERO) > 0 &&
-                                // lremise.compareTo(BigDecimal.valueOf(100)) < 100) {
-                                // totalLine =
-                                // totalLine.multiply(BigDecimal.valueOf(100).subtract(lremise),
-                                // DecimalUtils.HIGH_PRECISION).movePointLeft(2);
-                                // }
                                 if (rowVals.getTable().getFieldsName().contains("MONTANT_REMISE")) {
                                     final BigDecimal acomptePercent = rowVals.getBigDecimal("POURCENT_REMISE");
                                     final BigDecimal acompteMontant = rowVals.getBigDecimal("MONTANT_REMISE");
                                     Remise remise = new Remise(acomptePercent, acompteMontant);
                                     totalLine = remise.getResultFrom(totalLine);
                                 tableElement.fireModification(model.getRowValuesAt(i));
+                            }
+                        }
                         model.fireTableDataChanged();
+                    }
                 });
+            }
         };
         getModel().submit(r);
+    }
+    public BigDecimal getTotalHT(final TypeCalcul type) {
+        BigDecimal totalHT = BigDecimal.ZERO;
+        for (SQLRowValues rowVals : getRowValuesAtLevel(1)) {
+            int qte = rowVals.getInt("QTE");
+            BigDecimal qteU = rowVals.getBigDecimal("QTE_UNITAIRE");
+            BigDecimal pU = rowVals.getBigDecimal("PV_HT");
+            BigDecimal totalLine = pU.multiply(qteU, DecimalUtils.HIGH_PRECISION).multiply(new BigDecimal(qte), DecimalUtils.HIGH_PRECISION).setScale(2, RoundingMode.HALF_UP);
+            if (type == TypeCalcul.CALCUL_FACTURABLE || type == TypeCalcul.CALCUL_MONTANT_TOTAL) {
+                if (rowVals.getTable().getFieldsName().contains("MONTANT_REMISE")) {
+                    final BigDecimal acomptePercent = rowVals.getBigDecimal("POURCENT_REMISE");
+                    final BigDecimal acompteMontant = rowVals.getBigDecimal("MONTANT_REMISE");
+                    Remise remise = new Remise(acomptePercent, acompteMontant);
+                    totalLine = remise.getResultFrom(totalLine);
+                }
+            }
+            if (type == TypeCalcul.CALCUL_MONTANT_TOTAL) {
+                if (rowVals.getTable().getFieldsName().contains("POURCENT_FACTURABLE")) {
+                    final BigDecimal acomptePercent = rowVals.getBigDecimal("POURCENT_FACTURABLE");
+                    final BigDecimal acompteMontant = rowVals.getBigDecimal("MONTANT_FACTURABLE");
+                    Acompte acompte = new Acompte(acomptePercent, acompteMontant);
+                    totalLine = acompte.getResultFrom(totalLine);
+                }
+            }
+            totalHT = totalHT.add(totalLine);
+        }
+        return totalHT;
+    }
     private static Map<String, Boolean> visibilityMap = new HashMap<String, Boolean>();
     public static Map<String, Boolean> getVisibilityMap() {
         return visibilityMap;
+    }
     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);
         if (e.getTable().getFieldsName().contains("ECO_CONTRIBUTION")) {
             this.tableElementEco = new SQLTableElement(e.getTable().getField("ECO_CONTRIBUTION"));
             list.add(this.tableElementEco);
+        }
+        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");
-        // // Prix d'achat HT de la métrique 1
+                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);
+                }
+            }
         };
         this.tableElementPoidsTotal.setEditable(false);
         list.add(this.tableElementPoidsTotal);
         // Packaging
-        if (prefs.getBoolean(GestionArticleGlobalPreferencePanel.ITEM_PACKAGING, false)) {
+        if (e.getTable().contains("POIDS_COLIS_NET") && prefs.getBoolean(GestionArticleGlobalPreferencePanel.ITEM_PACKAGING, false)) {
+            SQLTableElement tareColis = new SQLTableElement(e.getTable().getField("TARE"), BigDecimal.class) {
+                @Override
+                public TableCellRenderer getTableCellRenderer() {
+                    return new QteUnitRowValuesRenderer();
+                }
+            };
+            list.add(tareColis);
             SQLTableElement poidsColis = new SQLTableElement(e.getTable().getField("POIDS_COLIS_NET"), BigDecimal.class) {
                 @Override
                 public TableCellRenderer getTableCellRenderer() {
                     return new QteUnitRowValuesRenderer();
             poidsColis.addModificationListener(totalPoidsColis);
             nbColis.addModificationListener(totalPoidsColis);
             totalPoidsColis.setModifier(new CellDynamicModifier() {
                 public Object computeValueFrom(final SQLRowValues row, SQLTableElement source) {
-                    final Object o2 = row.getObject("POIDS_COLIS_NET");
+                    final BigDecimal pdsColis = row.getBigDecimal("POIDS_COLIS_NET");
                     final Object o3 = row.getObject("NB_COLIS");
-                    if (o2 != null && o3 != null) {
+                    BigDecimal pdsColisTotal = BigDecimal.ZERO;
-                        BigDecimal poids = (BigDecimal) o2;
+                    if (pdsColis != null && o3 != null) {
                         int nb = (Integer) o3;
-                        return poids.multiply(new BigDecimal(nb), DecimalUtils.HIGH_PRECISION).setScale(totalPoidsColis.getDecimalDigits(), RoundingMode.HALF_UP);
+                        pdsColisTotal = pdsColis.multiply(new BigDecimal(nb), DecimalUtils.HIGH_PRECISION);
-                    } else {
-                        return row.getObject("T_POIDS_COLIS_NET");
+                    }
+                    return pdsColisTotal.setScale(totalPoidsColis.getDecimalDigits(), RoundingMode.HALF_UP);
+                }
+            });
+            final SQLTableElement totalPoidsBrut = new SQLTableElement(e.getTable().getField("T_POIDS_BRUT"), BigDecimal.class) {
+                @Override
+                public TableCellRenderer getTableCellRenderer() {
+                    return new QteUnitRowValuesRenderer();
+                }
+            };
+            list.add(totalPoidsBrut);
+            tareColis.addModificationListener(totalPoidsBrut);
+            poidsColis.addModificationListener(totalPoidsBrut);
+            nbColis.addModificationListener(totalPoidsBrut);
+            this.tableElementPoidsTotal.addModificationListener(totalPoidsBrut);
+            totalPoidsBrut.setModifier(new CellDynamicModifier() {
+                public Object computeValueFrom(final SQLRowValues row, SQLTableElement source) {
+                    final BigDecimal tare = row.getBigDecimal("TARE");
+                    final int qte = row.getInt("QTE");
+                    final BigDecimal pdsColis = row.getBigDecimal("POIDS_COLIS_NET");
+                    final Object o3 = row.getObject("NB_COLIS");
+                    BigDecimal pdsBrutTotal = BigDecimal.ZERO;
+                    if (row.getObject("T_POIDS") != null) {
+                        pdsBrutTotal = new BigDecimal(row.getFloat("T_POIDS"));
+                    }
+                    if (tare != null) {
+                        pdsBrutTotal = pdsBrutTotal.add(tare.multiply(new BigDecimal(qte)));
+                    }
+                    if (pdsColis != null && o3 != null) {
+                        int nb = (Integer) o3;
+                        pdsBrutTotal = pdsBrutTotal.add(pdsColis.multiply(new BigDecimal(nb), DecimalUtils.HIGH_PRECISION));
+                    }
+                    return pdsBrutTotal.setScale(totalPoidsBrut.getDecimalDigits(), RoundingMode.HALF_UP);
+                }
             });
+        }
         };
         CurrencyWithSymbolRenderer totalRenderer = new CurrencyWithSymbolRenderer();
         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")) {
             // SQLTableElement tableElementAcompte = new
             // SQLTableElement(e.getTable().getField("POURCENT_ACOMPTE"));
             // list.add(tableElementAcompte);
                     label.setText(a.toPlainString(true));
                     return label;
+                }
             });
             tableElementFacturable.addModificationListener(this.totalHT);
+            tableElementFacturable.addModificationListener(this.totalHA);
             list.add(tableElementFacturable);
+        }
         final SQLField fieldRemise = e.getTable().getField("POURCENT_REMISE");
             tableElementRG = new SQLTableElement(e.getTable().getField("POURCENT_RG"));
             list.add(tableElementRG);
+        }
         // Total HT
-        this.totalHA = new SQLTableElement(e.getTable().getField("T_PA_HT"), BigDecimal.class);
         this.totalHA.setRenderer(totalRenderer);
         this.totalHA.setEditable(false);
         list.add(this.totalHA);
         if (showDevise) {
         this.defaultRowVals = new SQLRowValues(UndefinedRowValuesCache.getInstance().getDefaultRowValues(e.getTable()));
         defaultRowVals.put("ID_TAXE", TaxeCache.getCache().getFirstTaxe().getID());
         defaultRowVals.put("CODE", "");
         defaultRowVals.put("NOM", "");
+        if (e.getTable().contains("ID_DEPOT_STOCK")) {
+            DefaultProps props = DefaultNXProps.getInstance();
+            Integer depotDefault = props.getIntProperty("DepotStockDefault", DepotStockSQLElement.DEFAULT_ID);
+            this.defaultRowVals.put("ID_DEPOT_STOCK", depotDefault);
+        }
         final RowValuesTableModel model = new RowValuesTableModel(e, list, e.getTable().getField("ID_TAXE"), false, defaultRowVals) {
             @Override
             public void commitData() {
                 int size = getRowCount();
                 for (int i = 0; i < size; i++) {
                         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);
+            }
         };
         setModel(model);
         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("QTE_LIVREE");
+            this.table.getClearCloneTableElement().add("LIVRE");
+            this.table.getClearCloneTableElement().add("LIVRE_FORCED");
+        }
         this.table.getTableHeader().addMouseListener(new MouseAdapter() {
             @Override
             public void mousePressed(MouseEvent e) {
                 if (e.isPopupTrigger()) {
         final SQLTable sqlTableArticle = ((ComptaPropsConfiguration) Configuration.getInstance()).getRootSociete().getTable("ARTICLE");
         List<String> completionField = new ArrayList<String>();
         if (e.getTable().getFieldsName().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("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");
+        }
         if (getSQLElement().getTable().getFieldsName().contains("QTE_ACHAT") && sqlTableArticle.getTable().getFieldsName().contains("QTE_ACHAT")) {
             completionField.add("QTE_ACHAT");
+        }
+        if (getSQLElement().getTable().getFieldsName().contains("POIDS_COLIS_NET") && sqlTableArticle.getTable().getFieldsName().contains("POIDS_COLIS_NET")) {
+            completionField.add("POIDS_COLIS_NET");
+        }
+        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()) {
             @Override
             protected Object getValueFrom(SQLRow row, String field, SQLRowAccessor rowDest) {
                 Object res = tarifCompletion(row, field, rowDest, true);
+                                }
+                            }
                             BigDecimal fVT = (BigDecimal) row.getObject("PV_HT");
                             BigDecimal r = b.multiply(fVT.multiply(BigDecimal.valueOf(qte), DecimalUtils.HIGH_PRECISION), DecimalUtils.HIGH_PRECISION);
-                            if (lremise.compareTo(BigDecimal.ZERO) > 0 && lremise.compareTo(BigDecimal.valueOf(100)) < 100) {
+                            if (lremise.compareTo(BigDecimal.ZERO) > 0) {
                                 r = r.multiply(BigDecimal.valueOf(100).subtract(lremise), DecimalUtils.HIGH_PRECISION).movePointLeft(2);
+                            }
                             if (row.getTable().getFieldsName().contains("MONTANT_REMISE")) {
                                 final BigDecimal acomptePercentR = row.getBigDecimal("POURCENT_REMISE");
                                 final BigDecimal acompteMontantR = row.getBigDecimal("MONTANT_REMISE");
                                 Remise remise = new Remise(acomptePercentR, acompteMontantR);
                                 r = remise.getResultFrom(r);
+                                // Si factrue d'avancement et remise =100% ou pv =0 alors on
+                                // applique le
+                                // ratio entre le montant facturer et le montant global
+                                if (acompteMontant.signum() == 0 && (acomptePercentR != null && acomptePercentR.compareTo(BigDecimal.ONE.movePointRight(2)) == 0)) {
+                                    r = BigDecimal.ZERO;
+                                    BigDecimal totalHTGlobal = getTotalHT(TypeCalcul.CALCUL_FACTURABLE);
+                                    if (acompteFacturer != null && acompteFacturer.getMontant() != null && totalHTGlobal != null && totalHTGlobal.signum() != 0) {
+                                        rHA = rHA.multiply(acompteFacturer.getMontant().divide(totalHTGlobal, DecimalUtils.HIGH_PRECISION), DecimalUtils.HIGH_PRECISION);
+                                    }
+                                }
+                            }
                             if (r.signum() != 0) {
                                 rHA = rHA.multiply(acompteMontant.divide(r, DecimalUtils.HIGH_PRECISION), DecimalUtils.HIGH_PRECISION);
+                            }
+                        }
                 return b.multiply(new BigDecimal(f.floatValue() * qte)).floatValue();
+            }
         });
         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");
+                }
+            }
             setColumnVisible(model.getColumnForField("ID_ECO_CONTRIBUTION"), showEco);
             setColumnVisible(model.getColumnForField("ECO_CONTRIBUTION"), showEco);
             setColumnVisible(model.getColumnForField("T_ECO_CONTRIBUTION"), showEco);
+        }
+        // ACtivation calcul m2
+        setColumnVisible(model.getColumnForField("HAUTEUR"), false);
+        setColumnVisible(model.getColumnForField("LARGEUR"), activeCalculM2);
+        setColumnVisible(model.getColumnForField("LONGUEUR"), activeCalculM2);
         // Gestion des unités de vente
         final boolean gestionUV = prefs.getBoolean(GestionArticleGlobalPreferencePanel.UNITE_VENTE, true);
         setColumnVisible(model.getColumnForField("QTE_UNITAIRE"), gestionUV);
         setColumnVisible(model.getColumnForField("ID_UNITE_VENTE"), gestionUV);
         setColumnVisible(model.getColumnForField("T_PA_HT"), showHAPrice);
         setColumnVisible(model.getColumnForField("ID_DEPOT_STOCK"), prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_MULTI_DEPOT, false));
+        setColumnVisible(model.getColumnForField("T_POIDS_COLIS_NET"), false);
+        setColumnVisible(model.getColumnForField("T_POIDS_BRUT"), false);
         for (String string : visibilityMap.keySet()) {
             setColumnVisible(model.getColumnForField(string), visibilityMap.get(string));
+        }
         Map<String, Boolean> mapCustom = getCustomVisibilityMap();
     public void setClient(SQLRowAccessor rowClient, boolean ask) {
         if (rowClient == null || getRowClient() == null || rowClient.getID() != getRowClient().getID()) {
             super.setClient(rowClient, ask);
             if (getRowClient() != null && !getRowClient().isUndefined()) {
                 this.cacheRemise = getRowClient().getReferentRows(getSQLElement().getTable().getTable("TARIF_ARTICLE_CLIENT"));
-                if (ask && getRowValuesTable().getRowCount() > 0
+                if (ask && this.cacheRemise.size() > 0 && getRowValuesTable().getRowCount() > 0
                         && JOptionPane.showConfirmDialog(null, "Appliquer les remises associées au client sur les lignes déjà présentes?") == JOptionPane.YES_OPTION) {
                     int nbRows = this.table.getRowCount();
                     for (int i = 0; i < nbRows; i++) {
                         SQLRowValues rowVals = getRowValuesTable().getRowValuesTableModel().getRowValuesAt(i);
     @Override
     public void setTarif(SQLRowAccessor rowValuesTarif, boolean ask) {
         if (rowValuesTarif == null || getTarif() == null || rowValuesTarif.getID() != getTarif().getID()) {
             super.setTarif(rowValuesTarif, ask);
-            if (ask && getRowValuesTable().getRowCount() > 0
+            if (ask && getRowValuesTable().getRowCount() > 0 && (rowValuesTarif == null || getTarif() == null || rowValuesTarif.isUndefined()
-                    && JOptionPane.showConfirmDialog(null, "Appliquer les tarifs associés au client sur les lignes déjà présentes?") == JOptionPane.YES_OPTION) {
+                    || JOptionPane.showConfirmDialog(null, "Appliquer les tarifs associés au client sur les lignes déjà présentes?") == JOptionPane.YES_OPTION)) {
                 int nbRows = this.table.getRowCount();
                 for (int i = 0; i < nbRows; i++) {
                     SQLRowValues rowVals = getRowValuesTable().getRowValuesTableModel().getRowValuesAt(i);
                     if (!rowVals.isForeignEmpty("ID_ARTICLE")) {
         // if (o != null) {
         // return o;
         // }
         SQLRowAccessor rowA = row.getForeign("ID_ARTICLE");
-        if (rowA != null && !rowA.isUndefined() && rowA.getTable().contains("AUTO_PRIX_MIN_VENTE_NOMENCLATURE") && rowA.getBoolean("AUTO_PRIX_MIN_VENTE_NOMENCLATURE")) {
+        if (rowA != null && !rowA.isUndefined() && rowA.getTable().getDBRoot().contains("ARTICLE_PRIX_PUBLIC") && rowA.getTable().contains("AUTO_PRIX_MIN_VENTE_NOMENCLATURE")
+                && rowA.getBoolean("AUTO_PRIX_MIN_VENTE_NOMENCLATURE")) {
             BigDecimal b = row.getBigDecimal("QTE_UNITAIRE");
             int q = row.getInt("QTE");
             BigDecimal qteTotal = b.multiply(new BigDecimal(q), DecimalUtils.HIGH_PRECISION);
             ProductHelper helper = new ProductHelper(rowA.getTable().getDBRoot());

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 174 → 177