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

 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.model.SQLBackgroundTableCache;
 import org.openconcerto.sql.model.SQLBackgroundTableCacheItem;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowAccessor;
-import org.openconcerto.sql.model.SQLRowValues;
-import org.openconcerto.sql.model.SQLRowValuesListFetcher;
 import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.preferences.SQLPreferences;
 import org.openconcerto.utils.DecimalUtils;
 import org.openconcerto.utils.Tuple2;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 public class TotalCalculator {
     public void setRowDefaultCptProduit(SQLRowAccessor rowDefaultCptProduit) {
         this.rowDefaultCptProduit = rowDefaultCptProduit;
+    }
     public void retoreRowDefaultCptProduit() {
-        this.rowDefaultCptProduit = rowDefaultCptProduitStandard;
+        this.rowDefaultCptProduit = this.rowDefaultCptProduitStandard;
+    }
     /**
      * Définition d'une remise HT à appliquer
+     *
         this.remiseHT = remiseHT;
         this.remiseRestante = remiseHT;
         this.totalHTAvantRemise = totalHTAvantRemise;
+    }
+    public void addTVAAdjust(BigDecimal tvaFix) {
+        final SQLBackgroundTableCacheItem cacheForTableCompte = SQLBackgroundTableCache.getInstance().getCacheForTable(this.compteTable);
+        SQLRowAccessor tva = TaxeCache.getCache().getFirstTaxe();
+        SQLRowAccessor rowCptTva;
+        if (this.intraComm) {
+            // Intra comm TTC=HT et solde de TVA
+            rowCptTva = cacheForTableCompte.getRowFromId(tva.getForeignID("ID_COMPTE_PCE_DED_INTRA"));
+            if (rowCptTva == null || rowCptTva.isUndefined()) {
+                rowCptTva = this.rowDefaultCptTVADeductible;
+            }
+            SQLRowAccessor rowCptTvaIntra = cacheForTableCompte.getRowFromId(tva.getForeignID("ID_COMPTE_PCE_COLLECTE_INTRA"));
+            if (rowCptTvaIntra == null || rowCptTvaIntra.isUndefined()) {
+                rowCptTvaIntra = this.rowDefaultCptTVADeductible;
+            }
+            if (this.mapHtTVAIntra.get(rowCptTvaIntra) == null) {
+                this.mapHtTVAIntra.put(rowCptTvaIntra, tvaFix);
+            } else {
+                BigDecimal l = this.mapHtTVAIntra.get(rowCptTvaIntra);
+                this.mapHtTVAIntra.put(rowCptTvaIntra, l.add(tvaFix));
+            }
+        } else if (this.achat) {
+            rowCptTva = cacheForTableCompte.getRowFromId(tva.getForeignID("ID_COMPTE_PCE_DED"));
+            if (rowCptTva == null || rowCptTva.isUndefined()) {
+                rowCptTva = this.rowDefaultCptTVADeductible;
+            }
+        } else {
+            rowCptTva = cacheForTableCompte.getRowFromId(tva.getForeignID("ID_COMPTE_PCE_COLLECTE"));
+            if (rowCptTva == null || rowCptTva.isUndefined()) {
+                rowCptTva = this.rowDefaultCptTVACollecte;
+            }
+        }
+        if (this.mapHtTVA.get(rowCptTva) == null) {
+            this.mapHtTVA.put(rowCptTva, tvaFix);
+        } else {
+            BigDecimal l = this.mapHtTVA.get(rowCptTva);
+            this.mapHtTVA.put(rowCptTva, l.add(tvaFix));
+        }
+        this.totalTTC = this.totalTTC.add(tvaFix);
+    }
     /**
      * Gestion de la vente de service
+     *
      * @param b
      */
     /**
      * Mise en cache des comptes de TVA
      */
     private void fetchTVA() {
         mapTVA = new HashMap<Integer, SQLRowAccessor>();
+        Set<SQLRowAccessor> taxes = TaxeCache.getCache().getAllTaxe();
+        for (SQLRowAccessor sqlRowAccessor : taxes) {
+            mapTVA.put(sqlRowAccessor.getID(), sqlRowAccessor);
+        }
-        SQLRowValues rowVals = new SQLRowValues(tvaTable);
+        // SQLRowValues rowVals = new SQLRowValues(this.tvaTable);
-        SQLRowValues rowValsC1 = new SQLRowValues(compteTable);
+        // SQLRowValues rowValsC1 = new SQLRowValues(this.compteTable);
-        rowValsC1.put("NUMERO", null);
+        // rowValsC1.put("NUMERO", null);
-        rowValsC1.put("ID", null);
+        // rowValsC1.put("ID", null);
+        //
-        SQLRowValues rowValsC2 = new SQLRowValues(compteTable);
+        // SQLRowValues rowValsC2 = new SQLRowValues(this.compteTable);
-        rowValsC2.put("NUMERO", null);
+        // rowValsC2.put("NUMERO", null);
-        rowValsC2.put("ID", null);
+        // rowValsC2.put("ID", null);
+        //
-        SQLRowValues rowValsC3 = new SQLRowValues(compteTable);
+        // SQLRowValues rowValsC3 = new SQLRowValues(this.compteTable);
-        rowValsC3.put("NUMERO", null);
+        // rowValsC3.put("NUMERO", null);
-        rowValsC3.put("ID", null);
+        // rowValsC3.put("ID", null);
-        SQLRowValues rowValsC4 = new SQLRowValues(compteTable);
+        // SQLRowValues rowValsC4 = new SQLRowValues(this.compteTable);
-        rowValsC4.put("NUMERO", null);
+        // rowValsC4.put("NUMERO", null);
-        rowValsC4.put("ID", null);
+        // rowValsC4.put("ID", null);
+        //
-        rowVals.put(tvaTable.getKey().getName(), null);
+        // rowVals.put(this.tvaTable.getKey().getName(), null);
-        rowVals.put("ID_COMPTE_PCE_COLLECTE", rowValsC1);
+        // rowVals.put("ID_COMPTE_PCE_COLLECTE", rowValsC1);
-        rowVals.put("ID_COMPTE_PCE_DED", rowValsC2);
+        // rowVals.put("ID_COMPTE_PCE_DED", rowValsC2);
-        rowVals.put("ID_COMPTE_PCE_VENTE", rowValsC3);
+        // rowVals.put("ID_COMPTE_PCE_VENTE", rowValsC3);
-        rowVals.put("ID_COMPTE_PCE_VENTE_SERVICE", rowValsC4);
+        // rowVals.put("ID_COMPTE_PCE_VENTE_SERVICE", rowValsC4);
+        //
-        if (tvaTable.contains("ID_COMPTE_PCE_COLLECTE_INTRA")) {
+        // if (this.tvaTable.contains("ID_COMPTE_PCE_COLLECTE_INTRA")) {
-            SQLRowValues rowValsC1Intra = new SQLRowValues(compteTable);
+        // SQLRowValues rowValsC1Intra = new SQLRowValues(this.compteTable);
-            rowValsC1Intra.put("NUMERO", null);
+        // rowValsC1Intra.put("NUMERO", null);
-            rowValsC1Intra.put("ID", null);
+        // rowValsC1Intra.put("ID", null);
-            rowVals.put("ID_COMPTE_PCE_COLLECTE_INTRA", rowValsC1Intra);
+        // rowVals.put("ID_COMPTE_PCE_COLLECTE_INTRA", rowValsC1Intra);
-            SQLRowValues rowValsC2Intra = new SQLRowValues(compteTable);
+        // SQLRowValues rowValsC2Intra = new SQLRowValues(this.compteTable);
-            rowValsC2Intra.put("NUMERO", null);
+        // rowValsC2Intra.put("NUMERO", null);
-            rowValsC2Intra.put("ID", null);
+        // rowValsC2Intra.put("ID", null);
-            rowVals.put("ID_COMPTE_PCE_DED_INTRA", rowValsC2Intra);
+        // rowVals.put("ID_COMPTE_PCE_DED_INTRA", rowValsC2Intra);
-        }
+        // }
-        SQLRowValuesListFetcher fetch = SQLRowValuesListFetcher.create(rowVals);
+        // SQLRowValuesListFetcher fetch = SQLRowValuesListFetcher.create(rowVals);
-        List<SQLRowValues> rowValsList = fetch.fetch();
+        // List<SQLRowValues> rowValsList = fetch.fetch();
+        //
-        for (SQLRowValues sqlRowValues : rowValsList) {
+        // for (SQLRowValues sqlRowValues : rowValsList) {
-            mapTVA.put(sqlRowValues.getID(), sqlRowValues);
+        // mapTVA.put(sqlRowValues.getID(), sqlRowValues);
-        }
+        // }
         lastTVAfetchedTime = System.currentTimeMillis();
+    }
     private void addHT(BigDecimal ht, BigDecimal htSansFacturable, SQLRowAccessor tva, SQLRowAccessor cptArticle, boolean selection) {
                 SQLRowAccessor rowCptTvaIntra = cacheForTableCompte.getRowFromId(tva.getForeignID("ID_COMPTE_PCE_COLLECTE_INTRA"));
                 if (rowCptTvaIntra == null || rowCptTvaIntra.isUndefined()) {
                     rowCptTvaIntra = this.rowDefaultCptTVADeductible;
+                }
-                if (mapHtTVAIntra.get(rowCptTvaIntra) == null) {
+                if (this.mapHtTVAIntra.get(rowCptTvaIntra) == null) {
-                    mapHtTVAIntra.put(rowCptTvaIntra, totalTVA);
+                    this.mapHtTVAIntra.put(rowCptTvaIntra, totalTVA);
                 } else {
-                    BigDecimal l = mapHtTVAIntra.get(rowCptTvaIntra);
+                    BigDecimal l = this.mapHtTVAIntra.get(rowCptTvaIntra);
-                    mapHtTVAIntra.put(rowCptTvaIntra, l.add(totalTVA));
+                    this.mapHtTVAIntra.put(rowCptTvaIntra, l.add(totalTVA));
+                }
                 ttc = ht;
             } else if (this.achat) {
                 rowCptTva = cacheForTableCompte.getRowFromId(tva.getForeignID("ID_COMPTE_PCE_DED"));
                 rowCptTva = cacheForTableCompte.getRowFromId(tva.getForeignID("ID_COMPTE_PCE_COLLECTE"));
                 if (rowCptTva == null || rowCptTva.isUndefined()) {
                     rowCptTva = this.rowDefaultCptTVACollecte;
+                }
+            }
-            if (mapHtTVA.get(rowCptTva) == null) {
+            if (this.mapHtTVA.get(rowCptTva) == null) {
-                mapHtTVA.put(rowCptTva, totalTVA);
+                this.mapHtTVA.put(rowCptTva, totalTVA);
             } else {
-                BigDecimal l = mapHtTVA.get(rowCptTva);
+                BigDecimal l = this.mapHtTVA.get(rowCptTva);
-                mapHtTVA.put(rowCptTva, l.add(totalTVA));
+                this.mapHtTVA.put(rowCptTva, l.add(totalTVA));
+            }
             if (ht.signum() != 0) {
-                if (mapHtTVARowTaux.get(tva) == null) {
+                if (this.mapHtTVARowTaux.get(tva) == null) {
-                    mapHtTVARowTaux.put(tva, Tuple2.create(ht, totalTVA));
+                    this.mapHtTVARowTaux.put(tva, Tuple2.create(ht, totalTVA));
                 } else {
-                    Tuple2<BigDecimal, BigDecimal> l = mapHtTVARowTaux.get(tva);
+                    Tuple2<BigDecimal, BigDecimal> l = this.mapHtTVARowTaux.get(tva);
-                    mapHtTVARowTaux.put(tva, Tuple2.create(ht.add(l.get0()), l.get1().add(totalTVA)));
+                    this.mapHtTVARowTaux.put(tva, Tuple2.create(ht.add(l.get0()), l.get1().add(totalTVA)));
+                }
+            }
             if (selection) {
-                if (mapHtTVASel.get(rowCptTva) == null) {
+                if (this.mapHtTVASel.get(rowCptTva) == null) {
-                    mapHtTVASel.put(rowCptTva, totalTVA);
+                    this.mapHtTVASel.put(rowCptTva, totalTVA);
                 } else {
-                    BigDecimal l = mapHtTVASel.get(rowCptTva);
+                    BigDecimal l = this.mapHtTVASel.get(rowCptTva);
-                    mapHtTVASel.put(rowCptTva, l.add(totalTVA));
+                    this.mapHtTVASel.put(rowCptTva, l.add(totalTVA));
+                }
+            }
+        }
-        if (mapHt.get(cptArticle) == null) {
+        if (this.mapHt.get(cptArticle) == null) {
-            mapHt.put(cptArticle, ht);
+            this.mapHt.put(cptArticle, ht);
         } else {
-            BigDecimal l = mapHt.get(cptArticle);
+            BigDecimal l = this.mapHt.get(cptArticle);
-            mapHt.put(cptArticle, l.add(ht));
+            this.mapHt.put(cptArticle, l.add(ht));
+        }
         this.totalTTC = this.totalTTC.add(ttc);
         this.totalHTSansFActurable = this.totalHTSansFActurable.add(htSansFacturable);
         if (selection) {
-            if (mapHtSel.get(cptArticle) == null) {
+            if (this.mapHtSel.get(cptArticle) == null) {
-                mapHtSel.put(cptArticle, ht);
+                this.mapHtSel.put(cptArticle, ht);
             } else {
-                BigDecimal l = mapHtSel.get(cptArticle);
+                BigDecimal l = this.mapHtSel.get(cptArticle);
-                mapHtSel.put(cptArticle, l.add(ht));
+                this.mapHtSel.put(cptArticle, l.add(ht));
+            }
             this.totalTTCSel = this.totalTTCSel.add(ttc);
+        }
+    }
         if (rowAccessorLine.getFields().contains("NIVEAU") && rowAccessorLine.getInt("NIVEAU") != 1) {
             return;
+        }
         // Total HT de la ligne
-        BigDecimal totalLineHT = rowAccessorLine.getObject(fieldHT) == null ? BigDecimal.ZERO : (BigDecimal) rowAccessorLine.getObject(fieldHT);
+        BigDecimal totalLineHT = rowAccessorLine.getObject(this.fieldHT) == null ? BigDecimal.ZERO : (BigDecimal) rowAccessorLine.getObject(this.fieldHT);
         BigDecimal totalLineEco = rowAccessorLine.getObject("T_ECO_CONTRIBUTION") == null ? BigDecimal.ZERO : (BigDecimal) rowAccessorLine.getObject("T_ECO_CONTRIBUTION");
         BigDecimal totalLineHTSansFacturable = totalLineHT;
-        if (!achat) {
+        if (!this.achat) {
             totalLineHTSansFacturable = rowAccessorLine.getObject("PV_HT") == null ? BigDecimal.ZERO : (BigDecimal) rowAccessorLine.getObject("PV_HT");
             BigDecimal qteUV = rowAccessorLine.getObject("QTE_UNITAIRE") == null ? BigDecimal.ZERO : (BigDecimal) rowAccessorLine.getObject("QTE_UNITAIRE");
             int qte = rowAccessorLine.getInt("QTE");
             totalLineHTSansFacturable = totalLineHTSansFacturable.multiply(qteUV).multiply(new BigDecimal(qte));
+        }
         // Prix Unitaire de la ligne
         // TODO voir pour passer le prix total et non le prix unitaire
-        BigDecimal totalHALigne = rowAccessorLine.getObject(fieldHA) == null ? BigDecimal.ZERO : (BigDecimal) rowAccessorLine.getObject(fieldHA);
+        BigDecimal totalHALigne = rowAccessorLine.getObject(this.fieldHA) == null ? BigDecimal.ZERO : (BigDecimal) rowAccessorLine.getObject(this.fieldHA);
         Boolean service = rowAccessorLine.getBoolean(FIELD_SERVICE);
-        BigDecimal totalLineDevise = (fieldDevise == null || rowAccessorLine.getObject(fieldDevise) == null) ? BigDecimal.ZERO : (BigDecimal) rowAccessorLine.getObject(fieldDevise);
+        BigDecimal totalLineDevise = (this.fieldDevise == null || rowAccessorLine.getObject(this.fieldDevise) == null) ? BigDecimal.ZERO : (BigDecimal) rowAccessorLine.getObject(this.fieldDevise);
         Number nPoids = (Number) rowAccessorLine.getObject(FIELD_POIDS);
         // Si il y a une remise à appliquer
         if (this.remiseHT != 0 && this.remiseRestante > 0 && this.totalHTAvantRemise != null && this.totalHTAvantRemise.signum() != 0) {
                 idTVA = foreignTVA.getID();
+            }
+        }
         SQLRowAccessor tva = mapTVA.get(idTVA);
-        SQLRowAccessor cpt = (achat ? this.rowDefaultCptAchat : this.rowDefaultCptProduit);
+        SQLRowAccessor cpt = (this.achat ? this.rowDefaultCptAchat : this.rowDefaultCptProduit);
         final SQLBackgroundTableCacheItem cacheForTableCompte = SQLBackgroundTableCache.getInstance().getCacheForTable(cpt.getTable());
-        if (!achat) {
+        if (!this.achat) {
             // Total Service
-            if (bServiceActive != null && bServiceActive && service != null && service.booleanValue()) {
+            if (this.bServiceActive != null && this.bServiceActive && service != null && service.booleanValue()) {
-                totalService = totalService.add(totalLineHT);
+                this.totalService = this.totalService.add(totalLineHT);
                 cpt = this.rowDefaultCptService;
                 if (tva != null && !tva.isForeignEmpty("ID_COMPTE_PCE_VENTE_SERVICE")) {
                     cpt = cacheForTableCompte.getRowFromId(tva.getForeignID("ID_COMPTE_PCE_VENTE_SERVICE"));
+                }
             } else {
                     cpt = cacheForTableCompte.getRowFromId(tva.getForeignID("ID_COMPTE_PCE_VENTE"));
+                }
+            }
+        }
+        // Compte PCE défini directement sur la ligne
+        boolean compteSpec = false;
+        if (rowAccessorLine.getTable().contains("ID_COMPTE_PCE") && rowAccessorLine.getObject("ID_COMPTE_PCE") != null && !rowAccessorLine.isForeignEmpty("ID_COMPTE_PCE")) {
+            compteSpec = true;
+            cpt = cacheForTableCompte.getRowFromId(rowAccessorLine.getForeignID("ID_COMPTE_PCE"));
+        }
         if (article != null && !article.isUndefined()) {
+            if (!compteSpec) {
-            SQLRowAccessor cptCatComptable = null;
+                SQLRowAccessor cptCatComptable = null;
-            // TODO Optimiser les requetes
+                // TODO Optimiser les requetes
-            if (rowCatComptable != null && !rowCatComptable.isUndefined()) {
+                if (this.rowCatComptable != null && !this.rowCatComptable.isUndefined()) {
-                String suffix = (this.achat ? "_ACHAT" : "_VENTE");
+                    String suffix = (this.achat ? "_ACHAT" : "_VENTE");
-                Collection<? extends SQLRowAccessor> rows = article.getReferentRows(compteTable.getTable("ARTICLE_CATEGORIE_COMPTABLE"));
+                    Collection<? extends SQLRowAccessor> rows = article.getReferentRows(this.compteTable.getTable("ARTICLE_CATEGORIE_COMPTABLE"));
-                for (SQLRowAccessor sqlRowAccessor : rows) {
+                    for (SQLRowAccessor sqlRowAccessor : rows) {
-                    if (sqlRowAccessor.getForeignID("ID_CATEGORIE_COMPTABLE") == this.rowCatComptable.getID()) {
+                        if (sqlRowAccessor.getForeignID("ID_CATEGORIE_COMPTABLE") == this.rowCatComptable.getID()) {
-                        cptCatComptable = cacheForTableCompte.getRowFromId(rowCatComptable.getForeignID("ID_COMPTE_PCE" + suffix));
+                            cptCatComptable = cacheForTableCompte.getRowFromId(this.rowCatComptable.getForeignID("ID_COMPTE_PCE" + suffix));
+                        }
+                    }
+                }
-            if (cptCatComptable == null) {
+                if (cptCatComptable == null) {
+                        }
+                    }
-            } else {
+                } else {
-                cpt = cptCatComptable;
+                    cpt = cptCatComptable;
+                }
+            }
-            if (!achat) {
+            if (!this.achat) {
                 SQLRowAccessor taxeCompl = (article.getFields().contains("ID_TAXE_COMPLEMENTAIRE") && article.getObject("ID_TAXE_COMPLEMENTAIRE") != null
                         && !article.isForeignEmpty("ID_TAXE_COMPLEMENTAIRE") ? article.getForeign("ID_TAXE_COMPLEMENTAIRE") : null);
                 if (taxeCompl != null && !taxeCompl.isUndefined()) {
                     Map<SQLRowAccessor, BigDecimal> mapCptTaxeValue = this.mapHtTaxeCompl.get(cpt);
                     mapCptTaxeValue.put(taxeCompl, b);
+                }
+            }
+        }
-        if (achat) {
+        if (!compteSpec) {
             // Total Service
-            if (bServiceActive != null && bServiceActive) {
+            if (this.bServiceActive != null && this.bServiceActive) {
                 if (service != null && service.booleanValue()) {
-                    totalService = totalService.add(totalLineHT);
+                    this.totalService = this.totalService.add(totalLineHT);
                     cpt = this.rowDefaultCptService;
+                }
+            }
+        }
         // Total HA
         this.totalHA = this.totalHA.add(totalHALigne);
         // Total Devise
         if (totalLineDevise != null) {
-            totalDevise = totalDevise.add(totalLineDevise);
+            this.totalDevise = this.totalDevise.add(totalLineDevise);
+        }
         // Total Poids
-        totalPoids += nPoids == null ? 0 : nPoids.doubleValue();
+        this.totalPoids += nPoids == null ? 0 : nPoids.doubleValue();
         // Eco-contribution
         this.totalEco = this.totalEco.add(totalLineEco);
         // Calcul total sélectionné
-        boolean selection = containsInt(selectedRows, lineNumber);
+        boolean selection = containsInt(this.selectedRows, lineNumber);
         if (selection) {
-            totalHASel = totalHASel.add(totalHALigne);
+            this.totalHASel = this.totalHASel.add(totalHALigne);
-            if (bServiceActive != null && bServiceActive) {
+            if (this.bServiceActive != null && this.bServiceActive) {
                 if (service != null && service.booleanValue()) {
-                    totalServiceSel = totalServiceSel.add(totalLineHT);
+                    this.totalServiceSel = this.totalServiceSel.add(totalLineHT);
+                }
+            }
             this.totalEcoSel = this.totalEcoSel.add(totalLineEco);
             if (totalLineDevise != null) {
-                totalDeviseSel = totalDeviseSel.add(totalLineDevise);
+                this.totalDeviseSel = this.totalDeviseSel.add(totalLineDevise);
+            }
+        }
         addHT(totalLineHT, totalLineHTSansFacturable, tva, cpt, selection);
+    }
     public void checkResult() {
         BigDecimal ht = getTotalHT();
         BigDecimal tva = getTotalTVA();
         BigDecimal totalTTC2 = getTotalTTC();
         BigDecimal reste = totalTTC2.subtract(ht.add(tva));
-        if (!intraComm && reste.compareTo(BigDecimal.ZERO) != 0) {
+        if (!this.intraComm && reste.compareTo(BigDecimal.ZERO) != 0) {
             System.err.print("Ecarts: " + reste + "(HT:" + ht);
             System.err.print(" TVA:" + tva);
             System.err.println(" TTC:" + totalTTC2);
             // TODO Check if row already exist in MAP ??
+            }
+        }
+    }
     public BigDecimal getTotalDevise() {
-        return totalDevise;
+        return this.totalDevise;
+    }
     public BigDecimal getTotalDeviseSel() {
-        return totalDeviseSel;
+        return this.totalDeviseSel;
+    }
     public BigDecimal getTotalHA() {
-        return totalHA;
+        return this.totalHA;
+    }
     public BigDecimal getTotalHASel() {
-        return totalHASel;
+        return this.totalHASel;
+    }
     public double getTotalPoids() {
-        return totalPoids;
+        return this.totalPoids;
+    }
     public BigDecimal getTotalService() {
-        return totalService;
+        return this.totalService;
+    }
     public BigDecimal getTotalServiceSel() {
-        return totalServiceSel;
+        return this.totalServiceSel;
+    }
     public Map<SQLRowAccessor, Map<SQLRowAccessor, BigDecimal>> getMapHtTaxeCompl() {
-        return mapHtTaxeCompl;
+        return this.mapHtTaxeCompl;
+    }
     public BigDecimal getTotalHT() {
         BigDecimal ht = BigDecimal.ZERO;
         for (SQLRowAccessor row : this.mapHt.keySet()) {
     public BigDecimal getTotalEcoSel() {
         return this.totalEcoSel.setScale(2, RoundingMode.HALF_UP);
+    }
     public BigDecimal getTotalHTSansFActurable() {
-        return totalHTSansFActurable;
+        return this.totalHTSansFActurable;
+    }
     public BigDecimal getTotalTTC() {
         return this.totalTTC.setScale(2, RoundingMode.HALF_UP);
+    }
         return this.totalTTCSel.setScale(2, RoundingMode.HALF_UP);
+    }
     public Map<SQLRowAccessor, BigDecimal> getMapHt() {
-        return mapHt;
+        return this.mapHt;
+    }
     public Map<SQLRowAccessor, Tuple2<BigDecimal, BigDecimal>> getMapHtTVARowTaux() {
-        return mapHtTVARowTaux;
+        return this.mapHtTVARowTaux;
+    }
     public Map<SQLRowAccessor, BigDecimal> getMapHtTVA() {
-        return mapHtTVA;
+        return this.mapHtTVA;
+    }
     public Map<SQLRowAccessor, BigDecimal> getMapHtTVAIntra() {
-        return mapHtTVAIntra;
+        return this.mapHtTVAIntra;
+    }
+}

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