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 9fd0c2f2e7e59bd6050d4c95059d57b6e5df31a4 Author: dcosse <cosse@codelutin.com> Date: Fri Sep 18 10:33:19 2015 +0200 refs #1297correction pour ne pas remonter les entitées ayant une date > à celle indiquée dans la période --- .../org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java b/lima-business/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java index 6abae2d..cdae5fa 100644 --- a/lima-business/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java +++ b/lima-business/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java @@ -83,7 +83,7 @@ public class ClosedPeriodicEntryBookTopiaDao extends AbstractClosedPeriodicEntry HqlAndParametersBuilder<ClosedPeriodicEntryBook> builder = newHqlAndParametersBuilder(); builder.addGreaterOrEquals(PROPERTY_BEGIN_DATE, beginDate); - builder.addGreaterOrEquals(PROPERTY_END_DATE, endDate); + builder.addLowerOrEquals(PROPERTY_END_DATE, endDate); builder.setOrderByArguments(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK + "." + EntryBook.PROPERTY_CODE); List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = findAll(builder.getHql(), builder.getHqlParameters()); @@ -104,7 +104,7 @@ public class ClosedPeriodicEntryBookTopiaDao extends AbstractClosedPeriodicEntry HqlAndParametersBuilder<ClosedPeriodicEntryBook> builder = newHqlAndParametersBuilder(); builder.addGreaterOrEquals(PROPERTY_BEGIN_DATE, beginDate); - builder.addGreaterOrEquals(PROPERTY_END_DATE, endDate); + builder.addLowerOrEquals(PROPERTY_END_DATE, endDate); builder.addEquals(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK, entryBook); List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = findAll(builder.getHql(), builder.getHqlParameters()); @@ -125,7 +125,7 @@ public class ClosedPeriodicEntryBookTopiaDao extends AbstractClosedPeriodicEntry HqlAndParametersBuilder<ClosedPeriodicEntryBook> builder = newHqlAndParametersBuilder(); builder.addGreaterOrEquals(PROPERTY_BEGIN_DATE, beginDate); - builder.addGreaterOrEquals(PROPERTY_END_DATE, endDate); + builder.addLowerOrEquals(PROPERTY_END_DATE, endDate); builder.addEquals(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK, entryBook); builder.addEquals(ClosedPeriodicEntryBook.PROPERTY_LOCKED, true); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.