Author: mallon Date: 2012-08-14 15:54:14 +0200 (Tue, 14 Aug 2012) New Revision: 3607 Url: http://chorem.org/repositories/revision/lima/3607 Log: refs #768 Correction sur la methode permettant le report a nouveau et la cloture de la periode fiscal selectionnee - Reste a voir de maniere plus precise les regles concernant le report a nouveau Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-08-14 13:05:05 UTC (rev 3606) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-08-14 13:54:14 UTC (rev 3607) @@ -302,19 +302,6 @@ } } - //if entrybook isn't found - //then create it - if (!found) { - entryBookService.createEntryBook(entryBook); - entryBooksList = entryBookService.getAllEntryBooks(); - for (EntryBook entry : entryBooksList) { - if (!found && entry.getCode().equals(entryBook.getCode())) { - entryBook = entry; - found = true; - } - } - } - //Sets accounts, check if they exist, if not create them //-> 8 COMPTES SPECIAUX // -> 89 BILAN Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-08-14 13:05:05 UTC (rev 3606) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-08-14 13:54:14 UTC (rev 3607) @@ -229,7 +229,6 @@ _("lima.ui.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); - //ask user for the entrybook to use for retained earnings if (answerRetainedEarnings == JOptionPane.YES_OPTION) { retainedEarnings = true;