This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 0c63042f81638cdf40bad2672104b8b5e6256495 Merge: 5062bb3 c203a51 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 20 14:26:02 2016 +0100 [jgitflow-maven-plugin]merging 'release/0.8.6' into 'master' .gitignore | 5 + README.md | 117 +++ README.txt | 4 + changelog.txt | 16 - lima-business-api/.gitignore | 1 + .../README.txt => lima-business-api/README.md | 0 lima-business-api/README.txt | 0 lima-business-api/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 10 +- .../org/chorem/lima/business/ImportResult.java | 7 +- .../chorem/lima/business/LimaServiceFactory.java | 2 +- .../org/chorem/lima/business/ServiceListener.java | 2 +- .../lima/business/ServiceMonitorableHandler.java | 28 +- .../chorem/lima/business/api/AccountService.java | 9 +- .../api/ClosedPeriodicEntryBookService.java | 3 + .../chorem/lima/business/api/EntryBookService.java | 6 + .../org/chorem/lima/business/api/EntryService.java | 7 - .../lima/business/api/FinancialPeriodService.java | 8 +- .../business/api/FinancialTransactionService.java | 28 +- .../lima/business/api/FiscalPeriodService.java | 14 + .../chorem/lima/business/api/ImportService.java | 15 +- .../chorem/lima/business/api/OptionsService.java | 3 + .../chorem/lima/business/api/TreasuryService.java | 24 +- .../lima/business/api/VatStatementService.java | 5 +- ...eportService.java => AccountReportService.java} | 14 +- .../business/api/report/BalanceReportService.java | 19 +- .../exceptions/AlreadyAffectedVatBoxException.java | 27 +- .../exceptions/RequiredFieldException.java | 27 +- .../business/exceptions/UnexistingAccount.java | 22 +- lima-business-api/src/site/site.xml | 4 +- lima-business/.gitignore | 1 + .../changelog.txt => lima-business/README.md | 0 lima-business/changelog.txt | 2 - lima-business/pom.xml | 6 +- lima-business/src/license/THIRD-PARTY.properties | 12 +- .../chorem/lima/business/LimaBusinessConfig.java | 22 +- .../lima/business/LimaConfigurationHelper.java | 21 - .../accountingrules/DefaultAccountingRules.java | 4 +- .../accountingrules/FranceAccountingRules.java | 2 +- .../lima/business/ejb/AccountServiceImpl.java | 31 +- .../ejb/ClosedPeriodicEntryBookServiceImpl.java | 11 + .../lima/business/ejb/EntryBookServiceImpl.java | 7 + .../chorem/lima/business/ejb/EntryServiceImpl.java | 9 - .../lima/business/ejb/ExportServiceImpl.java | 7 +- .../business/ejb/FinancialPeriodServiceImpl.java | 25 +- .../ejb/FinancialStatementServiceImpl.java | 2 +- .../ejb/FinancialTransactionServiceImpl.java | 133 +++- .../lima/business/ejb/FiscalPeriodServiceImpl.java | 34 +- .../lima/business/ejb/ImportServiceImpl.java | 62 +- .../lima/business/ejb/OptionsServiceImpl.java | 6 + .../lima/business/ejb/ReportServiceImpl.java | 6 +- .../lima/business/ejb/TreasuryServiceImpl.java | 91 +++ .../lima/business/ejb/VatStatementServiceImpl.java | 76 +- .../lima/business/ejb/csv/AbstractLimaModel.java | 4 +- .../chorem/lima/business/ejb/csv/EntryModel.java | 2 +- .../business/ejb/csv/FiscalControlExportModel.java | 2 +- .../lima/business/ejb/csv/IdentityModel.java | 4 +- .../lima/business/ejb/ebp/EntryBookEBPModel.java | 2 +- .../ejb/report/AccountReportServiceImpl.java | 147 ++++ .../ejb/report/BalanceReportServiceImpl.java | 325 +++++++-- .../business/ejb/report/CommonsDocumentReport.java | 82 +++ .../report/GeneralEntryBookReportServiceImpl.java | 47 +- .../ejb/report/LedgerReportServiceImpl.java | 41 +- .../ProvisionalEntryBookReportServiceImpl.java | 66 +- .../entity/ClosedPeriodicEntryBookTopiaDao.java | 29 +- .../java/org/chorem/lima/entity/EntryTopiaDao.java | 85 ++- .../lima/entity/FinancialPeriodTopiaDao.java | 20 +- .../chorem/lima/entity/FiscalPeriodTopiaDao.java | 20 + .../resources/i18n/lima-business_en_GB.properties | 90 ++- .../resources/i18n/lima-business_fr_FR.properties | 109 ++- lima-business/src/site/site.xml | 4 +- .../org/chorem/lima/business/AbstractLimaTest.java | 129 +++- .../lima/business/AccountServiceImplTest.java | 13 +- .../lima/business/EntryBookServiceImplTest.java | 6 +- .../business/FinancialPeriodServiceImplTest.java | 6 +- .../FinancialTransactionServiceImplTest.java | 16 +- .../lima/business/FiscalPeriodServiceImplTest.java | 8 +- .../lima/business/ImportExportServiceTest.java | 72 +- .../lima/business/ReportServiceImplTest.java | 8 +- .../accountingrules/TestAccountingRules.java | 2 +- .../lima/entity/FinancialTransactionDAOTest.java | 8 +- lima-callao/.gitignore | 1 + lima-callao/{README.txt => README.md} | 0 lima-callao/changelog.txt | 2 - lima-callao/pom.xml | 2 +- lima-callao/src/license/THIRD-PARTY.properties | 11 +- .../org/chorem/lima/beans/BalanceAccountImpl.java | 23 +- .../main/java/org/chorem/lima/beans/Condition.java | 4 +- .../lima/beans/FinancialTransactionCondition.java | 2 +- .../main/java/org/chorem/lima/beans/Labeled.java | 2 +- .../org/chorem/lima/beans/VisitorCondition.java | 24 +- .../main/java/org/chorem/lima/clause/Clause.java | 2 +- .../java/org/chorem/lima/clause/DateClause.java | 2 +- .../java/org/chorem/lima/clause/NumberClause.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 | 18 +- .../main/java/org/chorem/lima/filter/Filter.java | 6 +- .../org/chorem/lima/filter/FilterGenerator.java | 19 +- .../java/org/chorem/lima/filter/VisitorFilter.java | 8 +- .../V0_8_6_0__1241_create_table_TREASURY.sql | 54 ++ .../src/main/xmi/lima-callao-model.properties | 2 +- lima-callao/src/main/xmi/lima-callao-model.zargo | Bin 57316 -> 61665 bytes lima-report/.gitignore | 1 + lima-report/{README.txt => README.md} | 0 lima-report/pom.xml | 12 +- lima-report/src/license/THIRD-PARTY.properties | 12 +- .../chorem/lima/report/DocumentReportTypes.java | 3 +- .../java/org/chorem/lima/report/DocumentsEnum.java | 4 +- .../org/chorem/lima/report/LimaReportConfig.java | 60 +- .../lima/report/service/DocumentService.java | 332 ++++----- .../chorem/lima/report/service/JasperReports.java | 12 +- .../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 => README.md} | 0 lima-server/pom.xml | 2 +- lima-server/src/license/THIRD-PARTY.properties | 16 +- lima-server/src/main/assembly/bin.xml | 4 +- .../org/chorem/lima/server/HttpServerService.java | 41 +- lima-swing/.gitignore | 1 + lima-swing/{README.txt => README.md} | 0 lima-swing/changelog.txt | 47 -- lima-swing/pom.xml | 6 +- lima-swing/src/license/THIRD-PARTY.properties | 11 +- .../java/org/chorem/lima/LimaExceptionHandler.java | 2 +- .../src/main/java/org/chorem/lima/LimaMain.java | 5 +- .../chorem/lima/LimaSwingApplicationContext.java | 3 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 1 + .../org/chorem/lima/enums/EntryBooksChartEnum.java | 25 +- .../chorem/lima/enums/VatStatementsChartEnum.java | 5 +- .../AccountCondition/AccountConditionHandler.java | 6 +- .../Filter/dateCondition/DateConditionHandler.java | 19 +- .../ui/Filter/dateCondition/DateConditionView.jaxx | 3 +- .../DateIntervalConditionHandler.java | 19 +- .../DateIntervalConditionView.jaxx | 13 +- .../src/main/java/org/chorem/lima/ui/MainView.css | 5 + .../src/main/java/org/chorem/lima/ui/MainView.jaxx | 2 + .../java/org/chorem/lima/ui/MainViewHandler.java | 74 +- .../chorem/lima/ui/account/AccountViewHandler.java | 15 +- .../ui/accountViewer/AccountViewerEditModel.java | 162 +++++ .../AccountViewerSelectionModel.java} | 106 +-- .../accountViewer/AccountViewerTable.java} | 23 +- .../AccountViewerTableModel.java} | 50 +- .../AccountViewerView.css} | 114 ++- .../lima/ui/accountViewer/AccountViewerView.jaxx | 170 +++++ .../ui/accountViewer/AccountViewerViewHandler.java | 787 +++++++++++++++++++++ .../chorem/lima/ui/accountViewer/PeriodChoice.java | 56 ++ .../SelectionMode.java} | 52 +- .../lima/ui/celleditor/AccountTableCellEditor.java | 53 +- .../ui/celleditor/DateLimaTableCellRenderer.java | 4 +- .../lima/ui/celleditor/DateTableCellEditor.java | 154 ---- ...leCellRenderer.java => DayTableCellEditor.java} | 23 +- .../chorem/lima/ui/combobox/AccountComboBox.java | 7 +- .../lima/ui/combobox/EntryBookComboBoxModel.java | 4 +- .../ui/combobox/FiscalPeriodComboBoxModel.java | 6 +- .../chorem/lima/ui/common/AbstractLimaTable.java | 6 +- .../ui/common/FinancialTransactionTableModel.java | 111 ++- .../lima/ui/common/FiscalPeriodComboBoxModel.java | 12 + .../lima/ui/entrybook/EntryBookImportForm.css | 22 +- .../lima/ui/entrybook/EntryBookImportForm.jaxx | 14 +- .../lima/ui/entrybook/EntryBookViewHandler.java | 27 +- .../ui/financialtransaction/AccountColumn.java | 59 +- .../ui/financialtransaction/BalanceColumn.java | 35 +- .../lima/ui/financialtransaction/DayColumn.java | 6 +- .../FinancialTransactionView.css | 15 +- .../FinancialTransactionView.jaxx | 2 +- .../FinancialTransactionViewHandler.java | 126 +++- .../FinancialTransactionSearchTableModel.java | 12 +- .../FinancialTransactionUnbalancedViewHandler.java | 4 +- .../FiscalControlExportViewHandler.java | 11 +- .../ui/fiscalperiod/FiscalPeriodViewHandler.java | 4 +- .../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 | 113 ++- .../lima/ui/lettering/LetteringEditModel.java | 103 ++- ...tionModel.java => LetteringSelectionModel.java} | 31 +- .../lima/ui/lettering/LetteringTableModel.java | 38 + .../org/chorem/lima/ui/lettering/LetteringView.css | 7 +- .../chorem/lima/ui/lettering/LetteringView.jaxx | 9 +- .../lima/ui/lettering/LetteringViewHandler.java | 215 ++++-- .../{CreateEntryBookPanel.css => BackupPanel.css} | 9 +- ...{CreateEntryBookPanel.jaxx => BackupPanel.jaxx} | 8 +- .../{OpeningView.css => BackupPanelHandler.java} | 42 +- .../lima/ui/opening/CreateEntryBookPanel.css | 16 +- .../lima/ui/opening/CreateEntryBookPanel.jaxx | 20 +- .../chorem/lima/ui/opening/CreateIdentityPanel.css | 10 +- .../lima/ui/opening/CreateIdentityPanel.jaxx | 64 +- .../ui/opening/CreateIdentityPanelHandler.java | 1 - .../org/chorem/lima/ui/opening/OpeningView.css | 11 +- .../org/chorem/lima/ui/opening/OpeningView.jaxx | 28 +- .../chorem/lima/ui/opening/OpeningViewHandler.java | 221 ++++-- .../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/BigDecimalToString.java | 1 - .../java/org/chorem/lima/util/ErrorHelper.java | 2 +- .../resources/i18n/lima-swing_en_GB.properties | 107 +-- .../resources/i18n/lima-swing_fr_FR.properties | 92 +-- .../main/resources/icons/action-account-viewer.png | Bin 0 -> 1062 bytes .../icons/action-financialPeriod-close.png | Bin 715 -> 452 bytes .../resources/icons/action-fiscalPeriod-close.png | Bin 715 -> 452 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/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/log4j.properties | 2 +- pom.xml | 81 +-- src/site/resources/screens/lima_open_entrybook.png | Bin 21208 -> 26349 bytes src/site/rst/assistant.rst | 3 +- src/site/rst/importexport.rst | 20 +- src/site/site.xml | 18 +- 238 files changed, 7288 insertions(+), 4418 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.