[Lima-commits] r3845 - in trunk: lima-business/src/main/java/org/chorem/lima/business lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/resources/i18n lima-business-api/src/main/java/org/chorem/lima/business lima-business-api/src/main/java/org/chorem/lima/business/api lima-swing/src/main/java/org/chorem/lima lima-swing/src/main/java/org/chorem/lima/ui/account lima-swing/src/main/resources/i18n

Author: sbavencoff Date: 2014-07-10 14:26:56 +0200 (Thu, 10 Jul 2014) New Revision: 3845 Url: http://forge.chorem.org/projects/lima/repository/revisions/3845 Log: fixes #557 : fix refactor exception Removed: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessException.java Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/AccountException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistAccountException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBookException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBooksException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/DateException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntriesException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryBookException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialTransactionsException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/FiscalPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportEbpException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/InvalidAccountNumberException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/LimaException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedEntryBookException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedFinancialPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/MoreOneUnlockFiscalPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/NoEmptyFiscalPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotLockedClosedPeriodicEntryBooksException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnfilledEntriesException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedAccountException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedEntryBookException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/WithoutEntryBookFinancialTransactionsException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/AccountService.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties trunk/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Deleted: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessException.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -1,61 +0,0 @@ -/* - * #%L - * Lima business - * - * $Id: LimaBusinessException.java 3290 2011-09-17 12:55:34Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.business; - -/** - * Lima business exception throw by a business service method - * that cannot execute successfully. - * - * @author chatellier - * @version $Revision: 3290 $ - * <p/> - * Last update : $Date: 2011-09-17 14:55:34 +0200 (sam. 17 sept. 2011) $ - * By : $Author: tchemit $ - */ -public class LimaBusinessException extends LimaException { - - /** serialVersionUID. */ - private static final long serialVersionUID = -6876236663940184462L; - - /** - * Constructs a new exception with the specified detail message. - * - * @param message message - */ - public LimaBusinessException(String message) { - super(message); - } - - /** - * Constructs a new exception with the specified detail message and cause. - * - * @param message message - * @param cause cause - */ - public LimaBusinessException(String message, Throwable cause) { - super(message, cause); - } -} Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -96,7 +96,7 @@ // Check if the numberaccount is not blank if (StringUtils.isBlank(account.getAccountNumber())) { - throw new InvalidAccountNumberException(account.getAccountNumber(), "lima-business.defaultaccountingrules.invalidaccountnumber"); + throw new InvalidAccountNumberException(account.getAccountNumber()); } } @@ -104,7 +104,7 @@ public void updateAccountRules(Account account) throws InvalidAccountNumberException { // Check if the numberaccount is not blank if (StringUtils.isBlank(account.getAccountNumber())) { - throw new InvalidAccountNumberException(account.getAccountNumber(), "lima-business.defaultaccountingrules.invalidaccountnumber"); + throw new InvalidAccountNumberException(account.getAccountNumber()); } } @@ -143,7 +143,7 @@ EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); // Check if account have entries if (entryTopiaDao.forAccountEquals(account).exists()) { - throw new UsedAccountException(account.getAccountNumber(), "lima-business.defaultaccountingrules.deleteaccounterror"); + throw new UsedAccountException(account.getAccountNumber()); } } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -82,7 +82,7 @@ // Check root account starts with 1 to 8 if (accountNumber.length() >= 1 && !accountNumber.substring(0, 1).matches("[1-8]")) { - throw new InvalidAccountNumberException(account.getAccountNumber(), "lima-business.franceaccountingrules.accountstartnumbererror"); + throw new InvalidAccountNumberException(account.getAccountNumber()); } } @@ -95,12 +95,12 @@ // Check if the number account is type numeric if (!StringUtils.isNumeric(account.getAccountNumber())) { - throw new InvalidAccountNumberException(account.getAccountNumber(), "lima-business.franceaccountingrules.accountnumbernotnumeric"); + throw new InvalidAccountNumberException(account.getAccountNumber()); } // Check root account starts with 1 to 8 if (accountNumber.length() >= 1 && !accountNumber.substring(0, 1).matches("[1-8]")) { - throw new InvalidAccountNumberException(account.getAccountNumber(), "lima-business.franceaccountingrules.accountstartnumbererror"); + throw new InvalidAccountNumberException(account.getAccountNumber()); } } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -26,7 +26,6 @@ package org.chorem.lima.business.ejb; import org.apache.commons.lang.StringUtils; -import org.chorem.lima.business.AccountException; import org.chorem.lima.business.AccountingRules; import org.chorem.lima.business.AlreadyExistAccountException; import org.chorem.lima.business.InvalidAccountNumberException; @@ -76,7 +75,7 @@ * @throws LimaException */ @Override - public Account createAccount(Account account) throws AccountException { + public Account createAccount(Account account) throws AlreadyExistAccountException, InvalidAccountNumberException { // check rules before create the account AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); @@ -89,7 +88,7 @@ AccountTopiaDao AccountTopiaDao = getDaoHelper().getAccountDao(); if (AccountTopiaDao.existByNaturalId(account.getAccountNumber())) { - throw new AlreadyExistAccountException(account.getAccountNumber(), "lima-business.account.accountalreardyexist"); + throw new AlreadyExistAccountException(account.getAccountNumber()); } //create it 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-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -29,10 +29,11 @@ import org.apache.commons.lang3.time.DateUtils; import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.ReportsDatas; -import org.chorem.lima.business.AccountException; import org.chorem.lima.business.AccountingRules; +import org.chorem.lima.business.AlreadyExistAccountException; import org.chorem.lima.business.AlreadyLockedFiscalPeriodException; import org.chorem.lima.business.BeginAfterEndFiscalPeriodException; +import org.chorem.lima.business.InvalidAccountNumberException; import org.chorem.lima.business.LastUnlockedFiscalPeriodException; import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LockedEntryBookException; @@ -281,12 +282,13 @@ @Override public FiscalPeriod retainedEarningsAndBlockFiscalPeriod(FiscalPeriod fiscalPeriod, EntryBook entryBook, boolean retainedEarnings) - throws AccountException, - LockedFinancialPeriodException, + throws LockedFinancialPeriodException, LockedEntryBookException, NoFoundFinancialPeriodException, LastUnlockedFiscalPeriodException, - AlreadyLockedFiscalPeriodException { + AlreadyLockedFiscalPeriodException, + AlreadyExistAccountException, + InvalidAccountNumberException { if (entryBook != null && retainedEarnings) { 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 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -50,9 +50,10 @@ import org.chorem.lima.beans.FinancialTransactionImportImpl; import org.chorem.lima.beans.VatStatementImport; import org.chorem.lima.beans.VatStatementImportImpl; -import org.chorem.lima.business.AccountException; +import org.chorem.lima.business.AlreadyExistAccountException; import org.chorem.lima.business.BeginAfterEndFiscalPeriodException; import org.chorem.lima.business.ImportEbpException; +import org.chorem.lima.business.InvalidAccountNumberException; import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LockedEntryBookException; import org.chorem.lima.business.LockedFinancialPeriodException; @@ -329,29 +330,42 @@ "lima-business.import.entrybooknotexist", entryBook)); } + try { - // create transaction - if (financialTransaction == null - || !(dateEcr.equals(financialTransaction - .getTransactionDate()) && entryBook - .getCode().equals( - financialTransaction.getEntryBook() - .getCode()))) { - // create financial transaction - financialTransaction = new FinancialTransactionImpl(); - financialTransaction.setEntryBook(entryBook); - financialTransaction.setTransactionDate(dateEcr); - financialTransaction = financialTransactionService - .createFinancialTransaction(financialTransaction); - result.append(t( - "lima-business.import.transactionadded", dateEcr, - entryBook.getCode())); + // create transaction + if (financialTransaction == null + || !(dateEcr.equals(financialTransaction + .getTransactionDate()) && entryBook + .getCode().equals( + financialTransaction.getEntryBook() + .getCode()))) { + // create financial transaction + financialTransaction = new FinancialTransactionImpl(); + financialTransaction.setEntryBook(entryBook); + financialTransaction.setTransactionDate(dateEcr); + financialTransaction = financialTransactionService + .createFinancialTransaction(financialTransaction); + result.append(t( + "lima-business.import.transactionadded", dateEcr, + entryBook.getCode())); + } + // Inside the db, the entries reference the financialTransaction + entry.setFinancialTransaction(financialTransaction); + entry = financialTransactionService.createEntry(entry); + result.append(t("lima-business.import.entryadded", + entry.getDescription(), entry.getAmount())); + + } catch (LockedFinancialPeriodException e) { + result.append(t("lima-business.import.entries.error.lockedFinancialPeriod", + e.getFinancialPeriod().getBeginDate(), + e.getFinancialPeriod().getEndDate())); + } catch (LockedEntryBookException e) { + result.append(t("lima-business.import.entries.error.lockedEntryBook", + e.getClosedPeriodicEntryBook().getEntryBook().getCode(), + e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), + e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), + e.getClosedPeriodicEntryBook().getFinancialPeriod().getEndDate())); } - // Inside the db, the entries reference the financialTransaction - entry.setFinancialTransaction(financialTransaction); - entry = financialTransactionService.createEntry(entry); - result.append(t("lima-business.import.entryadded", - entry.getDescription(), entry.getAmount())); } } @@ -365,10 +379,6 @@ throw new ImportEbpException("Can't import ", e); } catch (IOException e) { throw new ImportEbpException("Can't import ", e); - } catch (LockedFinancialPeriodException e) { - throw new ImportEbpException("Can't import " + t("lima-business.import.FinancialTransaction.error.LockedFinancialPeriod")); - } catch (LockedEntryBookException e) { - throw new ImportEbpException("Can't import " + t("lima-business.import.FinancialTransaction.error.LockedEntryBook")); } finally { if (csvReader != null) { try { @@ -422,10 +432,18 @@ account = new AccountImpl(); account.setAccountNumber(accountNumber); account.setLabel(label); - accountService.createAccount(account); - result.append(t("lima-business.import.accountadded", - accountNumber, label)); - nbAccountCreated++; + try { + accountService.createAccount(account); + result.append(t("lima-business.import.account.added", + accountNumber, label)); + nbAccountCreated++; + } catch (AlreadyExistAccountException e) { + result.append(t("lima-business.import.account.alreadyExist", + accountNumber, label)); + } catch (InvalidAccountNumberException e) { + result.append(t("lima-business.import.account.InvalidAccountNumber", + accountNumber, label)); + } } line = csvReader.readNext(); } @@ -440,8 +458,6 @@ + (after - before) + " ms"); } - } catch (AccountException e) { - throw new ImportEbpException("Can't import", e); } catch (IOException e) { throw new ImportEbpException("Can't import", e); } finally { @@ -826,8 +842,10 @@ try { accountService.createAccount(account); - } catch (AccountException e) { - result.append(t("lima-business.import.accountalreadyexist", accountNumber)); + } catch (AlreadyExistAccountException e) { + result.append(t("lima-business.import.account.alreadyexist", accountNumber)); + } catch (InvalidAccountNumberException e) { + result.append(t("lima-business.import.account.InvalidAccountNumber", accountNumber)); } result.append(t("lima-business.import.accountadded", account.getAccountNumber(), Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2014-07-10 12:26:56 UTC (rev 3845) @@ -90,12 +90,21 @@ lima-business.import.FiscalPeriod.error.beginAfterEndFiscalPeriod= lima-business.import.FiscalPeriod.error.moreOneUnlockFiscalPeriod= lima-business.import.FiscalPeriod.error.notBeginNextDayOfLastFiscalPeriod= +lima-business.import.account.InvalidAccountNumber= +lima-business.import.account.added= +lima-business.import.account.alreadyExist= +lima-business.import.account.alreadyexist= +lima-business.import.accountInvalidAccountNumber= lima-business.import.accountadded=SUCCES \: Account %s - %s added\n lima-business.import.accountalreadyexist=FAILED \: Account %s already exist \n lima-business.import.closedperiodicentrybookupdated=SUCCESS \: The blockClosedPeriodicEntryBook %s - %s - %s is updated \! \n lima-business.import.ebpmissingaccount=FAILED \: Account %s already exist, import aborted. \nCreate all accounts before import entries. lima-business.import.ebpnoentry=FAILED \: This file contains no entries. lima-business.import.ebpnoheader=FAILED \: This file has no header datas. +lima-business.import.entries.error.FinancialPeriod= +lima-business.import.entries.error.LockedEntryBook= +lima-business.import.entries.error.lockedEntryBook= +lima-business.import.entries.error.lockedFinancialPeriod= lima-business.import.entriesoutofdatesrange=WARNING \: %s entries is out of range of opened fiscal periods. Entry was skip \!\n lima-business.import.entryadded=SUCCES \: Entry %s %s added\n" lima-business.import.entrybookalreadyexist=FAILED \: The entrybook %s already exists \!\n Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2014-07-10 12:26:56 UTC (rev 3845) @@ -87,6 +87,10 @@ lima-business.import.FiscalPeriod.error.beginAfterEndFiscalPeriod=La date de début doit être avant la date de fin lima-business.import.FiscalPeriod.error.moreOneUnlockFiscalPeriod=Seul deux exercices non clôturés sont autorisés lima-business.import.FiscalPeriod.error.notBeginNextDayOfLastFiscalPeriod=la date de début doit suivre la date de fin du précédent exercice +lima-business.import.account.InvalidAccountNumber=Le numéro de compt %1$s n'est pas valide\n +lima-business.import.account.added=Succès \: Compte %s - %s ajouté\n +lima-business.import.account.alreadyExist=Le compte %1$s - existe déjà \n +lima-business.import.account.alreadyexist= lima-business.import.accountadded=Succès \: Compte %s - %s ajouté\n lima-business.import.accountalreadyexist=Échec \: Le compte %s existe déjà \n lima-business.import.closedPeriodicEntryBook.error.NotLockedPreviousEntryBook=Les périodes financières précédentes pour ce journal doivent être bloquées avant @@ -97,6 +101,8 @@ lima-business.import.ebpmissingaccount=Échec \: Compte %s inexistant. \nImportation annulée. \nCréer tous les comptes avant d'importer les écritures. lima-business.import.ebpnoentry=Échec \: Ce fichier ne contient aucune entrée. lima-business.import.ebpnoheader=Échec \: Ce fichier ne contient aucun entête. +lima-business.import.entries.error.lockedEntryBook= +lima-business.import.entries.error.lockedFinancialPeriod= lima-business.import.entriesoutofdatesrange=Attention \: Cette entrée %s ne fait partie d'aucune période ouverte. Entrée non importée \!\n lima-business.import.entryadded=Succès \: Entrée %s %s ajoutée \n lima-business.import.entrybookalreadyexist=Échec \: Le journal %s exist déjà \!\n Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/AccountException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/AccountException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/AccountException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -29,13 +29,12 @@ protected String accountNumber; - public AccountException(String accountNumber, String message) { - super(message); + public AccountException(String accountNumber) { this.accountNumber = accountNumber; } - public AccountException(String accountNumber, String message, Throwable cause) { - super(message, cause); + public AccountException(String accountNumber, Throwable cause) { + super(cause); this.accountNumber = accountNumber; } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistAccountException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistAccountException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistAccountException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -26,11 +26,12 @@ * @author Sylvain Bavencoff <bavencoff@codelutin.com> */ public class AlreadyExistAccountException extends AccountException { - public AlreadyExistAccountException(String accountNumber, String message) { - super(accountNumber, message); + + public AlreadyExistAccountException(String accountNumber) { + super(accountNumber); } - public AlreadyExistAccountException(String accountNumber, String message, Throwable cause) { - super(accountNumber, message, cause); + public AlreadyExistAccountException(String accountNumber, Throwable cause) { + super(accountNumber, cause); } } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBookException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBookException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBookException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -31,21 +31,12 @@ protected ClosedPeriodicEntryBook closedPeriodicEntryBook; - public ClosedPeriodicEntryBookException(String message) { - super(message); - } - - public ClosedPeriodicEntryBookException(String message, Throwable cause) { - super(message, cause); - } - - public ClosedPeriodicEntryBookException(ClosedPeriodicEntryBook closedPeriodicEntryBook, String message) { - super(message); + public ClosedPeriodicEntryBookException(ClosedPeriodicEntryBook closedPeriodicEntryBook) { this.closedPeriodicEntryBook = closedPeriodicEntryBook; } - public ClosedPeriodicEntryBookException(ClosedPeriodicEntryBook closedPeriodicEntryBook, String message, Throwable cause) { - super(message, cause); + public ClosedPeriodicEntryBookException(ClosedPeriodicEntryBook closedPeriodicEntryBook, Throwable cause) { + super(cause); this.closedPeriodicEntryBook = closedPeriodicEntryBook; } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBooksException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBooksException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBooksException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -12,12 +12,11 @@ protected Collection<ClosedPeriodicEntryBook> closedPeriodicEntryBooks; public ClosedPeriodicEntryBooksException(Collection<ClosedPeriodicEntryBook> closedPeriodicEntryBooks) { - super(""); this.closedPeriodicEntryBooks = closedPeriodicEntryBooks; } public ClosedPeriodicEntryBooksException(Collection<ClosedPeriodicEntryBook> closedPeriodicEntryBooks, Throwable cause) { - super("", cause); + super(cause); this.closedPeriodicEntryBooks = closedPeriodicEntryBooks; } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/DateException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/DateException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/DateException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -10,12 +10,11 @@ protected Date date; public DateException(Date date) { - super(""); this.date = date; } public DateException(Date date, Throwable cause) { - super("", cause); + super(cause); this.date = date; } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntriesException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntriesException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntriesException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -12,12 +12,11 @@ protected Collection<Entry> entries; public EntriesException(Collection<Entry> entries) { - super(""); this.entries = entries; } public EntriesException(Collection<Entry> entries, Throwable cause) { - super("", cause); + super(cause); this.entries = entries; } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryBookException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryBookException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryBookException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -31,13 +31,12 @@ protected EntryBook entryBook; - public EntryBookException(EntryBook entryBook, String message) { - super(message); + public EntryBookException(EntryBook entryBook) { this.entryBook = entryBook; } - public EntryBookException(EntryBook entryBook, String message, Throwable cause) { - super(message, cause); + public EntryBookException(EntryBook entryBook, Throwable cause) { + super(cause); this.entryBook = entryBook; } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialPeriodException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialPeriodException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialPeriodException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -10,12 +10,11 @@ protected FinancialPeriod financialPeriod; public FinancialPeriodException(FinancialPeriod financialPeriod) { - super(""); this.financialPeriod = financialPeriod; } public FinancialPeriodException(FinancialPeriod financialPeriod, Throwable cause) { - super("", cause); + super(cause); this.financialPeriod = financialPeriod; } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialTransactionsException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialTransactionsException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialTransactionsException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -12,12 +12,11 @@ protected Collection<FinancialTransaction> financialTransactions; public FinancialTransactionsException(Collection<FinancialTransaction> financialTransactions) { - super(""); this.financialTransactions = financialTransactions; } public FinancialTransactionsException(Collection<FinancialTransaction> financialTransactions, Throwable cause) { - super("", cause); + super(cause); this.financialTransactions = financialTransactions; } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/FiscalPeriodException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/FiscalPeriodException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/FiscalPeriodException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -32,12 +32,11 @@ protected FiscalPeriod fiscalPeriod; public FiscalPeriodException(FiscalPeriod fiscalPeriod) { - super(""); this.fiscalPeriod = fiscalPeriod; } public FiscalPeriodException(FiscalPeriod fiscalPeriod, Throwable cause) { - super("", cause); + super(cause); this.fiscalPeriod = fiscalPeriod; } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportEbpException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportEbpException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportEbpException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -25,7 +25,8 @@ /** * @author Sylvain Bavencoff <bavencoff@codelutin.com> */ -public class ImportEbpException extends LimaException { +public class ImportEbpException extends Exception { + public ImportEbpException(String message) { super(message); } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/InvalidAccountNumberException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/InvalidAccountNumberException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/InvalidAccountNumberException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -26,11 +26,12 @@ * @author Sylvain Bavencoff <bavencoff@codelutin.com> */ public class InvalidAccountNumberException extends AccountException { - public InvalidAccountNumberException(String accountNumber, String message) { - super(accountNumber, message); + + public InvalidAccountNumberException(String accountNumber) { + super(accountNumber); } - public InvalidAccountNumberException(String accountNumber, String message, Throwable cause) { - super(accountNumber, message, cause); + public InvalidAccountNumberException(String accountNumber, Throwable cause) { + super(accountNumber, cause); } } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/LimaException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/LimaException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/LimaException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -37,7 +37,7 @@ * By : $Author$ */ @ApplicationException -public class LimaException extends Exception { +public abstract class LimaException extends Exception { /** * serialVersionUID. @@ -45,21 +45,19 @@ private static final long serialVersionUID = -6876236663940184462L; /** - * Constructs a new exception with the specified detail message. + * Constructs a new exception * - * @param message message */ - public LimaException(String message) { - super(message); + public LimaException() { + super(); } /** - * Constructs a new exception with the specified detail message and cause. + * Constructs a new exception with the specified cause. * - * @param message message * @param cause cause */ - public LimaException(String message, Throwable cause) { - super(message, cause); + public LimaException(Throwable cause) { + super(cause); } } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedEntryBookException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedEntryBookException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedEntryBookException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -8,10 +8,10 @@ public class LockedEntryBookException extends ClosedPeriodicEntryBookException { public LockedEntryBookException(ClosedPeriodicEntryBook closedPeriodicEntryBook) { - super(closedPeriodicEntryBook, ""); + super(closedPeriodicEntryBook); } public LockedEntryBookException(ClosedPeriodicEntryBook closedPeriodicEntryBook, Throwable cause) { - super(closedPeriodicEntryBook, "", cause); + super(closedPeriodicEntryBook, cause); } } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedFinancialPeriodException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedFinancialPeriodException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedFinancialPeriodException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -6,6 +6,7 @@ * @author Sylvain Bavencoff <bavencoff@codelutin.com> */ public class LockedFinancialPeriodException extends FinancialPeriodException{ + public LockedFinancialPeriodException(FinancialPeriod financialPeriod) { super(financialPeriod); } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/MoreOneUnlockFiscalPeriodException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/MoreOneUnlockFiscalPeriodException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/MoreOneUnlockFiscalPeriodException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -8,12 +8,11 @@ int countUnlockFiscalPeriod; public MoreOneUnlockFiscalPeriodException(int countUnlockFiscalPeriod) { - super(""); this.countUnlockFiscalPeriod = countUnlockFiscalPeriod; } public MoreOneUnlockFiscalPeriodException(int countUnlockFiscalPeriod, Throwable cause) { - super("", cause); + super(cause); this.countUnlockFiscalPeriod = countUnlockFiscalPeriod; } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/NoEmptyFiscalPeriodException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/NoEmptyFiscalPeriodException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/NoEmptyFiscalPeriodException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -8,6 +8,7 @@ * @author Sylvain Bavencoff <bavencoff@codelutin.com> */ public class NoEmptyFiscalPeriodException extends FinancialTransactionsException { + public NoEmptyFiscalPeriodException(Collection<FinancialTransaction> financialTransactions) { super(financialTransactions); } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotLockedClosedPeriodicEntryBooksException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotLockedClosedPeriodicEntryBooksException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotLockedClosedPeriodicEntryBooksException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -8,6 +8,7 @@ * @author Sylvain Bavencoff <bavencoff@codelutin.com> */ public class NotLockedClosedPeriodicEntryBooksException extends ClosedPeriodicEntryBooksException { + public NotLockedClosedPeriodicEntryBooksException(Collection<ClosedPeriodicEntryBook> closedPeriodicEntryBooks) { super(closedPeriodicEntryBooks); } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnfilledEntriesException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnfilledEntriesException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnfilledEntriesException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -8,6 +8,7 @@ * @author Sylvain Bavencoff <bavencoff@codelutin.com> */ public class UnfilledEntriesException extends EntriesException { + public UnfilledEntriesException(Collection<Entry> entries) { super(entries); } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedAccountException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedAccountException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedAccountException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -26,11 +26,12 @@ * @author Sylvain Bavencoff <bavencoff@codelutin.com> */ public class UsedAccountException extends AccountException { - public UsedAccountException(String accountNumber, String message) { - super(accountNumber, message); + + public UsedAccountException(String accountNumber) { + super(accountNumber); } - public UsedAccountException(String accountNumber, String message, Throwable cause) { - super(accountNumber, message, cause); + public UsedAccountException(String accountNumber, Throwable cause) { + super(accountNumber, cause); } } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedEntryBookException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedEntryBookException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedEntryBookException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -30,10 +30,10 @@ public class UsedEntryBookException extends EntryBookException { public UsedEntryBookException(EntryBook entryBook) { - super(entryBook, ""); + super(entryBook); } public UsedEntryBookException(EntryBook entryBook, Throwable cause) { - super(entryBook, "", cause); + super(entryBook, cause); } } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/WithoutEntryBookFinancialTransactionsException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/WithoutEntryBookFinancialTransactionsException.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/WithoutEntryBookFinancialTransactionsException.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -8,6 +8,7 @@ * @author Sylvain Bavencoff <bavencoff@codelutin.com> */ public class WithoutEntryBookFinancialTransactionsException extends FinancialTransactionsException { + public WithoutEntryBookFinancialTransactionsException(Collection<FinancialTransaction> financialTransactions) { super(financialTransactions); } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/AccountService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/AccountService.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/AccountService.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -25,7 +25,7 @@ package org.chorem.lima.business.api; -import org.chorem.lima.business.AccountException; +import org.chorem.lima.business.AlreadyExistAccountException; import org.chorem.lima.business.InvalidAccountNumberException; import org.chorem.lima.business.LimaException; import org.chorem.lima.business.UsedAccountException; @@ -93,7 +93,7 @@ * @param account account * @throws LimaException */ - Account createAccount(Account account) throws AccountException; + Account createAccount(Account account) throws AlreadyExistAccountException, InvalidAccountNumberException; Account updateAccount(Account account) throws InvalidAccountNumberException; Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -25,9 +25,10 @@ package org.chorem.lima.business.api; -import org.chorem.lima.business.AccountException; +import org.chorem.lima.business.AlreadyExistAccountException; import org.chorem.lima.business.AlreadyLockedFiscalPeriodException; import org.chorem.lima.business.BeginAfterEndFiscalPeriodException; +import org.chorem.lima.business.InvalidAccountNumberException; import org.chorem.lima.business.LastUnlockedFiscalPeriodException; import org.chorem.lima.business.LockedEntryBookException; import org.chorem.lima.business.LockedFinancialPeriodException; @@ -79,7 +80,13 @@ * */ FiscalPeriod retainedEarningsAndBlockFiscalPeriod(FiscalPeriod fiscalPeriod, EntryBook entryBook, boolean retainedEarnings) - throws AccountException, LockedFinancialPeriodException, LockedEntryBookException, NoFoundFinancialPeriodException, LastUnlockedFiscalPeriodException, AlreadyLockedFiscalPeriodException; + throws LockedFinancialPeriodException, + LockedEntryBookException, + NoFoundFinancialPeriodException, + LastUnlockedFiscalPeriodException, + AlreadyLockedFiscalPeriodException, + AlreadyExistAccountException, + InvalidAccountNumberException; /** * Test if we have retained earnings on a fiscal period Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaExceptionHandler.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -25,13 +25,8 @@ package org.chorem.lima; -import static org.nuiton.i18n.I18n.t; - -import javax.swing.JOptionPane; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.LimaBusinessException; import org.chorem.lima.util.ErrorHelper; /** @@ -64,18 +59,8 @@ log.error("Global application exception", ex); } - Throwable cause = ex; - while (cause != null && !(cause instanceof LimaBusinessException)) { - cause = cause.getCause(); - } - - if (cause instanceof LimaBusinessException) { - JOptionPane.showMessageDialog(null, cause.getMessage(), - t("lima.ui.common.error"), JOptionPane.ERROR_MESSAGE); - } else { - ErrorHelper errorHelper = new ErrorHelper(LimaConfig.getInstance()); - errorHelper.showErrorDialog(null, ex.getMessage(), ex); - } + ErrorHelper errorHelper = new ErrorHelper(LimaConfig.getInstance()); + errorHelper.showErrorDialog(null, ex.getMessage(), ex); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2014-07-10 12:26:56 UTC (rev 3845) @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaConfig; -import org.chorem.lima.business.AccountException; +import org.chorem.lima.business.AlreadyExistAccountException; import org.chorem.lima.business.InvalidAccountNumberException; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.UsedAccountException; @@ -46,7 +46,12 @@ 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; @@ -271,8 +276,10 @@ model.insertNodeInto(newNode, node, node.getChildCount()); treeTable.expandPath(new TreePath(model.getPathToRoot(node))); - } catch (AccountException e) { - errorHelper.showErrorMessage(t(e.getMessage())); + } catch (AlreadyExistAccountException e) { + errorHelper.showErrorMessage(t("lima.ui.account.add.error.alreadyExist", e.getAccountNumber())); + } catch (InvalidAccountNumberException e) { + errorHelper.showErrorMessage(t("lima.ui.account.add.error.InvalidAccountNumber", e.getAccountNumber())); } finally { dialog.dispose(); } @@ -378,7 +385,7 @@ model.valueForPathChanged(treePath, account); } catch (InvalidAccountNumberException e) { - errorHelper.showErrorMessage(t(e.getMessage())); + errorHelper.showErrorMessage(t("lima.ui.account.update.error.invalidAccountNumber", e.getAccountNumber())); } finally { // close dialog dialog.dispose(); @@ -417,7 +424,7 @@ // remove node model.removeNodeFromParent(lastNode); } catch (UsedAccountException e) { - errorHelper.showErrorMessage(t(e.getMessage())); + errorHelper.showErrorMessage(t("lima.ui.account.remove.error.usedAccount", e.getAccountNumber())); } } } Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-07-10 12:26:56 UTC (rev 3845) @@ -337,6 +337,8 @@ lima.tooltip.Filter= lima.tooltip.filter=<html>Regular expression \:<br/>- accounts interval i..j <br/>- accounts list i,j,k <br/>- Exclude an account -i</html> lima.tooltip.lettering=<html>Add a letter on many entries <br/>Select many rows with combination ctrl + click</html> +lima.ui.account.add.error.InvalidAccountNumber= +lima.ui.account.add.error.alreadyExist= lima.ui.account.addaccount= lima.ui.account.addaccounttitle= lima.ui.account.base= @@ -346,9 +348,11 @@ lima.ui.account.importtitle= lima.ui.account.label= lima.ui.account.number= +lima.ui.account.remove.error.usedAccount= lima.ui.account.removeaccountconfirm= lima.ui.account.removeaccounttitle= lima.ui.account.shortened= +lima.ui.account.update.error.invalidAccountNumber= lima.ui.account.updateaccounttitle= lima.ui.common.amountcredit= lima.ui.common.amountdebit= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-07-10 09:15:31 UTC (rev 3844) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-07-10 12:26:56 UTC (rev 3845) @@ -319,6 +319,8 @@ lima.tooltip.Filter= lima.tooltip.filter=<html>Expression régulière \:<br/>- intervalle de compte i..j <br/>- liste de compte i,j,k <br/>- Exclure un compte -i</html> lima.tooltip.lettering=<html>Pour ajouter une lettre à plusieurs écritures <br/>Sélectionner plusieurs lignes avec la combinaison ctrl + click</html> +lima.ui.account.add.error.InvalidAccountNumber=Le numéro du compt %1$s n'est pas valide +lima.ui.account.add.error.alreadyExist=Le compt %1$s existe déjà lima.ui.account.addaccount=Nouveau compte lima.ui.account.addaccounttitle=Ajout d'un compte lima.ui.account.base=Plan comptable de base @@ -328,9 +330,11 @@ lima.ui.account.importtitle=Importer lima.ui.account.label=Libellé lima.ui.account.number=Numéro de compte +lima.ui.account.remove.error.usedAccount=Il exist des transactions sur ce compte lima.ui.account.removeaccountconfirm=Voulez-vous supprimer le compte %s ? lima.ui.account.removeaccounttitle=Suppression d'un compte lima.ui.account.shortened=Plan comptable abrégé +lima.ui.account.update.error.invalidAccountNumber=Le numéro du compt %1$s n'est pas valide lima.ui.account.updateaccounttitle=Modification d'un compte lima.ui.common.amountcredit=Total Crédit lima.ui.common.amountdebit=Total Débit