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

 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.model.ProductHelper;
 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.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.JDate;
 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.Tuple2;
 import org.openconcerto.utils.text.SimpleDocumentListener;
 import java.awt.Component;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 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;
 import javax.swing.JTabbedPane;
 import javax.swing.JTextField;
 import javax.swing.SwingConstants;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
 public class ReferenceArticleSQLComponent extends BaseSQLComponent {
     private JTextField textPVHT, textPVTTC, textPAHT;
     private JTextField textMetrique1VT, textMetrique1HA;
             public void propertyChange(PropertyChangeEvent evt) {
                 System.err.println(ReferenceArticleSQLComponent.this.comboSelModeVente.getSelectedId());
                 selectModeVente(ReferenceArticleSQLComponent.this.comboSelModeVente.getSelectedId());
+            }
         };
         setListenerModeVenteActive(true);
         this.comboSelModeVente.setValue(ReferenceArticleSQLElement.A_LA_PIECE);
+    }
         c.gridx++;
         JTextField textTare = new JTextField(40);
         panel.add(textTare, c);
         addView(textTare, "TARE");
+        c.gridy++;
+        c.gridx = 0;
+        c.weightx = 0;
+        JLabel labelDLC = new JLabel(getLabelFor("DLC"));
+        panel.add(labelDLC, c);
+        c.weightx = 1;
+        c.gridx++;
+        JDate dateDLC = new JDate();
+        panel.add(dateDLC, c);
+        addView(dateDLC, "DLC");
         c.weightx = 0;
         c.gridy++;
         c.gridx = 0;
+        if (getTable().contains("POIDS_COLIS_NET")) {
+            JLabel labelPdsColis = new JLabel(getLabelFor("POIDS_COLIS_NET"));
+            panel.add(labelPdsColis, c);
+            c.weightx = 1;
+            c.gridx++;
+            JTextField textPdsColis = new JTextField(40);
+            panel.add(textPdsColis, c);
+            addView(textPdsColis, "POIDS_COLIS_NET");
+            c.gridx++;
+        }
         JLabel labelMasque = new JLabel(getLabelFor("MASQUE_CAISSE"));
         c.fill = GridBagConstraints.BOTH;
         panel.add(labelMasque, c);
         c.weightx = 1;
         c.gridx++;
             c.weightx = 1;
             c.gridx++;
             panel.add(fieldColoris, c);
             this.addView(fieldColoris, "COLORIS");
+        }
+        JTextField fieldLongueur = new JTextField();
+        c.gridy++;
+        c.fill = GridBagConstraints.HORIZONTAL;
+        c.weightx = 0;
+        c.gridwidth = 1;
+        panel.add(new JLabel(getLabelFor("LONGUEUR")), c);
+        c.weightx = 1;
+        c.gridx++;
+        panel.add(fieldLongueur, c);
+        this.addView(fieldLongueur, "LONGUEUR");
+        JTextField fieldLargeur = new JTextField();
+        c.gridx++;
+        c.fill = GridBagConstraints.HORIZONTAL;
+        c.weightx = 0;
+        c.gridwidth = 1;
+        panel.add(new JLabel(getLabelFor("LARGEUR")), c);
+        c.weightx = 1;
+        c.gridx++;
+        panel.add(fieldLargeur, c);
+        this.addView(fieldLargeur, "LARGEUR");
+        JTextField fieldHauteur = new JTextField();
+        c.gridy++;
+        c.gridx = 0;
+        c.fill = GridBagConstraints.HORIZONTAL;
+        c.weightx = 0;
+        c.gridwidth = 1;
+        panel.add(new JLabel(getLabelFor("HAUTEUR")), c);
+        c.weightx = 1;
+        c.gridx++;
+        panel.add(fieldHauteur, c);
+        this.addView(fieldHauteur, "HAUTEUR");
         ITextArea area = new ITextArea();
         JLabel sep = new JLabel("Descriptif complet");
         c.gridy++;
         c.gridx = 0;
         c.gridwidth = GridBagConstraints.REMAINDER;
         this.addView(comboSelFournisseur, "ID_FOURNISSEUR");
         SQLPreferences prefs = new SQLPreferences(ComptaPropsConfiguration.getInstanceCompta().getRootSociete());
         final boolean supplierCode = prefs.getBoolean(GestionArticleGlobalPreferencePanel.SUPPLIER_PRODUCT_CODE, false);
-        if (getTable().getSchema().contains("CODE_FOURNISSEUR") && supplierCode) {
-            this.rowValuesDefaultCodeFournisseur = new SQLRowValues(getTable().getTable("CODE_FOURNISSEUR"));
-            this.codeFournisseurTable = new CodeFournisseurItemTable(this.rowValuesDefaultCodeFournisseur);
-            c.gridy++;
-            c.gridx = 0;
-            c.gridwidth = 3;
-            c.weighty = 1;
-            c.weightx = 1;
-            c.fill = GridBagConstraints.BOTH;
-            panel.add(this.codeFournisseurTable, c);
-            comboSelFournisseur.addValueListener(new PropertyChangeListener() {
-                @Override
-                public void propertyChange(PropertyChangeEvent evt) {
-                    rowValuesDefaultCodeFournisseur.put("ID_FOURNISSEUR", comboSelFournisseur.getSelectedId());
-                }
-            });
-        } else {
-            // Tarif fournisseur
+        // Tarif fournisseur
-            c.gridy++;
+        c.gridy++;
-            c.gridx = 0;
+        c.gridx = 0;
-            c.gridwidth = GridBagConstraints.REMAINDER;
+        c.gridwidth = GridBagConstraints.REMAINDER;
-            TitledSeparator sep = new TitledSeparator("Tarifs fournisseurs");
+        TitledSeparator sep = new TitledSeparator("Tarifs fournisseurs");
-                @Override
+            @Override
-                public void actionPerformed(ActionEvent e) {
+            public void actionPerformed(ActionEvent e) {
-                    tableFourSec.removeSelectedRow();
+                tableFourSec.removeSelectedRow();
+            }
-            });
+        });
+        if (getTable().getSchema().contains("CODE_FOURNISSEUR") && supplierCode) {
+            c.gridy++;
+            c.gridx = 0;
+            c.gridwidth = GridBagConstraints.REMAINDER;
+            TitledSeparator sepC = new TitledSeparator("Codes fournisseurs");
+            panel.add(sepC, c);
+            this.rowValuesDefaultCodeFournisseur = new SQLRowValues(getTable().getTable("CODE_FOURNISSEUR"));
+            this.codeFournisseurTable = new CodeFournisseurItemTable(this.rowValuesDefaultCodeFournisseur);
+            c.gridy++;
+            c.gridx = 0;
+            c.gridwidth = GridBagConstraints.REMAINDER;
+            c.weighty = 1;
+            c.weightx = 1;
+            c.fill = GridBagConstraints.BOTH;
+            panel.add(this.codeFournisseurTable, c);
+            comboSelFournisseur.addValueListener(new PropertyChangeListener() {
+                @Override
+                public void propertyChange(PropertyChangeEvent evt) {
+                    rowValuesDefaultCodeFournisseur.put("ID_FOURNISSEUR", comboSelFournisseur.getSelectedId());
+                }
+            });
+        }
         return panel;
+    }
     private JPanel createExportationPanel() {
         JPanel panel = new JPanel(new GridBagLayout());
         panel.setOpaque(false);
     private JPanel createBOMpanel() {
         JPanel panel = new JPanel(new GridBagLayout());
         panel.setOpaque(false);
         GridBagConstraints c = new DefaultGridBagConstraints();
+        final JCheckBox checkAutoPrice = new JCheckBox(getLabelFor("AUTO_PRIX_MIN_VENTE_NOMENCLATURE"));
+        panel.add(checkAutoPrice, c);
+        this.addView(checkAutoPrice, "AUTO_PRIX_MIN_VENTE_NOMENCLATURE");
+        c.gridx++;
+        final JCheckBox checkAutoPriceHA = new JCheckBox(getLabelFor("AUTO_PRIX_ACHAT_NOMENCLATURE"));
+        panel.add(checkAutoPriceHA, c);
+        this.addView(checkAutoPriceHA, "AUTO_PRIX_ACHAT_NOMENCLATURE");
+        checkAutoPrice.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                updatePricesNomenclature(checkAutoPrice, checkAutoPriceHA);
+            }
+        });
+        checkAutoPriceHA.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                updatePricesNomenclature(checkAutoPrice, checkAutoPriceHA);
+            }
+        });
         c.gridwidth = GridBagConstraints.REMAINDER;
         c.fill = GridBagConstraints.BOTH;
         c.weightx = 1;
         c.weighty = 1;
         c.gridx = 0;
+        c.gridy++;
         c.fill = GridBagConstraints.BOTH;
         this.tableBom.setOpaque(false);
         panel.add(new RowValuesTableEditionPanel(this.tableBom), c);
+        this.tableBom.getModel().addTableModelListener(new TableModelListener() {
+            @Override
+            public void tableChanged(TableModelEvent e) {
+                updatePricesNomenclature(checkAutoPrice, checkAutoPriceHA);
+            }
+        });
         return panel;
+    }
+    private void updatePricesNomenclature(final JCheckBox checkAutoPrice, final JCheckBox checkAutoPriceHA) {
+        final Boolean vtAuto = checkAutoPrice.isSelected();
+        final Boolean haAuto = checkAutoPriceHA.isSelected();
+        if (vtAuto || haAuto) {
+            ProductHelper helper = new ProductHelper(getTable().getDBRoot());
+            Tuple2<BigDecimal, BigDecimal> p = helper.getStandardBomPrices(tableBom.getRowValuesTable().getRowValuesTableModel().getCopyOfValues());
+            if (haAuto && p.get0() != null) {
+                textPAHT.setText(p.get0().toString());
+            }
+            if (vtAuto && p.get1() != null) {
+                textPVHT.setText(p.get1().toString());
+            }
+        }
+    }
     private JPanel createTarifQtePanel() {
         JPanel panel = new JPanel(new GridBagLayout());
         panel.setOpaque(false);
+    }
     @Override
     public void update() {
         SQLRow row = this.getTable().getRow(this.getSelectedID());
+        final int selectedID = getSelectedID();
             super.update();
-        this.tableTarifVente.updateField("ID_ARTICLE", getSelectedID());
+        this.tableTarifVente.updateField("ID_ARTICLE", selectedID);
-        this.tableCatComptable.updateField("ID_ARTICLE", getSelectedID());
+        this.tableCatComptable.updateField("ID_ARTICLE", selectedID);
-        this.tableFourSec.updateField("ID_ARTICLE", getSelectedID());
+        this.tableFourSec.updateField("ID_ARTICLE", selectedID);
-        this.tableTarifQteVente.updateField("ID_ARTICLE", getSelectedID());
+        this.tableTarifQteVente.updateField("ID_ARTICLE", selectedID);
         if (this.tableBom != null) {
-            this.tableBom.updateField("ID_ARTICLE_PARENT", getSelectedID());
+            this.tableBom.updateField("ID_ARTICLE_PARENT", selectedID);
+        }
-        this.tableDes.updateField("ID_ARTICLE", getSelectedID());
+        this.tableDes.updateField("ID_ARTICLE", selectedID);
-        this.tableCodeClient.updateField("ID_ARTICLE", getSelectedID());
+        this.tableCodeClient.updateField("ID_ARTICLE", selectedID);
         if (this.codeFournisseurTable != null) {
-            this.codeFournisseurTable.updateField("ID_ARTICLE", getSelectedID());
+            this.codeFournisseurTable.updateField("ID_ARTICLE", selectedID);
+        }
-        ((ReferenceArticleSQLElement) getElement()).initStock(getSelectedID());
+        ((ReferenceArticleSQLElement) getElement()).initStock(selectedID);
         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")));
+        Where w = new Where(tableStock.getField("ID_ARTICLE"), "=", selectedID).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 {
             } catch (SQLException e) {
                 ExceptionHandler.handle("Erreur lors de la mise à jour du stock principal", e);
+            }
+        }
+        Runnable r = new Runnable() {
+            @Override
+            public void run() {
+                SQLRow rowArticle = getTable().getRow(selectedID);
+                List<SQLRow> itemsRows = rowArticle.getReferentRows(getTable().getTable("ARTICLE_ELEMENT").getField("ID_ARTICLE"));
+                for (SQLRow rowArticleItem : itemsRows) {
+                    SQLRow rowA = rowArticleItem.getForeign("ID_ARTICLE_PARENT");
+                    if (rowA != null && !rowA.isUndefined()) {
+                        final Boolean vtAuto = rowA.getBoolean("AUTO_PRIX_MIN_VENTE_NOMENCLATURE");
+                        final Boolean haAuto = rowA.getBoolean("AUTO_PRIX_ACHAT_NOMENCLATURE");
+                        if (vtAuto || haAuto) {
+                            ProductHelper helper = new ProductHelper(rowA.getTable().getDBRoot());
+                            Tuple2<BigDecimal, BigDecimal> p = helper.getStandardBomPrices(rowA.getReferentRows(rowA.getTable().getTable("ARTICLE_ELEMENT").getField("ID_ARTICLE_PARENT")));
+                            SQLRowValues rowVals = rowA.createEmptyUpdateRow();
+                            boolean up = false;
+                            if (vtAuto && p.get1() != null) {
+                                rowVals.put("PRIX_METRIQUE_VT_1", p.get1());
+                                rowVals.put("PV_HT", p.get1());
+                                float t = TaxeCache.getCache().getFirstTaxe().getFloat("TAUX");
+                                if (!rowA.isForeignEmpty("ID_TAXE")) {
+                                    t = TaxeCache.getCache().getTauxFromId(rowA.getForeignID("ID_TAXE"));
+                                }
+                                rowVals.put("PV_TTC", p.get1().multiply(new BigDecimal(t).movePointLeft(2).add(BigDecimal.ONE)).setScale(2, RoundingMode.HALF_UP));
+                                up = true;
+                            }
+                            if (haAuto && p.get0() != null) {
+                                rowVals.put("PRIX_METRIQUE_HA_1", p.get0());
+                                rowVals.put("PA_HT", p.get0());
+                                up = true;
+                            }
+                            if (up) {
+                                try {
+                                    rowVals.commit();
+                                } catch (SQLException e) {
+                                    ExceptionHandler.handle("Erreur lors de la mise à jour des tarifs des nomenclatures", e);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        };
+        new Thread(r).run();
+        ReferenceArticleSQLElement.updateDateAchat(getTable(), getTable().getRow(selectedID));
+    }
     /**
      * Sélection d'un mode de vente pour l'article. Affiche les prix metriques requis et fixe les
      * valeurs.
         this.tableCodeClient.updateField("ID_ARTICLE", id);
         if (this.codeFournisseurTable != null) {
             this.codeFournisseurTable.updateField("ID_ARTICLE", id);
+        }
         ((ReferenceArticleSQLElement) getElement()).initStock(id);
+        ReferenceArticleSQLElement.updateDateAchat(getTable(), getTable().getRow(id));
         return id;
+    }
     @Override
     protected SQLRowValues createDefaults() {

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