Skip to content

Commit

Permalink
ZUGFeRDExporterFromA3 did not set default ZUGFeRD Version
Browse files Browse the repository at this point in the history
  • Loading branch information
jstaerk committed Nov 26, 2023
1 parent 23650e6 commit 21e6903
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 12 deletions.
1 change: 1 addition & 0 deletions History.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
=======

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
Be able to validate XR 3.0 #347

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,6 @@ public boolean ensurePDFIsValid(final DataSource dataSource) throws IOException
return true;
}

public ZUGFeRDExporterFromA1() {
setZUGFeRDVersion(ZUGFeRDExporterFromA3.DefaultZUGFeRDVersion);

}

public ZUGFeRDExporterFromA1 load(String pdfFilename) throws IOException {
return (ZUGFeRDExporterFromA1) super.load(pdfFilename);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,8 @@ public ZUGFeRDExporterFromA3 load(byte[] pdfBinary) throws IOException {

public ZUGFeRDExporterFromA3() {
super();
setZUGFeRDVersion(ZUGFeRDExporterFromA3.DefaultZUGFeRDVersion);

}

public void attachFile(FileAttachment file) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,38 @@

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
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_UNKNOWN = "./target/testout-PDFA3FromUnkownA3.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
// the writing part
TradeParty recipient = new TradeParty("Franz Müller", "teststr.12", "55232", "Entenhausen", "DE");

Invoice i = createInvoice(recipient);
File tempFile = getResourceAsFile("MustangGnuaccountingBeispielRE-20201121_508blankoA3.pdf");//a3
File tempFile = getResourceAsFile("MustangGnuaccountingBeispielRE-20201121_508blanko.pdf");//a3
int exceptions=0;
try {
ZUGFeRDExporterFromA3 zea3 = new ZUGFeRDExporterFromA3().load(tempFile.getAbsolutePath());
ZUGFeRDExporterFromA1 zea3 = new ZUGFeRDExporterFromA1().load(tempFile.getAbsolutePath());
zea3.setTransaction(i);
zea3.export(TARGET_PDF_FROM_A1);

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", "[email protected]"))).setNumber("X12")
.addItem(new Item(new Product("Testprodukt", "", "C62", new BigDecimal(19)), new BigDecimal(2.5), new BigDecimal(1.0))));
} 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);
File tempFile = getResourceAsFile("MustangGnuaccountingBeispielRE-20201121_508blankoA3.pdf");//a3
int exceptions=0;
try {
ZUGFeRDExporterFromA3 zea3 = new ZUGFeRDExporterFromA3().load(tempFile.getAbsolutePath());
zea3.setTransaction(i);
zea3.export(TARGET_PDF_FROM_A3);

} catch (IOException e) {
Expand Down

0 comments on commit 21e6903

Please sign in to comment.