Lima-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- 1853 discussions
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 4e409ed fixes #1131: Migrates to git
new f1da99d fixes #1131: Migrates to git (tidy poms + fix webstart config)
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 f1da99dfef10590df3b8f21d9dd849de75a2f35f
Author: Tony CHEMIT <chemit(a)codelutin.com>
Date: Mon Oct 27 23:44:59 2014 +0100
fixes #1131: Migrates to git (tidy poms + fix webstart config)
Summary of changes:
lima-business-api/pom.xml | 1 +
lima-business/pom.xml | 1 +
lima-callao/pom.xml | 2 +-
lima-swing/pom.xml | 37 +------------------------------------
pom.xml | 4 +---
5 files changed, 5 insertions(+), 40 deletions(-)
--
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm(a)chorem.org>.
1
1
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 c332bcb refs #1115 on s'assure que LimaServiceConfig ne peut-être qu'un singleton, le constructeur n'est plus public
new 4e409ed fixes #1131: Migrates to git
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 4e409edaff696fa47d2e69cf2903152c707dd51a
Author: Tony CHEMIT <chemit(a)codelutin.com>
Date: Mon Oct 27 23:37:20 2014 +0100
fixes #1131: Migrates to git
Summary of changes:
.gitignore | 14 +++
lima-business-api/pom.xml | 3 +-
.../chorem/lima/business/api/AccountService.java | 5 +-
.../api/ClosedPeriodicEntryBookService.java | 2 -
.../chorem/lima/business/api/DocumentService.java | 5 +-
.../chorem/lima/business/api/EntryBookService.java | 5 +-
.../org/chorem/lima/business/api/EntryService.java | 2 -
.../chorem/lima/business/api/ExportService.java | 5 +-
.../lima/business/api/FinancialPeriodService.java | 5 +-
.../business/api/FinancialStatementService.java | 5 +-
.../business/api/FinancialTransactionService.java | 5 +-
.../lima/business/api/FiscalPeriodService.java | 5 +-
.../lima/business/api/HttpServerService.java | 5 +-
.../chorem/lima/business/api/IdentityService.java | 5 +-
.../chorem/lima/business/api/OptionsService.java | 5 +-
.../chorem/lima/business/api/ReportService.java | 5 +-
.../lima/business/api/VatStatementService.java | 7 +-
.../lima/business/exceptions/LimaException.java | 5 +-
.../chorem/lima/business/utils/FormatsEnum.java | 5 +-
.../business/utils/ImportExportEntityEnum.java | 5 +-
.../aop.xml => lima-business-api/src/site/site.xml | 47 ++++----
lima-business-api/src/site/site_fr.xml | 70 -----------
lima-business/pom.xml | 3 +-
lima-business/src/main/assembly/bin.xml | 5 +-
.../src/main/java/org/chorem/lima/LimaServer.java | 3 +-
.../main/java/org/chorem/lima/LimaXAResource.java | 3 +-
.../org/chorem/lima/business/AccountingRules.java | 5 +-
.../lima/business/LimaConfigurationHelper.java | 22 ++++
.../org/chorem/lima/business/LimaInterceptor.java | 3 +-
.../chorem/lima/business/LimaServiceConfig.java | 5 +-
.../org/chorem/lima/business/ServiceListener.java | 5 +-
.../chorem/lima/business/ServiceMonitorable.java | 5 +-
.../accountingrules/DefaultAccountingRules.java | 5 +-
.../accountingrules/FranceAccountingRules.java | 5 +-
.../lima/business/ejb/AbstractLimaService.java | 5 +-
.../lima/business/ejb/AccountServiceImpl.java | 5 +-
.../ejb/ClosedPeriodicEntryBookServiceImpl.java | 2 -
.../lima/business/ejb/DocumentServiceImpl.java | 5 +-
.../lima/business/ejb/EntryBookServiceImpl.java | 5 +-
.../chorem/lima/business/ejb/EntryServiceImpl.java | 2 -
.../lima/business/ejb/ExportServiceImpl.java | 5 +-
.../business/ejb/FinancialPeriodServiceImpl.java | 5 +-
.../ejb/FinancialStatementServiceImpl.java | 5 +-
.../ejb/FinancialTransactionServiceImpl.java | 5 +-
.../lima/business/ejb/FiscalPeriodServiceImpl.java | 5 +-
.../lima/business/ejb/HttpServerServiceImpl.java | 5 +-
.../lima/business/ejb/IdentityServiceImpl.java | 5 +-
.../lima/business/ejb/OptionsServiceImpl.java | 3 -
.../lima/business/ejb/ReportServiceImpl.java | 5 +-
.../lima/business/ejb/VatStatementServiceImpl.java | 3 -
.../lima/business/utils/AccountComparator.java | 5 +-
.../chorem/lima/business/utils/DocumentsEnum.java | 5 +-
.../lima/business/utils/EntryComparator.java | 5 +-
.../lima/business/utils/EntryEBPComparator.java | 5 +-
.../business/utils/FinancialPeriodComparator.java | 3 -
.../utils/FinancialTransactionComparator.java | 2 -
.../business/utils/FiscalPeriodComparator.java | 5 +-
.../lima/business/utils/LetteringComparator.java | 2 -
.../chorem/lima/service/LimaServiceFactory.java | 5 +-
.../lima/service/ServiceMonitorableHandler.java | 5 +-
.../java/org/chorem/lima/service/package-info.java | 5 +-
.../src/main/resources/META-INF/ejb-jar.xml | 5 +-
lima-business/src/main/resources/lima.properties | 7 +-
lima-business/src/main/resources/save_callao.dtd | 5 +-
.../aop.xml => lima-business/src/site/site.xml | 47 ++++----
lima-business/src/site/site_fr.xml | 70 -----------
.../org/chorem/lima/business/AbstractLimaTest.java | 3 +-
.../org/chorem/lima/business/AccountDaoTest.java | 22 ++++
.../lima/business/AccountServiceImplTest.java | 7 +-
.../lima/business/EntryBookServiceImplTest.java | 7 +-
.../business/FinancialPeriodServiceImplTest.java | 5 +-
.../FinancialTransactionServiceImplTest.java | 3 +-
.../lima/business/FiscalPeriodServiceImplTest.java | 7 +-
.../lima/business/LetteringComparatorTest.java | 2 -
.../org/chorem/lima/business/LimaMiscTest.java | 3 +-
.../lima/business/ReportServiceImplTest.java | 5 +-
.../accountingrules/AccountServiceRuleFrTest.java | 3 +-
.../EntryBookServiceRuleFrTest.java | 3 +-
.../FinancialPeriodServiceRuleFrTest.java | 3 +-
.../FinancialTransactionServiceRuleFrTest.java | 3 +-
.../FiscalPeriodServiceRuleFrTest.java | 3 +-
.../accountingrules/ImportServiceRuleFrTest.java | 3 +-
.../accountingrules/ReportServiceRuleFrTest.java | 3 +-
.../accountingrules/TestAccountingRules.java | 3 +-
.../lima/entity/FinancialTransactionDAOTest.java | 3 +-
.../src/test/resources/META-INF/ejb-jar.xml | 5 +-
.../src/test/resources/lima-test.properties | 5 +-
lima-business/src/test/resources/log4j.properties | 7 +-
lima-callao/pom.xml | 3 +-
.../org/chorem/lima/FinancialStatementWayEnum.java | 5 +-
.../lima/beans/AbstractBigDecimalCondition.java | 2 -
.../chorem/lima/beans/AbstractStringCondition.java | 2 -
.../org/chorem/lima/beans/AccountCondition.java | 2 -
.../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 | 4 +-
.../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/AccountTopiaDao.java | 5 +-
.../entity/ClosedPeriodicEntryBookTopiaDao.java | 5 +-
.../java/org/chorem/lima/entity/EntryImpl.java | 5 +-
.../java/org/chorem/lima/entity/EntryTopiaDao.java | 5 +-
.../lima/entity/FinancialPeriodTopiaDao.java | 5 +-
.../chorem/lima/entity/FinancialStatementImpl.java | 5 +-
.../lima/entity/FinancialStatementTopiaDao.java | 5 +-
.../lima/entity/FinancialTransactionImpl.java | 5 +-
.../lima/entity/FinancialTransactionTopiaDao.java | 5 +-
.../chorem/lima/entity/FiscalPeriodTopiaDao.java | 5 +-
.../org/chorem/lima/entity/GeneratorHQuery.java | 2 -
.../entity/LimaCallaoTopiaApplicationContext.java | 22 ++++
.../org/chorem/lima/entity/VatStatementImpl.java | 3 -
.../chorem/lima/entity/VatStatementTopiaDao.java | 5 +-
.../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 -
.../src/main/xmi/accounting-model.properties | 7 +-
.../aop.xml => lima-callao/src/site/site.xml | 47 ++++----
lima-callao/src/site/site_fr.xml | 70 -----------
lima-swing/pom.xml | 9 +-
lima-swing/src/license/THIRD-PARTY.properties | 9 +-
lima-swing/src/main/assembly/bin.xml | 5 +-
lima-swing/src/main/filters/pom.properties | 5 +-
.../java/org/chorem/lima/LimaExceptionHandler.java | 5 +-
.../src/main/java/org/chorem/lima/LimaMain.java | 5 +-
.../src/main/java/org/chorem/lima/LimaSplash.java | 5 +-
.../chorem/lima/LimaSwingApplicationContext.java | 5 +-
.../main/java/org/chorem/lima/LimaSwingConfig.java | 5 +-
.../java/org/chorem/lima/actions/MiscAction.java | 5 +-
.../org/chorem/lima/enums/AccountsChartEnum.java | 5 +-
.../chorem/lima/enums/ComboBoxAccountsEnum.java | 5 +-
.../org/chorem/lima/enums/ComboBoxDatesEnum.java | 5 +-
.../chorem/lima/enums/ComboBoxEntryBooksEnum.java | 5 +-
.../org/chorem/lima/enums/ComboBoxLetterEnum.java | 5 +-
.../chorem/lima/enums/ComboBoxOperatorsEnum.java | 5 +-
.../org/chorem/lima/enums/ComboBoxPeriodEnum.java | 5 +-
.../java/org/chorem/lima/enums/EncodingEnum.java | 5 +-
.../org/chorem/lima/enums/EntryBooksChartEnum.java | 5 +-
.../lima/enums/FinancialStatementsChartEnum.java | 5 +-
.../org/chorem/lima/enums/ImportExportEnum.java | 5 +-
.../chorem/lima/enums/VatStatementsChartEnum.java | 3 -
.../main/java/org/chorem/lima/ui/BetaLayerUI.java | 3 +-
.../java/org/chorem/lima/ui/ClosableTabHeader.css | 2 +-
.../java/org/chorem/lima/ui/ClosableTabHeader.jaxx | 5 +-
.../AccountCondition/AccountConditionHandler.java | 2 -
.../AccountCondition/AccountConditionView.jaxx | 9 +-
.../BigDecimalConditionHandler.java | 2 -
.../BigDecimalConditionView.jaxx | 9 +-
.../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 -
.../EntryBookCondition/EntryBookConditionView.jaxx | 9 +-
.../DescriptionConditionHandler.java | 2 -
.../StringCondition/DescriptionConditionView.java | 2 -
.../StringCondition/LetteringConditionHandler.java | 2 -
.../StringCondition/LetteringConditionView.java | 2 -
.../StringCondition/StringConditionHandler.java | 2 -
.../StringCondition/StringConditionView.jaxx | 7 +-
.../StringCondition/VoucherConditionHandler.java | 2 -
.../StringCondition/VoucherConditionView.java | 2 -
.../Filter/dateCondition/DateConditionHandler.java | 2 -
.../ui/Filter/dateCondition/DateConditionView.jaxx | 9 +-
.../DateIntervalConditionHandler.java | 2 -
.../DateIntervalConditionView.jaxx | 9 +-
.../FinancialPeriodConditionHandler.java | 2 -
.../FinancialPeriodConditionView.jaxx | 9 +-
.../FinancialTransactionConditionHandler.java | 2 -
.../FinancialTransactionConditionView.jaxx | 7 +-
.../FiscalPeriodConditionHandler.java | 2 -
.../FiscalPeriodConditionView.jaxx | 9 +-
.../org/chorem/lima/ui/LimaDecoratorProvider.java | 3 -
.../java/org/chorem/lima/ui/LimaRendererUtil.java | 3 -
.../src/main/java/org/chorem/lima/ui/MainView.jaxx | 5 +-
.../java/org/chorem/lima/ui/MainViewHandler.java | 5 +-
.../org/chorem/lima/ui/account/AccountForm.css | 21 ++++
.../org/chorem/lima/ui/account/AccountForm.jaxx | 5 +-
.../chorem/lima/ui/account/AccountImportForm.css | 21 ++++
.../chorem/lima/ui/account/AccountImportForm.jaxx | 5 +-
.../lima/ui/account/AccountTreeTableModel.java | 3 +-
.../lima/ui/account/AccountTreeTableRenderer.java | 3 +-
.../org/chorem/lima/ui/account/AccountView.css | 21 ++++
.../org/chorem/lima/ui/account/AccountView.jaxx | 5 +-
.../chorem/lima/ui/account/AccountViewHandler.java | 5 +-
.../chorem/lima/ui/account/UpdateAccountForm.css | 21 ++++
.../chorem/lima/ui/account/UpdateAccountForm.jaxx | 3 -
.../org/chorem/lima/ui/account/package-info.java | 3 +-
.../lima/ui/celleditor/AccountTableCellEditor.java | 5 +-
.../ui/celleditor/AccountTableCellRenderer.java | 2 -
.../ui/celleditor/BigDecimalTableCellEditor.java | 2 -
.../ui/celleditor/BigDecimalTableCellRenderer.java | 3 -
.../ui/celleditor/DateLimaTableCellRenderer.java | 2 -
.../lima/ui/celleditor/DateTableCellEditor.java | 5 +-
.../celleditor/DefaultLimaTableCellRenderer.java | 2 -
.../lima/ui/celleditor/EmptyCellRenderer.java | 3 -
.../ui/celleditor/EntryBookTableCellEditor.java | 5 +-
.../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 -
.../lima/ui/combobox/AccountComboBoxModel.java | 5 +-
.../lima/ui/combobox/EntryBookComboBoxModel.java | 5 +-
.../ui/combobox/FinancialPeriodComboBoxModel.java | 5 +-
.../ui/combobox/FiscalPeriodComboBoxModel.java | 5 +-
.../lima/ui/combobox/LeafAccountComboBoxModel.java | 5 +-
.../lima/ui/combobox/LetterComboBoxModel.java | 2 -
.../org/chorem/lima/ui/common/AbstractColumn.java | 2 -
.../chorem/lima/ui/common/AbstractLimaTable.java | 2 -
.../lima/ui/common/AbstractLimaTableModel.java | 2 -
.../lima/ui/common/AccountComboBoxModel.java | 5 +-
.../chorem/lima/ui/common/AccountListRenderer.java | 5 +-
.../lima/ui/common/CellRouteHorizontalAction.java | 2 -
.../lima/ui/common/CellRouteVerticalAction.java | 2 -
.../java/org/chorem/lima/ui/common/Column.java | 2 -
.../lima/ui/common/EntryBookComboBoxModel.java | 5 +-
.../lima/ui/common/EntryBookListRenderer.java | 3 +-
.../ui/common/FinancialPeriodComboBoxModel.java | 5 +-
.../ui/common/FinancialPeriodListRenderer.java | 3 +-
.../ui/common/FinancialTransactionTableModel.java | 2 -
.../lima/ui/common/FiscalPeriodComboBoxModel.java | 5 +-
.../lima/ui/common/FiscalPeriodListRenderer.java | 3 +-
.../lima/ui/common/GenericComboBoxModel.java | 5 +-
.../chorem/lima/ui/common/IntervalListener.java | 2 -
.../org/chorem/lima/ui/common/IntervalPanel.java | 2 -
.../lima/ui/common/LabelListCellRenderer.java | 2 -
.../chorem/lima/ui/common/TableModelWithGroup.java | 2 -
.../org/chorem/lima/ui/entrybook/EntryBookForm.css | 21 ++++
.../chorem/lima/ui/entrybook/EntryBookForm.jaxx | 5 +-
.../lima/ui/entrybook/EntryBookImportForm.css | 21 ++++
.../lima/ui/entrybook/EntryBookImportForm.jaxx | 5 +-
.../chorem/lima/ui/entrybook/EntryBookTable.java | 3 -
.../lima/ui/entrybook/EntryBookTableModel.java | 5 +-
.../org/chorem/lima/ui/entrybook/EntryBookView.css | 21 ++++
.../chorem/lima/ui/entrybook/EntryBookView.jaxx | 5 +-
.../lima/ui/entrybook/EntryBookViewHandler.java | 5 +-
.../org/chorem/lima/ui/entrybook/package-info.java | 3 +-
.../FinancialPeriodErrorDetector.java | 2 -
.../ui/financialperiod/FinancialPeriodTable.java | 5 +-
.../financialperiod/FinancialPeriodTableModel.java | 5 +-
.../ui/financialperiod/FinancialPeriodView.css | 21 ++++
.../ui/financialperiod/FinancialPeriodView.jaxx | 5 +-
.../FinancialPeriodViewHandler.java | 5 +-
.../lima/ui/financialperiod/package-info.java | 3 +-
.../FinancialStatementChartTreeTable.java | 3 -
.../FinancialStatementChartTreeTableModel.java | 5 +-
.../FinancialStatementChartView.css | 21 ++++
.../FinancialStatementChartView.jaxx | 7 +-
.../FinancialStatementChartViewHandler.java | 5 +-
.../FinancialStatementHeaderForm.css | 21 ++++
.../FinancialStatementHeaderForm.jaxx | 7 +-
.../FinancialStatementImportForm.css | 21 ++++
.../FinancialStatementImportForm.jaxx | 7 +-
.../FinancialStatementMovementForm.css | 21 ++++
.../FinancialStatementMovementForm.jaxx | 7 +-
.../ui/financialstatementchart/package-info.java | 3 +-
.../ui/financialtransaction/AccountColumn.java | 2 -
.../ui/financialtransaction/BalanceColumn.java | 2 -
.../lima/ui/financialtransaction/CreditColumn.java | 2 -
.../lima/ui/financialtransaction/DateColumn.java | 2 -
.../lima/ui/financialtransaction/DebitColumn.java | 2 -
.../ui/financialtransaction/DescriptionColumn.java | 2 -
.../ui/financialtransaction/EntryBookColumn.java | 2 -
.../FinancialTransactionDefaultTable.java | 2 -
.../FinancialTransactionErrorDetector.java | 2 -
.../FinancialTransactionTable.java | 5 +-
.../FinancialTransactionView.css | 21 ++++
.../FinancialTransactionView.jaxx | 7 +-
.../FinancialTransactionViewHandler.java | 5 +-
.../lima/ui/financialtransaction/LetterColumn.java | 2 -
.../ui/financialtransaction/VoucherColumn.java | 2 -
.../lima/ui/financialtransaction/package-info.java | 3 +-
.../FinancialTransactionSearchTable.java | 5 +-
.../FinancialTransactionSearchTableModel.java | 5 +-
.../FinancialTransactionSearchView.jaxx | 7 +-
.../FinancialTransactionSearchViewHandler.java | 5 +-
.../FinancialTransactionUnbalancedTable.java | 5 +-
.../FinancialTransactionUnbalancedTableModel.java | 5 +-
.../FinancialTransactionUnbalancedView.css | 21 ++++
.../FinancialTransactionUnbalancedView.jaxx | 7 +-
.../FinancialTransactionUnbalancedViewHandler.java | 5 +-
.../org/chorem/lima/ui/fiscalperiod/AddPeriod.css | 21 ++++
.../org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx | 7 +-
.../ui/fiscalperiod/FiscalPeriodErrorDetector.java | 2 -
.../lima/ui/fiscalperiod/FiscalPeriodTable.java | 5 +-
.../ui/fiscalperiod/FiscalPeriodTableModel.java | 5 +-
.../lima/ui/fiscalperiod/FiscalPeriodView.css | 21 ++++
.../lima/ui/fiscalperiod/FiscalPeriodView.jaxx | 5 +-
.../ui/fiscalperiod/FiscalPeriodViewHandler.java | 5 +-
.../fiscalperiod/RetainedEarningsEntryBookForm.css | 21 ++++
.../RetainedEarningsEntryBookForm.jaxx | 5 +-
.../lima/ui/fiscalperiod/RetainedEarningsWait.css | 21 ++++
.../lima/ui/fiscalperiod/RetainedEarningsWait.jaxx | 4 +-
.../chorem/lima/ui/fiscalperiod/package-info.java | 3 +-
.../org/chorem/lima/ui/home/AbstractHomePane.java | 3 +-
.../java/org/chorem/lima/ui/home/AccountsPane.java | 5 +-
.../org/chorem/lima/ui/home/EntryBooksPane.java | 5 +-
.../lima/ui/home/FinancialTransactionsPane.java | 5 +-
.../org/chorem/lima/ui/home/FiscalYearsPane.java | 5 +-
.../main/java/org/chorem/lima/ui/home/HomeView.css | 2 +-
.../java/org/chorem/lima/ui/home/HomeView.jaxx | 7 +-
.../java/org/chorem/lima/ui/home/package-info.java | 3 +-
.../org/chorem/lima/ui/identity/IdentityForm.css | 2 +-
.../org/chorem/lima/ui/identity/IdentityForm.jaxx | 7 +-
.../chorem/lima/ui/identity/IdentityHandler.java | 5 +-
.../chorem/lima/ui/importexport/ImportExport.java | 5 +-
.../lima/ui/importexport/ImportExportWaitView.jaxx | 5 +-
.../lima/ui/lettering/LetteringEditModel.java | 2 -
.../chorem/lima/ui/lettering/LetteringTable.java | 5 +-
.../lima/ui/lettering/LetteringTableModel.java | 5 +-
.../chorem/lima/ui/lettering/LetteringView.jaxx | 7 +-
.../lima/ui/lettering/LetteringViewHandler.java | 5 +-
.../lima/ui/lettering/LettringSelectionModel.java | 2 -
.../org/chorem/lima/ui/lettering/TypeEntry.java | 2 -
.../chorem/lima/ui/opening/CreateAccountsPanel.css | 21 ++++
.../lima/ui/opening/CreateAccountsPanel.jaxx | 5 +-
.../lima/ui/opening/CreateEntryBookPanel.css | 21 ++++
.../lima/ui/opening/CreateEntryBookPanel.jaxx | 5 +-
.../lima/ui/opening/CreateFiscalPeriodPanel.css | 21 ++++
.../lima/ui/opening/CreateFiscalPeriodPanel.jaxx | 5 +-
.../chorem/lima/ui/opening/CreateIdentityPanel.css | 2 +-
.../lima/ui/opening/CreateIdentityPanel.jaxx | 7 +-
.../org/chorem/lima/ui/opening/OpeningView.css | 21 ++++
.../org/chorem/lima/ui/opening/OpeningView.jaxx | 7 +-
.../chorem/lima/ui/opening/OpeningViewHandler.java | 5 +-
.../org/chorem/lima/ui/opening/package-info.java | 3 +-
.../chorem/lima/ui/vatchart/VatChartImportForm.css | 21 ++++
.../lima/ui/vatchart/VatChartImportForm.jaxx | 5 +-
.../lima/ui/vatchart/VatChartMovementForm.css | 21 ++++
.../lima/ui/vatchart/VatChartMovementForm.jaxx | 5 +-
.../chorem/lima/ui/vatchart/VatChartTreeTable.java | 3 -
.../lima/ui/vatchart/VatChartTreeTableModel.java | 3 -
.../org/chorem/lima/ui/vatchart/VatChartView.css | 21 ++++
.../org/chorem/lima/ui/vatchart/VatChartView.jaxx | 5 +-
.../lima/ui/vatchart/VatChartViewHandler.java | 3 -
.../java/org/chorem/lima/util/AccountToString.java | 5 +-
.../org/chorem/lima/util/EntryBookToString.java | 5 +-
.../java/org/chorem/lima/util/ErrorHelper.java | 5 +-
.../org/chorem/lima/util/ReportDialogView.jaxx | 7 +-
.../org/chorem/lima/widgets/JWideComboBox.java | 5 +-
.../chorem/lima/widgets/ScrollBasicComboPopup.java | 3 -
.../chorem/lima/widgets/ScrollMetalComboUI.java | 3 -
lima-swing/src/main/resources/META-INF/aop.xml | 5 +-
.../src/main/resources/lima-config.properties | 5 +-
lima-swing/src/main/resources/log4j.properties | 7 +-
lima-swing/src/site/devel/packaging.rst | 7 +-
.../resources/META-INF/aop.xml => site/site.xml} | 44 ++++---
lima-swing/src/site/site_fr.xml | 70 -----------
.../lima/ui/account/AccountViewHandlerTest.java | 2 -
pom.xml | 106 +++++++++-------
src/site/rst/assistant.rst | 3 -
src/site/rst/callao/callao.rst | 3 -
src/site/rst/callao/classes.rst | 3 -
src/site/rst/callao/contact.rst | 5 +-
src/site/rst/callao/developpement.rst | 3 -
src/site/rst/callao/howto.rst | 5 +-
src/site/rst/callao/index.rst | 3 -
src/site/rst/callao/lexique.rst | 5 +-
src/site/rst/callao/news.rst | 5 +-
src/site/rst/callao/roadmap.rst | 3 -
src/site/rst/callao/todo.rst | 3 -
src/site/rst/callao/usecases.rst | 3 -
src/site/rst/contact.rst | 3 -
src/site/rst/devel/glossary.rst | 3 -
src/site/rst/devel/modificationarchitecture.rst | 3 -
src/site/rst/devel/openejb.rst | 3 -
src/site/rst/devel/server.rst | 3 -
src/site/rst/features.rst | 3 -
src/site/rst/importexport.rst | 3 -
src/site/rst/index.rst | 3 -
src/site/rst/install.rst | 3 -
src/site/rst/lexique.rst | 3 -
src/site/rst/rapports.rst | 3 -
src/site/rst/saisie.rst | 3 -
src/site/site.xml | 91 ++++++++++++++
src/site/site_fr.xml | 133 ---------------------
402 files changed, 1128 insertions(+), 1711 deletions(-)
create mode 100644 .gitignore
copy lima-swing/src/main/resources/META-INF/aop.xml => lima-business-api/src/site/site.xml (54%)
delete mode 100644 lima-business-api/src/site/site_fr.xml
copy lima-swing/src/main/resources/META-INF/aop.xml => lima-business/src/site/site.xml (54%)
delete mode 100644 lima-business/src/site/site_fr.xml
copy lima-swing/src/main/resources/META-INF/aop.xml => lima-callao/src/site/site.xml (54%)
delete mode 100644 lima-callao/src/site/site_fr.xml
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionView.jaxx
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.jaxx
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExportWaitView.jaxx
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.jaxx
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.jaxx
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.jaxx
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.jaxx
mode change 100755 => 100644 lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningView.jaxx
copy lima-swing/src/{main/resources/META-INF/aop.xml => site/site.xml} (55%)
delete mode 100644 lima-swing/src/site/site_fr.xml
mode change 100755 => 100644 src/site/rst/importexport.rst
mode change 100755 => 100644 src/site/rst/rapports.rst
mode change 100755 => 100644 src/site/rst/saisie.rst
create mode 100644 src/site/site.xml
delete mode 100644 src/site/site_fr.xml
--
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm(a)chorem.org>.
1
1
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
omits c332bcb refs #1115 on s'assure que LimaServiceConfig ne peut-être qu'un singleton, le constructeur n'est plus public
omits a724373 refs #1032 refactoring sur service d'import export
omits 0227c22 mise à jour en têtes
omits fa1ea45 refs #1032 on ne modifie pas une variable parametre
omits 6d07f43 correction du pom, problème de dépendance sur nuiton-converter
omits 44a4188 refs #1115 refactoring sur l'initialisation des services
omits 3c3c227 refs #1115 refactoring recommendation sonar
omits 7297804 refs #1115 refactoring au tours du lancement de l'application
omits 7d5432a refs #875 #1043 : financial transaction unbalanced
omits d96e65b refs #875 #1043 : financial transaction view
omits f11bf92 refs #875 #1043 : VAT statement
omits 666b140 refs #875 #1043 : Financial statement
omits 9de08e6 refs #875 #1043 : FiscalPeriod
omits b9401ab refs #875 #1043 : FinancialPeriod
omits 759037f refs #875 #1043 : EntryBook
omits 2931d8c refs #875 #1043 : Accounts, remove "ui" and "common" in i18n keys
omits b4f1e7a refs #875 #1043 : opening
omits 7f4f367 Ajout d'un test en vue de ractorer la requête de récupération des comptes feuille
omits a6cee67 fix sonar warning
omits 885a82b fix sonar warning
omits 98c83bb mprops
omits 763b125 add serial ids
omits d3f54ab refactoring sonar
omits 1cd7f4d refactoring sonar
omits 1e5c25d refactoring
omits 6507511 corrige le fait que l'ouverture du navigateur ne foncionne pas
omits 138e95d refs #1032 gestion des erreurs en cas de mauvais fichier en entrée
omits 09f7bb5 refs #1054 déplacement + correction du build
omits c1e2539 refs #1032 correction d'une NPE
omits 19918ca refs #1032 gestion des exceptions d'import
omits 20c0e7c refs #1033 Le service de migration est à mettre à jour
omits f69ac50 refs #1032 correction des tests
omits 81be5b0 refs #1032 ajout de descriptions d'erreur
omits ab63da4 refs #1032 correction des traductions
omits c062834 refs #1032 gestion des retours d'import export
omits ca15230 monté de version de nuiton-csv
omits c91351c monté de version de jettyPluginVersion, nuitonConfigVersion, nuitonProfilingVersion, nuitonCsvVersion, nuitonI18nVersion, jdomVersion
omits 7f97f14 refs #1032 suppression de beans qui ne sont plus utilisé et refactoring de l'import des entrées EBP
omits 1f14b73 refs #1032 import des écritures depuis EBP
omits d61aaaf refs #1032 correction sur import export
omits b83dff7 refs #1032 import des journaux depuis EBP
omits 932c45a refs #1032 nouvelle implémentation des imports export EBP
omits f3fb6ec refs #1032 import export de l'identité
omits 5eca5ab refs #1032 corrections sur import journaux
omits cf77368 refs #1032 import des journaux depuis EBP
omits 3a163bd refs #1032 correction sur l'import des écritures depuis EBP
omits 8460105 refs #1032 import EBP des entries
omits 8774022 refs #875 #1043 : identity
omits 3d1ca07 refs #875 #1043 : identity
omits 56914ec refs #1032 import export des VATStatements
omits 6325078 refs #1032 ajout d'un contrôle sur les caractères authorisé d'un label de financial statement
omits edc28b2 refs #1032 gestion des imports des financial statement non ordonnés
omits 71b2bce refs #1032 maj des imports par défaut
omits 0dcc7b3 refs #1032 import export des financial statements.
omits 83d8093 refs #875 #1043 : mainview
omits 72d0627 refs #1044 #1051 : lettering/un-lettering
omits 4932eeb fix build
omits 378124d fixes #1052 : non création des périodes comptables
omits 8e16454 refs #1032 import export des transactions financières
omits 58889d9 refs #1032 gestion du cas ou il le master n'a pas de parents
omits 033d287 refs #1032 empêche la création de catégories de transaction financières ayant le même nom pour un même parent
omits fb21da8 refs #1032 utilisation des services metier propre aux entitées dans le service de migration
omits f03a50b fixes #973 : auto complete
omits 6b61c30 refs #1049 ajout d'un commentaire sur le pourquoi de la création manuel des schémas
omits c6cc80b refs #1032 correction sur un test en echec
omits 6247f35 refs #1048 il manquait un import pour que ça compile
omits b9838ed refs #1044 : financial statement service
omits f4cf1aa Utilisation De DesctopUtils de nuiton-utils à la place de Desktop
omits 9ce8c5e refs #1032 progression migration vers nouveaux services
omits a749879 refs #1032 export entries as CSV replace financialTransaction id by financialTransaction date
omits 1239ef0 refs #1032 fix import export for entries
omits cc122e9 refs #1032 correction sur import EBP
omits 0b173eb refs #1032 début de mise en place du nouveau servcice d'import export
omits 0644a70 refs #974 : change filter view
omits 20409f4 fixes #1045 : disable lettering column
omits 773e2be refs #1044 : fiscal period
omits 65a87c7 refs #1044 : financial transaction
omits d3754fd refs #1044 : ident + topia function
omits 9dba636 upgrade versions (mavenpom, eugene, topia, openEJB, pdfbox, nuiton-csv)
omits 4f71fc7 Rename package "Filter" to "filter"
omits 9a49512 fixes #975 : Entrées Incorretes : Suppression colone lettre
omits 2d34d1d fixes #977 : Rapport : suppression des menus
omits 17ab464 fixes #557 : remove fullscreen option
omits 6d3dcc9 fixes #557 : fix refactor exception
omits 17a960b fixes #557 : fix refactor exception
omits a92f344 refs #557 : fix fiscal period exception
omits d4a6572 refs #557 : fix financial transaction exception
omits c3874c9 refs #557 : fix financial transaction exception
omits f80dc42 refs #557 : fix financial transaction exception
omits 6332aa7 refs #557 : fix exception when lock periodic entry book
omits 4a1e527 refs #557 : fix locked entry book exception
omits 183d98c fixes #1042 : Reconstruction de blockClosedPeriodicEntryBookRules
omits 18a3d06 fixes #1040 : update to jdk 1.7
omits b721cc9 refs #557 : fix entry book exception
omits 2288808 refs #557 : fix test
omits 2789617 refs #557 : Revoir les exceptions techniques et metiers
omits 9300bcf #934 refactoring sur dao suppression methodes dépreciées
omits 172519f #934 refactoring retrait d'accès static à des methodes dont la classe est un singleton
omits 58f2d03 #934 refactorin sur LimaConfig
omits 50bab23 #1032 creation du zip coté swing
omits bfb5e88 #1032 utilisation de Base64 pour envoie du zip du server vers swing
omits f0d87d4 #1032 move file's creation to swing
omits 83f80a2 #1032 utilisation de nuiton-csv migration en cours
omits 91d93d4 Fix snapshot name in lib/ directory
omits 95442b3 corrige build + message de warning
omits b6d004c refs #1032 refactoring sur Import Export
omits dcf78c1 refs #934 : used Topia3 API and refractor code
omits 02c2af5 refs #934 : used Topia3 API and refractor code
omits ae7d685 Utilisation De org.nuiton.util.DesktopUtil à la place de java.awt.Desktop;
omits 6fcc5cf Remove snapshots
omits 3fa6718 refs #934 some refactoring
omits 7cb643a corrige le build
omits 6fab228 refs #934 désactivation du service de migration tant que celui-ci n''est pas fonctionnel.
omits 827147d correction du build de la partie swing
omits 277a899 erreurs de syntaxe
omits 2a77da8 refs #934 correction sur service de migration
omits 2f1ea45 Use latest versions
omits 91cf1ce refs #934 merge vs saveOrUpdate
omits 43ea1f3 Rename package
omits 23daf8f Fix Dao naming
omits 73bc2bd refs #934 Green bar !
omits 8d3b5b7 Fix some of the tests
omits 661fa4f refs #1027 mise en place dun service de migration de la table entry pour remplacer les lettrages vides par des null
omits e167432 refs #934 Migrate tests configuration
omits 24338f8 refs#935 suppression du module obsolète lima-negocia
omits daea878 refs#935 suppression du module obsolète lima-negocia
omits d7bc17b refs#935 suppression du module obsolète lima-negocia
omits 3e7f37d Remove LimaDaoHelper
omits 964aaa0 Migrate test compilation
omits 5dcea83 refs #934 Migrate LimaInterceptor and LimaXAResource
omits c49fa58 refs#934 migration topia3 en cours
omits 234f705 refs #934 début de migration vers Topia3
omits 05fc2e2 fixes #1026: Update to openejb 4.6.0.2
omits 558eef2 Fix javadoc
omits 2ff641a Fix javadoc
omits 4a3e263 [maven-release-plugin] prepare for next development iteration
adds 35fdbd3 [maven-release-plugin] copy for tag lima-0.7.3
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 (c332bcb)
\
N -- N -- N refs/heads/master (35fdbd3)
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.
No new revisions were added by this update.
Summary of changes:
lima-business-api/pom.xml | 2 +-
.../org/chorem/lima/LimaTechnicalException.java | 45 -
.../org/chorem/lima/business/ExportResult.java | 73 -
.../chorem/lima/business/ImportExportResults.java | 95 -
.../org/chorem/lima/business/ImportResult.java | 106 --
.../business/{exceptions => }/LimaException.java | 31 +-
.../chorem/lima/business/api/AccountService.java | 37 +-
.../chorem/lima/business/api/DocumentService.java | 17 +-
.../chorem/lima/business/api/EntryBookService.java | 29 +-
.../chorem/lima/business/api/ExportService.java | 54 +-
...dentityService.java => ExportServiceLocal.java} | 19 +-
.../lima/business/api/FinancialPeriodService.java | 32 +-
.../business/api/FinancialStatementService.java | 39 +-
.../business/api/FinancialTransactionService.java | 70 +-
.../lima/business/api/FiscalPeriodService.java | 50 +-
.../chorem/lima/business/api/IdentityService.java | 5 +-
.../chorem/lima/business/api/ImportService.java | 108 +-
.../chorem/lima/business/api/ReportService.java | 13 +-
.../lima/business/api/VatStatementService.java | 30 +-
.../lima/business/exceptions/AccountException.java | 54 -
.../exceptions/AfterLastFiscalPeriodException.java | 38 -
.../exceptions/AlreadyExistAccountException.java | 36 -
.../exceptions/AlreadyExistEntryBookException.java | 38 -
.../exceptions/AlreadyExistFinancialStatement.java | 46 -
.../AlreadyExistVatStatementException.java | 46 -
.../AlreadyLockedFiscalPeriodException.java | 38 -
.../BeforeFirstFiscalPeriodException.java | 37 -
.../BeginAfterEndFiscalPeriodException.java | 41 -
.../ClosedPeriodicEntryBookException.java | 46 -
.../ClosedPeriodicEntryBooksException.java | 48 -
.../lima/business/exceptions/DateException.java | 46 -
.../lima/business/exceptions/EntriesException.java | 48 -
.../business/exceptions/EntryBookException.java | 47 -
.../exceptions/FinancialPeriodException.java | 47 -
.../exceptions/FinancialTransactionsException.java | 48 -
.../business/exceptions/FiscalPeriodException.java | 46 -
.../business/exceptions/ImportBackupException.java | 35 -
.../business/exceptions/ImportEbpException.java | 33 -
.../business/exceptions/ImportFileException.java | 40 -
.../exceptions/InvalidAccountNumberException.java | 43 -
.../LastUnlockedFiscalPeriodException.java | 35 -
.../exceptions/LockedEntryBookException.java | 41 -
.../exceptions/LockedFinancialPeriodException.java | 41 -
.../MoreOneUnlockFiscalPeriodException.java | 61 -
.../exceptions/NoDataToImportException.java | 30 -
.../exceptions/NoEmptyFiscalPeriodException.java | 39 -
.../exceptions/NoFiscalPeriodFoundException.java | 30 -
.../NoFoundFinancialPeriodException.java | 38 -
.../exceptions/NotAllowedLabelException.java | 40 -
...NotBeginNextDayOfLastFiscalPeriodException.java | 41 -
...NotLockedClosedPeriodicEntryBooksException.java | 37 -
.../NotNumberAccountNumberException.java | 43 -
.../exceptions/UnbalancedEntriesException.java | 37 -
.../UnbalancedFinancialTransactionsException.java | 43 -
.../exceptions/UnfilledEntriesException.java | 37 -
.../business/exceptions/UsedAccountException.java | 35 -
.../exceptions/UsedEntryBookException.java | 36 -
...outEntryBookFinancialTransactionsException.java | 40 -
lima-business/pom.xml | 61 +-
lima-business/src/license/THIRD-PARTY.properties | 8 +-
.../main/java/org/chorem/lima/LimaXAResource.java | 22 +-
.../org/chorem/lima/business/AccountingRules.java | 69 +-
.../lima/business/LimaBusinessException.java | 43 +-
.../java/org/chorem/lima/business/LimaConfig.java | 257 +++
.../lima/business/LimaConfigurationHelper.java | 23 -
.../org/chorem/lima/business/LimaDaoHelper.java | 107 ++
.../org/chorem/lima/business/LimaInterceptor.java | 58 +-
.../chorem/lima/business/LimaServiceConfig.java | 324 ----
.../accountingrules/DefaultAccountingRules.java | 429 +++--
.../accountingrules/FranceAccountingRules.java | 255 +--
.../lima/business/ejb/AbstractLimaService.java | 4 +-
.../lima/business/ejb/AccountServiceImpl.java | 287 ++-
.../ejb/ClosedPeriodicEntryBookServiceImpl.java | 15 +-
.../lima/business/ejb/DocumentServiceImpl.java | 148 +-
.../lima/business/ejb/EntryBookServiceImpl.java | 207 +--
.../chorem/lima/business/ejb/EntryServiceImpl.java | 16 +-
.../lima/business/ejb/ExportServiceImpl.java | 817 ++++++---
.../business/ejb/FinancialPeriodServiceImpl.java | 173 +-
.../ejb/FinancialStatementServiceImpl.java | 518 +++---
.../ejb/FinancialTransactionServiceImpl.java | 436 ++---
.../lima/business/ejb/FiscalPeriodServiceImpl.java | 575 +++---
.../lima/business/ejb/HttpServerServiceImpl.java | 58 +-
.../lima/business/ejb/IdentityServiceImpl.java | 43 +-
.../lima/business/ejb/ImportServiceImpl.java | 1834 +++++++++++---------
.../lima/business/ejb/OptionsServiceImpl.java | 14 +-
.../lima/business/ejb/ReportServiceImpl.java | 315 ++--
.../lima/business/ejb/VatStatementServiceImpl.java | 357 ++--
.../lima/business/ejb/csv/AbstractLimaModel.java | 272 ---
.../chorem/lima/business/ejb/csv/AccountModel.java | 56 -
.../lima/business/ejb/csv/EntryBookModel.java | 54 -
.../chorem/lima/business/ejb/csv/EntryModel.java | 127 --
.../business/ejb/csv/FinancialStatementModel.java | 72 -
.../ejb/csv/FinancialTransactionModel.java | 92 -
.../lima/business/ejb/csv/FiscalPeriodModel.java | 56 -
.../lima/business/ejb/csv/IdentityModel.java | 72 -
.../lima/business/ejb/csv/VatStatementModel.java | 63 -
.../lima/business/ejb/ebp/AccountEBPModel.java | 154 --
.../lima/business/ejb/ebp/EntryBookEBPModel.java | 76 -
.../lima/business/ejb/ebp/EntryEBPModel.java | 95 -
.../business/migration/DatabaseMigrationClass.java | 74 +
.../lima/business/migration/MigrationV0V0_5.java | 49 +
.../lima/business/migration/MigrationV0_6.java | 85 +
.../lima/business/utils/AccountComparator.java | 2 +-
...odComparator.java => AccountEBPComparator.java} | 9 +-
.../lima/business/utils/EntryEBPComparator.java | 19 +-
.../chorem/lima/service/LimaServiceFactory.java | 11 +-
.../src/main/resources/META-INF/ejb-jar.xml | 8 +-
.../resources/i18n/lima-business_en_GB.properties | 33 +-
.../resources/i18n/lima-business_fr_FR.properties | 40 +-
lima-business/src/main/resources/lima.properties | 1 -
.../org/chorem/lima/business/AbstractLimaTest.java | 294 ++--
.../org/chorem/lima/business/AccountDaoTest.java | 515 ------
.../lima/business/AccountServiceImplTest.java | 21 +-
.../lima/business/EntryBookServiceImplTest.java | 35 +-
.../business/FinancialPeriodServiceImplTest.java | 31 +-
.../FinancialTransactionServiceImplTest.java | 16 +-
.../lima/business/FiscalPeriodServiceImplTest.java | 1 +
.../lima/business/ImportExportServiceTest.java | 599 -------
.../lima/business/ImportServiceImplTest.java | 164 ++
.../org/chorem/lima/business/LimaMiscTest.java | 13 +-
.../org/chorem/lima/business/LimaTestsConfig.java | 70 -
.../lima/business/ReportServiceImplTest.java | 4 +-
.../accountingrules/AccountServiceRuleFrTest.java | 32 +-
.../EntryBookServiceRuleFrTest.java | 14 +-
.../FinancialPeriodServiceRuleFrTest.java | 14 +-
.../FinancialTransactionServiceRuleFrTest.java | 14 +-
.../FiscalPeriodServiceRuleFrTest.java | 14 +-
.../accountingrules/ImportServiceRuleFrTest.java | 24 +-
.../accountingrules/ReportServiceRuleFrTest.java | 8 +-
.../accountingrules/TestAccountingRules.java | 97 +-
.../org/chorem/lima/business/ejb/ClearService.java | 24 +-
.../lima/business/ejb/ClearServiceImpl.java} | 43 +-
...TransactionDAOTest.java => AccountDAOTest.java} | 41 +-
.../lima/entity/FinancialTransactionDAOTest.java | 24 +-
.../src/test/resources/META-INF/ejb-jar.xml | 8 +-
lima-business/src/test/resources/ebp/ecritures.txt | 9 -
.../src/test/resources/import/bcr_developed.csv | 163 --
.../src/test/resources/import/vat_shortened.csv | 56 -
.../src/test/resources/lima-test.properties | 7 -
lima-business/src/test/resources/log4j.properties | 2 +-
lima-callao/pom.xml | 50 +-
.../chorem/lima/{clause => Clause}/AndClause.java | 2 +-
.../lima/{clause => Clause}/BooleanClause.java | 2 +-
.../org/chorem/lima/{clause => Clause}/Clause.java | 2 +-
.../chorem/lima/{clause => Clause}/DateClause.java | 2 +-
.../chorem/lima/{clause => Clause}/NotClause.java | 2 +-
.../lima/{clause => Clause}/NumberClause.java | 2 +-
.../chorem/lima/{clause => Clause}/OrClause.java | 2 +-
.../chorem/lima/{clause => Clause}/SetClause.java | 2 +-
.../lima/{clause => Clause}/StringClause.java | 2 +-
.../lima/{clause => Clause}/SubFilterClause.java | 4 +-
.../lima/{clause => Clause}/VisitorClause.java | 2 +-
.../org/chorem/lima/DefaultServiceContext.java | 148 --
.../lima/{filter => Filter}/AbstractFilter.java | 4 +-
.../lima/{filter => Filter}/AccountFilter.java | 4 +-
.../lima/{filter => Filter}/EntryBookFilter.java | 4 +-
.../lima/{filter => Filter}/EntryFilter.java | 12 +-
.../org/chorem/lima/{filter => Filter}/Filter.java | 4 +-
.../lima/{filter => Filter}/FilterGenerator.java | 22 +-
.../FinancialTransactionFilter.java | 8 +-
.../lima/{filter => Filter}/VisitorFilter.java | 2 +-
.../main/java/org/chorem/lima/ServiceContext.java | 38 -
.../org/chorem/lima/entity/AccountDAOImpl.java | 184 ++
.../org/chorem/lima/entity/AccountTopiaDao.java | 113 --
.../entity/ClosedPeriodicEntryBookDAOImpl.java | 197 +++
.../entity/ClosedPeriodicEntryBookTopiaDao.java | 185 --
.../java/org/chorem/lima/entity/EntryDAOImpl.java | 296 ++++
.../java/org/chorem/lima/entity/EntryTopiaDao.java | 286 ---
...odTopiaDao.java => FinancialPeriodDAOImpl.java} | 55 +-
...opiaDao.java => FinancialStatementDAOImpl.java} | 36 +-
.../chorem/lima/entity/FinancialStatementImpl.java | 11 -
.../lima/entity/FinancialTransactionDAOImpl.java | 301 ++++
.../lima/entity/FinancialTransactionTopiaDao.java | 256 ---
.../chorem/lima/entity/FiscalPeriodDAOImpl.java | 133 ++
.../chorem/lima/entity/FiscalPeriodTopiaDao.java | 92 -
.../org/chorem/lima/entity/GeneratorHQuery.java | 38 +-
.../entity/LimaCallaoTopiaApplicationContext.java | 20 -
.../entity/LimaCallaoTopiaPersistenceContext.java | 80 -
...ementTopiaDao.java => VatStatementDAOImpl.java} | 55 +-
lima-callao/src/main/xmi/accounting-model.zargo | Bin 46061 -> 0 bytes
...ting-model.properties => accounting.properties} | 6 +-
lima-callao/src/main/xmi/accounting.zargo | Bin 0 -> 48480 bytes
LICENSE.txt => lima-neogia/LICENSE.txt | 0
{lima-business => lima-neogia}/README.txt | 0
lima-neogia/changelog.txt | 10 +
lima-neogia/pom.xml | 306 ++++
lima-neogia/src/main/filters/filter.properties | 3 +
.../lima/service/neogia/NeogiaAccountService.java | 145 ++
.../lima/service/neogia/NeogiaCompanyService.java | 40 +
.../lima/service/neogia/NeogiaEntryService.java | 187 ++
.../lima/service/neogia/NeogiaFileService.java | 49 +
.../lima/service/neogia/NeogiaJournalService.java | 131 ++
.../lima/service/neogia/NeogiaPeriodService.java | 143 ++
.../lima/service/neogia/NeogiaServiceFactory.java | 85 +
.../lima/service/neogia/NeogiaStatusService.java | 67 +
.../service/neogia/NeogiaTransactionService.java | 206 +++
.../lima/service/neogia/NeogiaUserService.java | 39 +
.../neogia/parser/NGLAccountToAccountDTO.java | 91 +
.../lima/service/neogia/util/NeogiaUtil.java | 201 +++
.../src/main/resources/wsdl/addAccount.wsdl | 88 +
lima-neogia/src/main/resources/wsdl/addEntry.wsdl | 111 ++
.../src/main/resources/wsdl/addJournal.wsdl | 87 +
.../src/main/resources/wsdl/addTransaction.wsdl | 102 ++
.../src/main/resources/wsdl/getAllAccount.wsdl | 101 ++
.../src/main/resources/wsdl/getAllJournal.wsdl | 94 +
.../src/main/resources/wsdl/getAllPeriod.wsdl | 89 +
.../src/main/resources/wsdl/getAllStatus.wsdl | 86 +
.../src/main/resources/wsdl/getAllTransaction.wsdl | 88 +
.../main/resources/wsdl/getEntryByTransaction.wsdl | 105 ++
.../src/main/resources/wsdl/removeAccount.wsdl | 85 +
.../src/main/resources/wsdl/removeEntry.wsdl | 82 +
.../src/main/resources/wsdl/removeJournal.wsdl | 85 +
.../src/main/resources/wsdl/removeTransaction.wsdl | 87 +
.../src/main/resources/wsdl/updateAccount.wsdl | 86 +
.../src/main/resources/wsdl/updateEntry.wsdl | 86 +
.../src/main/resources/wsdl/updateJournal.wsdl | 87 +
.../src/main/resources/wsdl/updateTransaction.wsdl | 87 +
lima-swing/pom.xml | 44 +-
lima-swing/src/license/THIRD-PARTY.properties | 7 +-
lima-swing/src/main/assembly/bin.xml | 2 +-
lima-swing/src/main/assembly/lima.bat | 2 -
lima-swing/src/main/assembly/lima.exe | Bin 0 -> 25600 bytes
.../lima/{LimaSwingConfig.java => LimaConfig.java} | 95 +-
...ingApplicationContext.java => LimaContext.java} | 28 +-
.../java/org/chorem/lima/LimaExceptionHandler.java | 19 +-
.../src/main/java/org/chorem/lima/LimaMain.java | 20 +-
.../java/org/chorem/lima/actions/MiscAction.java | 12 +-
.../org/chorem/lima/enums/ImportExportEnum.java | 5 +-
.../java/org/chorem/lima/ui/ClosableTabHeader.css | 36 -
.../java/org/chorem/lima/ui/ClosableTabHeader.jaxx | 30 +-
.../AccountCondition/AccountConditionHandler.java | 3 +-
.../AccountCondition/AccountConditionView.jaxx | 32 +-
.../BigDecimalConditionView.jaxx | 59 +-
.../BigDecimalCondition/CreditConditionView.java | 2 +-
.../BigDecimalCondition/DebitConditionView.java | 2 +-
.../chorem/lima/ui/Filter/ConditionHandler.java | 2 +-
.../EntryBookConditionHandler.java | 21 +-
.../EntryBookCondition/EntryBookConditionView.jaxx | 36 +-
.../StringCondition/DescriptionConditionView.java | 2 +-
.../StringCondition/LetteringConditionView.java | 2 +-
.../StringCondition/StringConditionView.jaxx | 51 +-
.../StringCondition/VoucherConditionView.java | 2 +-
.../ui/Filter/dateCondition/DateConditionView.jaxx | 42 +-
.../DateIntervalConditionHandler.java | 3 +-
.../DateIntervalConditionView.jaxx | 57 +-
.../FinancialPeriodConditionHandler.java | 21 +-
.../FinancialPeriodConditionView.jaxx | 36 +-
.../FinancialTransactionConditionHandler.java | 8 +-
.../FinancialTransactionConditionView.jaxx | 42 +-
.../FiscalPeriodConditionHandler.java | 21 +-
.../FiscalPeriodConditionView.jaxx | 37 +-
.../java/org/chorem/lima/ui/LimaRendererUtil.java | 6 +-
.../src/main/java/org/chorem/lima/ui/MainView.css | 101 --
.../src/main/java/org/chorem/lima/ui/MainView.jaxx | 249 ++-
.../java/org/chorem/lima/ui/MainViewHandler.java | 306 ++--
.../org/chorem/lima/ui/account/AccountForm.css | 29 -
.../org/chorem/lima/ui/account/AccountForm.jaxx | 20 +-
.../chorem/lima/ui/account/AccountImportForm.css | 46 -
.../chorem/lima/ui/account/AccountImportForm.jaxx | 30 +-
.../org/chorem/lima/ui/account/AccountView.css | 32 -
.../org/chorem/lima/ui/account/AccountView.jaxx | 57 +-
.../chorem/lima/ui/account/AccountViewHandler.java | 62 +-
.../chorem/lima/ui/account/UpdateAccountForm.css | 30 -
.../chorem/lima/ui/account/UpdateAccountForm.jaxx | 23 +-
.../lima/ui/accountsreports/AccountComboBox.java | 142 ++
.../ui/accountsreports/AccountsReportsView.jaxx | 78 +
.../AccountsReportsViewHandler.java | 123 ++
.../package-info.java | 4 +-
.../BalanceReportsView.jaxx} | 60 +-
.../lima/ui/balance/BalanceReportsViewHandler.java | 110 ++
.../BalanceTable.java} | 22 +-
.../chorem/lima/ui/balance/BalanceTableModel.java | 162 ++
.../package-info.java | 4 +-
.../lima/ui/celleditor/AccountTableCellEditor.java | 19 +-
.../ui/celleditor/AutoCompleteTableCellEditor.java | 60 -
.../ui/celleditor/BigDecimalTableCellEditor.java | 9 +-
.../ui/celleditor/BigDecimalTableCellRenderer.java | 51 +-
.../lima/ui/celleditor/DateTableCellEditor.java | 8 +-
.../celleditor/DefaultLimaTableCellRenderer.java | 64 +-
.../ui/celleditor/EntryBookTableCellEditor.java | 9 +-
.../lima/ui/celleditor/StringTableCellEditor.java | 4 +-
.../lima/ui/combobox/AccountComboBoxModel.java | 10 +-
.../lima/ui/combobox/EntryBookComboBoxModel.java | 18 +-
.../ui/combobox/FinancialPeriodComboBoxModel.java | 29 +-
.../ui/combobox/FiscalPeriodComboBoxModel.java | 30 +-
.../lima/ui/combobox/LeafAccountComboBoxModel.java | 11 +-
.../lima/ui/combobox/LetterComboBoxModel.java | 13 +-
.../org/chorem/lima/ui/common/AbstractColumn.java | 18 -
.../chorem/lima/ui/common/AbstractLimaTable.java | 18 +-
.../lima/ui/common/AbstractLimaTableModel.java | 13 +-
.../lima/ui/common/CellRouteHorizontalAction.java | 1 -
.../lima/ui/common/CellRouteVerticalAction.java | 2 -
.../java/org/chorem/lima/ui/common/Column.java | 16 +-
.../ui/common/FinancialTransactionTableModel.java | 61 +-
.../org/chorem/lima/ui/common/IntervalPanel.java | 4 +-
.../lima/ui/common/LabelListCellRenderer.java | 2 -
.../chorem/lima/ui/common/TableModelWithGroup.java | 2 -
.../org/chorem/lima/ui/entrybook/EntryBookForm.css | 30 -
.../chorem/lima/ui/entrybook/EntryBookForm.jaxx | 30 +-
.../lima/ui/entrybook/EntryBookImportForm.css | 24 -
.../lima/ui/entrybook/EntryBookImportForm.jaxx | 18 +-
.../lima/ui/entrybook/EntryBookTableModel.java | 4 +-
.../org/chorem/lima/ui/entrybook/EntryBookView.css | 32 -
.../chorem/lima/ui/entrybook/EntryBookView.jaxx | 62 +-
.../lima/ui/entrybook/EntryBookViewHandler.java | 40 +-
.../ui/entrybooksreports/EntryBookComboBox.java | 83 +
.../EntryBooksReportsTable.java} | 88 +-
.../EntryBooksReportsTableModel.java | 188 ++
.../entrybooksreports/EntryBooksReportsView.jaxx | 66 +
.../EntryBooksReportsViewHandler.java | 124 ++
.../package-info.java | 4 +-
.../FinancialPeriodErrorDetector.java | 2 +-
.../financialperiod/FinancialPeriodTableModel.java | 14 +-
.../ui/financialperiod/FinancialPeriodView.css | 16 -
.../ui/financialperiod/FinancialPeriodView.jaxx | 49 +-
.../FinancialPeriodViewHandler.java | 74 +-
.../FinancialStatementChartTreeTableModel.java | 106 +-
.../FinancialStatementChartView.css | 41 -
.../FinancialStatementChartView.jaxx | 76 +-
.../FinancialStatementChartViewHandler.java | 45 +-
.../FinancialStatementHeaderForm.css | 33 -
.../FinancialStatementHeaderForm.jaxx | 26 +-
.../FinancialStatementImportForm.css | 46 -
.../FinancialStatementImportForm.jaxx | 32 +-
.../FinancialStatementMovementForm.css | 51 -
.../FinancialStatementMovementForm.jaxx | 41 +-
.../FinancialStatementReportTable.java | 166 ++
.../FinancialStatementReportTableCellRenderer.java | 110 ++
.../FinancialStatementReportTableModel.java | 176 ++
.../FinancialStatementReportView.jaxx} | 29 +-
.../FinancialStatementReportViewHandler.java | 112 ++
.../package-info.java | 4 +-
.../ui/financialtransaction/AccountColumn.java | 9 +-
.../lima/ui/financialtransaction/CreditColumn.java | 15 +-
.../lima/ui/financialtransaction/DateColumn.java | 8 +-
.../lima/ui/financialtransaction/DebitColumn.java | 15 +-
.../ui/financialtransaction/DescriptionColumn.java | 10 +-
.../ui/financialtransaction/EntryBookColumn.java | 6 +-
.../FinancialTransactionErrorDetector.java | 1 +
.../FinancialTransactionView.css | 106 --
.../FinancialTransactionView.jaxx | 182 +-
.../FinancialTransactionViewHandler.java | 480 ++---
.../lima/ui/financialtransaction/LetterColumn.java | 7 +-
.../ui/financialtransaction/VoucherColumn.java | 9 +-
.../FinancialTransactionSearchView.jaxx | 131 +-
.../FinancialTransactionSearchViewHandler.java | 4 +-
.../FinancialTransactionUnbalancedTableModel.java | 4 +
.../FinancialTransactionUnbalancedView.css | 46 -
.../FinancialTransactionUnbalancedView.jaxx | 103 +-
.../FinancialTransactionUnbalancedViewHandler.java | 178 +-
.../org/chorem/lima/ui/fiscalperiod/AddPeriod.css | 25 -
.../org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx | 14 +-
.../ui/fiscalperiod/FiscalPeriodErrorDetector.java | 2 +-
.../ui/fiscalperiod/FiscalPeriodTableModel.java | 12 +-
.../lima/ui/fiscalperiod/FiscalPeriodView.css | 36 -
.../lima/ui/fiscalperiod/FiscalPeriodView.jaxx | 68 +-
.../ui/fiscalperiod/FiscalPeriodViewHandler.java | 127 +-
.../fiscalperiod/RetainedEarningsEntryBookForm.css | 49 -
.../RetainedEarningsEntryBookForm.jaxx | 57 +-
.../lima/ui/fiscalperiod/RetainedEarningsWait.css | 7 -
.../lima/ui/fiscalperiod/RetainedEarningsWait.jaxx | 9 +-
.../java/org/chorem/lima/ui/home/AccountsPane.java | 43 +-
.../org/chorem/lima/ui/home/EntryBooksPane.java | 88 +-
.../lima/ui/home/FinancialTransactionsPane.java | 94 +-
...FiscalYearsPane.java => FiscalPeriodsPane.java} | 80 +-
.../main/java/org/chorem/lima/ui/home/HomeView.css | 70 -
.../java/org/chorem/lima/ui/home/HomeView.jaxx | 65 +-
.../org/chorem/lima/ui/identity/IdentityForm.css | 121 --
.../org/chorem/lima/ui/identity/IdentityForm.jaxx | 107 +-
.../chorem/lima/ui/identity/IdentityHandler.java | 38 +-
.../chorem/lima/ui/importexport/ImportExport.java | 666 ++-----
.../lima/ui/importexport/ImportExportWaitView.jaxx | 4 +-
.../LedgerTable.java} | 76 +-
.../chorem/lima/ui/ledger/LedgerTableModel.java | 250 +++
.../LedgerView.jaxx} | 33 +-
.../chorem/lima/ui/ledger/LedgerViewHandler.java | 135 ++
.../package-info.java | 4 +-
.../lima/ui/lettering/LetteringTableModel.java | 4 +-
.../chorem/lima/ui/lettering/LetteringView.jaxx | 27 +-
.../lima/ui/lettering/LetteringViewHandler.java | 150 +-
.../org/chorem/lima/ui/lettering/TypeEntry.java | 6 +-
.../chorem/lima/ui/opening/CreateAccountsPanel.css | 34 -
.../lima/ui/opening/CreateAccountsPanel.jaxx | 23 +-
.../lima/ui/opening/CreateEntryBookPanel.css | 8 -
.../lima/ui/opening/CreateEntryBookPanel.jaxx | 5 +-
.../lima/ui/opening/CreateFiscalPeriodPanel.css | 11 -
.../lima/ui/opening/CreateFiscalPeriodPanel.jaxx | 23 +-
.../chorem/lima/ui/opening/CreateIdentityPanel.css | 108 --
.../lima/ui/opening/CreateIdentityPanel.jaxx | 98 +-
.../ui/opening/CreateIdentityPanelHandler.java | 78 -
.../org/chorem/lima/ui/opening/OpeningView.css | 36 -
.../org/chorem/lima/ui/opening/OpeningView.jaxx | 21 +-
.../chorem/lima/ui/opening/OpeningViewHandler.java | 25 +-
.../chorem/lima/ui/vatchart/VatChartImportForm.css | 45 -
.../lima/ui/vatchart/VatChartImportForm.jaxx | 32 +-
.../lima/ui/vatchart/VatChartMovementForm.css | 44 -
.../lima/ui/vatchart/VatChartMovementForm.jaxx | 28 +-
.../chorem/lima/ui/vatchart/VatChartTreeTable.java | 8 +-
.../lima/ui/vatchart/VatChartTreeTableModel.java | 100 +-
.../org/chorem/lima/ui/vatchart/VatChartView.css | 29 -
.../org/chorem/lima/ui/vatchart/VatChartView.jaxx | 62 +-
.../lima/ui/vatchart/VatChartViewHandler.java | 79 +-
.../chorem/lima/ui/vatreports/VatReportTable.java | 59 +
.../lima/ui/vatreports/VatReportTableModel.java | 223 +++
.../chorem/lima/ui/vatreports/VatReportView.jaxx | 59 +
.../lima/ui/vatreports/VatReportViewHandler.java | 102 ++
.../java/org/chorem/lima/util/ErrorHelper.java | 24 +-
.../org/chorem/lima/util/ReportDialogView.jaxx | 2 +-
.../resources/i18n/lima-swing_en_GB.properties | 695 +++-----
.../resources/i18n/lima-swing_fr_FR.properties | 668 +++----
...ion-accounts.png => action-charts-accounts.png} | Bin
...entryBooks.png => action-charts-entrybooks.png} | Bin
...riods.png => action-charts-financialperiod.png} | Bin
...s.png => action-charts-financialstatements.png} | Bin
...lPeriods.png => action-charts-fiscalperiod.png} | Bin
...tements.png => action-charts-vatstatements.png} | Bin
...ion-entries.png => action-entries-balanced.png} | Bin
...action-export.png => action-export-element.png} | Bin
...ng => action-financialstatement-add-header.png} | Bin
... => action-financialstatement-add-movement.png} | Bin
...eck.png => action-financialstatement-check.png} | Bin
...edit.png => action-financialstatement-edit.png} | Bin
...rt.png => action-financialstatement-import.png} | Bin
...ve.png => action-financialstatement-remove.png} | Bin
.../src/main/resources/icons/action-fullscreen.png | Bin 0 -> 687 bytes
...action-import.png => action-import-element.png} | Bin
.../icons}/action-leave-fullscreen.png | Bin
...ement-edit.png => action-vatstatement-edit.png} | Bin
...t-import.png => action-vatstatement-import.png} | Bin
...atement-new.png => action-vatstatement-new.png} | Bin
...t-remove.png => action-vatstatement-remove.png} | Bin
lima-swing/src/main/resources/icons/entryBooks.png | Bin 2717 -> 0 bytes
.../src/main/resources/icons}/entrybooks.png | Bin
.../src/main/resources/icons/fiscalYears.png | Bin 2257 -> 0 bytes
.../src/main/resources/icons}/fiscalperiods.png | Bin
lima-swing/src/main/resources/import/bcr_base.csv | 325 ++--
.../src/main/resources/import/bcr_developed.csv | 325 ++--
.../src/main/resources/import/bcr_shortened.csv | 137 +-
.../src/main/resources/import/eb_default.csv | 11 +-
lima-swing/src/main/resources/import/pcg_base.csv | 923 +++++-----
.../src/main/resources/import/pcg_developed.csv | 1178 +++++++++++--
.../src/main/resources/import/pcg_shortened.csv | 501 +++---
lima-swing/src/main/resources/import/vat_base.csv | 127 +-
.../src/main/resources/import/vat_default.csv | 127 +-
.../src/main/resources/import/vat_developed.csv | 127 +-
.../src/main/resources/import/vat_shortened.csv | 127 +-
lima-swing/src/main/resources/log4j.properties | 2 +-
.../lima/ui/account/AccountViewHandlerTest.java | 3 +-
pom.xml | 140 +-
449 files changed, 18333 insertions(+), 17034 deletions(-)
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/LimaTechnicalException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/ExportResult.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/ImportExportResults.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/ImportResult.java
copy lima-business-api/src/main/java/org/chorem/lima/business/{exceptions => }/LimaException.java (71%)
copy lima-business-api/src/main/java/org/chorem/lima/business/api/{IdentityService.java => ExportServiceLocal.java} (75%)
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/AccountException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/AfterLastFiscalPeriodException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/AlreadyExistAccountException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/AlreadyExistEntryBookException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/AlreadyExistFinancialStatement.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/AlreadyExistVatStatementException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/AlreadyLockedFiscalPeriodException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/BeforeFirstFiscalPeriodException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/BeginAfterEndFiscalPeriodException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/ClosedPeriodicEntryBookException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/ClosedPeriodicEntryBooksException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/DateException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/EntriesException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/EntryBookException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/FinancialPeriodException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/FinancialTransactionsException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/FiscalPeriodException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/ImportBackupException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/ImportEbpException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/ImportFileException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/InvalidAccountNumberException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/LastUnlockedFiscalPeriodException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/LockedEntryBookException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/LockedFinancialPeriodException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/MoreOneUnlockFiscalPeriodException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/NoDataToImportException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/NoEmptyFiscalPeriodException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/NoFiscalPeriodFoundException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/NoFoundFinancialPeriodException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/NotAllowedLabelException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/NotBeginNextDayOfLastFiscalPeriodException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/NotLockedClosedPeriodicEntryBooksException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/NotNumberAccountNumberException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/UnbalancedEntriesException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/UnbalancedFinancialTransactionsException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/UnfilledEntriesException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/UsedAccountException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/UsedEntryBookException.java
delete mode 100644 lima-business-api/src/main/java/org/chorem/lima/business/exceptions/WithoutEntryBookFinancialTransactionsException.java
rename lima-business-api/src/main/java/org/chorem/lima/business/exceptions/LimaException.java => lima-business/src/main/java/org/chorem/lima/business/LimaBusinessException.java (60%)
create mode 100644 lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java
delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/LimaConfigurationHelper.java
create mode 100644 lima-business/src/main/java/org/chorem/lima/business/LimaDaoHelper.java
delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java
delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java
delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AccountModel.java
delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryBookModel.java
delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java
delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialStatementModel.java
delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialTransactionModel.java
delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalPeriodModel.java
delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/csv/IdentityModel.java
delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/csv/VatStatementModel.java
delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/ebp/AccountEBPModel.java
delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/ebp/EntryBookEBPModel.java
delete mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/ebp/EntryEBPModel.java
create mode 100644 lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java
create mode 100644 lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java
create mode 100644 lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java
copy lima-business/src/main/java/org/chorem/lima/business/utils/{FiscalPeriodComparator.java => AccountEBPComparator.java} (76%)
delete mode 100644 lima-business/src/test/java/org/chorem/lima/business/AccountDaoTest.java
delete mode 100644 lima-business/src/test/java/org/chorem/lima/business/ImportExportServiceTest.java
create mode 100644 lima-business/src/test/java/org/chorem/lima/business/ImportServiceImplTest.java
delete mode 100644 lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java
copy lima-swing/src/main/java/org/chorem/lima/ui/common/FiscalPeriodComboBoxModel.java => lima-business/src/test/java/org/chorem/lima/business/ejb/ClearService.java (69%)
copy lima-business/src/{main/java/org/chorem/lima/business/ejb/EntryServiceImpl.java => test/java/org/chorem/lima/business/ejb/ClearServiceImpl.java} (54%)
copy lima-business/src/test/java/org/chorem/lima/entity/{FinancialTransactionDAOTest.java => AccountDAOTest.java} (53%)
delete mode 100644 lima-business/src/test/resources/import/bcr_developed.csv
delete mode 100644 lima-business/src/test/resources/import/vat_shortened.csv
rename lima-callao/src/main/java/org/chorem/lima/{clause => Clause}/AndClause.java (97%)
rename lima-callao/src/main/java/org/chorem/lima/{clause => Clause}/BooleanClause.java (97%)
rename lima-callao/src/main/java/org/chorem/lima/{clause => Clause}/Clause.java (96%)
rename lima-callao/src/main/java/org/chorem/lima/{clause => Clause}/DateClause.java (98%)
rename lima-callao/src/main/java/org/chorem/lima/{clause => Clause}/NotClause.java (97%)
rename lima-callao/src/main/java/org/chorem/lima/{clause => Clause}/NumberClause.java (98%)
rename lima-callao/src/main/java/org/chorem/lima/{clause => Clause}/OrClause.java (96%)
rename lima-callao/src/main/java/org/chorem/lima/{clause => Clause}/SetClause.java (98%)
rename lima-callao/src/main/java/org/chorem/lima/{clause => Clause}/StringClause.java (98%)
rename lima-callao/src/main/java/org/chorem/lima/{clause => Clause}/SubFilterClause.java (96%)
rename lima-callao/src/main/java/org/chorem/lima/{clause => Clause}/VisitorClause.java (97%)
delete mode 100644 lima-callao/src/main/java/org/chorem/lima/DefaultServiceContext.java
rename lima-callao/src/main/java/org/chorem/lima/{filter => Filter}/AbstractFilter.java (93%)
rename lima-callao/src/main/java/org/chorem/lima/{filter => Filter}/AccountFilter.java (95%)
rename lima-callao/src/main/java/org/chorem/lima/{filter => Filter}/EntryBookFilter.java (94%)
rename lima-callao/src/main/java/org/chorem/lima/{filter => Filter}/EntryFilter.java (90%)
rename lima-callao/src/main/java/org/chorem/lima/{filter => Filter}/Filter.java (93%)
rename lima-callao/src/main/java/org/chorem/lima/{filter => Filter}/FilterGenerator.java (97%)
rename lima-callao/src/main/java/org/chorem/lima/{filter => Filter}/FinancialTransactionFilter.java (91%)
rename lima-callao/src/main/java/org/chorem/lima/{filter => Filter}/VisitorFilter.java (97%)
delete mode 100644 lima-callao/src/main/java/org/chorem/lima/ServiceContext.java
create mode 100644 lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java
delete mode 100644 lima-callao/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java
create mode 100644 lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java
delete mode 100644 lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java
create mode 100644 lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java
delete mode 100644 lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java
rename lima-callao/src/main/java/org/chorem/lima/entity/{FinancialPeriodTopiaDao.java => FinancialPeriodDAOImpl.java} (54%)
rename lima-callao/src/main/java/org/chorem/lima/entity/{FinancialStatementTopiaDao.java => FinancialStatementDAOImpl.java} (55%)
create mode 100644 lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java
delete mode 100644 lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java
create mode 100644 lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java
delete mode 100644 lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java
delete mode 100644 lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaApplicationContext.java
delete mode 100644 lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java
rename lima-callao/src/main/java/org/chorem/lima/entity/{VatStatementTopiaDao.java => VatStatementDAOImpl.java} (51%)
delete mode 100644 lima-callao/src/main/xmi/accounting-model.zargo
rename lima-callao/src/main/xmi/{accounting-model.properties => accounting.properties} (92%)
create mode 100644 lima-callao/src/main/xmi/accounting.zargo
copy LICENSE.txt => lima-neogia/LICENSE.txt (100%)
copy {lima-business => lima-neogia}/README.txt (100%)
create mode 100644 lima-neogia/changelog.txt
create mode 100644 lima-neogia/pom.xml
create mode 100644 lima-neogia/src/main/filters/filter.properties
create mode 100644 lima-neogia/src/main/java/org/chorem/lima/service/neogia/NeogiaAccountService.java
create mode 100644 lima-neogia/src/main/java/org/chorem/lima/service/neogia/NeogiaCompanyService.java
create mode 100644 lima-neogia/src/main/java/org/chorem/lima/service/neogia/NeogiaEntryService.java
create mode 100644 lima-neogia/src/main/java/org/chorem/lima/service/neogia/NeogiaFileService.java
create mode 100644 lima-neogia/src/main/java/org/chorem/lima/service/neogia/NeogiaJournalService.java
create mode 100644 lima-neogia/src/main/java/org/chorem/lima/service/neogia/NeogiaPeriodService.java
create mode 100644 lima-neogia/src/main/java/org/chorem/lima/service/neogia/NeogiaServiceFactory.java
create mode 100644 lima-neogia/src/main/java/org/chorem/lima/service/neogia/NeogiaStatusService.java
create mode 100644 lima-neogia/src/main/java/org/chorem/lima/service/neogia/NeogiaTransactionService.java
create mode 100644 lima-neogia/src/main/java/org/chorem/lima/service/neogia/NeogiaUserService.java
create mode 100644 lima-neogia/src/main/java/org/chorem/lima/service/neogia/parser/NGLAccountToAccountDTO.java
create mode 100644 lima-neogia/src/main/java/org/chorem/lima/service/neogia/util/NeogiaUtil.java
create mode 100644 lima-neogia/src/main/resources/wsdl/addAccount.wsdl
create mode 100644 lima-neogia/src/main/resources/wsdl/addEntry.wsdl
create mode 100644 lima-neogia/src/main/resources/wsdl/addJournal.wsdl
create mode 100644 lima-neogia/src/main/resources/wsdl/addTransaction.wsdl
create mode 100644 lima-neogia/src/main/resources/wsdl/getAllAccount.wsdl
create mode 100644 lima-neogia/src/main/resources/wsdl/getAllJournal.wsdl
create mode 100644 lima-neogia/src/main/resources/wsdl/getAllPeriod.wsdl
create mode 100644 lima-neogia/src/main/resources/wsdl/getAllStatus.wsdl
create mode 100644 lima-neogia/src/main/resources/wsdl/getAllTransaction.wsdl
create mode 100644 lima-neogia/src/main/resources/wsdl/getEntryByTransaction.wsdl
create mode 100644 lima-neogia/src/main/resources/wsdl/removeAccount.wsdl
create mode 100644 lima-neogia/src/main/resources/wsdl/removeEntry.wsdl
create mode 100644 lima-neogia/src/main/resources/wsdl/removeJournal.wsdl
create mode 100644 lima-neogia/src/main/resources/wsdl/removeTransaction.wsdl
create mode 100644 lima-neogia/src/main/resources/wsdl/updateAccount.wsdl
create mode 100644 lima-neogia/src/main/resources/wsdl/updateEntry.wsdl
create mode 100644 lima-neogia/src/main/resources/wsdl/updateJournal.wsdl
create mode 100644 lima-neogia/src/main/resources/wsdl/updateTransaction.wsdl
delete mode 100644 lima-swing/src/main/assembly/lima.bat
create mode 100755 lima-swing/src/main/assembly/lima.exe
rename lima-swing/src/main/java/org/chorem/lima/{LimaSwingConfig.java => LimaConfig.java} (90%)
rename lima-swing/src/main/java/org/chorem/lima/{LimaSwingApplicationContext.java => LimaContext.java} (82%)
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/MainView.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.css
create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountComboBox.java
create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx
create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java
copy lima-swing/src/main/java/org/chorem/lima/ui/{financialstatementchart => accountsreports}/package-info.java (90%)
copy lima-swing/src/main/java/org/chorem/lima/ui/{opening/CreateAccountsPanel.jaxx => balance/BalanceReportsView.jaxx} (54%)
mode change 100755 => 100644
create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceReportsViewHandler.java
copy lima-swing/src/main/java/org/chorem/lima/ui/{financialstatementchart/FinancialStatementChartTreeTable.java => balance/BalanceTable.java} (78%)
create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java
copy lima-swing/src/main/java/org/chorem/lima/ui/{financialstatementchart => balance}/package-info.java (90%)
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AutoCompleteTableCellEditor.java
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.css
create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBookComboBox.java
copy lima-swing/src/main/java/org/chorem/lima/ui/{vatchart/VatChartTreeTable.java => entrybooksreports/EntryBooksReportsTable.java} (53%)
create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java
create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx
create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java
copy lima-swing/src/main/java/org/chorem/lima/ui/{financialstatementchart => entrybooksreports}/package-info.java (90%)
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.css
create mode 100755 lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTable.java
create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableCellRenderer.java
create mode 100755 lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java
copy lima-swing/src/main/java/org/chorem/lima/ui/{ClosableTabHeader.jaxx => financialstatementreport/FinancialStatementReportView.jaxx} (62%)
mode change 100644 => 100755
create mode 100755 lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java
copy lima-swing/src/main/java/org/chorem/lima/ui/{financialstatementchart => financialstatementreport}/package-info.java (89%)
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.css
rename lima-swing/src/main/java/org/chorem/lima/ui/home/{FiscalYearsPane.java => FiscalPeriodsPane.java} (58%)
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css
copy lima-swing/src/main/java/org/chorem/lima/ui/{vatchart/VatChartTreeTable.java => ledger/LedgerTable.java} (56%)
create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTableModel.java
copy lima-swing/src/main/java/org/chorem/lima/ui/{ClosableTabHeader.jaxx => ledger/LedgerView.jaxx} (60%)
create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java
copy lima-swing/src/main/java/org/chorem/lima/ui/{financialstatementchart => ledger}/package-info.java (90%)
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanelHandler.java
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningView.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.css
delete mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.css
create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTable.java
create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTableModel.java
create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportView.jaxx
create mode 100644 lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java
rename lima-swing/src/main/resources/icons/{action-accounts.png => action-charts-accounts.png} (100%)
rename lima-swing/src/main/resources/icons/{action-entryBooks.png => action-charts-entrybooks.png} (100%)
rename lima-swing/src/main/resources/icons/{action-financialPeriods.png => action-charts-financialperiod.png} (100%)
rename lima-swing/src/main/resources/icons/{action-financialStatements.png => action-charts-financialstatements.png} (100%)
rename lima-swing/src/main/resources/icons/{action-fiscalPeriods.png => action-charts-fiscalperiod.png} (100%)
rename lima-swing/src/main/resources/icons/{action-vatStatements.png => action-charts-vatstatements.png} (100%)
rename lima-swing/src/main/resources/icons/{action-entries.png => action-entries-balanced.png} (100%)
rename lima-swing/src/main/resources/icons/{action-export.png => action-export-element.png} (100%)
rename lima-swing/src/main/resources/icons/{action-financialStatement-add-header.png => action-financialstatement-add-header.png} (100%)
rename lima-swing/src/main/resources/icons/{action-financialStatement-add-movement.png => action-financialstatement-add-movement.png} (100%)
rename lima-swing/src/main/resources/icons/{action-financialStatement-check.png => action-financialstatement-check.png} (100%)
rename lima-swing/src/main/resources/icons/{action-financialStatement-edit.png => action-financialstatement-edit.png} (100%)
rename lima-swing/src/main/resources/icons/{action-financialStatement-import.png => action-financialstatement-import.png} (100%)
rename lima-swing/src/main/resources/icons/{action-financialStatement-remove.png => action-financialstatement-remove.png} (100%)
create mode 100644 lima-swing/src/main/resources/icons/action-fullscreen.png
rename lima-swing/src/main/resources/icons/{action-import.png => action-import-element.png} (100%)
copy lima-swing/src/main/{filters => resources/icons}/action-leave-fullscreen.png (100%)
rename lima-swing/src/main/resources/icons/{action-vatStatement-edit.png => action-vatstatement-edit.png} (100%)
rename lima-swing/src/main/resources/icons/{action-vatStatement-import.png => action-vatstatement-import.png} (100%)
rename lima-swing/src/main/resources/icons/{action-vatStatement-new.png => action-vatstatement-new.png} (100%)
rename lima-swing/src/main/resources/icons/{action-vatStatement-remove.png => action-vatstatement-remove.png} (100%)
delete mode 100644 lima-swing/src/main/resources/icons/entryBooks.png
copy {lima-business/src/main/resources/images => lima-swing/src/main/resources/icons}/entrybooks.png (100%)
delete mode 100644 lima-swing/src/main/resources/icons/fiscalYears.png
copy {lima-business/src/main/resources/images => lima-swing/src/main/resources/icons}/fiscalperiods.png (100%)
--
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm(a)chorem.org>.
1
0
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
at c332bcb refs #1115 on s'assure que LimaServiceConfig ne peut-être qu'un singleton, le constructeur n'est plus public
No new revisions were added by this update.
--
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm(a)chorem.org>.
1
0
r3929 - in trunk: lima-business/src/main/java/org/chorem/lima/business lima-business/src/test/java/org/chorem/lima/business lima-swing/src/main/java/org/chorem/lima
by dcosse＠users.chorem.org 29 Sep '14
by dcosse＠users.chorem.org 29 Sep '14
29 Sep '14
Author: dcosse
Date: 2014-09-29 18:26:31 +0200 (Mon, 29 Sep 2014)
New Revision: 3929
Url: http://forge.chorem.org/projects/lima/repository/revisions/3929
Log:
refs #1115 on s'assure que LimaServiceConfig ne peut-?\195?\170tre qu'un singleton, le constructeur n'est plus public
Modified:
trunk/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java
trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java
trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java
trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java
Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java 2014-09-29 13:16:00 UTC (rev 3928)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java 2014-09-29 16:26:31 UTC (rev 3929)
@@ -65,13 +65,13 @@
protected static final String LIMA_DEFAULT_CONF_FILENAME = "lima.properties";
- protected static ApplicationConfig config;
+ protected ApplicationConfig config;
+ protected Properties rootContextProperties;
+
protected static volatile LimaServiceConfig instance;
- protected static Properties rootContextProperties;
-
- public LimaServiceConfig(String configFileName) {
+ private LimaServiceConfig(String configFileName) {
try {
ApplicationConfig defaultConfig = new ApplicationConfig(LIMA_DEFAULT_CONF_FILENAME);
defaultConfig.loadDefaultOptions(ServiceConfigOption.values());
@@ -94,8 +94,8 @@
}
}
- public static Properties getRootContextProperties() {
- if (rootContextProperties == null) {
+ protected static Properties getRootContextProperties() {
+ if (getInstance().rootContextProperties == null) {
Properties result = instance.getFlatOptions();
// add persistence classes from generated code
result.setProperty(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, LimaCallaoEntityEnum.getImplementationClassesAsString());
@@ -110,11 +110,18 @@
result.setProperty(entry.getKey(), entry.getValue());
}
}
- rootContextProperties = result;
+ getInstance().setRootContextProperties(result);
+
+
}
- return rootContextProperties;
+ Properties result = getInstance().rootContextProperties;
+ return result;
}
+ protected void setRootContextProperties(Properties rootContextProperties) {
+ this.rootContextProperties = rootContextProperties;
+ }
+
public static LimaServiceConfig getInstance(String configFileName) {
if (instance == null) {
instance= new LimaServiceConfig(configFileName);
@@ -129,6 +136,10 @@
return instance;
}
+ protected void setConfig(ApplicationConfig config) {
+ this.config = config;
+ }
+
public ApplicationConfig getConfig() {
return config;
}
@@ -150,7 +161,7 @@
}
protected static void loadAccountingRules() {
- Class<?> accountingRulesClass = config.getOptionAsClass(ServiceConfigOption.RULES_NATIONALTY.key);
+ Class<?> accountingRulesClass = getInstance().config.getOptionAsClass(ServiceConfigOption.RULES_NATIONALTY.key);
if (accountingRulesClass == null) {
if (log.isErrorEnabled()) {
log.error("No accounting rules defined for:" + ServiceConfigOption.RULES_NATIONALTY.key);
@@ -177,7 +188,7 @@
}
public void setAccountingRule(String accountingRule) {
- LimaServiceConfig.config.setOption(ServiceConfigOption.RULES_NATIONALTY.key, accountingRule);
+ LimaServiceConfig.getInstance().config.setOption(ServiceConfigOption.RULES_NATIONALTY.key, accountingRule);
// clear cache
loadAccountingRules();
}
Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java
===================================================================
--- trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 2014-09-29 13:16:00 UTC (rev 3928)
+++ trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 2014-09-29 16:26:31 UTC (rev 3929)
@@ -114,8 +114,8 @@
public void initAbstractTest() throws Exception {
setUpLocale();
Properties options = getTestConfiguration();
- LimaServiceConfig limaTestConfig = new LimaTestsConfig(LIMA_TEST_DEFAULT_CONF_FILENAME, options);
- initServices(limaTestConfig);
+ new LimaTestsConfig(LIMA_TEST_DEFAULT_CONF_FILENAME, options);
+ initServices();
context = createNewTestApplicationContext();
}
@@ -127,9 +127,9 @@
* Init services after i18n#init().
* @throws java.io.IOException
*/
- protected void initServices(LimaServiceConfig config) throws IOException {
+ protected void initServices() throws IOException {
if(accountService == null) {
- LimaServiceFactory.initFactory(config.getConfig());
+ LimaServiceFactory.initFactory(LimaServiceConfig.getInstance().getConfig());
accountService = LimaServiceFactory.getService(AccountService.class);
entryBookService = LimaServiceFactory.getService(EntryBookService.class);
financialPeriodService = LimaServiceFactory.getService(FinancialPeriodService.class);
Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java
===================================================================
--- trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java 2014-09-29 13:16:00 UTC (rev 3928)
+++ trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java 2014-09-29 16:26:31 UTC (rev 3929)
@@ -35,21 +35,21 @@
/**
* Created by davidcosse on 11/06/14.
*/
-public class LimaTestsConfig extends LimaServiceConfig {
+public class LimaTestsConfig {
public LimaTestsConfig(String configFileName, Properties limaTestConfig) {
- super(configFileName);
- Properties standardLimaConfig = config.getFlatOptions();
+ LimaServiceConfig instance = LimaServiceConfig.getInstance(configFileName);
+ Properties standardLimaConfig = instance.getConfig().getFlatOptions();
for (Map.Entry<Object, Object> entry : limaTestConfig.entrySet()) {
standardLimaConfig.setProperty((String)entry.getKey(),(String)entry.getValue());
}
- config = new ApplicationConfig(standardLimaConfig);
- instance = this;
+ ApplicationConfig testConfig = new ApplicationConfig(standardLimaConfig);
+ instance.setConfig(testConfig);
setRootContextProperties(instance);
}
- public void setRootContextProperties(LimaServiceConfig instance) {
+ protected void setRootContextProperties(LimaServiceConfig instance) {
Properties result = instance.getFlatOptions();
// add persistence classes from generated code
result.setProperty(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, LimaCallaoEntityEnum.getImplementationClassesAsString());
@@ -64,8 +64,7 @@
result.setProperty(entry.getKey(), entry.getValue());
}
}
- rootContextProperties = result;
-
+ instance.setRootContextProperties(result);
}
}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2014-09-29 13:16:00 UTC (rev 3928)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2014-09-29 16:26:31 UTC (rev 3929)
@@ -53,10 +53,10 @@
private static final Log log = LogFactory.getLog(LimaMain.class);
/** Lima configuration. */
- public static LimaSwingConfig config;
+ protected static LimaSwingConfig config;
/** splash */
- private static LimaSplash splash;
+ protected static LimaSplash splash;
/**
* Lima main method.
1
0
r3928 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by dcosse＠users.chorem.org 29 Sep '14
by dcosse＠users.chorem.org 29 Sep '14
29 Sep '14
Author: dcosse
Date: 2014-09-29 15:16:00 +0200 (Mon, 29 Sep 2014)
New Revision: 3928
Url: http://forge.chorem.org/projects/lima/repository/revisions/3928
Log:
refs #1032 refactoring sur service d'import export
Modified:
trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java
Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2014-09-29 12:36:53 UTC (rev 3927)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2014-09-29 13:16:00 UTC (rev 3928)
@@ -328,29 +328,32 @@
return results;
}
- protected FinancialStatement returnFinancialStatement (FinancialStatement rootFinancialStatement, String subFinancialStatementLabel) throws AlreadyExistFinancialStatement, NotAllowedLabelException {
- Collection<FinancialStatement> subFinancialStatements = rootFinancialStatement.getSubFinancialStatements();
+ protected FinancialStatement returnFinancialStatement (final FinancialStatement rootFinancialStatement, String subFinancialStatementLabel) throws AlreadyExistFinancialStatement, NotAllowedLabelException {
FinancialStatement targetedFinancialStatement = null;
+ if (rootFinancialStatement != null) {
+ Collection<FinancialStatement> subFinancialStatements = rootFinancialStatement.getSubFinancialStatements();
- // look for financial statement from tree range
- if (subFinancialStatements != null) {
- for (FinancialStatement subFinancialStatement : subFinancialStatements) {
- if(subFinancialStatement.getLabel().equals(subFinancialStatementLabel)){
- targetedFinancialStatement = subFinancialStatement;
- break;
+ // look for financial statement from tree range
+ if (subFinancialStatements != null) {
+ for (FinancialStatement subFinancialStatement : subFinancialStatements) {
+ if(subFinancialStatement.getLabel().equals(subFinancialStatementLabel)){
+ targetedFinancialStatement = subFinancialStatement;
+ break;
+ }
}
}
+
+ // the target financialStatement has not been created yet so we create it now.
+ if (targetedFinancialStatement == null) {
+ // not found, we need to create it
+ targetedFinancialStatement = financialStatementService.newFinancialStatement();
+ targetedFinancialStatement.setLabel(subFinancialStatementLabel);
+ // create targetedFinancialStatement and rootFinancialStatement if needed
+ targetedFinancialStatement = financialStatementService.createFinancialStatement(rootFinancialStatement, targetedFinancialStatement);
+ targetedFinancialStatement.getMasterFinancialStatement();
+ }
}
- // the target financialStatement has not been created yet so we create it now.
- if (targetedFinancialStatement == null) {
- // not found, we need to create it
- targetedFinancialStatement = financialStatementService.newFinancialStatement();
- targetedFinancialStatement.setLabel(subFinancialStatementLabel);
- // create targetedFinancialStatement and rootFinancialStatement if needed
- targetedFinancialStatement = financialStatementService.createFinancialStatement(rootFinancialStatement, targetedFinancialStatement);
- targetedFinancialStatement.getMasterFinancialStatement();
- }
return targetedFinancialStatement;
}
@@ -407,7 +410,7 @@
return results;
}
- protected void processFinancialStatementImport(ImportResult result, Map<String, FinancialStatement> orderedFinancialStatements, FinancialStatementImport financialStatementBean) {
+ protected void processFinancialStatementImport(ImportResult result, Map<String, FinancialStatement> orderedFinancialStatements, final FinancialStatementImport financialStatementBean) {
Binder<FinancialStatementImport, FinancialStatement> binder = BinderFactory.newBinder(FinancialStatementImport.class, FinancialStatement.class);
FinancialStatement financialStatement = financialStatementService.newFinancialStatement();
binder.copyExcluding(financialStatementBean, financialStatement, FinancialStatement.PROPERTY_MASTER_FINANCIAL_STATEMENT);
@@ -437,8 +440,7 @@
// in case it exist (not ordered import and previously created) values are bind to the previously created one excepted
// the sub financial statements
- boolean alreadyCreated = false;
- alreadyCreated = propagetChangesToExistingFinancialStatement(financialStatement, branchesFinancialStatement, alreadyCreated);
+ boolean alreadyCreated = propagetChangesToExistingFinancialStatement(financialStatement, branchesFinancialStatement, false);
// if necessary financial statement is created
if (!alreadyCreated) {
@@ -452,7 +454,7 @@
}
}
- private FinancialStatement getRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, FinancialStatementImport financialStatementBean, FinancialStatement financialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException {
+ private FinancialStatement getRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, final FinancialStatementImport financialStatementBean, final FinancialStatement financialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException {
FinancialStatement rootFinancialStatement = orderedFinancialStatements.get(financialStatementBean.getLabel());
if (rootFinancialStatement == null) {
@@ -467,18 +469,22 @@
return rootFinancialStatement;
}
- private FinancialStatement getBrancheFinancialStatement(String[] masterNames, FinancialStatement branchesFinancialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException {
- for (int i = 1; i < masterNames.length; i++) {// 0 is root
- String masterName = masterNames[i];
- branchesFinancialStatement = returnFinancialStatement(branchesFinancialStatement, masterName);
+ private FinancialStatement getBrancheFinancialStatement(String[] masterNames, final FinancialStatement branchesFinancialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException {
+ FinancialStatement _branchesFinancialStatement = branchesFinancialStatement;
+ if (_branchesFinancialStatement != null) {
+ // 0 is root, start from 1
+ for (int i = 1; i < masterNames.length; i++) {
+ String masterName = masterNames[i];
+ _branchesFinancialStatement = returnFinancialStatement(_branchesFinancialStatement, masterName);
+ }
}
- return branchesFinancialStatement;
+ return _branchesFinancialStatement;
}
- protected void createRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, FinancialStatement financialStatement, FinancialStatement branchesFinancialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException {
+ protected void createRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, final FinancialStatement financialStatement, final FinancialStatement branchesFinancialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException {
// if the master finacial statement has been modified then the current one is replace by the new one.
- financialStatement = financialStatementService.createFinancialStatement(branchesFinancialStatement, financialStatement);
- FinancialStatement targetedRootFinancialStatement = returnRootFinancialStatement(financialStatement);
+ FinancialStatement _financialStatement = financialStatementService.createFinancialStatement(branchesFinancialStatement, financialStatement);
+ FinancialStatement targetedRootFinancialStatement = returnRootFinancialStatement(_financialStatement);
// replace modified root financial statement with new one
if (orderedFinancialStatements.get(targetedRootFinancialStatement.getLabel()) != null) {
@@ -486,7 +492,7 @@
}
}
- protected boolean propagetChangesToExistingFinancialStatement(FinancialStatement financialStatement, FinancialStatement branchesFinancialStatement, boolean alreadyCreated) {
+ protected boolean propagetChangesToExistingFinancialStatement(final FinancialStatement financialStatement, final FinancialStatement branchesFinancialStatement, boolean alreadyCreated) {
if (branchesFinancialStatement != null && branchesFinancialStatement.getSubFinancialStatements() != null) {
for (FinancialStatement bfs : branchesFinancialStatement.getSubFinancialStatements()) {
if (bfs.getLabel().equals(financialStatement.getLabel())){
@@ -500,51 +506,59 @@
return alreadyCreated;
}
- protected FinancialStatement createRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, String rootMasterName, FinancialStatement rootFinancialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException {
- if (rootFinancialStatement == null) {
- rootFinancialStatement = financialStatementService.newFinancialStatement();
- rootFinancialStatement.setLabel(rootMasterName);
- rootFinancialStatement = financialStatementService.createFinancialStatement(null, rootFinancialStatement);
- orderedFinancialStatements.put(rootMasterName, rootFinancialStatement);
+ protected FinancialStatement createRootFinancialStatement(Map<String, FinancialStatement> orderedFinancialStatements, String rootMasterName, final FinancialStatement rootFinancialStatement) throws AlreadyExistFinancialStatement, NotAllowedLabelException {
+ FinancialStatement _rootFinancialStatement = rootFinancialStatement;
+ if (_rootFinancialStatement == null) {
+ _rootFinancialStatement = financialStatementService.newFinancialStatement();
+ _rootFinancialStatement.setLabel(rootMasterName);
+ _rootFinancialStatement = financialStatementService.createFinancialStatement(null, _rootFinancialStatement);
+ orderedFinancialStatements.put(rootMasterName, _rootFinancialStatement);
}
- return rootFinancialStatement;
+ return _rootFinancialStatement;
}
- protected VatStatement returnVATStatement (VatStatement rootVATStatement, String subVATStatementLabel) throws AlreadyExistVatStatementException, NotAllowedLabelException {
- Collection<VatStatement> subVatStatements = rootVATStatement.getSubVatStatements();
+ protected VatStatement returnVATStatement (final VatStatement rootVATStatement, String subVATStatementLabel) throws AlreadyExistVatStatementException, NotAllowedLabelException {
VatStatement targetedVATStatement = null;
+ if (rootVATStatement != null) {
+ Collection<VatStatement> subVatStatements = rootVATStatement.getSubVatStatements();
- // look for vatStatement from tree range
- if (subVatStatements != null) {
- for (VatStatement subVatStatement : subVatStatements) {
- if(subVatStatement.getLabel().equals(subVATStatementLabel)){
- targetedVATStatement = subVatStatement;
- break;
+ // look for vatStatement from tree range
+ if (subVatStatements != null) {
+ for (VatStatement subVatStatement : subVatStatements) {
+ if(subVatStatement.getLabel().equals(subVATStatementLabel)){
+ targetedVATStatement = subVatStatement;
+ break;
+ }
}
}
+
+ if (targetedVATStatement == null) {
+ // not found, we need to create it
+ targetedVATStatement = vatStatementService.newVatStatement();
+ targetedVATStatement.setLabel(subVATStatementLabel);
+ // create targetedVATStatement and rootVATStatement if needed
+ targetedVATStatement = vatStatementService.createVatStatement(rootVATStatement, targetedVATStatement);
+ targetedVATStatement.getMasterVatStatement();
+ }
}
- //
- if (targetedVATStatement == null) {
- // not found, we need to create it
- targetedVATStatement = vatStatementService.newVatStatement();
- targetedVATStatement.setLabel(subVATStatementLabel);
- // create targetedVATStatement and rootVATStatement if needed
- targetedVATStatement = vatStatementService.createVatStatement(rootVATStatement, targetedVATStatement);
- targetedVATStatement.getMasterVatStatement();
- }
return targetedVATStatement;
}
- protected VatStatement returnRootVATStatement(VatStatement vatStatement) {
+ protected VatStatement returnRootVATStatement(final VatStatement vatStatement) {
VatStatement rootVatStatement = null;
- while (rootVatStatement == null) {
- if (vatStatement.getMasterVatStatement() == null){
- rootVatStatement = vatStatement;
- } else {
- vatStatement = vatStatement.getMasterVatStatement();
+ VatStatement _vatStatement = vatStatement;
+
+ if (_vatStatement != null) {
+ while (rootVatStatement == null) {
+ if (_vatStatement.getMasterVatStatement() == null){
+ rootVatStatement = _vatStatement;
+ } else {
+ _vatStatement = _vatStatement.getMasterVatStatement();
+ }
}
}
+
return rootVatStatement;
}
@@ -581,7 +595,7 @@
return results;
}
- protected void importVatStatement(ImportResult result, Map<String, VatStatement> orderedVATStatements, VatStatementImport vatStatementBean) {
+ protected void importVatStatement(ImportResult result, Map<String, VatStatement> orderedVATStatements, final VatStatementImport vatStatementBean) {
Binder<VatStatementImport, VatStatement> binder = BinderFactory.newBinder(VatStatementImport.class, VatStatement.class);
VatStatement vatStatement = vatStatementService.newVatStatement();
binder.copyExcluding(vatStatementBean, vatStatement, VatStatement.PROPERTY_MASTER_VAT_STATEMENT);
@@ -611,8 +625,7 @@
// in case it exist (not ordered import and previously created) values are bind to the previously created one excepted
// the sub vatStatements
- boolean alreadyCreated = false;
- alreadyCreated = propagateVATChangeToBranche(vatStatement, branchesVATStatement, alreadyCreated);
+ boolean alreadyCreated = propagateVATChangeToBranche(vatStatement, branchesVATStatement, false);
// if necessary vatStatement is created
if (!alreadyCreated) {
@@ -627,10 +640,10 @@
}
}
- private void refreshMasterVATStatement(Map<String, VatStatement> orderedVATStatements, VatStatement vatStatement, VatStatement branchesVATStatement) throws AlreadyExistVatStatementException, NotAllowedLabelException {
+ private void refreshMasterVATStatement(Map<String, VatStatement> orderedVATStatements, final VatStatement vatStatement, final VatStatement branchesVATStatement) throws AlreadyExistVatStatementException, NotAllowedLabelException {
// if the master vatStatement has been modified then the current one is replace by the new one.
- vatStatement = vatStatementService.createVatStatement(branchesVATStatement, vatStatement);
- VatStatement targetedRootVATStatement = returnRootVATStatement(vatStatement);
+ VatStatement _vatStatement = vatStatementService.createVatStatement(branchesVATStatement, vatStatement);
+ VatStatement targetedRootVATStatement = returnRootVATStatement(_vatStatement);
// replace modified root vatStatement with new one
if (orderedVATStatements.get(targetedRootVATStatement.getLabel()) != null) {
@@ -638,7 +651,7 @@
}
}
- private boolean propagateVATChangeToBranche(VatStatement vatStatement, VatStatement branchesVATStatement, boolean alreadyCreated) {
+ private boolean propagateVATChangeToBranche(final VatStatement vatStatement, final VatStatement branchesVATStatement, boolean alreadyCreated) {
if (branchesVATStatement != null && branchesVATStatement.getSubVatStatements() != null) {
for (VatStatement bfs : branchesVATStatement.getSubVatStatements()) {
if (bfs.getLabel().equals(vatStatement.getLabel())){
@@ -652,36 +665,43 @@
return alreadyCreated;
}
- private VatStatement getBrancheVatStatement(String[] masterNames, VatStatement branchesVATStatement) throws AlreadyExistVatStatementException, NotAllowedLabelException {
+ private VatStatement getBrancheVatStatement(String[] masterNames, final VatStatement branchesVATStatement) throws AlreadyExistVatStatementException, NotAllowedLabelException {
+ VatStatement _branchesVATStatement = branchesVATStatement;
for (int i = 1; i < masterNames.length; i++) {// 0 is root
String masterName = masterNames[i];
- branchesVATStatement = returnVATStatement(branchesVATStatement, masterName);
+ _branchesVATStatement = returnVATStatement(_branchesVATStatement, masterName);
}
- return branchesVATStatement;
+ return _branchesVATStatement;
}
- private VatStatement createRootVATStatement(Map<String, VatStatement> orderedVATStatements, String rootMasterName, VatStatement rootVATStatement) throws AlreadyExistVatStatementException, NotAllowedLabelException {
- if (rootVATStatement == null) {
- rootVATStatement = vatStatementService.newVatStatement();
- rootVATStatement.setLabel(rootMasterName);
- rootVATStatement = vatStatementService.createVatStatement(null, rootVATStatement);
- orderedVATStatements.put(rootMasterName, rootVATStatement);
+ private VatStatement createRootVATStatement(Map<String, VatStatement> orderedVATStatements, String rootMasterName, final VatStatement rootVATStatement) throws AlreadyExistVatStatementException, NotAllowedLabelException {
+ VatStatement result = rootVATStatement;
+ if (result == null) {
+ result = vatStatementService.newVatStatement();
+ result.setLabel(rootMasterName);
+ result = vatStatementService.createVatStatement(null, result);
+ orderedVATStatements.put(rootMasterName, result);
}
- return rootVATStatement;
+ return result;
}
- private VatStatement getRootVatStatement(Map<String, VatStatement> orderedVATStatements, VatStatementImport vatStatementBean, VatStatement vatStatement) throws AlreadyExistVatStatementException, NotAllowedLabelException {
- VatStatement rootVATStatement = orderedVATStatements.get(vatStatementBean.getLabel());
+ private VatStatement getRootVatStatement(Map<String, VatStatement> orderedVATStatements, final VatStatementImport vatStatementBean, final VatStatement vatStatement) throws AlreadyExistVatStatementException, NotAllowedLabelException {
- if (rootVATStatement == null) {
- rootVATStatement = vatStatement;
- rootVATStatement = vatStatementService.createVatStatement(null, rootVATStatement);
- } else {
- // in case it exist (not ordered import and previously created) values are bind to the previously created one excepted
- // the sub vatStatements
- Binder<VatStatement, VatStatement> rootBinder = BinderFactory.newBinder(VatStatement.class, VatStatement.class);
- rootBinder.copyExcluding(vatStatement, rootVATStatement, VatStatement.PROPERTY_SUB_VAT_STATEMENTS);
+ VatStatement rootVATStatement = null;
+ if (vatStatementBean != null) {
+ rootVATStatement = orderedVATStatements.get(vatStatementBean.getLabel());
+
+ if (rootVATStatement == null) {
+ rootVATStatement = vatStatement;
+ rootVATStatement = vatStatementService.createVatStatement(null, rootVATStatement);
+ } else {
+ // in case it exist (not ordered import and previously created) values are bind to the previously created one excepted
+ // the sub vatStatements
+ Binder<VatStatement, VatStatement> rootBinder = BinderFactory.newBinder(VatStatement.class, VatStatement.class);
+ rootBinder.copyExcluding(vatStatement, rootVATStatement, VatStatement.PROPERTY_SUB_VAT_STATEMENTS);
+ }
}
+
return rootVATStatement;
}
@@ -805,7 +825,7 @@
return result;
}
- protected boolean validEntry(ImportResult importResult, Date dateEcr, Date fiscalPeriodsBiginDate, Date fiscalPeriodsEndingDate, Account account, String targetedAccount) {
+ protected boolean validEntry(ImportResult importResult, Date dateEcr, Date fiscalPeriodsBiginDate, Date fiscalPeriodsEndingDate, final Account account, String targetedAccount) {
boolean result = true;
// if entry date have fiscalperiod open
if (dateEcr.compareTo(fiscalPeriodsBiginDate) < 0
@@ -898,7 +918,7 @@
return results;
}
- protected Entry createEntry(EntryEBP entryEBP, Account account) {
+ protected Entry createEntry(EntryEBP entryEBP, final Account account) {
Entry entry;
BigDecimal debit;
entry = financialTransactionService.createNewEntry();
1
0
Author: dcosse
Date: 2014-09-29 14:36:53 +0200 (Mon, 29 Sep 2014)
New Revision: 3927
Url: http://forge.chorem.org/projects/lima/repository/revisions/3927
Log:
mise ?\195?\160 jour en t?\195?\170tes
Modified:
trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfigurationHelper.java
trunk/lima-business/src/test/java/org/chorem/lima/business/AccountDaoTest.java
trunk/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaApplicationContext.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningView.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.css
trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.css
Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfigurationHelper.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/AccountDaoTest.java
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaApplicationContext.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.css
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.css
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.css
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.css
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.css
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.css
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.css
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.css
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.css
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateAccountsPanel.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.css
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningView.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.css
___________________________________________________________________
Added: svn:eol-style
+ native
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
1
0
r3926 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by dcosse＠users.chorem.org 29 Sep '14
by dcosse＠users.chorem.org 29 Sep '14
29 Sep '14
Author: dcosse
Date: 2014-09-29 14:31:46 +0200 (Mon, 29 Sep 2014)
New Revision: 3926
Url: http://forge.chorem.org/projects/lima/repository/revisions/3926
Log:
refs #1032 on ne modifie pas une variable parametre
Modified:
trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java
Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2014-09-29 08:27:32 UTC (rev 3925)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2014-09-29 12:31:46 UTC (rev 3926)
@@ -354,13 +354,16 @@
return targetedFinancialStatement;
}
- protected FinancialStatement returnRootFinancialStatement(FinancialStatement financialStatement) {
+ protected FinancialStatement returnRootFinancialStatement(final FinancialStatement financialStatement) {
FinancialStatement rootFinancialStatement = null;
- while (rootFinancialStatement == null) {
- if (financialStatement.getMasterFinancialStatement() == null){
- rootFinancialStatement = financialStatement;
- } else {
- financialStatement = financialStatement.getMasterFinancialStatement();
+ FinancialStatement interFinancialStatement = financialStatement;
+ if (interFinancialStatement != null) {
+ while (rootFinancialStatement == null) {
+ if (interFinancialStatement.getMasterFinancialStatement() == null){
+ rootFinancialStatement = interFinancialStatement;
+ } else {
+ interFinancialStatement = interFinancialStatement.getMasterFinancialStatement();
+ }
}
}
return rootFinancialStatement;
1
0
Author: dcosse
Date: 2014-09-29 10:27:32 +0200 (Mon, 29 Sep 2014)
New Revision: 3925
Url: http://forge.chorem.org/projects/lima/repository/revisions/3925
Log:
correction du pom, probl?\195?\168me de d?\195?\169pendance sur nuiton-converter
Modified:
trunk/lima-swing/pom.xml
trunk/pom.xml
Modified: trunk/lima-swing/pom.xml
===================================================================
--- trunk/lima-swing/pom.xml 2014-09-26 15:58:02 UTC (rev 3924)
+++ trunk/lima-swing/pom.xml 2014-09-29 08:27:32 UTC (rev 3925)
@@ -160,6 +160,11 @@
</dependency>
<dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-converter</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-09-26 15:58:02 UTC (rev 3924)
+++ trunk/pom.xml 2014-09-29 08:27:32 UTC (rev 3925)
@@ -177,6 +177,7 @@
<nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion>
<nuitonProfilingVersion>3.0</nuitonProfilingVersion>
<nuitonCsvVersion>3.0-rc-4</nuitonCsvVersion>
+ <nuitonConverterVersion>1.0</nuitonConverterVersion>
<eugeneVersion>3.0-SNAPSHOT</eugeneVersion>
<topiaVersion>3.0-SNAPSHOT</topiaVersion>
<nuitonI18nVersion>3.3</nuitonI18nVersion>
@@ -341,6 +342,12 @@
</dependency>
<dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-converter</artifactId>
+ <version>${nuitonConverterVersion}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2Version}</version>
1
0
r3924 - in trunk: lima-business/src/main/java/org/chorem/lima/business lima-business/src/test/java/org/chorem/lima/business lima-swing/src/main/java/org/chorem/lima
by dcosse＠users.chorem.org 26 Sep '14
by dcosse＠users.chorem.org 26 Sep '14
26 Sep '14
Author: dcosse
Date: 2014-09-26 17:58:02 +0200 (Fri, 26 Sep 2014)
New Revision: 3924
Url: http://forge.chorem.org/projects/lima/repository/revisions/3924
Log:
refs #1115 refactoring sur l'initialisation des services
Modified:
trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfigurationHelper.java
trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java
trunk/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java
trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java
trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java
trunk/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java
Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfigurationHelper.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfigurationHelper.java 2014-09-26 09:10:52 UTC (rev 3923)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfigurationHelper.java 2014-09-26 15:58:02 UTC (rev 3924)
@@ -1,14 +1,8 @@
package org.chorem.lima.business;
import com.google.common.base.Function;
-import com.google.common.collect.Maps;
-import org.chorem.lima.entity.LimaCallaoEntityEnum;
import org.chorem.lima.entity.LimaCallaoTopiaApplicationContext;
-import org.nuiton.topia.flyway.TopiaFlywayService;
-import org.nuiton.topia.flyway.TopiaFlywayServiceImpl;
-import org.nuiton.topia.persistence.TopiaConfigurationConstants;
-import java.util.Map;
import java.util.Properties;
/**
@@ -26,22 +20,4 @@
};
}
- public static Properties getRootContextProperties(LimaServiceConfig serviceConfig) {
- Properties result = serviceConfig.getFlatOptions();
- // add persistence classes from generated code
- result.setProperty(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, LimaCallaoEntityEnum.getImplementationClassesAsString());
-
- Map<String, String> toAddIfNotPresent = Maps.newLinkedHashMap();
- toAddIfNotPresent.put("topia.service.migration", TopiaFlywayServiceImpl.class.getName());
- toAddIfNotPresent.put("topia.service.migration." + TopiaFlywayService.USE_MODEL_VERSION, "true");
- toAddIfNotPresent.put(TopiaConfigurationConstants.CONFIG_PERSISTENCE_INIT_SCHEMA, "true");
-
- for (Map.Entry<String, String> entry : toAddIfNotPresent.entrySet()) {
- if (!result.containsKey(entry.getKey())) {
- result.setProperty(entry.getKey(), entry.getValue());
- }
- }
-
- return result;
- }
}
Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java 2014-09-26 09:10:52 UTC (rev 3923)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java 2014-09-26 15:58:02 UTC (rev 3924)
@@ -38,7 +38,6 @@
import javax.interceptor.InvocationContext;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import java.util.Properties;
/**
* Interceptor for topia context transaction.
@@ -81,11 +80,10 @@
context.getTarget().getClass() + "#" + context.getMethod().getName());
}
- LimaServiceConfig config = LimaServiceConfig.getInstance();
+ LimaCallaoTopiaApplicationContext rootContext = TopiaApplicationContextCache.getContext(
+ LimaServiceConfig.getRootContextProperties(),
+ LimaConfigurationHelper.getCreateTopiaContextFunction());
- Properties contextProperties = LimaConfigurationHelper.getRootContextProperties(config);
- LimaCallaoTopiaApplicationContext rootContext = TopiaApplicationContextCache.getContext(contextProperties, LimaConfigurationHelper.getCreateTopiaContextFunction());
-
LimaCallaoTopiaPersistenceContext tx = rootContext.newPersistenceContext();
DAO_HELPER.set(tx);
Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java 2014-09-26 09:10:52 UTC (rev 3923)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java 2014-09-26 15:58:02 UTC (rev 3924)
@@ -25,16 +25,22 @@
package org.chorem.lima.business;
+import com.google.common.collect.Maps;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.chorem.lima.LimaTechnicalException;
import org.chorem.lima.business.accountingrules.FranceAccountingRules;
+import org.chorem.lima.entity.LimaCallaoEntityEnum;
import org.nuiton.config.ApplicationConfig;
import org.nuiton.config.ArgumentsParserException;
import org.nuiton.config.ConfigOptionDef;
+import org.nuiton.topia.flyway.TopiaFlywayService;
+import org.nuiton.topia.flyway.TopiaFlywayServiceImpl;
+import org.nuiton.topia.persistence.TopiaConfigurationConstants;
import java.io.File;
+import java.util.Map;
import java.util.Properties;
import static org.nuiton.i18n.I18n.n;
@@ -63,6 +69,8 @@
protected static volatile LimaServiceConfig instance;
+ protected static Properties rootContextProperties;
+
public LimaServiceConfig(String configFileName) {
try {
ApplicationConfig defaultConfig = new ApplicationConfig(LIMA_DEFAULT_CONF_FILENAME);
@@ -80,14 +88,44 @@
}
config = defaultConfig;
}
-
instance = this;
} catch (ArgumentsParserException ex) {
throw new LimaTechnicalException("Can't read configuration", ex);
}
}
+ public static Properties getRootContextProperties() {
+ if (rootContextProperties == null) {
+ Properties result = instance.getFlatOptions();
+ // add persistence classes from generated code
+ result.setProperty(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, LimaCallaoEntityEnum.getImplementationClassesAsString());
+
+ Map<String, String> toAddIfNotPresent = Maps.newLinkedHashMap();
+ toAddIfNotPresent.put("topia.service.migration", TopiaFlywayServiceImpl.class.getName());
+ toAddIfNotPresent.put("topia.service.migration." + TopiaFlywayService.USE_MODEL_VERSION, "true");
+ toAddIfNotPresent.put(TopiaConfigurationConstants.CONFIG_PERSISTENCE_INIT_SCHEMA, "true");
+
+ for (Map.Entry<String, String> entry : toAddIfNotPresent.entrySet()) {
+ if (!result.containsKey(entry.getKey())) {
+ result.setProperty(entry.getKey(), entry.getValue());
+ }
+ }
+ rootContextProperties = result;
+ }
+ return rootContextProperties;
+ }
+
+ public static LimaServiceConfig getInstance(String configFileName) {
+ if (instance == null) {
+ instance= new LimaServiceConfig(configFileName);
+ }
+ return instance;
+ }
+
public static LimaServiceConfig getInstance() {
+ if (instance == null) {
+ instance= new LimaServiceConfig(null);
+ }
return instance;
}
Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java
===================================================================
--- trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2014-09-26 09:10:52 UTC (rev 3923)
+++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2014-09-26 15:58:02 UTC (rev 3924)
@@ -29,7 +29,6 @@
import org.chorem.lima.entity.ClosedPeriodicEntryBookTopiaDao;
import org.chorem.lima.entity.LimaCallaoTopiaPersistenceContext;
import org.junit.Assert;
-import org.junit.Before;
import org.junit.Test;
import java.util.List;
@@ -48,11 +47,6 @@
*/
public class FinancialPeriodServiceImplTest extends AbstractLimaTest {
- @Before
- public void initTest() throws Exception {
- //initTestDatabase();
- }
-
/**
* Test de la fermeture d'une periode comptable pour un journal donné.
*
Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java
===================================================================
--- trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java 2014-09-26 09:10:52 UTC (rev 3923)
+++ trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java 2014-09-26 15:58:02 UTC (rev 3924)
@@ -22,7 +22,12 @@
* #L%
*/
+import com.google.common.collect.Maps;
+import org.chorem.lima.entity.LimaCallaoEntityEnum;
import org.nuiton.config.ApplicationConfig;
+import org.nuiton.topia.flyway.TopiaFlywayService;
+import org.nuiton.topia.flyway.TopiaFlywayServiceImpl;
+import org.nuiton.topia.persistence.TopiaConfigurationConstants;
import java.util.Map;
import java.util.Properties;
@@ -41,6 +46,26 @@
}
config = new ApplicationConfig(standardLimaConfig);
instance = this;
+ setRootContextProperties(instance);
}
+ public void setRootContextProperties(LimaServiceConfig instance) {
+ Properties result = instance.getFlatOptions();
+ // add persistence classes from generated code
+ result.setProperty(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, LimaCallaoEntityEnum.getImplementationClassesAsString());
+
+ Map<String, String> toAddIfNotPresent = Maps.newLinkedHashMap();
+ toAddIfNotPresent.put("topia.service.migration", TopiaFlywayServiceImpl.class.getName());
+ toAddIfNotPresent.put("topia.service.migration." + TopiaFlywayService.USE_MODEL_VERSION, "true");
+ toAddIfNotPresent.put(TopiaConfigurationConstants.CONFIG_PERSISTENCE_INIT_SCHEMA, "true");
+
+ for (Map.Entry<String, String> entry : toAddIfNotPresent.entrySet()) {
+ if (!result.containsKey(entry.getKey())) {
+ result.setProperty(entry.getKey(), entry.getValue());
+ }
+ }
+ rootContextProperties = result;
+
+ }
+
}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java 2014-09-26 09:10:52 UTC (rev 3923)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java 2014-09-26 15:58:02 UTC (rev 3924)
@@ -90,8 +90,7 @@
}
protected static void initApplicationContext() {
- // TODO DCossé 25/09/14 revoir cette partie
- new LimaServiceConfig(null);
+ LimaServiceConfig.getInstance();
}
/**
1
0