From scm@users.chorem.org Tue Jul 7 14:43:39 2015 From: "chorem.org scm" To: lima-commits@list.chorem.org Subject: [Lima-commits] 01/03: refs #1241 correction sur nom de police Date: Tue, 07 Jul 2015 14:43:40 +0000 Message-ID: <20150707144339.69F855C93CF@goh.codelutin.com> In-Reply-To: <20150707144339.1749.54085@bihar.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9220333406778526210==" --===============9220333406778526210== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. New commit to branch feature/1241-account-report in repository lima. See http://git.chorem.org/lima.git commit 0a807d298a196a0d0e428c4bd957d744da42c79d Author: dcosse Date: Thu Jul 2 15:08:14 2015 +0200 refs #1241 correction sur nom de police --- .../src/main/resources/jasperreports/balance/DocumentReport.jrxml | 4 ++= -- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lima-report/src/main/resources/jasperreports/balance/DocumentRep= ort.jrxml b/lima-report/src/main/resources/jasperreports/balance/DocumentRepo= rt.jrxml index a4bbb30..4cef030 100644 --- a/lima-report/src/main/resources/jasperreports/balance/DocumentReport.jrx= ml +++ b/lima-report/src/main/resources/jasperreports/balance/DocumentReport.jrx= ml @@ -1,12 +1,12 @@ - + + + - - - - + - - + + + + + + + + + + + + + + + + + + + + - + @@ -43,196 +74,100 @@ - + - + - + - - - - - - - - - - - - - - - - - - + + + - + - - - - + - + - + - - - - + - + - + - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - + + + + - - + + @@ -271,34 +206,9 @@ - - - - - - - - - - - - + - - - - - - - - - - - - - - - + @@ -306,16 +216,7 @@ - - - - - - - - - - + @@ -323,16 +224,7 @@ - - - - - - - - - - + @@ -341,20 +233,14 @@ - - - - + - - - - + diff --git a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties b= /lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties index 1bfb522..21e2ea1 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties @@ -482,7 +482,22 @@ lima.quit=3DExit lima.refresh=3DRefresh lima.refresh.shortcut=3DRefresh (F5) lima.remove=3DRemove -lima.remove.shortcut=3DDelete (Del) +lima.remove.shortcut=3D +lima.report.accounts=3DAccounts\: +lima.report.assets=3DAssets +lima.report.balance=3DBalance +lima.report.balanceForPeriod=3DBalance +lima.report.balanceSheet=3DBalance +lima.report.credit=3DCredit +lima.report.currency=3DCurrency\: +lima.report.currentAsset=3DCurrent asset +lima.report.dedit=3DDebit +lima.report.fromDateToDate=3DFrom %s to %s +lima.report.generatingDate=3DPrinted on %s +lima.report.investments=3DInvestments +lima.report.label=3DLabel +lima.report.liabilities=3DLiabilities +lima.report.totalForPeriod=3DPeriod total lima.retainedEarnings.wait=3D lima.search=3DSearch lima.structure=3DStructure diff --git a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties b= /lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties index 54a9304..2705ed8 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties @@ -488,10 +488,24 @@ lima.preferences=3DPr=C3=A9f=C3=A9rences lima.quit=3DQuitter lima.refresh=3DActualiser lima.refresh.shortcut=3DActualiser (F5) -lima.remove=3DSupprimer -lima.remove.shortcut=3DSupprimer (Suppr) -lima.retainedEarnings.wait=3DReport =C3=A0 nouveaux... -lima.search=3DRechercher +lima.remove.shortcut=3D +lima.report.account=3DCompte +lima.report.accounts=3DComptes\: +lima.report.assets=3Davoirs +lima.report.balance=3DSolde +lima.report.balanceForPeriod=3DSolde p=C3=A9riode +lima.report.balanceSheet=3DBalance +lima.report.credit=3DCr=C3=A9dit +lima.report.currency=3DDevise\: +lima.report.currentAsset=3DActif =C3=A0 court terme +lima.report.dedit=3DD=C3=A9bit +lima.report.fromDateToDate=3DDu %s au %s +lima.report.generatingDate=3D=C3=89dition du %s +lima.report.investments=3Dinvestissements +lima.report.label=3DIntitul=C3=A9 +lima.report.liabilities=3Dpassif +lima.report.totalForPeriod=3DTotal p=C3=A9riode +lima.retainedEarnings.wait=3D lima.structure=3DStructure lima.table.account=3DCompte lima.table.balance=3DSolde --=20 To stop receiving notification emails like this one, please contact chorem.org SCM administrator . --===============4870313537040200845==-- From scm@users.chorem.org Tue Jul 7 14:43:39 2015 From: "chorem.org scm" To: lima-commits@list.chorem.org Subject: [Lima-commits] 03/03: refs #1241 refactoring =?utf-8?b?Z8OpbsOp?= =?utf-8?q?ral?= sur les rapports, renommage variable, utilisation de style dans les rapports Date: Tue, 07 Jul 2015 14:43:42 +0000 Message-ID: <20150707144339.AE9525C940D@goh.codelutin.com> In-Reply-To: <20150707144339.1749.54085@bihar.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4470039349455203984==" --===============4470039349455203984== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. New commit to branch feature/1241-account-report in repository lima. See http://git.chorem.org/lima.git commit 36b2f8b33e4751dedf4d96663f42fe7ceaa1c5a7 Author: dcosse Date: Tue Jul 7 16:41:55 2015 +0200 refs #1241 refactoring g=C3=A9n=C3=A9ral sur les rapports, renommage vari= able, utilisation de style dans les rapports --- .../chorem/lima/business/LimaBusinessConfig.java | 11 + .../ejb/report/AccountReportServiceImpl.java | 11 +- .../ejb/report/BalanceReportServiceImpl.java | 80 ++-- .../report/GeneralEntryBookReportServiceImpl.java | 20 +- .../ejb/report/LedgerReportServiceImpl.java | 17 +- .../ProvisionalEntryBookReportServiceImpl.java | 44 +-- .../resources/i18n/lima-business_en_GB.properties | 13 +- .../resources/i18n/lima-business_fr_FR.properties | 13 +- .../org/chorem/lima/beans/BalanceAccountImpl.java | 8 +- lima-callao/src/main/xmi/lima-callao-model.zargo | Bin 58818 -> 59242 bytes .../jasperreports/account/AccountEntry.jrxml | 8 +- .../balance/BalanceReportAccountReport.jrxml | 18 +- .../balance/BalanceSubAccountsReport.jrxml | 48 +-- .../jasperreports/entryBook/DocumentReport.jrxml | 42 ++- .../jasperreports/entryBook/EntryBookReport.jrxml | 76 +--- .../entryBook/FinancialPeriodReport.jrxml | 187 ++------- .../entryBook/TransactionReport.jrxml | 193 +++------- .../generalEntryBook/DocumentReport.jrxml | 418 ++++++++-----------= -- .../generalEntryBook/EntryBookPeriodReport.jrxml | 48 +-- .../GeneralEntryBookEntryReport.jrxml | 11 +- .../generalLedger/DocumentReport.jrxml | 346 +++++++---------- .../generalLedger/GeneralLedgerEntryReport.jrxml | 204 +++------- .../generalLedger/GeneralLedgerReport.jrxml | 101 ++--- 23 files changed, 708 insertions(+), 1209 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/LimaBusines= sConfig.java b/lima-business/src/main/java/org/chorem/lima/business/LimaBusin= essConfig.java index 5b01b0f..c7beb4f 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig= .java +++ b/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig= .java @@ -245,6 +245,16 @@ public class LimaBusinessConfig { saveConfig(); } =20 + public String getDateFormat() { + return config.getOption(BusinessConfigOption.DATE_FORMAT.key); + } + + public void setDateFormat(String locale) { + config.setOption(BusinessConfigOption.DATE_FORMAT.key, locale); + saveConfig(); + } + + public char getDecimalSeparator() { char decimalSeparator =3D config.getOption(BusinessConfigOption.DECI= MAL_SEPARATOR.key).charAt(0); return decimalSeparator; @@ -338,6 +348,7 @@ public class LimaBusinessConfig { =20 SCALE("lima.data.bigDecimal.scale", t("lima.config.scale.label"), n(= "lima.config.scale.description"), "2", String.class, false, false), CURRENCY("lima.config.currency", t("lima.config.currency.label"), n(= "lima.config.currency.description"), "false", Boolean.class, false, false), + DATE_FORMAT("lima.config.dateFormat", t("lima.config.dateFormat.labe= l"), n("lima.config.dateFormat.description"), "DD/MM/YYYY", Boolean.class, fa= lse, false), DECIMAL_SEPARATOR("lima.data.bigDecimal.decimalSeparator", t("lima.c= onfig.decimalSeparator.label"), "", ",", Character.class, false, false), THOUSAND_SEPARATOR("lima.thousandSeparator", t("lima.config.thousand= Separator.label"), n("lima.config.thousandSeparator.description"), " ", Chara= cter.class, false, false); =20 diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/= AccountReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/b= usiness/ejb/report/AccountReportServiceImpl.java index 5c4a88a..6616e08 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/Account= ReportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/Account= ReportServiceImpl.java @@ -7,6 +7,7 @@ import org.chorem.lima.beans.AccountEntryImpl; import org.chorem.lima.beans.DocumentReport; import org.chorem.lima.beans.DocumentReportImpl; import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.IdentityService; import org.chorem.lima.business.api.ReportService; import org.chorem.lima.business.api.report.AccountReportService; @@ -37,8 +38,6 @@ import static org.nuiton.i18n.I18n.t; @TransactionAttribute public class AccountReportServiceImpl extends AbstractLimaService implements= AccountReportService { =20 - protected static final String TITLE =3D "COMPTE"; - @EJB protected IdentityService identityService; @EJB @@ -46,7 +45,8 @@ public class AccountReportServiceImpl extends AbstractLimaS= ervice implements Acc =20 @Override public DocumentReport getAccountDocumentReport(String accountId, Date fr= om, Date to, JasperReport accountsEntryJasperReport, DecimalFormat bigDecimal= Format) { - DocumentReport documentReport =3D getDocumentReport(from, to, accoun= tsEntryJasperReport, bigDecimalFormat, identityService); + String reportName =3D t("lima.config.documentReport.accountReport.ti= tle"); + DocumentReport documentReport =3D getDocumentReport(reportName, from= , to, accountsEntryJasperReport, bigDecimalFormat, identityService); =20 documentReport.setColumnAccountTitle(t("lima.config.documentReport.c= olumnAccountTitle")); documentReport.setColumnDateTitle(t("lima.config.documentReport.colu= mnDateTitle")); @@ -90,6 +90,7 @@ public class AccountReportServiceImpl extends AbstractLimaS= ervice implements Acc accountEntry.setDebit(entry.isDebit() ? entry.getAmount(= ) : BigDecimal.ZERO); accountEntry.setCredit(entry.isDebit() ? BigDecimal.ZERO= : entry.getAmount()); accountEntry.setFormatter(bigDecimalFormat); + accountEntry.setDateFormat(LimaBusinessConfig.getInstanc= e().getDateFormat()); accountEntries.add(accountEntry); } } @@ -115,13 +116,13 @@ public class AccountReportServiceImpl extends AbstractL= imaService implements Acc return documentReport; } =20 - protected static DocumentReport getDocumentReport(Date from, Date to, Ja= sperReport subReport, DecimalFormat bigDecimalFormat, IdentityService identit= yService) { + protected static DocumentReport getDocumentReport(String reportName, Dat= e from, Date to, JasperReport subReport, DecimalFormat bigDecimalFormat, Iden= tityService identityService) { Date currentDate =3D new Date(); DocumentReport documentReport =3D new DocumentReportImpl(); documentReport.setSubReport(subReport); documentReport.setFormatter(bigDecimalFormat); =20 - documentReport.setTitleReport(TITLE); + documentReport.setTitleReport(reportName); =20 Identity identity =3D identityService.getIdentity(); String companyName =3D identity =3D=3D null ? "" : identity.getName(= ); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/= BalanceReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/b= usiness/ejb/report/BalanceReportServiceImpl.java index 7a24de4..7992e2f 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/Balance= ReportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/Balance= ReportServiceImpl.java @@ -77,31 +77,31 @@ public class BalanceReportServiceImpl extends AbstractLim= aService implements Bal =20 protected static final Integer ACCOUNT_NUMBER_SIZE =3D 6; =20 - protected static final String TITLE =3D "BALANCE"; - protected static final Predicate HAS_NO_ENTRY =3D new Pr= edicate() { =20 @Override public boolean apply(BalanceAccount subClasses) { boolean result =3D BigDecimal.ZERO.equals(subClasses.getAmountDe= bit()) && BigDecimal.ZERO.equals(subClasses.getAmountCredit()) && - BigDecimal.ZERO.equals(subClasses.getSoldeDebit()) && - BigDecimal.ZERO.equals(subClasses.getSoldeCredit()); + BigDecimal.ZERO.equals(subClasses.getDebitBalance()) && + BigDecimal.ZERO.equals(subClasses.getCreditBalance()); return result; } }; =20 @Override public DocumentReport getBalanceDocumentReport(Date from, Date to, Strin= g selectedAccounts, DecimalFormat bigDecimalFormat, JasperReport mainAccounts= JasperReport, JasperReport subAccountsJasperReport) { - - DocumentReport documentReport =3D AccountReportServiceImpl.getDocume= ntReport(from, to, mainAccountsJasperReport, bigDecimalFormat, identityServic= e); + String reportName =3D t("lima.config.documentReport.balanceReport.ti= tle"); + DocumentReport documentReport =3D AccountReportServiceImpl.getDocume= ntReport(reportName, from, to, mainAccountsJasperReport, bigDecimalFormat, id= entityService); =20 documentReport.setColumnAccountTitle(t("lima.config.documentReport.c= olumnAccountTitle")); - documentReport.setColumnDescriptionTitle(t("lima.config.documentRepo= rt.columnDescriptionTitle")); - documentReport.setColumnTotalForPeriodTitle(t("lima.config.documentR= eport.columnTotalForPeriodTitle")); documentReport.setColumnBalanceForPeriodTitle(t("lima.config.documen= tReport.columnBalanceForPeriodTitle")); - documentReport.setColumnDebitTitle(t("lima.config.documentReport.col= umnDebitTitle")); documentReport.setColumnCreditTitle(t("lima.config.documentReport.co= lumnCreditTitle")); + documentReport.setColumnDateTitle(t("lima.config.documentReport.colu= mnDateTitle")); + documentReport.setColumnDebitTitle(t("lima.config.documentReport.col= umnDebitTitle")); + documentReport.setColumnDescriptionTitle(t("lima.config.documentRepo= rt.columnDescriptionTitle")); + documentReport.setColumnTotalForPeriodTitle(t("lima.config.documentR= eport.columnTotalForPeriodTitle")); + documentReport.setColumnVoucherTitle(t("lima.config.documentReport.c= olumnVoucherTitle")); =20 BalanceTrial balanceTrial =3D new BalanceTrialImpl(); balanceTrial.setReportsDatas(new ArrayList()); @@ -140,8 +140,10 @@ public class BalanceReportServiceImpl extends AbstractLi= maService implements Bal accountsByClasses.put(accountClass, accountSubAccounts); returnedAccounts.add(accountSubAccounts); } - BalanceAccount subClassAccount =3D bindAccountToBalanceRepor= tAccount(accountClass, account, from, to, bigDecimalFormat); - accountSubAccounts.addSubAccount(subClassAccount); + BalanceAccount subClassAccount =3D computeSubAccountBalance(= accountClass, account, from, to, bigDecimalFormat); + if (subClassAccount !=3D null) { + accountSubAccounts.addSubAccount(subClassAccount); + } } } =20 @@ -164,23 +166,13 @@ public class BalanceReportServiceImpl extends AbstractL= imaService implements Bal * Get all entries if true * @throws org.nuiton.topia.persistence.TopiaException */ - protected BalanceAccount bindAccountToBalanceReportAccount(String mainAc= countLabel, Account account, Date beginDate, Date endDate, DecimalFormat bigD= ecimalFormat) { - BalanceAccount balanceAccount =3D new BalanceAccountImpl(); - balanceAccount.setMainAccountLabel(mainAccountLabel); - balanceAccount.setFormatter(bigDecimalFormat); - - String accountNumber =3D account.getAccountNumber(); - accountNumber =3D StringUtils.rightPad(accountNumber, ACCOUNT_NUMBER= _SIZE - accountNumber.length(), '0'); - balanceAccount.setAccountNumber(accountNumber); - balanceAccount.setLabel(account.getLabel()); - balanceAccount.setSubTotalForLabel(t("lima.config.documentReport.sub= TotalFor")); - balanceAccount.setTotalForLabel(t("lima.config.documentReport.totalF= or")); + protected BalanceAccount computeSubAccountBalance(String mainAccountLabe= l, Account account, Date beginDate, Date endDate, DecimalFormat bigDecimalFor= mat) { =20 EntryTopiaDao entryTopiaDao =3D getDaoHelper().getEntryDao(); =20 BigDecimal credit =3D BigDecimal.ZERO; BigDecimal debit =3D BigDecimal.ZERO; - BigDecimal sold =3D BigDecimal.ZERO; + BigDecimal balance =3D BigDecimal.ZERO; =20 List results =3D entryTopiaDao.getDebitCreditOfBalancedTra= nsaction(account, beginDate, endDate); =20 @@ -199,20 +191,40 @@ public class BalanceReportServiceImpl extends AbstractL= imaService implements Bal =20 // set the amounts and sold //sold =3D debit - credit - sold =3D sold.add(debit); - sold =3D sold.subtract(credit); + balance =3D balance.add(debit); + balance =3D balance.subtract(credit); + + BalanceAccount balanceAccount =3D addSubAccountReport(mainAccountLab= el, account, bigDecimalFormat, credit, debit, balance); =20 - if (sold.compareTo(BigDecimal.ZERO) =3D=3D 1) { - balanceAccount.setSoldeDebit(sold.abs()); - balanceAccount.setSoldeCredit(BigDecimal.ZERO); - } else { - balanceAccount.setSoldeCredit(sold.abs()); - balanceAccount.setSoldeDebit(BigDecimal.ZERO); - } =20 - balanceAccount.setAmountCredit(credit); - balanceAccount.setAmountDebit(debit); + return balanceAccount; + } =20 + protected BalanceAccount addSubAccountReport(String mainAccountLabel, Ac= count account, DecimalFormat bigDecimalFormat, BigDecimal credit, BigDecimal = debit, BigDecimal balance) { + BalanceAccount balanceAccount =3D null; + if (BigDecimal.ZERO.compareTo(credit) !=3D 0 || BigDecimal.ZERO.comp= areTo(debit) !=3D 0) { + balanceAccount =3D new BalanceAccountImpl(); + balanceAccount.setMainAccountLabel(mainAccountLabel); + balanceAccount.setFormatter(bigDecimalFormat); + + String accountNumber =3D account.getAccountNumber(); + accountNumber =3D StringUtils.rightPad(accountNumber, ACCOUNT_NU= MBER_SIZE - accountNumber.length(), '0'); + balanceAccount.setAccountNumber(accountNumber); + balanceAccount.setLabel(account.getLabel()); + balanceAccount.setSubTotalForLabel(t("lima.config.documentReport= .subTotalFor")); + balanceAccount.setTotalForLabel(t("lima.config.documentReport.to= talFor")); + + if (balance.compareTo(BigDecimal.ZERO) =3D=3D 1) { + balanceAccount.setDebitBalance(balance.abs()); + balanceAccount.setCreditBalance(BigDecimal.ZERO); + } else { + balanceAccount.setCreditBalance(balance.abs()); + balanceAccount.setDebitBalance(BigDecimal.ZERO); + } + + balanceAccount.setAmountCredit(credit); + balanceAccount.setAmountDebit(debit); + } return balanceAccount; } } diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/= GeneralEntryBookReportServiceImpl.java b/lima-business/src/main/java/org/chor= em/lima/business/ejb/report/GeneralEntryBookReportServiceImpl.java index ec77f90..31ea391 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/General= EntryBookReportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/General= EntryBookReportServiceImpl.java @@ -35,6 +35,7 @@ import org.chorem.lima.beans.GeneralEntryBook; import org.chorem.lima.beans.GeneralEntryBookEntry; import org.chorem.lima.beans.GeneralEntryBookEntryImpl; import org.chorem.lima.beans.GeneralEntryBookImpl; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.ClosedPeriodicEntryBookService; import org.chorem.lima.business.api.EntryService; import org.chorem.lima.business.api.FinancialPeriodService; @@ -90,19 +91,17 @@ public class GeneralEntryBookReportServiceImpl extends Ab= stractLimaService imple @EJB protected IdentityService identityService; =20 - - protected static final String TITLE =3D "Journal G=C3=A9n=C3=A9ral Provi= soire"; - @Override public DocumentReport getGeneralEntryBookDocumentReport(Date beginDate, = Date endDate, DecimalFormat bigDecimalFormat, JasperReport generalEntryBooksJ= asperReport, JasperReport entriesJasperReport) { - - DocumentReport documentReport =3D AccountReportServiceImpl.getDocume= ntReport(beginDate, endDate, generalEntryBooksJasperReport, bigDecimalFormat,= identityService); + String reportName =3D t("lima.config.documentReport.generalEntryBook= Report.title"); + DocumentReport documentReport =3D AccountReportServiceImpl.getDocume= ntReport(reportName, beginDate, endDate, generalEntryBooksJasperReport, bigDe= cimalFormat, identityService); =20 documentReport.setColumnEntryBookTitle(t("lima.config.documentReport= .columnEntryBookTitle")); documentReport.setColumnDescriptionTitle(t("lima.config.documentRepo= rt.columnDescriptionTitle")); documentReport.setColumnTotalForPeriodTitle(t("lima.config.documentR= eport.columnTotalForPeriodTitle")); documentReport.setColumnDebitTitle(t("lima.config.documentReport.col= umnDebitTitle")); documentReport.setColumnCreditTitle(t("lima.config.documentReport.co= lumnCreditTitle")); + documentReport.setLastPageColumnDescription(t("lima.config.documentR= eport.entrybook.lastPageColumnDescription")); =20 try { if (beginDate !=3D null && endDate !=3D null) { @@ -134,7 +133,7 @@ public class GeneralEntryBookReportServiceImpl extends Ab= stractLimaService imple generalEntryBookEntry =3D new GeneralEntryBookEn= tryImpl(); generalEntryBookEntry.setFormatter(bigDecimalFor= mat); generalEntryBookEntry.setCode(closedPeriodicEntr= yBook.getEntryBook().getCode()); - generalEntryBookEntry.setLibelle(closedPeriodicE= ntryBook.getEntryBook().getLabel()); + generalEntryBookEntry.setDescription(closedPerio= dicEntryBook.getEntryBook().getLabel()); generalEntryBookEntryByEntryBookCode.put(entryBo= okCode, generalEntryBookEntry); =20 // init debit and credit @@ -178,10 +177,11 @@ public class GeneralEntryBookReportServiceImpl extends = AbstractLimaService imple if (subAmountCredit.compareTo(BigDecimal.ZERO) !=3D 0 &&= subAmountDebit.compareTo(BigDecimal.ZERO) !=3D 0) { GeneralEntryBook generalEntryBook =3D new GeneralEnt= ryBookImpl(); generalEntryBook.setFormatter(bigDecimalFormat); + generalEntryBook.setDateFormat(LimaBusinessConfig.ge= tInstance().getDateFormat()); generalEntryBook.setPeriod(financialPeriod.getBeginD= ate()); generalEntryBook.setSubReport(entriesJasperReport); - generalEntryBook.setSoldeDebit(subAmountDebit); - generalEntryBook.setSoldeCredit(subAmountCredit); + generalEntryBook.setDebitBalance(subAmountDebit); + generalEntryBook.setCreditBalance(subAmountCredit); generalEntryBook.setEntries(Lists.newArrayList(gener= alEntryBookEntries)); documentReport.addGeneralEntryBooks(generalEntryBook= ); =20 @@ -191,8 +191,8 @@ public class GeneralEntryBookReportServiceImpl extends Ab= stractLimaService imple =20 } =20 - documentReport.setSoldeDebit(amountDebit); - documentReport.setSoldeCredit(amountCredit); + documentReport.setDebitBalance(amountDebit); + documentReport.setCreditBalance(amountCredit); } } catch (Exception ex) { log.error("Can't create document", ex); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/= LedgerReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/bu= siness/ejb/report/LedgerReportServiceImpl.java index 50c5b17..3e4c4d7 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/LedgerR= eportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/LedgerR= eportServiceImpl.java @@ -31,6 +31,7 @@ import org.chorem.lima.beans.GeneralLedgerEntry; import org.chorem.lima.beans.GeneralLedgerEntryImpl; import org.chorem.lima.beans.GeneralLedgerImpl; import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.IdentityService; import org.chorem.lima.business.api.ReportService; import org.chorem.lima.business.api.report.LedgerReportService; @@ -46,6 +47,7 @@ import javax.ejb.Stateless; import javax.ejb.TransactionAttribute; import java.math.BigDecimal; import java.text.DecimalFormat; +import java.text.SimpleDateFormat; import java.util.Collections; import java.util.Date; import java.util.List; @@ -66,16 +68,16 @@ public class LedgerReportServiceImpl extends AbstractLima= Service implements Ledg @EJB protected IdentityService identityService; =20 - protected static final String TITLE =3D t("lima-business.document.ledger= "); - + // grand livre @Override public DocumentReport getLedgerDocumentReport(Date beginDate, Date endDa= te, DecimalFormat decimalFormat, JasperReport generalLedgersJasperReport, Jas= perReport entriesJasperReport) { - - DocumentReport documentReport =3D AccountReportServiceImpl.getDocume= ntReport(beginDate, endDate, generalLedgersJasperReport, decimalFormat, ident= ityService); + String reportName =3D t("lima.config.documentReport.ledgerReport.tit= le"); + DocumentReport documentReport =3D AccountReportServiceImpl.getDocume= ntReport(reportName, beginDate, endDate, generalLedgersJasperReport, decimalF= ormat, identityService); =20 documentReport.setColumnDateTitle(t("lima.config.documentReport.setC= olumnDateTitle")); documentReport.setColumnEntryBookTitle(t("lima.config.documentReport= .setColumnEntryBookTitle")); documentReport.setColumnVoucherTitle(t("lima.config.documentReport.c= olumnVoucherTitle")); + documentReport.setColumnDescriptionTitle(t("lima.config.documentRepo= rt.columnDescriptionTitle")); documentReport.setColumnDebitTitle(t("lima.config.documentReport.col= umnDebitTitle")); documentReport.setColumnCreditTitle(t("lima.config.documentReport.co= lumnCreditTitle")); documentReport.setColumnBalanceTitle(t("lima.config.documentReport.c= olumnBalanceTitle")); @@ -85,6 +87,8 @@ public class LedgerReportServiceImpl extends AbstractLimaSe= rvice implements Ledg =20 BalanceTrial balanceTrial =3D reportService.generateLedger(b= eginDate, endDate, null, true); documentReport.setHeaderSelectedAccounts(balanceTrial.getFro= mToAccountNumber()); + + SimpleDateFormat dateFormatter =3D new SimpleDateFormat(Lima= BusinessConfig.getInstance().getDateFormat()); if (balanceTrial.getReportsDatas() !=3D null) { for (ReportsDatas reportsDatas : balanceTrial.getReports= Datas()) { =20 @@ -101,7 +105,7 @@ public class LedgerReportServiceImpl extends AbstractLima= Service implements Ledg BigDecimal amountDebit =3D reportsDatas.getA= mountDebit(); generalLedger.setDebit(amountDebit); generalLedger.setCredit(amountCredit); - generalLedger.setSolde(amountDebit.subtract(= amountCredit)); + generalLedger.setBalance(amountDebit.subtrac= t(amountCredit)); generalLedger.setSubReport(entriesJasperRepo= rt); generalLedger.setNbEntries(balanceTrial.getR= eportsDatas().size()); documentReport.addGeneralLedgers(generalLedg= er); @@ -125,6 +129,7 @@ public class LedgerReportServiceImpl extends AbstractLima= Service implements Ledg =20 GeneralLedgerEntry generalLedgerEntry = =3D new GeneralLedgerEntryImpl(); generalLedgerEntry.setFormatter(decimalF= ormat); + generalLedgerEntry.setDateFormat(dateFor= matter); generalLedgerEntry.setDate(entry.getFina= ncialTransaction().getTransactionDate()); generalLedgerEntry.setEntryBook(entryBoo= kCode); generalLedgerEntry.setVoucher(entry.getV= oucher()); @@ -132,7 +137,7 @@ public class LedgerReportServiceImpl extends AbstractLima= Service implements Ledg generalLedgerEntry.setDebit(entryAmountD= ebit); generalLedgerEntry.setCredit(entryAmount= Credit); balance =3D balance.add(entryAmountDebit= .subtract(entryAmountCredit)); - generalLedgerEntry.setSolde(balance); + generalLedgerEntry.setBalance(balance); generalLedgerEntry.setNbEntries(entries.= size()); generalLedger.addEntries(generalLedgerEn= try); } diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/= ProvisionalEntryBookReportServiceImpl.java b/lima-business/src/main/java/org/= chorem/lima/business/ejb/report/ProvisionalEntryBookReportServiceImpl.java index 41d03a5..cf5a0a5 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/Provisi= onalEntryBookReportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/Provisi= onalEntryBookReportServiceImpl.java @@ -31,6 +31,7 @@ import org.chorem.lima.beans.EntryBookImpl; import org.chorem.lima.beans.FinancialPeriodImpl; import org.chorem.lima.beans.Transaction; import org.chorem.lima.beans.TransactionImpl; +import org.chorem.lima.business.LimaBusinessConfig; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.EntryService; import org.chorem.lima.business.api.FinancialPeriodService; @@ -48,6 +49,7 @@ import javax.ejb.Stateless; import javax.ejb.TransactionAttribute; import java.math.BigDecimal; import java.text.DecimalFormat; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; =20 @@ -77,30 +79,26 @@ public class ProvisionalEntryBookReportServiceImpl implem= ents ProvisionalEntryBo @EJB protected FinancialTransactionService financialTransactionService; =20 - protected static final String TITLE =3D "R=C3=A9capitulatif par compte"; - - /** - * - ENTRY_BOOK_REPORT_PATH - * - FINANCIAL_PERIOD_REPORT_PATH - * - TRANSACTION_REPORT_PATH - * - CURRENCY - * - BIG_DECIMAL_FORMAT - **/ @Override public DocumentReport getEntryBookDocumentReport(Date beginDate, Date en= dDate, List entryBookCodes, DecimalFormat bigDecimalFormat, JasperRep= ort entryBooksJasperReport, JasperReport financialPeriodsJasperReport, Jasper= Report transactionsJasperReport) { + String reportName =3D t("lima.config.documentReport.provisionalEntry= BookReport.title"); + DocumentReport documentReport =3D AccountReportServiceImpl.getDocume= ntReport(reportName, beginDate, endDate, entryBooksJasperReport, bigDecimalFo= rmat, identityService); =20 - DocumentReport documentReport =3D AccountReportServiceImpl.getDocume= ntReport(beginDate, endDate, entryBooksJasperReport, bigDecimalFormat, identi= tyService); - - documentReport.setColumnEntryBookTitle(t("lima.config.documentReport= .columnEntryBookTitle")); + documentReport.setColumnAccountTitle(t("lima.config.documentReport.c= olumnAccountTitle")); + documentReport.setColumnCreditTitle(t("lima.config.documentReport.co= lumnCreditTitle")); + documentReport.setColumnDateTitle(t("lima.config.documentReport.colu= mnDateTitle")); + documentReport.setColumnDebitTitle(t("lima.config.documentReport.col= umnDebitTitle")); documentReport.setColumnDescriptionTitle(t("lima.config.documentRepo= rt.columnDescriptionTitle")); documentReport.setColumnTotalForPeriodTitle(t("lima.config.documentR= eport.columnTotalForPeriodTitle")); - documentReport.setColumnDebitTitle(t("lima.config.documentReport.col= umnDebitTitle")); - documentReport.setColumnCreditTitle(t("lima.config.documentReport.co= lumnCreditTitle")); + documentReport.setColumnVoucherTitle(t("lima.config.documentReport.c= olumnVoucherTitle")); + + documentReport.setLastPageColumnDescription(t("lima.config.documentR= eport.generalEntrybook.lastPageColumnDescription")); =20 try { =20 if (beginDate !=3D null && endDate !=3D null) { =20 + SimpleDateFormat dateFormatter =3D new SimpleDateFormat(Lima= BusinessConfig.getInstance().getDateFormat()); BigDecimal documentReportDebit =3D BigDecimal.ZERO; BigDecimal documentReportCredit =3D BigDecimal.ZERO; =20 @@ -118,7 +116,7 @@ public class ProvisionalEntryBookReportServiceImpl implem= ents ProvisionalEntryBo for(EntryBook entryBook:entryBooks) { =20 org.chorem.lima.beans.EntryBook entryBookReport =3D new = EntryBookImpl(); - entryBookReport.setLibelle(entryBook.getLabel()); + entryBookReport.setLabel(entryBook.getLabel()); entryBookReport.setCode(entryBook.getCode()); entryBookReport.setSubReport(financialPeriodsJasperRepor= t); entryBookReport.setFormatter(bigDecimalFormat); @@ -153,11 +151,12 @@ public class ProvisionalEntryBookReportServiceImpl impl= ements ProvisionalEntryBo Transaction transaction =3D new TransactionI= mpl(); transaction.setTransactionDate(entry.getFina= ncialTransaction().getTransactionDate()); transaction.setAccount(accountLabel); - transaction.setLibelle(entry.getDescription(= )); + transaction.setDescription(entry.getDescript= ion()); transaction.setVoucher(entry.getVoucher()); transaction.setDebit(debit); transaction.setCredit(credit); transaction.setFormatter(bigDecimalFormat); + transaction.setDateFormat(dateFormatter); =20 financialPeriodDebit =3D financialPeriodDebi= t.add(debit); financialPeriodCredit =3D financialPeriodCre= dit.add(credit); @@ -169,9 +168,10 @@ public class ProvisionalEntryBookReportServiceImpl imple= ments ProvisionalEntryBo =20 if (financialPeriodDebit.compareTo(BigDecimal.ZERO) = !=3D 0 || financialPeriodCredit.compareTo(BigDecimal.ZERO) !=3D 0) { financialPeriodReport.setEntryBookCode(entryBook= .getCode()); - financialPeriodReport.setSoldeDebit(financialPer= iodDebit); - financialPeriodReport.setSoldeCredit(financialPe= riodCredit); + financialPeriodReport.setDebitBalance(financialP= eriodDebit); + financialPeriodReport.setCreditBalance(financial= PeriodCredit); financialPeriodReport.setFormatter(bigDecimalFor= mat); + financialPeriodReport.setDateFormat(LimaBusiness= Config.getInstance().getDateFormat()); =20 entryBookReport.addFinancialPeriods(financialPer= iodReport); entryBookSoldeDebit =3D entryBookSoldeDebit.add(= financialPeriodDebit); @@ -181,15 +181,15 @@ public class ProvisionalEntryBookReportServiceImpl impl= ements ProvisionalEntryBo } =20 if (entryBookSoldeDebit.compareTo(BigDecimal.ZERO) !=3D = 0 || entryBookSoldeCredit.compareTo(BigDecimal.ZERO) !=3D 0) { - entryBookReport.setSoldeDebit(entryBookSoldeDebit); - entryBookReport.setSoldeCredit(entryBookSoldeCredit); + entryBookReport.setDebitBalance(entryBookSoldeDebit); + entryBookReport.setCreditBalance(entryBookSoldeCredi= t); documentReport.addEntryBooks(entryBookReport); documentReportDebit =3D documentReportDebit.add(entr= yBookSoldeDebit); documentReportCredit =3D documentReportCredit.add(en= tryBookSoldeCredit); } } - documentReport.setSoldeDebit(documentReportDebit); - documentReport.setSoldeCredit(documentReportCredit); + documentReport.setDebitBalance(documentReportDebit); + documentReport.setCreditBalance(documentReportCredit); } } catch (Exception ex) { log.error("Can't create document", ex); diff --git a/lima-business/src/main/resources/i18n/lima-business_en_GB.proper= ties b/lima-business/src/main/resources/i18n/lima-business_en_GB.properties index f6f147a..921217d 100644 --- a/lima-business/src/main/resources/i18n/lima-business_en_GB.properties +++ b/lima-business/src/main/resources/i18n/lima-business_en_GB.properties @@ -54,15 +54,19 @@ lima.config.configFileName.description=3DFilename of Lima= 's configuration lima.config.currency.description=3D lima.config.currency.label=3D lima.config.data.dir.description=3DData directory of Lima +lima.config.dateFormat.description=3D +lima.config.dateFormat.label=3D lima.config.decimalSeparator.label=3D lima.config.documentReport.account.documentReportModelPath.description=3D lima.config.documentReport.account.noAccount=3DAny account present lima.config.documentReport.account.noAccountTitle=3DAny account present +lima.config.documentReport.accountReport.title=3DACCOUNT lima.config.documentReport.assets=3DAssets lima.config.documentReport.balance=3DBalance lima.config.documentReport.balance.balanceAccountReportModelPath.description= =3D lima.config.documentReport.balance.balanceSubAccountReportModelPath.descript= ion=3D lima.config.documentReport.balance.documentReportModelPath.description=3D +lima.config.documentReport.balanceReport.title=3DBALANCE lima.config.documentReport.balanceSheet=3DBalance lima.config.documentReport.columnAccountTitle=3DAccount lima.config.documentReport.columnBalanceForPeriodTitle=3DBalance @@ -79,10 +83,13 @@ lima.config.documentReport.currentAsset=3DCurrent asset lima.config.documentReport.entrybook.documentReportModelPath.description=3D lima.config.documentReport.entrybook.entryBookModelPath.description=3D lima.config.documentReport.entrybook.financialPeriodModelPath.description=3D +lima.config.documentReport.entrybook.lastPageColumnDescription=3D lima.config.documentReport.entrybook.transactionReportModelPath.description= =3D +lima.config.documentReport.generalEntryBookReport.title=3DPROVISIONAL GENERA= L ENTRY BOOK lima.config.documentReport.generalEntrybook.documentReportModelPath.descript= ion=3D lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.d= escription=3D lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.descri= ption=3D +lima.config.documentReport.generalEntrybook.lastPageColumnDescription=3D lima.config.documentReport.generalLedger.documentReportModelPath.description= =3D lima.config.documentReport.generalLedger.generalLedgerEntryModelPath.descrip= tion=3D lima.config.documentReport.generalLedger.generalLedgerModelPath.description= =3D @@ -90,9 +97,11 @@ lima.config.documentReport.headerCurrencyLabel=3DCurrency\: lima.config.documentReport.headerSelectedAccounts=3D%s to %s lima.config.documentReport.headerSelectedAccountsLabel=3DAccounts\: lima.config.documentReport.investments=3DInvestments +lima.config.documentReport.ledgerReport.title=3DLEDGER lima.config.documentReport.liabilities=3DLiabilities -lima.config.documentReport.setColumnDateTitle=3D -lima.config.documentReport.setColumnEntryBookTitle=3D +lima.config.documentReport.provisionalEntryBookReport.title=3DSUMMARY BY ACC= OUNT +lima.config.documentReport.setColumnDateTitle=3DDate +lima.config.documentReport.setColumnEntryBookTitle=3DEntry book lima.config.documentReport.subTotalFor=3DSub total for\: lima.config.documentReport.titleCurrentDate=3DPrinted on %s at %s lima.config.documentReport.titleFromToDate=3DFrom %s to %s diff --git a/lima-business/src/main/resources/i18n/lima-business_fr_FR.proper= ties b/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties index d8d52a9..778321c 100644 --- a/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties +++ b/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties @@ -53,14 +53,18 @@ lima.config.configFileName.description=3DNom du fichier d= e configuration de Lima lima.config.currency.description=3D lima.config.currency.label=3D lima.config.data.dir.description=3DR=C3=A9pertoire des donn=C3=A9es de Lima +lima.config.dateFormat.description=3D +lima.config.dateFormat.label=3D lima.config.decimalSeparator.label=3D lima.config.documentReport.account.accountModelPath.description=3Dfichier so= urce (.jrxml) g=C3=A9n=C3=A9r=C3=A9 par Jasper Report g=C3=A9rant les beans '= account' lima.config.documentReport.account.documentReportModelPath.description=3Dfic= hier source (.jrxml) g=C3=A9n=C3=A9r=C3=A9 par Jasper Report g=C3=A9rant les = beans 'DocumentReport' +lima.config.documentReport.accountReport.title=3DCOMPTE lima.config.documentReport.assets=3Davoirs lima.config.documentReport.balance=3DSolde lima.config.documentReport.balance.balanceAccountReportModelPath.description= =3Dfichier source (.jrxml) g=C3=A9n=C3=A9r=C3=A9 par Jasper Report g=C3=A9ran= t les beans 'BalanceAccount' lima.config.documentReport.balance.balanceSubAccountReportModelPath.descript= ion=3Dfichier source (.jrxml) g=C3=A9n=C3=A9r=C3=A9 par Jasper Report g=C3=A9= rant les beans 'BalanceAccount' des comptes enfants lima.config.documentReport.balance.documentReportModelPath.description=3Dfic= hier source (.jrxml) g=C3=A9n=C3=A9r=C3=A9 par Jasper Report g=C3=A9rant les = beans 'DocumentReport +lima.config.documentReport.balanceReport.title=3DBALANCE lima.config.documentReport.balanceSheet=3DBalance lima.config.documentReport.bigDecimalFormat=3Dformattage des montants lima.config.documentReport.columnAccountTitle=3DCompte @@ -79,12 +83,15 @@ lima.config.documentReport.dir.description=3DDossier des = rapports lima.config.documentReport.entrybook.documentReportModelPath.description=3Df= ichier source (.jrxml) g=C3=A9n=C3=A9r=C3=A9 par Jasper Report g=C3=A9rant le= s beans 'EntryBook' lima.config.documentReport.entrybook.entryBookModelPath.description=3Dfichie= r source (.jrxml) g=C3=A9n=C3=A9r=C3=A9 par Jasper Report g=C3=A9rant les bea= ns 'EntryBook' lima.config.documentReport.entrybook.financialPeriodModelPath.description=3D= fichier source (.jrxml) g=C3=A9n=C3=A9r=C3=A9 par Jasper Report g=C3=A9rant l= es beans 'FinancialPeriod' +lima.config.documentReport.entrybook.lastPageColumnDescription=3DTotal pour = les journaux s=C3=A9lectionn=C3=A9s lima.config.documentReport.entrybook.transactionReportModelPath.description= =3Dfichier source (.jrxml) g=C3=A9n=C3=A9r=C3=A9 par Jasper Report g=C3=A9ran= t les beans 'Transaction' lima.config.documentReport.financialStatement.documentReportModelPath.descri= ption=3Dfichier source (.jrxml) g=C3=A9n=C3=A9r=C3=A9 par Jasper Report g=C3= =A9rant les beans 'DocumentReport' lima.config.documentReport.financialStatement.financialStatementModelPath.de= scription=3Dfichier source (.jrxml) g=C3=A9n=C3=A9r=C3=A9 par Jasper Report g= =C3=A9rant les beans 'financialStatement' +lima.config.documentReport.generalEntryBookReport.title=3DJOURNAL G=C3=89N= =C3=89RAL PROVISOIRE lima.config.documentReport.generalEntrybook.documentReportModelPath.descript= ion=3Dfichier source (.jrxml) g=C3=A9n=C3=A9r=C3=A9 par Jasper Report g=C3=A9= rant les beans 'DocumentReport' lima.config.documentReport.generalEntrybook.generalEntryBookEntryModelPath.d= escription=3Dfichier source (.jrxml) g=C3=A9n=C3=A9r=C3=A9 par Jasper Report = g=C3=A9rant les beans 'GeneralEntryBookEntry' lima.config.documentReport.generalEntrybook.generalEntryBookModelPath.descri= ption=3Dfichier source (.jrxml) g=C3=A9n=C3=A9r=C3=A9 par Jasper Report g=C3= =A9rant les beans 'GeneralEntryBook' +lima.config.documentReport.generalEntrybook.lastPageColumnDescription=3DTota= l du Journal G=C3=A9n=C3=A9ral lima.config.documentReport.generalLedger.documentReportModelPath.description= =3Dfichier source (.jrxml) g=C3=A9n=C3=A9r=C3=A9 par Jasper Report g=C3=A9ran= t les beans 'DocumentReport' lima.config.documentReport.generalLedger.generalLedgerEntryModelPath.descrip= tion=3Dfichier source (.jrxml) g=C3=A9n=C3=A9r=C3=A9 par Jasper Report g=C3= =A9rant les beans 'generalLedgerEntry' lima.config.documentReport.generalLedger.generalLedgerModelPath.description= =3Dfichier source (.jrxml) g=C3=A9n=C3=A9r=C3=A9 par Jasper Report g=C3=A9ran= t les beans 'generalLedger' @@ -92,9 +99,11 @@ lima.config.documentReport.headerCurrencyLabel=3DDevise\: lima.config.documentReport.headerSelectedAccounts=3D%s =C3=A0 %s lima.config.documentReport.headerSelectedAccountsLabel=3DComptes\: lima.config.documentReport.investments=3Dinvestissements +lima.config.documentReport.ledgerReport.title=3DGRAND LIVRE lima.config.documentReport.liabilities=3Dpassif -lima.config.documentReport.setColumnDateTitle=3D -lima.config.documentReport.setColumnEntryBookTitle=3D +lima.config.documentReport.provisionalEntryBookReport.title=3DR=C3=89CAPITUL= ATIF PAR COMPTE +lima.config.documentReport.setColumnDateTitle=3DDate +lima.config.documentReport.setColumnEntryBookTitle=3DJournal lima.config.documentReport.subTotalFor=3DSous total pour\: lima.config.documentReport.titleCurrentDate=3D=C3=89dition du %s =C3=A0 %s lima.config.documentReport.titleFromToDate=3DDu %s au %s diff --git a/lima-callao/src/main/java/org/chorem/lima/beans/BalanceAccountIm= pl.java b/lima-callao/src/main/java/org/chorem/lima/beans/BalanceAccountImpl.= java index 4b1070b..de819dc 100644 --- a/lima-callao/src/main/java/org/chorem/lima/beans/BalanceAccountImpl.java +++ b/lima-callao/src/main/java/org/chorem/lima/beans/BalanceAccountImpl.java @@ -37,16 +37,16 @@ public class BalanceAccountImpl extends BalanceAccount { =20 BigDecimal newAmountDebit =3D this.amountDebit =3D=3D null ? Big= Decimal.ZERO : this.amountDebit; BigDecimal newAmountCredit =3D this.amountCredit =3D=3D null ? B= igDecimal.ZERO : this.amountCredit; - BigDecimal newSoldeDebit =3D this.soldeDebit =3D=3D null ? BigDe= cimal.ZERO : this.soldeDebit; - BigDecimal newSoldeCredit =3D this.soldeCredit =3D=3D null ? Big= Decimal.ZERO : this.soldeCredit; + BigDecimal newSoldeDebit =3D this.debitBalance =3D=3D null ? Big= Decimal.ZERO : this.debitBalance; + BigDecimal newSoldeCredit =3D this.creditBalance =3D=3D null ? B= igDecimal.ZERO : this.creditBalance; =20 this.amountDebit =3D subAccount.getAmountDebit().add(newAmountDe= bit); =20 this.amountCredit =3D subAccount.getAmountCredit().add(newAmount= Credit); =20 - this.soldeDebit =3D subAccount.getSoldeDebit().add(newSoldeDebit= ); + this.debitBalance =3D subAccount.getDebitBalance().add(newSoldeD= ebit); =20 - this.soldeCredit =3D subAccount.getSoldeCredit().add(newSoldeCre= dit); + this.creditBalance =3D subAccount.getCreditBalance().add(newSold= eCredit); } =20 // firePropertyChange(PROPERTY_SUB_ACCOUNTS, null, subAccount); diff --git a/lima-callao/src/main/xmi/lima-callao-model.zargo b/lima-callao/s= rc/main/xmi/lima-callao-model.zargo index 5e7eea2..8633e8e 100644 Binary files a/lima-callao/src/main/xmi/lima-callao-model.zargo and b/lima-ca= llao/src/main/xmi/lima-callao-model.zargo differ diff --git a/lima-report/src/main/resources/jasperreports/account/AccountEntr= y.jrxml b/lima-report/src/main/resources/jasperreports/account/AccountEntry.j= rxml index e46f3df..f800454 100644 --- a/lima-report/src/main/resources/jasperreports/account/AccountEntry.jrxml +++ b/lima-report/src/main/resources/jasperreports/account/AccountEntry.jrxml @@ -15,7 +15,11 @@ + + + @@ -47,10 +53,12 @@ - + + + =20 - - + + =20 @@ -203,33 +211,31 @@ - - - + - + - + - + - + - + - + diff --git a/lima-report/src/main/resources/jasperreports/entryBook/EntryBook= Report.jrxml b/lima-report/src/main/resources/jasperreports/entryBook/EntryBo= okReport.jrxml index 15581ab..79c7327 100644 --- a/lima-report/src/main/resources/jasperreports/entryBook/EntryBookReport.= jrxml +++ b/lima-report/src/main/resources/jasperreports/entryBook/EntryBookReport.= jrxml @@ -1,6 +1,6 @@ - - + + @@ -10,13 +10,17 @@ - - - - - - + + + + + + + + + + @@ -25,67 +29,30 @@ - - - - - - - - - - - - + - - - - - - - + - - - - + + - + - - - - - - - - + - - - - - - - - - - + - - @@ -97,10 +64,7 @@ - - - - + diff --git a/lima-report/src/main/resources/jasperreports/entryBook/Financial= PeriodReport.jrxml b/lima-report/src/main/resources/jasperreports/entryBook/F= inancialPeriodReport.jrxml index ae5b8fd..63e271a 100644 --- a/lima-report/src/main/resources/jasperreports/entryBook/FinancialPeriodR= eport.jrxml +++ b/lima-report/src/main/resources/jasperreports/entryBook/FinancialPeriodR= eport.jrxml @@ -1,6 +1,6 @@ - - + + @@ -18,14 +18,13 @@ - - - + + + - - + @@ -34,32 +33,13 @@ - - - - - - + - - - - - - - - - - - - - - - + @@ -67,37 +47,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + + + + + + + + @@ -106,31 +68,12 @@ - - - - - - - - - - - - + - - - - - - - + - - - - + + @@ -139,34 +82,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - + - - @@ -179,15 +97,7 @@ - - - - - - - - - + @@ -196,34 +106,17 @@ - - - - - - + - - - - + + + - - - - - - - - - - + - - - - + + @@ -232,38 +125,28 @@ - - - - + - - - + - - - - + - - - + diff --git a/lima-report/src/main/resources/jasperreports/entryBook/Transacti= onReport.jrxml b/lima-report/src/main/resources/jasperreports/entryBook/Trans= actionReport.jrxml index 64fdf12..c841467 100644 --- a/lima-report/src/main/resources/jasperreports/entryBook/TransactionRepor= t.jrxml +++ b/lima-report/src/main/resources/jasperreports/entryBook/TransactionRepor= t.jrxml @@ -1,22 +1,29 @@ - - + + - + + + - @@ -36,35 +43,15 @@ - - - - - - - - - - + - + - - - - - - - - - - - - + @@ -72,16 +59,7 @@ - - - - - - - - - - + @@ -89,33 +67,15 @@ - - - - - - - - - - - - - + - + - - - - - - - + @@ -123,10 +83,7 @@ - - - - + @@ -140,29 +97,15 @@ - - - - + - - - - + + + + - - - - - - - - - - - - + @@ -171,19 +114,11 @@ - - - - - - - - - - + + @@ -192,20 +127,7 @@ - - - - - - - - - - - - - - + @@ -220,29 +142,18 @@ - - - - + - + - - - - - - - - - - - - - + + + + + @@ -250,18 +161,9 @@ - - - - - - - - + - - - + @@ -271,21 +173,12 @@ - - - - - - - - - - - - - - - + + + + + + diff --git a/lima-report/src/main/resources/jasperreports/generalEntryBook/Do= cumentReport.jrxml b/lima-report/src/main/resources/jasperreports/generalEntr= yBook/DocumentReport.jrxml index 971ba90..367cf23 100644 --- a/lima-report/src/main/resources/jasperreports/generalEntryBook/DocumentR= eport.jrxml +++ b/lima-report/src/main/resources/jasperreports/generalEntryBook/DocumentR= eport.jrxml @@ -1,26 +1,58 @@ - - + + - + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -28,168 +60,101 @@ - - <band height=3D"41" splitType=3D"Stretch"> - <frame> - <reportElement style=3D"Default" mode=3D"Opaque" x=3D"0" y=3D"1" width= =3D"578" height=3D"40" forecolor=3D"#D0B48E" backcolor=3D"#F2EBDF" uuid=3D"1a= ba49d4-0acc-4925-8731-13c1cc1a90f4"/> - <box> - <topPen lineWidth=3D"0.6" lineStyle=3D"Solid" lineColor=3D"#FDCA97"/> - <leftPen lineWidth=3D"0.6" lineStyle=3D"Solid" lineColor=3D"#FDCA97"/> - <bottomPen lineWidth=3D"0.6" lineStyle=3D"Solid" lineColor=3D"#FDCA97"/> - <rightPen lineWidth=3D"0.6" lineStyle=3D"Solid" lineColor=3D"#FDCA97"/> - </box> - <textField isBlankWhenNull=3D"true"> - <reportElement style=3D"Default" x=3D"0" y=3D"0" width=3D"578" height= =3D"20" forecolor=3D"#736343" uuid=3D"9ee9d5f1-6e74-4526-83a4-3b386f2733a8"/> - <textElement textAlignment=3D"Center" verticalAlignment=3D"Middle"> - <font size=3D"14" isBold=3D"true"/> - </textElement> - <textFieldExpression><![CDATA[$F{title}]]></textFieldExpression> - </textField> - <textField pattern=3D"dd/MM/yyyy HH:mm" isBlankWhenNull=3D"true"> - <reportElement style=3D"Default" x=3D"444" y=3D"0" width=3D"134" height= =3D"20" forecolor=3D"#736343" uuid=3D"a60d5d40-69ac-4c50-a33a-67c26cce05f3"/> - <textElement textAlignment=3D"Right" verticalAlignment=3D"Middle"> - <font size=3D"8" isBold=3D"false"/> - <paragraph rightIndent=3D"5"/> - </textElement> - <textFieldExpression><![CDATA["Edition du: " + new SimpleDateFormat("dd= /MM/yyyy =C3=A0 HH:mm").format(new java.util.Date())]]></textFieldExpression> - </textField> - <textField pattern=3D"dd/MM/yyyy" isBlankWhenNull=3D"true"> - <reportElement style=3D"Default" x=3D"210" y=3D"20" width=3D"80" height= =3D"20" forecolor=3D"#736343" uuid=3D"37d0a47c-0197-4f09-8358-823b39a2a42a"> - <property name=3D"local_mesure_unitheight" value=3D"pixel"/> - <property name=3D"com.jaspersoft.studio.unit.height" value=3D"px"/> - </reportElement> - <textElement textAlignment=3D"Right" verticalAlignment=3D"Middle"> - <font isBold=3D"true"/> - </textElement> - <textFieldExpression><![CDATA["Du " + new SimpleDateFormat("dd/MM/yyyy"= ).format($F{fromDate})]]></textFieldExpression> - </textField> - <textField pattern=3D"dd/MM/yyyy" isBlankWhenNull=3D"true"> - <reportElement style=3D"Default" x=3D"290" y=3D"20" width=3D"80" height= =3D"20" forecolor=3D"#736343" uuid=3D"5fc4df4a-5930-4ccd-b450-cf7aac6be57b"> - <property name=3D"local_mesure_unitheight" value=3D"pixel"/> - <property name=3D"com.jaspersoft.studio.unit.height" value=3D"px"/> - <property name=3D"local_mesure_unitwidth" value=3D"pixel"/> - <property name=3D"com.jaspersoft.studio.unit.width" value=3D"px"/> - </reportElement> - <textElement verticalAlignment=3D"Middle"> - <font isBold=3D"true"/> - </textElement> - <textFieldExpression><![CDATA[" au " + new SimpleDateFormat("dd/MM/yyyy= ").format($F{toDate})]]></textFieldExpression> - </textField> - <textField isBlankWhenNull=3D"true"> - <reportElement style=3D"Default" x=3D"0" y=3D"0" width=3D"190" height= =3D"20" forecolor=3D"#736343" uuid=3D"5aa3ceb9-e407-42da-bdc3-097875bdd5f5"> - <property name=3D"local_mesure_unitheight" value=3D"pixel"/> - <property name=3D"com.jaspersoft.studio.unit.height" value=3D"px"/> - </reportElement> - <textElement verticalAlignment=3D"Middle" rotation=3D"None"> - <font size=3D"10" isBold=3D"true"/> - <paragraph leftIndent=3D"5"/> - </textElement> - <textFieldExpression><![CDATA[$F{companyName}]]></textFieldExpression> - </textField> - </frame> - </band> - - - - - - - - - - - - - - - + + <band height=3D"41" splitType=3D"Stretch"> + <frame> + <reportElement style=3D"Default" mode=3D"Opaque" x=3D"0" y= =3D"1" width=3D"578" height=3D"40" forecolor=3D"#D0B48E" backcolor=3D"#F2EBDF= " uuid=3D"1aba49d4-0acc-4925-8731-13c1cc1a90f4"/> + <box> + <topPen lineWidth=3D"0.6" lineStyle=3D"Solid" lineColor= =3D"#FDCA97"/> + <leftPen lineWidth=3D"0.6" lineStyle=3D"Solid" lineColor= =3D"#FDCA97"/> + <bottomPen lineWidth=3D"0.6" lineStyle=3D"Solid" lineCol= or=3D"#FDCA97"/> + <rightPen lineWidth=3D"0.6" lineStyle=3D"Solid" lineColo= r=3D"#FDCA97"/> + </box> + <textField isBlankWhenNull=3D"true"> + <reportElement style=3D"Default" x=3D"0" y=3D"0" width= =3D"578" height=3D"20" forecolor=3D"#736343" uuid=3D"9ee9d5f1-6e74-4526-83a4-= 3b386f2733a8"/> + <textElement textAlignment=3D"Center" verticalAlignment= =3D"Middle"> + <font size=3D"14" isBold=3D"true"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleReport}]]></textFi= eldExpression> + </textField> + <textField isBlankWhenNull=3D"true"> + <reportElement style=3D"Default" x=3D"444" y=3D"0" width= =3D"134" height=3D"20" forecolor=3D"#736343" uuid=3D"a60d5d40-69ac-4c50-a33a-= 67c26cce05f3"/> + <textElement textAlignment=3D"Right" verticalAlignment= =3D"Middle"> + <font size=3D"8" isBold=3D"false"/> + <paragraph rightIndent=3D"5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCurrentDate}]]></t= extFieldExpression> + </textField> + <textField isBlankWhenNull=3D"true"> + <reportElement style=3D"Default" x=3D"210" y=3D"20" widt= h=3D"160" height=3D"20" forecolor=3D"#736343" uuid=3D"37d0a47c-0197-4f09-8358= -823b39a2a42a"/> + <textElement textAlignment=3D"Center" verticalAlignment= =3D"Middle"> + <font isBold=3D"true"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleFromToDate}]]></te= xtFieldExpression> + </textField> + <textField isBlankWhenNull=3D"true"> + <reportElement style=3D"Default" x=3D"0" y=3D"0" width= =3D"190" height=3D"20" forecolor=3D"#736343" uuid=3D"5aa3ceb9-e407-42da-bdc3-= 097875bdd5f5"/> + <textElement verticalAlignment=3D"Middle" rotation=3D"No= ne"> + <font size=3D"10" isBold=3D"true"/> + <paragraph leftIndent=3D"5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyName}]]></t= extFieldExpression> + </textField> + </frame> + </band> + + + + + + + + + + + + - + - - - - - - - - - - - - - + + - - - - - - - - - - - - + + + + - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - + + + + - - + + @@ -223,98 +188,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lima-report/src/main/resources/jasperreports/generalEntryBook/En= tryBookPeriodReport.jrxml b/lima-report/src/main/resources/jasperreports/gene= ralEntryBook/EntryBookPeriodReport.jrxml index 2506f1e..0ddb70a 100644 --- a/lima-report/src/main/resources/jasperreports/generalEntryBook/EntryBook= PeriodReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/generalEntryBook/EntryBook= PeriodReport.jrxml @@ -1,6 +1,6 @@ - - + + @@ -18,12 +18,16 @@ - - + + + + + + + - - + @@ -32,12 +36,7 @@ - - - - - - + @@ -45,11 +44,7 @@ - - - - - + @@ -73,12 +68,7 @@ - - - - - - + @@ -86,13 +76,7 @@ - - - - - - - + @@ -117,7 +101,7 @@ - + @@ -131,7 +115,7 @@ - + diff --git a/lima-report/src/main/resources/jasperreports/generalEntryBook/Ge= neralEntryBookEntryReport.jrxml b/lima-report/src/main/resources/jasperreport= s/generalEntryBook/GeneralEntryBookEntryReport.jrxml index 0a0444b..5e154d0 100644 --- a/lima-report/src/main/resources/jasperreports/generalEntryBook/GeneralEn= tryBookEntryReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/generalEntryBook/GeneralEn= tryBookEntryReport.jrxml @@ -1,6 +1,6 @@ - - + + @@ -10,11 +10,12 @@ + + - + - @@ -47,7 +48,7 @@ - + diff --git a/lima-report/src/main/resources/jasperreports/generalLedger/Docum= entReport.jrxml b/lima-report/src/main/resources/jasperreports/generalLedger/= DocumentReport.jrxml index 130ea91..7a1a5ac 100644 --- a/lima-report/src/main/resources/jasperreports/generalLedger/DocumentRepo= rt.jrxml +++ b/lima-report/src/main/resources/jasperreports/generalLedger/DocumentRepo= rt.jrxml @@ -1,258 +1,179 @@ - - + + - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - <band height=3D"41" splitType=3D"Stretch"> - <frame> - <reportElement style=3D"Default" mode=3D"Opaque" x=3D"0" y=3D"1" width= =3D"578" height=3D"40" forecolor=3D"#D0B48E" backcolor=3D"#F2EBDF" uuid=3D"1a= ba49d4-0acc-4925-8731-13c1cc1a90f4"/> - <box> - <topPen lineWidth=3D"0.6" lineStyle=3D"Solid" lineColor=3D"#FDCA97"/> - <leftPen lineWidth=3D"0.6" lineStyle=3D"Solid" lineColor=3D"#FDCA97"/> - <bottomPen lineWidth=3D"0.6" lineStyle=3D"Solid" lineColor=3D"#FDCA97"/> - <rightPen lineWidth=3D"0.6" lineStyle=3D"Solid" lineColor=3D"#FDCA97"/> - </box> - <textField isBlankWhenNull=3D"true"> - <reportElement style=3D"Default" x=3D"0" y=3D"0" width=3D"578" height= =3D"20" forecolor=3D"#736343" uuid=3D"9ee9d5f1-6e74-4526-83a4-3b386f2733a8"/> - <textElement textAlignment=3D"Center" verticalAlignment=3D"Middle"> - <font size=3D"14" isBold=3D"true"/> - </textElement> - <textFieldExpression><![CDATA[$F{title}]]></textFieldExpression> - </textField> - <textField pattern=3D"dd/MM/yyyy HH:mm" isBlankWhenNull=3D"true"> - <reportElement style=3D"Default" x=3D"444" y=3D"0" width=3D"134" height= =3D"20" forecolor=3D"#736343" uuid=3D"a60d5d40-69ac-4c50-a33a-67c26cce05f3"/> - <textElement textAlignment=3D"Right" verticalAlignment=3D"Middle"> - <font size=3D"8" isBold=3D"false"/> - <paragraph rightIndent=3D"5"/> - </textElement> - <textFieldExpression><![CDATA["Edition du: " + new SimpleDateFormat("dd= /MM/yyyy =C3=A0 HH:mm").format(new java.util.Date())]]></textFieldExpression> - </textField> - <textField pattern=3D"dd/MM/yyyy" isBlankWhenNull=3D"true"> - <reportElement style=3D"Default" x=3D"210" y=3D"20" width=3D"80" height= =3D"20" forecolor=3D"#736343" uuid=3D"37d0a47c-0197-4f09-8358-823b39a2a42a"> - <property name=3D"local_mesure_unitheight" value=3D"pixel"/> - <property name=3D"com.jaspersoft.studio.unit.height" value=3D"px"/> - </reportElement> - <textElement textAlignment=3D"Right" verticalAlignment=3D"Middle"> - <font isBold=3D"true"/> - </textElement> - <textFieldExpression><![CDATA["Du " + new SimpleDateFormat("dd/MM/yyyy"= ).format($F{fromDate})]]></textFieldExpression> - </textField> - <textField pattern=3D"dd/MM/yyyy" isBlankWhenNull=3D"true"> - <reportElement style=3D"Default" x=3D"290" y=3D"20" width=3D"80" height= =3D"20" forecolor=3D"#736343" uuid=3D"5fc4df4a-5930-4ccd-b450-cf7aac6be57b"> - <property name=3D"local_mesure_unitheight" value=3D"pixel"/> - <property name=3D"com.jaspersoft.studio.unit.height" value=3D"px"/> - <property name=3D"local_mesure_unitwidth" value=3D"pixel"/> - <property name=3D"com.jaspersoft.studio.unit.width" value=3D"px"/> - </reportElement> - <textElement verticalAlignment=3D"Middle"> - <font isBold=3D"true"/> - </textElement> - <textFieldExpression><![CDATA[" au " + new SimpleDateFormat("dd/MM/yyyy= ").format($F{toDate})]]></textFieldExpression> - </textField> - <textField isBlankWhenNull=3D"true"> - <reportElement style=3D"Default" x=3D"0" y=3D"0" width=3D"190" height= =3D"20" forecolor=3D"#736343" uuid=3D"5aa3ceb9-e407-42da-bdc3-097875bdd5f5"> - <property name=3D"local_mesure_unitheight" value=3D"pixel"/> - <property name=3D"com.jaspersoft.studio.unit.height" value=3D"px"/> - </reportElement> - <textElement verticalAlignment=3D"Middle" rotation=3D"None"> - <font size=3D"10" isBold=3D"true"/> - <paragraph leftIndent=3D"5"/> - </textElement> - <textFieldExpression><![CDATA[$F{companyName}]]></textFieldExpression> - </textField> - </frame> - </band> - - - - - - - - - - - - - - - - - - - - - - - - - - + + + <band height=3D"41" splitType=3D"Stretch"> + <frame> + <reportElement style=3D"Default" mode=3D"Opaque" x=3D"0" y= =3D"1" width=3D"578" height=3D"40" forecolor=3D"#D0B48E" backcolor=3D"#F2EBDF= " uuid=3D"1aba49d4-0acc-4925-8731-13c1cc1a90f4"/> + <box> + <topPen lineWidth=3D"0.6" lineStyle=3D"Solid" lineColor= =3D"#FDCA97"/> + <leftPen lineWidth=3D"0.6" lineStyle=3D"Solid" lineColor= =3D"#FDCA97"/> + <bottomPen lineWidth=3D"0.6" lineStyle=3D"Solid" lineCol= or=3D"#FDCA97"/> + <rightPen lineWidth=3D"0.6" lineStyle=3D"Solid" lineColo= r=3D"#FDCA97"/> + </box> + <textField isBlankWhenNull=3D"true"> + <reportElement style=3D"Default" x=3D"0" y=3D"0" width= =3D"578" height=3D"20" forecolor=3D"#736343" uuid=3D"9ee9d5f1-6e74-4526-83a4-= 3b386f2733a8"/> + <textElement textAlignment=3D"Center" verticalAlignment= =3D"Middle"> + <font size=3D"14" isBold=3D"true"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleReport}]]></textFi= eldExpression> + </textField> + <textField isBlankWhenNull=3D"true"> + <reportElement style=3D"Default" x=3D"444" y=3D"0" width= =3D"134" height=3D"20" forecolor=3D"#736343" uuid=3D"a60d5d40-69ac-4c50-a33a-= 67c26cce05f3"/> + <textElement textAlignment=3D"Right" verticalAlignment= =3D"Middle"> + <font size=3D"8" isBold=3D"false"/> + <paragraph rightIndent=3D"5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCurrentDate}]]></t= extFieldExpression> + </textField> + <textField isBlankWhenNull=3D"true"> + <reportElement style=3D"Default" x=3D"210" y=3D"20" widt= h=3D"160" height=3D"20" forecolor=3D"#736343" uuid=3D"37d0a47c-0197-4f09-8358= -823b39a2a42a"/> + <textElement textAlignment=3D"Center" verticalAlignment= =3D"Middle"> + <font isBold=3D"true"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleFromToDate}]]></te= xtFieldExpression> + </textField> + <textField isBlankWhenNull=3D"true"> + <reportElement style=3D"Default" x=3D"0" y=3D"0" width= =3D"190" height=3D"20" forecolor=3D"#736343" uuid=3D"5aa3ceb9-e407-42da-bdc3-= 097875bdd5f5"/> + <textElement verticalAlignment=3D"Middle" rotation=3D"No= ne"> + <font size=3D"10" isBold=3D"true"/> + <paragraph leftIndent=3D"5"/> + </textElement> + <textFieldExpression><![CDATA[$F{titleCompanyName}]]></t= extFieldExpression> + </textField> + </frame> + </band> + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - + <= /textFieldExpression> + + + - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - + + + + - - + <= /textFieldExpression> + + @@ -262,6 +183,7 @@ + diff --git a/lima-report/src/main/resources/jasperreports/generalLedger/Gener= alLedgerEntryReport.jrxml b/lima-report/src/main/resources/jasperreports/gene= ralLedger/GeneralLedgerEntryReport.jrxml index 6ec6335..675f32d 100644 --- a/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedge= rEntryReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedge= rEntryReport.jrxml @@ -1,6 +1,6 @@ - - + + @@ -15,17 +15,27 @@ + + - - + @@ -35,141 +45,60 @@ - - + + - - - - - - - - - - + - - + - - - - - - - - - - - - - + - - - - - - - - - - - - - + - - - - - - - - - - - - - + - - - - - - - - - - - + - - - - - - - - - - - + - - - - - - - - - - - - - - - + - - + @@ -179,72 +108,59 @@ - - - - + - - - - + + + + - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + - + - - - - - - - - + + + + + - + - - - - - - - - - - - - - + = diff --git a/lima-report/src/main/resources/jasperreports/generalLedger/Gener= alLedgerReport.jrxml b/lima-report/src/main/resources/jasperreports/generalLe= dger/GeneralLedgerReport.jrxml index 7169223..9987b00 100644 --- a/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedge= rReport.jrxml +++ b/lima-report/src/main/resources/jasperreports/generalLedger/GeneralLedge= rReport.jrxml @@ -1,6 +1,6 @@ - - + + @@ -18,15 +18,18 @@ + + + + + - - - + - + @@ -38,8 +41,8 @@ - - + + @@ -50,35 +53,27 @@ - - + + - - + + - - - - + - - - - + + + + - - - - - - + @@ -89,10 +84,7 @@ - - - - + @@ -101,25 +93,15 @@ - - - - + - - - - + + + + - - - - - - - - + @@ -127,14 +109,7 @@ - - - - - - - - + @@ -142,27 +117,15 @@ - - - - - - - - + - + - - - - - - + --=20 To stop receiving notification emails like this one, please contact chorem.org SCM administrator . --===============4470039349455203984==--