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 4e94d244f52771c681529ceda1a781cb914ec610 Author: dcosse <cosse@codelutin.com> Date: Fri Sep 11 15:35:19 2015 +0200 refs #1241 modification sur en tête du rapport et correction pour appeler la bonne méthode. --- .../business/api/report/BalanceReportService.java | 23 ++++++++++++---------- .../ejb/report/BalanceReportServiceImpl.java | 8 ++++---- .../resources/i18n/lima-business_en_GB.properties | 3 ++- .../resources/i18n/lima-business_fr_FR.properties | 3 ++- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/report/BalanceReportService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/BalanceReportService.java index 1a23f70..4bd5c75 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/report/BalanceReportService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/BalanceReportService.java @@ -33,8 +33,9 @@ import java.util.Date; */ public interface BalanceReportService { + /** - * Generate the necessary beans to make balance report. + * Generate the necessary beans to make global balance report. * * @param from from date * @param to to date @@ -45,18 +46,20 @@ public interface BalanceReportService { * @param subAccountsJasperReport Jasper sub account report for balance sub account representation * @return model for balance report */ - DocumentReport getGeneralBalanceDocumentReport(Date from, Date to, String selectedAccounts, DecimalFormat bigDecimalFormat, JasperReport mainAccountsJasperReport, JasperReport subAccountsJasperReport); + DocumentReport getGlobalBalanceDocumentReport(Date from, Date to, String selectedAccounts, DecimalFormat bigDecimalFormat, JasperReport mainAccountsJasperReport, JasperReport subAccountsJasperReport); /** + * Generate the necessary beans to make balance report. * - * @param from - * @param to - * @param selectedAccounts - * @param bigDecimalFormat - * @param mainAccountsJasperReport - * @param subAccountsJasperReport - * @return + * @param from from date + * @param to to date + * @param selectedAccounts if null all accounts will be selected + * @Param isBalanceGeneral true if general Balance is requested + * @param bigDecimalFormat format used for amount representation + * @param mainAccountsJasperReport Jasper sub report for balance's main accounts representation + * @param subAccountsJasperReport Jasper sub account report for balance sub account representation + * @return model for balance report */ - DocumentReport getGlobalBalanceDocumentReport(Date from, Date to, String selectedAccounts, DecimalFormat bigDecimalFormat, JasperReport mainAccountsJasperReport, JasperReport subAccountsJasperReport); + DocumentReport getGeneralBalanceDocumentReport(Date from, Date to, String selectedAccounts, DecimalFormat bigDecimalFormat, JasperReport mainAccountsJasperReport, JasperReport subAccountsJasperReport); } 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 dbf7208..9f3ec87 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 @@ -94,8 +94,8 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal }; @Override - public DocumentReport getGeneralBalanceDocumentReport(Date from, Date to, String selectedAccounts, DecimalFormat bigDecimalFormat, JasperReport mainAccountsJasperReport, JasperReport subAccountsJasperReport) { - String reportName = t("lima-business.document.balanceReport.title"); + public DocumentReport getGlobalBalanceDocumentReport(Date from, Date to, String selectedAccounts, DecimalFormat bigDecimalFormat, JasperReport mainAccountsJasperReport, JasperReport subAccountsJasperReport) { + String reportName = t("lima-business.document.globalBalanceReport.title"); DocumentReport documentReport = getBalanceDocumentReport(from, to, bigDecimalFormat, mainAccountsJasperReport, reportName); BalanceGlobalResult balanceGlobalResult = new BalanceGlobalResult().invoke(); @@ -141,8 +141,8 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal } @Override - public DocumentReport getGlobalBalanceDocumentReport(Date from, Date to, String selectedAccounts, DecimalFormat bigDecimalFormat, JasperReport mainAccountsJasperReport, JasperReport subAccountsJasperReport) { - String reportName = t("lima-business.document.balanceReport.title"); + public DocumentReport getGeneralBalanceDocumentReport(Date from, Date to, String selectedAccounts, DecimalFormat bigDecimalFormat, JasperReport mainAccountsJasperReport, JasperReport subAccountsJasperReport) { + String reportName = t("lima-business.document.generalBalanceReport.title"); DocumentReport documentReport = getBalanceDocumentReport(from, to, bigDecimalFormat, mainAccountsJasperReport, reportName); BalanceGlobalResult balanceGlobalResult = new BalanceGlobalResult().invoke(); 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 1c64e65..2fd01cb 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 @@ -16,7 +16,6 @@ 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 lima-business.document.businessnumber=Business N° lima-business.document.city=City @@ -47,9 +46,11 @@ lima-business.document.entrybook.lastPageColumnDescription=Total for selected en lima-business.document.entrybooks=Entry books lima-business.document.financialstatement=FinancialStatement lima-business.document.forMonthText=%s +lima-business.document.generalBalanceReport.title=GENERAL BALANCE 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.globalBalanceReport.title=GLOBALE BALANCE lima-business.document.grossamount=Gross Amount lima-business.document.headerCurrencyLabel=Currency\: lima-business.document.headerSelectedAccounts=%s to %s diff --git a/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties b/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties index 49dd9cb..558a0db 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 @@ -14,7 +14,6 @@ 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 lima-business.document.businessnumber=N° Siret lima-business.document.city=Ville @@ -45,9 +44,11 @@ lima-business.document.entrybook.lastPageColumnDescription=Total pour les journa 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.generalBalanceReport.title=BALANCE GÉNÉRALE 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.globalBalanceReport.title=BALANCE GLOBALE lima-business.document.grossamount=Brut lima-business.document.headerCurrencyLabel=Devise\: lima-business.document.headerSelectedAccounts=%s à %s -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.