WebSVN - OpenConcerto - Diff - Rev 156 and 174 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/product/element/ReferenceArticleSQLElement.java

  */
  package org.openconcerto.erp.core.sales.product.element;
 import org.openconcerto.erp.config.ComptaPropsConfiguration;
+import org.openconcerto.erp.config.update.Updater_1_5;
 import org.openconcerto.erp.core.common.element.ComptaSQLConfElement;
 import org.openconcerto.erp.core.edm.AttachmentAction;
 import org.openconcerto.erp.core.finance.tax.model.TaxeCache;
 import org.openconcerto.erp.core.reports.history.ui.HistoriqueArticleFrame;
 import org.openconcerto.erp.core.sales.product.action.InventairePanel;
 import org.openconcerto.erp.core.sales.product.component.ReferenceArticleSQLComponent;
-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.generationDoc.gestcomm.FicheArticleXmlSheet;
 import org.openconcerto.erp.model.MouseSheetXmlListeListener;
 import org.openconcerto.erp.preferences.DefaultNXProps;
 import org.openconcerto.erp.preferences.GestionArticleGlobalPreferencePanel;
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.view.list.SQLTableModelSource;
 import org.openconcerto.ui.FrameUtil;
 import org.openconcerto.ui.PanelFrame;
 import org.openconcerto.utils.CollectionUtils;
 import org.openconcerto.utils.DecimalUtils;
-import org.openconcerto.utils.ExceptionHandler;
 import org.openconcerto.utils.ListMap;
 import java.awt.event.ActionEvent;
 import java.math.BigDecimal;
 import java.sql.SQLException;
         l.add("ID_FAMILLE_ARTICLE");
         l.add("ID_FOURNISSEUR");
         l.add("SKU");
         // if (!prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_MULTI_DEPOT, false)) {
+        l.add("GESTION_STOCK");
         l.add("ID_STOCK");
         // }
         String val = DefaultNXProps.getInstance().getStringProperty("ArticleService");
         Boolean b = Boolean.valueOf(val);
         if (b != null && b.booleanValue()) {
                 && rowVals1.getString("VALEUR_METRIQUE_2").equals(rowVals2.getString("VALEUR_METRIQUE_2")) && rowVals1.getString("VALEUR_METRIQUE_3").equals(rowVals2.getString("VALEUR_METRIQUE_3")));
+    }
     public void initStock(int id) {
         SQLRow row = getTable().getRow(id);
-        SQLSelect sel = new SQLSelect();
+        Updater_1_5.initStock(row);
-        sel.addSelectStar(getTable().getTable("DEPOT_STOCK"));
-        List<SQLRow> rowsDepot = SQLRowListRSH.execute(sel);
-        SQLSelect selStock = new SQLSelect();
-        selStock.addSelectStar(getTable().getTable("STOCK"));
-        selStock.setWhere(new Where(getTable().getTable("STOCK").getField("ID_ARTICLE"), "=", id));
-        List<SQLRow> rowsStock = SQLRowListRSH.execute(selStock);
-        Map<Integer, SQLRow> initedDepot = new HashMap<>();
-        for (SQLRow sqlRow : rowsStock) {
-            initedDepot.put(sqlRow.getForeignID("ID_DEPOT_STOCK"), sqlRow);
-        }
-        List<StockItem> stockItems = new ArrayList<StockItem>();
-        for (SQLRow sqlRow : rowsDepot) {
-            try {
-                if (!initedDepot.keySet().contains(sqlRow.getID())) {
-                    SQLRowValues rowVals = new SQLRowValues(getTable().getTable("STOCK"));
-                    rowVals.put("ID_ARTICLE", row.getID());
-                    rowVals.put("ID_DEPOT_STOCK", sqlRow.getID());
-                    SQLRow rowStock = rowVals.commit();
-                    if ((row.getObject("ID_DEPOT_STOCK") == null || row.isForeignEmpty("ID_DEPOT_STOCK")) && sqlRow.getID() == DepotStockSQLElement.DEFAULT_ID) {
-                        row.createEmptyUpdateRow().put("ID_STOCK", rowStock.getID()).put("ID_DEPOT_STOCK", DepotStockSQLElement.DEFAULT_ID).commit();
-                    } else if (sqlRow.getID() == row.getForeignID("ID_DEPOT_STOCK")) {
-                        row.createEmptyUpdateRow().put("ID_STOCK", rowStock.getID()).commit();
-                    }
-                    stockItems.add(new StockItem(row, rowStock));
-                } else {
-                    SQLRow rowExisting = initedDepot.get(sqlRow.getID());
-                    if ((row.getObject("ID_DEPOT_STOCK") == null || row.isForeignEmpty("ID_DEPOT_STOCK")) && sqlRow.getID() == DepotStockSQLElement.DEFAULT_ID) {
-                        row.createEmptyUpdateRow().put("ID_STOCK", rowExisting.getID()).put("ID_DEPOT_STOCK", DepotStockSQLElement.DEFAULT_ID).commit();
-                    } else if (sqlRow.getID() == row.getForeignID("ID_DEPOT_STOCK")) {
-                        row.createEmptyUpdateRow().put("ID_STOCK", rowExisting.getID()).commit();
-                    }
-                    stockItems.add(new StockItem(row, rowExisting));
-                }
-            } catch (SQLException e) {
-                ExceptionHandler.handle("Erreur lors de l'initialisation du stock de l'article", e);
-            }
-        }
-        if (row.getReferentRows(getTable().getTable("ARTICLE_ELEMENT").getField("ID_ARTICLE_PARENT")).size() > 0) {
-            ComposedItemStockUpdater up = new ComposedItemStockUpdater(getTable().getDBRoot(), stockItems);
-            try {
-                up.updateNomenclature(stockItems);
-            } catch (SQLException e) {
-                ExceptionHandler.handle("Erreur lors de l'actualisation du stock!", e);
-            }
-        }
+    }
     @Override
     protected String createCode() {
         return createCodeOfPackage() + ".ref";

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/element/ReferenceArticleSQLElement.java - Rev 156 → 174