Author: mallon Date: 2012-07-12 19:05:02 +0200 (Thu, 12 Jul 2012) New Revision: 3522 Url: http://chorem.org/repositories/revision/lima/3522 Log: fixes #693 Correction de la requete de selection des comptes. Desormais, toutes les entrees se trouvant dans un compte debutant par le meme numero que celui selectionne sont affichees. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.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-07-12 15:31:00 UTC (rev 3521) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-12 17:05:02 UTC (rev 3522) @@ -191,7 +191,7 @@ String query = "Select E from " + Entry.class.getName() + " E, " + FinancialTransaction.class.getName() + " F" + " where E.financialTransaction = F" + - " and E.account = :account "; + " and E.account.accountNumber like :account "; if (filter.getDisplayLettered() || filter.getDisplayUnlettred()){ if (filter.getDisplayUnlettred()){ @@ -206,7 +206,7 @@ " and E.financialTransaction.transactionDate between :beginDate and :endDate " + " order by F.transactionDate, F." + FinancialTransaction.TOPIA_CREATE_DATE; - entries = context.findAll(query, "account", filter.getAccount(), "beginDate", filter.getFiscalDateFilter().getDateStart(), "endDate", filter.getFiscalDateFilter().getDateEnd()); + entries = context.findAll(query, "account", filter.getAccount().getAccountNumber() + "%", "beginDate", filter.getFiscalDateFilter().getDateStart(), "endDate", filter.getFiscalDateFilter().getDateEnd()); return entries; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2012-07-12 15:31:00 UTC (rev 3521) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2012-07-12 17:05:02 UTC (rev 3522) @@ -65,5 +65,11 @@ //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); + } + + @Override + public void changeSelection(int rowIndex , int columnIndex, boolean bascule, boolean extend) { + } + }