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

ZUGFeRDExporterFromA3 did not set default ZUGFeRD Version

Browse Source
This commit is contained in:
jstaerk
2023-11-26 17:59:27 +01:00
parent 23650e68d8
commit 21e6903736
4 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
History.md
View File

@@ -2,6 +2,7 @@
======= =======
Missing closing tag in BankDetails when there's no BIC number #339 Missing closing tag in BankDetails when there's no BIC number #339
ZUGFeRDExporterFromA3 did not set default ZUGFeRD Version
Have a way to merge to PDF file without knowing if it is A-1 or A-3 #341 Have a way to merge to PDF file without knowing if it is A-1 or A-3 #341
Be able to validate XR 3.0 #347 Be able to validate XR 3.0 #347

4
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA1.java
View File

@@ -84,10 +84,6 @@ public class ZUGFeRDExporterFromA1 extends ZUGFeRDExporterFromA3 implements IZUG
return true; return true;
} }
public ZUGFeRDExporterFromA1() {
setZUGFeRDVersion(ZUGFeRDExporterFromA3.DefaultZUGFeRDVersion);
}
public ZUGFeRDExporterFromA1 load(String pdfFilename) throws IOException { public ZUGFeRDExporterFromA1 load(String pdfFilename) throws IOException {
return (ZUGFeRDExporterFromA1) super.load(pdfFilename); return (ZUGFeRDExporterFromA1) super.load(pdfFilename);

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

@@ -264,6 +264,8 @@ public class ZUGFeRDExporterFromA3 extends XRExporter implements IZUGFeRDExporte
public ZUGFeRDExporterFromA3() { public ZUGFeRDExporterFromA3() {
super(); super();
setZUGFeRDVersion(ZUGFeRDExporterFromA3.DefaultZUGFeRDVersion);
} }
public void attachFile(FileAttachment file) { public void attachFile(FileAttachment file) {

29
library/src/test/java/org/mustangproject/ZUGFeRD/PDFAWriteTest.java
View File

@@ -33,25 +33,38 @@ import java.util.Date;
@FixMethodOrder(MethodSorters.NAME_ASCENDING) @FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class PDFAWriteTest extends ResourceCase { public class PDFAWriteTest extends ResourceCase {
final String TARGET_PDF_FROM_A1 = "./target/testout-PDFA3FromA3.pdf";
final String TARGET_PDF_FROM_A3 = "./target/testout-PDFA3FromA3.pdf"; final String TARGET_PDF_FROM_A3 = "./target/testout-PDFA3FromA3.pdf";
final String TARGET_PDF_FROM_A3_UNKNOWN = "./target/testout-PDFA3FromUnkownA3.pdf"; final String TARGET_PDF_FROM_A3_UNKNOWN = "./target/testout-PDFA3FromUnkownA3.pdf";
final String TARGET_PDF_FROM_A1_UNKNOWN = "./target/testout-PDFA3FromUnkownA1.pdf"; final String TARGET_PDF_FROM_A1_UNKNOWN = "./target/testout-PDFA3FromUnkownA1.pdf";
public void testA3KnownExport() { public void testA1KnownExport() {
// test creating factur-x invoices to french authorities, i.e. with SIRET number // test creating factur-x invoices to french authorities, i.e. with SIRET number
// the writing part // the writing part
TradeParty recipient = new TradeParty("Franz Müller", "teststr.12", "55232", "Entenhausen", "DE"); TradeParty recipient = new TradeParty("Franz Müller", "teststr.12", "55232", "Entenhausen", "DE");
Invoice i = createInvoice(recipient);
File tempFile = getResourceAsFile("MustangGnuaccountingBeispielRE-20201121_508blanko.pdf");//a3
int exceptions=0;
try {
ZUGFeRDExporterFromA1 zea3 = new ZUGFeRDExporterFromA1().load(tempFile.getAbsolutePath());
zea3.setTransaction(i);
zea3.export(TARGET_PDF_FROM_A1);
} catch (IOException e) {
exceptions++;
}
assertTrue(exceptions==0);
}
public void testA3KnownExport() {
TradeParty recipient = new TradeParty("Franz Müller", "teststr.12", "55232", "Entenhausen", "DE");
Invoice i = createInvoice(recipient); Invoice i = createInvoice(recipient);
File tempFile = getResourceAsFile("MustangGnuaccountingBeispielRE-20201121_508blankoA3.pdf");//a3 File tempFile = getResourceAsFile("MustangGnuaccountingBeispielRE-20201121_508blankoA3.pdf");//a3
int exceptions=0; int exceptions=0;
try { try {
ZUGFeRDExporterFromA3 zea3 = new ZUGFeRDExporterFromA3().load(tempFile.getAbsolutePath()); ZUGFeRDExporterFromA3 zea3 = new ZUGFeRDExporterFromA3().load(tempFile.getAbsolutePath());
zea3.setTransaction(i);
zea3.setTransaction(new Invoice().setDueDate(new Date()).setIssueDate(new Date()).setDeliveryDate(new Date())
.setSender(new TradeParty("Test", "teststr", "55232", "teststadt", "DE").addBankDetails(new BankDetails("777666555", "DE4321"))).setOwnTaxID("4711").setOwnVATID("DE19990815")
.setRecipient(new TradeParty("Franz Müller", "teststr.12", "55232", "Entenhausen", "DE")
.setContact(new Contact("nameRep", "phoneRep", "emailRep@test.com"))).setNumber("X12")
.addItem(new Item(new Product("Testprodukt", "", "C62", new BigDecimal(19)), new BigDecimal(2.5), new BigDecimal(1.0))));
zea3.export(TARGET_PDF_FROM_A3); zea3.export(TARGET_PDF_FROM_A3);
} catch (IOException e) { } catch (IOException e) {