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 f204eea refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. adds ac28667 refs #769 merge de mes modification en cours adds 5e5d8f2 refs #769 création d'un nouveau module pour la partie web de lima et création du rapport balance avec jasper report adds faab6df refs #769 mise à jour des dépendances et des pom adds 94b7adb refs #769 nettoyage suite à la création du module web adds 7592a6d refs #769 affichage des montants sur les sous comptes adds dc86e67 refs #769 ajout du numéro de page en bas de page adds 52a5eb0 refs #769 modification du l'affichage des données du rapport de balance adds b39b384 refs #769 Ajout génération rappor Journal Général Provisoire adds c98fe93 refs #769 ajout d'un fichier adds 862b042 refs #769 génération des rapports pour journaux adds 2c66058 refs #769 correction sur rapports pour journaux adds 895be8f refs #769 correction sur rapports pour journaux adds b3a2a4f refs #769 ajout saut de page entre les différents journaux adds 2fc5766 refs #769 affichage correct des soldes de journaux adds b82fc56 refs #769 uniformasation des thèmes adds 4e1051d refs #769 path for generating report can be set through config file, it allows user to set it's own report builder file adds 801d27a refs #769 String -> Bigdecimal when there are numeric account values adds c34e00d refs #769 set BigDecimal format for general entry book report adds d93ebd0 refs #769 fix Balance report fill-up adds d7a7b32 refs #769 Mise à jour des rapports adds 8138d5b refs #769 services for Leger report adds 988f41d refs #769 Leger report generation adds ecf8a6c refs #769 amélioration sur la récupération et la mise à jour des paramètres adds c060107 refs #934 mise à jour version Topia adds 189a555 refs #769 fix in case of no identity is provided adds 5007fb8 refs #769 add general ledger report adds 5c96a75 Merge branch 'develop' into feature/newReportBuilder adds 3a5bac7 fixes #1162: order fiscal periods by date on export to allow correct imports adds 1e945cc refs #1162: Add all import results if there are no error adds d3b231b Merge remote-tracking branch 'origin/develop' into develop adds 35fdbd3 [maven-release-plugin] copy for tag lima-0.7.3 adds 67b1827 Merge branch 'master' into develop adds 1332b1f refs #1162 fix fiscal transaction an enries import adds 8ddfa08 refs #1054 add exception messages adds f78563f fixes #1162 be sure the fiscal periods or ordered by begin date adds 6f1f910 fixes #1163 launch first start lima befaore loading main ui adds 1792fa7 refs #1163 update progression bar status and label adds 3ad1ac7 fixes #116 lancement du jar de l'ui fonctionnel adds da41ade refs #1159 lancement de lima-server fonctionnel adds 6bcd775 refs #1115 fix Multithreaded correctness - Incorrect lazy initialization and update of static field adds 4956e3b fixes #1104 revert removed code adds a9dcff4 refs #1167 auto-complete description field with account label adds 4e7662d suppression d'une dépendance renseignée deux fois adds 12365ad utilisation de chorempom 1.8.1 adds 14979bc fixes #1178 Une taille minimal pour la fenetre principale est définie par défaut adds 0fd28da fixes #1170 Correction du focus sur l'édition des entrées, nouvelle transaction focus sur date, nouvelle entrée focus sur pièce comptable adds e29c401 fixes #1170 Mauvais focus Merge branch 'feature/1170_Mauvais_focus_sur_saisie_ecriture' into develop adds 31d783f fixes #1122 gestion du cas ou la saisie ne peut être convertis en BigDecimal adds 4c4e28c improve code (limit scope of try - catch block) + add comment for NPE adds 2edd026 fixes #1122 Remplacer les champs de saisie texte par des champs de saisie numérique lorsque les données à saisir sont numériques Merge branch 'feature/1122-Type_Champ_Egal_T_Metier' into develop adds b0cf424 fixes #1174 création de transaction pour chaque changement de date puis de pièce comptable (déplacement de branche) adds 6ec23ac fixes #1168 Diminuer la largeur des liste déroulante Merge branch 'feature/1168-Diminuer_la_largeur_des_filtres' into develop adds 0f3e22b fixes #1166 rétablie le fonctionnement par défaut de la touche échape c.a.d annule les changements adds ca47bb6 remove unecessary mouse listener + logger adds f7bfdf4 fixes #1166 annulation de l'édition d'une cellule Merge branch 'feature/1166-Annule_Edition' into develop adds 46ab5ea fixes #1169 Saisie du jour uniquement sur l'édition des entrées adds 30e57ca fixes #1169 retrait d'une classe innutile adds c3d48a0 fixes #1169 retrait d'imports inutilisés adds f1dc446 improve validation of day of month + remove try catch block adds e211861 fixes #1169 saisie de date , uniquement je jour du mois Merge branch 'feature/1169-Saisie_du_jour_uniquement' into develop adds 3882543 refs #1161 : activate flyway migration service adds 86bc102 fixes #1161 Migration des bases de donées Merge branch 'feature/1161' into develop adds 74dc1b7 debut de code pour ajout des totaux en dessous du tableau adds 3410156 fixes #1178 formatage des nombres selon la configuration utilisateur, ajout de la balance, affichage en rouge de la balance si balance !=0 adds adfd84d fixes #1173 en saisie des ecritures , ajouter les totaux; Merge branch 'feature/1173_ajout_toto' into develop adds cb7fe5e fixes #1180 correction de potentiels npe sur entry.getAccount() adds 706b8b0 fixes #1180 NPE à la génération des rapports journaux Merge branch 'feature/1180-NPE_raport_journaux' into develop adds 11b1256 [jgitflow-maven-plugin]updating poms for 0.8.1-SNAPSHOT development adds 0493023 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 1914876 [jgitflow-maven-plugin]updating poms for branch '0.8' with snapshot versions adds 1658d92 prepare release 0.8 adds a8e610e [jgitflow-maven-plugin]updating poms for branch'release/0.8' with non-snapshot versions adds a4e802f prepare release 0.8 adds 9c6cb18 remove file to publish (see http://forge.codelutin.com/issues/6738) adds b5c8f29 Merge branch 'release/0.8' adds 08d7c4e Merge branch 'master' into develop adds fcfb03f [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 7a1de1f make release possible next time... adds 4732f93 fixes #1181 Ajout de clefs i18n adds 26677aa fixes #1181 Ajout de clefs i18n adds fa88c97 fixes #1181 Ajout de nouvelles traductions adds cb5581f fixes #1181 mettre à jour les traductions Merge branch 'feature/1181-internationalisation' into develop adds d289283 correction des scopes de dépendances adds fa9429a debut de correction sur les resources adds 4c7a5a5 fixes #1184 Mise à jour du compilateur jasper. Les fichiers sources permettant la génération des rapports et déplacé dans la partie ressource du module web. Dans les fichiers Jasper contenant des sous rapports on ne passe plus le chemin vers les fichiers sources enfants mais on passe directement les rapports Jasper compilés. Correction de la génération du rapport du grand livre qui n'affichait ni les entetes de compte ni les soldes. adds d85f38d fixes #1184 Ajout de commentaires et d'un fichier non précédement commité adds a32e17f optimize third parties + dependencies (the sooner, the BETTER\!) adds 9ff56eb genere la license et les third parties adds 5752b0d fixes #1183 Ajout d'une description plus complète de lima dans la partie "A propos" adds 5e94be2 Merge branch 'feature/1183_Fenetre_Popup_infos_manquantes' into develop adds a091a07 [jgitflow-maven-plugin]updating poms for 0.9-SNAPSHOT development adds b6d8ad4 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 4c76397 prepare release 0.8.1 adds 215ef70 [jgitflow-maven-plugin]updating poms for branch'release/0.8.1' with non-snapshot versions adds 953e04b Merge branch 'release/0.8.1' adds 67a1114 Merge branch 'master' into develop adds c834d79 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 07c3c57 fixes #1189: fix flayway properties in create database adds fd942df fixes #1196 changement de polices sur les rapports + correction à la génération de ceux ci adds 3b132bf refs #1196 il restait des polices non libres sur ce documents adds 479daf4 refs #1196 correction sur taille police trop grande adds 0dc1dd2 fixes #1196 Il faudrait empacter les fonts pour la génération des rapports Merge branch 'feature/1196-reports_font' into develop adds 22604db fixes #1194 les fichiers sont retrouvés via leur URL et non plus via le file path adds 11ced16 fixes #1194 Les fichiers d'import par défaut ne peuvent être chargés adds 546b909 correction sur scope de la dépendance 'jasperreports-fonts' adds d5b2b30 refs #1190 some fixes, work in progress adds 0dd23ac refs #1190 Refactoring déplacement de LimaServer sur la partie business, correction sur les POMs, ajout de paramètres à openEjb. La partie serveur démarre et la partie client essaie de s'y connecter mais elle ne semble pas y parvenir, elle démarre toujours sur une base locale. adds 30ac42d refs #1190 uncomment necessary code adds 32911a4 refs #1190 Le mode client serveur est fonctionnel adds 139b85e refs #1190 Revue de code : -renommage LimaServiceConfig en LimaBusinessConfig ; -correction des Lima*Config pour la définition du nom de la propriété de conf, ainsi que le nom du fichier de conf par défaut (lima-config.properties) adds 4a70606 Merge branch 'feature/1190-encodage-path' into develop adds b9b6b57 refs #1198 properties file rename lima.properties -> lima-config.properties adds 93d92a4 refs #1202 : optimisation du rafraichissment de la page d'accueil adds 15b5e1b refs #1202 : optimisation du temps de reponce de la saisie de écritures adds d77d66d prefer use inner class than anonymous class adds eda4da1 fixes #1202: Optimisation du temps de réponses de l'UI adds fded943 fixes #1206 Reduire la taille minimale de l'application adds d9bb931 Merge branch 'feature/1206' into develop adds aa44acf refs #1197 ajout du module lima-server, fonctionnel mais travail non terminé adds e73557c refs #1197 mise à jour des fichiers readme et ajout de fichiers manquants adds 02bce0d refs #1197 mise à jour des fichiers readme et ajout de fichiers manquants adds a2ea31a refs #1197 Le module serveur est responsable du lancement du serveur web adds c771fc5 refs #1197 renommage du zip du module server adds 9cace2b Make module lima-report independant against lima-business (only depends on lima-business-api) adds cf1949b Force BigDecimal formatting properties to be saved on server side adds 1b9c881 Move some configuration (about lima-report) in lima-business common module adds 5429310 Make lima-swing independent of lima-business (only lima-business-api) adds fea2115 Fix *ConfigOption naming ; remove some of the unused config options adds 76f02ea refs #1197 prise en compte des parametres ejbd par LimaServiceFactory adds 293a3b4 SimpleDateFormat is not thread-safe adds 5d551a0 Refactor lima-report and lima-server's HttpServerServlet adds ab38cb4 Fix resources module location (move misplaced, delete obsolete, ...) adds 72ca5d0 Rename model file to match module name adds 5f68057 Remove useless classes adds 304ae4c refs #1197 déplacement des dao sur business adds b874da8 refs #1197 fix some dependencies adds d92dc73 fixes #1197: Revoir la modularisation adds ac287f3 [jgitflow-maven-plugin]updating poms for 0.8.3-SNAPSHOT development adds 5947526 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b923f12 [jgitflow-maven-plugin]updating poms for branch '0.8.2' with snapshot versions adds 049f7c8 [jgitflow-maven-plugin]updating poms for branch'release/0.8.2' with non-snapshot versions adds 44c9906 fix third parties adds 2753820 fix license headers adds d7d9a15 refs #1197 Les implantations d'entités doivent être dans le module callao adds 078cd83 utilisation d'un package org.chorem.lima et pas d'un répertoire nommé org.chorem.lima SuperLol adds 2f1935d fix license headers adds d45413e Merge branch 'release/0.8.2' adds 937f0ae Merge branch 'master' into develop adds 7b18ab3 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 1abd1d3 refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. 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 (f204eea) \ N -- N -- N refs/heads/feature/1158 (1abd1d3) 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 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 1abd1d35ccd9981e543760297206c2dc565ea805 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Apr 1 10:52:41 2015 +0200 refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. Summary of changes: lima-business-api/pom.xml | 41 +- .../src/license/THIRD-PARTY.properties | 31 +- .../chorem/lima/business/ImportExportResults.java | 10 + .../chorem/lima/business}/LimaServiceFactory.java | 43 +- .../org/chorem/lima/business/ServiceListener.java | 0 .../chorem/lima/business/ServiceMonitorable.java | 0 .../lima/business}/ServiceMonitorableHandler.java | 3 +- .../chorem/lima/business/api/AccountService.java | 1 + .../api/ClosedPeriodicEntryBookService.java | 6 + .../chorem/lima/business/api/DocumentService.java | 48 - .../chorem/lima/business/api/EntryBookService.java | 7 + .../org/chorem/lima/business/api/EntryService.java | 22 + .../business/api/FinancialTransactionService.java | 3 + .../lima/business/api/FiscalPeriodService.java | 53 +- .../lima/business/api/HttpServerService.java | 31 - .../chorem/lima/business/api/OptionsService.java | 38 +- .../chorem/lima/business/api/ReportService.java | 2 +- .../business/api/report/BalanceReportService.java | 48 + .../api/report/GeneralEntryBookReportService.java | 44 + .../business/api/report/LedgerReportService.java | 45 + .../report/ProvisionalEntryBookReportService.java | 47 + .../LimaConfigOptionDef.java} | 16 +- .../lima/business/utils/AccountComparator.java | 0 .../lima/business/utils/BigDecimalToString.java | 62 ++ .../lima/business/utils/EntryComparator.java | 2 +- .../business/utils/FinancialPeriodComparator.java | 0 .../business/utils/FiscalPeriodComparator.java | 0 lima-business/README.txt | 1 - lima-business/pom.xml | 109 +-- lima-business/src/license/THIRD-PARTY.properties | 22 +- .../src/main/java/org/chorem/lima/LimaServer.java | 75 -- ...aServiceConfig.java => LimaBusinessConfig.java} | 185 ++-- .../lima/business/LimaConfigurationHelper.java | 22 + .../org/chorem/lima/business/LimaInterceptor.java | 2 +- .../accountingrules/DefaultAccountingRules.java | 2 +- .../lima/business/ejb/AbstractLimaService.java | 2 +- .../lima/business/ejb/AccountServiceImpl.java | 17 +- .../ejb/ClosedPeriodicEntryBookServiceImpl.java | 22 +- .../lima/business/ejb/DocumentServiceImpl.java | 985 --------------------- .../lima/business/ejb/EntryBookServiceImpl.java | 21 +- .../chorem/lima/business/ejb/EntryServiceImpl.java | 31 + .../lima/business/ejb/ExportServiceImpl.java | 34 +- .../business/ejb/FinancialPeriodServiceImpl.java | 4 +- .../ejb/FinancialTransactionServiceImpl.java | 35 +- .../lima/business/ejb/FiscalPeriodServiceImpl.java | 26 +- .../lima/business/ejb/HttpServerServiceImpl.java | 365 -------- .../lima/business/ejb/ImportServiceImpl.java | 69 +- .../lima/business/ejb/OptionsServiceImpl.java | 76 +- .../lima/business/ejb/ReportServiceImpl.java | 34 +- .../ejb/report/BalanceReportServiceImpl.java | 219 +++++ .../report/GeneralEntryBookReportServiceImpl.java | 208 +++++ .../ejb/report/LedgerReportServiceImpl.java | 155 ++++ .../ProvisionalEntryBookReportServiceImpl.java | 205 +++++ .../org/chorem/lima/entity/AccountTopiaDao.java | 0 .../entity/ClosedPeriodicEntryBookTopiaDao.java | 0 .../java/org/chorem/lima/entity/EntryTopiaDao.java | 15 +- .../lima/entity/FinancialPeriodTopiaDao.java | 0 .../lima/entity/FinancialStatementTopiaDao.java | 2 +- .../lima/entity/FinancialTransactionTopiaDao.java | 0 .../chorem/lima/entity/FiscalPeriodTopiaDao.java | 13 +- .../org/chorem/lima/entity/GeneratorHQuery.java | 0 .../entity/LimaCallaoTopiaApplicationContext.java | 0 .../entity/LimaCallaoTopiaPersistenceContext.java | 2 +- .../chorem/lima/entity/LimaFlywayServiceImpl.java | 123 +++ .../chorem/lima/entity/VatStatementTopiaDao.java | 0 .../java/org/chorem/lima/service/package-info.java | 27 - .../resources/i18n/lima-business_en_GB.properties | 154 +--- .../resources/i18n/lima-business_fr_FR.properties | 145 +-- .../org/chorem/lima/business/AbstractLimaTest.java | 485 +++++++++- .../lima/business/EntryBookServiceImplTest.java | 9 +- .../lima/business/ImportExportServiceTest.java | 150 +++- .../org/chorem/lima/business/LimaMiscTest.java | 4 +- .../org/chorem/lima/business/LimaTestsConfig.java | 4 +- .../accountingrules/AccountServiceRuleFrTest.java | 8 +- .../EntryBookServiceRuleFrTest.java | 8 +- .../FinancialPeriodServiceRuleFrTest.java | 8 +- .../FinancialTransactionServiceRuleFrTest.java | 8 +- .../FiscalPeriodServiceRuleFrTest.java | 8 +- .../accountingrules/ImportServiceRuleFrTest.java | 8 +- .../accountingrules/ReportServiceRuleFrTest.java | 8 +- .../src/test/resources/META-INF/ejb-jar.xml | 41 - lima-business/src/test/resources/log4j.properties | 4 +- lima-callao/pom.xml | 41 +- lima-callao/src/license/THIRD-PARTY.properties | 20 +- .../org/chorem/lima/DefaultServiceContext.java | 148 ---- .../main/java/org/chorem/lima/ServiceContext.java | 38 - .../org/chorem/lima/beans/BalanceAccountImpl.java | 54 ++ .../org/chorem/lima/entity/FiscalPeriodImpl.java | 57 ++ .../org/chorem/lima/filter/FilterGenerator.java | 20 +- .../db/migration/V0_5_0_0__migration1.sql | 24 + .../db/migration/V0_6_0_0__migration2.sql | 44 + .../resources/i18n/lima-callao_en_GB.properties | 31 +- lima-callao/src/main/xmi/accounting-model.zargo | Bin 46061 -> 0 bytes ...del.properties => lima-callao-model.properties} | 0 lima-callao/src/main/xmi/lima-callao-model.zargo | Bin 0 -> 57316 bytes LICENSE.txt => lima-report/LICENSE.txt | 0 {lima-swing => lima-report}/README.txt | 0 {lima-business => lima-report}/pom.xml | 183 ++-- .../src/license/THIRD-PARTY.properties | 22 +- .../chorem/lima/report/DocumentReportTypes.java | 33 +- .../org/chorem/lima/report}/DocumentsEnum.java | 15 +- .../org/chorem/lima/report/LimaReportConfig.java | 423 +++++++++ .../lima/report/service/DocumentService.java | 637 +++++++++++++ .../lima/report/service/GeneratedReport.java | 63 ++ .../chorem/lima/report/service/JasperReports.java | 183 ++++ .../balance/BalanceReportAccountReport.jrxml | 41 + .../balance/BalanceSubAccountsReport.jrxml | 383 ++++++++ .../jasperreports/balance/DocumentReport.jrxml | 275 ++++++ .../jasperreports/entryBook/DocumentReport.jrxml | 365 ++++++++ .../jasperreports/entryBook/EntryBookReport.jrxml | 109 +++ .../entryBook/FinancialPeriodReport.jrxml | 271 ++++++ .../entryBook/TransactionReport.jrxml | 297 +++++++ .../generalEntryBook/DocumentReport.jrxml | 320 +++++++ .../generalEntryBook/EntryBookPeriodReport.jrxml | 146 +++ .../GeneralEntryBookEntryReport.jrxml | 82 ++ .../generalLedger/DocumentReport.jrxml | 286 ++++++ .../generalLedger/GeneralLedgerEntryReport.jrxml | 252 ++++++ .../generalLedger/GeneralLedgerReport.jrxml | 174 ++++ .../src/main/resources/reports/vat_form_fr.pdf | Bin .../org/chorem/lima/report/action/ReportTest.java | 60 ++ LICENSE.txt => lima-server/LICENSE.txt | 0 lima-server/README.txt | 7 + {lima-swing => lima-server}/pom.xml | 224 ++--- .../src/license/THIRD-PARTY.properties | 27 +- .../src/main/assembly/bin.xml | 7 - .../src/main/assembly/lima-server | 0 .../java/org/chorem/lima/server}/FormatsEnum.java | 12 +- .../org/chorem/lima/server/HttpServerService.java | 295 ++++++ .../java/org/chorem/lima/server/LimaServer.java | 120 +++ .../org/chorem/lima/server/LimaServerConfig.java | 202 +++++ .../src/main/resources/images/accounts.png | Bin .../src/main/resources/images/entries.png | Bin .../src/main/resources/images/entrybooks.png | Bin .../src/main/resources/images/fiscalperiods.png | Bin .../src/main/resources/images/identity.png | Bin .../src/main/resources/images/puzzle_icon_mini.png | Bin .../src/main/resources/log4j.properties | 15 +- lima-swing/README.txt | 11 +- lima-swing/pom.xml | 76 +- lima-swing/src/license/THIRD-PARTY.properties | 23 +- lima-swing/src/main/assembly/bin.xml | 4 +- lima-swing/src/main/filters/pom.properties | 6 +- .../src/main/java/org/chorem/lima/LimaMain.java | 35 +- .../src/main/java/org/chorem/lima/LimaSplash.java | 6 +- .../chorem/lima/LimaSwingApplicationContext.java | 6 - .../main/java/org/chorem/lima/LimaSwingConfig.java | 101 +-- .../org/chorem/lima/enums/AccountsChartEnum.java | 14 +- .../org/chorem/lima/enums/EntryBooksChartEnum.java | 11 +- .../lima/enums/FinancialStatementsChartEnum.java | 11 +- .../org/chorem/lima/enums/ImportExportEnum.java | 39 +- .../chorem/lima/enums/VatStatementsChartEnum.java | 11 +- .../main/java/org/chorem/lima/ui/BetaLayerUI.java | 13 +- .../AccountCondition/AccountConditionView.css | 21 + .../BigDecimalConditionView.css | 21 + .../EntryBookConditionHandler.java | 4 +- .../EntryBookCondition/EntryBookConditionView.css | 21 + .../Filter/StringCondition/StringConditionView.css | 21 + .../ui/Filter/dateCondition/DateConditionView.css | 21 + .../DateIntervalConditionView.css | 21 + .../FinancialPeriodConditionHandler.java | 4 +- .../FinancialPeriodConditionView.css | 21 + .../FinancialTransactionConditionView.css | 21 + .../FiscalPeriodConditionHandler.java | 4 +- .../FiscalPeriodConditionView.css | 21 + .../src/main/java/org/chorem/lima/ui/MainView.css | 5 +- .../src/main/java/org/chorem/lima/ui/MainView.jaxx | 3 +- .../java/org/chorem/lima/ui/MainViewHandler.java | 104 ++- .../chorem/lima/ui/account/AccountImportForm.css | 2 +- .../lima/ui/account/AccountTreeTableRenderer.java | 9 +- .../chorem/lima/ui/account/AccountViewHandler.java | 61 +- .../ui/celleditor/BigDecimalTableCellEditor.java | 25 +- .../ui/celleditor/BigDecimalTableCellRenderer.java | 6 +- .../lima/ui/combobox/AccountComboBoxModel.java | 2 +- .../lima/ui/combobox/EntryBookComboBoxModel.java | 2 +- .../ui/combobox/FinancialPeriodComboBoxModel.java | 2 +- .../ui/combobox/FiscalPeriodComboBoxModel.java | 2 +- .../lima/ui/combobox/LeafAccountComboBoxModel.java | 2 +- .../lima/ui/combobox/LetterComboBoxModel.java | 5 +- .../chorem/lima/ui/common/AbstractLimaTable.java | 39 +- .../chorem/lima/ui/common/AccountListRenderer.java | 6 +- .../lima/ui/common/EntryBookListRenderer.java | 10 +- .../ui/common/FinancialPeriodListRenderer.java | 15 +- .../ui/common/FinancialTransactionTableModel.java | 6 +- .../lima/ui/common/FiscalPeriodListRenderer.java | 15 +- .../lima/ui/common/GenericComboBoxModel.java | 3 +- .../lima/ui/entrybook/EntryBookViewHandler.java | 4 +- .../FinancialPeriodViewHandler.java | 9 +- .../FinancialStatementChartTreeTableModel.java | 2 +- .../FinancialStatementChartViewHandler.java | 4 +- .../ui/financialtransaction/AccountColumn.java | 5 + .../lima/ui/financialtransaction/DayColumn.java | 117 +++ .../FinancialTransactionDefaultTable.java | 3 + .../FinancialTransactionView.css | 6 + .../FinancialTransactionView.jaxx | 16 +- .../FinancialTransactionViewHandler.java | 132 ++- .../FinancialTransactionSearchTableModel.java | 4 +- .../FinancialTransactionSearchView.css | 21 + .../FinancialTransactionSearchViewHandler.java | 2 +- .../FinancialTransactionUnbalancedView.jaxx | 7 +- .../ui/fiscalperiod/FiscalPeriodViewHandler.java | 2 +- .../org/chorem/lima/ui/home/AbstractHomePane.java | 5 +- .../java/org/chorem/lima/ui/home/AccountsPane.java | 2 +- .../org/chorem/lima/ui/home/EntryBooksPane.java | 2 +- .../lima/ui/home/FinancialTransactionsPane.java | 6 +- .../org/chorem/lima/ui/home/FiscalYearsPane.java | 2 +- .../java/org/chorem/lima/ui/home/HomeView.jaxx | 23 +- .../chorem/lima/ui/identity/IdentityHandler.java | 2 +- .../chorem/lima/ui/importexport/ImportExport.java | 384 ++++---- .../lima/ui/importexport/ImportExportWaitView.css | 21 + .../org/chorem/lima/ui/lettering/LetteringView.css | 21 + .../lima/ui/lettering/LetteringViewHandler.java | 15 +- .../lima/ui/lettering/LettringSelectionModel.java | 2 +- .../chorem/lima/ui/opening/CreateAccountsPanel.css | 2 +- .../lima/ui/opening/CreateFiscalPeriodPanel.jaxx | 2 +- .../ui/opening/CreateIdentityPanelHandler.java | 2 +- .../org/chorem/lima/ui/opening/OpeningView.jaxx | 2 +- .../chorem/lima/ui/opening/OpeningViewHandler.java | 28 +- .../lima/ui/vatchart/VatChartTreeTableModel.java | 2 +- .../lima/ui/vatchart/VatChartViewHandler.java | 11 +- .../org/chorem/lima/util/BigDecimalToString.java | 41 +- .../java/org/chorem/lima/util/ReportDialogView.css | 21 + .../org/chorem/lima/widgets/JWideComboBox.java | 5 +- .../chorem/lima/widgets/ScrollBasicComboPopup.java | 3 +- lima-swing/src/main/resources/META-INF/aop.xml | 37 - .../resources/i18n/lima-swing_en_GB.properties | 690 ++++++++------- .../resources/i18n/lima-swing_fr_FR.properties | 33 +- .../src/main/resources/import/vat_shortened.csv | 2 +- .../{lima-config.properties => lima-swing.config} | 5 +- lima-swing/src/main/resources/log4j.properties | 57 +- .../lima/ui/account/AccountViewHandlerTest.java | 12 +- ofbizNeogia/src/org/ofbiz/lima/AccountService.java | 5 +- ofbizNeogia/src/org/ofbiz/lima/EntryService.java | 7 +- ofbizNeogia/src/org/ofbiz/lima/JournalService.java | 5 +- ofbizNeogia/src/org/ofbiz/lima/PeriodService.java | 5 +- ofbizNeogia/src/org/ofbiz/lima/StatusService.java | 5 +- .../src/org/ofbiz/lima/TransactionService.java | 11 +- pom.xml | 132 ++- src/site/rst/devel/server.rst | 2 +- 238 files changed, 9865 insertions(+), 3742 deletions(-) rename {lima-business/src/main/java/org/chorem/lima/service => lima-business-api/src/main/java/org/chorem/lima/business}/LimaServiceFactory.java (78%) rename {lima-business => lima-business-api}/src/main/java/org/chorem/lima/business/ServiceListener.java (100%) rename {lima-business => lima-business-api}/src/main/java/org/chorem/lima/business/ServiceMonitorable.java (100%) rename {lima-business/src/main/java/org/chorem/lima/service => lima-business-api/src/main/java/org/chorem/lima/business}/ServiceMonitorableHandler.java (97%) delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/api/DocumentService.java delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/api/HttpServerService.java create mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/api/report/BalanceReportService.java create mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/api/report/GeneralEntryBookReportService.java create mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/api/report/LedgerReportService.java create mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/api/report/ProvisionalEntryBookReportService.java copy lima-business-api/src/main/java/org/chorem/lima/business/{exceptions/NoDataToImportException.java => config/LimaConfigOptionDef.java} (71%) rename {lima-business => lima-business-api}/src/main/java/org/chorem/lima/business/utils/AccountComparator.java (100%) create mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/utils/BigDecimalToString.java rename {lima-business => lima-business-api}/src/main/java/org/chorem/lima/business/utils/EntryComparator.java (91%) rename {lima-business => lima-business-api}/src/main/java/org/chorem/lima/business/utils/FinancialPeriodComparator.java (100%) rename {lima-business => lima-business-api}/src/main/java/org/chorem/lima/business/utils/FiscalPeriodComparator.java (100%) delete mode 100644 lima-business/src/main/java/org/chorem/lima/LimaServer.java rename lima-business/src/main/java/org/chorem/lima/business/{LimaServiceConfig.java => LimaBusinessConfig.java} (53%) delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/report/BalanceReportServiceImpl.java create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/report/GeneralEntryBookReportServiceImpl.java create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/report/LedgerReportServiceImpl.java create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/report/ProvisionalEntryBookReportServiceImpl.java rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java (94%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/FinancialStatementTopiaDao.java (94%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java (90%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/GeneratorHQuery.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaApplicationContext.java (100%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java (98%) create mode 100644 lima-business/src/main/java/org/chorem/lima/entity/LimaFlywayServiceImpl.java rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/VatStatementTopiaDao.java (100%) delete mode 100644 lima-business/src/main/java/org/chorem/lima/service/package-info.java delete mode 100644 lima-business/src/test/resources/META-INF/ejb-jar.xml delete mode 100644 lima-callao/src/main/java/org/chorem/lima/DefaultServiceContext.java delete mode 100644 lima-callao/src/main/java/org/chorem/lima/ServiceContext.java create mode 100644 lima-callao/src/main/java/org/chorem/lima/beans/BalanceAccountImpl.java create mode 100644 lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodImpl.java create mode 100644 lima-callao/src/main/resources/db/migration/V0_5_0_0__migration1.sql create mode 100644 lima-callao/src/main/resources/db/migration/V0_6_0_0__migration2.sql delete mode 100644 lima-callao/src/main/xmi/accounting-model.zargo rename lima-callao/src/main/xmi/{accounting-model.properties => lima-callao-model.properties} (100%) create mode 100644 lima-callao/src/main/xmi/lima-callao-model.zargo copy LICENSE.txt => lima-report/LICENSE.txt (100%) copy {lima-swing => lima-report}/README.txt (100%) copy {lima-business => lima-report}/pom.xml (56%) copy {lima-business => lima-report}/src/license/THIRD-PARTY.properties (57%) copy lima-business-api/src/main/java/org/chorem/lima/business/exceptions/AlreadyExistAccountException.java => lima-report/src/main/java/org/chorem/lima/report/DocumentReportTypes.java (56%) rename {lima-business/src/main/java/org/chorem/lima/business/utils => lima-report/src/main/java/org/chorem/lima/report}/DocumentsEnum.java (79%) create mode 100644 lima-report/src/main/java/org/chorem/lima/report/LimaReportConfig.java create mode 100644 lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java create mode 100644 lima-report/src/main/java/org/chorem/lima/report/service/GeneratedReport.java create mode 100644 lima-report/src/main/java/org/chorem/lima/report/service/JasperReports.java create mode 100644 lima-report/src/main/resources/jasperreports/balance/BalanceReportAccountReport.jrxml create mode 100644 lima-report/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml create mode 100644 lima-report/src/main/resources/jasperreports/balance/DocumentReport.jrxml create mode 100644 lima-report/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml create mode 100644 lima-report/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml create mode 100644 lima-report/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml create mode 100644 lima-report/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml create mode 100644 lima-report/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml create mode 100644 lima-report/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml create mode 100644 lima-report/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml create mode 100644 lima-report/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml create mode 100644 lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml create mode 100644 lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml rename {lima-business => lima-report}/src/main/resources/reports/vat_form_fr.pdf (100%) create mode 100644 lima-report/src/test/java/org/chorem/lima/report/action/ReportTest.java copy LICENSE.txt => lima-server/LICENSE.txt (100%) create mode 100644 lima-server/README.txt copy {lima-swing => lima-server}/pom.xml (72%) copy {lima-swing => lima-server}/src/license/THIRD-PARTY.properties (54%) rename {lima-business => lima-server}/src/main/assembly/bin.xml (89%) rename {lima-business => lima-server}/src/main/assembly/lima-server (100%) rename {lima-business-api/src/main/java/org/chorem/lima/business/utils => lima-server/src/main/java/org/chorem/lima/server}/FormatsEnum.java (88%) create mode 100644 lima-server/src/main/java/org/chorem/lima/server/HttpServerService.java create mode 100644 lima-server/src/main/java/org/chorem/lima/server/LimaServer.java create mode 100644 lima-server/src/main/java/org/chorem/lima/server/LimaServerConfig.java rename {lima-business => lima-server}/src/main/resources/images/accounts.png (100%) rename {lima-business => lima-server}/src/main/resources/images/entries.png (100%) rename {lima-business => lima-server}/src/main/resources/images/entrybooks.png (100%) rename {lima-business => lima-server}/src/main/resources/images/fiscalperiods.png (100%) rename {lima-business => lima-server}/src/main/resources/images/identity.png (100%) rename {lima-business => lima-server}/src/main/resources/images/puzzle_icon_mini.png (100%) rename lima-business/src/main/resources/lima.properties => lima-server/src/main/resources/log4j.properties (70%) create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DayColumn.java delete mode 100644 lima-swing/src/main/resources/META-INF/aop.xml rename lima-swing/src/main/resources/{lima-config.properties => lima-swing.config} (90%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.