This is an automated email from the git hooks/post-receive script. New change to branch feature/1158 in repository lima. See http://git.chorem.org/lima.git discards ca5bde2 correction suite au merge discards 783fce3 import manquant discards 48cc69d refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. adds d5f467a refs #1295 Le tableau de la saisie des écritures n'est pas éditable si la période est cloturé pour le journal sélectionné adds 4a1b1d5 refs #1158 Ajout de commentaires + désactivation du boutton de création d'une transaction adds 253998b refs #1158 Sur l'onglet lettrage il n'est pas possible de modifier une selection comportant une entrée vérouillée. Ajout d'une colonne 'clos' indiquant les entrées vérouillées. adds 9957610 Merge branch 'feature/1158-NotEditableTableForClose' into develop new b4b645f refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. new b119160 import manquant new 7cd3ef3 correction suite au merge This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ca5bde2) \ N -- N -- N refs/heads/feature/1158 (7cd3ef3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 3 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 7cd3ef34507e48ff1a7cbfe30785ed2e0ef7cf2e Author: dcosse <cosse@codelutin.com> Date: Mon Nov 30 10:30:21 2015 +0100 correction suite au merge commit b1191604f2236351540bb93added3e253e1c9dd6 Author: dcosse <cosse@codelutin.com> Date: Mon Nov 30 10:12:09 2015 +0100 import manquant commit b4b645f61af063699eb418f0d860eb8bb9266c50 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Apr 1 10:52:41 2015 +0200 refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. Summary of changes: .../business/api/FinancialTransactionService.java | 7 ++ .../ejb/FinancialTransactionServiceImpl.java | 12 +++ .../java/org/chorem/lima/entity/EntryTopiaDao.java | 24 ++++++ .../FinancialTransactionView.css | 15 ++-- .../FinancialTransactionView.jaxx | 2 +- .../FinancialTransactionViewHandler.java | 50 ++++++++---- .../lima/ui/lettering/LetteringEditModel.java | 80 +++++++++---------- ...tionModel.java => LetteringSelectionModel.java} | 31 ++------ .../lima/ui/lettering/LetteringTableModel.java | 38 +++++++++ .../org/chorem/lima/ui/lettering/LetteringView.css | 6 +- .../chorem/lima/ui/lettering/LetteringView.jaxx | 2 +- .../lima/ui/lettering/LetteringViewHandler.java | 85 +++++++++++---------- .../resources/i18n/lima-swing_en_GB.properties | 5 ++ .../resources/i18n/lima-swing_fr_FR.properties | 7 +- .../icons/action-financialPeriod-close.png | Bin 715 -> 452 bytes lima-swing/src/main/resources/log4j.properties | 2 +- 16 files changed, 234 insertions(+), 132 deletions(-) rename lima-swing/src/main/java/org/chorem/lima/ui/lettering/{LettringSelectionModel.java => LetteringSelectionModel.java} (82%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.