This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from 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) new b7877b3 Merge branch 'feature/1207' into develop 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 b7877b37e49bb1c283abec6e4330bf0049b5e442 Merge: c6e0e9a 248ce54 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu May 7 16:06:55 2015 +0200 Merge branch 'feature/1207' into develop Summary of changes: .../chorem/lima/business/ImportExportResults.java | 2 +- .../business/api/FinancialStatementService.java | 4 +- .../business/api/FinancialTransactionService.java | 6 +- .../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 - .../ejb/FinancialStatementServiceImpl.java | 10 +- .../ejb/FinancialTransactionServiceImpl.java | 18 +-- .../lima/business/ejb/ImportServiceImpl.java | 14 +- .../ejb/report/BalanceReportServiceImpl.java | 24 +-- .../lima/business/utils/EntryEBPComparator.java | 7 +- .../utils/FinancialTransactionComparator.java | 42 ------ .../org/chorem/lima/entity/AccountTopiaDao.java | 2 +- .../org/chorem/lima/business/AccountDaoTest.java | 7 +- .../lima/business/EntryBookServiceImplTest.java | 3 +- .../lima/business/ImportExportServiceTest.java | 2 +- .../lima/business/ReportServiceImplTest.java | 2 +- .../lima/beans/AbstractBigDecimalCondition.java | 2 +- .../chorem/lima/beans/AbstractStringCondition.java | 2 +- .../java/org/chorem/lima/beans/DateCondition.java | 2 +- .../java/org/chorem/lima/report/DocumentsEnum.java | 2 +- .../lima/report/service/DocumentService.java | 56 ++++--- .../java/org/chorem/lima/server/FormatsEnum.java | 2 +- .../java/org/chorem/lima/server/LimaServer.java | 13 +- .../chorem/lima/LimaSwingApplicationContext.java | 6 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 25 ++- .../java/org/chorem/lima/enums/EncodingEnum.java | 13 +- .../org/chorem/lima/enums/ImportExportEnum.java | 4 - .../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 +- .../java/org/chorem/lima/ui/MainViewHandler.java | 3 +- .../chorem/lima/ui/account/AccountViewHandler.java | 2 +- .../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 -- .../lima/ui/entrybook/EntryBookViewHandler.java | 11 +- .../FinancialStatementChartTreeTableModel.java | 4 +- .../FinancialTransactionDefaultTable.java | 9 +- .../FinancialTransactionViewHandler.java | 2 +- .../FinancialTransactionSearchViewHandler.java | 15 +- .../ui/fiscalperiod/FiscalPeriodTableModel.java | 4 - .../chorem/lima/ui/importexport/ImportExport.java | 6 +- .../org/chorem/lima/ui/lettering/TypeEntry.java | 2 +- .../ui/opening/CreateIdentityPanelHandler.java | 7 +- .../lima/ui/vatchart/VatChartTreeTableModel.java | 6 +- .../lima/ui/vatchart/VatChartViewHandler.java | 17 +-- .../java/org/chorem/lima/util/ErrorHelper.java | 19 --- 76 files changed, 186 insertions(+), 678 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 -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.