Author: echatellier Date: 2012-05-30 16:06:48 +0200 (Wed, 30 May 2012) New Revision: 3434 Url: http://chorem.org/repositories/revision/lima/3434 Log: Fix queries Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-05-30 14:01:56 UTC (rev 3433) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-05-30 14:06:48 UTC (rev 3434) @@ -109,9 +109,9 @@ Date endDate) throws TopiaException { String query = getEquilibredTransactionQuery(beginDate, endDate) + // concerne le compte - " AND E.entryBook = :entryBook" + + " AND E = :entryBook" + // fix order - " ORDER BY, E.financialTransaction.beginDate, E.financialTransaction.topiaId"; + " ORDER BY E.financialTransaction.transactionDate, E.financialTransaction.topiaId"; List<Entry> entries = context.find(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); @@ -133,7 +133,7 @@ String query = "SELECT E.debit, sum(E.amount) " + getEquilibredTransactionQuery(beginDate, endDate) + // concerne le compte - " AND E.entryBook = :entryBook" + + " AND E = :entryBook" + " GROUP BY E.debit"; List<Object[]> result = context.find(query, "beginDate", beginDate,