branch feature/1174-Import_EBP_Transactions updated (866bcc2 -> 7a00a52)
This is an automated email from the git hooks/post-receive script. New change to branch feature/1174-Import_EBP_Transactions in repository lima. See https://gitlab.nuiton.org/chorem/lima.git discards 866bcc2 refs #1174 création de transaction pour chaque changement de date puis de pièce comptable (déplacement de branche) 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 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 adds d5f467a refs #1295 Le tableau de la saisie des écritures n'est pas éditable si la période est cloturé pour le journal sélectionné adds 4a1b1d5 refs #1158 Ajout de commentaires + désactivation du boutton de création d'une transaction adds 253998b refs #1158 Sur l'onglet lettrage il n'est pas possible de modifier une selection comportant une entrée vérouillée. Ajout d'une colonne 'clos' indiquant les entrées vérouillées. adds 9957610 Merge branch 'feature/1158-NotEditableTableForClose' into develop adds b4b645f refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. adds b119160 import manquant adds 7cd3ef3 correction suite au merge adds fd35125 Merge branch 'feature/1158' into develop adds f0e4f29 refs #1241 gérération des rapport de compte avec Jasper adds 03e84c6 refs #1241 gérération des rapport de compte avec Jasper adds 4c16fcb refs #1241 ne pas afficher les lignes ne comportant aucun montant de renseigné adds e9c8126 refs #1241 modification de l'affichage des infos adds ce734ff refs #1241 factorisation du code source Jasper, utilisation de style adds 643e3a5 refs #1241 correction sur nom de police adds 9afd18d refs #1241 refactoring adds b019126 refs #1241 refactoring général sur les rapports, renommage variable, utilisation de style dans les rapports adds 8b18d5e refs #1241 réactivation de l'impression de la TVA, avec mise à jour des données adds dedb5b9 refs #1241 mise à jour du plan de TVA adds 9a297ab refs #1268 permet la saisie des informations concernant le trésor public et affichage de ses infos lors de l'export TVA adds f56fee1 refs #1241 placement correcte des champs dans la fenêtre de saisie de l'identité adds cfd3f21 refs #1241 correction sur le formulaire concernant le trésor public. Renommage du boutton OK en Valider adds 797522f refs #1241 pas de changement dans l'interface de configuration du premier lancement adds 9c2a471 refs #1241 modificaction des écans de 1er configuration afin de prendre en compte les changements sur l'identité. adds 6c63783 refs #1241 ajout de l'icon de sauvegarde présente sur le 1er écran au 1er lancement de lima adds 7cc39ee refs #1241 progression sur internationalisation des rapports, ajout de l'entête avec l'identité sur tous les rapports adds b4373cd refs #1241mise à jour du plan de tva adds 21cbf77 refs #1241 minor adds e8e622e refs #1241 internationalisation sur le rapport de compte adds 5a144b5 refs #1241 internationalisation sur le rapport de compte adds 887373c refs #1241 ajout possibilité de créer des rapports de balance globale ou générale (le dernier par défaut centralise les comptes 401 avec ses sous comptes idem pour 411) adds b8a6ceb refs #1241 monté de version je Jasper report adds 6f487bf refs #1241 refactoring de code adds 1179c09 refs #1241 modification sur en tête du rapport et correction pour appeler la bonne méthode. adds 4e94d24 refs #1241 modification sur en tête du rapport et correction pour appeler la bonne méthode. adds 0919fa5 refs #1241 Ajout de traductions adds 7f54c9e refs #1298 corrige la génération de rapport pour les comptes si aucun compte n'existe adds 5655683 correction suite au merge adds 3d5a336 Merge branch 'feature/1241-account-report' into develop adds a200c71 refs #1287 ajout du montant total pour à l'onglet Lettrage adds 746e8ce refs #1287 import manquant adds 07988ba Merge branch 'feature/1287-compute-summary-on-lettering' into develop adds 1977c6c refs #686 Redémarrage complet de lima pour que l'internationalisation soit complète adds a47f485 refs #1182 Ajout de traductions adds 98ca966 refs #1182 Traduction des dates pickers adds e9ea36e refs #1182 rétablit le fonctionnement des datepicker sur interval adds 25b8310 Merge branch 'feature/1182-translation' into develop adds 4fe0543 montée de version mineur de libs adds 3c9b729 Mise à jour fichiers de licences adds 234f3ac Mise à jour fichiers de licences adds 1c09d51 Migration sur gitlab + utilisation chorempom 5-rc-2 adds 205012d refs #1182 valeur de clef de traduction manquante adds ce75d95 refs #1158 Il est de nouveau possible de créer une transaction sur une periode ou un exercice non clos adds 2bbb45e Merge branch 'feature/1158-Corriger-le-comportement-d-ajout-de-transaction' into develop adds 747bd28 refs #1241 Ajout d'un oglet consultation de compte, travail en cours adds fe9ed6b refs #1241 Ajout de la possibilité de choisir entre deux modes de sélection des entrées (Manuelle ou Balancée) + Ajout d'icones adds 25f8c7c refs #1241 Ajout de la possibilité de choisir entre deux modes de sélection des entrées (Manuelle ou Balancée) adds f66d9ad refs #1293 la validation des dates des date pickers est possible au Tab adds 22f84a3 refs #1293 Correction d'une exception survenant si un nom de compte est saisie est que aucun compte ne correspond adds 02e31e2 refs #1293 Correction sur les dates pickers et la recherche de compte appliquée égallement à l'onglet Lettering adds 4bf2d82 refs #1293 Traduction des dates pickers adds fd114e2 refs #1293 refactoring, modification de style adds e5bd1d9 refs #1293 Ajout de la possibilité de choisir une consultation de compte pour un exercice, une période financière ou un interval de dates adds 397fdb3 refs #1293 correction i18n adds 754b9ae refs #1293 modification concernnt l'affichage des infos résumées adds e2bbeb7 refs #1293 refactoring et modification du calcul du sold précédent à l'année fiscale adds 94833f1 refs #1293 corrections et refactoring adds 8373b34 refs #1293 corrections pour le cas ou aucune données existe dans Lima adds 8ac5089 refs #1293 corrige exception dans le cas ou aucune periode financière existe avec la date choisie adds 6b7523e refs #1293 Correction i18n adds 358093c refs #1268 déplacement des models du jaxx au handler adds 7824a86 refs #1268 déplacement de donnés liées au model de l'handler au model et suppression de listener innutils adds 21a91b5 refs #1293 correction traductions adds a383d34 refs #1293 correction de merge adds 6610b22 Merge branch 'feature/1293-addAccountViewerTab' into develop adds c2c4efa refs #1241 correction de risque de npe sur génération de rapports adds 8a9e13b refs #1314 mise à jour version pom et Third-party adds 5e23e95 refs #1315 Ajout des nouvelles écritures aux écritures non vérouillées adds c99ab61 Fix build adds ca457cc Update parent pom adds 144659a doc(README.md): Actualisation du README avec le contenu de l'index du site adds e099d71 refs #1316 ajout de logs adds 5da06cc refs #1316 changement de comportement, il est possible de rechercher un compte tant qu'aucune correspondance a été trouvée, une fois une correspondance unique trouvée la recherche est intérompue (peut-être reprise avec F12) et l'utilisateur peut alors passer sur une autre cellule adds 9622606 refs #1317 déclaration de licences manquante adds bc1f7e6 refs #1317 déclaration de licences manquante adds f761cfc refs #1317 déclaration de licences manquante adds 60c6329 refs #1317 déclaration de licences manquante adds 434a917 refs #1317 déclaration de licences manquante adds 5f97fd8 refs #1317 déclaration de licences manquante adds 9294f5d refs #1317 déclaration de licences manquante adds 7ea6ec6 refs #1317 déclaration de licences manquante adds d7915e5 Merge branch 'feature/1316-Rendre-utilisable-la-selection-de-compte' into develop adds 15845a6 refs #1361 correction sur affichage des erreurs d'import adds eb099f7 refs #1314 monté de version des libs adds 7671291 refs #1317 Crée une transaction Extourne ou placer les écritures créer pour équilibrer un lettrage new 7a00a52 refs #1174 création de transaction pour chaque changement de date puis de pièce comptable (déplacement de branche) 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 (866bcc2) \ N -- N -- N refs/heads/feature/1174-Import_EBP_Transactions (7a00a52) 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 7a00a52fa4dd3712a48e83b1e3ccf442c5d242a1 Author: dcosse <japbiw74> Date: Wed Feb 25 22:37:58 2015 +0100 refs #1174 création de transaction pour chaque changement de date puis de pièce comptable (déplacement de branche) Summary of changes: .gitignore | 5 + src/site/rst/index.rst => README.md | 38 +- README.txt | 4 + changelog.txt | 16 - lima-business-api/.gitignore | 1 + lima-business-api/{changelog.txt => README.md} | 0 lima-business-api/pom.xml | 28 +- .../src/license/THIRD-PARTY.properties | 21 +- .../org/chorem/lima/LimaTechnicalException.java | 2 +- .../chorem/lima/business/ImportExportResults.java | 2 +- .../org/chorem/lima/business/ImportResult.java | 2 + .../chorem/lima/business}/LimaServiceFactory.java | 35 +- .../org/chorem/lima/business/ServiceListener.java | 2 +- .../chorem/lima/business/ServiceMonitorable.java | 0 .../lima/business}/ServiceMonitorableHandler.java | 3 +- .../chorem/lima/business/api/AccountService.java | 11 +- .../api/ClosedPeriodicEntryBookService.java | 3 + .../chorem/lima/business/api/EntryBookService.java | 6 + .../chorem/lima/business/api/ExportService.java | 9 + .../lima/business/api/FinancialPeriodService.java | 10 +- .../business/api/FinancialStatementService.java | 8 +- .../business/api/FinancialTransactionService.java | 40 +- .../lima/business/api/FiscalPeriodService.java | 44 +- .../chorem/lima/business/api/ImportService.java | 11 + .../chorem/lima/business/api/OptionsService.java | 57 +- .../TreasuryService.java} | 17 +- .../lima/business/api/VatStatementService.java | 5 +- ...eportService.java => AccountReportService.java} | 14 +- .../business/api/report/BalanceReportService.java | 25 +- .../api/report/GeneralEntryBookReportService.java | 33 +- .../business/api/report/LedgerReportService.java | 29 +- .../report/ProvisionalEntryBookReportService.java | 31 +- .../LimaConfigOptionDef.java} | 16 +- .../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 +- .../lima/business/utils/AccountComparator.java | 0 .../lima/business/utils}/BigDecimalToString.java | 33 +- .../lima/business/utils/EntryComparator.java | 2 +- .../business/utils/FinancialPeriodComparator.java | 4 - .../business/utils/FiscalPeriodComparator.java | 0 lima-business/.gitignore | 1 + .../README.txt => lima-business/README.md | 0 lima-business/README.txt | 1 - lima-business/changelog.txt | 2 - lima-business/pom.xml | 66 +- lima-business/src/license/THIRD-PARTY.properties | 22 +- .../org/chorem/lima/business/AccountingRules.java | 35 +- .../chorem/lima/business/LimaBusinessConfig.java | 445 +++++++++++ .../org/chorem/lima/business/LimaInterceptor.java | 2 +- .../chorem/lima/business/LimaServiceConfig.java | 529 ------------- .../accountingrules/DefaultAccountingRules.java | 192 +++-- .../accountingrules/FranceAccountingRules.java | 10 +- .../lima/business/ejb/AccountServiceImpl.java | 31 +- .../ejb/ClosedPeriodicEntryBookServiceImpl.java | 11 + .../lima/business/ejb/EntryBookServiceImpl.java | 14 +- .../lima/business/ejb/ExportServiceImpl.java | 50 +- .../business/ejb/FinancialPeriodServiceImpl.java | 21 +- .../ejb/FinancialStatementServiceImpl.java | 62 +- .../ejb/FinancialTransactionServiceImpl.java | 122 ++- .../lima/business/ejb/FiscalPeriodServiceImpl.java | 81 +- .../lima/business/ejb/ImportServiceImpl.java | 131 +++- .../lima/business/ejb/OptionsServiceImpl.java | 95 +-- .../lima/business/ejb/ReportServiceImpl.java | 35 +- .../lima/business/ejb/TreasuryServiceImpl.java | 91 +++ .../lima/business/ejb/VatStatementServiceImpl.java | 74 +- .../chorem/lima/business/ejb/csv/EntryModel.java | 98 ++- .../business/ejb/csv/FiscalControlExportModel.java | 153 ++++ .../lima/business/ejb/csv/IdentityModel.java | 4 +- .../ejb/report/AccountReportServiceImpl.java | 147 ++++ .../ejb/report/BalanceReportServiceImpl.java | 328 ++++++-- .../business/ejb/report/CommonsDocumentReport.java | 79 ++ .../report/GeneralEntryBookReportServiceImpl.java | 77 +- .../ejb/report/LedgerReportServiceImpl.java | 85 ++- .../ProvisionalEntryBookReportServiceImpl.java | 112 +-- .../lima/business/utils/BigDecimalToString.java | 44 -- .../chorem/lima/business/utils/DocumentsEnum.java | 67 -- .../lima/business/utils/EntryEBPComparator.java | 7 +- .../utils/FinancialTransactionComparator.java | 42 -- .../org/chorem/lima/entity/AccountTopiaDao.java | 2 +- .../entity/ClosedPeriodicEntryBookTopiaDao.java | 29 +- .../java/org/chorem/lima/entity/EntryTopiaDao.java | 123 ++- .../lima/entity/FinancialPeriodTopiaDao.java | 34 +- .../lima/entity/FinancialStatementTopiaDao.java | 2 +- .../lima/entity/FinancialTransactionTopiaDao.java | 1 - .../chorem/lima/entity/FiscalPeriodTopiaDao.java | 34 +- .../org/chorem/lima/entity/GeneratorHQuery.java | 2 +- .../entity/LimaCallaoTopiaApplicationContext.java | 0 .../entity/LimaCallaoTopiaPersistenceContext.java | 4 - .../chorem/lima/entity/LimaFlywayServiceImpl.java | 123 +++ .../chorem/lima/entity/VatStatementTopiaDao.java | 0 .../resources/i18n/lima-business_en_GB.properties | 169 ++--- .../resources/i18n/lima-business_fr_FR.properties | 140 ++-- .../org/chorem/lima/business/AbstractLimaTest.java | 56 +- .../org/chorem/lima/business/AccountDaoTest.java | 7 +- .../lima/business/AccountServiceImplTest.java | 330 +++++--- .../lima/business/EntryBookServiceImplTest.java | 145 +++- .../business/FinancialPeriodServiceImplTest.java | 260 ++++++- .../FinancialTransactionServiceImplTest.java | 638 +++++++++++++++- .../lima/business/FiscalPeriodServiceImplTest.java | 640 +++++++++++++--- .../lima/business/ImportExportServiceTest.java | 32 +- .../org/chorem/lima/business/LimaMiscTest.java | 4 +- .../org/chorem/lima/business/LimaTestsConfig.java | 4 +- .../lima/business/ReportServiceImplTest.java | 5 +- .../accountingrules/AccountServiceRuleFrTest.java | 8 +- .../EntryBookServiceRuleFrTest.java | 8 +- .../FinancialPeriodServiceRuleFrTest.java | 8 +- .../FinancialTransactionServiceRuleFrTest.java | 8 +- .../FiscalPeriodServiceRuleFrTest.java | 8 +- .../accountingrules/ImportServiceRuleFrTest.java | 8 +- .../accountingrules/ReportServiceRuleFrTest.java | 8 +- .../lima/entity/FinancialTransactionDAOTest.java | 3 + .../src/test/resources/META-INF/ejb-jar.xml | 41 - lima-business/src/test/resources/log4j.properties | 6 +- .../src/test/resources/reports/AccountReport.jrxml | 144 ---- lima-callao/.gitignore | 1 + lima-callao/{README.txt => README.md} | 0 lima-callao/changelog.txt | 2 - lima-callao/pom.xml | 41 +- lima-callao/src/license/THIRD-PARTY.properties | 20 +- .../org/chorem/lima/DefaultServiceContext.java | 148 ---- .../org/chorem/lima/FinancialStatementWayEnum.java | 42 +- .../main/java/org/chorem/lima/ServiceContext.java | 38 - .../lima/beans/AbstractBigDecimalCondition.java | 4 +- .../chorem/lima/beans/AbstractStringCondition.java | 4 +- .../org/chorem/lima/beans/AccountCondition.java | 2 +- .../org/chorem/lima/beans/BalanceAccountImpl.java | 23 +- .../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/entity/FiscalPeriodImpl.java | 22 + .../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 +- .../db/migration/V0_5_0_0__migration1.sql | 24 + .../db/migration/V0_6_0_0__migration2.sql | 44 ++ .../V0_8_6_0__1241_create_table_TREASURY.sql | 54 ++ .../resources/i18n/lima-callao_en_GB.properties | 37 +- .../resources/i18n/lima-callao_fr_FR.properties | 6 +- lima-callao/src/main/xmi/accounting-model.zargo | Bin 56954 -> 0 bytes ...del.properties => lima-callao-model.properties} | 2 +- lima-callao/src/main/xmi/lima-callao-model.zargo | Bin 0 -> 61665 bytes lima-report/.gitignore | 1 + {lima-web => lima-report}/LICENSE.txt | 0 lima-web/README.txt => lima-report/README.md | 0 {lima-web => lima-report}/pom.xml | 124 +-- .../src/license/THIRD-PARTY.properties | 32 +- .../chorem/lima/report/DocumentReportTypes.java | 34 +- .../org/chorem/lima/report}/DocumentsEnum.java | 15 +- .../org/chorem/lima/report/LimaReportConfig.java | 447 +++++++++++ .../lima/report/service/DocumentService.java | 589 +++++++++++++++ .../lima/report/service/GeneratedReport.java | 63 ++ .../chorem/lima/report/service/JasperReports.java | 193 +++++ .../jasperreports/account/AccountEntry.jrxml | 174 ++--- .../jasperreports/account/DocumentReport.jrxml | 266 +++++++ .../balance/BalanceReportAccountReport.jrxml | 24 +- .../balance/BalanceSubAccountsReport.jrxml | 82 +- .../jasperreports/balance/DocumentReport.jrxml | 344 +++++++++ .../jasperreports/entryBook/DocumentReport.jrxml | 317 ++++++++ .../jasperreports/entryBook/EntryBookReport.jrxml | 74 ++ .../entryBook/FinancialPeriodReport.jrxml | 156 ++++ .../entryBook/TransactionReport.jrxml | 193 +++++ .../generalEntryBook/DocumentReport.jrxml | 296 ++++++++ .../generalEntryBook/EntryBookPeriodReport.jrxml | 64 +- .../GeneralEntryBookEntryReport.jrxml | 19 +- .../generalLedger/DocumentReport.jrxml | 268 +++++++ .../generalLedger/GeneralLedgerEntryReport.jrxml | 168 +++++ .../generalLedger/GeneralLedgerReport.jrxml | 137 ++++ .../src/main/resources/reports/vat_form_fr.pdf | Bin 0 -> 244238 bytes .../org/chorem/lima/report}/action/ReportTest.java | 6 +- {lima-web => lima-server}/LICENSE.txt | 0 lima-server/README.md | 27 + {lima-swing => lima-server}/pom.xml | 216 ++---- .../src/license/THIRD-PARTY.properties | 28 +- .../src/main/assembly/bin.xml | 42 -- .../src/main/assembly/lima-server | 0 .../java/org/chorem/lima/server}/FormatsEnum.java | 14 +- .../org/chorem/lima/server/HttpServerService.java | 320 ++++++++ .../java/org/chorem/lima/server/LimaServer.java | 158 ++++ .../org/chorem/lima/server/LimaServerConfig.java | 200 +++++ .../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/.gitignore | 1 + lima-swing/{README.txt => README.md} | 11 +- lima-swing/changelog.txt | 47 -- lima-swing/pom.xml | 51 +- lima-swing/src/license/THIRD-PARTY.properties | 28 +- lima-swing/src/main/filters/pom.properties | 6 +- .../src/main/java/org/chorem/lima/LimaMain.java | 41 +- .../chorem/lima/LimaSwingApplicationContext.java | 12 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 266 ++----- .../org/chorem/lima/enums/AccountsChartEnum.java | 37 +- .../java/org/chorem/lima/enums/EncodingEnum.java | 13 +- .../org/chorem/lima/enums/EntryBooksChartEnum.java | 11 +- .../lima/enums/FinancialStatementsChartEnum.java | 31 +- .../org/chorem/lima/enums/ImportExportEnum.java | 35 +- .../chorem/lima/enums/VatStatementsChartEnum.java | 32 +- .../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 | 28 +- .../ui/Filter/dateCondition/DateConditionView.jaxx | 3 +- .../DateIntervalConditionHandler.java | 28 +- .../DateIntervalConditionView.jaxx | 13 +- .../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 | 284 +++++-- .../src/main/java/org/chorem/lima/ui/MainView.jaxx | 9 +- .../java/org/chorem/lima/ui/MainViewHandler.java | 128 +++- .../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 | 87 ++- .../chorem/lima/ui/account/UpdateAccountForm.css | 2 + .../chorem/lima/ui/account/UpdateAccountForm.jaxx | 17 +- .../ui/accountViewer/AccountViewerEditModel.java | 162 ++++ .../AccountViewerSelectionModel.java} | 106 +-- .../AccountViewerTable.java} | 6 +- .../AccountViewerTableModel.java} | 50 +- .../lima/ui/accountViewer/AccountViewerView.css | 162 ++++ .../lima/ui/accountViewer/AccountViewerView.jaxx | 170 +++++ .../ui/accountViewer/AccountViewerViewHandler.java | 784 +++++++++++++++++++ .../chorem/lima/ui/accountViewer/PeriodChoice.java | 56 ++ .../SelectionMode.java} | 52 +- .../lima/ui/celleditor/AccountTableCellEditor.java | 111 +-- .../ui/celleditor/AccountTableCellRenderer.java | 2 +- .../ui/celleditor/AutoCompleteTableCellEditor.java | 8 +- .../ui/celleditor/BigDecimalTableCellEditor.java | 25 +- .../ui/celleditor/DateLimaTableCellRenderer.java | 6 +- .../lima/ui/celleditor/DateTableCellEditor.java | 149 ---- .../DayTableCellEditor.java} | 41 +- .../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} | 71 +- .../lima/ui/combobox/AccountComboBoxModel.java | 102 --- .../lima/ui/combobox/EntryBookComboBoxModel.java | 11 +- .../ui/combobox/FinancialPeriodComboBoxModel.java | 167 ----- .../ui/combobox/FiscalPeriodComboBoxModel.java | 20 +- .../lima/ui/combobox/LeafAccountComboBoxModel.java | 6 +- .../lima/ui/combobox/LetterComboBoxModel.java | 100 --- .../org/chorem/lima/ui/common/AbstractColumn.java | 2 +- .../chorem/lima/ui/common/AbstractLimaTable.java | 43 +- .../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 +- .../lima/ui/common/EntryBookListRenderer.java | 2 +- .../ui/common/FinancialPeriodListRenderer.java | 15 +- .../ui/common/FinancialTransactionTableModel.java | 128 +++- .../lima/ui/common/FiscalPeriodComboBoxModel.java | 12 + .../lima/ui/common/FiscalPeriodListRenderer.java | 26 +- .../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 +- .../FinancialPeriodViewHandler.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 | 61 +- .../ui/financialtransaction/BalanceColumn.java | 37 +- .../lima/ui/financialtransaction/CreditColumn.java | 2 +- .../lima/ui/financialtransaction/DateColumn.java | 2 +- .../lima/ui/financialtransaction/DayColumn.java | 119 +++ .../lima/ui/financialtransaction/DebitColumn.java | 2 +- .../ui/financialtransaction/DescriptionColumn.java | 2 +- .../ui/financialtransaction/EntryBookColumn.java | 2 +- .../FinancialTransactionDefaultTable.java | 14 +- .../FinancialTransactionErrorDetector.java | 2 +- .../FinancialTransactionTable.java | 11 +- .../FinancialTransactionView.css | 28 +- .../FinancialTransactionView.jaxx | 17 +- .../FinancialTransactionViewHandler.java | 254 +++++-- .../lima/ui/financialtransaction/LetterColumn.java | 2 +- .../ui/financialtransaction/VoucherColumn.java | 2 +- .../FinancialTransactionSearchTableModel.java | 12 +- .../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 | 172 +++-- .../fiscalperiod/RetainedEarningsEntryBookForm.css | 33 +- .../RetainedEarningsEntryBookForm.jaxx | 85 +-- .../java/org/chorem/lima/ui/home/AccountsPane.java | 8 +- .../org/chorem/lima/ui/home/EntryBooksPane.java | 10 +- .../lima/ui/home/FinancialTransactionsPane.java | 10 +- .../org/chorem/lima/ui/home/FiscalYearsPane.java | 12 +- .../java/org/chorem/lima/ui/home/HomeView.jaxx | 23 +- .../org/chorem/lima/ui/identity/IdentityForm.css | 175 ++++- .../org/chorem/lima/ui/identity/IdentityForm.jaxx | 297 +++++--- .../chorem/lima/ui/identity/IdentityHandler.java | 45 +- .../chorem/lima/ui/importexport/ImportExport.java | 520 +++++++------ .../lima/ui/lettering/LetteringEditModel.java | 103 ++- ...tionModel.java => LetteringSelectionModel.java} | 31 +- .../lima/ui/lettering/LetteringTableModel.java | 38 + .../org/chorem/lima/ui/lettering/LetteringView.css | 48 +- .../chorem/lima/ui/lettering/LetteringView.jaxx | 68 +- .../lima/ui/lettering/LetteringViewHandler.java | 301 +++++--- .../org/chorem/lima/ui/lettering/TypeEntry.java | 10 +- .../BackupPanel.css} | 10 +- ...{CreateEntryBookPanel.jaxx => BackupPanel.jaxx} | 8 +- .../{OpeningView.css => BackupPanelHandler.java} | 42 +- .../chorem/lima/ui/opening/CreateAccountsPanel.css | 2 +- .../lima/ui/opening/CreateFiscalPeriodPanel.jaxx | 2 +- .../chorem/lima/ui/opening/CreateIdentityPanel.css | 10 +- .../lima/ui/opening/CreateIdentityPanel.jaxx | 64 +- .../ui/opening/CreateIdentityPanelHandler.java | 10 +- .../org/chorem/lima/ui/opening/OpeningView.css | 11 +- .../org/chorem/lima/ui/opening/OpeningView.jaxx | 28 +- .../chorem/lima/ui/opening/OpeningViewHandler.java | 197 +++-- .../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 +++++ .../org/chorem/lima/util/BigDecimalToString.java | 26 +- .../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 ++++ lima-swing/src/main/resources/META-INF/aop.xml | 37 - .../resources/i18n/lima-swing_en_GB.properties | 797 +++++++++++--------- .../resources/i18n/lima-swing_fr_FR.properties | 168 ++++- .../main/resources/icons/action-account-viewer.png | Bin 0 -> 1062 bytes .../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 .../icons/action-financialPeriod-close.png | Bin 715 -> 452 bytes .../resources/icons/action-fiscalControlExport.png | Bin 0 -> 1244 bytes .../resources/icons/action-fiscalPeriod-close.png | Bin 715 -> 452 bytes lima-swing/src/main/resources/icons/action-ok.png | Bin 0 -> 537 bytes .../main/resources/icons/action-selection-mode.png | Bin 0 -> 1106 bytes lima-swing/src/main/resources/icons/backup.png | Bin 0 -> 4803 bytes lima-swing/src/main/resources/icons/warning.png | Bin 0 -> 965 bytes .../src/main/resources/import/pcg_developed.csv | 831 ++++++++++++++++++++- lima-swing/src/main/resources/import/vat_base.csv | 114 +-- .../src/main/resources/import/vat_default.csv | 111 +-- .../src/main/resources/import/vat_developed.csv | 56 -- .../src/main/resources/import/vat_shortened.csv | 56 -- .../{lima-config.properties => lima-swing.config} | 6 +- lima-swing/src/main/resources/log4j.properties | 57 +- .../java/org/chorem/lima/ui/AbstractLimaTest.java | 653 ---------------- .../java/org/chorem/lima/ui/LimaTestsConfig.java | 71 -- .../lima/ui/account/AccountViewHandlerTest.java | 5 +- .../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 -------- .../generalLedger/DocumentReport.jrxml | 286 ------- .../generalLedger/GeneralLedgerReport.jrxml | 189 ----- .../src/main/java/org/chorem/lima/LimaServer.java | 75 -- .../org/chorem/lima/web/action/ReportBuilder.java | 97 --- .../chorem/lima/web/service/DocumentService.java | 569 -------------- .../chorem/lima/web/service/HttpServerService.java | 329 -------- .../main/resources/i18n/lima-web_en_GB.properties | 55 -- .../main/resources/i18n/lima-web_fr_FR.properties | 55 -- .../src/main/resources/reports/vat_form_fr.pdf | Bin 222623 -> 0 bytes pom.xml | 122 +-- 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/devel/server.rst | 2 +- src/site/rst/features.rst | 31 +- src/site/rst/importexport.rst | 40 +- src/site/rst/install.rst | 4 +- src/site/site.xml | 14 +- 510 files changed, 17174 insertions(+), 11768 deletions(-) copy src/site/rst/index.rst => README.md (85%) delete mode 100644 changelog.txt create mode 100644 lima-business-api/.gitignore rename lima-business-api/{changelog.txt => README.md} (100%) rename {lima-business/src/main/java/org/chorem/lima/service => lima-business-api/src/main/java/org/chorem/lima/business}/LimaServiceFactory.java (84%) rename {lima-business => lima-business-api}/src/main/java/org/chorem/lima/business/ServiceListener.java (92%) 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%) copy lima-business-api/src/main/java/org/chorem/lima/business/{exceptions/NoFiscalPeriodFoundException.java => api/TreasuryService.java} (70%) copy lima-business-api/src/main/java/org/chorem/lima/business/api/report/{BalanceReportService.java => AccountReportService.java} (67%) copy lima-business-api/src/main/java/org/chorem/lima/business/{exceptions/NoDataToImportException.java => config/LimaConfigOptionDef.java} (71%) 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%) rename {lima-business => lima-business-api}/src/main/java/org/chorem/lima/business/utils/AccountComparator.java (100%) copy {lima-swing/src/main/java/org/chorem/lima/util => lima-business-api/src/main/java/org/chorem/lima/business/utils}/BigDecimalToString.java (67%) 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 (90%) rename {lima-business => lima-business-api}/src/main/java/org/chorem/lima/business/utils/FiscalPeriodComparator.java (100%) create mode 100644 lima-business/.gitignore rename lima-business-api/README.txt => lima-business/README.md (100%) delete mode 100644 lima-business/README.txt delete mode 100644 lima-business/changelog.txt create mode 100644 lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/TreasuryServiceImpl.java create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalControlExportModel.java create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/report/CommonsDocumentReport.java delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/utils/BigDecimalToString.java delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/utils/DocumentsEnum.java delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/utils/FinancialTransactionComparator.java rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java (98%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java (88%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java (64%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java (80%) 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 (99%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java (76%) rename {lima-callao => lima-business}/src/main/java/org/chorem/lima/entity/GeneratorHQuery.java (99%) 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 (90%) 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/test/resources/META-INF/ejb-jar.xml delete mode 100644 lima-business/src/test/resources/reports/AccountReport.jrxml create mode 100644 lima-callao/.gitignore rename lima-callao/{README.txt => README.md} (100%) delete mode 100644 lima-callao/changelog.txt 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/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 create mode 100644 lima-callao/src/main/resources/db/migration/V0_8_6_0__1241_create_table_TREASURY.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} (99%) create mode 100644 lima-callao/src/main/xmi/lima-callao-model.zargo create mode 100644 lima-report/.gitignore copy {lima-web => lima-report}/LICENSE.txt (100%) rename lima-web/README.txt => lima-report/README.md (100%) rename {lima-web => lima-report}/pom.xml (64%) copy {lima-web => lima-report}/src/license/THIRD-PARTY.properties (62%) 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-web/src/main/java/org/chorem/lima/web/utils => lima-report/src/main/java/org/chorem/lima/report}/DocumentsEnum.java (92%) 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 rename lima-web/src/main/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml => lima-report/src/main/resources/jasperreports/account/AccountEntry.jrxml (69%) create mode 100644 lima-report/src/main/resources/jasperreports/account/DocumentReport.jrxml rename {lima-web/src/main => lima-report/src/main/resources}/jasperreports/balance/BalanceReportAccountReport.jrxml (69%) rename {lima-web/src/main => lima-report/src/main/resources}/jasperreports/balance/BalanceSubAccountsReport.jrxml (81%) 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 rename {lima-web/src/main => lima-report/src/main/resources}/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml (70%) rename {lima-web/src/main => lima-report/src/main/resources}/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml (89%) 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 create mode 100644 lima-report/src/main/resources/reports/vat_form_fr.pdf rename {lima-web/src/test/java/org/chorem/lima/web => lima-report/src/test/java/org/chorem/lima/report}/action/ReportTest.java (93%) rename {lima-web => lima-server}/LICENSE.txt (100%) create mode 100644 lima-server/README.md copy {lima-swing => lima-server}/pom.xml (71%) rename {lima-web => lima-server}/src/license/THIRD-PARTY.properties (63%) rename {lima-web => lima-server}/src/main/assembly/bin.xml (59%) rename {lima-web => 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 (84%) 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-web => lima-server}/src/main/resources/images/accounts.png (100%) rename {lima-web => lima-server}/src/main/resources/images/entries.png (100%) rename {lima-web => lima-server}/src/main/resources/images/entrybooks.png (100%) rename {lima-web => lima-server}/src/main/resources/images/fiscalperiods.png (100%) rename {lima-web => lima-server}/src/main/resources/images/identity.png (100%) rename {lima-web => 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/.gitignore rename lima-swing/{README.txt => README.md} (71%) delete mode 100644 lima-swing/changelog.txt create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerEditModel.java copy lima-swing/src/main/java/org/chorem/lima/ui/{lettering/LettringSelectionModel.java => accountViewer/AccountViewerSelectionModel.java} (60%) copy lima-swing/src/main/java/org/chorem/lima/ui/{lettering/LetteringTable.java => accountViewer/AccountViewerTable.java} (84%) copy lima-swing/src/main/java/org/chorem/lima/ui/{lettering/LetteringTableModel.java => accountViewer/AccountViewerTableModel.java} (62%) create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerView.css create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerView.jaxx create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/AccountViewerViewHandler.java create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/PeriodChoice.java copy lima-swing/src/main/java/org/chorem/lima/ui/{opening/OpeningView.css => accountViewer/SelectionMode.java} (54%) delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java copy lima-swing/src/main/java/org/chorem/lima/ui/{account/AccountForm.css => celleditor/DayTableCellEditor.java} (59%) copy lima-swing/src/main/java/org/chorem/lima/ui/combobox/{LeafAccountComboBoxModel.java => AccountComboBox.java} (53%) 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 create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DayColumn.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 rename lima-swing/src/main/java/org/chorem/lima/ui/lettering/{LettringSelectionModel.java => LetteringSelectionModel.java} (82%) copy lima-swing/src/main/java/org/chorem/lima/ui/{fiscalperiod/RetainedEarningsWait.css => opening/BackupPanel.css} (88%) copy lima-swing/src/main/java/org/chorem/lima/ui/opening/{CreateEntryBookPanel.jaxx => BackupPanel.jaxx} (80%) copy lima-swing/src/main/java/org/chorem/lima/ui/opening/{OpeningView.css => BackupPanelHandler.java} (61%) 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 delete mode 100644 lima-swing/src/main/resources/META-INF/aop.xml create mode 100644 lima-swing/src/main/resources/icons/action-account-viewer.png 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/action-selection-mode.png create mode 100644 lima-swing/src/main/resources/icons/backup.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 rename lima-swing/src/main/resources/{lima-config.properties => lima-swing.config} (88%) delete mode 100644 lima-swing/src/test/java/org/chorem/lima/ui/AbstractLimaTest.java delete mode 100644 lima-swing/src/test/java/org/chorem/lima/ui/LimaTestsConfig.java delete mode 100644 lima-web/src/main/jasperreports/balance/DocumentReport.jrxml delete mode 100644 lima-web/src/main/jasperreports/entryBook/DocumentReport.jrxml delete mode 100644 lima-web/src/main/jasperreports/entryBook/EntryBookReport.jrxml delete mode 100644 lima-web/src/main/jasperreports/entryBook/FinancialPeriodReport.jrxml delete mode 100644 lima-web/src/main/jasperreports/entryBook/TransactionReport.jrxml delete mode 100644 lima-web/src/main/jasperreports/generalEntryBook/DocumentReport.jrxml delete mode 100644 lima-web/src/main/jasperreports/generalLedger/DocumentReport.jrxml delete mode 100644 lima-web/src/main/jasperreports/generalLedger/GeneralLedgerReport.jrxml delete mode 100644 lima-web/src/main/java/org/chorem/lima/LimaServer.java delete mode 100644 lima-web/src/main/java/org/chorem/lima/web/action/ReportBuilder.java delete mode 100644 lima-web/src/main/java/org/chorem/lima/web/service/DocumentService.java delete mode 100644 lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java delete mode 100644 lima-web/src/main/resources/i18n/lima-web_en_GB.properties delete mode 100644 lima-web/src/main/resources/i18n/lima-web_fr_FR.properties delete mode 100644 lima-web/src/main/resources/reports/vat_form_fr.pdf 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@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/1174-Import_EBP_Transactions in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 7a00a52fa4dd3712a48e83b1e3ccf442c5d242a1 Author: dcosse <japbiw74> Date: Wed Feb 25 22:37:58 2015 +0100 refs #1174 création de transaction pour chaque changement de date puis de pièce comptable (déplacement de branche) --- .../lima/business/ejb/ImportServiceImpl.java | 93 +++- .../resources/i18n/lima-business_en_GB.properties | 34 +- .../resources/i18n/lima-business_fr_FR.properties | 51 +- .../org/chorem/lima/business/AbstractLimaTest.java | 595 ++++++++++++++++++++- .../lima/business/AccountServiceImplTest.java | 12 +- .../lima/business/EntryBookServiceImplTest.java | 6 +- .../business/FinancialPeriodServiceImplTest.java | 6 +- .../FinancialTransactionServiceImplTest.java | 6 +- .../lima/business/FiscalPeriodServiceImplTest.java | 4 +- .../lima/business/ImportExportServiceTest.java | 66 +-- .../lima/business/ReportServiceImplTest.java | 8 +- .../lima/entity/FinancialTransactionDAOTest.java | 8 +- .../resources/i18n/lima-swing_en_GB.properties | 3 + .../resources/i18n/lima-swing_fr_FR.properties | 3 + 14 files changed, 773 insertions(+), 122 deletions(-) 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 e9b4e0c..2aa826e 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 @@ -23,6 +23,7 @@ package org.chorem.lima.business.ejb; */ import com.google.common.base.Function; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.google.common.collect.Sets; @@ -61,7 +62,6 @@ import org.chorem.lima.business.exceptions.AlreadyExistFinancialStatementExcepti import org.chorem.lima.business.exceptions.AlreadyExistVatStatementException; import org.chorem.lima.business.exceptions.BeforeFirstFiscalPeriodException; import org.chorem.lima.business.exceptions.BeginAfterEndFiscalPeriodException; -import org.chorem.lima.business.exceptions.ImportEbpException; import org.chorem.lima.business.exceptions.ImportFileException; import org.chorem.lima.business.exceptions.InvalidAccountNumberException; import org.chorem.lima.business.exceptions.LimaException; @@ -944,12 +944,14 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ // if entry date have fiscalperiod open if (dateEcr.compareTo(fiscalPeriodsBiginDate) < 0 || dateEcr.compareTo(fiscalPeriodsEndingDate) > 0) { - importResult.addException(new ImportEbpException(t("lima-business.import.entriesoutofdatesrange", dateEcr))); + importResult.addException(new ImportFileException(t("lima.import.error.entriesOutOfDatesRange", dateEcr))); + importResult.increaseIgnored(); result = false; } // if account not exist not export -> exception else if (account == null) { - importResult.addException(new ImportEbpException(t("lima-business.import.ebpmissingaccount", targetedAccount))); + importResult.addException(new ImportFileException(t("lima.import.error.invalidAccountNumber", targetedAccount))); + importResult.increaseIgnored(); result =false; } return result; @@ -989,9 +991,9 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ // the entry is validate (checking for valide FiscalPeriod and existing Account associated to it) // if valid entry // the entry entity is created and the association with it's dependant entites (Account are FinancialTransaction) are created - Date fiscalPeriodsBiginDate = fiscalPeriods.get(0).getBeginDate(); + Date fiscalPeriodsBeginDate = fiscalPeriods.get(0).getBeginDate(); Date fiscalPeriodsEndingDate = fiscalPeriods.get(fiscalPeriods.size() - 1).getEndDate(); - Map<EntryBook, Map<Date, FinancialTransaction>> entryBookFinancialTransactionByDate = getEntryBookFinancialTransactionOrderedByDate(fiscalPeriodsBiginDate, fiscalPeriodsEndingDate); + Map<EntryBook, Map<Date, Set<FinancialTransaction>>> entryBookFinancialTransactionsByDate = getEntryBookFinancialTransactionOrderedByDate(fiscalPeriodsBeginDate, fiscalPeriodsEndingDate); for (EntryEBP entryEBP : entryEBPs) { Date dateEcr = entryEBP.getDatEcr(); @@ -999,7 +1001,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ // account loading Account account = indexedAccounts.get(entryEBP.getCompte()); - if (!validEntry(result, dateEcr, fiscalPeriodsBiginDate, fiscalPeriodsEndingDate, account, entryEBP.getCompte())) { + if (!validEntry(result, dateEcr, fiscalPeriodsBeginDate, fiscalPeriodsEndingDate, account, entryEBP.getCompte())) { continue; } // create entry @@ -1010,7 +1012,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ try { // find financial transactions for entry period and entrybook - addEntryToFinancialTransaction(entry, entryEBP.getJournal(), indexedEntryBooks, entryBookFinancialTransactionByDate, dateEcr); + addEntryToFinancialTransaction(entry, entryEBP.getJournal(), indexedEntryBooks, entryBookFinancialTransactionsByDate, dateEcr); } catch (LockedFinancialPeriodException | LockedEntryBookException | AlreadyExistEntryBookException | AfterLastFiscalPeriodException | BeforeFirstFiscalPeriodException e) { result.addException(e); @@ -1054,34 +1056,68 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ return entry; } - protected void addEntryToFinancialTransaction(Entry entry, String entryBookCode, Map<String, EntryBook> indexedEntryBooks, Map<EntryBook, Map<Date, FinancialTransaction>> entryBookFinancialTransactionByDate, Date dateEcr) throws LockedFinancialPeriodException, LockedEntryBookException, AlreadyExistEntryBookException, AfterLastFiscalPeriodException, BeforeFirstFiscalPeriodException { + protected void addEntryToFinancialTransaction(Entry entry, String entryBookCode, Map<String, EntryBook> indexedEntryBooks, Map<EntryBook, Map<Date, Set<FinancialTransaction>>> entryBookFinancialTransactionsByDate, Date dateEcr) throws LockedFinancialPeriodException, LockedEntryBookException, AlreadyExistEntryBookException, AfterLastFiscalPeriodException, BeforeFirstFiscalPeriodException { EntryBook entryBook = getEntryBook(indexedEntryBooks, entryBookCode); - Map<Date, FinancialTransaction> financialTransactionsByDate = entryBookFinancialTransactionByDate.get(entryBook); + Map<Date, Set<FinancialTransaction>> financialTransactionsByDate = entryBookFinancialTransactionsByDate.get(entryBook); if (financialTransactionsByDate == null) { financialTransactionsByDate = new HashMap<>(); - entryBookFinancialTransactionByDate.put(entryBook, financialTransactionsByDate); + entryBookFinancialTransactionsByDate.put(entryBook, financialTransactionsByDate); } - // create transaction - FinancialTransaction financialTransaction = financialTransactionsByDate.get(dateEcr); - if (financialTransaction == null - || !(dateEcr.equals(financialTransaction - .getTransactionDate()) && entryBook + // find financial transaction for this required date and required voucher. + Set<FinancialTransaction> financialTransactionsForDate = financialTransactionsByDate.get(dateEcr); + if (financialTransactionsForDate == null) { + financialTransactionsForDate = Sets.newHashSet(); + financialTransactionsByDate.put(dateEcr, financialTransactionsForDate); + } + + String voucher = entry.getVoucher(); + + // look for an existing one + FinancialTransaction financialTransactionForDateAndVoucher = getFinancialTransactionForVoucher(financialTransactionsForDate, voucher); + + // if none exist a new one is created + if (financialTransactionForDateAndVoucher == null + || !(dateEcr.equals(financialTransactionForDateAndVoucher.getTransactionDate()) && entryBook .getCode().equals( - financialTransaction.getEntryBook() + financialTransactionForDateAndVoucher.getEntryBook() .getCode()))) { // create financial transaction - financialTransaction = financialTransactionService.createNewFinancialTransaction(); - financialTransaction.setEntryBook(entryBook); - financialTransaction.setTransactionDate(dateEcr); - financialTransaction = financialTransactionService.createFinancialTransaction(financialTransaction); - financialTransactionsByDate.put(financialTransaction.getTransactionDate(), financialTransaction); + financialTransactionForDateAndVoucher = financialTransactionService.createNewFinancialTransaction(); + financialTransactionForDateAndVoucher.setEntryBook(entryBook); + financialTransactionForDateAndVoucher.setTransactionDate(dateEcr); + financialTransactionForDateAndVoucher = financialTransactionService.createFinancialTransaction(financialTransactionForDateAndVoucher); + financialTransactionsForDate.add(financialTransactionForDateAndVoucher); } - financialTransaction.addEntry(entry); + + // add entry to financial transaction + financialTransactionForDateAndVoucher.addEntry(entry); financialTransactionService.createEntry(entry); } + private FinancialTransaction getFinancialTransactionForVoucher(Set<FinancialTransaction> financialTransactions, String voucher) { + FinancialTransaction financialTransactionForEntry = null; + if (financialTransactions != null) { + for (FinancialTransaction financialTransaction : financialTransactions) { + Collection<Entry> entries = financialTransaction.getEntry(); + if (entries != null && entries.iterator().hasNext()) { + Entry firstEntry = entries.iterator().next(); + if (firstEntry.getVoucher().contentEquals(voucher)) { + financialTransactionForEntry = financialTransaction; + break; + } + } else { + entries = Lists.newArrayList(); + financialTransaction.setEntry(entries); + financialTransactionForEntry = financialTransaction; + break; + } + } + } + return financialTransactionForEntry; + } + protected EntryBook getEntryBook(Map<String, EntryBook> indexedEntryBooks, String entryBookCode) throws AlreadyExistEntryBookException { EntryBook entryBook; // entryBook loading @@ -1099,19 +1135,24 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ return entryBook; } - protected Map<EntryBook, Map<Date, FinancialTransaction>> getEntryBookFinancialTransactionOrderedByDate(Date fiscalPeriodsBiginDate, Date fiscalPeriodsEndingDate) { - Map<EntryBook, Map<Date, FinancialTransaction>> entryBookFinancialTransactionByDate = new HashMap<>(); + protected Map<EntryBook, Map<Date, Set<FinancialTransaction>>> getEntryBookFinancialTransactionOrderedByDate(Date fiscalPeriodsBiginDate, Date fiscalPeriodsEndingDate) { + Map<EntryBook, Map<Date, Set<FinancialTransaction>>> entryBookFinancialTransactionByDate = new HashMap<>(); List<FinancialTransaction> financialTransactions = financialTransactionService.getAllFinancialTransactions(fiscalPeriodsBiginDate, fiscalPeriodsEndingDate); for (FinancialTransaction ft : financialTransactions) { EntryBook eb = ft.getEntryBook(); - Map<Date, FinancialTransaction> entryBooksFTs = entryBookFinancialTransactionByDate.get(eb); + Map<Date, Set<FinancialTransaction>> entryBooksFTs = entryBookFinancialTransactionByDate.get(eb); if (entryBooksFTs == null) { entryBooksFTs = new HashMap<>(); entryBookFinancialTransactionByDate.put(eb, entryBooksFTs); } // maybe not unique financial transaction for one date. // is there a way to know wich one to take ? - entryBooksFTs.put(ft.getTransactionDate(), ft); + Set<FinancialTransaction> financialTransactionsForEntryBook = entryBooksFTs.get(ft.getTransactionDate()); + if (financialTransactionsForEntryBook == null) { + financialTransactionsForEntryBook = Sets.newHashSet(); + } + financialTransactionsForEntryBook.add(ft); + entryBooksFTs.put(ft.getTransactionDate(), financialTransactionsForEntryBook); } return entryBookFinancialTransactionByDate; } diff --git a/lima-business/src/main/resources/i18n/lima-business_en_GB.properties b/lima-business/src/main/resources/i18n/lima-business_en_GB.properties index 89e4c1a..62a13bd 100644 --- a/lima-business/src/main/resources/i18n/lima-business_en_GB.properties +++ b/lima-business/src/main/resources/i18n/lima-business_en_GB.properties @@ -134,24 +134,32 @@ lima.config.scale.label= lima.config.serveraddress.description=Server Address lima.config.thousandSeparator.description= lima.config.thousandSeparator.label= -lima.configFileName.description=Descriontion -lima.financialtransaction.account=Account -lima.fiscalperiod.fiscalperiod=Fiscal period +lima.configFileName.description= +lima.financialtransaction.account= +lima.fiscalperiod.fiscalperiod= lima.host.address.description= lima.host.ejb.port.description= lima.host.http.address.description= lima.host.http.port.description= -lima.importexport.import.alreadyExistFinancialStatement=Same financial statement exists -lima.lettering.accountRegularization=Regulatory account +lima.import.error.entriesOutOfDatesRange= +lima.import.error.invalidAccountNumber= +lima.importexport.import.alreadyExistFinancialStatement= +lima.lettering.accountRegularization= lima.report.fromDateToDate= lima.reports.account.noAccount=Any account present lima.reports.account.noAccountTitle=Any account present -lima.reports.accounts=Accounts -lima.table.credit=Credit -lima.table.date=Date -lima.table.debit=Debit -lima.table.description=Description +lima.reports.account.noaccount= +lima.reports.account.noaccounttitle= +lima.reports.accounts= +lima.services.application.version= +lima.table.credit= +lima.table.date= +lima.table.debit= +lima.table.decription= +lima.table.description= lima.table.entryBook=Entry book -lima.table.letter=Letter -lima.table.number=Account number -lima.table.voucher=Voucher +lima.table.entrybook= +lima.table.letter= +lima.table.number= +lima.table.voucher= +llima.importexport.import.alreadyExistFinancialStatement= diff --git a/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties b/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties index 17c85be..6496672 100644 --- a/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties +++ b/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties @@ -100,6 +100,24 @@ lima-business.import.ebpmissingaccount=Échec \: Compte %s inexistant. \nCréer lima-business.import.entries.error.lockedEntryBook= lima-business.import.entries.error.lockedFinancialPeriod= lima-business.import.entriesoutofdatesrange=Attention \: Cette entrée %s ne fait partie d'aucune période ouverte. Entrée non importée. +lima-business.import.entryadded=Succès \: Entrée %s %s ajoutée \n +lima-business.import.entrybookalreadyexist=Échec \: Le journal %s exist déjà \!\n +lima-business.import.entrybooknotexist=Attention \: Le journal %s inexistant a été créé \!\n +lima-business.import.financialstatementadded=Succès \: Mouvement %s ajoutée \n +lima-business.import.financialstatementalnomaster=u00C9chec \: Le mouvement %s possède le master \: %s inexistant \n +lima-business.import.financialstatementalreadyexist=u00C9chec \: Le mouvement %s exist déjà \!\n +lima-business.import.fiscalperiodadded=Succès \: Exercice %s - %s ajoutée \! \n +lima-business.import.fiscalperiodalreadyexist=u00C9chec \: L'exerice %s - %s existe déjà \!\n +lima-business.import.fiscalperiodscloseperiodicentrybooks= +lima-business.import.identityadded=Succès \: Identité %s ajoutée \! \n +lima-business.import.lineformatmismatch=Le format de la ligne est incorrect. +lima-business.import.noaccount=Erreur \: Ce fichier ne contient aucun compte. +lima-business.import.nofiscalperiodopen=u00C9chec \: Aucun exercice ouvert \! \n +lima-business.import.transactionadded=Succès \: Transaction, %s, %s, ajoutée\n +lima-business.import.vatstatementadded=Succès \: Plan de TVA %s ajoutée \n +lima-business.import.vatstatementalnomaster=u00C9chec \: Le plan %s possède le master \: %s inexsitant \n +lima-business.import.vatstatementalreadyexist=u00C9chec \: Le plan %s exist déjà \!\n +lima.account.error.invalidAccountNumber= lima.config.configFileName.description=Nom du fichier de configuration de Lima lima.config.currency.description= lima.config.currency.label= @@ -138,21 +156,30 @@ lima.config.scale.label= lima.config.thousandSeparator.description= lima.config.thousandSeparator.label= lima.configFileName.description= -lima.financialtransaction.account=compte -lima.fiscalperiod.fiscalperiod=Période fiscale +lima.financialtransaction.account= +lima.fiscalperiod.fiscalperiod= lima.host.address.description=Addresse serveur lima.host.ejb.port.description=Port pour connexion du client au serveur lima.host.http.address.description= lima.host.http.port.description=Port du serveur web de Lima -lima.importexport.import.alreadyExistFinancialStatement=Transaction financière exitante -lima.lettering.accountRegularization=Compte de régulation +lima.import.error.entriesOutOfDatesRange= +lima.import.error.invalidAccountNumber= +lima.importexport.import.alreadyExistFinancialStatement= +lima.lettering.accountRegularization= lima.reports.account.noAccount=Aucun compte présent -lima.reports.accounts=Comptes -lima.table.credit=Credit -lima.table.date=Date -lima.table.debit=Débit -lima.table.description=Description +lima.reports.account.noaccount= +lima.reports.account.noaccounttitle= +lima.reports.accounts= +lima.services.application.version= +lima.table.credit= +lima.table.date= +lima.table.debit= +lima.table.decription= +lima.table.description= lima.table.entryBook=Journal -lima.table.letter=Lettre -lima.table.number=Numéro de compte -lima.table.voucher=Pièce comptable +lima.table.entrybook= +lima.table.letter= +lima.table.number= +lima.table.voucher= +lima.ui.importexport.import.exceptions.reason=Reason\:% +llima.importexport.import.alreadyExistFinancialStatement= diff --git a/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java b/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java index 6ddf862..063822d 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java @@ -38,12 +38,9 @@ import org.chorem.lima.business.api.IdentityService; import org.chorem.lima.business.api.ImportService; import org.chorem.lima.business.api.ReportService; import org.chorem.lima.business.api.VatStatementService; -import org.chorem.lima.business.exceptions.AlreadyExistAccountException; -import org.chorem.lima.business.exceptions.InvalidAccountNumberException; -import org.chorem.lima.business.exceptions.NotAllowedLabelException; -import org.chorem.lima.business.exceptions.NotNumberAccountNumberException; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountImpl; +import org.chorem.lima.entity.AccountTopiaDao; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryBookImpl; @@ -54,6 +51,7 @@ import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.FiscalPeriodImpl; import org.chorem.lima.entity.LimaCallaoEntityEnum; import org.chorem.lima.entity.LimaCallaoTopiaApplicationContext; +import org.chorem.lima.entity.LimaCallaoTopiaPersistenceContext; import org.hibernate.cfg.Environment; import org.junit.After; import org.junit.Before; @@ -217,7 +215,7 @@ public abstract class AbstractLimaTest { * @throws org.chorem.lima.business.exceptions.InvalidAccountNumberException * @throws org.chorem.lima.business.exceptions.NotNumberAccountNumberException */ - protected void createAccounts() throws AlreadyExistAccountException, NotAllowedLabelException, InvalidAccountNumberException, NotNumberAccountNumberException { + protected void initTestWithAccounts() throws Exception { // creation d'un plan compatble de test Account classFinancier = new AccountImpl(); @@ -257,12 +255,486 @@ public abstract class AbstractLimaTest { } /** + * Create a basic account plan. + * + * @throws org.chorem.lima.business.exceptions.LimaException + * @throws java.text.ParseException + */ + protected void initTestDefaultAccounts() throws Exception { + LimaCallaoTopiaPersistenceContext tcontext = context.newPersistenceContext(); + AccountTopiaDao accountTopiaDao = tcontext.getAccountDao(); + + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "1", Account.PROPERTY_LABEL, "COMPTES DE CAPITAUX"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2", Account.PROPERTY_LABEL, "COMPTES D'IMMOBILISATIONS"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "3", Account.PROPERTY_LABEL, "COMPTES DE STOCKS ET D'EN-COURS"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4", Account.PROPERTY_LABEL, "COMPTES DE TIERS"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "5", Account.PROPERTY_LABEL, "COMPTES FINANCIERS"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6", Account.PROPERTY_LABEL, "COMPTES DE CHARGES"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "7", Account.PROPERTY_LABEL, "COMPTES DE PRODUITS"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "8", Account.PROPERTY_LABEL, "COMPTES SPECIAUX"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "10", Account.PROPERTY_LABEL, "REPORT A NOUVEAU (solde créditeur ou débiteur)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "11", Account.PROPERTY_LABEL, "RESULTAT NET DE L'EXERCICE (bénéfice ou perte)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "12", Account.PROPERTY_LABEL, "PROVISIONS REGLEMENTEES"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "13", Account.PROPERTY_LABEL, "PROVlSlONS POUR RISQUES ET CHARGES"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "14", Account.PROPERTY_LABEL, "EMPRUNTS ET DETTES ASSIMILEES"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "15", Account.PROPERTY_LABEL, "IMMOBlLlSATIONS CORPORELLES"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "16", Account.PROPERTY_LABEL, "IMMOBILlSATlONS EN COURS"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "17", Account.PROPERTY_LABEL, "AUTRES IMMOBILISATIONS FINANCIERES"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "20", Account.PROPERTY_LABEL, "MATIERES PREMIERES (et fournitures)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "21", Account.PROPERTY_LABEL, "AUTRES APPROVISIONNEMENTS"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "23", Account.PROPERTY_LABEL, "EN-COURS DE PRODUCTION DE BIENS"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "26", Account.PROPERTY_LABEL, "EN-COURS DE PRODUCTION DE SERVICES"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "27", Account.PROPERTY_LABEL, "STOCKS DE PRODUITS"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "28", Account.PROPERTY_LABEL, "STOCKS DE MARCHANDISES"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "29", Account.PROPERTY_LABEL, "SECURITE SOCIALE ET AUTRES ORGANISMES SOCIAUX"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "31", Account.PROPERTY_LABEL, "DEBITEURS ET CREDITEURS DIVERS"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "32", Account.PROPERTY_LABEL, "COMPTES TRANSITOIRES OU D'ATTENTE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "33", Account.PROPERTY_LABEL, "VALEURS MOBILIERES DE PLACEMENT"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "34", Account.PROPERTY_LABEL, "BANQUES; ETABLISSEMENTS FINANCIERS ET ASSIMILES"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "35", Account.PROPERTY_LABEL, "CAISSE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "37", Account.PROPERTY_LABEL, "REGIES D'AVANCES ET ACCREDITIFS"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "39", Account.PROPERTY_LABEL, "VIREMENTS INTERNES"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "40", Account.PROPERTY_LABEL, "ACHATS (sauf 603)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "41", Account.PROPERTY_LABEL, "Services extérieurs"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "42", Account.PROPERTY_LABEL, "Autres services extérieurs"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "43", Account.PROPERTY_LABEL, "IMPOTS; TAXES ET VERSEMENTS"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "44", Account.PROPERTY_LABEL, "AUTRES CHARGES DE GESTION COURANTE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "45", Account.PROPERTY_LABEL, "CHARGES FINANCIERES"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "46", Account.PROPERTY_LABEL, "CHARGES EXCEPTIONNELLES"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "47", Account.PROPERTY_LABEL, "PRODUCTION IMMOBILISEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "48", Account.PROPERTY_LABEL, "SUBVENTlONS D'EXPLOITATION"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "49", Account.PROPERTY_LABEL, "AUTRES PRODUITS DE GESTION COURANTE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "50", Account.PROPERTY_LABEL, "PRODUITS FINANCIERS"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "51", Account.PROPERTY_LABEL, "PRODUITS EXCEPTIONNELS"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "52", Account.PROPERTY_LABEL, "REPRISES SUR AMORTISSEMENTS ET PROVISIONS"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "53", Account.PROPERTY_LABEL, "TRANSFERTS DE CHARGES"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "54", Account.PROPERTY_LABEL, "ENGAGEMENTS HORS BILAN"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "58", Account.PROPERTY_LABEL, "RESULTAT EN INSTANCE D'AFFECTATION"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "59", Account.PROPERTY_LABEL, "BILAN"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "60", Account.PROPERTY_LABEL, "Capital"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "61", Account.PROPERTY_LABEL, "Ecarts de réévaluation"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "62", Account.PROPERTY_LABEL, "Compte de l'exploitant"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "63", Account.PROPERTY_LABEL, "Résultat de l'exercice (bénéfice)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "64", Account.PROPERTY_LABEL, "Résultat de l'exercice (perte)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "65", Account.PROPERTY_LABEL, "Amortissements dérogatoires"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "66", Account.PROPERTY_LABEL, "Provision spéciale de réévaluation"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "67", Account.PROPERTY_LABEL, "Plus-values réinvesties"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "68", Account.PROPERTY_LABEL, "Autres provisions réglementées"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "69", Account.PROPERTY_LABEL, "Provisions pour risques"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "70", Account.PROPERTY_LABEL, "Autres emprunts obligataires"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "71", Account.PROPERTY_LABEL, "Emprunts auprès des établissements de crédit"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "72", Account.PROPERTY_LABEL, "Primes de remboursement des obligations"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "74", Account.PROPERTY_LABEL, "Dettes rattachées a des participations (groupe)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "75", Account.PROPERTY_LABEL, "Frais détablissement"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "76", Account.PROPERTY_LABEL, "Frais de recherche et de développement"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "77", Account.PROPERTY_LABEL, "Concessions et droits similaires; brevets; licences; marques"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "78", Account.PROPERTY_LABEL, "Droit au bail"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "79", Account.PROPERTY_LABEL, "Fonds commercial"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "80", Account.PROPERTY_LABEL, "Autres immobilisations incorporelles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "88", Account.PROPERTY_LABEL, "Dépôts et cautionnements versés"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "89", Account.PROPERTY_LABEL, "Amortissements des immobilisations incorporelles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "101", Account.PROPERTY_LABEL, "Amortissements des immobilisations corporelles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "104", Account.PROPERTY_LABEL, "Provisions pour dépréciation des immobilisations incorporell"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "105", Account.PROPERTY_LABEL, "Provisions pour dépréciation des immobilisations corporelles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "106", Account.PROPERTY_LABEL, "Provisions pour dépréciation des participations et créances"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "107", Account.PROPERTY_LABEL, "Provisions pour dépréciation des autres immobilisations fina"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "108", Account.PROPERTY_LABEL, "Provisions pour dépréciation des matières premières (et four"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "109", Account.PROPERTY_LABEL, "Provisions pour dépréciation des autres approvisionnements"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "110", Account.PROPERTY_LABEL, "Provisions pour dépréciation des encours de production de bi"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "119", Account.PROPERTY_LABEL, "Provisions pour dépréciation des en-cours de production de s"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "120", Account.PROPERTY_LABEL, "Provisions pour dépréciation des stocks de produits"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "129", Account.PROPERTY_LABEL, "Provisions pour dépréciation des stocks de marchandises"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "131", Account.PROPERTY_LABEL, "Personnel - Rémunérations dues"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "138", Account.PROPERTY_LABEL, "Personnel - Charges à payer et produits à recevoir"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "139", Account.PROPERTY_LABEL, "Sécurité sociale"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "142", Account.PROPERTY_LABEL, "Autres organismes sociaux"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "143", Account.PROPERTY_LABEL, "Etat - Impôts sur les bénéfices"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "144", Account.PROPERTY_LABEL, "Etat - Taxes sur le chiffre d'affaires"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "145", Account.PROPERTY_LABEL, "Obligations cautionnées"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "146", Account.PROPERTY_LABEL, "Autres impôts; taxes et versements assimilés"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "147", Account.PROPERTY_LABEL, "Associés - Comptes courants"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "148", Account.PROPERTY_LABEL, "Créances sur cessions d'immobilisations"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "151", Account.PROPERTY_LABEL, "Compte d'attente"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "153", Account.PROPERTY_LABEL, "Charges à repartir sur plusieurs exercices"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "154", Account.PROPERTY_LABEL, "Charges constatées d'avance"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "155", Account.PROPERTY_LABEL, "Produits constatés d'avance"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "156", Account.PROPERTY_LABEL, "Provisions pour dépréciation des comptes de clients"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "157", Account.PROPERTY_LABEL, "Provisions pour dépréciation des comptes de débiteurs divers"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "158", Account.PROPERTY_LABEL, "Valeurs à I'encaissement"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "161", Account.PROPERTY_LABEL, "Banques"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "163", Account.PROPERTY_LABEL, "Autres organismes financiers"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "164", Account.PROPERTY_LABEL, "Concours bancaires courant"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "165", Account.PROPERTY_LABEL, "Caisse siège social"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "166", Account.PROPERTY_LABEL, "Virements internes"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "167", Account.PROPERTY_LABEL, "Provisions pour dépréciation des valeurs mobilières de place"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "168", Account.PROPERTY_LABEL, "Achats stockés - Matières premières (et fournitures)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "169", Account.PROPERTY_LABEL, "VARIATION DES STOCKS (approvisionnements et marchandises)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "171", Account.PROPERTY_LABEL, "Achat de materiel; equipement et travaux"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "174", Account.PROPERTY_LABEL, "Achats non stockes de matières et fournitures"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "178", Account.PROPERTY_LABEL, "Achats de marchandises"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "201", Account.PROPERTY_LABEL, "Frais accessoires d'achat"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "203", Account.PROPERTY_LABEL, "Rabais; remises et ristournes obtenus sur achats"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "205", Account.PROPERTY_LABEL, "Sous-traitance générale"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "206", Account.PROPERTY_LABEL, "Redevances de crédit-bail"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "207", Account.PROPERTY_LABEL, "Locations"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "208", Account.PROPERTY_LABEL, "Charges locatives et de copropriété"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "211", Account.PROPERTY_LABEL, "Entretien et réparations"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "212", Account.PROPERTY_LABEL, "Primes d'assurance"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "213", Account.PROPERTY_LABEL, "Personnel extérieur à l'entreprise"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "214", Account.PROPERTY_LABEL, "Rémunérations intermédiaires et honoraires"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "215", Account.PROPERTY_LABEL, "Publicité; publications; relations publiques"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "218", Account.PROPERTY_LABEL, "Transports de biens et transports collectifs du personnel"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "231", Account.PROPERTY_LABEL, "Déplacements; missions et réceptions"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "232", Account.PROPERTY_LABEL, "Frais postaux et frais de télécommunications"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "237", Account.PROPERTY_LABEL, "Services bancaires et assimiles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "238", Account.PROPERTY_LABEL, "Impôts; taxes et versements assimiles sur rémunérations (aut"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "261", Account.PROPERTY_LABEL, "Autres impôts taxes et versements assimiles (administration"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "266", Account.PROPERTY_LABEL, "Rémunération du travail de l'exploitant"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "267", Account.PROPERTY_LABEL, "Charges de sécurité sociale et de prévoyance"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "268", Account.PROPERTY_LABEL, "Redevances pour concessions; brevets; licences; marques; pro"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "269", Account.PROPERTY_LABEL, "Pertes sur créances irrécouvrables"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "271", Account.PROPERTY_LABEL, "Quote-part de résultat sur opérations faites en commun"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "272", Account.PROPERTY_LABEL, "Escomptes accordés"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "273", Account.PROPERTY_LABEL, "Valeurs comptables des éléments d'actif cédés"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "274", Account.PROPERTY_LABEL, "Dotations aux amort. - Charges d'exploitation"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "275", Account.PROPERTY_LABEL, "Dotations aux amortissements et aux provisions - Charges fin"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "276", Account.PROPERTY_LABEL, "Dotations aux amortissements et aux provisions - Charges exc"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "279", Account.PROPERTY_LABEL, "Participation des salaries aux fruits de l'expansion"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "280", Account.PROPERTY_LABEL, "Impôts sur les bénéfices"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "281", Account.PROPERTY_LABEL, "Imposition forfaitaire annuelle des sociétés"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "290", Account.PROPERTY_LABEL, "Produits - Reports en arrière des déficits"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "291", Account.PROPERTY_LABEL, "Ventes de produits finis"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "293", Account.PROPERTY_LABEL, "Prestations de services"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "296", Account.PROPERTY_LABEL, "Ventes de marchandises"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "297", Account.PROPERTY_LABEL, "Produits des activités annexes"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "311", Account.PROPERTY_LABEL, "Rabais; remises et ristournes accordées par l'entreprise"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "312", Account.PROPERTY_LABEL, "VARIATION DES STOCKS (en-cours de production; produits)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "317", Account.PROPERTY_LABEL, "Immobilisations incorporelles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "321", Account.PROPERTY_LABEL, "Produits divers de gestion courante"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "322", Account.PROPERTY_LABEL, "Escomptes obtenus"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "326", Account.PROPERTY_LABEL, "Produits des cessions éléments d'actif"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "331", Account.PROPERTY_LABEL, "Reprises sur amortissements et provisions (à inscrire dans l"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "335", Account.PROPERTY_LABEL, "Reprises sur provisions a inscrire dans les produits financi"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "341", Account.PROPERTY_LABEL, "Reprises sur provisions (à inscrire dans les produits except"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "345", Account.PROPERTY_LABEL, "Transfert de charges d'exploitation"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "351", Account.PROPERTY_LABEL, "Engagements donnés par l'entreprise"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "355", Account.PROPERTY_LABEL, "Engagements reçus par l'entreprise"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "358", Account.PROPERTY_LABEL, "Contrepartie des engagements"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "371", Account.PROPERTY_LABEL, "Réserve légale"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "372", Account.PROPERTY_LABEL, "Réserves indisponibles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "391", Account.PROPERTY_LABEL, "Réserves statutaires ou contractuelles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "392", Account.PROPERTY_LABEL, "Réserves réglementes"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "393", Account.PROPERTY_LABEL, "Autres réserves"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "394", Account.PROPERTY_LABEL, "Provisions pour charges sociales et fiscales sur congés à pa"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "395", Account.PROPERTY_LABEL, "Matériel industriel (1)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "397", Account.PROPERTY_LABEL, "Matériel de transport"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "400", Account.PROPERTY_LABEL, "Matériel de bureau et matériel informatique"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "401", Account.PROPERTY_LABEL, "Frais établissement (même ventilation que celle du compte 20"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "403", Account.PROPERTY_LABEL, "Constructions même ventilation que celle du compte 213)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "404", Account.PROPERTY_LABEL, "Installations techniques; matériel et outillage industriels"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "405", Account.PROPERTY_LABEL, "Dettes provisionnées pour congés à payer"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "408", Account.PROPERTY_LABEL, "Autres charges à payer"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "409", Account.PROPERTY_LABEL, "Obligataires"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "410", Account.PROPERTY_LABEL, "tva cee"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "411", Account.PROPERTY_LABEL, "Taxes sur le chiffre d'affaires déductibles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "413", Account.PROPERTY_LABEL, "Produits à recevoir"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "416", Account.PROPERTY_LABEL, "Reglement par chèques"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "417", Account.PROPERTY_LABEL, "Réglement par CB"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "418", Account.PROPERTY_LABEL, "Réglement par LCR"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "419", Account.PROPERTY_LABEL, "Réglement en especes"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "421", Account.PROPERTY_LABEL, "Intérêts courus à payer"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "422", Account.PROPERTY_LABEL, "Crédit de mobilisation de créances commerciales (CMCC)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "424", Account.PROPERTY_LABEL, "Mobilisation de créances nées à létranger"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "425", Account.PROPERTY_LABEL, "Fournitures consommables"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "426", Account.PROPERTY_LABEL, "Variation des stocks de matières premières (et fournitures)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "427", Account.PROPERTY_LABEL, "Variation des stocks de marchandises"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "428", Account.PROPERTY_LABEL, "Achat marchandise CEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "431", Account.PROPERTY_LABEL, "Achats en francise"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "437", Account.PROPERTY_LABEL, "Malis sur emballages"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "438", Account.PROPERTY_LABEL, "Honoraires"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "441", Account.PROPERTY_LABEL, "Commissions et frais sur émission d'emprunts"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "442", Account.PROPERTY_LABEL, "Frais sur effets (commissions d'endos...)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "443", Account.PROPERTY_LABEL, "Participation des employeurs à l'effort de construction"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "444", Account.PROPERTY_LABEL, "Contribution sociale de solidarité à la charge des sociétés"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "445", Account.PROPERTY_LABEL, "Congés payes"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "446", Account.PROPERTY_LABEL, "Indemnités et avantages divers"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "447", Account.PROPERTY_LABEL, "Cotisations à l'URSSAF"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "451", Account.PROPERTY_LABEL, "Cotisations aux caisses de retraites"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "455", Account.PROPERTY_LABEL, "Cotisations aux ASSEDIC"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "456", Account.PROPERTY_LABEL, "Intérêts des emprunts et dettes"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "457", Account.PROPERTY_LABEL, "Intérêts des comptes courants et des dépôts créditeurs"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "458", Account.PROPERTY_LABEL, "Intérêts bancaires et sur opérations de financement (escompt"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "462", Account.PROPERTY_LABEL, "Intérêts des obligations cautionnées"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "464", Account.PROPERTY_LABEL, "Pertes de change ou de conversion"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "465", Account.PROPERTY_LABEL, "Dotations aux amortissements sur immobilisations incorporell"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "467", Account.PROPERTY_LABEL, "Dotations aux amortissements des charges d'exploitation à ré"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "468", Account.PROPERTY_LABEL, "Dotations aux provisions pour risques et charges d'exploitat"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "470", Account.PROPERTY_LABEL, "Dotations aux amortissements des primes de remboursement des"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "476", Account.PROPERTY_LABEL, "Dotation aux provisions pour dépréciation des éléments finan"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "477", Account.PROPERTY_LABEL, "Dotations aux amortissements exceptionnels sur immobilisatio"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "478", Account.PROPERTY_LABEL, "Ports et frais accessoires factures"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "481", Account.PROPERTY_LABEL, "Bonis sur reprises d'emballages consignes"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "486", Account.PROPERTY_LABEL, "Autres produits activités annexes (cessions d'approvisionnem"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "487", Account.PROPERTY_LABEL, "Variation des en-cours de production de biens"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "488", Account.PROPERTY_LABEL, "Variation des en-cours de production de services"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "491", Account.PROPERTY_LABEL, "Variation des stocks de produits"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "495", Account.PROPERTY_LABEL, "Gains de change ou de conversion"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "496", Account.PROPERTY_LABEL, "Reprises sur provisions pour dépréciation des éléments finan"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "501", Account.PROPERTY_LABEL, "Sur emprunts auprès des établissements de crédit"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "502", Account.PROPERTY_LABEL, "TVA à décaisser"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "503", Account.PROPERTY_LABEL, "TVA sur immobilisations"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "504", Account.PROPERTY_LABEL, "TVA sur autres bien et services"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "505", Account.PROPERTY_LABEL, "Crédit de TVA à reporter"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "506", Account.PROPERTY_LABEL, "Taxes assimilées à la TVA"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "507", Account.PROPERTY_LABEL, "TVA collectée"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "508", Account.PROPERTY_LABEL, "Taxes assimilées à la TVA"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "509", Account.PROPERTY_LABEL, "Remboursement de taxes sur le chiffre d'affaires demandé"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "511", Account.PROPERTY_LABEL, "TVA récupérée d'avance"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "512", Account.PROPERTY_LABEL, "Taxes sur le chiffre d'affaires sur factures non parvenues"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "514", Account.PROPERTY_LABEL, "Taxes sur le chiffre d'affaires sur factures à établir"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "515", Account.PROPERTY_LABEL, "Achats stockés - Matières premières France"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "516", Account.PROPERTY_LABEL, "Achats stockés - Matières premières CEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "517", Account.PROPERTY_LABEL, "Frais accessoires d'achat France"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "518", Account.PROPERTY_LABEL, "Frais accessoires d'achat CEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "519", Account.PROPERTY_LABEL, "Dotations aux amort. immobilisations incorporelles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "530", Account.PROPERTY_LABEL, "Dotations provisions dépréc. immos incorporelles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "540", Account.PROPERTY_LABEL, "Dotations provisions dépréc. immos corporelles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "580", Account.PROPERTY_LABEL, "Stocks et en-cours"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "590", Account.PROPERTY_LABEL, "Créances"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "601", Account.PROPERTY_LABEL, "Amortissements dérogatoires"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "602", Account.PROPERTY_LABEL, "Ventes de produits finis France"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "603", Account.PROPERTY_LABEL, "Ventes de produits finis CEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "604", Account.PROPERTY_LABEL, "Prestations de services France"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "605", Account.PROPERTY_LABEL, "Prestations de services CEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "606", Account.PROPERTY_LABEL, "Ventes de marchandises France"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "607", Account.PROPERTY_LABEL, "Ventes de marchandises CEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "608", Account.PROPERTY_LABEL, "Compte créé pendant import"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "609", Account.PROPERTY_LABEL, "Reprises prov. dépréc. immos incorporelles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "611", Account.PROPERTY_LABEL, "Reprises prov. dépréc. immos corporelles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "612", Account.PROPERTY_LABEL, "Stocks et en-cours"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "613", Account.PROPERTY_LABEL, "Créances"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "614", Account.PROPERTY_LABEL, "Reprises sur provisions - Amort. dérogatoires"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "615", Account.PROPERTY_LABEL, "achat cee"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "616", Account.PROPERTY_LABEL, "TVA sur autres bien et services 19.6 Débit France"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "617", Account.PROPERTY_LABEL, "TVA sur autres bien et services 19.6 Débit CEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "618", Account.PROPERTY_LABEL, "TVA sur autres bien et services 5.5 Débit France"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "619", Account.PROPERTY_LABEL, "TVA sur autres bien et services 5.5 Débit CEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "621", Account.PROPERTY_LABEL, "TVA sur autres bien et services 19.6 Encais. France"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "622", Account.PROPERTY_LABEL, "TVA sur autres bien et services 19.6 Encais. CEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "623", Account.PROPERTY_LABEL, "TVA sur autres bien et services 5.5 Encais. France"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "624", Account.PROPERTY_LABEL, "TVA sur autres bien et services 5.5 Encais. CEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "625", Account.PROPERTY_LABEL, "TVA Collectée 19.6 Débit France"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "626", Account.PROPERTY_LABEL, "TVA Collectée 19.6 Débit CEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "627", Account.PROPERTY_LABEL, "TVA"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "628", Account.PROPERTY_LABEL, "TVA Collectée 5.5 Débit France"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "629", Account.PROPERTY_LABEL, "TVA Collectée 5.5 Débit CEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "631", Account.PROPERTY_LABEL, "TVA Collectée 19.6 Encais. France"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "633", Account.PROPERTY_LABEL, "TVA Collectée 19.6 Encais. CEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "635", Account.PROPERTY_LABEL, "TVA Collectée 5.5 Encais. France"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "637", Account.PROPERTY_LABEL, "TVA Collectée 5.5 Encais. CEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "641", Account.PROPERTY_LABEL, "Capital"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "644", Account.PROPERTY_LABEL, "Capital non amorti"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "645", Account.PROPERTY_LABEL, "Ecarts de réévaluation"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "646", Account.PROPERTY_LABEL, "Réserve légale"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "647", Account.PROPERTY_LABEL, "réserve légale"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "648", Account.PROPERTY_LABEL, "Réserves indisponibles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "651", Account.PROPERTY_LABEL, "Réserves statutaires ou contractuelles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "653", Account.PROPERTY_LABEL, "Réserves réglementes"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "654", Account.PROPERTY_LABEL, "Autres réserves"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "655", Account.PROPERTY_LABEL, "Compte de l'exploitant"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "658", Account.PROPERTY_LABEL, "report a nouveau"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "661", Account.PROPERTY_LABEL, "Résultat de l'exercice (bénéfice)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "664", Account.PROPERTY_LABEL, "Résultat de l'exercice (perte)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "665", Account.PROPERTY_LABEL, "Amortissements dérogatoires"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "667", Account.PROPERTY_LABEL, "Provision spéciale de réévaluation"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "668", Account.PROPERTY_LABEL, "Plus-values réinvesties"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "671", Account.PROPERTY_LABEL, "Autres provisions réglementées"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "672", Account.PROPERTY_LABEL, "Provisions pour risques"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "675", Account.PROPERTY_LABEL, "Provision pour litige"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "678", Account.PROPERTY_LABEL, "Provisions pour charges sociales et fiscales sur congés à pa"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "681", Account.PROPERTY_LABEL, "Autres emprunts obligataires"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "686", Account.PROPERTY_LABEL, "Emprunts auprès des établissements de crédit"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "687", Account.PROPERTY_LABEL, "Sur emprunts auprès des établissements de crédit"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "691", Account.PROPERTY_LABEL, "Primes de remboursement des obligations"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "695", Account.PROPERTY_LABEL, "Dettes rattachées a des participations (groupe)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "696", Account.PROPERTY_LABEL, "Frais détablissement"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "697", Account.PROPERTY_LABEL, "Frais de recherche et de développement"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "698", Account.PROPERTY_LABEL, "Concessions et droits similaires; brevets; licences; marques"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "699", Account.PROPERTY_LABEL, "Droit au bail"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "701", Account.PROPERTY_LABEL, "Fonds commercial"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "702", Account.PROPERTY_LABEL, "Autres immobilisations incorporelles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "703", Account.PROPERTY_LABEL, "Matériel industriel (1)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "704", Account.PROPERTY_LABEL, "Matériel de transport"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "705", Account.PROPERTY_LABEL, "Matériel de bureau et matériel informatique"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "706", Account.PROPERTY_LABEL, "MATERIEL INFORMATIQUE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "707", Account.PROPERTY_LABEL, "Autres titres"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "708", Account.PROPERTY_LABEL, "PRET AUX SALARIES"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "709", Account.PROPERTY_LABEL, "Dépôts et cautionnements versés"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "713", Account.PROPERTY_LABEL, "Créances sur Titres Immo."); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "721", Account.PROPERTY_LABEL, "Amortissements des immobilisations incorporelles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "722", Account.PROPERTY_LABEL, "Frais établissement (même ventilation que celle du compte 20"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "740", Account.PROPERTY_LABEL, "Amortissements des immobilisations corporelles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "751", Account.PROPERTY_LABEL, "Constructions même ventilation que celle du compte 213)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "752", Account.PROPERTY_LABEL, "Installations techniques; matériel et outillage industriels"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "753", Account.PROPERTY_LABEL, "AMORTISSEMENT MATERIEL"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "754", Account.PROPERTY_LABEL, "Provisions pour dépréciation des immobilisations incorporell"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "755", Account.PROPERTY_LABEL, "Provisions pour dépréciation des immobilisations corporelles"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "758", Account.PROPERTY_LABEL, "Provisions pour dépréciation des participations et créances"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "761", Account.PROPERTY_LABEL, "Provisions pour dépréciation des autres immobilisations fina"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "762", Account.PROPERTY_LABEL, "Provisions pour dépréciation des matières premières (et four"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "763", Account.PROPERTY_LABEL, "Provisions pour dépréciation des autres approvisionnements"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "764", Account.PROPERTY_LABEL, "Provisions pour dépréciation des encours de production de bi"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "765", Account.PROPERTY_LABEL, "Provisions pour dépréciation des en-cours de production de s"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "766", Account.PROPERTY_LABEL, "Provisions pour dépréciation des stocks de produits"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "767", Account.PROPERTY_LABEL, "Provisions pour dépréciation des stocks de marchandises"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "768", Account.PROPERTY_LABEL, "Fournisseurs divers"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "771", Account.PROPERTY_LABEL, "NF Poussin Benjamin"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "772", Account.PROPERTY_LABEL, "NF Thimel Arnaud"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "775", Account.PROPERTY_LABEL, "NF Ruchaud Julien"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "777", Account.PROPERTY_LABEL, "Mutuelle du Mans"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "778", Account.PROPERTY_LABEL, "SFR"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "781", Account.PROPERTY_LABEL, "Free Telecom"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "786", Account.PROPERTY_LABEL, "April"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "787", Account.PROPERTY_LABEL, "CM-CIC Epargne Salariale"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "791", Account.PROPERTY_LABEL, "ECAC -Troadec"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "796", Account.PROPERTY_LABEL, "Fournisseurs facture à recevoir"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "801", Account.PROPERTY_LABEL, "Facture à Emettre"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "802", Account.PROPERTY_LABEL, "Personnel - Rémunérations dues"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "809", Account.PROPERTY_LABEL, "Regul Mutuelle à recupérer"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "890", Account.PROPERTY_LABEL, "Personnel - Charges à payer et produits à recevoir"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "891", Account.PROPERTY_LABEL, "Dettes provisionnées pour congés à payer"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "1061", Account.PROPERTY_LABEL, "Intéressement à verser aux salariés"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "1062", Account.PROPERTY_LABEL, "Personnel -autres charges a payer"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "1063", Account.PROPERTY_LABEL, "Urssaf"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "1064", Account.PROPERTY_LABEL, "Urssaf-csg-crds-forfait social"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "1068", Account.PROPERTY_LABEL, "retraite"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "1391", Account.PROPERTY_LABEL, "Pôle Emploi"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "1398", Account.PROPERTY_LABEL, "Retraite ARRCO"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "1671", Account.PROPERTY_LABEL, "Retraite Cadre AGIRC"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "1674", Account.PROPERTY_LABEL, "Mutuelle"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "1675", Account.PROPERTY_LABEL, "Prévoyance"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2761", Account.PROPERTY_LABEL, "charges sociales sur congés à payer"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2768", Account.PROPERTY_LABEL, "Autres charges à payer"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2801", Account.PROPERTY_LABEL, "URSSAF à recevoir"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2803", Account.PROPERTY_LABEL, "Subventions d'expoitation"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2805", Account.PROPERTY_LABEL, "Etat - Impôts sur les bénéfices"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2807", Account.PROPERTY_LABEL, "Crédit Impot Recherche à recevoir"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2808", Account.PROPERTY_LABEL, "IS à payer"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2811", Account.PROPERTY_LABEL, "Crédit Impot Recherche à recevoir"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2812", Account.PROPERTY_LABEL, "Crédit Impot Intéressement"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2813", Account.PROPERTY_LABEL, "Etat - Taxes sur le chiffre d'affaires"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2814", Account.PROPERTY_LABEL, "TVA à décaisser"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2815", Account.PROPERTY_LABEL, "TVA à décaisser 20%"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2818", Account.PROPERTY_LABEL, "TVA sur immobilisations"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2905", Account.PROPERTY_LABEL, "TVA sur immobilisations 20%"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2906", Account.PROPERTY_LABEL, "TVA sur autres bien et services"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2907", Account.PROPERTY_LABEL, "TVA/ABS 2;1%"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2908", Account.PROPERTY_LABEL, "TVA sur autres bien et services 5.5 Débit France"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2911", Account.PROPERTY_LABEL, "TVA sur autres biens et services 20%"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2931", Account.PROPERTY_LABEL, "Crédit de TVA à reporter"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2932", Account.PROPERTY_LABEL, "Crédit de TVA à reporter 20%"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2961", Account.PROPERTY_LABEL, "Taxes assimilées à la TVA"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2966", Account.PROPERTY_LABEL, "TVA collectée"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2967", Account.PROPERTY_LABEL, "TVA Collectée 20%"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2968", Account.PROPERTY_LABEL, "TVA encaissée"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2971", Account.PROPERTY_LABEL, "TVA encaissée 20%"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2972", Account.PROPERTY_LABEL, "Taxes assimilées à la TVA"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2973", Account.PROPERTY_LABEL, "TVA A REGUL"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2974", Account.PROPERTY_LABEL, "Remboursement de taxes sur le chiffre d'affaires demandé"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2975", Account.PROPERTY_LABEL, "TVA récupérée d'avance"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "2976", Account.PROPERTY_LABEL, "Taxes sur le chif d'af sur factures non parvenues"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4081", Account.PROPERTY_LABEL, "Taxes sur le chiffre d'affaires sur factures à établir"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4084", Account.PROPERTY_LABEL, "Obligations cautionnées"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4088", Account.PROPERTY_LABEL, "Autres TVA à déduire"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4091", Account.PROPERTY_LABEL, "Autres impôts; taxes et versements assimilés"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4096", Account.PROPERTY_LABEL, "ETAT CHARGES A PAYER"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4097", Account.PROPERTY_LABEL, "Etat charges a payer"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4098", Account.PROPERTY_LABEL, "TAXE PRO"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4191", Account.PROPERTY_LABEL, "Etat charges à payer formation prof"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4196", Account.PROPERTY_LABEL, "Impôt dégrevements à recevoir"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4197", Account.PROPERTY_LABEL, "Associés - Comptes courants"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4198", Account.PROPERTY_LABEL, "compte REGNIER"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4282", Account.PROPERTY_LABEL, "compte POUSSIN"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4284", Account.PROPERTY_LABEL, "compte PINEAU"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4286", Account.PROPERTY_LABEL, "Créances sur cessions d'immobilisations"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4287", Account.PROPERTY_LABEL, "Subvention Oseo à recevoir"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4452", Account.PROPERTY_LABEL, "Débiteurs et crediteurs divers"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4455", Account.PROPERTY_LABEL, "Produits à recevoir"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4456", Account.PROPERTY_LABEL, "Compte d'attente"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4457", Account.PROPERTY_LABEL, "Compte d'attente"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4458", Account.PROPERTY_LABEL, "Charges à repartir sur plusieurs exercices"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4686", Account.PROPERTY_LABEL, "Charges constatées d'avance"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "4687", Account.PROPERTY_LABEL, "Produits constatés d'avance"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "5111", Account.PROPERTY_LABEL, "Provisions pour dépréciation des comptes de clients"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "5112", Account.PROPERTY_LABEL, "Provisions pour dépréciation des comptes de débiteurs divers"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "5113", Account.PROPERTY_LABEL, "VMP - Actions"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "5114", Account.PROPERTY_LABEL, "CAT Tonic 60"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "5121", Account.PROPERTY_LABEL, "Valeurs à I'encaissement"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "5122", Account.PROPERTY_LABEL, "Banques"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6022", Account.PROPERTY_LABEL, "CAT TONIC 60"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6026", Account.PROPERTY_LABEL, "Autres organismes financiers"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6031", Account.PROPERTY_LABEL, "Intérêts courus à payer"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6032", Account.PROPERTY_LABEL, "Concours bancaires courant"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6091", Account.PROPERTY_LABEL, "Crédit de mobilisation de créances commerciales (CMCC)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6092", Account.PROPERTY_LABEL, "Mobilisation de créances nées à létranger"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6094", Account.PROPERTY_LABEL, "TONIC 60- Intérets courus à recevoir"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6095", Account.PROPERTY_LABEL, "Caisse siège social"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6096", Account.PROPERTY_LABEL, "Virements internes"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6097", Account.PROPERTY_LABEL, "Provisions pour dépréciation des valeurs mobilières de place"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6098", Account.PROPERTY_LABEL, "Achats stockés - Matières premières (et fournitures)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6371", Account.PROPERTY_LABEL, "ACHATS MATERIELS INFORMATIQUES"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6411", Account.PROPERTY_LABEL, "Achats stockés - Matières premières France"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6412", Account.PROPERTY_LABEL, "Achats stockés - Matières premières CEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6413", Account.PROPERTY_LABEL, "Fournitures consommables"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6414", Account.PROPERTY_LABEL, "achat carburant"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6451", Account.PROPERTY_LABEL, "Fourniture de magasin"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6452", Account.PROPERTY_LABEL, "Fourniture de bureau"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6453", Account.PROPERTY_LABEL, "Frais postaux"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6454", Account.PROPERTY_LABEL, "Emballages"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "6688", Account.PROPERTY_LABEL, "VARIATION DES STOCKS (approvisionnements et marchandises)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "7133", Account.PROPERTY_LABEL, "Variation des stocks de matières premières (et fournitures)"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "7134", Account.PROPERTY_LABEL, "Variation des stocks de marchandises"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "7135", Account.PROPERTY_LABEL, "Prestations de services"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "7688", Account.PROPERTY_LABEL, "achat matériel informatique"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "27682", Account.PROPERTY_LABEL, "Achats non stockes de matières et fournitures"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "27684", Account.PROPERTY_LABEL, "éléctricité"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "27685", Account.PROPERTY_LABEL, "gaz"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "27688", Account.PROPERTY_LABEL, "Repas"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "44551", Account.PROPERTY_LABEL, "Petit équipement"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "44562", Account.PROPERTY_LABEL, "frais d'aménagement"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "44566", Account.PROPERTY_LABEL, "Fournitures de bureau"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "44567", Account.PROPERTY_LABEL, "CARBURANTS"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "44571", Account.PROPERTY_LABEL, "Achats de marchandises"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "44583", Account.PROPERTY_LABEL, "achats divers"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "44584", Account.PROPERTY_LABEL, "Achats de marchandises France"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "44586", Account.PROPERTY_LABEL, "Achats de marchandises CEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "44587", Account.PROPERTY_LABEL, "Frais accessoires d'achat"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "68111", Account.PROPERTY_LABEL, "Frais accessoires d'achat France"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "68112", Account.PROPERTY_LABEL, "Frais accessoires d'achat CEE"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "68161", Account.PROPERTY_LABEL, "Rabais; remises et ristournes obtenus sur achats"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "68162", Account.PROPERTY_LABEL, "RRR sur prestations de services"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "68725", Account.PROPERTY_LABEL, "Sous-traitance générale"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "78161", Account.PROPERTY_LABEL, "Redevances de crédit-bail"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "78162", Account.PROPERTY_LABEL, "Locations"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "78725", Account.PROPERTY_LABEL, "loyer"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "445661", Account.PROPERTY_LABEL, "Location informatique"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "445662", Account.PROPERTY_LABEL, "location mobilière"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "445664", Account.PROPERTY_LABEL, "Malis sur emballages"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "445665", Account.PROPERTY_LABEL, "Charges locatives et de copropriété"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "445711", Account.PROPERTY_LABEL, "Entretien et réparations"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "445712", Account.PROPERTY_LABEL, "Entretien et réparations sur biens immo"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "445714", Account.PROPERTY_LABEL, "entretien locaux"); + accountTopiaDao.create(Account.PROPERTY_ACCOUNT_NUMBER, "445715", Account.PROPERTY_LABEL, "Primes d'assurance"); + tcontext.commit(); + } + + /** * Create some EntryBooks. * * @throws org.chorem.lima.business.exceptions.LimaException * @throws java.text.ParseException */ - protected void createEntryBooks() throws Exception { + protected void initTestWithEntryBooks() throws Exception { // creation d'un journal EntryBook journalDesVentes = new EntryBookImpl(); journalDesVentes.setLabel("Journal des ventes"); @@ -287,7 +759,14 @@ public abstract class AbstractLimaTest { * @throws org.chorem.lima.business.exceptions.LimaException * @throws java.text.ParseException */ - protected void createFiscalPeriod() throws Exception { + protected void initTestWithFiscalPeriod() throws Exception { + initTestWithAccounts(); + + // creation d'un journal + EntryBook journalDesVentes = new EntryBookImpl(); + journalDesVentes.setLabel("Journal des ventes"); + journalDesVentes.setCode("jdv"); + entryBookService.createEntryBook(journalDesVentes); // creation d'un exercice fiscal FiscalPeriod fiscalPeriod = new FiscalPeriodImpl(); @@ -300,15 +779,102 @@ public abstract class AbstractLimaTest { * Create FinancialTransaction with 2 entries * @throws Exception */ - protected void createFinancialTransaction() throws Exception { + protected void initTestWithFinancialTransaction() throws Exception { + + initTestWithFiscalPeriod(); + Account accountVmpVae = accountService.getAccountByNumber("511"); + EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); + + FinancialTransaction transaction1 = new FinancialTransactionImpl(); + transaction1.setTransactionDate(df.parse("April 4, 2012")); + transaction1.setEntryBook(journalDesVentes); + transaction1 = financialTransactionService.createFinancialTransaction(transaction1); + + Entry tr1Entry1 = new EntryImpl(); + tr1Entry1.setAmount(BigDecimal.valueOf(42.0)); + tr1Entry1.setAccount(accountVmpVae); + tr1Entry1.setFinancialTransaction(transaction1); + tr1Entry1.setDescription("test desc"); + tr1Entry1.setVoucher("voucher"); + tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); + + Entry tr1Entry2 = new EntryImpl(); + tr1Entry2.setAmount(BigDecimal.valueOf(42.0)); + tr1Entry2.setDebit(true); + tr1Entry2.setAccount(accountVmpVae); + tr1Entry2.setFinancialTransaction(transaction1); + tr1Entry2.setDescription("test desc"); + tr1Entry2.setVoucher("voucher"); + tr1Entry2 = financialTransactionService.createEntry(tr1Entry2); + + transaction1.setEntry(Lists.newArrayList(tr1Entry1, tr1Entry2)); + financialTransactionService.updateFinancialTransaction(transaction1); + } + - createFinancialTransaction("jdv", df.parse("April 4, 2012"), "511", "501", BigDecimal.valueOf(42.0)); + protected void initTestWithSomeFinancialTransaction() throws Exception { + + initTestWithFiscalPeriod(); + Account accountVmpVae = accountService.getAccountByNumber("511"); + EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); + + FinancialTransaction transaction1 = new FinancialTransactionImpl(); + transaction1.setTransactionDate(df.parse("April 4, 2012")); + transaction1.setEntryBook(journalDesVentes); + transaction1 = financialTransactionService.createFinancialTransaction(transaction1); + + Entry tr1Entry1 = new EntryImpl(); + tr1Entry1.setAmount(BigDecimal.valueOf(42.0)); + tr1Entry1.setAccount(accountVmpVae); + tr1Entry1.setFinancialTransaction(transaction1); + tr1Entry1.setDescription("test desc"); + tr1Entry1.setVoucher("voucherA"); + tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); + + Entry tr1Entry2 = new EntryImpl(); + tr1Entry2.setAmount(BigDecimal.valueOf(42.0)); + tr1Entry2.setDebit(true); + tr1Entry2.setAccount(accountVmpVae); + tr1Entry2.setFinancialTransaction(transaction1); + tr1Entry2.setDescription("test desc"); + tr1Entry2.setVoucher("voucherA"); + tr1Entry2 = financialTransactionService.createEntry(tr1Entry2); + + transaction1.setEntry(Lists.newArrayList(tr1Entry1, tr1Entry2)); + financialTransactionService.updateFinancialTransaction(transaction1); + + FinancialTransaction transaction2 = new FinancialTransactionImpl(); + transaction2.setTransactionDate(df.parse("April 4, 2012")); + transaction2.setEntryBook(journalDesVentes); + transaction2 = financialTransactionService.createFinancialTransaction(transaction2); + + Entry tr1Entry1b = new EntryImpl(); + tr1Entry1b.setAmount(BigDecimal.valueOf(12.0)); + tr1Entry1b.setAccount(accountVmpVae); + tr1Entry1b.setFinancialTransaction(transaction2); + tr1Entry1b.setDescription("test desc"); + tr1Entry1b.setVoucher("voucherB"); + financialTransactionService.createEntry(tr1Entry1b); + + Entry tr1Entry2b = new EntryImpl(); + tr1Entry2b.setAmount(BigDecimal.valueOf(6.0)); + tr1Entry2b.setDebit(true); + tr1Entry2b.setAccount(accountVmpVae); + tr1Entry2b.setFinancialTransaction(transaction2); + tr1Entry2b.setDescription("test desc"); + tr1Entry2b.setVoucher("voucherB"); + financialTransactionService.createEntry(tr1Entry2b); + + Entry tr1Entry3b = new EntryImpl(); + tr1Entry3b.setAmount(BigDecimal.valueOf(6.0)); + tr1Entry3b.setDebit(true); + tr1Entry3b.setAccount(accountVmpVae); + tr1Entry3b.setFinancialTransaction(transaction2); + tr1Entry3b.setDescription("test desc"); + tr1Entry3b.setVoucher("voucherB"); + financialTransactionService.createEntry(tr1Entry3b); } - /** - * Create FinancialTransaction with 2 entries - * @throws Exception - */ protected FinancialTransaction createFinancialTransaction(String entryBookCode, Date date, String accountDebitNumber, String accountCreditNumber, BigDecimal amount) throws Exception { @@ -345,5 +911,4 @@ public abstract class AbstractLimaTest { return transaction; } - -} +} \ No newline at end of file diff --git a/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java b/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java index 9cf9a7a..5e9200e 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java @@ -51,7 +51,7 @@ public class AccountServiceImplTest extends AbstractLimaTest { @Before public void initTest() throws Exception { - createAccounts(); + initTestWithAccounts(); } @Test @@ -357,13 +357,13 @@ public class AccountServiceImplTest extends AbstractLimaTest { * On souhaite supprimer le compte 501, ce dernier est utilisé dans une ecriture. La * suppression ne peut s'effectuer. * - * @throws UsedAccountException + * @throws AlreadyExistAccountException */ - @Test(expected = UsedAccountException.class) + @Test(expected = AlreadyExistAccountException.class) public void removeUsedAccountTest() throws Exception { - createEntryBooks(); - createFiscalPeriod(); - createFinancialTransaction(); + initTestWithEntryBooks(); + initTestWithFiscalPeriod(); + initTestWithFinancialTransaction(); Account account = accountService.getAccountByNumber("511"); accountService.removeAccount(account); } diff --git a/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java b/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java index 8455e99..56b768f 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java @@ -48,7 +48,7 @@ public class EntryBookServiceImplTest extends AbstractLimaTest { @Before public void initTest() throws Exception { - createEntryBooks(); + initTestWithEntryBooks(); } @Test @@ -175,8 +175,8 @@ public class EntryBookServiceImplTest extends AbstractLimaTest { */ @Test(expected=UsedEntryBookException.class) public void deleteUsedEntryBook() throws Exception { - createFiscalPeriod(); - createFinancialTransaction(); + initTestWithFiscalPeriod(); + initTestWithFinancialTransaction(); EntryBook entryBook = entryBookService.getEntryBookByCode("jdv"); entryBookService.removeEntryBook(entryBook); diff --git a/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java b/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java index 5da0a81..8dbc49c 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java @@ -58,9 +58,9 @@ public class FinancialPeriodServiceImplTest extends AbstractLimaTest { @Before public void initTest() throws Exception { - createAccounts(); - createEntryBooks(); - createFiscalPeriod(); + initTestWithAccounts(); + initTestWithEntryBooks(); + initTestWithFiscalPeriod(); } @Test diff --git a/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java b/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java index 5650f35..73baf8e 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java @@ -63,9 +63,9 @@ public class FinancialTransactionServiceImplTest extends AbstractLimaTest { @Before public void initTest() throws Exception { - createAccounts(); - createEntryBooks(); - createFiscalPeriod(); + initTestWithAccounts(); + initTestWithEntryBooks(); + initTestWithFiscalPeriod(); } @Test diff --git a/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java b/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java index 08168f9..8f5f9ed 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java @@ -72,8 +72,8 @@ public class FiscalPeriodServiceImplTest extends AbstractLimaTest { @Before public void initTest() throws Exception { - createAccounts(); - createEntryBooks(); + initTestWithAccounts(); + initTestWithEntryBooks(); } @Test diff --git a/lima-business/src/test/java/org/chorem/lima/business/ImportExportServiceTest.java b/lima-business/src/test/java/org/chorem/lima/business/ImportExportServiceTest.java index d76cd5e..64b0b5c 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/ImportExportServiceTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/ImportExportServiceTest.java @@ -55,6 +55,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStreamWriter; +import java.math.BigDecimal; import java.nio.charset.Charset; import java.text.ParseException; import java.util.ArrayList; @@ -72,9 +73,9 @@ public class ImportExportServiceTest extends AbstractLimaTest { @Test public void testExportImportAccounts() throws Exception { - createAccounts(); - createEntryBooks(); - createFiscalPeriod(); + initTestWithAccounts(); + initTestWithEntryBooks(); + initTestWithFiscalPeriod(); // make sure they are some accounts. List<Account> accounts = accountService.getAllAccounts(); Assert.assertTrue(accountService.getAllAccounts().size() > 0); @@ -126,8 +127,8 @@ public class ImportExportServiceTest extends AbstractLimaTest { @Test public void testExportImportEntryBooks() throws Exception { - createAccounts(); - createEntryBooks(); + initTestWithAccounts(); + initTestWithEntryBooks(); String tmpDir = System.getProperty("java.io.tmpdir")+"/"; ImportExportResults export = exportService.exportEntryBooksAsCSV(Charset.defaultCharset().name()); @@ -162,10 +163,10 @@ public class ImportExportServiceTest extends AbstractLimaTest { @Test public void testExportImportEntries() throws Exception { - createAccounts(); - createEntryBooks(); - createFiscalPeriod(); - createFinancialTransaction(); + initTestWithAccounts(); + initTestWithEntryBooks(); + initTestWithFiscalPeriod(); + initTestWithFinancialTransaction(); List<FinancialTransaction> financialTransactions = financialTransactionService.getAllFinancialTransactions(df.parse("April 4, 2012"),df.parse("December 31, 2012")); List<Entry> entries = Lists.newArrayList(); @@ -219,9 +220,9 @@ public class ImportExportServiceTest extends AbstractLimaTest { @Test public void testExportImportFiscalPeriodsAsCSV() throws Exception { - createAccounts(); - createEntryBooks(); - createFiscalPeriod(); + initTestWithAccounts(); + initTestWithEntryBooks(); + initTestWithFiscalPeriod(); String tmpDir = System.getProperty("java.io.tmpdir")+"/"; String export = exportService.exportFiscalPeriodsAsCSV(Charset.defaultCharset().name()).getExportResults().get(0).getExportData(); @@ -254,10 +255,10 @@ public class ImportExportServiceTest extends AbstractLimaTest { @Test public void exportImportAllAsCSVTest() throws Exception { - createAccounts(); - createEntryBooks(); - createFiscalPeriod(); - createFinancialTransaction(); + initTestWithAccounts(); + initTestWithEntryBooks(); + initTestWithFiscalPeriod(); + initTestWithFinancialTransaction(); Identity identity = new IdentityImpl(); identity.setName("Code Lutin"); @@ -552,10 +553,7 @@ public class ImportExportServiceTest extends AbstractLimaTest { @Test public void testExportImportEntriesEbp() throws Exception { - createAccounts(); - createEntryBooks(); - createFiscalPeriod(); - createFinancialTransaction(); + initTestWithSomeFinancialTransaction(); List<FinancialTransaction> financialTransactions = financialTransactionService.getAllFinancialTransactions(df.parse("April 4, 2012"),df.parse("December 31, 2012")); List<Entry> entries = Lists.newArrayList(); @@ -590,27 +588,33 @@ public class ImportExportServiceTest extends AbstractLimaTest { // test import FileInputStream contentStream = null; - ImportResult result; try { contentStream = new FileInputStream(tmpDir + "export-entries-EBP.csv"); String inputStream = IOUtils.toString(contentStream); - result = importService.importEntriesFromEbp(inputStream).getImportResults().get(0); + importService.importEntriesFromEbp(inputStream).getImportResults().get(0); } finally { IOUtils.closeQuietly(contentStream); } // valid import financialTransactions = financialTransactionService.getAllFinancialTransactions(df.parse("April 4, 2012"),df.parse("December 31, 2012")); - Assert.assertEquals(1, financialTransactions.size()); + Assert.assertEquals(2, financialTransactions.size()); for (FinancialTransaction financialTransaction : financialTransactions) { - entries.addAll(financialTransaction.getEntry()); - } - - Assert.assertEquals(nbEntities, entries.size()); - Assert.assertEquals(nbEntities, result.getNbCreated()); - Assert.assertNull(result.getAllExceptionsByLine()); - for (Entry entry : entries) { - Assert.assertTrue(42.0 == entry.getAmount().doubleValue()); + if (financialTransaction.getAmountDebit().compareTo(BigDecimal.valueOf(42.0)) == 0) { + Collection<Entry> voucherAEntries = financialTransaction.getEntry(); + Assert.assertEquals(2L, voucherAEntries.size()); + for (Entry entry : voucherAEntries) { + Assert.assertTrue(entry.getVoucher().contentEquals("voucherA")); + } + } else if (financialTransaction.getAmountDebit().compareTo(BigDecimal.valueOf(12.0)) == 0) { + Collection<Entry> voucherBEntries = financialTransaction.getEntry(); + Assert.assertEquals(3L, voucherBEntries.size()); + for (Entry entry : voucherBEntries) { + Assert.assertTrue(entry.getVoucher().contentEquals("voucherB")); + } + } else { + Assert.fail("Fail to import financial transactions"); + } } } diff --git a/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java b/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java index 6851851..a3e05e0 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java @@ -48,10 +48,10 @@ public class ReportServiceImplTest extends AbstractLimaTest { @Before public void initTest() throws Exception { - createAccounts(); - createEntryBooks(); - createFiscalPeriod(); - createFinancialTransaction(); + initTestWithAccounts(); + initTestWithEntryBooks(); + initTestWithFiscalPeriod(); + initTestWithFinancialTransaction(); } /** diff --git a/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java b/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java index 1ea0b63..a5dba3f 100644 --- a/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java +++ b/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java @@ -54,10 +54,10 @@ public class FinancialTransactionDAOTest extends AbstractLimaTest { @Test public void testFindAllUnbalancedTransactions() throws Exception { - createAccounts(); - createEntryBooks(); - createFiscalPeriod(); - createFinancialTransaction(); + initTestWithAccounts(); + initTestWithEntryBooks(); + initTestWithFiscalPeriod(); + initTestWithFinancialTransaction(); FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); diff --git a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties index 29d8443..331c21a 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties @@ -427,7 +427,10 @@ lima.identity.phoneNumber=Phone number lima.identity.vatNumber=VAT number lima.identity.zipCode=Zip code lima.import.error=Import Failed +lima.import.error.andMoreErrors=And %d more errors +lima.import.error.entriesOutOfDatesRange=Open fiscal period lima.import.error.extractFile=Invalid file +lima.import.error.invalidAccountNumber=None existing account with number '%' lima.import.error.noDataToImport=Any data to import lima.import.error.unknown=Unknown error lima.import.line=line diff --git a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties index 4f261ab..895f7b2 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties @@ -438,7 +438,10 @@ lima.identity.phoneNumber=n° Tel lima.identity.vatNumber=Numéro TVA\: FR lima.identity.zipCode=Code Postal lima.import.error=Une erreur est survenue lors de l'import +lima.import.error.andMoreErrors=Et %d autres erreurs... +lima.import.error.entriesOutOfDatesRange=Periode fiscale non authorisé lima.import.error.extractFile=Le fichier n'est correct +lima.import.error.invalidAccountNumber=Le compte '%s' n'existe pas. lima.import.error.noDataToImport=Aucune donnée à importer. lima.import.error.unknown=Erreur inconnue. lima.import.line=Ligne %d\: -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm