Author: dcosse Date: 2014-07-23 16:52:58 +0200 (Wed, 23 Jul 2014) New Revision: 3859 Url: http://forge.chorem.org/projects/lima/repository/revisions/3859 Log: refs #1032 fix import export for entries Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/NewImportService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewImportServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewImportServiceImpl.java 2014-07-23 14:27:23 UTC (rev 3858) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewImportServiceImpl.java 2014-07-23 14:52:58 UTC (rev 3859) @@ -193,11 +193,11 @@ } @Override - public void importAllAsCSV(String entryBooks, String financialTransactions, String fiscalPeriods, String entries, String accounts){ + public void importAllAsCSV(String entryBooks, String financialTransactions, String fiscalPeriods, String accounts, String entries){ importEntryBooksAsCSV(entryBooks); importFinancialTransactionsAsCSV(financialTransactions); importFiscalPeriodsAsCSV(fiscalPeriods); + importAccountAsCSV(accounts); importEntriesAsCSV(entries); - importAccountAsCSV(accounts); } } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/NewImportService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/NewImportService.java 2014-07-23 14:27:23 UTC (rev 3858) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/NewImportService.java 2014-07-23 14:52:58 UTC (rev 3859) @@ -37,5 +37,5 @@ void importEntriesAsCSV(String contents); - void importAllAsCSV(String entryBooks, String transactions, String fiscalPeriods, String entries, String accounts); + void importAllAsCSV(String entryBooks, String transactions, String fiscalPeriods, String accounts, String entries); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2014-07-23 14:27:23 UTC (rev 3858) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2014-07-23 14:52:58 UTC (rev 3859) @@ -65,24 +65,24 @@ <JMenu text="lima.ui.importexport.import" actionIcon='import-element'> <JMenuItem text="lima.ui.importexport.all" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ALL_IMPORT)'/> + <JMenuItem text="lima.ui.importexport.entrybooks" + onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ENTRYBOOKS_IMPORT)'/> <JMenuItem text="lima.ui.importexport.accountcharts" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ACCOUNTCHARTS_IMPORT)'/> - <JMenuItem text="lima.ui.importexport.entrybooks" - onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ENTRYBOOKS_IMPORT)'/> + <JMenuItem text="lima.ui.importexport.financialtransactions" + onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ENTRIES_IMPORT)'/> <JMenuItem text="lima.ui.importexport.financialstatements" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_FINANCIALSTATEMENTS_IMPORT)'/> <JMenuItem text="lima.ui.importexport.vatstatements" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_VAT_IMPORT)'/> - <JMenuItem text="lima.ui.importexport.financialtransactions" - onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ENTRIES_IMPORT)'/> </JMenu> <JMenu text="lima.ui.importexport.export" actionIcon='export-element'> <JMenuItem text="lima.ui.importexport.all" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ALL_EXPORT)'/> + <JMenuItem text="lima.ui.importexport.entrybooks" + onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ENTRYBOOKS_EXPORT)'/> <JMenuItem text="lima.ui.importexport.accountcharts" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ACCOUNTCHARTS_EXPORT)'/> - <JMenuItem text="lima.ui.importexport.entrybooks" - onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ENTRYBOOKS_EXPORT)'/> <JMenuItem text="lima.ui.importexport.financialstatements" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_FINANCIALSTATEMENTS_EXPORT)'/> <JMenuItem text="lima.ui.importexport.vatstatements" @@ -91,20 +91,20 @@ </JMenu> <JMenu text="lima.ui.importexport.ebp"> <JMenu text="lima.ui.importexport.import" actionIcon='import-element'> + <JMenuItem text="lima.ui.importexport.entrybooks" + onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ENTRYBOOKS_IMPORT)'/> <JMenuItem text="lima.ui.importexport.accountcharts" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ACCOUNTCHARTS_IMPORT)'/> <JMenuItem text="lima.ui.importexport.entries" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ENTRIES_IMPORT)'/> - <JMenuItem text="lima.ui.importexport.entrybooks" - onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ENTRYBOOKS_IMPORT)'/> </JMenu> <JMenu text="lima.ui.importexport.export" actionIcon='export-element'> + <JMenuItem text="lima.ui.importexport.entrybooks" + onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ENTRYBOOKS_EXPORT)'/> <JMenuItem text="lima.ui.importexport.accountcharts" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ACCOUNTCHARTS_EXPORT)'/> <JMenuItem text="lima.ui.importexport.entries" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ENTRIES_EXPORT)'/> - <JMenuItem text="lima.ui.importexport.entrybooks" - onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.EBP_ENTRYBOOKS_EXPORT)'/> </JMenu> </JMenu> <JSeparator/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-07-23 14:27:23 UTC (rev 3858) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-07-23 14:52:58 UTC (rev 3859) @@ -472,16 +472,16 @@ String fiscalPeriodsStreamString = IOUtils.toString(fiscalPeriodsStream); IOUtils.closeQuietly(fiscalPeriodsStream); + accountsStream = new FileInputStream(tmpDir + "accounts.csv"); + String accountsStreamString = IOUtils.toString(accountsStream); + IOUtils.closeQuietly(accountsStream); + entriesStream = new FileInputStream(tmpDir + "entries.csv"); String entriesStreamString = IOUtils.toString(entriesStream); IOUtils.closeQuietly(entriesStream); - accountsStream = new FileInputStream(tmpDir + "accounts.csv"); - String accountsStreamString = IOUtils.toString(accountsStream); - IOUtils.closeQuietly(accountsStream); + newImportService.importAllAsCSV(entryBooksStreamString, transactionsStreamString, fiscalPeriodsStreamString, accountsStreamString, entriesStreamString); - newImportService.importAllAsCSV(entryBooksStreamString, transactionsStreamString, fiscalPeriodsStreamString, entriesStreamString, accountsStreamString); - } catch (Exception ex) { if(log.isInfoEnabled()) { log.info(ex);