WebSVN - OpenConcerto - Diff - Rev 180 and 182 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/order/element/CommandeClientElementSQLElement.java

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
- * Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
+ * Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.
+ *
  * The contents of this file are subject to the terms of the GNU General Public License Version 3
  * only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
  * copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
  * language governing permissions and limitations under the License.
 import org.openconcerto.erp.core.sales.product.element.UniteVenteArticleSQLElement;
 import org.openconcerto.erp.core.supplychain.stock.element.MouvementStockSQLElement;
 import org.openconcerto.erp.core.supplychain.stock.element.StockItemsUpdater;
 import org.openconcerto.erp.core.supplychain.stock.element.StockItemsUpdater.TypeStockUpdate;
 import org.openconcerto.erp.core.supplychain.stock.element.StockLabel;
+import org.openconcerto.erp.preferences.GestionArticleGlobalPreferencePanel;
 import org.openconcerto.sql.element.SQLComponent;
 import org.openconcerto.sql.element.SQLElement;
 import org.openconcerto.sql.element.UISQLComponent;
 import org.openconcerto.sql.model.SQLInjector;
 import org.openconcerto.sql.model.SQLRow;
 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.request.ListSQLRequest;
 import org.openconcerto.sql.request.UpdateBuilder;
 import org.openconcerto.sql.sqlobject.ElementComboBox;
 import org.openconcerto.sql.users.UserManager;
 import org.openconcerto.sql.view.EditFrame;
                         return "Commande N°" + rowElt.getForeign("ID_COMMANDE_CLIENT").getString("NUMERO");
+                    }
                 }, res.get(0), res, TypeStockUpdate.VIRTUAL_DELIVER, false);
                 try {
                     updater.update();
+                } catch (
-                } catch (SQLException e1) {
+                SQLException e1) {
                     e1.printStackTrace();
+                }
+            }
+        }
+    }
     protected List<String> getListFields() {
         final List<String> l = new ArrayList<String>();
         l.add("CODE");
         l.add("NOM");
+        SQLPreferences prefs = new SQLPreferences(getTable().getDBRoot());
+        if (prefs.getBoolean(GestionArticleGlobalPreferencePanel.ACTIVER_DECLINAISON, false)) {
+            for (String fieldName : getTable().getFieldsName()) {
+                if (fieldName.startsWith("ID_ARTICLE_DECLINAISON_")) {
+                    l.add(fieldName);
+                }
+            }
+        }
         l.add("ID_COMMANDE_CLIENT");
         l.add("ID_ARTICLE");
         l.add("ID_DEPOT_STOCK");
         l.add("PA_HT");
         l.add("PV_HT");
     /**
      * Transfert d'une commande en commande fournisseur
+     *
      * @param commandeID
      */
-    public void transfertCommande(List<SQLRowValues> commandeClientEltsRows) {
+    public void transfertCommande(List<SQLRowAccessor> commandeClientEltsRows) {
         ComptaPropsConfiguration.getInstanceCompta().getNonInteractiveSQLExecutor().execute(new Runnable() {
             @Override
             public void run() {
                 final ListMap<SQLRow, SQLRowValues> map = new ListMap<SQLRow, SQLRowValues>();
                 List<String> fields2copy = Arrays.asList("CODE", "NOM", "VALEUR_METRIQUE_1", "VALEUR_METRIQUE_2", "VALEUR_METRIQUE_3");
                 Set<Integer> artAdded = new HashSet<Integer>();
-                for (SQLRowValues sqlRow : commandeClientEltsRows) {
+                for (SQLRowAccessor sqlRow : commandeClientEltsRows) {
                     boolean article = false;
                     if (sqlRow.getTable().getName().equalsIgnoreCase("ARTICLE")) {
                         article = true;
+                    }
-                    // renderer sur liste des ar
-                    // if()
-                    /// rowValsElt.put("QTE", sqlRow.getObject("QTE"));
                     SQLRowAccessor rowArticleFind;
-                    SQLRowValues rowArticle;
                     int qte = 1;
                     BigDecimal qteUV = BigDecimal.ONE;
                     boolean gestionStock = true;
                     if (!article) {
+                        SQLRowValues rowArticle;
+                        if (sqlRow.contains("ID_ARTICLE") && sqlRow.getNonEmptyForeign("ID_ARTICLE") != null) {
+                            // on récupére l'article qui lui correspond
+                            rowArticleFind = sqlRow.asRow().getForeign("ID_ARTICLE");
+                            rowArticle = rowArticleFind.asRowValues();
+                        } else {
-                        // on récupére l'article qui lui correspond
+                            // on récupére l'article qui lui correspond
-                        rowArticle = new SQLRowValues(eltArticle.getTable());
+                            rowArticle = new SQLRowValues(eltArticle.getTable());
-                        for (String field : fields2copy) {
+                            for (String field : fields2copy) {
-                            // if (sqlRow.getTable().getFieldsName().contains(field.getName())) {
-                            rowArticle.put(field, sqlRow.asRow().getObject(field));
+                                rowArticle.put(field, sqlRow.asRow().getObject(field));
-                            // }
+                            }
-                        int idArticle = ReferenceArticleSQLElement.getIdForCNM(rowArticle, true);
+                            int idArticle = ReferenceArticleSQLElement.getIdForCNM(rowArticle, true);
-                        rowArticleFind = eltArticle.getTable().getRow(idArticle);
+                            rowArticleFind = eltArticle.getTable().getRow(idArticle);
+                        }
                         gestionStock = rowArticleFind.getBoolean("GESTION_STOCK");
                         if (!gestionStock) {
                             qte = sqlRow.getInt("QTE");
                             qteUV = sqlRow.getBigDecimal("QTE_UNITAIRE");
                                 qte = -Math.round(rowStock.getFloat("QTE_TH") - rowStock.getFloat("QTE_MIN"));
+                            }
+                        }
                     } else {
                         rowArticleFind = sqlRow;
-                        rowArticle = sqlRow;
-                        if (rowArticle.getForeign("ID_STOCK") != null && !rowArticle.isForeignEmpty("ID_STOCK")) {
+                        if (sqlRow.getForeign("ID_STOCK") != null && !sqlRow.isForeignEmpty("ID_STOCK")) {
-                            SQLRowAccessor rowStock = rowArticle.getForeign("ID_STOCK");
+                            SQLRowAccessor rowStock = sqlRow.getForeign("ID_STOCK");
                             qte = -Math.round(rowStock.getFloat("QTE_TH") - rowStock.getFloat("QTE_MIN"));
+                        }
+                    }
                     if (rowArticleFind != null && !rowArticleFind.isUndefined() && (!gestionStock || !artAdded.contains(rowArticleFind.getID()))) {
                         artAdded.add(rowArticleFind.getID());
-                        SQLInjector inj = SQLInjector.getInjector(rowArticle.getTable(), tableCmdElt);
+                        SQLInjector inj = SQLInjector.getInjector(eltArticle.getTable(), tableCmdElt);
                         SQLRowValues rowValsElt = new SQLRowValues(inj.createRowValuesFrom(rowArticleFind.asRow()));
-                        rowValsElt.put("ID_STYLE", sqlRow.getObject("ID_STYLE"));
                         rowValsElt.put("QTE", qte);
                         rowValsElt.put("QTE_UNITAIRE", qteUV);
                         rowValsElt.put("T_POIDS", rowValsElt.getLong("POIDS") * rowValsElt.getInt("QTE"));
                         rowValsElt.put("T_PA_HT", ((BigDecimal) rowValsElt.getObject("PA_HT")).multiply(new BigDecimal(rowValsElt.getInt("QTE")), DecimalUtils.HIGH_PRECISION));
                         rowValsElt.put("T_PA_TTC", ((BigDecimal) rowValsElt.getObject("T_PA_HT")).multiply(new BigDecimal((rowValsElt.getForeign("ID_TAXE").getFloat("TAUX") / 100.0 + 1.0)),
                                 DecimalUtils.HIGH_PRECISION));
-                        // rowValsElt.put("ID_DEVISE",
-                        // rowCmd.getForeignRow("ID_TARIF").getForeignID("ID_DEVISE"));
                         map.add(rowArticleFind.asRow().getForeignRow("ID_FOURNISSEUR"), rowValsElt);
+                    }
+                }
                 MouvementStockSQLElement.createCommandeF(map, null, "");

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/order/element/CommandeClientElementSQLElement.java - Rev 180 → 182