Author: mallon Date: 2012-08-09 17:08:53 +0200 (Thu, 09 Aug 2012) New Revision: 3595 Url: http://chorem.org/repositories/revision/lima/3595 Log: fixes #751 Correction concernant le setter de la date de fin, permettant de selectionner l unique date. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-08-09 14:19:55 UTC (rev 3594) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-08-09 15:08:53 UTC (rev 3595) @@ -288,8 +288,8 @@ Date beginDate = financialTransactionSearch.getBeginDate(); Date endDate = financialTransactionSearch.getEndDate(); if (beginDate != null && endDate != null) { - query += " AND :beginDate <= T.transactionDate" + - " AND T.transactionDate <= :endDate"; + query += " AND (:beginDate <= T.transactionDate" + + " AND T.transactionDate <= :endDate)"; args.add("beginDate"); args.add(beginDate); args.add("endDate"); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2012-08-09 14:19:55 UTC (rev 3594) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2012-08-09 15:08:53 UTC (rev 3595) @@ -76,7 +76,6 @@ } }; handler.setBeginDate(datePicker.getDate()); - handler.setEndDate(null); handler.refresh(); datePicker.addActionListener(dateActionListener); removeAll();