This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit e8e622ed5486d9932ddd4fbc6bf5fd3d72e1c08c Author: dcosse <cosse@codelutin.com> Date: Mon Sep 7 14:25:14 2015 +0200 refs #1241 internationalisation sur le rapport de compte --- .../lima/business/ejb/report/AccountReportServiceImpl.java | 7 ++++--- .../src/main/resources/i18n/lima-business_en_GB.properties | 12 ++++++++++-- .../src/main/resources/i18n/lima-business_fr_FR.properties | 12 ++++++++++-- .../main/resources/jasperreports/account/AccountEntry.jrxml | 3 ++- 4 files changed, 26 insertions(+), 8 deletions(-) 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 1879a4b..94c74ff 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 @@ -82,6 +82,7 @@ public class AccountReportServiceImpl extends AbstractLimaService implements Acc accountEntry.setCredit(entry.isDebit() ? BigDecimal.ZERO : entry.getAmount()); accountEntry.setFormatter(bigDecimalFormat); accountEntry.setDateFormat(LimaBusinessConfig.getInstance().getDateFormat()); + accountEntry.setSubTotalForLabel(t("lima-business.document.subTotal")); accountEntries.add(accountEntry); } } @@ -89,11 +90,11 @@ public class AccountReportServiceImpl extends AbstractLimaService implements Acc documentReport.addAllAccounts(accountEntries); if (CollectionUtils.isEmpty(accountEntries)) { - selectedAccounts += ", aucune entrée trouvée sur ce compte"; + selectedAccounts += t("lima-business.document.selectedAccountNoEntryFound"); } else if (accountEntries.size() == 1){ - selectedAccounts += ", et son compte fils"; + selectedAccounts += t("lima-business.document.selectedAccountAndSubAccount"); } else { - selectedAccounts += ", et ses comptes fils"; + selectedAccounts += t("lima-business.document.selectedAccountAndSubAccounts"); } documentReport.setHeaderSelectedAccounts(selectedAccounts); 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 f809c87..1c64e65 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 @@ -12,6 +12,9 @@ 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.balance.globalClient=CENTRALISATION CLIENTS +lima-business.document.balance.globalSupplier=CENTRALISATION SUPPLIERS +lima-business.document.balance.lastPageColumnDescription=Global total lima-business.document.balanceForEntryBook=Total for entry book %s until %s lima-business.document.balanceReport.title=BALANCE lima-business.document.balanceSheet=Balance @@ -66,6 +69,9 @@ 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.selectedAccountAndSubAccount=, and it sub account +lima-business.document.selectedAccountAndSubAccounts=, and it sub accounts +lima-business.document.selectedAccountNoEntryFound=, no entry found lima-business.document.setColumnDateTitle=Date lima-business.document.setColumnEntryBookTitle=Entry book lima-business.document.society=Society @@ -74,12 +80,12 @@ 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.subTotalForMonthText=Sub total for % 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.totalFor=Total for %s lima-business.document.totalForAccount=Total for account %s lima-business.document.vat=VAT form lima-business.document.vatnumber=VAT N° @@ -115,6 +121,8 @@ lima.config.documentReport.generalLedger.generalLedgerEntryModelPath.description lima.config.documentReport.generalLedger.generalLedgerModelPath.description= lima.config.host.address.description= lima.config.httpport.description=HTTP Port +lima.config.local.description= +lima.config.local.label= lima.config.reports.dir.description= lima.config.reportvatpdfurl.description= lima.config.rulesnationality.description=Rules Nationality 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 bfabd31..49dd9cb 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 @@ -10,6 +10,9 @@ 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.balance.globalClient=CENTRALISATION CLIENTS +lima-business.document.balance.globalSupplier=CENTRALISATION FOURNISSEURS +lima-business.document.balance.lastPageColumnDescription=Total général lima-business.document.balanceForEntryBook=Solde pour le journal %s jusqu'à fin %s lima-business.document.balanceReport.title=BALANCE lima-business.document.balanceSheet=Balance @@ -64,6 +67,9 @@ 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.selectedAccountAndSubAccount=, et son compte fils +lima-business.document.selectedAccountAndSubAccounts=, et ses comptes fils +lima-business.document.selectedAccountNoEntryFound=, aucune entrée trouvée sur ce compte lima-business.document.setColumnDateTitle=Date lima-business.document.setColumnEntryBookTitle=Journal lima-business.document.society=Nom @@ -71,13 +77,13 @@ 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.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.totalFor=Total pour %s 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 @@ -119,6 +125,8 @@ lima.config.documentReport.generalLedger.generalLedgerEntryModelPath.description lima.config.documentReport.generalLedger.generalLedgerModelPath.description=fichier source (.jrxml) généré par Jasper Report gérant les beans 'generalLedger' lima.config.host.address.description=Adresse du serveur LIMA lima.config.host.http.port.description=Port HTTP +lima.config.local.description= +lima.config.local.label= lima.config.reports.dir.description=Dossier des rapports lima.config.reportvatpdfurl.description=Chemin du raport lima.config.rulesnationality.description=Règles nationales diff --git a/lima-report/src/main/resources/jasperreports/account/AccountEntry.jrxml b/lima-report/src/main/resources/jasperreports/account/AccountEntry.jrxml index f800454..15b1213 100644 --- a/lima-report/src/main/resources/jasperreports/account/AccountEntry.jrxml +++ b/lima-report/src/main/resources/jasperreports/account/AccountEntry.jrxml @@ -27,6 +27,7 @@ <field name="lettering" class="java.lang.String"/> <field name="debit" class="java.math.BigDecimal"/> <field name="credit" class="java.math.BigDecimal"/> + <field name="subTotalForLabel" class="java.lang.String"/> <variable name="subTotalDebit" class="java.math.BigDecimal" calculation="Sum"> <variableExpression><![CDATA[$F{debit}]]></variableExpression> @@ -213,7 +214,7 @@ <textElement> <font size="8"/> </textElement> - <textFieldExpression><![CDATA["Sous total"]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{subTotalForLabel}]]></textFieldExpression> </textField> <textField> <reportElement x="506" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.