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 c2c4efabbf7c58157e4833850ae8e74319b40132 Author: dcosse <cosse@codelutin.com> Date: Sun Jan 31 16:35:06 2016 +0100 refs #1241 correction de risque de npe sur génération de rapports --- .../report/GeneralEntryBookReportServiceImpl.java | 2 +- .../lima/report/service/DocumentService.java | 23 +++++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) 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 0e843c3..7bf6996 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 @@ -159,7 +159,7 @@ public class GeneralEntryBookReportServiceImpl extends AbstractLimaService imple if ((Boolean) results.get(0)[0]) { debit = (BigDecimal) results.get(0)[1]; } else { - credit = (BigDecimal) results.get(1)[1]; + credit = (BigDecimal) results.get(0)[1]; } } entryBookDebit = entryBookDebit.add(debit); diff --git a/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java b/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java index 9eea4b4..4ce1035 100644 --- a/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java +++ b/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java @@ -336,20 +336,25 @@ public class DocumentService { Identity identity = identityService.getIdentity(); Treasury treasury = treasuryService.getTreasury(); - String ident = identity.getName() + "\n" + identity.getAddress() + "\n" + identity.getAddress2() + "\n" + identity.getZipCode() + " " + identity.getCity(); - String treasuryAddress = treasury.getAddress() + '\n' + treasury.getZipCode() + " " + treasury.getCity(); + String ident = Strings.nullToEmpty(identity.getName()) + "\n" + + Strings.nullToEmpty(identity.getAddress()) + "\n" + Strings.nullToEmpty(identity.getAddress2()) + "\n" + + Strings.nullToEmpty(identity.getZipCode()) + " " + + Strings.nullToEmpty(identity.getCity()); + String treasuryAddress = Strings.nullToEmpty(treasury.getAddress()) + '\n' + + Strings.nullToEmpty(treasury.getZipCode()) + " " + + Strings.nullToEmpty(treasury.getCity()); fields.setField(doc, "a1", t("lima-business.document.vatPeriod1", beginDate)); fields.setField(doc, "a2", treasuryAddress); fields.setField(doc, "a4", ident); - fields.setField(doc, "a6", treasury.getSie()); - fields.setField(doc, "a7", treasury.getDossierNumber()); - fields.setField(doc, "a8", treasury.getKey()); + fields.setField(doc, "a6", Strings.nullToEmpty(treasury.getSie())); + fields.setField(doc, "a7", Strings.nullToEmpty(treasury.getDossierNumber())); + fields.setField(doc, "a8", Strings.nullToEmpty(treasury.getKey())); fields.setField(doc, "a9", t("lima-business.document.treasuryPeriod", beginDate)); - fields.setField(doc, "a10", treasury.getCdi()); - fields.setField(doc, "a11", treasury.getServiceCode()); - fields.setField(doc, "a12", treasury.getSystemType()); - fields.setField(doc, "a13", "FR" + identity.getVatNumber() + identity.getBusinessNumber()); + fields.setField(doc, "a10", Strings.nullToEmpty(treasury.getCdi())); + fields.setField(doc, "a11", Strings.nullToEmpty(treasury.getServiceCode())); + fields.setField(doc, "a12", Strings.nullToEmpty(treasury.getSystemType())); + fields.setField(doc, "a13", "FR" + Strings.nullToEmpty(identity.getVatNumber()) + Strings.nullToEmpty(identity.getBusinessNumber())); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.