OpenConcerto

Dépôt officiel du code source de l'ERP OpenConcerto
sonarqube

svn://code.openconcerto.org/openconcerto

Rev

Rev 142 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 142 Rev 156
Line 140... Line 140...
140
        if (compteDeb.equals(this.compteEnd)) {
140
        if (compteDeb.equals(this.compteEnd)) {
141
            w = w.and(new Where(tableCompte.getField("NUMERO"), "=", this.compteDeb));
141
            w = w.and(new Where(tableCompte.getField("NUMERO"), "=", this.compteDeb));
142
        } else {
142
        } else {
143
            w = w.and(new Where(tableCompte.getField("NUMERO"), (Object) this.compteDeb, (Object) this.compteEnd));
143
            w = w.and(new Where(tableCompte.getField("NUMERO"), (Object) this.compteDeb, (Object) this.compteEnd));
144
        }
144
        }
-
 
145
 
-
 
146
        // FIXME use flag cloture
-
 
147
        Where wCloture = new Where(tableEcriture.getField("NOM"), "NOT LIKE", "Fermeture du compte%");
-
 
148
        wCloture = wCloture.and(new Where(tableEcriture.getField("DATE"), "=", this.dateAu));
-
 
149
        wCloture = wCloture.or(new Where(tableEcriture.getField("DATE"), "<", this.dateAu));
-
 
150
        w = w.and(wCloture);
-
 
151
 
145
        sel.setWhere(w);
152
        sel.setWhere(w);
146
 
153
 
147
        String req = sel.asString() + " AND \"ECRITURE\".\"ID_COMPTE_PCE\" = \"COMPTE_PCE\".\"ID\" GROUP BY  \"COMPTE_PCE\".\"NUMERO\", \"COMPTE_PCE\".\"ID\" ORDER BY \"COMPTE_PCE\".\"NUMERO\"";
154
        String req = sel.asString() + " AND \"ECRITURE\".\"ID_COMPTE_PCE\" = \"COMPTE_PCE\".\"ID\" GROUP BY  \"COMPTE_PCE\".\"NUMERO\", \"COMPTE_PCE\".\"ID\" ORDER BY \"COMPTE_PCE\".\"NUMERO\"";
148
 
155
 
149
        System.err.println(req);
156
        System.err.println(req);