Author: dcosse Date: 2014-07-31 17:10:21 +0200 (Thu, 31 Jul 2014) New Revision: 3883 Url: http://forge.chorem.org/projects/lima/repository/revisions/3883 Log: refs #1032 import EBP des entries Added: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ebp/ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ebp/EntryEBPModel.java Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/LimaTechnicalException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/AccountException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/AfterLastFiscalPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistAccountException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistFinancialStatement.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistVatStatement.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyLockedFiscalPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/BeforeFirstFiscalPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/BeginAfterEndFiscalPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBookException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBooksException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/DateException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntriesException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryBookException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialTransactionsException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/FiscalPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportEbpException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportResult.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/InvalidAccountNumberException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/LastUnlockedFiscalPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/LimaException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedEntryBookException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedFinancialPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/MoreOneUnlockFiscalPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/NoEmptyFiscalPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/NoFoundFinancialPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotAllowedLabel.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotBeginNextDayOfLastFiscalPeriodException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotLockedClosedPeriodicEntryBooksException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnbalancedEntriesException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnbalancedFinancialTransactionsException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnfilledEntriesException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedAccountException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedEntryBookException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/WithoutEntryBookFinancialTransactionsException.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/ImportService.java trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/NewImportService.java trunk/lima-business/src/main/java/org/chorem/lima/LimaServer.java trunk/lima-business/src/main/java/org/chorem/lima/LimaXAResource.java trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java trunk/lima-business/src/main/java/org/chorem/lima/business/ServiceListener.java trunk/lima-business/src/main/java/org/chorem/lima/business/ServiceMonitorable.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ClosedPeriodicEntryBookServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/IdentityServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewExportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewImportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AccountModel.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryBookModel.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialStatementModel.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialTransactionModel.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalPeriodModel.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/VatStatementModel.java trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_8.java trunk/lima-business/src/main/java/org/chorem/lima/business/utils/AccountComparator.java trunk/lima-business/src/main/java/org/chorem/lima/business/utils/AccountEBPComparator.java trunk/lima-business/src/main/java/org/chorem/lima/business/utils/DocumentsEnum.java trunk/lima-business/src/main/java/org/chorem/lima/business/utils/EntryComparator.java trunk/lima-business/src/main/java/org/chorem/lima/business/utils/EntryEBPComparator.java trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialPeriodComparator.java trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialTransactionComparator.java trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FiscalPeriodComparator.java trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java trunk/lima-business/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java trunk/lima-business/src/main/java/org/chorem/lima/service/package-info.java trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/ImportServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java trunk/lima-business/src/test/java/org/chorem/lima/business/NewImportExportServiceTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java trunk/lima-business/src/test/resources/import/bcr_developed.csv trunk/lima-business/src/test/resources/import/vat_shortened.csv trunk/lima-callao/src/main/java/org/chorem/lima/DefaultServiceContext.java trunk/lima-callao/src/main/java/org/chorem/lima/ServiceContext.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementTopiaDao.java trunk/lima-callao/src/main/xmi/accounting-model.zargo trunk/lima-swing/src/main/assembly/lima.bat trunk/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AutoCompleteTableCellEditor.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.css trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/LimaServer.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/LimaServer.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/LimaServer.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,7 +1,7 @@ /* * #%L - * $Id: LimaServer.java 3350 2012-04-04 09:03:41Z echatellier $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 Codelutin, Chatellier Eric * %% @@ -36,10 +36,10 @@ * Starts openejb server. * * @author chatellier - * @version $Revision: 3350 $ + * @version $Revision$ * <p/> - * Last update : $Date: 2012-04-04 11:03:41 +0200 (mer. 04 avril 2012) $ - * By : $Author: echatellier $ + * Last update : $Date$ + * By : $Author$ */ public class LimaServer { Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/LimaServer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/LimaXAResource.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/LimaXAResource.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/LimaXAResource.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,7 +1,7 @@ /* * #%L - * $Id: LimaXAResource.java 3585 2012-08-08 14:52:14Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 Codelutin, Chatellier Eric * %% @@ -23,23 +23,23 @@ package org.chorem.lima; -import javax.transaction.xa.XAException; -import javax.transaction.xa.XAResource; -import javax.transaction.xa.Xid; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.TopiaTransaction; +import javax.transaction.xa.XAException; +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; + /** * Topia XA ressource containing TopiaContext to commit or rollback. * * @author chatellier - * @version $Revision: 3585 $ + * @version $Revision$ * - * Last update : $Date: 2012-08-08 16:52:14 +0200 (mer. 08 août 2012) $ - * By : $Author: tchemit $ + * Last update : $Date$ + * By : $Author$ */ public class LimaXAResource implements XAResource { Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/LimaXAResource.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: AccountingRules.java 3519 2012-07-12 10:27:43Z echatellier $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: LimaConfig.java 3796 2014-05-13 14:52:18Z echatellier $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% @@ -31,17 +31,17 @@ import org.chorem.lima.business.accountingrules.FranceAccountingRules; import org.chorem.lima.business.migration.DatabaseMigrationClass; 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.migration.TopiaMigrationEngine; +import org.nuiton.topia.migration.TopiaMigrationService; import org.nuiton.topia.persistence.TopiaConfigurationConstants; -import org.nuiton.topia.migration.TopiaMigrationService; -import org.nuiton.config.ApplicationConfig; -import org.nuiton.config.ConfigOptionDef; -import org.nuiton.config.ArgumentsParserException; import java.io.File; +import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; -import static org.nuiton.i18n.I18n.n; /** * Configuration pour le business. @@ -49,10 +49,10 @@ * A voir comment le lier avec celui de lima swing. * * @author chatellier - * @version $Revision: 3796 $ + * @version $Revision$ * <p/> - * Last update : $Date: 2014-05-13 16:52:18 +0200 (mar. 13 mai 2014) $ - * By : $Author: echatellier $ + * Last update : $Date$ + * By : $Author$ */ public class LimaConfig extends ApplicationConfig { Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,7 +1,7 @@ /* * #%L - * $Id: LimaInterceptor.java 3585 2012-08-08 14:52:14Z tchemit $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 Codelutin, Chatellier Eric * %% @@ -23,16 +23,7 @@ package org.chorem.lima.business; -import java.util.Properties; - -import javax.annotation.Resource; -import javax.ejb.Stateless; -import javax.ejb.TransactionAttribute; -import javax.interceptor.AroundInvoke; -import javax.interceptor.InvocationContext; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; - +import com.google.common.base.Function; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaXAResource; @@ -42,21 +33,28 @@ import org.chorem.lima.entity.LimaCallaoTopiaPersistenceContext; import org.nuiton.config.ApplicationConfig; import org.nuiton.topia.persistence.TopiaApplicationContextCache; - -import com.google.common.base.Function; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.util.TopiaUtil; +import javax.annotation.Resource; +import javax.ejb.Stateless; +import javax.ejb.TransactionAttribute; +import javax.interceptor.AroundInvoke; +import javax.interceptor.InvocationContext; +import javax.transaction.Transaction; +import javax.transaction.TransactionManager; +import java.util.Properties; + /** * Interceptor for topia context transaction. * * http://stackoverflow.com/questions/8608349 * * @author chatellier - * @version $Revision: 3585 $ + * @version $Revision$ * - * Last update : $Date: 2012-08-08 16:52:14 +0200 (mer. 08 août 2012) $ - * By : $Author: tchemit $ + * Last update : $Date$ + * By : $Author$ */ @Stateless public class LimaInterceptor { Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaInterceptor.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ServiceListener.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ServiceListener.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ServiceListener.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: ServiceListener.java 3278 2011-08-16 14:09:44Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ServiceListener.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ServiceMonitorable.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ServiceMonitorable.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ServiceMonitorable.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: ServiceMonitorable.java 3366 2012-04-13 13:46:24Z echatellier $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ServiceMonitorable.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: DefaultAccountingRules.java 3777 2014-04-14 07:29:08Z sbavencoff $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: FranceAccountingRules.java 3777 2014-04-14 07:29:08Z sbavencoff $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: AbstractLimaService.java 3409 2012-05-11 10:19:53Z echatellier $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% @@ -34,7 +34,7 @@ * Abstract code for all ejb services (get context, catch, finally...). * * @author chatellier - * @version $Revision: 3409 $ + * @version $Revision$ */ public abstract class AbstractLimaService { Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: AccountServiceImpl.java 3777 2014-04-14 07:29:08Z sbavencoff $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ClosedPeriodicEntryBookServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ClosedPeriodicEntryBookServiceImpl.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ClosedPeriodicEntryBookServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -3,8 +3,8 @@ /* * #%L * Lima :: business - * $Id: ClosedPeriodicEntryBookServiceImpl.java 3768 2014-04-11 13:38:02Z dcosse $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2014 CodeLutin * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ClosedPeriodicEntryBookServiceImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: DocumentServiceImpl.java 3778 2014-04-15 16:09:41Z dcosse $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: EntryBookServiceImpl.java 3780 2014-05-05 16:28:39Z dcosse $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryServiceImpl.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -3,8 +3,8 @@ /* * #%L * Lima :: business - * $Id: EntryServiceImpl.java 3768 2014-04-11 13:38:02Z dcosse $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2014 CodeLutin * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryServiceImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: ExportServiceImpl.java 3781 2014-05-06 09:22:03Z dcosse $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% @@ -65,10 +65,10 @@ /** * CSV import export service. * - * @version $Revision: 3781 $ + * @version $Revision$ * <p/> - * Last update : $Date: 2014-05-06 11:22:03 +0200 (mar. 06 mai 2014) $ - * By : $Author: dcosse $ + * Last update : $Date$ + * By : $Author$ */ @Stateless @Remote(ExportService.class) Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: FinancialPeriodServiceImpl.java 3740 2014-01-17 22:12:04Z dcosse $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: FinancialStatementServiceImpl.java 3777 2014-04-14 07:29:08Z sbavencoff $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * * - * $Id: FinancialTransactionServiceImpl.java 3783 2014-05-06 16:47:18Z dcosse $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * * - * $Id: FiscalPeriodServiceImpl.java 3777 2014-04-14 07:29:08Z sbavencoff $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: HttpServerServiceImpl.java 3777 2014-04-14 07:29:08Z sbavencoff $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/IdentityServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/IdentityServiceImpl.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/IdentityServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: IdentityServiceImpl.java 3410 2012-05-11 10:26:46Z echatellier $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/IdentityServiceImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: ImportServiceImpl.java 3782 2014-05-06 15:41:32Z dcosse $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% @@ -26,8 +26,6 @@ package org.chorem.lima.business.ejb; import au.com.bytecode.opencsv.CSVReader; -import au.com.bytecode.opencsv.bean.ColumnPositionMappingStrategy; -import au.com.bytecode.opencsv.bean.CsvToBean; import com.google.common.base.Function; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -37,16 +35,12 @@ import org.apache.pdfbox.exceptions.COSVisitorException; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.interactive.form.PDField; -import org.chorem.lima.beans.EntryEBP; -import org.chorem.lima.beans.EntryEBPImpl; import org.chorem.lima.beans.EntryImport; import org.chorem.lima.beans.FinancialTransactionImport; import org.chorem.lima.business.AlreadyExistAccountException; import org.chorem.lima.business.ImportEbpException; import org.chorem.lima.business.InvalidAccountNumberException; import org.chorem.lima.business.LimaConfig; -import org.chorem.lima.business.LockedEntryBookException; -import org.chorem.lima.business.LockedFinancialPeriodException; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.ClosedPeriodicEntryBookService; import org.chorem.lima.business.api.EntryBookService; @@ -57,18 +51,11 @@ import org.chorem.lima.business.api.IdentityService; import org.chorem.lima.business.api.ImportService; import org.chorem.lima.business.utils.DocumentsEnum; -import org.chorem.lima.business.utils.EntryEBPComparator; -import org.chorem.lima.business.utils.FiscalPeriodComparator; import org.chorem.lima.business.utils.ImportExportEntityEnum; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountImpl; -import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryBookImpl; -import org.chorem.lima.entity.EntryImpl; -import org.chorem.lima.entity.FinancialTransaction; -import org.chorem.lima.entity.FinancialTransactionImpl; -import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.Identity; import org.chorem.lima.entity.IdentityImpl; @@ -81,13 +68,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.StringReader; -import java.math.BigDecimal; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Date; import java.util.List; import java.util.Map; @@ -149,215 +130,6 @@ // ################ IMPORT THIRD PART ACCOUNTING SOFTWARE ################ @Override - public String importEntriesFromEbp(String datas) throws ImportEbpException{ - - if (datas.isEmpty()) { - throw new ImportEbpException(t("lima-business.import.ebpnoentry")); - } - - // use for logs - long before = System.currentTimeMillis(); - - List<Account> accounts = accountService.getAllAccounts(); - if (accounts == null) { - accounts = Lists.newArrayList(); - } - Map<String, Account> indexedAccounts = Maps.newHashMap(Maps.uniqueIndex(accounts, GET_ACCOUNT_NUMBER)); - - List<EntryBook> entryBooks = entryBookService.getAllEntryBooks(); - if (entryBooks == null) { - entryBooks = Lists.newArrayList(); - } - Map<String, EntryBook> indexedEntryBooks = Maps.newHashMap(Maps.uniqueIndex(entryBooks, GET_ENTRY_BOOK_CODE)); - - SimpleDateFormat epbDateFormat = new SimpleDateFormat(DATE_PATTERN); - StringBuilder result = new StringBuilder(); - CSVReader csvReader = null; - - try { - csvReader = new CSVReader(new StringReader(datas)); - ColumnPositionMappingStrategy<EntryEBPImpl> strat = new ColumnPositionMappingStrategy<EntryEBPImpl>(); - strat.setType(EntryEBPImpl.class); - // read header to set strategy mapping - strat.setColumnMapping(csvReader.readNext()); - - // check if file have a good header - List<String> headEntry = new ArrayList<String>(); - headEntry.add(EntryEBP.PROPERTY_DAT_ECR); - headEntry.add(EntryEBP.PROPERTY_JOURNAL); - headEntry.add(EntryEBP.PROPERTY_COMPTE); - headEntry.add(EntryEBP.PROPERTY_LIBELLE); - headEntry.add(EntryEBP.PROPERTY_PIECE); - headEntry.add(EntryEBP.PROPERTY_DEBIT); - headEntry.add(EntryEBP.PROPERTY_CREDIT); - headEntry.add(EntryEBP.PROPERTY_LETTRE); - if (!Arrays.asList(strat.getColumnMapping()).containsAll(headEntry)) { - throw new ImportEbpException( - t("lima-business.import.ebpnoheader")); - } - - // Sorts the list according to the entry date - CsvToBean<EntryEBPImpl> csv = new CsvToBean<EntryEBPImpl>(); - List<EntryEBPImpl> list = csv.parse(strat, csvReader); - Collections.sort(list, new EntryEBPComparator()); - - // Get all the valid fiscalPeriods Ordered by date. - List<FiscalPeriod> fiscalPeriods = fiscalPeriodService - .getAllUnblockedFiscalPeriods(); - Collections.sort(fiscalPeriods, new FiscalPeriodComparator()); - - // There are no valid fiscalPeriods -> exception - int nbFiscalPeriods = fiscalPeriods.size(); - if (nbFiscalPeriods == 0) { - throw new ImportEbpException( - t("lima-business.import.nofiscalperiodopen")); - } - - // attributes declaration - FinancialTransaction financialTransaction = null; - Date dateEcr; - Account account; - Entry entry; - BigDecimal debit; - String entryBookCode; - EntryBook entryBook; - - // For all entries loaded from the file - // the entry is validate (checking for valide FiscalPeriod and existing Account associated to it) - // if valid entry - // the entry entity is created and the association with it's dependant entites (Account are FinancialTransaction) are created - - for (EntryEBP entryEBP : list) { - dateEcr = epbDateFormat.parse(entryEBP.getDatEcr()); - - // account loading - account = indexedAccounts.get(entryEBP.getCompte()); - - // if entry date have fiscalperiod open - if (dateEcr.compareTo(fiscalPeriods.get(0).getBeginDate()) < 0 - || dateEcr.compareTo(fiscalPeriods.get(nbFiscalPeriods - 1).getEndDate()) > 0) { - result.append(t( - "lima-business.import.entriesoutofdatesrange", dateEcr)); - } - - // if account not exist not export -> exception - else if (account == null) { - // TODO DCossé 28/05/14 this message is not displayed on user's error window. - throw new ImportEbpException(t( - "lima-business.import.ebpmissingaccount", - entryEBP.getCompte())); - } - - // create entry - else { - - // creation of the entry - // initialisation of this attributs - - entry = new EntryImpl(); - - // the entry has one amount witch can be Debit or Credit - // regarding the value of the boolean:debit - debit = new BigDecimal(entryEBP.getDebit()); - if (BigDecimal.ZERO.compareTo(debit)==0) { - entry.setDebit(false); - entry.setAmount(new BigDecimal(entryEBP.getCredit())); - } else { - entry.setDebit(true); - entry.setAmount(debit); - } - entry.setAccount(account); - entry.setDescription(StringUtils.trimToNull(entryEBP.getLibelle())); - entry.setVoucher(StringUtils.trimToNull(entryEBP.getPiece())); - entry.setLettering(StringUtils.trimToNull(entryEBP.getLettre())); - - // Association of the entry with the financialTransaction - // Each financialTransaction is associated with an entryBook - // loading of the entryBook from the db according to the entryBookCode - // if the entryBook doesn't exist it's entity is created - // if any financialTransaction exist for the entry - // a financialTransaction entity is created associated with the entryBook - // creation of the entry entity - // association between the entry and the financialTransaction is done. - - entryBookCode = entryEBP.getJournal(); - // entryBook loading - entryBook = indexedEntryBooks.get(entryBookCode); - - // if entrybook not exist create it ! - if (entryBook == null) { - entryBook = new EntryBookImpl(); - entryBook.setCode(entryBookCode); - //financialTransaction = null; - // create it - entryBook = entryBookService.createEntryBook(entryBook); - result.append(t( - "lima-business.import.entrybooknotexist", - entryBook)); - } - try { - - // create transaction - if (financialTransaction == null - || !(dateEcr.equals(financialTransaction - .getTransactionDate()) && entryBook - .getCode().equals( - financialTransaction.getEntryBook() - .getCode()))) { - // create financial transaction - financialTransaction = new FinancialTransactionImpl(); - financialTransaction.setEntryBook(entryBook); - financialTransaction.setTransactionDate(dateEcr); - financialTransaction = financialTransactionService.createFinancialTransaction(financialTransaction); - result.append(t( - "lima-business.import.transactionadded", dateEcr, - entryBook.getCode())); - } - financialTransaction.getEntry().add(entry); - // Inside the db, the entries reference the financialTransaction - entry.setFinancialTransaction(financialTransaction); - entry = financialTransactionService.createEntry(entry); - result.append(t("lima-business.import.entryadded", - entry.getDescription(), entry.getAmount())); - - } catch (LockedFinancialPeriodException e) { - result.append(t("lima-business.import.entries.error.lockedFinancialPeriod", - e.getFinancialPeriod().getBeginDate(), - e.getFinancialPeriod().getEndDate())); - } catch (LockedEntryBookException e) { - result.append(t("lima-business.import.entries.error.lockedEntryBook", - e.getClosedPeriodicEntryBook().getEntryBook().getCode(), - e.getClosedPeriodicEntryBook().getEntryBook().getLabel(), - e.getClosedPeriodicEntryBook().getFinancialPeriod().getBeginDate(), - e.getClosedPeriodicEntryBook().getFinancialPeriod().getEndDate())); - } - - } - } - - if (log.isInfoEnabled()) { - - long after = System.currentTimeMillis(); - log.info("Imported form EBP : " + list.size() + " entries in " - + (after - before) + " ms"); - } - } catch (ParseException e) { - throw new ImportEbpException("Can't import ", e); - } catch (IOException e) { - throw new ImportEbpException("Can't import ", e); - } finally { - if (csvReader != null) { - try { - csvReader.close(); - } catch (IOException e) { - // on fait rien - } - } - } - return result.toString(); - } - - @Override public String importAccountsChartFromEbp(String datas) throws ImportEbpException{ long before = System.currentTimeMillis(); List<Account> accounts = accountService.getAllAccounts(); Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewExportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewExportServiceImpl.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewExportServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: ExportServiceImpl.java 3781 2014-05-06 09:22:03Z dcosse $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% @@ -74,10 +74,10 @@ /** * CSV import export service. * - * @version $Revision: 3781 $ + * @version $Revision$ * <p/> - * Last update : $Date: 2014-05-06 11:22:03 +0200 (mar. 06 mai 2014) $ - * By : $Author: dcosse $ + * Last update : $Date$ + * By : $Author$ */ @Stateless @Remote(NewExportService.class) Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewExportServiceImpl.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewImportServiceImpl.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewImportServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -22,15 +22,19 @@ * #L% */ -import com.google.common.base.Predicate; +import com.google.common.base.Function; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; +import org.chorem.lima.beans.EntryEBP; import org.chorem.lima.beans.FinancialStatementImport; import org.chorem.lima.beans.VatStatementImport; import org.chorem.lima.business.AlreadyExistAccountException; import org.chorem.lima.business.AlreadyExistFinancialStatement; import org.chorem.lima.business.AlreadyExistVatStatement; import org.chorem.lima.business.FiscalPeriodException; +import org.chorem.lima.business.ImportEbpException; import org.chorem.lima.business.ImportResult; import org.chorem.lima.business.InvalidAccountNumberException; import org.chorem.lima.business.LockedEntryBookException; @@ -52,11 +56,17 @@ import org.chorem.lima.business.ejb.csv.FinancialTransactionModel; import org.chorem.lima.business.ejb.csv.FiscalPeriodModel; import org.chorem.lima.business.ejb.csv.VatStatementModel; +import org.chorem.lima.business.ejb.ebp.EntryEBPModel; +import org.chorem.lima.business.utils.EntryEBPComparator; +import org.chorem.lima.business.utils.FiscalPeriodComparator; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.EntryBookImpl; +import org.chorem.lima.entity.EntryImpl; import org.chorem.lima.entity.FinancialStatement; import org.chorem.lima.entity.FinancialTransaction; +import org.chorem.lima.entity.FinancialTransactionImpl; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.VatStatement; import org.nuiton.csv.Import; @@ -69,11 +79,17 @@ import javax.ejb.Stateless; import javax.ejb.TransactionAttribute; import java.io.InputStream; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; + +import static org.nuiton.i18n.I18n.t; + /** * Created by davidcosse on 03/06/14. */ @@ -103,11 +119,17 @@ @EJB protected VatStatementService vatStatementService; - protected static final Predicate<FinancialStatement> IS_ROOT_FINANCIAL_STATEMENT = new Predicate<FinancialStatement>() { + protected static final Function<Account, String> GET_ACCOUNT_NUMBER = new Function<Account, String>() { + @Override + public String apply(Account input) { + return input.getAccountNumber(); + } + }; + protected static final Function<EntryBook, String> GET_ENTRY_BOOK_CODE = new Function<EntryBook, String>() { @Override - public boolean apply(FinancialStatement financialStatement) { - return financialStatement.getMasterFinancialStatement()==null; + public String apply(EntryBook input) { + return input.getCode(); } }; @@ -531,7 +553,7 @@ @Override public List<ImportResult> importBackup(String entryBooks, String financialTransactions, String fiscalPeriods, String accounts, String entries) throws AlreadyExistAccountException, InvalidAccountNumberException { - List<ImportResult> results = new ArrayList<ImportResult>(); + List<ImportResult> results = new ArrayList<>(); importAccountAsCSV(accounts); importEntryBooksAsCSV(entryBooks); importFiscalPeriodsAsCSV(fiscalPeriods); @@ -539,4 +561,178 @@ importEntriesAsCSV(entries); return results; } + + @Override + public ImportResult importEntriesFromEbp(String datas) throws ImportEbpException { + + ImportResult result = new ImportResult(); + if (datas.isEmpty()) { + result.getException().addException(0, new ImportEbpException(t("lima-business.import.ebpnoentry"))); + return result; + } + + // use for logs + long before = System.currentTimeMillis(); + + List<Account> accounts = accountService.getAllAccounts(); + if (accounts == null) { + accounts = Lists.newArrayList(); + } + Map<String, Account> indexedAccounts = Maps.newHashMap(Maps.uniqueIndex(accounts, GET_ACCOUNT_NUMBER)); + + List<EntryBook> entryBooks = entryBookService.getAllEntryBooks(); + if (entryBooks == null) { + entryBooks = Lists.newArrayList(); + } + Map<String, EntryBook> indexedEntryBooks = Maps.newHashMap(Maps.uniqueIndex(entryBooks, GET_ENTRY_BOOK_CODE)); + + InputStream contentStream = null; + try { + contentStream = IOUtils.toInputStream(datas); + + ImportModel<EntryEBP> model = new EntryEBPModel(); + + Import<EntryEBP> entryEBPs = Import.newImport(model, contentStream); + List<EntryEBP> list = new ArrayList<>(); + for (EntryEBP entryEBP : entryEBPs) { + list.add(entryEBP); + } + + Collections.sort(list, new EntryEBPComparator()); + + // Get all the valid fiscalPeriods Ordered by date. + List<FiscalPeriod> fiscalPeriods = fiscalPeriodService + .getAllUnblockedFiscalPeriods(); + Collections.sort(fiscalPeriods, new FiscalPeriodComparator()); + + // There are no valid fiscalPeriods -> exception + int nbFiscalPeriods = fiscalPeriods.size(); + if (nbFiscalPeriods == 0) { + result.getException().addException(0, new ImportEbpException( + t("lima-business.import.nofiscalperiodopen"))); + // whe don't want to go further. + return result; + } + + // attributes declaration + FinancialTransaction financialTransaction = null; + Date dateEcr; + Account account; + Entry entry; + BigDecimal debit; + String entryBookCode; + EntryBook entryBook; + + // For all entries loaded from the file + // the entry is validate (checking for valide FiscalPeriod and existing Account associated to it) + // if valid entry + // the entry entity is created and the association with it's dependant entites (Account are FinancialTransaction) are created + + int lineIndex = 0; + for (EntryEBP entryEBP : list) { + dateEcr = entryEBP.getDatEcr(); + + // account loading + account = indexedAccounts.get(entryEBP.getCompte()); + + // if entry date have fiscalperiod open + if (dateEcr.compareTo(fiscalPeriods.get(0).getBeginDate()) < 0 + || dateEcr.compareTo(fiscalPeriods.get(nbFiscalPeriods - 1).getEndDate()) > 0) { + result.getException().addException(lineIndex, new ImportEbpException(t("lima-business.import.entriesoutofdatesrange", dateEcr))); + lineIndex++; + continue; + } + + // if account not exist not export -> exception + else if (account == null) { + result.getException().addException(lineIndex, new ImportEbpException(t("lima-business.import.ebpmissingaccount", entryEBP.getCompte()))); + lineIndex++; + continue; + } + + // create entry + else { + + // creation of the entry + // initialisation of this attributs + + entry = new EntryImpl(); + + // the entry has one amount witch can be Debit or Credit + // regarding the value of the boolean:debit + debit = entryEBP.getDebit(); + if (BigDecimal.ZERO.compareTo(debit)==0) { + entry.setDebit(false); + entry.setAmount(entryEBP.getCredit()); + } else { + entry.setDebit(true); + entry.setAmount(debit); + } + entry.setAccount(account); + entry.setDescription(entryEBP.getLibelle()); + entry.setVoucher(entryEBP.getPiece()); + entry.setLettering(entryEBP.getLettre()); + + // Association of the entry with the financialTransaction + // Each financialTransaction is associated with an entryBook + // loading of the entryBook from the db according to the entryBookCode + // if the entryBook doesn't exist it's entity is created + // if any financialTransaction exist for the entry + // a financialTransaction entity is created associated with the entryBook + // creation of the entry entity + // association between the entry and the financialTransaction is done. + + entryBookCode = entryEBP.getJournal(); + // entryBook loading + entryBook = indexedEntryBooks.get(entryBookCode); + + // if entrybook not exist create it ! + if (entryBook == null) { + entryBook = new EntryBookImpl(); + entryBook.setCode(entryBookCode); + //financialTransaction = null; + // create it + entryBook = entryBookService.createEntryBook(entryBook); + } + try { + + // create transaction + if (financialTransaction == null + || !(dateEcr.equals(financialTransaction + .getTransactionDate()) && entryBook + .getCode().equals( + financialTransaction.getEntryBook() + .getCode()))) { + // create financial transaction + financialTransaction = new FinancialTransactionImpl(); + financialTransaction.setEntryBook(entryBook); + financialTransaction.setTransactionDate(dateEcr); + financialTransaction = financialTransactionService.createFinancialTransaction(financialTransaction); + } + financialTransaction.getEntry().add(entry); + // Inside the db, the entries reference the financialTransaction + entry.setFinancialTransaction(financialTransaction); + financialTransactionService.createEntry(entry); + + } catch (LockedFinancialPeriodException | LockedEntryBookException e) { + result.getException().addException(lineIndex, e); + lineIndex++; + continue; + } + + } + result.increaseCreated(); + lineIndex++; + } + + if (log.isInfoEnabled()) { + long after = System.currentTimeMillis(); + log.info("Imported form EBP : " + list.size() + " entries in " + + (after - before) + " ms"); + } + } finally { + IOUtils.closeQuietly(contentStream); + } + return result; + } } Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/NewImportServiceImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima :: business * - * $Id: OptionsServiceImpl.java 3410 2012-05-11 10:26:46Z echatellier $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% @@ -24,12 +24,12 @@ */ package org.chorem.lima.business.ejb; +import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.api.OptionsService; + import javax.ejb.Remote; import javax.ejb.Stateless; -import org.chorem.lima.business.LimaConfig; -import org.chorem.lima.business.api.OptionsService; - @Stateless @Remote(OptionsService.class) public class OptionsServiceImpl extends AbstractLimaService implements OptionsService { Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: ReportServiceImpl.java 3742 2014-01-31 14:17:41Z sbavencoff $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima :: business * - * $Id: VatStatementServiceImpl.java 3740 2014-01-17 22:12:04Z dcosse $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -139,21 +139,6 @@ }; /** - * Date converter converter. - */ - protected static final ValueParser<Date> DATE_PARSER = new ValueParser<Date>() { - @Override - public Date parse(String value) throws ParseException { - Date result = null; - if (!Strings.isNullOrEmpty(value)) { - SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy"); - result = format.parse(value); - } - return result; - } - }; - - /** * O/N boolean parser. */ protected static final ValueParser<Boolean> O_N_PARSER = new ValueParser<Boolean>() { @@ -217,6 +202,21 @@ } }; + /** + * Date converter converter. + */ + protected static final ValueParser<Date> DATE_PARSER = new ValueParser<Date>() { + @Override + public Date parse(String value) throws ParseException { + Date result = null; + if (!Strings.isNullOrEmpty(value)) { + SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy"); + result = format.parse(value); + } + return result; + } + }; + protected static final ValueFormatter<EntryBook> ENTRY_BOOK_TO_ENTRY_BOOK_CODE_FORMATTER = new ValueFormatter<EntryBook>() { @Override public String format(EntryBook value) { Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AccountModel.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryBookModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialStatementModel.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialStatementModel.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialStatementModel.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business.ejb.csv; +/* + * #%L + * Lima :: business + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.beans.FinancialStatementImport; import org.chorem.lima.beans.FinancialStatementImportImpl; import org.chorem.lima.entity.FinancialStatement; Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialStatementModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FinancialTransactionModel.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/FiscalPeriodModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/VatStatementModel.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/VatStatementModel.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/VatStatementModel.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business.ejb.csv; +/* + * #%L + * Lima :: business + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.beans.VatStatementImport; import org.chorem.lima.beans.VatStatementImportImpl; import org.chorem.lima.entity.VatStatement; Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/VatStatementModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ebp/EntryEBPModel.java (from rev 3879, trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/EntryModel.java) =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ebp/EntryEBPModel.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ebp/EntryEBPModel.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -0,0 +1,94 @@ +package org.chorem.lima.business.ejb.ebp; + +/* + * #%L + * Lima :: business + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import org.chorem.lima.beans.EntryEBP; +import org.chorem.lima.beans.EntryEBPImpl; +import org.chorem.lima.business.ejb.csv.AbstractLimaModel; +import org.nuiton.csv.ExportModel; +import org.nuiton.csv.ExportableColumn; +import org.nuiton.csv.ModelBuilder; + +/** + * Created by davidcosse on 03/06/14. + */ +public class EntryEBPModel extends AbstractLimaModel<EntryEBP> implements ExportModel<EntryEBP> { + + public EntryEBPModel() { + super(','); + newMandatoryColumn("Journal", EntryEBP.PROPERTY_JOURNAL); + newMandatoryColumn("Compte", EntryEBP.PROPERTY_COMPTE); + newMandatoryColumn("DatEcr", EntryEBP.PROPERTY_DAT_ECR, DATE_PARSER); + newIgnoredColumn("DatVal"); + newIgnoredColumn("DatSai"); + newIgnoredColumn("DatEch"); + newIgnoredColumn("Poste"); + newMandatoryColumn("Piece", EntryEBP.PROPERTY_PIECE); + newIgnoredColumn("NumDoc"); + newOptionalColumn("Libelle", EntryEBP.PROPERTY_LIBELLE); + newOptionalColumn("Debit", EntryEBP.PROPERTY_DEBIT, BIG_DECIMAL_WITH_NULL_PARSER); + newOptionalColumn("Credit", EntryEBP.PROPERTY_CREDIT, BIG_DECIMAL_WITH_NULL_PARSER); + newIgnoredColumn("Devise"); + newIgnoredColumn("TauxDevise"); + newIgnoredColumn("DevDebit"); + newIgnoredColumn("DevCredit"); + newIgnoredColumn("CDebit"); + newIgnoredColumn("CCredit"); + newOptionalColumn("Lettre", EntryEBP.PROPERTY_LETTRE); + newIgnoredColumn("Rapp"); + newIgnoredColumn("CodReg"); + newIgnoredColumn("Cheque"); + newIgnoredColumn("CptTVA"); + newIgnoredColumn("MoisTVA"); + newIgnoredColumn("GTypEcr"); + newIgnoredColumn("GNumEcr"); + newIgnoredColumn("DateReleve"); + newIgnoredColumn("DatLet"); + newIgnoredColumn("SoftImport"); + newIgnoredColumn("RefBVR"); + newIgnoredColumn("NumAdhBVR"); + newIgnoredColumn("DatderGen"); + newIgnoredColumn("LetPart"); + newIgnoredColumn("bSaisieKM"); + } + + @Override + public Iterable<ExportableColumn<EntryEBP, Object>> getColumnsForExport() { + ModelBuilder<EntryEBP> modelBuilder = new ModelBuilder<>(); + modelBuilder.newColumnForExport("Journal", EntryEBP.PROPERTY_JOURNAL); + modelBuilder.newColumnForExport("Compte", EntryEBP.PROPERTY_COMPTE, ACCOUNT_TO_ACCOUNT_NUMBER_FORMATTER); + modelBuilder.newColumnForExport("DatEcr", EntryEBP.PROPERTY_DAT_ECR, DATE_FORMATTER); + modelBuilder.newColumnForExport("Piece", EntryEBP.PROPERTY_PIECE); + modelBuilder.newColumnForExport("Libelle", EntryEBP.PROPERTY_LIBELLE); + modelBuilder.newColumnForExport("Debit", EntryEBP.PROPERTY_DEBIT, BIG_DECIMAL_FORMATTER); + modelBuilder.newColumnForExport("Credit", EntryEBP.PROPERTY_CREDIT, BIG_DECIMAL_FORMATTER); + modelBuilder.newColumnForExport("Lettre", EntryEBP.PROPERTY_LETTRE); + + return (Iterable) modelBuilder.getColumnsForExport(); + } + + @Override + public EntryEBP newEmptyInstance() { + return new EntryEBPImpl(); + } +} Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ebp/EntryEBPModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima :: business * - * $Id: DatabaseMigrationClass.java 3322 2012-01-17 09:35:25Z echatellier $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Victor Salaun * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima :: business * - * $Id: MigrationV0V0_5.java 3296 2011-09-20 17:49:06Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Victor Salaun * %% @@ -28,6 +28,7 @@ import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.Version; + import java.util.List; public class MigrationV0V0_5 extends MigrationCallBackForVersion { Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima :: business * - * $Id: MigrationV0_6.java 3421 2012-05-15 09:53:13Z echatellier $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin, Chatellier Eric * %% @@ -32,7 +32,6 @@ import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.Version; - import java.util.List; /** Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_8.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/AccountComparator.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/AccountComparator.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/AccountComparator.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: AccountComparator.java 3290 2011-09-17 12:55:34Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/AccountComparator.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/AccountEBPComparator.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/AccountEBPComparator.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/AccountEBPComparator.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: AccountEBPComparator.java 3290 2011-09-17 12:55:34Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/AccountEBPComparator.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/DocumentsEnum.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/DocumentsEnum.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/DocumentsEnum.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: DocumentsEnum.java 3777 2014-04-14 07:29:08Z sbavencoff $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/DocumentsEnum.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/EntryComparator.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/EntryComparator.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/EntryComparator.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: EntryComparator.java 3721 2013-12-31 15:03:48Z sbavencoff $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/EntryComparator.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/EntryEBPComparator.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/EntryEBPComparator.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/EntryEBPComparator.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: EntryEBPComparator.java 3290 2011-09-17 12:55:34Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin * %% @@ -30,8 +30,6 @@ import org.chorem.lima.beans.EntryEBP; import java.io.Serializable; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.Comparator; import java.util.Date; @@ -45,19 +43,12 @@ @Override public int compare(EntryEBP o1, EntryEBP o2) { int result = 0; - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - try { - Date date1 = sdf.parse(o1.getDatEcr()); - Date date2 = sdf.parse(o2.getDatEcr()); - result = date1.compareTo(date2); - if (result == 0) { - result = o1.getJournal().compareTo(o2.getJournal()); - } - } catch (ParseException eee) { - log.error("Can't parse date", eee); + Date date1 = o1.getDatEcr(); + Date date2 = o2.getDatEcr(); + result = date1.compareTo(date2); + if (result == 0) { + result = o1.getJournal().compareTo(o2.getJournal()); } - - return result; } Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/EntryEBPComparator.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialPeriodComparator.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialPeriodComparator.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialPeriodComparator.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima :: business * - * $Id: FinancialPeriodComparator.java 3442 2012-06-05 14:51:55Z echatellier $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Victor Salaun * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialPeriodComparator.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialTransactionComparator.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialTransactionComparator.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialTransactionComparator.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -3,8 +3,8 @@ /* * #%L * Lima :: business - * $Id: FinancialTransactionComparator.java 3695 2013-07-10 09:11:39Z athimel $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2013 CodeLutin * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialTransactionComparator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FiscalPeriodComparator.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FiscalPeriodComparator.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FiscalPeriodComparator.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: FiscalPeriodComparator.java 3290 2011-09-17 12:55:34Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FiscalPeriodComparator.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ /* * #%L * Lima :: business - * $Id: LetteringComparator.java 3740 2014-01-17 22:12:04Z dcosse $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/LetteringComparator.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: LimaServiceFactory.java 3797 2014-05-14 11:51:21Z echatellier $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/main/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima Swing * - * $Id: ServiceMonitorableHandler.java 3322 2012-01-17 09:35:25Z echatellier $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% @@ -43,10 +43,10 @@ * All other call are forwarded on notified to registered listeners. * * @author chatellier - * @version $Revision: 3322 $ + * @version $Revision$ * - * Last update : $Date: 2012-01-17 10:35:25 +0100 (mar. 17 janv. 2012) $ - * By : $Author: echatellier $ + * Last update : $Date$ + * By : $Author$ */ public class ServiceMonitorableHandler implements InvocationHandler { Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/main/java/org/chorem/lima/service/package-info.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/service/package-info.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/main/java/org/chorem/lima/service/package-info.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima Business * - * $Id: package-info.java 3585 2012-08-08 14:52:14Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/service/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,7 +1,7 @@ /* * #%L - * $Id: AbstractLimaTest.java 3408 2012-05-09 15:37:59Z echatellier $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Codelutin, Chatellier Eric * %% @@ -72,10 +72,10 @@ * Common initialization code for all lima tests. * * @author chatellier - * @version $Revision: 3408 $ + * @version $Revision$ * <p/> - * Last update : $Date: 2012-05-09 17:37:59 +0200 (mer. 09 mai 2012) $ - * By : $Author: echatellier $ + * Last update : $Date$ + * By : $Author$ */ public abstract class AbstractLimaTest { Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: AccountServiceImplTest.java 3400 2012-05-04 09:43:18Z echatellier $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: EntryBookServiceImplTest.java 3391 2012-04-25 08:28:20Z echatellier $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: FinancialPeriodServiceImplTest.java 3614 2012-08-20 11:59:56Z echatellier $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,7 +1,7 @@ /* * #%L - * $Id: FinancialTransactionServiceImplTest.java 3710 2013-10-11 13:56:17Z Bavencoff $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 Codelutin, Chatellier Eric * %% @@ -45,10 +45,10 @@ * Test on financial transaction service. * * @author chatellier - * @version $Revision: 3710 $ + * @version $Revision$ * - * Last update : $Date: 2013-10-11 15:56:17 +0200 (ven. 11 oct. 2013) $ - * By : $Author: Bavencoff $ + * Last update : $Date$ + * By : $Author$ */ public class FinancialTransactionServiceImplTest extends AbstractLimaTest { Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: FiscalPeriodServiceImplTest.java 3391 2012-04-25 08:28:20Z echatellier $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/ImportServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/ImportServiceImplTest.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/ImportServiceImplTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,7 +1,7 @@ /* * #%L - * $Id: ImportServiceImplTest.java 3585 2012-08-08 14:52:14Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 Codelutin, Chatellier Eric * %% @@ -38,10 +38,10 @@ * Test du service d'import en faisant des import/export EBP et xml. * * @author chatellier - * @version $Revision: 3585 $ + * @version $Revision$ * - * Last update : $Date: 2012-08-08 16:52:14 +0200 (mer. 08 août 2012) $ - * By : $Author: tchemit $ + * Last update : $Date$ + * By : $Author$ */ public class ImportServiceImplTest extends AbstractLimaTest { @@ -79,10 +79,10 @@ importService.importEntryBookFromEbp(entryBookData); entryBookStream.close(); - entriesStream = ImportServiceImplTest.class.getResourceAsStream("/ebp/ecritures.txt"); - String entriesData = IOUtils.toString(entriesStream, "ISO-8859-1"); - importService.importEntriesFromEbp(entriesData); - entriesStream.close(); +// entriesStream = ImportServiceImplTest.class.getResourceAsStream("/ebp/ecritures.txt"); +// String entriesData = IOUtils.toString(entriesStream, "ISO-8859-1"); +// importService.importEntriesFromEbp(entriesData); +// entriesStream.close(); } finally { IOUtils.closeQuietly(accountStream); Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/ImportServiceImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ /* * #%L * Lima :: business - * $Id: LetteringComparatorTest.java 3585 2012-08-08 14:52:14Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin * %% Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/LetteringComparatorTest.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,7 +1,7 @@ /* * #%L - * $Id: LimaMiscTest.java 3585 2012-08-08 14:52:14Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 Codelutin, Chatellier Eric * %% @@ -31,10 +31,10 @@ * Lima misc tests. * * @author chatellier - * @version $Revision: 3585 $ + * @version $Revision$ * - * Last update : $Date: 2012-08-08 16:52:14 +0200 (mer. 08 août 2012) $ - * By : $Author: tchemit $ + * Last update : $Date$ + * By : $Author$ */ public class LimaMiscTest extends AbstractLimaTest { Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.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/LimaTestsConfig.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/NewImportExportServiceTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/NewImportExportServiceTest.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/NewImportExportServiceTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Lists; import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.IOUtils; @@ -10,6 +32,7 @@ import org.chorem.lima.entity.FinancialStatement; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; +import org.chorem.lima.entity.FiscalPeriodImpl; import org.junit.Assert; import org.junit.Test; @@ -332,4 +355,18 @@ Assert.assertEquals(55, result.getNbCreated()); Assert.assertEquals(55, vatStatementService.getAllVatStatements().size()); } + + @Test + public void testImportEntriesFromEBP() throws Exception { + // create fiscal period (mandatory for import) + FiscalPeriod fiscalPeriod = new FiscalPeriodImpl(); + fiscalPeriod.setBeginDate(df.parse("January 1, 2012")); + fiscalPeriod.setEndDate(df.parse("December 31, 2012")); + fiscalPeriodService.createFiscalPeriod(fiscalPeriod); + + InputStream entriesStream = NewImportExportServiceTest.class.getResourceAsStream("/ebp/ecritures.txt"); + String entriesData = IOUtils.toString(entriesStream, "ISO-8859-1"); + ImportResult result = newImportService.importEntriesFromEbp(entriesData); + entriesStream.close(); + } } Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/NewImportExportServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima business * - * $Id: ReportServiceImplTest.java 3585 2012-08-08 14:52:14Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin, Chatellier Eric * %% @@ -38,9 +38,7 @@ import org.junit.Test; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Date; -import java.util.List; /** * Test le service de génération des reports. Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,7 +1,7 @@ /* * #%L - * $Id: AccountServiceRuleFrTest.java 3747 2014-02-17 08:41:35Z dcosse $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 Codelutin, Chatellier Eric * %% @@ -25,13 +25,8 @@ import org.chorem.lima.business.AccountServiceImplTest; import org.chorem.lima.business.LimaConfig; -import org.chorem.lima.business.LimaException; -import org.chorem.lima.entity.Account; -import org.chorem.lima.entity.AccountImpl; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; /** @@ -42,10 +37,10 @@ * Plus ajout de test specific à la locale FR. * * @author chatellier - * @version $Revision: 3747 $ + * @version $Revision$ * - * Last update : $Date: 2014-02-17 09:41:35 +0100 (lun. 17 févr. 2014) $ - * By : $Author: dcosse $ + * Last update : $Date$ + * By : $Author$ */ public class AccountServiceRuleFrTest extends AccountServiceImplTest { Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,7 +1,7 @@ /* * #%L - * $Id: EntryBookServiceRuleFrTest.java 3585 2012-08-08 14:52:14Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 Codelutin, Chatellier Eric * %% @@ -27,7 +27,6 @@ import org.chorem.lima.business.LimaConfig; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; /** @@ -38,10 +37,10 @@ * Plus ajout de test specific à la locale FR. * * @author chatellier - * @version $Revision: 3585 $ + * @version $Revision$ * - * Last update : $Date: 2012-08-08 16:52:14 +0200 (mer. 08 août 2012) $ - * By : $Author: tchemit $ + * Last update : $Date$ + * By : $Author$ */ public class EntryBookServiceRuleFrTest extends EntryBookServiceImplTest { Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,7 +1,7 @@ /* * #%L - * $Id: FinancialPeriodServiceRuleFrTest.java 3585 2012-08-08 14:52:14Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 Codelutin, Chatellier Eric * %% @@ -27,7 +27,6 @@ import org.chorem.lima.business.LimaConfig; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; /** @@ -38,10 +37,10 @@ * Plus ajout de test specific à la locale FR. * * @author chatellier - * @version $Revision: 3585 $ + * @version $Revision$ * - * Last update : $Date: 2012-08-08 16:52:14 +0200 (mer. 08 août 2012) $ - * By : $Author: tchemit $ + * Last update : $Date$ + * By : $Author$ */ public class FinancialPeriodServiceRuleFrTest extends EntryBookServiceImplTest { Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,7 +1,7 @@ /* * #%L - * $Id: FinancialTransactionServiceRuleFrTest.java 3585 2012-08-08 14:52:14Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 Codelutin, Chatellier Eric * %% @@ -27,7 +27,6 @@ import org.chorem.lima.business.LimaConfig; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; /** @@ -38,10 +37,10 @@ * Plus ajout de test specific à la locale FR. * * @author chatellier - * @version $Revision: 3585 $ + * @version $Revision$ * - * Last update : $Date: 2012-08-08 16:52:14 +0200 (mer. 08 août 2012) $ - * By : $Author: tchemit $ + * Last update : $Date$ + * By : $Author$ */ public class FinancialTransactionServiceRuleFrTest extends FinancialTransactionServiceImplTest { Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,7 +1,7 @@ /* * #%L - * $Id: FiscalPeriodServiceRuleFrTest.java 3585 2012-08-08 14:52:14Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 Codelutin, Chatellier Eric * %% @@ -27,7 +27,6 @@ import org.chorem.lima.business.LimaConfig; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; /** @@ -38,10 +37,10 @@ * Plus ajout de test specific à la locale FR. * * @author chatellier - * @version $Revision: 3585 $ + * @version $Revision$ * - * Last update : $Date: 2012-08-08 16:52:14 +0200 (mer. 08 août 2012) $ - * By : $Author: tchemit $ + * Last update : $Date$ + * By : $Author$ */ public class FiscalPeriodServiceRuleFrTest extends FiscalPeriodServiceImplTest { Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,7 +1,7 @@ /* * #%L - * $Id: ImportServiceRuleFrTest.java 3585 2012-08-08 14:52:14Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 Codelutin, Chatellier Eric * %% @@ -39,10 +39,10 @@ * Plus ajout de test specific à la locale FR. * * @author chatellier - * @version $Revision: 3585 $ + * @version $Revision$ * - * Last update : $Date: 2012-08-08 16:52:14 +0200 (mer. 08 août 2012) $ - * By : $Author: tchemit $ + * Last update : $Date$ + * By : $Author$ */ public class ImportServiceRuleFrTest extends ImportServiceImplTest { Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ImportServiceRuleFrTest.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,7 +1,7 @@ /* * #%L - * $Id: ReportServiceRuleFrTest.java 3585 2012-08-08 14:52:14Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 Codelutin, Chatellier Eric * %% @@ -38,10 +38,10 @@ * Plus ajout de test specific à la locale FR. * * @author chatellier - * @version $Revision: 3585 $ + * @version $Revision$ * - * Last update : $Date: 2012-08-08 16:52:14 +0200 (mer. 08 août 2012) $ - * By : $Author: tchemit $ + * Last update : $Date$ + * By : $Author$ * * FIXME echatellier 20120424 fix parent test first */ Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,7 +1,7 @@ /* * #%L - * $Id: TestAccountingRules.java 3777 2014-04-14 07:29:08Z sbavencoff $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-business/src/test/java/org/chorem/lima... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 Codelutin, Chatellier Eric * %% @@ -49,10 +49,10 @@ * et FranceAccountingRules une autre fois. * * @author chatellier - * @version $Revision: 3777 $ + * @version $Revision$ * - * Last update : $Date: 2014-04-14 09:29:08 +0200 (lun. 14 avril 2014) $ - * By : $Author: sbavencoff $ + * Last update : $Date$ + * By : $Author$ */ @Ignore public class TestAccountingRules extends DefaultAccountingRules { Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,7 +1,7 @@ /* * #%L - * $Id: FinancialTransactionDAOTest.java 3585 2012-08-08 14:52:14Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/test/java/org/chorem/... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 Codelutin, Chatellier Eric * %% @@ -34,10 +34,10 @@ * Test for {@link FinancialTransactionTopiaDao}. * * @author chatellier - * @version $Revision: 3585 $ + * @version $Revision$ * - * Last update : $Date: 2012-08-08 16:52:14 +0200 (mer. 08 août 2012) $ - * By : $Author: tchemit $ + * Last update : $Date$ + * By : $Author$ */ public class FinancialTransactionDAOTest extends AbstractLimaTest { Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/entity/FinancialTransactionDAOTest.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/lima-business/src/test/resources/import/bcr_developed.csv ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/lima-business/src/test/resources/import/vat_shortened.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/LimaTechnicalException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/AccountException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/AfterLastFiscalPeriodException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/AfterLastFiscalPeriodException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/AfterLastFiscalPeriodException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.Date; /** Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/AfterLastFiscalPeriodException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistAccountException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistFinancialStatement.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistFinancialStatement.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistFinancialStatement.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * Created by davidcosse on 28/07/14. */ Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistFinancialStatement.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistVatStatement.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistVatStatement.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistVatStatement.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * Created by davidcosse on 28/07/14. */ Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyExistVatStatement.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyLockedFiscalPeriodException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyLockedFiscalPeriodException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyLockedFiscalPeriodException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.FiscalPeriod; /** Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/AlreadyLockedFiscalPeriodException.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/BeforeFirstFiscalPeriodException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/BeforeFirstFiscalPeriodException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/BeforeFirstFiscalPeriodException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.Date; /** Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/BeforeFirstFiscalPeriodException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/BeginAfterEndFiscalPeriodException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/BeginAfterEndFiscalPeriodException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/BeginAfterEndFiscalPeriodException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.FiscalPeriod; /** Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/BeginAfterEndFiscalPeriodException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBookException.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBooksException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBooksException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBooksException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.ClosedPeriodicEntryBook; import java.util.Collection; Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/ClosedPeriodicEntryBooksException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/DateException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/DateException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/DateException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.Date; /** Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/DateException.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntriesException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntriesException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntriesException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.Entry; import java.util.Collection; Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntriesException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/EntryBookException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialPeriodException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialPeriodException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialPeriodException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.FinancialPeriod; /** Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialPeriodException.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialTransactionsException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialTransactionsException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialTransactionsException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.FinancialTransaction; import java.util.Collection; Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/FinancialTransactionsException.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/FiscalPeriodException.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportEbpException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportEbpException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportEbpException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -25,7 +25,7 @@ /** * @author Sylvain Bavencoff <bavencoff@codelutin.com> */ -public class ImportEbpException extends Exception { +public class ImportEbpException extends LimaException { public ImportEbpException(String message) { super(message); Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportEbpException.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.HashMap; import java.util.Map; /** Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportResult.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportResult.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportResult.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.Serializable; /** Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportResult.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/InvalidAccountNumberException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/LastUnlockedFiscalPeriodException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/LastUnlockedFiscalPeriodException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/LastUnlockedFiscalPeriodException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.FiscalPeriod; /** Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/LastUnlockedFiscalPeriodException.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/LimaException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/LimaException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/LimaException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -53,6 +53,23 @@ } /** + * Constructs a new exception with specified message. + * + */ + public LimaException(String message) { + super(message); + } + + /** + * Constructs a new exception with specified message and cause. + * @param message + * @param cause + */ + public LimaException(String message, Throwable cause) { + super(message, cause); + } + + /** * Constructs a new exception with the specified cause. * * @param cause cause Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedEntryBookException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedEntryBookException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedEntryBookException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.ClosedPeriodicEntryBook; /** Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedEntryBookException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedFinancialPeriodException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedFinancialPeriodException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedFinancialPeriodException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.FinancialPeriod; /** Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/LockedFinancialPeriodException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/MoreOneUnlockFiscalPeriodException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/MoreOneUnlockFiscalPeriodException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/MoreOneUnlockFiscalPeriodException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * @author Sylvain Bavencoff <bavencoff@codelutin.com> */ Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/MoreOneUnlockFiscalPeriodException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/NoEmptyFiscalPeriodException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/NoEmptyFiscalPeriodException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/NoEmptyFiscalPeriodException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.FinancialTransaction; import java.util.Collection; Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/NoEmptyFiscalPeriodException.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/NoFoundFinancialPeriodException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/NoFoundFinancialPeriodException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/NoFoundFinancialPeriodException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.Date; /** Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/NoFoundFinancialPeriodException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotAllowedLabel.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotAllowedLabel.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotAllowedLabel.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * Created by davidcosse on 31/07/14. */ Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotAllowedLabel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotBeginNextDayOfLastFiscalPeriodException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotBeginNextDayOfLastFiscalPeriodException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotBeginNextDayOfLastFiscalPeriodException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.FiscalPeriod; /** Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotBeginNextDayOfLastFiscalPeriodException.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotLockedClosedPeriodicEntryBooksException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotLockedClosedPeriodicEntryBooksException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotLockedClosedPeriodicEntryBooksException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.ClosedPeriodicEntryBook; import java.util.Collection; Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/NotLockedClosedPeriodicEntryBooksException.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnbalancedEntriesException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnbalancedEntriesException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnbalancedEntriesException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.Entry; import java.util.Collection; Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnbalancedEntriesException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnbalancedFinancialTransactionsException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnbalancedFinancialTransactionsException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnbalancedFinancialTransactionsException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.FinancialTransaction; import java.util.Collection; Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnbalancedFinancialTransactionsException.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnfilledEntriesException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnfilledEntriesException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnfilledEntriesException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.Entry; import java.util.Collection; Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/UnfilledEntriesException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedAccountException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/UsedEntryBookException.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/WithoutEntryBookFinancialTransactionsException.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/WithoutEntryBookFinancialTransactionsException.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/WithoutEntryBookFinancialTransactionsException.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.business; +/* + * #%L + * Lima :: business API + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.chorem.lima.entity.FinancialTransaction; import java.util.Collection; Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/WithoutEntryBookFinancialTransactionsException.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/ImportService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/ImportService.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/ImportService.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -54,15 +54,6 @@ String importEntryBookFromEbp(String datas) throws ImportEbpException; /** - * Import entries as EBP import. - * - * @param data import file content as string (remote service can't take File) - * @return result log - * @throws LimaException - */ - String importEntriesFromEbp(String data) throws ImportEbpException; - - /** * Import content as CSV depending on import type. * * @param data import file content as string (remote service can't take File) Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/NewImportService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/NewImportService.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/NewImportService.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -23,6 +23,7 @@ */ import org.chorem.lima.business.AlreadyExistAccountException; +import org.chorem.lima.business.ImportEbpException; import org.chorem.lima.business.ImportResult; import org.chorem.lima.business.InvalidAccountNumberException; @@ -46,4 +47,6 @@ ImportResult importVATStatementsAsCSV(String contents); List<ImportResult> importBackup(String entryBooks, String transactions, String fiscalPeriods, String accounts, String entries) throws AlreadyExistAccountException, InvalidAccountNumberException; + + ImportResult importEntriesFromEbp(String datas) throws ImportEbpException; } Property changes on: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/NewImportService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/DefaultServiceContext.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/ServiceContext.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima callao * - * $Id: AccountDAOImpl.java 3613 2012-08-20 11:38:22Z mallon $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-callao/src/main/java/org/chorem/li... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountTopiaDao.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima callao * - * $Id: ClosedPeriodicEntryBookDAOImpl.java 3476 2012-06-26 15:48:13Z echatellier $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-callao/src/main/java/org/chorem/lima/e... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima callao * * - * $Id: EntryDAOImpl.java 3783 2014-05-06 16:47:18Z dcosse $ - * $HeadURL: http://svn.chorem.org/lima/trunk/lima-callao/src/main/java/org/chorem/lima/e... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryTopiaDao.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima callao * - * $Id: FinancialPeriodDAOImpl.java 3476 2012-06-26 15:48:13Z echatellier $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-callao/src/main/java/org/chorem/li... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodTopiaDao.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementTopiaDao.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementTopiaDao.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima callao * - * $Id: FinancialStatementDAOImpl.java 3585 2012-08-08 14:52:14Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-callao/src/main/java/org/chorem/li... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin, Chatellier Eric * %% @@ -32,10 +32,10 @@ * Ajout de requetes specifiques aux {@link FinancialStatement} sur le DAO. * * @author chatellier - * @version $Revision: 3585 $ + * @version $Revision$ * - * Last update : $Date: 2012-08-08 16:52:14 +0200 (mer. 08 août 2012) $ - * By : $Author: tchemit $ + * Last update : $Date$ + * By : $Author$ */ public class FinancialStatementTopiaDao extends AbstractFinancialStatementTopiaDao<FinancialStatement> { Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementTopiaDao.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima callao * - * $Id: FinancialTransactionDAOImpl.java 3688 2013-06-27 13:12:22Z Bavencoff $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-callao/src/main/java/org/chorem/li... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin, Chatellier Eric * %% @@ -40,10 +40,10 @@ * Ajout de requetes specifiques aux financial transaction sur le DAO. * * @author chatellier - * @version $Revision: 3688 $ + * @version $Revision$ * - * Last update : $Date: 2013-06-27 15:12:22 +0200 (jeu. 27 juin 2013) $ - * By : $Author: Bavencoff $ + * Last update : $Date$ + * By : $Author$ */ public class FinancialTransactionTopiaDao extends AbstractFinancialTransactionTopiaDao<FinancialTransaction> { Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima callao * - * $Id: FiscalPeriodDAOImpl.java 3598 2012-08-10 16:31:26Z mallon $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-callao/src/main/java/org/chorem/li... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin, Chatellier Eric * %% @@ -29,10 +29,10 @@ * Fiscal period entity DAO. * * @author chatellier - * @version $Revision: 3598 $ + * @version $Revision$ * - * Last update : $Date: 2012-08-10 18:31:26 +0200 (ven. 10 août 2012) $ - * By : $Author: mallon $ + * Last update : $Date$ + * By : $Author$ */ public class FiscalPeriodTopiaDao extends AbstractFiscalPeriodTopiaDao<FiscalPeriod> { Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.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/LimaCallaoTopiaPersistenceContext.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementTopiaDao.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementTopiaDao.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementTopiaDao.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -2,8 +2,8 @@ * #%L * Lima callao * - * $Id: VatStatementDAOImpl.java 3585 2012-08-08 14:52:14Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-callao/src/main/java/org/chorem/li... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 CodeLutin, Chatellier Eric * %% @@ -34,10 +34,10 @@ * Ajout de requetes specifiques aux {@code VatStatement} sur le DAO. * * @author chatellier - * @version $Revision: 3585 $ + * @version $Revision$ * - * Last update : $Date: 2012-08-08 16:52:14 +0200 (mer. 08 août 2012) $ - * By : $Author: tchemit $ + * Last update : $Date$ + * By : $Author$ */ public class VatStatementTopiaDao extends AbstractVatStatementTopiaDao<VatStatement> { Property changes on: trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementTopiaDao.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-callao/src/main/xmi/accounting-model.zargo =================================================================== (Binary files differ) Property changes on: trunk/lima-swing/src/main/assembly/lima.bat ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.css 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.css 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,3 +1,24 @@ +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #tab { opaque : false; } Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.css ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,3 +1,24 @@ +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #mainView { title : "lima.ui.mainview.title"; Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AutoCompleteTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AutoCompleteTableCellEditor.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AutoCompleteTableCellEditor.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,5 +1,27 @@ package org.chorem.lima.ui.celleditor; +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator; Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/AutoCompleteTableCellEditor.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.css =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.css 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.css 2014-07-31 15:10:21 UTC (rev 3883) @@ -1,3 +1,24 @@ +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ .infoPanel { Property changes on: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.css ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-07-31 15:04:52 UTC (rev 3882) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-07-31 15:10:21 UTC (rev 3883) @@ -230,11 +230,13 @@ //For windows ebp datas = extractFile(filePath, EncodingEnum.ISOLATIN1.getEncoding()); result = importService.importAccountsChartFromEbp(datas); + // TODO DCossé 24/07/14 change result + result = "SUCCESS"; break; case EBP_ENTRIES_IMPORT: //For windows ebp datas = extractFile(filePath, EncodingEnum.ISOLATIN1.getEncoding()); - result = importService.importEntriesFromEbp(datas); + importResult = newImportService.importEntriesFromEbp(datas); break; case EBP_ENTRYBOOKS_IMPORT: datas = extractFile(filePath, EncodingEnum.ISOLATIN1.getEncoding());