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

branch feature/1158 updated (783fce3 -> ca5bde2)
by chorem.org scm 30 Nov '15

30 Nov '15

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 from 783fce3 import manquant new ca5bde2 correction suite au merge 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 ca5bde2a84afa61ebecfce3368f8ac110ff1335a Author: dcosse <cosse(a)codelutin.com> Date: Mon Nov 30 10:30:21 2015 +0100 correction suite au merge Summary of changes: .../java/org/chorem/lima/ui/common/FinancialTransactionTableModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/1158 updated (13810b7 -> 783fce3)
by chorem.org scm 30 Nov '15

30 Nov '15

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 13810b7 import manquant discards 1abd1d3 refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. adds f8d81c6 refs #1226 Hide close tab button if you cannot close the tab adds 2184fc7 fixes #1226 Hide close tab button if you cannot close the tab Merge branch 'feature/1226' into develop adds e06ef0c fixes #1193 La zone des critères de recherche apparait réduite, les critères de recherche ne sont donc pas visibles, il faudrait définir une taille minimale adds 2581c20 refs #1226 Hide close tab button if you cannot close the tab adds a9d9110 utilisation css adds e8a9357 fixes #1193: La zone des critères de recherche apparait réduite, les critères de recherche ne sont donc pas visibles, il faudrait définir une taille minimale Merge branch 'feature/1193' into develop adds 9243835 change remove icon on tab adds 47dacdc refs #1187 : account popups adds 0e30c25 refs #1187 : entry book popups adds 4ac2c21 refs #1187 : fiscal period popups adds ece040e refs #1187 : inancial statement popups adds 1f5f807 refs #1187 : Vat chart popups adds 37937e4 refs #1187 : identitiy popups adds 964faf1 fixes #1187: Améliorer l'apparence des Popup Merge branch 'feature/1187' into develop adds 3c0f684 refs #1221: Erreur à l'annulation des import/export adds 80adf13 fixes #1221 Erreur à l'annulation des import/export Merge branch 'feature/1221' into develop adds 9aa89d0 refs #1222: Le lettrage ne fonctionne plus adds cc2841b fixes #1222 Le lettrage ne fonctionne plus Merge branch 'feature/1222' into develop adds 8da87c9 refs #1209: A l'ajout automatique d'une écriture le focus ne correspond pas à la cellule éditée adds 275821d fixes #1209 A l'ajout automatique d'une écriture le focus ne correspond pas à la cellule éditée Merge branch 'feature/1209' into develop adds 89caf6e refs #1218: Plan BCR : exception à la deuxième modification d'un regrouppement adds 3e445d8 fixes #1218 Plan BCR : exception à la deuxième modification d'un regrouppement Merge branch 'feature/1218' into develop adds c771213 refs #1223: l'onglet lettrage est peu réactif adds c6e0e9a fixes #1223: l'onglet lettrage est peu réactif Merge branch 'feature/1223' into develop adds ead303a refs #1207 : correction d'erreurs criticals adds a0b7cbf refs #1207 corrections d'erreurs majeures adds 78602e6 refs #1207 corrections d'erreurs majeures adds 248ce54 rebase to develop (refs #1207) adds b7877b3 Merge branch 'feature/1207' into develop adds 1e13def refs #1210 rétablissement du fonctionnement des rapports en mode client/serveur adds d2dd63f refs #1210 allow to configure defferent address for Ejb than Http adds 0047b54 Merge branch 'feature/1210-client-server-params' into develop adds 951e181 [jgitflow-maven-plugin]updating poms for 0.8.4-SNAPSHOT development adds a2addde [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds ccbe508 [jgitflow-maven-plugin]updating poms for branch '0.8.3' with snapshot versions adds 21b81ce remove licences fron thirdparty adds 556fc85 [jgitflow-maven-plugin]updating poms for branch'release/0.8.3' with non-snapshot versions adds 10b0c67 Merge branch 'release/0.8.3' adds 24b6f47 Merge branch 'master' into develop adds 750c191 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 8021dbe [jgitflow-maven-plugin]updating poms for 0.8.5-SNAPSHOT development adds c016677 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds adf3308 [jgitflow-maven-plugin]updating poms for branch'release/0.8.4' with non-snapshot versions adds c95d5a1 Merge branch 'release/0.8.4' adds 5464ca5 Merge branch 'master' into develop adds f2a70f9 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 9a1e21c correction de la javadoc adds bf21713 refs #1199 : ajout de l'export du fichier des écritures comptables adds fbab021 fixes #1228 : correction import comptes. adds 10e2882 Merge branch 'feature/1228' into develop adds a1679da fixes #1119 : changement du layout pour les toolbar possiblement trop large adds f5f01d4 Merge branch 'feature/1119' into develop adds 565f06b fixes #1208 : ajouter le moi en toutes lettres + afficher la période dans la bar de statut adds f60f3ab fixes #1225 : si l'exercice est sur deux années afficher les deux années (ex : "2015 - 2016") adds b557829 refs #1208 : correction de la marge a droite de la balance. adds 5d95df9 refs #1199 : ajout de l'export du fichier des écritures comptables adds 12ce7b8 fixes #1228 : correction import comptes. adds 449120d fixes #1119 : changement du layout pour les toolbar possiblement trop large adds 1c0d6fb fixes #1208 : ajouter le moi en toutes lettres + afficher la période dans la bar de statut adds 99faafa refs #1208 : correction de la marge a droite de la balance. adds 807085c Merge branch 'feature/1208' into develop adds 931a9e6 fixes #1229 : recherche d'un compt sur tout ou partie du code ou de la désignation adds d0e4e99 refs #1229 : suppression d'une variable non utilisé. adds acf87ab Merge branch 'feature/1229' into develop adds 7c15303 fixes #1224 : Ajout la date et le journal de la transaction ainssi qu'un id permettant de distinguer les transactions adds 33d60db fixes #1231 : déplacement débit, crédit et solde. adds 6291377 refs #1186 : text d'a propos adds 66e4193 refs #1186 : correction text adds b6a5de8 refs #1186 : rendre dynamique l'année du copyright adds 8f3b127 refs #1186 : correction du text d'à propos et de la traduction. adds 5486747 Merge branch 'feature/1186' into develop adds 28e0454 refs #1199 : corrextion d'un index hors limites, ey précision d'un label. adds 1d60b71 fixes #1232 : ne pas clôturer un exercice avec des transactions en erreur adds cd3af52 refs #1233 : test du service des comptes + retructuration des initialiseur de test adds 391ae16 refs #1233 : test du service des journaux adds 89b999b refs #1233 : test du service des périodes fiscales (suppresion des fonctions de service non utilisé) adds d54b68d refs #1233 : test du service des transaction + correction et amélioration du code adds 47e387f refs #1233 : test du service des exercices adds 56d8305 Merge branch 'feature/1233' into develop adds 43a92d4 refs #1233 : test du service des exercices adds 4fa9916 refs #1233 : fix test and update log adds 30a62a3 fixes #1235 : fix import plan BCR (and journaux) adds b33247a fixes #1236 : afficher les exceptions métier adds 9c806ea fixes #1237 : fix id menu item adds f9c60c6 change Datepiker pattern adn fix account combobox dimension adds 96c285b refs #1176 : mise a jours des impressions d'écrans. et correction adds 6565524 refs #1176 : mise a jour d'un imprime écran et du tableau des fichierd CSV adds e93d950 Merge branch 'feature/1176-2' into develop adds 372bc24 mise à jour du pom parents adds 2f4f28c [jgitflow-maven-plugin]updating poms for 0.8.6-SNAPSHOT development adds 26817eb [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e57c000 fixes releases : add headers adds 6b45377 [jgitflow-maven-plugin]updating poms for branch'release/0.8.5' with non-snapshot versions adds 5062bb3 [jgitflow-maven-plugin]merging 'release/0.8.5' into 'master' adds 4024d64 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 19a980d [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 34f7074 refs #1240 ajout de controles adds 0112481 refs #1290 A la création d'une transaction si aucune n'a été créée lors de la même session est qu'une transaction est sélectionnée alors la nouvelle trasaction prend la date de celle-ci adds d100451 refs #1289 calcul de la colonne Solde dans l'onglet recherche des entrées adds acefd82 refs #1289refactoring adds 32aa3f8 refs #1289 Le solde est positif si le solde est débiteur adds 13b9893 Merge branch 'feature/1289-SearchEntriescomputeSold' into develop adds 26111c4 refs #1293 "Onglet Saisie des écritures" La saisie dans le champ jour est dirrectement prise en compte adds 54e25dd refs #1293 Auto selection du compte si un seul compte correspond à la recherche adds 785fc80 refs #1295 Même objet sélectionné entre la combobox et le model adds c51843f Merge branch 'feature/1295-improveEditEntryView' into develop adds 2d2c8a4 refs #1241 ordonne les entrée par date adds 8ef9bf6 refs #1286 Regrouppement des entrées par pièces comptable dans la saisie d'écriture adds bce1075 refs #1286 La solution adopter n'est pas idéale, il faudra revoir le model pour ordonnée les entrée d'une transaction voir ref #1207 adds 4bbfd4d Merge branch 'feature/1286-ordered-entries' into develop adds 636a5ba refs #1242 verifivation que l'on filtre bien sur un compte adds ae8502c fixes #1243 la sortie du champ date ou le clic sur une autre action entraine bien la prise en compte des dates saisies adds 2dc6345 refs #1242 Modification pour plus de lisibilité suite à revue de code Kevin adds 79ebf7d refs #1242 Refactoring pour plus de lisibilité adds 4d8ac91 refs #1242 correction de merge adds 7288ae1 Merge branch 'feature/1242-no-account-research-exception' into develop adds 9fd0c2f refs #1297correction pour ne pas remonter les entitées ayant une date > à celle indiquée dans la période adds bde8128 refs #1298 corrige NPE dans le cas ou aucune donnée existe adds e3d95f9 refs #1242 ordre des traductions revu adds d9b4a7d Merge branch 'feature/1298-FixNPE' into develop adds 959bbc3 refs #1268 l'interface de saisie d'un plan de TVA est de nouveau fonctionnelle adds 6b2e99c refs #1268 utilisation de JXTreeTable à la place de VatChartTreeTable adds 73a9813 refs #1268 déplacement du ListSelectionModel dans le handler adds b44dada Merge branch 'feature/1268-vat-statement-usable' into develop adds 635828d refs #1242 correction sur refactoring adds a0857b1 Mise à jour de la déclaration de licences new 48cc69d refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. new 783fce3 import manquant 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 (13810b7) \ N -- N -- N refs/heads/feature/1158 (783fce3) 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 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 783fce3030175b90ff7da17ae77fbd674936fd9e Author: dcosse <cosse(a)codelutin.com> Date: Mon Nov 30 10:12:09 2015 +0100 import manquant commit 48cc69d2b2f6d93ad307f58e00c91fb116ab5cde Author: Sylvain Bavencoff <bavencoff(a)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: 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 - .../org/chorem/lima/business/ServiceListener.java | 2 +- .../chorem/lima/business/api/AccountService.java | 5 +- .../chorem/lima/business/api/ExportService.java | 9 + .../lima/business/api/FinancialPeriodService.java | 4 - .../business/api/FinancialStatementService.java | 8 +- .../business/api/FinancialTransactionService.java | 12 +- .../lima/business/api/FiscalPeriodService.java | 38 +- .../chorem/lima/business/api/OptionsService.java | 3 +- .../lima/business/api/VatStatementService.java | 5 +- .../lima/business/exceptions/AccountException.java | 9 +- .../exceptions/AfterLastFiscalPeriodException.java | 2 +- ...on.java => AlreadyAffectedVatBoxException.java} | 14 +- .../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 +- ...lException.java => RequiredFieldException.java} | 14 +- .../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 +- .../org/chorem/lima/business/AccountingRules.java | 35 +- .../chorem/lima/business/LimaBusinessConfig.java | 57 +- .../accountingrules/DefaultAccountingRules.java | 190 +++-- .../accountingrules/FranceAccountingRules.java | 10 +- .../lima/business/ejb/AccountServiceImpl.java | 16 +- .../lima/business/ejb/ExportServiceImpl.java | 50 +- .../business/ejb/FinancialPeriodServiceImpl.java | 18 - .../ejb/FinancialStatementServiceImpl.java | 62 +- .../ejb/FinancialTransactionServiceImpl.java | 39 +- .../lima/business/ejb/FiscalPeriodServiceImpl.java | 62 +- .../lima/business/ejb/ImportServiceImpl.java | 116 ++- .../lima/business/ejb/OptionsServiceImpl.java | 6 +- .../lima/business/ejb/VatStatementServiceImpl.java | 74 +- .../chorem/lima/business/ejb/csv/EntryModel.java | 98 ++- .../business/ejb/csv/FiscalControlExportModel.java | 153 ++++ .../ejb/report/BalanceReportServiceImpl.java | 24 +- .../lima/business/utils/EntryEBPComparator.java | 7 +- .../utils/FinancialTransactionComparator.java | 42 -- .../org/chorem/lima/entity/AccountTopiaDao.java | 2 +- .../entity/ClosedPeriodicEntryBookTopiaDao.java | 6 +- .../java/org/chorem/lima/entity/EntryTopiaDao.java | 57 +- .../lima/entity/FinancialPeriodTopiaDao.java | 14 - .../lima/entity/FinancialTransactionTopiaDao.java | 1 - .../chorem/lima/entity/FiscalPeriodTopiaDao.java | 24 - .../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/AbstractLimaTest.java | 575 ++------------ .../org/chorem/lima/business/AccountDaoTest.java | 7 +- .../lima/business/AccountServiceImplTest.java | 332 +++++--- .../lima/business/EntryBookServiceImplTest.java | 147 +++- .../business/FinancialPeriodServiceImplTest.java | 260 ++++++- .../FinancialTransactionServiceImplTest.java | 638 +++++++++++++++- .../lima/business/FiscalPeriodServiceImplTest.java | 640 +++++++++++++--- .../lima/business/ImportExportServiceTest.java | 47 +- .../lima/business/ReportServiceImplTest.java | 7 +- .../lima/entity/FinancialTransactionDAOTest.java | 5 +- lima-business/src/test/resources/log4j.properties | 4 +- 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 | 6 +- lima-swing/src/license/THIRD-PARTY.properties | 1 + .../src/main/java/org/chorem/lima/LimaMain.java | 1 + .../chorem/lima/LimaSwingApplicationContext.java | 6 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 36 +- .../org/chorem/lima/enums/AccountsChartEnum.java | 29 +- .../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 | 23 +- .../java/org/chorem/lima/ui/ClosableTabHeader.css | 14 +- .../java/org/chorem/lima/ui/ClosableTabHeader.jaxx | 6 +- .../AccountCondition/AccountConditionHandler.java | 18 +- .../AccountCondition/AccountConditionView.css | 8 +- .../AccountCondition/AccountConditionView.jaxx | 11 +- .../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 +- .../ui/Filter/dateCondition/DateConditionView.jaxx | 2 +- .../DateIntervalConditionHandler.java | 9 +- .../DateIntervalConditionView.jaxx | 7 +- .../FinancialPeriodConditionHandler.java | 13 +- .../FinancialTransactionConditionHandler.java | 2 +- .../FiscalPeriodConditionHandler.java | 10 +- .../java/org/chorem/lima/ui/LimaRendererUtil.java | 8 +- .../src/main/java/org/chorem/lima/ui/MainView.css | 280 +++++-- .../src/main/java/org/chorem/lima/ui/MainView.jaxx | 4 +- .../java/org/chorem/lima/ui/MainViewHandler.java | 16 +- .../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 | 29 +- .../chorem/lima/ui/account/UpdateAccountForm.css | 2 + .../chorem/lima/ui/account/UpdateAccountForm.jaxx | 17 +- .../lima/ui/celleditor/AccountTableCellEditor.java | 86 +-- .../ui/celleditor/AccountTableCellRenderer.java | 2 +- .../ui/celleditor/AutoCompleteTableCellEditor.java | 8 +- .../ui/celleditor/DateLimaTableCellRenderer.java | 2 +- .../lima/ui/celleditor/DateTableCellEditor.java | 11 +- .../celleditor/DayTableCellEditor.java} | 24 +- .../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 +- ...ountComboBoxModel.java => AccountComboBox.java} | 70 +- .../lima/ui/combobox/AccountComboBoxModel.java | 102 --- .../lima/ui/combobox/EntryBookComboBoxModel.java | 9 +- .../ui/combobox/FinancialPeriodComboBoxModel.java | 167 ----- .../ui/combobox/FiscalPeriodComboBoxModel.java | 16 +- .../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/AccountComboBoxModel.java | 54 -- .../lima/ui/common/CellRouteHorizontalAction.java | 2 +- .../lima/ui/common/CellRouteVerticalAction.java | 2 +- .../java/org/chorem/lima/ui/common/Column.java | 2 +- .../ui/common/FinancialPeriodListRenderer.java | 14 +- .../ui/common/FinancialTransactionTableModel.java | 63 +- .../lima/ui/common/FiscalPeriodListRenderer.java | 21 +- .../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 | 23 +- .../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 | 57 +- .../ui/financialtransaction/BalanceColumn.java | 37 +- .../lima/ui/financialtransaction/CreditColumn.java | 2 +- .../lima/ui/financialtransaction/DateColumn.java | 2 +- .../lima/ui/financialtransaction/DayColumn.java | 6 +- .../lima/ui/financialtransaction/DebitColumn.java | 2 +- .../ui/financialtransaction/DescriptionColumn.java | 2 +- .../ui/financialtransaction/EntryBookColumn.java | 2 +- .../FinancialTransactionDefaultTable.java | 11 +- .../FinancialTransactionErrorDetector.java | 2 +- .../FinancialTransactionTable.java | 13 +- .../FinancialTransactionView.css | 13 +- .../FinancialTransactionView.jaxx | 5 +- .../FinancialTransactionViewHandler.java | 99 ++- .../lima/ui/financialtransaction/LetterColumn.java | 2 +- .../ui/financialtransaction/VoucherColumn.java | 2 +- .../FinancialTransactionSearchTableModel.java | 11 +- .../FinancialTransactionSearchView.css | 6 +- .../FinancialTransactionSearchView.jaxx | 7 +- .../FinancialTransactionSearchViewHandler.java | 28 +- .../FiscalControlExportView.css} | 58 +- .../FiscalControlExportView.jaxx | 85 +++ .../FiscalControlExportViewHandler.java | 229 ++++++ .../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 | 170 +++-- .../fiscalperiod/RetainedEarningsEntryBookForm.css | 33 +- .../RetainedEarningsEntryBookForm.jaxx | 85 +-- .../java/org/chorem/lima/ui/home/AccountsPane.java | 6 +- .../org/chorem/lima/ui/home/EntryBooksPane.java | 8 +- .../lima/ui/home/FinancialTransactionsPane.java | 6 +- .../org/chorem/lima/ui/home/FiscalYearsPane.java | 10 +- .../org/chorem/lima/ui/identity/IdentityForm.css | 18 +- .../org/chorem/lima/ui/identity/IdentityForm.jaxx | 130 ++-- .../chorem/lima/ui/importexport/ImportExport.java | 88 ++- .../org/chorem/lima/ui/lettering/LetteringView.css | 47 +- .../chorem/lima/ui/lettering/LetteringView.jaxx | 65 +- .../lima/ui/lettering/LetteringViewHandler.java | 112 +-- .../org/chorem/lima/ui/lettering/TypeEntry.java | 10 +- .../ui/opening/CreateIdentityPanelHandler.java | 9 +- .../chorem/lima/ui/opening/OpeningViewHandler.java | 69 +- .../chorem/lima/ui/vatchart/VatChartImportForm.css | 35 +- .../lima/ui/vatchart/VatChartImportForm.jaxx | 84 +-- .../lima/ui/vatchart/VatChartMovementForm.css | 31 +- .../lima/ui/vatchart/VatChartMovementForm.jaxx | 72 +- .../chorem/lima/ui/vatchart/VatChartTreeTable.java | 134 ---- .../lima/ui/vatchart/VatChartTreeTableModel.java | 226 ------ .../org/chorem/lima/ui/vatchart/VatChartView.jaxx | 26 +- .../lima/ui/vatchart/VatChartViewHandler.java | 399 ++++++---- .../chorem/lima/ui/vatchart/VatChartViewModel.java | 191 +++++ .../java/org/chorem/lima/util/ErrorHelper.java | 19 - .../java/org/chorem/lima/util/ReportDialogView.css | 5 +- .../org/chorem/lima/util/ReportDialogView.jaxx | 2 +- .../org/chorem/lima/util/WrapToolBarLayout.java | 129 ++++ .../resources/i18n/lima-swing_en_GB.properties | 64 +- .../resources/i18n/lima-swing_fr_FR.properties | 101 ++- .../src/main/resources/icons/action-cancel.png | Bin 0 -> 587 bytes ...on-vatStatement-remove.png => action-close.png} | Bin .../src/main/resources/icons/action-closeTab.png | Bin 3140 -> 0 bytes .../resources/icons/action-fiscalControlExport.png | Bin 0 -> 1244 bytes lima-swing/src/main/resources/icons/action-ok.png | Bin 0 -> 537 bytes lima-swing/src/main/resources/icons/warning.png | Bin 0 -> 965 bytes .../src/main/resources/import/pcg_developed.csv | 831 ++++++++++++++++++++- .../src/main/resources/import/vat_developed.csv | 56 -- .../src/main/resources/import/vat_shortened.csv | 56 -- lima-swing/src/main/resources/lima-swing.config | 1 + pom.xml | 6 +- src/site/procedure.txt | 15 + src/site/resources/extras/exemple_ecritures.csv | 162 ++-- src/site/resources/screens/export_ebp_1.png | Bin 114103 -> 94362 bytes src/site/resources/screens/export_ebp_2.png | Bin 17856 -> 8139 bytes src/site/resources/screens/export_ebp_3.png | Bin 71482 -> 54392 bytes src/site/resources/screens/export_ebp_4.png | Bin 24204 -> 14348 bytes src/site/resources/screens/export_ebp_5.png | Bin 30588 -> 14741 bytes src/site/resources/screens/export_ebp_6.png | Bin 26990 -> 11937 bytes src/site/resources/screens/export_ebp_7.png | Bin 17221 -> 6030 bytes .../resources/screens/lima_charts_accounts.png | Bin 133980 -> 66178 bytes .../resources/screens/lima_charts_entrybooks.png | Bin 43275 -> 34352 bytes .../screens/lima_charts_financialperiod.png | Bin 136544 -> 55293 bytes .../screens/lima_charts_financialstatement.png | Bin 92981 -> 53248 bytes .../resources/screens/lima_charts_fiscalperiod.png | Bin 53467 -> 36434 bytes src/site/resources/screens/lima_entries.png | Bin 140056 -> 37587 bytes .../resources/screens/lima_financialstatement.png | Bin 71670 -> 66083 bytes src/site/resources/screens/lima_home.png | Bin 50198 -> 36968 bytes src/site/resources/screens/lima_import_charset.png | Bin 56032 -> 42025 bytes src/site/resources/screens/lima_import_limaall.png | Bin 64072 -> 46841 bytes .../resources/screens/lima_incorrectEntries.png | Bin 110247 -> 30473 bytes src/site/resources/screens/lima_lettering.png | Bin 170873 -> 59893 bytes src/site/resources/screens/lima_open_account.png | Bin 39308 -> 26602 bytes src/site/resources/screens/lima_open_entrybook.png | Bin 31108 -> 21208 bytes .../resources/screens/lima_open_fiscalperiod.png | Bin 28827 -> 19797 bytes src/site/resources/screens/lima_open_identity.png | Bin 31849 -> 27903 bytes src/site/resources/screens/lima_open_welcome.png | Bin 35463 -> 24208 bytes .../resources/screens/lima_reports_accounts.png | Bin 64174 -> 38541 bytes .../resources/screens/lima_reports_balance.png | Bin 56936 -> 34936 bytes .../resources/screens/lima_reports_entrybooks.png | Bin 61887 -> 0 bytes .../screens/lima_reports_financialstatement.png | Bin 57424 -> 0 bytes src/site/resources/screens/lima_reports_ledger.png | Bin 57008 -> 0 bytes src/site/resources/screens/lima_searchEntry.png | Bin 66603 -> 47531 bytes .../resources/screens/lima_searchtransaction.png | Bin 93053 -> 0 bytes src/site/rst/assistant.rst | 18 +- src/site/rst/features.rst | 31 +- src/site/rst/importexport.rst | 40 +- src/site/rst/install.rst | 4 +- 342 files changed, 6583 insertions(+), 4281 deletions(-) copy lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{NotAllowedLabelException.java => AlreadyAffectedVatBoxException.java} (74%) rename lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{AlreadyExistFinancialStatement.java => AlreadyExistFinancialStatementException.java} (82%) copy lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{NotAllowedLabelException.java => RequiredFieldException.java} (74%) create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalControlExportModel.java delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/utils/FinancialTransactionComparator.java copy lima-swing/src/main/java/org/chorem/lima/{util/BigDecimalToString.java => ui/celleditor/DayTableCellEditor.java} (60%) copy lima-swing/src/main/java/org/chorem/lima/ui/combobox/{LeafAccountComboBoxModel.java => AccountComboBox.java} (56%) delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.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/AccountComboBoxModel.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/common/IntervalListener.java copy lima-swing/src/main/java/org/chorem/lima/ui/{financialtransactionunbalanced/FinancialTransactionUnbalancedView.css => fiscalControlExport/FiscalControlExportView.css} (51%) create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/fiscalControlExport/FiscalControlExportView.jaxx create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/fiscalControlExport/FiscalControlExportViewHandler.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewModel.java create mode 100644 lima-swing/src/main/java/org/chorem/lima/util/WrapToolBarLayout.java create mode 100644 lima-swing/src/main/resources/icons/action-cancel.png copy lima-swing/src/main/resources/icons/{action-vatStatement-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-fiscalControlExport.png create mode 100644 lima-swing/src/main/resources/icons/action-ok.png create mode 100644 lima-swing/src/main/resources/icons/warning.png delete mode 100644 lima-swing/src/main/resources/import/vat_developed.csv delete mode 100644 lima-swing/src/main/resources/import/vat_shortened.csv create mode 100644 src/site/procedure.txt delete mode 100644 src/site/resources/screens/lima_reports_entrybooks.png delete mode 100644 src/site/resources/screens/lima_reports_financialstatement.png delete mode 100644 src/site/resources/screens/lima_reports_ledger.png delete mode 100644 src/site/resources/screens/lima_searchtransaction.png -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

branch feature/1158 updated (1abd1d3 -> 13810b7)
by chorem.org scm 30 Nov '15

30 Nov '15

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 from 1abd1d3 refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. new 13810b7 import manquant 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 13810b7cf7ec3fdad97d914f3710aaf620911154 Author: dcosse <cosse(a)codelutin.com> Date: Mon Nov 30 10:12:09 2015 +0100 import manquant Summary of changes: .../org/chorem/lima/ui/common/FinancialTransactionTableModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (b44dada -> a0857b1)
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from b44dada Merge branch 'feature/1268-vat-statement-usable' into develop new 635828d refs #1242 correction sur refactoring new a0857b1 Mise à jour de la déclaration de licences 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 a0857b1ab6b98fff329a1a7c4ed686d12ced461d Author: dcosse <cosse(a)codelutin.com> Date: Mon Nov 30 09:47:48 2015 +0100 Mise à jour de la déclaration de licences commit 635828d791c6060501390a056a25fbec8029de5a Author: dcosse <cosse(a)codelutin.com> Date: Sun Nov 29 22:32:41 2015 +0100 refs #1242 correction sur refactoring Summary of changes: lima-swing/src/license/THIRD-PARTY.properties | 1 + .../java/org/chorem/lima/ui/financialtransaction/AccountColumn.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

branch feature/1293-addAccountViewerTab updated (ca881cf -> 0609df0)
by chorem.org scm 30 Nov '15

30 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1293-addAccountViewerTab in repository lima. See http://git.chorem.org/lima.git from ca881cf refs #1268 déplacement de donnés liées au model de l'handler au model et suppression de listener innutils new 0609df0 Mise à jour de la déclaration de licences 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 0609df0358578025052622702b9ec222cf8f8200 Author: dcosse <cosse(a)codelutin.com> Date: Mon Nov 30 09:41:24 2015 +0100 Mise à jour de la déclaration de licences Summary of changes: lima-swing/src/license/THIRD-PARTY.properties | 1 + 1 file changed, 1 insertion(+) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (d9b4a7d -> b44dada)
by chorem.org scm 29 Nov '15

29 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from d9b4a7d Merge branch 'feature/1298-FixNPE' into develop new 959bbc3 refs #1268 l'interface de saisie d'un plan de TVA est de nouveau fonctionnelle new 6b2e99c refs #1268 utilisation de JXTreeTable à la place de VatChartTreeTable new 73a9813 refs #1268 déplacement du ListSelectionModel dans le handler new b44dada Merge branch 'feature/1268-vat-statement-usable' into develop The 4 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 b44dada9baa979834a53f5f213a7a96fdb4aa251 Merge: d9b4a7d 73a9813 Author: dcosse <cosse(a)codelutin.com> Date: Sun Nov 29 08:07:31 2015 +0100 Merge branch 'feature/1268-vat-statement-usable' into develop commit 73a98135dd2ab3db5440d14331450e5e3cdbb451 Author: dcosse <cosse(a)codelutin.com> Date: Wed Sep 30 11:34:35 2015 +0200 refs #1268 déplacement du ListSelectionModel dans le handler commit 6b2e99c335e784dc608478520d978eccb282a809 Author: dcosse <cosse(a)codelutin.com> Date: Wed Jul 22 12:31:24 2015 +0200 refs #1268 utilisation de JXTreeTable à la place de VatChartTreeTable commit 959bbc3dcb9cc2323762236db2bc240a61e9b926 Author: dcosse <cosse(a)codelutin.com> Date: Wed Jul 22 11:17:26 2015 +0200 refs #1268 l'interface de saisie d'un plan de TVA est de nouveau fonctionnelle Summary of changes: .../org/chorem/lima/business/ServiceListener.java | 2 +- .../lima/business/api/VatStatementService.java | 5 +- ...on.java => AlreadyAffectedVatBoxException.java} | 14 +- ...lException.java => RequiredFieldException.java} | 14 +- .../lima/business/ejb/ImportServiceImpl.java | 17 +- .../lima/business/ejb/VatStatementServiceImpl.java | 74 ++-- .../chorem/lima/enums/VatStatementsChartEnum.java | 5 +- .../chorem/lima/ui/account/AccountViewHandler.java | 3 +- .../lima/ui/combobox/EntryBookComboBoxModel.java | 4 +- .../ui/combobox/FiscalPeriodComboBoxModel.java | 4 +- .../lima/ui/entrybook/EntryBookViewHandler.java | 8 +- .../ui/fiscalperiod/FiscalPeriodViewHandler.java | 4 +- .../java/org/chorem/lima/ui/home/AccountsPane.java | 6 +- .../org/chorem/lima/ui/home/EntryBooksPane.java | 8 +- .../lima/ui/home/FinancialTransactionsPane.java | 6 +- .../org/chorem/lima/ui/home/FiscalYearsPane.java | 10 +- .../chorem/lima/ui/opening/OpeningViewHandler.java | 69 +--- .../lima/ui/vatchart/VatChartMovementForm.css | 2 + .../lima/ui/vatchart/VatChartMovementForm.jaxx | 19 +- .../chorem/lima/ui/vatchart/VatChartTreeTable.java | 134 ------- .../lima/ui/vatchart/VatChartTreeTableModel.java | 226 ------------ .../org/chorem/lima/ui/vatchart/VatChartView.jaxx | 26 +- .../lima/ui/vatchart/VatChartViewHandler.java | 401 +++++++++++++-------- .../chorem/lima/ui/vatchart/VatChartViewModel.java | 191 ++++++++++ .../resources/i18n/lima-swing_en_GB.properties | 2 + .../resources/i18n/lima-swing_fr_FR.properties | 4 +- .../src/main/resources/import/vat_developed.csv | 56 --- .../src/main/resources/import/vat_shortened.csv | 56 --- 28 files changed, 591 insertions(+), 779 deletions(-) copy lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{NotAllowedLabelException.java => AlreadyAffectedVatBoxException.java} (74%) copy lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{NotAllowedLabelException.java => RequiredFieldException.java} (74%) delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTable.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewModel.java delete mode 100644 lima-swing/src/main/resources/import/vat_developed.csv delete mode 100644 lima-swing/src/main/resources/import/vat_shortened.csv -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 4

branch feature/1268-vat-statement-usable deleted (was 73a9813)
by chorem.org scm 29 Nov '15

29 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1268-vat-statement-usable in repository lima. See http://git.chorem.org/lima.git was 73a9813 refs #1268 déplacement du ListSelectionModel dans le handler This change permanently discards the following revisions: discards 73a9813 refs #1268 déplacement du ListSelectionModel dans le handler discards 6b2e99c refs #1268 utilisation de JXTreeTable à la place de VatChartTreeTable discards 959bbc3 refs #1268 l'interface de saisie d'un plan de TVA est de nouveau fonctionnelle -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/1268-vat-statement-usable updated (52b3857 -> 73a9813)
by chorem.org scm 29 Nov '15

29 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1268-vat-statement-usable in repository lima. See http://git.chorem.org/lima.git discards 52b3857 refs #1268 déplacement du ListSelectionModel dans le handler discards fef92f6 refs #1268 utilisation de JXTreeTable à la place de VatChartTreeTable discards 5b05f81 refs #1268 l'interface de saisie d'un plan de TVA est de nouveau fonctionnelle adds 0112481 refs #1290 A la création d'une transaction si aucune n'a été créée lors de la même session est qu'une transaction est sélectionnée alors la nouvelle trasaction prend la date de celle-ci adds d100451 refs #1289 calcul de la colonne Solde dans l'onglet recherche des entrées adds acefd82 refs #1289refactoring adds 32aa3f8 refs #1289 Le solde est positif si le solde est débiteur adds 13b9893 Merge branch 'feature/1289-SearchEntriescomputeSold' into develop adds 26111c4 refs #1293 "Onglet Saisie des écritures" La saisie dans le champ jour est dirrectement prise en compte adds 54e25dd refs #1293 Auto selection du compte si un seul compte correspond à la recherche adds 785fc80 refs #1295 Même objet sélectionné entre la combobox et le model adds c51843f Merge branch 'feature/1295-improveEditEntryView' into develop adds 2d2c8a4 refs #1241 ordonne les entrée par date adds 8ef9bf6 refs #1286 Regrouppement des entrées par pièces comptable dans la saisie d'écriture adds bce1075 refs #1286 La solution adopter n'est pas idéale, il faudra revoir le model pour ordonnée les entrée d'une transaction voir ref #1207 adds 4bbfd4d Merge branch 'feature/1286-ordered-entries' into develop adds 636a5ba refs #1242 verifivation que l'on filtre bien sur un compte adds ae8502c fixes #1243 la sortie du champ date ou le clic sur une autre action entraine bien la prise en compte des dates saisies adds 2dc6345 refs #1242 Modification pour plus de lisibilité suite à revue de code Kevin adds 79ebf7d refs #1242 Refactoring pour plus de lisibilité adds 4d8ac91 refs #1242 correction de merge adds 7288ae1 Merge branch 'feature/1242-no-account-research-exception' into develop adds 9fd0c2f refs #1297correction pour ne pas remonter les entitées ayant une date > à celle indiquée dans la période adds bde8128 refs #1298 corrige NPE dans le cas ou aucune donnée existe adds e3d95f9 refs #1242 ordre des traductions revu adds d9b4a7d Merge branch 'feature/1298-FixNPE' into develop new 959bbc3 refs #1268 l'interface de saisie d'un plan de TVA est de nouveau fonctionnelle new 6b2e99c refs #1268 utilisation de JXTreeTable à la place de VatChartTreeTable new 73a9813 refs #1268 déplacement du ListSelectionModel dans le handler 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 (52b3857) \ N -- N -- N refs/heads/feature/1268-vat-statement-usable (73a9813) 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 73a98135dd2ab3db5440d14331450e5e3cdbb451 Author: dcosse <cosse(a)codelutin.com> Date: Wed Sep 30 11:34:35 2015 +0200 refs #1268 déplacement du ListSelectionModel dans le handler commit 6b2e99c335e784dc608478520d978eccb282a809 Author: dcosse <cosse(a)codelutin.com> Date: Wed Jul 22 12:31:24 2015 +0200 refs #1268 utilisation de JXTreeTable à la place de VatChartTreeTable commit 959bbc3dcb9cc2323762236db2bc240a61e9b926 Author: dcosse <cosse(a)codelutin.com> Date: Wed Jul 22 11:17:26 2015 +0200 refs #1268 l'interface de saisie d'un plan de TVA est de nouveau fonctionnelle Summary of changes: .../lima/business/ejb/AccountServiceImpl.java | 9 ++-- .../ejb/FinancialTransactionServiceImpl.java | 2 +- .../entity/ClosedPeriodicEntryBookTopiaDao.java | 6 +-- .../java/org/chorem/lima/entity/EntryTopiaDao.java | 19 +++++--- .../AccountCondition/AccountConditionHandler.java | 6 ++- .../ui/Filter/dateCondition/DateConditionView.jaxx | 2 +- .../DateIntervalConditionView.jaxx | 7 +-- .../lima/ui/celleditor/AccountTableCellEditor.java | 28 +++++++++-- .../lima/ui/celleditor/DayTableCellEditor.java | 30 +++++------- .../ui/common/FinancialTransactionTableModel.java | 56 +++++++++++++++++++++- .../ui/financialtransaction/AccountColumn.java | 48 +++++++++++++------ .../ui/financialtransaction/BalanceColumn.java | 35 +++++++++++--- .../lima/ui/financialtransaction/DayColumn.java | 6 ++- .../FinancialTransactionViewHandler.java | 45 +++++++++++++---- .../FinancialTransactionSearchTableModel.java | 15 ++++-- .../FiscalControlExportViewHandler.java | 2 +- .../resources/i18n/lima-swing_en_GB.properties | 1 + .../resources/i18n/lima-swing_fr_FR.properties | 1 + pom.xml | 2 +- 19 files changed, 239 insertions(+), 81 deletions(-) copy lima-business-api/src/main/java/org/chorem/lima/LimaTechnicalException.java => lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DayTableCellEditor.java (64%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

branch develop updated (9fd0c2f -> d9b4a7d)
by chorem.org scm 29 Nov '15

29 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from 9fd0c2f refs #1297correction pour ne pas remonter les entitées ayant une date > à celle indiquée dans la période new bde8128 refs #1298 corrige NPE dans le cas ou aucune donnée existe new e3d95f9 refs #1242 ordre des traductions revu new d9b4a7d Merge branch 'feature/1298-FixNPE' into develop 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 d9b4a7d36bf94993153b399524aa3999b52072ff Merge: 9fd0c2f e3d95f9 Author: dcosse <cosse(a)codelutin.com> Date: Sun Nov 29 07:38:18 2015 +0100 Merge branch 'feature/1298-FixNPE' into develop commit e3d95f981ee7e66c3efa06d57c21d5e371834a84 Author: dcosse <cosse(a)codelutin.com> Date: Sun Nov 29 07:38:02 2015 +0100 refs #1242 ordre des traductions revu commit bde81288585be9c20472a785e35282967a76a3af Author: dcosse <cosse(a)codelutin.com> Date: Thu Sep 24 14:46:52 2015 +0200 refs #1298 corrige NPE dans le cas ou aucune donnée existe Summary of changes: .../lima/business/ejb/AccountServiceImpl.java | 9 +++---- .../FinancialTransactionViewHandler.java | 28 +++++++++++++++------- .../FiscalControlExportViewHandler.java | 2 +- .../resources/i18n/lima-swing_en_GB.properties | 1 + .../resources/i18n/lima-swing_fr_FR.properties | 1 + 5 files changed, 28 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

branch feature/1298-FixNPE deleted (was e3d95f9)
by chorem.org scm 29 Nov '15

29 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/1298-FixNPE in repository lima. See http://git.chorem.org/lima.git was e3d95f9 refs #1242 ordre des traductions revu This change permanently discards the following revisions: discards e3d95f9 refs #1242 ordre des traductions revu discards bde8128 refs #1298 corrige NPE dans le cas ou aucune donnée existe -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0