branch develop updated (4fa9916 -> 30a62a3)
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 4fa9916 refs #1233 : fix test and update log new 30a62a3 fixes #1235 : fix import plan BCR (and journaux) 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 30a62a36f4b8ab1f9af308dcfa7e919d50b8affb Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Jun 4 14:23:13 2015 +0200 fixes #1235 : fix import plan BCR (and journaux) Summary of changes: .../main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java | 6 +++++- .../java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java | 6 ++++-- .../financialstatementchart/FinancialStatementChartViewHandler.java | 2 +- 3 files changed, 10 insertions(+), 4 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 30a62a36f4b8ab1f9af308dcfa7e919d50b8affb Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Jun 4 14:23:13 2015 +0200 fixes #1235 : fix import plan BCR (and journaux) --- .../main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java | 6 +++++- .../java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java | 6 ++++-- .../financialstatementchart/FinancialStatementChartViewHandler.java | 2 +- 3 files changed, 10 insertions(+), 4 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 b0d92fb..15b5628 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 @@ -522,7 +522,11 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ // in case it exist (not ordered import and previously created) values are bind to the previously created one excepted // the sub financial statements Binder<FinancialStatement, FinancialStatement> rootBinder = BinderFactory.newBinder(FinancialStatement.class, FinancialStatement.class); - rootBinder.copyExcluding(financialStatement, rootFinancialStatement, FinancialStatement.PROPERTY_SUB_FINANCIAL_STATEMENTS); + rootBinder.copyExcluding(financialStatement, rootFinancialStatement, + FinancialStatement.PROPERTY_SUB_FINANCIAL_STATEMENTS, + FinancialStatement.PROPERTY_TOPIA_ID, + FinancialStatement.PROPERTY_TOPIA_VERSION, + FinancialStatement.PROPERTY_TOPIA_CREATE_DATE); } return rootFinancialStatement; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java index a9cf069..89f8b88 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java @@ -33,6 +33,7 @@ import org.chorem.lima.business.exceptions.AlreadyExistEntryBookException; import org.chorem.lima.business.exceptions.UsedEntryBookException; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryBookImpl; +import org.chorem.lima.enums.EntryBooksChartEnum; import org.chorem.lima.enums.ImportExportEnum; import org.chorem.lima.ui.importexport.ImportExport; import org.chorem.lima.util.ErrorHelper; @@ -287,12 +288,13 @@ public class EntryBookViewHandler implements ServiceListener { form.setVisible(true); Object value = form.getButtonGroup().getSelectedValue(); + EntryBooksChartEnum entryBooksChartEnum = (EntryBooksChartEnum) value; // if action confirmed - if (value != null) { + if (entryBooksChartEnum != null) { ImportExport importExport = new ImportExport(view); importExport.importExport(ImportExportEnum.CSV_ENTRYBOOKS_IMPORT, - null, null, true); + null, entryBooksChartEnum.getDefaultFileURL(), true); } } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java index 3fb4314..2bb773a 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java @@ -391,7 +391,7 @@ public class FinancialStatementChartViewHandler implements ServiceListener { (FinancialStatementsChartEnum) value; ImportExport importExport = new ImportExport(view); importExport.importExport(ImportExportEnum.CSV_FINANCIALSTATEMENTS_IMPORT, - null, null, true); + null, financialStatementsEnum.getDefaultFileUrl(), true); FinancialStatementChartTreeTableModel treeTableModel = (FinancialStatementChartTreeTableModel) view.getTreeTable().getTreeTableModel(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm