This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit 56d83059fed1161c50f5444cc5ae799d2984baba Merge: 1d60b71 47e387f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Jun 3 11:06:46 2015 +0200 Merge branch 'feature/1233' into develop .../chorem/lima/business/api/AccountService.java | 5 +- .../lima/business/api/FinancialPeriodService.java | 4 - .../business/api/FinancialTransactionService.java | 6 +- .../lima/business/api/FiscalPeriodService.java | 12 - .../org/chorem/lima/business/AccountingRules.java | 33 +- .../accountingrules/DefaultAccountingRules.java | 151 ++--- .../accountingrules/FranceAccountingRules.java | 3 +- .../lima/business/ejb/AccountServiceImpl.java | 7 +- .../lima/business/ejb/ExportServiceImpl.java | 2 +- .../business/ejb/FinancialPeriodServiceImpl.java | 18 - .../ejb/FinancialTransactionServiceImpl.java | 19 +- .../lima/business/ejb/FiscalPeriodServiceImpl.java | 38 +- .../lima/business/ejb/ImportServiceImpl.java | 14 +- .../lima/entity/FinancialPeriodTopiaDao.java | 14 - .../chorem/lima/entity/FiscalPeriodTopiaDao.java | 24 - .../org/chorem/lima/business/AbstractLimaTest.java | 575 ++----------------- .../lima/business/AccountServiceImplTest.java | 332 ++++++++--- .../lima/business/EntryBookServiceImplTest.java | 148 ++++- .../business/FinancialPeriodServiceImplTest.java | 260 ++++++++- .../FinancialTransactionServiceImplTest.java | 635 ++++++++++++++++++++- .../lima/business/FiscalPeriodServiceImplTest.java | 220 ++++++- .../lima/business/ImportExportServiceTest.java | 31 +- .../lima/business/ReportServiceImplTest.java | 5 +- .../lima/entity/FinancialTransactionDAOTest.java | 5 +- .../chorem/lima/ui/account/AccountViewHandler.java | 12 +- .../ui/common/FinancialTransactionTableModel.java | 6 +- .../FinancialTransactionViewHandler.java | 17 + .../resources/i18n/lima-swing_en_GB.properties | 3 + .../resources/i18n/lima-swing_fr_FR.properties | 4 +- 29 files changed, 1661 insertions(+), 942 deletions(-) diff --cc lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java index f8dc1da,78c2c3a..33098a5 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java @@@ -34,9 -34,10 +34,11 @@@ import org.chorem.lima.business.api.Fin import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.business.api.FiscalPeriodService; import org.chorem.lima.business.api.ReportService; + import org.chorem.lima.business.exceptions.AfterLastFiscalPeriodException; import org.chorem.lima.business.exceptions.AlreadyExistAccountException; +import org.chorem.lima.business.exceptions.AlreadyExistEntryBookException; import org.chorem.lima.business.exceptions.AlreadyLockedFiscalPeriodException; + import org.chorem.lima.business.exceptions.BeforeFirstFiscalPeriodException; import org.chorem.lima.business.exceptions.BeginAfterEndFiscalPeriodException; import org.chorem.lima.business.exceptions.InvalidAccountNumberException; import org.chorem.lima.business.exceptions.LastUnlockedFiscalPeriodException; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.