WebSVN - OpenConcerto - Diff - Rev 180 and 182 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/invoice/report/SituationCompteXmlSheet.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 java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
     public String getDefaultTemplateId() {
         return "SituationCompte";
+    }
-    private Date d = null;
+    private Date d;
     @Override
     public String getName() {
         if (this.d == null) {
             this.d = new Date();
         Where w = new Where(echTable.getField("REGLE"), "=", Boolean.FALSE);
         w = w.and(new Where(echTable.getField("REG_COMPTA"), "=", Boolean.FALSE));
         w = w.and(new Where(echTable.getField("ID_CLIENT"), "=", row.getID()));
         SQLRowValuesListFetcher fetcher = SQLRowValuesListFetcher.create(rowVals);
-        fetcher.addSelTransf(new ITransformer<SQLSelect, SQLSelect>() {
+        List<SQLRowValues> result = fetcher.fetch(w);
+        Collections.sort(result, new Comparator<SQLRowValues>() {
             @Override
-            public SQLSelect transformChecked(SQLSelect input) {
+            public int compare(SQLRowValues o1, SQLRowValues o2) {
-                input.addFieldOrder(echTable.getField("DATE"));
-                return input;
+                return o1.getDate("DATE").compareTo(o2.getDate("DATE"));
+            }
-        }, 0);
+        });
-        List<SQLRowValues> result = fetcher.fetch(w);
         List<Map<String, Object>> listValues = new ArrayList<Map<String, Object>>();
         Map<Integer, String> styleValues = new HashMap<Integer, String>();
         BigDecimal totalRegle = BigDecimal.ZERO;
         BigDecimal totalEch = BigDecimal.ZERO;
         for (SQLRowValues sqlRow : result) {
             Map<String, Object> mValues = new HashMap<String, Object>();
             final Calendar dateEch = sqlRow.getDate("DATE");
             mValues.put("DATE_ECHEANCE", dateFormat.format(dateEch.getTime()));
             final BigDecimal montantDu = new BigDecimal(sqlRow.getLong("MONTANT"));
-            mValues.put("DU", montantDu);
+            mValues.put("DU", montantDu.movePointLeft(2));
             totalEch = totalEch.add(montantDu);
             SQLRowAccessor rowFact = sqlRow.getNonEmptyForeign("ID_SAISIE_VENTE_FACTURE");
             final BigDecimal regle;
                 mValues.put("PIECE", rowFact.getString("NUMERO"));
                 mValues.put("LIBELLE", rowFact.getString("NOM"));
                 mValues.put("DATE", dateFormat.format(rowFact.getDate("DATE").getTime()));
                 final BigDecimal montantFact = new BigDecimal(rowFact.getLong("NET_A_PAYER"));
                 regle = montantFact.subtract(montantDu);
-                mValues.put("DU", montantFact);
+                mValues.put("DU", montantFact.movePointLeft(2));
-                mValues.put("REGLE", montantFact.subtract(montantDu));
+                mValues.put("REGLE", montantFact.subtract(montantDu).movePointLeft(2));
-                mValues.put("SOLDE", montantDu);
+                mValues.put("SOLDE", montantDu.movePointLeft(2));
             } else {
                 regle = BigDecimal.ZERO;
-                mValues.put("SOLDE", montantDu);
+                mValues.put("SOLDE", montantDu.movePointLeft(2));
+            }
             if (dateEch.before(today)) {
                 totalEchPasse = totalEchPasse.add(montantDu);
                 styleValues.put(listValues.size(), "Normal");
             } else {
             // listValues.add(mValuesEnc);
             // }
+        }
+        // Avoir
+        final SQLTable avoirTable = echTable.getTable("AVOIR_CLIENT");
+        SQLRowValues rowValsAvoir = new SQLRowValues(avoirTable);
+        rowValsAvoir.putNulls("NUMERO", "MONTANT_TTC", "MONTANT_SOLDE", "MONTANT_RESTANT", "DATE", "NOM");
+        Where wA = new Where(avoirTable.getField("SOLDE"), "=", Boolean.FALSE);
+        wA = wA.and(new Where(avoirTable.getField("ID_CLIENT"), "=", row.getID()));
+        wA = wA.and(new Where(avoirTable.getField("MONTANT_RESTANT"), ">", 0));
+        SQLRowValuesListFetcher fetcherA = SQLRowValuesListFetcher.create(rowValsAvoir);
+        List<SQLRowValues> resultA = fetcherA.fetch(wA);
+        Collections.sort(resultA, new Comparator<SQLRowValues>() {
+            @Override
+            public int compare(SQLRowValues o1, SQLRowValues o2) {
+                return o1.getDate("DATE").compareTo(o2.getDate("DATE"));
+            }
+        });
+        if (!resultA.isEmpty()) {
+            listValues.add(new HashMap<String, Object>());
+        }
+        for (SQLRowValues sqlRow : resultA) {
+            Map<String, Object> mValues = new HashMap<String, Object>();
+            final Calendar dateEch = sqlRow.getDate("DATE");
+            mValues.put("DATE_ECHEANCE", dateFormat.format(dateEch.getTime()));
+            final BigDecimal montantDu = new BigDecimal(sqlRow.getLong("MONTANT_RESTANT")).movePointLeft(2).negate();
+            mValues.put("DU", montantDu);
+            totalEch = totalEch.add(montantDu.movePointRight(2));
+            totalEchPasse = totalEchPasse.add(montantDu.movePointRight(2));
+            mValues.put("PIECE", sqlRow.getString("NUMERO"));
+            mValues.put("LIBELLE", sqlRow.getString("NOM"));
+            mValues.put("DATE", dateFormat.format(sqlRow.getDate("DATE").getTime()));
+            styleValues.put(listValues.size(), "Normal");
+            listValues.add(mValues);
+        }
-        SQLRow rowSoc = conf.getRowSociete();
+        SQLRow rowSoc = this.conf.getRowSociete();
         SQLRow adrSoc = rowSoc.getForeign("ID_ADRESSE_COMMON");
         Map<String, Object> sheetVals = new HashMap<String, Object>();
-        sheetVals.put("TOTAL_REGLE", totalRegle);
+        sheetVals.put("TOTAL_REGLE", totalRegle.movePointLeft(2));
-        sheetVals.put("TOTAL_ECHEANCE", totalEch);
+        sheetVals.put("TOTAL_ECHEANCE", totalEch.movePointLeft(2));
-        sheetVals.put("TOTAL_FUTUR", totalEch.subtract(totalEchPasse));
+        sheetVals.put("TOTAL_FUTUR", totalEch.subtract(totalEchPasse).movePointLeft(2));
-        sheetVals.put("TOTAL_PASSE", totalEchPasse);
+        sheetVals.put("TOTAL_PASSE", totalEchPasse.movePointLeft(2));
         sheetVals.put("NOM_CLIENT", row.getString("NOM"));
-        sheetVals.put("DATE", new Date());
+        sheetVals.put("DATE", dateFormat.format(new Date()));
         sheetVals.put("CODE_CLIENT", row.getString("CODE"));
         sheetVals.put("TELEPHONE", row.getString("TEL"));
         SQLRow rowAdrClient = row.getForeign("ID_ADRESSE");
         sheetVals.put("ADRESSE", rowAdrClient.getString("RUE"));
         sheetVals.put("VILLE", rowAdrClient.getString("CODE_POSTAL") + " " + rowAdrClient.getString("VILLE"));

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/invoice/report/SituationCompteXmlSheet.java - Rev 180 → 182