Merge branch 'master' into issues/764

# Conflicts: # library/src/main/java/org/mustangproject/Charge.java # library/src/main/java/org/mustangproject/Item.java # library/src/main/java/org/mustangproject/ZUGFeRD/LineCalculator.java
2025-05-20 08:29:53 +02:00
parent 6f1f3fa2d2 6059f489ef
commit a65289ae3a
71 changed files with 26484 additions and 31011 deletions
--- a/History.md
+++ b/History.md
@@ -1,18 +1,33 @@
- #722
- #774
- #742/#753
- #778
- #759
- #614, #770
- #728
- #776
- #741
- #782
- #772
- #775
- #802
- #809
- #812
+- #819
+- #458
+- #788
+- #790
+- upgrade from PDFBOX 3.0.2 to 3.0.5 
+- #817
+- #811
+- #833
+- #835
+- #816
+
+2.16.4
+=======
+2025-04-19
+- #722 extend ValidationLogVisualizer to not use only file system
+- #774 disable XML parsing entities
+- #742/#753 "Adresszusatz 1" (LineTwo) showing up as "Postfach" in HTML visualization
+- #778 Added XEE Protection features (that were missing according to Stackoverflow)
+- #759 Use the dedicated class instead of var type
+- #614, #770 Exemption reason text should not be reused
+- #728 Invoice setCorrection causes duplicate XML output
+- #776 Fix potential resource leaks in core file processing classes
+- #741 read position accountingReference
+- #782/771 prevent NullPointerException on Product Description
+- #772 TradeParty Name should be optional for ShipToTradeParty
+- #775 not deleted tmp files
+- #802 fix: capital letter for ID in listID
+- #809 invoice reader to support multiple charges per item
+- #812 fileattachment relation should have a default
+- #818 need exceptions from files validated with validateExpectValid


 2.16.3
--- a/Mustang-CLI/pom.xml
+++ b/Mustang-CLI/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>org.mustangproject</groupId>
        <artifactId>core</artifactId>
-        <version>2.16.4-SNAPSHOT</version>
+        <version>2.17.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.mustangproject</groupId>
@@ -12,7 +12,7 @@
        should also work for XRechnung/CII.
    </name>
    <packaging>jar</packaging>
-    <version>2.16.4-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <maven.compiler.compilerVersion>11</maven.compiler.compilerVersion>
@@ -23,7 +23,7 @@
        <dependency>
            <groupId>org.mustangproject</groupId>
            <artifactId>validator</artifactId>
-            <version>2.16.4-SNAPSHOT</version>
+            <version>2.17.0-SNAPSHOT</version>
            <!-- prototypes of new mustangproject versions can be installed by referring to them and installed to the local repo from a jar file with
           mvn install:install-file -Dfile=mustang-1.5.4-SNAPSHOT.jar -DgroupId=org.mustangproject.ZUGFeRD -DartifactId=mustang -Dversion=1.5.4 -Dpackaging=jar -DgeneratePom=true
           -->
--- a/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java
+++ b/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java
@@ -86,14 +86,18 @@ public class Main {
 			+ "                Additional parameters (optional - user will be prompted if not defined)\n"
 			+ "                [--source <filename>]: input PDF or XML file\n"
 			+ "                [--log-as-pdf]: save log output as pdf\n"
-			+ "        --action validateExpectInvalid  validate directory expecting negative results \n"
+			+ "        --action validateExpectInvalid  validate directory recursively expecting negative results \n"
 			+ "                [--no-notices]: refrain from reporting notices\n"
-			+ "                Additional parameters (optional - user will be prompted if not defined)\n"
+			+ "                Additional parameters (user will be prompted if not defined)\n"
 			+ "					-d, --directory to check recursively\n"
-			+ "        --action validateExpectValid  validate directory expecting positive results \n"
+			+ "                Additional parameters (optional)\n"
+			+ "					--exclude: comma-separated list of filenames to ignore\n"
+			+ "        --action validateExpectValid  validate directory recursively expecting positive results \n"
 			+ "                [--no-notices]: refrain from reporting notices\n"
-			+ "                Additional parameters (optional - user will be prompted if not defined)\n"
+			+ "                Additional parameters (user will be prompted if not defined)\n"
 			+ "					-d, --directory to check recursively \n"
+			+ "                Additional parameters (user will be prompted if not defined)\n"
+			+ "					--exclude: comma-separated list of filenames to ignore\n"
 			+ "        --action visualize  convert XML to HTML \n"
 			+ "                [--language <lang>]: set output lang (en, fr or de)\n"
 			+ "                [--source <filename>]: set input XML file\n"
@@ -347,8 +351,11 @@ public class Main {
 			Option attachmentOpt = new Option("attachments", "attachments", true, "File attachments");
 			attachmentOpt.setValueSeparator(',');
 			attachmentOpt.setArgs(Option.UNLIMITED_VALUES);
-
 			options.addOption(attachmentOpt);
+			Option excludeOpt = new Option("exclude", "exclude", true, "Files to exclude from recursive directory traversal");
+			excludeOpt.setValueSeparator(',');
+			excludeOpt.setArgs(Option.UNLIMITED_VALUES);
+			options.addOption(excludeOpt);
 			options.addOption(new Option("source", "source", true, "which source file to use"));
 			options.addOption(new Option("source-xml", "source-xml", true, "which source file to use"));
 			options.addOption(new Option("language", "language", true, "output language (en, de or fr)"));
@@ -389,6 +396,7 @@ public class Main {
 				String zugferdProfile = cmd.getOptionValue("profile");

 				String[] attachmentFilenames = cmd.hasOption("attachments") ? cmd.getOptionValues("attachments") : null;
+				String[] excludedFilenames = cmd.hasOption("exclude") ? cmd.getOptionValues("exclude") : null;


 				ArrayList<FileAttachment> attachments = new ArrayList<>();
@@ -433,9 +441,9 @@ public class Main {
 				} else if ((action != null) && (action.equals("validate"))) {
 					optionsRecognized = performValidate(sourceName, noNotices, cmd.getOptionValue("logAppend"), LogAsPDF);
 				} else if ((action != null) && (action.equals("validateExpectValid"))) {
-					optionsRecognized = performValidateExpect(true, directoryName);
+					optionsRecognized = performValidateExpect(true, directoryName, excludedFilenames);
 				} else if ((action != null) && (action.equals("validateExpectInvalid"))) {
-					optionsRecognized = performValidateExpect(false, directoryName);
+					optionsRecognized = performValidateExpect(false, directoryName, excludedFilenames);
 				}

 			} catch (UnrecognizedOptionException ex) {
@@ -487,8 +495,8 @@ public class Main {
 		return optionsRecognized;
 	}

-	private static boolean performValidateExpect(boolean valid, String dirName) {
-		ValidatorFileWalker zfWalk = new ValidatorFileWalker(valid);
+	private static boolean performValidateExpect(boolean valid, String dirName, String[] excludedFiles) {
+		ValidatorFileWalker zfWalk = new ValidatorFileWalker(valid, excludedFiles);
 		Path startingDir = Paths.get(dirName);
 		try {
 			Files.walkFileTree(startingDir, zfWalk);
--- a/Mustang-CLI/src/main/java/org/mustangproject/commandline/ValidatorFileWalker.java
+++ b/Mustang-CLI/src/main/java/org/mustangproject/commandline/ValidatorFileWalker.java
@@ -1,7 +1,6 @@
 package org.mustangproject.commandline;


-
 import java.io.IOException;
 import java.nio.file.FileSystems;
 import java.nio.file.FileVisitResult;
@@ -11,7 +10,9 @@ import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.mustangproject.validator.ZUGFeRDValidator;
@@ -23,13 +24,15 @@ public  class ValidatorFileWalker
 	private static final Logger LOGGER = LoggerFactory.getLogger(ValidatorFileWalker.class.getCanonicalName()); // log
 	protected PathMatcher matcher;
 	protected ZUGFeRDValidator zul;
-	protected int fileCount=1;
-	protected boolean expectValid=true;
-	protected boolean allValid=true;
+	protected int fileCount = 1;
+	protected boolean expectValid = true;
+	protected boolean allValid = true;
+	protected String[] excludedFiles = {};

-	public ValidatorFileWalker(boolean expectValid) {
+	public ValidatorFileWalker(boolean expectValid, String[] excludedFiles) {
 		this.zul = new ZUGFeRDValidator();
-		this.expectValid=expectValid;
+		this.expectValid = expectValid;
+		this.excludedFiles = excludedFiles;
 		matcher = FileSystems.getDefault().getPathMatcher("glob:*.{pdf,xml}");

 	}
@@ -37,6 +40,7 @@ public  class ValidatorFileWalker
 	public boolean getResult() {
 		return allValid;
 	}
+
 	// Print information about
 	// each type of file.
 	@Override
@@ -45,24 +49,27 @@ public  class ValidatorFileWalker
 		DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		//get current date time with Date()
 		Date date = new Date();
-        String expectedString="valid";
+		String expectedString = "valid";
 		if (!expectValid) {
-          expectedString="invalid";
+			expectedString = "invalid";
 		}
-        if ((attr!=null)&&(attr.isRegularFile())) {
+		if ((attr != null) && (attr.isRegularFile())) {
 			if (matcher.matches(file.getFileName())) {
-        		String thisResultString="  valid";
+				// I could have extended the path matcher but an exclusion list is quite simple
+				if ((excludedFiles == null) || (!Arrays.asList(excludedFiles).contains(file.getFileName().toString()))) {
+
+					String thisResultString = "  valid";
 					try {
 						assertThat(zul.validate(file.toAbsolutePath().toString())).valueByXPath("/validation/summary/@status")
 							.asString()
 							.isEqualTo(expectedString);

 					} catch (AssertionError ae) {
-    					thisResultString="invalid";
-    					allValid=false;
+						thisResultString = "invalid";
+						allValid = false;
+					}
+					LOGGER.info(String.format("\n@%s Testing file %d: %s (%s) ", dateFormat.format(date), fileCount++, thisResultString, file));
 				}
-    				LOGGER.info(String.format("\n@%s Testing file %d: %s (%s)", dateFormat.format(date), fileCount++, thisResultString, file));
-    
 			}
 		}
 		return FileVisitResult.CONTINUE;
@@ -72,7 +79,7 @@ public  class ValidatorFileWalker
 	@Override
 	public FileVisitResult postVisitDirectory(Path dir,
 											  IOException exc) {
-        LOGGER.info("\nDirectory: %s%n", dir);
+		LOGGER.info(String.format("\nDirectory: %s \n", dir));
 		return FileVisitResult.CONTINUE;
 	}

@@ -84,7 +91,7 @@ public  class ValidatorFileWalker
 	@Override
 	public FileVisitResult visitFileFailed(Path file,
 										   IOException exc) {
-        LOGGER.error(exc.getMessage(),exc);
+		LOGGER.error(exc.getMessage(), exc);
 		return FileVisitResult.CONTINUE;
 	}
 }
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -3,13 +3,13 @@
    <parent>
        <groupId>org.mustangproject</groupId>
        <artifactId>core</artifactId>
-        <version>2.16.4-SNAPSHOT</version>
+        <version>2.17.0-SNAPSHOT</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <groupId>org.mustangproject</groupId>
    <artifactId>library</artifactId>
-    <version>2.16.4-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
    <packaging>jar</packaging>
    <name>Library to write, read and validate e-invoices (Factur-X, ZUGFeRD, Order-X, XRechnung/CII)</name>
    <description>FOSS Java library to read, write and validate european electronic invoices and orders in the UN/CEFACT
@@ -110,12 +110,12 @@
        <dependency>
            <groupId>org.apache.pdfbox</groupId>
            <artifactId>preflight</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.5</version>
        </dependency>
        <dependency>
            <groupId>org.apache.pdfbox</groupId>
            <artifactId>pdfbox</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.5</version>
        </dependency>
 		<!-- DOM4j -->
        <dependency>
--- a/library/src/main/java/org/mustangproject/Invoice.java
+++ b/library/src/main/java/org/mustangproject/Invoice.java
@@ -56,7 +56,7 @@ public class Invoice implements IExportableTransaction {

 	protected ArrayList<IZUGFeRDAllowanceCharge> Allowances = new ArrayList<>(),
 		Charges = new ArrayList<>(), LogisticsServiceCharges = new ArrayList<>();
-	protected IZUGFeRDPaymentTerms paymentTerms = null;
+	protected ArrayList<IZUGFeRDPaymentTerms> paymentTerms = new ArrayList<>();

 	protected String invoiceReferencedDocumentID = null;
 	protected Date invoiceReferencedIssueDate;
@@ -646,15 +646,43 @@ public class Invoice implements IExportableTransaction {

 	@Override
 	public IZUGFeRDPaymentTerms getPaymentTerms() {
-		return paymentTerms;
+		if (!paymentTerms.isEmpty()) {
+			return paymentTerms.get(0);
+		}
+		return null;
 	}

-	public Invoice setPaymentTerms(IZUGFeRDPaymentTerms paymentTerms) {
-		this.paymentTerms = paymentTerms;
+	public Invoice setPaymentTerms(IZUGFeRDPaymentTerms paymentTerm) {
+		if (paymentTerms.isEmpty()) {
+			paymentTerms.add(paymentTerm);
+		}
+		else {
+			paymentTerms.set(0, paymentTerm);
+		}
 		return this;
 	}

 	@Override
+	public IZUGFeRDPaymentTerms[] getExtendedPaymentTerms() {
+		return paymentTerms.toArray(new IZUGFeRDPaymentTerms[0]);
+	}
+
+	public Invoice setExtendedPaymentTerms(IZUGFeRDPaymentTerms[] paymentTerms) {
+		this.paymentTerms.clear();
+		this.paymentTerms.addAll(Arrays.asList(paymentTerms));
+		return this;
+	}
+
+	/**
+	 * Set multiple payment terms when using the EXTENDED profile.
+	 * @return
+	 */
+	public Invoice addPaymentTerms(IZUGFeRDPaymentTerms paymentTerm) {
+		paymentTerms.add(paymentTerm);
+		return this;
+	}
+
+
 	public String getPaymentReference() {
 		return paymentReference;
 	}
--- a/library/src/main/java/org/mustangproject/Item.java
+++ b/library/src/main/java/org/mustangproject/Item.java
@@ -173,6 +173,7 @@ public class Item implements IZUGFeRDExportableItem {
 			icnm.getAsNodeMap("ApplicableTradeTax")
 				.flatMap(cnm -> cnm.getAsString("ExemptionReason"))
 				.ifPresent(product::setTaxExemptionReason);
+
 			icnm.getAllNodes("SpecifiedTradeAllowanceCharge").map(NodeMap::new).forEach(stac -> {
 				stac.getAsNodeMap("ChargeIndicator").ifPresent(ci -> {
 					String isChargeString = ci.getAsString("Indicator").get();
@@ -210,7 +211,6 @@ public class Item implements IZUGFeRDExportableItem {
 				});

 			});
-
 			if (recalcPrice && !BigDecimal.ZERO.equals(quantity)) {
 				icnm.getAsNodeMap("SpecifiedTradeSettlementLineMonetarySummation")
 					.flatMap(cnm -> cnm.getAsBigDecimal("LineTotalAmount"))
@@ -228,6 +228,36 @@ public class Item implements IZUGFeRDExportableItem {
 			});
 		});

+		itemMap.getAllNodes("AllowanceCharge").map(NodeMap::new).forEach(stac -> { //UBL
+
+			String isChargeString = stac.getAsString("ChargeIndicator").get();
+			String percentString = stac.getAsStringOrNull("MultiplierFactorNumeric");
+			String amountString = stac.getAsStringOrNull("Amount");
+			String reason = stac.getAsStringOrNull("AllowanceChargeReason");
+			Charge izac = new Charge();
+			if (isChargeString.equalsIgnoreCase("false")) {
+				izac = new Allowance();
+			} else {
+				izac = new Charge();
+			}
+			if (amountString != null) {
+				izac.setTotalAmount(new BigDecimal(amountString));
+			}
+			if (percentString != null) {
+				izac.setPercent(new BigDecimal(percentString));
+			}
+			if (reason != null) {
+				izac.setReason(reason);
+			}
+
+			if (isChargeString.equalsIgnoreCase("false")) {
+				addAllowance(izac);
+			} else {
+				addCharge(izac);
+			}
+
+		});
+
 		itemMap.getAsNodeMap("AssociatedDocumentLineDocument").ifPresent(adld -> {
 			List<IncludedNote> includedNotes = new ArrayList<>();
 			adld.getAllNodes("IncludedNote").forEach(item -> {
--- a/library/src/main/java/org/mustangproject/LegalOrganisation.java
+++ b/library/src/main/java/org/mustangproject/LegalOrganisation.java
@@ -29,7 +29,7 @@ public class LegalOrganisation implements IZUGFeRDLegalOrganisation {

 	public LegalOrganisation(SchemedID schemedID, String tradingBusinessName) {
 		this.schemedID = schemedID;
-		this.tradingBusinessName=tradingBusinessName;
+		this.tradingBusinessName = tradingBusinessName;
 	}

 	/***
@@ -54,7 +54,7 @@ public class LegalOrganisation implements IZUGFeRDLegalOrganisation {
 							this.setSchemedID(gid);
 						}
 					}
-					if (currentItemNode.getLocalName().equals("TradingBusinessName")) {
+					if ((currentItemNode.getLocalName().equals("TradingBusinessName")) && (currentItemNode.getFirstChild() != null)) {
 						setTradingBusinessName(currentItemNode.getFirstChild().getNodeValue());
 					}
 				}
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/IExportableTransaction.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/IExportableTransaction.java
@@ -305,8 +305,7 @@ public interface IExportableTransaction {
 	}

 	/**
-	 * get payment terms. if set, getPaymentTermDescription() and getDueDate() are
-	 * ignored
+	 * get payment terms. if set, getPaymentTermDescription() and getDueDate() are ignored
 	 *
 	 * @return the IZUGFeRDPaymentTerms of the invoice
 	 */
@@ -318,6 +317,14 @@ public interface IExportableTransaction {
 		return null;
 	}

+	/**
+	 * Get payment terms for the EXTENDED profile (multiple terms are allowed)
+	 * @return
+	 */
+	default IZUGFeRDPaymentTerms[] getExtendedPaymentTerms() {
+		return new IZUGFeRDPaymentTerms[0];
+	}
+
 	/**
 	 * returns if a rebate agreements exists
 	 *
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/LineCalculator.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/LineCalculator.java
@@ -56,7 +56,6 @@ public class LineCalculator {
 		}
 		BigDecimal multiplicator = vatPercent.divide(BigDecimal.valueOf(100));

-
 		BigDecimal quantity=BigDecimal.ZERO;
 		if ((currentItem!=null)&&(currentItem.getQuantity()!=null)) {
 			quantity=currentItem.getQuantity();
@@ -72,8 +71,8 @@ public class LineCalculator {
 		BigDecimal basisQuantity = currentItem.getBasisQuantity().compareTo(BigDecimal.ZERO) == 0
 			? BigDecimal.ONE.setScale(4)
 			: currentItem.getBasisQuantity();
-		itemTotalNetAmount = quantity.multiply(currentItem.getPrice()).divide(basisQuantity, 18, RoundingMode.HALF_UP)
-			.subtract(allowanceItemTotal).subtract(allowance).add(charge).setScale(2, RoundingMode.HALF_UP);
+		itemTotalNetAmount = quantity.multiply(price).divide(basisQuantity, 18, RoundingMode.HALF_UP)
+				.subtract(allowanceItemTotal).setScale(2, RoundingMode.HALF_UP);
 		itemTotalVATAmount = itemTotalNetAmount.multiply(multiplicator);
 	}

--- a/library/src/main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java
@@ -506,15 +506,21 @@ public class OXPullProvider extends ZUGFeRD2PullProvider {

 	private String buildPaymentTermsXml() {

-		final IZUGFeRDPaymentTerms paymentTerms = trans.getPaymentTerms();
-		if (paymentTerms == null) {
+		final IZUGFeRDPaymentTerms[] paymentTerms = trans.getExtendedPaymentTerms();
+
+		String paymentTermsXml = "";
+		if (paymentTerms == null || paymentTerms.length == 0) {
 			return "";
 		}
-		String paymentTermsXml = "<ram:SpecifiedTradePaymentTerms>";

-		final IZUGFeRDPaymentDiscountTerms discountTerms = paymentTerms.getDiscountTerms();
-		paymentTermsXml += "<ram:Description>" + paymentTerms.getDescription() + "</ram:Description>";
-		if (discountTerms != null) {
+		for (IZUGFeRDPaymentTerms pt : paymentTerms)
+		{
+			paymentTermsXml += "<ram:SpecifiedTradePaymentTerms>";
+
+			final IZUGFeRDPaymentDiscountTerms discountTerms = pt.getDiscountTerms();
+			paymentTermsXml += "<ram:Description>" + pt.getDescription() + "</ram:Description>";
+			if (discountTerms != null)
+			{
 				paymentTermsXml += "<ram:ApplicableTradePaymentDiscountTerms>";
 				final String currency = trans.getCurrency();
 				final String basisAmount = currencyFormat(calc.getGrandTotal());
@@ -522,7 +528,8 @@ public class OXPullProvider extends ZUGFeRD2PullProvider {
 				paymentTermsXml += "<ram:CalculationPercent>" + discountTerms.getCalculationPercentage().toString()
 					+ "</ram:CalculationPercent>";

-			if (discountTerms.getBaseDate() != null) {
+				if (discountTerms.getBaseDate() != null)
+				{
 					final Date baseDate = discountTerms.getBaseDate();
 					paymentTermsXml += "<ram:BasisDateTime>";
 					paymentTermsXml += DATE.udtFormat(baseDate);
@@ -536,6 +543,7 @@ public class OXPullProvider extends ZUGFeRD2PullProvider {
 			}

 			paymentTermsXml += "</ram:SpecifiedTradePaymentTerms>";
+		}
 		return paymentTermsXml;
 	}

--- a/library/src/main/java/org/mustangproject/ZUGFeRD/TransactionCalculator.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/TransactionCalculator.java
@@ -7,6 +7,7 @@ import java.math.RoundingMode;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

@@ -65,6 +66,24 @@ public class TransactionCalculator implements IAbsoluteValueProvider {
 		return sumAllowanceCharge(percent, charges);
 	}

+
+	/**
+	 * Returns information about every tax that is involved in the current transaction.
+	 *
+	 * @return transaction taxes.
+	 */
+	public Set<VATAmount> getTaxDetails() {
+		return getVATPercentAmountMap().entrySet().stream()
+			.map(entry ->
+				new VATAmount(
+					entry.getValue().getBasis(),
+					entry.getValue().getCalculated(),
+					entry.getValue().getCategoryCode()
+				).setCalculated(entry.getKey())
+			)
+			.collect(Collectors.toSet());
+	}
+
 	private BigDecimal sumAllowanceCharge(BigDecimal percent, IZUGFeRDAllowanceCharge[] charges) {
 		BigDecimal res = BigDecimal.ZERO;
 		if ((charges != null) && (charges.length > 0)) {
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java
@@ -433,23 +433,34 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider {
 	}

 	private String buildPaymentTermsXml() {
-		String paymentTermsXml = "<ram:SpecifiedTradePaymentTerms>";
+		final IZUGFeRDPaymentTerms[] paymentTerms = trans.getExtendedPaymentTerms();

-		final IZUGFeRDPaymentTerms paymentTerms = trans.getPaymentTerms();
-		final IZUGFeRDPaymentDiscountTerms discountTerms = paymentTerms.getDiscountTerms();
-		final Date dueDate = paymentTerms.getDueDate();
-		if (dueDate != null && discountTerms != null && discountTerms.getBaseDate() != null) {
+		String paymentTermsXml = "";
+		if (paymentTerms == null || paymentTerms.length == 0) {
+			return paymentTermsXml;
+		}
+
+		for (IZUGFeRDPaymentTerms pt : paymentTerms)
+		{
+			paymentTermsXml += "<ram:SpecifiedTradePaymentTerms>";
+
+			final IZUGFeRDPaymentDiscountTerms discountTerms = pt.getDiscountTerms();
+			final Date dueDate = pt.getDueDate();
+			if (dueDate != null && discountTerms != null && discountTerms.getBaseDate() != null)
+			{
 				throw new IllegalStateException(
 					"if paymentTerms.dueDate is specified, paymentTerms.discountTerms.baseDate has not to be specified");
 			}
-		paymentTermsXml += "<ram:Description>" + paymentTerms.getDescription() + "</ram:Description>";
-		if (dueDate != null) {
+			paymentTermsXml += "<ram:Description>" + pt.getDescription() + "</ram:Description>";
+			if (dueDate != null)
+			{
 				paymentTermsXml += "<ram:DueDateDateTime>";
 				paymentTermsXml += DATE.udtFormat(dueDate);
 				paymentTermsXml += "</ram:DueDateDateTime>";
 			}

-		if (discountTerms != null) {
+			if (discountTerms != null)
+			{
 				paymentTermsXml += "<ram:ApplicableTradePaymentDiscountTerms>";
 				final String currency = trans.getCurrency();
 				final String basisAmount = currencyFormat(calc.getGrandTotal());
@@ -457,7 +468,8 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider {
 				paymentTermsXml += "<ram:CalculationPercent>" + discountTerms.getCalculationPercentage().toString()
 					+ "</ram:CalculationPercent>";

-			if (discountTerms.getBaseDate() != null) {
+				if (discountTerms.getBaseDate() != null)
+				{
 					final Date baseDate = discountTerms.getBaseDate();
 					paymentTermsXml += "<ram:BasisDateTime>";
 					paymentTermsXml += DATE.udtFormat(baseDate);
@@ -471,6 +483,7 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider {
 			}

 			paymentTermsXml += "</ram:SpecifiedTradePaymentTerms>";
+		}
 		return paymentTermsXml;
 	}

--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
@@ -969,35 +969,53 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 	}

 	private String buildPaymentTermsXml() {
-		final IZUGFeRDPaymentTerms paymentTerms = trans.getPaymentTerms();
-		if (paymentTerms == null) {
+
+		ArrayList<IZUGFeRDPaymentTerms> paymentTerms = new ArrayList<IZUGFeRDPaymentTerms>(Arrays.asList(trans.getExtendedPaymentTerms()));
+
+		IZUGFeRDPaymentTerms izpt= trans.getPaymentTerms();
+		if (izpt!=null) {
+			paymentTerms.add(izpt);
+		}
+
+		String paymentTermsXml = "";
+		if (paymentTerms.size() == 0) {
 			return "";
 		}
-		String paymentTermsXml = "<ram:SpecifiedTradePaymentTerms>";

-		final IZUGFeRDPaymentDiscountTerms discountTerms = paymentTerms.getDiscountTerms();
-		final Date dueDate = paymentTerms.getDueDate();
-		if (dueDate != null && discountTerms != null && discountTerms.getBaseDate() != null) {
+		for (IZUGFeRDPaymentTerms pt : paymentTerms)
+		{
+
+			paymentTermsXml += "<ram:SpecifiedTradePaymentTerms>";
+
+			final IZUGFeRDPaymentDiscountTerms discountTerms = pt.getDiscountTerms();
+			final Date dueDate = pt.getDueDate();
+			if (dueDate != null && discountTerms != null && discountTerms.getBaseDate() != null)
+			{
 				throw new IllegalStateException(
 					"if paymentTerms.dueDate is specified, paymentTerms.discountTerms.baseDate has not to be specified");
 			}
-		paymentTermsXml += "<ram:Description>" + paymentTerms.getDescription() + "</ram:Description>";
+			paymentTermsXml += "<ram:Description>" + pt.getDescription() + "</ram:Description>";

-		if (dueDate != null) {
+			if (dueDate != null)
+			{
 				paymentTermsXml += "<ram:DueDateDateTime>";
 				paymentTermsXml += DATE.udtFormat(dueDate);
 				paymentTermsXml += "</ram:DueDateDateTime>";
 			}

-		if (trans.getTradeSettlement() != null) {
-			for (final IZUGFeRDTradeSettlement payment : trans.getTradeSettlement()) {
-				if ((payment != null) && (payment instanceof IZUGFeRDTradeSettlementDebit)) {
+			if (trans.getTradeSettlement() != null)
+			{
+				for (final IZUGFeRDTradeSettlement payment : trans.getTradeSettlement())
+				{
+					if ((payment != null) && (payment instanceof IZUGFeRDTradeSettlementDebit))
+					{
 						paymentTermsXml += payment.getPaymentXML();
 					}
 				}
 			}

-		if (discountTerms != null) {
+			if (discountTerms != null)
+			{
 				paymentTermsXml += "<ram:ApplicableTradePaymentDiscountTerms>";
 				final String currency = trans.getCurrency();
 				final String basisAmount = currencyFormat(calc.getGrandTotal());
@@ -1005,7 +1023,8 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 				paymentTermsXml += "<ram:CalculationPercent>" + discountTerms.getCalculationPercentage().toString()
 					+ "</ram:CalculationPercent>";

-			if (discountTerms.getBaseDate() != null) {
+				if (discountTerms.getBaseDate() != null)
+				{
 					final Date baseDate = discountTerms.getBaseDate();
 					paymentTermsXml += "<ram:BasisDateTime>";
 					paymentTermsXml += DATE.udtFormat(baseDate);
@@ -1019,6 +1038,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 			}

 			paymentTermsXml += "</ram:SpecifiedTradePaymentTerms>";
+		}
 		return paymentTermsXml;
 	}

--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java
@@ -527,7 +527,7 @@ public class ZUGFeRDImporter extends ZUGFeRDInvoiceImporter {

 		try {
 			if (getVersion() == 1) {
-				nl = getNodeListByPath("//*[localname() = 'CrossIndustryDocument']//*[local-name() = 'SpecifiedSupplyChainTradeTransaction']/*[local-name() = 'ApplicableSupplyChainTradeAgreement']//*[local-name() = 'BuyerTradeParty']//*[local-name() = 'PostalTradeAddress']");
+				nl = getNodeListByPath("//*[local-name() = 'CrossIndustryDocument']//*[local-name() = 'SpecifiedSupplyChainTradeTransaction']/*[local-name() = 'ApplicableSupplyChainTradeAgreement']//*[local-name() = 'BuyerTradeParty']//*[local-name() = 'PostalTradeAddress']");
 			} else {
 				nl = getNodeListByPath("//*[local-name() = 'CrossIndustryInvoice']//*[local-name() = 'SupplyChainTradeTransaction']//*[local-name() = 'ApplicableHeaderTradeAgreement']//*[local-name() = 'BuyerTradeParty']//*[local-name() = 'PostalTradeAddress']");
 			}
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
@@ -450,7 +450,7 @@ public class ZUGFeRDInvoiceImporter {
 		xpr = xpath.compile("//*[local-name()=\"ExchangedDocument\"]|//*[local-name()=\"HeaderExchangedDocument\"]");
 		NodeList ExchangedDocumentNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
 		
-		xpr = xpath.compile("//*[local-name()=\"GrandTotalAmount\"]|//*[local-name()=\"PayableAmount\"]");
+		xpr = xpath.compile("//*[local-name()=\"GrandTotalAmount\"]|//*[local-name()=\"TaxInclusiveAmount\"]");
 		BigDecimal expectedGrandTotal = null;
 		NodeList totalNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
 		if (totalNodes.getLength() > 0) {
--- a/library/src/test/java/org/mustangproject/ZUGFeRD/CalculationTest.java
+++ b/library/src/test/java/org/mustangproject/ZUGFeRD/CalculationTest.java
@@ -82,8 +82,9 @@ public class CalculationTest extends ResourceCase {
 	@Test
 	public void testLineCalculatorForeignCurrencyExample() {

-
+/*
 		File inputCII = getResourceAsFile("Extended_fremdwaehrung.xml");
+inputCII=new File("C:\\Users\\jstaerk\\workspace\\XMLExamples\\zfdiverses\\20250407\\fremdwaehrung.xml");
 		ZUGFeRDInvoiceImporter zii=new ZUGFeRDInvoiceImporter();
 		Invoice invoice=null;
 		zii.doIgnoreCalculationErrors();
@@ -103,9 +104,9 @@ public class CalculationTest extends ResourceCase {

 		final TransactionCalculator calculator = new TransactionCalculator(invoice);

-		assertEquals(valueOf(521.91).stripTrailingZeros(), calculator.getDuePayable().stripTrailingZeros());
-
+		assertEquals(valueOf(521.91).stripTrailingZeros(), calculator.getGrandTotal().stripTrailingZeros());

+ */
 	}


--- a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2EdgeTest.java
+++ b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2EdgeTest.java
@@ -240,13 +240,11 @@ public class ZF2EdgeTest extends MustangReaderTestCase {
 			e.printStackTrace();

 		}
-		return
-				new PaymentTerms(
+		return new PaymentTerms(
 				"14 Tage 2% Skonto, 30 Tage rein netto",
 				due,// fälligkeitsdatum
 				paymentDiscountTerms //PaymentDiscountTerms
 			);
-
 	}

 	@Override
--- a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java
+++ b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java
@@ -431,7 +431,9 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase {
 			CalculatedInvoice i = new CalculatedInvoice();
 			zii.extractInto(i);
 			assertEquals("TOSL108", i.getNumber());
-			assertEquals("729", i.getGrandTotal().toString());
+			assertEquals("1729", i.getGrandTotal().toString());
+			assertEquals("729", i.getDuePayable().toString());
+

 		} catch (IOException e) {
 			fail("IOException not expected");
@@ -501,6 +503,24 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase {
 	}


+	@Test
+	public void testImportPrepaidUBL() throws XPathExpressionException, ParseException {
+		InputStream inputStream = this.getClass()
+			.getResourceAsStream("/ubl/XRECHNUNG_teilrechnung.ubl.xml");
+		ZUGFeRDInvoiceImporter importer = new ZUGFeRDInvoiceImporter();
+		importer.doIgnoreCalculationErrors();
+		importer.setInputStream(inputStream);
+
+		CalculatedInvoice invoice = new CalculatedInvoice();
+		importer.extractInto(invoice);
+
+		assertEquals(0, invoice.getGrandTotal().compareTo(new BigDecimal("529.87")));
+		assertEquals(0, invoice.getLineTotalAmount().compareTo(new BigDecimal("473")));
+		assertEquals(0, invoice.getTotalPrepaidAmount().compareTo(new BigDecimal("500")));
+		assertEquals(0, invoice.getDuePayable().compareTo(new BigDecimal("29.87")));
+	}
+
+
 	@Test
 	public void testImportIncludedNotes() throws XPathExpressionException, ParseException {
 		InputStream inputStream = this.getClass()
--- a/library/src/test/resources/ubl/XRECHNUNG_teilrechnung.ubl.xml
+++ b/library/src/test/resources/ubl/XRECHNUNG_teilrechnung.ubl.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Invoice xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cec="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
+  <cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>471102</cbc:ID>
+  <cbc:IssueDate>2024-11-15</cbc:IssueDate>
+  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+  <cbc:Note>Rechnung gemäß Bestellung vom 01.11.2024.</cbc:Note>
+  <cbc:Note>#REG#Lieferant GmbH				
+Lieferantenstraße 20				
+80333 München				
+Deutschland				
+Geschäftsführer: Hans Muster
+Handelsregisternummer: H A 123
+      </cbc:Note>
+  <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+  <cbc:BuyerReference>04011000-12345-34</cbc:BuyerReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="EM">info@Mustermann.de</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="0088">4000001123452</cbc:ID>
+      </cac:PartyIdentification>
+      <cac:PostalAddress>
+        <cbc:StreetName>Lieferantenstraße 20</cbc:StreetName>
+        <cbc:CityName>München</cbc:CityName>
+        <cbc:PostalZone>80333</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>DE</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>201/113/40209</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>FC</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>DE123456789</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>Lieferant GmbH</cbc:RegistrationName>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>Max Mustermann</cbc:Name>
+        <cbc:Telephone>+49891234567</cbc:Telephone>
+        <cbc:ElectronicMail>Max@Mustermann.de</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="EM">info@kunde.de</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID>GE2020211</cbc:ID>
+      </cac:PartyIdentification>
+      <cac:PostalAddress>
+        <cbc:StreetName>Kundenstraße 15</cbc:StreetName>
+        <cbc:CityName>Frankfurt</cbc:CityName>
+        <cbc:PostalZone>69876</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>DE</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>Kunden AG Mitte</cbc:RegistrationName>
+      </cac:PartyLegalEntity>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cbc:ActualDeliveryDate>2024-11-14</cbc:ActualDeliveryDate>
+  </cac:Delivery>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="Zahlung per SEPA Überweisung.">58</cbc:PaymentMeansCode>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>DE02120300000000202051</cbc:ID>
+      <cbc:Name>Kunden AG</cbc:Name>
+      <cac:FinancialInstitutionBranch>
+        <cbc:ID>BYLADEM1001</cbc:ID>
+      </cac:FinancialInstitutionBranch>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:PaymentTerms>
+    <cbc:Note>Zahlbar innerhalb 30 Tagen netto bis 15.12.2024, 3% Skonto innerhalb 10 Tagen bis 25.11.2024</cbc:Note>
+  </cac:PaymentTerms>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="EUR">56.87</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="EUR">275</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="EUR">19.25</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>7</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="EUR">198</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="EUR">37.62</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>19</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="EUR">473</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="EUR">473</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="EUR">529.87</cbc:TaxInclusiveAmount>
+    <cbc:AllowanceTotalAmount currencyID="EUR">0</cbc:AllowanceTotalAmount>
+    <cbc:ChargeTotalAmount currencyID="EUR">0</cbc:ChargeTotalAmount>
+    <cbc:PrepaidAmount currencyID="EUR">500</cbc:PrepaidAmount>
+    <cbc:PayableAmount currencyID="EUR">29.87</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="H87">20</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">198</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Name>Trennblätter A4</cbc:Name>
+      <cac:SellersItemIdentification>
+        <cbc:ID>TB100A4</cbc:ID>
+      </cac:SellersItemIdentification>
+      <cac:StandardItemIdentification>
+        <cbc:ID schemeID="0160">4012345001235</cbc:ID>
+      </cac:StandardItemIdentification>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>19</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="EUR">9.9</cbc:PriceAmount>
+      <cac:AllowanceCharge>
+        <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+        <cbc:Amount currencyID="EUR">0</cbc:Amount>
+        <cbc:BaseAmount currencyID="EUR">9.9</cbc:BaseAmount>
+      </cac:AllowanceCharge>
+    </cac:Price>
+  </cac:InvoiceLine>
+  <cac:InvoiceLine>
+    <cbc:ID>2</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="H87">50</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">275</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Name>Joghurt Banane</cbc:Name>
+      <cac:SellersItemIdentification>
+        <cbc:ID>ARNR2</cbc:ID>
+      </cac:SellersItemIdentification>
+      <cac:StandardItemIdentification>
+        <cbc:ID schemeID="0160">4000050986428</cbc:ID>
+      </cac:StandardItemIdentification>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>7</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="EUR">5.5</cbc:PriceAmount>
+      <cac:AllowanceCharge>
+        <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+        <cbc:Amount currencyID="EUR">0</cbc:Amount>
+        <cbc:BaseAmount currencyID="EUR">5.5</cbc:BaseAmount>
+      </cac:AllowanceCharge>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.mustangproject</groupId>
    <artifactId>core</artifactId>
-    <version>2.16.4-SNAPSHOT</version>    <packaging>pom</packaging>
+    <version>2.17.0-SNAPSHOT</version>    <packaging>pom</packaging>
    <name>Mustang</name>

    <modules>
--- a/validator/pom.xml
+++ b/validator/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>org.mustangproject</groupId>
        <artifactId>core</artifactId>
-        <version>2.16.4-SNAPSHOT</version>
+        <version>2.17.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.mustangproject</groupId>
@@ -11,7 +11,7 @@
    <name>Library to validate e-invoices (ZUGFeRD, Factur-X and Xrechnung)</name>

    <packaging>jar</packaging>
-    <version>2.16.4-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
    <repositories>
        <repository>
            <!-- for jargs -->
@@ -38,7 +38,7 @@
        <dependency>
            <groupId>${project.groupId}</groupId>
            <artifactId>library</artifactId>
-            <version>2.16.4-SNAPSHOT</version>
+            <version>2.17.0-SNAPSHOT</version>
        </dependency>
 		<dependency>
 			<groupId>org.dom4j</groupId>
@@ -59,7 +59,7 @@
 		<dependency>
 			<groupId>org.apache.pdfbox</groupId>
 			<artifactId>pdfbox</artifactId>
-			<version>3.0.2</version>
+			<version>3.0.5</version>
 		</dependency>
        <dependency>
            <groupId>jakarta.xml.bind</groupId>
@@ -230,10 +230,10 @@
                        </goals>

                        <configuration>
-                            <outputDirectory>src/main/resources/xslt/ZF_232/</outputDirectory>
+                            <outputDirectory>src/main/resources/xslt/ZF_233/</outputDirectory>
                            <resources>
                                <resource>
-                                    <directory>${basedir}/src/main/resources/schematron/ZF_232/</directory>
+                                    <directory>${basedir}/src/main/resources/schematron/ZF_233/</directory>
                                    <includes>
                                        <include>**/*.xml</include>
                                    </includes>
--- a/validator/src/main/java/org/mustangproject/validator/PDFValidator.java
+++ b/validator/src/main/java/org/mustangproject/validator/PDFValidator.java
@@ -268,6 +268,7 @@ public class PDFValidator extends Validator {
 		final byte[] ghostscriptSignature = "%%Invocation:".getBytes(StandardCharsets.UTF_8);
 		final byte[] cibpdfbrewerSignature = "CIB pdf brewer".getBytes(StandardCharsets.UTF_8);
 		final byte[] lexofficeSignature = "lexoffice".getBytes(StandardCharsets.UTF_8);		
+		final byte[] s2IndustriesSignature = "s2industries.ZUGFeRD.PDF".getBytes(StandardCharsets.UTF_8); // https://github.com/stephanstapel/ZUGFeRD-csharp

 		if (ByteArraySearcher.contains(fileContents, symtraxSignature)) {
 			Signature = "Symtrax";
@@ -287,6 +288,8 @@ public class PDFValidator extends Validator {
 			Signature = "CIB pdf brewer";
 		} else if (ByteArraySearcher.contains(fileContents, lexofficeSignature)) {
 			Signature = "Lexware office";
+		} else if (ByteArraySearcher.contains(fileContents, s2IndustriesSignature)) {
+			Signature = "ZUGFeRD.PDF-csharp";
 		}

 		context.setSignature(Signature);
--- a/validator/src/main/java/org/mustangproject/validator/XMLValidator.java
+++ b/validator/src/main/java/org/mustangproject/validator/XMLValidator.java
@@ -205,7 +205,7 @@ public class XMLValidator extends Validator {
 				boolean isEN16931 = false;
 				boolean isExtended = false;
 				boolean isXRechnung = false;
-				String currentZFVersionDir = "ZF_232";
+				String currentZFVersionDir = "ZF_233";
 				int mainSchematronSectionErrorTypeCode = 4;
 				String xsltFilename = null;
 				// urn:ferd:CrossIndustryDocument:invoice:1p0:extended,
@@ -374,12 +374,14 @@ public class XMLValidator extends Validator {

 				}

-				if (context.getFormat().equals("CII")) {
+				if (context.getFormat().equals("CII") && (context.getGeneration().equals("2"))) {

-					if (context.getGeneration().equals("2")
-						&& (isBasic || isEN16931 || isXRechnung)) {
-						//additionally validate against CEN
+					if (isXRechnung) {
+						//additionally validate against CEN, the CEN rules are part of the ZF Schematron anyway
 						validateSchematron(zfXML, "/xslt/en16931schematron/EN16931-CII-validation.xslt", 24, ESeverity.error);
+					}
+					if (isXRechnung || isBasic || isEN16931) {
+						//potentially (basic or EN) or definitely validate against XR
 						if (!disableNotices || XrechnungSeverity != ESeverity.notice) {
 							validateXR(zfXML, XrechnungSeverity);
 						}
--- a/validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL.xsd
+++ b/validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL.xsd
--- a/validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_codedb.xml
+++ b/validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_codedb.xml
--- a/validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
+++ b/validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
--- a/validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
+++ b/validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
@@ -5,8 +5,8 @@
    xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"
    targetNamespace="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
    elementFormDefault="qualified">
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="Factur-X_1.07.2_BASICWL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="Factur-X_1.07.2_BASICWL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
  <xs:complexType name="CreditorFinancialAccountType">
    <xs:sequence>
      <xs:element name="IBANID" type="udt:IDType" minOccurs="0"/>
--- a/validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
+++ b/validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
--- a/validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC.xsd
+++ b/validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC.xsd
--- a/validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_codedb.xml
+++ b/validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_codedb.xml
--- a/validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
+++ b/validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
--- a/validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
+++ b/validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
@@ -5,8 +5,8 @@
    xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"
    targetNamespace="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
    elementFormDefault="qualified">
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="Factur-X_1.07.2_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="Factur-X_1.07.2_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
  <xs:complexType name="CreditorFinancialAccountType">
    <xs:sequence>
      <xs:element name="IBANID" type="udt:IDType" minOccurs="0"/>
--- a/validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
+++ b/validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
--- a/validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931.xsd
+++ b/validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931.xsd
--- a/validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_codedb.xml
+++ b/validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_codedb.xml
--- a/validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
+++ b/validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
--- a/validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
+++ b/validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
@@ -5,8 +5,8 @@
    xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"
    targetNamespace="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
    elementFormDefault="qualified">
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="Factur-X_1.07.2_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="Factur-X_1.07.2_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
  <xs:complexType name="CreditorFinancialAccountType">
    <xs:sequence>
      <xs:element name="IBANID" type="udt:IDType" minOccurs="0"/>
--- a/validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
+++ b/validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
--- a/validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED.xsd
+++ b/validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED.xsd
--- a/validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_codedb.xml
+++ b/validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_codedb.xml
--- a/validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
+++ b/validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
--- a/validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
+++ b/validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
@@ -5,8 +5,8 @@
    xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"
    targetNamespace="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
    elementFormDefault="qualified">
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="Factur-X_1.07.2_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="Factur-X_1.07.2_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
  <xs:complexType name="AdvancePaymentType">
    <xs:sequence>
      <xs:element name="PaidAmount" type="udt:AmountType"/>
--- a/validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
+++ b/validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
--- a/validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM.xsd
+++ b/validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM.xsd
--- a/validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_codedb.xml
+++ b/validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_codedb.xml
@@ -0,0 +1,917 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<codedb>
+  <cl id="1">
+    <enumeration value="urn:factur-x.eu:1p0:minimum"/>
+    <enumeration value="urn:zugferd.de:2p0:minimum"/>
+  </cl>
+  <cl id="2">
+    <enumeration value="71"/>
+    <enumeration value="80"/>
+    <enumeration value="81"/>
+    <enumeration value="82"/>
+    <enumeration value="83"/>
+    <enumeration value="84"/>
+    <enumeration value="102"/>
+    <enumeration value="130"/>
+    <enumeration value="202"/>
+    <enumeration value="203"/>
+    <enumeration value="204"/>
+    <enumeration value="211"/>
+    <enumeration value="218"/>
+    <enumeration value="219"/>
+    <enumeration value="261"/>
+    <enumeration value="262"/>
+    <enumeration value="295"/>
+    <enumeration value="296"/>
+    <enumeration value="308"/>
+    <enumeration value="325"/>
+    <enumeration value="326"/>
+    <enumeration value="331"/>
+    <enumeration value="380"/>
+    <enumeration value="381"/>
+    <enumeration value="382"/>
+    <enumeration value="383"/>
+    <enumeration value="384"/>
+    <enumeration value="385"/>
+    <enumeration value="386"/>
+    <enumeration value="387"/>
+    <enumeration value="388"/>
+    <enumeration value="389"/>
+    <enumeration value="390"/>
+    <enumeration value="393"/>
+    <enumeration value="394"/>
+    <enumeration value="395"/>
+    <enumeration value="396"/>
+    <enumeration value="420"/>
+    <enumeration value="456"/>
+    <enumeration value="457"/>
+    <enumeration value="458"/>
+    <enumeration value="527"/>
+    <enumeration value="532"/>
+    <enumeration value="553"/>
+    <enumeration value="575"/>
+    <enumeration value="623"/>
+    <enumeration value="633"/>
+    <enumeration value="751"/>
+    <enumeration value="780"/>
+    <enumeration value="817"/>
+    <enumeration value="870"/>
+    <enumeration value="875"/>
+    <enumeration value="876"/>
+    <enumeration value="877"/>
+    <enumeration value="935"/>
+  </cl>
+  <cl id="3">
+    <enumeration value="102"/>
+  </cl>
+  <cl id="4">
+    <enumeration value="0002"/>
+    <enumeration value="0003"/>
+    <enumeration value="0004"/>
+    <enumeration value="0005"/>
+    <enumeration value="0006"/>
+    <enumeration value="0007"/>
+    <enumeration value="0008"/>
+    <enumeration value="0009"/>
+    <enumeration value="0010"/>
+    <enumeration value="0011"/>
+    <enumeration value="0012"/>
+    <enumeration value="0013"/>
+    <enumeration value="0014"/>
+    <enumeration value="0015"/>
+    <enumeration value="0016"/>
+    <enumeration value="0017"/>
+    <enumeration value="0018"/>
+    <enumeration value="0019"/>
+    <enumeration value="0020"/>
+    <enumeration value="0021"/>
+    <enumeration value="0022"/>
+    <enumeration value="0023"/>
+    <enumeration value="0024"/>
+    <enumeration value="0025"/>
+    <enumeration value="0026"/>
+    <enumeration value="0027"/>
+    <enumeration value="0028"/>
+    <enumeration value="0029"/>
+    <enumeration value="0030"/>
+    <enumeration value="0031"/>
+    <enumeration value="0032"/>
+    <enumeration value="0033"/>
+    <enumeration value="0034"/>
+    <enumeration value="0035"/>
+    <enumeration value="0036"/>
+    <enumeration value="0037"/>
+    <enumeration value="0038"/>
+    <enumeration value="0039"/>
+    <enumeration value="0040"/>
+    <enumeration value="0041"/>
+    <enumeration value="0042"/>
+    <enumeration value="0043"/>
+    <enumeration value="0044"/>
+    <enumeration value="0045"/>
+    <enumeration value="0046"/>
+    <enumeration value="0047"/>
+    <enumeration value="0048"/>
+    <enumeration value="0049"/>
+    <enumeration value="0050"/>
+    <enumeration value="0051"/>
+    <enumeration value="0052"/>
+    <enumeration value="0053"/>
+    <enumeration value="0054"/>
+    <enumeration value="0055"/>
+    <enumeration value="0056"/>
+    <enumeration value="0057"/>
+    <enumeration value="0058"/>
+    <enumeration value="0059"/>
+    <enumeration value="0060"/>
+    <enumeration value="0061"/>
+    <enumeration value="0062"/>
+    <enumeration value="0063"/>
+    <enumeration value="0064"/>
+    <enumeration value="0065"/>
+    <enumeration value="0066"/>
+    <enumeration value="0067"/>
+    <enumeration value="0068"/>
+    <enumeration value="0069"/>
+    <enumeration value="0070"/>
+    <enumeration value="0071"/>
+    <enumeration value="0072"/>
+    <enumeration value="0073"/>
+    <enumeration value="0074"/>
+    <enumeration value="0075"/>
+    <enumeration value="0076"/>
+    <enumeration value="0077"/>
+    <enumeration value="0078"/>
+    <enumeration value="0079"/>
+    <enumeration value="0080"/>
+    <enumeration value="0081"/>
+    <enumeration value="0082"/>
+    <enumeration value="0083"/>
+    <enumeration value="0084"/>
+    <enumeration value="0085"/>
+    <enumeration value="0086"/>
+    <enumeration value="0087"/>
+    <enumeration value="0088"/>
+    <enumeration value="0089"/>
+    <enumeration value="0090"/>
+    <enumeration value="0091"/>
+    <enumeration value="0093"/>
+    <enumeration value="0094"/>
+    <enumeration value="0095"/>
+    <enumeration value="0096"/>
+    <enumeration value="0097"/>
+    <enumeration value="0098"/>
+    <enumeration value="0099"/>
+    <enumeration value="0100"/>
+    <enumeration value="0101"/>
+    <enumeration value="0102"/>
+    <enumeration value="0104"/>
+    <enumeration value="0105"/>
+    <enumeration value="0106"/>
+    <enumeration value="0107"/>
+    <enumeration value="0108"/>
+    <enumeration value="0109"/>
+    <enumeration value="0110"/>
+    <enumeration value="0111"/>
+    <enumeration value="0112"/>
+    <enumeration value="0113"/>
+    <enumeration value="0114"/>
+    <enumeration value="0115"/>
+    <enumeration value="0116"/>
+    <enumeration value="0117"/>
+    <enumeration value="0118"/>
+    <enumeration value="0119"/>
+    <enumeration value="0120"/>
+    <enumeration value="0121"/>
+    <enumeration value="0122"/>
+    <enumeration value="0123"/>
+    <enumeration value="0124"/>
+    <enumeration value="0125"/>
+    <enumeration value="0126"/>
+    <enumeration value="0127"/>
+    <enumeration value="0128"/>
+    <enumeration value="0129"/>
+    <enumeration value="0130"/>
+    <enumeration value="0131"/>
+    <enumeration value="0132"/>
+    <enumeration value="0133"/>
+    <enumeration value="0134"/>
+    <enumeration value="0135"/>
+    <enumeration value="0136"/>
+    <enumeration value="0137"/>
+    <enumeration value="0138"/>
+    <enumeration value="0139"/>
+    <enumeration value="0140"/>
+    <enumeration value="0141"/>
+    <enumeration value="0142"/>
+    <enumeration value="0143"/>
+    <enumeration value="0144"/>
+    <enumeration value="0145"/>
+    <enumeration value="0146"/>
+    <enumeration value="0147"/>
+    <enumeration value="0148"/>
+    <enumeration value="0149"/>
+    <enumeration value="0150"/>
+    <enumeration value="0151"/>
+    <enumeration value="0152"/>
+    <enumeration value="0153"/>
+    <enumeration value="0154"/>
+    <enumeration value="0155"/>
+    <enumeration value="0156"/>
+    <enumeration value="0157"/>
+    <enumeration value="0158"/>
+    <enumeration value="0159"/>
+    <enumeration value="0160"/>
+    <enumeration value="0161"/>
+    <enumeration value="0162"/>
+    <enumeration value="0163"/>
+    <enumeration value="0164"/>
+    <enumeration value="0165"/>
+    <enumeration value="0166"/>
+    <enumeration value="0167"/>
+    <enumeration value="0168"/>
+    <enumeration value="0169"/>
+    <enumeration value="0170"/>
+    <enumeration value="0171"/>
+    <enumeration value="0172"/>
+    <enumeration value="0173"/>
+    <enumeration value="0174"/>
+    <enumeration value="0175"/>
+    <enumeration value="0176"/>
+    <enumeration value="0177"/>
+    <enumeration value="0178"/>
+    <enumeration value="0179"/>
+    <enumeration value="0180"/>
+    <enumeration value="0183"/>
+    <enumeration value="0184"/>
+    <enumeration value="0185"/>
+    <enumeration value="0186"/>
+    <enumeration value="0187"/>
+    <enumeration value="0188"/>
+    <enumeration value="0189"/>
+    <enumeration value="0190"/>
+    <enumeration value="0191"/>
+    <enumeration value="0192"/>
+    <enumeration value="0193"/>
+    <enumeration value="0194"/>
+    <enumeration value="0195"/>
+    <enumeration value="0196"/>
+    <enumeration value="0197"/>
+    <enumeration value="0198"/>
+    <enumeration value="0199"/>
+    <enumeration value="0200"/>
+    <enumeration value="0201"/>
+    <enumeration value="0202"/>
+    <enumeration value="0203"/>
+    <enumeration value="0204"/>
+    <enumeration value="0205"/>
+    <enumeration value="0206"/>
+    <enumeration value="0207"/>
+    <enumeration value="0208"/>
+    <enumeration value="0209"/>
+    <enumeration value="0210"/>
+    <enumeration value="0211"/>
+    <enumeration value="0212"/>
+    <enumeration value="0213"/>
+    <enumeration value="0214"/>
+    <enumeration value="0215"/>
+    <enumeration value="0216"/>
+    <enumeration value="0217"/>
+    <enumeration value="0218"/>
+    <enumeration value="0219"/>
+    <enumeration value="0220"/>
+    <enumeration value="0221"/>
+    <enumeration value="0222"/>
+    <enumeration value="0223"/>
+    <enumeration value="0224"/>
+    <enumeration value="0225"/>
+    <enumeration value="0226"/>
+    <enumeration value="0227"/>
+    <enumeration value="0228"/>
+    <enumeration value="0229"/>
+    <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
+    <enumeration value="0239"/>
+    <enumeration value="0240"/>
+  </cl>
+  <cl id="5">
+    <enumeration value="AD"/>
+    <enumeration value="AE"/>
+    <enumeration value="AF"/>
+    <enumeration value="AG"/>
+    <enumeration value="AI"/>
+    <enumeration value="AL"/>
+    <enumeration value="AM"/>
+    <enumeration value="AO"/>
+    <enumeration value="AQ"/>
+    <enumeration value="AR"/>
+    <enumeration value="AS"/>
+    <enumeration value="AT"/>
+    <enumeration value="AU"/>
+    <enumeration value="AW"/>
+    <enumeration value="AX"/>
+    <enumeration value="AZ"/>
+    <enumeration value="BA"/>
+    <enumeration value="BB"/>
+    <enumeration value="BD"/>
+    <enumeration value="BE"/>
+    <enumeration value="BF"/>
+    <enumeration value="BG"/>
+    <enumeration value="BH"/>
+    <enumeration value="BI"/>
+    <enumeration value="BJ"/>
+    <enumeration value="BL"/>
+    <enumeration value="BM"/>
+    <enumeration value="BN"/>
+    <enumeration value="BO"/>
+    <enumeration value="BQ"/>
+    <enumeration value="BR"/>
+    <enumeration value="BS"/>
+    <enumeration value="BT"/>
+    <enumeration value="BV"/>
+    <enumeration value="BW"/>
+    <enumeration value="BY"/>
+    <enumeration value="BZ"/>
+    <enumeration value="CA"/>
+    <enumeration value="CC"/>
+    <enumeration value="CD"/>
+    <enumeration value="CF"/>
+    <enumeration value="CG"/>
+    <enumeration value="CH"/>
+    <enumeration value="CI"/>
+    <enumeration value="CK"/>
+    <enumeration value="CL"/>
+    <enumeration value="CM"/>
+    <enumeration value="CN"/>
+    <enumeration value="CO"/>
+    <enumeration value="CR"/>
+    <enumeration value="CU"/>
+    <enumeration value="CV"/>
+    <enumeration value="CW"/>
+    <enumeration value="CX"/>
+    <enumeration value="CY"/>
+    <enumeration value="CZ"/>
+    <enumeration value="DE"/>
+    <enumeration value="DJ"/>
+    <enumeration value="DK"/>
+    <enumeration value="DM"/>
+    <enumeration value="DO"/>
+    <enumeration value="DZ"/>
+    <enumeration value="EC"/>
+    <enumeration value="EE"/>
+    <enumeration value="EG"/>
+    <enumeration value="EH"/>
+    <enumeration value="ER"/>
+    <enumeration value="ES"/>
+    <enumeration value="ET"/>
+    <enumeration value="FI"/>
+    <enumeration value="FJ"/>
+    <enumeration value="FK"/>
+    <enumeration value="FM"/>
+    <enumeration value="FO"/>
+    <enumeration value="FR"/>
+    <enumeration value="GA"/>
+    <enumeration value="GB"/>
+    <enumeration value="GD"/>
+    <enumeration value="GE"/>
+    <enumeration value="GF"/>
+    <enumeration value="GG"/>
+    <enumeration value="GH"/>
+    <enumeration value="GI"/>
+    <enumeration value="GL"/>
+    <enumeration value="GM"/>
+    <enumeration value="GN"/>
+    <enumeration value="GP"/>
+    <enumeration value="GQ"/>
+    <enumeration value="GR"/>
+    <enumeration value="GS"/>
+    <enumeration value="GT"/>
+    <enumeration value="GU"/>
+    <enumeration value="GW"/>
+    <enumeration value="GY"/>
+    <enumeration value="HK"/>
+    <enumeration value="HM"/>
+    <enumeration value="HN"/>
+    <enumeration value="HR"/>
+    <enumeration value="HT"/>
+    <enumeration value="HU"/>
+    <enumeration value="ID"/>
+    <enumeration value="IE"/>
+    <enumeration value="IL"/>
+    <enumeration value="IM"/>
+    <enumeration value="IN"/>
+    <enumeration value="IO"/>
+    <enumeration value="IQ"/>
+    <enumeration value="IR"/>
+    <enumeration value="IS"/>
+    <enumeration value="IT"/>
+    <enumeration value="JE"/>
+    <enumeration value="JM"/>
+    <enumeration value="JO"/>
+    <enumeration value="JP"/>
+    <enumeration value="KE"/>
+    <enumeration value="KG"/>
+    <enumeration value="KH"/>
+    <enumeration value="KI"/>
+    <enumeration value="KM"/>
+    <enumeration value="KN"/>
+    <enumeration value="KP"/>
+    <enumeration value="KR"/>
+    <enumeration value="KW"/>
+    <enumeration value="KY"/>
+    <enumeration value="KZ"/>
+    <enumeration value="LA"/>
+    <enumeration value="LB"/>
+    <enumeration value="LC"/>
+    <enumeration value="LI"/>
+    <enumeration value="LK"/>
+    <enumeration value="LR"/>
+    <enumeration value="LS"/>
+    <enumeration value="LT"/>
+    <enumeration value="LU"/>
+    <enumeration value="LV"/>
+    <enumeration value="LY"/>
+    <enumeration value="MA"/>
+    <enumeration value="MC"/>
+    <enumeration value="MD"/>
+    <enumeration value="ME"/>
+    <enumeration value="MF"/>
+    <enumeration value="MG"/>
+    <enumeration value="MH"/>
+    <enumeration value="MK"/>
+    <enumeration value="ML"/>
+    <enumeration value="MM"/>
+    <enumeration value="MN"/>
+    <enumeration value="MO"/>
+    <enumeration value="MP"/>
+    <enumeration value="MQ"/>
+    <enumeration value="MR"/>
+    <enumeration value="MS"/>
+    <enumeration value="MT"/>
+    <enumeration value="MU"/>
+    <enumeration value="MV"/>
+    <enumeration value="MW"/>
+    <enumeration value="MX"/>
+    <enumeration value="MY"/>
+    <enumeration value="MZ"/>
+    <enumeration value="NA"/>
+    <enumeration value="NC"/>
+    <enumeration value="NE"/>
+    <enumeration value="NF"/>
+    <enumeration value="NG"/>
+    <enumeration value="NI"/>
+    <enumeration value="NL"/>
+    <enumeration value="NO"/>
+    <enumeration value="NP"/>
+    <enumeration value="NR"/>
+    <enumeration value="NU"/>
+    <enumeration value="NZ"/>
+    <enumeration value="OM"/>
+    <enumeration value="PA"/>
+    <enumeration value="PE"/>
+    <enumeration value="PF"/>
+    <enumeration value="PG"/>
+    <enumeration value="PH"/>
+    <enumeration value="PK"/>
+    <enumeration value="PL"/>
+    <enumeration value="PM"/>
+    <enumeration value="PN"/>
+    <enumeration value="PR"/>
+    <enumeration value="PS"/>
+    <enumeration value="PT"/>
+    <enumeration value="PW"/>
+    <enumeration value="PY"/>
+    <enumeration value="QA"/>
+    <enumeration value="RE"/>
+    <enumeration value="RO"/>
+    <enumeration value="RS"/>
+    <enumeration value="RU"/>
+    <enumeration value="RW"/>
+    <enumeration value="SA"/>
+    <enumeration value="SB"/>
+    <enumeration value="SC"/>
+    <enumeration value="SD"/>
+    <enumeration value="SE"/>
+    <enumeration value="SG"/>
+    <enumeration value="SH"/>
+    <enumeration value="SI"/>
+    <enumeration value="SJ"/>
+    <enumeration value="SK"/>
+    <enumeration value="SL"/>
+    <enumeration value="SM"/>
+    <enumeration value="SN"/>
+    <enumeration value="SO"/>
+    <enumeration value="SR"/>
+    <enumeration value="SS"/>
+    <enumeration value="ST"/>
+    <enumeration value="SV"/>
+    <enumeration value="SX"/>
+    <enumeration value="SY"/>
+    <enumeration value="SZ"/>
+    <enumeration value="TC"/>
+    <enumeration value="TD"/>
+    <enumeration value="TF"/>
+    <enumeration value="TG"/>
+    <enumeration value="TH"/>
+    <enumeration value="TJ"/>
+    <enumeration value="TK"/>
+    <enumeration value="TL"/>
+    <enumeration value="TM"/>
+    <enumeration value="TN"/>
+    <enumeration value="TO"/>
+    <enumeration value="TR"/>
+    <enumeration value="TT"/>
+    <enumeration value="TV"/>
+    <enumeration value="TW"/>
+    <enumeration value="TZ"/>
+    <enumeration value="UA"/>
+    <enumeration value="UG"/>
+    <enumeration value="UM"/>
+    <enumeration value="US"/>
+    <enumeration value="UY"/>
+    <enumeration value="UZ"/>
+    <enumeration value="VA"/>
+    <enumeration value="VC"/>
+    <enumeration value="VE"/>
+    <enumeration value="VG"/>
+    <enumeration value="VI"/>
+    <enumeration value="VN"/>
+    <enumeration value="VU"/>
+    <enumeration value="WF"/>
+    <enumeration value="WS"/>
+    <enumeration value="YE"/>
+    <enumeration value="YT"/>
+    <enumeration value="ZA"/>
+    <enumeration value="ZM"/>
+    <enumeration value="ZW"/>
+    <enumeration value="1A"/>
+    <enumeration value="XI"/>
+  </cl>
+  <cl id="6">
+    <enumeration value="AED"/>
+    <enumeration value="AFN"/>
+    <enumeration value="ALL"/>
+    <enumeration value="AMD"/>
+    <enumeration value="ANG"/>
+    <enumeration value="AOA"/>
+    <enumeration value="ARS"/>
+    <enumeration value="AUD"/>
+    <enumeration value="AWG"/>
+    <enumeration value="AZN"/>
+    <enumeration value="BAM"/>
+    <enumeration value="BBD"/>
+    <enumeration value="BDT"/>
+    <enumeration value="BGN"/>
+    <enumeration value="BHD"/>
+    <enumeration value="BIF"/>
+    <enumeration value="BMD"/>
+    <enumeration value="BND"/>
+    <enumeration value="BOB"/>
+    <enumeration value="BOV"/>
+    <enumeration value="BRL"/>
+    <enumeration value="BSD"/>
+    <enumeration value="BTN"/>
+    <enumeration value="BWP"/>
+    <enumeration value="BYN"/>
+    <enumeration value="BZD"/>
+    <enumeration value="CAD"/>
+    <enumeration value="CDF"/>
+    <enumeration value="CHE"/>
+    <enumeration value="CHF"/>
+    <enumeration value="CHW"/>
+    <enumeration value="CLF"/>
+    <enumeration value="CLP"/>
+    <enumeration value="CNY"/>
+    <enumeration value="COP"/>
+    <enumeration value="COU"/>
+    <enumeration value="CRC"/>
+    <enumeration value="CUP"/>
+    <enumeration value="CVE"/>
+    <enumeration value="CZK"/>
+    <enumeration value="DJF"/>
+    <enumeration value="DKK"/>
+    <enumeration value="DOP"/>
+    <enumeration value="DZD"/>
+    <enumeration value="EGP"/>
+    <enumeration value="ERN"/>
+    <enumeration value="ETB"/>
+    <enumeration value="EUR"/>
+    <enumeration value="FJD"/>
+    <enumeration value="FKP"/>
+    <enumeration value="GBP"/>
+    <enumeration value="GEL"/>
+    <enumeration value="GHS"/>
+    <enumeration value="GIP"/>
+    <enumeration value="GMD"/>
+    <enumeration value="GNF"/>
+    <enumeration value="GTQ"/>
+    <enumeration value="GYD"/>
+    <enumeration value="HKD"/>
+    <enumeration value="HNL"/>
+    <enumeration value="HTG"/>
+    <enumeration value="HUF"/>
+    <enumeration value="IDR"/>
+    <enumeration value="ILS"/>
+    <enumeration value="INR"/>
+    <enumeration value="IQD"/>
+    <enumeration value="IRR"/>
+    <enumeration value="ISK"/>
+    <enumeration value="JMD"/>
+    <enumeration value="JOD"/>
+    <enumeration value="JPY"/>
+    <enumeration value="KES"/>
+    <enumeration value="KGS"/>
+    <enumeration value="KHR"/>
+    <enumeration value="KMF"/>
+    <enumeration value="KPW"/>
+    <enumeration value="KRW"/>
+    <enumeration value="KWD"/>
+    <enumeration value="KYD"/>
+    <enumeration value="KZT"/>
+    <enumeration value="LAK"/>
+    <enumeration value="LBP"/>
+    <enumeration value="LKR"/>
+    <enumeration value="LRD"/>
+    <enumeration value="LSL"/>
+    <enumeration value="LYD"/>
+    <enumeration value="MAD"/>
+    <enumeration value="MDL"/>
+    <enumeration value="MGA"/>
+    <enumeration value="MKD"/>
+    <enumeration value="MMK"/>
+    <enumeration value="MNT"/>
+    <enumeration value="MOP"/>
+    <enumeration value="MRU"/>
+    <enumeration value="MUR"/>
+    <enumeration value="MVR"/>
+    <enumeration value="MWK"/>
+    <enumeration value="MXN"/>
+    <enumeration value="MXV"/>
+    <enumeration value="MYR"/>
+    <enumeration value="MZN"/>
+    <enumeration value="NAD"/>
+    <enumeration value="NGN"/>
+    <enumeration value="NIO"/>
+    <enumeration value="NOK"/>
+    <enumeration value="NPR"/>
+    <enumeration value="NZD"/>
+    <enumeration value="OMR"/>
+    <enumeration value="PAB"/>
+    <enumeration value="PEN"/>
+    <enumeration value="PGK"/>
+    <enumeration value="PHP"/>
+    <enumeration value="PKR"/>
+    <enumeration value="PLN"/>
+    <enumeration value="PYG"/>
+    <enumeration value="QAR"/>
+    <enumeration value="RON"/>
+    <enumeration value="RSD"/>
+    <enumeration value="RUB"/>
+    <enumeration value="RWF"/>
+    <enumeration value="SAR"/>
+    <enumeration value="SBD"/>
+    <enumeration value="SCR"/>
+    <enumeration value="SDG"/>
+    <enumeration value="SEK"/>
+    <enumeration value="SGD"/>
+    <enumeration value="SHP"/>
+    <enumeration value="SLE"/>
+    <enumeration value="SOS"/>
+    <enumeration value="SRD"/>
+    <enumeration value="SSP"/>
+    <enumeration value="STN"/>
+    <enumeration value="SVC"/>
+    <enumeration value="SYP"/>
+    <enumeration value="SZL"/>
+    <enumeration value="THB"/>
+    <enumeration value="TJS"/>
+    <enumeration value="TMT"/>
+    <enumeration value="TND"/>
+    <enumeration value="TOP"/>
+    <enumeration value="TRY"/>
+    <enumeration value="TTD"/>
+    <enumeration value="TWD"/>
+    <enumeration value="TZS"/>
+    <enumeration value="UAH"/>
+    <enumeration value="UGX"/>
+    <enumeration value="USD"/>
+    <enumeration value="USN"/>
+    <enumeration value="UYI"/>
+    <enumeration value="UYU"/>
+    <enumeration value="UYW"/>
+    <enumeration value="UZS"/>
+    <enumeration value="VED"/>
+    <enumeration value="VES"/>
+    <enumeration value="VND"/>
+    <enumeration value="VUV"/>
+    <enumeration value="WST"/>
+    <enumeration value="XAF"/>
+    <enumeration value="XAG"/>
+    <enumeration value="XAU"/>
+    <enumeration value="XBA"/>
+    <enumeration value="XBB"/>
+    <enumeration value="XBC"/>
+    <enumeration value="XBD"/>
+    <enumeration value="XCD"/>
+    <enumeration value="XDR"/>
+    <enumeration value="XOF"/>
+    <enumeration value="XPD"/>
+    <enumeration value="XPF"/>
+    <enumeration value="XPT"/>
+    <enumeration value="XSU"/>
+    <enumeration value="XTS"/>
+    <enumeration value="XUA"/>
+    <enumeration value="XXX"/>
+    <enumeration value="YER"/>
+    <enumeration value="ZAR"/>
+    <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
+  </cl>
+  <cl id="7">
+    <enumeration value="AED"/>
+    <enumeration value="AFN"/>
+    <enumeration value="ALL"/>
+    <enumeration value="AMD"/>
+    <enumeration value="ANG"/>
+    <enumeration value="AOA"/>
+    <enumeration value="ARS"/>
+    <enumeration value="AUD"/>
+    <enumeration value="AWG"/>
+    <enumeration value="AZN"/>
+    <enumeration value="BAM"/>
+    <enumeration value="BBD"/>
+    <enumeration value="BDT"/>
+    <enumeration value="BGN"/>
+    <enumeration value="BHD"/>
+    <enumeration value="BIF"/>
+    <enumeration value="BMD"/>
+    <enumeration value="BND"/>
+    <enumeration value="BOB"/>
+    <enumeration value="BOV"/>
+    <enumeration value="BRL"/>
+    <enumeration value="BSD"/>
+    <enumeration value="BTN"/>
+    <enumeration value="BWP"/>
+    <enumeration value="BYN"/>
+    <enumeration value="BZD"/>
+    <enumeration value="CAD"/>
+    <enumeration value="CDF"/>
+    <enumeration value="CHE"/>
+    <enumeration value="CHF"/>
+    <enumeration value="CHW"/>
+    <enumeration value="CLF"/>
+    <enumeration value="CLP"/>
+    <enumeration value="CNY"/>
+    <enumeration value="COP"/>
+    <enumeration value="COU"/>
+    <enumeration value="CRC"/>
+    <enumeration value="CUP"/>
+    <enumeration value="CVE"/>
+    <enumeration value="CZK"/>
+    <enumeration value="DJF"/>
+    <enumeration value="DKK"/>
+    <enumeration value="DOP"/>
+    <enumeration value="DZD"/>
+    <enumeration value="EGP"/>
+    <enumeration value="ERN"/>
+    <enumeration value="ETB"/>
+    <enumeration value="EUR"/>
+    <enumeration value="FJD"/>
+    <enumeration value="FKP"/>
+    <enumeration value="GBP"/>
+    <enumeration value="GEL"/>
+    <enumeration value="GHS"/>
+    <enumeration value="GIP"/>
+    <enumeration value="GMD"/>
+    <enumeration value="GNF"/>
+    <enumeration value="GTQ"/>
+    <enumeration value="GYD"/>
+    <enumeration value="HKD"/>
+    <enumeration value="HNL"/>
+    <enumeration value="HTG"/>
+    <enumeration value="HUF"/>
+    <enumeration value="IDR"/>
+    <enumeration value="ILS"/>
+    <enumeration value="INR"/>
+    <enumeration value="IQD"/>
+    <enumeration value="IRR"/>
+    <enumeration value="ISK"/>
+    <enumeration value="JMD"/>
+    <enumeration value="JOD"/>
+    <enumeration value="JPY"/>
+    <enumeration value="KES"/>
+    <enumeration value="KGS"/>
+    <enumeration value="KHR"/>
+    <enumeration value="KMF"/>
+    <enumeration value="KPW"/>
+    <enumeration value="KRW"/>
+    <enumeration value="KWD"/>
+    <enumeration value="KYD"/>
+    <enumeration value="KZT"/>
+    <enumeration value="LAK"/>
+    <enumeration value="LBP"/>
+    <enumeration value="LKR"/>
+    <enumeration value="LRD"/>
+    <enumeration value="LSL"/>
+    <enumeration value="LYD"/>
+    <enumeration value="MAD"/>
+    <enumeration value="MDL"/>
+    <enumeration value="MGA"/>
+    <enumeration value="MKD"/>
+    <enumeration value="MMK"/>
+    <enumeration value="MNT"/>
+    <enumeration value="MOP"/>
+    <enumeration value="MRU"/>
+    <enumeration value="MUR"/>
+    <enumeration value="MVR"/>
+    <enumeration value="MWK"/>
+    <enumeration value="MXN"/>
+    <enumeration value="MXV"/>
+    <enumeration value="MYR"/>
+    <enumeration value="MZN"/>
+    <enumeration value="NAD"/>
+    <enumeration value="NGN"/>
+    <enumeration value="NIO"/>
+    <enumeration value="NOK"/>
+    <enumeration value="NPR"/>
+    <enumeration value="NZD"/>
+    <enumeration value="OMR"/>
+    <enumeration value="PAB"/>
+    <enumeration value="PEN"/>
+    <enumeration value="PGK"/>
+    <enumeration value="PHP"/>
+    <enumeration value="PKR"/>
+    <enumeration value="PLN"/>
+    <enumeration value="PYG"/>
+    <enumeration value="QAR"/>
+    <enumeration value="RON"/>
+    <enumeration value="RSD"/>
+    <enumeration value="RUB"/>
+    <enumeration value="RWF"/>
+    <enumeration value="SAR"/>
+    <enumeration value="SBD"/>
+    <enumeration value="SCR"/>
+    <enumeration value="SDG"/>
+    <enumeration value="SEK"/>
+    <enumeration value="SGD"/>
+    <enumeration value="SHP"/>
+    <enumeration value="SLE"/>
+    <enumeration value="SOS"/>
+    <enumeration value="SRD"/>
+    <enumeration value="SSP"/>
+    <enumeration value="STN"/>
+    <enumeration value="SVC"/>
+    <enumeration value="SYP"/>
+    <enumeration value="SZL"/>
+    <enumeration value="THB"/>
+    <enumeration value="TJS"/>
+    <enumeration value="TMT"/>
+    <enumeration value="TND"/>
+    <enumeration value="TOP"/>
+    <enumeration value="TRY"/>
+    <enumeration value="TTD"/>
+    <enumeration value="TWD"/>
+    <enumeration value="TZS"/>
+    <enumeration value="UAH"/>
+    <enumeration value="UGX"/>
+    <enumeration value="USD"/>
+    <enumeration value="USN"/>
+    <enumeration value="UYI"/>
+    <enumeration value="UYU"/>
+    <enumeration value="UYW"/>
+    <enumeration value="UZS"/>
+    <enumeration value="VED"/>
+    <enumeration value="VES"/>
+    <enumeration value="VND"/>
+    <enumeration value="VUV"/>
+    <enumeration value="WST"/>
+    <enumeration value="XAF"/>
+    <enumeration value="XAG"/>
+    <enumeration value="XAU"/>
+    <enumeration value="XBA"/>
+    <enumeration value="XBB"/>
+    <enumeration value="XBC"/>
+    <enumeration value="XBD"/>
+    <enumeration value="XCD"/>
+    <enumeration value="XDR"/>
+    <enumeration value="XOF"/>
+    <enumeration value="XPD"/>
+    <enumeration value="XPF"/>
+    <enumeration value="XPT"/>
+    <enumeration value="XSU"/>
+    <enumeration value="XTS"/>
+    <enumeration value="XUA"/>
+    <enumeration value="XXX"/>
+    <enumeration value="YER"/>
+    <enumeration value="ZAR"/>
+    <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
+  </cl>
+</codedb>
--- a/validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
+++ b/validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
--- a/validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
+++ b/validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
@@ -5,8 +5,8 @@
    xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"
    targetNamespace="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
    elementFormDefault="qualified">
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="Factur-X_1.07.2_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="Factur-X_1.07.2_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
  <xs:complexType name="DocumentContextParameterType">
    <xs:sequence>
      <xs:element name="ID" type="udt:IDType"/>
--- a/validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
+++ b/validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
--- a/validator/src/main/resources/schematron/XR_30/README.md
+++ b/validator/src/main/resources/schematron/XR_30/README.md
@@ -0,0 +1 @@
+XRechnung 3 schematrons and above are applied using their published XSLT version directly 
--- a/validator/src/main/resources/schematron/XR_30/XRechnung-CII-validation.sch
+++ b/validator/src/main/resources/schematron/XR_30/XRechnung-CII-validation.sch
@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://purl.oclc.org/dsdl/schematron"
-        xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
-        xmlns:ccts="urn:un:unece:uncefact:documentation:standard:CoreComponentsTechnicalSpecification:2"
-        xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"
-        xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:100"
-        xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-        queryBinding="xslt2"
-        xmlns:u="utils">
-  <title>Schematron Version @xr-schematron.version.full@ - XRechnung @xrechnung.version@ compatible - CII</title>
-  <ns prefix="rsm"  uri="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" />
-  <ns prefix="ccts" uri="urn:un:unece:uncefact:documentation:standard:CoreComponentsTechnicalSpecification:2" />
-  <ns prefix="udt"  uri="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" />
-  <ns prefix="qdt"  uri="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" />
-  <ns prefix="ram"  uri="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" />
-
-  <xsl:function as="xs:decimal" name="u:decimalOrZero">
-    <xsl:param name="element" />
-    <xsl:sequence select="if (boolean($element)) then xs:decimal($element) else 0" />
-  </xsl:function>
-
-  <phase id="xrechnung-model">
-    <active pattern="variable-pattern" />
-    <active pattern="cii-pattern" />
-    <active pattern="cii-extension-pattern" />
-  </phase>
-
-  <include href="../common.sch" />
-
-  <pattern id="cii-pattern">
-    <rule context="/rsm:CrossIndustryInvoice">
-
-        <!-- Only if BG-19 exists, rules BR-DE-30 and BR-DE-31 should fail on missing elements BT-90 or BT-91.
-            Because there is no specific (sub-)element for BG-19 in CII, are making use of the semantic definition that BG-19 has three mandatory elements and,
-            accordingly, either all of the three BTs must exist or none. -->
-        <let name="BT-89-path" value="rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:DirectDebitMandateID"/>
-        <let name="BT-90-path" value="rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:CreditorReferenceID"/>
-        <let name="BT-91-path" value="rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans/ram:PayerPartyDebtorFinancialAccount/ram:IBANID"/>
-        <let name="BG-19-not-existing" value="not(exists(($BT-89-path, $BT-90-path, $BT-91-path)))" />
-        <assert test="(($BT-89-path or $BT-91-path) and $BT-90-path) or $BG-19-not-existing"
-              flag="fatal"
-              id="BR-DE-30"
-        >[BR-DE-30] Wenn "DIRECT DEBIT" BG-19 vorhanden ist, dann muss "Bank assigned creditor identifier" BT-90 übermittelt werden.</assert>
-        <assert test="(($BT-89-path or $BT-90-path) and $BT-91-path) or $BG-19-not-existing"
-              flag="fatal"
-              id="BR-DE-31"
-        >[BR-DE-31] Wenn "DIRECT DEBIT" BG-19 vorhanden ist, dann muss "Debited account identifier" BT-91 übermittelt werden.</assert>
-<assert test="rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans"
-              flag="fatal"
-              id="BR-DE-1"
-          >[BR-DE-1] Eine Rechnung (INVOICE) muss Angaben zu "PAYMENT INSTRUCTIONS" (BG-16) enthalten.</assert>
-      <assert test="rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:BuyerReference[boolean(normalize-space(.))]"
-              flag="fatal"
-              id="BR-DE-15"
-          >[BR-DE-15] Das Element "Buyer reference" (BT-10) muss übermittelt werden.</assert>
-      <assert test="not((rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedLineTradeSettlement/ram:ApplicableTradeTax/ram:TypeCode = 'VAT' and
-                         rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedLineTradeSettlement/ram:ApplicableTradeTax/ram:CategoryCode = ('S', 'Z', 'E', 'AE', 'K', 'G', 'L', 'M')) or
-                        (rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge/ram:CategoryTradeTax = 'VAT' and
-                         rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge/ram:CategoryTradeTax/ram:CategoryCode = ('S', 'Z', 'E', 'AE', 'K', 'G', 'L', 'M')) or
-                        (rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedLineTradeSettlement/ram:ApplicableTradeTax/ram:TypeCode = 'VAT' and
-                         rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedLineTradeSettlement/ram:ApplicableTradeTax/ram:CategoryCode = ('S', 'Z', 'E', 'AE', 'K', 'G', 'L', 'M'))) or
-                    ((rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:SpecifiedTaxRegistration/ram:ID[normalize-space(@schemeID)='VA' or
-                                                                                                                                                  normalize-space(@schemeID)='FC'][boolean(normalize-space(.))], rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty))"
-              flag="fatal"
-              id="BR-DE-16"
-          >[BR-DE-16] Wenn in einer Rechnung die Steuercodes S, Z, E, AE, K, G, L oder M verwendet werden, muss mindestens eines der Elemente "Seller VAT identifier" (BT-31), "Seller tax registration identifier" (BT-32)
-          oder "SELLER TAX REPRESENTATIVE PARTY" (BG-11) übermittelt werden.
-      </assert>
-      <assert test="normalize-space(rsm:ExchangedDocument/ram:TypeCode) = ('326', '380', '384', '389', '381', '875', '876', '877')"
-              flag="warning"
-              id="BR-DE-17"
-          >[BR-DE-17] Mit dem Element "Invoice type code" (BT-3) sollen ausschließlich folgende Codes aus der Codeliste UNTDID 1001 übermittelt werden: 326 (Partial invoice), 380 (Commercial invoice), 384 (Corrected invoice), 389 (Self-billed invoice) und 381 (Credit note),875 (Partial construction invoice), 876 (Partial final construction invoice), 877 (Final construction invoice).</assert>
-      <assert test="every $line 
-                      in rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:Description[1]/tokenize(. , '(\r?\n)')[starts-with( normalize-space(.) , '#')] 
-                      satisfies matches ( normalize-space ($line), $XR-SKONTO-REGEX ) and
-                    matches( rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:Description[1]/tokenize(. ,  '#.+#')[last()], '^\s*\n' )"                    
-              flag="fatal"
-              id="BR-DE-18"
-          >[BR-DE-18] Skonto Zeilen in <name/> muessen diesem regulärem Ausdruck entsprechen: <value-of select="$XR-SKONTO-REGEX"/>. Die Informationen zur Gewährung von Skonto müssen wie folgt im Element "Payment terms" (BT-20) übermittelt werden: Anzugeben ist im ersten Segment "SKONTO", im zweiten "TAGE=n", im dritten "PROZENT=n". Prozentzahlen sind ohne Vorzeichen sowie mit Punkt getrennt von zwei Nachkommastellen anzugeben. Liegt dem zu berechnenden Betrag nicht BT-115, "fälliger Betrag" zugrunde, sondern nur ein Teil des fälligen Betrags der Rechnung, ist der Grundwert zur Berechnung von Skonto als viertes Segment "BASISBETRAG=n" gemäß dem semantischen Datentypen Amount anzugeben. Jeder Eintrag beginnt mit einer #, die Segmente sind mit einer # getrennt und eine Zeile schließt mit einer # ab. Am Ende einer vollständigen Skontoangabe muss ein XML-konformer Zeilenumbruch folgen. Alle Angaben zur Gewährung von Skonto müssen in Großbuchstaben gemacht werden. Zusätzliches Whitespace (Leerzeichen, Tabulatoren oder Zeilenumbrüche) ist nicht zulässig. Andere Zeichen oder Texte als in den oberen Vorgaben genannt sind nicht zulässig.</assert>
-
-      <assert test="count(//ram:AdditionalReferencedDocument) = count(//ram:AdditionalReferencedDocument[not(./ram:AttachmentBinaryObject/@filename = preceding-sibling::ram:AdditionalReferencedDocument/ram:AttachmentBinaryObject/@filename)])"
-              flag="fatal"
-              id="BR-DE-22"
-          >[BR-DE-22] Not all filename attributes of the embeddedDocumentBinaryObject elements are unique</assert>
-      <assert test="not(normalize-space(rsm:ExchangedDocument/ram:TypeCode) = '384') or
-                    (rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:InvoiceReferencedDocument)"
-              flag="warning"
-              id="BR-DE-26"
-          >[BR-DE-26] Wenn im Element Invoice type code (BT-3) der Code 384 (Corrected invoice) übergeben wird, soll PRECEDING INVOICE REFERENCE BG-3 mind. einmal vorhanden sein.</assert>
-      </rule>
-  
-    <rule context="/rsm:CrossIndustryInvoice/rsm:ExchangedDocumentContext">
-      <assert test="ram:GuidelineSpecifiedDocumentContextParameter/ram:ID = $XR-CIUS-ID or
-                    ram:GuidelineSpecifiedDocumentContextParameter/ram:ID = $XR-EXTENSION-ID"
-              flag="warning"
-              id="BR-DE-21"
-          >[BR-DE-21] Das Element "Specification identifier" (BT-24) soll syntaktisch der Kennung des Standards XRechnung entsprechen.</assert>
-    </rule>
-  
-    <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty">
-      <assert test="ram:DefinedTradeContact"
-              flag="fatal"
-              id="BR-DE-2"
-          >[BR-DE-2] Die Gruppe "SELLER CONTACT" (BG-6) muss übermittelt werden.</assert>
-    </rule>
-  
-    <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:PostalTradeAddress">
-      <assert test="ram:CityName[boolean(normalize-space(.))]"
-              flag="fatal"
-              id="BR-DE-3"
-          >[BR-DE-3] Das Element "Seller city" (BT-37) muss übermittelt werden.</assert>
-      <assert test="ram:PostcodeCode[boolean(normalize-space(.))]"
-              flag="fatal"
-              id="BR-DE-4"
-          >[BR-DE-4] Das Element "Seller post code" (BT-38) muss übermittelt werden.</assert>
-    </rule>
-  
-    <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:DefinedTradeContact">
-      <assert test="(ram:PersonName,ram:DepartmentName)[boolean(normalize-space(.))]"
-              flag="fatal"
-              id="BR-DE-5"
-          >[BR-DE-5] Das Element "Seller contact point" (BT-41) muss übermittelt werden.</assert>
-      <assert test="ram:TelephoneUniversalCommunication/ram:CompleteNumber[boolean(normalize-space(.))]"
-              flag="fatal"
-              id="BR-DE-6"
-          >[BR-DE-6] Das Element "Seller contact telephone number" (BT-42) muss übermittelt werden.</assert>
-      <assert test="ram:EmailURIUniversalCommunication/ram:URIID[boolean(normalize-space(.))]"
-              flag="fatal"
-              id="BR-DE-7"
-          >[BR-DE-7] Das Element "Seller contact email address" (BT-43) muss übermittelt werden.</assert>
-      <assert test="matches(normalize-space(ram:TelephoneUniversalCommunication/ram:CompleteNumber), $XR-TELEPHONE-REGEX)"
-        flag="warning"
-        id="BR-DE-27"
-        >[BR-DE-27] In BT-42 sollen mindestens drei Ziffern enthalten sein.</assert>
-      <assert test="matches(normalize-space(ram:EmailURIUniversalCommunication/ram:URIID), $XR-EMAIL-REGEX)"
-        flag="warning"
-        id="BR-DE-28"
-        >[BR-DE-28] In BT-43 soll genau ein @-Zeichen enthalten sein, welches nicht von einem Leerzeichen, einem Punkt, aber mindestens zwei Zeichen auf beiden Seiten flankiert werden soll. Ein Punkt sollte nicht am Anfang oder am Ende stehen.</assert>
-    </rule>
-  
-    <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:BuyerTradeParty/ram:PostalTradeAddress">
-      <assert test="ram:CityName[boolean(normalize-space(.))]"
-              flag="fatal"
-              id="BR-DE-8"
-          >[BR-DE-8] Das Element "Buyer city" (BT-52) muss übermittelt werden.</assert>
-      <assert test="ram:PostcodeCode[boolean(normalize-space(.))]"
-              flag="fatal"
-              id="BR-DE-9"
-          >[BR-DE-9] Das Element "Buyer post code" (BT-53) muss übermittelt werden.</assert>
-    </rule>
-      <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:AdditionalReferencedDocument[ram:TypeCode = '916']">
-        <assert test="not(exists(ram:URIID)) or (matches(ram:URIID, $XR-URL-REGEX))"
-            flag="warning"
-              id="BR-TMP-2">[BR-TMP-2] BT-124 "External document location" muss eine absolute URL mit gültigem Schema enthalten.</assert>
-    </rule>
-  
-    <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeDelivery/ram:ShipToTradeParty/ram:PostalTradeAddress">
-      <assert test="ram:CityName[boolean(normalize-space(.))]"
-              flag="fatal"
-              id="BR-DE-10"
-          >[BR-DE-10] Das Element "Deliver to city" (BT-77) muss übermittelt werden, wenn die Gruppe "DELIVER TO ADDRESS" (BG-15) übermittelt wird.</assert>
-      <assert test="ram:PostcodeCode[boolean(normalize-space(.))]"
-              flag="fatal"
-              id="BR-DE-11"
-          >[BR-DE-11] Das Element "Deliver to post code" (BT-78) muss übermittelt werden, wenn die Gruppe "DELIVER TO ADDRESS" (BG-15) übermittelt wird.</assert>
-    </rule>
-    
-    <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans[normalize-space(ram:TypeCode) = ('30','58')]">
-      <assert test="not(normalize-space(ram:TypeCode) = '58') or
-                    matches(normalize-space(replace(ram:PayeePartyCreditorFinancialAccount/ram:IBANID, '([ \n\r\t\s])', '')), '^[A-Z]{2}[0-9]{2}[a-zA-Z0-9]{0,30}$') and
-                    xs:integer(string-join(for $cp in string-to-codepoints(concat(substring(normalize-space(replace(ram:PayeePartyCreditorFinancialAccount/ram:IBANID, '([ \n\r\t\s])', '')),5),upper-case(substring(normalize-space(replace(ram:PayeePartyCreditorFinancialAccount/ram:IBANID, '([ \n\r\t\s])', '')),1,2)),substring(normalize-space(replace(ram:PayeePartyCreditorFinancialAccount/ram:IBANID, '([ \n\r\t\s])', '')),3,2))) return  (if($cp > 64) then string($cp - 55) else  string($cp - 48)),'')) mod 97 = 1"
-              flag="warning"
-              id="BR-DE-19"
-        >[BR-DE-19] "Payment account identifier" (BT-84) soll eine korrekte IBAN enthalten, wenn in "Payment means type code" (BT-81) mit dem Code 58 SEPA als Zahlungsmittel gefordert wird.</assert>
-      <assert test="ram:PayeePartyCreditorFinancialAccount"
-              flag="fatal"
-              id="BR-DE-23-a"
-        >[BR-DE-23-a] Wenn BT-81 "Payment means type code" einen Schlüssel für Überweisungen enthält (30, 58), muss BG-17 "CREDIT TRANSFER" übermittelt werden.</assert>
-      <assert test="not(ram:ApplicableTradeSettlementFinancialCard) and
-                    not(/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:DirectDebitMandateID or
-                        /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:CreditorReferenceID or
-                        ram:PayerPartyDebtorFinancialAccount/ram:IBANID)"
-              flag="fatal"
-              id="BR-DE-23-b"
-        >[BR-DE-23-b] Wenn BT-81 "Payment means type code" einen Schlüssel für Überweisungen enthält (30, 58), dürfen BG-18 und BG-19 nicht übermittelt werden.</assert>
-    </rule>
-  
-    <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans[normalize-space(ram:TypeCode) = ('48','54','55')]">
-      <assert test="ram:ApplicableTradeSettlementFinancialCard"
-              flag="fatal"
-              id="BR-DE-24-a"
-        >[BR-DE-24-a] Wenn BT-81 "Payment means type code" einen Schlüssel für Kartenzahlungen enthält (48, 54, 55), muss genau BG-18 "PAYMENT CARD INFORMATION" übermittelt werden.</assert>
-      <assert test="not(ram:PayeePartyCreditorFinancialAccount) and
-                    not(/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:DirectDebitMandateID or
-                        /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:CreditorReferenceID or
-                        ram:PayerPartyDebtorFinancialAccount/ram:IBANID)"
-              flag="fatal"
-              id="BR-DE-24-b"
-        >[BR-DE-24-b] Wenn BT-81 "Payment means type code" einen Schlüssel für Kartenzahlungen enthält (48, 54, 55), dürfen BG-17 und BG-19 nicht übermittelt werden.</assert>
-    </rule>
-  
-    <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans[normalize-space(ram:TypeCode) = '59']">
-      <assert test="not(normalize-space(ram:TypeCode) = '59') or
-                    matches(normalize-space(replace(ram:PayerPartyDebtorFinancialAccount/ram:IBANID, '([ \n\r\t\s])', '')), '^[A-Z]{2}[0-9]{2}[a-zA-Z0-9]{0,30}$') and
-                    xs:decimal(string-join(for $cp in string-to-codepoints(concat(substring(normalize-space(replace(ram:PayerPartyDebtorFinancialAccount/ram:IBANID, '([ \n\r\t\s])', '')),5),upper-case(substring(normalize-space(replace(ram:PayerPartyDebtorFinancialAccount/ram:IBANID, '([ \n\r\t\s])', '')),1,2)),substring(normalize-space(replace(ram:PayerPartyDebtorFinancialAccount/ram:IBANID, '([ \n\r\t\s])', '')),3,2))) return  (if($cp > 64) then string($cp - 55) else  string($cp - 48)),'')) mod 97 = 1"
-              flag="warning"
-              id="BR-DE-20"
-        >[BR-DE-20] "Debited account identifier" (BT-91) soll eine korrekte IBAN enthalten, wenn in "Payment means type code" (BT-81) mit dem Code 59 SEPA als Zahlungsmittel gefordert wird.</assert>
-      <assert test="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:DirectDebitMandateID or
-                    /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:CreditorReferenceID or
-                    ram:PayerPartyDebtorFinancialAccount/ram:IBANID"
-              flag="fatal"
-              id="BR-DE-25-a"
-        >[BR-DE-25-a] Wenn BT-81 "Payment means type code" einen Schlüssel für Lastschriften enthält (59), muss genau BG-19 "DIRECT DEBIT" übermittelt werden.</assert>        
-      <assert test="not(ram:PayeePartyCreditorFinancialAccount) and
-                    not(ram:ApplicableTradeSettlementFinancialCard)"
-              flag="fatal"
-              id="BR-DE-25-b"
-        >[BR-DE-25-b] Wenn BT-81 "Payment means type code" einen Schlüssel für Lastschriften enthält (59), dürfen BG-17 und BG-18 nicht übermittelt werden.</assert>        
-    </rule>
-    
-    <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:ApplicableTradeTax">
-      <assert test="ram:RateApplicablePercent[boolean(normalize-space(.))]"
-              flag="fatal"
-              id="BR-DE-14"
-          >[BR-DE-14] Das Element "VAT category rate" (BT-119) muss übermittelt werden.</assert>
-    </rule>
-  </pattern>
-  <pattern id="cii-extension-pattern">
-    <!-- robust version of testing extension https://stackoverflow.com/questions/3206975/xpath-selecting-elements-that-equal-a-value  -->
-    <let name="isExtension"
-        value="exists(/rsm:CrossIndustryInvoice/rsm:ExchangedDocumentContext/ram:GuidelineSpecifiedDocumentContextParameter/ram:ID[text() = concat( 'urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_', $XR-MAJOR-MINOR-VERSION ,'#conformant#urn:xeinkauf.de:kosit:extension:xrechnung_', $XR-MAJOR-MINOR-VERSION) ] )" />
-    
-      <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:AssociatedDocumentLineDocument[$isExtension]">
-          <assert test="not(exists(//ram:ParentLineID))"
-              flag="warning"
-              id="BR-DEX-15">
-              [BR-DEX-15] This CII file might use the concept of Sub Invoice Lines. However XRechnung does not support this.
-          </assert>
-      </rule>
-      <rule context="//ram:GlobalID[@schemeID and $isExtension][not(ancestor::ram:SpecifiedTradeProduct) and not(ancestor::ram:ShipToTradeParty)]">
-        <!-- BR-DEX-04
-    Überschreibt BR-CL-10 und ergänzt um XR01, XR02, XR03
-      -->
-          <assert test="((not(contains(normalize-space(@schemeID), ' ')) and contains($ISO-6523-ICD-EXT-CODES, concat(' ', normalize-space(@schemeID), ' '))))"
-            flag="fatal"
-            id="BR-DEX-04"
-              >[BR-DEX-04] Any scheme identifier in <name/> MUST be coded using one of the ISO 6523 ICD list. </assert>
-      </rule>
-      <rule context="ram:ID[@schemeID and $isExtension][not(ancestor::ram:SpecifiedTaxRegistration)]">
-        <!-- BR-DEX-05
-    Überschreibt BR-CL-11 und ergänzt um XR01, XR02, XR03
-      -->
-          <assert test="((not(contains(normalize-space(@schemeID), ' ')) and contains($ISO-6523-ICD-EXT-CODES, concat(' ', normalize-space(@schemeID), ' '))))"
-            flag="fatal"
-            id="BR-DEX-05"
-              >[BR-DEX-05] Any scheme identifier in <name/> MUST be coded using one of the ISO 6523 ICD list. </assert>
-      </rule>
-      <rule context="ram:SpecifiedTradeProduct/ram:GlobalID[@schemeID and $isExtension]">
-        <!-- BR-DEX-06
-    Überschreibt BR-CL-21 und ergänzt um XR01, XR02, XR03
-      -->
-          <assert test="((not(contains(normalize-space(@schemeID), ' ')) and contains($ISO-6523-ICD-EXT-CODES, concat(' ', normalize-space(@schemeID), ' '))))"
-            flag="fatal"
-            id="BR-DEX-06"
-              >[BR-DEX-06] Any scheme identifier in <name/> MUST be coded using one of the ISO 6523 ICD list. </assert>
-      </rule>    
-      <rule context="ram:URIUniversalCommunication/ram:URIID[@schemeID and $isExtension]">
-        <!-- BR-DEX-07
-    Überschreibt BR-CL-25 und ergänzt um XR01, XR02, XR03
-      -->
-          <assert test="((not(contains(normalize-space(@schemeID), ' ')) and contains($CEF-EAS-EXT-CODES, concat(' ', normalize-space(@schemeID), ' '))))"
-            flag="fatal"
-            id="BR-DEX-07"
-              >[BR-DEX-07] Any scheme identifier for an Endpoint Identifier in <name/> MUST belong to the CEF EAS code list. </assert>
-      </rule>
-      <rule context="ram:ApplicableHeaderTradeDelivery/ram:ShipToTradeParty/ram:GlobalID[@schemeID and $isExtension]">
-        <!-- BR-DEX-08
-    Überschreibt BR-CL-26 und ergänzt um XR01, XR02, XR03
-      -->
-          <assert test="((not(contains(normalize-space(@schemeID), ' ')) and contains($ISO-6523-ICD-EXT-CODES, concat(' ', normalize-space(@schemeID), ' '))))"
-            flag="fatal"
-            id="BR-DEX-08"
-              >[BR-DEX-08] Any scheme identifier for a Delivery location identifier in <name/> MUST be coded using one of the ISO 6523 ICD list. </assert>
-    </rule>
-
-      <rule context="ram:AttachmentBinaryObject[$isExtension]">
-          <!-- BR-DEX-01
-        checks whether an EmbeddedCocumentBinaryObject has a valid mimeCode (incl. XML)
-        -->
-          <assert test=".[@mimeCode = 'application/pdf' or
-              @mimeCode = 'image/png' or
-              @mimeCode = 'image/jpeg' or
-              @mimeCode = 'text/csv' or
-              @mimeCode = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' or
-              @mimeCode = 'application/vnd.oasis.opendocument.spreadsheet' or
-              @mimeCode = 'application/xml']"
-              id="BR-DEX-01"
-              flag="fatal"
-              >[BR-DEX-01] Das Element <name /> "Attached Document" (BT-125) benutzt einen nicht zulässigen MIME-Code: <value-of
-                  select="@mimeCode" />. Im Falle einer Extension darf zusätzlich zu der Liste der mime codes (definiert in Abschnitt 8.2, "Binary Object") der MIME-Code application/xml genutzt werden.</assert>
-      </rule>
-  </pattern>
-</schema>
--- a/validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC-WL.sch
+++ b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC-WL.sch
--- a/validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC-WL_codedb.xml
+++ b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC-WL_codedb.xml
--- a/validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC.sch
+++ b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC.sch
--- a/validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC_codedb.xml
+++ b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC_codedb.xml
--- a/validator/src/main/resources/schematron/ZF_233/FACTUR-X_EN16931.sch
+++ b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_EN16931.sch
--- a/validator/src/main/resources/schematron/ZF_233/FACTUR-X_EN16931_codedb.xml
+++ b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_EN16931_codedb.xml
--- a/validator/src/main/resources/schematron/ZF_233/FACTUR-X_EXTENDED.sch
+++ b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_EXTENDED.sch
--- a/validator/src/main/resources/schematron/ZF_233/FACTUR-X_EXTENDED_codedb.xml
+++ b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_EXTENDED_codedb.xml
--- a/validator/src/main/resources/schematron/ZF_233/FACTUR-X_MINIMUM.sch
+++ b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_MINIMUM.sch
--- a/validator/src/main/resources/schematron/ZF_233/FACTUR-X_MINIMUM_codedb.xml
+++ b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_MINIMUM_codedb.xml
--- a/validator/src/main/resources/xslt/ZF_233/FACTUR-X_BASIC-WL.xslt
+++ b/validator/src/main/resources/xslt/ZF_233/FACTUR-X_BASIC-WL.xslt
--- a/validator/src/main/resources/xslt/ZF_233/FACTUR-X_BASIC-WL_codedb.xml
+++ b/validator/src/main/resources/xslt/ZF_233/FACTUR-X_BASIC-WL_codedb.xml
--- a/validator/src/main/resources/xslt/ZF_233/FACTUR-X_BASIC.xslt
+++ b/validator/src/main/resources/xslt/ZF_233/FACTUR-X_BASIC.xslt
--- a/validator/src/main/resources/xslt/ZF_233/FACTUR-X_BASIC_codedb.xml
+++ b/validator/src/main/resources/xslt/ZF_233/FACTUR-X_BASIC_codedb.xml
--- a/validator/src/main/resources/xslt/ZF_233/FACTUR-X_EN16931.xslt
+++ b/validator/src/main/resources/xslt/ZF_233/FACTUR-X_EN16931.xslt
--- a/validator/src/main/resources/xslt/ZF_233/FACTUR-X_EN16931_codedb.xml
+++ b/validator/src/main/resources/xslt/ZF_233/FACTUR-X_EN16931_codedb.xml
--- a/validator/src/main/resources/xslt/ZF_233/FACTUR-X_EXTENDED.xslt
+++ b/validator/src/main/resources/xslt/ZF_233/FACTUR-X_EXTENDED.xslt
--- a/validator/src/main/resources/xslt/ZF_233/FACTUR-X_EXTENDED_codedb.xml
+++ b/validator/src/main/resources/xslt/ZF_233/FACTUR-X_EXTENDED_codedb.xml
--- a/validator/src/main/resources/xslt/ZF_233/FACTUR-X_MINIMUM.xslt
+++ b/validator/src/main/resources/xslt/ZF_233/FACTUR-X_MINIMUM.xslt
--- a/validator/src/main/resources/xslt/ZF_233/FACTUR-X_MINIMUM_codedb.xml
+++ b/validator/src/main/resources/xslt/ZF_233/FACTUR-X_MINIMUM_codedb.xml
				`@@ -0,0 +1 @@`
				`XRechnung 3 schematrons and above are applied using their published XSLT version directly`