This commit is contained in:
jstaerk
2024-11-14 15:06:20 +01:00
parent c035b11e71
commit bf41558322
3 changed files with 7 additions and 14 deletions

View File

@@ -3,7 +3,7 @@
2024- 2024-
- 435 use invoiceimporter as common technical basis also for zugferdimporter - 435 use invoiceimporter as common technical basis also for zugferdimporter
- also import delivery address - also import delivery address
- 527 metrics raises errors - 527 metrics may raise error on some pdf files
- 517 read product GlobalID - 517 read product GlobalID
- 380 Added test for input stream validation - 380 Added test for input stream validation
- 518 corrently validate more XRechnung versions - 518 corrently validate more XRechnung versions
@@ -13,6 +13,8 @@
- 532 support validation warnings! - 532 support validation warnings!
- 534 new signature - 534 new signature
- 538 Mustang validator always claims PDF is invalid if flavour is PDF/A-3A - 538 Mustang validator always claims PDF is invalid if flavour is PDF/A-3A
- 555 be able to validate ubl credit notes
- when parsing now distinguishing between the parseExceptions StructureException and ArithmetricException
2.14.2 2.14.2

View File

@@ -54,15 +54,6 @@ public class ZUGFeRDImporter extends ZUGFeRDInvoiceImporter {
} }
/***
* Wrapper for protected method extractString
* @param xpathStr the xpath expression to be evaluated
* @return the extracted String for the specific path in the document
*/
public String wExtractString(String xpathStr) {
return extractString(xpathStr);
}
//////////////////////////////////// ////////////////////////////////////

View File

@@ -9,6 +9,8 @@ import org.apache.pdfbox.pdmodel.common.PDNameTreeNode;
import org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification; import org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification;
import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile; import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
import org.mustangproject.*; import org.mustangproject.*;
import org.mustangproject.Exceptions.ArithmetricException;
import org.mustangproject.Exceptions.StructureException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.w3c.dom.Document; import org.w3c.dom.Document;
@@ -701,15 +703,13 @@ public class ZUGFeRDInvoiceImporter {
try { try {
whichType = getStandard(); whichType = getStandard();
} catch (Exception e) { } catch (Exception e) {
throw new ParseException("Could not find out if it's an invoice, order, or delivery advice", 0); throw new StructureException("Could not find out if it's an invoice, order, or delivery advice", 0);
} }
if ((whichType != EStandard.despatchadvice) if ((whichType != EStandard.despatchadvice)
&& ((!expectedStringTotalGross.equals(XMLTools.nDigitFormat(expectedGrandTotal, 2))) && ((!expectedStringTotalGross.equals(XMLTools.nDigitFormat(expectedGrandTotal, 2)))
&& (!ignoreCalculationErrors))) { && (!ignoreCalculationErrors))) {
throw new ParseException( throw new ArithmetricException();
"Could not reproduce the invoice, this could mean that it could not be read properly", 0);
} }
} }
return zpp; return zpp;