This is an automated email from the git hooks/post-receive script. New commit to branch feature/1369-demarage-initial in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit c56887327963da702adef64eff7cba04dc17dc90 Merge: 9316918 5be94d4 Author: David Cossé <cosse@codelutin.com> Date: Thu Sep 8 17:16:53 2016 +0200 Merge branch 'feature/1174-Import_EBP_Transactions' into develop .../org/chorem/lima/business/ImportResult.java | 5 +- .../business/exceptions/UnexistingAccount.java | 26 ++++- .../org/chorem/lima/business/AccountingRules.java | 3 +- .../accountingrules/DefaultAccountingRules.java | 6 +- .../lima/business/ejb/AccountServiceImpl.java | 4 + .../lima/business/ejb/ImportServiceImpl.java | 23 +++-- .../resources/i18n/lima-business_en_GB.properties | 34 ++++--- .../resources/i18n/lima-business_fr_FR.properties | 51 +++++++--- .../org/chorem/lima/business/AbstractLimaTest.java | 110 ++++++++++++++++++--- .../lima/business/AccountServiceImplTest.java | 8 +- .../lima/business/EntryBookServiceImplTest.java | 6 +- .../business/FinancialPeriodServiceImplTest.java | 6 +- .../FinancialTransactionServiceImplTest.java | 6 +- .../lima/business/FiscalPeriodServiceImplTest.java | 4 +- .../lima/business/ImportExportServiceTest.java | 68 +++++++------ .../lima/business/ReportServiceImplTest.java | 8 +- .../lima/entity/FinancialTransactionDAOTest.java | 8 +- .../chorem/lima/ui/importexport/ImportExport.java | 6 +- .../resources/i18n/lima-swing_en_GB.properties | 3 + .../resources/i18n/lima-swing_fr_FR.properties | 3 + 20 files changed, 267 insertions(+), 121 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.