From 6acad64f36b79f42ec8e99ba916da647c4434c65 Mon Sep 17 00:00:00 2001 From: Sebastian Sieber Date: Fri, 8 Jul 2022 16:30:50 +0200 Subject: [PATCH] Add missing encodeXML to node payment terms description --- .../main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java | 3 +-- .../java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java index 495bd7c0..10b4b498 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.mustangproject.EStandard; import org.mustangproject.FileAttachment; -import org.mustangproject.TradeParty; import org.mustangproject.XMLTools; public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider { @@ -57,7 +56,7 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider final String exemptionReason = ""; if (trans.getPaymentTermDescription() != null) { - paymentTermsDescription = trans.getPaymentTermDescription(); + paymentTermsDescription = XMLTools.encodeXML(trans.getPaymentTermDescription()); } if ((paymentTermsDescription == null) && (trans.getDocumentCode() != CORRECTEDINVOICE)/* && (trans.getDocumentCode() != DocumentCodeTypeConstants.CREDITNOTE)*/) { diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java index 7a2ada17..e8307fc1 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java @@ -265,7 +265,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { String exemptionReason = ""; if (trans.getPaymentTermDescription() != null) { - paymentTermsDescription = trans.getPaymentTermDescription(); + paymentTermsDescription = XMLTools.encodeXML(trans.getPaymentTermDescription()); } if ((paymentTermsDescription == null) && (trans.getDocumentCode() != CORRECTEDINVOICE)/* && (trans.getDocumentCode() != DocumentCodeTypeConstants.CREDITNOTE)*/) { @@ -746,7 +746,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { String paymentTermsXml = ""; final IZUGFeRDPaymentDiscountTerms discountTerms = paymentTerms.getDiscountTerms(); - Date dueDate = paymentTerms.getDueDate(); + final Date dueDate = paymentTerms.getDueDate(); if (dueDate != null && discountTerms != null && discountTerms.getBaseDate() != null) { throw new IllegalStateException( "if paymentTerms.dueDate is specified, paymentTerms.discountTerms.baseDate has not to be specified");