louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

closes #523

Browse Source
This commit is contained in:
jstaerk
2024-10-25 14:17:22 +02:00
parent 85aaa324b5
commit 3675894dc5
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
History.md
View File

@@ -4,10 +4,11 @@
- 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 raises errors
- 517 - 517 read product GlobalID
- 380 - 380 Added test for input stream validation
- 518 corrently validate more XRechnung versions - 518 corrently validate more XRechnung versions
- make document charges and allowances serializable - make document charges and allowances serializable
- 523
2.14.2 2.14.2

2
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java
View File

@@ -717,7 +717,7 @@ public class ZUGFeRDImporter extends ZUGFeRDInvoiceImporter {
SchemedID globalId = new SchemedID() SchemedID globalId = new SchemedID()
.setScheme(node.getAttributes() .setScheme(node.getAttributes()
.getNamedItem("schemeID").getNodeValue()) .getNamedItem("schemeID").getNodeValue())
.setId(getNodeValue(node)); .setId(XMLTools.getNodeValue(node));
lineItem.getProduct().addGlobalID(globalId); lineItem.getProduct().addGlobalID(globalId);
} }
node = getNodeByName(nn.getChildNodes(), "SellerAssignedID"); node = getNodeByName(nn.getChildNodes(), "SellerAssignedID");

2
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
View File

@@ -704,7 +704,7 @@ public class ZUGFeRDInvoiceImporter {
&& ((!expectedStringTotalGross.equals(XMLTools.nDigitFormat(expectedGrandTotal, 2))) && ((!expectedStringTotalGross.equals(XMLTools.nDigitFormat(expectedGrandTotal, 2)))
&& (!ignoreCalculationErrors))) { && (!ignoreCalculationErrors))) {
throw new ParseException( throw new ParseException(
"Could not reproduce the invoice, this could mean that it could not be read properly exp "+expectedStringTotalGross+" is "+XMLTools.nDigitFormat(expectedGrandTotal, 2), 0); "Could not reproduce the invoice, this could mean that it could not be read properly", 0);
} }
} }
return zpp; return zpp;

2
library/src/main/resources/stylesheets/xr-pdf.xsl
View File

@@ -64,7 +64,7 @@
<x:xmpmeta xmlns:x="adobe:ns:meta/"> <x:xmpmeta xmlns:x="adobe:ns:meta/">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"> <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/">
<dc:title><xsl:value-of select="xr:Invoice_number"/></dc:title> <dc:title><rdf:Alt><rdf:li xml:lang="x-default"><xsl:value-of select="xr:Invoice_number"/></rdf:li></rdf:Alt></dc:title>
<!-- <!--
<dc:creator></dc:creator> <dc:creator></dc:creator>
<dc:description></dc:description> <dc:description></dc:description>