branch feature/1241-account-report updated (5f895d0 -> 395e868)
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 5f895d0 refs #1241 ajout de l'icon de sauvegarde présente sur le 1er écran au 1er lancement de lima new 395e868 refs #1241 progression sur internationalisation des rapports, ajout de l'entête avec l'identité sur tous les rapports The 1 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 395e8680cadddad989da41a640a8730ac81b9fee Author: dcosse <cosse@codelutin.com> Date: Thu Jul 30 17:10:33 2015 +0200 refs #1241 progression sur internationalisation des rapports, ajout de l'entête avec l'identité sur tous les rapports Summary of changes: .../lima/business/ejb/AbstractLimaService.java | 5 - .../ejb/report/AccountReportServiceImpl.java | 46 ++-- .../ejb/report/BalanceReportServiceImpl.java | 28 +-- .../business/ejb/report/CommonsDocumentReport.java | 57 +++++ .../report/GeneralEntryBookReportServiceImpl.java | 18 +- .../ejb/report/LedgerReportServiceImpl.java | 19 +- .../ProvisionalEntryBookReportServiceImpl.java | 25 ++- .../resources/i18n/lima-business_en_GB.properties | 80 ++++--- .../resources/i18n/lima-business_fr_FR.properties | 78 ++++--- lima-callao/src/main/xmi/lima-callao-model.zargo | Bin 60092 -> 61424 bytes .../jasperreports/account/DocumentReport.jrxml | 250 +++++++++++++-------- .../jasperreports/balance/DocumentReport.jrxml | 86 +++++-- .../jasperreports/entryBook/DocumentReport.jrxml | 86 +++++-- .../jasperreports/entryBook/EntryBookReport.jrxml | 3 +- .../entryBook/FinancialPeriodReport.jrxml | 4 +- .../entryBook/TransactionReport.jrxml | 29 +-- .../generalEntryBook/DocumentReport.jrxml | 86 +++++-- .../generalEntryBook/EntryBookPeriodReport.jrxml | 6 +- .../generalLedger/DocumentReport.jrxml | 86 +++++-- .../generalLedger/GeneralLedgerReport.jrxml | 18 +- .../org/chorem/lima/ui/identity/IdentityForm.css | 8 + .../org/chorem/lima/ui/identity/IdentityForm.jaxx | 4 +- .../chorem/lima/ui/identity/IdentityHandler.java | 12 + .../resources/i18n/lima-swing_en_GB.properties | 32 +-- 24 files changed, 727 insertions(+), 339 deletions(-) create mode 100644 lima-business/src/main/java/org/chorem/lima/business/ejb/report/CommonsDocumentReport.java -- 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 395e8680cadddad989da41a640a8730ac81b9fee Author: dcosse <cosse@codelutin.com> Date: Thu Jul 30 17:10:33 2015 +0200 refs #1241 progression sur internationalisation des rapports, ajout de l'entête avec l'identité sur tous les rapports --- .../lima/business/ejb/AbstractLimaService.java | 5 - .../ejb/report/AccountReportServiceImpl.java | 46 ++-- .../ejb/report/BalanceReportServiceImpl.java | 28 +-- .../business/ejb/report/CommonsDocumentReport.java | 57 +++++ .../report/GeneralEntryBookReportServiceImpl.java | 18 +- .../ejb/report/LedgerReportServiceImpl.java | 19 +- .../ProvisionalEntryBookReportServiceImpl.java | 25 ++- .../resources/i18n/lima-business_en_GB.properties | 80 ++++--- .../resources/i18n/lima-business_fr_FR.properties | 78 ++++--- lima-callao/src/main/xmi/lima-callao-model.zargo | Bin 60092 -> 61424 bytes .../jasperreports/account/DocumentReport.jrxml | 250 +++++++++++++-------- .../jasperreports/balance/DocumentReport.jrxml | 86 +++++-- .../jasperreports/entryBook/DocumentReport.jrxml | 86 +++++-- .../jasperreports/entryBook/EntryBookReport.jrxml | 3 +- .../entryBook/FinancialPeriodReport.jrxml | 4 +- .../entryBook/TransactionReport.jrxml | 29 +-- .../generalEntryBook/DocumentReport.jrxml | 86 +++++-- .../generalEntryBook/EntryBookPeriodReport.jrxml | 6 +- .../generalLedger/DocumentReport.jrxml | 86 +++++-- .../generalLedger/GeneralLedgerReport.jrxml | 18 +- .../org/chorem/lima/ui/identity/IdentityForm.css | 8 + .../org/chorem/lima/ui/identity/IdentityForm.jaxx | 4 +- .../chorem/lima/ui/identity/IdentityHandler.java | 12 + .../resources/i18n/lima-swing_en_GB.properties | 32 +-- 24 files changed, 727 insertions(+), 339 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 2cb10ea..bedb0a5 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,8 +27,6 @@ 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...). * @@ -37,9 +35,6 @@ import java.text.SimpleDateFormat; */ 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 6616e08..1879a4b 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 @@ -5,7 +5,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.chorem.lima.beans.AccountEntry; 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; @@ -15,7 +14,6 @@ import org.chorem.lima.business.ejb.AbstractLimaService; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountTopiaDao; import org.chorem.lima.entity.Entry; -import org.chorem.lima.entity.Identity; import javax.ejb.EJB; import javax.ejb.Remote; @@ -45,17 +43,10 @@ public class AccountReportServiceImpl extends AbstractLimaService implements Acc @Override public DocumentReport getAccountDocumentReport(String accountId, Date from, Date to, JasperReport accountsEntryJasperReport, DecimalFormat bigDecimalFormat) { - 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")); - 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")); + String reportName = t("lima-business.document.accountReport.title"); + DocumentReport documentReport = CommonsDocumentReport.getDocumentReport(reportName, from, to, accountsEntryJasperReport, bigDecimalFormat, identityService); + + setHeaderColumnTitles(documentReport); AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountDao(); Account account = accountTopiaDao.forTopiaIdEquals(accountId).findUniqueOrNull(); @@ -98,7 +89,7 @@ public class AccountReportServiceImpl extends AbstractLimaService implements Acc documentReport.addAllAccounts(accountEntries); if (CollectionUtils.isEmpty(accountEntries)) { - selectedAccounts += ", aucune entrée trouvé sur ce compte"; + selectedAccounts += ", aucune entrée trouvée sur ce compte"; } else if (accountEntries.size() == 1){ selectedAccounts += ", et son compte fils"; } else { @@ -116,23 +107,14 @@ public class AccountReportServiceImpl extends AbstractLimaService implements Acc return documentReport; } - 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(reportName); - - 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; + protected void setHeaderColumnTitles(DocumentReport documentReport) { + documentReport.setColumnAccountTitle(t("lima-business.document.columnAccountTitle")); + documentReport.setColumnDateTitle(t("lima-business.document.columnDateTitle")); + documentReport.setColumnEntryBookTitle(t("lima-business.document.columnEntryBookTitle")); + documentReport.setColumnVoucherTitle(t("lima-business.document.columnVoucherTitle")); + documentReport.setColumnDescriptionTitle(t("lima-business.document.columnDescriptionTitle")); + documentReport.setColumnLetterTitle(t("lima-business.document.columnLetterTitle")); + documentReport.setColumnDebitTitle(t("lima-business.document.columnDebitTitle")); + documentReport.setColumnCreditTitle(t("lima-business.document.columnCreditTitle")); } } 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 7992e2f..ff5af26 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 @@ -91,17 +91,17 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal @Override public DocumentReport getBalanceDocumentReport(Date from, Date to, String selectedAccounts, DecimalFormat bigDecimalFormat, JasperReport mainAccountsJasperReport, JasperReport subAccountsJasperReport) { - 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.setColumnBalanceForPeriodTitle(t("lima.config.documentReport.columnBalanceForPeriodTitle")); - 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")); + String reportName = t("lima-business.document.balanceReport.title"); + DocumentReport documentReport = CommonsDocumentReport.getDocumentReport(reportName, from, to, mainAccountsJasperReport, bigDecimalFormat, identityService); + + documentReport.setColumnAccountTitle(t("lima-business.document.columnAccountTitle")); + documentReport.setColumnBalanceForPeriodTitle(t("lima-business.document.columnBalanceForPeriodTitle")); + documentReport.setColumnCreditTitle(t("lima-business.document.columnCreditTitle")); + documentReport.setColumnDateTitle(t("lima-business.document.columnDateTitle")); + documentReport.setColumnDebitTitle(t("lima-business.document.columnDebitTitle")); + documentReport.setColumnDescriptionTitle(t("lima-business.document.columnDescriptionTitle")); + documentReport.setColumnTotalForPeriodTitle(t("lima-business.document.columnTotalForPeriodTitle")); + documentReport.setColumnVoucherTitle(t("lima-business.document.columnVoucherTitle")); BalanceTrial balanceTrial = new BalanceTrialImpl(); balanceTrial.setReportsDatas(new ArrayList<ReportsDatas>()); @@ -157,7 +157,7 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal 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)); + documentReport.setHeaderSelectedAccounts(t("lima-business.document.headerSelectedAccounts", fromAccountText, toAccountText)); } /** @@ -211,8 +211,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")); + balanceAccount.setSubTotalForLabel(t("lima-business.document.subTotalFor")); + balanceAccount.setTotalForLabel(t("lima-business.document.totalFor")); if (balance.compareTo(BigDecimal.ZERO) == 1) { balanceAccount.setDebitBalance(balance.abs()); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/CommonsDocumentReport.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/CommonsDocumentReport.java new file mode 100644 index 0000000..3b17a97 --- /dev/null +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/CommonsDocumentReport.java @@ -0,0 +1,57 @@ +package org.chorem.lima.business.ejb.report; + +import net.sf.jasperreports.engine.JasperReport; +import org.apache.commons.lang3.StringUtils; +import org.chorem.lima.beans.DocumentReport; +import org.chorem.lima.beans.DocumentReportImpl; +import org.chorem.lima.business.api.IdentityService; +import org.chorem.lima.entity.Identity; + +import java.text.DecimalFormat; +import java.text.SimpleDateFormat; +import java.util.Date; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created by davidcosse on 29/07/15. + */ +public class CommonsDocumentReport { + + public static SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM/yyyy"); + public static SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("HH:mm"); + + 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(reportName); + + Identity identity = identityService.getIdentity(); + String companyName = identity == null ? "" : identity.getName(); + String companyAddress = identity == null ? "" : StringUtils.replace(identity.getAddress(), "\n", ", "); + String companyPostCode = identity == null ? "" : identity.getZipCode(); + String companyCity = identity == null ? "" : identity.getCity(); + String businessNumber = identity == null ? "" : identity.getBusinessNumber(); + String phone = identity == null ? "" : identity.getPhoneNumber(); + + documentReport.setTitleCompanyName(companyName); + documentReport.setTitleCompanyAddress(companyAddress); + documentReport.setTitleCompanyPostCode(companyPostCode); + documentReport.setTitleCompanyCity(companyCity); + documentReport.setTitleCompanySiret(businessNumber); + documentReport.setTitleCompanyPhone(phone); + + documentReport.setTitleCompanySiretLabel(t("lima-business.document.titleCompanySiretLabel")); + documentReport.setTitleCompanyPhoneLabel(t("lima-business.document.titleCompanyPhoneLabel")); + documentReport.setTitleCurrentDate(t("lima-business.document.titleCurrentDate", DATE_FORMAT.format(currentDate), TIME_FORMAT.format(currentDate))); + documentReport.setTitleFromToDate(t("lima-business.document.titleFromToDate", DATE_FORMAT.format(from), DATE_FORMAT.format(to))); + + documentReport.setHeaderSelectedAccountsLabel(t("lima-business.document.headerSelectedAccountsLabel")); + documentReport.setHeaderCurrencyLabel(t("lima-business.document.headerCurrencyLabel")); + documentReport.setHeaderCurrency(bigDecimalFormat.getDecimalFormatSymbols().getCurrencySymbol()); + return documentReport; + } +} 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 31ea391..bf4bd1e 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 @@ -93,15 +93,15 @@ public class GeneralEntryBookReportServiceImpl extends AbstractLimaService imple @Override public DocumentReport getGeneralEntryBookDocumentReport(Date beginDate, Date endDate, DecimalFormat bigDecimalFormat, JasperReport generalEntryBooksJasperReport, JasperReport entriesJasperReport) { - String reportName = t("lima.config.documentReport.generalEntryBookReport.title"); - DocumentReport documentReport = AccountReportServiceImpl.getDocumentReport(reportName, beginDate, endDate, generalEntryBooksJasperReport, bigDecimalFormat, identityService); + String reportName = t("lima-business.document.generalEntryBookReport.title"); + DocumentReport documentReport = CommonsDocumentReport.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")); + documentReport.setColumnEntryBookTitle(t("lima-business.document.columnEntryBookTitle")); + documentReport.setColumnDescriptionTitle(t("lima-business.document.columnDescriptionTitle")); + documentReport.setColumnTotalForPeriodTitle(t("lima-business.document.columnTotalForPeriodTitle")); + documentReport.setColumnDebitTitle(t("lima-business.document.columnDebitTitle")); + documentReport.setColumnCreditTitle(t("lima-business.document.columnCreditTitle")); + documentReport.setLastPageColumnDescription(t("lima-business.document.entrybook.lastPageColumnDescription")); try { if (beginDate != null && endDate != null) { @@ -176,6 +176,8 @@ public class GeneralEntryBookReportServiceImpl extends AbstractLimaService imple if (subAmountCredit.compareTo(BigDecimal.ZERO) != 0 && subAmountDebit.compareTo(BigDecimal.ZERO) != 0) { GeneralEntryBook generalEntryBook = new GeneralEntryBookImpl(); + generalEntryBook.setSubTotalForMonthText(t("lima-business.document.subTotalForMonthText")); + generalEntryBook.setForMonthText(t("lima-business.document.forMonthText")); generalEntryBook.setFormatter(bigDecimalFormat); generalEntryBook.setDateFormat(LimaBusinessConfig.getInstance().getDateFormat()); generalEntryBook.setPeriod(financialPeriod.getBeginDate()); 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 3e4c4d7..ffec468 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 @@ -71,16 +71,16 @@ public class LedgerReportServiceImpl extends AbstractLimaService implements Ledg // grand livre @Override public DocumentReport getLedgerDocumentReport(Date beginDate, Date endDate, DecimalFormat decimalFormat, JasperReport generalLedgersJasperReport, JasperReport entriesJasperReport) { - String reportName = t("lima.config.documentReport.ledgerReport.title"); - DocumentReport documentReport = AccountReportServiceImpl.getDocumentReport(reportName, beginDate, endDate, generalLedgersJasperReport, decimalFormat, identityService); + String reportName = t("lima-business.document.ledgerReport.title"); + DocumentReport documentReport = CommonsDocumentReport.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")); + documentReport.setColumnDateTitle(t("lima-business.document.setColumnDateTitle")); + documentReport.setColumnEntryBookTitle(t("lima-business.document.setColumnEntryBookTitle")); + documentReport.setColumnVoucherTitle(t("lima-business.document.columnVoucherTitle")); + documentReport.setColumnDescriptionTitle(t("lima-business.document.columnDescriptionTitle")); + documentReport.setColumnDebitTitle(t("lima-business.document.columnDebitTitle")); + documentReport.setColumnCreditTitle(t("lima-business.document.columnCreditTitle")); + documentReport.setColumnBalanceTitle(t("lima-business.document.columnBalanceTitle")); if (beginDate != null && endDate != null) { try { @@ -99,6 +99,7 @@ public class LedgerReportServiceImpl extends AbstractLimaService implements Ledg if (account != null) { GeneralLedger generalLedger = new GeneralLedgerImpl(); generalLedger.setFormatter(decimalFormat); + generalLedger.setTotalForAccountText(t("lima-business.document.totalForAccount")); generalLedger.setAccountNumber(account.getAccountNumber()); generalLedger.setLabel(account.getLabel()); BigDecimal amountCredit = reportsDatas.getAmountCredit(); 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 cf5a0a5..206f478 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 @@ -81,18 +81,18 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo @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); + String reportName = t("lima-business.document.provisionalEntryBookReport.title"); + DocumentReport documentReport = CommonsDocumentReport.getDocumentReport(reportName, beginDate, endDate, entryBooksJasperReport, bigDecimalFormat, identityService); - 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.setColumnVoucherTitle(t("lima.config.documentReport.columnVoucherTitle")); + documentReport.setColumnAccountTitle(t("lima-business.document.columnAccountTitle")); + documentReport.setColumnCreditTitle(t("lima-business.document.columnCreditTitle")); + documentReport.setColumnDateTitle(t("lima-business.document.columnDateTitle")); + documentReport.setColumnDebitTitle(t("lima-business.document.columnDebitTitle")); + documentReport.setColumnDescriptionTitle(t("lima-business.document.columnDescriptionTitle")); + documentReport.setColumnTotalForPeriodTitle(t("lima-business.document.columnTotalForPeriodTitle")); + documentReport.setColumnVoucherTitle(t("lima-business.document.columnVoucherTitle")); - documentReport.setLastPageColumnDescription(t("lima.config.documentReport.generalEntrybook.lastPageColumnDescription")); + documentReport.setLastPageColumnDescription(t("lima-business.document.generalEntrybook.lastPageColumnDescription")); try { @@ -120,6 +120,7 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo entryBookReport.setCode(entryBook.getCode()); entryBookReport.setSubReport(financialPeriodsJasperReport); entryBookReport.setFormatter(bigDecimalFormat); + entryBookReport.setEntryBookCodeAndNameText(t("lima-business.document.entryBookCodeAndName")); BigDecimal entryBookSoldeDebit = BigDecimal.ZERO; BigDecimal entryBookSoldeCredit = BigDecimal.ZERO; @@ -128,6 +129,8 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo for (FinancialPeriod financialPeriod : financialPeriods) { org.chorem.lima.beans.FinancialPeriod financialPeriodReport = new FinancialPeriodImpl(); + financialPeriodReport.setForMonthText(t("lima-business.document.forMonthText")); + financialPeriodReport.setBalanceForEntryBookText(t("lima-business.document.balanceForEntryBook")); financialPeriodReport.setSubReport(transactionsJasperReport); financialPeriodReport.setPeriod(financialPeriod.getBeginDate()); @@ -149,6 +152,8 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo Account account = entry.getAccount(); String accountLabel = account != null ? entry.getAccount().getAccountNumber() + " - " + entry.getAccount().getLabel() : ""; Transaction transaction = new TransactionImpl(); + transaction.setSubTotalText(t("lima-business.document.subTotal")); + transaction.setSubTotalForText(t("lima-business.document.subTotalFor")); transaction.setTransactionDate(entry.getFinancialTransaction().getTransactionDate()); transaction.setAccount(accountLabel); transaction.setDescription(entry.getDescription()); 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 921217d..f809c87 100644 --- a/lima-business/src/main/resources/i18n/lima-business_en_GB.properties +++ b/lima-business/src/main/resources/i18n/lima-business_en_GB.properties @@ -1,17 +1,36 @@ application.version=Version blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description= lima-business.document.account=Account +lima-business.document.account.noAccount=Any account present +lima-business.document.account.noAccountTitle=Any account present +lima-business.document.accountReport.title=ACCOUNT lima-business.document.accounts=Accounts lima-business.document.address=Address lima-business.document.addressMore=Address (more) lima-business.document.amount=Amount lima-business.document.amounts=Amounts lima-business.document.amountsperiod=Amounts %1$tB %1$tY +lima-business.document.assets=Assets lima-business.document.balance=Balance +lima-business.document.balanceForEntryBook=Total for entry book %s until %s +lima-business.document.balanceReport.title=BALANCE +lima-business.document.balanceSheet=Balance lima-business.document.businessnumber=Business N° lima-business.document.city=City lima-business.document.classificationcode=Classification Code +lima-business.document.columnAccountTitle=Account +lima-business.document.columnBalanceForPeriodTitle=Balance +lima-business.document.columnBalanceTitle=Balance +lima-business.document.columnCreditTitle=Credit +lima-business.document.columnDateTitle=Date +lima-business.document.columnDebitTitle=Debit +lima-business.document.columnDescriptionTitle=Label +lima-business.document.columnEntryBookTitle=Entry book +lima-business.document.columnLetterTitle=Letter +lima-business.document.columnTotalForPeriodTitle=Total for period +lima-business.document.columnVoucherTitle=Voucher lima-business.document.credit=Credit +lima-business.document.currentAsset=Current asset lima-business.document.date=Date lima-business.document.date.begin=Begin date lima-business.document.date.end=End date @@ -19,13 +38,24 @@ lima-business.document.dateformat=%1$tm/%1$te/%1$tY lima-business.document.debit=Debit lima-business.document.description=Description lima-business.document.entries=Entries +lima-business.document.entryBookCodeAndName=Entry book %s %s lima-business.document.entrybook=Entry book +lima-business.document.entrybook.lastPageColumnDescription=Total for selected entry books lima-business.document.entrybooks=Entry books lima-business.document.financialstatement=FinancialStatement +lima-business.document.forMonthText=%s +lima-business.document.generalEntryBookReport.title=PROVISIONAL GENERAL ENTRY BOOK +lima-business.document.generalEntrybook.lastPageColumnDescription=Provisional general entry book total lima-business.document.generalentrybook=General EntryBook lima-business.document.grossamount=Gross Amount +lima-business.document.headerCurrencyLabel=Currency\: +lima-business.document.headerSelectedAccounts=%s to %s +lima-business.document.headerSelectedAccountsLabel=Accounts\: +lima-business.document.investments=Investments lima-business.document.label=Label lima-business.document.ledger=Ledger +lima-business.document.ledgerReport.title=LEDGER +lima-business.document.liabilities=Liabilities lima-business.document.monthformat=%1$tB %1$tY lima-business.document.movementcredit=Credit movement lima-business.document.movementdebit=Debit movement @@ -34,11 +64,23 @@ lima-business.document.period1=Periode from lima-business.document.period1format=%1$tm/%1$te/%1$tY lima-business.document.period2=to lima-business.document.period2format=%1$tm/%1$te/%1$tY +lima-business.document.provisionalEntryBookReport.title=PROVISIONAL ENTRY BOOK lima-business.document.provisiondeprecationamount=Provision Deprecation Amount +lima-business.document.setColumnDateTitle=Date +lima-business.document.setColumnEntryBookTitle=Entry book lima-business.document.society=Society lima-business.document.solde=Solde lima-business.document.soldecredit=Credit solde lima-business.document.soldedebit=Debit solde +lima-business.document.subTotal=Sub total +lima-business.document.subTotalFor=Sub total for %s +lima-business.document.subTotalForMonthText= +lima-business.document.titleCompanyPhoneLabel=Phone\: +lima-business.document.titleCompanySiretLabel=Business N°\: +lima-business.document.titleCurrentDate=Printed on %s at %s +lima-business.document.titleFromToDate=From %s to %s +lima-business.document.totalFor=total for\: +lima-business.document.totalForAccount=Total for account %s lima-business.document.vat=VAT form lima-business.document.vatnumber=VAT N° lima-business.document.voucher=Voucher @@ -58,54 +100,19 @@ 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 -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= -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= -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.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 -lima.config.documentReport.totalFor=total for\: lima.config.host.address.description= lima.config.httpport.description=HTTP Port lima.config.reports.dir.description= @@ -126,6 +133,9 @@ lima.host.http.port.description= lima.importexport.import.alreadyExistFinancialStatement=Same financial statement exists lima.lettering.accountRegularization=Regulatory account lima.report.fromDateToDate= +lima.reports.account.noAccount=Any account present +lima.reports.account.noAccountTitle=Any account present +lima.reports.accounts=Accounts 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 da69ed6..bfabd31 100644 --- a/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties +++ b/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties @@ -1,17 +1,34 @@ application.version=Version blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description= lima-business.document.account=Compte +lima-business.document.accountReport.title=COMPTE lima-business.document.accounts=Comptes lima-business.document.address=Adresse lima-business.document.addressMore=Adresse - suite lima-business.document.amount=Total lima-business.document.amounts=Totaux lima-business.document.amountsperiod=Totaux %1$tB %1$tY +lima-business.document.assets=avoirs lima-business.document.balance=Balance +lima-business.document.balanceForEntryBook=Solde pour le journal %s jusqu'à fin %s +lima-business.document.balanceReport.title=BALANCE +lima-business.document.balanceSheet=Balance lima-business.document.businessnumber=N° Siret lima-business.document.city=Ville lima-business.document.classificationcode=NAF +lima-business.document.columnAccountTitle=Compte +lima-business.document.columnBalanceForPeriodTitle=Solde période +lima-business.document.columnBalanceTitle=Solde +lima-business.document.columnCreditTitle=Crédit +lima-business.document.columnDateTitle=Date +lima-business.document.columnDebitTitle=Débit +lima-business.document.columnDescriptionTitle=Intitulé +lima-business.document.columnEntryBookTitle=Journal +lima-business.document.columnLetterTitle=Lettre +lima-business.document.columnTotalForPeriodTitle=Total période +lima-business.document.columnVoucherTitle=Pièce comptable lima-business.document.credit=Crédit +lima-business.document.currentAsset=Actif à court terme lima-business.document.date=Date lima-business.document.date.begin=Date de début\: lima-business.document.date.end=Date de fin\: @@ -19,13 +36,24 @@ lima-business.document.dateformat=%1$te/%1$tm/%1$tY lima-business.document.debit=Débit lima-business.document.description=Description lima-business.document.entries=entrées +lima-business.document.entryBookCodeAndName=Journal %s %s lima-business.document.entrybook=Journal +lima-business.document.entrybook.lastPageColumnDescription=Total pour les journaux sélectionnés lima-business.document.entrybooks=Journaux lima-business.document.financialstatement=Bilan et compte de résultat +lima-business.document.forMonthText=Mois de\:%s +lima-business.document.generalEntryBookReport.title=JOURNAL GÉNÉRAL PROVISOIRE +lima-business.document.generalEntrybook.lastPageColumnDescription=Total du Journal Général lima-business.document.generalentrybook=Journal Général lima-business.document.grossamount=Brut +lima-business.document.headerCurrencyLabel=Devise\: +lima-business.document.headerSelectedAccounts=%s à %s +lima-business.document.headerSelectedAccountsLabel=Comptes\: +lima-business.document.investments=investissements lima-business.document.label=Libellé lima-business.document.ledger=Grand Livre +lima-business.document.ledgerReport.title=GRAND LIVRE +lima-business.document.liabilities=passif lima-business.document.monthformat=%1$tB %1$tY lima-business.document.movementcredit=Mouvement Créditeur lima-business.document.movementdebit=Mouvement Débiteur @@ -34,11 +62,23 @@ lima-business.document.period1=Période du lima-business.document.period1format=%1$te/%1$tm/%1$tY lima-business.document.period2=au lima-business.document.period2format=%1$te/%1$tm/%1$tY +lima-business.document.provisionalEntryBookReport.title=JOURNAL PROVISOIRE lima-business.document.provisiondeprecationamount=Amortissements et provisions +lima-business.document.setColumnDateTitle=Date +lima-business.document.setColumnEntryBookTitle=Journal lima-business.document.society=Nom lima-business.document.solde=Solde lima-business.document.soldecredit=Solde Créditeur lima-business.document.soldedebit=Solde Débiteur +lima-business.document.subTotal=Sous total +lima-business.document.subTotalFor=Sous total pour %s +lima-business.document.subTotalForMonthText=Sous-total pour le mois de %s +lima-business.document.titleCompanyPhoneLabel=Téléphone\: +lima-business.document.titleCompanySiretLabel=SIRET\: +lima-business.document.titleCurrentDate=Édition du %s à %s +lima-business.document.titleFromToDate=Du %s au %s +lima-business.document.totalFor=total pour\: +lima-business.document.totalForAccount=Total pour le compte %s lima-business.document.treasuryPeriod=%1$te%1$tm%1$tY lima-business.document.vat=Déclaration de TVA lima-business.document.vatPeriod1=%1$tM %1$tY @@ -58,60 +98,28 @@ 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.document.dir.description=Dossier des rapports 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 -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' -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' -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.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 -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 @@ -127,8 +135,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 4bb153c..790db87 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 71d897f..0d55892 100644 --- a/lima-report/src/main/resources/jasperreports/account/DocumentReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/account/DocumentReport.jrxml @@ -1,44 +1,51 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Created with Jaspersoft Studio version 6.1.0.final using JasperReports Library version 6.1.0 --> -<!-- 2015-06-29T11:12:29 --> +<!-- 2015-07-29T11:17:51 --> <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="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> + <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="subReport" class="net.sf.jasperreports.engine.JasperReport"/> - <field name="accounts" class="java.util.List"/> + <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="titleCompanyName" class="java.lang.String"/> + <field name="titleCompanyAddress" class="java.lang.String"/> + <field name="titleCompanyPostCode" class="java.lang.String"/> + <field name="titleCompanyCity" class="java.lang.String"/> + <field name="titleCompanySiretLabel" class="java.lang.String"/> + <field name="titleCompanySiret" class="java.lang.String"/> + <field name="titleCompanyPhoneLabel" class="java.lang.String"/> + <field name="titleCompanyPhone" 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="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"/> + <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> @@ -47,67 +54,120 @@ <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{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> + <title> + <band height="51" splitType="Stretch"> + <frame> + <reportElement style="Default" mode="Opaque" x="0" y="1" width="578" height="50" 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="195" height="10" forecolor="#736343" uuid="5aa3ceb9-e407-42da-bdc3-097875bdd5f5"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8" isBold="true"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyName}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="0" y="10" width="195" height="10" forecolor="#736343" uuid="596652a7-7c6e-40c9-85d8-ace32960eb18"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyAddress}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="0" y="20" width="50" height="10" forecolor="#736343" uuid="04a791f3-caf8-47f9-9664-476a72148ef5"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyPostCode}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="50" y="20" width="160" height="10" forecolor="#736343" uuid="48f7a5c0-a2d2-48b8-9ac7-5dbb6352b6f6"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyCity}]]></textFieldExpression> + </textField> + <textField> + <reportElement style="Default" x="0" y="30" width="60" height="10" forecolor="#736343" uuid="2cea74ae-6e08-42fa-b7c7-6da7fbe72550"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanySiretLabel}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="60" y="30" width="150" height="10" forecolor="#736343" uuid="73d903f0-c59d-4a2a-826a-c4c36a3ae50a"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanySiret}]]></textFieldExpression> + </textField> + <textField> + <reportElement style="Default" x="0" y="40" width="60" height="10" forecolor="#736343" uuid="3318e3d9-7970-4933-badc-90c41cccad55"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyPhoneLabel}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="60" y="40" width="150" height="10" forecolor="#736343" uuid="43585fdc-7b80-4e32-b0b7-55c04cce46c4"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyPhone}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="195" y="0" width="188" 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="15" forecolor="#736343" uuid="37d0a47c-0197-4f09-8358-823b39a2a42a"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="8" isBold="false"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleFromToDate}]]></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> @@ -129,7 +189,7 @@ <textFieldExpression><![CDATA[$F{columnDateTitle}]]></textFieldExpression> </textField> <textField> - <reportElement style="HeaderColumn" x="146" y="0" width="36" height="20" uuid="da44668c-4f62-4f75-abaf-cb941b73bfcb"/> + <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> @@ -161,14 +221,14 @@ <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="8" isBold="true"/> </textElement> - <textFieldExpression><![CDATA[$F{columnDebitTitle}]]></textFieldExpression> + <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> - <textFieldExpression><![CDATA[$F{columnCreditTitle}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{columnCreditTitle}]]></textFieldExpression> </textField> </frame> </band> diff --git a/lima-report/src/main/resources/jasperreports/balance/DocumentReport.jrxml b/lima-report/src/main/resources/jasperreports/balance/DocumentReport.jrxml index 16754a9..bc37ab4 100644 --- a/lima-report/src/main/resources/jasperreports/balance/DocumentReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/balance/DocumentReport.jrxml @@ -22,6 +22,13 @@ <field name="mainAccounts" class="java.util.List"/> <field name="titleCompanyName" class="java.lang.String"/> + <field name="titleCompanyAddress" class="java.lang.String"/> + <field name="titleCompanyPostCode" class="java.lang.String"/> + <field name="titleCompanyCity" class="java.lang.String"/> + <field name="titleCompanySiretLabel" class="java.lang.String"/> + <field name="titleCompanySiret" class="java.lang.String"/> + <field name="titleCompanyPhoneLabel" class="java.lang.String"/> + <field name="titleCompanyPhone" 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"/> @@ -45,9 +52,9 @@ <band splitType="Stretch"/> </background> <title> - <band height="41" splitType="Stretch"> + <band height="51" 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"/> + <reportElement style="Default" mode="Opaque" x="0" y="1" width="578" height="50" 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"/> @@ -55,7 +62,68 @@ <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"/> + <reportElement style="Default" x="0" y="0" width="195" height="10" forecolor="#736343" uuid="5aa3ceb9-e407-42da-bdc3-097875bdd5f5"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8" isBold="true"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyName}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="0" y="10" width="195" height="10" forecolor="#736343" uuid="596652a7-7c6e-40c9-85d8-ace32960eb18"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyAddress}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="0" y="20" width="50" height="10" forecolor="#736343" uuid="04a791f3-caf8-47f9-9664-476a72148ef5"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyPostCode}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="50" y="20" width="160" height="10" forecolor="#736343" uuid="48f7a5c0-a2d2-48b8-9ac7-5dbb6352b6f6"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyCity}]]></textFieldExpression> + </textField> + <textField> + <reportElement style="Default" x="0" y="30" width="60" height="10" forecolor="#736343" uuid="2cea74ae-6e08-42fa-b7c7-6da7fbe72550"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanySiretLabel}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="60" y="30" width="150" height="10" forecolor="#736343" uuid="73d903f0-c59d-4a2a-826a-c4c36a3ae50a"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanySiret}]]></textFieldExpression> + </textField> + <textField> + <reportElement style="Default" x="0" y="40" width="60" height="10" forecolor="#736343" uuid="3318e3d9-7970-4933-badc-90c41cccad55"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyPhoneLabel}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="60" y="40" width="150" height="10" forecolor="#736343" uuid="43585fdc-7b80-4e32-b0b7-55c04cce46c4"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyPhone}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="195" y="0" width="188" height="20" forecolor="#736343" uuid="9ee9d5f1-6e74-4526-83a4-3b386f2733a8"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> @@ -70,20 +138,12 @@ <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"/> + <reportElement style="Default" x="210" y="20" width="160" height="15" forecolor="#736343" uuid="37d0a47c-0197-4f09-8358-823b39a2a42a"/> <textElement textAlignment="Center" verticalAlignment="Middle"> - <font isBold="true"/> + <font size="8" isBold="false"/> </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> diff --git a/lima-report/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml b/lima-report/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml index d6ade61..c6e48a2 100644 --- a/lima-report/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml @@ -38,6 +38,13 @@ <field name="entryBooks" class="java.util.List"/> <field name="titleCompanyName" class="java.lang.String"/> + <field name="titleCompanyAddress" class="java.lang.String"/> + <field name="titleCompanyPostCode" class="java.lang.String"/> + <field name="titleCompanyCity" class="java.lang.String"/> + <field name="titleCompanySiretLabel" class="java.lang.String"/> + <field name="titleCompanySiret" class="java.lang.String"/> + <field name="titleCompanyPhoneLabel" class="java.lang.String"/> + <field name="titleCompanyPhone" 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"/> @@ -68,9 +75,9 @@ <band splitType="Stretch"/> </background> <title> - <band height="41" splitType="Stretch"> + <band height="51" 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"/> + <reportElement style="Default" mode="Opaque" x="0" y="1" width="578" height="50" 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"/> @@ -78,7 +85,68 @@ <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"/> + <reportElement style="Default" x="0" y="0" width="195" height="10" forecolor="#736343" uuid="5aa3ceb9-e407-42da-bdc3-097875bdd5f5"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8" isBold="true"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyName}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="0" y="10" width="195" height="10" forecolor="#736343" uuid="596652a7-7c6e-40c9-85d8-ace32960eb18"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyAddress}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="0" y="20" width="50" height="10" forecolor="#736343" uuid="04a791f3-caf8-47f9-9664-476a72148ef5"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyPostCode}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="50" y="20" width="160" height="10" forecolor="#736343" uuid="48f7a5c0-a2d2-48b8-9ac7-5dbb6352b6f6"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyCity}]]></textFieldExpression> + </textField> + <textField> + <reportElement style="Default" x="0" y="30" width="60" height="10" forecolor="#736343" uuid="2cea74ae-6e08-42fa-b7c7-6da7fbe72550"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanySiretLabel}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="60" y="30" width="150" height="10" forecolor="#736343" uuid="73d903f0-c59d-4a2a-826a-c4c36a3ae50a"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanySiret}]]></textFieldExpression> + </textField> + <textField> + <reportElement style="Default" x="0" y="40" width="60" height="10" forecolor="#736343" uuid="3318e3d9-7970-4933-badc-90c41cccad55"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyPhoneLabel}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="60" y="40" width="150" height="10" forecolor="#736343" uuid="43585fdc-7b80-4e32-b0b7-55c04cce46c4"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyPhone}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="195" y="0" width="188" height="20" forecolor="#736343" uuid="9ee9d5f1-6e74-4526-83a4-3b386f2733a8"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> @@ -93,20 +161,12 @@ <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"/> + <reportElement style="Default" x="210" y="20" width="160" height="15" forecolor="#736343" uuid="37d0a47c-0197-4f09-8358-823b39a2a42a"/> <textElement textAlignment="Center" verticalAlignment="Middle"> - <font isBold="true"/> + <font size="8" isBold="false"/> </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> diff --git a/lima-report/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml b/lima-report/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml index 79c7327..aeca794 100644 --- a/lima-report/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml @@ -12,6 +12,7 @@ </queryString> <field name="formatter" class="java.text.DecimalFormat"/> + <field name="entryBookCodeAndNameText" class="java.lang.String"/> <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> <field name="financialPeriods" class="java.util.List"/> @@ -40,7 +41,7 @@ <font size="8" isBold="true" isItalic="true"/> <paragraph lineSpacingSize="0.0" leftIndent="40"/> </textElement> - <textFieldExpression><![CDATA["Journal " + $F{code} + " " + $F{label}]]></textFieldExpression> + <textFieldExpression><![CDATA[String.format($F{entryBookCodeAndNameText}, $F{code},$F{label})]]></textFieldExpression> </textField> <textField> <reportElement x="434" y="0" width="72" height="10" uuid="baca77fb-1d57-428f-8746-1bb482b61b55"/> diff --git a/lima-report/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml b/lima-report/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml index 63e271a..b5134e5 100644 --- a/lima-report/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml @@ -19,6 +19,8 @@ <![CDATA[]]> </queryString> <field name="formatter" class="java.text.DecimalFormat"/> + <field name="balanceForEntryBookText" class="java.lang.String"/> + <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> <field name="debitBalance" class="java.math.BigDecimal"/> <field name="creditBalance" class="java.math.BigDecimal"/> @@ -122,7 +124,7 @@ <font size="8" isBold="true" isItalic="true"/> <paragraph lineSpacingSize="0.0" leftIndent="40"/> </textElement> - <textFieldExpression><![CDATA["Solde pour le journal " + $F{entryBookCode} + " jusqu'à fin " + new SimpleDateFormat("MMMM yyyy").format($F{period})]]></textFieldExpression> + <textFieldExpression><![CDATA[String.format($F{balanceForEntryBookText}, $F{entryBookCode}, 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"/> diff --git a/lima-report/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml b/lima-report/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml index c841467..02e7159 100644 --- a/lima-report/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml @@ -16,6 +16,9 @@ <queryString> <![CDATA[]]> </queryString> + <field name="subTotalText" class="java.lang.String"/> + <field name="subTotalForText" 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"/> @@ -24,19 +27,19 @@ <field name="transactionDate" class="java.util.Date"/> <field name="account" class="java.lang.String"/> <field name="voucher" class="java.lang.String"/> - <variable name="entryBookDebitSolde" class="java.math.BigDecimal" calculation="Sum"> + <variable name="entryBookDebitBalance" class="java.math.BigDecimal" calculation="Sum"> <variableExpression><![CDATA[$F{debit}]]></variableExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> </variable> - <variable name="EntryBookEndColomnDebitSolde" class="java.math.BigDecimal" resetType="Column" calculation="Sum"> + <variable name="entryBookEndColumnDebitBalance" class="java.math.BigDecimal" resetType="Column" calculation="Sum"> <variableExpression><![CDATA[$F{debit}]]></variableExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> </variable> - <variable name="EntryBookCreditSolde" class="java.math.BigDecimal" calculation="Sum"> + <variable name="entryBookCreditBalance" class="java.math.BigDecimal" calculation="Sum"> <variableExpression><![CDATA[$F{credit}]]></variableExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> </variable> - <variable name="EntryBookEndColomnCreditSolde" class="java.math.BigDecimal" resetType="Column" calculation="Sum"> + <variable name="entryBookEndColumnCreditBalance" class="java.math.BigDecimal" resetType="Column" calculation="Sum"> <variableExpression><![CDATA[$F{credit}]]></variableExpression> <initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression> </variable> @@ -110,29 +113,29 @@ <font size="8" isBold="true"/> <paragraph leftIndent="80"/> </textElement> - <textFieldExpression><![CDATA["Sous-total"]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{subTotalText}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="false"> <reportElement key="" x="434" y="0" width="72" height="10" forecolor="#736343" uuid="75ef2eb9-6e2d-447c-9dd6-488a63fcdf04"> - <printWhenExpression><![CDATA[new Boolean($V{EntryBookEndColomnDebitSolde}.compareTo(BigDecimal.ZERO) != 0)]]></printWhenExpression> + <printWhenExpression><![CDATA[new Boolean($V{entryBookEndColumnDebitBalance}.compareTo(BigDecimal.ZERO) != 0)]]></printWhenExpression> </reportElement> <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"/> + <font fontName="DejaVu Sans Mono" size="8" isBold="true"/> <paragraph rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($V{EntryBookEndColomnDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{EntryBookEndColomnDebitSolde}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($V{entryBookEndColumnDebitBalance}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{entryBookEndColumnDebitBalance}) : ""]]></textFieldExpression> </textField> <textField isBlankWhenNull="false"> <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"/> + <font fontName="DejaVu Sans Mono" size="8" isBold="true"/> <paragraph rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($V{EntryBookEndColomnCreditSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{EntryBookEndColomnCreditSolde}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($V{entryBookEndColumnCreditBalance}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{entryBookEndColumnCreditBalance}) : ""]]></textFieldExpression> </textField> </frame> </band> @@ -158,7 +161,7 @@ <font size="8" isBold="true"/> <paragraph leftIndent="80"/> </textElement> - <textFieldExpression><![CDATA["Sous-total pour " + new SimpleDateFormat("MMMM yyyy").format($F{transactionDate})]]></textFieldExpression> + <textFieldExpression><![CDATA[String.format($F{subTotalForText}, 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"/> @@ -170,7 +173,7 @@ <font fontName="DejaVu Sans Mono" size="8" isBold="true"/> <paragraph rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($V{entryBookDebitSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{entryBookDebitSolde}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($V{entryBookDebitBalance}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{entryBookDebitBalance}) : ""]]></textFieldExpression> </textField> <textField> <reportElement x="506" y="0" width="72" height="10" forecolor="#736343" uuid="a7b19080-fcc5-407b-ae5c-20a85afd363e"/> @@ -182,7 +185,7 @@ <font fontName="DejaVu Sans Mono" size="8" isBold="true"/> <paragraph rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($V{EntryBookCreditSolde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{EntryBookCreditSolde}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($V{entryBookCreditBalance}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($V{entryBookCreditBalance}) : ""]]></textFieldExpression> </textField> </frame> </band> diff --git a/lima-report/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml b/lima-report/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml index 367cf23..5fe386e 100644 --- a/lima-report/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml @@ -34,6 +34,13 @@ <field name="generalEntryBooks" class="java.util.List"/> <field name="titleCompanyName" class="java.lang.String"/> + <field name="titleCompanyAddress" class="java.lang.String"/> + <field name="titleCompanyPostCode" class="java.lang.String"/> + <field name="titleCompanyCity" class="java.lang.String"/> + <field name="titleCompanySiretLabel" class="java.lang.String"/> + <field name="titleCompanySiret" class="java.lang.String"/> + <field name="titleCompanyPhoneLabel" class="java.lang.String"/> + <field name="titleCompanyPhone" 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"/> @@ -61,9 +68,9 @@ <band splitType="Stretch"/> </background> <title> - <band height="41" splitType="Stretch"> + <band height="51" 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"/> + <reportElement style="Default" mode="Opaque" x="0" y="1" width="578" height="50" 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"/> @@ -71,7 +78,68 @@ <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"/> + <reportElement style="Default" x="0" y="0" width="195" height="10" forecolor="#736343" uuid="5aa3ceb9-e407-42da-bdc3-097875bdd5f5"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8" isBold="true"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyName}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="0" y="10" width="195" height="10" forecolor="#736343" uuid="596652a7-7c6e-40c9-85d8-ace32960eb18"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyAddress}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="0" y="20" width="50" height="10" forecolor="#736343" uuid="04a791f3-caf8-47f9-9664-476a72148ef5"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyPostCode}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="50" y="20" width="160" height="10" forecolor="#736343" uuid="48f7a5c0-a2d2-48b8-9ac7-5dbb6352b6f6"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyCity}]]></textFieldExpression> + </textField> + <textField> + <reportElement style="Default" x="0" y="30" width="60" height="10" forecolor="#736343" uuid="2cea74ae-6e08-42fa-b7c7-6da7fbe72550"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanySiretLabel}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="60" y="30" width="150" height="10" forecolor="#736343" uuid="73d903f0-c59d-4a2a-826a-c4c36a3ae50a"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanySiret}]]></textFieldExpression> + </textField> + <textField> + <reportElement style="Default" x="0" y="40" width="60" height="10" forecolor="#736343" uuid="3318e3d9-7970-4933-badc-90c41cccad55"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyPhoneLabel}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="60" y="40" width="150" height="10" forecolor="#736343" uuid="43585fdc-7b80-4e32-b0b7-55c04cce46c4"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyPhone}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="195" y="0" width="188" height="20" forecolor="#736343" uuid="9ee9d5f1-6e74-4526-83a4-3b386f2733a8"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> @@ -86,20 +154,12 @@ <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"/> + <reportElement style="Default" x="210" y="20" width="160" height="15" forecolor="#736343" uuid="37d0a47c-0197-4f09-8358-823b39a2a42a"/> <textElement textAlignment="Center" verticalAlignment="Middle"> - <font isBold="true"/> + <font size="8" isBold="false"/> </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> diff --git a/lima-report/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml b/lima-report/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml index 0ddb70a..054c970 100644 --- a/lima-report/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml @@ -20,6 +20,8 @@ </queryString> <field name="formatter" class="java.text.DecimalFormat"/> <field name="dateFormat" class="java.text.SimpleDateFormat"/> + <field name="forMonthText" class="java.lang.String"/> + <field name="subTotalForMonthText" class="java.lang.String"/> <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> @@ -55,7 +57,7 @@ <font size="8" isBold="true" isItalic="true"/> <paragraph lineSpacingSize="0.0" leftIndent="40"/> </textElement> - <textFieldExpression><![CDATA["Mois de " + new SimpleDateFormat("MMMM yyyy").format($F{period})]]></textFieldExpression> + <textFieldExpression><![CDATA[String.format($F{forMonthText},new SimpleDateFormat("MMMM yyyy").format($F{period}))]]></textFieldExpression> </textField> </frame> </band> @@ -87,7 +89,7 @@ <font size="8" isBold="true" isItalic="true"/> <paragraph lineSpacingSize="0.0" leftIndent="40"/> </textElement> - <textFieldExpression><![CDATA["Sous-total " + new SimpleDateFormat("MMMM yyyy").format($F{period})]]></textFieldExpression> + <textFieldExpression><![CDATA[String.format($F{subTotalForMonthText}, new SimpleDateFormat("MMMM yyyy").format($F{period}))]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> <reportElement style="Default" x="434" y="0" width="72" height="10" forecolor="#736343" 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 7a1a5ac..9073360 100644 --- a/lima-report/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml @@ -26,6 +26,13 @@ <field name="generalLedgers" class="java.util.List"/> <field name="titleCompanyName" class="java.lang.String"/> + <field name="titleCompanyAddress" class="java.lang.String"/> + <field name="titleCompanyPostCode" class="java.lang.String"/> + <field name="titleCompanyCity" class="java.lang.String"/> + <field name="titleCompanySiretLabel" class="java.lang.String"/> + <field name="titleCompanySiret" class="java.lang.String"/> + <field name="titleCompanyPhoneLabel" class="java.lang.String"/> + <field name="titleCompanyPhone" 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"/> @@ -53,9 +60,9 @@ </background> <title> - <band height="41" splitType="Stretch"> + <band height="51" 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"/> + <reportElement style="Default" mode="Opaque" x="0" y="1" width="578" height="50" 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"/> @@ -63,7 +70,68 @@ <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"/> + <reportElement style="Default" x="0" y="0" width="195" height="10" forecolor="#736343" uuid="5aa3ceb9-e407-42da-bdc3-097875bdd5f5"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8" isBold="true"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyName}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="0" y="10" width="195" height="10" forecolor="#736343" uuid="596652a7-7c6e-40c9-85d8-ace32960eb18"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyAddress}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="0" y="20" width="50" height="10" forecolor="#736343" uuid="04a791f3-caf8-47f9-9664-476a72148ef5"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyPostCode}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="50" y="20" width="160" height="10" forecolor="#736343" uuid="48f7a5c0-a2d2-48b8-9ac7-5dbb6352b6f6"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyCity}]]></textFieldExpression> + </textField> + <textField> + <reportElement style="Default" x="0" y="30" width="60" height="10" forecolor="#736343" uuid="2cea74ae-6e08-42fa-b7c7-6da7fbe72550"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanySiretLabel}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="60" y="30" width="150" height="10" forecolor="#736343" uuid="73d903f0-c59d-4a2a-826a-c4c36a3ae50a"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanySiret}]]></textFieldExpression> + </textField> + <textField> + <reportElement style="Default" x="0" y="40" width="60" height="10" forecolor="#736343" uuid="3318e3d9-7970-4933-badc-90c41cccad55"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + <paragraph leftIndent="5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyPhoneLabel}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="60" y="40" width="150" height="10" forecolor="#736343" uuid="43585fdc-7b80-4e32-b0b7-55c04cce46c4"/> + <textElement verticalAlignment="Middle" rotation="None"> + <font size="8"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyPhone}]]></textFieldExpression> + </textField> + <textField isBlankWhenNull="true"> + <reportElement style="Default" x="195" y="0" width="188" height="20" forecolor="#736343" uuid="9ee9d5f1-6e74-4526-83a4-3b386f2733a8"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> @@ -78,20 +146,12 @@ <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"/> + <reportElement style="Default" x="210" y="20" width="160" height="15" forecolor="#736343" uuid="37d0a47c-0197-4f09-8358-823b39a2a42a"/> <textElement textAlignment="Center" verticalAlignment="Middle"> - <font isBold="true"/> + <font size="8" isBold="false"/> </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> diff --git a/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml b/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml index 9987b00..e8fe131 100644 --- a/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml @@ -20,10 +20,10 @@ </queryString> <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> <field name="formatter" class="java.text.DecimalFormat"/> + <field name="totalForAccountText" class="java.lang.String"/> + <field name="accountNumber" class="java.lang.String"/> <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"/> @@ -100,6 +100,13 @@ <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="362" height="10" forecolor="#736343" uuid="3deefb8e-456b-4bbb-8574-1a02651e5d7f"/> + <textElement> + <font size="8" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[String.format($F{totalForAccountText}, $F{accountNumber})]]></textFieldExpression> + </textField> <textField isBlankWhenNull="true"> <reportElement x="362" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"/> <textElement textAlignment="Right"> @@ -124,13 +131,6 @@ </textElement> <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"/> - <textElement> - <font size="8" isBold="true"/> - </textElement> - <textFieldExpression><![CDATA["Total pour le compte " + $F{accountNumber}]]></textFieldExpression> - </textField> </frame> </band> </detail> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css index ec1381b..ffb2283 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css @@ -25,6 +25,14 @@ defaultCloseOperation : {JDialog.DO_NOTHING_ON_CLOSE}; } +#identityTab { + title : {handler.getIdentityTabTitle()}; +} + +#treasuryTab { + title : {handler.getTreasuryTabTitle()}; +} + #nameLabel { text : "lima.identity.name"; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx index 936438d..7b69aef 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx @@ -42,7 +42,7 @@ <JTabbedPane id="identityContentTabbedPane" constraints="BorderLayout.CENTER"> - <tab id="identityTab" title="Identité"> + <tab id="identityTab"> <Table id="identityTable" fill="both"> <row> <cell anchor="east" weightx="1"> @@ -136,7 +136,7 @@ </Table> </tab> - <tab id="treasuryTab" title="Trésor Public"> + <tab id="treasuryTab"> <JPanel layout="{new BorderLayout()}"> <Table fill="both" constraints="BorderLayout.NORTH" insets="5"> <row> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityHandler.java index afda4ba..3771ca7 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityHandler.java @@ -31,6 +31,8 @@ import org.chorem.lima.entity.Identity; import org.chorem.lima.entity.IdentityImpl; import org.chorem.lima.entity.Treasury; +import static org.nuiton.i18n.I18n.t; + public class IdentityHandler { protected IdentityService identityService; @@ -90,4 +92,14 @@ public class IdentityHandler { treasuryService.updateTreasury(treasury); } + + public String getIdentityTabTitle() { + String result = t("lima.identity"); + return result; + } + + public String getTreasuryTabTitle() { + String result = t("lima.treasury"); + return result; + } } 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 bfe01c3..c51df9c 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties @@ -1,5 +1,4 @@ -Identit\\u00e9= -Tr\\u00e9sor\ Public= +lima-business.document.subTotalForMonthText=Sub total for %s lima.account=Account lima.account.add=Add account (Ctrl+A) lima.account.add.error.InvalidAccountNumber=Invalid account number\:%1$s @@ -20,12 +19,12 @@ lima.action.commandline.help=Show help in console lima.balance=Balance lima.cancel=Cancel lima.chart.accounts=Accounts chart -lima.chart.accounts.base=Base accountchart -lima.chart.accounts.developed=Developped accountchart +lima.chart.accounts.base=Base account chart +lima.chart.accounts.developed=Developed account chart lima.chart.accounts.import.csv=CSV customized accounting plan lima.chart.accounts.import.ebp=EBP customized accounting plan -lima.chart.accounts.shortened=Shorthened accountchart -lima.close= +lima.chart.accounts.shortened=Shortened account chart +lima.close=Close lima.closed=Closed lima.code=Code lima.config.category.directories=Directories @@ -195,7 +194,7 @@ lima.entryBook.add=Add entry book (Ctrl+A) lima.entryBook.alreadyExistEntryBook=Already existing entry book lima.entryBook.code=Code lima.entryBook.default=Default entry book -lima.entryBook.delete.used.error=Can't delete entry book %2$s (%1$s) because exist financcial transactions in this entry book. +lima.entryBook.delete.used.error=Can't delete entry book %2$s (%1$s) because exist financial transactions in this entry book. lima.entryBook.error.lockedEntryBook=Closed entry book %2$s (%1$s) for period from %3$te %3$tB %3$tY to %4$te %4$tB %4$tY. lima.entryBook.form=Entry book lima.entryBook.import=Importer @@ -264,21 +263,21 @@ lima.financialStatement.base=Base financial statement chart lima.financialStatement.check=Check accounts passing to movement lima.financialStatement.creditAccounts=Account credit list lima.financialStatement.debitAccounts=Account debit list -lima.financialStatement.developed=Developped financial statement chart +lima.financialStatement.developed=Developed financial statement chart lima.financialStatement.error.alreadyExistFinancialStatement=Failed\! Financial statement %s already exist lima.financialStatement.header.add=Add category lima.financialStatement.header.form=Category lima.financialStatement.headerAmount=Calculate amount on header lima.financialStatement.import=Import lima.financialStatement.import.delete=Delete actual financial statement chart before import new -lima.financialStatement.import.description=NO financialstatement chart +lima.financialStatement.import.description=NO financial statement chart lima.financialStatement.label=Label lima.financialStatement.movement.add=Add movement lima.financialStatement.movement.form=Group lima.financialStatement.provisionDeprecationAccounts= lima.financialStatement.remove.confirm=Do you really want to remove this financial statement ? -lima.financialStatement.shortened=Shortened financialstatement chart -lima.financialStatement.subAmount=Calculate a subamount +lima.financialStatement.shortened=Shortened financial statement chart +lima.financialStatement.subAmount=Calculate a sub amount lima.financialStatement.way=Way lima.financialStatements=Financial statements lima.financialStatements.check=check account @@ -470,7 +469,7 @@ lima.open=Open lima.openEjb.remote.mode.description=Server started lima.openEjb.remote.mode.label=Server started lima.opening=Launching -lima.opening.accounts=<html><center>Select a default, <br/>import your personnal<br/> or cancel to create your own account chart.</center></html> +lima.opening.accounts=<html><center>Select a default, <br/>import your personal<br/> or cancel to create your own account chart.</center></html> lima.opening.close=Close lima.opening.end=Finish lima.opening.entryBook=Select it to import default entry books @@ -519,6 +518,7 @@ lima.table.provisionDeprecation=Provision Deprecation lima.table.voucher=Voucher lima.title=Lutin Invoice Monitoring and Accounting lima.transaction=Transaction +lima.treasury=Tax authority administration lima.treasury.address=Address lima.treasury.address2=Address (next) lima.treasury.cdi=CDI @@ -527,7 +527,7 @@ lima.treasury.dossierNumber=File number lima.treasury.key=key lima.treasury.serviceCode=Service Code lima.treasury.sie=SIE -lima.treasury.systemType=Sytem Type +lima.treasury.systemType=System Type lima.treasury.vatNumber=VAT number lima.treasury.zipCode=Zip Code lima.update=Modify @@ -540,9 +540,9 @@ lima.vatStatement.boxName=PDF BoxName lima.vatStatement.default= lima.vatStatement.delete=Delete actual VAT statement chart before import new lima.vatStatement.delete.parent=Remove parent -lima.vatStatement.developed=Developped VAT statement chart +lima.vatStatement.developed=Developed VAT statement chart lima.vatStatement.error.alreadyExistVatStatement= -lima.vatStatement.import=Impport CSV +lima.vatStatement.import=Import CSV lima.vatStatement.import.delete= lima.vatStatement.import.description= lima.vatStatement.label=Label @@ -550,7 +550,7 @@ lima.vatStatement.master=Master VAT statement lima.vatStatement.movement=Movement lima.vatStatement.movement.add=Add movement lima.vatStatement.nothing=No vat statement chart -lima.vatStatement.remove.confirm=Do you realy want to remove line ? +lima.vatStatement.remove.confirm=Do you really want to remove line ? lima.vatStatement.remove.title=Remove line ? lima.vatStatement.shortened=Shortened vat statement chart lima.vatStatements=VAT statements -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm