OpenConcerto

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

svn://code.openconcerto.org/openconcerto

Compare Revisions

Regard whitespace Rev 60 → Rev 61

/trunk/OpenConcerto/src/org/openconcerto/erp/generationDoc/OOXMLField.java
345,7 → 345,7
// Retourne la date d'échéance
int idModeReglement = this.row.getInt("ID_MODE_REGLEMENT");
Date d = (Date) this.row.getObject("DATE");
return getDateEcheance(idModeReglement, d);
return getDateEcheance(idModeReglement, d, this.elt.getAttributeValue("DatePattern"));
} else if (typeComp.equalsIgnoreCase("Jour")) {
int day = this.row.getInt(field);
stringValue = "le " + String.valueOf(day);
413,6 → 413,20
 
long cumul = 0;
 
SQLRowAccessor rowAff = rowFact.getForeign("ID_AFFAIRE");
Calendar date = rowFact.getDate("DATE");
if (rowAff != null && !rowAff.isUndefined()) {
if (rowAff.getBoolean("CCI")) {
 
List<SQLRow> rows = rowAff.asRow().getReferentRows(rowFact.getTable());
for (SQLRow sqlRow : rows) {
if (sqlRow.getID() != rowFact.getID() && sqlRow.getDate("DATE").before(date)) {
cumul += sqlRow.getLong("T_HT");
}
}
}
} else {
 
// On recupere les missions associées
SQLTable tableElt = Configuration.getInstance().getRoot().findTable("SAISIE_VENTE_FACTURE_ELEMENT");
Collection<? extends SQLRowAccessor> factElts = rowFact.getReferentRows(tableElt);
424,12 → 438,13
Collection<? extends SQLRowAccessor> rowsElt = foreign.getReferentRows(tableElt);
for (SQLRowAccessor row2 : rowsElt) {
SQLRowAccessor rowFacture = row2.getForeign("ID_SAISIE_VENTE_FACTURE");
if (rowFacture.getDate("DATE").before(rowFact.getDate("DATE"))) {
if (rowFacture.getDate("DATE").before(date)) {
cumul += row2.getLong("T_PV_HT");
}
}
}
}
}
 
return cumul;
}