diff --git a/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java b/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java index c3d71165..a9b26b21 100755 --- a/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java +++ b/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java @@ -70,7 +70,7 @@ public class Main { + " [--version <1|2>]: set ZUGFeRD version\n" + " [--profile <...>]: set ZUGFeRD profile\n" + " For ZUGFeRD v1 or Order-X: ASIC, OMFORT or EXENDED\n" - + " For ZUGFeRD v2: INIMUM, BASIC L, ASIC, IUS, N16931, Rechnung, EXENDED\n" + + " For ZUGFeRD v2: INIMUM, BASIC L, ASIC, IUS, N16931, Rechnung, EXTENDED-CTC-[F]R, EXENDED\n" + " [--attachments ]: list of file attachments (passing a single empty file name prevents prompting)\n" + " [--no-additional-attachments]: prevent prompting for attachments\n" + " --action ubl convert UN/CEFACT 2016b CII XML to UBL XML\n" @@ -730,6 +730,8 @@ public class Main { zfConformanceLevelProfile = Profiles.getByName(standard, "CIUS", zfIntVersion); } else if (zfProfile.equals("e")) { zfConformanceLevelProfile = Profiles.getByName(standard, "EN16931", zfIntVersion); + } else if (zfProfile.equals("f")) { + zfConformanceLevelProfile = Profiles.getByName(standard, "EXTENDED-CTC-FR", zfIntVersion); } else if (zfProfile.equals("t")) { zfConformanceLevelProfile = Profiles.getByName(standard, "EXTENDED", zfIntVersion); } else if (zfProfile.equals("x")) { diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/Profiles.java b/library/src/main/java/org/mustangproject/ZUGFeRD/Profiles.java index 3d73e7ac..9adae572 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/Profiles.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/Profiles.java @@ -32,6 +32,7 @@ public class Profiles { {"BASICWL", new Profile("BASICWL", "urn:factur-x.eu:1p0:basicwl")}, {"BASIC", new Profile("BASIC", "urn:cen.eu:en16931:2017#compliant#urn:factur-x.eu:1p0:basic")}, {"EN16931", new Profile("EN16931", "urn:cen.eu:en16931:2017")}, + {"EXTENDED-CTC-FR", new Profile("EXTENDED-CTC-FR", "urn:cen.eu:en16931:2017#conformant#urn.cpro.gouv.fr:1p0:extended-ctc-fr")}, {"EXTENDED", new Profile("EXTENDED", "urn:cen.eu:en16931:2017#conformant#urn:factur-x.eu:1p0:extended")}, {"XRECHNUNG", new Profile("XRECHNUNG", "urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_3.0")} // up next: urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_3.0 diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java index 7e692c15..b2c1b56e 100644 --- a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java +++ b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java @@ -393,7 +393,7 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase { int version=-1; try { - zii.fromXML(new String(Files.readAllBytes(Paths.get("./target/testout-XR-Edge.xml")), StandardCharsets.UTF_8)); + zii.fromXML(new String(Files.readAllBytes(Paths.get("C:\\Users\\jstaerk\\workspace\\XMLExamples\\zfdiverses\\20260423\\EXTENDED_Fremdwaehrung_wdis_fx.pdf")), StandardCharsets.UTF_8)); version=zii.getVersion(); } catch (IOException e) { hasExceptions = true;