[Lima-commits] branch feature/1207 updated (248ce54 -> 2bbb45e)

This is an automated email from the git hooks/post-receive script. New change to branch feature/1207 in repository lima. See http://git.chorem.org/lima.git from 248ce54 rebase to develop (refs #1207) 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 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 No new revisions were added by this update. Summary of changes: lima-business-api/pom.xml | 15 +- .../src/license/THIRD-PARTY.properties | 12 +- .../org/chorem/lima/LimaTechnicalException.java | 2 +- .../chorem/lima/business/LimaServiceFactory.java | 8 - .../org/chorem/lima/business/ServiceListener.java | 2 +- .../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 | 4 - .../business/api/FinancialTransactionService.java | 13 +- .../lima/business/api/FiscalPeriodService.java | 38 +- .../chorem/lima/business/api/ImportService.java | 11 + .../chorem/lima/business/api/OptionsService.java | 6 +- .../chorem/lima/business/api/TreasuryService.java | 13 + .../lima/business/api/VatStatementService.java | 5 +- ...eportService.java => AccountReportService.java} | 14 +- .../business/api/report/BalanceReportService.java | 19 +- .../lima/business/exceptions/AccountException.java | 2 +- .../exceptions/AfterLastFiscalPeriodException.java | 2 +- ...on.java => AlreadyAffectedVatBoxException.java} | 14 +- .../exceptions/AlreadyExistAccountException.java | 2 +- .../AlreadyLockedFiscalPeriodException.java | 2 +- .../BeforeFirstFiscalPeriodException.java | 2 +- .../BeginAfterEndFiscalPeriodException.java | 2 +- .../ClosedPeriodicEntryBookException.java | 2 +- .../ClosedPeriodicEntryBooksException.java | 2 +- .../lima/business/exceptions/DateException.java | 2 +- .../lima/business/exceptions/EntriesException.java | 2 +- .../business/exceptions/EntryBookException.java | 2 +- .../exceptions/FinancialPeriodException.java | 2 +- .../exceptions/FinancialTransactionsException.java | 2 +- .../business/exceptions/FiscalPeriodException.java | 2 +- .../business/exceptions/ImportEbpException.java | 2 +- .../exceptions/InvalidAccountNumberException.java | 2 +- .../LastUnlockedFiscalPeriodException.java | 2 +- .../exceptions/LockedEntryBookException.java | 2 +- .../exceptions/LockedFinancialPeriodException.java | 2 +- .../MoreOneUnlockFiscalPeriodException.java | 2 +- .../exceptions/NoEmptyFiscalPeriodException.java | 2 +- .../NoFoundFinancialPeriodException.java | 2 +- ...NotBeginNextDayOfLastFiscalPeriodException.java | 2 +- ...NotLockedClosedPeriodicEntryBooksException.java | 2 +- .../NotNumberAccountNumberException.java | 2 +- ...lException.java => RequiredFieldException.java} | 14 +- .../exceptions/UnbalancedEntriesException.java | 2 +- .../UnbalancedFinancialTransactionsException.java | 2 +- .../exceptions/UnfilledEntriesException.java | 2 +- .../business/exceptions/UsedAccountException.java | 2 +- .../exceptions/UsedEntryBookException.java | 2 +- ...outEntryBookFinancialTransactionsException.java | 2 +- lima-business/pom.xml | 2 +- .../org/chorem/lima/business/AccountingRules.java | 35 +- .../chorem/lima/business/LimaBusinessConfig.java | 77 +- .../accountingrules/DefaultAccountingRules.java | 190 +++-- .../accountingrules/FranceAccountingRules.java | 10 +- .../lima/business/ejb/AccountServiceImpl.java | 23 +- .../ejb/ClosedPeriodicEntryBookServiceImpl.java | 11 + .../lima/business/ejb/EntryBookServiceImpl.java | 7 + .../lima/business/ejb/ExportServiceImpl.java | 50 +- .../business/ejb/FinancialPeriodServiceImpl.java | 18 - .../ejb/FinancialTransactionServiceImpl.java | 33 +- .../lima/business/ejb/FiscalPeriodServiceImpl.java | 62 +- .../lima/business/ejb/ImportServiceImpl.java | 106 ++- .../lima/business/ejb/OptionsServiceImpl.java | 12 +- .../lima/business/ejb/TreasuryServiceImpl.java | 69 ++ .../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 | 125 ++++ .../ejb/report/BalanceReportServiceImpl.java | 325 ++++++-- .../business/ejb/report/CommonsDocumentReport.java | 57 ++ .../report/GeneralEntryBookReportServiceImpl.java | 43 +- .../ejb/report/LedgerReportServiceImpl.java | 41 +- .../ProvisionalEntryBookReportServiceImpl.java | 64 +- .../entity/ClosedPeriodicEntryBookTopiaDao.java | 29 +- .../java/org/chorem/lima/entity/EntryTopiaDao.java | 81 +- .../lima/entity/FinancialPeriodTopiaDao.java | 14 - .../lima/entity/FinancialTransactionTopiaDao.java | 1 - .../chorem/lima/entity/FiscalPeriodTopiaDao.java | 24 - .../org/chorem/lima/entity/GeneratorHQuery.java | 2 +- .../resources/i18n/lima-business_en_GB.properties | 60 ++ .../resources/i18n/lima-business_fr_FR.properties | 66 +- .../org/chorem/lima/business/AbstractLimaTest.java | 575 ++------------ .../lima/business/AccountServiceImplTest.java | 332 +++++--- .../lima/business/EntryBookServiceImplTest.java | 148 +++- .../business/FinancialPeriodServiceImplTest.java | 260 ++++++- .../FinancialTransactionServiceImplTest.java | 638 +++++++++++++++- .../lima/business/FiscalPeriodServiceImplTest.java | 640 +++++++++++++--- .../lima/business/ImportExportServiceTest.java | 45 +- .../lima/business/ReportServiceImplTest.java | 5 +- .../lima/entity/FinancialTransactionDAOTest.java | 5 +- lima-business/src/test/resources/log4j.properties | 4 +- lima-callao/pom.xml | 2 +- .../lima/beans/AbstractBigDecimalCondition.java | 2 +- .../chorem/lima/beans/AbstractStringCondition.java | 2 +- .../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 | 2 +- .../chorem/lima/beans/DateIntervalCondition.java | 2 +- .../java/org/chorem/lima/beans/DebitCondition.java | 2 +- .../chorem/lima/beans/DescriptionCondition.java | 2 +- .../org/chorem/lima/beans/EntryBookCondition.java | 2 +- .../lima/beans/FinancialPeriodCondition.java | 2 +- .../lima/beans/FinancialTransactionCondition.java | 2 +- .../chorem/lima/beans/FiscalPeriodCondition.java | 2 +- .../main/java/org/chorem/lima/beans/Labeled.java | 2 +- .../org/chorem/lima/beans/LetteringCondition.java | 2 +- .../org/chorem/lima/beans/VisitorCondition.java | 2 +- .../org/chorem/lima/beans/VoucherCondition.java | 2 +- .../java/org/chorem/lima/clause/AndClause.java | 2 +- .../java/org/chorem/lima/clause/BooleanClause.java | 2 +- .../main/java/org/chorem/lima/clause/Clause.java | 2 +- .../java/org/chorem/lima/clause/DateClause.java | 2 +- .../java/org/chorem/lima/clause/NotClause.java | 2 +- .../java/org/chorem/lima/clause/NumberClause.java | 2 +- .../main/java/org/chorem/lima/clause/OrClause.java | 2 +- .../java/org/chorem/lima/clause/SetClause.java | 2 +- .../java/org/chorem/lima/clause/StringClause.java | 2 +- .../org/chorem/lima/clause/SubFilterClause.java | 2 +- .../java/org/chorem/lima/clause/VisitorClause.java | 2 +- .../org/chorem/lima/filter/AbstractFilter.java | 2 +- .../java/org/chorem/lima/filter/AccountFilter.java | 2 +- .../org/chorem/lima/filter/EntryBookFilter.java | 2 +- .../java/org/chorem/lima/filter/EntryFilter.java | 2 +- .../main/java/org/chorem/lima/filter/Filter.java | 2 +- .../org/chorem/lima/filter/FilterGenerator.java | 2 +- .../lima/filter/FinancialTransactionFilter.java | 2 +- .../java/org/chorem/lima/filter/VisitorFilter.java | 2 +- ...ql => V0_8_6_0__1241_create_table_TREASURY.sql} | 52 +- .../src/main/xmi/lima-callao-model.properties | 2 +- lima-callao/src/main/xmi/lima-callao-model.zargo | Bin 57316 -> 61665 bytes lima-report/pom.xml | 12 +- lima-report/src/license/THIRD-PARTY.properties | 14 +- .../chorem/lima/report/DocumentReportTypes.java | 1 + .../java/org/chorem/lima/report/DocumentsEnum.java | 4 +- .../org/chorem/lima/report/LimaReportConfig.java | 60 +- .../lima/report/service/DocumentService.java | 321 ++++---- .../chorem/lima/report/service/JasperReports.java | 10 + .../AccountEntry.jrxml} | 170 ++--- .../jasperreports/account/DocumentReport.jrxml | 266 +++++++ .../balance/BalanceReportAccountReport.jrxml | 18 +- .../balance/BalanceSubAccountsReport.jrxml | 54 +- .../jasperreports/balance/DocumentReport.jrxml | 387 ++++++---- .../jasperreports/entryBook/DocumentReport.jrxml | 394 +++++----- .../jasperreports/entryBook/EntryBookReport.jrxml | 77 +- .../entryBook/FinancialPeriodReport.jrxml | 191 +---- .../entryBook/TransactionReport.jrxml | 222 ++---- .../generalEntryBook/DocumentReport.jrxml | 478 ++++++------ .../generalEntryBook/EntryBookPeriodReport.jrxml | 54 +- .../GeneralEntryBookEntryReport.jrxml | 11 +- .../generalLedger/DocumentReport.jrxml | 406 +++++----- .../generalLedger/GeneralLedgerEntryReport.jrxml | 204 ++--- .../generalLedger/GeneralLedgerReport.jrxml | 113 +-- .../src/main/resources/reports/vat_form_fr.pdf | Bin 222623 -> 244238 bytes .../org/chorem/lima/report/action/ReportTest.java | 2 +- lima-server/README.txt | 26 +- lima-server/pom.xml | 3 +- .../org/chorem/lima/server/HttpServerService.java | 55 +- .../java/org/chorem/lima/server/LimaServer.java | 43 +- .../org/chorem/lima/server/LimaServerConfig.java | 2 - lima-swing/README.txt | 4 +- lima-swing/pom.xml | 6 +- lima-swing/src/license/THIRD-PARTY.properties | 5 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 12 +- .../org/chorem/lima/enums/AccountsChartEnum.java | 9 +- .../chorem/lima/enums/VatStatementsChartEnum.java | 5 +- .../AccountCondition/AccountConditionHandler.java | 14 +- .../AccountCondition/AccountConditionView.css | 8 +- .../AccountCondition/AccountConditionView.jaxx | 11 +- .../BigDecimalConditionHandler.java | 2 +- .../CreditConditionHandler.java | 2 +- .../BigDecimalCondition/CreditConditionView.java | 2 +- .../BigDecimalCondition/DebitConditionHandler.java | 2 +- .../BigDecimalCondition/DebitConditionView.java | 2 +- .../chorem/lima/ui/Filter/ConditionHandler.java | 2 +- .../EntryBookConditionHandler.java | 2 +- .../DescriptionConditionHandler.java | 2 +- .../StringCondition/DescriptionConditionView.java | 2 +- .../StringCondition/LetteringConditionHandler.java | 2 +- .../StringCondition/LetteringConditionView.java | 2 +- .../StringCondition/StringConditionHandler.java | 2 +- .../StringCondition/VoucherConditionHandler.java | 2 +- .../StringCondition/VoucherConditionView.java | 2 +- .../Filter/dateCondition/DateConditionHandler.java | 21 +- .../ui/Filter/dateCondition/DateConditionView.jaxx | 3 +- .../DateIntervalConditionHandler.java | 21 +- .../DateIntervalConditionView.jaxx | 13 +- .../FinancialPeriodConditionHandler.java | 2 +- .../FinancialTransactionConditionHandler.java | 2 +- .../FiscalPeriodConditionHandler.java | 2 +- .../src/main/java/org/chorem/lima/ui/MainView.css | 11 +- .../src/main/java/org/chorem/lima/ui/MainView.jaxx | 4 +- .../java/org/chorem/lima/ui/MainViewHandler.java | 42 +- .../chorem/lima/ui/account/AccountViewHandler.java | 25 +- .../lima/ui/celleditor/AccountTableCellEditor.java | 86 +-- .../ui/celleditor/AccountTableCellRenderer.java | 2 +- .../ui/celleditor/AutoCompleteTableCellEditor.java | 2 +- .../ui/celleditor/DateLimaTableCellRenderer.java | 6 +- .../lima/ui/celleditor/DateTableCellEditor.java | 154 ---- .../celleditor/DayTableCellEditor.java} | 24 +- .../celleditor/DefaultLimaTableCellRenderer.java | 2 +- .../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} | 66 +- .../lima/ui/combobox/AccountComboBoxModel.java | 98 --- .../lima/ui/combobox/EntryBookComboBoxModel.java | 4 +- .../ui/combobox/FiscalPeriodComboBoxModel.java | 4 +- .../org/chorem/lima/ui/common/AbstractColumn.java | 2 +- .../chorem/lima/ui/common/AbstractLimaTable.java | 4 +- .../lima/ui/common/AbstractLimaTableModel.java | 2 +- .../lima/ui/common/AccountComboBoxModel.java | 54 -- .../lima/ui/common/CellRouteHorizontalAction.java | 2 +- .../lima/ui/common/CellRouteVerticalAction.java | 2 +- .../java/org/chorem/lima/ui/common/Column.java | 2 +- .../ui/common/FinancialPeriodListRenderer.java | 14 +- .../ui/common/FinancialTransactionTableModel.java | 119 ++- .../lima/ui/common/FiscalPeriodListRenderer.java | 21 +- .../lima/ui/common/LabelListCellRenderer.java | 2 +- .../chorem/lima/ui/common/TableModelWithGroup.java | 2 +- .../lima/ui/entrybook/EntryBookViewHandler.java | 14 +- .../FinancialPeriodErrorDetector.java | 2 +- .../FinancialStatementChartViewHandler.java | 2 +- .../ui/financialtransaction/AccountColumn.java | 57 +- .../ui/financialtransaction/BalanceColumn.java | 37 +- .../lima/ui/financialtransaction/CreditColumn.java | 2 +- .../lima/ui/financialtransaction/DateColumn.java | 2 +- .../lima/ui/financialtransaction/DayColumn.java | 6 +- .../lima/ui/financialtransaction/DebitColumn.java | 2 +- .../ui/financialtransaction/DescriptionColumn.java | 2 +- .../ui/financialtransaction/EntryBookColumn.java | 2 +- .../FinancialTransactionDefaultTable.java | 2 +- .../FinancialTransactionErrorDetector.java | 2 +- .../FinancialTransactionView.css | 28 +- .../FinancialTransactionView.jaxx | 7 +- .../FinancialTransactionViewHandler.java | 157 +++- .../lima/ui/financialtransaction/LetterColumn.java | 2 +- .../ui/financialtransaction/VoucherColumn.java | 2 +- .../FinancialTransactionSearchTableModel.java | 12 +- .../FiscalControlExportView.css} | 58 +- .../FiscalControlExportView.jaxx | 85 +++ .../FiscalControlExportViewHandler.java | 229 ++++++ .../ui/fiscalperiod/FiscalPeriodErrorDetector.java | 2 +- .../ui/fiscalperiod/FiscalPeriodViewHandler.java | 88 ++- .../java/org/chorem/lima/ui/home/AccountsPane.java | 6 +- .../org/chorem/lima/ui/home/EntryBooksPane.java | 8 +- .../lima/ui/home/FinancialTransactionsPane.java | 6 +- .../org/chorem/lima/ui/home/FiscalYearsPane.java | 10 +- .../org/chorem/lima/ui/identity/IdentityForm.css | 161 +++- .../org/chorem/lima/ui/identity/IdentityForm.jaxx | 281 ++++--- .../chorem/lima/ui/identity/IdentityHandler.java | 45 +- .../chorem/lima/ui/importexport/ImportExport.java | 37 +- .../lima/ui/lettering/LetteringEditModel.java | 105 ++- ...tionModel.java => LetteringSelectionModel.java} | 31 +- .../lima/ui/lettering/LetteringTableModel.java | 38 + .../org/chorem/lima/ui/lettering/LetteringView.css | 47 +- .../chorem/lima/ui/lettering/LetteringView.jaxx | 68 +- .../lima/ui/lettering/LetteringViewHandler.java | 247 +++--- .../org/chorem/lima/ui/lettering/TypeEntry.java | 8 +- .../BackupPanel.css} | 10 +- ...{CreateEntryBookPanel.jaxx => BackupPanel.jaxx} | 8 +- .../{OpeningView.css => BackupPanelHandler.java} | 42 +- .../chorem/lima/ui/opening/CreateIdentityPanel.css | 10 +- .../lima/ui/opening/CreateIdentityPanel.jaxx | 64 +- .../ui/opening/CreateIdentityPanelHandler.java | 3 +- .../org/chorem/lima/ui/opening/OpeningView.css | 11 +- .../org/chorem/lima/ui/opening/OpeningView.jaxx | 28 +- .../chorem/lima/ui/opening/OpeningViewHandler.java | 195 +++-- .../lima/ui/vatchart/VatChartMovementForm.css | 2 + .../lima/ui/vatchart/VatChartMovementForm.jaxx | 19 +- .../chorem/lima/ui/vatchart/VatChartTreeTable.java | 134 ---- .../lima/ui/vatchart/VatChartTreeTableModel.java | 226 ------ .../org/chorem/lima/ui/vatchart/VatChartView.jaxx | 26 +- .../lima/ui/vatchart/VatChartViewHandler.java | 401 ++++++---- .../chorem/lima/ui/vatchart/VatChartViewModel.java | 191 +++++ .../org/chorem/lima/util/WrapToolBarLayout.java | 129 ++++ .../resources/i18n/lima-swing_en_GB.properties | 114 ++- .../resources/i18n/lima-swing_fr_FR.properties | 96 ++- .../icons/action-financialPeriod-close.png | Bin 715 -> 452 bytes .../resources/icons/action-fiscalControlExport.png | Bin 0 -> 1244 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-swing/src/main/resources/lima-swing.config | 1 + lima-swing/src/main/resources/log4j.properties | 2 +- pom.xml | 51 +- src/site/procedure.txt | 15 + src/site/resources/extras/exemple_ecritures.csv | 162 ++-- src/site/resources/screens/export_ebp_1.png | Bin 114103 -> 94362 bytes src/site/resources/screens/export_ebp_2.png | Bin 17856 -> 8139 bytes src/site/resources/screens/export_ebp_3.png | Bin 71482 -> 54392 bytes src/site/resources/screens/export_ebp_4.png | Bin 24204 -> 14348 bytes src/site/resources/screens/export_ebp_5.png | Bin 30588 -> 14741 bytes src/site/resources/screens/export_ebp_6.png | Bin 26990 -> 11937 bytes src/site/resources/screens/export_ebp_7.png | Bin 17221 -> 6030 bytes .../resources/screens/lima_charts_accounts.png | Bin 133980 -> 66178 bytes .../resources/screens/lima_charts_entrybooks.png | Bin 43275 -> 34352 bytes .../screens/lima_charts_financialperiod.png | Bin 136544 -> 55293 bytes .../screens/lima_charts_financialstatement.png | Bin 92981 -> 53248 bytes .../resources/screens/lima_charts_fiscalperiod.png | Bin 53467 -> 36434 bytes src/site/resources/screens/lima_entries.png | Bin 140056 -> 37587 bytes .../resources/screens/lima_financialstatement.png | Bin 71670 -> 66083 bytes src/site/resources/screens/lima_home.png | Bin 50198 -> 36968 bytes src/site/resources/screens/lima_import_charset.png | Bin 56032 -> 42025 bytes src/site/resources/screens/lima_import_limaall.png | Bin 64072 -> 46841 bytes .../resources/screens/lima_incorrectEntries.png | Bin 110247 -> 30473 bytes src/site/resources/screens/lima_lettering.png | Bin 170873 -> 59893 bytes src/site/resources/screens/lima_open_account.png | Bin 39308 -> 26602 bytes src/site/resources/screens/lima_open_entrybook.png | Bin 31108 -> 21208 bytes .../resources/screens/lima_open_fiscalperiod.png | Bin 28827 -> 19797 bytes src/site/resources/screens/lima_open_identity.png | Bin 31849 -> 27903 bytes src/site/resources/screens/lima_open_welcome.png | Bin 35463 -> 24208 bytes .../resources/screens/lima_reports_accounts.png | Bin 64174 -> 38541 bytes .../resources/screens/lima_reports_balance.png | Bin 56936 -> 34936 bytes .../resources/screens/lima_reports_entrybooks.png | Bin 61887 -> 0 bytes .../screens/lima_reports_financialstatement.png | Bin 57424 -> 0 bytes src/site/resources/screens/lima_reports_ledger.png | Bin 57008 -> 0 bytes src/site/resources/screens/lima_searchEntry.png | Bin 66603 -> 47531 bytes .../resources/screens/lima_searchtransaction.png | Bin 93053 -> 0 bytes src/site/rst/assistant.rst | 18 +- src/site/rst/features.rst | 31 +- src/site/rst/importexport.rst | 40 +- src/site/rst/install.rst | 4 +- src/site/site.xml | 14 +- 334 files changed, 9221 insertions(+), 5474 deletions(-) create mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/api/TreasuryService.java copy lima-business-api/src/main/java/org/chorem/lima/business/api/report/{BalanceReportService.java => AccountReportService.java} (63%) copy lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{NotAllowedLabelException.java => AlreadyAffectedVatBoxException.java} (74%) copy lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{NotAllowedLabelException.java => RequiredFieldException.java} (74%) 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 copy lima-callao/src/main/resources/db/migration/{V0_6_0_0__migration2.sql => V0_8_6_0__1241_create_table_TREASURY.sql} (50%) copy lima-report/src/main/resources/jasperreports/{generalLedger/GeneralLedgerEntryReport.jrxml => account/AccountEntry.jrxml} (69%) create mode 100644 lima-report/src/main/resources/jasperreports/account/DocumentReport.jrxml delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java copy lima-swing/src/main/java/org/chorem/lima/{util/BigDecimalToString.java => ui/celleditor/DayTableCellEditor.java} (60%) copy lima-swing/src/main/java/org/chorem/lima/ui/combobox/{LeafAccountComboBoxModel.java => AccountComboBox.java} (57%) 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/common/AccountComboBoxModel.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 create mode 100644 lima-swing/src/main/resources/icons/action-fiscalControlExport.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 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>.