Added Extended-CTC-FR to profiles for commandline
This commit is contained in:
@@ -70,7 +70,7 @@ public class Main {
|
|||||||
+ " [--version <1|2>]: set ZUGFeRD version\n"
|
+ " [--version <1|2>]: set ZUGFeRD version\n"
|
||||||
+ " [--profile <...>]: set ZUGFeRD profile\n"
|
+ " [--profile <...>]: set ZUGFeRD profile\n"
|
||||||
+ " For ZUGFeRD v1 or Order-X: <B>ASIC, <C>OMFORT or EX<T>ENDED\n"
|
+ " For ZUGFeRD v1 or Order-X: <B>ASIC, <C>OMFORT or EX<T>ENDED\n"
|
||||||
+ " For ZUGFeRD v2: <M>INIMUM, BASIC <W>L, <B>ASIC, <C>IUS, <E>N16931, <X>Rechnung, EX<T>ENDED\n"
|
+ " For ZUGFeRD v2: <M>INIMUM, BASIC <W>L, <B>ASIC, <C>IUS, <E>N16931, <X>Rechnung, EXTENDED-CTC-[F]R, EX<T>ENDED\n"
|
||||||
+ " [--attachments <filenames>]: list of file attachments (passing a single empty file name prevents prompting)\n"
|
+ " [--attachments <filenames>]: list of file attachments (passing a single empty file name prevents prompting)\n"
|
||||||
+ " [--no-additional-attachments]: prevent prompting for attachments\n"
|
+ " [--no-additional-attachments]: prevent prompting for attachments\n"
|
||||||
+ " --action ubl convert UN/CEFACT 2016b CII XML to UBL XML\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);
|
zfConformanceLevelProfile = Profiles.getByName(standard, "CIUS", zfIntVersion);
|
||||||
} else if (zfProfile.equals("e")) {
|
} else if (zfProfile.equals("e")) {
|
||||||
zfConformanceLevelProfile = Profiles.getByName(standard, "EN16931", zfIntVersion);
|
zfConformanceLevelProfile = Profiles.getByName(standard, "EN16931", zfIntVersion);
|
||||||
|
} else if (zfProfile.equals("f")) {
|
||||||
|
zfConformanceLevelProfile = Profiles.getByName(standard, "EXTENDED-CTC-FR", zfIntVersion);
|
||||||
} else if (zfProfile.equals("t")) {
|
} else if (zfProfile.equals("t")) {
|
||||||
zfConformanceLevelProfile = Profiles.getByName(standard, "EXTENDED", zfIntVersion);
|
zfConformanceLevelProfile = Profiles.getByName(standard, "EXTENDED", zfIntVersion);
|
||||||
} else if (zfProfile.equals("x")) {
|
} else if (zfProfile.equals("x")) {
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ public class Profiles {
|
|||||||
{"BASICWL", new Profile("BASICWL", "urn:factur-x.eu:1p0:basicwl")},
|
{"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")},
|
{"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")},
|
{"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")},
|
{"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
|
{"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
|
||||||
|
|
||||||
|
|||||||
@@ -393,7 +393,7 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase {
|
|||||||
|
|
||||||
int version=-1;
|
int version=-1;
|
||||||
try {
|
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();
|
version=zii.getVersion();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
hasExceptions = true;
|
hasExceptions = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user