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 d3b231b33f897f9319f3ff31d9ea2c11033207fa Merge: 5c96a75 1e945cc Author: dcosse <japbiw74> Date: Mon Feb 9 09:33:30 2015 +0100 Merge remote-tracking branch 'origin/develop' into develop .../chorem/lima/business/ImportExportResults.java | 10 ++ .../lima/business/api/FiscalPeriodService.java | 53 +++++++- .../lima/business/ejb/ExportServiceImpl.java | 12 +- .../lima/business/ejb/FiscalPeriodServiceImpl.java | 15 ++- .../lima/business/ejb/ImportServiceImpl.java | 52 ++++++- .../lima/business/ImportExportServiceTest.java | 150 +++++++++++++++------ .../chorem/lima/entity/FiscalPeriodTopiaDao.java | 13 +- .../chorem/lima/ui/importexport/ImportExport.java | 8 +- 8 files changed, 250 insertions(+), 63 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.