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 d2892832e882cc29835bc9b17fcc322fc62cc822 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 2 09:14:36 2015 +0100 correction des scopes de dépendances --- lima-swing/pom.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lima-swing/pom.xml b/lima-swing/pom.xml index ec5dd8a..fb24c34 100644 --- a/lima-swing/pom.xml +++ b/lima-swing/pom.xml @@ -187,16 +187,12 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-service-flyway</artifactId> - <scope>provided</scope> + <scope>runtime</scope> </dependency> - <!-- FIXME tchemit 2015-02-28, please avoid to avoid those dependencies - here, this is for test purpose only, should have something about it - in business module... --> <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <scope>provided</scope> </dependency> </dependencies> -- 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 develop in repository lima. See http://git.chorem.org/lima.git commit 4c7a5a54538b71cedf195be335a3a8c7f718d64b Author: dcosse <cosse@codelutin.com> Date: Mon Mar 2 17:17:35 2015 +0100 fixes #1184 Mise à jour du compilateur jasper. Les fichiers sources permettant la génération des rapports et déplacé dans la partie ressource du module web. Dans les fichiers Jasper contenant des sous rapports on ne passe plus le chemin vers les fichiers sources enfants mais on passe directement les rapports Jasper compilés. Correction de la génération du rapport du grand livre qui n'affichait ni les entetes de compte ni les soldes. --- .../business/api/report/BalanceReportService.java | 8 +- .../api/report/GeneralEntryBookReportService.java | 11 +-- .../business/api/report/LedgerReportService.java | 7 +- .../report/ProvisionalEntryBookReportService.java | 9 ++- .../lima/business/ejb/ReportServiceImpl.java | 33 ++++++-- .../ejb/report/BalanceReportServiceImpl.java | 11 +-- .../report/GeneralEntryBookReportServiceImpl.java | 10 +-- .../ejb/report/LedgerReportServiceImpl.java | 26 ++----- .../ProvisionalEntryBookReportServiceImpl.java | 20 ++--- .../lima/business/utils/DocumentReportTypes.java | 23 ++++++ .../chorem/lima/business/utils/DocumentsEnum.java | 11 ++- lima-callao/pom.xml | 5 ++ lima-callao/src/main/xmi/accounting-model.zargo | Bin 56954 -> 57335 bytes lima-swing/src/license/THIRD-PARTY.properties | 26 ++++--- .../src/main/java/org/chorem/lima/LimaMain.java | 5 +- .../main/java/org/chorem/lima/LimaSwingConfig.java | 33 ++++---- .../org/chorem/lima/web/action/ReportBuilder.java | 86 +++++++++++++++++---- .../chorem/lima/web/service/DocumentService.java | 32 +++++--- .../chorem/lima/web/service/HttpServerService.java | 6 +- .../balance/BalanceReportAccountReport.jrxml | 8 +- .../balance/BalanceSubAccountsReport.jrxml | 0 .../jasperreports/balance/DocumentReport.jrxml | 8 +- .../jasperreports/entryBook/DocumentReport.jrxml | 8 +- .../jasperreports/entryBook/EntryBookReport.jrxml | 8 +- .../entryBook/FinancialPeriodReport.jrxml | 10 +-- .../entryBook/TransactionReport.jrxml | 4 +- .../generalEntryBook/DocumentReport.jrxml | 8 +- .../generalEntryBook/EntryBookPeriodReport.jrxml | 8 +- .../GeneralEntryBookEntryReport.jrxml | 4 +- .../generalLedger/DocumentReport.jrxml | 8 +- .../generalLedger/GeneralLedgerEntryReport.jrxml | 8 +- .../generalLedger/GeneralLedgerReport.jrxml | 41 ++++------ pom.xml | 2 +- 33 files changed, 290 insertions(+), 197 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 9426ea8..016e01c 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 @@ -22,6 +22,7 @@ package org.chorem.lima.business.api.report; * #L% */ +import net.sf.jasperreports.engine.JasperReport; import org.chorem.lima.beans.DocumentReport; import java.text.DecimalFormat; @@ -38,7 +39,10 @@ public interface BalanceReportService { * @param from from date * @param to to date * @param selectedAccounts if null all accounts will be selected - * @return the balance beans + * @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 getBalanceDocumentReport(Date from, Date to, String selectedAccounts, DecimalFormat bigDecimalFormat); + DocumentReport getBalanceDocumentReport(Date from, Date to, String selectedAccounts, DecimalFormat bigDecimalFormat, JasperReport mainAccountsJasperReport, JasperReport subAccountsJasperReport); } diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/report/GeneralEntryBookReportService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/GeneralEntryBookReportService.java index 57cc07b..a3f55a1 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/report/GeneralEntryBookReportService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/GeneralEntryBookReportService.java @@ -22,6 +22,7 @@ package org.chorem.lima.business.api.report; * #L% */ +import net.sf.jasperreports.engine.JasperReport; import org.chorem.lima.beans.DocumentReport; import java.text.DecimalFormat; @@ -34,10 +35,10 @@ public interface GeneralEntryBookReportService { /** * Generate the necessary beans to make general entry book report. - * - * @param from from date + * @param from from date * @param to to date - * @return the entryBook beans - */ - DocumentReport getGeneralEntryBookDocumentReport(Date from, Date to, DecimalFormat bigDecimalFormat); + * @param generalEntryBooksJasperReport Jasper sub report for general entry book's representation + * @param entriesJasperReport Jasper sub report for general entry book's entries representation + * */ + DocumentReport getGeneralEntryBookDocumentReport(Date from, Date to, DecimalFormat bigDecimalFormat, JasperReport generalEntryBooksJasperReport, JasperReport entriesJasperReport); } diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/report/LedgerReportService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/LedgerReportService.java index 92e1ee0..82a7620 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/report/LedgerReportService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/LedgerReportService.java @@ -22,6 +22,7 @@ package org.chorem.lima.business.api.report; * #L% */ +import net.sf.jasperreports.engine.JasperReport; import org.chorem.lima.beans.DocumentReport; import java.text.DecimalFormat; @@ -36,7 +37,9 @@ public interface LedgerReportService { * * @param beginDate period from * @param endDate period to - * @return + * @param generalLedgersJasperReport Jasper sub report for general ledgers representation + * @param entriesJasperReport Jasper sub report for general ledgers entries representation + * @return model for report */ - DocumentReport getLedgerDocumentReport(Date beginDate, Date endDate, DecimalFormat decimalFormat); + DocumentReport getLedgerDocumentReport(Date beginDate, Date endDate, DecimalFormat decimalFormat, JasperReport generalLedgersJasperReport, JasperReport entriesJasperReport); } diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/report/ProvisionalEntryBookReportService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/ProvisionalEntryBookReportService.java index 7ad0a07..a30eacc 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/report/ProvisionalEntryBookReportService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/report/ProvisionalEntryBookReportService.java @@ -22,12 +22,12 @@ package org.chorem.lima.business.api.report; * #L% */ +import net.sf.jasperreports.engine.JasperReport; import org.chorem.lima.beans.DocumentReport; import java.text.DecimalFormat; import java.util.Date; import java.util.List; -import java.util.Properties; /** * Created by davidcosse on 19/11/14. @@ -38,7 +38,10 @@ public interface ProvisionalEntryBookReportService { * @param beginDate period from * @param endDate period to * @param entryBookCodes selected entry books if null all are selected - * @return + * @param entryBooksJasperReport Jasper sub report for entryBooks representation + * @param financialPeriodsJasperReport Jasper sub report for entryBooks financial periods representation + * @param transactionsJasperReport Jasper sub report for entry books transactions representation + * @return model for entry books report */ - DocumentReport getEntryBookDocumentReport(Date beginDate, Date endDate, List<String> entryBookCodes, DecimalFormat bigDecimalFormat); + DocumentReport getEntryBookDocumentReport(Date beginDate, Date endDate, List<String> entryBookCodes, DecimalFormat bigDecimalFormat, JasperReport entryBooksJasperReport, JasperReport financialPeriodsJasperReport, JasperReport transactionsJasperReport); } diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java index 94459e6..04031f4 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java @@ -65,6 +65,8 @@ public class ReportServiceImpl extends AbstractLimaService implements ReportServ protected AccountService accountService; protected static final Log log = LogFactory.getLog(ReportServiceImpl.class); + public static final int MAX_ACCOUNT_NUMBER_DISPLAYED = 3; + public static final String ACCOUNTS_SEPARATOR = " - "; /** * Recursiv @@ -295,7 +297,7 @@ public class ReportServiceImpl extends AbstractLimaService implements ReportServ balanceTrial.setReportsDatas(new ArrayList<ReportsDatas>()); BigDecimal credit = BigDecimal.ZERO; BigDecimal debit = BigDecimal.ZERO; - BigDecimal solde = BigDecimal.ZERO; + BigDecimal balance = BigDecimal.ZERO; AccountTopiaDao accountTopiaDao = getDaoHelper().getAccountDao(); //for each account create a balance sheet with a ReportsDatas @@ -315,6 +317,8 @@ public class ReportServiceImpl extends AbstractLimaService implements ReportServ Collections.sort(accounts, new AccountComparator()); + balanceTrial.setFromToAccountNumber(getFromToAccounts(accounts)); + for (Account account : accounts) { ReportsDatas reportsDatas = generateSubAccountBalance(account, beginDate, @@ -343,19 +347,36 @@ public class ReportServiceImpl extends AbstractLimaService implements ReportServ } // set the amounts and solde //solde = debit - credit; - solde = solde.add(debit); - solde = solde.subtract(credit); - if (solde.compareTo(BigDecimal.ZERO) == 1) { + balance = balance.add(debit); + balance = balance.subtract(credit); + if (balance.compareTo(BigDecimal.ZERO) == 1) { balanceTrial.setSoldeDebit(true); } - solde = solde.abs(); + balance = balance.abs(); balanceTrial.setAmountCredit(credit); balanceTrial.setAmountDebit(debit); - balanceTrial.setAmountSolde(solde); + balanceTrial.setAmountSolde(balance); return balanceTrial; } + protected String getFromToAccounts(List<Account> accounts) { + String fromToAccount = ""; + if (accounts.size() > 0) { + if (accounts.size() < MAX_ACCOUNT_NUMBER_DISPLAYED) { + StringBuilder stringBuilder = new StringBuilder(); + for (int i = 0; i < MAX_ACCOUNT_NUMBER_DISPLAYED - 1; i++) { + stringBuilder.append(accounts.get(i).getAccountNumber()); + stringBuilder.append(ACCOUNTS_SEPARATOR); + } + fromToAccount = stringBuilder.append(accounts.get(MAX_ACCOUNT_NUMBER_DISPLAYED)).toString(); + } else { + fromToAccount = accounts.get(0).getAccountNumber() + " ... " + accounts.get(accounts.size() -1).getAccountNumber(); + } + } + return fromToAccount; + } + /** * Get Ledger 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 671ce09..b9446a5 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 @@ -24,6 +24,7 @@ package org.chorem.lima.business.ejb.report; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; +import net.sf.jasperreports.engine.JasperReport; import org.apache.commons.lang3.StringUtils; import org.chorem.lima.beans.DocumentReport; import org.chorem.lima.beans.BalanceAccount; @@ -32,7 +33,6 @@ import org.chorem.lima.beans.DocumentReportImpl; import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.BalanceTrialImpl; import org.chorem.lima.beans.ReportsDatas; -import org.chorem.lima.business.LimaServiceConfig; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.FinancialPeriodService; import org.chorem.lima.business.api.IdentityService; @@ -91,9 +91,7 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal }; @Override - public DocumentReport getBalanceDocumentReport(Date from, Date to, String selectedAccounts, DecimalFormat bigDecimalFormat) { - String balanceAccountReportModelPath = LimaServiceConfig.getInstance().getBalanceAccountReportModelPath(); - String balanceSubAccountReportModelPath = LimaServiceConfig.getInstance().getBalanceSubAccountReportModelPath(); + public DocumentReport getBalanceDocumentReport(Date from, Date to, String selectedAccounts, DecimalFormat bigDecimalFormat, JasperReport mainAccountsJasperReport, JasperReport subAccountsJasperReport) { DocumentReport documentReport = new DocumentReportImpl(); documentReport.setFormatter(bigDecimalFormat); @@ -107,8 +105,7 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal documentReport.setCurrency(bigDecimalFormat.getDecimalFormatSymbols().getCurrencySymbol()); documentReport.setFromDate(from); documentReport.setToDate(to); - documentReport.setSubReportPath(balanceAccountReportModelPath); - + documentReport.setSubReport(mainAccountsJasperReport); BalanceTrial balanceTrial = new BalanceTrialImpl(); balanceTrial.setReportsDatas(new ArrayList<ReportsDatas>()); @@ -148,7 +145,7 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal if (classAccount == null) { classAccount = new BalanceAccountImpl(); classAccount.setFormatter(bigDecimalFormat); - classAccount.setBalanceSubAccountsReportPath(balanceSubAccountReportModelPath); + classAccount.setSubReport(subAccountsJasperReport); classAccount.setSubAccounts(new ArrayList<BalanceAccount>()); classAccount.setAccountNumber(""); accountsByClasses.put(accountClass, classAccount); 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 8f8fab1..9615820 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 @@ -26,6 +26,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import net.sf.jasperreports.engine.JasperReport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaTechnicalException; @@ -35,7 +36,6 @@ import org.chorem.lima.beans.GeneralEntryBook; import org.chorem.lima.beans.GeneralEntryBookEntry; import org.chorem.lima.beans.GeneralEntryBookEntryImpl; import org.chorem.lima.beans.GeneralEntryBookImpl; -import org.chorem.lima.business.LimaServiceConfig; import org.chorem.lima.business.api.ClosedPeriodicEntryBookService; import org.chorem.lima.business.api.EntryService; import org.chorem.lima.business.api.FinancialPeriodService; @@ -94,9 +94,7 @@ public class GeneralEntryBookReportServiceImpl extends AbstractLimaService imple protected static final String TITLE = "Journal Général Provisoire"; @Override - public DocumentReport getGeneralEntryBookDocumentReport(Date beginDate, Date endDate, DecimalFormat bigDecimalFormat) { - String generalEntryBookReportPath = LimaServiceConfig.getInstance().getGeneralEntryBookReportModelPath(); - String generalEntryBookEntryReportPath = LimaServiceConfig.getInstance().getGeneralEntryBookEntryReportModelPath(); + public DocumentReport getGeneralEntryBookDocumentReport(Date beginDate, Date endDate, DecimalFormat bigDecimalFormat, JasperReport generalEntryBooksJasperReport, JasperReport entriesJasperReport) { DocumentReport documentReport = new DocumentReportImpl(); try { @@ -111,7 +109,7 @@ public class GeneralEntryBookReportServiceImpl extends AbstractLimaService imple documentReport.setCurrency(bigDecimalFormat.getDecimalFormatSymbols().getCurrencySymbol()); documentReport.setFromDate(beginDate); documentReport.setToDate(endDate); - documentReport.setSubReportPath(generalEntryBookReportPath); + documentReport.setSubReport(generalEntryBooksJasperReport); documentReport.setFormatter(bigDecimalFormat); List<FinancialPeriod> financialPeriods = financialPeriodService.getFinancialPeriods(beginDate, endDate); @@ -186,7 +184,7 @@ public class GeneralEntryBookReportServiceImpl extends AbstractLimaService imple GeneralEntryBook generalEntryBook = new GeneralEntryBookImpl(); generalEntryBook.setFormatter(bigDecimalFormat); generalEntryBook.setPeriod(financialPeriod.getBeginDate()); - generalEntryBook.setSubReportPath(generalEntryBookEntryReportPath); + generalEntryBook.setSubReport(entriesJasperReport); generalEntryBook.setSoldeDebit(subAmountDebit); generalEntryBook.setSoldeCredit(subAmountCredit); generalEntryBook.setEntries(Lists.newArrayList(generalEntryBookEntries)); 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 efd83a4..56376df 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 @@ -22,8 +22,7 @@ package org.chorem.lima.business.ejb.report; * #L% */ -import com.google.common.base.Preconditions; -import org.apache.commons.lang3.StringUtils; +import net.sf.jasperreports.engine.JasperReport; import org.chorem.lima.LimaTechnicalException; import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.DocumentReport; @@ -33,7 +32,6 @@ import org.chorem.lima.beans.GeneralLedgerEntry; import org.chorem.lima.beans.GeneralLedgerEntryImpl; import org.chorem.lima.beans.GeneralLedgerImpl; import org.chorem.lima.beans.ReportsDatas; -import org.chorem.lima.business.LimaServiceConfig; import org.chorem.lima.business.api.IdentityService; import org.chorem.lima.business.api.ReportService; import org.chorem.lima.business.api.report.LedgerReportService; @@ -50,7 +48,6 @@ import javax.ejb.Stateless; import javax.ejb.TransactionAttribute; import java.math.BigDecimal; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; @@ -74,34 +71,25 @@ public class LedgerReportServiceImpl extends AbstractLimaService implements Ledg protected static final String TITLE = t("lima-business.document.ledger"); @Override - public DocumentReport getLedgerDocumentReport(Date beginDate, Date endDate, DecimalFormat decimalFormat) { - String generalLedgerReportModelPath = LimaServiceConfig.getInstance().getGeneralLedgerModelPath(); - String generalLedgerEntryModelPath = LimaServiceConfig.getInstance().getGeneralLedgerEntryModelPath(); - - Preconditions.checkArgument(StringUtils.isNoneBlank(generalLedgerReportModelPath)); - Preconditions.checkArgument(StringUtils.isNoneBlank(generalLedgerEntryModelPath)); + public DocumentReport getLedgerDocumentReport(Date beginDate, Date endDate, DecimalFormat decimalFormat, JasperReport generalLedgersJasperReport, JasperReport entriesJasperReport) { DocumentReport result = new DocumentReportImpl(); result.setFormatter(decimalFormat); result.setCurrency(decimalFormat.getDecimalFormatSymbols().getCurrencySymbol()); - //result.setFromAccount(); - //result.setToAccount(); result.setFromDate(beginDate); result.setToDate(endDate); - result.setSubReportPath(""); + result.setSubReport(generalLedgersJasperReport); result.setTitle(TITLE); Identity identity = identityService.getIdentity(); String companyName = identity == null ? "" : identity.getName(); result.setCompanyName(companyName); - result.setSubReportPath(generalLedgerReportModelPath); - - if (beginDate != null && endDate != null) { try { BalanceTrial balanceTrial = reportService.generateLedger(beginDate, endDate, null, true); + result.setFromAccount(balanceTrial.getFromToAccountNumber()); if (balanceTrial.getReportsDatas() != null) { for (ReportsDatas reportsDatas : balanceTrial.getReportsDatas()) { @@ -119,12 +107,13 @@ public class LedgerReportServiceImpl extends AbstractLimaService implements Ledg generalLedger.setDebit(amountDebit); generalLedger.setCredit(amountCredit); generalLedger.setSolde(amountDebit.subtract(amountCredit)); - generalLedger.setSubReportPath(generalLedgerEntryModelPath); + generalLedger.setSubReport(entriesJasperReport); generalLedger.setNbEntries(balanceTrial.getReportsDatas().size()); result.addGeneralLedgers(generalLedger); Collections.sort(entries, new EntryComparator()); + BigDecimal balance = BigDecimal.ZERO; for (Entry entry : entries) { String entryBookCode = ""; EntryBook entryBook = entry.getFinancialTransaction().getEntryBook(); @@ -147,7 +136,8 @@ public class LedgerReportServiceImpl extends AbstractLimaService implements Ledg generalLedgerEntry.setDescription(entry.getDescription()); generalLedgerEntry.setDebit(entryAmountDebit); generalLedgerEntry.setCredit(entryAmountCredit); - generalLedgerEntry.setSolde(entryAmountDebit.subtract(entryAmountCredit)); + balance = balance.add(entryAmountDebit.subtract(entryAmountCredit)); + generalLedgerEntry.setSolde(balance); generalLedgerEntry.setNbEntries(entries.size()); generalLedger.addEntries(generalLedgerEntry); } diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/ProvisionalEntryBookReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/ProvisionalEntryBookReportServiceImpl.java index ab8a666..ad88652 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 @@ -22,8 +22,7 @@ package org.chorem.lima.business.ejb.report; * #L% */ -import com.google.common.base.Preconditions; -import org.apache.commons.lang3.StringUtils; +import net.sf.jasperreports.engine.JasperReport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaTechnicalException; @@ -33,7 +32,6 @@ import org.chorem.lima.beans.EntryBookImpl; import org.chorem.lima.beans.FinancialPeriodImpl; import org.chorem.lima.beans.Transaction; import org.chorem.lima.beans.TransactionImpl; -import org.chorem.lima.business.LimaServiceConfig; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.EntryService; import org.chorem.lima.business.api.FinancialPeriodService; @@ -89,18 +87,10 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo * - BIG_DECIMAL_FORMAT **/ @Override - public DocumentReport getEntryBookDocumentReport(Date beginDate, Date endDate, List<String> entryBookCodes, DecimalFormat bigDecimalFormat) { - LimaServiceConfig config = LimaServiceConfig.getInstance(); - - String entryBookReportPath = config.getEntryBookEntryBookReportModelPath(); - String financialPeriodReportPath = config.getEntryBookFinancialPeriodReportModelPath(); - String transactionReportPath = config.getEntryBookTransactionReportModelPath(); + public DocumentReport getEntryBookDocumentReport(Date beginDate, Date endDate, List<String> entryBookCodes, DecimalFormat bigDecimalFormat, JasperReport entryBooksJasperReport, JasperReport financialPeriodsJasperReport, JasperReport transactionsJasperReport) { DocumentReport documentReport = new DocumentReportImpl(); try { - Preconditions.checkArgument(StringUtils.isNoneBlank(entryBookReportPath)); - Preconditions.checkArgument(StringUtils.isNoneBlank(financialPeriodReportPath)); - Preconditions.checkArgument(StringUtils.isNoneBlank(transactionReportPath)); if (beginDate != null && endDate != null) { Identity identity = identityService.getIdentity(); @@ -113,7 +103,7 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo documentReport.setFromDate(beginDate); documentReport.setToDate(endDate); - documentReport.setSubReportPath(entryBookReportPath); + documentReport.setSubReport(entryBooksJasperReport); BigDecimal documentReportDebit = BigDecimal.ZERO; BigDecimal documentReportCredit = BigDecimal.ZERO; @@ -134,7 +124,7 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo org.chorem.lima.beans.EntryBook entryBookReport = new EntryBookImpl(); entryBookReport.setLibelle(entryBook.getLabel()); entryBookReport.setCode(entryBook.getCode()); - entryBookReport.setSubReportPath(financialPeriodReportPath); + entryBookReport.setSubReport(financialPeriodsJasperReport); BigDecimal entryBookSoldeDebit = BigDecimal.ZERO; BigDecimal entryBookSoldeCredit = BigDecimal.ZERO; @@ -143,7 +133,7 @@ public class ProvisionalEntryBookReportServiceImpl implements ProvisionalEntryBo for (FinancialPeriod financialPeriod : financialPeriods) { org.chorem.lima.beans.FinancialPeriod financialPeriodReport = new FinancialPeriodImpl(); - financialPeriodReport.setSubReportPath(transactionReportPath); + financialPeriodReport.setSubReport(transactionsJasperReport); financialPeriodReport.setPeriod(financialPeriod.getBeginDate()); BigDecimal financialPeriodDebit = BigDecimal.ZERO; diff --git a/lima-business/src/main/java/org/chorem/lima/business/utils/DocumentReportTypes.java b/lima-business/src/main/java/org/chorem/lima/business/utils/DocumentReportTypes.java new file mode 100644 index 0000000..11cae94 --- /dev/null +++ b/lima-business/src/main/java/org/chorem/lima/business/utils/DocumentReportTypes.java @@ -0,0 +1,23 @@ +package org.chorem.lima.business.utils; + + +/** + * Created by davidcosse on 02/03/15. + */ +public enum DocumentReportTypes { + ACCOUNT, + BALANCE, + BALANCE_MAIN_ACCOUNTS, + BALANCE_SUB_ACCOUNTS, + ENTRY_BOOKS, + ENTRY_BOOKS_ENTRY_BOOKS, + ENTRY_BOOKS_FINANCIAL_PERIODS, + ENTRY_BOOKS_TRANSACTION, + FINANCIAL_STATEMENT, + GENERAL_ENTRY_BOOK, + GENERAL_ENTRY_BOOK_GENERAL_ENTRY_BOOKS, + GENERAL_ENTRY_BOOK_ENTRIES, + LEDGER, + LEDGER_GENERAL_LEDGERS, + LEDGER_ENTRIES; +} diff --git a/lima-business/src/main/java/org/chorem/lima/business/utils/DocumentsEnum.java b/lima-business/src/main/java/org/chorem/lima/business/utils/DocumentsEnum.java index e692408..5fa414d 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/utils/DocumentsEnum.java +++ b/lima-business/src/main/java/org/chorem/lima/business/utils/DocumentsEnum.java @@ -26,14 +26,13 @@ import static org.nuiton.i18n.I18n.t; public enum DocumentsEnum { - - GENERAL_ENTRYBOOK(t("lima-business.document.generalentrybook"), "lima_general_entybook"), - ENTRYBOOKS(t("lima-business.document.entrybook"), "lima_entrybooks"), + ACCOUNT(t("lima-business.document.account"), "lima_account"), BALANCE(t("lima-business.document.balance"), "lima_balance"), - LEDGER(t("lima-business.document.ledger"), "lima_ledger"), - FINANCIALSTATEMENT(t("lima-business.document.financialstatement"), "lima_financialstatements"), + ENTRY_BOOKS(t("lima-business.document.entrybook"), "lima_entrybooks"), + FINANCIAL_STATEMENT(t("lima-business.document.financialstatement"), "lima_financialstatements"), + GENERAL_ENTRY_BOOK(t("lima-business.document.generalentrybook"), "lima_general_entybook"), + LEDGER(t("lima-business.document.ledger"), "lima_ledger"); // VAT(t("lima-business.document.vat"), "lima_vat"), - ACCOUNT(t("lima-business.document.account"), "lima_account"); private final String fileName; diff --git a/lima-callao/pom.xml b/lima-callao/pom.xml index e7c426b..7dbdcc3 100644 --- a/lima-callao/pom.xml +++ b/lima-callao/pom.xml @@ -58,6 +58,11 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-service-flyway</artifactId> </dependency> + <dependency> + <groupId>net.sf.jasperreports</groupId> + <artifactId>jasperreports</artifactId> + <scope>compile</scope> + </dependency> </dependencies> <build> diff --git a/lima-callao/src/main/xmi/accounting-model.zargo b/lima-callao/src/main/xmi/accounting-model.zargo index 50e0d42..85c30f8 100644 Binary files a/lima-callao/src/main/xmi/accounting-model.zargo and b/lima-callao/src/main/xmi/accounting-model.zargo differ diff --git a/lima-swing/src/license/THIRD-PARTY.properties b/lima-swing/src/license/THIRD-PARTY.properties index 0a7875b..9643b47 100644 --- a/lima-swing/src/license/THIRD-PARTY.properties +++ b/lima-swing/src/license/THIRD-PARTY.properties @@ -4,9 +4,11 @@ # - AL 2.0 # - Apache 2 # - Apache License 2.0 +# - Apache License, Version 2.0 # - Apache License, version 2.0 # - Apache Software License - Version 2.0 # - Apache Software License 2.0 +# - BSD # - BSD License # - CDDL # - CDDL + GPLv2 with classpath exception @@ -17,23 +19,22 @@ # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License - Version 1.0 -# - Eclipse Public License - v 1.0 -# - GNU General Lesser Public License (LGPL) version 3.0 +# - Eclipse Public License v1.0 +# - GNU Affero General Public License v3 +# - GNU General Public Library # - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public Licence +# - GNU Lesser General Public License # - GNU Library or Lesser General Public License # - GPL2 w/ CPE # - GPLv2+CE # - General Public License (GPL) # - HSQLDB License, a BSD open source license -# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - LGPL 2.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - Lesser General Public License (LPGL) -# - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 -# - Mozilla Public License Version 2.0 # - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 @@ -45,14 +46,21 @@ # Please fill the missing licenses for dependencies : # # -#Fri Feb 27 17:40:22 UTC 2015 +#Mon Mar 02 12:01:23 CET 2015 commons-jxpath--commons-jxpath--1.3=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=jdomlicence -eclipse--jdtcore--3.1.0=Eclipse Public License - v 1.0 jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0 -org.codehaus.castor--castor--1.2=The Apache Software License, Version 2.0 +org.codehaus.castor--castor-core--1.3.3=The Apache Software License, Version 2.0 +org.codehaus.castor--castor-xml--1.3.3=The Apache Software License, Version 2.0 org.metatype.sxc--sxc-jaxb-core--0.8=CDDL 1.1 org.metatype.sxc--sxc-runtime--0.8=CDDL 1.1 org.olap4j--olap4j--0.9.7.309-JS-3=GNU Lesser General Public License +org.springframework--spring-aop--3.0.6.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-asm--3.0.6.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-beans--3.0.6.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-context--3.0.6.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-core--3.0.6.RELEASE=The Apache Software License, Version 2.0 +org.springframework--spring-expression--3.0.6.RELEASE=The Apache Software License, Version 2.0 +stax--stax--1.2.0=The Apache Software License, Version 2.0 xml-apis--xml-apis--1.3.02=The Apache Software License, Version 2.0 diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java index 9b62ff2..c926d07 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java @@ -206,6 +206,10 @@ public class LimaMain { LimaServiceConfig serviceConfig = LimaServiceConfig.getInstance(); LimaSwingConfig swingConfig = LimaSwingConfig.getInstance(); + // TODO DCossé 02/03/15 Ceci ne devrait pas être fait ainsi + // ici sont poussés côté service les chemins vers les fichier source JASPER nécessaires à la compilation des rapports + // la configuration est pourssé dans les service afin de pouvoir être récupérée par la partie web ! + // dans la partie web ce fait la création (graphique) des rapport à partir des données remontées par la partie service. serviceConfig.setBalanceDocumentReportModelPath(swingConfig.getBalanceDocumentReportModelPath()); serviceConfig.setReportsModelDir(swingConfig.getReportsDir().getAbsolutePath()); serviceConfig.setAccountReportModelPath(swingConfig.getAccountDocumentReportModelPath()); @@ -214,7 +218,6 @@ public class LimaMain { serviceConfig.setBalanceSubAccountReportModelPath(swingConfig.getBalanceSubAccountReportModelPath()); serviceConfig.setGeneralEntryBookDocumentReportModelPath(swingConfig.getGeneralEntryBookDocumentReportModelPath()); serviceConfig.setGeneralEntryBookEntryReportModelPath(swingConfig.getGeneralEntryBookGeneralEntryBookEntryReportPath()); - serviceConfig.setGeneralEntryBookEntryReportModelPath(swingConfig.getGeneralEntryBookGeneralEntryBookEntryReportPath()); serviceConfig.setEntryBookDocumentReportModelPath(swingConfig.getProvisionalEntryBookEntryBookMainReportPath()); serviceConfig.setEntryBookEntryBookReportModelPath(swingConfig.getProvisionalEntryBookEntryBookReportPath()); serviceConfig.setEntryBookFinancialPeriodReportModelPath(swingConfig.getProvisionalEntryBookFinancialPeriodReportPath()); diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java index 366469d..7ef0476 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java @@ -74,9 +74,7 @@ public class LimaSwingConfig extends ApplicationConfig { /** La version du logiciel. */ protected Version version; - - protected final static String ROOT_PATH = new File("").getAbsolutePath(); - + /** * Get copyright text (include version). * @@ -694,68 +692,68 @@ public class LimaSwingConfig extends ApplicationConfig { ACCOUNT_DOCUMENT_REPORT_MODEL_PATH("lima.config.documentReport.account.documentReportModelPath", "", n("lima.config.documentReport.account.documentReportModelPath.description"), - ROOT_PATH + "/lima-web/src/main/jasperreports/accounts/DocumentReport.jrxml", + "/jasperreports/account/DocumentReport.jrxml", String.class, false, false), BALANCE_DOCUMENT_REPORT_MODEL_PATH("lima.config.documentReport.balance.documentReportModelPath", "", n("lima.config.documentReport.balance.documentReportModelPath.description"), - ROOT_PATH + "/lima-web/src/main/jasperreports/balance/DocumentReport.jrxml", + "/jasperreports/balance/DocumentReport.jrxml", String.class, false, false), BALANCE_ACCOUNT_REPORT_MODEL_PATH("lima.config.documentReport.balance.balanceAccountReportModelPath", "", n("lima.config.documentReport.balance.balanceAccountReportModelPath.description"), - ROOT_PATH + "/lima-web/src/main/jasperreports/balance/BalanceReportAccountReport.jrxml", + "/jasperreports/balance/BalanceReportAccountReport.jrxml", String.class, false, false), BALANCE_SUB_ACCOUNT_REPORT_MODEL_PATH("lima.config.documentReport.balance.balanceSubAccountReportModelPath", "", n("lima.config.documentReport.balance.balanceSubAccountReportModelPath.description"), - ROOT_PATH + "/lima-web/src/main/jasperreports/balance/BalanceSubAccountsReport.jrxml", + "/jasperreports/balance/BalanceSubAccountsReport.jrxml", String.class, false, false), GENERAL_ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH("lima.config.documentReport.generalEntrybook.documentReportModelPath", "", n("lima.config.documentReport.generalEntrybook.documentReportModelPath.description"), - ROOT_PATH + "/lima-web/src/main/jasperreports/generalEntryBook/DocumentReport.jrxml", + "/jasperreports/generalEntryBook/DocumentReport.jrxml", String.class, false, false), GENERAL_ENTRY_BOOK_REPORT_MODEL_PATH("lima.config.documentReport.generalEntrybook.generalEntryBookModelPath", "", n("lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.description"), - ROOT_PATH + "/lima-web/src/main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml", + "/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml", String.class, false, false), GENERAL_ENTRY_BOOK_ENTRY_REPORT_MODEL_PATH("lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath", "", - n("lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description"), - ROOT_PATH + "/lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml", + n("blima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.description"), + "/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml", String.class, false, false), ENTRY_BOOK_DOCUMENT_REPORT_MODEL_PATH("lima.config.documentReport.entrybook.documentReportModelPath", "", n("lima.config.documentReport.entrybook.documentReportModelPath.description"), - ROOT_PATH + "/lima-web/src/main/jasperreports/entryBook/DocumentReport.jrxml", + "/jasperreports/entryBook/DocumentReport.jrxml", String.class,false, false), ENTRY_BOOK_ENTRY_BOOK_REPORT_MODEL_PATH("lima.config.documentReport.entrybook.entryBookModelPath", "", n("lima.config.documentReport.entrybook.entryBookModelPath.description"), - ROOT_PATH + "/lima-web/src/main/jasperreports/entryBook/EntryBookReport.jrxml", + "/jasperreports/entryBook/EntryBookReport.jrxml", String.class,false, false), ENTRY_BOOK_FINANCIAL_PERIOD_REPORT_MODEL_PATH("lima.config.documentReport.entrybook.financialPeriodModelPath", "", n("lima.config.documentReport.entrybook.financialPeriodModelPath.description"), - ROOT_PATH + "/lima-web/src/main/jasperreports/entryBook/FinancialPeriodReport.jrxml", + "/jasperreports/entryBook/FinancialPeriodReport.jrxml", String.class, false, false), ENTRY_BOOK_TRANSACTION_REPORT_MODEL_PATH("lima.config.documentReport.entrybook.transactionReportModelPath", "", n("lima.config.documentReport.entrybook.transactionReportModelPath.description"), - ROOT_PATH + "/lima-web/src/main/jasperreports/entryBook/TransactionReport.jrxml", + "/jasperreports/entryBook/TransactionReport.jrxml", String.class, false, false); protected enum ComportmentEditingCellEnum {ALL, NOTHING} @@ -882,10 +880,5 @@ public class LimaSwingConfig extends ApplicationConfig { optionsService.setScale(scaleOption); } - // report BigDecimal format -// String bigDecimalFormat = getOption(Option.BIG_DECIMAL_FORMAT.key); -// if (StringUtils.isNotBlank(bigDecimalFormat)) { -// optionsService.setBigDecimalFormat(bigDecimalFormat); -// } } } diff --git a/lima-web/src/main/java/org/chorem/lima/web/action/ReportBuilder.java b/lima-web/src/main/java/org/chorem/lima/web/action/ReportBuilder.java index 8e7f35f..0777feb 100644 --- a/lima-web/src/main/java/org/chorem/lima/web/action/ReportBuilder.java +++ b/lima-web/src/main/java/org/chorem/lima/web/action/ReportBuilder.java @@ -35,6 +35,7 @@ import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaTechnicalException; import org.chorem.lima.beans.DocumentReport; import org.chorem.lima.business.LimaServiceConfig; +import org.chorem.lima.business.utils.DocumentReportTypes; import org.chorem.lima.business.utils.DocumentsEnum; import java.io.IOException; @@ -52,12 +53,21 @@ public class ReportBuilder { private static final Log log = LogFactory.getLog(ReportBuilder.class); protected JasperReport balanceDocumentReport; - - protected JasperReport generalEntryBookDocumentReport; + protected JasperReport balanceManAccountsReport; + protected JasperReport balanceSubAccountsReport; protected JasperReport entryBookDocumentReport; + protected JasperReport entryBookEntryBooksReport; + protected JasperReport entryBookFinancialPeriodsReport; + protected JasperReport entryBookTransactionsReport; + + protected JasperReport generalEntryBookDocumentReport; + protected JasperReport generalEntryBookGeneralEntryBooksReport; + protected JasperReport generalEntryBookEntriesReport; protected JasperReport generalLedgerDocumentReport; + protected JasperReport generalLedgerGeneralLedgersReport; + protected JasperReport generalLedgerEntriesReport; protected Map<DocumentsEnum, JasperReport> reportsByDocumentType; @@ -66,32 +76,41 @@ public class ReportBuilder { LimaServiceConfig config = LimaServiceConfig.getInstance(); // compile phase - balanceDocumentReport = createReport(config.getBalanceDocumentReportModelUrl()); - //TODO -// generalEntryBookDocumentReport = JasperCompileManager.compileReport(config.getGeneralEntryBookDocumentReportModelPath()); -// entryBookDocumentReport = JasperCompileManager.compileReport(config.getEntryBookDocumentReportModelPath()); -// generalLedgerDocumentReport = JasperCompileManager.compileReport(config.getGeneralLedgerDocumentReportModelPath()); + balanceDocumentReport = createReport(config.getReportModelUrl(DocumentReportTypes.BALANCE)); + balanceManAccountsReport = createReport(config.getReportModelUrl(DocumentReportTypes.BALANCE_MAIN_ACCOUNTS)); + balanceSubAccountsReport = createReport(config.getReportModelUrl(DocumentReportTypes.BALANCE_SUB_ACCOUNTS)); + entryBookDocumentReport = createReport(config.getReportModelUrl(DocumentReportTypes.ENTRY_BOOKS)); + entryBookEntryBooksReport = createReport(config.getReportModelUrl(DocumentReportTypes.ENTRY_BOOKS_ENTRY_BOOKS)); + entryBookFinancialPeriodsReport = createReport(config.getReportModelUrl(DocumentReportTypes.ENTRY_BOOKS_FINANCIAL_PERIODS)); + entryBookTransactionsReport = createReport(config.getReportModelUrl(DocumentReportTypes.ENTRY_BOOKS_TRANSACTION)); + + generalEntryBookDocumentReport = createReport(config.getReportModelUrl(DocumentReportTypes.GENERAL_ENTRY_BOOK)); + generalEntryBookGeneralEntryBooksReport = createReport(config.getReportModelUrl(DocumentReportTypes.GENERAL_ENTRY_BOOK_GENERAL_ENTRY_BOOKS)); + generalEntryBookEntriesReport = createReport(config.getReportModelUrl(DocumentReportTypes.GENERAL_ENTRY_BOOK_ENTRIES)); + + generalLedgerDocumentReport = createReport(config.getReportModelUrl(DocumentReportTypes.LEDGER)); + generalLedgerGeneralLedgersReport = createReport(config.getReportModelUrl(DocumentReportTypes.LEDGER_GENERAL_LEDGERS)); + generalLedgerEntriesReport = createReport(config.getReportModelUrl(DocumentReportTypes.LEDGER_ENTRIES)); reportsByDocumentType = Maps.newHashMap(); reportsByDocumentType.put(DocumentsEnum.BALANCE, balanceDocumentReport); - reportsByDocumentType.put(DocumentsEnum.GENERAL_ENTRYBOOK, generalEntryBookDocumentReport); - reportsByDocumentType.put(DocumentsEnum.ENTRYBOOKS, entryBookDocumentReport); + reportsByDocumentType.put(DocumentsEnum.GENERAL_ENTRY_BOOK, generalEntryBookDocumentReport); + reportsByDocumentType.put(DocumentsEnum.ENTRY_BOOKS, entryBookDocumentReport); reportsByDocumentType.put(DocumentsEnum.LEDGER, generalLedgerDocumentReport); } protected JasperReport createReport(URL url) { - + JasperReport jasperReport; try (InputStream inputStream = url.openStream()) { - JasperReport jasperReport = JasperCompileManager.compileReport(inputStream); - return jasperReport; + jasperReport = JasperCompileManager.compileReport(inputStream); } catch (IOException e) { throw new LimaTechnicalException("Could not close inputStream for " + url, e); } catch (JRException e) { throw new LimaTechnicalException("Could not compile jaspert report for " + url, e); } - + return jasperReport; } public void generatePDFReport(DocumentsEnum reportType, String path, List<DocumentReport> reports) { @@ -113,4 +132,45 @@ public class ReportBuilder { } } + + + public JasperReport getBalanceManAccountsReport() { + return balanceManAccountsReport; + } + + public JasperReport getBalanceSubAccountsReport() { + return balanceSubAccountsReport; + } + + public JasperReport getEntryBookEntryBooksReport() { + return entryBookEntryBooksReport; + } + + public JasperReport getEntryBookFinancialPeriodsReport() { + return entryBookFinancialPeriodsReport; + } + + public JasperReport getEntryBookTransactionsReport() { + return entryBookTransactionsReport; + } + + public JasperReport getGeneralEntryBookGeneralEntryBooksReport() { + return generalEntryBookGeneralEntryBooksReport; + } + + public JasperReport getGeneralEntryBookEntriesReport() { + return generalEntryBookEntriesReport; + } + + public JasperReport getGeneralLedgerGeneralLedgersReport() { + return generalLedgerGeneralLedgersReport; + } + + public JasperReport getGeneralLedgerEntriesReport() { + return generalLedgerEntriesReport; + } + + public Map<DocumentsEnum, JasperReport> getReportsByDocumentType() { + return reportsByDocumentType; + } } diff --git a/lima-web/src/main/java/org/chorem/lima/web/service/DocumentService.java b/lima-web/src/main/java/org/chorem/lima/web/service/DocumentService.java index 70b53e5..a798d8e 100644 --- a/lima-web/src/main/java/org/chorem/lima/web/service/DocumentService.java +++ b/lima-web/src/main/java/org/chorem/lima/web/service/DocumentService.java @@ -23,6 +23,7 @@ package org.chorem.lima.web.service; import com.google.common.collect.Lists; +import net.sf.jasperreports.engine.JasperReport; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -541,28 +542,37 @@ public class DocumentService { //############## balance ############## public DocumentReport createBalanceDocuments(Date beginDate, Date endDate, String fromToAccount) { - - DocumentReport report = balanceReportService.getBalanceDocumentReport(beginDate, endDate, fromToAccount, BigDecimalToString.getDecimalFormat()); + JasperReport balanceMainAccountsReport = reportBuilder.getBalanceManAccountsReport(); + JasperReport balanceSubAccountsReport = reportBuilder.getBalanceSubAccountsReport(); + DocumentReport report = balanceReportService.getBalanceDocumentReport(beginDate, endDate, fromToAccount, BigDecimalToString.getDecimalFormat(), balanceMainAccountsReport, balanceSubAccountsReport); reportBuilder.generatePDFReport(org.chorem.lima.business.utils.DocumentsEnum.BALANCE, BALANCE_FILE_PATH, Lists.newArrayList(report)); return report; } - //############## General EntryBook ############# - public DocumentReport createGeneralEntryBooksDocuments(Date beginDate, Date endDate) { - - DocumentReport report = generalEntryBookReportService.getGeneralEntryBookDocumentReport(beginDate, endDate, BigDecimalToString.getDecimalFormat()); - reportBuilder.generatePDFReport(org.chorem.lima.business.utils.DocumentsEnum.GENERAL_ENTRYBOOK, GENERAL_ENTRY_BOOK_REPORT_PDF_FILE_PATH, Lists.newArrayList(report)); + //############## EntryBook ############# + public DocumentReport createEntryBooksDocuments(Date beginDate, Date endDate, List<String> entryBookCodes) { + JasperReport entryBookEntryBooksReport = reportBuilder.getEntryBookEntryBooksReport(); + JasperReport entryBookFinancialPeriodsReport = reportBuilder.getEntryBookFinancialPeriodsReport(); + JasperReport entryBookTransactionsReport = reportBuilder.getEntryBookTransactionsReport(); + DocumentReport report = entryBookReportService.getEntryBookDocumentReport(beginDate, endDate, entryBookCodes, BigDecimalToString.getDecimalFormat(), entryBookEntryBooksReport, entryBookFinancialPeriodsReport, entryBookTransactionsReport); + reportBuilder.generatePDFReport(org.chorem.lima.business.utils.DocumentsEnum.ENTRY_BOOKS, ENTRY_BOOKS_REPORT_PDF_FILE_PATH, Lists.newArrayList(report)); return report; } - public DocumentReport createEntryBooksDocuments(Date beginDate, Date endDate, List<String> entryBookCodes) { - DocumentReport report = entryBookReportService.getEntryBookDocumentReport(beginDate, endDate, entryBookCodes, BigDecimalToString.getDecimalFormat()); - reportBuilder.generatePDFReport(org.chorem.lima.business.utils.DocumentsEnum.ENTRYBOOKS, ENTRY_BOOKS_REPORT_PDF_FILE_PATH, Lists.newArrayList(report)); + //############## General EntryBook ############# + public DocumentReport createGeneralEntryBooksDocuments(Date beginDate, Date endDate) { + JasperReport generalEntryBookGeneralEntryBooksReport = reportBuilder.getGeneralEntryBookGeneralEntryBooksReport(); + JasperReport generalEntryBookEntriesReport = reportBuilder.getGeneralEntryBookEntriesReport(); + DocumentReport report = generalEntryBookReportService.getGeneralEntryBookDocumentReport(beginDate, endDate, BigDecimalToString.getDecimalFormat(), generalEntryBookGeneralEntryBooksReport, generalEntryBookEntriesReport); + reportBuilder.generatePDFReport(org.chorem.lima.business.utils.DocumentsEnum.GENERAL_ENTRY_BOOK, GENERAL_ENTRY_BOOK_REPORT_PDF_FILE_PATH, Lists.newArrayList(report)); return report; } + //############## Ledger ############# public DocumentReport createLedgerDocuments(Date beginDate, Date endDate) { - DocumentReport report = ledgerReportService.getLedgerDocumentReport(beginDate, endDate, BigDecimalToString.getDecimalFormat()); + JasperReport generalLedgerGeneralLedgersReport = reportBuilder.getGeneralLedgerGeneralLedgersReport(); + JasperReport generalLedgerEntriesReport = reportBuilder.getGeneralLedgerEntriesReport(); + DocumentReport report = ledgerReportService.getLedgerDocumentReport(beginDate, endDate, BigDecimalToString.getDecimalFormat(), generalLedgerGeneralLedgersReport, generalLedgerEntriesReport); reportBuilder.generatePDFReport(org.chorem.lima.business.utils.DocumentsEnum.LEDGER, LEDGER_REPORT_PDF_FILE_PATH, Lists.newArrayList(report)); return report; } diff --git a/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java b/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java index 8f9d349..afd40ce 100644 --- a/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java +++ b/lima-web/src/main/java/org/chorem/lima/web/service/HttpServerService.java @@ -172,13 +172,13 @@ public class HttpServerService { accountReport = documentService.createAccountDocument( beginDateFormat, endDateFormat, account); break; - case ENTRYBOOKS: + case ENTRY_BOOKS: documentService.createEntryBooksDocuments(beginDateFormat, endDateFormat, null); break; - case GENERAL_ENTRYBOOK: + case GENERAL_ENTRY_BOOK: documentService.createGeneralEntryBooksDocuments(beginDateFormat, endDateFormat); break; - case FINANCIALSTATEMENT: + case FINANCIAL_STATEMENT: financialReport = documentService.createFinancialStatementsDocuments( beginDateFormat, endDateFormat); break; diff --git a/lima-web/src/main/jasperreports/balance/BalanceReportAccountReport.jrxml b/lima-web/src/main/resources/jasperreports/balance/BalanceReportAccountReport.jrxml similarity index 87% rename from lima-web/src/main/jasperreports/balance/BalanceReportAccountReport.jrxml rename to lima-web/src/main/resources/jasperreports/balance/BalanceReportAccountReport.jrxml index 2a56b5d..3a0aada 100644 --- a/lima-web/src/main/jasperreports/balance/BalanceReportAccountReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/balance/BalanceReportAccountReport.jrxml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2015-01-21T13:44:15 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-02T12:49:55 --> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="21" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Empty" isIgnorePagination="true" uuid="75ff [...] <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> @@ -17,7 +17,7 @@ <field name="soldeDebit" class="java.math.BigDecimal"/> <field name="soldeCredit" class="java.math.BigDecimal"/> <field name="subAccounts" class="java.util.List"/> - <field name="balanceSubAccountsReportPath" class="java.lang.String"/> + <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> <field name="formatter" class="java.text.DecimalFormat"/> <variable name="subAccounts" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource"> <variableExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource((java.util.List)$F{subAccounts})]]></variableExpression> @@ -27,7 +27,7 @@ <subreport isUsingCache="false" runToBottom="false"> <reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"/> <dataSourceExpression><![CDATA[$V{subAccounts}]]></dataSourceExpression> - <subreportExpression><![CDATA[JasperCompileManager.compileReport($F{balanceSubAccountsReportPath})]]></subreportExpression> + <subreportExpression><![CDATA[$F{subReport}]]></subreportExpression> </subreport> </band> </detail> diff --git a/lima-web/src/main/jasperreports/balance/BalanceSubAccountsReport.jrxml b/lima-web/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml similarity index 100% rename from lima-web/src/main/jasperreports/balance/BalanceSubAccountsReport.jrxml rename to lima-web/src/main/resources/jasperreports/balance/BalanceSubAccountsReport.jrxml diff --git a/lima-web/src/main/jasperreports/balance/DocumentReport.jrxml b/lima-web/src/main/resources/jasperreports/balance/DocumentReport.jrxml similarity index 97% rename from lima-web/src/main/jasperreports/balance/DocumentReport.jrxml rename to lima-web/src/main/resources/jasperreports/balance/DocumentReport.jrxml index 05cdae3..920a489 100644 --- a/lima-web/src/main/jasperreports/balance/DocumentReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/balance/DocumentReport.jrxml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2015-01-21T10:08:30 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-02T12:48:06 --> <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"/> @@ -17,7 +17,7 @@ <field name="fromAccount" class="java.lang.String"/> <field name="toAccount" class="java.lang.String"/> <field name="mainAccounts" class="java.util.List"/> - <field name="subReportPath" class="java.lang.String"/> + <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> <field name="companyName" class="java.lang.String"/> <field name="title" class="java.lang.String"/> <variable name="mainAccounts" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource"> @@ -247,7 +247,7 @@ <subreport isUsingCache="false" runToBottom="false"> <reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="0" width="578" height="20" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"/> <dataSourceExpression><![CDATA[$V{mainAccounts}]]></dataSourceExpression> - <subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression> + <subreportExpression><![CDATA[$F{subReport}]]></subreportExpression> </subreport> </band> </detail> diff --git a/lima-web/src/main/jasperreports/entryBook/DocumentReport.jrxml b/lima-web/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml similarity index 98% rename from lima-web/src/main/jasperreports/entryBook/DocumentReport.jrxml rename to lima-web/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml index 3b01327..95b2cae 100644 --- a/lima-web/src/main/jasperreports/entryBook/DocumentReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/entryBook/DocumentReport.jrxml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2015-01-21T10:16:58 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-02T15:06:22 --> <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"/> @@ -15,7 +15,7 @@ <field name="toDate" class="java.util.Date"/> <field name="currency" class="java.lang.String"/> <field name="entryBooks" class="java.util.List"/> - <field name="subReportPath" class="java.lang.String"/> + <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> <field name="companyName" class="java.lang.String"/> <field name="title" class="java.lang.String"/> <field name="soldeDebit" class="java.math.BigDecimal"/> @@ -241,7 +241,7 @@ <subreport isUsingCache="false" runToBottom="false"> <reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="0" width="578" height="20" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"/> <dataSourceExpression><![CDATA[$V{entryBooks}]]></dataSourceExpression> - <subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression> + <subreportExpression><![CDATA[$F{subReport}]]></subreportExpression> </subreport> </band> </detail> diff --git a/lima-web/src/main/jasperreports/entryBook/EntryBookReport.jrxml b/lima-web/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml similarity index 95% rename from lima-web/src/main/jasperreports/entryBook/EntryBookReport.jrxml rename to lima-web/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml index 67b9927..70edefa 100644 --- a/lima-web/src/main/jasperreports/entryBook/EntryBookReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/entryBook/EntryBookReport.jrxml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2015-01-21T10:20:12 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-02T15:07:00 --> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="50" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isFloatColumnFooter="true" whenResourceMissingType="Empty" isIgnoreP [...] <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> @@ -13,7 +13,7 @@ <field name="soldeDebit" class="java.math.BigDecimal"/> <field name="soldeCredit" class="java.math.BigDecimal"/> <field name="financialPeriods" class="java.util.List"/> - <field name="subReportPath" class="java.lang.String"/> + <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> <field name="code" class="java.lang.String"/> <field name="libelle" class="java.lang.String"/> <field name="formatter" class="java.text.DecimalFormat"/> @@ -102,7 +102,7 @@ <property name="com.jaspersoft.studio.unit.y" value="px"/> </reportElement> <dataSourceExpression><![CDATA[$V{generalEntryBookEntry}]]></dataSourceExpression> - <subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression> + <subreportExpression><![CDATA[$F{subReport}]]></subreportExpression> </subreport> </band> </detail> diff --git a/lima-web/src/main/jasperreports/entryBook/FinancialPeriodReport.jrxml b/lima-web/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml similarity index 97% rename from lima-web/src/main/jasperreports/entryBook/FinancialPeriodReport.jrxml rename to lima-web/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml index b830692..e9e4e53 100644 --- a/lima-web/src/main/jasperreports/entryBook/FinancialPeriodReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/entryBook/FinancialPeriodReport.jrxml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2015-01-21T10:20:48 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-02T15:19:55 --> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="51" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isFloatColumnFooter="true" whenResourceMissingType="Empty" isIgnoreP [...] <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> @@ -21,7 +21,7 @@ <field name="soldeDebit" class="java.math.BigDecimal"/> <field name="soldeCredit" class="java.math.BigDecimal"/> <field name="transactions" class="java.util.List"/> - <field name="subReportPath" class="java.lang.String"/> + <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> <field name="period" class="java.util.Date"/> <field name="libelle" class="java.lang.String"/> <field name="entryBookCode" class="java.lang.String"/> @@ -176,7 +176,7 @@ <printWhenExpression><![CDATA[new Boolean($V{PAGE_NUMBER} == 1 && $V{REPORT_COUNT} == 1)]]></printWhenExpression> </reportElement> <dataSourceExpression><![CDATA[$V{generalEntryBookEntry}]]></dataSourceExpression> - <subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression> + <subreportExpression><![CDATA[$F{subReport}]]></subreportExpression> </subreport> <subreport isUsingCache="false" runToBottom="false"> <reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="10" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="1095b1fb-ac01-4f55-b694-2e4e5ec17a76"> @@ -189,7 +189,7 @@ <printWhenExpression><![CDATA[new Boolean(!($V{PAGE_NUMBER} == 1 && $V{REPORT_COUNT} == 1))]]></printWhenExpression> </reportElement> <dataSourceExpression><![CDATA[$V{generalEntryBookEntry}]]></dataSourceExpression> - <subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression> + <subreportExpression><![CDATA[$F{subReport}]]></subreportExpression> </subreport> </band> <band height="10" splitType="Prevent"> diff --git a/lima-web/src/main/jasperreports/entryBook/TransactionReport.jrxml b/lima-web/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml similarity index 99% rename from lima-web/src/main/jasperreports/entryBook/TransactionReport.jrxml rename to lima-web/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml index dfe6ba9..09c5e9f 100644 --- a/lima-web/src/main/jasperreports/entryBook/TransactionReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/entryBook/TransactionReport.jrxml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2015-01-22T21:52:42 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-02T11:52:06 --> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="30" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Empty" isIgnorePagination="true" uuid="75ff86c6-c370-4f0b-a2d3-e17324a465bb"> <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> diff --git a/lima-web/src/main/jasperreports/generalEntryBook/DocumentReport.jrxml b/lima-web/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml similarity index 98% rename from lima-web/src/main/jasperreports/generalEntryBook/DocumentReport.jrxml rename to lima-web/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml index 35a28e7..aae7025 100644 --- a/lima-web/src/main/jasperreports/generalEntryBook/DocumentReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/generalEntryBook/DocumentReport.jrxml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2015-01-21T10:06:37 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-02T15:08:52 --> <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"/> @@ -15,7 +15,7 @@ <field name="toDate" class="java.util.Date"/> <field name="currency" class="java.lang.String"/> <field name="generalEntryBooks" class="java.util.List"/> - <field name="subReportPath" class="java.lang.String"/> + <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> <field name="companyName" class="java.lang.String"/> <field name="title" class="java.lang.String"/> <field name="soldeDebit" class="java.math.BigDecimal"/> @@ -198,7 +198,7 @@ <subreport isUsingCache="false" runToBottom="false"> <reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="0" width="578" height="20" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"/> <dataSourceExpression><![CDATA[$V{generalEntryBooks}]]></dataSourceExpression> - <subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression> + <subreportExpression><![CDATA[$F{subReport}]]></subreportExpression> </subreport> </band> </detail> diff --git a/lima-web/src/main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml b/lima-web/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml similarity index 96% rename from lima-web/src/main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml rename to lima-web/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml index 343f89d..78b4ddb 100644 --- a/lima-web/src/main/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/generalEntryBook/EntryBookPeriodReport.jrxml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2015-01-21T10:22:40 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-02T15:09:34 --> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="20" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Empty" isIgnorePagination="true" uuid="75ff [...] <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> @@ -21,7 +21,7 @@ <field name="soldeDebit" class="java.math.BigDecimal"/> <field name="soldeCredit" class="java.math.BigDecimal"/> <field name="entries" class="java.util.List"/> - <field name="subReportPath" class="java.lang.String"/> + <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> <field name="period" class="java.util.Date"/> <field name="formatter" class="java.text.DecimalFormat"/> <variable name="entries" class="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource"> @@ -68,7 +68,7 @@ <subreport isUsingCache="false" runToBottom="false"> <reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="0" width="578" height="10" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"/> <dataSourceExpression><![CDATA[$V{entries}]]></dataSourceExpression> - <subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression> + <subreportExpression><![CDATA[$F{subReport}]]></subreportExpression> </subreport> </band> <band height="10" splitType="Stretch"> diff --git a/lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml b/lima-web/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml similarity index 97% rename from lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml rename to lima-web/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml index 36a7553..f03ba1c 100644 --- a/lima-web/src/main/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/generalEntryBook/GeneralEntryBookEntryReport.jrxml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2015-01-21T10:22:40 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-02T11:55:38 --> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="21" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="75ff86c6-c370-4f0b-a2d3-e17324a465bb"> <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> diff --git a/lima-web/src/main/jasperreports/generalLedger/DocumentReport.jrxml b/lima-web/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml similarity index 97% rename from lima-web/src/main/jasperreports/generalLedger/DocumentReport.jrxml rename to lima-web/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml index 94288b6..961e077 100644 --- a/lima-web/src/main/jasperreports/generalLedger/DocumentReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/generalLedger/DocumentReport.jrxml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2015-01-22T21:51:55 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-02T16:44:25 --> <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"/> @@ -14,7 +14,7 @@ <field name="fromDate" class="java.util.Date"/> <field name="toDate" class="java.util.Date"/> <field name="currency" class="java.lang.String"/> - <field name="subReportPath" class="java.lang.String"/> + <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> <field name="companyName" class="java.lang.String"/> <field name="title" class="java.lang.String"/> <field name="fromAccount" class="java.lang.String"/> @@ -258,7 +258,7 @@ <subreport isUsingCache="false" runToBottom="false"> <reportElement key="subreport-5" positionType="Float" mode="Transparent" x="0" y="0" width="578" height="20" isRemoveLineWhenBlank="true" forecolor="#000000" backcolor="#FFFFFF" uuid="d7fbefd9-03b1-4eaf-b7c6-fb46c737190a"/> <dataSourceExpression><![CDATA[$V{generalLedgers}]]></dataSourceExpression> - <subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression> + <subreportExpression><![CDATA[$F{subReport}]]></subreportExpression> </subreport> </band> </detail> diff --git a/lima-web/src/main/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml b/lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml similarity index 98% rename from lima-web/src/main/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml rename to lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml index 028f1a1..6e6aa41 100644 --- a/lima-web/src/main/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerEntryReport.jrxml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2015-01-22T23:47:14 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-02T16:58:32 --> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="31" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Empty" isIgnorePagination="true" uuid="75ff [...] <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> @@ -169,7 +169,7 @@ <font size="8"/> <paragraph rightIndent="2"/> </textElement> - <textFieldExpression><![CDATA[new Boolean($F{debit}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{solde}) : ""]]></textFieldExpression> + <textFieldExpression><![CDATA[new Boolean($F{solde}.compareTo(BigDecimal.ZERO) != 0) ? $F{formatter}.format($F{solde}) : ""]]></textFieldExpression> </textField> </band> </detail> @@ -177,7 +177,7 @@ <band height="10"> <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> - <printWhenExpression><![CDATA[$V{REPORT_COUNT} < $F{nbEntries} ]]></printWhenExpression> + <printWhenExpression><![CDATA[$V{REPORT_COUNT} < $F{nbEntries}]]></printWhenExpression> <frame> <reportElement x="0" y="0" width="578" height="10" uuid="5863f40f-6423-4463-ad4a-c4cecab0323c"> <property name="local_mesure_unitwidth" value="pixel"/> diff --git a/lima-web/src/main/jasperreports/generalLedger/GeneralLedgerReport.jrxml b/lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml similarity index 85% rename from lima-web/src/main/jasperreports/generalLedger/GeneralLedgerReport.jrxml rename to lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml index 1c320f1..f1a326e 100644 --- a/lima-web/src/main/jasperreports/generalLedger/GeneralLedgerReport.jrxml +++ b/lima-web/src/main/resources/jasperreports/generalLedger/GeneralLedgerReport.jrxml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 --> -<!-- 2015-01-23T00:04:20 --> +<!-- Created with Jaspersoft Studio version 6.0.3.final using JasperReports Library version 6.0.3 --> +<!-- 2015-03-02T16:31:43 --> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="BalanceClassesReport" pageWidth="578" pageHeight="31" whenNoDataType="BlankPage" columnWidth="578" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Empty" uuid="75ff86c6-c370-4f0b-a2d3-e17324 [...] <property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/> <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.HorizontalRowLayout"/> @@ -23,7 +23,7 @@ <field name="debit" class="java.math.BigDecimal"/> <field name="credit" class="java.math.BigDecimal"/> <field name="solde" class="java.math.BigDecimal"/> - <field name="subReportPath" class="java.lang.String"/> + <field name="subReport" class="net.sf.jasperreports.engine.JasperReport"/> <field name="entries" class="java.util.List"/> <field name="nbEntries" class="java.lang.Integer"/> <field name="formatter" class="java.text.DecimalFormat"/> @@ -72,33 +72,18 @@ <bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> </box> - <textField isBlankWhenNull="false"> - <reportElement key="" mode="Transparent" x="0" y="0" width="60" height="10" forecolor="#736343" uuid="be71eb35-fb58-473a-8ac1-07d658474372"> - <property name="local_mesure_unitheight" value="pixel"/> - <property name="com.jaspersoft.studio.unit.height" value="px"/> + <textField pattern=""> + <reportElement mode="Transparent" x="0" y="0" width="578" height="10" forecolor="#736343" uuid="b3b8449e-a63c-445d-8699-f0b9579f34f3"> <property name="local_mesure_unitwidth" value="pixel"/> <property name="com.jaspersoft.studio.unit.width" value="px"/> - </reportElement> - <textElement rotation="None"> - <font isBold="false"/> - <paragraph leftIndent="2"/> - </textElement> - <textFieldExpression><![CDATA[$F{accountNumber}]]></textFieldExpression> - </textField> - <textField pattern=""> - <reportElement style="Default" stretchType="RelativeToBandHeight" mode="Transparent" x="60" y="0" width="518" height="10" forecolor="#736343" backcolor="rgba(255, 255, 255, 0.33333334)" uuid="c2b6613a-5505-4f7b-8aba-79e247b3edc6"> <property name="local_mesure_unitheight" value="pixel"/> <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="local_mesure_unitx" value="pixel"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - <property name="local_mesure_unitwidth" value="pixel"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> </reportElement> - <textElement> - <font isBold="true"/> - <paragraph leftIndent="2"/> + <textElement textAlignment="Center"> + <font size="8" isBold="true"/> + <paragraph leftIndent="0"/> </textElement> - <textFieldExpression><![CDATA[$F{label}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{accountNumber} + " " + $F{label}]]></textFieldExpression> </textField> </frame> </band> @@ -109,7 +94,7 @@ <property name="com.jaspersoft.studio.unit.height" value="px"/> </reportElement> <dataSourceExpression><![CDATA[$V{entries}]]></dataSourceExpression> - <subreportExpression><![CDATA[JasperCompileManager.compileReport($F{subReportPath})]]></subreportExpression> + <subreportExpression><![CDATA[$F{subReport}]]></subreportExpression> </subreport> </band> <band height="10"> @@ -126,7 +111,7 @@ <bottomPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> <rightPen lineWidth="0.6" lineStyle="Solid" lineColor="#FDCA97"/> </box> - <textField> + <textField isBlankWhenNull="true"> <reportElement x="362" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"> <property name="local_mesure_unitwidth" value="pixel"/> <property name="com.jaspersoft.studio.unit.width" value="px"/> @@ -141,7 +126,7 @@ </textElement> <textFieldExpression><![CDATA[$F{debit}]]></textFieldExpression> </textField> - <textField> + <textField isBlankWhenNull="true"> <reportElement x="434" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"> <property name="local_mesure_unitwidth" value="pixel"/> <property name="com.jaspersoft.studio.unit.width" value="px"/> @@ -156,7 +141,7 @@ </textElement> <textFieldExpression><![CDATA[$F{credit}]]></textFieldExpression> </textField> - <textField pattern=""> + <textField pattern="" isBlankWhenNull="true"> <reportElement x="506" y="0" width="72" height="10" forecolor="#736343" uuid="0311393c-8196-477b-b00b-e76e767855ee"> <property name="local_mesure_unitwidth" value="pixel"/> <property name="com.jaspersoft.studio.unit.width" value="px"/> diff --git a/pom.xml b/pom.xml index 9bcfb4c..c8c296c 100644 --- a/pom.xml +++ b/pom.xml @@ -196,7 +196,7 @@ <h2Version>1.3.176</h2Version> <hibernateVersion>4.3.7.Final</hibernateVersion> <itextVersion>4.2.1</itextVersion> - <jasperreportsVersion>5.6.1</jasperreportsVersion> + <jasperreportsVersion>6.0.3</jasperreportsVersion> <javaxServletVersion>3.1.0</javaxServletVersion> <jaxxVersion>2.16.1</jaxxVersion> <jbossTransactionVersion>1.0.0.Final</jbossTransactionVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.