branch develop updated (b3640a6a -> f22e08a8)
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 b3640a6a Active Antialiased 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 new f22e08a8 Merge remote-tracking branch 'origin/develop' into develop 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 f22e08a8b9fcec508096077776360127e2e03a77 Merge: 183a489f b3640a6a Author: David Cossé <cosse@codelutin.com> Date: Fri Oct 13 23:09:48 2017 +0200 Merge remote-tracking branch 'origin/develop' into develop Summary of changes: .../lima/business/ejb/ExportServiceImpl.java | 73 ++++++---------- .../business/ejb/report/CommonsDocumentReport.java | 4 +- .../chorem/lima/ui/account/AccountViewHandler.java | 12 +++ .../lima/ui/entrybook/EntryBookViewHandler.java | 12 +++ .../chorem/lima/ui/importexport/ImportExport.java | 6 +- .../lima/ui/vatchart/VatChartViewHandler.java | 12 +++ .../resources/i18n/lima-swing_en_GB.properties | 96 ++++++++++----------- .../resources/i18n/lima-swing_fr_FR.properties | 28 +++--- 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 .../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 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/contact.rst | 2 +- src/site/rst/devel/server.rst | 4 +- src/site/rst/features.rst | 26 ++++-- src/site/rst/importexport.rst | 4 +- src/site/rst/install.rst | 6 +- src/site/rst/rapports.rst | 27 +++--- 33 files changed, 180 insertions(+), 151 deletions(-) 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_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_vat.png create mode 100644 src/site/resources/screens/report_global_balance.png -- 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 f22e08a8b9fcec508096077776360127e2e03a77 Merge: 183a489f b3640a6a Author: David Cossé <cosse@codelutin.com> Date: Fri Oct 13 23:09:48 2017 +0200 Merge remote-tracking branch 'origin/develop' into develop lima-swing/src/main/assembly/lima | 4 ++-- lima-swing/src/main/assembly/lima.bat | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm