WebSVN - OpenConcerto - Diff - Rev 149 and 156 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/product/component/ReferenceArticleSQLComponent.java

 import org.openconcerto.erp.core.common.ui.TotalPanel;
 import org.openconcerto.erp.core.finance.accounting.model.CurrencyConverter;
 import org.openconcerto.erp.core.finance.tax.model.TaxeCache;
 import org.openconcerto.erp.core.sales.product.element.ArticleCodeClientTable;
 import org.openconcerto.erp.core.sales.product.element.ReferenceArticleSQLElement;
+import org.openconcerto.erp.core.sales.product.element.SupplierPriceListTable;
 import org.openconcerto.erp.core.sales.product.element.UniteVenteArticleSQLElement;
+import org.openconcerto.erp.core.sales.product.ui.ArticleCategorieComptableTable;
 import org.openconcerto.erp.core.sales.product.ui.ArticleDesignationTable;
 import org.openconcerto.erp.core.sales.product.ui.ArticleTarifTable;
 import org.openconcerto.erp.core.sales.product.ui.ProductItemListTable;
 import org.openconcerto.erp.core.sales.product.ui.ProductQtyPriceListTable;
 import org.openconcerto.erp.core.sales.product.ui.RowValuesTableEditionPanel;
+import org.openconcerto.erp.core.supplychain.stock.element.ComposedItemStockUpdater;
+import org.openconcerto.erp.core.supplychain.stock.element.DepotStockSQLElement;
+import org.openconcerto.erp.core.supplychain.stock.element.StockItem;
 import org.openconcerto.erp.model.ISQLCompteSelector;
 import org.openconcerto.erp.preferences.DefaultNXProps;
 import org.openconcerto.erp.preferences.GestionArticleGlobalPreferencePanel;
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.element.BaseSQLComponent;
 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.SQLSelect;
+import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.model.Where;
 import org.openconcerto.sql.preferences.SQLPreferences;
 import org.openconcerto.sql.sqlobject.ElementComboBox;
+import org.openconcerto.sql.sqlobject.SQLTextCombo;
 import org.openconcerto.ui.DefaultGridBagConstraints;
 import org.openconcerto.ui.FormLayouter;
 import org.openconcerto.ui.TitledSeparator;
 import org.openconcerto.ui.component.ITextArea;
 import org.openconcerto.ui.preferences.DefaultProps;
 import org.openconcerto.utils.DecimalUtils;
+import org.openconcerto.utils.ExceptionHandler;
 import org.openconcerto.utils.StringUtils;
 import org.openconcerto.utils.text.SimpleDocumentListener;
 import java.awt.Component;
 import java.awt.GridBagConstraints;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
     private JLabel labelMetriqueVT1 = new JLabel(getLabelFor("PRIX_METRIQUE_VT_1"), SwingConstants.RIGHT);
     private ArticleDesignationTable tableDes = new ArticleDesignationTable();
     private ArticleCodeClientTable tableCodeClient = new ArticleCodeClientTable();
     private ArticleTarifTable tableTarifVente = new ArticleTarifTable(this);
+    private ArticleCategorieComptableTable tableCatComptable = new ArticleCategorieComptableTable();
+    private SupplierPriceListTable tableFourSec = new SupplierPriceListTable();
     private ProductQtyPriceListTable tableTarifQteVente = new ProductQtyPriceListTable(this);
     private ProductItemListTable tableBom;
-    private final JTextField textMarge = new JTextField(15);
+    private final JTextField textMarge = new JTextField(10);
+    private final JLabel labelMarge = new JLabel("%           ");
+    private ElementComboBox boxCR;
+    private JCheckBox boxMargeWithCR;
     private DocumentListener pieceHAArticle = new SimpleDocumentListener() {
         @Override
         public void update(DocumentEvent e) {
         @Override
         public void update(DocumentEvent e) {
             ReferenceArticleSQLComponent.this.textMarge.getDocument().removeDocumentListener(ReferenceArticleSQLComponent.this.listenerMargeTextMarge);
             if (ReferenceArticleSQLComponent.this.textPVHT.getText().trim().length() > 0 && ReferenceArticleSQLComponent.this.textPAHT.getText().trim().length() > 0) {
                 final BigDecimal vt = StringUtils.getBigDecimalFromUserText(ReferenceArticleSQLComponent.this.textPVHT.getText());
-                final BigDecimal ha = StringUtils.getBigDecimalFromUserText(ReferenceArticleSQLComponent.this.textPAHT.getText());
+                BigDecimal ha = StringUtils.getBigDecimalFromUserText(ReferenceArticleSQLComponent.this.textPAHT.getText());
                 if (vt != null && ha != null) {
                     if (vt.signum() != 0 && ha.signum() != 0) {
+                        if (boxMargeWithCR.isSelected() && boxCR != null) {
+                            SQLRow rowCR = boxCR.getSelectedRow();
+                            if (rowCR != null && !rowCR.isUndefined()) {
+                                BigDecimal cr = rowCR.getBigDecimal("POURCENT");
+                                ha = ha.multiply(cr.movePointLeft(2).add(BigDecimal.ONE), DecimalUtils.HIGH_PRECISION);
+                            }
+                        }
                         BigDecimal margeHT = vt.subtract(ha);
                         BigDecimal value;
                         if (DefaultNXProps.getInstance().getBooleanValue(TotalPanel.MARGE_MARQUE, false)) {
                         if (value.compareTo(BigDecimal.ZERO) > 0) {
                             ReferenceArticleSQLComponent.this.textMarge.setText(value.setScale(6, RoundingMode.HALF_UP).toString());
                         } else {
                             ReferenceArticleSQLComponent.this.textMarge.setText("0");
+                        }
+                        labelMarge.setText("% (" + StringUtils.leftAlign(margeHT.setScale(2, RoundingMode.HALF_UP).toString(), 9) + ")");
+                    }
+                }
+            }
             ReferenceArticleSQLComponent.this.textMarge.getDocument().addDocumentListener(ReferenceArticleSQLComponent.this.listenerMargeTextMarge);
+        }
         if (this.textPAHT.getText().trim().length() > 0) {
             BigDecimal ha = StringUtils.getBigDecimalFromUserText(this.textPAHT.getText());
             if (ha != null && this.textMarge.getText().trim().length() > 0) {
+                if (boxMargeWithCR.isSelected() && boxCR != null) {
+                    SQLRow rowCR = this.boxCR.getSelectedRow();
+                    if (rowCR != null && !rowCR.isUndefined()) {
+                        BigDecimal cr = rowCR.getBigDecimal("POURCENT");
+                        ha = ha.multiply(cr.movePointLeft(2).add(BigDecimal.ONE), DecimalUtils.HIGH_PRECISION);
+                    }
+                }
                 BigDecimal d = StringUtils.getBigDecimalFromUserText(this.textMarge.getText());
+                if (d == null) {
+                    d = BigDecimal.ZERO;
+                }
+                final BigDecimal vt;
                 if (DefaultNXProps.getInstance().getBooleanValue(TotalPanel.MARGE_MARQUE, false)) {
                     final BigDecimal e = BigDecimal.ONE.subtract(d.divide(BigDecimal.valueOf(100), DecimalUtils.HIGH_PRECISION));
                     if (e.signum() == 0) {
-                        this.textPVHT.setText("0");
+                        vt = BigDecimal.ZERO;
                     } else {
-                        this.textPVHT.setText(ha.divide(e, DecimalUtils.HIGH_PRECISION).setScale(getTable().getField("PV_HT").getType().getDecimalDigits(), RoundingMode.HALF_UP).toString());
+                        vt = ha.divide(e, DecimalUtils.HIGH_PRECISION).setScale(getTable().getField("PV_HT").getType().getDecimalDigits(), RoundingMode.HALF_UP);
+                    }
                 } else {
                     BigDecimal result = ha.multiply(d.divide(BigDecimal.valueOf(100), DecimalUtils.HIGH_PRECISION).add(BigDecimal.ONE));
-                    this.textPVHT.setText(result.setScale(getTable().getField("PV_HT").getType().getDecimalDigits(), RoundingMode.HALF_UP).toString());
+                    vt = result.setScale(getTable().getField("PV_HT").getType().getDecimalDigits(), RoundingMode.HALF_UP);
+                    this.textPVHT.setText(vt.toString());
+                }
+                this.textPVHT.setText(vt.toString());
+                BigDecimal margeHT = vt.subtract(ha);
+                labelMarge.setText("% (" + StringUtils.leftAlign(margeHT.setScale(2, RoundingMode.HALF_UP).toString(), 9) + ")");
+            }
+        }
+    }
     public ReferenceArticleSQLComponent(SQLElement elt) {
         super.select(r);
         if (r != null && r.getID() > getTable().getUndefinedID()) {
             this.checkObs.setVisible(true);
             this.tableTarifVente.setArticleValues(r);
             this.tableTarifVente.insertFrom("ID_ARTICLE", r.getID());
+            this.tableCatComptable.insertFrom("ID_ARTICLE", r.getID());
+            this.tableFourSec.insertFrom("ID_ARTICLE", r.getID());
             this.tableTarifQteVente.insertFrom("ID_ARTICLE", r.getID());
             if (this.tableBom != null) {
                 this.tableBom.insertFrom("ID_ARTICLE_PARENT", r.getID());
+            }
             this.tableDes.insertFrom("ID_ARTICLE", r.getID());
         SQLPreferences prefs = new SQLPreferences(getTable().getDBRoot());
         // Gestion des unités de vente
         final boolean gestionUV = prefs.getBoolean(GestionArticleGlobalPreferencePanel.UNITE_VENTE, true);
         c.gridy++;
+        final ElementComboBox boxUnite = new ElementComboBox();
         if (gestionUV) {
             c.gridx = 0;
             c.weightx = 0;
             this.add(new JLabel(getLabelFor("ID_UNITE_VENTE"), SwingConstants.RIGHT), c);
             c.gridx++;
             c.weightx = 1;
             c.fill = GridBagConstraints.NONE;
-            ElementComboBox boxUnite = new ElementComboBox();
             DefaultGridBagConstraints.lockMinimumSize(boxUnite);
             this.add(boxUnite, c);
             this.addView(boxUnite, "ID_UNITE_VENTE");
             c.fill = GridBagConstraints.HORIZONTAL;
+        }
         DefaultGridBagConstraints.lockMinimumSize(fieldSKU);
         this.add(fieldSKU, c);
         this.addView(fieldSKU, "SKU");
         c.fill = GridBagConstraints.HORIZONTAL;
+        c.gridy++;
+        if (gestionUV) {
+            c.gridx = 0;
+            c.weightx = 0;
+            this.add(new JLabel(getLabelFor("QTE_UNITAIRE"), SwingConstants.RIGHT), c);
+            c.gridx++;
+            c.weightx = 1;
+            c.fill = GridBagConstraints.NONE;
+            final JTextField qte = new JTextField(10);
+            qte.setEditable(false);
+            this.add(qte, c);
+            this.addView(qte, "QTE_UNITAIRE", REQ);
+            boxUnite.addModelListener("wantedID", new PropertyChangeListener() {
+                @Override
+                public void propertyChange(PropertyChangeEvent evt) {
+                    if (!boxUnite.isEmpty() && boxUnite.getSelectedId() == UniteVenteArticleSQLElement.A_LA_PIECE) {
+                        qte.setText("1");
+                        qte.setEditable(false);
+                    } else {
+                        qte.setEditable(true);
+                    }
+                }
+            });
+            c.fill = GridBagConstraints.HORIZONTAL;
+        }
         DefaultProps props = DefaultNXProps.getInstance();
         // Article détaillé
         String modeVente = props.getStringProperty("ArticleModeVenteAvance");
         Boolean bModeVente = Boolean.valueOf(modeVente);
         c.weightx = 1;
         c.gridx++;
         ElementComboBox boxTaxeCompl = new ElementComboBox();
         panel.add(boxTaxeCompl, c);
+        c.weightx = 0;
+        c.gridy++;
+        c.gridx = 0;
+        JLabel labelMatiere = new JLabel(getLabelFor("MATIERE"));
+        c.fill = GridBagConstraints.BOTH;
+        panel.add(labelMatiere, c);
+        c.weightx = 1;
+        c.gridx++;
+        SQLTextCombo comboMatiere = new SQLTextCombo();
+        panel.add(comboMatiere, c);
         c.gridy++;
         c.gridx = 0;
         c.gridwidth = GridBagConstraints.REMAINDER;
         TitledSeparator sep = new TitledSeparator(getLabelFor("INFOS"));
         panel.add(sep, c);
         ITextArea infos = new ITextArea();
         c.fill = GridBagConstraints.BOTH;
         panel.add(infos, c);
         this.addSQLObject(infos, "INFOS");
+        this.addSQLObject(comboMatiere, "MATIERE");
         this.addSQLObject(box, "ID_ECO_CONTRIBUTION");
         this.addSQLObject(boxTaxeCompl, "ID_TAXE_COMPLEMENTAIRE");
         return panel;
+    }
                 fieldQteMin.setEnabled(boxStock.isSelected());
                 fieldQteAchat.setEnabled(boxStock.isSelected());
+            }
         });
-        c.gridwidth = 1;
-        if (gestionStockMin) {
+        boolean visibleDepot = (prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_MULTI_DEPOT, false));
-            c.gridx = 0;
+        c.gridx = 0;
-            c.gridy++;
+        c.gridy++;
-            c.weightx = 0;
+        c.weightx = 0;
-            panel.add(new JLabel(getLabelFor("QTE_MIN")), c);
+        final JLabel labelDepot = new JLabel(getLabelFor("ID_DEPOT_STOCK"));
+        panel.add(labelDepot, c);
+        labelDepot.setVisible(visibleDepot);
-            c.gridx++;
+        c.gridx++;
-            c.weightx = 1;
+        c.weightx = 1;
+        ElementComboBox boxDepot = new ElementComboBox();
+        panel.add(boxDepot, c);
+        boxDepot.setVisible(visibleDepot);
+        this.addView(boxDepot, "ID_DEPOT_STOCK", REQ);
+        c.gridwidth = 1;
+        if (gestionStockMin) {
+            // c.gridx = 0;
+            // c.gridy++;
+            // c.weightx = 0;
+            // panel.add(new JLabel(getLabelFor("QTE_MIN")), c);
+            // c.gridx++;
+            // c.weightx = 1;
-            panel.add(fieldQteMin, c);
+            // panel.add(fieldQteMin, c);
-            this.addView(fieldQteMin, "QTE_MIN");
+            // this.addView(fieldQteMin, "QTE_MIN");
             c.gridx = 0;
             c.gridy++;
             c.weightx = 0;
             panel.add(new JLabel(getLabelFor("QTE_ACHAT")), c);
         c.weightx = 1;
         panel.add(selAchat, c);
         this.addView(selAchat, "ID_COMPTE_PCE_ACHAT");
         c.gridy++;
+        c.gridx = 0;
         c.weighty = 1;
         c.weightx = 1;
         c.fill = GridBagConstraints.BOTH;
+        c.gridwidth = GridBagConstraints.REMAINDER;
+        panel.add(createCategorieComptablePanel(), c);
-        final JPanel spacer = new JPanel();
+        // final JPanel spacer = new JPanel();
-        spacer.setOpaque(false);
+        // spacer.setOpaque(false);
-        panel.add(spacer, c);
+        // panel.add(spacer, c);
         return panel;
+    }
     private SQLRowValues rowValuesDefaultCodeFournisseur;
     private CodeFournisseurItemTable codeFournisseurTable;
                 public void propertyChange(PropertyChangeEvent evt) {
                     rowValuesDefaultCodeFournisseur.put("ID_FOURNISSEUR", comboSelFournisseur.getSelectedId());
+                }
             });
         } else {
+            // Tarif fournisseur
             c.gridy++;
+            c.gridx = 0;
+            c.gridwidth = GridBagConstraints.REMAINDER;
+            TitledSeparator sep = new TitledSeparator("Tarifs fournisseurs");
+            panel.add(sep, c);
+            // Ajout fournisseur
+            c.gridwidth = 1;
-            c.weighty = 1;
+            c.weightx = 0;
+            c.gridy++;
+            c.gridx = 0;
+            panel.add(new JLabel("Ajouter le fournisseur "), c);
+            final ElementComboBox boxF = new ElementComboBox();
+            boxF.init(Configuration.getInstance().getDirectory().getElement("FOURNISSEUR"));
+            c.gridx++;
+            panel.add(boxF, c);
+            c.fill = GridBagConstraints.NONE;
+            c.gridx++;
+            JButton buttonAjouter = new JButton("Ajouter");
+            buttonAjouter.setOpaque(false);
+            panel.add(buttonAjouter, c);
+            c.gridx++;
+            JButton buttonSupprimer = new JButton("Supprimer");
+            buttonSupprimer.setOpaque(false);
+            panel.add(buttonSupprimer, c);
+            c.gridwidth = GridBagConstraints.REMAINDER;
+            c.fill = GridBagConstraints.BOTH;
             c.weightx = 1;
+            c.weighty = 1;
+            c.gridy++;
+            c.gridx = 0;
             c.fill = GridBagConstraints.BOTH;
-            final JPanel spacer = new JPanel();
+            this.tableFourSec.setOpaque(false);
-            spacer.setOpaque(false);
+            panel.add(this.tableFourSec, c);
+            // Listeners
+            buttonAjouter.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    SQLRow rowCat = boxF.getSelectedRow();
+                    if (rowCat == null || rowCat.isUndefined()) {
-            panel.add(spacer, c);
+                        return;
+                    }
+                    int nbRows = tableFourSec.getModel().getRowCount();
+                    // for (int i = 0; i < nbRows; i++) {
+                    // SQLRowValues rowVals = tableFourSec.getModel().getRowValuesAt(i);
+                    // int idTarif =
+                    // Integer.parseInt(rowVals.getObject("ID_FOURNISSEUR").toString());
+                    // if (idTarif == rowCat.getID()) {
+                    // JOptionPane.showMessageDialog(null, "Impossible d'ajouter.\nLe fournisseur
+                    // est déjà présent dans la liste!");
+                    // return;
+                    // }
+                    // }
+                    SQLRowValues rowVals = new SQLRowValues(Configuration.getInstance().getBase().getTable("ARTICLE_TARIF_FOURNISSEUR"));
+                    if (getSelectedID() > 1) {
+                        rowVals.put("ID_ARTICLE", getSelectedID());
+                    }
+                    rowVals.put("ID_FOURNISSEUR", rowCat.getID());
+                    tableFourSec.getModel().addRow(rowVals);
+                }
+            });
+            buttonSupprimer.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    tableFourSec.removeSelectedRow();
+                }
+            });
+        }
         return panel;
+    }
     private JPanel createExportationPanel() {
+            }
         });
         return panel;
+    }
+    private JPanel createCategorieComptablePanel() {
+        JPanel panel = new JPanel(new GridBagLayout());
+        panel.setOpaque(false);
+        GridBagConstraints c = new DefaultGridBagConstraints();
+        // Ajout catégorie
+        c.gridwidth = 1;
+        c.weightx = 0;
+        c.gridy++;
+        c.gridx = 0;
+        panel.add(new JLabel("Ajouter la catégorie "), c);
+        final ElementComboBox boxCat = new ElementComboBox();
+        boxCat.init(Configuration.getInstance().getDirectory().getElement("CATEGORIE_COMPTABLE"));
+        c.gridx++;
+        panel.add(boxCat, c);
+        c.fill = GridBagConstraints.NONE;
+        c.gridx++;
+        JButton buttonAjouter = new JButton("Ajouter");
+        buttonAjouter.setOpaque(false);
+        panel.add(buttonAjouter, c);
+        c.gridx++;
+        JButton buttonSupprimer = new JButton("Supprimer");
+        buttonSupprimer.setOpaque(false);
+        panel.add(buttonSupprimer, c);
+        c.gridwidth = GridBagConstraints.REMAINDER;
+        c.fill = GridBagConstraints.BOTH;
+        c.weightx = 1;
+        c.weighty = 1;
+        c.gridy++;
+        c.gridx = 0;
+        c.fill = GridBagConstraints.BOTH;
+        this.tableCatComptable.setOpaque(false);
+        panel.add(this.tableCatComptable, c);
+        // Listeners
+        buttonAjouter.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                SQLRow rowCat = boxCat.getSelectedRow();
+                if (rowCat == null || rowCat.isUndefined()) {
+                    return;
+                }
+                int nbRows = tableCatComptable.getModel().getRowCount();
+                for (int i = 0; i < nbRows; i++) {
+                    SQLRowValues rowVals = tableCatComptable.getModel().getRowValuesAt(i);
+                    int idTarif = Integer.parseInt(rowVals.getObject("ID_CATEGORIE_COMPTABLE").toString());
+                    if (idTarif == rowCat.getID()) {
+                        JOptionPane.showMessageDialog(null, "Impossible d'ajouter.\nLa catégorie est déjà présente dans la liste!");
+                        return;
+                    }
+                }
+                SQLRowValues rowVals = new SQLRowValues(Configuration.getInstance().getBase().getTable("ARTICLE_CATEGORIE_COMPTABLE"));
+                if (getSelectedID() > 1) {
+                    rowVals.put("ID_ARTICLE", getSelectedID());
+                }
+                rowVals.put("ID_CATEGORIE_COMPTABLE", rowCat.getID());
+                tableCatComptable.getModel().addRow(rowVals);
+            }
+        });
+        buttonSupprimer.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                tableCatComptable.removeSelectedRow();
+            }
+        });
+        return panel;
+    }
     private JPanel createBOMpanel() {
         JPanel panel = new JPanel(new GridBagLayout());
         panel.setOpaque(false);
         GridBagConstraints c = new DefaultGridBagConstraints();
         cAchat.gridx++;
         p.add(this.textMarge, cAchat);
         this.textMarge.getDocument().addDocumentListener(this.listenerMargeTextMarge);
         cAchat.gridx++;
         cAchat.weightx = 0;
-        p.add(new JLabel("%           "), cAchat);
+        p.add(this.labelMarge, cAchat);
         // Poids
         JLabel labelPds = new JLabel(getLabelFor("POIDS"));
         cAchat.gridx++;
         cAchat.weightx = 0;
         c.anchor = GridBagConstraints.WEST;
         c.weightx = 1;
         c.fill = GridBagConstraints.NONE;
         this.add(p, c);
+        c.gridx = 0;
+        c.gridy++;
+        c.gridwidth = 1;
+        if (getTable().contains("ID_COUT_REVIENT")) {
+            // Cout de revient
+            c.weightx = 0;
+            c.fill = GridBagConstraints.HORIZONTAL;
+            this.add(new JLabel(getLabelFor("ID_COUT_REVIENT"), SwingConstants.RIGHT), c);
+            JPanel pCR = new JPanel(new GridBagLayout());
+            GridBagConstraints cCR = new DefaultGridBagConstraints();
+            cCR.insets = new Insets(0, 0, 0, 4);
+            this.boxCR = new ElementComboBox(true, 15);
+            pCR.add(boxCR, cCR);
+            this.addView(boxCR, "ID_COUT_REVIENT");
+            DefaultGridBagConstraints.lockMinimumSize(boxCR);
+            boxCR.addModelListener("wantedID", new PropertyChangeListener() {
+                @Override
+                public void propertyChange(PropertyChangeEvent evt) {
+                    if (!isFilling()) {
+                        ReferenceArticleSQLComponent.this.textPVHT.getDocument().removeDocumentListener(ReferenceArticleSQLComponent.this.listenerMargeTextVT);
+                        updateVtFromMarge();
+                        ReferenceArticleSQLComponent.this.textPVHT.getDocument().addDocumentListener(ReferenceArticleSQLComponent.this.listenerMargeTextVT);
+                    }
+                }
+            });
+            cCR.gridx++;
+            this.boxMargeWithCR = new JCheckBox(getLabelFor("MARGE_WITH_COUT_REVIENT"));
+            pCR.add(boxMargeWithCR, cCR);
+            addView(boxMargeWithCR, "MARGE_WITH_COUT_REVIENT");
+            boxMargeWithCR.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    if (!isFilling()) {
+                        ReferenceArticleSQLComponent.this.textPVHT.getDocument().removeDocumentListener(ReferenceArticleSQLComponent.this.listenerMargeTextVT);
+                        updateVtFromMarge();
+                        ReferenceArticleSQLComponent.this.textPVHT.getDocument().addDocumentListener(ReferenceArticleSQLComponent.this.listenerMargeTextVT);
+                    }
+                }
+            });
+            c.gridx++;
+            c.gridwidth = GridBagConstraints.REMAINDER;
+            c.anchor = GridBagConstraints.WEST;
+            c.weightx = 1;
+            c.fill = GridBagConstraints.NONE;
+            this.add(pCR, c);
+        }
         // PV HT
         c.gridx = 0;
         c.gridy++;
         };
         this.taxeListener = new PropertyChangeListener() {
             public void propertyChange(PropertyChangeEvent evt) {
+                if (!isFilling()) {
-                if (ReferenceArticleSQLComponent.this.textPVHT.getText().trim().length() > 0) {
+                    if (ReferenceArticleSQLComponent.this.textPVHT.getText().trim().length() > 0) {
-                    setTextTTC();
+                        setTextTTC();
-                } else {
+                    } else {
-                    setTextHT();
+                        setTextHT();
+                    }
+                }
                 tableTarifVente.fireModification();
+            }
         };
         this.textPVHT.getDocument().addDocumentListener(this.htDocListener);
         this.textPVTTC.getDocument().addDocumentListener(this.ttcDocListener);
+    }
     @Override
     public void update() {
+        SQLRow row = this.getTable().getRow(this.getSelectedID());
             super.update();
         this.tableTarifVente.updateField("ID_ARTICLE", getSelectedID());
+        this.tableCatComptable.updateField("ID_ARTICLE", getSelectedID());
+        this.tableFourSec.updateField("ID_ARTICLE", getSelectedID());
         this.tableTarifQteVente.updateField("ID_ARTICLE", getSelectedID());
         if (this.tableBom != null) {
             this.tableBom.updateField("ID_ARTICLE_PARENT", getSelectedID());
+        }
         this.tableDes.updateField("ID_ARTICLE", getSelectedID());
         this.tableCodeClient.updateField("ID_ARTICLE", getSelectedID());
         if (this.codeFournisseurTable != null) {
             this.codeFournisseurTable.updateField("ID_ARTICLE", getSelectedID());
+        }
+        ((ReferenceArticleSQLElement) getElement()).initStock(getSelectedID());
+        SQLSelect sel = new SQLSelect();
+        SQLTable tableStock = getTable().getTable("STOCK");
+        sel.addSelect(tableStock.getKey());
+        Where w = new Where(tableStock.getField("ID_ARTICLE"), "=", getSelectedID()).and(new Where(tableStock.getField("ID_DEPOT_STOCK"), "=", row.getForeignID("ID_DEPOT_STOCK")));
+        sel.setWhere(w);
+        List<SQLRow> stock = SQLRowListRSH.execute(sel);
+        if (stock != null && stock.size() == 1) {
+            try {
+                row.createEmptyUpdateRow().put("ID_STOCK", stock.get(0).getID()).update();
+            } catch (SQLException e) {
+                ExceptionHandler.handle("Erreur lors de la mise à jour du stock principal", e);
+            }
+        }
+    }
     /**
      * Sélection d'un mode de vente pour l'article. Affiche les prix metriques requis et fixe les
      * valeurs.
     @Override
     public int insert(SQLRow order) {
         int id = super.insert(order);
         this.tableTarifVente.updateField("ID_ARTICLE", id);
+        this.tableCatComptable.updateField("ID_ARTICLE", id);
+        this.tableFourSec.updateField("ID_ARTICLE", id);
         this.tableTarifQteVente.updateField("ID_ARTICLE", id);
         if (this.tableBom != null) {
             this.tableBom.updateField("ID_ARTICLE_PARENT", id);
+        }
         this.tableDes.updateField("ID_ARTICLE", id);
         this.tableCodeClient.updateField("ID_ARTICLE", id);
         if (this.codeFournisseurTable != null) {
             this.codeFournisseurTable.updateField("ID_ARTICLE", id);
+        }
+        ((ReferenceArticleSQLElement) getElement()).initStock(id);
         return id;
+    }
     @Override
     protected SQLRowValues createDefaults() {
         SQLRowValues rowVals = new SQLRowValues(getTable());
         rowVals.put("ID_TAXE", TaxeCache.getCache().getFirstTaxe().getID());
+        rowVals.put("ID_DEPOT_STOCK", DepotStockSQLElement.DEFAULT_ID);
         rowVals.put("ID_UNITE_VENTE", UniteVenteArticleSQLElement.A_LA_PIECE);
+        rowVals.put("QTE_UNITAIRE", BigDecimal.ONE);
         rowVals.put("ID_MODE_VENTE_ARTICLE", ReferenceArticleSQLElement.A_LA_PIECE);
         selectModeVente(ReferenceArticleSQLElement.A_LA_PIECE);
         rowVals.put("VALEUR_METRIQUE_1", Float.valueOf("1.0"));
         rowVals.put("PA_HT", BigDecimal.ZERO);
+        rowVals.put("QTE_UNITAIRE", BigDecimal.ONE);
         rowVals.put("POIDS", Float.valueOf(0));
+        rowVals.put("GESTION_STOCK", Boolean.TRUE);
         return rowVals;
+    }
     private void setTextHT() {

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/product/component/ReferenceArticleSQLComponent.java - Rev 149 → 156