This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit 2d2c8a4284257e4fe073f1ee15e8e7049ed3e8b5 Author: dcosse <cosse@codelutin.com> Date: Wed Sep 9 15:47:01 2015 +0200 refs #1241 ordonne les entrée par date --- .../main/java/org/chorem/lima/entity/EntryTopiaDao.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java b/lima-business/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java index 4c44ba6..158e5a6 100644 --- a/lima-business/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java +++ b/lima-business/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java @@ -68,7 +68,8 @@ public class EntryTopiaDao extends AbstractEntryTopiaDao<Entry> { HqlAndParametersBuilder<Entry> builder = getEquilibredTransactionQuery(beginDate, endDate); builder.addEquals(Entry.PROPERTY_ACCOUNT, account); - builder.setOrderByArguments(Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_TRANSACTION_DATE); + builder.setOrderByArguments(PROPERTY_TRANSACTION_DATE, Entry.PROPERTY_FINANCIAL_TRANSACTION); + List<Entry> entries = findAll(builder.getHql(), builder.getHqlParameters()); return entries; @@ -111,8 +112,7 @@ public class EntryTopiaDao extends AbstractEntryTopiaDao<Entry> { HqlAndParametersBuilder<Entry> builder = getEquilibredTransactionQuery(beginDate, endDate); builder.addEquals(PROPERTY_ENTRY_BOOK, entryBook); - builder.setOrderByArguments(PROPERTY_TRANSACTION_DATE, - Entry.PROPERTY_FINANCIAL_TRANSACTION + "." + FinancialTransaction.PROPERTY_TOPIA_ID); + builder.setOrderByArguments(PROPERTY_TRANSACTION_DATE, Entry.PROPERTY_FINANCIAL_TRANSACTION); List<Entry> entries = findAll(builder.getHql(), builder.getHqlParameters()); return entries; @@ -225,6 +225,8 @@ public class EntryTopiaDao extends AbstractEntryTopiaDao<Entry> { "OR " + alias + "." + Entry.PROPERTY_LETTERING + " != ''"); } + builder.setOrderByArguments(PROPERTY_TRANSACTION_DATE, Entry.PROPERTY_FINANCIAL_TRANSACTION); + List<Entry> entries = findAll(builder.getHql(), builder.getHqlParameters()); return entries; @@ -278,6 +280,7 @@ public class EntryTopiaDao extends AbstractEntryTopiaDao<Entry> { builder.addGreaterOrEquals(PROPERTY_TRANSACTION_DATE, beginDate); builder.addLowerOrEquals(PROPERTY_TRANSACTION_DATE, endDate); builder.addEquals(PROPERTY_ENTRY_BOOK, entryBook); + builder.setOrderByArguments(PROPERTY_TRANSACTION_DATE, Entry.PROPERTY_FINANCIAL_TRANSACTION); List<Entry> result = findAll(builder.getHql(), builder.getHqlParameters()); return result; @@ -301,7 +304,8 @@ public class EntryTopiaDao extends AbstractEntryTopiaDao<Entry> { "OR " + Entry.PROPERTY_VOUCHER + " = null " + "OR " + Entry.PROPERTY_VOUCHER + " = ''" + "OR " + Entry.PROPERTY_DESCRIPTION + " = null " + - "OR " + Entry.PROPERTY_DESCRIPTION + " = ''" ); + "OR " + Entry.PROPERTY_DESCRIPTION + " = ''"); + builder.setOrderByArguments(PROPERTY_TRANSACTION_DATE, Entry.PROPERTY_FINANCIAL_TRANSACTION); List<Entry> entries = findAll(builder.getHql(), builder.getHqlParameters()); @@ -324,7 +328,8 @@ public class EntryTopiaDao extends AbstractEntryTopiaDao<Entry> { "OR " + Entry.PROPERTY_VOUCHER + " = null " + "OR " + Entry.PROPERTY_VOUCHER + " = ''" + "OR " + Entry.PROPERTY_DESCRIPTION + " = null " + - "OR " + Entry.PROPERTY_DESCRIPTION + " = ''" ); + "OR " + Entry.PROPERTY_DESCRIPTION + " = ''"); + builder.setOrderByArguments(PROPERTY_TRANSACTION_DATE, Entry.PROPERTY_FINANCIAL_TRANSACTION); List<Entry> entries = findAll(builder.getHql(), builder.getHqlParameters()); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.