WebSVN - OpenConcerto - Diff - Rev 174 and 177 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/AbstractAchatArticleItemTable.java

 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.CurrencyWithSymbolRenderer;
 import org.openconcerto.erp.core.sales.product.ui.DeliveredQtyRowValuesRenderer;
 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.preferences.DefaultNXProps;
 import org.openconcerto.erp.preferences.GestionArticleGlobalPreferencePanel;
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.element.SQLElement;
 import org.openconcerto.sql.model.FieldPath;
 import org.openconcerto.sql.model.Where;
 import org.openconcerto.sql.model.graph.Path;
 import org.openconcerto.sql.preferences.SQLPreferences;
 import org.openconcerto.sql.sqlobject.ITextArticleWithCompletionCellEditor;
 import org.openconcerto.sql.sqlobject.ITextWithCompletion;
+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.sql.view.list.ValidStateChecker;
+import org.openconcerto.ui.preferences.DefaultProps;
 import org.openconcerto.utils.DecimalUtils;
 import org.openconcerto.utils.Tuple3;
 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.util.Map;
 import java.util.Set;
 import java.util.Vector;
 import javax.swing.AbstractAction;
+import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPopupMenu;
 import javax.swing.JTable;
         list.add(tableElementPoids);
         // Poids total
         this.tableElementPoidsTotal = new SQLTableElement(e.getTable().getField("T_POIDS"), Float.class);
         list.add(this.tableElementPoidsTotal);
+        // Packaging
+        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();
+                }
+            };
+            list.add(poidsColis);
+            SQLTableElement nbColis = new SQLTableElement(e.getTable().getField("NB_COLIS"), Integer.class);
+            list.add(nbColis);
+            final SQLTableElement totalPoidsColis = new SQLTableElement(e.getTable().getField("T_POIDS_COLIS_NET"), BigDecimal.class) {
+                @Override
+                public TableCellRenderer getTableCellRenderer() {
+                    return new QteUnitRowValuesRenderer();
+                }
+            };
+            list.add(totalPoidsColis);
+            poidsColis.addModificationListener(totalPoidsColis);
+            nbColis.addModificationListener(totalPoidsColis);
+            totalPoidsColis.setModifier(new CellDynamicModifier() {
+                public Object computeValueFrom(final SQLRowValues row, SQLTableElement source) {
+                    final BigDecimal pdsColis = row.getBigDecimal("POIDS_COLIS_NET");
+                    final Object o3 = row.getObject("NB_COLIS");
+                    BigDecimal pdsColisTotal = BigDecimal.ZERO;
+                    if (pdsColis != null && o3 != null) {
+                        int nb = (Integer) o3;
+                        pdsColisTotal = pdsColis.multiply(new BigDecimal(nb), DecimalUtils.HIGH_PRECISION);
+                    }
+                    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 row.getObject("T_POIDS_COLIS_NET");
+                    return pdsBrutTotal.setScale(totalPoidsBrut.getDecimalDigits(), RoundingMode.HALF_UP);
+                }
+            });
+        }
         // Service
         String val = DefaultNXProps.getInstance().getStringProperty("ArticleService");
         Boolean b = Boolean.valueOf(val);
         if (b != null && b.booleanValue()) {
             this.service = new SQLTableElement(e.getTable().getField("SERVICE"), Boolean.class);
         this.tableElementTotalTTC = new SQLTableElement(e.getTable().getField("T_PA_TTC"), BigDecimal.class);
         this.tableElementTotalTTC.setRenderer(totalRenderer);
         list.add(this.tableElementTotalTTC);
         this.defaultRowVals = new SQLRowValues(UndefinedRowValuesCache.getInstance().getDefaultRowValues(e.getTable()));
-        this.defaultRowVals.put("ID_TAXE", TaxeCache.getCache().getFirstTaxe().getID());
+        this.defaultRowVals.put("ID_TAXE", TaxeCache.getCache().getFirstTaxeAchat().getID());
         this.defaultRowVals.put("CODE", "");
         this.defaultRowVals.put("NOM", "");
         this.defaultRowVals.put("QTE", 1);
         this.defaultRowVals.put("QTE_UNITAIRE", BigDecimal.ONE);
         this.defaultRowVals.put("ID_UNITE_VENTE", UniteVenteArticleSQLElement.A_LA_PIECE);
         this.defaultRowVals.put("ID_MODE_VENTE_ARTICLE", ReferenceArticleSQLElement.A_LA_PIECE);
+        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("NOM"), false, this.defaultRowVals);
+        final RowValuesTableModel model = new RowValuesTableModel(e, list, e.getTable().getField("NOM"), false, this.defaultRowVals) {
+            @Override
+            public void 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_ELEMENT")) {
+            this.table.getClearCloneTableElement().add("QTE_RECUE");
+            this.table.getClearCloneTableElement().add("RECU");
+            this.table.getClearCloneTableElement().add("RECU_FORCED");
+        } else if (getSQLElement().getTable().getName().equals("BON_RECEPTION_ELEMENT")) {
+            this.table.getClearCloneTableElement().add("ID_COMMANDE_ELEMENT");
+        }
         table.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseReleased(MouseEvent e) {
                 handlePopup(e);
             completionFields.add("DESCRIPTIF");
+        }
         if (e.getTable().getFieldsName().contains("ID_FAMILLE_ARTICLE")) {
             completionFields.add("ID_FAMILLE_ARTICLE");
+        }
+        final SQLTable sqlTableArticle = e.getTable().getTable("ARTICLE");
+        if (getSQLElement().getTable().getFieldsName().contains("POIDS_COLIS_NET") && sqlTableArticle.getTable().getFieldsName().contains("POIDS_COLIS_NET")) {
+            completionFields.add("POIDS_COLIS_NET");
+        }
-        this.m = new AutoCompletionManager(tableElementCode, ((ComptaPropsConfiguration) Configuration.getInstance()).getSQLBaseSociete().getField("ARTICLE.CODE"), this.table,
+        if (getSQLElement().getTable().getFieldsName().contains("TARE") && sqlTableArticle.getTable().getFieldsName().contains("TARE")) {
-                this.table.getRowValuesTableModel()) {
+            completionFields.add("TARE");
+        }
+        this.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);
                 if (res == null) {
                     return super.getValueFrom(row, field, rowDest);
+                }
+            }
         };
         m.fill("NOM", "NOM");
         m.fill("ID", "ID_ARTICLE");
+        if (e.getTable().contains("ID_CODE_FOURNISSEUR") && supplierCode) {
+            m.fill("ID_CODE_FOURNISSEUR", "ID_CODE_FOURNISSEUR");
+        }
         for (String string : completionFields) {
             m.fill(string, string);
+        }
-        final SQLTable sqlTableArticle = ((ComptaPropsConfiguration) Configuration.getInstance()).getRootSociete().getTable("ARTICLE");
         final Where w = new Where(sqlTableArticle.getField("OBSOLETE"), "=", Boolean.FALSE);
         m.setWhere(w);
         this.m2 = new AutoCompletionManager(tableElementNom, ((ComptaPropsConfiguration) Configuration.getInstance()).getSQLBaseSociete().getField("ARTICLE.NOM"), this.table,
                 this.table.getRowValuesTableModel()) {
                     } else {
                         return res;
+                    }
+                }
             };
+            m4.fill("ID", "ID_ARTICLE");
             m4.fill("CODE", "CODE");
             m4.fill("NOM", "NOM");
             for (String string : completionFields) {
                 m4.fill(string, string);
+            }
             @Override
             public Object computeValueFrom(SQLRowValues row, SQLTableElement source) {
                 int qte = Integer.parseInt(row.getObject("QTE").toString());
                 BigDecimal f = (BigDecimal) row.getObject("PA_HT");
                 int idTaux = Integer.parseInt(row.getObject("ID_TAXE").toString());
-                if (idTaux < 0) {
-                    System.out.println(row);
-                }
                 Float resultTaux = TaxeCache.getCache().getTauxFromId(idTaux);
+                if (resultTaux == null) {
+                    SQLRow rowTax = TaxeCache.getCache().getFirstTaxe();
+                    row.put("ID_TAXE", rowTax.getID());
+                    resultTaux = rowTax.getFloat("TAUX");
+                }
                 editorPAHT.setTaxe(resultTaux);
                 BigDecimal b = (row.getObject("QTE_UNITAIRE") == null) ? BigDecimal.ONE : (BigDecimal) row.getObject("QTE_UNITAIRE");
                 BigDecimal r = b.multiply(f.multiply(BigDecimal.valueOf(qte), DecimalUtils.HIGH_PRECISION), DecimalUtils.HIGH_PRECISION).setScale(tableElementTotalTTC.getDecimalDigits(),
                         BigDecimal.ROUND_HALF_UP);
                 float taux = (resultTaux == null) ? 0.0F : resultTaux.floatValue();
         setColumnVisible(model.getColumnForField("CODE"), !selectArticle || (selectArticle && createAuto));
         setColumnVisible(model.getColumnForField("NOM"), !selectArticle || (selectArticle && createAuto));
         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);
         // Calcul automatique du poids unitaire
         tableElement_ValeurMetrique1.addModificationListener(tableElementPoids);
         tableElement_ValeurMetrique2.addModificationListener(tableElementPoids);
         tableElement_ValeurMetrique3.addModificationListener(tableElementPoids);
         tableElementPoids.setModifier(new CellDynamicModifier() {
+        }
         // On réécrit la configuration au cas ou les preferences aurait changé
         this.table.writeState();
+        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);
+        }
+    }
     private static Map<String, Boolean> visibilityMap = new HashMap<String, Boolean>();
     public static Map<String, Boolean> getVisibilityMap() {
+    }
     public Object tarifCompletion(SQLRow row, String field) {
         final SQLTable tTarifFournisseur = this.getSQLElement().getTable().getDBRoot().getTable("ARTICLE_TARIF_FOURNISSEUR");
+        if (row != null && !row.isUndefined() && (field.equalsIgnoreCase("ID_CODE_FOURNISSEUR")) && this.rowFournisseur != null && !this.rowFournisseur.isUndefined()) {
+            final SQLTable foreignTableCodeF = getSQLElement().getTable().getForeignTable("ID_CODE_FOURNISSEUR");
+            List<SQLRow> resultCode = row.getReferentRows(foreignTableCodeF);
+            int idCode = foreignTableCodeF.getUndefinedID();
+            for (SQLRow sqlRow : resultCode) {
+                if (sqlRow.getForeignID("ID_FOURNISSEUR") == this.rowFournisseur.getID()) {
+                    return sqlRow.getID();
+                }
+            }
+            return idCode;
+        }
+        if (field.equalsIgnoreCase("ID_CODE_FOURNISSEUR")) {
+            final SQLTable foreignTableCodeF = getSQLElement().getTable().getForeignTable("ID_CODE_FOURNISSEUR");
+            return foreignTableCodeF.getUndefinedID();
+        }
         if (row != null && !row.isUndefined() && (field.equalsIgnoreCase("PRIX_METRIQUE_HA_1") || field.equalsIgnoreCase("PA_HT")) && tTarifFournisseur != null) {
             List<String> incoTerms;
             if (this.incoterm != null && this.incoterm.equalsIgnoreCase("CPT")) {
                 incoTerms = Arrays.asList("PRIX_ACHAT", "COEF_TRANSPORT_PORT");
                 incoTerms = Arrays.asList("PRIX_ACHAT", "COEF_TRANSPORT_PORT", "COEF_TAXE_D");
             } else {
                 incoTerms = Arrays.asList("PRIX_ACHAT");
+            }
             List<SQLRow> rows = row.getReferentRows(tTarifFournisseur);
-            if (row.getBoolean("AUTO_PRIX_ACHAT_NOMENCLATURE")) {
+            if (row.getBoolean("AUTO_PRIX_ACHAT_NOMENCLATURE") && row.getTable().getDBRoot().contains("ARTICLE_PRIX_REVIENT")) {
                 List<SQLRow> rowsElt = row.getReferentRows(row.getTable().getTable("ARTICLE_ELEMENT").getField("ID_ARTICLE_PARENT"));
                 BigDecimal price = BigDecimal.ZERO;
                 final Set<String> tarifNotFound = new HashSet<String>();
                 for (SQLRow sqlRow : rowsElt) {
                 row2Insert.put("T_PA_HT", resultTotalHT);
                 Float resultTaux = TaxeCache.getCache().getTauxFromId(row2Insert.getForeignID("ID_TAXE"));
                 if (resultTaux == null) {
-                    SQLRow rowTax = TaxeCache.getCache().getFirstTaxe();
+                    SQLRow rowTax = TaxeCache.getCache().getFirstTaxeAchat();
                     resultTaux = rowTax.getFloat("TAUX");
+                }
                 float taux = (resultTaux == null) ? 0.0F : resultTaux.floatValue();

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/AbstractAchatArticleItemTable.java @ 180 - Rev 174 → 177