r3221 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-swing/src/main/java/org/chorem/lima/ui lima-swing/src/main/resources/i18n - Lima-commits

12 Jul 2011

Author: vsalaun
Date: 2011-07-12 14:33:30 +0200 (Tue, 12 Jul 2011)
New Revision: 3221

Url: http://chorem.org/repositories/revision/lima/3221

Log:
#347 enable access to vat chart and vat statement

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/VatStatementServiceImpl.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx
   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/DocumentServiceImpl.java
===================================================================

--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java	2011-07-12 08:23:05 UTC (rev 3220)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java	2011-07-12 12:33:30 UTC (rev 3221)
@@ -1465,8 +1465,8 @@
             List<VatStatement> vatStatementsList = vatStatementService.getAllVatStatements();
             
             for (VatStatement vatStatement : vatStatementsList) {
-                BigDecimal nb = vatStatementService.vatStatementAmounts(vatStatement, beginDate, endDate);
-                System.out.println(vatStatement.getLabel() + " : " + nb);
+                BigDecimal amount = vatStatementService.vatStatementAmounts(vatStatement, beginDate, endDate);
+                //System.out.println(vatStatement.getLabel() + " : " + amount);
             }
             
             String filePath = 

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-12 08:23:05 UTC (rev 3220)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java	2011-07-12 12:33:30 UTC (rev 3221)
@@ -151,6 +151,9 @@
         } catch (TopiaException ex) {
             doCatch(transaction, ex, log);
         }
+        finally {
+            doFinally(transaction, log);
+        }
         return vatStatements;
         
     }
@@ -239,7 +242,7 @@
                     ReportsDatas reportsDatas = reportServiceLocal.
                     generateAccountReportsWithTransaction(account, true,
                             selectedBeginDate, selectedEndDate, topiaContext);
-                    if (reportsDatas.getSoldeDebit()){
+                    if (reportsDatas.getSoldeDebit()) {
                         debitTemp = debitTemp.add(reportsDatas.getAmountSolde());
                     }
                     else {
@@ -283,9 +286,11 @@
             String labelProperty =
                 TopiaQuery.getProperty(VatStatement.LABEL);
             
-            query.addWhere(labelProperty + " " + Op.LIKE + " '%" +
-                    vatStatement.getLabel() + "%'");
-            //query.addWhere(label, operator, paramValue)            
+            //not to be used causing query exception with ' character
+            //query.addWhere(labelProperty + " " + Op.LIKE + " '%" +
+            //        vatStatement.getLabel() + "%'");
+            
+            query.addWhere(labelProperty, Op.LIKE, vatStatement.getLabel());
             query.setMaxResults(1);
 
             log.debug("query to find account by VAT " + query);
@@ -298,7 +303,7 @@
         }
         catch (TopiaException e) {
             doCatch(topiaContext, e, log);
-       }
+        }
         return accountNumbersList;
     }
     
@@ -331,8 +336,10 @@
         }
         catch (TopiaException e) {
             doCatch(transaction, e, log);
-       }
-        
+        }
+        finally {
+            doFinally(transaction, log);
+        }
         return debitTemp.subtract(creditTemp).abs();
     }
 

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-12 08:23:05 UTC (rev 3220)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx	2011-07-12 12:33:30 UTC (rev 3221)
@@ -168,6 +168,8 @@
                        actionIcon='charts-financialperiod'/>
             <JMenuItem text="lima.charts.financialstatement" onActionPerformed='getHandler().showFinancialStatementView(this)'
                        actionIcon='charts-financialstatements'/>
+            <JMenuItem text="lima.charts.vatstatement" onActionPerformed='getHandler().showVatChartView(this)'
+                       actionIcon='charts-financialstatements'/>
         </JMenu>
 
         <JMenu text="lima.entries" mnemonic="{'E'}">
@@ -191,6 +193,8 @@
                 actionIcon='reports-ledger'/>
             <JMenuItem text="lima.reports.financialstatement" onActionPerformed='getHandler().showFinancialStatementReportsView(this)'
                 actionIcon='reports-financialstatement'/>
+            <JMenuItem text="lima.reports.vatstatement" onActionPerformed='getHandler().showVatReportView(this)'
+                actionIcon='reports-financialstatement'/>
 
         </JMenu>
 

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-12 08:23:05 UTC (rev 3220)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties	2011-07-12 12:33:30 UTC (rev 3221)
@@ -34,7 +34,7 @@
 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
-lima.charts.vat=VAT statement chart
+lima.charts.vatstatement=VAT statement chart
 lima.common.account=Account
 lima.common.amount=Amount
 lima.common.amountcredit=Credit amount
@@ -208,6 +208,7 @@
 lima.reports.financialstatement=Financialstatements
 lima.reports.ledger=Ledger
 lima.reports.vat=Edit VAT
+lima.reports.vatstatement=
 lima.response.no=No
 lima.response.yes=Yes
 lima.splash.1=Loading services...

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-12 08:23:05 UTC (rev 3220)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties	2011-07-12 12:33:30 UTC (rev 3221)
@@ -34,7 +34,7 @@
 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?
 lima.charts.fiscalyear=Exercices
-lima.charts.vat=Plan TVA
+lima.charts.vatstatement=Plan TVA
 lima.common.account=Compte
 lima.common.amount=Montant
 lima.common.amountcredit=Total Crédit
@@ -208,6 +208,7 @@
 lima.reports.financialstatement=Bilan et Compte de résultat
 lima.reports.ledger=Grand Livre
 lima.reports.vat=Edition TVA
+lima.reports.vatstatement=
 lima.response.no=Non
 lima.response.yes=Oui
 lima.splash.1=Chargement des services...

    

r3221 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-swing/src/main/java/org/chorem/lima/ui lima-swing/src/main/resources/i18n

vsalaun＠users.chorem.org

tags

participants (1)