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

r3171 - in trunk/lima-business/src/main/java/org/chorem/lima/business: migration utils
by echatellier＠users.chorem.org June 10, 2011

June 10, 2011

Author: echatellier Date: 2011-06-10 15:34:35 +0200 (Fri, 10 Jun 2011) New Revision: 3171 Url: http://chorem.org/repositories/revision/lima/3171 Log: Fix headers Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialPeriodComparator.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java 2011-06-10 13:29:15 UTC (rev 3170) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java 2011-06-10 13:34:35 UTC (rev 3171) @@ -1,3 +1,27 @@ +/* + * #%L + * Lima :: business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin, Victor Salaun + * %% + * 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.migration; import java.util.List; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java 2011-06-10 13:29:15 UTC (rev 3170) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java 2011-06-10 13:34:35 UTC (rev 3171) @@ -1,3 +1,27 @@ +/* + * #%L + * Lima :: business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin, Victor Salaun + * %% + * 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.migration; import java.util.List; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialPeriodComparator.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialPeriodComparator.java 2011-06-10 13:29:15 UTC (rev 3170) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/utils/FinancialPeriodComparator.java 2011-06-10 13:34:35 UTC (rev 3171) @@ -1,3 +1,27 @@ +/* + * #%L + * Lima :: business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin, Victor Salaun + * %% + * 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.utils; import java.io.Serializable;

1 0

r3170 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by echatellier＠users.chorem.org June 10, 2011

June 10, 2011

Author: echatellier Date: 2011-06-10 15:29:15 +0200 (Fri, 10 Jun 2011) New Revision: 3170 Url: http://chorem.org/repositories/revision/lima/3170 Log: Fix i18n format Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.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 2011-06-10 13:13:42 UTC (rev 3169) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServiceImpl.java 2011-06-10 13:29:15 UTC (rev 3170) @@ -90,9 +90,7 @@ Account existAccount = accountDAO.findByAccountNumber(account.getAccountNumber()); if (existAccount != null) { - throw new LimaBusinessException(_( - "lima-business.account.accountalreardyexist", - account.getAccountNumber())); + throw new LimaBusinessException(_("lima-business.account.accountalreardyexist", account.getAccountNumber())); } //create it

1 0

r3169 - trunk
by echatellier＠users.chorem.org June 10, 2011

June 10, 2011

Author: echatellier Date: 2011-06-10 15:13:42 +0200 (Fri, 10 Jun 2011) New Revision: 3169 Url: http://chorem.org/repositories/revision/lima/3169 Log: #388 : Update to h2 1.3.155 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-10 09:52:47 UTC (rev 3168) +++ trunk/pom.xml 2011-06-10 13:13:42 UTC (rev 3169) @@ -90,7 +90,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.137</version> + <version>1.3.155</version> <scope>runtime</scope> </dependency>

1 0

r3168 - trunk
by vsalaun＠users.chorem.org June 10, 2011

June 10, 2011

Author: vsalaun Date: 2011-06-10 11:52:47 +0200 (Fri, 10 Jun 2011) New Revision: 3168 Url: http://chorem.org/repositories/revision/lima/3168 Log: #347 fixed dependencies cause Eric said to Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-10 09:45:02 UTC (rev 3167) +++ trunk/pom.xml 2011-06-10 09:52:47 UTC (rev 3168) @@ -198,16 +198,6 @@ <artifactId>pdfbox</artifactId> <version>1.5.0</version> </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15</artifactId> - <version>1.44</version> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk15</artifactId> - <version>1.44</version> - </dependency> </dependencies>

1 0

r3167 - in trunk: . lima-business
by vsalaun＠users.chorem.org June 10, 2011

June 10, 2011

Author: vsalaun Date: 2011-06-10 11:45:02 +0200 (Fri, 10 Jun 2011) New Revision: 3167 Url: http://chorem.org/repositories/revision/lima/3167 Log: #347 add pdfbox Modified: trunk/lima-business/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-06-09 15:30:11 UTC (rev 3166) +++ trunk/lima-business/pom.xml 2011-06-10 09:45:02 UTC (rev 3167) @@ -27,8 +27,11 @@ <groupId>com.lowagie</groupId> <artifactId>itext</artifactId> </dependency> - <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox</artifactId> + </dependency> + <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-09 15:30:11 UTC (rev 3166) +++ trunk/pom.xml 2011-06-10 09:45:02 UTC (rev 3167) @@ -190,6 +190,24 @@ <artifactId>servlet-api</artifactId> <version>2.5-6.0.1</version> </dependency> + +  + + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox</artifactId> + <version>1.5.0</version> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15</artifactId> + <version>1.44</version> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcmail-jdk15</artifactId> + <version>1.44</version> + </dependency> </dependencies>

1 0

r3166 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/java/org/chorem/lima/business/ejbinterface lima-swing/src/main/resources/i18n
by vsalaun＠users.chorem.org June 9, 2011

June 9, 2011

Author: vsalaun Date: 2011-06-09 17:30:11 +0200 (Thu, 09 Jun 2011) New Revision: 3166 Url: http://chorem.org/repositories/revision/lima/3166 Log: #347 add VAT service 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-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/ReportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2011-06-09 14:05:37 UTC (rev 3165) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2011-06-09 15:30:11 UTC (rev 3166) @@ -29,6 +29,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; + +import javax.ejb.EJB; import javax.ejb.Stateless; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -37,8 +39,11 @@ import org.chorem.lima.beans.BalanceTrialImpl; import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.beans.ReportsDatasImpl; +import org.chorem.lima.beans.VatReports; +import org.chorem.lima.beans.VatReportsImpl; import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.ejbinterface.FinancialPeriodService; import org.chorem.lima.business.ejbinterface.ReportService; import org.chorem.lima.business.ejbinterface.ReportServiceLocal; import org.chorem.lima.entity.Account; @@ -46,7 +51,9 @@ import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryDAO; +import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialTransaction; +import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.LimaCallaoDAOHelper; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; @@ -61,6 +68,9 @@ private TopiaContext rootContext; + @EJB + protected FinancialPeriodService financialPeriodService; + public ReportServiceImpl() { LimaConfig config = LimaConfig.getInstance(); try { @@ -536,7 +546,108 @@ return generateBalanceTrial(beginDate, endDate, selectedAccounts, true, movementedFilter); } + /** + * Generate VAT + * + * @return VatReports + * @throws TopiaException + */ + @Override + public List<VatReports> generateVat(FiscalPeriod fiscalPeriod) throws LimaException { + + List<VatReports> vatReportsList = new ArrayList<VatReports>(); + + //gets the list of all the financialPeriods from the given fiscalPeriod + List<FinancialPeriod> financialPeriodsList = + financialPeriodService.getFinancialPeriods(fiscalPeriod.getBeginDate(), fiscalPeriod.getEndDate()); + + //Sets variables used to save amount for the following period + BigDecimal payable = BigDecimal.ZERO; + BigDecimal remainingCredit = BigDecimal.ZERO; + + TopiaContext topiaTransaction = null; + try { + topiaTransaction = beginTransaction(); + + AccountDAO accountDAO = + LimaCallaoDAOHelper.getAccountDAO(topiaTransaction); + //for each account, add the amount to the correct VatReports variable + + List<Account> accountsList = null; + + //Remove Spaces + String result = "445711,445712,445714,445715"; // TVA collectee + result = result.concat(",44562,445661,445662,445664,445665"); //TVA deductible + //build list account from selectedAccounts + accountsList = accountDAO.stringToListAccounts(result, false); + for (FinancialPeriod financialPeriod : financialPeriodsList) { + //Variable to save the vat total sum (collected - deductible) + BigDecimal vat = BigDecimal.ZERO; + //Sets VatReports variables to Zero + VatReports vatReports = new VatReportsImpl(); + vatReports.setPeriod(financialPeriod); + vatReports.setAmountCollected(BigDecimal.ZERO); + vatReports.setAmountDeductible(BigDecimal.ZERO); + vatReports.setAmountDue(BigDecimal.ZERO); + vatReports.setAmountCredit(BigDecimal.ZERO); + vatReports.setAmountRepayments(BigDecimal.ZERO); + vatReports.setAmountRemainingCredit(BigDecimal.ZERO); + //if remainingCredit is not nul then report it to the current period + if (!remainingCredit.equals(BigDecimal.ZERO)) { + vatReports.setAmountRemainingCredit(remainingCredit); + remainingCredit = BigDecimal.ZERO; + } + //if payable is not null then report it to the current period + vatReports.setAmountPayable(BigDecimal.ZERO); + if (!payable.equals(BigDecimal.ZERO)) { + vatReports.setAmountPayable(payable); + payable = BigDecimal.ZERO; + } + vatReports.setAmountPaid(BigDecimal.ZERO); + for (Account account : accountsList) { + ReportsDatas reportsDatas = + generateSubAccountBalanceWithTransaction(account, financialPeriod.getBeginDate(), + financialPeriod.getEndDate(), false, topiaTransaction); + //445711,445712,445714,445715 TVA collectee + if (("445711,445712,445714,445715").contains(account.getAccountNumber()) + && (reportsDatas.getAmountSolde() != null)) { + vatReports.setAmountCollected(vatReports.getAmountCollected().add(reportsDatas.getAmountSolde())); + vat = vat.add(reportsDatas.getAmountSolde()); + } + //44562,445661,445662,445664,445665TVA deductible + if (("44562,445661,445662,445664,445665").contains(account.getAccountNumber()) + && (reportsDatas.getAmountSolde() != null)) { + vatReports.setAmountDeductible(vatReports.getAmountDeductible().add(reportsDatas.getAmountSolde())); + vat = vat.add(reportsDatas.getAmountSolde().negate()); + } + } + //if vat is positive it's a credit + if (vat.compareTo(BigDecimal.ZERO) < 0) { + vatReports.setAmountRemainingCredit(vat.abs()); + remainingCredit = vat.abs(); + } + //if vat is negative it's a debit + if (vat.compareTo(BigDecimal.ZERO) > 0) { + vatReports.setAmountDue(vat.abs()); + payable = vat.abs(); + } + if (vatReports != null) { + vatReportsList.add(vatReports); + } + } + + //commitTransaction(topiaTransaction); + } + catch (TopiaException ex) { + doCatch(topiaTransaction, ex, log); + } + finally { + doFinally(topiaTransaction, log); + } + return vatReportsList; + } + protected TopiaContext beginTransaction() throws TopiaException { // basic check done, make check in database // TODO move it into JTA 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 2011-06-09 14:05:37 UTC (rev 3165) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/ReportService.java 2011-06-09 15:30:11 UTC (rev 3166) @@ -26,12 +26,16 @@ package org.chorem.lima.business.ejbinterface; import java.util.Date; +import java.util.List; + import javax.ejb.Remote; import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.beans.VatReports; import org.chorem.lima.business.LimaException; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.FiscalPeriod; /** * Service de generation des rapports. @@ -86,5 +90,10 @@ * Generation du rapports des journaux */ ReportsDatas generateEntryBooksReports(EntryBook entryBook, Date beginDate, Date endDate) throws LimaException; + + /** + * Generate VAT + */ + List<VatReports> generateVat(FiscalPeriod fiscalPeriod) throws LimaException; } 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-06-09 14:05:37 UTC (rev 3165) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2011-06-09 15:30:11 UTC (rev 3166) @@ -203,6 +203,7 @@ lima.reports.entrybooks=Edit entrybook lima.reports.financialstatement=Financialstatements lima.reports.ledger=Ledger +lima.reports.vat=Edit VAT lima.response.no=No lima.response.yes=Yes lima.splash.1=Loading services... @@ -214,8 +215,8 @@ lima.table.balance=Balance lima.table.closure=Closed lima.table.code=Code +lima.table.collectedvat=Collected VAT lima.table.credit=Credit -lima.table.collectedvat=Collected VAT lima.table.date=Date lima.table.debit=Debit lima.table.debitcredit=Debit and credit 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-06-09 14:05:37 UTC (rev 3165) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2011-06-09 15:30:11 UTC (rev 3166) @@ -203,6 +203,7 @@ lima.reports.entrybooks=Edition journal lima.reports.financialstatement=Bilan et Compte de r\u00E9sultat lima.reports.ledger=Grand Livre +lima.reports.vat=Edition TVA lima.response.no=Non lima.response.yes=Oui lima.splash.1=Chargement des services... @@ -240,7 +241,7 @@ lima.table.vatcredit=Cr\u00E9dit de TVA lima.table.vatdue=TVA due lima.table.vatpaid=TVA pay\u00E9e -lima.table.vatpayable=TVA \u00e0 payer +lima.table.vatpayable=TVA \u00E0 payer lima.table.voucher=Pi\u00E8ce comptable lima.title=Lutin Invoice Monitoring and Accounting lima.title.about=\u00C0 propos de Lima...

1 0

r3165 - in trunk: lima-callao/src/main/xmi lima-swing/src/main/java/org/chorem/lima/ui/vatreports
by vsalaun＠users.chorem.org June 9, 2011

June 9, 2011

Author: vsalaun Date: 2011-06-09 16:05:37 +0200 (Thu, 09 Jun 2011) New Revision: 3165 Url: http://chorem.org/repositories/revision/lima/3165 Log: #347 Updating VatReports (table, model, view, accounting.zargo) Modified: trunk/lima-callao/src/main/xmi/accounting.zargo trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatViewHandler.java Modified: trunk/lima-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java 2011-06-09 14:01:42 UTC (rev 3164) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTable.java 2011-06-09 14:05:37 UTC (rev 3165) @@ -1,23 +1,20 @@ package org.chorem.lima.ui.vatreports; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; +import java.awt.Color; +import java.awt.Component; import java.math.BigDecimal; -import java.util.Date; +import java.text.SimpleDateFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.entity.Account; -import org.chorem.lima.entity.EntryBook; -import org.chorem.lima.ui.celleditor.AccountTableCellEditor; +import org.chorem.lima.beans.VatReports; import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; -import org.chorem.lima.ui.celleditor.DateTableCellEditor; -import org.chorem.lima.ui.celleditor.EmptyCellRenderer; -import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; import org.jdesktop.swingx.JXTable; +import org.jdesktop.swingx.decorator.ColorHighlighter; +import org.jdesktop.swingx.decorator.ComponentAdapter; +import org.jdesktop.swingx.decorator.HighlightPredicate; +import org.jdesktop.swingx.decorator.Highlighter; public class VatTable extends JXTable { @@ -28,27 +25,47 @@ private static final Log log = LogFactory.getLog(VatTable.class); protected VatViewHandler handler; + + protected VatTableModel model; + + private Highlighter colorTransaction; public VatTable(VatViewHandler handler) { this.handler = handler; - //Get new date editor - setDefaultEditor(Date.class, new DateTableCellEditor()); - //Get new entry book editor - setDefaultEditor(EntryBook.class, new EntryBookTableCellEditor()); - //Get new account editor - setDefaultEditor(Account.class, new AccountTableCellEditor()); - //Get new amount editor + model = this.handler.getView().getVatTableModel(); + + //Get new BigDecimal editor setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); - //get new String renderer for empty cells - setDefaultRenderer(String.class, new EmptyCellRenderer()); - //get new Account renderer for empty cells - setDefaultRenderer(Account.class, new EmptyCellRenderer()); - //get new EntryBook renderer for empty cells - setDefaultRenderer(EntryBook.class, new EmptyCellRenderer()); + + //highlight financial financial transactions + //FIXME 2011.06.09 doen't work !!! + addMonthColor(); } + + /* + * Color the background row in grey if the month number is even (pair in french) + */ + protected void addMonthColor() { + HighlightPredicate predicate = new HighlightPredicate() { + @Override + public boolean isHighlighted(Component renderer, + ComponentAdapter adapter) { + VatReports vatReport = model.getElementAt(adapter.row); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM"); + int month = Integer.parseInt(simpleDateFormat.format( + vatReport.getPeriod().getBeginDate())); + // true if month is even + return ((month % 2)==0); + + } + }; + colorTransaction = + new ColorHighlighter(predicate, new Color(222,222,222), null); + addHighlighter(colorTransaction); + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java 2011-06-09 14:01:42 UTC (rev 3164) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatTableModel.java 2011-06-09 14:05:37 UTC (rev 3165) @@ -2,8 +2,8 @@ import static org.nuiton.i18n.I18n._; +import java.text.SimpleDateFormat; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -11,12 +11,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.beans.VatReports; +import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.ReportServiceMonitorable; import org.chorem.lima.business.ServiceListener; -import org.chorem.lima.entity.Account; -import org.chorem.lima.entity.EntryBook; -import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FiscalPeriod; -import org.chorem.lima.entity.Letter; +import org.chorem.lima.service.LimaServiceFactory; +import org.chorem.lima.util.ErrorHelper; public class VatTableModel extends AbstractTableModel implements ServiceListener { @@ -27,19 +28,38 @@ private static final Log log = LogFactory .getLog(VatTableModel.class); + /** Services. */ + protected ReportServiceMonitorable reportService; + /** selected financial period */ protected FiscalPeriod selectedFiscalPeriod; /** data cache */ - protected List<Object> cacheDataList; + protected List<VatReports> cacheDataList; + protected VatReports vatReportsCache; public VatTableModel() { - // + reportService = + LimaServiceFactory.getInstance().getService( + ReportServiceMonitorable.class); } - protected List<Object> getDataList() { - List<Object> results = new ArrayList<Object>(); + protected List<VatReports> getDataList() { + List<VatReports> results = null; + + if (selectedFiscalPeriod != null) { + try { + results = reportService.generateVat(selectedFiscalPeriod); + } + catch (LimaException eee) { + if (log.isErrorEnabled()) { + log.debug("Can't update model", eee); + } + ErrorHelper.showErrorDialog("Can't get VAT list", eee); + } + } + return results; } @@ -114,11 +134,55 @@ public int getColumnCount() { return 8; } + + public VatReports getElementAt(int row){ + VatReports currentRow = (VatReports) cacheDataList.get(row); + return currentRow; + } @Override - public Object getValueAt(int rowIndex, int columnIndex) { - // TODO Auto-generated method stub - return null; + public Object getValueAt(int row, int column) { + Object result = null; + VatReports currentRow = (VatReports) cacheDataList.get(row); + //get entries for the period for the current row + + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMM yyyy"); + + try { + switch (column) { + case 0: + //result = currentRow.getDate(); //date + result = simpleDateFormat.format(currentRow.getPeriod().getBeginDate()) + + " - " + simpleDateFormat.format(currentRow.getPeriod().getEndDate()); + break; + case 1: + result = currentRow.getAmountCollected(); //tva collectee + break; + case 2: + result = currentRow.getAmountDeductible(); //tva deductible + break; + case 3: + result = currentRow.getAmountDue(); //tva due + break; + case 4: + result = currentRow.getAmountCredit(); //credit de tva + break; + case 5: + result = currentRow.getAmountRepayments(); //remboursemments + break; + case 6: + result = currentRow.getAmountRemainingCredit(); //credit restant + break; + case 7: + result = currentRow.getAmountPayable(); //tva a payer + break; + } + } + catch (Exception eee) { + log.debug("Can't get entries", eee); + } + + return result; } public void setFiscalPeriod(FiscalPeriod fiscalPeriod){ Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatView.jaxx 2011-06-09 14:01:42 UTC (rev 3164) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatView.jaxx 2011-06-09 14:05:37 UTC (rev 3165) @@ -32,6 +32,10 @@ onActionPerformed="getVatTableModel().setFiscalPeriod((FiscalPeriod)fiscalPeriodComboBox.getSelectedItem())" editable="false"/> </cell> + <cell> + <JButton id="editVatButton" text="lima.reports.vat" + onActionPerformed="getHandler().editVat()"/> + </cell> </row> <row> <cell fill="both" weightx="1" weighty="1" rows="3" columns="11"> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatViewHandler.java 2011-06-09 14:01:42 UTC (rev 3164) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatViewHandler.java 2011-06-09 14:05:37 UTC (rev 3165) @@ -21,6 +21,23 @@ this.view = view; } + /** + * @return VatView + */ + public VatView getView() { + return view; + } + + /** + * Edit VAT document + */ + public void editVat() { + + } + + /** + * Refresh VatTableModel + */ public void refresh(){ tableModel = view.getVatTableModel(); tableModel.refresh();

1 0

r3164 - trunk/lima-swing/src/main/java/org/chorem/lima/ui
by vsalaun＠users.chorem.org June 9, 2011

June 9, 2011

Author: vsalaun Date: 2011-06-09 16:01:42 +0200 (Thu, 09 Jun 2011) New Revision: 3164 Url: http://chorem.org/repositories/revision/lima/3164 Log: #347 add VAT reports menu item Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 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-06-09 08:52:35 UTC (rev 3163) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2011-06-09 14:01:42 UTC (rev 3164) @@ -185,6 +185,8 @@ actionIcon='reports-ledger'/> <JMenuItem text="lima.reports.financialstatement" onActionPerformed='getHandler().showFinancialStatementReportsView(this)' actionIcon='reports-financialstatement'/> + <JMenuItem text="lima.reports.vat" onActionPerformed='getHandler().showVatView(this)' + actionIcon='reports-financialstatement'/> </JMenu> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2011-06-09 08:52:35 UTC (rev 3163) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2011-06-09 14:01:42 UTC (rev 3164) @@ -54,6 +54,7 @@ import org.chorem.lima.ui.importexport.ImportExport; import org.chorem.lima.ui.ledger.LedgerView; import org.chorem.lima.ui.lettering.LetteringView; +import org.chorem.lima.ui.vatreports.VatView; import org.chorem.lima.util.ErrorHelper; /** @@ -405,6 +406,13 @@ FinancialStatementReportView financialStatementReportView = new FinancialStatementReportView(mainView); mainView.showTab(_("lima.reports.financialstatement"), financialStatementReportView); } + + public void showVatView(JAXXContext rootContext) { + MainView mainView = getUI(rootContext); + VatView vatView = new VatView(mainView); + mainView.showTab(_("lima.reports.vat"), vatView); + + } public void showImportExportView(JAXXContext rootContext, ImportExportEnum type) { MainView mainView = getUI(rootContext);

1 0

r3163 - trunk/lima-callao/src/main/xmi
by vsalaun＠users.chorem.org June 9, 2011

June 9, 2011

Author: vsalaun Date: 2011-06-09 10:52:35 +0200 (Thu, 09 Jun 2011) New Revision: 3163 Url: http://chorem.org/repositories/revision/lima/3163 Log: #347 add VatReports to accounting.zargo Modified: trunk/lima-callao/src/main/xmi/accounting.zargo Modified: trunk/lima-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ)

1 0

r3162 - trunk
by tchemit＠users.chorem.org June 7, 2011

June 7, 2011

Author: tchemit Date: 2011-06-07 22:10:32 +0200 (Tue, 07 Jun 2011) New Revision: 3162 Url: http://chorem.org/repositories/revision/lima/3162 Log: Update mavenpom4redmine to 2.5.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-07 16:31:55 UTC (rev 3161) +++ trunk/pom.xml 2011-06-07 20:10:32 UTC (rev 3162) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.5.4</version> + <version>2.5.5</version> </parent> <groupId>org.chorem</groupId>

1 0