Author: echatellier Date: 2012-08-20 13:59:56 +0200 (Mon, 20 Aug 2012) New Revision: 3614 Url: http://chorem.org/repositories/revision/lima/3614 Log: Corection de la mise ?\195?\160 jour de la liste des periodes comptables apr?\195?\168s fermeture. Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialPeriodService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2012-08-20 11:38:22 UTC (rev 3613) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2012-08-20 11:59:56 UTC (rev 3614) @@ -153,9 +153,10 @@ } @Override - public void blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException { + public ClosedPeriodicEntryBook blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException { AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + ClosedPeriodicEntryBook result = null; try { // check rules before create the account accountingRules.blockClosedPeriodicEntryBookRules(closedPeriodicEntryBook); @@ -164,16 +165,17 @@ getDaoHelper().getClosedPeriodicEntryBookDAO(); // reload object in current transaction - ClosedPeriodicEntryBook closedPeriodicEntryBook2 = - closedPeriodicEntryBookDAO.findByTopiaId( + result = closedPeriodicEntryBookDAO.findByTopiaId( closedPeriodicEntryBook.getTopiaId()); - closedPeriodicEntryBook2.setLocked(true); - closedPeriodicEntryBookDAO.update(closedPeriodicEntryBook2); + result.setLocked(true); + result = closedPeriodicEntryBookDAO.update(result); } catch (TopiaException ex) { throw new LimaException("Can't block period", ex); } + + return result; } @Override Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2012-08-20 11:38:22 UTC (rev 3613) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2012-08-20 11:59:56 UTC (rev 3614) @@ -1124,9 +1124,8 @@ .findByEntryBookAndFinancialPeriod(entryBook, financialPeriod); try { - financialPeriodService - .blockClosedPeriodicEntryBook( - closedPeriodicEntryBook); + closedPeriodicEntryBook = financialPeriodService + .blockClosedPeriodicEntryBook(closedPeriodicEntryBook); result.append(_("lima-business.import.closedperiodicentrybookupdated", beginDateFinancialPeriod, endDateFinancialPeriod, codeEntryBook)); } catch (LimaException eee) { Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2012-08-20 11:38:22 UTC (rev 3613) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2012-08-20 11:59:56 UTC (rev 3614) @@ -68,7 +68,7 @@ // block it Assert.assertFalse(closedPeriodic.isLocked()); - financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodic); + closedPeriodic = financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodic); // check it's blocked context = getTestContext().beginTransaction(); Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialPeriodService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialPeriodService.java 2012-08-20 11:38:22 UTC (rev 3613) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialPeriodService.java 2012-08-20 11:59:56 UTC (rev 3614) @@ -55,7 +55,7 @@ List<ClosedPeriodicEntryBook> getAllClosedPeriodicEntryBooksFromUnblockedFiscalPeriod() throws LimaException; - void blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException; + ClosedPeriodicEntryBook blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException; List<FinancialPeriod> getAllFinancialPeriods() throws LimaException; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2012-08-20 11:38:22 UTC (rev 3613) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2012-08-20 11:59:56 UTC (rev 3614) @@ -118,11 +118,16 @@ return currentRow; } + public void setElementAt(int row, ClosedPeriodicEntryBook closedPeriodicEntryBook) { + closedPeriodicEntryBooks.set(row, closedPeriodicEntryBook); + fireTableRowsUpdated(row, row); + } + @Override public Object getValueAt(int rowIndex, int columnIndex) { Object result = null; - ClosedPeriodicEntryBook closedPeriodicEntryBook = closedPeriodicEntryBooks.get(rowIndex); + ClosedPeriodicEntryBook closedPeriodicEntryBook = getElementAt(rowIndex); switch (columnIndex) { case 0: @@ -147,11 +152,4 @@ return result; } - - /*public void blockFinancialPeriod(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException { - financialPeriodService. - blockClosedPeriodicEntryBook(closedPeriodicEntryBook); - refresh(); - }*/ - } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2012-08-20 11:38:22 UTC (rev 3613) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2012-08-20 11:59:56 UTC (rev 3614) @@ -100,8 +100,8 @@ JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (response == JOptionPane.YES_OPTION) { - financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodicEntryBook); - model.fireTableRowsUpdated(selectedRow, selectedRow); + closedPeriodicEntryBook = financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodicEntryBook); + model.setElementAt(selectedRow, closedPeriodicEntryBook); } }