May 2015 - Lima-commits - mailman.cloud.codelutin.com

branch feature/1186 updated (600ea17 -> 67330f3)
by chorem.org scm 18 May '15

18 May '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1186 in repository lima. See http://git.chorem.org/lima.git from 600ea17 refs #1186 : text d'a propos new 2293f92 refs #1186 : correction text new 67330f3 refs #1186 : rendre dynamique l'année du copyright The 2 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 67330f31abae8d93ed2662fa0609df41e37cf499 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon May 18 10:45:47 2015 +0200 refs #1186 : rendre dynamique l'année du copyright commit 2293f92f017b7110832b0663b9f3b7d9bb4b923d Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon May 18 10:44:32 2015 +0200 refs #1186 : correction text Summary of changes: lima-swing/pom.xml | 3 +++ lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java | 2 +- lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties | 2 +- lima-swing/src/main/resources/lima-swing.config | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

branch feature/1186 created (now 600ea17)
by chorem.org scm 15 May '15

15 May '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1186 in repository lima. See http://git.chorem.org/lima.git at 600ea17 refs #1186 : text d'a propos This branch includes the following new commits: new 600ea17 refs #1186 : text d'a propos 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 600ea173fde0581e5a3f34a8b809022951cb59df Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri May 15 16:58:44 2015 +0200 refs #1186 : text d'a propos -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/1208 created (now 565f06b)
by chorem.org scm 15 May '15

15 May '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1208 in repository lima. See http://git.chorem.org/lima.git at 565f06b fixes #1208 : ajouter le moi en toutes lettres + afficher la période dans la bar de statut This branch includes the following new commits: new 565f06b fixes #1208 : ajouter le moi en toutes lettres + afficher la période dans la bar de statut 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 565f06b1c1d636c2188fdf08e1d390222cc7d089 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri May 15 14:50:48 2015 +0200 fixes #1208 : ajouter le moi en toutes lettres + afficher la période dans la bar de statut -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/1119 created (now a1679da)
by chorem.org scm 15 May '15

15 May '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1119 in repository lima. See http://git.chorem.org/lima.git at a1679da fixes #1119 : changement du layout pour les toolbar possiblement trop large This branch includes the following new commits: new a1679da fixes #1119 : changement du layout pour les toolbar possiblement trop large 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 a1679da0570380bdc0e3b1560c06e631dbe78baa Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri May 15 12:10:59 2015 +0200 fixes #1119 : changement du layout pour les toolbar possiblement trop large -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/1228 created (now fbab021)
by chorem.org scm 15 May '15

15 May '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1228 in repository lima. See http://git.chorem.org/lima.git at fbab021 fixes #1228 : correction import comptes. This branch includes the following new commits: new fbab021 fixes #1228 : correction import comptes. 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 fbab021ae48bcfaa151cb3be0b27ca28a41dd7a2 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri May 15 10:51:49 2015 +0200 fixes #1228 : correction import comptes. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/1176 updated (56cfe4a -> 1a14575)
by chorem.org scm 15 May '15

15 May '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1176 in repository lima. See http://git.chorem.org/lima.git from 56cfe4a refs #1176 : mise a jour de la documentation new 9b1e86c utilisation css new 7874dd6 refs #1210 rétablissement du fonctionnement des rapports en mode client/serveur new a3280ab change remove icon on tab new 762104f refs #1187 : account popups new 290c02e refs #1187 : entry book popups new aedc005 refs #1187 : fiscal period popups new 993fe91 refs #1187 : inancial statement popups new b7d0508 refs #1187 : Vat chart popups new f44b3da refs #1187 : identitiy popups new 94b81e0 refs #1221: Erreur à l'annulation des import/export new 4347f89 refs #1222: Le lettrage ne fonctionne plus new a8f2dee refs #1209: A l'ajout automatique d'une écriture le focus ne correspond pas à la cellule éditée new 10b5355 refs #1218: Plan BCR : exception à la deuxième modification d'un regrouppement new c34e2e8 refs #1223: l'onglet lettrage est peu réactif new 939759a refs #1207 : correction d'erreurs criticals new 885063f refs #1207 corrections d'erreurs majeures new a39b7a6 refs #1207 corrections d'erreurs majeures new 56d6a40 rebase to develop (refs #1207) new 2d3c9fc refs #1210 allow to configure defferent address for Ejb than Http new ea929a6 [jgitflow-maven-plugin]updating poms for 0.8.4-SNAPSHOT development new b3ea0fe [jgitflow-maven-plugin]updating poms for branch '0.8.3' with snapshot versions new 5dc4b0d remove licences fron thirdparty new ff30173 [jgitflow-maven-plugin]updating poms for branch'release/0.8.3' with non-snapshot versions new f17ef3e [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 62d44cb [jgitflow-maven-plugin]updating poms for 0.8.5-SNAPSHOT development new 5ddfac7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 3462358 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 1a14575 correction de la javadoc The 28 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 1a145752e0fbbd76e0956112435ea7d7703a09d0 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon May 11 17:00:46 2015 +0200 correction de la javadoc commit 3462358c59591c1eb4e6fdc75a84838bc7d0dc27 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon May 11 14:27:55 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 5ddfac7a5c7335358574c4b7cccf11d58a980eba Author: Maven Release <maven-release(a)codelutin.com> Date: Mon May 11 14:27:54 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 62d44cb56f2e87c46c31f9090dabf18f58a86430 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon May 11 14:12:26 2015 +0000 [jgitflow-maven-plugin]updating poms for 0.8.5-SNAPSHOT development commit f17ef3e4edbf5009a30baeeac61cd7708331c794 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu May 7 16:37:34 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit ff30173cbc7a238cfb94d896455f35696c4055a9 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu May 7 16:33:42 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.8.3' with non-snapshot versions commit 5dc4b0d88b30c9421d72f2ce693cd70f02f1ea9a Author: Maven Release <maven-release(a)codelutin.com> Date: Thu May 7 16:32:31 2015 +0000 remove licences fron thirdparty commit b3ea0feee22aaee83d3b2e3ec178e5d762291030 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu May 7 16:27:22 2015 +0000 [jgitflow-maven-plugin]updating poms for branch '0.8.3' with snapshot versions commit ea929a692ec5846600785fc2f2defecf25575ff5 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu May 7 17:30:57 2015 +0200 [jgitflow-maven-plugin]updating poms for 0.8.4-SNAPSHOT development commit 2d3c9fc1cd44972b0dd379f3fa6e8de4de6bf5bf Author: dcosse <cosse(a)codelutin.com> Date: Mon Apr 27 16:41:02 2015 +0200 refs #1210 allow to configure defferent address for Ejb than Http commit 56d6a40296d0b4c7929971c57d5ac66c7299835f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 24 17:49:49 2015 +0200 rebase to develop (refs #1207) commit a39b7a69e79b2ea27260c42ab54485c3739d9c80 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Mar 21 07:44:17 2015 +0100 refs #1207 corrections d'erreurs majeures commit 885063fb4168fee7bc4f08a277b2f3c04f8f801b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Mar 21 01:32:19 2015 +0100 refs #1207 corrections d'erreurs majeures commit 939759a7c53f4a812bf58a1839dc0ea521ff687a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Mar 21 00:32:12 2015 +0100 refs #1207 : correction d'erreurs criticals commit c34e2e8572ff848e32fc1c662ca18fd7234d2761 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 8 10:02:37 2015 +0200 refs #1223: l'onglet lettrage est peu réactif commit 10b5355c115616c91138b28abbe56648d948b6c3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 8 09:58:55 2015 +0200 refs #1218: Plan BCR : exception à la deuxième modification d'un regrouppement commit a8f2deeaf8e73321861a02ff29d6dac422abbdd1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 8 09:39:24 2015 +0200 refs #1209: A l'ajout automatique d'une écriture le focus ne correspond pas à la cellule éditée commit 4347f89274c0c0445f46e5827522077f9cf66865 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 8 09:42:50 2015 +0200 refs #1222: Le lettrage ne fonctionne plus commit 94b81e09fc6d96b4152ee53a786c7b4f998c5c3a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 8 09:30:34 2015 +0200 refs #1221: Erreur à l'annulation des import/export commit f44b3dab6c582d2287b687a6a16c7f593cf28cff Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Mar 31 14:28:51 2015 +0200 refs #1187 : identitiy popups commit b7d050836fb9584e2a1aac069c93ae41d34a6c0d Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Mar 31 09:09:09 2015 +0200 refs #1187 : Vat chart popups commit 993fe919ad2852a2a82c7c522073d0808817b161 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Mar 30 17:13:41 2015 +0200 refs #1187 : inancial statement popups commit aedc0057165b18bec29dc76971a6e26712891c33 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Mar 27 08:52:22 2015 +0100 refs #1187 : fiscal period popups commit 290c02e22b66868ed6fe724c064e75f57f669256 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Mar 20 17:26:07 2015 +0100 refs #1187 : entry book popups commit 762104feafd1f8827f78bce51d0ff1ef4a05c7bb Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Mar 20 17:15:42 2015 +0100 refs #1187 : account popups commit a3280abd147a3cd91cb1c3c5dc1b12420a010f35 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Mar 20 15:02:18 2015 +0100 change remove icon on tab commit 7874dd6b238860e5be4e6d12d89e869840bcd488 Author: dcosse <cosse(a)codelutin.com> Date: Sat Apr 11 17:51:05 2015 +0200 refs #1210 rétablissement du fonctionnement des rapports en mode client/serveur commit 9b1e86c673487dc748569af6821ade1bd54d5b2b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 8 12:31:56 2015 +0200 utilisation css Summary of changes: lima-business-api/pom.xml | 15 +- .../src/license/THIRD-PARTY.properties | 12 +- .../org/chorem/lima/LimaTechnicalException.java | 2 +- .../chorem/lima/business/ImportExportResults.java | 2 +- .../chorem/lima/business/LimaServiceFactory.java | 8 - .../business/api/FinancialStatementService.java | 8 +- .../business/api/FinancialTransactionService.java | 6 +- .../chorem/lima/business/api/OptionsService.java | 3 +- .../lima/business/exceptions/AccountException.java | 9 +- .../exceptions/AfterLastFiscalPeriodException.java | 2 +- .../exceptions/AlreadyExistAccountException.java | 2 +- ...> AlreadyExistFinancialStatementException.java} | 8 +- .../AlreadyExistVatStatementException.java | 4 +- .../AlreadyLockedFiscalPeriodException.java | 2 +- .../BeforeFirstFiscalPeriodException.java | 2 +- .../BeginAfterEndFiscalPeriodException.java | 2 +- .../ClosedPeriodicEntryBookException.java | 4 +- .../ClosedPeriodicEntryBooksException.java | 4 +- .../lima/business/exceptions/DateException.java | 4 +- .../lima/business/exceptions/EntriesException.java | 4 +- .../business/exceptions/EntryBookException.java | 4 +- .../exceptions/FinancialPeriodException.java | 4 +- .../exceptions/FinancialTransactionsException.java | 4 +- .../business/exceptions/FiscalPeriodException.java | 4 +- .../business/exceptions/ImportEbpException.java | 2 +- .../business/exceptions/ImportFileException.java | 2 +- .../exceptions/InvalidAccountNumberException.java | 2 +- .../LastUnlockedFiscalPeriodException.java | 2 +- .../exceptions/LockedEntryBookException.java | 2 +- .../exceptions/LockedFinancialPeriodException.java | 2 +- .../MoreOneUnlockFiscalPeriodException.java | 11 +- .../exceptions/NoEmptyFiscalPeriodException.java | 2 +- .../NoFoundFinancialPeriodException.java | 2 +- .../exceptions/NotAllowedLabelException.java | 2 +- ...NotBeginNextDayOfLastFiscalPeriodException.java | 2 +- ...NotLockedClosedPeriodicEntryBooksException.java | 2 +- .../NotNumberAccountNumberException.java | 2 +- .../exceptions/UnbalancedEntriesException.java | 2 +- .../UnbalancedFinancialTransactionsException.java | 5 +- .../exceptions/UnfilledEntriesException.java | 2 +- .../business/exceptions/UsedAccountException.java | 2 +- .../exceptions/UsedEntryBookException.java | 2 +- ...outEntryBookFinancialTransactionsException.java | 2 +- .../business/utils/FinancialPeriodComparator.java | 4 - lima-business/pom.xml | 2 +- .../chorem/lima/business/LimaBusinessConfig.java | 57 +++++-- .../ejb/FinancialStatementServiceImpl.java | 62 +++----- .../ejb/FinancialTransactionServiceImpl.java | 18 +-- .../lima/business/ejb/ImportServiceImpl.java | 29 ++-- .../lima/business/ejb/OptionsServiceImpl.java | 6 +- .../ejb/report/BalanceReportServiceImpl.java | 24 +-- .../lima/business/utils/EntryEBPComparator.java | 7 +- .../utils/FinancialTransactionComparator.java | 42 ------ .../org/chorem/lima/entity/AccountTopiaDao.java | 2 +- .../java/org/chorem/lima/entity/EntryTopiaDao.java | 3 +- .../org/chorem/lima/entity/GeneratorHQuery.java | 2 +- .../resources/i18n/lima-business_en_GB.properties | 4 + .../resources/i18n/lima-business_fr_FR.properties | 10 +- .../org/chorem/lima/business/AccountDaoTest.java | 7 +- .../lima/business/EntryBookServiceImplTest.java | 3 +- .../lima/business/ImportExportServiceTest.java | 2 +- .../lima/business/ReportServiceImplTest.java | 2 +- lima-callao/pom.xml | 2 +- .../org/chorem/lima/FinancialStatementWayEnum.java | 42 ++---- .../lima/beans/AbstractBigDecimalCondition.java | 4 +- .../chorem/lima/beans/AbstractStringCondition.java | 4 +- .../org/chorem/lima/beans/AccountCondition.java | 2 +- .../main/java/org/chorem/lima/beans/Condition.java | 2 +- .../org/chorem/lima/beans/CreditCondition.java | 2 +- .../java/org/chorem/lima/beans/DateCondition.java | 4 +- .../chorem/lima/beans/DateIntervalCondition.java | 2 +- .../java/org/chorem/lima/beans/DebitCondition.java | 2 +- .../chorem/lima/beans/DescriptionCondition.java | 2 +- .../org/chorem/lima/beans/EntryBookCondition.java | 2 +- .../lima/beans/FinancialPeriodCondition.java | 2 +- .../lima/beans/FinancialTransactionCondition.java | 2 +- .../chorem/lima/beans/FiscalPeriodCondition.java | 2 +- .../main/java/org/chorem/lima/beans/Labeled.java | 2 +- .../org/chorem/lima/beans/LetteringCondition.java | 2 +- .../org/chorem/lima/beans/VisitorCondition.java | 2 +- .../org/chorem/lima/beans/VoucherCondition.java | 2 +- .../java/org/chorem/lima/clause/AndClause.java | 2 +- .../java/org/chorem/lima/clause/BooleanClause.java | 2 +- .../main/java/org/chorem/lima/clause/Clause.java | 2 +- .../java/org/chorem/lima/clause/DateClause.java | 2 +- .../java/org/chorem/lima/clause/NotClause.java | 2 +- .../java/org/chorem/lima/clause/NumberClause.java | 2 +- .../main/java/org/chorem/lima/clause/OrClause.java | 2 +- .../java/org/chorem/lima/clause/SetClause.java | 2 +- .../java/org/chorem/lima/clause/StringClause.java | 2 +- .../org/chorem/lima/clause/SubFilterClause.java | 2 +- .../java/org/chorem/lima/clause/VisitorClause.java | 2 +- .../org/chorem/lima/filter/AbstractFilter.java | 2 +- .../java/org/chorem/lima/filter/AccountFilter.java | 2 +- .../org/chorem/lima/filter/EntryBookFilter.java | 2 +- .../java/org/chorem/lima/filter/EntryFilter.java | 2 +- .../main/java/org/chorem/lima/filter/Filter.java | 2 +- .../org/chorem/lima/filter/FilterGenerator.java | 2 +- .../lima/filter/FinancialTransactionFilter.java | 2 +- .../java/org/chorem/lima/filter/VisitorFilter.java | 2 +- .../resources/i18n/lima-callao_en_GB.properties | 6 +- .../resources/i18n/lima-callao_fr_FR.properties | 6 +- lima-report/pom.xml | 2 +- lima-report/src/license/THIRD-PARTY.properties | 14 +- .../java/org/chorem/lima/report/DocumentsEnum.java | 2 +- .../lima/report/service/DocumentService.java | 56 ++++--- lima-server/README.txt | 26 +++- lima-server/pom.xml | 3 +- .../java/org/chorem/lima/server/FormatsEnum.java | 2 +- .../org/chorem/lima/server/HttpServerService.java | 14 +- .../java/org/chorem/lima/server/LimaServer.java | 56 +++++-- .../org/chorem/lima/server/LimaServerConfig.java | 2 - lima-swing/README.txt | 4 +- lima-swing/pom.xml | 2 +- .../chorem/lima/LimaSwingApplicationContext.java | 6 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 34 ++--- .../org/chorem/lima/enums/AccountsChartEnum.java | 24 ++- .../java/org/chorem/lima/enums/EncodingEnum.java | 13 +- .../lima/enums/FinancialStatementsChartEnum.java | 22 ++- .../org/chorem/lima/enums/ImportExportEnum.java | 4 - .../chorem/lima/enums/VatStatementsChartEnum.java | 26 +++- .../java/org/chorem/lima/ui/ClosableTabHeader.css | 14 +- .../AccountCondition/AccountConditionHandler.java | 6 +- .../BigDecimalConditionHandler.java | 6 +- .../CreditConditionHandler.java | 2 +- .../BigDecimalCondition/CreditConditionView.java | 2 +- .../BigDecimalCondition/DebitConditionHandler.java | 2 +- .../BigDecimalCondition/DebitConditionView.java | 2 +- .../chorem/lima/ui/Filter/ConditionHandler.java | 8 +- .../EntryBookConditionHandler.java | 10 +- .../DescriptionConditionHandler.java | 2 +- .../StringCondition/DescriptionConditionView.java | 2 +- .../StringCondition/LetteringConditionHandler.java | 2 +- .../StringCondition/LetteringConditionView.java | 2 +- .../StringCondition/StringConditionHandler.java | 9 +- .../StringCondition/VoucherConditionHandler.java | 2 +- .../StringCondition/VoucherConditionView.java | 2 +- .../Filter/dateCondition/DateConditionHandler.java | 9 +- .../DateIntervalConditionHandler.java | 9 +- .../FinancialPeriodConditionHandler.java | 13 +- .../FinancialTransactionConditionHandler.java | 2 +- .../FiscalPeriodConditionHandler.java | 10 +- .../java/org/chorem/lima/ui/LimaRendererUtil.java | 8 +- .../java/org/chorem/lima/ui/MainViewHandler.java | 6 +- .../org/chorem/lima/ui/account/AccountForm.css | 2 + .../org/chorem/lima/ui/account/AccountForm.jaxx | 20 ++- .../chorem/lima/ui/account/AccountImportForm.css | 39 ++--- .../chorem/lima/ui/account/AccountImportForm.jaxx | 61 +++----- .../chorem/lima/ui/account/AccountViewHandler.java | 4 +- .../chorem/lima/ui/account/UpdateAccountForm.css | 2 + .../chorem/lima/ui/account/UpdateAccountForm.jaxx | 17 ++- .../ui/celleditor/AccountTableCellRenderer.java | 2 +- .../ui/celleditor/AutoCompleteTableCellEditor.java | 8 +- .../ui/celleditor/DateLimaTableCellRenderer.java | 2 +- .../lima/ui/celleditor/DateTableCellEditor.java | 11 +- .../celleditor/DefaultLimaTableCellRenderer.java | 2 +- .../lima/ui/celleditor/EmptyCellRenderer.java | 4 - .../ui/celleditor/EntryBookTableCellRender.java | 2 +- .../ui/celleditor/NumberSeparatorCellRenderer.java | 2 +- .../NumberSeparatorTableCellRenderer.java | 2 +- .../lima/ui/celleditor/StringTableCellEditor.java | 2 +- .../lima/ui/celleditor/TableCellErrorDetector.java | 2 +- .../lima/ui/combobox/AccountComboBoxModel.java | 10 +- .../lima/ui/combobox/EntryBookComboBoxModel.java | 5 - .../ui/combobox/FinancialPeriodComboBoxModel.java | 167 --------------------- .../ui/combobox/FiscalPeriodComboBoxModel.java | 12 +- .../lima/ui/combobox/LeafAccountComboBoxModel.java | 4 - .../lima/ui/combobox/LetterComboBoxModel.java | 100 ------------ .../org/chorem/lima/ui/common/AbstractColumn.java | 2 +- .../chorem/lima/ui/common/AbstractLimaTable.java | 2 +- .../lima/ui/common/AbstractLimaTableModel.java | 2 +- .../lima/ui/common/CellRouteHorizontalAction.java | 2 +- .../lima/ui/common/CellRouteVerticalAction.java | 2 +- .../java/org/chorem/lima/ui/common/Column.java | 2 +- .../ui/common/FinancialTransactionTableModel.java | 2 +- .../chorem/lima/ui/common/IntervalListener.java | 29 ---- .../lima/ui/common/LabelListCellRenderer.java | 2 +- .../chorem/lima/ui/common/TableModelWithGroup.java | 16 +- .../org/chorem/lima/ui/entrybook/EntryBookForm.css | 2 + .../chorem/lima/ui/entrybook/EntryBookForm.jaxx | 20 ++- .../lima/ui/entrybook/EntryBookImportForm.css | 2 + .../lima/ui/entrybook/EntryBookImportForm.jaxx | 26 ++-- .../lima/ui/entrybook/EntryBookViewHandler.java | 11 +- .../FinancialPeriodErrorDetector.java | 2 +- .../FinancialStatementChartTreeTableModel.java | 98 ++++++------ .../FinancialStatementChartViewHandler.java | 35 +++-- .../FinancialStatementHeaderForm.css | 25 +-- .../FinancialStatementHeaderForm.jaxx | 65 ++++---- .../FinancialStatementImportForm.css | 41 ++--- .../FinancialStatementImportForm.jaxx | 84 ++++------- .../FinancialStatementMovementForm.css | 16 +- .../FinancialStatementMovementForm.jaxx | 63 ++++---- .../ui/financialtransaction/AccountColumn.java | 2 +- .../ui/financialtransaction/BalanceColumn.java | 2 +- .../lima/ui/financialtransaction/CreditColumn.java | 2 +- .../lima/ui/financialtransaction/DateColumn.java | 2 +- .../lima/ui/financialtransaction/DebitColumn.java | 2 +- .../ui/financialtransaction/DescriptionColumn.java | 2 +- .../ui/financialtransaction/EntryBookColumn.java | 2 +- .../FinancialTransactionDefaultTable.java | 11 +- .../FinancialTransactionErrorDetector.java | 2 +- .../FinancialTransactionTable.java | 11 +- .../FinancialTransactionViewHandler.java | 15 +- .../lima/ui/financialtransaction/LetterColumn.java | 2 +- .../ui/financialtransaction/VoucherColumn.java | 2 +- .../FinancialTransactionSearchView.css | 6 +- .../FinancialTransactionSearchView.jaxx | 6 +- .../FinancialTransactionSearchViewHandler.java | 15 +- .../org/chorem/lima/ui/fiscalperiod/AddPeriod.css | 6 +- .../org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx | 28 ++-- .../ui/fiscalperiod/FiscalPeriodErrorDetector.java | 2 +- .../ui/fiscalperiod/FiscalPeriodTableModel.java | 4 - .../ui/fiscalperiod/FiscalPeriodViewHandler.java | 70 +++++---- .../fiscalperiod/RetainedEarningsEntryBookForm.css | 33 ++-- .../RetainedEarningsEntryBookForm.jaxx | 85 +++-------- .../org/chorem/lima/ui/identity/IdentityForm.css | 18 ++- .../org/chorem/lima/ui/identity/IdentityForm.jaxx | 130 ++++++++-------- .../chorem/lima/ui/importexport/ImportExport.java | 61 ++++---- .../org/chorem/lima/ui/lettering/LetteringView.css | 6 +- .../lima/ui/lettering/LetteringViewHandler.java | 27 ++-- .../org/chorem/lima/ui/lettering/TypeEntry.java | 10 +- .../ui/opening/CreateIdentityPanelHandler.java | 9 +- .../chorem/lima/ui/vatchart/VatChartImportForm.css | 35 ++--- .../lima/ui/vatchart/VatChartImportForm.jaxx | 84 ++++------- .../lima/ui/vatchart/VatChartMovementForm.css | 29 ++-- .../lima/ui/vatchart/VatChartMovementForm.jaxx | 59 ++++---- .../lima/ui/vatchart/VatChartTreeTableModel.java | 6 +- .../lima/ui/vatchart/VatChartViewHandler.java | 22 ++- .../java/org/chorem/lima/util/ErrorHelper.java | 19 --- .../java/org/chorem/lima/util/ReportDialogView.css | 5 +- .../org/chorem/lima/util/ReportDialogView.jaxx | 2 +- .../resources/i18n/lima-swing_en_GB.properties | 21 +-- .../resources/i18n/lima-swing_fr_FR.properties | 51 ++++--- .../src/main/resources/icons/action-cancel.png | Bin 0 -> 587 bytes ...{action-account-remove.png => action-close.png} | Bin .../src/main/resources/icons/action-closeTab.png | Bin 3140 -> 0 bytes lima-swing/src/main/resources/icons/action-ok.png | Bin 0 -> 537 bytes pom.xml | 2 +- 238 files changed, 1229 insertions(+), 1743 deletions(-) rename lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{AlreadyExistFinancialStatement.java => AlreadyExistFinancialStatementException.java} (82%) delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/utils/FinancialTransactionComparator.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/common/IntervalListener.java create mode 100644 lima-swing/src/main/resources/icons/action-cancel.png copy lima-swing/src/main/resources/icons/{action-account-remove.png => action-close.png} (100%) delete mode 100644 lima-swing/src/main/resources/icons/action-closeTab.png create mode 100644 lima-swing/src/main/resources/icons/action-ok.png -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 15

13/28: refs #1218: Plan BCR : exception à la deuxième modification d'un regrouppement
by chorem.org scm 15 May '15

15 May '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1176 in repository lima. See http://git.chorem.org/lima.git commit 10b5355c115616c91138b28abbe56648d948b6c3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 8 09:58:55 2015 +0200 refs #1218: Plan BCR : exception à la deuxième modification d'un regrouppement --- .../business/api/FinancialStatementService.java | 4 +- .../ejb/FinancialStatementServiceImpl.java | 54 +++++-------- .../lima/business/ejb/ImportServiceImpl.java | 17 ++-- .../FinancialStatementChartTreeTableModel.java | 94 ++++++++++++---------- .../FinancialStatementChartViewHandler.java | 29 ++++--- 5 files changed, 96 insertions(+), 102 deletions(-) diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialStatementService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialStatementService.java index af30ffb..a24f032 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialStatementService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialStatementService.java @@ -40,12 +40,12 @@ public interface FinancialStatementService { */ FinancialStatement newFinancialStatement(); - void createMasterFinacialStatements(FinancialStatement masterFinancialStatements); + FinancialStatement createMasterFinacialStatements(FinancialStatement masterFinancialStatements); FinancialStatement createFinancialStatement(FinancialStatement masterFinancialStatement, FinancialStatement financialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException; - void updateFinancialStatement(FinancialStatement financialStatement); + FinancialStatement updateFinancialStatement(FinancialStatement financialStatement); void removeFinancialStatement(FinancialStatement financialStatement); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java index d98e599..4fb4cb7 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java @@ -23,6 +23,7 @@ package org.chorem.lima.business.ejb; import com.google.common.base.Function; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; @@ -46,8 +47,6 @@ import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountTopiaDao; import org.chorem.lima.entity.FinancialStatement; import org.chorem.lima.entity.FinancialStatementTopiaDao; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; import javax.ejb.EJB; import javax.ejb.Remote; @@ -97,25 +96,6 @@ public class FinancialStatementServiceImpl extends AbstractLimaService implement } } - protected void addFinancialStatementToMaster(FinancialStatement masterFinancialStatement, - FinancialStatement financialStatement) { - if (masterFinancialStatement != null) { - FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementDao(); - - masterFinancialStatement.addSubFinancialStatements(financialStatement); - - if (masterFinancialStatement.isPersisted()) { - // update the persisted entity to avoid NonUniqueObjectException: A different object with the same identifier value was already associated with the session - FinancialStatement financialStatementToUpdate = financialStatementTopiaDao.forTopiaIdEquals(masterFinancialStatement.getTopiaId()).findUnique(); - Binder<FinancialStatement, FinancialStatement> binder = BinderFactory.newBinder(FinancialStatement.class, FinancialStatement.class); - binder.copy(masterFinancialStatement, financialStatementToUpdate); - financialStatementTopiaDao.update(financialStatementToUpdate); - } else { - financialStatementTopiaDao.create(masterFinancialStatement); - } - } - } - @Override public FinancialStatement newFinancialStatement() { FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementDao(); @@ -124,29 +104,32 @@ public class FinancialStatementServiceImpl extends AbstractLimaService implement } @Override - public void createMasterFinacialStatements(FinancialStatement masterFinancialStatements) { + public FinancialStatement createMasterFinacialStatements(FinancialStatement masterFinancialStatements) { FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementDao(); - financialStatementTopiaDao.create(masterFinancialStatements); + FinancialStatement result = financialStatementTopiaDao.create(masterFinancialStatements); + return result; } @Override - public FinancialStatement createFinancialStatement(FinancialStatement masterFinancialStatement, + public FinancialStatement createFinancialStatement(FinancialStatement parentFinancialStatement, FinancialStatement financialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException { - validateNewFinancialStatement(masterFinancialStatement, financialStatement); + validateNewFinancialStatement(parentFinancialStatement, financialStatement); + Preconditions.checkState(parentFinancialStatement.isPersisted(), "parents statement must be persited"); + Preconditions.checkState(! financialStatement.isPersisted(), " statement to create must be not persited"); FinancialStatementTopiaDao financialStatementTopiaDao = getDaoHelper().getFinancialStatementDao(); - FinancialStatement result; - if (!financialStatement.isPersisted()) { - result = financialStatementTopiaDao.create(financialStatement); - } else { - result = financialStatement; - } + // refresh parent financialstatement + parentFinancialStatement = financialStatementTopiaDao.forTopiaIdEquals(parentFinancialStatement.getTopiaId()).findUnique(); - addFinancialStatementToMaster(masterFinancialStatement, result); + financialStatement = financialStatementTopiaDao.create(financialStatement); - return result; + parentFinancialStatement.addSubFinancialStatements(financialStatement); + + financialStatementTopiaDao.update(parentFinancialStatement); + + return financialStatement; } @Override @@ -192,13 +175,14 @@ public class FinancialStatementServiceImpl extends AbstractLimaService implement } @Override - public void updateFinancialStatement(FinancialStatement financialStatement) { + public FinancialStatement updateFinancialStatement(FinancialStatement financialStatement) { // TopiaDao FinancialStatementTopiaDao financialStatementHeaderTopiaDao = getDaoHelper().getFinancialStatementDao(); //update - financialStatementHeaderTopiaDao.update(financialStatement); + financialStatement = financialStatementHeaderTopiaDao.update(financialStatement); + return financialStatement; } 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 188cd3f..b9d34b6 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 @@ -480,7 +480,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ if (rootFinancialStatement == null) { rootFinancialStatement = financialStatement; - rootFinancialStatement = financialStatementService.createFinancialStatement(null, rootFinancialStatement); + rootFinancialStatement = financialStatementService.createMasterFinacialStatements(rootFinancialStatement); } else { // in case it exist (not ordered import and previously created) values are bind to the previously created one excepted // the sub financial statements @@ -527,15 +527,14 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ return alreadyCreated; } - protected FinancialStatement createRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, String rootMasterName, final FinancialStatement rootFinancialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException { - FinancialStatement _rootFinancialStatement = rootFinancialStatement; - if (_rootFinancialStatement == null) { - _rootFinancialStatement = financialStatementService.newFinancialStatement(); - _rootFinancialStatement.setLabel(rootMasterName); - _rootFinancialStatement = financialStatementService.createFinancialStatement(null, _rootFinancialStatement); - orderedFinancialStatements.put(rootMasterName, _rootFinancialStatement); + protected FinancialStatement createRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, String rootMasterName, FinancialStatement rootFinancialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException { + if (rootFinancialStatement == null) { + rootFinancialStatement = financialStatementService.newFinancialStatement(); + rootFinancialStatement.setLabel(rootMasterName); + rootFinancialStatement = financialStatementService.createMasterFinacialStatements(rootFinancialStatement); + orderedFinancialStatements.put(rootMasterName, rootFinancialStatement); } - return _rootFinancialStatement; + return rootFinancialStatement; } protected VatStatement returnVATStatement (final VatStatement rootVATStatement, String subVATStatementLabel) throws AlreadyExistVatStatementException, NotAllowedLabelException { diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java index b5f0cab..e2687e8 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java @@ -26,14 +26,16 @@ import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaSwingConfig; +import org.chorem.lima.business.LimaServiceFactory; import org.chorem.lima.business.api.FinancialStatementService; import org.chorem.lima.business.exceptions.AlreadyExistFinancialStatement; import org.chorem.lima.business.exceptions.NotAllowedLabelException; import org.chorem.lima.entity.FinancialStatement; import org.chorem.lima.entity.FinancialStatementImpl; -import org.chorem.lima.business.LimaServiceFactory; import org.chorem.lima.util.ErrorHelper; import org.jdesktop.swingx.treetable.AbstractTreeTableModel; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; import javax.swing.tree.TreePath; import java.util.List; @@ -58,16 +60,27 @@ public class FinancialStatementChartTreeTableModel extends AbstractTreeTableMode /** Services. */ protected final FinancialStatementService financialStatementService; + Binder<FinancialStatement, FinancialStatement> binderFinancialStatement; + protected ErrorHelper errorHelper; /** Model constructor. Init account service used here. */ public FinancialStatementChartTreeTableModel() { + //create root for the tree super(new FinancialStatementImpl()); - // Gets factory service + + // Gets factory service financialStatementService = LimaServiceFactory.getService(FinancialStatementService.class); + + FinancialStatement master = (FinancialStatement) root; + master.addAllSubFinancialStatements(financialStatementService.getRootFinancialStatements()); + errorHelper = new ErrorHelper(LimaSwingConfig.getInstance()); + + binderFinancialStatement = BinderFactory.newBinder(FinancialStatement.class); + } @@ -101,54 +114,33 @@ public class FinancialStatementChartTreeTableModel extends AbstractTreeTableMode @Override public int getChildCount(Object node) { - int result = 0; - if (node == getRoot()) { - result = financialStatementService. - getRootFinancialStatements().size(); - } else { - FinancialStatement parentFinancialStatementHeader = + FinancialStatement parentFinancialStatementHeader = (FinancialStatement) node; - result = parentFinancialStatementHeader.getSubFinancialStatements().size(); - } + int result = parentFinancialStatementHeader.sizeSubFinancialStatements(); return result; } @Override public Object getChild(Object parent, int index) { - Object result = null; - if (parent == getRoot()) { - List<FinancialStatement> financialStatements = - financialStatementService.getRootFinancialStatements(); - result = financialStatements.get(index); - } else { - FinancialStatement parentFinancialStatement = - (FinancialStatement) parent; + FinancialStatement parentFinancialStatement = + (FinancialStatement) parent; - List<FinancialStatement> financialStatements = - Lists.newArrayList(parentFinancialStatement.getSubFinancialStatements()); + List<FinancialStatement> financialStatements = + Lists.newArrayList(parentFinancialStatement.getSubFinancialStatements()); - result = financialStatements.get(index); - } + FinancialStatement result = financialStatements.get(index); return result; } @Override public int getIndexOfChild(Object parent, Object child) { - int result = 0; - - if (parent == getRoot()) { - List<FinancialStatement> financialStatements = - financialStatementService.getRootFinancialStatements(); - result = financialStatements.indexOf(child); - } else { - FinancialStatement parentFinancialStatement = - (FinancialStatement) parent; + FinancialStatement parentFinancialStatement = + (FinancialStatement) parent; - List<FinancialStatement> financialStatements = - Lists.newArrayList(parentFinancialStatement.getSubFinancialStatements()); + List<FinancialStatement> financialStatements = + Lists.newArrayList(parentFinancialStatement.getSubFinancialStatements()); - result = financialStatements.indexOf(child); - } + int result = financialStatements.indexOf(child); return result; } @@ -183,13 +175,17 @@ public class FinancialStatementChartTreeTableModel extends AbstractTreeTableMode @Override public boolean isLeaf(Object node) { - return getChildCount(node) == 0; + FinancialStatement financialStatement = (FinancialStatement) node; + return financialStatement != getRoot() && !financialStatement.isHeader(); } /** Refresh FinancialStatementChart. */ public void refreshTree() { + FinancialStatement master = (FinancialStatement) root; + master.setSubFinancialStatements(financialStatementService.getRootFinancialStatements()); + modelSupport.fireNewRoot(); } @@ -204,12 +200,22 @@ public class FinancialStatementChartTreeTableModel extends AbstractTreeTableMode // Calling account service FinancialStatement parentFinancialStatementHeader = (FinancialStatement) path.getLastPathComponent(); - if (parentFinancialStatementHeader == getRoot()) { - parentFinancialStatementHeader = null; - } + try { - financialStatementService.createFinancialStatement( - parentFinancialStatementHeader, financialStatement); + + if (parentFinancialStatementHeader == getRoot()) { + financialStatement = financialStatementService.createMasterFinacialStatements( + financialStatement); + parentFinancialStatementHeader.addSubFinancialStatements(financialStatement); + } else { + financialStatement = financialStatementService.createFinancialStatement( + parentFinancialStatementHeader, financialStatement); + binderFinancialStatement.copy(financialStatement.getMasterFinancialStatement(), parentFinancialStatementHeader); + } + + modelSupport.fireTreeStructureChanged(path); + + } catch (AlreadyExistFinancialStatement alreadyExistFinancialStatement) { errorHelper.showErrorMessage(t("lima.financialStatement.error.alreadyExistFinancialStatement", alreadyExistFinancialStatement.getFinancialStatementLabel(), alreadyExistFinancialStatement.getMasterLabel())); @@ -217,7 +223,6 @@ public class FinancialStatementChartTreeTableModel extends AbstractTreeTableMode errorHelper.showErrorMessage(t("lima.error.notAllowedLabel", notAllowedLabel.getLabel())); } - modelSupport.fireTreeStructureChanged(path); } @@ -229,8 +234,9 @@ public class FinancialStatementChartTreeTableModel extends AbstractTreeTableMode */ public void updateFinancialStatement(TreePath path, FinancialStatement financialStatement) { - financialStatementService.updateFinancialStatement(financialStatement); - modelSupport.fireTreeStructureChanged(path); + FinancialStatement updateFinancialStatement = financialStatementService.updateFinancialStatement(financialStatement); + binderFinancialStatement.copy(updateFinancialStatement, financialStatement); + modelSupport.firePathChanged(path); } 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 e0f3e35..3fb4314 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 @@ -24,6 +24,7 @@ package org.chorem.lima.ui.financialstatementchart; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.business.LimaServiceFactory; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.FinancialStatementService; import org.chorem.lima.business.api.ImportService; @@ -32,15 +33,20 @@ import org.chorem.lima.entity.FinancialStatement; import org.chorem.lima.entity.FinancialStatementImpl; import org.chorem.lima.enums.FinancialStatementsChartEnum; import org.chorem.lima.enums.ImportExportEnum; -import org.chorem.lima.business.LimaServiceFactory; import org.chorem.lima.ui.importexport.ImportExport; import org.chorem.lima.util.ReportDialogView; import org.jdesktop.swingx.JXTreeTable; import org.nuiton.util.Resource; -import javax.swing.*; +import javax.swing.AbstractAction; +import javax.swing.ActionMap; +import javax.swing.InputMap; +import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.JTextArea; +import javax.swing.KeyStroke; import javax.swing.tree.TreePath; -import java.awt.*; +import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; @@ -255,18 +261,13 @@ public class FinancialStatementChartViewHandler implements ServiceListener { (FinancialStatementChartTreeTableModel) treeTable.getTreeTableModel(); // get selected account - int selectedRow = view.treeTable.getSelectedRow(); - TreePath treePath = view.treeTable.getPathForRow(selectedRow); // not null + int selectedRow = treeTable.getSelectedRow(); + TreePath treePath = treeTable.getPathForRow(selectedRow); // not null FinancialStatement financialStatement = (FinancialStatement) treePath.getLastPathComponent(); //update Account or update SubLedger if (financialStatement != null) { - // get current selection path - if (selectedRow != -1) { - treePath = view.treeTable.getPathForRow(selectedRow); - } else { - treePath = new TreePath(treeTableModel.getRoot()); - } + //test if selectedrow is account or ledger log.debug(financialStatement.isHeader()); if (financialStatement.isHeader()) { @@ -390,7 +391,11 @@ public class FinancialStatementChartViewHandler implements ServiceListener { (FinancialStatementsChartEnum) value; ImportExport importExport = new ImportExport(view); importExport.importExport(ImportExportEnum.CSV_FINANCIALSTATEMENTS_IMPORT, - null, financialStatementsEnum.getDefaultFileUrl(), true); + null, null, true); + + FinancialStatementChartTreeTableModel treeTableModel = (FinancialStatementChartTreeTableModel) view.getTreeTable().getTreeTableModel(); + + treeTableModel.refreshTree(); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

12/28: refs #1209: A l'ajout automatique d'une écriture le focus ne correspond pas à la cellule éditée
by chorem.org scm 15 May '15

15 May '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1176 in repository lima. See http://git.chorem.org/lima.git commit a8f2deeaf8e73321861a02ff29d6dac422abbdd1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 8 09:39:24 2015 +0200 refs #1209: A l'ajout automatique d'une écriture le focus ne correspond pas à la cellule éditée --- .../ui/financialtransaction/FinancialTransactionTable.java | 11 ++++++----- .../FinancialTransactionViewHandler.java | 13 ++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java index cae0c9c..ce6e084 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java @@ -96,13 +96,11 @@ public class FinancialTransactionTable extends FinancialTransactionDefaultTable< BigDecimal debit = transaction.getAmountDebit(); if (credit.compareTo(debit) != 0) { table.handler.addEntry(); - column = 2; - row++; + // addEntry entry change selection end = true; } else if (row >= nbRows - 1) { table.handler.addFinancialTransaction(); - column = 0; - row++; + // addFinancialTransaction change selection end = true; } else { column = 0; @@ -116,7 +114,10 @@ public class FinancialTransactionTable extends FinancialTransactionDefaultTable< column++; } } while (!end && !tableModel.isCellEditable(row,column)); - changeSelection(row, column, false, false); + + if (!end) { + changeSelection(row, column, false, false); + } } } } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java index b9f869b..44ab57b 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java @@ -475,7 +475,7 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo int index = tableModel.indexOf(transaction); selectionModel.setSelectionInterval(index, index); table.changeSelection(index, 1, false, false); - table.editCellAt(index, 1); + table.requestFocus(); table.scrollRowToVisible(Math.max(0, index - 5)); table.scrollRowToVisible(Math.min(tableModel.size() -1 , index + transaction.sizeEntry() + 5)); } catch (LockedFinancialPeriodException e) { @@ -532,7 +532,7 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo selectionModel.setSelectionInterval(index, index); //focus on second column table.changeSelection(index, 1, false, false); - table.editCellAt(index, 1); + table.requestFocus(); } catch (LockedFinancialPeriodException e) { errorHelper.showErrorMessage(t("lima.entries.paste.entry.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), @@ -584,7 +584,7 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo selectionModel.setSelectionInterval(addIndex, addIndex); // set focus on date table.changeSelection(addIndex, 0, false, false); - table.editCellAt(addIndex, 0); + table.requestFocus(); table.scrollRowToVisible(Math.max(0, addIndex - 5)); table.scrollRowToVisible(Math.min(tableModel.size() - 1, addIndex + 5)); } catch (LockedFinancialPeriodException e) { @@ -691,7 +691,7 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo row, row); // set focus on voucher table.changeSelection(row, 1, false, false); - table.editCellAt(row, 1); + table.requestFocus(); } catch (LockedFinancialPeriodException e) { errorHelper.showErrorMessage(t("lima.entries.add.entry.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), @@ -742,7 +742,7 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo selectionModel.setSelectionInterval( indexSelectedRow, indexSelectedRow); table.changeSelection(indexSelectedRow, 1, false, false); - table.editCellAt(indexSelectedRow, 1); + table.requestFocus(); } } catch (LockedFinancialPeriodException e) { errorHelper.showErrorMessage(t("lima.entries.remove.transaction.error.lockedFinancialPeriod", @@ -787,7 +787,7 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo selectionModel.setSelectionInterval( indexSelectedRow, indexSelectedRow); table.changeSelection(indexSelectedRow, 1, false, false); - table.editCellAt(indexSelectedRow, 1); + table.requestFocus(); } } catch (LockedFinancialPeriodException e) { errorHelper.showErrorMessage(t("lima.entries.remove.entry.error.lockedFinancialPeriod", @@ -842,7 +842,6 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo int firstRow = tableModel.indexOf(transaction); int lastRow = firstRow + transaction.sizeEntry() - 1; tableModel.fireTableRowsUpdated(firstRow, lastRow); - table.editCellAt(selectedRow, selectedColumn); } catch (LockedEntryBookException e) { errorHelper.showErrorMessage(t("lima.entries.assign.error.lockedEntryBook", e.getClosedPeriodicEntryBook().getEntryBook().getCode(), -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

11/28: refs #1222: Le lettrage ne fonctionne plus
by chorem.org scm 15 May '15

15 May '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1176 in repository lima. See http://git.chorem.org/lima.git commit 4347f89274c0c0445f46e5827522077f9cf66865 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 8 09:42:50 2015 +0200 refs #1222: Le lettrage ne fonctionne plus --- .../src/main/java/org/chorem/lima/ui/lettering/LetteringView.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css index b40b962..919c5b9 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css @@ -25,19 +25,19 @@ #lettered { toolTipText : "lima.lettering.lettered"; - enabled : {editModel.lettred}; + enabled : {editModel.isLettred()}; actionIcon : "lettering"; } #noLettered { toolTipText : "lima.lettering.unLettered"; - enabled : {editModel.unLettred}; + enabled : {editModel.isUnLettred()}; actionIcon : "un-lettering"; } #round { toolTipText : "lima.lettering.equalize"; - enabled : {editModel.equalized}; + enabled : {editModel.isEqualized()}; actionIcon : "balance"; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

10/28: refs #1221: Erreur à l'annulation des import/export
by chorem.org scm 15 May '15

15 May '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1176 in repository lima. See http://git.chorem.org/lima.git commit 94b81e09fc6d96b4152ee53a786c7b4f998c5c3a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 8 09:30:34 2015 +0200 refs #1221: Erreur à l'annulation des import/export --- .../chorem/lima/ui/importexport/ImportExport.java | 55 ++++++++++++---------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java index d0c4de2..8ab4506 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java @@ -140,15 +140,17 @@ public class ImportExport { final Charset defaultCharset = Charsets.UTF_8; if (Strings.isNullOrEmpty(exportPath) && importUrl == null) { exportPath = chooseFile(importExportChoice.getImportMode(), importExportChoice); - File file = new File(exportPath); - if (file.exists()) { - try { - importUrl = file.toURI().toURL(); - } catch (MalformedURLException e) { - throw new LimaTechnicalException("Can't open file " + exportPath); + if (exportPath != null) { // if null ==> cancel import/export + File file = new File(exportPath); + if (file.exists()) { + try { + importUrl = file.toURI().toURL(); + } catch (MalformedURLException e) { + throw new LimaTechnicalException("Can't open file " + exportPath); + } + } else { + throw new LimaTechnicalException("Can't open file from path" + exportPath); } - } else { - throw new LimaTechnicalException("Can't open file from path" + exportPath); } } processImportExport(verbose, importExportChoice, defaultCharset, exportPath, importUrl); @@ -189,27 +191,32 @@ public class ImportExport { final Charset defaultCharset = Charsets.UTF_8; URL importFileUrl; String importFilePath = chooseFile(importExportChoice.getImportMode(), importExportChoice); - File file = new File(importFilePath); - if (file.exists()) { - try { - importFileUrl = file.toURI().toURL(); - } catch (MalformedURLException e) { - throw new LimaTechnicalException("Can't open file " + importFilePath); + if (importFilePath != null) { // if null ==> cancel import + File file = new File(importFilePath); + if (file.exists()) { + try { + importFileUrl = file.toURI().toURL(); + } catch (MalformedURLException e) { + throw new LimaTechnicalException("Can't open file " + importFilePath); + } + } else { + throw new LimaTechnicalException("Can't open file from path" + importFilePath); } - } else { - throw new LimaTechnicalException("Can't open file from path" + importFilePath); + log.info("Precessing import:" + importFileUrl.getPath() + " " + importFilePath + " " + importFileUrl.getFile()); + processImportExport(verbose, importExportChoice, defaultCharset, null, importFileUrl); } - log.info("Precessing import:" + importFileUrl.getPath() + " " + importFilePath + " " + importFileUrl.getFile()); - processImportExport(verbose, importExportChoice, defaultCharset, null, importFileUrl); } protected void processExport(final ImportExportEnum importExportChoice, boolean verbose) { String exportFilePath = chooseFile(importExportChoice.getImportMode(), importExportChoice); - if (StringUtils.isNotBlank(exportFilePath)) { - log.info("Precessing export:" + exportFilePath); - processImportExport(verbose, importExportChoice, Charsets.UTF_8, exportFilePath, null); - } else { - throw new LimaTechnicalException("Targeted directory can not be found."); + if (exportFilePath != null) { // if null ==> cancel export + File file = new File(exportFilePath); + if (file.exists()) { + log.info("Precessing export:" + exportFilePath); + processImportExport(verbose, importExportChoice, Charsets.UTF_8, exportFilePath, null); + } else { + throw new LimaTechnicalException("Targeted directory can not be found."); + } } } @@ -500,7 +507,7 @@ public class ImportExport { * @return the targeted file path */ public String chooseFile(Boolean importMode, ImportExportEnum importExportMethod) { - String filePath = ""; + String filePath = null; JFileChooser chooser = new JFileChooser(); //Encoding option -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0