WebSVN - OpenConcerto - Diff - Rev 149 and 156 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/AbstractVenteArticleItemTable.java

     public static final String ARTICLE_SHOW_DEVISE = "ArticleShowDevise";
     public static final String ARTICLE_SERVICE = "ArticleService";
     public static final String EDIT_PRIX_VENTE_CODE = "CORPS_EDITER_PRIX_VENTE";
     public static final String SHOW_PRIX_ACHAT_CODE = "CORPS_VOIR_PRIX_ACHAT";
+    public static final String SHOW_PRIX_VENTE_CODE = "CORPS_VOIR_PRIX_VENTE";
     public static final String LOCK_PRIX_MIN_VENTE_CODE = "CORPS_VERROU_PRIX_MIN_VENTE";
     public AbstractVenteArticleItemTable() {
         super();
+    }
         SQLPreferences prefs = SQLPreferences.getMemCached(getSQLElement().getTable().getDBRoot());
         final boolean selectArticle = prefs.getBoolean(GestionArticleGlobalPreferencePanel.USE_CREATED_ARTICLE, false);
         final boolean filterFamilleArticle = prefs.getBoolean(GestionArticleGlobalPreferencePanel.FILTER_BY_FAMILY, false);
         final boolean createAuto = prefs.getBoolean(GestionArticleGlobalPreferencePanel.CREATE_ARTICLE_AUTO, true);
         final boolean showEco = prefs.getBoolean(AbstractVenteArticleItemTable.SHOW_ECO_CONTRIBUTION_COLUMNS, false);
+        final boolean showDevise = prefs.getBoolean(AbstractVenteArticleItemTable.ARTICLE_SHOW_DEVISE, false);
         final UserRights rights = UserRightsManager.getCurrentUserRights();
         final boolean editVTPrice = rights.haveRight(EDIT_PRIX_VENTE_CODE);
         final boolean showHAPrice = rights.haveRight(SHOW_PRIX_ACHAT_CODE);
         final boolean lockVTMinPrice = rights.haveRight(LOCK_PRIX_MIN_VENTE_CODE);
         final SQLTableElement tableFamille = new SQLTableElement(e.getTable().getField("ID_FAMILLE_ARTICLE"));
         list.add(tableFamille);
         // Article
+        SQLTableElement tableElementDepot = new SQLTableElement(e.getTable().getField("ID_DEPOT_STOCK"), true, true, true);
+        list.add(tableElementDepot);
+        // Article
         SQLTableElement tableElementArticle = new SQLTableElement(e.getTable().getField("ID_ARTICLE"), true, true, true);
         list.add(tableElementArticle);
         if (e.getTable().getFieldsName().contains("ID_ECO_CONTRIBUTION")) {
             this.tableElementEcoID = new SQLTableElement(e.getTable().getField("ID_ECO_CONTRIBUTION"));
         if (e.getTable().getFieldsName().contains("DELAI")) {
             final SQLTableElement tableElementDelai = new SQLTableElement(e.getTable().getField("DELAI"));
             list.add(tableElementDelai);
+        }
-        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
+        if (showDevise) {
             // Code Douanier
             final SQLTableElement tableElementCodeDouane = new SQLTableElement(e.getTable().getField("CODE_DOUANIER"));
             list.add(tableElementCodeDouane);
-        }
-        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
             final SQLTableElement tableElementPays = new SQLTableElement(e.getTable().getField("ID_PAYS"));
             list.add(tableElementPays);
+        }
         // Valeur des métriques
         tableElement_PrixMetrique1_AchatHT.setRenderer(new CurrencyWithSymbolRenderer());
         list.add(tableElement_PrixMetrique1_AchatHT);
         SQLTableElement eltDevise = null;
         SQLTableElement eltUnitDevise = null;
-        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
+        if (showDevise) {
             // Devise
             eltDevise = new SQLTableElement(e.getTable().getField("ID_DEVISE"));
             list.add(eltDevise);
             // Prix vente devise
         this.totalHA = new SQLTableElement(e.getTable().getField("T_PA_HT"), BigDecimal.class);
         this.totalHA.setRenderer(new CurrencyWithSymbolRenderer());
         this.totalHA.setEditable(false);
         list.add(this.totalHA);
-        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
+        if (showDevise) {
             // Total HT
             this.tableElementTotalDevise = new SQLTableElement(e.getTable().getField("PV_T_DEVISE"), BigDecimal.class) {
                 @Override
                 public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
                     return isCellNiveauEditable(vals, rowIndex, columnIndex);
         this.defaultRowVals = new SQLRowValues(UndefinedRowValuesCache.getInstance().getDefaultRowValues(e.getTable()));
         defaultRowVals.put("ID_TAXE", TaxeCache.getCache().getFirstTaxe().getID());
         defaultRowVals.put("CODE", "");
         defaultRowVals.put("NOM", "");
-        final RowValuesTableModel model = new RowValuesTableModel(e, list, e.getTable().getField("ID_TAXE"), false, defaultRowVals);
+        final RowValuesTableModel model = new RowValuesTableModel(e, list, e.getTable().getField("ID_TAXE"), false, defaultRowVals) {
+            @Override
+            public void commitData() {
+                int size = getRowCount();
+                for (int i = 0; i < size; i++) {
+                    SQLRowValues rowVals = getRowValuesAt(i);
+                    if (rowVals.getObject("PV_U_DEVISE") == null) {
+                        rowVals.put("PV_U_DEVISE", rowVals.getObject("PRIX_METRIQUE_VT_1"));
+                        final BigDecimal globalQty = rowVals.getBigDecimal("QTE_UNITAIRE").multiply(new BigDecimal(rowVals.getInt("QTE")));
+                        rowVals.put("PV_T_DEVISE", rowVals.getBigDecimal("PRIX_METRIQUE_VT_1").multiply(globalQty));
+                    }
+                }
+                super.commitData();
+            }
+        };
         setModel(model);
         this.table = new RowValuesTable(model, getConfigurationFile());
         ToolTipManager.sharedInstance().unregisterComponent(this.table);
         ToolTipManager.sharedInstance().unregisterComponent(this.table.getTableHeader());
         final SQLTable sqlTableArticle = ((ComptaPropsConfiguration) Configuration.getInstance()).getRootSociete().getTable("ARTICLE");
         List<String> completionField = new ArrayList<String>();
         if (e.getTable().getFieldsName().contains("ID_ECO_CONTRIBUTION")) {
             completionField.add("ID_ECO_CONTRIBUTION");
+        }
-        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
-            completionField.add("POURCENT_REMISE");
+        if (showDevise) {
             completionField.add("CODE_DOUANIER");
-        }
-        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
             completionField.add("ID_PAYS");
+        }
+        completionField.add("POURCENT_REMISE");
         completionField.add("ID_UNITE_VENTE");
+        completionField.add("QTE_UNITAIRE");
         completionField.add("PA_HT");
         completionField.add("PV_HT");
         completionField.add("ID_TAXE");
         completionField.add("POIDS");
         completionField.add("PRIX_METRIQUE_HA_1");
         completionField.add("SERVICE");
         completionField.add("ID_FAMILLE_ARTICLE");
         if (getSQLElement().getTable().getFieldsName().contains("DESCRIPTIF")) {
             completionField.add("DESCRIPTIF");
+        }
-        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
+        if (showDevise) {
             completionField.add("ID_DEVISE");
-        }
-        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
             completionField.add("PV_U_DEVISE");
+        }
         if (getSQLElement().getTable().getFieldsName().contains("QTE_ACHAT") && sqlTableArticle.getTable().getFieldsName().contains("QTE_ACHAT")) {
             completionField.add("QTE_ACHAT");
+        }
                 // FIXME utiliser le stock sélectionné sur la ligne et non le stock par défaut de
                 // l'article
                 final SQLTable tableStock = sqlTableArticle.getTable("STOCK");
                 input.andWhere(new Where(tableStock.getKey(), "=", sqlTableArticle.getField("ID_STOCK")));
                 input.setExcludeUndefined(false, tableStock);
-                Where w = new Where(sqlTableArticle.getField("OBSOLETE"), "=", Boolean.FALSE).or(new Where(input.getAlias(tableStock.getKey()), "=", tableStock.getUndefinedID()))
+                Where w = new Where(sqlTableArticle.getField("OBSOLETE"), "=", Boolean.FALSE)
-                        .or(new Where(input.getAlias(tableStock.getField("QTE_REEL")), ">", 0));
+                        .or(new Where(input.getAlias(tableStock.getKey()), "!=", tableStock.getUndefinedID()).and(new Where(input.getAlias(tableStock.getField("QTE_REEL")), ">", 0)));
                 if (input.getWhere() != null) {
                     input.setWhere(input.getWhere().and(w));
                 } else {
                     input.setWhere(w);
             public void setValueFrom(SQLRowValues row, Object value) {
                 super.setValueFrom(row, value);
+            }
         });
-        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
+        if (showDevise) {
             this.qte.addModificationListener(tableElementTotalDevise);
             qteU.addModificationListener(tableElementTotalDevise);
             if (eltUnitDevise != null) {
                 eltUnitDevise.addModificationListener(tableElementTotalDevise);
+            }
+                }
+            }
         });
-        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
+        if (showDevise) {
             if (eltUnitDevise != null) {
                 eltUnitDevise.addModificationListener(tableElement_PrixMetrique1_VenteHT);
+            }
             if (eltUnitDevise != null) {
         setColumnVisible(model.getColumnForField("POURCENT_FACTURABLE"), false);
         setColumnVisible(getModel().getColumnForField("ID_FAMILLE_ARTICLE"), filterFamilleArticle);
         setColumnVisible(model.getColumnForField("PRIX_METRIQUE_HA_1"), showHAPrice);
+        setColumnVisible(model.getColumnForField("MARGE_HT"), showHAPrice);
         setColumnVisible(model.getColumnForField("T_PA_HT"), showHAPrice);
+        setColumnVisible(model.getColumnForField("ID_DEPOT_STOCK"), prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_MULTI_DEPOT, false));
         for (String string : visibilityMap.keySet()) {
             setColumnVisible(model.getColumnForField(string), visibilityMap.get(string));
+        }
         Map<String, Boolean> mapCustom = getCustomVisibilityMap();
         return tarifCompletion(row, field, rowDest, false);
+    }
     protected Object tarifCompletion(SQLRowAccessor row, String field, SQLRowAccessor rowDest, boolean fromCompletion) {
-        if (row != null && !row.isUndefined() && getSQLElement().getTable().getDBRoot().contains("ARTICLE_PRIX_REVIENT")
-                && (field.equalsIgnoreCase("PRIX_METRIQUE_HA_1") || field.equalsIgnoreCase("PA_HT"))) {
+        if (row != null && !row.isUndefined() && (field.equalsIgnoreCase("PRIX_METRIQUE_HA_1") || field.equalsIgnoreCase("PA_HT"))) {
+            if (getSQLElement().getTable().getDBRoot().contains("ARTICLE_PRIX_REVIENT")) {
-            final BigDecimal prc;
+                final BigDecimal prc;
-            if (row.getBoolean("AUTO_PRIX_REVIENT_NOMENCLATURE")) {
+                if (row.getBoolean("AUTO_PRIX_REVIENT_NOMENCLATURE")) {
-                ProductHelper helper = new ProductHelper(row.getTable().getDBRoot());
+                    ProductHelper helper = new ProductHelper(row.getTable().getDBRoot());
-                prc = helper.getBomPriceForQuantity(1, row.getReferentRows(row.getTable().getTable("ARTICLE_ELEMENT").getField("ID_ARTICLE_PARENT")), TypePrice.ARTICLE_PRIX_REVIENT);
+                    prc = helper.getBomPriceForQuantity(1, row.getReferentRows(row.getTable().getTable("ARTICLE_ELEMENT").getField("ID_ARTICLE_PARENT")), TypePrice.ARTICLE_PRIX_REVIENT);
-            } else {
+                } else {
-                ProductComponent productComp = new ProductComponent(row, BigDecimal.ONE);
+                    ProductComponent productComp = new ProductComponent(row, BigDecimal.ONE, null, null);
-                prc = productComp.getPRC(new Date());
+                    prc = productComp.getPRC(new Date());
+                }
-            if (prc == null) {
+                if (prc == null) {
-                return BigDecimal.ZERO;
+                    return BigDecimal.ZERO;
+                }
-            return prc;
+                return prc;
+            } else if (getSQLElement().getTable().getDBRoot().contains("COUT_REVIENT") && row.getObject("ID_COUT_REVIENT") != null && !row.isForeignEmpty("ID_COUT_REVIENT")) {
+                BigDecimal ha = row.getBigDecimal(field);
+                BigDecimal percent = row.getForeign("ID_COUT_REVIENT").getBigDecimal("POURCENT");
+                return ha.multiply(percent.movePointLeft(2).add(BigDecimal.ONE)).setScale(ha.precision(), RoundingMode.HALF_UP);
+            }
+        }
         if (getTarif() != null && !getTarif().isUndefined()) {
             Collection<? extends SQLRowAccessor> rows = row.getReferentRows(tableArticleTarif);
                     return remise;
+                }
+            }
+        }
+        if (field.equalsIgnoreCase("ID_TAXE_VENTE") && this.rowCatComptable != null) {
+            return this.rowCatComptable.getForeignID("ID_TAXE_VENTE");
+        }
         if ((field.equalsIgnoreCase("POURCENT_REMISE"))) {
             return new Acompte(BigDecimal.ZERO, BigDecimal.ZERO);
+        }
         if ((field.equalsIgnoreCase("PRIX_METRIQUE_VT_1"))) {

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/AbstractVenteArticleItemTable.java - Rev 149 → 156