[Lima-commits] branch master updated (d45413e -> 10b0c67)

This is an automated email from the git hooks/post-receive script. New change to branch master in repository lima. See http://git.chorem.org/lima.git from d45413e Merge branch 'release/0.8.2' 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 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 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' No new revisions were added by this update. Summary of changes: lima-business-api/pom.xml | 15 +- .../src/license/THIRD-PARTY.properties | 12 +- .../chorem/lima/business/ImportExportResults.java | 2 +- .../chorem/lima/business/LimaServiceFactory.java | 8 - .../business/api/FinancialStatementService.java | 8 +- .../business/api/FinancialTransactionService.java | 6 +- .../chorem/lima/business/api/OptionsService.java | 3 +- .../lima/business/exceptions/AccountException.java | 7 +- ...> AlreadyExistFinancialStatementException.java} | 8 +- .../AlreadyExistVatStatementException.java | 4 +- .../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/ImportFileException.java | 2 +- .../MoreOneUnlockFiscalPeriodException.java | 9 +- .../exceptions/NotAllowedLabelException.java | 2 +- .../UnbalancedFinancialTransactionsException.java | 3 - .../business/utils/FinancialPeriodComparator.java | 4 - lima-business/pom.xml | 2 +- .../chorem/lima/business/LimaBusinessConfig.java | 57 +++-- .../ejb/FinancialStatementServiceImpl.java | 62 ++--- .../ejb/FinancialTransactionServiceImpl.java | 18 +- .../lima/business/ejb/ImportServiceImpl.java | 29 ++- .../lima/business/ejb/OptionsServiceImpl.java | 6 +- .../ejb/report/BalanceReportServiceImpl.java | 24 +- .../lima/business/utils/EntryEBPComparator.java | 7 +- .../utils/FinancialTransactionComparator.java | 42 ---- .../org/chorem/lima/entity/AccountTopiaDao.java | 2 +- .../java/org/chorem/lima/entity/EntryTopiaDao.java | 3 +- .../resources/i18n/lima-business_en_GB.properties | 4 + .../resources/i18n/lima-business_fr_FR.properties | 10 +- .../org/chorem/lima/business/AccountDaoTest.java | 7 +- .../lima/business/EntryBookServiceImplTest.java | 3 +- .../lima/business/ImportExportServiceTest.java | 2 +- .../lima/business/ReportServiceImplTest.java | 2 +- lima-callao/pom.xml | 2 +- .../org/chorem/lima/FinancialStatementWayEnum.java | 42 +--- .../lima/beans/AbstractBigDecimalCondition.java | 2 +- .../chorem/lima/beans/AbstractStringCondition.java | 2 +- .../java/org/chorem/lima/beans/DateCondition.java | 2 +- .../resources/i18n/lima-callao_en_GB.properties | 6 +- .../resources/i18n/lima-callao_fr_FR.properties | 6 +- lima-report/pom.xml | 2 +- lima-report/src/license/THIRD-PARTY.properties | 14 +- .../java/org/chorem/lima/report/DocumentsEnum.java | 2 +- .../lima/report/service/DocumentService.java | 56 ++--- lima-server/README.txt | 26 +- lima-server/pom.xml | 3 +- .../java/org/chorem/lima/server/FormatsEnum.java | 2 +- .../org/chorem/lima/server/HttpServerService.java | 14 +- .../java/org/chorem/lima/server/LimaServer.java | 56 ++++- .../org/chorem/lima/server/LimaServerConfig.java | 2 - lima-swing/README.txt | 4 +- lima-swing/pom.xml | 2 +- .../src/main/java/org/chorem/lima/LimaMain.java | 1 + .../chorem/lima/LimaSwingApplicationContext.java | 6 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 34 +-- .../org/chorem/lima/enums/AccountsChartEnum.java | 24 +- .../java/org/chorem/lima/enums/EncodingEnum.java | 13 +- .../lima/enums/FinancialStatementsChartEnum.java | 22 +- .../org/chorem/lima/enums/ImportExportEnum.java | 4 - .../chorem/lima/enums/VatStatementsChartEnum.java | 26 +- .../java/org/chorem/lima/ui/ClosableTabHeader.css | 14 +- .../java/org/chorem/lima/ui/ClosableTabHeader.jaxx | 6 +- .../AccountCondition/AccountConditionHandler.java | 4 - .../BigDecimalConditionHandler.java | 4 - .../chorem/lima/ui/Filter/ConditionHandler.java | 6 +- .../EntryBookConditionHandler.java | 8 +- .../StringCondition/StringConditionHandler.java | 7 - .../Filter/dateCondition/DateConditionHandler.java | 7 - .../DateIntervalConditionHandler.java | 7 - .../FinancialPeriodConditionHandler.java | 11 +- .../FiscalPeriodConditionHandler.java | 8 +- .../java/org/chorem/lima/ui/LimaRendererUtil.java | 8 +- .../src/main/java/org/chorem/lima/ui/MainView.css | 275 +++++++++++++++++---- .../java/org/chorem/lima/ui/MainViewHandler.java | 7 +- .../org/chorem/lima/ui/account/AccountForm.css | 2 + .../org/chorem/lima/ui/account/AccountForm.jaxx | 20 +- .../chorem/lima/ui/account/AccountImportForm.css | 39 +-- .../chorem/lima/ui/account/AccountImportForm.jaxx | 61 ++--- .../chorem/lima/ui/account/AccountViewHandler.java | 4 +- .../chorem/lima/ui/account/UpdateAccountForm.css | 2 + .../chorem/lima/ui/account/UpdateAccountForm.jaxx | 17 +- .../ui/celleditor/AutoCompleteTableCellEditor.java | 6 +- .../lima/ui/celleditor/DateTableCellEditor.java | 11 +- .../lima/ui/celleditor/EmptyCellRenderer.java | 4 - .../lima/ui/combobox/AccountComboBoxModel.java | 10 +- .../lima/ui/combobox/EntryBookComboBoxModel.java | 5 - .../ui/combobox/FinancialPeriodComboBoxModel.java | 167 ------------- .../ui/combobox/FiscalPeriodComboBoxModel.java | 12 +- .../lima/ui/combobox/LeafAccountComboBoxModel.java | 4 - .../lima/ui/combobox/LetterComboBoxModel.java | 100 -------- .../chorem/lima/ui/common/IntervalListener.java | 29 --- .../chorem/lima/ui/common/TableModelWithGroup.java | 14 -- .../org/chorem/lima/ui/entrybook/EntryBookForm.css | 2 + .../chorem/lima/ui/entrybook/EntryBookForm.jaxx | 20 +- .../lima/ui/entrybook/EntryBookImportForm.css | 2 + .../lima/ui/entrybook/EntryBookImportForm.jaxx | 26 +- .../lima/ui/entrybook/EntryBookViewHandler.java | 11 +- .../FinancialStatementChartTreeTableModel.java | 98 ++++---- .../FinancialStatementChartViewHandler.java | 35 +-- .../FinancialStatementHeaderForm.css | 25 +- .../FinancialStatementHeaderForm.jaxx | 65 ++--- .../FinancialStatementImportForm.css | 41 ++- .../FinancialStatementImportForm.jaxx | 84 +++---- .../FinancialStatementMovementForm.css | 16 +- .../FinancialStatementMovementForm.jaxx | 63 +++-- .../FinancialTransactionDefaultTable.java | 9 +- .../FinancialTransactionTable.java | 11 +- .../FinancialTransactionViewHandler.java | 15 +- .../FinancialTransactionSearchView.css | 6 +- .../FinancialTransactionSearchView.jaxx | 7 +- .../FinancialTransactionSearchViewHandler.java | 28 ++- .../org/chorem/lima/ui/fiscalperiod/AddPeriod.css | 6 +- .../org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx | 28 +-- .../ui/fiscalperiod/FiscalPeriodTableModel.java | 4 - .../ui/fiscalperiod/FiscalPeriodViewHandler.java | 70 ++++-- .../fiscalperiod/RetainedEarningsEntryBookForm.css | 33 ++- .../RetainedEarningsEntryBookForm.jaxx | 85 ++----- .../org/chorem/lima/ui/identity/IdentityForm.css | 18 +- .../org/chorem/lima/ui/identity/IdentityForm.jaxx | 130 +++++----- .../chorem/lima/ui/importexport/ImportExport.java | 61 +++-- .../org/chorem/lima/ui/lettering/LetteringView.css | 6 +- .../lima/ui/lettering/LetteringViewHandler.java | 27 +- .../org/chorem/lima/ui/lettering/TypeEntry.java | 8 +- .../ui/opening/CreateIdentityPanelHandler.java | 7 +- .../chorem/lima/ui/vatchart/VatChartImportForm.css | 35 +-- .../lima/ui/vatchart/VatChartImportForm.jaxx | 84 +++---- .../lima/ui/vatchart/VatChartMovementForm.css | 29 ++- .../lima/ui/vatchart/VatChartMovementForm.jaxx | 59 +++-- .../lima/ui/vatchart/VatChartTreeTableModel.java | 6 +- .../lima/ui/vatchart/VatChartViewHandler.java | 22 +- .../java/org/chorem/lima/util/ErrorHelper.java | 19 -- .../java/org/chorem/lima/util/ReportDialogView.css | 5 +- .../org/chorem/lima/util/ReportDialogView.jaxx | 2 +- .../resources/i18n/lima-swing_en_GB.properties | 21 +- .../resources/i18n/lima-swing_fr_FR.properties | 51 ++-- .../src/main/resources/icons/action-cancel.png | Bin 0 -> 587 bytes ...{action-account-remove.png => action-close.png} | Bin .../src/main/resources/icons/action-closeTab.png | Bin 3140 -> 0 bytes lima-swing/src/main/resources/icons/action-ok.png | Bin 0 -> 537 bytes pom.xml | 2 +- 147 files changed, 1346 insertions(+), 1679 deletions(-) rename lima-business-api/src/main/java/org/chorem/lima/business/exceptions/{AlreadyExistFinancialStatement.java => AlreadyExistFinancialStatementException.java} (82%) delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/utils/FinancialTransactionComparator.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/common/IntervalListener.java create mode 100644 lima-swing/src/main/resources/icons/action-cancel.png copy lima-swing/src/main/resources/icons/{action-account-remove.png => action-close.png} (100%) delete mode 100644 lima-swing/src/main/resources/icons/action-closeTab.png create mode 100644 lima-swing/src/main/resources/icons/action-ok.png -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.