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

Update history, prevent counting non-pdf-files as PDF in toecount, default export filename for ZF2 files now factur-x.xml in toecount

Browse Source
This commit is contained in:
Jochen Stärk
2017-11-29 17:22:45 +01:00
parent 3d9742891c
commit 50f9fe5f65
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
History.md
View File

@@ -1,11 +1,24 @@
1.5.0 1.5.0
===== =====
<date> <date>
Now using factory. Export now also possible on OutputStream. Now using factory. Export is now also possible on OutputStream.
Further dev improvements: no more need to call PDFattachZugferdFile(null); Further dev improvements: no more need to call PDFattachZugferdFile(null) or exporter close();
toecount now has options to combine documents and upgrade xml file from ZF1 to ZF2 toecount now has options to combine documents and upgrade xml file from ZF1 to ZF2
More unit tests, e.g. for custom xml export. More unit tests, e.g. for custom xml export, PDF/A Schema extensions.
Toecount is now integrated and the main class so "java -jar mustang-1.5.0.jar" should suffice
Further changes:
be able to specify profile #50
close pdf files automatically after export #49
ZUGFeRDimporter does not close #48
command line option -e does not work on all-in-one jar #47
invoices have wrong namespaces #45
invalid a3 #44
warn on export #39
1.4.0 1.4.0
===== =====
2017-05-11 2017-05-11

4
src/main/java/org/mustangproject/toecount/FileChecker.java
View File

@@ -17,7 +17,9 @@ public class FileChecker {
if (extIndex >= 0) { if (extIndex >= 0) {
extension = filename.substring(extIndex).toLowerCase(); extension = filename.substring(extIndex).toLowerCase();
isPDF=extension.equals(".pdf");// alternative check for PDF: File starts with %PDF- isPDF=extension.equals(".pdf");// alternative check for PDF: File starts with %PDF-
thisRun.incPDFCount(); if (isPDF) {
thisRun.incPDFCount();
}
} }
} else { } else {

2
src/main/java/org/mustangproject/toecount/Toecount.java
View File

@@ -378,7 +378,7 @@ public class Toecount {
try { try {
xmlName = getFilenameFromUser("ZUGFeRD 1.0 XML source", "ZUGFeRD-invoice.xml", "xml", true, false); xmlName = getFilenameFromUser("ZUGFeRD 1.0 XML source", "ZUGFeRD-invoice.xml", "xml", true, false);
outName = getFilenameFromUser("ZUGFeRD 2.0 XML target", "ZUGFeRD-2-invoice.xml", "xml", false, true); outName = getFilenameFromUser("ZUGFeRD 2.0 XML target", "factur-x.xml", "xml", false, true);
ZUGFeRDMigrator zmi = new ZUGFeRDMigrator(); ZUGFeRDMigrator zmi = new ZUGFeRDMigrator();
String xml = zmi.migrateFromV1ToV2(xmlName); String xml = zmi.migrateFromV1ToV2(xmlName);