This is an automated email from the git hooks/post-receive script. New commit to branch feature/newReportBuilder in repository lima. See http://git.chorem.org/lima.git commit d93ebd03805fae66175b55c2a9ac113cceab349e Author: dcosse <japbiw74> Date: Wed Jan 14 16:00:56 2015 +0100 refs #769 fix Balance report fill-up --- .../lima/business/ejb/report/BalanceReportServiceImpl.java | 1 + .../java/org/chorem/lima/beans/BalanceReportAccountImpl.java | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) 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 bde32b9..5173f2c 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 @@ -146,6 +146,7 @@ public class BalanceReportServiceImpl extends AbstractLimaService implements Bal BalanceReportAccountImpl classAccount = accountsByClasses.get(accountClass); if (classAccount == null) { classAccount = new BalanceReportAccountImpl(); + classAccount.setFormatter(bigDecimalFormat); classAccount.setBalanceSubAccountsReportPath(BALANCE_SUB_ACCOUNTS_REPORT_PATH); classAccount.setSubAccounts(new ArrayList<BalanceReportAccount>()); classAccount.setAccountNumber(""); diff --git a/lima-callao/src/main/java/org/chorem/lima/beans/BalanceReportAccountImpl.java b/lima-callao/src/main/java/org/chorem/lima/beans/BalanceReportAccountImpl.java index 44c521e..fbb88db 100644 --- a/lima-callao/src/main/java/org/chorem/lima/beans/BalanceReportAccountImpl.java +++ b/lima-callao/src/main/java/org/chorem/lima/beans/BalanceReportAccountImpl.java @@ -32,13 +32,13 @@ public class BalanceReportAccountImpl extends BalanceReportAccount { public void addSubAccount(BalanceReportAccount subAccount) { // we only add account that have values - if (BigDecimal.ZERO.equals(subAccount.getAmountDebit()) && BigDecimal.ZERO.equals(subAccount.getAmountCredit())) { + if (subAccount.getAmountDebit() != null && subAccount.getAmountCredit() != null) { getSubAccounts().add(subAccount); - BigDecimal newAmountDebit = this.amountDebit; - BigDecimal newAmountCredit = this.amountCredit; - BigDecimal newSoldeDebit = this.soldeDebit; - BigDecimal newSoldeCredit = this.soldeCredit; + BigDecimal newAmountDebit = this.amountDebit == null ? BigDecimal.ZERO : this.amountDebit; + BigDecimal newAmountCredit = this.amountCredit == null ? BigDecimal.ZERO : this.amountCredit; + BigDecimal newSoldeDebit = this.soldeDebit == null ? BigDecimal.ZERO : this.soldeDebit; + BigDecimal newSoldeCredit = this.soldeCredit == null ? BigDecimal.ZERO : this.soldeCredit; this.amountDebit = subAccount.getAmountDebit().add(newAmountDebit); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.