diff --git a/History.md b/History.md index 42272163..02233be3 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,13 @@ +signatur mustangproject wird nicht erkannt +fx option in kommandozeile fehlt + +java -jar ZUV-0.7.0c-SNAPSHOT.jar --action validate -x /Users/jstaerk/workspace/mustangproject/src/test/resources/migration/reference/ZUGFeRD2_EXTENDED_Warenrechnung.xml +errors + + +java -jar ZUV-0.7.0c-SNAPSHOT.jar --action validate -x /Users/jstaerk/workspace/mustangproject/src/test/resources/migration/reference/ZUGFeRD2_COMFORT_Einfach.xml +nullpointerex + 1.6.0 ===== 2019-02-03 diff --git a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDMigrator.java b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDMigrator.java index bdc78ea3..83d67468 100644 --- a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDMigrator.java +++ b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDMigrator.java @@ -67,6 +67,12 @@ public class ZUGFeRDMigrator { String res = null; res = baos.toString("UTF-8"); + //migrate the profiles + + res=res.replace("urn:ferd:CrossIndustryDocument:invoice:1p0:basic", "urn:cen.eu:en16931:2017#compliant#urn:zugferd.de:2p0:basic"); + res=res.replace("urn:ferd:CrossIndustryDocument:invoice:1p0:comfort", "urn:cen.eu:en16931:2017"); + res=res.replace("urn:ferd:CrossIndustryDocument:invoice:1p0:extended", "urn:cen.eu:en16931:2017#conformant#urn:zugferd.de:2p0:extended"); + //somehow the XML parser seems to insert erreneous XML namespaces, depending on which one it is, saxon seems to be cleaner. //nevertheless, remove them manually res=res.replace("", ""); diff --git a/src/test/resources/migration/reference/ZUGFeRD2-invoice-adjusted.xml b/src/test/resources/migration/reference/ZUGFeRD2-invoice-adjusted.xml index bb9ba7a4..d0c2bf92 100644 --- a/src/test/resources/migration/reference/ZUGFeRD2-invoice-adjusted.xml +++ b/src/test/resources/migration/reference/ZUGFeRD2-invoice-adjusted.xml @@ -25,7 +25,7 @@ Migrated by Mustangproject XSLT false - urn:ferd:CrossIndustryDocument:invoice:1p0:extended + urn:cen.eu:en16931:2017#conformant#urn:zugferd.de:2p0:extended diff --git a/src/test/resources/migration/reference/ZUGFeRD2-invoice.xml b/src/test/resources/migration/reference/ZUGFeRD2-invoice.xml index cbaf1829..9502a57d 100644 --- a/src/test/resources/migration/reference/ZUGFeRD2-invoice.xml +++ b/src/test/resources/migration/reference/ZUGFeRD2-invoice.xml @@ -25,7 +25,7 @@ false - urn:ferd:CrossIndustryDocument:invoice:1p0:extended + urn:cen.eu:en16931:2017#conformant#urn:zugferd.de:2p0:extended diff --git a/src/test/resources/migration/reference/ZUGFeRD2_COMFORT_Einfach.xml b/src/test/resources/migration/reference/ZUGFeRD2_COMFORT_Einfach.xml index 250b7565..86566c1b 100644 --- a/src/test/resources/migration/reference/ZUGFeRD2_COMFORT_Einfach.xml +++ b/src/test/resources/migration/reference/ZUGFeRD2_COMFORT_Einfach.xml @@ -55,7 +55,7 @@ Migrated by Mustangproject XSLT - urn:ferd:CrossIndustryDocument:invoice:1p0:comfort + urn:cen.eu:en16931:2017 diff --git a/src/test/resources/migration/reference/ZUGFeRD2_EXTENDED_Warenrechnung.xml b/src/test/resources/migration/reference/ZUGFeRD2_EXTENDED_Warenrechnung.xml index 44468bdd..ad6d4ca5 100644 --- a/src/test/resources/migration/reference/ZUGFeRD2_EXTENDED_Warenrechnung.xml +++ b/src/test/resources/migration/reference/ZUGFeRD2_EXTENDED_Warenrechnung.xml @@ -55,7 +55,7 @@ Migrated by Mustangproject XSLT - urn:ferd:CrossIndustryDocument:invoice:1p0:extended + urn:cen.eu:en16931:2017#conformant#urn:zugferd.de:2p0:extended