OpenConcerto

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

svn://code.openconcerto.org/openconcerto

Compare Revisions

Regard whitespace Rev 155 → Rev 156

/trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/invoice/report/ReportingVenteXmlSheet.java
17,6 → 17,7
import org.openconcerto.erp.preferences.PrinterNXProps;
import org.openconcerto.sql.Configuration;
import org.openconcerto.sql.element.SQLElement;
import org.openconcerto.sql.model.AliasedTable;
import org.openconcerto.sql.model.SQLRow;
import org.openconcerto.sql.model.SQLRowListRSH;
import org.openconcerto.sql.model.SQLSelect;
87,17 → 88,18
protected void createListeValues() {
 
SQLSelect sel = new SQLSelect();
sel.addRawSelect("SUM(\"QTE\"*\"QTE_UNITAIRE\")", "q");
final SQLTable tableItemFact = eltFactItem.getTable();
sel.addSelect(tableItemFact.getField("T_PA_HT"), "SUM");
sel.addSelect(tableItemFact.getField("T_PV_HT"), "SUM");
sel.addSelect(tableItemFact.getField("T_PV_TTC"), "SUM");
AliasedTable tableAlias = new AliasedTable(tableItemFact, "eltTable");
sel.addRawSelect("SUM(\"eltTable\".\"QTE\"*\"eltTable\".\"QTE_UNITAIRE\")", "q");
sel.addSelect(tableAlias.getField("T_PA_HT"), "SUM");
sel.addSelect(tableAlias.getField("T_PV_HT"), "SUM");
sel.addSelect(tableAlias.getField("T_PV_TTC"), "SUM");
final SQLTable tableArt = eltFactItem.getForeignElement("ID_ARTICLE").getTable();
sel.addSelect(tableItemFact.getField("ID_ARTICLE"));
sel.addSelect(tableAlias.getField("ID_ARTICLE"));
 
final SQLSelectJoin joinFact = sel.addJoin("LEFT", tableItemFact.getField("ID_" + eltFact.getTable().getName()));
final SQLSelectJoin joinFact = sel.addJoin("LEFT", tableAlias.getField("ID_" + eltFact.getTable().getName()));
 
Where wA = new Where(tableArt.getKey(), "=", tableItemFact.getField("ID_ARTICLE"));
Where wA = new Where(tableArt.getKey(), "=", tableAlias.getField("ID_ARTICLE"));
Where w = new Where(joinFact.getJoinedTable().getField("DATE"), this.du, this.au);
 
if (idS != null && idS.size() > 0) {
108,7 → 110,7
}
sel.setWhere(wA.and(w));
 
sel.addGroupBy(tableItemFact.getField("ID_ARTICLE"));
sel.addGroupBy(tableAlias.getField("ID_ARTICLE"));
 
List<Object[]> result = eltFact.getTable().getDBSystemRoot().getDataSource().executeA(sel.asString());