branch feature/1241-account-report updated (8238eb1 -> 36b2f8b)
This is an automated email from the git hooks/post-receive script. New change to branch feature/1241-account-report in repository lima. See http://git.chorem.org/lima.git from 8238eb1 refs #1241 factorisation du code source Jasper, utilisation de style new 0a807d2 refs #1241 correction sur nom de police new 87a14e5 refs #1241 refactoring new 36b2f8b refs #1241 refactoring général sur les rapports, renommage variable, utilisation de style dans les rapports The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 36b2f8b33e4751dedf4d96663f42fe7ceaa1c5a7 Author: dcosse <cosse@codelutin.com> Date: Tue Jul 7 16:41:55 2015 +0200 refs #1241 refactoring général sur les rapports, renommage variable, utilisation de style dans les rapports commit 87a14e5cc7a65ca411dcd9ab3a3e3714a99cad8a Author: dcosse <cosse@codelutin.com> Date: Fri Jul 3 18:24:09 2015 +0200 refs #1241 refactoring commit 0a807d298a196a0d0e428c4bd957d744da42c79d Author: dcosse <cosse@codelutin.com> Date: Thu Jul 2 15:08:14 2015 +0200 refs #1241 correction sur nom de police Summary of changes: .../chorem/lima/business/LimaBusinessConfig.java | 11 + .../lima/business/ejb/AbstractLimaService.java | 5 + .../ejb/report/AccountReportServiceImpl.java | 61 +-- .../ejb/report/BalanceReportServiceImpl.java | 141 +++---- .../report/GeneralEntryBookReportServiceImpl.java | 41 +- .../ejb/report/LedgerReportServiceImpl.java | 40 +- .../ProvisionalEntryBookReportServiceImpl.java | 59 ++- .../resources/i18n/lima-business_en_GB.properties | 41 +- .../resources/i18n/lima-business_fr_FR.properties | 39 +- .../org/chorem/lima/beans/BalanceAccountImpl.java | 8 +- lima-callao/src/main/xmi/lima-callao-model.zargo | Bin 57764 -> 59242 bytes .../jasperreports/account/AccountEntry.jrxml | 8 +- .../jasperreports/account/DocumentReport.jrxml | 350 +++++++---------- .../balance/BalanceReportAccountReport.jrxml | 18 +- .../balance/BalanceSubAccountsReport.jrxml | 58 +-- .../jasperreports/balance/DocumentReport.jrxml | 165 ++++---- .../jasperreports/entryBook/DocumentReport.jrxml | 316 +++++----------- .../jasperreports/entryBook/EntryBookReport.jrxml | 76 +--- .../entryBook/FinancialPeriodReport.jrxml | 187 ++------- .../entryBook/TransactionReport.jrxml | 193 +++------- .../generalEntryBook/DocumentReport.jrxml | 418 ++++++++------------- .../generalEntryBook/EntryBookPeriodReport.jrxml | 48 +-- .../GeneralEntryBookEntryReport.jrxml | 11 +- .../generalLedger/DocumentReport.jrxml | 346 +++++++---------- .../generalLedger/GeneralLedgerEntryReport.jrxml | 204 +++------- .../generalLedger/GeneralLedgerReport.jrxml | 101 ++--- .../resources/i18n/lima-swing_en_GB.properties | 17 +- .../resources/i18n/lima-swing_fr_FR.properties | 22 +- 28 files changed, 1165 insertions(+), 1819 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 0a807d298a196a0d0e428c4bd957d744da42c79d Author: dcosse <cosse@codelutin.com> Date: Thu Jul 2 15:08:14 2015 +0200 refs #1241 correction sur nom de police --- .../src/main/resources/jasperreports/balance/DocumentReport.jrxml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lima-report/src/main/resources/jasperreports/balance/DocumentReport.jrxml b/lima-report/src/main/resources/jasperreports/balance/DocumentReport.jrxml index a4bbb30..4cef030 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-01T15:11:39 --> +<!-- 2015-07-02T15:06:04 --> <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="DejaVuSans-Bold" fontSize="8" isBold="true"> + <style name="HeaderColomn" forecolor="#804000" fontName="DejaVu Sans" fontSize="8" isBold="true"> <box> <topPen lineWidth="0.6" lineColor="#804000"/> <leftPen lineWidth="0.6" lineColor="#804000"/> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 87a14e5cc7a65ca411dcd9ab3a3e3714a99cad8a 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 1bfb522..21e2ea1 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 @@ -482,7 +482,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 54a9304..2705ed8 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 @@ -488,10 +488,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>.
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 36b2f8b33e4751dedf4d96663f42fe7ceaa1c5a7 Author: dcosse <cosse@codelutin.com> Date: Tue Jul 7 16:41:55 2015 +0200 refs #1241 refactoring général sur les rapports, renommage variable, utilisation de style dans les rapports --- .../chorem/lima/business/LimaBusinessConfig.java | 11 + .../ejb/report/AccountReportServiceImpl.java | 11 +- .../ejb/report/BalanceReportServiceImpl.java | 80 ++-- .../report/GeneralEntryBookReportServiceImpl.java | 20 +- .../ejb/report/LedgerReportServiceImpl.java | 17 +- .../ProvisionalEntryBookReportServiceImpl.java | 44 +-- .../resources/i18n/lima-business_en_GB.properties | 13 +- .../resources/i18n/lima-business_fr_FR.properties | 13 +- .../org/chorem/lima/beans/BalanceAccountImpl.java | 8 +- lima-callao/src/main/xmi/lima-callao-model.zargo | Bin 58818 -> 59242 bytes .../jasperreports/account/AccountEntry.jrxml | 8 +- .../balance/BalanceReportAccountReport.jrxml | 18 +- .../balance/BalanceSubAccountsReport.jrxml | 48 +-- .../jasperreports/entryBook/DocumentReport.jrxml | 42 ++- .../jasperreports/entryBook/EntryBookReport.jrxml | 76 +--- .../entryBook/FinancialPeriodReport.jrxml | 187 ++------- .../entryBook/TransactionReport.jrxml | 193 +++------- .../generalEntryBook/DocumentReport.jrxml | 418 ++++++++------------- .../generalEntryBook/EntryBookPeriodReport.jrxml | 48 +-- .../GeneralEntryBookEntryReport.jrxml | 11 +- .../generalLedger/DocumentReport.jrxml | 346 +++++++---------- .../generalLedger/GeneralLedgerEntryReport.jrxml | 204 +++------- .../generalLedger/GeneralLedgerReport.jrxml | 101 ++--- 23 files changed, 708 insertions(+), 1209 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java b/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java index 5b01b0f..c7beb4f 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java +++ b/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java @@ -245,6 +245,16 @@ public class LimaBusinessConfig { saveConfig(); } + public String getDateFormat() { + return config.getOption(BusinessConfigOption.DATE_FORMAT.key); + } + + public void setDateFormat(String locale) { + config.setOption(BusinessConfigOption.DATE_FORMAT.key, locale); + saveConfig(); + } + + public char getDecimalSeparator() { char decimalSeparator = config.getOption(BusinessConfigOption.DECIMAL_SEPARATOR.key).charAt(0); return decimalSeparator; @@ -338,6 +348,7 @@ public class LimaBusinessConfig { SCALE("lima.data.bigDecimal.scale", t("lima.config.scale.label"), n("lima.config.scale.description"), "2", String.class, false, false), CURRENCY("lima.config.currency", t("lima.config.currency.label"), n("lima.config.currency.description"), "false", Boolean.class, false, false), + DATE_FORMAT("lima.config.dateFormat", t("lima.config.dateFormat.label"), n("lima.config.dateFormat.description"), "DD/MM/YYYY", Boolean.class, false, false), DECIMAL_SEPARATOR("lima.data.bigDecimal.decimalSeparator", t("lima.config.decimalSeparator.label"), "", ",", Character.class, false, false), THOUSAND_SEPARATOR("lima.thousandSeparator", t("lima.config.thousandSeparator.label"), n("lima.config.thousandSeparator.description"), " ", Character.class, false, false); 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 5c4a88a..6616e08 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 @@ -7,6 +7,7 @@ import org.chorem.lima.beans.AccountEntryImpl; import org.chorem.lima.beans.DocumentReport; import org.chorem.lima.beans.DocumentReportImpl; import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.IdentityService; import org.chorem.lima.business.api.ReportService; import org.chorem.lima.business.api.report.AccountReportService; @@ -37,8 +38,6 @@ import static org.nuiton.i18n.I18n.t; @TransactionAttribute public class AccountReportServiceImpl extends AbstractLimaService implements AccountReportService { - protected static final String TITLE = "COMPTE"; - @EJB protected IdentityService identityService; @EJB @@ -46,7 +45,8 @@ 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); + String reportName = t("lima.config.documentReport.accountReport.title"); + DocumentReport documentReport = getDocumentReport(reportName, from, to, accountsEntryJasperReport, bigDecimalFormat, identityService); documentReport.setColumnAccountTitle(t("lima.config.documentReport.columnAccountTitle")); documentReport.setColumnDateTitle(t("lima.config.documentReport.columnDateTitle")); @@ -90,6 +90,7 @@ public class AccountReportServiceImpl extends AbstractLimaService implements Acc accountEntry.setDebit(entry.isDebit() ? entry.getAmount() : BigDecimal.ZERO); accountEntry.setCredit(entry.isDebit() ? BigDecimal.ZERO : entry.getAmount()); accountEntry.setFormatter(bigDecimalFormat); + accountEntry.setDateFormat(LimaBusinessConfig.getInstance().getDateFormat()); accountEntries.add(accountEntry); } } @@ -115,13 +116,13 @@ public class AccountReportServiceImpl extends AbstractLimaService implements Acc return documentReport; } - protected static DocumentReport getDocumentReport(Date from, Date to, JasperReport subReport, DecimalFormat bigDecimalFormat, IdentityService identityService) { + protected static DocumentReport getDocumentReport(String reportName, 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); + documentReport.setTitleReport(reportName); Identity identity = identityService.getIdentity(); String companyName = identity == null ? "" : identity.getName(); 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 7a24de4..7992e2f 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 @@ -77,31 +77,31 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal protected static final Integer ACCOUNT_NUMBER_SIZE = 6; - protected static final String TITLE = "BALANCE"; - protected static final Predicate<BalanceAccount> HAS_NO_ENTRY = new Predicate<BalanceAccount>() { @Override public boolean apply(BalanceAccount subClasses) { boolean result = BigDecimal.ZERO.equals(subClasses.getAmountDebit()) && BigDecimal.ZERO.equals(subClasses.getAmountCredit()) && - BigDecimal.ZERO.equals(subClasses.getSoldeDebit()) && - BigDecimal.ZERO.equals(subClasses.getSoldeCredit()); + BigDecimal.ZERO.equals(subClasses.getDebitBalance()) && + BigDecimal.ZERO.equals(subClasses.getCreditBalance()); return result; } }; @Override public DocumentReport getBalanceDocumentReport(Date from, Date to, String selectedAccounts, DecimalFormat bigDecimalFormat, JasperReport mainAccountsJasperReport, JasperReport subAccountsJasperReport) { - - DocumentReport documentReport = AccountReportServiceImpl.getDocumentReport(from, to, mainAccountsJasperReport, bigDecimalFormat, identityService); + String reportName = t("lima.config.documentReport.balanceReport.title"); + DocumentReport documentReport = AccountReportServiceImpl.getDocumentReport(reportName, from, to, mainAccountsJasperReport, bigDecimalFormat, identityService); 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")); + documentReport.setColumnDateTitle(t("lima.config.documentReport.columnDateTitle")); + documentReport.setColumnDebitTitle(t("lima.config.documentReport.columnDebitTitle")); + documentReport.setColumnDescriptionTitle(t("lima.config.documentReport.columnDescriptionTitle")); + documentReport.setColumnTotalForPeriodTitle(t("lima.config.documentReport.columnTotalForPeriodTitle")); + documentReport.setColumnVoucherTitle(t("lima.config.documentReport.columnVoucherTitle")); BalanceTrial balanceTrial = new BalanceTrialImpl(); balanceTrial.setReportsDatas(new ArrayList<ReportsDatas>()); @@ -140,8 +140,10 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal accountsByClasses.put(accountClass, accountSubAccounts); returnedAccounts.add(accountSubAccounts); } - BalanceAccount subClassAccount = bindAccountToBalanceReportAccount(accountClass, account, from, to, bigDecimalFormat); - accountSubAccounts.addSubAccount(subClassAccount); + BalanceAccount subClassAccount = computeSubAccountBalance(accountClass, account, from, to, bigDecimalFormat); + if (subClassAccount != null) { + accountSubAccounts.addSubAccount(subClassAccount); + } } } @@ -164,23 +166,13 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal * Get all entries if true * @throws org.nuiton.topia.persistence.TopiaException */ - protected BalanceAccount bindAccountToBalanceReportAccount(String mainAccountLabel, Account account, Date beginDate, Date endDate, DecimalFormat bigDecimalFormat) { - BalanceAccount balanceAccount = new BalanceAccountImpl(); - balanceAccount.setMainAccountLabel(mainAccountLabel); - balanceAccount.setFormatter(bigDecimalFormat); - - String accountNumber = account.getAccountNumber(); - accountNumber = StringUtils.rightPad(accountNumber, ACCOUNT_NUMBER_SIZE - accountNumber.length(), '0'); - balanceAccount.setAccountNumber(accountNumber); - balanceAccount.setLabel(account.getLabel()); - balanceAccount.setSubTotalForLabel(t("lima.config.documentReport.subTotalFor")); - balanceAccount.setTotalForLabel(t("lima.config.documentReport.totalFor")); + protected BalanceAccount computeSubAccountBalance(String mainAccountLabel, Account account, Date beginDate, Date endDate, DecimalFormat bigDecimalFormat) { EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); BigDecimal credit = BigDecimal.ZERO; BigDecimal debit = BigDecimal.ZERO; - BigDecimal sold = BigDecimal.ZERO; + BigDecimal balance = BigDecimal.ZERO; List<Object[]> results = entryTopiaDao.getDebitCreditOfBalancedTransaction(account, beginDate, endDate); @@ -199,20 +191,40 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal // set the amounts and sold //sold = debit - credit - sold = sold.add(debit); - sold = sold.subtract(credit); + balance = balance.add(debit); + balance = balance.subtract(credit); + + BalanceAccount balanceAccount = addSubAccountReport(mainAccountLabel, account, bigDecimalFormat, credit, debit, balance); - if (sold.compareTo(BigDecimal.ZERO) == 1) { - balanceAccount.setSoldeDebit(sold.abs()); - balanceAccount.setSoldeCredit(BigDecimal.ZERO); - } else { - balanceAccount.setSoldeCredit(sold.abs()); - balanceAccount.setSoldeDebit(BigDecimal.ZERO); - } - balanceAccount.setAmountCredit(credit); - balanceAccount.setAmountDebit(debit); + return balanceAccount; + } + protected BalanceAccount addSubAccountReport(String mainAccountLabel, Account account, DecimalFormat bigDecimalFormat, BigDecimal credit, BigDecimal debit, BigDecimal balance) { + BalanceAccount balanceAccount = null; + if (BigDecimal.ZERO.compareTo(credit) != 0 || BigDecimal.ZERO.compareTo(debit) != 0) { + balanceAccount = new BalanceAccountImpl(); + balanceAccount.setMainAccountLabel(mainAccountLabel); + balanceAccount.setFormatter(bigDecimalFormat); + + String accountNumber = account.getAccountNumber(); + 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")); + + if (balance.compareTo(BigDecimal.ZERO) == 1) { + balanceAccount.setDebitBalance(balance.abs()); + balanceAccount.setCreditBalance(BigDecimal.ZERO); + } else { + balanceAccount.setCreditBalance(balance.abs()); + balanceAccount.setDebitBalance(BigDecimal.ZERO); + } + + balanceAccount.setAmountCredit(credit); + balanceAccount.setAmountDebit(debit); + } return balanceAccount; } } diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/GeneralEntryBookReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/GeneralEntryBookReportServiceImpl.java index ec77f90..31ea391 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 @@ -35,6 +35,7 @@ import org.chorem.lima.beans.GeneralEntryBook; import org.chorem.lima.beans.GeneralEntryBookEntry; import org.chorem.lima.beans.GeneralEntryBookEntryImpl; import org.chorem.lima.beans.GeneralEntryBookImpl; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.ClosedPeriodicEntryBookService; import org.chorem.lima.business.api.EntryService; import org.chorem.lima.business.api.FinancialPeriodService; @@ -90,19 +91,17 @@ public class GeneralEntryBookReportServiceImpl extends AbstractLimaService imple @EJB protected IdentityService identityService; - - protected static final String TITLE = "Journal Général Provisoire"; - @Override public DocumentReport getGeneralEntryBookDocumentReport(Date beginDate, Date endDate, DecimalFormat bigDecimalFormat, JasperReport generalEntryBooksJasperReport, JasperReport entriesJasperReport) { - - DocumentReport documentReport = AccountReportServiceImpl.getDocumentReport(beginDate, endDate, generalEntryBooksJasperReport, bigDecimalFormat, identityService); + String reportName = t("lima.config.documentReport.generalEntryBookReport.title"); + DocumentReport documentReport = AccountReportServiceImpl.getDocumentReport(reportName, 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")); + documentReport.setLastPageColumnDescription(t("lima.config.documentReport.entrybook.lastPageColumnDescription")); try { if (beginDate != null && endDate != null) { @@ -134,7 +133,7 @@ public class GeneralEntryBookReportServiceImpl extends AbstractLimaService imple generalEntryBookEntry = new GeneralEntryBookEntryImpl(); generalEntryBookEntry.setFormatter(bigDecimalFormat); generalEntryBookEntry.setCode(closedPeriodicEntryBook.getEntryBook().getCode()); - generalEntryBookEntry.setLibelle(closedPeriodicEntryBook.getEntryBook().getLabel()); + generalEntryBookEntry.setDescription(closedPeriodicEntryBook.getEntryBook().getLabel()); generalEntryBookEntryByEntryBookCode.put(entryBookCode, generalEntryBookEntry); // init debit and credit @@ -178,10 +177,11 @@ public class GeneralEntryBookReportServiceImpl extends AbstractLimaService imple if (subAmountCredit.compareTo(BigDecimal.ZERO) != 0 && subAmountDebit.compareTo(BigDecimal.ZERO) != 0) { GeneralEntryBook generalEntryBook = new GeneralEntryBookImpl(); generalEntryBook.setFormatter(bigDecimalFormat); + generalEntryBook.setDateFormat(LimaBusinessConfig.getInstance().getDateFormat()); generalEntryBook.setPeriod(financialPeriod.getBeginDate()); generalEntryBook.setSubReport(entriesJasperReport); - generalEntryBook.setSoldeDebit(subAmountDebit); - generalEntryBook.setSoldeCredit(subAmountCredit); + generalEntryBook.setDebitBalance(subAmountDebit); + generalEntryBook.setCreditBalance(subAmountCredit); generalEntryBook.setEntries(Lists.newArrayList(generalEntryBookEntries)); documentReport.addGeneralEntryBooks(generalEntryBook); @@ -191,8 +191,8 @@ public class GeneralEntryBookReportServiceImpl extends AbstractLimaService imple } - documentReport.setSoldeDebit(amountDebit); - documentReport.setSoldeCredit(amountCredit); + documentReport.setDebitBalance(amountDebit); + documentReport.setCreditBalance(amountCredit); } } catch (Exception ex) { log.error("Can't create document", ex); 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 50c5b17..3e4c4d7 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 @@ -31,6 +31,7 @@ import org.chorem.lima.beans.GeneralLedgerEntry; import org.chorem.lima.beans.GeneralLedgerEntryImpl; import org.chorem.lima.beans.GeneralLedgerImpl; import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.IdentityService; import org.chorem.lima.business.api.ReportService; import org.chorem.lima.business.api.report.LedgerReportService; @@ -46,6 +47,7 @@ import javax.ejb.Stateless; import javax.ejb.TransactionAttribute; import java.math.BigDecimal; import java.text.DecimalFormat; +import java.text.SimpleDateFormat; import java.util.Collections; import java.util.Date; import java.util.List; @@ -66,16 +68,16 @@ public class LedgerReportServiceImpl extends AbstractLimaService implements Ledg @EJB protected IdentityService identityService; - protected static final String TITLE = t("lima-business.document.ledger"); - + // grand livre @Override public DocumentReport getLedgerDocumentReport(Date beginDate, Date endDate, DecimalFormat decimalFormat, JasperReport generalLedgersJasperReport, JasperReport entriesJasperReport) { - - DocumentReport documentReport = AccountReportServiceImpl.getDocumentReport(beginDate, endDate, generalLedgersJasperReport, decimalFormat, identityService); + String reportName = t("lima.config.documentReport.ledgerReport.title"); + DocumentReport documentReport = AccountReportServiceImpl.getDocumentReport(reportName, beginDate, endDate, generalLedgersJasperReport, decimalFormat, identityService); documentReport.setColumnDateTitle(t("lima.config.documentReport.setColumnDateTitle")); documentReport.setColumnEntryBookTitle(t("lima.config.documentReport.setColumnEntryBookTitle")); documentReport.setColumnVoucherTitle(t("lima.config.documentReport.columnVoucherTitle")); + documentReport.setColumnDescriptionTitle(t("lima.config.documentReport.columnDescriptionTitle")); documentReport.setColumnDebitTitle(t("lima.config.documentReport.columnDebitTitle")); documentReport.setColumnCreditTitle(t("lima.config.documentReport.columnCreditTitle")); documentReport.setColumnBalanceTitle(t("lima.config.documentReport.columnBalanceTitle")); @@ -85,6 +87,8 @@ public class LedgerReportServiceImpl extends AbstractLimaService implements Ledg BalanceTrial balanceTrial = reportService.generateLedger(beginDate, endDate, null, true); documentReport.setHeaderSelectedAccounts(balanceTrial.getFromToAccountNumber()); + + SimpleDateFormat dateFormatter = new SimpleDateFormat(LimaBusinessConfig.getInstance().getDateFormat()); if (balanceTrial.getReportsDatas() != null) { for (ReportsDatas reportsDatas : balanceTrial.getReportsDatas()) { @@ -101,7 +105,7 @@ public class LedgerReportServiceImpl extends AbstractLimaService implements Ledg BigDecimal amountDebit = reportsDatas.getAmountDebit(); generalLedger.setDebit(amountDebit); generalLedger.setCredit(amountCredit); - generalLedger.setSolde(amountDebit.subtract(amountCredit)); + generalLedger.setBalance(amountDebit.subtract(amountCredit)); generalLedger.setSubReport(entriesJasperReport); generalLedger.setNbEntries(balanceTrial.getReportsDatas().size()); documentReport.addGeneralLedgers(generalLedger); @@ -125,6 +129,7 @@ public class LedgerReportServiceImpl extends AbstractLimaService implements Ledg GeneralLedgerEntry generalLedgerEntry = new GeneralLedgerEntryImpl(); generalLedgerEntry.setFormatter(decimalFormat); + generalLedgerEntry.setDateFormat(dateFormatter); generalLedgerEntry.setDate(entry.getFinancialTransaction().getTransactionDate()); generalLedgerEntry.setEntryBook(entryBookCode); generalLedgerEntry.setVoucher(entry.getVoucher()); @@ -132,7 +137,7 @@ public class LedgerReportServiceImpl extends AbstractLimaService implements Ledg generalLedgerEntry.setDebit(entryAmountDebit); generalLedgerEntry.setCredit(entryAmountCredit); balance = balance.add(entryAmountDebit.subtract(entryAmountCredit)); - generalLedgerEntry.setSolde(balance); + generalLedgerEntry.setBalance(balance); generalLedgerEntry.setNbEntries(entries.size()); generalLedger.addEntries(generalLedgerEntry); } 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 41d03a5..cf5a0a5 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 @@ -31,6 +31,7 @@ import org.chorem.lima.beans.EntryBookImpl; import org.chorem.lima.beans.FinancialPeriodImpl; import org.chorem.lima.beans.Transaction; import org.chorem.lima.beans.TransactionImpl; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.EntryService; import org.chorem.lima.business.api.FinancialPeriodService; @@ -48,6 +49,7 @@ import javax.ejb.Stateless; import javax.ejb.TransactionAttribute; import java.math.BigDecimal; import java.text.DecimalFormat; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -77,30 +79,26 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo @EJB protected FinancialTransactionService financialTransactionService; - protected static final String TITLE = "Récapitulatif par compte"; - - /** - * - ENTRY_BOOK_REPORT_PATH - * - FINANCIAL_PERIOD_REPORT_PATH - * - TRANSACTION_REPORT_PATH - * - CURRENCY - * - BIG_DECIMAL_FORMAT - **/ @Override public DocumentReport getEntryBookDocumentReport(Date beginDate, Date endDate, List<String> entryBookCodes, DecimalFormat bigDecimalFormat, JasperReport entryBooksJasperReport, JasperReport financialPeriodsJasperReport, JasperReport transactionsJasperReport) { + String reportName = t("lima.config.documentReport.provisionalEntryBookReport.title"); + DocumentReport documentReport = AccountReportServiceImpl.getDocumentReport(reportName, beginDate, endDate, entryBooksJasperReport, bigDecimalFormat, identityService); - DocumentReport documentReport = AccountReportServiceImpl.getDocumentReport(beginDate, endDate, entryBooksJasperReport, bigDecimalFormat, identityService); - - documentReport.setColumnEntryBookTitle(t("lima.config.documentReport.columnEntryBookTitle")); + documentReport.setColumnAccountTitle(t("lima.config.documentReport.columnAccountTitle")); + documentReport.setColumnCreditTitle(t("lima.config.documentReport.columnCreditTitle")); + documentReport.setColumnDateTitle(t("lima.config.documentReport.columnDateTitle")); + documentReport.setColumnDebitTitle(t("lima.config.documentReport.columnDebitTitle")); 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")); + documentReport.setColumnVoucherTitle(t("lima.config.documentReport.columnVoucherTitle")); + + documentReport.setLastPageColumnDescription(t("lima.config.documentReport.generalEntrybook.lastPageColumnDescription")); try { if (beginDate != null && endDate != null) { + SimpleDateFormat dateFormatter = new SimpleDateFormat(LimaBusinessConfig.getInstance().getDateFormat()); BigDecimal documentReportDebit = BigDecimal.ZERO; BigDecimal documentReportCredit = BigDecimal.ZERO; @@ -118,7 +116,7 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo for(EntryBook entryBook:entryBooks) { org.chorem.lima.beans.EntryBook entryBookReport = new EntryBookImpl(); - entryBookReport.setLibelle(entryBook.getLabel()); + entryBookReport.setLabel(entryBook.getLabel()); entryBookReport.setCode(entryBook.getCode()); entryBookReport.setSubReport(financialPeriodsJasperReport); entryBookReport.setFormatter(bigDecimalFormat); @@ -153,11 +151,12 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo Transaction transaction = new TransactionImpl(); transaction.setTransactionDate(entry.getFinancialTransaction().getTransactionDate()); transaction.setAccount(accountLabel); - transaction.setLibelle(entry.getDescription()); + transaction.setDescription(entry.getDescription()); transaction.setVoucher(entry.getVoucher()); transaction.setDebit(debit); transaction.setCredit(credit); transaction.setFormatter(bigDecimalFormat); + transaction.setDateFormat(dateFormatter); financialPeriodDebit = financialPeriodDebit.add(debit); financialPeriodCredit = financialPeriodCredit.add(credit); @@ -169,9 +168,10 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo if (financialPeriodDebit.compareTo(BigDecimal.ZERO) != 0 || financialPeriodCredit.compareTo(BigDecimal.ZERO) != 0) { financialPeriodReport.setEntryBookCode(entryBook.getCode()); - financialPeriodReport.setSoldeDebit(financialPeriodDebit); - financialPeriodReport.setSoldeCredit(financialPeriodCredit); + financialPeriodReport.setDebitBalance(financialPeriodDebit); + financialPeriodReport.setCreditBalance(financialPeriodCredit); financialPeriodReport.setFormatter(bigDecimalFormat); + financialPeriodReport.setDateFormat(LimaBusinessConfig.getInstance().getDateFormat()); entryBookReport.addFinancialPeriods(financialPeriodReport); entryBookSoldeDebit = entryBookSoldeDebit.add(financialPeriodDebit); @@ -181,15 +181,15 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo } if (entryBookSoldeDebit.compareTo(BigDecimal.ZERO) != 0 || entryBookSoldeCredit.compareTo(BigDecimal.ZERO) != 0) { - entryBookReport.setSoldeDebit(entryBookSoldeDebit); - entryBookReport.setSoldeCredit(entryBookSoldeCredit); + entryBookReport.setDebitBalance(entryBookSoldeDebit); + entryBookReport.setCreditBalance(entryBookSoldeCredit); documentReport.addEntryBooks(entryBookReport); documentReportDebit = documentReportDebit.add(entryBookSoldeDebit); documentReportCredit = documentReportCredit.add(entryBookSoldeCredit); } } - documentReport.setSoldeDebit(documentReportDebit); - documentReport.setSoldeCredit(documentReportCredit); + documentReport.setDebitBalance(documentReportDebit); + documentReport.setCreditBalance(documentReportCredit); } } catch (Exception ex) { log.error("Can't create document", ex); 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 f6f147a..921217d 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 @@ -54,15 +54,19 @@ lima.config.configFileName.description=Filename of Lima's configuration lima.config.currency.description= lima.config.currency.label= lima.config.data.dir.description=Data directory of Lima +lima.config.dateFormat.description= +lima.config.dateFormat.label= 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.accountReport.title=ACCOUNT 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.balanceReport.title=BALANCE lima.config.documentReport.balanceSheet=Balance lima.config.documentReport.columnAccountTitle=Account lima.config.documentReport.columnBalanceForPeriodTitle=Balance @@ -79,10 +83,13 @@ lima.config.documentReport.currentAsset=Current asset lima.config.documentReport.entrybook.documentReportModelPath.description= lima.config.documentReport.entrybook.entryBookModelPath.description= lima.config.documentReport.entrybook.financialPeriodModelPath.description= +lima.config.documentReport.entrybook.lastPageColumnDescription= lima.config.documentReport.entrybook.transactionReportModelPath.description= +lima.config.documentReport.generalEntryBookReport.title=PROVISIONAL GENERAL ENTRY BOOK lima.config.documentReport.generalEntrybook.documentReportModelPath.description= lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description= lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.description= +lima.config.documentReport.generalEntrybook.lastPageColumnDescription= lima.config.documentReport.generalLedger.documentReportModelPath.description= lima.config.documentReport.generalLedger.generalLedgerEntryModelPath.description= lima.config.documentReport.generalLedger.generalLedgerModelPath.description= @@ -90,9 +97,11 @@ 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.ledgerReport.title=LEDGER lima.config.documentReport.liabilities=Liabilities -lima.config.documentReport.setColumnDateTitle= -lima.config.documentReport.setColumnEntryBookTitle= +lima.config.documentReport.provisionalEntryBookReport.title=SUMMARY BY ACCOUNT +lima.config.documentReport.setColumnDateTitle=Date +lima.config.documentReport.setColumnEntryBookTitle=Entry book lima.config.documentReport.subTotalFor=Sub total for\: lima.config.documentReport.titleCurrentDate=Printed on %s at %s lima.config.documentReport.titleFromToDate=From %s to %s 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 d8d52a9..778321c 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 @@ -53,14 +53,18 @@ lima.config.configFileName.description=Nom du fichier de configuration de Lima lima.config.currency.description= lima.config.currency.label= lima.config.data.dir.description=Répertoire des données de Lima +lima.config.dateFormat.description= +lima.config.dateFormat.label= 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.accountReport.title=COMPTE 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.balanceReport.title=BALANCE lima.config.documentReport.balanceSheet=Balance lima.config.documentReport.bigDecimalFormat=formattage des montants lima.config.documentReport.columnAccountTitle=Compte @@ -79,12 +83,15 @@ 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' +lima.config.documentReport.entrybook.lastPageColumnDescription=Total pour les journaux sélectionnés lima.config.documentReport.entrybook.transactionReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'Transaction' lima.config.documentReport.financialStatement.documentReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'DocumentReport' lima.config.documentReport.financialStatement.financialStatementModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'financialStatement' +lima.config.documentReport.generalEntryBookReport.title=JOURNAL GÉNÉRAL PROVISOIRE lima.config.documentReport.generalEntrybook.documentReportModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'DocumentReport' lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'GeneralEntryBookEntry' lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'GeneralEntryBook' +lima.config.documentReport.generalEntrybook.lastPageColumnDescription=Total du Journal Général 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' @@ -92,9 +99,11 @@ lima.config.documentReport.headerCurrencyLabel=Devise\: lima.config.documentReport.headerSelectedAccounts=%s à %s lima.config.documentReport.headerSelectedAccountsLabel=Comptes\: lima.config.documentReport.investments=investissements +lima.config.documentReport.ledgerReport.title=GRAND LIVRE lima.config.documentReport.liabilities=passif -lima.config.documentReport.setColumnDateTitle= -lima.config.documentReport.setColumnEntryBookTitle= +lima.config.documentReport.provisionalEntryBookReport.title=RÉCAPITULATIF PAR COMPTE +lima.config.documentReport.setColumnDateTitle=Date +lima.config.documentReport.setColumnEntryBookTitle=Journal lima.config.documentReport.subTotalFor=Sous total pour\: lima.config.documentReport.titleCurrentDate=Édition du %s à %s lima.config.documentReport.titleFromToDate=Du %s au %s diff --git a/lima-callao/src/main/java/org/chorem/lima/beans/BalanceAccountImpl.java b/lima-callao/src/main/java/org/chorem/lima/beans/BalanceAccountImpl.java index 4b1070b..de819dc 100644 --- a/lima-callao/src/main/java/org/chorem/lima/beans/BalanceAccountImpl.java +++ b/lima-callao/src/main/java/org/chorem/lima/beans/BalanceAccountImpl.java @@ -37,16 +37,16 @@ public class BalanceAccountImpl extends BalanceAccount { BigDecimal newAmountDebit = this.amountDebit == null ? BigDecimal.ZERO : this.amountDebit; BigDecimal newAmountCredit = this.amountCredit == null ? BigDecimal.ZERO : this.amountCredit; - BigDecimal newSoldeDebit = this.soldeDebit == null ? BigDecimal.ZERO : this.soldeDebit; - BigDecimal newSoldeCredit = this.soldeCredit == null ? BigDecimal.ZERO : this.soldeCredit; + BigDecimal newSoldeDebit = this.debitBalance == null ? BigDecimal.ZERO : this.debitBalance; + BigDecimal newSoldeCredit = this.creditBalance == null ? BigDecimal.ZERO : this.creditBalance; this.amountDebit = subAccount.getAmountDebit().add(newAmountDebit); this.amountCredit = subAccount.getAmountCredit().add(newAmountCredit); - this.soldeDebit = subAccount.getSoldeDebit().add(newSoldeDebit); + this.debitBalance = subAccount.getDebitBalance().add(newSoldeDebit); - this.soldeCredit = subAccount.getSoldeCredit().add(newSoldeCredit); + this.creditBalance = subAccount.getCreditBalance().add(newSoldeCredit); } // firePropertyChange(PROPERTY_SUB_ACCOUNTS, null, subAccount); diff --git a/lima-callao/src/main/xmi/lima-callao-model.zargo b/lima-callao/src/main/xmi/lima-callao-model.zargo index 5e7eea2..8633e8e 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/AccountEntry.jrxml b/lima-report/src/main/resources/jasperreports/account/AccountEntry.jrxml index e46f3df..f800454 100644 --- a/lima-report/src/main/resources/jasperreports/account/AccountEntry.jrxml +++ b/lima-report/src/main/resources/jasperreports/account/AccountEntry.jrxml @@ -15,7 +15,11 @@ <property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/> <style name="Default" isDefault="true" fontName="DejaVu Sans"/> <style name="Default oblique" fontName="DejaVu Sans Mono"/> - <field name="accountNumber" class="java.lang.String"/> + + <field name="formatter" class="java.text.DecimalFormat"/> + <field name="dateFormat" class="java.lang.String"/> + + <field name="accountNumber" class="java.lang.String"/> <field name="transactionDate" class="java.util.Date"/> <field name="code" class="java.lang.String"/> <field name="voucher" class="java.lang.String"/> @@ -23,7 +27,7 @@ <field name="lettering" class="java.lang.String"/> <field name="debit" class="java.math.BigDecimal"/> <field name="credit" class="java.math.BigDecimal"/> - <field name="formatter" class="java.text.DecimalFormat"/> + <variable name="subTotalDebit" class="java.math.BigDecimal" calculation="Sum"> <variableExpression><![CDATA[$F{debit}]]></variableExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> diff --git a/lima-report/src/main/resources/jasperreports/balance/BalanceReportAccountReport.jrxml b/lima-report/src/main/resources/jasperreports/balance/BalanceReportAccountReport.jrxml index 3a33815..246de93 100644 --- a/lima-report/src/main/resources/jasperreports/balance/BalanceReportAccountReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/balance/BalanceReportAccountReport.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-02T12:49:55 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-02T12:49:55 --> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="21" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Empty" isIgnorePagination="true" uuid="75ff [...] <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> @@ -10,18 +10,16 @@ <queryString> <![CDATA[]]> </queryString> - <field name="accountNumber" class="java.lang.String"/> - <field name="label" class="java.lang.String"/> - <field name="amountDebit" class="java.math.BigDecimal"/> - <field name="amountCredit" class="java.math.BigDecimal"/> - <field name="soldeDebit" class="java.math.BigDecimal"/> - <field name="soldeCredit" class="java.math.BigDecimal"/> - <field name="subAccounts" class="java.util.List"/> - <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> <field name="formatter" class="java.text.DecimalFormat"/> + + <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> + + <field name="subAccounts" class="java.util.List"/> + <variable name="subAccounts" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource"> <variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{subAccounts})]]></variableExpression> </variable> + <detail> <band height="10" splitType="Stretch"> <subreport isUsingCache="false" runToBottom="false"> diff --git a/lima-report/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml b/lima-report/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml index 6214da6..4f8896d 100644 --- a/lima-report/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml @@ -10,30 +10,32 @@ <queryString> <![CDATA[]]> </queryString> + <field name="formatter" class="java.text.DecimalFormat"/> + <field name="accountNumber" class="java.lang.String"/> <field name="label" class="java.lang.String"/> <field name="amountDebit" class="java.math.BigDecimal"/> <field name="amountCredit" class="java.math.BigDecimal"/> - <field name="soldeDebit" class="java.math.BigDecimal"/> - <field name="soldeCredit" class="java.math.BigDecimal"/> - <field name="formatter" class="java.text.DecimalFormat"/> + <field name="debitBalance" class="java.math.BigDecimal"/> + <field name="creditBalance" class="java.math.BigDecimal"/> <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"> + + <variable name="amountBalanceDebit" class="java.math.BigDecimal" calculation="Sum"> <variableExpression><![CDATA[$F{amountDebit}]]></variableExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> </variable> - <variable name="amountCreditSolde" class="java.math.BigDecimal" calculation="Sum"> + <variable name="amountBalanceCredit" class="java.math.BigDecimal" calculation="Sum"> <variableExpression><![CDATA[$F{amountCredit}]]></variableExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> </variable> - <variable name="soldeDebitSolde" class="java.math.BigDecimal" calculation="Sum"> - <variableExpression><![CDATA[$F{soldeDebit}]]></variableExpression> + <variable name="sumBalanceDebit" class="java.math.BigDecimal" calculation="Sum"> + <variableExpression><![CDATA[$F{debitBalance}]]></variableExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> </variable> - <variable name="soldeCreditSolde" class="java.math.BigDecimal" calculation="Sum"> - <variableExpression><![CDATA[$F{soldeCredit}]]></variableExpression> + <variable name="sumBalanceCredit" class="java.math.BigDecimal" calculation="Sum"> + <variableExpression><![CDATA[$F{creditBalance}]]></variableExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> </variable> <detail> @@ -110,7 +112,7 @@ <font fontName="DejaVu Sans Mono" size="8"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($F{soldeDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeDebit}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($F{debitBalance}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{debitBalance}) : ""]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> <reportElement x="506" y="0" width="72" height="10" uuid="edb8a8c1-ac7a-44cb-9de6-b231b00f966f"/> @@ -124,7 +126,7 @@ <font fontName="DejaVu Sans Mono" size="8"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($F{soldeCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeCredit}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($F{creditBalance}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{creditBalance}) : ""]]></textFieldExpression> </textField> </band> </detail> @@ -170,7 +172,7 @@ <property name="com.jaspersoft.studio.unit.width" value="px"/> <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> - <printWhenExpression><![CDATA[new Boolean($V{soldeDebitSolde}.compareTo(BigDecimal.ZERO) != 0)]]></printWhenExpression> + <printWhenExpression><![CDATA[new Boolean($V{sumBalanceDebit}.compareTo(BigDecimal.ZERO) != 0)]]></printWhenExpression> </reportElement> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -182,7 +184,7 @@ <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($V{soldeDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{soldeDebitSolde}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($V{sumBalanceDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{sumBalanceDebit}) : ""]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> <reportElement x="506" y="0" width="72" height="10" forecolor="#736343" uuid="52091c73-538e-4f13-9e80-d8ceceb20925"> @@ -203,7 +205,7 @@ <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($V{soldeCreditSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{soldeCreditSolde}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($V{sumBalanceCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{sumBalanceCredit}) : ""]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> <reportElement key="" x="290" y="0" width="72" height="10" forecolor="#736343" uuid="7f9a6117-e3b4-492f-ba5a-b4f913516294"> @@ -215,7 +217,7 @@ <property name="com.jaspersoft.studio.unit.height" value="px"/> <property name="local_mesure_unity" value="pixel"/> <property name="com.jaspersoft.studio.unit.y" value="px"/> - <printWhenExpression><![CDATA[new Boolean($V{soldeDebitSolde}.compareTo(BigDecimal.ZERO) != 0)]]></printWhenExpression> + <printWhenExpression><![CDATA[new Boolean($V{sumBalanceDebit}.compareTo(BigDecimal.ZERO) != 0)]]></printWhenExpression> </reportElement> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -227,7 +229,7 @@ <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($V{amountDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{amountDebitSolde}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($V{amountBalanceDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{amountBalanceDebit}) : ""]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> <reportElement x="362" y="0" width="72" height="10" forecolor="#736343" uuid="d149a582-98a8-4cce-ab19-c42f1142839c"> @@ -250,7 +252,7 @@ <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($V{amountCreditSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{amountCreditSolde}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($V{amountBalanceCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{amountBalanceCredit}) : ""]]></textFieldExpression> </textField> </frame> </band> @@ -297,7 +299,7 @@ <property name="com.jaspersoft.studio.unit.width" value="px"/> <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> - <printWhenExpression><![CDATA[new Boolean($V{soldeDebitSolde}.compareTo(BigDecimal.ZERO) != 0)]]></printWhenExpression> + <printWhenExpression><![CDATA[new Boolean($V{sumBalanceDebit}.compareTo(BigDecimal.ZERO) != 0)]]></printWhenExpression> </reportElement> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -309,7 +311,7 @@ <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($V{soldeDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{soldeDebitSolde}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($V{sumBalanceDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{sumBalanceDebit}) : ""]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> <reportElement x="506" y="0" width="72" height="10" forecolor="#736343" uuid="6bc7b25f-7a33-4243-8b41-c12fc69bfdd9"> @@ -330,7 +332,7 @@ <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($V{soldeCreditSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{soldeCreditSolde}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($V{sumBalanceCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{sumBalanceCredit}) : ""]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> <reportElement key="" x="290" y="0" width="72" height="10" forecolor="#736343" uuid="4b3cfcb7-e1c1-4825-824d-3f30c424cb8d"> @@ -342,7 +344,7 @@ <property name="com.jaspersoft.studio.unit.height" value="px"/> <property name="local_mesure_unity" value="pixel"/> <property name="com.jaspersoft.studio.unit.y" value="px"/> - <printWhenExpression><![CDATA[new Boolean($V{soldeDebitSolde}.compareTo(BigDecimal.ZERO) != 0)]]></printWhenExpression> + <printWhenExpression><![CDATA[new Boolean($V{sumBalanceDebit}.compareTo(BigDecimal.ZERO) != 0)]]></printWhenExpression> </reportElement> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -354,7 +356,7 @@ <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($V{amountDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{amountDebitSolde}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($V{amountBalanceDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{amountBalanceDebit}) : ""]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> <reportElement x="362" y="0" width="72" height="10" forecolor="#736343" uuid="0736caf4-6f73-417e-93c8-2a81a81f6721"> @@ -377,7 +379,7 @@ <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($V{amountCreditSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{amountCreditSolde}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($V{amountBalanceCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{amountBalanceCredit}) : ""]]></textFieldExpression> </textField> </frame> </band> diff --git a/lima-report/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml b/lima-report/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml index 4e76999..d6ade61 100644 --- a/lima-report/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml @@ -4,8 +4,11 @@ <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="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="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> @@ -15,18 +18,21 @@ <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"/> + <style name="FooterColumn" forecolor="#804000" fontName="DejaVu Sans" fontSize="8" isBold="true"> + <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> </style> + <queryString> <![CDATA[]]> </queryString> + <field name="formatter" class="java.text.DecimalFormat"/> <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> <field name="entryBooks" class="java.util.List"/> @@ -47,10 +53,12 @@ <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="columnVoucherTitle" class="java.lang.String"/> + + <field name="lastPageColumnDescription" class="java.lang.String"/> - <field name="soldeDebit" class="java.math.BigDecimal"/> - <field name="soldeCredit" class="java.math.BigDecimal"/> + <field name="debitBalance" class="java.math.BigDecimal"/> + <field name="creditBalance" class="java.math.BigDecimal"/> <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> @@ -203,33 +211,31 @@ </pageFooter> <lastPageFooter> <band height="30"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> <frame> - <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"/> + <reportElement style="FooterHeader" stretchType="RelativeToBandHeight" x="0" y="0" width="578" height="20" isRemoveLineWhenBlank="true" uuid="ffa6f4ff-14e5-4501-acbe-0c4e832d9c2a"/> <textField isBlankWhenNull="true"> - <reportElement style="FooterColumn" x="0" y="0" width="434" height="20" forecolor="#736343" uuid="f818f119-5580-46fd-acbd-086f7d222dde"/> + <reportElement style="FooterColumn" x="0" y="0" width="434" height="20" uuid="f818f119-5580-46fd-acbd-086f7d222dde"/> <textElement textAlignment="Left" verticalAlignment="Middle"> <font size="12" isBold="true" isItalic="true"/> <paragraph lineSpacingSize="0.0" leftIndent="40"/> </textElement> - <textFieldExpression><![CDATA["Total pour les journaux sélectionnés"]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{lastPageColumnDescription}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement style="FooterColumn" x="434" y="0" width="72" height="20" forecolor="#736343" uuid="8382935a-23c9-48a0-88f3-aa486cccd575"/> + <reportElement style="FooterColumn" x="434" y="0" width="72" height="20" 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"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($F{soldeDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeDebit}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($F{debitBalance}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{debitBalance}) : ""]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement style="FooterColumn" x="506" y="0" width="72" height="20" forecolor="#736343" uuid="c7fa4a13-051c-40c0-b663-58b0401402b4"/> + <reportElement style="FooterColumn" x="506" y="0" width="72" height="20" 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"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($F{soldeCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeCredit}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($F{creditBalance}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{creditBalance}) : ""]]></textFieldExpression> </textField> </frame> <textField isBlankWhenNull="false"> diff --git a/lima-report/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml b/lima-report/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml index 15581ab..79c7327 100644 --- a/lima-report/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/entryBook/EntryBookReport.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-11T11:57:53 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-11T11:57:53 --> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="50" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isFloatColumnFooter="true" whenResourceMissingType="Empty" isIgnoreP [...] <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> @@ -10,13 +10,17 @@ <queryString> <![CDATA[]]> </queryString> - <field name="soldeDebit" class="java.math.BigDecimal"/> - <field name="soldeCredit" class="java.math.BigDecimal"/> - <field name="financialPeriods" class="java.util.List"/> - <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> - <field name="code" class="java.lang.String"/> - <field name="libelle" class="java.lang.String"/> + <field name="formatter" class="java.text.DecimalFormat"/> + <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> + + <field name="financialPeriods" class="java.util.List"/> + + <field name="debitBalance" class="java.math.BigDecimal"/> + <field name="creditBalance" class="java.math.BigDecimal"/> + <field name="code" class="java.lang.String"/> + <field name="label" class="java.lang.String"/> + <variable name="generalEntryBookEntry" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource"> <variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{financialPeriods})]]></variableExpression> </variable> @@ -25,67 +29,30 @@ <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> <frame> - <reportElement style="Default" mode="Opaque" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="b362ba5e-b960-4aff-8c28-d8288ee352a1"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - </box> + <reportElement style="Default" mode="Opaque" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="b362ba5e-b960-4aff-8c28-d8288ee352a1"/> <textField pattern="" isBlankWhenNull="true"> - <reportElement mode="Transparent" x="0" y="0" width="434" height="10" isRemoveLineWhenBlank="true" forecolor="#736343" uuid="1472eda4-3df8-47ae-aba7-0aae2d2bedae"> - <property name="local_mesure_unity" value="pixel"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> + <reportElement mode="Transparent" x="0" y="0" width="434" height="10" isRemoveLineWhenBlank="true" forecolor="#736343" uuid="1472eda4-3df8-47ae-aba7-0aae2d2bedae"/> <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"/> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textElement textAlignment="Left" verticalAlignment="Middle"> <font size="8" isBold="true" isItalic="true"/> <paragraph lineSpacingSize="0.0" leftIndent="40"/> </textElement> - <textFieldExpression><![CDATA["Journal " + $F{code} + " " + $F{libelle}]]></textFieldExpression> + <textFieldExpression><![CDATA["Journal " + $F{code} + " " + $F{label}]]></textFieldExpression> </textField> <textField> - <reportElement x="434" y="0" width="72" height="10" uuid="baca77fb-1d57-428f-8746-1bb482b61b55"> - <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> + <reportElement x="434" y="0" width="72" height="10" uuid="baca77fb-1d57-428f-8746-1bb482b61b55"/> <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> </textField> <textField> - <reportElement x="506" y="0" width="72" height="10" uuid="da04b7ce-dd80-4c40-a0cb-7d74dac0da00"> - <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> + <reportElement x="506" y="0" width="72" height="10" uuid="da04b7ce-dd80-4c40-a0cb-7d74dac0da00"/> <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> </textField> @@ -97,10 +64,7 @@ <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> <subreport isUsingCache="false" runToBottom="false"> - <reportElement key="subreport-5" positionType="Float" mode="Opaque" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - </reportElement> + <reportElement key="subreport-5" positionType="Float" mode="Opaque" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"/> <dataSourceExpression><![CDATA[$V{generalEntryBookEntry}]]></dataSourceExpression> <subreportExpression><![CDATA[$F{subReport}]]></subreportExpression> </subreport> diff --git a/lima-report/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml b/lima-report/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml index ae5b8fd..63e271a 100644 --- a/lima-report/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.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-11T14:47:39 --> +<!-- Created with Jaspersoft Studio version 6.1.0.final using JasperReports Library version 6.1.0 --> +<!-- 2015-07-07T15:18:19 --> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="51" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isFloatColumnFooter="true" whenResourceMissingType="Empty" isIgnoreP [...] <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> @@ -18,14 +18,13 @@ <queryString> <![CDATA[]]> </queryString> - <field name="soldeDebit" class="java.math.BigDecimal"/> - <field name="soldeCredit" class="java.math.BigDecimal"/> - <field name="transactions" class="java.util.List"/> + <field name="formatter" class="java.text.DecimalFormat"/> <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> + <field name="debitBalance" class="java.math.BigDecimal"/> + <field name="creditBalance" class="java.math.BigDecimal"/> <field name="period" class="java.util.Date"/> - <field name="libelle" class="java.lang.String"/> <field name="entryBookCode" class="java.lang.String"/> - <field name="formatter" class="java.text.DecimalFormat"/> + <field name="transactions" class="java.util.List"/> <variable name="generalEntryBookEntry" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource"> <variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{transactions})]]></variableExpression> </variable> @@ -34,32 +33,13 @@ <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> <frame> - <reportElement style="Default" mode="Opaque" x="0" y="0" width="578" height="10" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="b362ba5e-b960-4aff-8c28-d8288ee352a1"> - <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> + <reportElement style="Default" mode="Opaque" x="0" y="0" width="578" height="10" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="b362ba5e-b960-4aff-8c28-d8288ee352a1"/> <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textField pattern="" isBlankWhenNull="true"> - <reportElement x="0" y="0" width="434" height="10" forecolor="#736343" uuid="1472eda4-3df8-47ae-aba7-0aae2d2bedae"> - <property name="local_mesure_unity" value="pixel"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - </box> + <reportElement x="0" y="0" width="434" height="10" forecolor="#736343" uuid="1472eda4-3df8-47ae-aba7-0aae2d2bedae"/> <textElement textAlignment="Left" verticalAlignment="Middle"> <font size="8" isBold="true" isItalic="true"/> <paragraph lineSpacingSize="0.0" leftIndent="80"/> @@ -67,37 +47,19 @@ <textFieldExpression><![CDATA[new SimpleDateFormat("MMMM yyyy").format($F{period})]]></textFieldExpression> </textField> <textField pattern=""> - <reportElement x="434" y="0" width="72" height="10" uuid="e6c93d97-54e3-4b70-9c28-56a3319bad77"> - <property name="local_mesure_unitx" value="pixel"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - </box> - </textField> - <textField> - <reportElement x="506" y="0" width="72" height="10" uuid="b5197d26-0ac8-4102-9a6e-857a6e2b2c99"> - <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> + <reportElement x="434" y="0" width="72" height="10" uuid="e6c93d97-54e3-4b70-9c28-56a3319bad77"/> <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <leftPen lineWidth="0.6" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineColor="#804000"/> </box> </textField> + <textField pattern=""> + <reportElement x="506" y="0" width="72" height="10" uuid="e6c93d97-54e3-4b70-9c28-56a3319bad88"/> + <box> + <leftPen lineWidth="0.6" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineColor="#804000"/> + </box> + </textField> </frame> </band> </pageHeader> @@ -106,31 +68,12 @@ <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> <frame> - <reportElement style="Default" mode="Opaque" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="b362ba5e-b960-4aff-8c28-d8288ee352a1"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - </box> + <reportElement style="Default" mode="Opaque" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="b362ba5e-b960-4aff-8c28-d8288ee352a1"/> <textField pattern="" isBlankWhenNull="true"> - <reportElement x="0" y="0" width="434" height="10" isRemoveLineWhenBlank="true" forecolor="#736343" uuid="1472eda4-3df8-47ae-aba7-0aae2d2bedae"> - <property name="local_mesure_unity" value="pixel"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> + <reportElement x="0" y="0" width="434" height="10" isRemoveLineWhenBlank="true" forecolor="#736343" uuid="1472eda4-3df8-47ae-aba7-0aae2d2bedae"/> <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"/> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textElement textAlignment="Left" verticalAlignment="Middle"> <font size="8" isBold="true" isItalic="true"/> @@ -139,34 +82,9 @@ <textFieldExpression><![CDATA[new SimpleDateFormat("MMMM yyyy").format($F{period})]]></textFieldExpression> </textField> <textField pattern=""> - <reportElement x="434" y="0" width="72" height="10" uuid="128b759f-c6d0-4310-a83c-8b9993d537dd"> - <property name="local_mesure_unitx" value="pixel"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - </box> - </textField> - <textField> - <reportElement x="506" y="0" width="72" height="10" uuid="49cc6926-8eb0-4e4c-9c53-6efc0a56a728"> - <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> + <reportElement x="434" y="0" width="72" height="10" uuid="128b759f-c6d0-4310-a83c-8b9993d537dd"/> <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> </textField> @@ -179,15 +97,7 @@ <subreportExpression><![CDATA[$F{subReport}]]></subreportExpression> </subreport> <subreport isUsingCache="false" runToBottom="false"> - <reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="10" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="1095b1fb-ac01-4f55-b694-2e4e5ec17a76"> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <printWhenExpression><![CDATA[new Boolean(!($V{PAGE_NUMBER} == 1 && $V{REPORT_COUNT} == 1))]]></printWhenExpression> - </reportElement> + <reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="10" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="1095b1fb-ac01-4f55-b694-2e4e5ec17a76"/> <dataSourceExpression><![CDATA[$V{generalEntryBookEntry}]]></dataSourceExpression> <subreportExpression><![CDATA[$F{subReport}]]></subreportExpression> </subreport> @@ -196,34 +106,17 @@ <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> <frame> - <reportElement style="Default" stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="578" height="10" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="571d1774-22c4-4ab4-901b-7470c74f0405"> - <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> + <reportElement style="Default" stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="578" height="10" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="571d1774-22c4-4ab4-901b-7470c74f0405"/> <box> - <topPen lineWidth="0.0" lineColor="#804000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#804000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <bottomPen lineWidth="0.8" lineStyle="Solid" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textField pattern="" isBlankWhenNull="true"> - <reportElement x="0" y="0" width="434" height="10" forecolor="#736343" uuid="d3f672ab-80d2-4467-9ff9-73d4611a3025"> - <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"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - </reportElement> + <reportElement x="0" y="0" width="434" height="10" forecolor="#736343" uuid="d3f672ab-80d2-4467-9ff9-73d4611a3025"/> <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textElement textAlignment="Left" verticalAlignment="Middle"> <font size="8" isBold="true" isItalic="true"/> @@ -232,38 +125,28 @@ <textFieldExpression><![CDATA["Solde pour le journal " + $F{entryBookCode} + " jusqu'à fin " + new SimpleDateFormat("MMMM yyyy").format($F{period})]]></textFieldExpression> </textField> <textField isBlankWhenNull="false"> - <reportElement style="Default" x="434" y="0" width="72" height="10" forecolor="#736343" uuid="53ba669a-6626-4e70-bbf0-fb243908a20e"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - </reportElement> + <reportElement style="Default" x="434" y="0" width="72" height="10" forecolor="#736343" uuid="53ba669a-6626-4e70-bbf0-fb243908a20e"/> <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - <bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="DejaVu Sans Mono" size="8" isBold="true"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($F{soldeDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeDebit}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($F{debitBalance}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{debitBalance}) : ""]]></textFieldExpression> </textField> <textField isBlankWhenNull="false"> - <reportElement style="Default" x="506" y="0" width="72" height="10" forecolor="#736343" uuid="edb8a8c1-ac7a-44cb-9de6-b231b00f966f"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - </reportElement> + <reportElement style="Default" x="506" y="0" width="72" height="10" forecolor="#736343" uuid="edb8a8c1-ac7a-44cb-9de6-b231b00f966f"/> <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - <bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="DejaVu Sans Mono" size="8" isBold="true"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($F{soldeCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeCredit}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($F{creditBalance}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{creditBalance}) : ""]]></textFieldExpression> </textField> </frame> </band> diff --git a/lima-report/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml b/lima-report/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml index 64fdf12..c841467 100644 --- a/lima-report/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml @@ -1,22 +1,29 @@ <?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-11T11:59:00 --> +<!-- Created with Jaspersoft Studio version 6.1.0.final using JasperReports Library version 6.1.0 --> +<!-- 2015-07-07T12:30:07 --> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="30" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Empty" isIgnorePagination="true" uuid="75ff86c6-c370-4f0b-a2d3-e17324a465bb"> <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> <property name="com.jaspersoft.studio.unit." value="pixel"/> <style name="Default" isDefault="true" fontName="DejaVu Sans"/> <style name="Default oblique" fontName="DejaVu Sans Mono"/> + <style name="bodyColumn" fontName="DejaVu Sans" fontSize="8"> + <box> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + </box> + </style> <queryString> <![CDATA[]]> </queryString> - <field name="libelle" class="java.lang.String"/> + <field name="formatter" class="java.text.DecimalFormat"/> + <field name="dateFormat" class="java.text.SimpleDateFormat"/> + <field name="description" class="java.lang.String"/> <field name="debit" class="java.math.BigDecimal"/> <field name="credit" class="java.math.BigDecimal"/> <field name="transactionDate" class="java.util.Date"/> <field name="account" class="java.lang.String"/> <field name="voucher" class="java.lang.String"/> - <field name="formatter" class="java.text.DecimalFormat"/> <variable name="entryBookDebitSolde" class="java.math.BigDecimal" calculation="Sum"> <variableExpression><![CDATA[$F{debit}]]></variableExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> @@ -36,35 +43,15 @@ <detail> <band height="10" splitType="Stretch"> <textField pattern="" isBlankWhenNull="true"> - <reportElement x="0" y="0" width="60" height="10" uuid="c5f32333-c77a-45f8-9bec-c8d61e15d85a"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> - </box> + <reportElement style="bodyColumn" x="0" y="0" width="60" height="10" uuid="c5f32333-c77a-45f8-9bec-c8d61e15d85a"/> <textElement textAlignment="Left" verticalAlignment="Middle"> <font size="8"/> <paragraph leftIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new SimpleDateFormat("dd/MM/yyyy").format($F{transactionDate})]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{dateFormat}.format($F{transactionDate})]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement x="60" y="0" width="100" height="10" uuid="c5f32333-c77a-45f8-9bec-c8d61e15d85a"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> - </box> + <reportElement style="bodyColumn" x="60" y="0" width="100" height="10" uuid="c5f32333-c77a-45f8-9bec-c8d61e15d85a"/> <textElement textAlignment="Left" verticalAlignment="Middle"> <font size="8"/> <paragraph leftIndent="2"/> @@ -72,16 +59,7 @@ <textFieldExpression><![CDATA[$F{account}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement x="160" y="0" width="40" height="10" uuid="c5f32333-c77a-45f8-9bec-c8d61e15d85a"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> - </box> + <reportElement style="bodyColumn" x="160" y="0" width="40" height="10" uuid="c5f32333-c77a-45f8-9bec-c8d61e15d85a"/> <textElement textAlignment="Left" verticalAlignment="Middle"> <font size="8"/> <paragraph leftIndent="2"/> @@ -89,33 +67,15 @@ <textFieldExpression><![CDATA[$F{voucher}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement x="200" y="0" width="234" height="10" uuid="0bcc6e5d-b2ee-474f-8e66-475933d55a16"> - <property name="local_mesure_unity" value="pixel"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> - </box> + <reportElement style="bodyColumn" x="200" y="0" width="234" height="10" uuid="0bcc6e5d-b2ee-474f-8e66-475933d55a16"/> <textElement textAlignment="Left" verticalAlignment="Middle"> <font size="8"/> <paragraph leftIndent="2"/> </textElement> - <textFieldExpression><![CDATA[$F{libelle}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{description}]]></textFieldExpression> </textField> <textField isBlankWhenNull="false"> - <reportElement x="506" y="0" width="72" height="10" uuid="edb8a8c1-ac7a-44cb-9de6-b231b00f966f"/> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> - </box> + <reportElement style="bodyColumn" x="506" y="0" width="72" height="10" uuid="edb8a8c1-ac7a-44cb-9de6-b231b00f966f"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="DejaVu Sans Mono" size="8"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> @@ -123,10 +83,7 @@ <textFieldExpression><![CDATA[new Boolean($F{credit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{credit}) : ""]]></textFieldExpression> </textField> <textField> - <reportElement x="434" y="0" width="72" height="10" uuid="39bdbda9-8233-4e46-b3ed-d5f0d06e2d86"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> + <reportElement style="bodyColumn" x="434" y="0" width="72" height="10" uuid="39bdbda9-8233-4e46-b3ed-d5f0d06e2d86"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> @@ -140,29 +97,15 @@ <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> <frame> - <reportElement mode="Transparent" x="0" y="0" width="578" height="10" uuid="48190dbf-c1d0-421a-bfcb-9c9db0c0c359"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> + <reportElement mode="Transparent" x="0" y="0" width="578" height="10" uuid="48190dbf-c1d0-421a-bfcb-9c9db0c0c359"/> <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> - <bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> + <topPen lineWidth="0.0" lineStyle="Dashed" lineColor="#804000"/> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <bottomPen lineWidth="0.6" lineStyle="Dashed" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textField> - <reportElement x="0" y="0" width="434" height="10" forecolor="#736343" uuid="d622e85e-b93e-4be5-90e0-cf3b854f012d"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> - </box> + <reportElement x="0" y="0" width="434" height="10" forecolor="#736343" uuid="d622e85e-b93e-4be5-90e0-cf3b854f012d"/> <textElement> <font size="8" isBold="true"/> <paragraph leftIndent="80"/> @@ -171,19 +114,11 @@ </textField> <textField pattern="" isBlankWhenNull="false"> <reportElement key="" x="434" y="0" width="72" height="10" forecolor="#736343" uuid="75ef2eb9-6e2d-447c-9dd6-488a63fcdf04"> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> <printWhenExpression><![CDATA[new Boolean($V{EntryBookEndColomnDebitSolde}.compareTo(BigDecimal.ZERO) != 0)]]></printWhenExpression> </reportElement> <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textElement textAlignment="Right"> <font fontName="DejaVu Sans Mono" size="8"/> @@ -192,20 +127,7 @@ <textFieldExpression><![CDATA[new Boolean($V{EntryBookEndColomnDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{EntryBookEndColomnDebitSolde}) : ""]]></textFieldExpression> </textField> <textField isBlankWhenNull="false"> - <reportElement x="506" y="0" width="72" height="10" forecolor="#736343" uuid="c52c36a6-6a50-473b-9dad-0526f039b7c1"> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#736343"/> - </box> + <reportElement x="506" y="0" width="72" height="10" forecolor="#736343" uuid="c52c36a6-6a50-473b-9dad-0526f039b7c1"/> <textElement textAlignment="Right"> <font fontName="DejaVu Sans Mono" size="8"/> <paragraph rightIndent="2"/> @@ -220,29 +142,18 @@ <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> <frame> - <reportElement mode="Opaque" x="0" y="0" width="578" height="10" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="d7d82e83-663d-410a-a61d-6211645557ce"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> + <reportElement mode="Opaque" x="0" y="0" width="578" height="10" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="d7d82e83-663d-410a-a61d-6211645557ce"/> <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> + <topPen lineWidth="0.6" lineStyle="Dashed" lineColor="#804000"/> <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textField> - <reportElement x="0" y="0" width="434" height="10" forecolor="#736343" uuid="16735e42-8adf-47c5-8aa6-590bbc2327a9"> - <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="#804000"/> - <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> - <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> - </box> + <reportElement x="0" y="0" width="434" height="10" forecolor="#736343" uuid="16735e42-8adf-47c5-8aa6-590bbc2327a9"/> + <box> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + </box> <textElement> <font size="8" isBold="true"/> <paragraph leftIndent="80"/> @@ -250,18 +161,9 @@ <textFieldExpression><![CDATA["Sous-total pour " + new SimpleDateFormat("MMMM yyyy").format($F{transactionDate})]]></textFieldExpression> </textField> <textField pattern=""> - <reportElement x="434" y="0" width="72" height="10" forecolor="#736343" uuid="4c23c4e2-1c93-4a78-b82b-895286708171"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> + <reportElement x="434" y="0" width="72" height="10" forecolor="#736343" uuid="4c23c4e2-1c93-4a78-b82b-895286708171"/> <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#804000"/> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> </box> <textElement textAlignment="Right"> @@ -271,21 +173,12 @@ <textFieldExpression><![CDATA[new Boolean($V{entryBookDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{entryBookDebitSolde}) : ""]]></textFieldExpression> </textField> <textField> - <reportElement x="506" y="0" width="72" height="10" forecolor="#736343" uuid="a7b19080-fcc5-407b-ae5c-20a85afd363e"> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> - </box> - <textElement textAlignment="Right"> + <reportElement x="506" y="0" width="72" height="10" forecolor="#736343" uuid="a7b19080-fcc5-407b-ae5c-20a85afd363e"/> + <box> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + </box> + <textElement textAlignment="Right"> <font fontName="DejaVu Sans Mono" size="8" isBold="true"/> <paragraph rightIndent="2"/> </textElement> diff --git a/lima-report/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml b/lima-report/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml index 971ba90..367cf23 100644 --- a/lima-report/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml @@ -1,26 +1,58 @@ <?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:41:37 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-11T17:41:37 --> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceReport" pageWidth="595" pageHeight="842" whenNoDataType="BlankPage" columnWidth="575" leftMargin="10" rightMargin="10" topMargin="10" bottomMargin="10" isSummaryNewPage="true" isSummaryWithPageHeaderAndFooter="true" isFloa [...] <property name="com.jaspersoft.studio.unit." value="pixel"/> <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> - <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="#804000" fontName="DejaVu Sans" fontSize="8" isBold="true"> + <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> + </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="generalEntryBooks" 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="soldeDebit" class="java.math.BigDecimal"/> - <field name="soldeCredit" class="java.math.BigDecimal"/> <field name="formatter" class="java.text.DecimalFormat"/> + <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> + <field name="generalEntryBooks" 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="columnEntryBookTitle" class="java.lang.String"/> + <field name="columnDescriptionTitle" class="java.lang.String"/> + <field name="columnTotalForPeriodTitle" class="java.lang.String"/> + <field name="columnDebitTitle" class="java.lang.String"/> + <field name="columnCreditTitle" class="java.lang.String"/> + + <field name="lastPageColumnDescription" class="java.lang.String"/> + + <field name="debitBalance" class="java.math.BigDecimal"/> + <field name="creditBalance" class="java.math.BigDecimal"/> <variable name="generalEntryBooks" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource"> <variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{generalEntryBooks})]]></variableExpression> </variable> @@ -28,168 +60,101 @@ <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> - </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="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 x="0" y="0" width="40" height="20" forecolor="#804000" uuid="63da28a1-a793-4bf5-81d4-6a4d6fc1e4df"> - <property name="local_mesure_unitwidth" value="pixel"/> - </reportElement> - <box> - <rightPen lineWidth="0.6"/> - </box> + <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[Journal]]></text> - </staticText> - <staticText> - <reportElement x="40" y="0" width="394" height="20" forecolor="#804000" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb"> - <property name="local_mesure_unitheight" value="pixel"/> - </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="40" y="0" width="394" 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> @@ -223,98 +188,49 @@ </textField> </band> </pageFooter> - <lastPageFooter> - <band height="30"> - <frame> - <reportElement style="Default" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="578" height="20" forecolor="#D0B48E" backcolor="#F2EBDF" uuid="07f5ee06-0c59-46c6-b23e-052974f98f2f"> - <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> - <textField isBlankWhenNull="true"> - <reportElement x="0" y="0" width="434" height="20" forecolor="#736343" uuid="9e826238-b4eb-45d6-a470-859288447fad"> - <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> - <textElement textAlignment="Left" verticalAlignment="Middle"> - <font size="12" isBold="true" isItalic="true"/> - <paragraph lineSpacingSize="0.0" leftIndent="40"/> - </textElement> - <textFieldExpression><![CDATA["Total du Journal Général"]]></textFieldExpression> - </textField> - <textField isBlankWhenNull="true"> - <reportElement style="Default" x="434" y="0" width="72" height="20" forecolor="#736343" uuid="bfddf750-3e4a-459a-8f09-7f617d0112e8"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - </box> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <font fontName="DejaVu Sans Mono" size="8" isBold="true"/> - <paragraph lineSpacingSize="0.0" rightIndent="2"/> - </textElement> - <textFieldExpression><![CDATA[new Boolean($F{soldeDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeDebit}) : ""]]></textFieldExpression> - </textField> - <textField isBlankWhenNull="true"> - <reportElement style="Default" x="506" y="0" width="72" height="20" forecolor="#736343" uuid="eb9dc63a-0873-43de-91a5-6d54d0748b3d"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - </box> - <textElement textAlignment="Right" verticalAlignment="Middle"> - <font fontName="DejaVu Sans Mono" size="8" isBold="true"/> - <paragraph lineSpacingSize="0.0" rightIndent="2"/> - </textElement> - <textFieldExpression><![CDATA[new Boolean($F{soldeCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeCredit}) : ""]]></textFieldExpression> - </textField> - </frame> - <textField isBlankWhenNull="false"> - <reportElement x="0" y="20" width="288" height="10" uuid="87361454-c898-41a6-8d56-2cd13115ba14"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - </reportElement> - <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="3528c1ce-80bd-4714-948d-493b0bba736a"> - <property name="local_mesure_unity" value="pixel"/> - <property name="com.jaspersoft.studio.unit.y" value="px"/> - </reportElement> - <textElement textAlignment="Left"> - <paragraph lineSpacingSize="0.0"/> - </textElement> - <textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression> - </textField> - </band> - </lastPageFooter> + <lastPageFooter> + <band height="30"> + <frame> + <reportElement style="FooterHeader" stretchType="RelativeToBandHeight" x="0" y="0" width="578" height="20" isRemoveLineWhenBlank="true" uuid="ffa6f4ff-14e5-4501-acbe-0c4e832d9c2a"/> + <textField isBlankWhenNull="true"> + <reportElement style="FooterColumn" x="0" y="0" width="434" height="20" uuid="f818f119-5580-46fd-acbd-086f7d222dde"/> + <textElement textAlignment="Left" verticalAlignment="Middle"> + <font size="12" isBold="true" isItalic="true"/> + <paragraph lineSpacingSize="0.0" leftIndent="40"/> + </textElement> + <textFieldExpression><![CDATA[$F{lastPageColumnDescription}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="FooterColumn" x="434" y="0" width="72" height="20" 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"/> + </textElement> + <textFieldExpression><![CDATA[new Boolean($F{debitBalance}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{debitBalance}) : ""]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="FooterColumn" x="506" y="0" width="72" height="20" 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"/> + </textElement> + <textFieldExpression><![CDATA[new Boolean($F{creditBalance}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{creditBalance}) : ""]]></textFieldExpression> + </textField> + </frame> + <textField isBlankWhenNull="false"> + <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"/> + <textElement textAlignment="Left"> + <paragraph lineSpacingSize="0.0"/> + </textElement> + <textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression> + </textField> + </band> + </lastPageFooter> </jasperReport> diff --git a/lima-report/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml b/lima-report/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml index 2506f1e..0ddb70a 100644 --- a/lima-report/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.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-11T17:29:13 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-11T17:29: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="BalanceClassesReport" pageWidth="578" pageHeight="20" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Empty" isIgnorePagination="true" uuid="75ff [...] <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> @@ -18,12 +18,16 @@ <queryString> <![CDATA[]]> </queryString> - <field name="soldeDebit" class="java.math.BigDecimal"/> - <field name="soldeCredit" class="java.math.BigDecimal"/> + <field name="formatter" class="java.text.DecimalFormat"/> + <field name="dateFormat" class="java.text.SimpleDateFormat"/> + + <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> + + <field name="debitBalance" class="java.math.BigDecimal"/> + <field name="creditBalance" class="java.math.BigDecimal"/> <field name="entries" class="java.util.List"/> - <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> <field name="period" class="java.util.Date"/> - <field name="formatter" class="java.text.DecimalFormat"/> + <variable name="entries" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource"> <variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{entries})]]></variableExpression> </variable> @@ -32,12 +36,7 @@ <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> <frame> - <reportElement style="Default" mode="Opaque" x="0" y="0" width="578" height="10" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="b362ba5e-b960-4aff-8c28-d8288ee352a1"> - <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> + <reportElement style="Default" mode="Opaque" x="0" y="0" width="578" height="10" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="b362ba5e-b960-4aff-8c28-d8288ee352a1"/> <box> <topPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> @@ -45,11 +44,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> </box> <textField isBlankWhenNull="true"> - <reportElement x="0" y="0" width="578" height="10" forecolor="#736343" uuid="1472eda4-3df8-47ae-aba7-0aae2d2bedae"> - <property name="local_mesure_unity" value="pixel"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> + <reportElement x="0" y="0" width="578" height="10" forecolor="#736343" uuid="1472eda4-3df8-47ae-aba7-0aae2d2bedae"/> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -73,12 +68,7 @@ </band> <band height="10" splitType="Stretch"> <frame> - <reportElement style="Default" mode="Opaque" x="0" y="0" width="578" height="10" forecolor="#FFFFFF" backcolor="#FFFFFF" uuid="571d1774-22c4-4ab4-901b-7470c74f0405"> - <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> + <reportElement style="Default" mode="Opaque" x="0" y="0" width="578" height="10" forecolor="#FFFFFF" backcolor="#FFFFFF" uuid="571d1774-22c4-4ab4-901b-7470c74f0405"/> <box> <topPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> @@ -86,13 +76,7 @@ <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> </box> <textField isBlankWhenNull="true"> - <reportElement x="0" y="0" width="434" height="10" forecolor="#736343" uuid="dc68030b-597d-47b5-8be9-eecfdde17f5e"> - <property name="local_mesure_unity" value="pixel"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> + <reportElement x="0" y="0" width="434" height="10" forecolor="#736343" uuid="dc68030b-597d-47b5-8be9-eecfdde17f5e"/> <box> <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> @@ -117,7 +101,7 @@ <font fontName="DejaVu Sans Mono" size="8" isBold="true"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($F{soldeDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeDebit}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($F{debitBalance}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{debitBalance}) : ""]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> <reportElement style="Default" x="506" y="0" width="72" height="10" forecolor="#736343" uuid="edb8a8c1-ac7a-44cb-9de6-b231b00f966f"/> @@ -131,7 +115,7 @@ <font fontName="DejaVu Sans Mono" size="8" isBold="true"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($F{soldeCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{soldeCredit}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($F{creditBalance}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{creditBalance}) : ""]]></textFieldExpression> </textField> </frame> </band> diff --git a/lima-report/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml b/lima-report/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml index 0a0444b..5e154d0 100644 --- a/lima-report/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.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-11T11:54:13 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-11T11:54: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="BalanceClassesReport" pageWidth="578" pageHeight="21" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="75ff86c6-c370-4f0b-a2d3-e17324a465bb"> <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> @@ -10,11 +10,12 @@ <queryString> <![CDATA[]]> </queryString> + <field name="formatter" class="java.text.DecimalFormat"/> + <field name="code" class="java.lang.String"/> - <field name="libelle" class="java.lang.String"/> + <field name="description" class="java.lang.String"/> <field name="debit" class="java.math.BigDecimal"/> <field name="credit" class="java.math.BigDecimal"/> - <field name="formatter" class="java.text.DecimalFormat"/> <detail> <band height="10" splitType="Stretch"> <textField isBlankWhenNull="true"> @@ -47,7 +48,7 @@ <font size="8"/> <paragraph leftIndent="2"/> </textElement> - <textFieldExpression><![CDATA[$F{libelle}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{description}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> <reportElement x="434" y="0" width="72" height="10" uuid="53ba669a-6626-4e70-bbf0-fb243908a20e"/> diff --git a/lima-report/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml b/lima-report/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml index 130ea91..7a1a5ac 100644 --- a/lima-report/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml @@ -1,258 +1,179 @@ <?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-11T11:59:35 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-11T11:59:35 --> <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> + <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="subReport" class="net.sf.jasperreports.engine.JasperReport"/> - <field name="companyName" class="java.lang.String"/> - <field name="title" class="java.lang.String"/> - <field name="fromAccount" class="java.lang.String"/> - <field name="toAccount" class="java.lang.String"/> - <field name="formatter" class="java.text.DecimalFormat"/> - <field name="generalLedgers" class="java.util.List"/> + + <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> + <field name="generalLedgers" 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="columnBalanceTitle" 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="columnVoucherTitle" class="java.lang.String"/> + <variable name="generalLedgers" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource"> <variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{generalLedgers})]]></variableExpression> </variable> + <group name="generalLedgers"/> <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="02c35c41-1b1f-4554-ab87-5403d63ae3d6"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <textElement textAlignment="Left" verticalAlignment="Middle"> - <font size="8" isItalic="true"/> - </textElement> - <textFieldExpression><![CDATA["Comptes: " + $F{fromAccount}]]></textFieldExpression> - </textField> - </band> - </pageHeader> + + <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" forecolor="#D0B48E" backcolor="#FDCA97" uuid="6c2c2b44-eebf-41d3-8b56-47d4a20a4b24"> + <reportElement style="TableHeader" mode="Opaque" 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="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{columnDateTitle}]]></textFieldExpression> + </textField> + <textField> + <reportElement style="HeaderColumn" x="60" 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[Journal]]></text> - </staticText> - <staticText> - <reportElement x="100" y="0" width="40" height="20" forecolor="#804000" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="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="100" 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="140" y="0" width="222" 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="140" y="0" width="222" 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="362" y="0" width="72" height="20" forecolor="#804000" uuid="b6ea8597-d637-47d1-9a39-7c99101594e9"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.6" lineColor="#804000"/> - <leftPen lineWidth="0.6" lineColor="#804000"/> - <bottomPen lineWidth="0.6" lineColor="#804000"/> - <rightPen lineWidth="0.6" lineColor="#804000"/> - </box> + <textFieldExpression><![CDATA[$F{columnDescriptionTitle}]]></textFieldExpression> + </textField> + <textField> + <reportElement style="HeaderColumn" x="362" 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="434" y="0" width="72" height="20" forecolor="#804000" uuid="c4f9f592-7052-4b66-abc2-f04cc5f3972c"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> - <box> - <topPen 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="434" 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> - <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"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> - <box> - <topPen lineColor="#804000"/> - <leftPen lineColor="#804000"/> - <bottomPen lineColor="#804000"/> - <rightPen lineWidth="0.6" lineColor="#804000"/> - </box> + <textFieldExpression><![CDATA[$F{columnCreditTitle}]]></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[Solde]]></text> - </staticText> + <textFieldExpression><![CDATA[$F{columnBalanceTitle}]]></textFieldExpression> + </textField> </frame> </band> </columnHeader> + <detail> <band height="20" splitType="Stretch"> <subreport isUsingCache="false" runToBottom="false"> @@ -262,6 +183,7 @@ </subreport> </band> </detail> + <pageFooter> <band height="10" splitType="Stretch"> <property name="local_mesure_unitheight" value="pixel"/> diff --git a/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml b/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml index 6ec6335..675f32d 100644 --- a/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.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:00:01 --> +<!-- Created with Jaspersoft Studio version 6.1.0.final using JasperReports Library version 6.1.0 --> +<!-- 2015-07-07T11:29:55 --> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="31" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Empty" isIgnorePagination="true" uuid="75ff [...] <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> @@ -15,17 +15,27 @@ <property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/> <style name="Default" isDefault="true" fontName="DejaVu Sans"/> <style name="Default oblique" fontName="DejaVu Sans Mono"/> + <style name="TableBody" fontName="DejaVu Sans"/> + <style name="BodyColumn" fontName="DejaVu Sans" fontSize="8"> + <box> + <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + </box> + </style> <queryString> <![CDATA[]]> </queryString> + <field name="formatter" class="java.text.DecimalFormat"/> + <field name="dateFormat" class="java.text.SimpleDateFormat"/> <field name="date" class="java.util.Date"/> <field name="entryBook" class="java.lang.String"/> <field name="voucher" class="java.lang.String"/> <field name="description" class="java.lang.String"/> <field name="debit" class="java.math.BigDecimal"/> <field name="credit" class="java.math.BigDecimal"/> - <field name="solde" class="java.math.BigDecimal"/> - <field name="formatter" class="java.text.DecimalFormat"/> + <field name="balance" class="java.math.BigDecimal"/> <field name="nbEntries" class="java.lang.Integer"/> <variable name="subTotalDebit" class="java.math.BigDecimal" calculation="Sum"> <variableExpression><![CDATA[$F{debit}]]></variableExpression> @@ -35,141 +45,60 @@ <variableExpression><![CDATA[$F{credit}]]></variableExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> </variable> - <variable name="subTotalSolde" class="java.math.BigDecimal" calculation="Sum"> - <variableExpression><![CDATA[$F{solde}]]></variableExpression> + <variable name="subTotalBalance" class="java.math.BigDecimal" calculation="Sum"> + <variableExpression><![CDATA[$F{balance}]]></variableExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> </variable> <detail> <band height="10" splitType="Stretch"> <textField isBlankWhenNull="true"> - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="60" height="10" uuid="c5f32333-c77a-45f8-9bec-c8d61e15d85a"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - </box> + <reportElement style="BodyColumn" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="60" height="10" uuid="c5f32333-c77a-45f8-9bec-c8d61e15d85a"/> <textElement textAlignment="Left" verticalAlignment="Middle"> - <font size="8" isBold="true"/> <paragraph lineSpacingSize="0.0" leftIndent="2"/> </textElement> - <textFieldExpression><![CDATA[$F{date}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{dateFormat}.format($F{date})]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement x="60" y="0" width="40" height="10" uuid="0bcc6e5d-b2ee-474f-8e66-475933d55a16"> - <property name="local_mesure_unity" value="pixel"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - </box> + <reportElement style="BodyColumn" x="60" y="0" width="40" height="10" uuid="0bcc6e5d-b2ee-474f-8e66-475933d55a16"/> <textElement textAlignment="Left" verticalAlignment="Middle"> - <font size="8" isBold="true"/> <paragraph lineSpacingSize="0.0" leftIndent="2"/> </textElement> <textFieldExpression><![CDATA[$F{entryBook}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement x="100" y="0" width="40" height="10" uuid="e774e638-6353-46d0-9968-15992ef50bd3"> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - </box> + <reportElement style="BodyColumn" x="100" y="0" width="40" height="10" uuid="e774e638-6353-46d0-9968-15992ef50bd3"/> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font size="8" isBold="true"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[$F{voucher}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement style="Default" x="140" y="0" width="222" height="10" uuid="daac5561-4c81-4582-aabf-e8034c2cf93e"> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - </box> + <reportElement style="BodyColumn" x="140" y="0" width="222" height="10" uuid="daac5561-4c81-4582-aabf-e8034c2cf93e"/> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font size="8" isBold="true"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[$F{description}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement style="Default" x="362" y="0" width="72" height="10" uuid="53ba669a-6626-4e70-bbf0-fb243908a20e"> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - </box> + <reportElement style="BodyColumn" x="362" y="0" width="72" height="10" uuid="53ba669a-6626-4e70-bbf0-fb243908a20e"/> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font size="8" isBold="true"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($F{debit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{debit}) : ""]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement style="Default" x="434" y="0" width="72" height="10" uuid="edb8a8c1-ac7a-44cb-9de6-b231b00f966f"> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - </box> + <reportElement style="BodyColumn" x="434" y="0" width="72" height="10" uuid="edb8a8c1-ac7a-44cb-9de6-b231b00f966f"/> <textElement textAlignment="Right" verticalAlignment="Middle"> - <font size="8" isBold="true"/> <paragraph lineSpacingSize="0.0" rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($F{credit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{credit}) : ""]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement x="506" y="0" width="72" height="10" uuid="961e8048-c6ef-4b58-a857-31f9f29406c8"> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <box> - <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/> - </box> + <reportElement style="BodyColumn" x="506" y="0" width="72" height="10" uuid="961e8048-c6ef-4b58-a857-31f9f29406c8"/> <textElement textAlignment="Right"> - <font size="8"/> <paragraph rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($F{solde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{solde}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($F{balance}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{balance}) : ""]]></textFieldExpression> </textField> </band> </detail> @@ -179,72 +108,59 @@ <property name="com.jaspersoft.studio.unit.height" value="px"/> <printWhenExpression><![CDATA[$V{REPORT_COUNT} < $F{nbEntries}]]></printWhenExpression> <frame> - <reportElement x="0" y="0" width="578" height="10" uuid="5863f40f-6423-4463-ad4a-c4cecab0323c"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> + <reportElement x="0" y="0" width="578" height="10" uuid="5863f40f-6423-4463-ad4a-c4cecab0323c"/> <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"/> + <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> <textField> - <reportElement x="362" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> + <reportElement x="0" y="0" width="362" height="10" forecolor="#736343" uuid="3deefb8e-456b-4bbb-8574-1a02651e5d7f"/> + <box> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + </box> + <textElement> + <font size="8" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA["Sous total"]]></textFieldExpression> + </textField> + <textField> + <reportElement x="362" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"/> + <box> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + </box> <textElement textAlignment="Right"> - <font size="8"/> + <font size="8" isBold="true"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($V{subTotalDebit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{subTotalDebit}) : ""]]></textFieldExpression> </textField> <textField> - <reportElement x="434" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> + <reportElement x="434" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"/> + <box> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + </box> <textElement textAlignment="Right"> - <font size="8"/> + <font size="8" isBold="true"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[new Boolean($V{subTotalCredit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{subTotalCredit}) : ""]]></textFieldExpression> </textField> <textField> - <reportElement x="506" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> + <reportElement x="506" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"/> + <box> + <leftPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#804000"/> + </box> <textElement textAlignment="Right"> - <font size="8"/> + <font size="8" isBold="true"/> <paragraph rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($V{subTotalSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{subTotalSolde}) : ""]]></textFieldExpression> - </textField> - <textField> - <reportElement x="0" y="0" width="362" height="10" forecolor="#736343" uuid="3deefb8e-456b-4bbb-8574-1a02651e5d7f"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> - <textElement> - <font size="8"/> - </textElement> - <textFieldExpression><![CDATA["Sous total"]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($V{subTotalBalance}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{subTotalBalance}) : ""]]></textFieldExpression> </textField> </frame> </band> diff --git a/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml b/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml index 7169223..9987b00 100644 --- a/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.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:00:32 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-11T12:00:32 --> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="31" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Empty" uuid="75ff86c6-c370-4f0b-a2d3-e17324 [...] <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,15 +18,18 @@ <queryString> <![CDATA[]]> </queryString> + <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> + <field name="formatter" class="java.text.DecimalFormat"/> + + <field name="entries" class="java.util.List"/> + <field name="accountNumber" class="java.lang.String"/> <field name="label" class="java.lang.String"/> <field name="debit" class="java.math.BigDecimal"/> <field name="credit" class="java.math.BigDecimal"/> - <field name="solde" class="java.math.BigDecimal"/> - <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> - <field name="entries" class="java.util.List"/> + <field name="balance" class="java.math.BigDecimal"/> <field name="nbEntries" class="java.lang.Integer"/> - <field name="formatter" class="java.text.DecimalFormat"/> + <variable name="entries" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource"> <variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{entries})]]></variableExpression> </variable> @@ -38,8 +41,8 @@ <variableExpression><![CDATA[$F{credit}]]></variableExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> </variable> - <variable name="totalPeriodSolde" class="java.math.BigDecimal" calculation="Sum"> - <variableExpression><![CDATA[$F{solde}]]></variableExpression> + <variable name="totalPeriodBalance" class="java.math.BigDecimal" calculation="Sum"> + <variableExpression><![CDATA[$F{balance}]]></variableExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> </variable> <variable name="totalAccountDebit" class="java.math.BigDecimal" calculation="Sum"> @@ -50,35 +53,27 @@ <variableExpression><![CDATA[$F{credit}]]></variableExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> </variable> - <variable name="totalAccountSolde" class="java.math.BigDecimal" calculation="Sum"> - <variableExpression><![CDATA[$F{solde}]]></variableExpression> + <variable name="totalAccountBalance" class="java.math.BigDecimal" calculation="Sum"> + <variableExpression><![CDATA[$F{balance}]]></variableExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> </variable> - <variable name="solde1" class="java.math.BigDecimal" resetType="Column" calculation="Sum"> - <variableExpression><![CDATA[$F{solde}]]></variableExpression> + <variable name="balance1" class="java.math.BigDecimal" resetType="Column" calculation="Sum"> + <variableExpression><![CDATA[$F{balance}]]></variableExpression> </variable> <detail> <band height="10"> <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> <frame> - <reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="578" height="10" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="644d4927-8973-45d7-bd80-0512dad33987"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> + <reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="578" height="10" forecolor="#FEEEDE" backcolor="#FEEEDE" uuid="644d4927-8973-45d7-bd80-0512dad33987"/> <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"/> + <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> <textField pattern=""> - <reportElement mode="Transparent" x="0" y="0" width="578" height="10" forecolor="#736343" uuid="b3b8449e-a63c-445d-8699-f0b9579f34f3"> - <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> + <reportElement mode="Transparent" x="0" y="0" width="578" height="10" forecolor="#736343" uuid="b3b8449e-a63c-445d-8699-f0b9579f34f3"/> <textElement textAlignment="Center"> <font size="8" isBold="true"/> <paragraph leftIndent="0"/> @@ -89,10 +84,7 @@ </band> <band height="10" splitType="Stretch"> <subreport isUsingCache="false" runToBottom="false"> - <reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="0877d57b-0e57-4e7a-a97e-c5418acbf030"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> + <reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="0877d57b-0e57-4e7a-a97e-c5418acbf030"/> <dataSourceExpression><![CDATA[$V{entries}]]></dataSourceExpression> <subreportExpression><![CDATA[$F{subReport}]]></subreportExpression> </subreport> @@ -101,25 +93,15 @@ <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> <frame> - <reportElement x="0" y="0" width="578" height="10" uuid="5863f40f-6423-4463-ad4a-c4cecab0323c"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> + <reportElement x="0" y="0" width="578" height="10" uuid="5863f40f-6423-4463-ad4a-c4cecab0323c"/> <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"/> + <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> <textField isBlankWhenNull="true"> - <reportElement x="362" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> + <reportElement x="362" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"/> <textElement textAlignment="Right"> <font size="8" isBold="true"/> <paragraph rightIndent="2"/> @@ -127,14 +109,7 @@ <textFieldExpression><![CDATA[$F{debit}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement x="434" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> + <reportElement x="434" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"/> <textElement textAlignment="Right"> <font size="8" isBold="true"/> <paragraph rightIndent="2"/> @@ -142,27 +117,15 @@ <textFieldExpression><![CDATA[$F{credit}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement x="506" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> + <reportElement x="506" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"/> <textElement textAlignment="Right"> <font size="8" isBold="true"/> <paragraph rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[$F{solde}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{balance}]]></textFieldExpression> </textField> <textField pattern=""> - <reportElement mode="Transparent" x="0" y="0" width="362" height="10" forecolor="#736343" uuid="3deefb8e-456b-4bbb-8574-1a02651e5d7f"> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - </reportElement> + <reportElement mode="Transparent" x="0" y="0" width="362" height="10" forecolor="#736343" uuid="3deefb8e-456b-4bbb-8574-1a02651e5d7f"/> <textElement> <font size="8" isBold="true"/> </textElement> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm