This is an automated email from the git hooks/post-receive script. New commit to branch feature/1233 in repository lima. See http://git.chorem.org/lima.git commit 89b999b2b954938b4f59ee7ff461e7ef86c17d6f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Jun 2 08:56:32 2015 +0200 refs #1233 : test du service des périodes fiscales (suppresion des fonctions de service non utilisé) --- .../lima/business/api/FinancialPeriodService.java | 4 - .../business/ejb/FinancialPeriodServiceImpl.java | 18 -- .../lima/entity/FinancialPeriodTopiaDao.java | 14 -- .../org/chorem/lima/business/AbstractLimaTest.java | 71 +++--- .../business/FinancialPeriodServiceImplTest.java | 263 +++++++++++++++++++-- .../chorem/lima/ui/account/AccountViewHandler.java | 12 +- 6 files changed, 290 insertions(+), 92 deletions(-) diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialPeriodService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialPeriodService.java index 031192e..3b078dd 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialPeriodService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialPeriodService.java @@ -45,8 +45,6 @@ import java.util.List; public interface FinancialPeriodService { - List<FinancialPeriod> getUnblockedFinancialPeriods(); - ClosedPeriodicEntryBook getClosedPeriodicEntryBook(EntryBook entryBook, FinancialPeriod financialPeriod); @@ -62,6 +60,4 @@ public interface FinancialPeriodService { List<FinancialPeriod> getFinancialPeriods(Date beginDate, Date endDate); - - FinancialPeriod getFinancialPeriodByNaturalIds(Date beginDate, Date endDate); } diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java index 8e62747..cabbf73 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java @@ -62,16 +62,6 @@ public class FinancialPeriodServiceImpl extends AbstractLimaService implements F return result; } - /** @return all unblocked financial period */ - @Override - public List<FinancialPeriod> getUnblockedFinancialPeriods() { - - FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodDao(); - List<FinancialPeriod>result = financialPeriodTopiaDao.findAllUnlockedOrderByBeginDate(); - - return result; - } - /** @return all financial period from a fiscal period */ @Override public List<FinancialPeriod> getFinancialPeriods(Date beginDate, Date endDate) { @@ -82,14 +72,6 @@ public class FinancialPeriodServiceImpl extends AbstractLimaService implements F return result; } - public FinancialPeriod getFinancialPeriodByNaturalIds(Date beginDate, Date endDate) { - - FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodDao(); - FinancialPeriod result = financialPeriodTopiaDao.findByNaturalId(beginDate, endDate); - - return result; - } - @Override public ClosedPeriodicEntryBook blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws UnbalancedFinancialTransactionsException, UnfilledEntriesException, WithoutEntryBookFinancialTransactionsException, NotLockedClosedPeriodicEntryBooksException { AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); diff --git a/lima-business/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java b/lima-business/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java index 9582a70..e951ade 100644 --- a/lima-business/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java +++ b/lima-business/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java @@ -77,19 +77,5 @@ public class FinancialPeriodTopiaDao extends AbstractFinancialPeriodTopiaDao<Fin return financialPeriod; } - - /** - * Retourne toutes les periodes ordonnées par date de debut de periode. - * - * @return all period ordered - */ - public List<FinancialPeriod> findAllUnlockedOrderByBeginDate() { - - List<FinancialPeriod> financialPeriod = forLockedEquals(false) - .setOrderByArguments(FinancialPeriod.PROPERTY_BEGIN_DATE) - .findAll(); - - return financialPeriod; - } } diff --git a/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java b/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java index 210f6c4..6ddf862 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java @@ -65,6 +65,7 @@ import java.io.File; import java.io.IOException; import java.math.BigDecimal; import java.text.DateFormat; +import java.util.Date; import java.util.Locale; import java.util.Properties; import java.util.UUID; @@ -301,32 +302,48 @@ public abstract class AbstractLimaTest { */ protected void createFinancialTransaction() throws Exception { - Account accountVmpVae = accountService.getAccountByNumber("511"); - EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); - - FinancialTransaction transaction1 = new FinancialTransactionImpl(); - transaction1.setTransactionDate(df.parse("April 4, 2012")); - transaction1.setEntryBook(journalDesVentes); - transaction1 = financialTransactionService.createFinancialTransaction(transaction1); - - Entry tr1Entry1 = new EntryImpl(); - tr1Entry1.setAmount(BigDecimal.valueOf(42.0)); - tr1Entry1.setAccount(accountVmpVae); - tr1Entry1.setFinancialTransaction(transaction1); - tr1Entry1.setDescription("test desc"); - tr1Entry1.setVoucher("voucher"); - tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); - - Entry tr1Entry2 = new EntryImpl(); - tr1Entry2.setAmount(BigDecimal.valueOf(42.0)); - tr1Entry2.setDebit(true); - tr1Entry2.setAccount(accountVmpVae); - tr1Entry2.setFinancialTransaction(transaction1); - tr1Entry2.setDescription("test desc"); - tr1Entry2.setVoucher("voucher"); - tr1Entry2 = financialTransactionService.createEntry(tr1Entry2); - - transaction1.setEntry(Lists.newArrayList(tr1Entry1, tr1Entry2)); - financialTransactionService.updateFinancialTransaction(transaction1); + createFinancialTransaction("jdv", df.parse("April 4, 2012"), "511", "501", BigDecimal.valueOf(42.0)); } + + /** + * Create FinancialTransaction with 2 entries + * @throws Exception + */ + protected FinancialTransaction createFinancialTransaction(String entryBookCode, Date date, + String accountDebitNumber, String accountCreditNumber, + BigDecimal amount) throws Exception { + + EntryBook entryBook = entryBookService.getEntryBookByCode(entryBookCode); + Account accountDebit = accountService.getAccountByNumber(accountDebitNumber); + Account accountCredit = accountService.getAccountByNumber(accountCreditNumber); + + FinancialTransaction transaction = new FinancialTransactionImpl(); + transaction.setTransactionDate(date); + transaction.setEntryBook(entryBook); + transaction = financialTransactionService.createFinancialTransaction(transaction); + + Entry entry1 = new EntryImpl(); + entry1.setAmount(amount); + entry1.setDebit(true); + entry1.setAccount(accountDebit); + entry1.setFinancialTransaction(transaction); + entry1.setDescription("test desc"); + entry1.setVoucher("voucher"); + entry1 = financialTransactionService.createEntry(entry1); + + Entry entry2 = new EntryImpl(); + entry2.setAmount(amount); + entry2.setDebit(false); + entry2.setAccount(accountCredit); + entry2.setFinancialTransaction(transaction); + entry2.setDescription("test desc"); + entry2.setVoucher("voucher"); + entry2 = financialTransactionService.createEntry(entry2); + + transaction.setEntry(Lists.newArrayList(entry1, entry2)); + financialTransactionService.updateFinancialTransaction(transaction); + + return transaction; + } + } diff --git a/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java b/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java index e699b7c..5da0a81 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java @@ -22,12 +22,24 @@ package org.chorem.lima.business; +import org.chorem.lima.business.exceptions.NotLockedClosedPeriodicEntryBooksException; +import org.chorem.lima.business.exceptions.UnbalancedFinancialTransactionsException; +import org.chorem.lima.business.exceptions.UnfilledEntriesException; import org.chorem.lima.entity.ClosedPeriodicEntryBook; -import org.chorem.lima.entity.ClosedPeriodicEntryBookTopiaDao; -import org.chorem.lima.entity.LimaCallaoTopiaPersistenceContext; +import org.chorem.lima.entity.Entry; +import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.FinancialPeriod; +import org.chorem.lima.entity.FinancialTransaction; +import org.chorem.lima.entity.FiscalPeriod; +import org.chorem.lima.entity.FiscalPeriodImpl; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; +import org.nuiton.util.DateUtil; +import java.math.BigDecimal; +import java.text.ParseException; +import java.util.Iterator; import java.util.List; /** @@ -44,6 +56,54 @@ import java.util.List; */ public class FinancialPeriodServiceImplTest extends AbstractLimaTest { + @Before + public void initTest() throws Exception { + createAccounts(); + createEntryBooks(); + createFiscalPeriod(); + } + + @Test + public void getClosedPeriodicEntryBookTest() throws ParseException { + EntryBook entryBook = entryBookService.getEntryBookByCode("jdv"); + + List<FinancialPeriod> periods = financialPeriodService.getAllFinancialPeriods(); + + ClosedPeriodicEntryBook closedPeriodicEntryBook = financialPeriodService.getClosedPeriodicEntryBook(entryBook, periods.get(0)); + + Assert.assertNotNull(closedPeriodicEntryBook); + Assert.assertEquals(entryBook, closedPeriodicEntryBook.getEntryBook()); + Assert.assertEquals(periods.get(0), closedPeriodicEntryBook.getFinancialPeriod()); + Assert.assertFalse(closedPeriodicEntryBook.isLocked()); + } + + @Test + public void getAllClosedPeriodicEntryBooksFromUnblockedFiscalPeriodTest() throws Exception { + + List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = financialPeriodService.getAllClosedPeriodicEntryBooksFromUnblockedFiscalPeriod(); + + Assert.assertEquals(36, closedPeriodicEntryBooks.size()); + + // creation d'un exercice fiscal + FiscalPeriod fiscalPeriod = new FiscalPeriodImpl(); + fiscalPeriod.setBeginDate(df.parse("January 1, 2013")); + fiscalPeriod.setEndDate(df.parse("December 31, 2013")); + fiscalPeriodService.createFiscalPeriod(fiscalPeriod); + + closedPeriodicEntryBooks = financialPeriodService.getAllClosedPeriodicEntryBooksFromUnblockedFiscalPeriod(); + + Assert.assertEquals(72, closedPeriodicEntryBooks.size()); + + List<FiscalPeriod> fiscalPeriods = fiscalPeriodService.getAllFiscalPeriods(); + + fiscalPeriodService.blockFiscalPeriod(fiscalPeriods.get(0)); + + closedPeriodicEntryBooks = financialPeriodService.getAllClosedPeriodicEntryBooksFromUnblockedFiscalPeriod(); + + Assert.assertEquals(36, closedPeriodicEntryBooks.size()); + } + + /** * Test de la fermeture d'une periode comptable pour un journal donné. * @@ -51,28 +111,183 @@ public class FinancialPeriodServiceImplTest extends AbstractLimaTest { */ @Test public void blockClosedPeriodicEntryBookTest() throws Exception { - createAccounts(); - createEntryBooks(); - createFiscalPeriod(); - createFinancialTransaction(); - - // find one closed to close - LimaCallaoTopiaPersistenceContext tcontext = context.newPersistenceContext(); - ClosedPeriodicEntryBookTopiaDao dao = tcontext.getClosedPeriodicEntryBookDao(); - List<ClosedPeriodicEntryBook> closedPeriodics = dao.findAll(); - tcontext.close(); - ClosedPeriodicEntryBook closedPeriodic = closedPeriodics.get(0); - - // block it - Assert.assertFalse(closedPeriodic.isLocked()); - financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodic); - - // check it's blocked - tcontext = context.newPersistenceContext(); - dao = tcontext.getClosedPeriodicEntryBookDao(); - closedPeriodic = dao.findAll().get(0); - tcontext.close(); - Assert.assertFalse(closedPeriodic.isLocked()); + + EntryBook entryBook = entryBookService.getEntryBookByCode("jdv"); + + List<FinancialPeriod> periods = financialPeriodService.getAllFinancialPeriods(); + + ClosedPeriodicEntryBook closedPeriodicEntryBook = financialPeriodService.getClosedPeriodicEntryBook(entryBook, periods.get(0)); + + financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodicEntryBook); + + closedPeriodicEntryBook = financialPeriodService.getClosedPeriodicEntryBook(entryBook, periods.get(0)); + + Assert.assertTrue(closedPeriodicEntryBook.isLocked()); } + @Test(expected = UnbalancedFinancialTransactionsException.class) + public void blockClosedPeriodicEntryBookFailUnbalanceTest() throws Exception { + + FinancialTransaction transaction = createFinancialTransaction("jdv", df.parse("January 4, 2012"), "511", "501", BigDecimal.valueOf(42.0)); + + Entry entry = transaction.getEntry().iterator().next(); + entry.setAmount(BigDecimal.valueOf(12)); + + financialTransactionService.updateEntry(entry); + + EntryBook entryBook = entryBookService.getEntryBookByCode("jdv"); + + List<FinancialPeriod> periods = financialPeriodService.getAllFinancialPeriods(); + + ClosedPeriodicEntryBook closedPeriodicEntryBook = financialPeriodService.getClosedPeriodicEntryBook(entryBook, periods.get(0)); + + financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodicEntryBook); + } + + @Test(expected = UnfilledEntriesException.class) + public void blockClosedPeriodicEntryBookFailUnfilledEntriesTest() throws Exception { + + FinancialTransaction transaction = createFinancialTransaction("jdv", df.parse("January 4, 2012"), "511", "501", BigDecimal.valueOf(42.0)); + + Entry entry = transaction.getEntry().iterator().next(); + entry.setDescription(""); + + financialTransactionService.updateEntry(entry); + + EntryBook entryBook = entryBookService.getEntryBookByCode("jdv"); + + List<FinancialPeriod> periods = financialPeriodService.getAllFinancialPeriods(); + + ClosedPeriodicEntryBook closedPeriodicEntryBook = financialPeriodService.getClosedPeriodicEntryBook(entryBook, periods.get(0)); + + financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodicEntryBook); + } + + @Test(expected = Exception.class) + public void blockClosedPeriodicEntryBookFailNoEntryBoockTest() throws Exception { + + FinancialTransaction transaction = createFinancialTransaction("jdv", df.parse("January 4, 2012"), "511", "501", BigDecimal.valueOf(42.0)); + + transaction.setEntryBook(null); + + financialTransactionService.updateFinancialTransaction(transaction); + + EntryBook entryBook = entryBookService.getEntryBookByCode("jdv"); + + List<FinancialPeriod> periods = financialPeriodService.getAllFinancialPeriods(); + + ClosedPeriodicEntryBook closedPeriodicEntryBook = financialPeriodService.getClosedPeriodicEntryBook(entryBook, periods.get(0)); + + financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodicEntryBook); + } + + @Test(expected = NotLockedClosedPeriodicEntryBooksException.class) + public void blockClosedPeriodicEntryBookFailNoLockedPréviousTest() throws Exception { + + EntryBook entryBook = entryBookService.getEntryBookByCode("jdv"); + + List<FinancialPeriod> periods = financialPeriodService.getAllFinancialPeriods(); + + ClosedPeriodicEntryBook closedPeriodicEntryBook = financialPeriodService.getClosedPeriodicEntryBook(entryBook, periods.get(4)); + + financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodicEntryBook); + } + + @Test + public void getAllFinancialPeriodsTest() throws Exception { + + // creation d'un exercice fiscal + FiscalPeriod fiscalPeriod = new FiscalPeriodImpl(); + fiscalPeriod.setBeginDate(df.parse("January 1, 2013")); + fiscalPeriod.setEndDate(df.parse("December 31, 2013")); + fiscalPeriodService.createFiscalPeriod(fiscalPeriod); + + List<FiscalPeriod> fiscalPeriods = fiscalPeriodService.getAllFiscalPeriods(); + + fiscalPeriodService.blockFiscalPeriod(fiscalPeriods.get(0)); + + + List<FinancialPeriod> periods = financialPeriodService.getAllFinancialPeriods(); + + Assert.assertEquals(24, periods.size()); + + Iterator<FinancialPeriod> iterator = periods.iterator(); + + FinancialPeriod period; + period = iterator.next(); + Assert.assertEquals(df.parse("January 1, 2012"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("January 31, 2012")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("February 1, 2012"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("February 29, 2012")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("March 1, 2012"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("March 31, 2012")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("April 1, 2012"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("April 30, 2012")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("May 1, 2012"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("May 31, 2012")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("June 1, 2012"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("June 30, 2012")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("July 1, 2012"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("July 31, 2012")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("August 1, 2012"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("August 31, 2012")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("September 1, 2012"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("September 30, 2012")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("October 1, 2012"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("October 31, 2012")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("November 1, 2012"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("November 30, 2012")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("December 1, 2012"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("December 31, 2012")), period.getEndDate()); + + period = iterator.next(); + Assert.assertEquals(df.parse("January 1, 2013"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("January 31, 2013")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("February 1, 2013"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("February 28, 2013")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("March 1, 2013"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("March 31, 2013")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("April 1, 2013"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("April 30, 2013")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("May 1, 2013"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("May 31, 2013")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("June 1, 2013"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("June 30, 2013")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("July 1, 2013"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("July 31, 2013")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("August 1, 2013"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("August 31, 2013")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("September 1, 2013"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("September 30, 2013")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("October 1, 2013"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("October 31, 2013")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("November 1, 2013"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("November 30, 2013")), period.getEndDate()); + period = iterator.next(); + Assert.assertEquals(df.parse("December 1, 2013"), period.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(df.parse("December 31, 2013")), period.getEndDate()); + } + + } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java index d4e683f..9680deb 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java @@ -25,18 +25,17 @@ package org.chorem.lima.ui.account; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaSwingConfig; +import org.chorem.lima.business.LimaServiceFactory; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.ImportService; import org.chorem.lima.business.exceptions.AlreadyExistAccountException; import org.chorem.lima.business.exceptions.InvalidAccountNumberException; -import org.chorem.lima.business.exceptions.NotAllowedLabelException; import org.chorem.lima.business.exceptions.NotNumberAccountNumberException; import org.chorem.lima.business.exceptions.UsedAccountException; import org.chorem.lima.entity.Account; import org.chorem.lima.enums.AccountsChartEnum; import org.chorem.lima.enums.ImportExportEnum; -import org.chorem.lima.business.LimaServiceFactory; import org.chorem.lima.ui.importexport.ImportExport; import org.chorem.lima.util.ErrorHelper; import org.jdesktop.swingx.JXTreeTable; @@ -45,7 +44,12 @@ import org.jdesktop.swingx.treetable.DefaultTreeTableModel; import org.jdesktop.swingx.treetable.MutableTreeTableNode; import org.jdesktop.swingx.treetable.TreeTableNode; -import javax.swing.*; +import javax.swing.AbstractAction; +import javax.swing.ActionMap; +import javax.swing.InputMap; +import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.KeyStroke; import javax.swing.tree.TreePath; import java.awt.event.ActionEvent; import java.awt.event.InputEvent; @@ -284,8 +288,6 @@ public class AccountViewHandler implements ServiceListener { errorHelper.showErrorMessage(t("lima.account.add.error.InvalidAccountNumber", e.getAccountNumber())); } catch (NotNumberAccountNumberException e) { errorHelper.showErrorMessage(t("lima.account.error.notNumberAccountNumber", e.getAccountNumber())); - } catch (NotAllowedLabelException e) { - errorHelper.showErrorMessage(t("lima.error.notAllowedLabel", e.getLabel())); } finally { dialog.dispose(); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.