This is an automated email from the git hooks/post-receive script. New change to branch master in repository lima. See https://gitlab.nuiton.org/chorem/lima.git from 0c63042f [jgitflow-maven-plugin]merging 'release/0.8.6' into 'master' adds f13d54dd [jgitflow-maven-plugin]updating poms for 0.8.7-SNAPSHOT development adds 3635d3f7 Lima Pre release adds 1d887370 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 83872443 [jgitflow-maven-plugin]merging 'master' into 'develop' adds a7e46279 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds c7bb6a0b refs #1375 [ISO] refactoring adds 0dd526f3 refs #1314 [ISO] renommage de méthode adds 8c151454 refs #1314 mise à jour du mavenpom adds 2253fd31 refs #1375 [ISO] refactoring adds 125f89cd refs #1375 [ISO] refactoring adds e8e306e9 Merge branch 'feature/1375-Ne_pas_interrompre_export' into develop adds 4bf39e30 refs #1377 [ISO] refactoring, réorganisation de l'enum adds 54b56bfc refs #1377 affichage correcte du retour du résultat d'un import adds 7b5f4552 refs #1377 Ajout d'un nom de fichier par défaut pour les fichiers exportés adds 20e7ab2c refs #1377 Lors d'une restauration de backup au premier démarrage, ne pas poursuivre l'initialisation du projet qui vient d'âtre restauré adds 35044bc2 refs #1377 la méthode générant le nom du fichier est autonome adds 948ebc04 Merge branch 'feature/1377-Amélioration_import_export_tous' into develop adds d0115dda refs #1376 mise à jour version Jdom adds 6942d31c refs 1380 execute l'export même si aucune entitée adds 716dbd47 refs #1380 ferme la boite de dialogue de mise en attente dans tous les cas adds 83f1431d Merge branch 'feature/1380-terminate_export' into develop adds 36969fbc refs #1381 ajout du racourci clavier pour les imports adds 18749165 refs #1381 correction des toolkits adds 44782ad9 refs #1381 ajout de clefs de traduction adds 60b9593d refs #1381 ajout de clefs de traduction adds 3386aa19 refs #1381 ajout de clefs de traduction adds b0d7dea2 Merge branch 'feature/1381-fix-shortcut' into develop adds de8df123 refs #1382 correction sur date de création des rapport adds bc293640 refs #1373 ajout et maj des captures d'écran adds 5beba371 refs #1373 ajout de captures d'écran adds 0159b2d5 refs #1373 ajout de captures d'écran adds fa54d8d7 refs #1373 ajout de captures d'écran adds 20bc6f86 refs #1373 modification du text de l'écran d'acceuil adds 388ab892 refs #1373 modification du text de l'écran d'acceuil adds 56835045 refs #1373 renommage de fichier adds 9933150a refs #1373 changement de text adds 3baaee89 refs #1373 Mise à jour de la documentation adds 183a489f Merge branch 'feature/1373-MAJ_documentation' into develop adds b3640a6a Active Antialiased adds f22e08a8 Merge remote-tracking branch 'origin/develop' into develop adds c8767165 refs #1373 récuppération de modifications écrasées adds 6c389d0b refs #1394 ne rafraîchir l'interface que si nécessaire et que la partie concernée adds 20926d40 refs #1395 Correction temporaire: ne pas remonter toutes les erreurs adds 0f2d1137 refs #1396 retrait @Deprecated adds 6978a6cf refs #1394 affectation d'une valeur par défaut MainUiRefreshComponent adds 76c960d9 refs #1396 amélioration de la vitesse d'exéction de l'import des entrées EBP adds 7b8e804f refs #1396 [ISO] renommage adds cefaabd6 refs #1396 correction les entrées n'étaient pas sauvegardées adds 3af75d9d refs #1396 [ISO] refactoring adds 28158308 refs #1396 l'export des entrées au format EBP est fait avec les transactions ordonnées par dates adds b62c44d1 refs #1394 retrait de l'appel du refresh a l'initialisation de l'onglet entrées invalides. L'action refresh est déclanché pas le listener sur le combo fiscalPeriod adds 5e4483e4 refs #1394 ajout d'indexes adds 10064bde refs #1394 initialisation des listeners apres modification des la vue initiale adds 60b17c7d refs #1394 Revue du mécanisme de création/peristance des transactions et de leur entrées adds d993ad81 refs #1394 Ne calculer le status transaction locked que si nécéssaire adds ac3b63cf refs #1394 Ajout d'index en base de données adds 290db764 refs #1394 Analyse de code adds cb13e330 refs #1394 modification Copyright adds d1884b54 refs #1394 onglet saisie des écriture un peu plus rapide adds 5a8af881 refs #1373 mise à jour URLs adds f63c2236 refs #1394 [ISO] formatage adds 91812ef5 refs #1394 correction numéro version model adds 017c408c refs #1394 ajout contrôle adds a9201f42 refs #1394 [ISO] possibilité d'utiliser une base de données H2 adds 175e2f0e refs #1373 Mise à jour de la documentation adds 6161aff9 refs #1373 Mise à jour de la documentation adds 28c9bcd3 refs #1373 Mise à jour de la documentation adds f98a9f82 refs #1394 petites amméliorations adds cf0858c1 refs #1394 diminution des pré-requis adds 3254ef30 test adds dd6727b3 [jgitflow-maven-plugin]updating poms for 0.8.8-SNAPSHOT development adds 5e235e14 refs #1394 J8 adds 75be3c38 [jgitflow-maven-plugin]updating poms for branch'release/0.8.7' with non-snapshot versions adds cc5dfe95 [jgitflow-maven-plugin]merging 'release/0.8.7' into 'master' No new revisions were added by this update. Summary of changes: 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 +- ...gration1.sql => V0_8_7_0__1394_add_indexes.sql} | 11 +- .../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} | 22 +- .../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, 1801 insertions(+), 1003 deletions(-) copy lima-callao/src/main/resources/db/migration/{V0_5_0_0__migration1.sql => V0_8_7_0__1394_add_indexes.sql} (51%) copy lima-swing/src/main/java/org/chorem/lima/{ui/opening/CreateFiscalPeriodPanel.css => enums/MainUiRefreshComponent.java} (76%) create mode 100644 src/site/resources/screens/lima_accont_viewer.png create mode 100644 src/site/resources/screens/lima_charts_vat.png rename src/site/resources/screens/{lima_import_limaall.png => lima_import_lima_all.png} (100%) create mode 100644 src/site/resources/screens/lima_preferences.png create mode 100644 src/site/resources/screens/lima_reports_entrybooks.png create mode 100644 src/site/resources/screens/lima_reports_financialstatement.png create mode 100644 src/site/resources/screens/lima_reports_ledger.png copy src/site/resources/screens/{lima_reports_accounts.png => lima_reports_menu_accounts.png} (100%) copy src/site/resources/screens/{lima_reports_balance.png => lima_reports_menu_balance.png} (100%) create mode 100644 src/site/resources/screens/lima_reports_menu_global_menu.png create mode 100644 src/site/resources/screens/lima_reports_vat.png create mode 100644 src/site/resources/screens/report_global_balance.png create mode 100644 src/site/rst/backup.rst -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.