[Lima-commits] 07/28: refs #1241 refactoring

30 Nov 2015

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

New commit to branch feature/1241-account-report in repository lima.

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

commit 9afd18d63faa9b966fc50beda3e2573cc7fd47b3
Author: dcosse <cosse@codelutin.com>
Date:   Fri Jul 3 18:24:09 2015 +0200

    refs #1241 refactoring
---
 .../lima/business/ejb/AbstractLimaService.java     |   5 +
 .../ejb/report/AccountReportServiceImpl.java       |  54 ++--
 .../ejb/report/BalanceReportServiceImpl.java       |  73 +++--
 .../report/GeneralEntryBookReportServiceImpl.java  |  25 +-
 .../ejb/report/LedgerReportServiceImpl.java        |  25 +-
 .../ProvisionalEntryBookReportServiceImpl.java     |  25 +-
 .../resources/i18n/lima-business_en_GB.properties  |  32 +-
 .../resources/i18n/lima-business_fr_FR.properties  |  30 +-
 lima-callao/src/main/xmi/lima-callao-model.zargo   | Bin 57764 -> 58818 bytes
 .../jasperreports/account/DocumentReport.jrxml     | 350 ++++++++-------------
 .../balance/BalanceSubAccountsReport.jrxml         |  10 +-
 .../jasperreports/balance/DocumentReport.jrxml     | 165 ++++------
 .../jasperreports/entryBook/DocumentReport.jrxml   | 296 ++++++-----------
 .../resources/i18n/lima-swing_en_GB.properties     |  17 +-
 .../resources/i18n/lima-swing_fr_FR.properties     |  22 +-
 15 files changed, 488 insertions(+), 641 deletions(-)

diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java
index bedb0a5..2cb10ea 100644
--- a/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java
+++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java
@@ -27,6 +27,8 @@ import org.apache.commons.logging.LogFactory;
 import org.chorem.lima.business.LimaInterceptor;
 import org.chorem.lima.entity.LimaCallaoTopiaDaoSupplier;
 
+import java.text.SimpleDateFormat;
+
 /**
  * Abstract code for all ejb services (get context, catch, finally...).
  *
@@ -35,6 +37,9 @@ import org.chorem.lima.entity.LimaCallaoTopiaDaoSupplier;
  */
 public abstract class AbstractLimaService {
 
+    public static SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM/yyyy");
+    public static SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("HH:mm");
+
     /** Logger. */
     protected static final Log log = LogFactory.getLog(AbstractLimaService.class);
 
diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java
index d43dd90..5c4a88a 100644
--- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java
+++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java
@@ -27,6 +27,8 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
+import static org.nuiton.i18n.I18n.t;
+
 /**
  * Created by davidcosse on 26/06/15.
  */
@@ -44,26 +46,22 @@ public class AccountReportServiceImpl extends AbstractLimaService implements Acc
 
     @Override
     public DocumentReport getAccountDocumentReport(String accountId, Date from, Date to, JasperReport accountsEntryJasperReport, DecimalFormat bigDecimalFormat) {
+        DocumentReport documentReport = getDocumentReport(from, to, accountsEntryJasperReport, bigDecimalFormat, identityService);
 
-        DocumentReport documentReport = new DocumentReportImpl();
-        documentReport.setFormatter(bigDecimalFormat);
-
-        Identity identity = identityService.getIdentity();
-        String companyName = identity == null ? "" : identity.getName();
-        documentReport.setCompanyName(companyName);
-
-        // general info about balance report
-        documentReport.setTitle(TITLE);
-        documentReport.setCurrency(bigDecimalFormat.getDecimalFormatSymbols().getCurrencySymbol());
-        documentReport.setFromDate(from);
-        documentReport.setToDate(to);
-        documentReport.setSubReport(accountsEntryJasperReport);
+        documentReport.setColumnAccountTitle(t("lima.config.documentReport.columnAccountTitle"));
+        documentReport.setColumnDateTitle(t("lima.config.documentReport.columnDateTitle"));
+        documentReport.setColumnEntryBookTitle(t("lima.config.documentReport.columnEntryBookTitle"));
+        documentReport.setColumnVoucherTitle(t("lima.config.documentReport.columnVoucherTitle"));
+        documentReport.setColumnDescriptionTitle(t("lima.config.documentReport.columnDescriptionTitle"));
+        documentReport.setColumnLetterTitle(t("lima.config.documentReport.columnLetterTitle"));
+        documentReport.setColumnDebitTitle(t("lima.config.documentReport.columnDebitTitle"));
+        documentReport.setColumnCreditTitle(t("lima.config.documentReport.columnCreditTitle"));
 
         AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountDao();
         Account account = accountTopiaDao.forTopiaIdEquals(accountId).findUniqueOrNull();
 
         if (from != null && to != null && account != null) {
-            String fromAccountLabel = account.getAccountNumber();
+            String selectedAccounts = account.getAccountNumber();
 
             Collection<AccountEntry> accountEntries = new ArrayList<>();
 
@@ -99,14 +97,14 @@ public class AccountReportServiceImpl extends AbstractLimaService implements Acc
             documentReport.addAllAccounts(accountEntries);
 
             if (CollectionUtils.isEmpty(accountEntries)) {
-                fromAccountLabel += ", aucune entrée trouvé sur ce compte";
+                selectedAccounts += ", aucune entrée trouvé sur ce compte";
             } else if (accountEntries.size() == 1){
-                fromAccountLabel += ", et son compte fils";
+                selectedAccounts += ", et son compte fils";
             } else {
-                fromAccountLabel += ", et ses comptes fils";
+                selectedAccounts += ", et ses comptes fils";
             }
 
-            documentReport.setFromAccount(fromAccountLabel);
+            documentReport.setHeaderSelectedAccounts(selectedAccounts);
 
         } else {
             if (log.isWarnEnabled()) {
@@ -116,4 +114,24 @@ public class AccountReportServiceImpl extends AbstractLimaService implements Acc
 
         return documentReport;
     }
+
+    protected static DocumentReport getDocumentReport(Date from, Date to, JasperReport subReport, DecimalFormat bigDecimalFormat, IdentityService identityService) {
+        Date currentDate = new Date();
+        DocumentReport documentReport = new DocumentReportImpl();
+        documentReport.setSubReport(subReport);
+        documentReport.setFormatter(bigDecimalFormat);
+
+        documentReport.setTitleReport(TITLE);
+
+        Identity identity = identityService.getIdentity();
+        String companyName = identity == null ? "" : identity.getName();
+        documentReport.setTitleCompanyName(companyName);
+        documentReport.setTitleCurrentDate(t("lima.config.documentReport.titleCurrentDate", DATE_FORMAT.format(currentDate), TIME_FORMAT.format(currentDate)));
+        documentReport.setTitleFromToDate(t("lima.config.documentReport.titleFromToDate", DATE_FORMAT.format(from), DATE_FORMAT.format(to)));
+
+        documentReport.setHeaderSelectedAccountsLabel(t("lima.config.documentReport.headerSelectedAccountsLabel"));
+        documentReport.setHeaderCurrencyLabel(t("lima.config.documentReport.headerCurrencyLabel"));
+        documentReport.setHeaderCurrency(bigDecimalFormat.getDecimalFormatSymbols().getCurrencySymbol());
+        return documentReport;
+    }
 }
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 f4ecd08..7a24de4 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
@@ -25,13 +25,13 @@ package org.chorem.lima.business.ejb.report;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import net.sf.jasperreports.engine.JasperReport;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.chorem.lima.beans.DocumentReport;
 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;
+import org.chorem.lima.beans.DocumentReport;
 import org.chorem.lima.beans.ReportsDatas;
 import org.chorem.lima.business.api.AccountService;
 import org.chorem.lima.business.api.FinancialPeriodService;
@@ -42,7 +42,6 @@ import org.chorem.lima.business.utils.AccountComparator;
 import org.chorem.lima.entity.Account;
 import org.chorem.lima.entity.AccountTopiaDao;
 import org.chorem.lima.entity.EntryTopiaDao;
-import org.chorem.lima.entity.Identity;
 
 import javax.ejb.EJB;
 import javax.ejb.Remote;
@@ -57,6 +56,8 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
+import static org.nuiton.i18n.I18n.t;
+
 /**
  * Created by davidcosse on 04/11/14.
  */
@@ -93,19 +94,14 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal
     @Override
     public DocumentReport getBalanceDocumentReport(Date from, Date to, String selectedAccounts, DecimalFormat bigDecimalFormat, JasperReport mainAccountsJasperReport, JasperReport subAccountsJasperReport) {
 
-        DocumentReport documentReport = new DocumentReportImpl();
-        documentReport.setFormatter(bigDecimalFormat);
+        DocumentReport documentReport = AccountReportServiceImpl.getDocumentReport(from, to, mainAccountsJasperReport, bigDecimalFormat, identityService);
 
-        Identity identity = identityService.getIdentity();
-        String companyName = identity == null ? "" : identity.getName();
-        documentReport.setCompanyName(companyName);
-
-        // general info about balance report
-        documentReport.setTitle(TITLE);
-        documentReport.setCurrency(bigDecimalFormat.getDecimalFormatSymbols().getCurrencySymbol());
-        documentReport.setFromDate(from);
-        documentReport.setToDate(to);
-        documentReport.setSubReport(mainAccountsJasperReport);
+        documentReport.setColumnAccountTitle(t("lima.config.documentReport.columnAccountTitle"));
+        documentReport.setColumnDescriptionTitle(t("lima.config.documentReport.columnDescriptionTitle"));
+        documentReport.setColumnTotalForPeriodTitle(t("lima.config.documentReport.columnTotalForPeriodTitle"));
+        documentReport.setColumnBalanceForPeriodTitle(t("lima.config.documentReport.columnBalanceForPeriodTitle"));
+        documentReport.setColumnDebitTitle(t("lima.config.documentReport.columnDebitTitle"));
+        documentReport.setColumnCreditTitle(t("lima.config.documentReport.columnCreditTitle"));
 
         BalanceTrial balanceTrial = new BalanceTrialImpl();
         balanceTrial.setReportsDatas(new ArrayList<ReportsDatas>());
@@ -116,43 +112,36 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal
         List<Account> accounts;
 
         //Remove Spaces
-        // TODO DCossé 12/06/14 selectedAccounts is allways NULL
         selectedAccounts = StringUtils.deleteWhitespace(selectedAccounts);
-        //if no filter account
-        if (selectedAccounts == null || selectedAccounts.equals("")) {
+
+        // find all if none specified
+        if (StringUtils.isBlank(selectedAccounts)) {
             accounts = accountTopiaDao.findAll();
-        }
-        //build list account from selectedAccounts
-        else {
+        } else {
             accounts = accountService.stringToListAccounts(selectedAccounts);
         }
 
         Collection<BalanceAccount> returnedAccounts = new ArrayList<>();
-        if (accounts != null && !accounts.isEmpty()) {
+        if (CollectionUtils.isNotEmpty(accounts)) {
             Collections.sort(accounts, new AccountComparator());
 
-            Account fromAccount = accounts.get(0);
-            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();
-            documentReport.setFromAccount(fromAccountLabel + " à " + toAccountLabel);
+            setDocumentReportHeaderSelectedAccounts(documentReport, accounts);
 
             HashMap<String, BalanceAccountImpl> accountsByClasses = new HashMap<>();
             for (Account account : accounts) {
                 String accountClass = String.valueOf(account.getAccountNumber().charAt(0));
 
-                BalanceAccountImpl classAccount = accountsByClasses.get(accountClass);
-                if (classAccount == null) {
-                    classAccount = new BalanceAccountImpl();
-                    classAccount.setFormatter(bigDecimalFormat);
-                    classAccount.setSubReport(subAccountsJasperReport);
-                    classAccount.setSubAccounts(new ArrayList<BalanceAccount>());
-                    classAccount.setAccountNumber("");
-                    accountsByClasses.put(accountClass, classAccount);
-                    returnedAccounts.add(classAccount);
+                BalanceAccountImpl accountSubAccounts = accountsByClasses.get(accountClass);
+                if (accountSubAccounts == null) {
+                    accountSubAccounts = new BalanceAccountImpl();
+                    accountSubAccounts.setFormatter(bigDecimalFormat);
+                    accountSubAccounts.setSubReport(subAccountsJasperReport);
+                    accountSubAccounts.setSubAccounts(new ArrayList<BalanceAccount>());
+                    accountsByClasses.put(accountClass, accountSubAccounts);
+                    returnedAccounts.add(accountSubAccounts);
                 }
                 BalanceAccount subClassAccount = bindAccountToBalanceReportAccount(accountClass, account, from, to, bigDecimalFormat);
-                classAccount.addSubAccount(subClassAccount);
+                accountSubAccounts.addSubAccount(subClassAccount);
             }
         }
 
@@ -161,6 +150,14 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal
         return documentReport;
     }
 
+    protected void setDocumentReportHeaderSelectedAccounts(DocumentReport documentReport, List<Account> accounts) {
+        Account fromAccount = accounts.get(0);
+        Account toAccount = accounts.get(accounts.size()-1);
+        String fromAccountText = StringUtils.isNotBlank(fromAccount.getLabel()) ? fromAccount.getLabel() + " (" + fromAccount.getAccountNumber() + ")" : fromAccount.getAccountNumber();
+        String toAccountText = StringUtils.isNotBlank(toAccount.getLabel()) ? toAccount.getLabel() + " (" + toAccount.getAccountNumber() + ")" : toAccount.getAccountNumber();
+        documentReport.setHeaderSelectedAccounts(t("lima.config.documentReport.headerSelectedAccounts", fromAccountText, toAccountText));
+    }
+
     /**
      * Calculate all credit, debit and solde amounts for the balance
      * <p/>
@@ -176,6 +173,8 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal
         accountNumber = StringUtils.rightPad(accountNumber, ACCOUNT_NUMBER_SIZE - accountNumber.length(), '0');
         balanceAccount.setAccountNumber(accountNumber);
         balanceAccount.setLabel(account.getLabel());
+        balanceAccount.setSubTotalForLabel(t("lima.config.documentReport.subTotalFor"));
+        balanceAccount.setTotalForLabel(t("lima.config.documentReport.totalFor"));
 
         EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao();
 
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 9615820..ec77f90 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
@@ -31,7 +31,6 @@ import org.apache.commons.logging.Log;
 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.GeneralEntryBook;
 import org.chorem.lima.beans.GeneralEntryBookEntry;
 import org.chorem.lima.beans.GeneralEntryBookEntryImpl;
@@ -44,7 +43,6 @@ import org.chorem.lima.business.api.report.GeneralEntryBookReportService;
 import org.chorem.lima.business.ejb.AbstractLimaService;
 import org.chorem.lima.entity.ClosedPeriodicEntryBook;
 import org.chorem.lima.entity.FinancialPeriod;
-import org.chorem.lima.entity.Identity;
 
 import javax.ejb.EJB;
 import javax.ejb.Remote;
@@ -57,6 +55,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import static org.nuiton.i18n.I18n.t;
+
 
 /**
  * Created by davidcosse on 17/11/14.
@@ -96,21 +96,16 @@ public class GeneralEntryBookReportServiceImpl extends AbstractLimaService imple
     @Override
     public DocumentReport getGeneralEntryBookDocumentReport(Date beginDate, Date endDate, DecimalFormat bigDecimalFormat, JasperReport generalEntryBooksJasperReport, JasperReport entriesJasperReport) {
 
-        DocumentReport documentReport = new DocumentReportImpl();
-        try {
+        DocumentReport documentReport = AccountReportServiceImpl.getDocumentReport(beginDate, endDate, generalEntryBooksJasperReport, bigDecimalFormat, identityService);
 
+        documentReport.setColumnEntryBookTitle(t("lima.config.documentReport.columnEntryBookTitle"));
+        documentReport.setColumnDescriptionTitle(t("lima.config.documentReport.columnDescriptionTitle"));
+        documentReport.setColumnTotalForPeriodTitle(t("lima.config.documentReport.columnTotalForPeriodTitle"));
+        documentReport.setColumnDebitTitle(t("lima.config.documentReport.columnDebitTitle"));
+        documentReport.setColumnCreditTitle(t("lima.config.documentReport.columnCreditTitle"));
+
+        try {
             if (beginDate != null && endDate != null) {
-                Identity identity = identityService.getIdentity();
-                String companyName = identity == null ? "" : identity.getName();
-                documentReport.setCompanyName(companyName);
-
-                // general infos about balance report
-                documentReport.setTitle(TITLE);
-                documentReport.setCurrency(bigDecimalFormat.getDecimalFormatSymbols().getCurrencySymbol());
-                documentReport.setFromDate(beginDate);
-                documentReport.setToDate(endDate);
-                documentReport.setSubReport(generalEntryBooksJasperReport);
-                documentReport.setFormatter(bigDecimalFormat);
 
                 List<FinancialPeriod> financialPeriods = financialPeriodService.getFinancialPeriods(beginDate, endDate);
 
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 56376df..50c5b17 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
@@ -26,7 +26,6 @@ import net.sf.jasperreports.engine.JasperReport;
 import org.chorem.lima.LimaTechnicalException;
 import org.chorem.lima.beans.BalanceTrial;
 import org.chorem.lima.beans.DocumentReport;
-import org.chorem.lima.beans.DocumentReportImpl;
 import org.chorem.lima.beans.GeneralLedger;
 import org.chorem.lima.beans.GeneralLedgerEntry;
 import org.chorem.lima.beans.GeneralLedgerEntryImpl;
@@ -40,7 +39,6 @@ import org.chorem.lima.business.utils.EntryComparator;
 import org.chorem.lima.entity.Account;
 import org.chorem.lima.entity.Entry;
 import org.chorem.lima.entity.EntryBook;
-import org.chorem.lima.entity.Identity;
 
 import javax.ejb.EJB;
 import javax.ejb.Remote;
@@ -73,23 +71,20 @@ public class LedgerReportServiceImpl extends AbstractLimaService implements Ledg
     @Override
     public DocumentReport getLedgerDocumentReport(Date beginDate, Date endDate, DecimalFormat decimalFormat, JasperReport generalLedgersJasperReport, JasperReport entriesJasperReport) {
 
-        DocumentReport result = new DocumentReportImpl();
-        result.setFormatter(decimalFormat);
-        result.setCurrency(decimalFormat.getDecimalFormatSymbols().getCurrencySymbol());
-        result.setFromDate(beginDate);
-        result.setToDate(endDate);
-        result.setSubReport(generalLedgersJasperReport);
-        result.setTitle(TITLE);
+        DocumentReport documentReport = AccountReportServiceImpl.getDocumentReport(beginDate, endDate, generalLedgersJasperReport, decimalFormat, identityService);
 
-        Identity identity = identityService.getIdentity();
-        String companyName = identity == null ? "" : identity.getName();
-        result.setCompanyName(companyName);
+        documentReport.setColumnDateTitle(t("lima.config.documentReport.setColumnDateTitle"));
+        documentReport.setColumnEntryBookTitle(t("lima.config.documentReport.setColumnEntryBookTitle"));
+        documentReport.setColumnVoucherTitle(t("lima.config.documentReport.columnVoucherTitle"));
+        documentReport.setColumnDebitTitle(t("lima.config.documentReport.columnDebitTitle"));
+        documentReport.setColumnCreditTitle(t("lima.config.documentReport.columnCreditTitle"));
+        documentReport.setColumnBalanceTitle(t("lima.config.documentReport.columnBalanceTitle"));
 
         if (beginDate != null && endDate != null) {
             try {
 
                 BalanceTrial balanceTrial = reportService.generateLedger(beginDate, endDate, null, true);
-                result.setFromAccount(balanceTrial.getFromToAccountNumber());
+                documentReport.setHeaderSelectedAccounts(balanceTrial.getFromToAccountNumber());
                 if (balanceTrial.getReportsDatas() != null) {
                     for (ReportsDatas reportsDatas : balanceTrial.getReportsDatas()) {
 
@@ -109,7 +104,7 @@ public class LedgerReportServiceImpl extends AbstractLimaService implements Ledg
                                 generalLedger.setSolde(amountDebit.subtract(amountCredit));
                                 generalLedger.setSubReport(entriesJasperReport);
                                 generalLedger.setNbEntries(balanceTrial.getReportsDatas().size());
-                                result.addGeneralLedgers(generalLedger);
+                                documentReport.addGeneralLedgers(generalLedger);
 
                                 Collections.sort(entries, new EntryComparator());
 
@@ -150,6 +145,6 @@ public class LedgerReportServiceImpl extends AbstractLimaService implements Ledg
                 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/ProvisionalEntryBookReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/ProvisionalEntryBookReportServiceImpl.java
index 0340918..41d03a5 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
@@ -27,7 +27,6 @@ import org.apache.commons.logging.Log;
 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.EntryBookImpl;
 import org.chorem.lima.beans.FinancialPeriodImpl;
 import org.chorem.lima.beans.Transaction;
@@ -42,7 +41,6 @@ import org.chorem.lima.entity.Account;
 import org.chorem.lima.entity.Entry;
 import org.chorem.lima.entity.EntryBook;
 import org.chorem.lima.entity.FinancialPeriod;
-import org.chorem.lima.entity.Identity;
 
 import javax.ejb.EJB;
 import javax.ejb.Remote;
@@ -53,6 +51,8 @@ import java.text.DecimalFormat;
 import java.util.Date;
 import java.util.List;
 
+import static org.nuiton.i18n.I18n.t;
+
 /**
  * Created by davidcosse on 19/11/14.
  */
@@ -89,22 +89,17 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo
     @Override
     public DocumentReport getEntryBookDocumentReport(Date beginDate, Date endDate, List<String> entryBookCodes, DecimalFormat bigDecimalFormat, JasperReport entryBooksJasperReport, JasperReport financialPeriodsJasperReport, JasperReport transactionsJasperReport) {
 
-        DocumentReport documentReport = new DocumentReportImpl();
+        DocumentReport documentReport = AccountReportServiceImpl.getDocumentReport(beginDate, endDate, entryBooksJasperReport, bigDecimalFormat, identityService);
+
+        documentReport.setColumnEntryBookTitle(t("lima.config.documentReport.columnEntryBookTitle"));
+        documentReport.setColumnDescriptionTitle(t("lima.config.documentReport.columnDescriptionTitle"));
+        documentReport.setColumnTotalForPeriodTitle(t("lima.config.documentReport.columnTotalForPeriodTitle"));
+        documentReport.setColumnDebitTitle(t("lima.config.documentReport.columnDebitTitle"));
+        documentReport.setColumnCreditTitle(t("lima.config.documentReport.columnCreditTitle"));
+
         try {
 
             if (beginDate != null && endDate != null) {
-                Identity identity = identityService.getIdentity();
-                String companyName = identity == null ? "" : identity.getName();
-                documentReport.setCompanyName(companyName);
-
-                // general infos about balance report
-                documentReport.setTitle(TITLE);
-                documentReport.setCurrency(bigDecimalFormat.getDecimalFormatSymbols().getCurrencySymbol());
-                documentReport.setFromDate(beginDate);
-                documentReport.setToDate(endDate);
-                documentReport.setFormatter(bigDecimalFormat);
-
-                documentReport.setSubReport(entryBooksJasperReport);
 
                 BigDecimal documentReportDebit = BigDecimal.ZERO;
                 BigDecimal documentReportCredit = BigDecimal.ZERO;
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 36aa5b4..f6f147a 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
@@ -56,9 +56,26 @@ lima.config.currency.label=
 lima.config.data.dir.description=Data directory of Lima
 lima.config.decimalSeparator.label=
 lima.config.documentReport.account.documentReportModelPath.description=
+lima.config.documentReport.account.noAccount=Any account present
+lima.config.documentReport.account.noAccountTitle=Any account present
+lima.config.documentReport.assets=Assets
+lima.config.documentReport.balance=Balance
 lima.config.documentReport.balance.balanceAccountReportModelPath.description=
 lima.config.documentReport.balance.balanceSubAccountReportModelPath.description=
 lima.config.documentReport.balance.documentReportModelPath.description=
+lima.config.documentReport.balanceSheet=Balance
+lima.config.documentReport.columnAccountTitle=Account
+lima.config.documentReport.columnBalanceForPeriodTitle=Balance
+lima.config.documentReport.columnBalanceTitle=Balance
+lima.config.documentReport.columnCreditTitle=Credit
+lima.config.documentReport.columnDateTitle=Date
+lima.config.documentReport.columnDebitTitle=Debit
+lima.config.documentReport.columnDescriptionTitle=Label
+lima.config.documentReport.columnEntryBookTitle=Entry book
+lima.config.documentReport.columnLetterTitle=Letter
+lima.config.documentReport.columnTotalForPeriodTitle=Total for period
+lima.config.documentReport.columnVoucherTitle=Voucher
+lima.config.documentReport.currentAsset=Current asset
 lima.config.documentReport.entrybook.documentReportModelPath.description=
 lima.config.documentReport.entrybook.entryBookModelPath.description=
 lima.config.documentReport.entrybook.financialPeriodModelPath.description=
@@ -69,6 +86,17 @@ lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.descriptio
 lima.config.documentReport.generalLedger.documentReportModelPath.description=
 lima.config.documentReport.generalLedger.generalLedgerEntryModelPath.description=
 lima.config.documentReport.generalLedger.generalLedgerModelPath.description=
+lima.config.documentReport.headerCurrencyLabel=Currency\:
+lima.config.documentReport.headerSelectedAccounts=%s to %s
+lima.config.documentReport.headerSelectedAccountsLabel=Accounts\:
+lima.config.documentReport.investments=Investments
+lima.config.documentReport.liabilities=Liabilities
+lima.config.documentReport.setColumnDateTitle=
+lima.config.documentReport.setColumnEntryBookTitle=
+lima.config.documentReport.subTotalFor=Sub total for\:
+lima.config.documentReport.titleCurrentDate=Printed on %s at %s
+lima.config.documentReport.titleFromToDate=From %s to %s
+lima.config.documentReport.totalFor=total for\:
 lima.config.host.address.description=
 lima.config.httpport.description=HTTP Port
 lima.config.reports.dir.description=
@@ -88,9 +116,7 @@ lima.host.http.address.description=
 lima.host.http.port.description=
 lima.importexport.import.alreadyExistFinancialStatement=Same financial statement exists
 lima.lettering.accountRegularization=Regulatory account
-lima.reports.account.noAccount=Any account present
-lima.reports.account.noAccountTitle=Any account present
-lima.reports.accounts=Accounts
+lima.report.fromDateToDate=
 lima.table.credit=Credit
 lima.table.date=Date
 lima.table.debit=Debit
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 10c9d44..d8d52a9 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
@@ -56,10 +56,26 @@ lima.config.data.dir.description=Répertoire des données de Lima
 lima.config.decimalSeparator.label=
 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.assets=avoirs
+lima.config.documentReport.balance=Solde
 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.balanceSheet=Balance
 lima.config.documentReport.bigDecimalFormat=formattage des montants
+lima.config.documentReport.columnAccountTitle=Compte
+lima.config.documentReport.columnBalanceForPeriodTitle=Solde période
+lima.config.documentReport.columnBalanceTitle=Solde
+lima.config.documentReport.columnCreditTitle=Crédit
+lima.config.documentReport.columnDateTitle=Date
+lima.config.documentReport.columnDebitTitle=Débit
+lima.config.documentReport.columnDescriptionTitle=Intitulé
+lima.config.documentReport.columnEntryBookTitle=Journal
+lima.config.documentReport.columnLetterTitle=Lettre
+lima.config.documentReport.columnTotalForPeriodTitle=Total période
+lima.config.documentReport.columnVoucherTitle=Pièce comptable
+lima.config.documentReport.currentAsset=Actif à court terme
+lima.config.documentReport.dir.description=Dossier des rapports
 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'
@@ -72,9 +88,19 @@ lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.descriptio
 lima.config.documentReport.generalLedger.documentReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'DocumentReport'
 lima.config.documentReport.generalLedger.generalLedgerEntryModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'generalLedgerEntry'
 lima.config.documentReport.generalLedger.generalLedgerModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'generalLedger'
+lima.config.documentReport.headerCurrencyLabel=Devise\:
+lima.config.documentReport.headerSelectedAccounts=%s à %s
+lima.config.documentReport.headerSelectedAccountsLabel=Comptes\:
+lima.config.documentReport.investments=investissements
+lima.config.documentReport.liabilities=passif
+lima.config.documentReport.setColumnDateTitle=
+lima.config.documentReport.setColumnEntryBookTitle=
+lima.config.documentReport.subTotalFor=Sous total pour\:
+lima.config.documentReport.titleCurrentDate=Édition du %s à %s
+lima.config.documentReport.titleFromToDate=Du %s au %s
+lima.config.documentReport.totalFor=total pour\:
 lima.config.host.address.description=Adresse du serveur LIMA
 lima.config.host.http.port.description=Port HTTP
-lima.config.reports.dir.description=Dossier des rapports
 lima.config.reportvatpdfurl.description=Chemin du raport
 lima.config.rulesnationality.description=Règles nationales
 lima.config.scale.description=Précision
@@ -90,8 +116,8 @@ lima.host.http.address.description=
 lima.host.http.port.description=Port du serveur web de Lima
 lima.importexport.import.alreadyExistFinancialStatement=Transaction financière exitante
 lima.lettering.accountRegularization=Compte de régulation
+lima.report.fromDateToDate=
 lima.reports.account.noAccount=Aucun compte présent
-lima.reports.accounts=Comptes
 lima.table.credit=Credit
 lima.table.date=Date
 lima.table.debit=Débit
diff --git a/lima-callao/src/main/xmi/lima-callao-model.zargo b/lima-callao/src/main/xmi/lima-callao-model.zargo
index 659fb03..5e7eea2 100644
Binary files a/lima-callao/src/main/xmi/lima-callao-model.zargo and b/lima-callao/src/main/xmi/lima-callao-model.zargo differ
diff --git a/lima-report/src/main/resources/jasperreports/account/DocumentReport.jrxml b/lima-report/src/main/resources/jasperreports/account/DocumentReport.jrxml
index f753198..71d897f 100644
--- a/lima-report/src/main/resources/jasperreports/account/DocumentReport.jrxml
+++ b/lima-report/src/main/resources/jasperreports/account/DocumentReport.jrxml
@@ -4,24 +4,42 @@
 <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"/>
-	<style name="Default" isDefault="true" fontName="DejaVu Sans" fontSize="8"/>
-	<style name="Bold" fontName="DejaVu Sans" fontSize="8"/>
-	<style name="Oblique" fontName="DejaVu Sans Mono" fontSize="8"/>
-	<style name="Column header" forecolor="#D0B48E" backcolor="#F2EBDF" fontName="DejaVu Sans" fontSize="12" isBold="true"/>
-	<queryString>
+    <style name="Default" isDefault="true" scaleImage="Clip" fontName="DejaVu Sans" fontSize="8"/>
+    <style name="TableHeader" mode="Opaque" forecolor="#D0B48E" backcolor="#FDCA97" fontName="DejaVu Sans"/>
+    <style name="HeaderColumn" forecolor="#804000" fontName="DejaVu Sans" fontSize="8" isBold="true">
+        <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>
+    </style>
+    <style name="Oblique" fontName="DejaVu Sans Mono" fontSize="8" isItalic="true"/>
+    <queryString>
 		<![CDATA[]]>
 	</queryString>
-	<field name="accounts" class="java.util.List"/>
-	<field name="companyName" class="java.lang.String"/>
-	<field name="currency" class="java.lang.String"/>
-	<field name="formatter" class="java.text.DecimalFormat"/>
-	<field name="fromAccount" class="java.lang.String"/>
-	<field name="fromDate" class="java.util.Date"/>
-	<field name="soldeCredit" class="java.math.BigDecimal"/>
-	<field name="soldeDebit" class="java.math.BigDecimal"/>
-	<field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/>
-	<field name="title" class="java.lang.String"/>
-	<field name="toDate" class="java.util.Date"/>
+    <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/>
+    <field name="accounts" class="java.util.List"/>
+
+    <field name="titleCompanyName" class="java.lang.String"/>
+    <field name="titleCurrentDate" class="java.lang.String"/>
+    <field name="titleFromToDate" class="java.lang.String"/>
+    <field name="titleReport" class="java.lang.String"/>
+
+    <field name="headerCurrency" class="java.lang.String"/>
+    <field name="headerCurrencyLabel" class="java.lang.String"/>
+    <field name="headerSelectedAccounts" class="java.lang.String"/>
+    <field name="headerSelectedAccountsLabel" class="java.lang.String"/>
+
+    <field name="columnAccountTitle" class="java.lang.String"/>
+    <field name="columnCreditTitle" class="java.lang.String"/>
+    <field name="columnDateTitle" class="java.lang.String"/>
+    <field name="columnDebitTitle" class="java.lang.String"/>
+    <field name="columnDescriptionTitle"  class="java.lang.String"/>
+    <field name="columnEntryBookTitle" class="java.lang.String"/>
+    <field name="columnLetterTitle"  class="java.lang.String"/>
+    <field name="columnVoucherTitle"  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>
@@ -29,241 +47,129 @@
 	<background>
 		<band splitType="Stretch"/>
 	</background>
-	<title>
-		<band height="41" splitType="Stretch">
-			<frame>
-				<reportElement style="Default" mode="Opaque" x="0" y="1" width="578" height="40" forecolor="#D0B48E" backcolor="#F2EBDF" uuid="1aba49d4-0acc-4925-8731-13c1cc1a90f4"/>
-				<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 isBlankWhenNull="true">
-					<reportElement style="Default" x="0" y="0" width="578" height="20" forecolor="#736343" uuid="9ee9d5f1-6e74-4526-83a4-3b386f2733a8"/>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="14" isBold="true"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{title}]]></textFieldExpression>
-				</textField>
-				<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
-					<reportElement style="Default" x="444" y="0" width="134" height="20" forecolor="#736343" uuid="a60d5d40-69ac-4c50-a33a-67c26cce05f3"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8" isBold="false"/>
-						<paragraph rightIndent="5"/>
-					</textElement>
-					<textFieldExpression><![CDATA["Edition du: " + new SimpleDateFormat("dd/MM/yyyy à HH:mm").format(new java.util.Date())]]></textFieldExpression>
-				</textField>
-				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-					<reportElement style="Default" x="210" y="20" width="80" height="20" forecolor="#736343" uuid="37d0a47c-0197-4f09-8358-823b39a2a42a">
-						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font isBold="true"/>
-					</textElement>
-					<textFieldExpression><![CDATA["Du " + new SimpleDateFormat("dd/MM/yyyy").format($F{fromDate})]]></textFieldExpression>
-				</textField>
-				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-					<reportElement style="Default" x="290" y="20" width="80" height="20" forecolor="#736343" uuid="5fc4df4a-5930-4ccd-b450-cf7aac6be57b">
-						<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>
-					<textElement verticalAlignment="Middle">
-						<font isBold="true"/>
-					</textElement>
-					<textFieldExpression><![CDATA[" au " + new SimpleDateFormat("dd/MM/yyyy").format($F{toDate})]]></textFieldExpression>
-				</textField>
-				<textField isBlankWhenNull="true">
-					<reportElement style="Default" x="0" y="0" width="190" height="20" forecolor="#736343" uuid="5aa3ceb9-e407-42da-bdc3-097875bdd5f5">
-						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<textElement verticalAlignment="Middle" rotation="None">
-						<font size="10" isBold="true"/>
-						<paragraph leftIndent="5"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{companyName}]]></textFieldExpression>
-				</textField>
-			</frame>
-		</band>
-	</title>
-	<pageHeader>
-		<band height="25" splitType="Stretch">
-			<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"/>
-				</reportElement>
-				<textElement textAlignment="Right" verticalAlignment="Middle">
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA["Devise: " + $F{currency}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement style="Oblique" x="0" y="9" width="444" height="16" uuid="5b52edd4-5983-4e67-8b3f-9e89cfe43818">
-					<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>
+    <title>
+        <band height="41" splitType="Stretch">
+            <frame>
+                <reportElement style="Default" mode="Opaque" x="0" y="1" width="578" height="40" forecolor="#D0B48E" backcolor="#F2EBDF" uuid="1aba49d4-0acc-4925-8731-13c1cc1a90f4"/>
+                <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 isBlankWhenNull="true">
+                    <reportElement style="Default" x="0" y="0" width="578" height="20" forecolor="#736343" uuid="9ee9d5f1-6e74-4526-83a4-3b386f2733a8"/>
+                    <textElement textAlignment="Center" verticalAlignment="Middle">
+                        <font size="14" isBold="true"/>
+                    </textElement>
+                    <textFieldExpression><![CDATA[$F{titleReport}]]></textFieldExpression>
+                </textField>
+                <textField isBlankWhenNull="true">
+                    <reportElement style="Default" x="444" y="0" width="134" height="20" forecolor="#736343" uuid="a60d5d40-69ac-4c50-a33a-67c26cce05f3"/>
+                    <textElement textAlignment="Right" verticalAlignment="Middle">
+                        <font size="8" isBold="false"/>
+                        <paragraph rightIndent="5"/>
+                    </textElement>
+                    <textFieldExpression><![CDATA[$F{titleCurrentDate}]]></textFieldExpression>
+                </textField>
+                <textField isBlankWhenNull="true">
+                    <reportElement style="Default" x="210" y="20" width="160" height="20" forecolor="#736343" uuid="37d0a47c-0197-4f09-8358-823b39a2a42a"/>
+                    <textElement textAlignment="Center" verticalAlignment="Middle">
+                        <font isBold="true"/>
+                    </textElement>
+                    <textFieldExpression><![CDATA[$F{titleFromToDate}]]></textFieldExpression>
+                </textField>
+                <textField isBlankWhenNull="true">
+                    <reportElement style="Default" x="0" y="0" width="190" height="20" forecolor="#736343" uuid="5aa3ceb9-e407-42da-bdc3-097875bdd5f5"/>
+                    <textElement verticalAlignment="Middle" rotation="None">
+                        <font size="10" isBold="true"/>
+                        <paragraph leftIndent="5"/>
+                    </textElement>
+                    <textFieldExpression><![CDATA[$F{titleCompanyName}]]></textFieldExpression>
+                </textField>
+            </frame>
+        </band>
+    </title>
+    <pageHeader>
+        <band height="16" splitType="Stretch">
+            <textField isBlankWhenNull="true">
+                <reportElement style="Oblique" x="0" y="0" width="444" height="16" uuid="9db3917c-44e3-46d2-b95a-6463e5eff328"/>
+                <textElement textAlignment="Left" verticalAlignment="Middle">
+                    <font size="8" isItalic="true"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$F{headerSelectedAccountsLabel} + $F{headerSelectedAccounts}]]></textFieldExpression>
+            </textField>
+            <textField isBlankWhenNull="true">
+                <reportElement style="Oblique" x="444" y="0" width="134" height="16" forecolor="#000000" uuid="abcb18cb-7d0e-4eb8-a9f5-aca4baffa9ae"/>
+                <textElement textAlignment="Right" verticalAlignment="Middle">
+                    <font size="8"/>
+                </textElement>
+                <textFieldExpression><![CDATA[$F{headerCurrencyLabel} + $F{headerCurrency}]]></textFieldExpression>
+            </textField>
+        </band>
+    </pageHeader>
 	<columnHeader>
 		<band height="20">
 			<frame>
-				<reportElement style="Column header" mode="Opaque" x="0" y="0" width="578" height="20" backcolor="#FDCA97" uuid="6c2c2b44-eebf-41d3-8b56-47d4a20a4b24">
+				<reportElement style="TableHeader" x="0" y="0" width="578" height="20" uuid="6c2c2b44-eebf-41d3-8b56-47d4a20a4b24">
 					<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/>
 				</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>
-				<staticText>
-					<reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="84" 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"/>
-					</box>
+				<textField>
+					<reportElement style="HeaderColumn" x="0" y="0" width="84" height="20" uuid="63da28a1-a793-4bf5-81d4-6a4d6fc1e4df"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[N° Compte]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="84" y="0" width="62" 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"/>
-						<leftPen lineWidth="0.6"/>
-						<bottomPen lineWidth="0.6"/>
-						<rightPen lineWidth="0.6"/>
-					</box>
+					<textFieldExpression><![CDATA[$F{columnAccountTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="84" y="0" width="62" height="20" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Date]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="146" y="0" width="36" 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"/>
-						<leftPen lineWidth="0.6"/>
-						<bottomPen lineWidth="0.6"/>
-						<rightPen lineWidth="0.6"/>
-					</box>
+					<textFieldExpression><![CDATA[$F{columnDateTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="146" y="0" width="36" height="20"  uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Journal]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="182" y="0" width="108" 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"/>
-						<leftPen lineWidth="0.6"/>
-						<bottomPen lineWidth="0.6"/>
-						<rightPen lineWidth="0.6"/>
-					</box>
+					<textFieldExpression><![CDATA[$F{columnEntryBookTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="182" y="0" width="108" height="20" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Pièce comptable]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="290" y="0" width="108" height="20" 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>
+					<textFieldExpression><![CDATA[$F{columnVoucherTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="290" y="0" width="108" height="20" uuid="1bc6ab8b-d490-46a2-9a10-8f4c4f219889"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Description]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="398" y="0" width="36" height="20" forecolor="#804000" uuid="f0c1ae81-733f-42ba-844d-082b51c95040">
-						<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"/>
-						<leftPen lineWidth="0.6"/>
-						<bottomPen lineWidth="0.6"/>
-						<rightPen lineWidth="0.6"/>
-					</box>
+					<textFieldExpression><![CDATA[$F{columnDescriptionTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="398" y="0" width="36" height="20" uuid="f0c1ae81-733f-42ba-844d-082b51c95040"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Lettre]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="434" 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"/>
-					</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>
+					<textFieldExpression><![CDATA[$F{columnLetterTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="434" y="0" width="72" height="20" uuid="b6ea8597-d637-47d1-9a39-7c99101594e9"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Débit]]></text>
-				</staticText>
-				<staticText>
-					<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"/>
-					</reportElement>
-					<box>
-						<topPen lineColor="#804000"/>
-						<leftPen lineColor="#804000"/>
-						<bottomPen lineColor="#804000"/>
-						<rightPen lineWidth="0.6" lineColor="#804000"/>
-					</box>
+                    <textFieldExpression><![CDATA[$F{columnDebitTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="506" y="0" width="72" height="20" uuid="c4f9f592-7052-4b66-abc2-f04cc5f3972c"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Crédit]]></text>
-				</staticText>
+                    <textFieldExpression><![CDATA[$F{columnCreditTitle}]]></textFieldExpression>
+				</textField>
 			</frame>
 		</band>
 	</columnHeader>
diff --git a/lima-report/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml b/lima-report/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml
index 1e970a7..6214da6 100644
--- a/lima-report/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml
+++ b/lima-report/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3  -->
-<!-- 2015-03-11T12:07:20 -->
+<!-- Created with Jaspersoft Studio version 6.1.0.final using JasperReports Library version 6.1.0  -->
+<!-- 2015-07-02T18:03:10 -->
 <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"/>
@@ -18,6 +18,8 @@
 	<field name="soldeCredit" class="java.math.BigDecimal"/>
 	<field name="formatter" class="java.text.DecimalFormat"/>
 	<field name="mainAccountLabel" class="java.lang.String"/>
+	<field name="totalForLabel" class="java.lang.String"/>
+	<field name="subTotalForLabel" class="java.lang.String"/>
 	<variable name="amountDebitSolde" class="java.math.BigDecimal" calculation="Sum">
 		<variableExpression><![CDATA[$F{amountDebit}]]></variableExpression>
 		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
@@ -158,7 +160,7 @@
 						<font size="8" isBold="true"/>
 						<paragraph leftIndent="80"/>
 					</textElement>
-					<textFieldExpression><![CDATA["Sous total pour " + $F{mainAccountLabel}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{subTotalForLabel} + $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">
@@ -285,7 +287,7 @@
 						<font size="8" isBold="true"/>
 						<paragraph leftIndent="80"/>
 					</textElement>
-					<textFieldExpression><![CDATA["Total pour " + $F{mainAccountLabel}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{totalForLabel} + $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">
diff --git a/lima-report/src/main/resources/jasperreports/balance/DocumentReport.jrxml b/lima-report/src/main/resources/jasperreports/balance/DocumentReport.jrxml
index 4cef030..16754a9 100644
--- a/lima-report/src/main/resources/jasperreports/balance/DocumentReport.jrxml
+++ b/lima-report/src/main/resources/jasperreports/balance/DocumentReport.jrxml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.1.0.final using JasperReports Library version 6.1.0  -->
-<!-- 2015-07-02T15:06:04 -->
+<!-- 2015-07-02T17:50:13 -->
 <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"/>
 	<style name="Default" isDefault="true" scaleImage="Clip" fontName="DejaVu Sans" fontSize="8"/>
 	<style name="TableHeader" mode="Opaque" forecolor="#D0B48E" backcolor="#FDCA97" fontName="DejaVu Sans"/>
-	<style name="HeaderColomn" forecolor="#804000" fontName="DejaVu Sans" fontSize="8" isBold="true">
+	<style name="HeaderColumn" forecolor="#804000" fontName="DejaVu Sans" fontSize="8" isBold="true">
 		<box>
 			<topPen lineWidth="0.6" lineColor="#804000"/>
 			<leftPen lineWidth="0.6" lineColor="#804000"/>
@@ -18,15 +18,25 @@
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
-	<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="mainAccounts" class="java.util.List"/>
 	<field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/>
-	<field name="companyName" class="java.lang.String"/>
-	<field name="title" class="java.lang.String"/>
+	<field name="mainAccounts" class="java.util.List"/>
+
+	<field name="titleCompanyName" class="java.lang.String"/>
+	<field name="titleCurrentDate" class="java.lang.String"/>
+	<field name="titleFromToDate" class="java.lang.String"/>
+	<field name="titleReport" class="java.lang.String"/>
+
+	<field name="headerCurrency" class="java.lang.String"/>
+	<field name="headerCurrencyLabel" class="java.lang.String"/>
+	<field name="headerSelectedAccounts" class="java.lang.String"/>
+	<field name="headerSelectedAccountsLabel" class="java.lang.String"/>
+	
+	<field name="columnAccountTitle" class="java.lang.String"/>
+	<field name="columnBalanceForPeriodTitle" class="java.lang.String"/>
+	<field name="columnCreditTitle" class="java.lang.String"/>
+	<field name="columnDebitTitle" class="java.lang.String"/>
+	<field name="columnDescriptionTitle" class="java.lang.String"/>
+	<field name="columnTotalForPeriodTitle" class="java.lang.String"/>
 	<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>
@@ -49,46 +59,30 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="14" isBold="true"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{title}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{titleReport}]]></textFieldExpression>
 				</textField>
-				<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
+				<textField isBlankWhenNull="true">
 					<reportElement style="Default" x="444" y="0" width="134" height="20" forecolor="#736343" uuid="a60d5d40-69ac-4c50-a33a-67c26cce05f3"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8" isBold="false"/>
 						<paragraph rightIndent="5"/>
 					</textElement>
-					<textFieldExpression><![CDATA["Edition du: " + new SimpleDateFormat("dd/MM/yyyy à HH:mm").format(new java.util.Date())]]></textFieldExpression>
-				</textField>
-				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-					<reportElement style="Default" x="210" y="20" width="80" height="20" forecolor="#736343" uuid="37d0a47c-0197-4f09-8358-823b39a2a42a">
-						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font isBold="true"/>
-					</textElement>
-					<textFieldExpression><![CDATA["Du " + new SimpleDateFormat("dd/MM/yyyy").format($F{fromDate})]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{titleCurrentDate}]]></textFieldExpression>
 				</textField>
-				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-					<reportElement style="Default" x="290" y="20" width="80" height="20" forecolor="#736343" uuid="5fc4df4a-5930-4ccd-b450-cf7aac6be57b">
-						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<textElement verticalAlignment="Middle">
+				<textField isBlankWhenNull="true">
+					<reportElement style="Default" x="210" y="20" width="160" height="20" forecolor="#736343" uuid="37d0a47c-0197-4f09-8358-823b39a2a42a"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
-					<textFieldExpression><![CDATA[" au " + new SimpleDateFormat("dd/MM/yyyy").format($F{toDate})]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{titleFromToDate}]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement style="Default" x="0" y="0" width="190" height="20" forecolor="#736343" uuid="5aa3ceb9-e407-42da-bdc3-097875bdd5f5">
-						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
+					<reportElement style="Default" x="0" y="0" width="190" height="20" forecolor="#736343" uuid="5aa3ceb9-e407-42da-bdc3-097875bdd5f5"/>
 					<textElement verticalAlignment="Middle" rotation="None">
 						<font size="10" isBold="true"/>
 						<paragraph leftIndent="5"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{companyName}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{titleCompanyName}]]></textFieldExpression>
 				</textField>
 			</frame>
 		</band>
@@ -96,25 +90,18 @@
 	<pageHeader>
 		<band height="16" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement style="Oblique" x="0" y="0" 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>
+				<reportElement style="Oblique" x="0" y="0" width="444" height="16" uuid="9db3917c-44e3-46d2-b95a-6463e5eff328"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="8" isItalic="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA["Comptes: " + $F{fromAccount}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{headerSelectedAccountsLabel} + $F{headerSelectedAccounts}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement style="Oblique" x="444" y="0" 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"/>
-				</reportElement>
+				<reportElement style="Oblique" x="444" y="0" width="134" height="16" forecolor="#000000" uuid="abcb18cb-7d0e-4eb8-a9f5-aca4baffa9ae"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA["Devise: " + $F{currency}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{headerCurrencyLabel} + $F{headerCurrency}]]></textFieldExpression>
 			</textField>
 		</band>
 	</pageHeader>
@@ -124,84 +111,62 @@
 				<reportElement style="TableHeader" x="0" y="0" width="578" height="20" uuid="6c2c2b44-eebf-41d3-8b56-47d4a20a4b24">
 					<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/>
 				</reportElement>
-				<staticText>
-					<reportElement style="HeaderColomn" x="0" y="0" width="40" height="20" uuid="63da28a1-a793-4bf5-81d4-6a4d6fc1e4df">
-						<property name="local_mesure_unitwidth" value="pixel"/>
-					</reportElement>
+				<textField>
+					<reportElement style="HeaderColumn" x="0" y="0" width="40" height="20" uuid="63da28a1-a793-4bf5-81d4-6a4d6fc1e4df"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Compte]]></text>
-				</staticText>
-				<staticText>
-					<reportElement style="HeaderColomn" x="40" y="0" width="250" height="20" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb">
-						<property name="local_mesure_unitheight" value="pixel"/>
-					</reportElement>
+					<textFieldExpression><![CDATA[$F{columnAccountTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="40" y="0" width="250" height="20" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Intitulé]]></text>
-				</staticText>
-				<staticText>
-					<reportElement style="HeaderColomn" x="290" y="0" width="144" height="10" uuid="caadc464-ad77-4b53-b5cb-11e29c0a18ce">
-						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
+					<textFieldExpression><![CDATA[$F{columnDescriptionTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="290" y="0" width="144" height="10" uuid="caadc464-ad77-4b53-b5cb-11e29c0a18ce"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Total Période]]></text>
-				</staticText>
-				<staticText>
-					<reportElement style="HeaderColomn" x="290" y="10" width="72" height="10" uuid="e6928f86-fe5c-4c14-996c-19728e6abf44">
-						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
+					<textFieldExpression><![CDATA[$F{columnTotalForPeriodTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="290" y="10" width="72" height="10" uuid="e6928f86-fe5c-4c14-996c-19728e6abf44"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Débit]]></text>
-				</staticText>
-				<staticText>
-					<reportElement style="HeaderColomn" x="362" y="10" width="72" height="10" uuid="13dd0f7b-3331-4ca4-8ef8-5468fb65fc3e">
-						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
+					<textFieldExpression><![CDATA[$F{columnDebitTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="362" y="10" width="72" height="10" uuid="13dd0f7b-3331-4ca4-8ef8-5468fb65fc3e"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Crédit]]></text>
-				</staticText>
-				<staticText>
-					<reportElement style="HeaderColomn" x="434" y="0" width="144" height="10" uuid="1bc6ab8b-d490-46a2-9a10-8f4c4f219889">
-						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
+					<textFieldExpression><![CDATA[$F{columnCreditTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="434" y="0" width="144" height="10" uuid="1bc6ab8b-d490-46a2-9a10-8f4c4f219889"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Solde Période]]></text>
-				</staticText>
-				<staticText>
-					<reportElement style="HeaderColomn" x="434" y="10" width="72" height="10" uuid="b6ea8597-d637-47d1-9a39-7c99101594e9">
-						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
+					<textFieldExpression><![CDATA[$F{columnBalanceForPeriodTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="434" y="10" width="72" height="10" uuid="b6ea8597-d637-47d1-9a39-7c99101594e9"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Débit]]></text>
-				</staticText>
-				<staticText>
-					<reportElement style="HeaderColomn" x="506" y="10" width="72" height="10" uuid="c4f9f592-7052-4b66-abc2-f04cc5f3972c">
-						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
+					<textFieldExpression><![CDATA[$F{columnDebitTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="506" y="10" width="72" height="10" uuid="c4f9f592-7052-4b66-abc2-f04cc5f3972c"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Crédit]]></text>
-				</staticText>
+					<textFieldExpression><![CDATA[$F{columnCreditTitle}]]></textFieldExpression>
+				</textField>
 			</frame>
 		</band>
 	</columnHeader>
diff --git a/lima-report/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml b/lima-report/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml
index 4b649cc..4e76999 100644
--- a/lima-report/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml
+++ b/lima-report/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml
@@ -1,26 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3  -->
-<!-- 2015-03-11T17:42:23 -->
+<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3  -->
+<!-- 2015-03-11T17:42:23 -->
 <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"/>
-	<style name="Default" isDefault="true" fontName="DejaVu Sans" fontSize="8"/>
-	<style name="Bold" fontName="DejaVu Sans" fontSize="8"/>
-	<style name="Oblique" fontName="DejaVu Sans Mono" fontSize="8"/>
-	<style name="Column header" forecolor="#D0B48E" backcolor="#F2EBDF" fontName="DejaVu Sans" fontSize="12" isBold="true"/>
+	<style name="Default" isDefault="true" scaleImage="Clip" fontName="DejaVu Sans" fontSize="8"/>
+	<style name="Oblique" fontName="DejaVu Sans Mono" fontSize="8" isItalic="true"/>
+	<style name="TableHeader" mode="Opaque" forecolor="#D0B48E" backcolor="#FDCA97" fontName="DejaVu Sans"/>
+	<style name="HeaderColumn" forecolor="#804000" fontName="DejaVu Sans" fontSize="8" isBold="true">
+		<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>
+	</style>
+	<style name="FooterHeader" mode="Opaque" forecolor="#D0B48E" backcolor="#FDCA97" fontName="DejaVu Sans"/>
+	<style name="FooterColumn" forecolor="#D0B48E" backcolor="#F2EBDF" fontName="DejaVu Sans" fontSize="8" isBold="true">
+		<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>
+	</style>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
-	<field name="fromDate" class="java.util.Date"/>
-	<field name="toDate" class="java.util.Date"/>
-	<field name="currency" class="java.lang.String"/>
-	<field name="entryBooks" class="java.util.List"/>
+	<field name="formatter" class="java.text.DecimalFormat"/>
 	<field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/>
-	<field name="companyName" class="java.lang.String"/>
-	<field name="title" class="java.lang.String"/>
+	<field name="entryBooks" class="java.util.List"/>
+
+	<field name="titleCompanyName" class="java.lang.String"/>
+	<field name="titleCurrentDate" class="java.lang.String"/>
+	<field name="titleFromToDate" class="java.lang.String"/>
+	<field name="titleReport" class="java.lang.String"/>
+
+	<field name="headerCurrency" class="java.lang.String"/>
+	<field name="headerCurrencyLabel" class="java.lang.String"/>
+	<field name="headerSelectedAccounts" class="java.lang.String"/>
+	<field name="headerSelectedAccountsLabel" class="java.lang.String"/>
+
+	<field name="columnAccountTitle" class="java.lang.String"/>
+	<field name="columnCreditTitle" class="java.lang.String"/>
+	<field name="columnDateTitle" class="java.lang.String"/>
+	<field name="columnDebitTitle" class="java.lang.String"/>
+	<field name="columnDescriptionTitle" class="java.lang.String"/>
+	<field name="columnTotalForPeriodTitle" class="java.lang.String"/>
+	<field name="columnVoucherTitle"  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="entryBooks" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource">
 		<variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{entryBooks})]]></variableExpression>
 	</variable>
@@ -43,196 +74,100 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="14" isBold="true"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{title}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{titleReport}]]></textFieldExpression>
 				</textField>
-				<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
+				<textField isBlankWhenNull="true">
 					<reportElement style="Default" x="444" y="0" width="134" height="20" forecolor="#736343" uuid="a60d5d40-69ac-4c50-a33a-67c26cce05f3"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8" isBold="false"/>
 						<paragraph rightIndent="5"/>
 					</textElement>
-					<textFieldExpression><![CDATA["Edition du: " + new SimpleDateFormat("dd/MM/yyyy à HH:mm").format(new java.util.Date())]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{titleCurrentDate}]]></textFieldExpression>
 				</textField>
-				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-					<reportElement style="Default" x="210" y="20" width="80" height="20" forecolor="#736343" uuid="37d0a47c-0197-4f09-8358-823b39a2a42a">
-						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font isBold="true"/>
-					</textElement>
-					<textFieldExpression><![CDATA["Du " + new SimpleDateFormat("dd/MM/yyyy").format($F{fromDate})]]></textFieldExpression>
-				</textField>
-				<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-					<reportElement style="Default" x="290" y="20" width="80" height="20" forecolor="#736343" uuid="5fc4df4a-5930-4ccd-b450-cf7aac6be57b">
-						<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>
-					<textElement verticalAlignment="Middle">
+				<textField isBlankWhenNull="true">
+					<reportElement style="Default" x="210" y="20" width="160" height="20" forecolor="#736343" uuid="37d0a47c-0197-4f09-8358-823b39a2a42a"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font isBold="true"/>
 					</textElement>
-					<textFieldExpression><![CDATA[" au " + new SimpleDateFormat("dd/MM/yyyy").format($F{toDate})]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{titleFromToDate}]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement style="Default" x="0" y="0" width="190" height="20" forecolor="#736343" uuid="5aa3ceb9-e407-42da-bdc3-097875bdd5f5">
-						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
+					<reportElement style="Default" x="0" y="0" width="190" height="20" forecolor="#736343" uuid="5aa3ceb9-e407-42da-bdc3-097875bdd5f5"/>
 					<textElement verticalAlignment="Middle" rotation="None">
 						<font size="10" isBold="true"/>
 						<paragraph leftIndent="5"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{companyName}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{titleCompanyName}]]></textFieldExpression>
 				</textField>
 			</frame>
 		</band>
 	</title>
 	<pageHeader>
-		<band height="25" splitType="Stretch">
+		<band height="16" splitType="Stretch">
 			<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"/>
-				</reportElement>
+				<reportElement style="Oblique" x="444" y="0" width="134" height="16" forecolor="#000000" uuid="abcb18cb-7d0e-4eb8-a9f5-aca4baffa9ae"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression><![CDATA["Devise: " + $F{currency}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{headerCurrencyLabel} + $F{headerCurrency}]]></textFieldExpression>
 			</textField>
 		</band>
 	</pageHeader>
 	<columnHeader>
 		<band height="20">
 			<frame>
-				<reportElement style="Column header" mode="Opaque" x="0" y="0" width="578" height="20" backcolor="#FDCA97" uuid="6c2c2b44-eebf-41d3-8b56-47d4a20a4b24">
+				<reportElement style="TableHeader" x="0" y="0" width="578" height="20" uuid="6c2c2b44-eebf-41d3-8b56-47d4a20a4b24">
 					<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/>
 				</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>
-				<staticText>
-					<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"/>
-					</box>
+				<textField>
+					<reportElement style="HeaderColumn" x="0" y="0" width="60" height="20" uuid="63da28a1-a793-4bf5-81d4-6a4d6fc1e4df"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Date]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="60" y="0" width="100" 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"/>
-						<leftPen lineWidth="0.6"/>
-						<bottomPen lineWidth="0.6"/>
-						<rightPen lineWidth="0.6"/>
-					</box>
+					<textFieldExpression><![CDATA[$F{columnDateTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="60" y="0" width="100" height="20" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[N° Compte]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="160" 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"/>
-						<leftPen lineWidth="0.6"/>
-						<bottomPen lineWidth="0.6"/>
-						<rightPen lineWidth="0.6"/>
-					</box>
+					<textFieldExpression><![CDATA[$F{columnAccountTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="160" y="0" width="40" height="20" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Pièce]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="200" y="0" width="234" 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"/>
-						<leftPen lineWidth="0.6"/>
-						<bottomPen lineWidth="0.6"/>
-						<rightPen lineWidth="0.6"/>
-					</box>
+					<textFieldExpression><![CDATA[$F{columnVoucherTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="200" y="0" width="234" height="20" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Intitulé]]></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>
+					<textFieldExpression><![CDATA[$F{columnDescriptionTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="434" y="0" width="144" height="10" uuid="1bc6ab8b-d490-46a2-9a10-8f4c4f219889"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Total Période]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="434" y="10" width="72" height="10" forecolor="#804000" uuid="b6ea8597-d637-47d1-9a39-7c99101594e9">
-						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" 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>
+					<textFieldExpression><![CDATA[$F{columnTotalForPeriodTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="434" y="10" width="72" height="10" uuid="b6ea8597-d637-47d1-9a39-7c99101594e9"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Débit]]></text>
-				</staticText>
-				<staticText>
-					<reportElement x="506" y="10" width="72" height="10" forecolor="#804000" uuid="c4f9f592-7052-4b66-abc2-f04cc5f3972c">
-						<property name="local_mesure_unitheight" value="pixel"/>
-						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					</reportElement>
-					<box>
-						<topPen lineColor="#804000"/>
-						<leftPen lineColor="#804000"/>
-						<bottomPen lineColor="#804000"/>
-						<rightPen lineWidth="0.6" lineColor="#804000"/>
-					</box>
+					<textFieldExpression><![CDATA[$F{columnDebitTitle}]]></textFieldExpression>
+				</textField>
+				<textField>
+					<reportElement style="HeaderColumn" x="506" y="10" width="72" height="10" uuid="c4f9f592-7052-4b66-abc2-f04cc5f3972c"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<text><![CDATA[Crédit]]></text>
-				</staticText>
+					<textFieldExpression><![CDATA[$F{columnCreditTitle}]]></textFieldExpression>
+				</textField>
 			</frame>
 		</band>
 	</columnHeader>
@@ -271,34 +206,9 @@
 			<property name="local_mesure_unitheight" value="pixel"/>
 			<property name="com.jaspersoft.studio.unit.height" value="px"/>
 			<frame>
-				<reportElement style="Default" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="578" height="20" isRemoveLineWhenBlank="true" forecolor="#D0B48E" backcolor="#F2EBDF" uuid="ffa6f4ff-14e5-4501-acbe-0c4e832d9c2a">
-					<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.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>
+				<reportElement style="FooterHeader" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="578" height="20" isRemoveLineWhenBlank="true" forecolor="#D0B48E" backcolor="#F2EBDF" uuid="ffa6f4ff-14e5-4501-acbe-0c4e832d9c2a"/>
 				<textField isBlankWhenNull="true">
-					<reportElement x="0" y="0" width="434" height="20" forecolor="#736343" uuid="f818f119-5580-46fd-acbd-086f7d222dde">
-						<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"/>
-						<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>
+					<reportElement style="FooterColumn" x="0" y="0" width="434" height="20" forecolor="#736343" uuid="f818f119-5580-46fd-acbd-086f7d222dde"/>
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="12" isBold="true" isItalic="true"/>
 						<paragraph lineSpacingSize="0.0" leftIndent="40"/>
@@ -306,16 +216,7 @@
 					<textFieldExpression><![CDATA["Total pour les journaux sélectionnés"]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement style="Default" x="434" y="0" width="72" height="20" forecolor="#736343" uuid="8382935a-23c9-48a0-88f3-aa486cccd575">
-						<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>
+					<reportElement style="FooterColumn" x="434" y="0" width="72" height="20" forecolor="#736343" uuid="8382935a-23c9-48a0-88f3-aa486cccd575"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="DejaVu Sans Mono" size="8" isBold="true"/>
 						<paragraph lineSpacingSize="0.0" rightIndent="2"/>
@@ -323,16 +224,7 @@
 					<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="20" forecolor="#736343" uuid="c7fa4a13-051c-40c0-b663-58b0401402b4">
-						<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>
+					<reportElement style="FooterColumn" x="506" y="0" width="72" height="20" forecolor="#736343" uuid="c7fa4a13-051c-40c0-b663-58b0401402b4"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="DejaVu Sans Mono" size="8" isBold="true"/>
 						<paragraph lineSpacingSize="0.0" rightIndent="2"/>
@@ -341,20 +233,14 @@
 				</textField>
 			</frame>
 			<textField isBlankWhenNull="false">
-				<reportElement x="0" y="20" width="288" height="10" uuid="fd62df4f-6500-4fea-93be-fe749f161de6">
-					<property name="local_mesure_unity" value="pixel"/>
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-				</reportElement>
+				<reportElement x="0" y="20" width="288" height="10" uuid="fd62df4f-6500-4fea-93be-fe749f161de6"/>
 				<textElement textAlignment="Right">
 					<paragraph lineSpacingSize="0.0"/>
 				</textElement>
 				<textFieldExpression><![CDATA["Page " + $V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report">
-				<reportElement x="288" y="20" width="287" height="10" uuid="e5018134-bbde-4b3e-a83d-7abf00c56c09">
-					<property name="local_mesure_unity" value="pixel"/>
-					<property name="com.jaspersoft.studio.unit.y" value="px"/>
-				</reportElement>
+				<reportElement x="288" y="20" width="287" height="10" uuid="e5018134-bbde-4b3e-a83d-7abf00c56c09"/>
 				<textElement textAlignment="Left">
 					<paragraph lineSpacingSize="0.0"/>
 				</textElement>
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 a6a4484..4c6de4d 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
@@ -488,7 +488,22 @@ lima.quit=Exit
 lima.refresh=Refresh
 lima.refresh.shortcut=Refresh (F5)
 lima.remove=Remove
-lima.remove.shortcut=Delete (Del)
+lima.remove.shortcut=
+lima.report.accounts=Accounts\:
+lima.report.assets=Assets
+lima.report.balance=Balance
+lima.report.balanceForPeriod=Balance
+lima.report.balanceSheet=Balance
+lima.report.credit=Credit
+lima.report.currency=Currency\:
+lima.report.currentAsset=Current asset
+lima.report.dedit=Debit
+lima.report.fromDateToDate=From %s to %s
+lima.report.generatingDate=Printed on %s
+lima.report.investments=Investments
+lima.report.label=Label
+lima.report.liabilities=Liabilities
+lima.report.totalForPeriod=Period total
 lima.retainedEarnings.wait=
 lima.search=Search
 lima.structure=Structure
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 d10862e..6440893 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
@@ -494,10 +494,24 @@ lima.preferences=Préférences
 lima.quit=Quitter
 lima.refresh=Actualiser
 lima.refresh.shortcut=Actualiser (F5)
-lima.remove=Supprimer
-lima.remove.shortcut=Supprimer (Suppr)
-lima.retainedEarnings.wait=Report à nouveaux...
-lima.search=Rechercher
+lima.remove.shortcut=
+lima.report.account=Compte
+lima.report.accounts=Comptes\:
+lima.report.assets=avoirs
+lima.report.balance=Solde
+lima.report.balanceForPeriod=Solde période
+lima.report.balanceSheet=Balance
+lima.report.credit=Crédit
+lima.report.currency=Devise\:
+lima.report.currentAsset=Actif à court terme
+lima.report.dedit=Débit
+lima.report.fromDateToDate=Du %s au %s
+lima.report.generatingDate=Édition du %s
+lima.report.investments=investissements
+lima.report.label=Intitulé
+lima.report.liabilities=passif
+lima.report.totalForPeriod=Total période
+lima.retainedEarnings.wait=
 lima.structure=Structure
 lima.table.account=Compte
 lima.table.balance=Solde

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

    

[Lima-commits] 07/28: refs #1241 refactoring

chorem.org scm