branch develop updated (100cba76 -> 33c58bac)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git from 100cba76 [jgitflow-maven-plugin]updating poms for 0.8.8-SNAPSHOT development new f5ca99b5 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 75be3c38 [jgitflow-maven-plugin]updating poms for branch'release/0.8.7' with non-snapshot versions new cc5dfe95 [jgitflow-maven-plugin]merging 'release/0.8.7' into 'master' new a6a55521 [jgitflow-maven-plugin]merging 'master' into 'develop' new 33c58bac [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 33c58bac655fcdfae4be7cbe6a40811c67fbe4cb Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 27 10:24:22 2017 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit a6a55521abe42d7b37da86c424897766913d6a80 Merge: f5ca99b5 cc5dfe95 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 27 10:24:22 2017 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit f5ca99b591dc2e5a05f823eebc4352cc2ddcfd77 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 27 10:24:22 2017 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit cc5dfe95b9c023877304474f80fd12cac9f35653 Merge: 0c63042f 75be3c38 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 27 10:24:20 2017 +0200 [jgitflow-maven-plugin]merging 'release/0.8.7' into 'master' commit 75be3c388ac64fddbfff540826c54185c77ca25f Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 27 10:21:56 2017 +0200 [jgitflow-maven-plugin]updating poms for branch'release/0.8.7' with non-snapshot versions Summary of changes: -- 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 https://gitlab.nuiton.org/chorem/lima.git commit 75be3c388ac64fddbfff540826c54185c77ca25f Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 27 10:21:56 2017 +0200 [jgitflow-maven-plugin]updating poms for branch'release/0.8.7' with non-snapshot versions --- lima-business-api/pom.xml | 2 +- lima-business/pom.xml | 2 +- lima-callao/pom.xml | 2 +- lima-report/pom.xml | 2 +- lima-server/pom.xml | 2 +- lima-swing/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lima-business-api/pom.xml b/lima-business-api/pom.xml index 6c1889c8..176a6571 100644 --- a/lima-business-api/pom.xml +++ b/lima-business-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.7-SNAPSHOT</version> + <version>0.8.7</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-business/pom.xml b/lima-business/pom.xml index ea0a2e07..7a5eea2d 100644 --- a/lima-business/pom.xml +++ b/lima-business/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.7-SNAPSHOT</version> + <version>0.8.7</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-callao/pom.xml b/lima-callao/pom.xml index 215b193e..a775588f 100644 --- a/lima-callao/pom.xml +++ b/lima-callao/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.7-SNAPSHOT</version> + <version>0.8.7</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-report/pom.xml b/lima-report/pom.xml index 8ed8fe41..b39c1cc4 100644 --- a/lima-report/pom.xml +++ b/lima-report/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.7-SNAPSHOT</version> + <version>0.8.7</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-server/pom.xml b/lima-server/pom.xml index 7e573bb2..c03511d6 100644 --- a/lima-server/pom.xml +++ b/lima-server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.7-SNAPSHOT</version> + <version>0.8.7</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-swing/pom.xml b/lima-swing/pom.xml index db03fbb2..07afd439 100644 --- a/lima-swing/pom.xml +++ b/lima-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.7-SNAPSHOT</version> + <version>0.8.7</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/pom.xml b/pom.xml index c26e3b5f..b80b3388 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.7-SNAPSHOT</version> + <version>0.8.7</version> <packaging>pom</packaging> <name>Lima</name> -- 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 https://gitlab.nuiton.org/chorem/lima.git commit cc5dfe95b9c023877304474f80fd12cac9f35653 Merge: 0c63042f 75be3c38 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 27 10:24:20 2017 +0200 [jgitflow-maven-plugin]merging 'release/0.8.7' into 'master' README.md | 75 +++---- README.txt | 2 + lima-business-api/pom.xml | 24 +- .../org/chorem/lima/business/ImportResult.java | 11 +- .../lima/business/ServiceMonitorableHandler.java | 4 +- .../api/ClosedPeriodicEntryBookService.java | 3 +- .../chorem/lima/business/api/EntryBookService.java | 3 + .../org/chorem/lima/business/api/EntryService.java | 5 + .../chorem/lima/business/api/ExportService.java | 2 +- .../business/api/FinancialTransactionService.java | 23 +- .../chorem/lima/business/api/ImportService.java | 2 +- lima-business/README.md | 1 + lima-business/pom.xml | 29 ++- .../main/java/org/chorem/lima/LimaXAResource.java | 6 +- .../org/chorem/lima/business/AccountingRules.java | 3 + .../chorem/lima/business/LimaBusinessConfig.java | 7 +- .../lima/business/LimaConfigurationHelper.java | 10 +- .../accountingrules/DefaultAccountingRules.java | 15 +- .../ejb/ClosedPeriodicEntryBookServiceImpl.java | 8 + .../lima/business/ejb/EntryBookServiceImpl.java | 51 ++++- .../chorem/lima/business/ejb/EntryServiceImpl.java | 6 + .../lima/business/ejb/ExportServiceImpl.java | 218 +++++++----------- .../ejb/FinancialTransactionServiceImpl.java | 119 +++++++++- .../lima/business/ejb/FiscalPeriodServiceImpl.java | 28 +-- .../lima/business/ejb/ImportServiceImpl.java | 98 +++++--- .../lima/business/ejb/ReportServiceImpl.java | 4 +- .../lima/business/ejb/VatStatementServiceImpl.java | 4 +- .../lima/business/ejb/csv/AbstractLimaModel.java | 2 +- .../chorem/lima/business/ejb/csv/AccountModel.java | 4 +- .../lima/business/ejb/csv/EntryBookModel.java | 4 +- .../chorem/lima/business/ejb/csv/EntryModel.java | 16 +- .../ejb/csv/FinancialTransactionModel.java | 6 +- .../business/ejb/csv/FiscalControlExportModel.java | 20 +- .../lima/business/ejb/csv/FiscalPeriodModel.java | 4 +- .../ejb/report/BalanceReportServiceImpl.java | 9 +- .../business/ejb/report/CommonsDocumentReport.java | 4 +- .../entity/ClosedPeriodicEntryBookTopiaDao.java | 18 +- .../lima/entity/FinancialTransactionTopiaDao.java | 9 +- .../org/chorem/lima/entity/GeneratorHQuery.java | 32 +-- .../chorem/lima/entity/LimaFlywayServiceImpl.java | 7 +- .../org/chorem/lima/business/AbstractLimaTest.java | 43 ++-- .../FinancialTransactionServiceImplTest.java | 247 ++++++++++++--------- .../lima/business/FiscalPeriodServiceImplTest.java | 6 +- .../lima/business/ImportExportServiceTest.java | 14 +- .../org/chorem/lima/business/LimaTestsConfig.java | 4 - .../lima/business/ReportServiceImplTest.java | 7 +- lima-callao/pom.xml | 24 +- .../db/migration/V0_8_7_0__1394_add_indexes.sql | 31 +++ .../src/main/xmi/lima-callao-model.properties | 4 +- lima-report/pom.xml | 24 +- lima-server/README.md | 32 +-- lima-server/pom.xml | 26 ++- lima-swing/pom.xml | 26 ++- lima-swing/src/main/assembly/lima | 5 +- lima-swing/src/main/assembly/lima.bat | 2 +- .../org/chorem/lima/enums/ImportExportEnum.java | 6 +- .../MainUiRefreshComponent.java} | 29 +-- .../AccountCondition/AccountConditionView.jaxx | 4 +- .../src/main/java/org/chorem/lima/ui/MainView.jaxx | 3 + .../java/org/chorem/lima/ui/MainViewHandler.java | 50 +++-- .../chorem/lima/ui/account/AccountViewHandler.java | 42 +++- .../ui/accountViewer/AccountViewerViewHandler.java | 14 +- .../lima/ui/celleditor/AccountTableCellEditor.java | 17 +- .../ui/celleditor/AutoCompleteTableCellEditor.java | 9 +- .../ui/celleditor/BigDecimalTableCellEditor.java | 4 +- .../chorem/lima/ui/combobox/AccountComboBox.java | 5 +- .../lima/ui/combobox/LeafAccountComboBoxModel.java | 7 +- .../chorem/lima/ui/common/AbstractLimaTable.java | 18 +- .../lima/ui/common/AbstractLimaTableModel.java | 5 +- .../ui/common/FinancialTransactionTableModel.java | 114 ++++++---- .../lima/ui/entrybook/EntryBookViewHandler.java | 31 +++ .../FinancialPeriodViewHandler.java | 7 +- .../FinancialTransactionViewHandler.java | 133 ++++++----- .../FinancialTransactionUnbalancedViewHandler.java | 22 +- .../FiscalControlExportViewHandler.java | 2 +- .../ui/fiscalperiod/FiscalPeriodViewHandler.java | 21 +- .../lima/ui/home/FinancialTransactionsPane.java | 8 +- .../java/org/chorem/lima/ui/home/HomeView.jaxx | 29 ++- .../chorem/lima/ui/importexport/ImportExport.java | 133 ++++++----- .../lima/ui/lettering/LetteringEditModel.java | 4 +- .../chorem/lima/ui/lettering/LetteringView.jaxx | 4 +- .../lima/ui/lettering/LetteringViewHandler.java | 21 +- .../org/chorem/lima/ui/opening/BackupPanel.jaxx | 1 + .../chorem/lima/ui/opening/BackupPanelHandler.java | 3 +- .../chorem/lima/ui/opening/OpeningViewHandler.java | 8 + .../lima/ui/vatchart/VatChartViewHandler.java | 37 +-- .../resources/i18n/lima-swing_en_GB.properties | 112 +++++----- .../resources/i18n/lima-swing_fr_FR.properties | 46 ++-- pom.xml | 58 +++-- src/site/resources/screens/lima_accont_viewer.png | Bin 0 -> 44028 bytes .../screens/lima_charts_financialperiod.png | Bin 55293 -> 57813 bytes .../resources/screens/lima_charts_fiscalperiod.png | Bin 36434 -> 32422 bytes src/site/resources/screens/lima_charts_vat.png | Bin 0 -> 42757 bytes src/site/resources/screens/lima_entries.png | Bin 37587 -> 37183 bytes ...import_limaall.png => lima_import_lima_all.png} | Bin src/site/resources/screens/lima_lettering.png | Bin 59893 -> 70752 bytes src/site/resources/screens/lima_open_account.png | Bin 26602 -> 31102 bytes src/site/resources/screens/lima_open_welcome.png | Bin 24208 -> 29635 bytes src/site/resources/screens/lima_preferences.png | Bin 0 -> 31616 bytes .../resources/screens/lima_reports_accounts.png | Bin 38541 -> 22100 bytes .../resources/screens/lima_reports_balance.png | Bin 34936 -> 93093 bytes .../resources/screens/lima_reports_entrybooks.png | Bin 0 -> 88753 bytes .../screens/lima_reports_financialstatement.png | Bin 0 -> 38765 bytes src/site/resources/screens/lima_reports_ledger.png | Bin 0 -> 102439 bytes ...accounts.png => lima_reports_menu_accounts.png} | Bin ...s_balance.png => lima_reports_menu_balance.png} | Bin .../screens/lima_reports_menu_global_menu.png | Bin 0 -> 37662 bytes src/site/resources/screens/lima_reports_vat.png | Bin 0 -> 75758 bytes .../resources/screens/report_global_balance.png | Bin 0 -> 93848 bytes src/site/rst/assistant.rst | 19 +- src/site/rst/backup.rst | 47 ++++ src/site/rst/contact.rst | 7 +- src/site/rst/devel/server.rst | 32 ++- src/site/rst/features.rst | 69 ++++-- src/site/rst/importexport.rst | 11 +- src/site/rst/index.rst | 8 +- src/site/rst/install.rst | 110 ++++++++- src/site/rst/rapports.rst | 109 +++++---- src/site/rst/saisie.rst | 18 +- src/site/site.xml | 3 +- 120 files changed, 1822 insertions(+), 1009 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 https://gitlab.nuiton.org/chorem/lima.git commit f5ca99b591dc2e5a05f823eebc4352cc2ddcfd77 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 27 10:24:22 2017 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- lima-business-api/pom.xml | 2 +- lima-business/pom.xml | 2 +- lima-callao/pom.xml | 2 +- lima-report/pom.xml | 2 +- lima-server/pom.xml | 2 +- lima-swing/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lima-business-api/pom.xml b/lima-business-api/pom.xml index 0493bffb..176a6571 100644 --- a/lima-business-api/pom.xml +++ b/lima-business-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.7</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-business/pom.xml b/lima-business/pom.xml index 1c1060aa..7a5eea2d 100644 --- a/lima-business/pom.xml +++ b/lima-business/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.7</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-callao/pom.xml b/lima-callao/pom.xml index 75a2661c..a775588f 100644 --- a/lima-callao/pom.xml +++ b/lima-callao/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.7</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-report/pom.xml b/lima-report/pom.xml index d18a43ed..b39c1cc4 100644 --- a/lima-report/pom.xml +++ b/lima-report/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.7</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-server/pom.xml b/lima-server/pom.xml index c21b2ea3..c03511d6 100644 --- a/lima-server/pom.xml +++ b/lima-server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.7</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-swing/pom.xml b/lima-swing/pom.xml index 6bf8e8f8..07afd439 100644 --- a/lima-swing/pom.xml +++ b/lima-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.7</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/pom.xml b/pom.xml index eb04a78b..b80b3388 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.7</version> <packaging>pom</packaging> <name>Lima</name> -- 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 https://gitlab.nuiton.org/chorem/lima.git commit a6a55521abe42d7b37da86c424897766913d6a80 Merge: f5ca99b5 cc5dfe95 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 27 10:24:22 2017 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' -- 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 https://gitlab.nuiton.org/chorem/lima.git commit 33c58bac655fcdfae4be7cbe6a40811c67fbe4cb Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 27 10:24:22 2017 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- lima-business-api/pom.xml | 2 +- lima-business/pom.xml | 2 +- lima-callao/pom.xml | 2 +- lima-report/pom.xml | 2 +- lima-server/pom.xml | 2 +- lima-swing/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lima-business-api/pom.xml b/lima-business-api/pom.xml index 176a6571..0493bffb 100644 --- a/lima-business-api/pom.xml +++ b/lima-business-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.7</version> + <version>0.8.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-business/pom.xml b/lima-business/pom.xml index 7a5eea2d..1c1060aa 100644 --- a/lima-business/pom.xml +++ b/lima-business/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.7</version> + <version>0.8.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-callao/pom.xml b/lima-callao/pom.xml index a775588f..75a2661c 100644 --- a/lima-callao/pom.xml +++ b/lima-callao/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.7</version> + <version>0.8.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-report/pom.xml b/lima-report/pom.xml index b39c1cc4..d18a43ed 100644 --- a/lima-report/pom.xml +++ b/lima-report/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.7</version> + <version>0.8.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-server/pom.xml b/lima-server/pom.xml index c03511d6..c21b2ea3 100644 --- a/lima-server/pom.xml +++ b/lima-server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.7</version> + <version>0.8.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/lima-swing/pom.xml b/lima-swing/pom.xml index 07afd439..6bf8e8f8 100644 --- a/lima-swing/pom.xml +++ b/lima-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.7</version> + <version>0.8.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> diff --git a/pom.xml b/pom.xml index b80b3388..eb04a78b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8.7</version> + <version>0.8.8-SNAPSHOT</version> <packaging>pom</packaging> <name>Lima</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm