branch develop updated (3a5bac7 -> 1e945cc)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from 3a5bac7 fixes #1162: order fiscal periods by date on export to allow correct imports new 1e945cc refs #1162: Add all import results if there are no error The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1e945cc6e329db8d7533b636cf453e00ce620d4d Author: dcosse <japbiw74> Date: Mon Feb 2 12:29:25 2015 +0100 refs #1162: Add all import results if there are no error Summary of changes: .../java/org/chorem/lima/business/ejb/ImportServiceImpl.java | 10 +++++----- .../java/org/chorem/lima/business/ImportExportServiceTest.java | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 1e945cc6e329db8d7533b636cf453e00ce620d4d Author: dcosse <japbiw74> Date: Mon Feb 2 12:29:25 2015 +0100 refs #1162: Add all import results if there are no error --- .../java/org/chorem/lima/business/ejb/ImportServiceImpl.java | 10 +++++----- .../java/org/chorem/lima/business/ImportExportServiceTest.java | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java index 49bf6bd..5cdd6fa 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java @@ -730,32 +730,32 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ } ImportExportResults subReport = importEntryBooksAsCSV(entryBooks); + globalResult.pushImportResults(subReport); if (subReport.isErrors()){ - globalResult.pushImportResults(subReport); return globalResult; } subReport = importFiscalPeriodsAsCSV(fiscalPeriods); + globalResult.pushImportResults(subReport); if (subReport.isErrors()){ - globalResult.pushImportResults(subReport); return globalResult; } subReport = importFinancialTransactionsAsCSV(financialTransactions); + globalResult.pushImportResults(subReport); if (subReport.isErrors()){ - globalResult.pushImportResults(subReport); return globalResult; } subReport = importEntriesAsCSV(entries); + globalResult.pushImportResults(subReport); if (subReport.isErrors()){ - globalResult.pushImportResults(subReport); return globalResult; } subReport = importIdentityAsCSV(identity); + globalResult.pushImportResults(subReport); if (subReport.isErrors()){ - globalResult.pushImportResults(subReport); return globalResult; } diff --git a/lima-business/src/test/java/org/chorem/lima/business/ImportExportServiceTest.java b/lima-business/src/test/java/org/chorem/lima/business/ImportExportServiceTest.java index ef4f45f..92d6e08 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/ImportExportServiceTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/ImportExportServiceTest.java @@ -271,6 +271,7 @@ public class ImportExportServiceTest extends AbstractLimaTest { String[] imported = {"accounts", "entryBooks", "fiscalPeriod", "financialTransactions", "entries", "identity"}; Assert.assertEquals(6, importResults.size()); + for (int i = 0; i < importResults.size(); i++) { ImportResult importResult = importResults.get(i); log.info(imported[i] +": created:"+importResult.getNbCreated() + " updated:" + importResult.getNbUpdated() + " ignoded:" + importResult.getNbIgnored()); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm