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

History.md

@@ -1,10 +1,23 @@
 1.5.0
 =====
 <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
-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
 =====

src/main/java/org/mustangproject/toecount/FileChecker.java

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

src/main/java/org/mustangproject/toecount/Toecount.java

@@ -378,7 +378,7 @@ public class Toecount {
 
 				try {
 					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();
 					String xml = zmi.migrateFromV1ToV2(xmlName);