Author: sbavencoff Date: 2014-07-18 17:52:47 +0200 (Fri, 18 Jul 2014) New Revision: 3854 Url: http://forge.chorem.org/projects/lima/repository/revisions/3854 Log: refs #1044 : fiscal period Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.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 2014-07-18 15:33:15 UTC (rev 3853) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2014-07-18 15:52:47 UTC (rev 3854) @@ -111,9 +111,6 @@ MoreOneUnlockFiscalPeriodException { FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); - FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodDao(); - - ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookDao(); EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookDao(); AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); @@ -224,7 +221,7 @@ // Get the old fiscal period instance for no object conflict FiscalPeriod oldFiscalPeriod = - fiscalPeriodTopiaDao.findByTopiaId(fiscalPeriod.getTopiaId()); + fiscalPeriodTopiaDao.forTopiaIdEquals(fiscalPeriod.getTopiaId()).findUnique(); // lock fiscalperiod oldFiscalPeriod.setLocked(true); @@ -245,19 +242,13 @@ financialTransactionService.getAllFinancialTransactions( fiscalPeriod.getBeginDate(), fiscalPeriod.getEndDate()); //check if they are at least one transaction to be report - if (!financialTransactionsList.isEmpty()) { - int i = 0; - while (i < financialTransactionsList.size() && !found) { - Collection<Entry> entryList = financialTransactionsList.get(i).getEntry(); - for (Entry entry : entryList) { - if (entry.getAccount() != null) { - if (Integer.valueOf(entry.getAccount().getAccountNumber().substring(0, 1)) < 6 - && !entry.getAmount().equals(BigDecimal.ZERO)) { - found = true; - } - } + for (FinancialTransaction financialTransaction : financialTransactionsList) { + for (Entry entry : financialTransaction.getEntry()) { + if (Integer.valueOf(entry.getAccount().getAccountNumber().substring(0, 1)) < 6 + && !entry.getAmount().equals(BigDecimal.ZERO)) { + found = true; + return found; } - i++; } } return found; @@ -269,7 +260,7 @@ FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); String topiaId = fiscalPeriod.getTopiaId(); - FiscalPeriod fiscalPeriodOld = fiscalPeriodTopiaDao.findByTopiaId(topiaId); + FiscalPeriod fiscalPeriodOld = fiscalPeriodTopiaDao.forTopiaIdEquals(topiaId).findUnique(); Date endDate = fiscalPeriod.getEndDate(); fiscalPeriodOld.setEndDate(endDate); @@ -461,7 +452,7 @@ FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); // re-attach entities to current session - FiscalPeriod localFiscalPeriod = fiscalPeriodTopiaDao.findByTopiaId(fiscalPeriod.getTopiaId()); + FiscalPeriod localFiscalPeriod = fiscalPeriodTopiaDao.forTopiaIdEquals(fiscalPeriod.getTopiaId()).findUnique(); //check rules accountingRules.deleteFiscalPeriodRules(localFiscalPeriod);