From 2454fe7c628acdc4eccb1abbc449692f8dd1f9e5 Mon Sep 17 00:00:00 2001 From: jstaerk Date: Mon, 11 Aug 2025 09:27:09 +0200 Subject: [PATCH] closes #813 --- History.md | 7 ++++++- .../org/mustangproject/validator/ZUGFeRDValidator.java | 6 +----- .../org/mustangproject/validator/ZUGFeRDValidatorTest.java | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/History.md b/History.md index 917248dc..15d8b0ab 100644 --- a/History.md +++ b/History.md @@ -2,10 +2,15 @@ ======= - #893 Tradeparty globalID is not read from JSON - #902 Tests to use definted TZ (UTC) -- #905 Parse product level charges/discounts in UBL +- #905 Parse product level charges/discounts into JSON - #869 Import Account Holder returns SellerTradeParty.name instead of AccountHolder - #861 Multiple problems with Product.CountryOfOrigin - #908 Validation: Make clear when embedded file name is wrong +- #913 downgrade PDF/A errors to warnings +- #821 +- #911 +- #912 + 2.18.0 ======= diff --git a/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java b/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java index a64efdce..bb5e9576 100644 --- a/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java +++ b/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java @@ -204,10 +204,6 @@ public class ZUGFeRDValidator { context.clearCustomXML(); } - if ((isPDF) && (!pdfValidity)) { - context.setInvalid(); - } - } } catch (IrrecoverableValidationError | IOException irx) { LOGGER.info(irx.getMessage()); @@ -337,7 +333,7 @@ public class ZUGFeRDValidator { + " Signature:" + Signature + " Checksum:" + sha1Checksum + " Profile:" + context.getProfile() + " Version:" + context.getGeneration() + " Took:" + duration + "ms Errors:[" + context.getCSVResult() + "] ErrorIDs: [" + context.getCSVIDResult() + "]" + toBeAppended); - wasCompletelyValid = ((pdfValidity) && (xmlValidity)); + wasCompletelyValid = xmlValidity; return sw.toString(); } diff --git a/validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java b/validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java index ec938490..1cd6681e 100644 --- a/validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java +++ b/validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java @@ -31,7 +31,7 @@ public class ZUGFeRDValidatorTest extends ResourceCase { .isEqualTo("valid"); assertThat(res).valueByXPath("/validation/summary/@status") - .isEqualTo("invalid"); + .isEqualTo("valid"); tempFile = getResourceAsFile("validAvoir_FR_type380_BASICWL.pdf"); @@ -103,7 +103,7 @@ public class ZUGFeRDValidatorTest extends ResourceCase { .isEqualTo("valid"); assertThat(res).valueByXPath("/validation/summary/@status") - .isEqualTo("invalid"); + .isEqualTo("valid"); fileBytes = getResourceAsByteArray("validAvoir_FR_type380_BASICWL.pdf");