[Lima-commits] 05/07: refs #769 Mise à jour des rapports

23 Jan 2015

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/newReportBuilder in repository lima.

See http://git.chorem.org/lima.git

commit d7a7b32a38f4943674ab3bd14b50b662108dcdeb
Author: dcosse <japbiw74>
Date:   Wed Jan 21 14:39:42 2015 +0100

    refs #769 Mise à jour des rapports
---
 .../api/report/GeneralEntryBookReportService.java  |   2 +-
 .../business/api/report/LedgerReportService.java   |   3 +-
 .../report/ProvisionalEntryBookReportService.java  |   2 +-
 .../chorem/lima/business/LimaServiceConfig.java    | 184 +++++++------
 .../lima/business/ejb/OptionsServiceImpl.java      |  24 +-
 .../ejb/report/BalanceReportServiceImpl.java       |  74 ++---
 .../report/GeneralEntryBookReportServiceImpl.java  |  48 ++--
 .../ejb/report/LedgerReportServiceImpl.java        |   3 +-
 .../ProvisionalEntryBookReportServiceImpl.java     |  24 +-
 .../resources/i18n/lima-business_en_GB.properties  |  12 +-
 .../resources/i18n/lima-business_fr_FR.properties  |  22 +-
 .../lima/business/EntryBookServiceImplTest.java    |   9 +-
 ...ortAccountImpl.java => BalanceAccountImpl.java} |   4 +-
 lima-callao/src/main/xmi/accounting-model.zargo    | Bin 54041 -> 55585 bytes
 .../src/main/java/org/chorem/lima/LimaMain.java    |  26 +-
 .../main/java/org/chorem/lima/LimaSwingConfig.java |  93 +++----
 .../resources/i18n/lima-swing_en_GB.properties     |  11 +
 .../resources/i18n/lima-swing_fr_FR.properties     |  17 ++
 .../jasperreports/accounts/AccountReport.jrxml     | 161 -----------
 .../balance/BalanceReportAccountReport.jrxml       |  90 +-----
 .../balance/BalanceSubAccountsReport.jrxml         | 291 +++++++++++++++++++-
 .../{BalanceReport.jrxml => DocumentReport.jrxml}  |  12 +-
 .../DocumentReport.jrxml}                          |  12 +-
 .../EntryBookReport.jrxml                          |   6 +-
 .../FinancialPeriodReport.jrxml                    |   6 +-
 .../TransactionReport.jrxml                        |   2 +-
 ...ryBookMainReport.jrxml => DocumentReport.jrxml} |  10 +-
 .../generalEntryBook/EntryBookPeriodReport.jrxml   |  10 +-
 .../GeneralEntryBookEntryReport.jrxml              |   2 +-
 .../DocumentReport.jrxml}                          | 138 +++++-----
 .../jasperreports/ledger/LedgerPeriodReport.jrxml  | 301 +++++++++++++++++++++
 .../chorem/lima/web/action/DocumentService.java    |  24 +-
 .../lima/web/action/balance/ReportBuilder.java     |  12 +-
 .../chorem/lima/web/service/HttpServerService.java |   7 +-
 34 files changed, 1014 insertions(+), 628 deletions(-)

diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/report/GeneralEntryBookReportService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/GeneralEntryBookReportService.java
index 7623053..134eaf0 100644
--- a/lima-business-api/src/main/java/org/chorem/lima/business/api/report/GeneralEntryBookReportService.java
+++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/GeneralEntryBookReportService.java
@@ -18,5 +18,5 @@ public interface GeneralEntryBookReportService {
      * @param currency the currency used
      * @return the entryBook beans
      */
-    DocumentReport getEntryBookDocumentReport(Date from, Date to, String currency, DecimalFormat bigDecimalFormat);
+    DocumentReport getGeneralEntryBookDocumentReport(Date from, Date to, String currency, DecimalFormat bigDecimalFormat);
 }
diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/report/LedgerReportService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/LedgerReportService.java
index f189ce5..c63c203 100644
--- a/lima-business-api/src/main/java/org/chorem/lima/business/api/report/LedgerReportService.java
+++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/LedgerReportService.java
@@ -2,6 +2,7 @@ package org.chorem.lima.business.api.report;
 
 import org.chorem.lima.beans.DocumentReport;
 
+import java.text.DecimalFormat;
 import java.util.Date;
 
 /**
@@ -16,5 +17,5 @@ public interface LedgerReportService {
      * @param currency current currency
      * @return
      */
-    DocumentReport getLedgerDocumentReport(Date beginDate, Date endDate, String currency);
+    DocumentReport getLedgerDocumentReport(Date beginDate, Date endDate, String currency, DecimalFormat decimalFormat);
 }
diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/report/ProvisionalEntryBookReportService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/ProvisionalEntryBookReportService.java
index dfa1b33..b1930ba 100644
--- a/lima-business-api/src/main/java/org/chorem/lima/business/api/report/ProvisionalEntryBookReportService.java
+++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/ProvisionalEntryBookReportService.java
@@ -19,5 +19,5 @@ public interface ProvisionalEntryBookReportService {
      * @param currency current currency
      * @return
      */
-    DocumentReport getProvisionalEntryBookDocumentReport(Date beginDate, Date endDate, List<String> entryBookCodes, String currency, DecimalFormat bigDecimalFormat);
+    DocumentReport getEntryBookDocumentReport(Date beginDate, Date endDate, List<String> entryBookCodes, String currency, DecimalFormat bigDecimalFormat);
 }
diff --git a/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java b/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java
index 1b43a09..ef75c48 100644
--- a/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java
+++ b/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java
@@ -219,159 +219,163 @@ public class LimaServiceConfig {
 
     // ** REPORT PART **
 
-    public File getReportsDir() {
-        String reportsDirPath =  config.getOption(ServiceConfigOption.REPORTS_DIR.key);
+    public File getReportsModelDir() {
+        String reportsDirPath =  config.getOption(ServiceConfigOption.REPORTS_MODEL_DIR.key);
         File result = new File(reportsDirPath);
         return result;
     }
 
-    public void setReportsDir(String url) {
-        config.setOption(ServiceConfigOption.REPORTS_DIR.key, url);
+    public void setReportsModelDir(String url) {
+        config.setOption(ServiceConfigOption.REPORTS_MODEL_DIR.key, url);
         config.saveForUser();
     }
 
-    public String getAccountReportPath() {
-        String vatPDFUrl = config.getOption(ServiceConfigOption.ACCOUNT_REPORT_PATH.getKey());
+    public String getAccountReportModelPath() {
+        String vatPDFUrl = config.getOption(ServiceConfigOption.ACCOUNT_DOCUMENT_REPORT_MODEL_PATH.getKey());
         return vatPDFUrl;
     }
 
-    public void setAccountReportPath(String path) {
-        config.setOption(ServiceConfigOption.ACCOUNT_REPORT_PATH.key, path);
+    public int getScale() {
+        return config.getOptionAsInt(ServiceConfigOption.SCALE.key);
+    }
+
+    public void setScale(String locale) {
+        config.setOption(ServiceConfigOption.SCALE.key, locale);
         config.saveForUser();
     }
 
-    public String getBalanceReportPath() {
-        String result = config.getOption(ServiceConfigOption.BALANCE_REPORT_PATH.getKey());
-        return result;
+    public boolean getCurrency() {
+        return config.getOptionAsBoolean(ServiceConfigOption.CURRENCY.key);
     }
 
-    public void setBalanceReportPath(String path) {
-        config.setOption(ServiceConfigOption.BALANCE_REPORT_PATH.key, path);
+    public void setCurrency(String locale) {
+        config.setOption(ServiceConfigOption.CURRENCY.key, locale);
         config.saveForUser();
     }
 
-    public String getBalanceReportAccountReportPath() {
-        String result = config.getOption(ServiceConfigOption.BALANCE_REPORT_ACCOUNT_REPORT_PATH.getKey());
-        return result;
+    public char getDecimalSeparator() {
+        char decimalSeparator = config.getOption(ServiceConfigOption.DECIMAL_SEPARATOR.key).charAt(0);
+        LimaServiceConfig serviceConfig = LimaServiceConfig.getInstance();
+        return decimalSeparator;
     }
 
-    public void setBalanceReportAccountReportPath(String path) {
-        config.setOption(ServiceConfigOption.BALANCE_REPORT_ACCOUNT_REPORT_PATH.key, path);
+    public void setDecimalSeparator(String locale) {
+        config.setOption(ServiceConfigOption.DECIMAL_SEPARATOR.key, locale);
         config.saveForUser();
     }
-    public String getBalanceSubAccountReportPath() {
-        String result = config.getOption(ServiceConfigOption.BALANCE_SUB_ACCOUNT_REPORT_PATH.getKey());
-        return result;
+
+    public char getThousandSeparator() {
+        return config.getOption(ServiceConfigOption.THOUSAND_SEPARATOR.key).charAt(0);
     }
 
-    public void setBalanceSubAccountReportPath(String path) {
-        config.setOption(ServiceConfigOption.BALANCE_SUB_ACCOUNT_REPORT_PATH.key, path);
+    public void setThousandSeparator(String locale) {
+        config.setOption(ServiceConfigOption.THOUSAND_SEPARATOR.key, locale);
         config.saveForUser();
     }
-    public String getGeneralEntryBookEntryBookMainReportPath() {
-        String result = config.getOption(ServiceConfigOption.GENERAL_ENTRY_BOOK_ENTRY_BOOK_MAIN_REPORT_PATH.getKey());
-        return result;
-    }
 
-    public void setGeneralEntryBookEntryBookMainReportPath(String path) {
-        config.setOption(ServiceConfigOption.GENERAL_ENTRY_BOOK_ENTRY_BOOK_MAIN_REPORT_PATH.key, path);
+    public void setAccountReportModelPath(String path) {
+        config.setOption(ServiceConfigOption.ACCOUNT_DOCUMENT_REPORT_MODEL_PATH.key, path);
         config.saveForUser();
     }
-    public String getGeneralEntryBookEntryBookPeriodReportPath() {
-        String result = config.getOption(ServiceConfigOption.GENERAL_ENTRY_BOOK_ENTRY_BOOK_PERIOD_REPORT_PATH.getKey());
+
+    public String getBalanceDocumentReportModelPath() {
+        String result = config.getOption(ServiceConfigOption.BALANCE_DOCUMENT_REPORT_MODEL_PATH.getKey());
         return result;
     }
 
-    public void setGeneralEntryBookEntryBookPeriodReportPath(String path) {
-        config.setOption(ServiceConfigOption.GENERAL_ENTRY_BOOK_ENTRY_BOOK_PERIOD_REPORT_PATH.key, path);
+    public void setBalanceDocumentReportModelPath(String path) {
+        config.setOption(ServiceConfigOption.BALANCE_DOCUMENT_REPORT_MODEL_PATH.key, path);
         config.saveForUser();
     }
 
-    public String getGeneralEntryBookGeneralEntryBookEntryReportPath() {
-        String result = config.getOption(ServiceConfigOption.GENERAL_ENTRY_BOOK_GENERAL_ENTRY_BOOK_ENTRY_REPORT_PATH.getKey());
+    public String getBalanceAccountReportModelPath() {
+        String result = config.getOption(ServiceConfigOption.BALANCE_ACCOUNT_REPORT_MODEL_PATH.getKey());
         return result;
     }
 
-    public void setGeneralEntryBookGeneralEntryBookEntryReportPath(String path) {
-        config.setOption(ServiceConfigOption.GENERAL_ENTRY_BOOK_GENERAL_ENTRY_BOOK_ENTRY_REPORT_PATH.key, path);
+    public void setBalanceAccountReportModelPath(String path) {
+        config.setOption(ServiceConfigOption.BALANCE_ACCOUNT_REPORT_MODEL_PATH.key, path);
         config.saveForUser();
     }
-    public String getProvisionalEntryBookEntryBookMainReportPath() {
-        String result = config.getOption(ServiceConfigOption.PROVISIONAL_ENTRY_BOOK_ENTRY_BOOK_MAIN_REPORT_PATH.getKey());
+
+    public String getBalanceSubAccountReportModelPath() {
+        String result = config.getOption(ServiceConfigOption.BALANCE_SUB_ACCOUNT_REPORT_MODEL_PATH.getKey());
         return result;
     }
 
-    public void setProvisionalEntryBookEntryBookMainReportPath(String path) {
-        config.setOption(ServiceConfigOption.PROVISIONAL_ENTRY_BOOK_ENTRY_BOOK_MAIN_REPORT_PATH.key, path);
+    public void setBalanceSubAccountReportModelPath(String path) {
+        config.setOption(ServiceConfigOption.BALANCE_SUB_ACCOUNT_REPORT_MODEL_PATH.key, path);
         config.saveForUser();
     }
-    public String getProvisionalEntryBookEntryBookReportPath() {
-        String result = config.getOption(ServiceConfigOption.PROVISIONAL_ENTRY_BOOK_ENTRY_BOOK_REPORT_PATH.getKey());
+
+    public String getEntryBookDocumentReportModelPath() {
+        String result = config.getOption(ServiceConfigOption.ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH.getKey());
         return result;
     }
 
-    public void setProvisionalEntryBookEntryBookReportPath(String path) {
-        config.setOption(ServiceConfigOption.PROVISIONAL_ENTRY_BOOK_ENTRY_BOOK_REPORT_PATH.key, path);
+    public void setEntryBookDocumentReportModelPath(String path) {
+        config.setOption(ServiceConfigOption.ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH.key, path);
         config.saveForUser();
     }
-    public String getProvisionalEntryBookFinancialPeriodReportPath() {
-        String result = config.getOption(ServiceConfigOption.PROVISIONAL_ENTRY_BOOK_FINANCIAL_PERIOD_REPORT_PATH.getKey());
+    public String getEntryBookEntryBookReportModelPath() {
+        String result = config.getOption(ServiceConfigOption.ENTRY_BOOK_ENTRY_BOOK_REPORT_MODEL_PATH.getKey());
         return result;
     }
 
-    public void setProvisionalEntryBookFinancialPeriodReportPath(String path) {
-        config.setOption(ServiceConfigOption.PROVISIONAL_ENTRY_BOOK_FINANCIAL_PERIOD_REPORT_PATH.key, path);
+    public void setEntryBookEntryBookReportModelPath(String path) {
+        config.setOption(ServiceConfigOption.ENTRY_BOOK_ENTRY_BOOK_REPORT_MODEL_PATH.key, path);
         config.saveForUser();
     }
 
-    public String getProvisionalEntryBookTransactionReportPath() {
-        String result = config.getOption(ServiceConfigOption.PROVISIONAL_ENTRY_BOOK_TRANSACTION_REPORT_PATH.getKey());
+    public String getEntryBookFinancialPeriodReportModelPath() {
+        String result = config.getOption(ServiceConfigOption.ENTRY_BOOK_FINANCIAL_PERIOD_REPORT_MODEL_PATH.getKey());
         return result;
     }
 
-    public void setProvisionalEntryBookTransactionReportPath(String path) {
-        config.setOption(ServiceConfigOption.PROVISIONAL_ENTRY_BOOK_TRANSACTION_REPORT_PATH.key, path);
+    public void setEntryBookFinancialPeriodReportModelPath(String path) {
+        config.setOption(ServiceConfigOption.ENTRY_BOOK_FINANCIAL_PERIOD_REPORT_MODEL_PATH.key, path);
         config.saveForUser();
     }
 
-    public int getScale() {
-        return config.getOptionAsInt(ServiceConfigOption.SCALE.key);
+    public String getEntryBookTransactionReportModelPath() {
+        String result = config.getOption(ServiceConfigOption.ENTRY_BOOK_TRANSACTION_REPORT_MODEL_PATH.getKey());
+        return result;
     }
 
-    public void setScale(String locale) {
-        config.setOption(ServiceConfigOption.SCALE.key, locale);
+    public void setEntryBookTransactionReportModelPath(String path) {
+        config.setOption(ServiceConfigOption.ENTRY_BOOK_TRANSACTION_REPORT_MODEL_PATH.key, path);
         config.saveForUser();
     }
 
-    public boolean getCurrency() {
-        return config.getOptionAsBoolean(ServiceConfigOption.CURRENCY.key);
+    public String getGeneralEntryBookDocumentReportModelPath() {
+        String result = config.getOption(ServiceConfigOption.GENERAL_ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH.getKey());
+        return result;
     }
 
-    public void setCurrency(String locale) {
-        config.setOption(ServiceConfigOption.CURRENCY.key, locale);
+    public void setGeneralEntryBookDocumentReportModelPath(String path) {
+        config.setOption(ServiceConfigOption.GENERAL_ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH.key, path);
         config.saveForUser();
     }
 
-    public char getDecimalSeparator() {
-        char decimalSeparator = config.getOption(ServiceConfigOption.DECIMAL_SEPARATOR.key).charAt(0);
-        LimaServiceConfig serviceConfig = LimaServiceConfig.getInstance();
-        return decimalSeparator;
+    public String getGeneralEntryBookReportModelPath() {
+        String result = config.getOption(ServiceConfigOption.GENERAL_ENTRY_BOOK_REPORT_MODEL_PATH.getKey());
+        return result;
     }
 
-    public void setDecimalSeparator(String locale) {
-        config.setOption(ServiceConfigOption.DECIMAL_SEPARATOR.key, locale);
+    public void setGeneralEntryBookReportModelPath(String path) {
+        config.setOption(ServiceConfigOption.GENERAL_ENTRY_BOOK_REPORT_MODEL_PATH.key, path);
         config.saveForUser();
     }
 
-    public char getThousandSeparator() {
-        return config.getOption(ServiceConfigOption.THOUSAND_SEPARATOR.key).charAt(0);
+    public String getGeneralEntryBookEntryReportModelPath() {
+        String result = config.getOption(ServiceConfigOption.GENERAL_ENTRY_BOOK_ENTRY_REPORT_MODEL_PATH.getKey());
+        return result;
     }
 
-    public void setThousandSeparator(String locale) {
-        config.setOption(ServiceConfigOption.THOUSAND_SEPARATOR.key, locale);
+    public void setGeneralEntryBookEntryReportModelPath(String path) {
+        config.setOption(ServiceConfigOption.GENERAL_ENTRY_BOOK_ENTRY_REPORT_MODEL_PATH.key, path);
         config.saveForUser();
     }
-
     // ** FIN REPORT PART **
 
 
@@ -392,22 +396,28 @@ public class LimaServiceConfig {
         SERVER_ADRESS("lima.serveraddress", n("lima.config.serveraddress.description"), "", String.class, false, false),
         VAT_PDF_URL("lima.report.vatpdfurl", n("lima.config.reportvatpdfurl.description"), "default", String.class, false, false),
 
-        REPORTS_DIR("lima.reports.dir",n("lima.config.reports.dir.description"),"${lima.data.dir}/reports", File.class, false, false),
-        ACCOUNT_REPORT_PATH("lima.accounts.accountReportPath", "", ROOT_PATH +"/lima-web/src/main/jasperreports/accounts/AccountReport.jrxml",String.class, false, false),
-        BALANCE_REPORT_PATH("lima.balance.balanceReportPath","", ROOT_PATH +"/lima-web/src/main/jasperreports/balance/BalanceReport.jrxml",String.class, false, false),
-        BALANCE_REPORT_ACCOUNT_REPORT_PATH("lima.balance.balanceReportAccountReportPath","", ROOT_PATH +"/lima-web/src/main/jasperreports/balance/BalanceReportAccountReport.jrxml",String.class, false, false),
-        BALANCE_SUB_ACCOUNT_REPORT_PATH("lima.balance.balanceSubAccountReportPath",n("lima.config.documentReport.balanceReportAccount.description"), ROOT_PATH +"/lima-web/src/main/jasperreports/balance/BalanceSubAccountsReport.jrxml",String.class, false, false),
-        GENERAL_ENTRY_BOOK_ENTRY_BOOK_MAIN_REPORT_PATH("lima.generalEntryBook.entryBookMainReportPath", "", ROOT_PATH +"/lima-web/src/main/jasperreports/generalEntryBook/EntryBookMainReport.jrxml", String.class, false, false),
-        GENERAL_ENTRY_BOOK_ENTRY_BOOK_PERIOD_REPORT_PATH("lima.generalEntryBook.entryBookPeriodReportPath","", ROOT_PATH +"/lima-web/src/main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml", String.class, false, false),
-        GENERAL_ENTRY_BOOK_GENERAL_ENTRY_BOOK_ENTRY_REPORT_PATH("lima.generalEntryBook.generalEntryBookEntryReportPath", "", ROOT_PATH +"/lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml", String.class, false, false),
-        PROVISIONAL_ENTRY_BOOK_ENTRY_BOOK_MAIN_REPORT_PATH("lima.provisionalEntryBook.entryBookMainReportPath","", ROOT_PATH +"/lima-web/src/main/jasperreports/provisionalEntryBook/EntryBookMainReport.jrxml",String.class,false, false),
-        PROVISIONAL_ENTRY_BOOK_ENTRY_BOOK_REPORT_PATH("lima.provisionalEntryBook.entryBookReport","", ROOT_PATH +"/lima-web/src/main/jasperreports/provisionalEntryBook/EntryBookReport.jrxml",String.class,false, false),
-        PROVISIONAL_ENTRY_BOOK_FINANCIAL_PERIOD_REPORT_PATH("lima.provisionalEntryBook.financialPeriodReportPath","", ROOT_PATH +"/lima-web/src/main/jasperreports/provisionalEntryBook/FinancialPeriodReport.jrxml", String.class, false, false),
-        PROVISIONAL_ENTRY_BOOK_TRANSACTION_REPORT_PATH("lima.provisionalEntryBook.transactionReportPath","", ROOT_PATH +"/lima-web/src/main/jasperreports/provisionalEntryBook/TransactionReport.jrxml",String.class, false, false),
+        REPORTS_MODEL_DIR("lima.reports.dir",n("lima.config.reports.dir.description"),"${lima.data.dir}/reports", File.class, false, false),
+
+        ACCOUNT_DOCUMENT_REPORT_MODEL_PATH("lima.config.documentReport.account.documentReportModelPath", n("lima.config.documentReport.account.documentReportModelPath.description"), ROOT_PATH +"/lima-web/src/main/jasperreports/accounts/DocumentReport.jrxml",String.class, false, false),
+
+        BALANCE_DOCUMENT_REPORT_MODEL_PATH("lima.config.documentReport.balance.documentReportModelPath", n("lima.config.documentReport.balance.documentReportModelPath.description"), ROOT_PATH + "/lima-web/src/main/jasperreports/balance/DocumentReport.jrxml", String.class, false, false),
+        BALANCE_ACCOUNT_REPORT_MODEL_PATH("lima.config.documentReport.balance.balanceAccountReportModelPath", n("lima.config.documentReport.balance.balanceAccountReportModelPath.description"), ROOT_PATH + "/lima-web/src/main/jasperreports/balance/BalanceReportAccountReport.jrxml", String.class, false, false),
+        BALANCE_SUB_ACCOUNT_REPORT_MODEL_PATH("lima.config.documentReport.balance.balanceSubAccountReportModelPath", n("lima.config.documentReport.balance.balanceSubAccountReportModelPath.description"), ROOT_PATH + "/lima-web/src/main/jasperreports/balance/BalanceSubAccountsReport.jrxml", String.class, false, false),
+
+        GENERAL_ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH("lima.config.documentReport.generalEntrybook.documentReportModelPath", n("lima.config.documentReport.generalEntrybook.documentReportModelPath.description"), ROOT_PATH + "/lima-web/src/main/jasperreports/generalEntryBook/DocumentReport.jrxml", String.class, false, false),
+        GENERAL_ENTRY_BOOK_REPORT_MODEL_PATH("lima.config.documentReport.generalEntrybook.generalEntryBookModelPath", n("lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.description"), ROOT_PATH + "/lima-web/src/main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml", String.class, false, false),
+        GENERAL_ENTRY_BOOK_ENTRY_REPORT_MODEL_PATH("lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath", n("blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description"), ROOT_PATH + "/lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml", String.class, false, false),
+
+        ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH("lima.config.documentReport.entrybook.documentReportModelPath", n("lima.config.documentReport.entrybook.documentReportModelPath.description"), ROOT_PATH + "/lima-web/src/main/jasperreports/entryBook/DocumentReport.jrxml", String.class, false, false),
+        ENTRY_BOOK_ENTRY_BOOK_REPORT_MODEL_PATH("lima.config.documentReport.entrybook.entryBookModelPath", n("lima.config.documentReport.entrybook.entryBookModelPath.description"), ROOT_PATH + "/lima-web/src/main/jasperreports/entryBook/EntryBookReport.jrxml", String.class, false, false),
+        ENTRY_BOOK_FINANCIAL_PERIOD_REPORT_MODEL_PATH("lima.config.documentReport.entrybook.financialPeriodModelPath", n("lima.config.documentReport.entrybook.financialPeriodModelPath.description"), ROOT_PATH + "/lima-web/src/main/jasperreports/entryBook/FinancialPeriodReport.jrxml", String.class, false, false),
+        ENTRY_BOOK_TRANSACTION_REPORT_MODEL_PATH("lima.config.documentReport.entrybook.transactionReportModelPath", n("lima.config.documentReport.entrybook.transactionReportModelPath.description"), ROOT_PATH + "/lima-web/src/main/jasperreports/entryBook/TransactionReport.jrxml", String.class, false, false),
+
+
         SCALE("lima.scale", n("lima.config.scale.description"), "2", String.class, false, false),
-        CURRENCY("lima.config.currency","","false", Boolean.class, false, false),
-        DECIMAL_SEPARATOR("lima.data.bigDecimal.decimalSeparator","",",",Character.class, false, false),
-        THOUSAND_SEPARATOR("lima.thousandSeparator",""," ",Character.class, false, false);
+        CURRENCY("lima.config.currency", "", "false", Boolean.class, false, false),
+        DECIMAL_SEPARATOR("lima.data.bigDecimal.decimalSeparator", "", ",", Character.class, false, false),
+        THOUSAND_SEPARATOR("lima.thousandSeparator", "", " ", Character.class, false, false);
 
         private final String key;
 
diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java
index 772d489..caf775e 100644
--- a/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java
+++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java
@@ -46,62 +46,62 @@ public class OptionsServiceImpl extends AbstractLimaService implements OptionsSe
 
     @Override
     public void setReportsDir(String path) {
-        LimaServiceConfig.getInstance().setReportsDir(path);
+        LimaServiceConfig.getInstance().setReportsModelDir(path);
     }
 
     @Override
     public void setAccountReportPath(String path) {
-        LimaServiceConfig.getInstance().setAccountReportPath(path);
+        LimaServiceConfig.getInstance().setAccountReportModelPath(path);
     }
 
     @Override
     public void setBalanceReportPath(String path) {
-        LimaServiceConfig.getInstance().setBalanceReportPath(path);
+        LimaServiceConfig.getInstance().setBalanceDocumentReportModelPath(path);
     }
 
     @Override
     public void setBalanceReportAccountReportPath(String path) {
-        LimaServiceConfig.getInstance().setBalanceReportAccountReportPath(path);
+        LimaServiceConfig.getInstance().setBalanceAccountReportModelPath(path);
     }
 
     @Override
     public void setBalanceSubAccountReportPath(String path) {
-        LimaServiceConfig.getInstance().setBalanceSubAccountReportPath(path);
+        LimaServiceConfig.getInstance().setBalanceSubAccountReportModelPath(path);
     }
 
     @Override
     public void setGeneralEntryBookEntryBookMainReportPath(String path) {
-        LimaServiceConfig.getInstance().setGeneralEntryBookEntryBookMainReportPath(path);
+        LimaServiceConfig.getInstance().setGeneralEntryBookDocumentReportModelPath(path);
     }
 
     @Override
     public void setGeneralEntryBookPeriodReportPath(String path) {
-        LimaServiceConfig.getInstance().setGeneralEntryBookEntryBookPeriodReportPath(path);
+        LimaServiceConfig.getInstance().setGeneralEntryBookReportModelPath(path);
     }
 
     @Override
     public void setGeneralEntryBookGeneralEntryBookReportPath(String path) {
-        LimaServiceConfig.getInstance().setGeneralEntryBookGeneralEntryBookEntryReportPath(path);
+        LimaServiceConfig.getInstance().setGeneralEntryBookEntryReportModelPath(path);
     }
 
     @Override
     public void setProvisionalEntryBookEntryBookMainReportPath(String path) {
-        LimaServiceConfig.getInstance().setProvisionalEntryBookEntryBookMainReportPath(path);
+        LimaServiceConfig.getInstance().setEntryBookDocumentReportModelPath(path);
     }
 
     @Override
     public void setProvisionalEntryBookEntryBookReportPath(String path) {
-        LimaServiceConfig.getInstance().setProvisionalEntryBookEntryBookReportPath(path);
+        LimaServiceConfig.getInstance().setEntryBookEntryBookReportModelPath(path);
     }
 
     @Override
     public void setProvisionalEntryBookFinancialPeriodReportPath(String path) {
-        LimaServiceConfig.getInstance().setProvisionalEntryBookFinancialPeriodReportPath(path);
+        LimaServiceConfig.getInstance().setEntryBookFinancialPeriodReportModelPath(path);
     }
 
     @Override
     public void setProvisionalEntryBookTransactionReportPath(String path) {
-        LimaServiceConfig.getInstance().setProvisionalEntryBookTransactionReportPath(path);
+        LimaServiceConfig.getInstance().setEntryBookTransactionReportModelPath(path);
     }
 
 //    @Override
diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/BalanceReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/BalanceReportServiceImpl.java
index 5173f2c..a8cccf1 100644
--- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/BalanceReportServiceImpl.java
+++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/BalanceReportServiceImpl.java
@@ -26,8 +26,8 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import org.apache.commons.lang3.StringUtils;
 import org.chorem.lima.beans.DocumentReport;
-import org.chorem.lima.beans.BalanceReportAccount;
-import org.chorem.lima.beans.BalanceReportAccountImpl;
+import org.chorem.lima.beans.BalanceAccount;
+import org.chorem.lima.beans.BalanceAccountImpl;
 import org.chorem.lima.beans.DocumentReportImpl;
 import org.chorem.lima.beans.BalanceTrial;
 import org.chorem.lima.beans.BalanceTrialImpl;
@@ -78,10 +78,10 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal
 
     protected static final String TITLE = "BALANCE";
 
-    protected static final Predicate<BalanceReportAccount> HAS_NO_ENTRY = new Predicate<BalanceReportAccount>() {
+    protected static final Predicate<BalanceAccount> HAS_NO_ENTRY = new Predicate<BalanceAccount>() {
 
         @Override
-        public boolean apply(BalanceReportAccount subClasses) {
+        public boolean apply(BalanceAccount subClasses) {
             boolean result = BigDecimal.ZERO.equals(subClasses.getAmountDebit()) &&
                     BigDecimal.ZERO.equals(subClasses.getAmountCredit()) &&
                     BigDecimal.ZERO.equals(subClasses.getSoldeDebit()) &&
@@ -92,21 +92,21 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal
 
     @Override
     public DocumentReport getBalanceDocumentReport(Date from, Date to, String selectedAccounts, String currency, DecimalFormat bigDecimalFormat) {
-        String BALANCE_REPORT_ACCOUNT_REPORT_PATH = LimaServiceConfig.getInstance().getBalanceReportAccountReportPath();
-        String BALANCE_SUB_ACCOUNTS_REPORT_PATH = LimaServiceConfig.getInstance().getBalanceSubAccountReportPath();
+        String balanceAccountReportModelPath = LimaServiceConfig.getInstance().getBalanceAccountReportModelPath();
+        String balanceSubAccountReportModelPath = LimaServiceConfig.getInstance().getBalanceSubAccountReportModelPath();
 
-        DocumentReport result = new DocumentReportImpl();
-        result.setFormatter(bigDecimalFormat);
+        DocumentReport documentReport = new DocumentReportImpl();
+        documentReport.setFormatter(bigDecimalFormat);
 
         Identity identity = identityService.getIdentity();
-        result.setCompanyName(StringUtils.isNotBlank(identity.getName()) ? identity.getName() : "");
+        documentReport.setCompanyName(StringUtils.isNotBlank(identity.getName()) ? identity.getName() : "");
 
         // general info about balance report
-        result.setTitle(TITLE);
-        result.setCurrency(currency);
-        result.setFromDate(from);
-        result.setToDate(to);
-        result.setSubReportPath(BALANCE_REPORT_ACCOUNT_REPORT_PATH);
+        documentReport.setTitle(TITLE);
+        documentReport.setCurrency(currency);
+        documentReport.setFromDate(from);
+        documentReport.setToDate(to);
+        documentReport.setSubReportPath(balanceAccountReportModelPath);
 
 
         BalanceTrial balanceTrial = new BalanceTrialImpl();
@@ -129,7 +129,7 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal
             accounts = accountService.stringToListAccounts(selectedAccounts);
         }
 
-        Collection<BalanceReportAccount> returnedAccounts = new ArrayList<>();
+        Collection<BalanceAccount> returnedAccounts = new ArrayList<>();
         if (accounts != null && !accounts.isEmpty()) {
             Collections.sort(accounts, new AccountComparator());
 
@@ -137,31 +137,30 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal
             Account toAccount = accounts.get(accounts.size()-1);
             String fromAccountLabel = StringUtils.isNotBlank(fromAccount.getLabel()) ? fromAccount.getLabel() + " (" + fromAccount.getAccountNumber() + ")" : fromAccount.getAccountNumber();
             String toAccountLabel = StringUtils.isNotBlank(toAccount.getLabel()) ? toAccount.getLabel() + " (" + toAccount.getAccountNumber() + ")" : toAccount.getAccountNumber();
-            result.setFromAccount(fromAccountLabel + " à " + toAccountLabel);
+            documentReport.setFromAccount(fromAccountLabel + " à " + toAccountLabel);
 
-            HashMap<String, BalanceReportAccountImpl> accountsByClasses = new HashMap<>();
+            HashMap<String, BalanceAccountImpl> accountsByClasses = new HashMap<>();
             for (Account account : accounts) {
                 String accountClass = String.valueOf(account.getAccountNumber().charAt(0));
 
-                BalanceReportAccountImpl classAccount = accountsByClasses.get(accountClass);
+                BalanceAccountImpl classAccount = accountsByClasses.get(accountClass);
                 if (classAccount == null) {
-                    classAccount = new BalanceReportAccountImpl();
+                    classAccount = new BalanceAccountImpl();
                     classAccount.setFormatter(bigDecimalFormat);
-                    classAccount.setBalanceSubAccountsReportPath(BALANCE_SUB_ACCOUNTS_REPORT_PATH);
-                    classAccount.setSubAccounts(new ArrayList<BalanceReportAccount>());
+                    classAccount.setBalanceSubAccountsReportPath(balanceSubAccountReportModelPath);
+                    classAccount.setSubAccounts(new ArrayList<BalanceAccount>());
                     classAccount.setAccountNumber("");
-                    classAccount.setLabel("Total " + accountClass);
                     accountsByClasses.put(accountClass, classAccount);
                     returnedAccounts.add(classAccount);
                 }
-                BalanceReportAccount subClassAccount = bindAccountToBalanceReportAccount(account, from, to, bigDecimalFormat);
+                BalanceAccount subClassAccount = bindAccountToBalanceReportAccount(accountClass, account, from, to, bigDecimalFormat);
                 classAccount.addSubAccount(subClassAccount);
             }
         }
 
         Iterables.removeIf(returnedAccounts, HAS_NO_ENTRY);
-        result.addAllAccounts(returnedAccounts);
-        return result;
+        documentReport.addAllMainAccounts(returnedAccounts);
+        return documentReport;
     }
 
     /**
@@ -170,14 +169,15 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal
      * Get all entries if true
      * @throws org.nuiton.topia.persistence.TopiaException
      */
-    protected BalanceReportAccount bindAccountToBalanceReportAccount(Account account, Date beginDate, Date endDate, DecimalFormat bigDecimalFormat) {
-        BalanceReportAccount balanceReportAccount = new BalanceReportAccountImpl();
-        balanceReportAccount.setFormatter(bigDecimalFormat);
+    protected BalanceAccount bindAccountToBalanceReportAccount(String mainAccountLabel, Account account, Date beginDate, Date endDate, DecimalFormat bigDecimalFormat) {
+        BalanceAccount BalanceAccount = new BalanceAccountImpl();
+        BalanceAccount.setMainAccountLabel(mainAccountLabel);
+        BalanceAccount.setFormatter(bigDecimalFormat);
 
         String accountNumber = account.getAccountNumber();
         accountNumber = StringUtils.rightPad(accountNumber, ACCOUNT_NUMBER_SIZE - accountNumber.length(), '0');
-        balanceReportAccount.setAccountNumber(accountNumber);
-        balanceReportAccount.setLabel(account.getLabel());
+        BalanceAccount.setAccountNumber(accountNumber);
+        BalanceAccount.setLabel(account.getLabel());
 
         EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao();
 
@@ -206,16 +206,16 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal
         sold = sold.subtract(credit);
 
         if (sold.compareTo(BigDecimal.ZERO) == 1) {
-            balanceReportAccount.setSoldeDebit(sold.abs());
-            balanceReportAccount.setSoldeCredit(BigDecimal.ZERO);
+            BalanceAccount.setSoldeDebit(sold.abs());
+            BalanceAccount.setSoldeCredit(BigDecimal.ZERO);
         } else {
-            balanceReportAccount.setSoldeCredit(sold.abs());
-            balanceReportAccount.setSoldeDebit(BigDecimal.ZERO);
+            BalanceAccount.setSoldeCredit(sold.abs());
+            BalanceAccount.setSoldeDebit(BigDecimal.ZERO);
         }
 
-        balanceReportAccount.setAmountCredit(credit);
-        balanceReportAccount.setAmountDebit(debit);
+        BalanceAccount.setAmountCredit(credit);
+        BalanceAccount.setAmountDebit(debit);
 
-        return balanceReportAccount;
+        return BalanceAccount;
     }
 }
diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/GeneralEntryBookReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/GeneralEntryBookReportServiceImpl.java
index 70fef04..0d0cd36 100644
--- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/GeneralEntryBookReportServiceImpl.java
+++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/GeneralEntryBookReportServiceImpl.java
@@ -10,10 +10,10 @@ import org.apache.commons.logging.LogFactory;
 import org.chorem.lima.LimaTechnicalException;
 import org.chorem.lima.beans.DocumentReport;
 import org.chorem.lima.beans.DocumentReportImpl;
-import org.chorem.lima.beans.EntryBookPeriodReport;
-import org.chorem.lima.beans.EntryBookPeriodReportImpl;
+import org.chorem.lima.beans.GeneralEntryBook;
 import org.chorem.lima.beans.GeneralEntryBookEntry;
 import org.chorem.lima.beans.GeneralEntryBookEntryImpl;
+import org.chorem.lima.beans.GeneralEntryBookImpl;
 import org.chorem.lima.business.LimaServiceConfig;
 import org.chorem.lima.business.api.ClosedPeriodicEntryBookService;
 import org.chorem.lima.business.api.EntryService;
@@ -73,24 +73,24 @@ public class GeneralEntryBookReportServiceImpl extends AbstractLimaService imple
     protected static final String TITLE = "Journal Général Provisoire";
 
     @Override
-    public DocumentReport getEntryBookDocumentReport(Date beginDate, Date endDate, String currency, DecimalFormat bigDecimalFormat) {
-        String entryBookPeriodReportPath = LimaServiceConfig.getInstance().getGeneralEntryBookEntryBookPeriodReportPath();
-        String generalEntryBookEntryBookReportPath = LimaServiceConfig.getInstance().getGeneralEntryBookGeneralEntryBookEntryReportPath();
+    public DocumentReport getGeneralEntryBookDocumentReport(Date beginDate, Date endDate, String currency, DecimalFormat bigDecimalFormat) {
+        String generalEntryBookReportPath = LimaServiceConfig.getInstance().getGeneralEntryBookReportModelPath();
+        String generalEntryBookEntryReportPath = LimaServiceConfig.getInstance().getGeneralEntryBookEntryReportModelPath();
 
-        DocumentReport result = new DocumentReportImpl();
+        DocumentReport documentReport = new DocumentReportImpl();
         try {
 
             if (beginDate != null && endDate != null) {
                 Identity identity = identityService.getIdentity();
-                result.setCompanyName(StringUtils.isNotBlank(identity.getName()) ? identity.getName() : "");
+                documentReport.setCompanyName(StringUtils.isNotBlank(identity.getName()) ? identity.getName() : "");
 
                 // general infos about balance report
-                result.setTitle(TITLE);
-                result.setCurrency(currency);
-                result.setFromDate(beginDate);
-                result.setToDate(endDate);
-                result.setSubReportPath(entryBookPeriodReportPath);
-                result.setFormatter(bigDecimalFormat);
+                documentReport.setTitle(TITLE);
+                documentReport.setCurrency(currency);
+                documentReport.setFromDate(beginDate);
+                documentReport.setToDate(endDate);
+                documentReport.setSubReportPath(generalEntryBookReportPath);
+                documentReport.setFormatter(bigDecimalFormat);
 
                 List<FinancialPeriod> financialPeriods = financialPeriodService.getFinancialPeriods(beginDate, endDate);
 
@@ -161,14 +161,14 @@ public class GeneralEntryBookReportServiceImpl extends AbstractLimaService imple
                     Iterables.removeIf(generalEntryBookEntries, HAS_NO_ENTRY);
 
                     if (subAmountCredit.compareTo(BigDecimal.ZERO) != 0 && subAmountDebit.compareTo(BigDecimal.ZERO) != 0) {
-                        EntryBookPeriodReport entryBookPeriodReport = new EntryBookPeriodReportImpl();
-                        entryBookPeriodReport.setFormatter(bigDecimalFormat);
-                        entryBookPeriodReport.setPeriod(financialPeriod.getBeginDate());
-                        entryBookPeriodReport.setSubReportPath(generalEntryBookEntryBookReportPath);
-                        entryBookPeriodReport.setSoldeDebit(subAmountDebit);
-                        entryBookPeriodReport.setSoldeCredit(subAmountCredit);
-                        entryBookPeriodReport.setGeneralEntryBookEntry(Lists.newArrayList(generalEntryBookEntries));
-                        result.addEntryBookPeriodReport(entryBookPeriodReport);
+                        GeneralEntryBook generalEntryBook = new GeneralEntryBookImpl();
+                        generalEntryBook.setFormatter(bigDecimalFormat);
+                        generalEntryBook.setPeriod(financialPeriod.getBeginDate());
+                        generalEntryBook.setSubReportPath(generalEntryBookEntryReportPath);
+                        generalEntryBook.setSoldeDebit(subAmountDebit);
+                        generalEntryBook.setSoldeCredit(subAmountCredit);
+                        generalEntryBook.setEntries(Lists.newArrayList(generalEntryBookEntries));
+                        documentReport.addGeneralEntryBooks(generalEntryBook);
 
                         amountCredit = amountCredit.add(subAmountCredit);
                         amountDebit = amountDebit.add(subAmountDebit);
@@ -176,13 +176,13 @@ public class GeneralEntryBookReportServiceImpl extends AbstractLimaService imple
 
                 }
 
-                result.setSoldeDebit(amountDebit);
-                result.setSoldeCredit(amountCredit);
+                documentReport.setSoldeDebit(amountDebit);
+                documentReport.setSoldeCredit(amountCredit);
             }
         } catch (Exception ex) {
             log.error("Can't create document", ex);
             throw new LimaTechnicalException("Can't create document", ex);
         }
-        return result;
+        return documentReport;
     }
 }
diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/LedgerReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/LedgerReportServiceImpl.java
index cf97ecb..425bbe9 100644
--- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/LedgerReportServiceImpl.java
+++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/LedgerReportServiceImpl.java
@@ -18,6 +18,7 @@ import javax.ejb.Remote;
 import javax.ejb.Stateless;
 import javax.ejb.TransactionAttribute;
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -37,7 +38,7 @@ public class LedgerReportServiceImpl extends AbstractLimaService implements Ledg
     protected ReportService reportService;
 
     @Override
-    public DocumentReport getLedgerDocumentReport(Date beginDate, Date endDate, String currency) {
+    public DocumentReport getLedgerDocumentReport(Date beginDate, Date endDate, String currency, DecimalFormat decimalFormat) {
         return null;
 //        List<Object> list = new ArrayList<Object>();
 //
diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/ProvisionalEntryBookReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/ProvisionalEntryBookReportServiceImpl.java
index 5f78586..d21faa1 100644
--- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/ProvisionalEntryBookReportServiceImpl.java
+++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/ProvisionalEntryBookReportServiceImpl.java
@@ -7,10 +7,8 @@ import org.apache.commons.logging.LogFactory;
 import org.chorem.lima.LimaTechnicalException;
 import org.chorem.lima.beans.DocumentReport;
 import org.chorem.lima.beans.DocumentReportImpl;
-import org.chorem.lima.beans.EntryBookReport;
-import org.chorem.lima.beans.EntryBookReportImpl;
-import org.chorem.lima.beans.FinancialPeriodReport;
-import org.chorem.lima.beans.FinancialPeriodReportImpl;
+import org.chorem.lima.beans.EntryBookImpl;
+import org.chorem.lima.beans.FinancialPeriodImpl;
 import org.chorem.lima.beans.Transaction;
 import org.chorem.lima.beans.TransactionImpl;
 import org.chorem.lima.business.LimaServiceConfig;
@@ -68,12 +66,12 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo
     *              - BIG_DECIMAL_FORMAT
     **/
     @Override
-    public DocumentReport getProvisionalEntryBookDocumentReport(Date beginDate, Date endDate, List<String> entryBookCodes, String currency, DecimalFormat bigDecimalFormat) {
+    public DocumentReport getEntryBookDocumentReport(Date beginDate, Date endDate, List<String> entryBookCodes, String currency, DecimalFormat bigDecimalFormat) {
         LimaServiceConfig config = LimaServiceConfig.getInstance();
 
-        String entryBookReportPath = config.getProvisionalEntryBookEntryBookReportPath();
-        String financialPeriodReportPath = config.getProvisionalEntryBookFinancialPeriodReportPath();
-        String transactionReportPath = config.getProvisionalEntryBookTransactionReportPath();
+        String entryBookReportPath = config.getEntryBookEntryBookReportModelPath();
+        String financialPeriodReportPath = config.getEntryBookFinancialPeriodReportModelPath();
+        String transactionReportPath = config.getEntryBookTransactionReportModelPath();
 
         DocumentReport documentReport = new DocumentReportImpl();
         try {
@@ -109,7 +107,7 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo
 
                 for(EntryBook entryBook:entryBooks) {
 
-                    EntryBookReport entryBookReport = new EntryBookReportImpl();
+                    org.chorem.lima.beans.EntryBook entryBookReport = new EntryBookImpl();
                     entryBookReport.setLibelle(entryBook.getLabel());
                     entryBookReport.setCode(entryBook.getCode());
                     entryBookReport.setSubReportPath(financialPeriodReportPath);
@@ -120,7 +118,7 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo
                     // for each FinancialPeriod an EntryBookPeriodReport is created
                     for (FinancialPeriod financialPeriod : financialPeriods) {
 
-                        FinancialPeriodReport financialPeriodReport = new FinancialPeriodReportImpl();
+                        org.chorem.lima.beans.FinancialPeriod financialPeriodReport = new FinancialPeriodImpl();
                         financialPeriodReport.setSubReportPath(transactionReportPath);
                         financialPeriodReport.setPeriod(financialPeriod.getBeginDate());
 
@@ -151,7 +149,7 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo
                                 financialPeriodDebit = financialPeriodDebit.add(debit);
                                 financialPeriodCredit = financialPeriodCredit.add(credit);
 
-                                financialPeriodReport.addTransaction(transaction);
+                                financialPeriodReport.addTransactions(transaction);
                             }
                         }
 
@@ -161,7 +159,7 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo
                             financialPeriodReport.setCredit(financialPeriodCredit);
                             financialPeriodReport.setEntryBookCode(entryBook.getCode());
 
-                            entryBookReport.addFinancialPeriodReport(financialPeriodReport);
+                            entryBookReport.addFinancialPeriods(financialPeriodReport);
                             entryBookSoldeDebit = entryBookSoldeDebit.add(financialPeriodDebit);
                             entryBookSoldeCredit = entryBookSoldeCredit.add(financialPeriodCredit);
 
@@ -173,7 +171,7 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo
                     if (entryBookSoldeDebit.compareTo(BigDecimal.ZERO) != 0 || entryBookSoldeCredit.compareTo(BigDecimal.ZERO) != 0) {
                         entryBookReport.setSoldeDebit(entryBookSoldeDebit);
                         entryBookReport.setSoldeCredit(entryBookSoldeCredit);
-                        documentReport.addEntryBookReport(entryBookReport);
+                        documentReport.addEntryBooks(entryBookReport);
                         documentReportDebit = documentReportDebit.add(entryBookSoldeDebit);
                         documentReportCredit = documentReportCredit.add(entryBookSoldeCredit);
                     }
diff --git a/lima-business/src/main/resources/i18n/lima-business_en_GB.properties b/lima-business/src/main/resources/i18n/lima-business_en_GB.properties
index aa2b1b3..5f2474e 100644
--- a/lima-business/src/main/resources/i18n/lima-business_en_GB.properties
+++ b/lima-business/src/main/resources/i18n/lima-business_en_GB.properties
@@ -1,4 +1,5 @@
 application.version=
+blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description=
 lima-Business.defaultaccountingrules.updateentryerror=Can't update entry \: financialperiod of this entrybook is closed
 lima-Business.defaultaccountingrules.updatefinancialtransactionnewperioderror=Can't update financialtransaction \: this financialperiod of new entrybook is closed
 lima-Business.defaultaccountingrules.updatefinancialtransactionperioderror=Can't update financialtransaction \: the new financialperiod of this entrybook is closed
@@ -126,7 +127,16 @@ lima-business.import.vatstatementalnomaster=FAILED \: The vatStatement %s has ma
 lima-business.import.vatstatementalreadyexist=FAILED \: The vatStatement %s already exists \!\n
 lima.config.configFileName.description=Filename of Lima's configuration
 lima.config.data.dir.description=Data directory of Lima
-lima.config.documentReport.balanceReportAccount.description=
+lima.config.documentReport.account.documentReportModelPath.description=
+lima.config.documentReport.balance.balanceAccountReportModelPath.description=
+lima.config.documentReport.balance.balanceSubAccountReportModelPath.description=
+lima.config.documentReport.balance.documentReportModelPath.description=
+lima.config.documentReport.entrybook.documentReportModelPath.description=
+lima.config.documentReport.entrybook.entryBookModelPath.description=
+lima.config.documentReport.entrybook.financialPeriodModelPath.description=
+lima.config.documentReport.entrybook.transactionReportModelPath.description=
+lima.config.documentReport.generalEntrybook.documentReportModelPath.description=
+lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.description=
 lima.config.httpport.description=HTTP Port
 lima.config.reports.dir.description=
 lima.config.reportvatpdfurl.description=
diff --git a/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties b/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties
index e708dfe..8a3a976 100644
--- a/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties
+++ b/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties
@@ -1,4 +1,5 @@
 application.version=
+blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description=
 lima-Business.defaultaccountingrules.updateentryerror=Impossible de mettre à jour l'entrée \: la période financière de ce journal est bloquée
 lima-Business.defaultaccountingrules.updatefinancialtransactionnewperioderror=Impossible de mettre à jour la transaction \: la période financière de ce nouveau journal est bloquée
 lima-Business.defaultaccountingrules.updatefinancialtransactionperioderror=Impossible de mettre à jour la transaction \: la période financière de ce journal est bloquée
@@ -121,12 +122,23 @@ lima-business.import.vatstatementalnomaster=u00C9chec \: Le plan %s possède le
 lima-business.import.vatstatementalreadyexist=u00C9chec \: Le plan %s exist déjà \!\n
 lima.config.configFileName.description=Nom du fichier de configuration de Lima
 lima.config.data.dir.description=Répertoire des données de Lima
-lima.config.documentReport.balanceReportAccount.description=
+lima.config.documentReport.account.accountModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'account'
+lima.config.documentReport.account.documentReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'DocumentReport'
+lima.config.documentReport.balance.balanceAccountReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'BalanceAccount'
+lima.config.documentReport.balance.balanceSubAccountReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'BalanceAccount' des comptes enfants
+lima.config.documentReport.balance.documentReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'DocumentReport
 lima.config.documentReport.bigDecimalFormat=formattage des montants
-lima.config.documentReport.entryBookReportPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'EntryBookReport'
-lima.config.documentReport.financialPeriodPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'FinancialPeriodReport'
-lima.config.documentReport.generalEntryBookReportPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'DocumentReport'
-lima.config.documentReport.transactionReportPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'Transaction'
+lima.config.documentReport.entrybook.documentReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'EntryBook'
+lima.config.documentReport.entrybook.entryBookModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'EntryBook'
+lima.config.documentReport.entrybook.financialPeriodModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'FinancialPeriod'
+lima.config.documentReport.entrybook.transactionReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'Transaction'
+lima.config.documentReport.financialStatement.documentReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'DocumentReport'
+lima.config.documentReport.financialStatement.financialStatementModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'financialStatement'
+lima.config.documentReport.generalEntrybook.documentReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'DocumentReport'
+lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'GeneralEntryBookEntry'
+lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'GeneralEntryBook'
+lima.config.documentReport.generalLedger.documentReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'DocumentReport'
+lima.config.documentReport.generalLedger.generalLedgerModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'generalLedger'
 lima.config.httpport.description=Port HTTP
 lima.config.reports.dir.description=Dossier des rapports
 lima.config.reportvatpdfurl.description=Chemin du raport
diff --git a/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java b/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java
index 2350d54..db4f3e0 100644
--- a/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java
+++ b/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java
@@ -35,6 +35,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import java.text.ParseException;
+import java.util.List;
 
 /**
  * Tests pour la gestion des journaux.
@@ -60,15 +61,15 @@ public class EntryBookServiceImplTest extends AbstractLimaTest {
      */
     @Test
     public void modifyJournalTest() throws LimaException {
-
-        EntryBook entryBook = entryBookService.getAllEntryBooks().get(0);
+        List<EntryBook> entryBooks =  entryBookService.getAllEntryBooks();
+        EntryBook entryBook = entryBookService.getEntryBookByCode("jdv");
         Assert.assertNotNull(entryBook);
         Assert.assertEquals(JOURNAL_DES_VENTES, entryBook.getLabel());
         entryBook.setLabel("Journal des achats");
         entryBookService.updateEntryBook(entryBook);
 
         // Recherche du journal dans la bdd
-        entryBook = entryBookService.getAllEntryBooks().get(0);
+        entryBook = entryBookService.getEntryBookByCode("jdv");
         Assert.assertNotNull(entryBook);
         Assert.assertEquals("Journal des achats", entryBook.getLabel());
     }
@@ -80,7 +81,7 @@ public class EntryBookServiceImplTest extends AbstractLimaTest {
      */
     @Test(expected=UsedEntryBookException.class)
     public void deleteUsedEntryBook() throws LimaException, ParseException {
-        EntryBook entryBook = entryBookService.getAllEntryBooks().get(0); // VTE
+        EntryBook entryBook = entryBookService.getEntryBookByCode("jdv");
         Assert.assertNotNull(entryBook);
 
         // make transaction used
diff --git a/lima-callao/src/main/java/org/chorem/lima/beans/BalanceReportAccountImpl.java b/lima-callao/src/main/java/org/chorem/lima/beans/BalanceAccountImpl.java
similarity index 93%
rename from lima-callao/src/main/java/org/chorem/lima/beans/BalanceReportAccountImpl.java
rename to lima-callao/src/main/java/org/chorem/lima/beans/BalanceAccountImpl.java
index fbb88db..4b1070b 100644
--- a/lima-callao/src/main/java/org/chorem/lima/beans/BalanceReportAccountImpl.java
+++ b/lima-callao/src/main/java/org/chorem/lima/beans/BalanceAccountImpl.java
@@ -25,11 +25,11 @@ package org.chorem.lima.beans;
 
 import java.math.BigDecimal;
 
-public class BalanceReportAccountImpl extends BalanceReportAccount {
+public class BalanceAccountImpl extends BalanceAccount {
 
     private static final long serialVersionUID = 1L;
 
-    public void addSubAccount(BalanceReportAccount subAccount) {
+    public void addSubAccount(BalanceAccount subAccount) {
 
         // we only add account that have values
         if (subAccount.getAmountDebit() != null && subAccount.getAmountCredit() != null) {
diff --git a/lima-callao/src/main/xmi/accounting-model.zargo b/lima-callao/src/main/xmi/accounting-model.zargo
index bdf1867..ca852d6 100644
Binary files a/lima-callao/src/main/xmi/accounting-model.zargo and b/lima-callao/src/main/xmi/accounting-model.zargo differ
diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java
index e74b66c..84710a2 100644
--- a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java
+++ b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java
@@ -205,19 +205,19 @@ public class LimaMain {
             LimaServiceConfig serviceConfig = LimaServiceConfig.getInstance();
             LimaSwingConfig swingConfig = LimaSwingConfig.getInstance();
 
-            serviceConfig.setBalanceReportPath(swingConfig.getBalanceReportPath());
-            serviceConfig.setReportsDir(swingConfig.getReportsDir().getAbsolutePath());
-            serviceConfig.setAccountReportPath(swingConfig.getAccountReportPath());
-            serviceConfig.setBalanceReportPath(swingConfig.getBalanceReportPath());
-            serviceConfig.setBalanceReportAccountReportPath(swingConfig.getBalanceReportAccountReportPath());
-            serviceConfig.setBalanceSubAccountReportPath(swingConfig.getBalanceSubAccountReportPath());
-            serviceConfig.setGeneralEntryBookEntryBookMainReportPath(swingConfig.getGeneralEntryBookEntryBookMainReportPath());
-            serviceConfig.setGeneralEntryBookGeneralEntryBookEntryReportPath(swingConfig.getGeneralEntryBookGeneralEntryBookEntryReportPath());
-            serviceConfig.setGeneralEntryBookGeneralEntryBookEntryReportPath(swingConfig.getGeneralEntryBookGeneralEntryBookEntryReportPath());
-            serviceConfig.setProvisionalEntryBookEntryBookMainReportPath(swingConfig.getProvisionalEntryBookEntryBookMainReportPath());
-            serviceConfig.setProvisionalEntryBookEntryBookReportPath(swingConfig.getProvisionalEntryBookEntryBookReportPath());
-            serviceConfig.setProvisionalEntryBookFinancialPeriodReportPath(swingConfig.getProvisionalEntryBookFinancialPeriodReportPath());
-            serviceConfig.setProvisionalEntryBookTransactionReportPath(swingConfig.getProvisionalEntryBookTransactionReportPath());
+            serviceConfig.setBalanceDocumentReportModelPath(swingConfig.getBalanceDocumentReportModelPath());
+            serviceConfig.setReportsModelDir(swingConfig.getReportsDir().getAbsolutePath());
+            serviceConfig.setAccountReportModelPath(swingConfig.getAccountDocumentReportModelPath());
+            serviceConfig.setBalanceDocumentReportModelPath(swingConfig.getBalanceDocumentReportModelPath());
+            serviceConfig.setBalanceAccountReportModelPath(swingConfig.getBalanceAccountReportModelPath());
+            serviceConfig.setBalanceSubAccountReportModelPath(swingConfig.getBalanceSubAccountReportModelPath());
+            serviceConfig.setGeneralEntryBookDocumentReportModelPath(swingConfig.getGeneralEntryBookDocumentReportModelPath());
+            serviceConfig.setGeneralEntryBookEntryReportModelPath(swingConfig.getGeneralEntryBookGeneralEntryBookEntryReportPath());
+            serviceConfig.setGeneralEntryBookEntryReportModelPath(swingConfig.getGeneralEntryBookGeneralEntryBookEntryReportPath());
+            serviceConfig.setEntryBookDocumentReportModelPath(swingConfig.getProvisionalEntryBookEntryBookMainReportPath());
+            serviceConfig.setEntryBookEntryBookReportModelPath(swingConfig.getProvisionalEntryBookEntryBookReportPath());
+            serviceConfig.setEntryBookFinancialPeriodReportModelPath(swingConfig.getProvisionalEntryBookFinancialPeriodReportPath());
+            serviceConfig.setEntryBookTransactionReportModelPath(swingConfig.getProvisionalEntryBookTransactionReportPath());
 
 
             httpServerService = new HttpServerService();
diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java
index 59a72f4..143e4cd 100644
--- a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java
+++ b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java
@@ -368,58 +368,58 @@ public class LimaSwingConfig extends ApplicationConfig {
     }
 
     // reports
-    public String getAccountReportPath() {
-        String result = getOption(Option.ACCOUNT_REPORT_PATH.key);
+    public String getAccountDocumentReportModelPath() {
+        String result = getOption(Option.ACCOUNT_DOCUMENT_REPORT_MODEL_PATH.key);
         return result;
     }
 
-    public String getBalanceReportPath() {
-        String result = getOption(Option.BALANCE_REPORT_PATH.key);
+    public String getBalanceDocumentReportModelPath() {
+        String result = getOption(Option.BALANCE_DOCUMENT_REPORT_MODEL_PATH.key);
         return result;
     }
 
-    public String getBalanceReportAccountReportPath() {
-        String result = getOption(Option.BALANCE_REPORT_ACCOUNT_REPORT_PATH.key);
+    public String getBalanceAccountReportModelPath() {
+        String result = getOption(Option.BALANCE_ACCOUNT_REPORT_MODEL_PATH.key);
         return result;
     }
 
-    public String getBalanceSubAccountReportPath() {
-        String result = getOption(Option.BALANCE_SUB_ACCOUNT_REPORT_PATH.key);
+    public String getBalanceSubAccountReportModelPath() {
+        String result = getOption(Option.BALANCE_SUB_ACCOUNT_REPORT_MODEL_PATH.key);
         return result;
     }
 
-    public String getGeneralEntryBookEntryBookMainReportPath() {
-        String result = getOption(Option.GENERAL_ENTRY_BOOK_ENTRY_BOOK_MAIN_REPORT_PATH.key);
+    public String getGeneralEntryBookDocumentReportModelPath() {
+        String result = getOption(Option.GENERAL_ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH.key);
         return result;
     }
 
-    public String getGeneralEntryBookEntryBookPeriodReportPath() {
-        String result = getOption(Option.GENERAL_ENTRY_BOOK_ENTRY_BOOK_PERIOD_REPORT_PATH.key);
+    public String getGeneralEntryBookReportModelPath() {
+        String result = getOption(Option.GENERAL_ENTRY_BOOK_REPORT_MODEL_PATH.key);
         return result;
     }
 
     public String getGeneralEntryBookGeneralEntryBookEntryReportPath() {
-        String result = getOption(Option.GENERAL_ENTRY_BOOK_GENERAL_ENTRY_BOOK_ENTRY_REPORT_PATH.key);
+        String result = getOption(Option.GENERAL_ENTRY_BOOK_ENTRY_REPORT_MODEL_PATH.key);
         return result;
     }
 
     public String getProvisionalEntryBookEntryBookMainReportPath() {
-        String result = getOption(Option.PROVISIONAL_ENTRY_BOOK_ENTRY_BOOK_MAIN_REPORT_PATH.getKey());
+        String result = getOption(Option.ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH.getKey());
         return result;
     }
 
     public String getProvisionalEntryBookEntryBookReportPath() {
-        String result = getOption(Option.PROVISIONAL_ENTRY_BOOK_ENTRY_BOOK_REPORT_PATH.getKey());
+        String result = getOption(Option.ENTRY_BOOK_ENTRY_BOOK_REPORT_MODEL_PATH.getKey());
         return result;
     }
 
     public String getProvisionalEntryBookFinancialPeriodReportPath() {
-        String result = getOption(Option.PROVISIONAL_ENTRY_BOOK_FINANCIAL_PERIOD_REPORT_PATH.getKey());
+        String result = getOption(Option.ENTRY_BOOK_FINANCIAL_PERIOD_REPORT_MODEL_PATH.getKey());
         return result;
     }
 
     public String getProvisionalEntryBookTransactionReportPath() {
-        String result = getOption(Option.PROVISIONAL_ENTRY_BOOK_TRANSACTION_REPORT_PATH.getKey());
+        String result = getOption(Option.ENTRY_BOOK_TRANSACTION_REPORT_MODEL_PATH.getKey());
         return result;
     }
 
@@ -699,70 +699,71 @@ public class LimaSwingConfig extends ApplicationConfig {
                 "${lima.data.dir}/reports", File.class, false, false),
 
 
-        ACCOUNT_REPORT_PATH("lima.accounts.accountReportPath",
+        ACCOUNT_DOCUMENT_REPORT_MODEL_PATH("lima.config.documentReport.account.documentReportModelPath",
                 "",
-                "",
-                ROOT_PATH + "/lima-web/src/main/jasperreports/accounts/AccountReport.jrxml",
+                n("lima.config.documentReport.account.documentReportModelPath.description"),
+                ROOT_PATH + "/lima-web/src/main/jasperreports/accounts/DocumentReport.jrxml",
                 String.class, false, false),
 
-        BALANCE_REPORT_PATH("lima.balance.balanceReportPath",
-                "",
+        BALANCE_DOCUMENT_REPORT_MODEL_PATH("lima.config.documentReport.balance.documentReportModelPath",
                 "",
-                ROOT_PATH + "/lima-web/src/main/jasperreports/balance/BalanceReport.jrxml",
+                n("lima.config.documentReport.balance.documentReportModelPath.description"),
+                ROOT_PATH + "/lima-web/src/main/jasperreports/balance/DocumentReport.jrxml",
                 String.class, false, false),
 
-        BALANCE_REPORT_ACCOUNT_REPORT_PATH("lima.balance.balanceReportAccountReportPath",
-                "",
+        BALANCE_ACCOUNT_REPORT_MODEL_PATH("lima.config.documentReport.balance.balanceAccountReportModelPath",
                 "",
+                n("lima.config.documentReport.balance.balanceAccountReportModelPath.description"),
                 ROOT_PATH + "/lima-web/src/main/jasperreports/balance/BalanceReportAccountReport.jrxml",
                 String.class, false, false),
 
-        BALANCE_SUB_ACCOUNT_REPORT_PATH("lima.balance.balanceSubAccountReportPath",
+        BALANCE_SUB_ACCOUNT_REPORT_MODEL_PATH("lima.config.documentReport.balance.balanceSubAccountReportModelPath",
                 "",
-                n("lima.config.documentReport.balanceReportAccount.description"),
+                n("lima.config.documentReport.balance.balanceSubAccountReportModelPath.description"),
                 ROOT_PATH + "/lima-web/src/main/jasperreports/balance/BalanceSubAccountsReport.jrxml",
                 String.class, false, false),
 
-        GENERAL_ENTRY_BOOK_ENTRY_BOOK_MAIN_REPORT_PATH("lima.generalEntryBook.entryBookMainReportPath",
+        GENERAL_ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH("lima.config.documentReport.generalEntrybook.documentReportModelPath",
                 "",
-                "",
-                ROOT_PATH + "/lima-web/src/main/jasperreports/generalEntryBook/EntryBookMainReport.jrxml",
+                n("lima.config.documentReport.generalEntrybook.documentReportModelPath.description"),
+                ROOT_PATH + "/lima-web/src/main/jasperreports/generalEntryBook/DocumentReport.jrxml",
                 String.class, false, false),
 
-        GENERAL_ENTRY_BOOK_ENTRY_BOOK_PERIOD_REPORT_PATH("lima.generalEntryBook.entryBookPeriodReportPath",
-                "",
+        GENERAL_ENTRY_BOOK_REPORT_MODEL_PATH("lima.config.documentReport.generalEntrybook.generalEntryBookModelPath",
                 "",
+                n("lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.description"),
                 ROOT_PATH + "/lima-web/src/main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml",
                 String.class, false, false),
 
 
-        GENERAL_ENTRY_BOOK_GENERAL_ENTRY_BOOK_ENTRY_REPORT_PATH("lima.generalEntryBook.generalEntryBookEntryReportPath",
-                "",
+        GENERAL_ENTRY_BOOK_ENTRY_REPORT_MODEL_PATH("lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath",
                 "",
+                n("blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description"),
                 ROOT_PATH + "/lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml",
                 String.class, false, false),
 
-        PROVISIONAL_ENTRY_BOOK_ENTRY_BOOK_MAIN_REPORT_PATH("lima.provisionalEntryBook.entryBookMainReportPath",
+        ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH("lima.config.documentReport.entrybook.documentReportModelPath",
                 "",
-                "",
-                ROOT_PATH + "/lima-web/src/main/jasperreports/provisionalEntryBook/EntryBookMainReport.jrxml",
+                n("lima.config.documentReport.entrybook.documentReportModelPath.description"),
+                ROOT_PATH + "/lima-web/src/main/jasperreports/entryBook/DocumentReport.jrxml",
                 String.class,false, false),
-        PROVISIONAL_ENTRY_BOOK_ENTRY_BOOK_REPORT_PATH("lima.provisionalEntryBook.entryBookReport",
-                "",
+
+        ENTRY_BOOK_ENTRY_BOOK_REPORT_MODEL_PATH("lima.config.documentReport.entrybook.entryBookModelPath",
                 "",
-                ROOT_PATH + "/lima-web/src/main/jasperreports/provisionalEntryBook/EntryBookReport.jrxml",
+                n("lima.config.documentReport.entrybook.entryBookModelPath.description"),
+                ROOT_PATH + "/lima-web/src/main/jasperreports/entryBook/EntryBookReport.jrxml",
                 String.class,false, false),
 
-        PROVISIONAL_ENTRY_BOOK_FINANCIAL_PERIOD_REPORT_PATH("lima.provisionalEntryBook.financialPeriodReportPath",
+        ENTRY_BOOK_FINANCIAL_PERIOD_REPORT_MODEL_PATH("lima.config.documentReport.entrybook.financialPeriodModelPath",
                 "",
-                "",
-                ROOT_PATH + "/lima-web/src/main/jasperreports/provisionalEntryBook/FinancialPeriodReport.jrxml",
+                n("lima.config.documentReport.entrybook.financialPeriodModelPath.description"),
+                ROOT_PATH + "/lima-web/src/main/jasperreports/entryBook/FinancialPeriodReport.jrxml",
                 String.class, false, false),
 
-        PROVISIONAL_ENTRY_BOOK_TRANSACTION_REPORT_PATH("lima.provisionalEntryBook.transactionReportPath",
-                "",
+        ENTRY_BOOK_TRANSACTION_REPORT_MODEL_PATH("lima.config.documentReport.entrybook.transactionReportModelPath",
                 "",
-                ROOT_PATH + "/lima-web/src/main/jasperreports/provisionalEntryBook/TransactionReport.jrxml",
+                n("lima.config.documentReport.entrybook.transactionReportModelPath.description"),
+                ROOT_PATH + "/lima-web/src/main/jasperreports/entryBook/TransactionReport.jrxml",
                 String.class, false, false);
 
         protected enum ComportmentEditingCellEnum {ALL, NOTHING}
diff --git a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
index 7fd97de..0531cee 100644
--- a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
+++ b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
@@ -1,3 +1,4 @@
+blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description=
 lima.account=
 lima.account.add=
 lima.account.add.error.InvalidAccountNumber=
@@ -90,9 +91,19 @@ lima.config.data.dir.description=
 lima.config.data.dir.label=
 lima.config.decimalSeparator.description=
 lima.config.decimalSeparator.label=
+lima.config.documentReport.account.documentReportModelPath.description=
+lima.config.documentReport.balance.balanceAccountReportModelPath.description=
+lima.config.documentReport.balance.balanceSubAccountReportModelPath.description=
+lima.config.documentReport.balance.documentReportModelPath.description=
 lima.config.documentReport.balanceReportAccount.description=
 lima.config.documentReport.bigDecimalFormat.description=
 lima.config.documentReport.bigDecimalFormat.label=
+lima.config.documentReport.entrybook.documentReportModelPath.description=
+lima.config.documentReport.entrybook.entryBookModelPath.description=
+lima.config.documentReport.entrybook.financialPeriodModelPath.description=
+lima.config.documentReport.entrybook.transactionReportModelPath.description=
+lima.config.documentReport.generalEntrybook.documentReportModelPath.description=
+lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.description=
 lima.config.host.address.description=
 lima.config.host.address.label=
 lima.config.i18n.dir.description=
diff --git a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
index c09f545..6ede2c9 100644
--- a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
+++ b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
@@ -1,3 +1,4 @@
+blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description=
 lima.account=Compte
 lima.account.add=Nouveau compte (Ctrl+A)
 lima.account.add.error.InvalidAccountNumber=Le numéro du compt %1$s n'est pas valide
@@ -89,9 +90,25 @@ lima.config.data.dir.description=Répertoire d'enregistrement des données de l'
 lima.config.data.dir.label=Répertoire des données
 lima.config.decimalSeparator.description=Caractères de séparation entre la partie entière et la parti décimale d'un nombre
 lima.config.decimalSeparator.label=Séparateur de décimales
+lima.config.documentReport.account.accountModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'account'
+lima.config.documentReport.account.documentReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'DocumentReport'
+lima.config.documentReport.balance.balanceAccountReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'BalanceAccount'
+lima.config.documentReport.balance.balanceSubAccountReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'BalanceAccount' des comptes enfants
+lima.config.documentReport.balance.documentReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'DocumentReport
 lima.config.documentReport.balanceReportAccount.description=
 lima.config.documentReport.bigDecimalFormat.description=format pour affichage des montants dans les rapports
 lima.config.documentReport.bigDecimalFormat.label=format pour affichage des montants
+lima.config.documentReport.entrybook.documentReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'EntryBook'
+lima.config.documentReport.entrybook.entryBookModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'EntryBook'
+lima.config.documentReport.entrybook.financialPeriodModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'FinancialPeriod'
+lima.config.documentReport.entrybook.transactionReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'Transaction'
+lima.config.documentReport.financialStatement.documentReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'DocumentReport'
+lima.config.documentReport.financialStatement.financialStatementModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'financialStatement'
+lima.config.documentReport.generalEntrybook.documentReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'DocumentReport'
+lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'GeneralEntryBookEntry'
+lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'GeneralEntryBook'
+lima.config.documentReport.generalLedger.documentReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'DocumentReport'
+lima.config.documentReport.generalLedger.generalLedgerModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'generalLedger'
 lima.config.host.address.description=Adresse du serveur distant
 lima.config.host.address.label=Serveur
 lima.config.i18n.dir.description=Dossier contenant les traduction de lima
diff --git a/lima-web/src/main/jasperreports/accounts/AccountReport.jrxml b/lima-web/src/main/jasperreports/accounts/AccountReport.jrxml
deleted file mode 100644
index 014e820..0000000
--- a/lima-web/src/main/jasperreports/accounts/AccountReport.jrxml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 5.6.1.final using JasperReports Library version 5.6.1  -->
-<!-- 2014-10-02T11:45:07 -->
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="AccountReportC" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="988d60dc-e878-4a6d-8789-7dffd9f27769">
-  <property name="com.jaspersoft.studio.data.defaultdataadapter" value="AccountBeanAdaptor2"/>
-  <property name="com.jaspersoft.studio.unit." value="pixel"/>
-  <property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
-  <property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/>
-  <property name="com.jaspersoft.studio.unit.topMargin" value="pixel"/>
-  <property name="com.jaspersoft.studio.unit.bottomMargin" value="pixel"/>
-  <property name="com.jaspersoft.studio.unit.leftMargin" value="pixel"/>
-  <property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/>
-  <property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/>
-  <property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/>
-  <property name="net.sf.jasperreports.awt.ignore.missing.font" value="true"/>
-  <style name="Title" fontName="Times New Roman" fontSize="50" isBold="true" pdfFontName="Times-Bold"/>
-  <style name="SubTitle" forecolor="#736343" fontName="Times New Roman" pdfFontName="Times-Roman" fontSize="18"/>
-  <style name="Column header" forecolor="#666666" fontName="Times New Roman" pdfFontName="Times-Roman" fontSize="12" isBold="true"/>
-  <style name="Detail" backcolor="#CCFFCC" fontName="Times New Roman" fontSize="12" pdfFontName="Times-Roman"/>
-  <style name="Row" mode="Transparent">
-    <conditionalStyle>
-      <conditionExpression><![CDATA[$V{REPORT_COUNT}%2 == 0]]></conditionExpression>
-      <style backcolor="#E6DAC3"/>
-    </conditionalStyle>
-  </style>
-  <queryString language="SQL">
-    <![CDATA[]]>
-  </queryString>
-  <field name="accountNumber" class="java.lang.String"/>
-  <field name="label" class="java.lang.String"/>
-  <group name="Group1">
-    <groupExpression><![CDATA[(int)($V{REPORT_COUNT}/15)]]></groupExpression>
-  </group>
-  <group name="Group2">
-    <groupExpression><![CDATA[(int)($V{REPORT_COUNT}/5)]]></groupExpression>
-  </group>
-  <background>
-    <band splitType="Stretch"/>
-  </background>
-  <title>
-    <band height="50" splitType="Stretch">
-      <staticText>
-        <reportElement style="Title" x="170" y="0" width="263" height="30" uuid="f4b151ca-f4bb-45fa-8fa7-416c74bda6ed"/>
-        <textElement textAlignment="Center" verticalAlignment="Middle">
-          <font fontName="Times New Roman" size="14" pdfFontName="Times-Roman"/>
-        </textElement>
-        <text><![CDATA[Liste des Comptes]]></text>
-      </staticText>
-      <textField pattern="EEEEE dd MMMMM yyyy">
-        <reportElement style="Column header" x="450" y="10" width="115" height="20" forecolor="#736343" uuid="6e0a2e2e-bfe6-4208-b2b8-a2ee0fd23bc3"/>
-        <textElement verticalAlignment="Middle">
-          <font size="10" isBold="false"/>
-        </textElement>
-        <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
-      </textField>
-    </band>
-  </title>
-  <pageHeader>
-    <band splitType="Stretch"/>
-  </pageHeader>
-  <columnHeader>
-    <band height="20" splitType="Stretch">
-      <frame>
-        <reportElement mode="Opaque" x="100" y="0" width="100" height="20" forecolor="#B89F7D" backcolor="#F2EBDF" uuid="cfea52a4-a7c7-4222-96c0-3ff78a050aa4"/>
-        <box>
-          <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-          <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-          <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-          <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-        </box>
-        <staticText>
-          <reportElement x="0" y="0" width="100" height="20" uuid="0768a37f-c1c8-4247-9546-9ea7c6117ed9"/>
-          <box>
-            <topPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-            <leftPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-            <bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-            <rightPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-          </box>
-          <text><![CDATA[label]]></text>
-        </staticText>
-      </frame>
-      <frame>
-        <reportElement mode="Opaque" x="0" y="0" width="99" height="20" forecolor="#B89F7D" backcolor="#F2EBDF" uuid="13e75fe2-71fa-484b-9a2c-cd7a178deb17"/>
-        <box>
-          <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-          <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-          <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-          <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-        </box>
-        <staticText>
-          <reportElement x="0" y="0" width="99" height="20" uuid="cdbebdf6-fb7e-40a1-b5a3-00ac9d5389ef"/>
-          <box>
-            <topPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-            <leftPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-            <bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-            <rightPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-          </box>
-          <text><![CDATA[Compte]]></text>
-        </staticText>
-      </frame>
-    </band>
-  </columnHeader>
-  <detail>
-    <band height="20" splitType="Stretch">
-      <textField>
-        <reportElement x="0" y="0" width="100" height="20" uuid="c940221c-a753-4c62-a407-465456d450b6"/>
-        <box>
-          <topPen lineWidth="0.5"/>
-          <leftPen lineWidth="0.5"/>
-          <bottomPen lineWidth="0.5"/>
-          <rightPen lineWidth="0.5"/>
-        </box>
-        <textFieldExpression><![CDATA[$F{accountNumber}]]></textFieldExpression>
-      </textField>
-      <textField>
-        <reportElement x="100" y="0" width="100" height="20" uuid="2a034b82-680f-47b7-b951-f11dd97ffabf"/>
-        <box>
-          <topPen lineWidth="0.5"/>
-          <leftPen lineWidth="0.5"/>
-          <bottomPen lineWidth="0.5"/>
-          <rightPen lineWidth="0.5"/>
-        </box>
-        <textFieldExpression><![CDATA[$F{label}]]></textFieldExpression>
-      </textField>
-    </band>
-  </detail>
-  <columnFooter>
-    <band height="45" splitType="Stretch"/>
-  </columnFooter>
-  <pageFooter>
-    <band height="25" splitType="Stretch">
-      <frame>
-        <reportElement mode="Opaque" x="-21" y="1" width="597" height="24" forecolor="#D0B48E" backcolor="#F2EBDF" uuid="b5834407-22ff-4e5d-a7f8-3b5be0962706"/>
-        <textField evaluationTime="Report">
-          <reportElement style="Column header" x="533" y="0" width="40" height="20" forecolor="#736343" uuid="df3c3050-1890-4a3b-a4b4-1e8f28016a1c"/>
-          <textElement verticalAlignment="Middle">
-            <font size="10" isBold="false"/>
-          </textElement>
-          <textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-        </textField>
-        <textField>
-          <reportElement style="Column header" x="453" y="0" width="80" height="20" forecolor="#736343" uuid="3d887e8a-f0d7-4d38-8553-dbf76dd04d36"/>
-          <textElement textAlignment="Right" verticalAlignment="Middle">
-            <font size="10" isBold="false"/>
-          </textElement>
-          <textFieldExpression><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-        </textField>
-        <textField pattern="EEEEE dd MMMMM yyyy">
-          <reportElement style="Column header" x="22" y="1" width="197" height="20" forecolor="#736343" uuid="1cc9564c-479d-46b3-a4bf-9221ae6d4f01"/>
-          <textElement verticalAlignment="Middle">
-            <font size="10" isBold="false"/>
-          </textElement>
-          <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
-        </textField>
-      </frame>
-    </band>
-  </pageFooter>
-  <summary>
-    <band splitType="Stretch"/>
-  </summary>
-</jasperReport>
diff --git a/lima-web/src/main/jasperreports/balance/BalanceReportAccountReport.jrxml b/lima-web/src/main/jasperreports/balance/BalanceReportAccountReport.jrxml
index 9cb3b94..2a56b5d 100644
--- a/lima-web/src/main/jasperreports/balance/BalanceReportAccountReport.jrxml
+++ b/lima-web/src/main/jasperreports/balance/BalanceReportAccountReport.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1  -->
-<!-- 2015-01-14T14:01:44 -->
+<!-- 2015-01-21T13:44:15 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="21" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Empty" isIgnorePagination="true" uuid="75ff [...]
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
 	<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/>
@@ -30,94 +30,6 @@
 				<subreportExpression><![CDATA[JasperCompileManager.compileReport($F{balanceSubAccountsReportPath})]]></subreportExpression>
 			</subreport>
 		</band>
-		<band height="10" splitType="Stretch">
-			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="40" height="10" uuid="c5f32333-c77a-45f8-9bec-c8d61e15d85a"/>
-				<box>
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/>
-					<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
-					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/>
-					<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
-				</box>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font size="8" isBold="true"/>
-					<paragraph lineSpacingSize="0.0" leftIndent="2"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{accountNumber}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="40" y="0" width="250" height="10" uuid="0bcc6e5d-b2ee-474f-8e66-475933d55a16">
-					<property name="local_mesure_unity" value="pixel"/>
-				</reportElement>
-				<box>
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/>
-					<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
-					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/>
-					<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
-				</box>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font size="8" isBold="true"/>
-					<paragraph lineSpacingSize="0.0" leftIndent="2"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{label}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="290" y="0" width="72" height="10" uuid="e774e638-6353-46d0-9968-15992ef50bd3"/>
-				<box>
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/>
-					<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
-					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/>
-					<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
-				</box>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font size="8" isBold="true"/>
-					<paragraph lineSpacingSize="0.0" rightIndent="2"/>
-				</textElement>
-				<textFieldExpression><![CDATA[new Boolean($F{amountDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{amountDebit}) : ""]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement style="Default" x="362" y="0" width="72" height="10" uuid="daac5561-4c81-4582-aabf-e8034c2cf93e"/>
-				<box>
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/>
-					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/>
-				</box>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font size="8" isBold="true"/>
-					<paragraph lineSpacingSize="0.0" rightIndent="2"/>
-				</textElement>
-				<textFieldExpression><![CDATA[new Boolean($F{amountCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{amountCredit}) : ""]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement style="Default" x="434" y="0" width="72" height="10" uuid="53ba669a-6626-4e70-bbf0-fb243908a20e"/>
-				<box>
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/>
-					<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
-					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/>
-					<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
-				</box>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font size="8" isBold="true"/>
-					<paragraph lineSpacingSize="0.0" rightIndent="2"/>
-				</textElement>
-				<textFieldExpression><![CDATA[new Boolean($F{soldeDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeDebit}) : ""]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement style="Default" x="506" y="0" width="72" height="10" uuid="edb8a8c1-ac7a-44cb-9de6-b231b00f966f"/>
-				<box>
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/>
-					<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
-					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/>
-					<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
-				</box>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font size="8" isBold="true"/>
-					<paragraph lineSpacingSize="0.0" rightIndent="2"/>
-				</textElement>
-				<textFieldExpression><![CDATA[new Boolean($F{soldeCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeCredit}) : ""]]></textFieldExpression>
-			</textField>
-		</band>
 	</detail>
 	<columnFooter>
 		<band height="1">
diff --git a/lima-web/src/main/jasperreports/balance/BalanceSubAccountsReport.jrxml b/lima-web/src/main/jasperreports/balance/BalanceSubAccountsReport.jrxml
index b5df64e..a9a5bd5 100644
--- a/lima-web/src/main/jasperreports/balance/BalanceSubAccountsReport.jrxml
+++ b/lima-web/src/main/jasperreports/balance/BalanceSubAccountsReport.jrxml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1  -->
-<!-- 2015-01-14T14:15:11 -->
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="10" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="75ff86c6-c370-4f0b-a2d3-e17324a465bb">
+<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1  -->
+<!-- 2015-01-21T14:33:53 -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="20" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="75ff86c6-c370-4f0b-a2d3-e17324a465bb">
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
 	<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/>
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.topMargin" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.bottomMargin" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.leftMargin" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/>
-	<property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/>
 	<style name="Default" isDefault="true" fontName="Arial"/>
 	<style name="Default oblique" fontName="Monospaced"/>
 	<queryString>
@@ -25,6 +17,23 @@
 	<field name="soldeDebit" class="java.math.BigDecimal"/>
 	<field name="soldeCredit" class="java.math.BigDecimal"/>
 	<field name="formatter" class="java.text.DecimalFormat"/>
+	<field name="mainAccountLabel" class="java.lang.String"/>
+	<variable name="amountDebitSolde" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{amountDebit}]]></variableExpression>
+		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
+	</variable>
+	<variable name="amountCreditSolde" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{amountCredit}]]></variableExpression>
+		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
+	</variable>
+	<variable name="soldeDebitSolde" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{soldeDebit}]]></variableExpression>
+		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
+	</variable>
+	<variable name="soldeCreditSolde" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{soldeCredit}]]></variableExpression>
+		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
+	</variable>
 	<detail>
 		<band height="10" splitType="Stretch">
 			<textField isBlankWhenNull="true">
@@ -42,7 +51,7 @@
 				<textFieldExpression><![CDATA[$F{accountNumber}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="40" y="0" width="250" height="10" uuid="0bcc6e5d-b2ee-474f-8e66-475933d55a16">
+				<reportElement stretchType="RelativeToTallestObject" x="40" y="0" width="250" height="10" uuid="0bcc6e5d-b2ee-474f-8e66-475933d55a16">
 					<property name="local_mesure_unity" value="pixel"/>
 				</reportElement>
 				<box>
@@ -86,7 +95,9 @@
 				<textFieldExpression><![CDATA[new Boolean($F{amountCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{amountCredit}) : ""]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="434" y="0" width="72" height="10" uuid="53ba669a-6626-4e70-bbf0-fb243908a20e"/>
+				<reportElement x="434" y="0" width="72" height="10" uuid="53ba669a-6626-4e70-bbf0-fb243908a20e">
+					<property name="local_mesure_unitx" value="pixel"/>
+				</reportElement>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/>
 					<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
@@ -115,4 +126,258 @@
 			</textField>
 		</band>
 	</detail>
+	<columnFooter>
+		<band height="10">
+			<property name="local_mesure_unitheight" value="pixel"/>
+			<printWhenExpression><![CDATA[($V{PAGE_NUMBER} +1) < $V{PAGE_COUNT}]]></printWhenExpression>
+			<frame>
+				<reportElement mode="Transparent" x="0" y="0" width="578" height="10" uuid="01691c82-c3b6-4b63-b6d5-3aba5eff6b27">
+					<property name="local_mesure_unitwidth" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/>
+					<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+					<bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+					<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+				</box>
+				<textField isBlankWhenNull="true">
+					<reportElement x="0" y="0" width="290" height="10" forecolor="#736343" uuid="b656cbb0-02be-403d-8913-191b051fff78">
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unitheight" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box>
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+					</box>
+					<textElement>
+						<font size="8" isBold="true"/>
+						<paragraph leftIndent="80"/>
+					</textElement>
+					<textFieldExpression><![CDATA["Sous total pour" + $F{mainAccountLabel}]]></textFieldExpression>
+				</textField>
+				<textField pattern="" isBlankWhenNull="true">
+					<reportElement key="" x="434" y="0" width="72" height="10" forecolor="#736343" uuid="9c59df76-21ef-428f-8266-0da4cade0a20">
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unitheight" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<printWhenExpression><![CDATA[new Boolean($V{soldeDebitSolde}.compareTo(BigDecimal.ZERO) != 0)]]></printWhenExpression>
+					</reportElement>
+					<box>
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+					</box>
+					<textElement textAlignment="Right">
+						<font fontName="Courier 10 Pitch" size="8"/>
+						<paragraph rightIndent="2"/>
+					</textElement>
+					<textFieldExpression><![CDATA[new Boolean($V{soldeDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{soldeDebitSolde}) : ""]]></textFieldExpression>
+				</textField>
+				<textField isBlankWhenNull="true">
+					<reportElement x="506" y="0" width="72" height="10" forecolor="#736343" uuid="52091c73-538e-4f13-9e80-d8ceceb20925">
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unitheight" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box>
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+					</box>
+					<textElement textAlignment="Right">
+						<font fontName="Courier 10 Pitch" size="8"/>
+						<paragraph rightIndent="2"/>
+					</textElement>
+					<textFieldExpression><![CDATA[new Boolean($V{soldeCreditSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{soldeCreditSolde}) : ""]]></textFieldExpression>
+				</textField>
+				<textField pattern="" isBlankWhenNull="true">
+					<reportElement key="" x="290" y="0" width="72" height="10" forecolor="#736343" uuid="7f9a6117-e3b4-492f-ba5a-b4f913516294">
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unitheight" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="local_mesure_unity" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+						<printWhenExpression><![CDATA[new Boolean($V{soldeDebitSolde}.compareTo(BigDecimal.ZERO) != 0)]]></printWhenExpression>
+					</reportElement>
+					<box>
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+					</box>
+					<textElement textAlignment="Right">
+						<font fontName="Courier 10 Pitch" size="8"/>
+						<paragraph rightIndent="2"/>
+					</textElement>
+					<textFieldExpression><![CDATA[new Boolean($V{amountDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{amountDebitSolde}) : ""]]></textFieldExpression>
+				</textField>
+				<textField isBlankWhenNull="true">
+					<reportElement x="362" y="0" width="72" height="10" forecolor="#736343" uuid="d149a582-98a8-4cce-ab19-c42f1142839c">
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unitheight" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="local_mesure_unity" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					</reportElement>
+					<box>
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+					</box>
+					<textElement textAlignment="Right">
+						<font fontName="Courier 10 Pitch" size="8"/>
+						<paragraph rightIndent="2"/>
+					</textElement>
+					<textFieldExpression><![CDATA[new Boolean($V{amountCreditSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{amountCreditSolde}) : ""]]></textFieldExpression>
+				</textField>
+			</frame>
+		</band>
+	</columnFooter>
+	<lastPageFooter>
+		<band height="10">
+			<property name="local_mesure_unitheight" value="pixel"/>
+			<property name="com.jaspersoft.studio.unit.height" value="px"/>
+			<frame>
+				<reportElement mode="Transparent" x="0" y="0" width="578" height="10" uuid="4b8bb146-d5ae-4d4f-af2f-638dfd75dd32">
+					<property name="local_mesure_unitwidth" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/>
+					<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+					<bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+					<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+				</box>
+				<textField isBlankWhenNull="true">
+					<reportElement x="0" y="0" width="290" height="10" forecolor="#736343" uuid="438ff8bf-de02-4ab6-8565-86f3e5deec4c">
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unitheight" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box>
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+					</box>
+					<textElement>
+						<font size="8" isBold="true"/>
+						<paragraph leftIndent="80"/>
+					</textElement>
+					<textFieldExpression><![CDATA["Total pour " + $F{mainAccountLabel}]]></textFieldExpression>
+				</textField>
+				<textField pattern="" isBlankWhenNull="true">
+					<reportElement key="" x="434" y="0" width="72" height="10" forecolor="#736343" uuid="6edd1323-c09c-45f8-ac94-be4753616581">
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unitheight" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<printWhenExpression><![CDATA[new Boolean($V{soldeDebitSolde}.compareTo(BigDecimal.ZERO) != 0)]]></printWhenExpression>
+					</reportElement>
+					<box>
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+					</box>
+					<textElement textAlignment="Right">
+						<font fontName="Courier 10 Pitch" size="8"/>
+						<paragraph rightIndent="2"/>
+					</textElement>
+					<textFieldExpression><![CDATA[new Boolean($V{soldeDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{soldeDebitSolde}) : ""]]></textFieldExpression>
+				</textField>
+				<textField isBlankWhenNull="true">
+					<reportElement x="506" y="0" width="72" height="10" forecolor="#736343" uuid="6bc7b25f-7a33-4243-8b41-c12fc69bfdd9">
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unitheight" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box>
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+					</box>
+					<textElement textAlignment="Right">
+						<font fontName="Courier 10 Pitch" size="8"/>
+						<paragraph rightIndent="2"/>
+					</textElement>
+					<textFieldExpression><![CDATA[new Boolean($V{soldeCreditSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{soldeCreditSolde}) : ""]]></textFieldExpression>
+				</textField>
+				<textField pattern="" isBlankWhenNull="true">
+					<reportElement key="" x="290" y="0" width="72" height="10" forecolor="#736343" uuid="4b3cfcb7-e1c1-4825-824d-3f30c424cb8d">
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unitheight" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="local_mesure_unity" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+						<printWhenExpression><![CDATA[new Boolean($V{soldeDebitSolde}.compareTo(BigDecimal.ZERO) != 0)]]></printWhenExpression>
+					</reportElement>
+					<box>
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+					</box>
+					<textElement textAlignment="Right">
+						<font fontName="Courier 10 Pitch" size="8"/>
+						<paragraph rightIndent="2"/>
+					</textElement>
+					<textFieldExpression><![CDATA[new Boolean($V{amountDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{amountDebitSolde}) : ""]]></textFieldExpression>
+				</textField>
+				<textField isBlankWhenNull="true">
+					<reportElement x="362" y="0" width="72" height="10" forecolor="#736343" uuid="0736caf4-6f73-417e-93c8-2a81a81f6721">
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unitheight" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="local_mesure_unity" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					</reportElement>
+					<box>
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/>
+					</box>
+					<textElement textAlignment="Right">
+						<font fontName="Courier 10 Pitch" size="8"/>
+						<paragraph rightIndent="2"/>
+					</textElement>
+					<textFieldExpression><![CDATA[new Boolean($V{amountCreditSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{amountCreditSolde}) : ""]]></textFieldExpression>
+				</textField>
+			</frame>
+		</band>
+	</lastPageFooter>
 </jasperReport>
diff --git a/lima-web/src/main/jasperreports/balance/BalanceReport.jrxml b/lima-web/src/main/jasperreports/balance/DocumentReport.jrxml
similarity index 97%
copy from lima-web/src/main/jasperreports/balance/BalanceReport.jrxml
copy to lima-web/src/main/jasperreports/balance/DocumentReport.jrxml
index 2939f3c..05cdae3 100644
--- a/lima-web/src/main/jasperreports/balance/BalanceReport.jrxml
+++ b/lima-web/src/main/jasperreports/balance/DocumentReport.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1  -->
-<!-- 2015-01-14T14:14:01 -->
+<!-- 2015-01-21T10:08:30 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceReport" pageWidth="595" pageHeight="842" whenNoDataType="BlankPage" columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" isSummaryNewPage="true" isSummaryWithPageHeaderAndFooter="true" isFloa [...]
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
@@ -16,14 +16,14 @@
 	<field name="currency" class="java.lang.String"/>
 	<field name="fromAccount" class="java.lang.String"/>
 	<field name="toAccount" class="java.lang.String"/>
-	<field name="accounts" class="java.util.List"/>
+	<field name="mainAccounts" class="java.util.List"/>
 	<field name="subReportPath" class="java.lang.String"/>
 	<field name="companyName" class="java.lang.String"/>
 	<field name="title" class="java.lang.String"/>
-	<variable name="accounts" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource">
-		<variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{accounts})]]></variableExpression>
+	<variable name="mainAccounts" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource">
+		<variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{mainAccounts})]]></variableExpression>
 	</variable>
-	<group name="accounts"/>
+	<group name="mainAccounts"/>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -246,7 +246,7 @@
 		<band height="20" splitType="Stretch">
 			<subreport isUsingCache="false" runToBottom="false">
 				<reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="0" width="578" height="20" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"/>
-				<dataSourceExpression><![CDATA[$V{accounts}]]></dataSourceExpression>
+				<dataSourceExpression><![CDATA[$V{mainAccounts}]]></dataSourceExpression>
 				<subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression>
 			</subreport>
 		</band>
diff --git a/lima-web/src/main/jasperreports/provisionalEntryBook/EntryBookMainReport.jrxml b/lima-web/src/main/jasperreports/entryBook/DocumentReport.jrxml
similarity index 97%
rename from lima-web/src/main/jasperreports/provisionalEntryBook/EntryBookMainReport.jrxml
rename to lima-web/src/main/jasperreports/entryBook/DocumentReport.jrxml
index e5320fe..3b01327 100644
--- a/lima-web/src/main/jasperreports/provisionalEntryBook/EntryBookMainReport.jrxml
+++ b/lima-web/src/main/jasperreports/entryBook/DocumentReport.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1  -->
-<!-- 2015-01-14T11:17:08 -->
+<!-- 2015-01-21T10:16:58 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceReport" pageWidth="595" pageHeight="842" whenNoDataType="BlankPage" columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" isSummaryNewPage="true" isSummaryWithPageHeaderAndFooter="true" isFloa [...]
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
@@ -14,17 +14,17 @@
 	<field name="fromDate" class="java.util.Date"/>
 	<field name="toDate" class="java.util.Date"/>
 	<field name="currency" class="java.lang.String"/>
-	<field name="entryBookReport" class="java.util.List"/>
+	<field name="entryBooks" class="java.util.List"/>
 	<field name="subReportPath" class="java.lang.String"/>
 	<field name="companyName" class="java.lang.String"/>
 	<field name="title" class="java.lang.String"/>
 	<field name="soldeDebit" class="java.math.BigDecimal"/>
 	<field name="soldeCredit" class="java.math.BigDecimal"/>
 	<field name="formatter" class="java.text.DecimalFormat"/>
-	<variable name="entryBookPeriodReport" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource">
-		<variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{entryBookReport})]]></variableExpression>
+	<variable name="entryBooks" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource">
+		<variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{entryBooks})]]></variableExpression>
 	</variable>
-	<group name="entryBookPeriodReport"/>
+	<group name="entryBooks"/>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -240,7 +240,7 @@
 		<band height="20" splitType="Stretch">
 			<subreport isUsingCache="false" runToBottom="false">
 				<reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="0" width="578" height="20" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"/>
-				<dataSourceExpression><![CDATA[$V{entryBookPeriodReport}]]></dataSourceExpression>
+				<dataSourceExpression><![CDATA[$V{entryBooks}]]></dataSourceExpression>
 				<subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression>
 			</subreport>
 		</band>
diff --git a/lima-web/src/main/jasperreports/provisionalEntryBook/EntryBookReport.jrxml b/lima-web/src/main/jasperreports/entryBook/EntryBookReport.jrxml
similarity index 98%
rename from lima-web/src/main/jasperreports/provisionalEntryBook/EntryBookReport.jrxml
rename to lima-web/src/main/jasperreports/entryBook/EntryBookReport.jrxml
index a83354f..67b9927 100644
--- a/lima-web/src/main/jasperreports/provisionalEntryBook/EntryBookReport.jrxml
+++ b/lima-web/src/main/jasperreports/entryBook/EntryBookReport.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1  -->
-<!-- 2015-01-14T11:21:54 -->
+<!-- 2015-01-21T10:20:12 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="50" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isFloatColumnFooter="true" whenResourceMissingType="Empty" isIgnoreP [...]
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
 	<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/>
@@ -12,13 +12,13 @@
 	</queryString>
 	<field name="soldeDebit" class="java.math.BigDecimal"/>
 	<field name="soldeCredit" class="java.math.BigDecimal"/>
-	<field name="financialPeriodReport" class="java.util.List"/>
+	<field name="financialPeriods" class="java.util.List"/>
 	<field name="subReportPath" class="java.lang.String"/>
 	<field name="code" class="java.lang.String"/>
 	<field name="libelle" class="java.lang.String"/>
 	<field name="formatter" class="java.text.DecimalFormat"/>
 	<variable name="generalEntryBookEntry" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource">
-		<variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{financialPeriodReport})]]></variableExpression>
+		<variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{financialPeriods})]]></variableExpression>
 	</variable>
 	<pageHeader>
 		<band height="10">
diff --git a/lima-web/src/main/jasperreports/provisionalEntryBook/FinancialPeriodReport.jrxml b/lima-web/src/main/jasperreports/entryBook/FinancialPeriodReport.jrxml
similarity index 98%
rename from lima-web/src/main/jasperreports/provisionalEntryBook/FinancialPeriodReport.jrxml
rename to lima-web/src/main/jasperreports/entryBook/FinancialPeriodReport.jrxml
index cf9f593..b830692 100644
--- a/lima-web/src/main/jasperreports/provisionalEntryBook/FinancialPeriodReport.jrxml
+++ b/lima-web/src/main/jasperreports/entryBook/FinancialPeriodReport.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1  -->
-<!-- 2015-01-14T11:21:00 -->
+<!-- 2015-01-21T10:20:48 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="51" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isFloatColumnFooter="true" whenResourceMissingType="Empty" isIgnoreP [...]
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
 	<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/>
@@ -20,14 +20,14 @@
 	</queryString>
 	<field name="soldeDebit" class="java.math.BigDecimal"/>
 	<field name="soldeCredit" class="java.math.BigDecimal"/>
-	<field name="transaction" class="java.util.List"/>
+	<field name="transactions" class="java.util.List"/>
 	<field name="subReportPath" class="java.lang.String"/>
 	<field name="period" class="java.util.Date"/>
 	<field name="libelle" class="java.lang.String"/>
 	<field name="entryBookCode" class="java.lang.String"/>
 	<field name="formatter" class="java.text.DecimalFormat"/>
 	<variable name="generalEntryBookEntry" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource">
-		<variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{transaction})]]></variableExpression>
+		<variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{transactions})]]></variableExpression>
 	</variable>
 	<pageHeader>
 		<band height="10">
diff --git a/lima-web/src/main/jasperreports/provisionalEntryBook/TransactionReport.jrxml b/lima-web/src/main/jasperreports/entryBook/TransactionReport.jrxml
similarity index 99%
rename from lima-web/src/main/jasperreports/provisionalEntryBook/TransactionReport.jrxml
rename to lima-web/src/main/jasperreports/entryBook/TransactionReport.jrxml
index a609a8e..282875c 100644
--- a/lima-web/src/main/jasperreports/provisionalEntryBook/TransactionReport.jrxml
+++ b/lima-web/src/main/jasperreports/entryBook/TransactionReport.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1  -->
-<!-- 2015-01-14T11:24:25 -->
+<!-- 2015-01-21T11:00:00 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="30" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Empty" isIgnorePagination="true" uuid="75ff86c6-c370-4f0b-a2d3-e17324a465bb">
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
 	<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/>
diff --git a/lima-web/src/main/jasperreports/generalEntryBook/EntryBookMainReport.jrxml b/lima-web/src/main/jasperreports/generalEntryBook/DocumentReport.jrxml
similarity index 97%
rename from lima-web/src/main/jasperreports/generalEntryBook/EntryBookMainReport.jrxml
rename to lima-web/src/main/jasperreports/generalEntryBook/DocumentReport.jrxml
index 23c6cb0..35a28e7 100644
--- a/lima-web/src/main/jasperreports/generalEntryBook/EntryBookMainReport.jrxml
+++ b/lima-web/src/main/jasperreports/generalEntryBook/DocumentReport.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1  -->
-<!-- 2015-01-14T15:09:41 -->
+<!-- 2015-01-21T10:06:37 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceReport" pageWidth="595" pageHeight="842" whenNoDataType="BlankPage" columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" isSummaryNewPage="true" isSummaryWithPageHeaderAndFooter="true" isFloa [...]
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
@@ -14,15 +14,15 @@
 	<field name="fromDate" class="java.util.Date"/>
 	<field name="toDate" class="java.util.Date"/>
 	<field name="currency" class="java.lang.String"/>
-	<field name="entryBookPeriodReport" class="java.util.List"/>
+	<field name="generalEntryBooks" class="java.util.List"/>
 	<field name="subReportPath" class="java.lang.String"/>
 	<field name="companyName" class="java.lang.String"/>
 	<field name="title" class="java.lang.String"/>
 	<field name="soldeDebit" class="java.math.BigDecimal"/>
 	<field name="soldeCredit" class="java.math.BigDecimal"/>
 	<field name="formatter" class="java.text.DecimalFormat"/>
-	<variable name="entryBookPeriodReport" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource">
-		<variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{entryBookPeriodReport})]]></variableExpression>
+	<variable name="generalEntryBooks" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource">
+		<variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{generalEntryBooks})]]></variableExpression>
 	</variable>
 	<group name="entryBookPeriodReport"/>
 	<background>
@@ -197,7 +197,7 @@
 		<band height="20" splitType="Stretch">
 			<subreport isUsingCache="false" runToBottom="false">
 				<reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="0" width="578" height="20" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"/>
-				<dataSourceExpression><![CDATA[$V{entryBookPeriodReport}]]></dataSourceExpression>
+				<dataSourceExpression><![CDATA[$V{generalEntryBooks}]]></dataSourceExpression>
 				<subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression>
 			</subreport>
 		</band>
diff --git a/lima-web/src/main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml b/lima-web/src/main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml
index 03f40b2..343f89d 100644
--- a/lima-web/src/main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml
+++ b/lima-web/src/main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1  -->
-<!-- 2015-01-14T15:09:41 -->
+<!-- 2015-01-21T10:22:40 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="20" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Empty" isIgnorePagination="true" uuid="75ff [...]
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
 	<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/>
@@ -20,12 +20,12 @@
 	</queryString>
 	<field name="soldeDebit" class="java.math.BigDecimal"/>
 	<field name="soldeCredit" class="java.math.BigDecimal"/>
-	<field name="generalEntryBookEntry" class="java.util.List"/>
+	<field name="entries" class="java.util.List"/>
 	<field name="subReportPath" class="java.lang.String"/>
 	<field name="period" class="java.util.Date"/>
 	<field name="formatter" class="java.text.DecimalFormat"/>
-	<variable name="generalEntryBookEntry" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource">
-		<variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{generalEntryBookEntry})]]></variableExpression>
+	<variable name="entries" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource">
+		<variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{entries})]]></variableExpression>
 	</variable>
 	<detail>
 		<band height="10">
@@ -67,7 +67,7 @@
 		<band height="10" splitType="Stretch">
 			<subreport isUsingCache="false" runToBottom="false">
 				<reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"/>
-				<dataSourceExpression><![CDATA[$V{generalEntryBookEntry}]]></dataSourceExpression>
+				<dataSourceExpression><![CDATA[$V{entries}]]></dataSourceExpression>
 				<subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression>
 			</subreport>
 		</band>
diff --git a/lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml b/lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml
index 44b60d8..36a7553 100644
--- a/lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml
+++ b/lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1  -->
-<!-- 2015-01-14T15:09:41 -->
+<!-- 2015-01-21T10:22:40 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="21" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="75ff86c6-c370-4f0b-a2d3-e17324a465bb">
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
 	<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/>
diff --git a/lima-web/src/main/jasperreports/balance/BalanceReport.jrxml b/lima-web/src/main/jasperreports/ledger/DocumentReport.jrxml
similarity index 77%
rename from lima-web/src/main/jasperreports/balance/BalanceReport.jrxml
rename to lima-web/src/main/jasperreports/ledger/DocumentReport.jrxml
index 2939f3c..aded66d 100644
--- a/lima-web/src/main/jasperreports/balance/BalanceReport.jrxml
+++ b/lima-web/src/main/jasperreports/ledger/DocumentReport.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1  -->
-<!-- 2015-01-14T14:14:01 -->
+<!-- 2015-01-21T10:10:15 -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceReport" pageWidth="595" pageHeight="842" whenNoDataType="BlankPage" columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" isSummaryNewPage="true" isSummaryWithPageHeaderAndFooter="true" isFloa [...]
 	<property name="com.jaspersoft.studio.unit." value="pixel"/>
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
@@ -14,16 +14,16 @@
 	<field name="fromDate" class="java.util.Date"/>
 	<field name="toDate" class="java.util.Date"/>
 	<field name="currency" class="java.lang.String"/>
-	<field name="fromAccount" class="java.lang.String"/>
-	<field name="toAccount" class="java.lang.String"/>
-	<field name="accounts" class="java.util.List"/>
+	<field name="generalLedgers" class="java.util.List"/>
 	<field name="subReportPath" class="java.lang.String"/>
 	<field name="companyName" class="java.lang.String"/>
 	<field name="title" class="java.lang.String"/>
-	<variable name="accounts" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource">
-		<variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{accounts})]]></variableExpression>
+	<field name="fromAccount" class="java.lang.String"/>
+	<field name="toAccount" class="java.lang.String"/>
+	<variable name="entryBookPeriodReport" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource">
+		<variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{generalLedgers})]]></variableExpression>
 	</variable>
-	<group name="accounts"/>
+	<group name="entryBookPeriodReport"/>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -91,17 +91,6 @@
 	<pageHeader>
 		<band height="25" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement style="Oblique" x="0" y="9" width="444" height="16" uuid="9db3917c-44e3-46d2-b95a-6463e5eff328">
-					<property name="local_mesure_unitheight" value="pixel"/>
-					<property name="local_mesure_unitwidth" value="pixel"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
-					<font size="8" isItalic="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA["Comptes: " + $F{fromAccount}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
 				<reportElement style="Oblique" x="444" y="9" width="134" height="16" forecolor="#000000" uuid="abcb18cb-7d0e-4eb8-a9f5-aca4baffa9ae">
 					<property name="local_mesure_unitheight" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -111,6 +100,17 @@
 				</textElement>
 				<textFieldExpression><![CDATA["Devise: " + $F{currency}]]></textFieldExpression>
 			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement style="Oblique" x="0" y="9" width="444" height="16" uuid="02c35c41-1b1f-4554-ab87-5403d63ae3d6">
+					<property name="local_mesure_unitheight" value="pixel"/>
+					<property name="local_mesure_unitwidth" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8" isItalic="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA["Comptes: " + $F{fromAccount}]]></textFieldExpression>
+			</textField>
 		</band>
 	</pageHeader>
 	<columnHeader>
@@ -126,118 +126,128 @@
 					<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
 				</box>
 				<staticText>
-					<reportElement x="0" y="0" width="40" height="20" forecolor="#804000" uuid="63da28a1-a793-4bf5-81d4-6a4d6fc1e4df">
+					<reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="60" height="20" forecolor="#804000" backcolor="#FFFFFF" uuid="63da28a1-a793-4bf5-81d4-6a4d6fc1e4df">
 						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box>
-						<rightPen lineWidth="0.6" lineColor="#804000"/>
+						<rightPen lineWidth="0.6"/>
 					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Compte]]></text>
+					<text><![CDATA[Date]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="40" y="0" width="250" height="20" forecolor="#804000" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb">
+					<reportElement x="60" y="0" width="40" height="20" forecolor="#804000" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb">
 						<property name="local_mesure_unitheight" value="pixel"/>
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box>
-						<topPen lineWidth="0.6" lineColor="#804000"/>
-						<leftPen lineWidth="0.6" lineColor="#804000"/>
-						<bottomPen lineWidth="0.6" lineColor="#804000"/>
-						<rightPen lineWidth="0.6" lineColor="#804000"/>
+						<topPen lineWidth="0.6"/>
+						<leftPen lineWidth="0.6"/>
+						<bottomPen lineWidth="0.6"/>
+						<rightPen lineWidth="0.6"/>
 					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Intitulé]]></text>
+					<text><![CDATA[Journal]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="290" y="0" width="144" height="10" forecolor="#804000" uuid="caadc464-ad77-4b53-b5cb-11e29c0a18ce">
+					<reportElement x="100" y="0" width="40" height="20" forecolor="#804000" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb">
 						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box>
-						<topPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
-						<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
-						<bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
-						<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
+						<topPen lineWidth="0.6"/>
+						<leftPen lineWidth="0.6"/>
+						<bottomPen lineWidth="0.6"/>
+						<rightPen lineWidth="0.6"/>
 					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Total Période]]></text>
+					<text><![CDATA[Pièce]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="290" y="10" width="72" height="10" forecolor="#804000" uuid="e6928f86-fe5c-4c14-996c-19728e6abf44">
+					<reportElement x="140" y="0" width="222" height="20" forecolor="#804000" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb">
 						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box>
-						<rightPen lineWidth="0.6" lineColor="#804000"/>
+						<topPen lineWidth="0.6"/>
+						<leftPen lineWidth="0.6"/>
+						<bottomPen lineWidth="0.6"/>
+						<rightPen lineWidth="0.6"/>
 					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Débit]]></text>
+					<text><![CDATA[Intitulé]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="362" y="10" width="72" height="10" forecolor="#804000" uuid="13dd0f7b-3331-4ca4-8ef8-5468fb65fc3e">
+					<reportElement x="362" y="0" width="72" height="20" forecolor="#804000" uuid="b6ea8597-d637-47d1-9a39-7c99101594e9">
 						<property name="local_mesure_unitheight" value="pixel"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 					</reportElement>
 					<box>
+						<topPen lineWidth="0.6" lineColor="#804000"/>
+						<leftPen lineWidth="0.6" lineColor="#804000"/>
+						<bottomPen lineWidth="0.6" lineColor="#804000"/>
 						<rightPen lineWidth="0.6" lineColor="#804000"/>
 					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Crédit]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="434" y="0" width="144" height="10" forecolor="#804000" uuid="1bc6ab8b-d490-46a2-9a10-8f4c4f219889">
-						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<box>
-						<topPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
-						<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
-						<bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
-						<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/>
-					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="8" isBold="true"/>
-					</textElement>
-					<text><![CDATA[Solde Période]]></text>
+					<text><![CDATA[Débit]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="434" y="10" width="72" height="10" forecolor="#804000" uuid="b6ea8597-d637-47d1-9a39-7c99101594e9">
+					<reportElement x="434" y="0" width="72" height="20" forecolor="#804000" uuid="c4f9f592-7052-4b66-abc2-f04cc5f3972c">
 						<property name="local_mesure_unitheight" value="pixel"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 					</reportElement>
 					<box>
-						<topPen lineWidth="0.6" lineColor="#804000"/>
-						<leftPen lineWidth="0.6" lineColor="#804000"/>
-						<bottomPen lineWidth="0.6" lineColor="#804000"/>
+						<topPen lineColor="#804000"/>
+						<leftPen lineColor="#804000"/>
+						<bottomPen lineColor="#804000"/>
 						<rightPen lineWidth="0.6" lineColor="#804000"/>
 					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Débit]]></text>
+					<text><![CDATA[Crédit]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="506" y="10" width="72" height="10" forecolor="#804000" uuid="c4f9f592-7052-4b66-abc2-f04cc5f3972c">
+					<reportElement x="506" y="0" width="72" height="20" forecolor="#804000" uuid="c4f9f592-7052-4b66-abc2-f04cc5f3972c">
 						<property name="local_mesure_unitheight" value="pixel"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 					</reportElement>
 					<box>
+						<topPen lineColor="#804000"/>
+						<leftPen lineColor="#804000"/>
+						<bottomPen lineColor="#804000"/>
 						<rightPen lineWidth="0.6" lineColor="#804000"/>
 					</box>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Crédit]]></text>
+					<text><![CDATA[Solde]]></text>
 				</staticText>
 			</frame>
 		</band>
@@ -246,7 +256,7 @@
 		<band height="20" splitType="Stretch">
 			<subreport isUsingCache="false" runToBottom="false">
 				<reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="0" width="578" height="20" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"/>
-				<dataSourceExpression><![CDATA[$V{accounts}]]></dataSourceExpression>
+				<dataSourceExpression><![CDATA[$V{entryBookPeriodReport}]]></dataSourceExpression>
 				<subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression>
 			</subreport>
 		</band>
diff --git a/lima-web/src/main/jasperreports/ledger/LedgerPeriodReport.jrxml b/lima-web/src/main/jasperreports/ledger/LedgerPeriodReport.jrxml
new file mode 100644
index 0000000..370b349
--- /dev/null
+++ b/lima-web/src/main/jasperreports/ledger/LedgerPeriodReport.jrxml
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1  -->
+<!-- 2015-01-14T11:29:22 -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="31" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Empty" isIgnorePagination="true" uuid="75ff [...]
+	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
+	<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/>
+	<property name="com.jaspersoft.studio.unit." value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.pageHeight" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.pageWidth" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.topMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.bottomMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.leftMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/>
+	<property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/>
+	<style name="Default" isDefault="true" fontName="Arial"/>
+	<style name="Default oblique" fontName="Monospaced"/>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="date" class="java.util.Date"/>
+	<field name="entryBook" class="java.lang.String"/>
+	<field name="voucher" class="java.lang.String"/>
+	<field name="libelle" class="java.lang.String"/>
+	<field name="debit" class="java.math.BigDecimal"/>
+	<field name="credit" class="java.math.BigDecimal"/>
+	<field name="solde" class="java.math.BigDecimal"/>
+	<field name="period" class="java.lang.String"/>
+	<field name="accountNumber" class="java.lang.String"/>
+	<field name="accountLabel" class="java.lang.String"/>
+	<variable name="totalPeriodDebit" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{debit}]]></variableExpression>
+		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
+	</variable>
+	<variable name="totalPeriodCredit" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{credit}]]></variableExpression>
+		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
+	</variable>
+	<variable name="totalPeriodSolde" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{solde}]]></variableExpression>
+		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
+	</variable>
+	<variable name="totalAccountDebit" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{debit}]]></variableExpression>
+		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
+	</variable>
+	<variable name="totalAccountCredit" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{credit}]]></variableExpression>
+		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
+	</variable>
+	<variable name="totalAccountSolde" class="java.math.BigDecimal" calculation="Sum">
+		<variableExpression><![CDATA[$F{solde}]]></variableExpression>
+		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
+	</variable>
+	<variable name="solde1" class="java.math.BigDecimal" resetType="Column" calculation="Sum">
+		<variableExpression><![CDATA[$F{solde}]]></variableExpression>
+	</variable>
+	<pageHeader>
+		<band height="10">
+			<property name="local_mesure_unitheight" value="pixel"/>
+			<property name="com.jaspersoft.studio.unit.height" value="px"/>
+			<frame>
+				<reportElement mode="Opaque" x="0" y="0" width="578" height="10" forecolor="#D0B48E" backcolor="#FDCA97" uuid="644d4927-8973-45d7-bd80-0512dad33987">
+					<property name="local_mesure_unitwidth" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/>
+					<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/>
+					<bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/>
+					<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/>
+				</box>
+				<textField>
+					<reportElement x="0" y="0" width="60" height="10" uuid="be71eb35-fb58-473a-8ac1-07d658474372">
+						<property name="local_mesure_unitheight" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<textFieldExpression><![CDATA[$F{accountNumber}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="60" y="0" width="518" height="10" uuid="c2b6613a-5505-4f7b-8aba-79e247b3edc6">
+						<property name="local_mesure_unitheight" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<textFieldExpression><![CDATA[$F{accountLabel}]]></textFieldExpression>
+				</textField>
+			</frame>
+		</band>
+	</pageHeader>
+	<detail>
+		<band height="10" splitType="Stretch">
+			<textField isBlankWhenNull="true">
+				<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="60" height="10" uuid="c5f32333-c77a-45f8-9bec-c8d61e15d85a">
+					<property name="local_mesure_unitwidth" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8" isBold="true"/>
+					<paragraph lineSpacingSize="0.0" leftIndent="2"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{date}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="60" y="0" width="40" height="10" uuid="0bcc6e5d-b2ee-474f-8e66-475933d55a16">
+					<property name="local_mesure_unity" value="pixel"/>
+					<property name="local_mesure_unitx" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="local_mesure_unitwidth" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8" isBold="true"/>
+					<paragraph lineSpacingSize="0.0" leftIndent="2"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{entryBook}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="100" y="0" width="40" height="10" uuid="e774e638-6353-46d0-9968-15992ef50bd3">
+					<property name="local_mesure_unitx" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="local_mesure_unitwidth" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8" isBold="true"/>
+					<paragraph lineSpacingSize="0.0" rightIndent="2"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{voucher}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement style="Default" x="140" y="0" width="222" height="10" uuid="daac5561-4c81-4582-aabf-e8034c2cf93e">
+					<property name="local_mesure_unitx" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="local_mesure_unitwidth" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8" isBold="true"/>
+					<paragraph lineSpacingSize="0.0" rightIndent="2"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{libelle}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement style="Default" x="362" y="0" width="72" height="10" uuid="53ba669a-6626-4e70-bbf0-fb243908a20e">
+					<property name="local_mesure_unitx" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8" isBold="true"/>
+					<paragraph lineSpacingSize="0.0" rightIndent="2"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{debit}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement style="Default" x="434" y="0" width="72" height="10" uuid="edb8a8c1-ac7a-44cb-9de6-b231b00f966f">
+					<property name="local_mesure_unitx" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8" isBold="true"/>
+					<paragraph lineSpacingSize="0.0" rightIndent="2"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{credit}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="506" y="0" width="72" height="10" uuid="961e8048-c6ef-4b58-a857-31f9f29406c8">
+					<property name="local_mesure_unitx" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="local_mesure_unitwidth" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<property name="local_mesure_unitheight" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{solde}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band height="10">
+			<property name="local_mesure_unitheight" value="pixel"/>
+			<property name="com.jaspersoft.studio.unit.height" value="px"/>
+			<frame>
+				<reportElement x="0" y="0" width="578" height="10" uuid="5863f40f-6423-4463-ad4a-c4cecab0323c">
+					<property name="local_mesure_unitwidth" value="pixel"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/>
+					<leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/>
+					<bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/>
+					<rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/>
+				</box>
+				<textField>
+					<reportElement x="362" y="0" width="72" height="10" forecolor="#D0B48E" uuid="0311393c-8196-477b-b00b-e76e767855ee">
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unitheight" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					</reportElement>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{totalPeriodDebit}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="434" y="0" width="72" height="10" forecolor="#D0B48E" uuid="0311393c-8196-477b-b00b-e76e767855ee">
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unitheight" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					</reportElement>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{totalPeriodCredit}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement x="506" y="0" width="72" height="10" forecolor="#D0B48E" uuid="0311393c-8196-477b-b00b-e76e767855ee">
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unitheight" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="local_mesure_unitx" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					</reportElement>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$V{totalPeriodSolde}]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement x="0" y="0" width="362" height="10" forecolor="#D0B48E" uuid="3deefb8e-456b-4bbb-8574-1a02651e5d7f">
+						<property name="local_mesure_unitwidth" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="local_mesure_unitheight" value="pixel"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<text><![CDATA[Sous total + $F{period}]]></text>
+				</staticText>
+			</frame>
+		</band>
+	</columnFooter>
+</jasperReport>
diff --git a/lima-web/src/main/java/org/chorem/lima/web/action/DocumentService.java b/lima-web/src/main/java/org/chorem/lima/web/action/DocumentService.java
index 70795ff..dfcefdd 100644
--- a/lima-web/src/main/java/org/chorem/lima/web/action/DocumentService.java
+++ b/lima-web/src/main/java/org/chorem/lima/web/action/DocumentService.java
@@ -62,7 +62,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-import java.util.Properties;
 
 import static org.nuiton.i18n.I18n.t;
 
@@ -83,7 +82,7 @@ public class DocumentService {
 
     protected GeneralEntryBookReportService generalEntryBookReportService;
 
-    protected ProvisionalEntryBookReportService provisionalEntryBookReportService;
+    protected ProvisionalEntryBookReportService entryBookReportService;
 
     protected LedgerReportService ledgerReportService;
 
@@ -97,11 +96,12 @@ public class DocumentService {
 
     protected AccountService accountService;
 
-    protected String path = LimaServiceConfig.getInstance().getReportsDir().getAbsolutePath();
+    protected String path = LimaServiceConfig.getInstance().getReportsModelDir().getAbsolutePath();
 
     protected final String BALANCE_FILE_PATH = path + File.separator + DocumentsEnum.BALANCE.getFileName() + ".pdf";
     protected final String GENERAL_ENTRY_BOOK_REPORT_PDF_FILE_PATH = path + File.separator + DocumentsEnum.GENERAL_ENTRY_BOOK.getFileName() + ".pdf";
     protected final String ENTRY_BOOKS_REPORT_PDF_FILE_PATH = path + File.separator + DocumentsEnum.ENTRY_BOOKS.getFileName() + ".pdf";
+    protected final String LEDGER_REPORT_PDF_FILE_PATH = path + File.separator + DocumentsEnum.LEDGER.getFileName() + ".pdf";
 
     public DocumentService() {
         identityService = LimaServiceFactory.getService(IdentityService.class);
@@ -115,7 +115,7 @@ public class DocumentService {
 
         balanceReportService = LimaServiceFactory.getService(BalanceReportService.class);
         generalEntryBookReportService = LimaServiceFactory.getService(GeneralEntryBookReportService.class);
-        provisionalEntryBookReportService = LimaServiceFactory.getService(ProvisionalEntryBookReportService.class);
+        entryBookReportService = LimaServiceFactory.getService(ProvisionalEntryBookReportService.class);
 
         reportBuilder = new ReportBuilder();
 
@@ -406,7 +406,7 @@ public class DocumentService {
 //        String filePath = path + File.separator
 //                + DocumentsEnum.VAT.getFileName() + ".pdf";
 //
-//        String path = LimaServiceConfig.getInstance().getReportsDir().getAbsolutePath();
+//        String path = LimaServiceConfig.getInstance().getReportsModelDir().getAbsolutePath();
 //
 //        String filePathDefault = path + File.separator
 //                + DocumentsEnum.VAT.getFileName() + "_default.pdf";
@@ -684,20 +684,20 @@ public class DocumentService {
     //##############     General EntryBook      #############
     public DocumentReport createGeneralEntryBooksDocuments(Date beginDate, Date endDate, String currency) {
 
-        DocumentReport report = generalEntryBookReportService.getEntryBookDocumentReport(beginDate, endDate, currency, BigDecimalToString.getDecimalFormat());
+        DocumentReport report = generalEntryBookReportService.getGeneralEntryBookDocumentReport(beginDate, endDate, currency, BigDecimalToString.getDecimalFormat());
         reportBuilder.generatePDFReport(org.chorem.lima.business.utils.DocumentsEnum.GENERAL_ENTRYBOOK, GENERAL_ENTRY_BOOK_REPORT_PDF_FILE_PATH, Lists.newArrayList(report));
         return report;
     }
 
     public DocumentReport createEntryBooksDocuments(Date beginDate, Date endDate, List<String> entryBookCodes, String currency) {
-        DocumentReport report = provisionalEntryBookReportService.getProvisionalEntryBookDocumentReport(beginDate, endDate, entryBookCodes, currency, BigDecimalToString.getDecimalFormat());
+        DocumentReport report = entryBookReportService.getEntryBookDocumentReport(beginDate, endDate, entryBookCodes, currency, BigDecimalToString.getDecimalFormat());
         reportBuilder.generatePDFReport(org.chorem.lima.business.utils.DocumentsEnum.ENTRYBOOKS, ENTRY_BOOKS_REPORT_PDF_FILE_PATH, Lists.newArrayList(report));
         return report;
     }
 
-//    public DocumentReport createLedgerDocuments(Date beginDate, Date endDate, String currency) {
-//        DocumentReport report = ledgerReportService.getLedgerDocumentReport(beginDate, endDate, currency);
-//        reportBuilder.generatePDFReport(org.chorem.lima.business.utils.DocumentsEnum.LEDGER, LEDGER_REPORT_PDF_FILE_PATH, Lists.newArrayList(report));
-//        return report;
-//    }
+    public DocumentReport createLedgerDocuments(Date beginDate, Date endDate, String currency) {
+        DocumentReport report = ledgerReportService.getLedgerDocumentReport(beginDate, endDate, currency, BigDecimalToString.getDecimalFormat());
+        reportBuilder.generatePDFReport(org.chorem.lima.business.utils.DocumentsEnum.LEDGER, LEDGER_REPORT_PDF_FILE_PATH, Lists.newArrayList(report));
+        return report;
+    }
 }
diff --git a/lima-web/src/main/java/org/chorem/lima/web/action/balance/ReportBuilder.java b/lima-web/src/main/java/org/chorem/lima/web/action/balance/ReportBuilder.java
index ff4238e..6862217 100644
--- a/lima-web/src/main/java/org/chorem/lima/web/action/balance/ReportBuilder.java
+++ b/lima-web/src/main/java/org/chorem/lima/web/action/balance/ReportBuilder.java
@@ -37,11 +37,9 @@ import org.chorem.lima.beans.DocumentReport;
 import org.chorem.lima.business.LimaServiceConfig;
 import org.chorem.lima.business.utils.DocumentsEnum;
 
-import java.io.File;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 /**
  * Created by davidcosse on 02/10/14.
@@ -52,7 +50,7 @@ public class ReportBuilder {
 
     protected JasperReport balanceReport;
     protected JasperReport generalEntryBookReport;
-    protected JasperReport provisionalEntryBookReport;
+    protected JasperReport entryBookReport;
     protected Map<DocumentsEnum, JasperReport> reportsByDocumentType;
 
     public ReportBuilder() {
@@ -60,14 +58,14 @@ public class ReportBuilder {
             LimaServiceConfig config = LimaServiceConfig.getInstance();
 
             // compile phase
-            balanceReport= JasperCompileManager.compileReport(config.getBalanceReportPath());
-            generalEntryBookReport = JasperCompileManager.compileReport(config.getGeneralEntryBookEntryBookMainReportPath());
-            provisionalEntryBookReport = JasperCompileManager.compileReport(config.getProvisionalEntryBookEntryBookMainReportPath());
+            balanceReport= JasperCompileManager.compileReport(config.getBalanceDocumentReportModelPath());
+            generalEntryBookReport = JasperCompileManager.compileReport(config.getGeneralEntryBookDocumentReportModelPath());
+            entryBookReport = JasperCompileManager.compileReport(config.getEntryBookDocumentReportModelPath());
 
             reportsByDocumentType = Maps.newHashMap();
             reportsByDocumentType.put(DocumentsEnum.BALANCE, balanceReport);
             reportsByDocumentType.put(DocumentsEnum.GENERAL_ENTRYBOOK, generalEntryBookReport);
-            reportsByDocumentType.put(DocumentsEnum.ENTRYBOOKS, provisionalEntryBookReport);
+            reportsByDocumentType.put(DocumentsEnum.ENTRYBOOKS, entryBookReport);
         } catch (JRException e) {
             throw new LimaTechnicalException(e);
         }
diff --git a/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java b/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java
index feb90be..451b0ed 100644
--- a/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java
+++ b/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java
@@ -58,7 +58,6 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-import java.util.Properties;
 
 import static org.nuiton.i18n.I18n.t;
 
@@ -81,7 +80,7 @@ public class HttpServerService {
     protected ReportBuilder reportBuilder;
 
     public HttpServerService() {
-        //File reportDir = (File) props.get("REPORTS_DIR");
+        //File reportDir = (File) props.get("REPORTS_MODEL_DIR");
         //path = reportDir.getAbsolutePath();
         port = LimaServiceConfig.getInstance().getHttpPort();
         accountService = LimaServiceFactory.getService(AccountService.class);
@@ -94,7 +93,7 @@ public class HttpServerService {
         if (server == null) {
             try {
                 LimaServiceConfig config = LimaServiceConfig.getInstance();
-                File reportDir = config.getReportsDir();
+                File reportDir = config.getReportsModelDir();
 
                 FileUtil.createDirectoryIfNecessary(reportDir);
 
@@ -223,7 +222,7 @@ public class HttpServerService {
                         IOUtils.write(report, out, Charsets.UTF_8);
                     } else {
                         LimaServiceConfig config = LimaServiceConfig.getInstance();
-                        File reportDir = config.getReportsDir();
+                        File reportDir = config.getReportsModelDir();
                         String path = reportDir.getAbsolutePath();
                         URL doc = new URL("file:" + path + File.separator + model + ".pdf");
                         if (log.isDebugEnabled()) {

-- 
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm@chorem.org>.

    

[Lima-commits] 05/07: refs #769 Mise à jour des rapports

chorem.org scm