February 2012 - Lima-commits - mailman.cloud.codelutin.com

r3336 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by echatellier＠users.chorem.org Feb. 22, 2012

Feb. 22, 2012

Author: echatellier Date: 2012-02-22 10:56:52 +0100 (Wed, 22 Feb 2012) New Revision: 3336 Url: http://chorem.org/repositories/revision/lima/3336 Log: Fix sub entries sum query Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 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 2012-02-21 15:56:10 UTC (rev 3335) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-02-22 09:56:52 UTC (rev 3336) @@ -317,7 +317,8 @@ TopiaQuery query = financialTransactionDAO.createQuery("T"); query.addFrom(FiscalPeriod.class, "F") .addLeftJoin("T." + FinancialTransaction.PROPERTY_ENTRY, "E", false) - .addWhere("T.amountCredit = T.amountDebit") + .addWhere("(select sum(amount) from " + Entry.class.getName() + " where debit = false and financialTransaction = T) <> " + + "(select sum(amount) from " + Entry.class.getName() + " where debit = true and financialTransaction = T)") .addNotNull("E.account") .addNotNull("T.entryBook") .addInElements("T.financialPeriod", "F.financialPeriod")

1 0

r3335 - trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules
by echatellier＠users.chorem.org Feb. 21, 2012

Feb. 21, 2012

Author: echatellier Date: 2012-02-21 16:56:10 +0100 (Tue, 21 Feb 2012) New Revision: 3335 Url: http://chorem.org/repositories/revision/lima/3335 Log: Fix doc 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/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 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 2012-02-21 15:55:51 UTC (rev 3334) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java 2012-02-21 15:56:10 UTC (rev 3335) @@ -34,7 +34,7 @@ /** * Add configuration to add specific test on French rules set. * - * (redo all test defined in AccountServiceImplTest). + * (redo all test defined in EntryBookServiceImplTest). * * Plus ajout de test specific à la locale FR. * 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 2012-02-21 15:55:51 UTC (rev 3334) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java 2012-02-21 15:56:10 UTC (rev 3335) @@ -34,7 +34,7 @@ /** * Add configuration to add specific test on French rules set. * - * (redo all test defined in AccountServiceImplTest). + * (redo all test defined in EntryBookServiceImplTest). * * Plus ajout de test specific à la locale FR. * 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 2012-02-21 15:55:51 UTC (rev 3334) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java 2012-02-21 15:56:10 UTC (rev 3335) @@ -34,7 +34,7 @@ /** * Add configuration to add specific test on French rules set. * - * (redo all test defined in AccountServiceImplTest). + * (redo all test defined in FinancialTransactionServiceImplTest). * * Plus ajout de test specific à la locale FR. * 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 2012-02-21 15:55:51 UTC (rev 3334) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java 2012-02-21 15:56:10 UTC (rev 3335) @@ -34,7 +34,7 @@ /** * Add configuration to add specific test on French rules set. * - * (redo all test defined in AccountServiceImplTest). + * (redo all test defined in FiscalPeriodServiceImplTest). * * Plus ajout de test specific à la locale FR. *

1 0

r3334 - in trunk/lima-business/src: main/java/org/chorem/lima/business/ejb main/java/org/chorem/lima/business/ejbinterface test/java/org/chorem/lima/business test/java/org/chorem/lima/business/accountingrules
by echatellier＠users.chorem.org Feb. 21, 2012

Feb. 21, 2012

Author: echatellier Date: 2012-02-21 16:55:51 +0100 (Tue, 21 Feb 2012) New Revision: 3334 Url: http://chorem.org/repositories/revision/lima/3334 Log: Ajout test report. Correction report sans transactions non balanc?\195?\169es (en harcod?\195?\169, ya que ca de vrai) Added: trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ReportService.java trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java 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 2012-02-21 15:07:06 UTC (rev 3333) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2012-02-21 15:55:51 UTC (rev 3334) @@ -162,7 +162,7 @@ /** * Query for find entries for accountsreports and balancereports - * Just exact and balanced transaction are calculated + * Just exact and balanced transaction are calculated. * * @param account * @param beginDate @@ -181,17 +181,13 @@ String transactionDateProperty = TopiaQuery.getProperty( Entry.PROPERTY_FINANCIAL_TRANSACTION, FinancialTransaction.PROPERTY_TRANSACTION_DATE); - - // FIXME 20120110 echatellier amoutcredit and debit removed since 0.6 - //String amountCreditProperty = TopiaQuery.getProperty( - // Entry.PROPERTY_FINANCIAL_TRANSACTION, FinancialTransaction.PROPERTY_AMOUNT_CREDIT); - //String amountDebitProperty = TopiaQuery.getProperty( - // Entry.PROPERTY_FINANCIAL_TRANSACTION, FinancialTransaction.PROPERTY_AMOUNT_DEBIT); String entryBookProperty = TopiaQuery.getProperty( Entry.PROPERTY_FINANCIAL_TRANSACTION, FinancialTransaction.PROPERTY_ENTRY_BOOK); + // echatellier, oui c'est hardcodé, mais qu'est ce que c'est illisible sans ca query - //.addWhere(amountCreditProperty + " = " + amountDebitProperty) + .addWhere("(select sum(E2.amount) from " + Entry.class.getName() + " E2 where E2.debit = false and E2.financialTransaction = E.financialTransaction) = " + + "(select sum(E2.amount) from " + Entry.class.getName() + " E2 where E2.debit = true and E2.financialTransaction = E.financialTransaction)") .addWhere(transactionDateProperty + " BETWEEN :beginDate AND :endDate") .addNotNull(entryBookProperty) .addParam("beginDate", beginDate) Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ReportService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ReportService.java 2012-02-21 15:07:06 UTC (rev 3333) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ReportService.java 2012-02-21 15:55:51 UTC (rev 3334) @@ -75,7 +75,7 @@ Boolean movementedFilter) throws LimaException; /** - * Generation du grand-livre + * Generation du grand-livre. * * @param beginDate * @param endDate @@ -91,7 +91,7 @@ /** - * Generation du rapports des comptes + * Generation du rapports des comptes. * * @param account * @param thirdPartAccountsMode @@ -107,7 +107,7 @@ /** - * Calculate all credit, debit and solde amounts for the balance + * Calculate all credit, debit and solde amounts for the balance. * <p/> * Get all entries if true * @@ -126,7 +126,7 @@ TopiaContext topiaContext) throws LimaException; /** - * Generation du rapports des journaux + * Generation du rapports des journaux. * * @param entryBook * @param beginDate @@ -139,7 +139,7 @@ Date endDate) throws LimaException; /** - * Generate VAT + * Generate VAT. * * @param fiscalPeriod * @return 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 2012-02-21 15:07:06 UTC (rev 3333) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 2012-02-21 15:55:51 UTC (rev 3334) @@ -26,6 +26,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.math.BigDecimal; import java.text.DateFormat; import java.text.ParseException; import java.util.Locale; @@ -44,10 +45,16 @@ import org.chorem.lima.business.ejbinterface.FinancialPeriodService; import org.chorem.lima.business.ejbinterface.FinancialTransactionService; import org.chorem.lima.business.ejbinterface.FiscalPeriodService; +import org.chorem.lima.business.ejbinterface.ReportService; 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.FinancialPeriod; +import org.chorem.lima.entity.FinancialTransaction; +import org.chorem.lima.entity.FinancialTransactionImpl; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.FiscalPeriodImpl; import org.chorem.lima.entity.LimaCallaoDAOHelper; @@ -79,6 +86,7 @@ protected static FinancialPeriodService financialPeriodService; protected static FinancialTransactionService financialTransactionService; protected static FiscalPeriodService fiscalPeriodService; + protected static ReportService reportService; /** * This is a before class method, but junit will fail to run inherited @@ -109,6 +117,7 @@ financialPeriodService = LimaServiceFactory.getService(FinancialPeriodServiceMonitorable.class); financialTransactionService = LimaServiceFactory.getService(FinancialTransactionServiceMonitorable.class); fiscalPeriodService = LimaServiceFactory.getService(FiscalPeriodServiceMonitorable.class); + reportService = LimaServiceFactory.getService(ReportServiceMonitorable.class); } /** @@ -187,7 +196,17 @@ */ @Before public void initTestDatabase() throws LimaException, ParseException { + initTestAccounts(); + initTestTransactions(); + } + /** + * Create a basic account plan. + * + * @throws LimaException + * @throws ParseException + */ + protected void initTestAccounts() throws LimaException, ParseException { // clear database clearService.clearDatabase(); @@ -218,10 +237,10 @@ accountService.createAccount(accountBefa, accountBanques); // creation d'un journal - EntryBook entryBook = new EntryBookImpl(); - entryBook.setLabel("Journal des ventes"); - entryBook.setCode("jdv"); - entryBookService.createEntryBook(entryBook); + EntryBook journalDesVentes = new EntryBookImpl(); + journalDesVentes.setLabel("Journal des ventes"); + journalDesVentes.setCode("jdv"); + entryBookService.createEntryBook(journalDesVentes); // creation d'un exercice fiscal FiscalPeriod fiscalPeriod = new FiscalPeriodImpl(); @@ -229,4 +248,43 @@ fiscalPeriod.setEndDate(df.parse("December 31, 2012")); fiscalPeriodService.createFiscalPeriod(fiscalPeriod); } + + /** + * Create some transaction in previous accounts. + * + * @throws LimaException + * @throws ParseException + */ + protected void initTestTransactions() throws LimaException, ParseException { + // add some transactions + // FIXME echatellier 20120221 fix test, following instance already in current method + EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); + Account accountVmpVae = accountService.getAccountByNumber("511"); + + // TODO echatellier 20120116 improve period choice + FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); + + FinancialTransaction transaction1 = new FinancialTransactionImpl(); + transaction1.setTransactionDate(df.parse("April 4, 2012")); + transaction1.setEntryBook(journalDesVentes); + transaction1.setFinancialPeriod(financialPeriod); + transaction1 = financialTransactionService.createFinancialTransaction(transaction1); + + Entry tr1Entry1 = new EntryImpl(); + tr1Entry1.setAmount(BigDecimal.valueOf(42.0)); + tr1Entry1.setAccount(accountVmpVae); + tr1Entry1.setFinancialTransaction(transaction1); + tr1Entry1.setDescription("test desc"); + tr1Entry1.setVoucher("voucher"); + tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); + + Entry tr1Entry2 = new EntryImpl(); + tr1Entry2.setAmount(BigDecimal.valueOf(42.0)); + tr1Entry2.setDebit(true); + tr1Entry2.setAccount(accountVmpVae); + tr1Entry2.setFinancialTransaction(transaction1); + tr1Entry2.setDescription("test desc"); + tr1Entry2.setVoucher("voucher"); + tr1Entry2 = financialTransactionService.createEntry(tr1Entry2); + } } 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 2012-02-21 15:07:06 UTC (rev 3333) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java 2012-02-21 15:55:51 UTC (rev 3334) @@ -53,45 +53,6 @@ public class FinancialTransactionServiceImplTest extends AbstractLimaTest { /** - * Init db with some transaction. - * - * @throws ParseException - * @throws LimaException - */ - @Before - public void initTransactions() throws ParseException, LimaException { - - EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); - Account accountVmpVae = accountService.getAccountByNumber("511"); - - // TODO echatellier 20120116 improve period choice - FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); - - FinancialTransaction transaction1 = new FinancialTransactionImpl(); - transaction1.setTransactionDate(df.parse("April 4, 2012")); - transaction1.setEntryBook(journalDesVentes); - transaction1.setFinancialPeriod(financialPeriod); - transaction1 = financialTransactionService.createFinancialTransaction(transaction1); - - Entry tr1Entry1 = new EntryImpl(); - tr1Entry1.setAmount(BigDecimal.valueOf(42.0)); - tr1Entry1.setAccount(accountVmpVae); - tr1Entry1.setFinancialTransaction(transaction1); - tr1Entry1.setDescription("test desc"); - tr1Entry1.setVoucher("voucher"); - tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); - - Entry tr1Entry2 = new EntryImpl(); - tr1Entry2.setAmount(BigDecimal.valueOf(42.0)); - tr1Entry2.setDebit(true); - tr1Entry2.setAccount(accountVmpVae); - tr1Entry2.setFinancialTransaction(transaction1); - tr1Entry2.setDescription("test desc"); - tr1Entry2.setVoucher("voucher"); - tr1Entry2 = financialTransactionService.createEntry(tr1Entry2); - } - - /** * Test to find all unbalanced transactions. * Nothing wrong here. * Added: trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java 2012-02-21 15:55:51 UTC (rev 3334) @@ -0,0 +1,107 @@ +/* + * #%L + * Lima business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Chatellier Eric + * %% + * 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% + */ + +package org.chorem.lima.business; + +import java.math.BigDecimal; +import java.text.ParseException; +import java.util.Date; + +import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.Entry; +import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.EntryImpl; +import org.chorem.lima.entity.FinancialPeriod; +import org.chorem.lima.entity.FinancialTransaction; +import org.chorem.lima.entity.FinancialTransactionImpl; +import org.junit.Assert; +import org.junit.Test; + +/** + * Test le service de génération des reports. + */ +public class ReportServiceImplTest extends AbstractLimaTest { + + /** + * Test de génération du rapport des comptes. + * + * @throws LimaException + * @throws ParseException + */ + @Test + public void testGenerateAccountsReports() throws LimaException, ParseException { + + Account accountBefa = accountService.getAccountByNumber("51"); + Assert.assertNotNull(accountBefa); + + Date beginDate = df.parse("April 1, 2012"); + Date endDate = df.parse("May 31, 2012"); + ReportsDatas datas = reportService.generateAccountsReports(accountBefa, false, beginDate, endDate); + Assert.assertEquals(BigDecimal.valueOf(42), datas.getAmountCredit().stripTrailingZeros()); + Assert.assertEquals(BigDecimal.valueOf(42), datas.getAmountDebit().stripTrailingZeros()); + + beginDate = df.parse("May 1, 2012"); + datas = reportService.generateAccountsReports(accountBefa, false, beginDate, endDate); + Assert.assertEquals(BigDecimal.valueOf(0), datas.getAmountCredit().stripTrailingZeros()); + Assert.assertEquals(BigDecimal.valueOf(0), datas.getAmountDebit().stripTrailingZeros()); + } + + /** + * Test de génération du rapport des comptes, en verifiant que les transactions + * non équilibrées ne sont pas présentes (modification 0.6). + * + * @throws LimaException + * @throws ParseException + */ + @Test + public void testGenerateAccountsReportsUnlalanced() throws LimaException, ParseException { + EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); + Account accountVmpVae = accountService.getAccountByNumber("511"); + + // TODO echatellier 20120116 improve period choice + FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); + + FinancialTransaction transaction1 = new FinancialTransactionImpl(); + transaction1.setTransactionDate(df.parse("April 5, 2012")); + transaction1.setEntryBook(journalDesVentes); + transaction1.setFinancialPeriod(financialPeriod); + transaction1 = financialTransactionService.createFinancialTransaction(transaction1); + + Entry tr1Entry1 = new EntryImpl(); + tr1Entry1.setAmount(BigDecimal.valueOf(54.0)); + tr1Entry1.setAccount(accountVmpVae); + tr1Entry1.setFinancialTransaction(transaction1); + tr1Entry1.setDescription("test desc"); + tr1Entry1.setVoucher("voucher"); + tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); + + Date beginDate = df.parse("April 1, 2012"); + Date endDate = df.parse("May 31, 2012"); + ReportsDatas datas = reportService.generateAccountsReports(accountVmpVae, false, beginDate, endDate); + Assert.assertEquals(BigDecimal.valueOf(42), datas.getAmountCredit().stripTrailingZeros()); + Assert.assertEquals(BigDecimal.valueOf(42), datas.getAmountDebit().stripTrailingZeros()); + } +} Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/ReportServiceImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: 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 (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java 2012-02-21 15:55:51 UTC (rev 3334) @@ -0,0 +1,62 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.business.accountingrules; + +import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.ReportServiceImplTest; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Add configuration to add specific test on French rules set. + * + * (redo all test defined in ReportServiceImplTest). + * + * Plus ajout de test specific à la locale FR. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ReportServiceRuleFrTest extends ReportServiceImplTest { + + @BeforeClass + public static void installFrenchRule() throws Exception { + LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + } + + /** + * Test une fois que la regles est correctement instanciée car + * elle peut être mise en cache dans {@link LimaConfig}. + */ + @Test + public void testRuleInstance() { + Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + } +} Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ReportServiceRuleFrTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r3333 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by echatellier＠users.chorem.org Feb. 21, 2012

Feb. 21, 2012

Author: echatellier Date: 2012-02-21 16:07:06 +0100 (Tue, 21 Feb 2012) New Revision: 3333 Url: http://chorem.org/repositories/revision/lima/3333 Log: switch to protected (service util method) Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 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 2012-02-21 14:43:33 UTC (rev 3332) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2012-02-21 15:07:06 UTC (rev 3333) @@ -172,7 +172,7 @@ * @return * @throws LimaException */ - public TopiaQuery createEntryQuery(Account account, + protected TopiaQuery createEntryQuery(Account account, Date beginDate, Date endDate, EntryDAO entryDAO,

1 0

r3332 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface
by echatellier＠users.chorem.org Feb. 21, 2012

Feb. 21, 2012

Author: echatellier Date: 2012-02-21 15:43:33 +0100 (Tue, 21 Feb 2012) New Revision: 3332 Url: http://chorem.org/repositories/revision/lima/3332 Log: Remove strange comment Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ReportService.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ReportService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ReportService.java 2012-02-21 14:20:35 UTC (rev 3331) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ReportService.java 2012-02-21 14:43:33 UTC (rev 3332) @@ -58,15 +58,6 @@ public interface ReportService { /** - * Generation du bilan. - * - * @param fiscalPeriod exercice - * @return le bilan - * @throws LimaException - * BalanceSheet generateBalanceSheet(FiscalPeriod fiscalPeriod) throws LimaException; - */ - - /** * Generation de la balance. * * @param beginDate

1 0

r3331 - in trunk/lima-business/src/test/java/org/chorem/lima/business: . accountingrules
by echatellier＠users.chorem.org Feb. 21, 2012

Feb. 21, 2012

Author: echatellier Date: 2012-02-21 15:20:35 +0100 (Tue, 21 Feb 2012) New Revision: 3331 Url: http://chorem.org/repositories/revision/lima/3331 Log: Add new test with FR accountingRules Added: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.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 Removed: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceTest.java Copied: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java (from rev 3329, trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceTest.java) =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java 2012-02-21 14:20:35 UTC (rev 3331) @@ -0,0 +1,190 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.business; + +import java.math.BigDecimal; +import java.text.ParseException; +import java.util.List; + +import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.Entry; +import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.EntryImpl; +import org.chorem.lima.entity.FinancialPeriod; +import org.chorem.lima.entity.FinancialTransaction; +import org.chorem.lima.entity.FinancialTransactionImpl; +import org.chorem.lima.entity.FiscalPeriod; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +/** + * Test on financial transaction service. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class FinancialTransactionServiceImplTest extends AbstractLimaTest { + + /** + * Init db with some transaction. + * + * @throws ParseException + * @throws LimaException + */ + @Before + public void initTransactions() throws ParseException, LimaException { + + EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); + Account accountVmpVae = accountService.getAccountByNumber("511"); + + // TODO echatellier 20120116 improve period choice + FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); + + FinancialTransaction transaction1 = new FinancialTransactionImpl(); + transaction1.setTransactionDate(df.parse("April 4, 2012")); + transaction1.setEntryBook(journalDesVentes); + transaction1.setFinancialPeriod(financialPeriod); + transaction1 = financialTransactionService.createFinancialTransaction(transaction1); + + Entry tr1Entry1 = new EntryImpl(); + tr1Entry1.setAmount(BigDecimal.valueOf(42.0)); + tr1Entry1.setAccount(accountVmpVae); + tr1Entry1.setFinancialTransaction(transaction1); + tr1Entry1.setDescription("test desc"); + tr1Entry1.setVoucher("voucher"); + tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); + + Entry tr1Entry2 = new EntryImpl(); + tr1Entry2.setAmount(BigDecimal.valueOf(42.0)); + tr1Entry2.setDebit(true); + tr1Entry2.setAccount(accountVmpVae); + tr1Entry2.setFinancialTransaction(transaction1); + tr1Entry2.setDescription("test desc"); + tr1Entry2.setVoucher("voucher"); + tr1Entry2 = financialTransactionService.createEntry(tr1Entry2); + } + + /** + * Test to find all unbalanced transactions. + * Nothing wrong here. + * + * @throws ParseException + * @throws LimaException + */ + @Test + public void testGetInexactTransactionAllGood() throws ParseException, LimaException { + FiscalPeriod fiscalPeriod = fiscalPeriodService.getAllFiscalPeriods().get(0); + List<FinancialTransaction> transactions = financialTransactionService.getAllInexactFinancialTransactions(fiscalPeriod); + Assert.assertTrue(transactions.isEmpty()); + } + + /** + * Test to find all unbalanced transactions. + * + * wrong data. + * + * @throws ParseException + * @throws LimaException + */ + @Test + public void testGetInexactTransactionNotAllGood() throws ParseException, LimaException { + + EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); + Account accountVmpVae = accountService.getAccountByNumber("511"); + + // TODO echatellier 20120116 improve period choice + FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); + + FinancialTransaction transaction1 = new FinancialTransactionImpl(); + transaction1.setTransactionDate(df.parse("April 5, 2012")); + transaction1.setEntryBook(journalDesVentes); + transaction1.setFinancialPeriod(financialPeriod); + transaction1 = financialTransactionService.createFinancialTransaction(transaction1); + + Entry tr1Entry1 = new EntryImpl(); + tr1Entry1.setAmount(BigDecimal.valueOf(42.0)); + tr1Entry1.setAccount(accountVmpVae); + tr1Entry1.setFinancialTransaction(transaction1); + //tr1Entry1.setDescription("test desc"); + tr1Entry1.setVoucher("voucher"); + tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); + + Entry tr1Entry2 = new EntryImpl(); + tr1Entry2.setAmount(BigDecimal.valueOf(42.0)); + tr1Entry2.setDebit(true); + tr1Entry2.setAccount(accountVmpVae); + tr1Entry2.setFinancialTransaction(transaction1); + tr1Entry2.setDescription("test desc"); + tr1Entry2.setVoucher("voucher"); + tr1Entry2 = financialTransactionService.createEntry(tr1Entry2); + + // one in period + FiscalPeriod fiscalPeriod = fiscalPeriodService.getAllFiscalPeriods().get(0); + List<FinancialTransaction> transactions = financialTransactionService.getAllInexactFinancialTransactions(fiscalPeriod); + Assert.assertEquals(1, transactions.size()); + } + + /** + * Test to find all unbalanced transactions. + * + * Test only unbalanced transactions (no data errors : fields). + * + * @throws ParseException + * @throws LimaException + */ + @Test + public void testGetUnbalancedTransactionNotAllGood() throws ParseException, LimaException { + + EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); + Account accountVmpVae = accountService.getAccountByNumber("511"); + + // TODO echatellier 20120116 improve period choice + FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); + + FinancialTransaction transaction1 = new FinancialTransactionImpl(); + transaction1.setTransactionDate(df.parse("April 5, 2012")); + transaction1.setEntryBook(journalDesVentes); + transaction1.setFinancialPeriod(financialPeriod); + transaction1 = financialTransactionService.createFinancialTransaction(transaction1); + + Entry tr1Entry1 = new EntryImpl(); + tr1Entry1.setAmount(BigDecimal.valueOf(54.0)); + tr1Entry1.setAccount(accountVmpVae); + tr1Entry1.setFinancialTransaction(transaction1); + tr1Entry1.setDescription("test desc"); + tr1Entry1.setVoucher("voucher"); + tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); + + // one in period + FiscalPeriod fiscalPeriod = fiscalPeriodService.getAllFiscalPeriods().get(0); + List<FinancialTransaction> transactions = financialTransactionService.getAllInexactFinancialTransactions(fiscalPeriod); + Assert.assertEquals(1, transactions.size()); + } +} Deleted: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceTest.java 2012-02-21 14:02:26 UTC (rev 3330) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceTest.java 2012-02-21 14:20:35 UTC (rev 3331) @@ -1,190 +0,0 @@ -/* - * #%L - * - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.business; - -import java.math.BigDecimal; -import java.text.ParseException; -import java.util.List; - -import org.chorem.lima.entity.Account; -import org.chorem.lima.entity.Entry; -import org.chorem.lima.entity.EntryBook; -import org.chorem.lima.entity.EntryImpl; -import org.chorem.lima.entity.FinancialPeriod; -import org.chorem.lima.entity.FinancialTransaction; -import org.chorem.lima.entity.FinancialTransactionImpl; -import org.chorem.lima.entity.FiscalPeriod; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -/** - * Test on financial transaction service. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class FinancialTransactionServiceTest extends AbstractLimaTest { - - /** - * Init db with some transaction. - * - * @throws ParseException - * @throws LimaException - */ - @Before - public void initTransactions() throws ParseException, LimaException { - - EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); - Account accountVmpVae = accountService.getAccountByNumber("511"); - - // TODO echatellier 20120116 improve period choice - FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); - - FinancialTransaction transaction1 = new FinancialTransactionImpl(); - transaction1.setTransactionDate(df.parse("April 4, 2012")); - transaction1.setEntryBook(journalDesVentes); - transaction1.setFinancialPeriod(financialPeriod); - transaction1 = financialTransactionService.createFinancialTransaction(transaction1); - - Entry tr1Entry1 = new EntryImpl(); - tr1Entry1.setAmount(BigDecimal.valueOf(42.0)); - tr1Entry1.setAccount(accountVmpVae); - tr1Entry1.setFinancialTransaction(transaction1); - tr1Entry1.setDescription("test desc"); - tr1Entry1.setVoucher("voucher"); - tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); - - Entry tr1Entry2 = new EntryImpl(); - tr1Entry2.setAmount(BigDecimal.valueOf(42.0)); - tr1Entry2.setDebit(true); - tr1Entry2.setAccount(accountVmpVae); - tr1Entry2.setFinancialTransaction(transaction1); - tr1Entry2.setDescription("test desc"); - tr1Entry2.setVoucher("voucher"); - tr1Entry2 = financialTransactionService.createEntry(tr1Entry2); - } - - /** - * Test to find all unbalanced transactions. - * Nothing wrong here. - * - * @throws ParseException - * @throws LimaException - */ - @Test - public void testGetInexactTransactionAllGood() throws ParseException, LimaException { - FiscalPeriod fiscalPeriod = fiscalPeriodService.getAllFiscalPeriods().get(0); - List<FinancialTransaction> transactions = financialTransactionService.getAllInexactFinancialTransactions(fiscalPeriod); - Assert.assertTrue(transactions.isEmpty()); - } - - /** - * Test to find all unbalanced transactions. - * - * wrong data. - * - * @throws ParseException - * @throws LimaException - */ - @Test - public void testGetInexactTransactionNotAllGood() throws ParseException, LimaException { - - EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); - Account accountVmpVae = accountService.getAccountByNumber("511"); - - // TODO echatellier 20120116 improve period choice - FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); - - FinancialTransaction transaction1 = new FinancialTransactionImpl(); - transaction1.setTransactionDate(df.parse("April 5, 2012")); - transaction1.setEntryBook(journalDesVentes); - transaction1.setFinancialPeriod(financialPeriod); - transaction1 = financialTransactionService.createFinancialTransaction(transaction1); - - Entry tr1Entry1 = new EntryImpl(); - tr1Entry1.setAmount(BigDecimal.valueOf(42.0)); - tr1Entry1.setAccount(accountVmpVae); - tr1Entry1.setFinancialTransaction(transaction1); - //tr1Entry1.setDescription("test desc"); - tr1Entry1.setVoucher("voucher"); - tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); - - Entry tr1Entry2 = new EntryImpl(); - tr1Entry2.setAmount(BigDecimal.valueOf(42.0)); - tr1Entry2.setDebit(true); - tr1Entry2.setAccount(accountVmpVae); - tr1Entry2.setFinancialTransaction(transaction1); - tr1Entry2.setDescription("test desc"); - tr1Entry2.setVoucher("voucher"); - tr1Entry2 = financialTransactionService.createEntry(tr1Entry2); - - // one in period - FiscalPeriod fiscalPeriod = fiscalPeriodService.getAllFiscalPeriods().get(0); - List<FinancialTransaction> transactions = financialTransactionService.getAllInexactFinancialTransactions(fiscalPeriod); - Assert.assertEquals(1, transactions.size()); - } - - /** - * Test to find all unbalanced transactions. - * - * Test only unbalanced transactions (no data errors : fields). - * - * @throws ParseException - * @throws LimaException - */ - @Test - public void testGetUnbalancedTransactionNotAllGood() throws ParseException, LimaException { - - EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); - Account accountVmpVae = accountService.getAccountByNumber("511"); - - // TODO echatellier 20120116 improve period choice - FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); - - FinancialTransaction transaction1 = new FinancialTransactionImpl(); - transaction1.setTransactionDate(df.parse("April 5, 2012")); - transaction1.setEntryBook(journalDesVentes); - transaction1.setFinancialPeriod(financialPeriod); - transaction1 = financialTransactionService.createFinancialTransaction(transaction1); - - Entry tr1Entry1 = new EntryImpl(); - tr1Entry1.setAmount(BigDecimal.valueOf(54.0)); - tr1Entry1.setAccount(accountVmpVae); - tr1Entry1.setFinancialTransaction(transaction1); - tr1Entry1.setDescription("test desc"); - tr1Entry1.setVoucher("voucher"); - tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); - - // one in period - FiscalPeriod fiscalPeriod = fiscalPeriodService.getAllFiscalPeriods().get(0); - List<FinancialTransaction> transactions = financialTransactionService.getAllInexactFinancialTransactions(fiscalPeriod); - Assert.assertEquals(1, transactions.size()); - } -} Added: 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 (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/EntryBookServiceRuleFrTest.java 2012-02-21 14:20:35 UTC (rev 3331) @@ -0,0 +1,62 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.business.accountingrules; + +import org.chorem.lima.business.EntryBookServiceImplTest; +import org.chorem.lima.business.LimaConfig; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Add configuration to add specific test on French rules set. + * + * (redo all test defined in AccountServiceImplTest). + * + * Plus ajout de test specific à la locale FR. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class EntryBookServiceRuleFrTest extends EntryBookServiceImplTest { + + @BeforeClass + public static void installFrenchRule() throws Exception { + LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + } + + /** + * Test une fois que la regles est correctement instanciée car + * elle peut être mise en cache dans {@link LimaConfig}. + */ + @Test + public void testRuleInstance() { + Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + } +} 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: 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 (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java 2012-02-21 14:20:35 UTC (rev 3331) @@ -0,0 +1,62 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.business.accountingrules; + +import org.chorem.lima.business.EntryBookServiceImplTest; +import org.chorem.lima.business.LimaConfig; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Add configuration to add specific test on French rules set. + * + * (redo all test defined in AccountServiceImplTest). + * + * Plus ajout de test specific à la locale FR. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class FinancialPeriodServiceRuleFrTest extends EntryBookServiceImplTest { + + @BeforeClass + public static void installFrenchRule() throws Exception { + LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + } + + /** + * Test une fois que la regles est correctement instanciée car + * elle peut être mise en cache dans {@link LimaConfig}. + */ + @Test + public void testRuleInstance() { + Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + } +} Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialPeriodServiceRuleFrTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: 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 (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FinancialTransactionServiceRuleFrTest.java 2012-02-21 14:20:35 UTC (rev 3331) @@ -0,0 +1,62 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.business.accountingrules; + +import org.chorem.lima.business.FinancialTransactionServiceImplTest; +import org.chorem.lima.business.LimaConfig; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Add configuration to add specific test on French rules set. + * + * (redo all test defined in AccountServiceImplTest). + * + * Plus ajout de test specific à la locale FR. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class FinancialTransactionServiceRuleFrTest extends FinancialTransactionServiceImplTest { + + @BeforeClass + public static void installFrenchRule() throws Exception { + LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + } + + /** + * Test une fois que la regles est correctement instanciée car + * elle peut être mise en cache dans {@link LimaConfig}. + */ + @Test + public void testRuleInstance() { + Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + } +} 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: 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 (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java 2012-02-21 14:20:35 UTC (rev 3331) @@ -0,0 +1,62 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.business.accountingrules; + +import org.chorem.lima.business.FiscalPeriodServiceImplTest; +import org.chorem.lima.business.LimaConfig; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Add configuration to add specific test on French rules set. + * + * (redo all test defined in AccountServiceImplTest). + * + * Plus ajout de test specific à la locale FR. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class FiscalPeriodServiceRuleFrTest extends FiscalPeriodServiceImplTest { + + @BeforeClass + public static void installFrenchRule() throws Exception { + LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + } + + /** + * Test une fois que la regles est correctement instanciée car + * elle peut être mise en cache dans {@link LimaConfig}. + */ + @Test + public void testRuleInstance() { + Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + } +} Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/FiscalPeriodServiceRuleFrTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r3330 - trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules
by echatellier＠users.chorem.org Feb. 21, 2012

Feb. 21, 2012

Author: echatellier Date: 2012-02-21 15:02:26 +0100 (Tue, 21 Feb 2012) New Revision: 3330 Url: http://chorem.org/repositories/revision/lima/3330 Log: Fix tests without services internal state Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java 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 2012-02-21 14:00:40 UTC (rev 3329) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java 2012-02-21 14:02:26 UTC (rev 3330) @@ -32,7 +32,6 @@ import org.chorem.lima.entity.AccountImpl; import org.junit.Assert; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; /** @@ -67,14 +66,10 @@ /** * Création d'un compte dans le plan comptable. * - * This test currently wont work because AccountServiceImpl keep accouting - * reference and @BeforeClass changes has no effects. - * * @throws LimaException */ @Test(expected=LimaException.class) @Override - @Ignore public void testCreateAccountWrongNumber() throws LimaException { Account myAccount = new AccountImpl(); myAccount.setAccountNumber("42");

1 0

r3329 - trunk/lima-business/src/test/java/org/chorem/lima/business
by echatellier＠users.chorem.org Feb. 21, 2012

Feb. 21, 2012

Author: echatellier Date: 2012-02-21 15:00:40 +0100 (Tue, 21 Feb 2012) New Revision: 3329 Url: http://chorem.org/repositories/revision/lima/3329 Log: Fix imports Modified: 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/FinancialTransactionServiceTest.java 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 2012-02-21 13:50:57 UTC (rev 3328) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java 2012-02-21 14:00:40 UTC (rev 3329) @@ -28,7 +28,6 @@ import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryBookImpl; import org.junit.Assert; -import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; 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 2012-02-21 13:50:57 UTC (rev 3328) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2012-02-21 14:00:40 UTC (rev 3329) @@ -25,7 +25,6 @@ package org.chorem.lima.business; -import org.junit.BeforeClass; import org.junit.Test; /** Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceTest.java 2012-02-21 13:50:57 UTC (rev 3328) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceTest.java 2012-02-21 14:00:40 UTC (rev 3329) @@ -29,8 +29,6 @@ import java.text.ParseException; import java.util.List; -import junit.framework.Assert; - import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; @@ -39,8 +37,8 @@ import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FinancialTransactionImpl; import org.chorem.lima.entity.FiscalPeriod; +import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; /**

1 0

r3328 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by echatellier＠users.chorem.org Feb. 21, 2012

Feb. 21, 2012

Author: echatellier Date: 2012-02-21 14:50:57 +0100 (Tue, 21 Feb 2012) New Revision: 3328 Url: http://chorem.org/repositories/revision/lima/3328 Log: Remove service states (accountingRules) to test service with different countries 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/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/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/VatStatementServiceImpl.java 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 2012-02-20 17:54:22 UTC (rev 3327) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2012-02-21 13:50:57 UTC (rev 3328) @@ -59,11 +59,8 @@ private TopiaContext rootContext; - protected AccountingRules accountingRules; - public AccountServiceImpl() { rootContext = acquireRootContext(); - accountingRules = LimaConfig.getInstance().getAccountingRules(); } @Override @@ -72,7 +69,7 @@ TopiaContext topiaContext) throws LimaException { try { - // force upppercase account number + // force uppercase account number account.setAccountNumber(account.getAccountNumber().toUpperCase()); // check if account number already exist @@ -123,6 +120,7 @@ Account account) throws LimaException { //check rules before create the account + AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); accountingRules.createAccountRules(masterAccount, account); TopiaContext transaction = beginTransaction(rootContext); @@ -184,6 +182,7 @@ Account account) throws LimaException { //check rules before create the account + AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); accountingRules.createSubLedgerRules(masterAccount, account); TopiaContext transaction = beginTransaction(rootContext); @@ -378,6 +377,8 @@ @Override public void removeAccount(Account account) throws LimaException { TopiaContext transaction = beginTransaction(rootContext); + AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + try { AccountDAO accountDAO = LimaCallaoDAOHelper.getAccountDAO(transaction); @@ -434,6 +435,7 @@ public void updateAccount(Account account) throws LimaException { TopiaContext transaction = beginTransaction(rootContext); + AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); try { // DAO 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 2012-02-20 17:54:22 UTC (rev 3327) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2012-02-21 13:50:57 UTC (rev 3328) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -117,9 +117,6 @@ private static final SimpleDateFormat hourFormat = new SimpleDateFormat("HH:mm"); -// private static final SimpleDateFormat filedateFormat = -// new SimpleDateFormat("dd-MM-yyyy_HH-mm"); - private static final SimpleDateFormat monthYearFormat = new SimpleDateFormat("MMM yyyy"); 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 2012-02-20 17:54:22 UTC (rev 3327) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2012-02-21 13:50:57 UTC (rev 3328) @@ -59,11 +59,8 @@ private TopiaContext rootContext; - protected AccountingRules accountingRules; - public EntryBookServiceImpl() { rootContext = acquireRootContext(); - accountingRules = LimaConfig.getInstance().getAccountingRules(); } @Override @@ -173,6 +170,7 @@ public void removeEntryBook(EntryBook entryBook) throws LimaException { TopiaContext topiaTransaction = beginTransaction(rootContext); + AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); try { 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 2012-02-20 17:54:22 UTC (rev 3327) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2012-02-21 13:50:57 UTC (rev 3328) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as 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 2012-02-20 17:54:22 UTC (rev 3327) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2012-02-21 13:50:57 UTC (rev 3328) @@ -59,11 +59,8 @@ private TopiaContext rootContext; - protected AccountingRules accountingRules; - public FinancialPeriodServiceImpl() { rootContext = acquireRootContext(); - accountingRules = LimaConfig.getInstance().getAccountingRules(); } /** @@ -206,6 +203,8 @@ public void blockClosedPeriodicEntryBookWithTransaction( ClosedPeriodicEntryBook closedPeriodicEntryBook, TopiaContext topiaContext) throws LimaException { + AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + try { //check rules before create the account accountingRules.blockClosedPeriodicEntryBookRules( @@ -249,7 +248,6 @@ FinancialPeriod financialPeriod) throws LimaException { ClosedPeriodicEntryBook closedPeriodicEntryBook = null; - TopiaContext topiaContext = beginTransaction(rootContext); try { 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 2012-02-20 17:54:22 UTC (rev 3327) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java 2012-02-21 13:50:57 UTC (rev 3328) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -34,8 +34,6 @@ import org.chorem.lima.beans.FinancialStatementDatas; import org.chorem.lima.beans.FinancialStatementDatasImpl; import org.chorem.lima.beans.ReportsDatas; -import org.chorem.lima.business.AccountingRules; -import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; import org.chorem.lima.business.ejbinterface.FinancialStatementService; import org.chorem.lima.business.ejbinterface.FinancialStatementServiceLocal; @@ -65,14 +63,11 @@ private TopiaContext rootContext; - protected AccountingRules accountingRules; - @EJB private ReportServiceLocal reportServiceLocal; public FinancialStatementServiceImpl() { rootContext = acquireRootContext(); - accountingRules = LimaConfig.getInstance().getAccountingRules(); } @Override 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 2012-02-20 17:54:22 UTC (rev 3327) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-02-21 13:50:57 UTC (rev 3328) @@ -25,7 +25,6 @@ package org.chorem.lima.business.ejb; - import org.chorem.lima.FinancialStatementWayEnum; import org.chorem.lima.beans.FinancialTransactionSearch; import org.chorem.lima.business.AccountingRules; @@ -77,8 +76,6 @@ private TopiaContext rootContext; - protected AccountingRules accountingRules; - @EJB protected FinancialPeriodServiceLocal financialPeriodService; @@ -93,7 +90,6 @@ public FinancialTransactionServiceImpl() { rootContext = acquireRootContext(); - accountingRules = LimaConfig.getInstance().getAccountingRules(); } @Override @@ -101,6 +97,8 @@ FinancialTransaction financialtransaction, TopiaContext topiaContext) throws LimaException { FinancialTransaction fTransaction = null; + AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + try { //check if the financial period is blocked accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction( @@ -358,6 +356,9 @@ @Override public void updateFinancialTransactionWithTransaction(FinancialTransaction financialtransaction, TopiaContext topiaContext) throws LimaException { + + AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + try { FinancialTransactionDAO transactionDAO = LimaCallaoDAOHelper.getFinancialTransactionDAO(topiaContext); @@ -401,6 +402,8 @@ public void removeFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException { TopiaContext topiaTransaction = beginTransaction(rootContext); + AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + try { //check if the financial period is blocked @@ -424,6 +427,8 @@ @Override public Entry createEntryWithTransaction(Entry entry, TopiaContext topiaContext) throws LimaException { + AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + Entry newEntry = null; try { //check if the financial period is blocked @@ -471,6 +476,8 @@ public void updateEntry(Entry entry) throws LimaException { TopiaContext topiaContext = beginTransaction(rootContext); + AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + try { EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(topiaContext); @@ -509,6 +516,8 @@ @Override public void removeEntry(Entry entry) throws LimaException { + AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + TopiaContext topiaContext = beginTransaction(rootContext); try { 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 2012-02-20 17:54:22 UTC (rev 3327) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-02-21 13:50:57 UTC (rev 3328) @@ -69,7 +69,6 @@ import static org.nuiton.i18n.I18n._; - /** * Gestion des exercices. * Un exercice ne peut être supprimée et débloquée après cloture. @@ -81,8 +80,6 @@ private TopiaContext rootContext; - protected AccountingRules accountingRules; - @EJB protected AccountServiceLocal accountService; @@ -100,13 +97,14 @@ public FiscalPeriodServiceImpl() { rootContext = acquireRootContext(); - accountingRules = LimaConfig.getInstance().getAccountingRules(); } - @Override public void createFiscalPeriodWithTransaction(FiscalPeriod fiscalPeriod, TopiaContext topiaContext) throws LimaException { + + AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + try { Date beginDate = fiscalPeriod.getBeginDate(); @@ -250,9 +248,11 @@ */ @Override public void blockFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { + //open transaction for update TopiaContext transaction = beginTransaction(rootContext); - //open transaction for update + AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); + try { if (fiscalPeriod.getLocked()) { 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 2012-02-20 17:54:22 UTC (rev 3327) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2012-02-21 13:50:57 UTC (rev 3328) @@ -60,7 +60,6 @@ import org.nuiton.util.FileUtil; import org.nuiton.util.Resource; - @Stateless public class HttpServerServiceImpl extends AbstractLimaService implements HttpServerService, HttpServerServiceLocal { 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 2012-02-20 17:54:22 UTC (rev 3327) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/IdentityServiceImpl.java 2012-02-21 13:50:57 UTC (rev 3328) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as 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 2012-02-20 17:54:22 UTC (rev 3327) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java 2012-02-21 13:50:57 UTC (rev 3328) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2011 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -60,7 +60,6 @@ * * @author vsalaun */ - @Stateless public class VatStatementServiceImpl extends AbstractLimaService implements VatStatementService, VatStatementServiceLocal {

1 0

r3327 - trunk/lima-swing
by echatellier＠users.chorem.org Feb. 20, 2012

Feb. 20, 2012

Author: echatellier Date: 2012-02-20 18:54:22 +0100 (Mon, 20 Feb 2012) New Revision: 3327 Url: http://chorem.org/repositories/revision/lima/3327 Log: ... Modified: trunk/lima-swing/pom.xml Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2012-02-20 17:09:22 UTC (rev 3326) +++ trunk/lima-swing/pom.xml 2012-02-20 17:54:22 UTC (rev 3327) @@ -154,7 +154,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <addCompileClassPath>true</addCompileClassPath> <addProjectClassPath>true</addProjectClassPath>

1 0