July 2011 - Lima-commits - mailman.cloud.codelutin.com

r3217 - in trunk: . lima-business lima-callao lima-swing
by echatellier＠users.chorem.org 11 Jul '11

11 Jul '11

Author: echatellier Date: 2011-07-11 22:18:28 +0200 (Mon, 11 Jul 2011) New Revision: 3217 Url: http://chorem.org/repositories/revision/lima/3217 Log: Make versionutil happy Modified: trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-07-11 18:56:12 UTC (rev 3216) +++ trunk/lima-business/pom.xml 2011-07-11 20:18:28 UTC (rev 3217) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5-beta2-SNAPSHOT</version> + <version>0.5-beta-2-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2011-07-11 18:56:12 UTC (rev 3216) +++ trunk/lima-callao/pom.xml 2011-07-11 20:18:28 UTC (rev 3217) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5-beta2-SNAPSHOT</version> + <version>0.5-beta-2-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2011-07-11 18:56:12 UTC (rev 3216) +++ trunk/lima-swing/pom.xml 2011-07-11 20:18:28 UTC (rev 3217) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5-beta2-SNAPSHOT</version> + <version>0.5-beta-2-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-11 18:56:12 UTC (rev 3216) +++ trunk/pom.xml 2011-07-11 20:18:28 UTC (rev 3217) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5-beta2-SNAPSHOT</version> + <version>0.5-beta-2-SNAPSHOT</version> <modules> <module>lima-callao</module>

1 0

r3216 - in trunk: . lima-business lima-callao lima-swing
by echatellier＠users.chorem.org 11 Jul '11

11 Jul '11

Author: echatellier Date: 2011-07-11 20:56:12 +0200 (Mon, 11 Jul 2011) New Revision: 3216 Url: http://chorem.org/repositories/revision/lima/3216 Log: Fix plugin version, prepare next release Modified: trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-07-11 17:59:25 UTC (rev 3215) +++ trunk/lima-business/pom.xml 2011-07-11 18:56:12 UTC (rev 3216) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.5-beta2-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2011-07-11 17:59:25 UTC (rev 3215) +++ trunk/lima-callao/pom.xml 2011-07-11 18:56:12 UTC (rev 3216) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.5-beta2-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2011-07-11 17:59:25 UTC (rev 3215) +++ trunk/lima-swing/pom.xml 2011-07-11 18:56:12 UTC (rev 3216) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.5-beta2-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-11 17:59:25 UTC (rev 3215) +++ trunk/pom.xml 2011-07-11 18:56:12 UTC (rev 3216) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.5-beta2-SNAPSHOT</version> <modules> <module>lima-callao</module> @@ -332,7 +332,7 @@  <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>maven-i18n-plugin</artifactId> <version>${nuitonI18nVersion}</version> </plugin>

1 0

r3215 - trunk
by sletellier＠users.chorem.org 11 Jul '11

11 Jul '11

Author: sletellier Date: 2011-07-11 19:59:25 +0200 (Mon, 11 Jul 2011) New Revision: 3215 Url: http://chorem.org/repositories/revision/lima/3215 Log: Fix ejb dependency Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-11 14:47:39 UTC (rev 3214) +++ trunk/pom.xml 2011-07-11 17:59:25 UTC (rev 3215) @@ -25,13 +25,6 @@ <dependencyManagement> <dependencies> - - <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>javaee-api</artifactId> - <version>5.0-3</version> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -126,7 +119,15 @@ <version>${openEjbVersion}</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>javaee-api</artifactId> + <version>5.0-3</version> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>org.apache.openejb</groupId> <artifactId>ejb31-api-experimental</artifactId> <version>${openEjbVersion}</version>

1 0

r3214 - in trunk: . lima-business lima-callao lima-swing
by vsalaun＠users.chorem.org 11 Jul '11

11 Jul '11

Author: vsalaun Date: 2011-07-11 16:47:39 +0200 (Mon, 11 Jul 2011) New Revision: 3214 Url: http://chorem.org/repositories/revision/lima/3214 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-07-11 14:47:33 UTC (rev 3213) +++ trunk/lima-business/pom.xml 2011-07-11 14:47:39 UTC (rev 3214) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5-beta1</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2011-07-11 14:47:33 UTC (rev 3213) +++ trunk/lima-callao/pom.xml 2011-07-11 14:47:39 UTC (rev 3214) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5-beta1</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2011-07-11 14:47:33 UTC (rev 3213) +++ trunk/lima-swing/pom.xml 2011-07-11 14:47:39 UTC (rev 3214) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5-beta1</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-11 14:47:33 UTC (rev 3213) +++ trunk/pom.xml 2011-07-11 14:47:39 UTC (rev 3214) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5-beta1</version> + <version>0.6-SNAPSHOT</version> <modules> <module>lima-callao</module> @@ -361,10 +361,10 @@   <scm> - <connection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.5-beta1</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.5-beta1 + <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/lima/tags/lima-0.5-beta1</url> + <url>http://www.chorem.org/repositories/browse/lima/trunk</url> </scm> <repositories>

1 0

r3213 - in tags: . lima-0.5-beta1
by vsalaun＠users.chorem.org 11 Jul '11

11 Jul '11

Author: vsalaun Date: 2011-07-11 16:47:33 +0200 (Mon, 11 Jul 2011) New Revision: 3213 Url: http://chorem.org/repositories/revision/lima/3213 Log: [maven-release-plugin] copy for tag lima-0.5-beta1 Added: tags/lima-0.5-beta1/ Property changes on: tags/lima-0.5-beta1 ___________________________________________________________________ Added: svn:ignore + *.log target bin .classpath .project *.ipr *.iws *.iml Added: svn:mergeinfo +

1 0

r3212 - in trunk: . lima-business lima-callao lima-swing
by vsalaun＠users.chorem.org 11 Jul '11

11 Jul '11

Author: vsalaun Date: 2011-07-11 16:47:31 +0200 (Mon, 11 Jul 2011) New Revision: 3212 Url: http://chorem.org/repositories/revision/lima/3212 Log: [maven-release-plugin] prepare release lima-0.5-beta1 Modified: trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-07-11 14:30:43 UTC (rev 3211) +++ trunk/lima-business/pom.xml 2011-07-11 14:47:31 UTC (rev 3212) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5-beta1-SNAPSHOT</version> + <version>0.5-beta1</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2011-07-11 14:30:43 UTC (rev 3211) +++ trunk/lima-callao/pom.xml 2011-07-11 14:47:31 UTC (rev 3212) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5-beta1-SNAPSHOT</version> + <version>0.5-beta1</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2011-07-11 14:30:43 UTC (rev 3211) +++ trunk/lima-swing/pom.xml 2011-07-11 14:47:31 UTC (rev 3212) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5-beta1-SNAPSHOT</version> + <version>0.5-beta1</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-11 14:30:43 UTC (rev 3211) +++ trunk/pom.xml 2011-07-11 14:47:31 UTC (rev 3212) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5-beta1-SNAPSHOT</version> + <version>0.5-beta1</version> <modules> <module>lima-callao</module> @@ -361,10 +361,10 @@   <scm> - <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/trunk + <connection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.5-beta1</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.5-beta1 </developerConnection> - <url>http://www.chorem.org/repositories/browse/lima/trunk</url> + <url>http://www.chorem.org/repositories/browse/lima/tags/lima-0.5-beta1</url> </scm> <repositories>

1 0

r3211 - in trunk: . lima-business lima-callao lima-swing
by vsalaun＠users.chorem.org 11 Jul '11

11 Jul '11

Author: vsalaun Date: 2011-07-11 16:30:43 +0200 (Mon, 11 Jul 2011) New Revision: 3211 Url: http://chorem.org/repositories/revision/lima/3211 Log: change bersion to 0.5-beta1 Modified: trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-07-11 14:24:55 UTC (rev 3210) +++ trunk/lima-business/pom.xml 2011-07-11 14:30:43 UTC (rev 3211) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5-beta1-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2011-07-11 14:24:55 UTC (rev 3210) +++ trunk/lima-callao/pom.xml 2011-07-11 14:30:43 UTC (rev 3211) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5-beta1-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2011-07-11 14:24:55 UTC (rev 3210) +++ trunk/lima-swing/pom.xml 2011-07-11 14:30:43 UTC (rev 3211) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5-beta1-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-11 14:24:55 UTC (rev 3210) +++ trunk/pom.xml 2011-07-11 14:30:43 UTC (rev 3211) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5-beta1-SNAPSHOT</version> <modules> <module>lima-callao</module>

1 0

r3210 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-swing/src/main/java/org/chorem/lima/ui
by vsalaun＠users.chorem.org 11 Jul '11

11 Jul '11

Author: vsalaun Date: 2011-07-11 16:24:55 +0200 (Mon, 11 Jul 2011) New Revision: 3210 Url: http://chorem.org/repositories/revision/lima/3210 Log: block vat access for release Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 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 2011-07-11 13:36:42 UTC (rev 3209) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java 2011-07-11 14:24:55 UTC (rev 3210) @@ -1,15 +1,53 @@ +/* + * #%L + * Lima :: business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 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% + */ package org.chorem.lima.business.ejb; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; import java.util.List; +import java.util.StringTokenizer; +import javax.ejb.EJB; import javax.ejb.Stateless; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.beans.Amounts; +import org.chorem.lima.beans.AmountsImpl; +import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.ejbinterface.ReportServiceLocal; import org.chorem.lima.business.ejbinterface.VatStatementService; import org.chorem.lima.business.ejbinterface.VatStatementServiceLocal; +import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.AccountDAO; +import org.chorem.lima.entity.FinancialStatement; +import org.chorem.lima.entity.FinancialStatementDAO; import org.chorem.lima.entity.LimaCallaoDAOHelper; import org.chorem.lima.entity.VatStatement; import org.chorem.lima.entity.VatStatementDAO; @@ -18,6 +56,7 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaNotFoundException; import org.nuiton.topia.framework.TopiaQuery; +import org.nuiton.topia.framework.TopiaQuery.Op; /** * Permet d'implémenter le plan de la déclaration de TVA @@ -32,6 +71,9 @@ LogFactory.getLog(VatStatementServiceImpl.class); private TopiaContext rootContext; + + @EJB + private ReportServiceLocal reportServiceLocal; public VatStatementServiceImpl() { LimaConfig config = LimaConfig.getInstance(); @@ -177,7 +219,123 @@ doFinally(transaction, log); } } + + public Amounts amountFromAccountList(String accountsNumberList, Date selectedBeginDate, Date selectedEndDate, TopiaContext topiaContext) throws LimaException{ + Amounts amounts = new AmountsImpl(); + BigDecimal debit = new BigDecimal(0); + BigDecimal credit = new BigDecimal(0); + Boolean substract = false; + try { + AccountDAO accountDAO = LimaCallaoDAOHelper.getAccountDAO(topiaContext); + //Remove Spaces + String result = StringUtils.deleteWhitespace(accountsNumberList); + StringTokenizer stQuote = new StringTokenizer(result, ","); + while (stQuote.hasMoreTokens()) { + String s = stQuote.nextToken(); + List<Account> accountsList = accountDAO.stringToListAccounts(s, false); + BigDecimal debitTemp = new BigDecimal(0); + BigDecimal creditTemp = new BigDecimal(0); + for (Account account : accountsList) { + ReportsDatas reportsDatas = reportServiceLocal. + generateAccountReportsWithTransaction(account, true, + selectedBeginDate, selectedEndDate, topiaContext); + if (reportsDatas.getSoldeDebit()){ + debitTemp = debitTemp.add(reportsDatas.getAmountSolde()); + } + else { + creditTemp = creditTemp.add(reportsDatas.getAmountSolde()); + } + } + if (!substract){ + debit = debitTemp; + credit = creditTemp; + } + //compte(s) précédé du signe - + else { + debit = debit.subtract(debitTemp); + credit = credit.subtract(creditTemp); + } + substract = true; + } + amounts.setCredit(credit); + amounts.setDebit(debit); + } catch (TopiaException e) { + doCatch(topiaContext, e, log); + } + return amounts; + } + + /** + * Gives the list of account numbers from a VatStatement + * @param vatStatement + * @return accountNumbersList + * @throws LimaException + */ + public String findAccountNumberByVatStatement(VatStatement vatStatement, TopiaContext topiaContext) throws LimaException { + + String accountNumbersList = null; + + try { + VatStatementDAO vatStatementDAO = + LimaCallaoDAOHelper.getVatStatementDAO(topiaContext); + TopiaQuery query = vatStatementDAO.createQuery(); + + String labelProperty = + TopiaQuery.getProperty(VatStatement.LABEL); + + query.addWhere(labelProperty + " " + Op.LIKE + " '%" + + vatStatement.getLabel() + "%'"); + //query.addWhere(label, operator, paramValue) + query.setMaxResults(1); + log.debug("query to find account by VAT " + query); + + List<VatStatement> vatStatementsList = vatStatementDAO.findAllByQuery(query); + + if (vatStatementsList.size() > 0) { + accountNumbersList = vatStatementsList.get(0).getAccounts(); + } + } + catch (TopiaException e) { + doCatch(topiaContext, e, log); + } + return accountNumbersList; + } + + @Override + public BigDecimal vatStatementAmounts(VatStatement vatStatement, Date selectedBeginDate, Date selectedEndDate) throws LimaException, TopiaException { + + BigDecimal debitTemp = new BigDecimal(0); + BigDecimal creditTemp = new BigDecimal(0); + + TopiaContext transaction = null; + try { + transaction = beginTransaction(); + + String accountNumbersList = findAccountNumberByVatStatement(vatStatement, transaction); + + AccountDAO accountDAO = LimaCallaoDAOHelper.getAccountDAO(transaction); + List<Account> accountsList = accountDAO.stringToListAccounts(accountNumbersList, false); + + for (Account account : accountsList) { + ReportsDatas reportsDatas = reportServiceLocal. + generateAccountReportsWithTransaction(account, true, + selectedBeginDate, selectedEndDate, transaction); + if (reportsDatas.getSoldeDebit()){ + debitTemp = debitTemp.add(reportsDatas.getAmountSolde()); + } + else { + creditTemp = creditTemp.add(reportsDatas.getAmountSolde()); + } + } + } + catch (TopiaException e) { + doCatch(transaction, e, log); + } + + return debitTemp.subtract(creditTemp).abs(); + } + protected TopiaContext beginTransaction() throws TopiaException { // basic check done, make check in database Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2011-07-11 13:36:42 UTC (rev 3209) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2011-07-11 14:24:55 UTC (rev 3210) @@ -168,8 +168,6 @@ actionIcon='charts-financialperiod'/> <JMenuItem text="lima.charts.financialstatement" onActionPerformed='getHandler().showFinancialStatementView(this)' actionIcon='charts-financialstatements'/> - <JMenuItem text="lima.charts.vat" onActionPerformed='getHandler().showVatChartView(this)' - actionIcon='charts-financialstatements'/> </JMenu> <JMenu text="lima.entries" mnemonic="{'E'}"> @@ -193,8 +191,6 @@ actionIcon='reports-ledger'/> <JMenuItem text="lima.reports.financialstatement" onActionPerformed='getHandler().showFinancialStatementReportsView(this)' actionIcon='reports-financialstatement'/> - <JMenuItem text="lima.reports.vat" onActionPerformed='getHandler().showVatReportView(this)' - actionIcon='reports-financialstatement'/> </JMenu>

1 0

r3209 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod lima-swing/src/main/resources/i18n
by vsalaun＠users.chorem.org 11 Jul '11

11 Jul '11

Author: vsalaun Date: 2011-07-11 15:36:42 +0200 (Mon, 11 Jul 2011) New Revision: 3209 Url: http://chorem.org/repositories/revision/lima/3209 Log: #345 add checking question for user Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 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 2011-07-11 11:08:52 UTC (rev 3208) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2011-07-11 13:36:42 UTC (rev 3209) @@ -476,10 +476,14 @@ List<ReportsDatas> reportsDatasList = (List<ReportsDatas>) results.getReportsDatas(); + //check if at least one transaction has been reported + boolean transaction = false; + for (ReportsDatas report : reportsDatasList) { //Account class from 1 to 5 and only non zero amount - if (report.getAccount().getAccountNumber().substring(0, 1).matches("[1-5]") + if (Integer.valueOf(report.getAccount().getAccountNumber().substring(0, 1)) < 6 && !report.getAmountSolde().equals(BigDecimal.ZERO)) { + transaction = true; //close accounts by removing amounts from all class 1 to 5 accounts beginEntry = new EntryImpl(); beginEntry.setDescription(_("lima-business.financialtransaction.retainedearnings.description") + " (" + calendar.get(Calendar.YEAR) + ")"); @@ -521,8 +525,13 @@ } } } + //if no transaction has been reported + if (!transaction) { + topiaContext.rollbackTransaction(); //if no problem appeared, commit - commitTransaction(topiaContext); + } else { + commitTransaction(topiaContext); + } } catch (TopiaException ex) { doCatch(topiaContext, ex, log); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2011-07-11 11:08:52 UTC (rev 3208) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2011-07-11 13:36:42 UTC (rev 3209) @@ -27,8 +27,11 @@ import static org.nuiton.i18n.I18n._; -import java.util.Date; +import java.math.BigDecimal; +import java.util.Collection; +import java.util.List; + import javax.swing.JOptionPane; import org.jdesktop.swingx.JXTable; import org.nuiton.util.DateUtil; @@ -37,8 +40,10 @@ import org.chorem.lima.business.FinancialTransactionServiceMonitorable; import org.chorem.lima.business.FiscalPeriodServiceMonitorable; import org.chorem.lima.business.LimaException; +import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryBookImpl; +import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.fiscalperiod.AddPeriod; @@ -67,12 +72,18 @@ /** Service. */ protected FiscalPeriodServiceMonitorable fiscalPeriodService; + protected FinancialTransactionServiceMonitorable financialTransactionService; + protected FiscalPeriodViewHandler(FiscalPeriodView view) { this.view=view; fiscalPeriodService = LimaServiceFactory.getInstance().getService( FiscalPeriodServiceMonitorable.class); + + financialTransactionService = + LimaServiceFactory.getInstance().getService( + FinancialTransactionServiceMonitorable.class); } public void addFiscalPeriod() { @@ -135,7 +146,7 @@ if (model.getRowCount()-1 != selectedRow) { newyear = true; //two are open } else { - //check if the user want to create a new fiscal year + //check if the user wants to create a new fiscal year response = JOptionPane.showConfirmDialog(getView(), _("lima.charts.fiscalperiod.question.newyear"), @@ -168,18 +179,50 @@ FiscalPeriodTableModel model = (FiscalPeriodTableModel)getView().getFiscalPeriodTable().getModel(); try { - //Sets EntryBook - EntryBook newEntryBook = new EntryBookImpl(); - RetainedEarningsEntryBookForm entryBookForm = new RetainedEarningsEntryBookForm(view); - entryBookForm.setEntryBook(newEntryBook); - // jaxx constructor don't call super() ? - entryBookForm.setLocationRelativeTo(view); - entryBookForm.setVisible(true); - // null == cancel action - EntryBook entryBook = entryBookForm.getEntryBook(); - if (entryBook != null) { - fiscalPeriodService.addRetainedEarnings(selectedFiscalPeriod, newyear, entryBook); + boolean found = false; + List<FinancialTransaction> financialTransactionsList = + financialTransactionService.getAllFinancialTransactionsFromDateToDate( + selectedFiscalPeriod.getBeginDate(), selectedFiscalPeriod.getEndDate()); + //check if they are at least one transaction to be report + if (!financialTransactionsList.isEmpty()) { + int i = 0; + while (i < financialTransactionsList.size() && !found) { + Collection<Entry> entryList = financialTransactionsList.get(i).getEntry(); + for (Entry entry : entryList) { + if (Integer.valueOf(entry.getAccount().getAccountNumber().substring(0, 1)) < 6 + && !entry.getAmount().equals(BigDecimal.ZERO)) { + found = true; + } + } + i++; + } } + //report if they are at least one transaction to be report + if (found) { + //check if the user wants to report datas + int response = + JOptionPane.showConfirmDialog(getView(), + _("lima.charts.fiscalperiod.question.addretainedearnings"), + _("lima.common.question"), JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE); + //ask user for the entrybook to use for retained earnings + if (response == JOptionPane.YES_OPTION) { + //Sets EntryBook + EntryBook newEntryBook = new EntryBookImpl(); + RetainedEarningsEntryBookForm entryBookForm = + new RetainedEarningsEntryBookForm(view); + entryBookForm.setEntryBook(newEntryBook); + // jaxx constructor don't call super() ? + entryBookForm.setLocationRelativeTo(view); + entryBookForm.setVisible(true); + // null == cancel action + EntryBook entryBook = entryBookForm.getEntryBook(); + if (entryBook != null) { + fiscalPeriodService.addRetainedEarnings( + selectedFiscalPeriod, newyear, entryBook); + } + } + } } catch (LimaException eee) { if (log.isErrorEnabled()) { log.error("Can't set net income", eee); Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2011-07-11 11:08:52 UTC (rev 3208) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2011-07-11 13:36:42 UTC (rev 3209) @@ -27,10 +27,10 @@ lima.charts.financialtransaction.question.removeentry=Do you really remove this entry ? lima.charts.financialtransaction.question.removetransaction=Do you really remove this transaction ? lima.charts.fiscalperiod.add=Add fiscalperiod -lima.charts.fiscalperiod.addretainedearnings=Report retained earnings lima.charts.fiscalperiod.block=Block fiscalperiod lima.charts.fiscalperiod.create=Create fiscalperiod -lima.charts.fiscalperiod.question.blocked=Block fiscalperiod +lima.charts.fiscalperiod.question.addretainedearnings=Report retained earnings ? +lima.charts.fiscalperiod.question.blocked=Block fiscalperiod ? lima.charts.fiscalperiod.question.morethan12=This period is longer than 12 months. Do you really create this ? lima.charts.fiscalperiod.question.newyear=Do you want to create a new fiscal year ? lima.charts.fiscalyear=Fiscal Years Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2011-07-11 11:08:52 UTC (rev 3208) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2011-07-11 13:36:42 UTC (rev 3209) @@ -27,9 +27,9 @@ lima.charts.financialtransaction.question.removeentry=Voulez-vous supprimer cette ligne de transaction? lima.charts.financialtransaction.question.removetransaction=Voulez-vous supprimer cette transaction? lima.charts.fiscalperiod.add=Nouvel exercice -lima.charts.fiscalperiod.addretainedearnings=Reporter à nouveau lima.charts.fiscalperiod.block=Cloturer un exercice lima.charts.fiscalperiod.create=Choisissez la date de début et de fin du nouvel exercice +lima.charts.fiscalperiod.question.addretainedearnings=Reporter à nouveau? lima.charts.fiscalperiod.question.blocked=Ètes vous sûre de vouloir clôturer cette exercice ? Cette action est irréversible \! lima.charts.fiscalperiod.question.morethan12=La période sélectionnée n'est pas de 12 mois, voulez-vous continuer ? lima.charts.fiscalperiod.question.newyear=Voulez vous créer un nouvel exercice?

1 0

r3208 - in trunk: lima-business/src/main/java/org/chorem/lima/business lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/java/org/chorem/lima/business/ejbinterface lima-business/src/test/java/org/chorem/lima/business lima-callao/src/main/java/org/chorem/lima/entity
by vsalaun＠users.chorem.org 11 Jul '11

11 Jul '11

Author: vsalaun Date: 2011-07-11 13:08:52 +0200 (Mon, 11 Jul 2011) New Revision: 3208 Url: http://chorem.org/repositories/revision/lima/3208 Log: add headers ton lima-business / lima-callao Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/OptionsServiceMonitorable.java trunk/lima-business/src/main/java/org/chorem/lima/business/VatStatementServiceMonitorable.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/OptionsServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/OptionsService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/OptionsServiceLocal.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/VatStatementService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/VatStatementServiceLocal.java trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/OptionsServiceMonitorable.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/OptionsServiceMonitorable.java 2011-07-11 11:02:45 UTC (rev 3207) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/OptionsServiceMonitorable.java 2011-07-11 11:08:52 UTC (rev 3208) @@ -1,3 +1,27 @@ +/* + * #%L + * Lima :: business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 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% + */ package org.chorem.lima.business; import org.chorem.lima.business.ejbinterface.OptionsService; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/VatStatementServiceMonitorable.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/VatStatementServiceMonitorable.java 2011-07-11 11:02:45 UTC (rev 3207) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/VatStatementServiceMonitorable.java 2011-07-11 11:08:52 UTC (rev 3208) @@ -1,3 +1,27 @@ +/* + * #%L + * Lima :: business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 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% + */ package org.chorem.lima.business; import org.chorem.lima.business.ejbinterface.VatStatementService; 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 2011-07-11 11:02:45 UTC (rev 3207) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2011-07-11 11:08:52 UTC (rev 3208) @@ -62,6 +62,7 @@ import org.chorem.lima.business.ejbinterface.FinancialStatementService; import org.chorem.lima.business.ejbinterface.IdentityService; import org.chorem.lima.business.ejbinterface.ReportService; +import org.chorem.lima.business.ejbinterface.VatStatementService; import org.chorem.lima.business.utils.DocumentsEnum; import org.chorem.lima.business.utils.EntryComparator; import org.chorem.lima.business.utils.FormatsEnum; @@ -76,6 +77,7 @@ import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.Identity; import org.chorem.lima.entity.LimaCallaoDAOHelper; +import org.chorem.lima.entity.VatStatement; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; @@ -116,6 +118,9 @@ @EJB private ReportService reportService; + @EJB + private VatStatementService vatStatementService; + protected String path; //SDFs @@ -1455,7 +1460,15 @@ @Override public void createVatDocuments(Date beginDate, Date endDate, FormatsEnum format) throws LimaException, IOException, COSVisitorException { - try { + try { + + List<VatStatement> vatStatementsList = vatStatementService.getAllVatStatements(); + + for (VatStatement vatStatement : vatStatementsList) { + BigDecimal nb = vatStatementService.vatStatementAmounts(vatStatement, beginDate, endDate); + System.out.println(vatStatement.getLabel() + " : " + nb); + } + String filePath = path+File.separator+DocumentsEnum.VAT.getFileName()+format.getExtension(); 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 2011-07-11 11:02:45 UTC (rev 3207) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java 2011-07-11 11:08:52 UTC (rev 3208) @@ -1,3 +1,27 @@ +/* + * #%L + * Lima :: business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 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% + */ package org.chorem.lima.business.ejb; import javax.ejb.Stateless; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/OptionsService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/OptionsService.java 2011-07-11 11:02:45 UTC (rev 3207) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/OptionsService.java 2011-07-11 11:08:52 UTC (rev 3208) @@ -1,3 +1,27 @@ +/* + * #%L + * Lima :: business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 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% + */ package org.chorem.lima.business.ejbinterface; import javax.ejb.Remote; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/OptionsServiceLocal.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/OptionsServiceLocal.java 2011-07-11 11:02:45 UTC (rev 3207) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/OptionsServiceLocal.java 2011-07-11 11:08:52 UTC (rev 3208) @@ -1,3 +1,27 @@ +/* + * #%L + * Lima :: business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 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% + */ package org.chorem.lima.business.ejbinterface; import javax.ejb.Local; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/VatStatementService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/VatStatementService.java 2011-07-11 11:02:45 UTC (rev 3207) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/VatStatementService.java 2011-07-11 11:08:52 UTC (rev 3208) @@ -1,11 +1,38 @@ +/* + * #%L + * Lima :: business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 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% + */ package org.chorem.lima.business.ejbinterface; +import java.math.BigDecimal; +import java.util.Date; import java.util.List; import javax.ejb.Remote; import org.chorem.lima.business.LimaException; import org.chorem.lima.entity.VatStatement; +import org.nuiton.topia.TopiaException; @Remote public interface VatStatementService { @@ -24,4 +51,9 @@ void updateVatStatement(VatStatement vatStatement) throws LimaException; + BigDecimal vatStatementAmounts(VatStatement vatStatement, + Date selectedBeginDate, Date selectedEndDate) throws LimaException, + TopiaException; + + } \ No newline at end of file Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/VatStatementServiceLocal.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/VatStatementServiceLocal.java 2011-07-11 11:02:45 UTC (rev 3207) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/VatStatementServiceLocal.java 2011-07-11 11:08:52 UTC (rev 3208) @@ -1,3 +1,27 @@ +/* + * #%L + * Lima :: business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 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% + */ package org.chorem.lima.business.ejbinterface; import javax.ejb.Local; 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 2011-07-11 11:02:45 UTC (rev 3207) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 2011-07-11 11:08:52 UTC (rev 3208) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 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 + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementImpl.java 2011-07-11 11:02:45 UTC (rev 3207) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementImpl.java 2011-07-11 11:08:52 UTC (rev 3208) @@ -1,3 +1,27 @@ +/* + * #%L + * Lima :: callao + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2011 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% + */ package org.chorem.lima.entity; public class VatStatementImpl extends VatStatementAbstract {

1 0