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

Squashed commit of the following:

Browse Source 
commit f0a44d757de2693e5baa89ac68192ee92632e0a2
Author: langfr <frank.langelage@outlook.de>
Date:   Sat Sep 6 12:00:42 2025 +0100

    Enable option setting Additional Document Description 2.

commit 15524a2ed661fb44f782863da5d7e9fcf4f68e78
Author: langfr <frank.langelage@outlook.de>
Date:   Tue Sep 2 21:30:30 2025 +0100

    Enable option setting Additional Document Description.

Enable setting and reading Additional Document Description.
This commit is contained in:
langfr
2025-09-06 12:04:08 +01:00
parent dadf0de4b0
commit 37e4e43ed2
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
library/src/main/java/org/mustangproject/FileAttachment.java
View File

@@ -10,7 +10,7 @@ public class FileAttachment {
protected String filename;
protected String mimetype;
protected String relation = "Unspecified";
protected String description;
protected String description = "Additional file attachment";
protected byte[] data;
@@ -21,19 +21,25 @@ public class FileAttachment {
}
public FileAttachment(String filename, String mimetype, String relation, byte[] data, String description) {
this.filename = filename;
this.mimetype = mimetype;
this.relation = relation;
this.data = data;
this.description = description;
}
public FileAttachment(String filename, String mimetype, String relation, byte[] data) {
this.filename = filename;
this.mimetype = mimetype;
this.relation = relation;
this.data = data;
this.description = "Additional file attachment";
}
public FileAttachment(String filename, String mimetype, byte[] data) {
this.filename = filename;
this.mimetype = mimetype;
this.data = data;
this.description = "Additional file attachment";
}
public String getDescription() {

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

@@ -994,6 +994,12 @@ public class ZUGFeRDInvoiceImporter {
NodeList attachmentNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
for (int i = 0; i < attachmentNodes.getLength(); i++) {
FileAttachment fa = new FileAttachment(attachmentNodes.item(i).getAttributes().getNamedItem("filename").getNodeValue(), attachmentNodes.item(i).getAttributes().getNamedItem("mimeCode").getNodeValue(), "Data", Base64.getMimeDecoder().decode(XMLTools.trimOrNull(attachmentNodes.item(i))));
NodeList nl = attachmentNodes.item(i).getParentNode().getChildNodes();
for (int j = 0; j < nl.getLength(); j++) {
if (nl.item(j).getLocalName() != null && nl.item(j).getLocalName().equals("Name")) {
fa.setDescription(nl.item(j).getTextContent());
}
}
zpp.embedFileInXML(fa);
// filename = "Aufmass.png" mimeCode = "image/png"
//EmbeddedDocumentBinaryObject cbc:EmbeddedDocumentBinaryObject mimeCode="image/png" filename="Aufmass.png"

5
library/src/test/java/org/mustangproject/ZUGFeRD/XRTest.java
View File

@@ -102,7 +102,7 @@ public class XRTest extends TestCase {
BigDecimal amount = new BigDecimal(amountStr);
byte[] b = {12, 13};
FileAttachment fe1 = new FileAttachment("one.pdf", "application/pdf", "Alternative", b);
FileAttachment fe1 = new FileAttachment("one.pdf", "application/pdf", "Alternative", b,"Beschreibung");
Invoice i = new Invoice().setDueDate(new Date()).setIssueDate(new Date()).setDeliveryDate(new Date())
.setSender(new TradeParty(orgname, "teststr", "55232", "teststadt", "DE").setEmail("sender@example.com").addTaxID("DE4711").addVATID("DE0815").setContact(new Contact("Hans Test", "+49123456789", "test@example.org")).addBankDetails(new BankDetails("DE12500105170648489890", "COBADEFXXX").setAccountName("kontoInhaber")))
.setRecipient(new TradeParty("Franz Müller", "teststr.12", "55232", "Entenhausen", "DE").setEmail("recipient@sample.org"))
@@ -121,6 +121,7 @@ public class XRTest extends TestCase {
zf2p.setProfile(Profiles.getByName("XRechnung"));
zf2p.generateXML(i);
String theXML = new String(zf2p.getXML(), StandardCharsets.UTF_8);
System.out.println(theXML);
assertTrue(theXML.contains("<rsm:CrossIndustryInvoice"));
assertTrue(theXML.contains("#SKONTO#"));
assertThat(theXML).valueByXPath("count(//*[local-name()='IncludedSupplyChainTradeLineItem'])")
@@ -158,7 +159,7 @@ public class XRTest extends TestCase {
assertEquals(attachedFiles.length, 1);
assertTrue(Arrays.equals(attachedFiles[0].getData(), b));
assertEquals("Beschreibung",attachedFiles[0].getDescription());
}