diff --git a/History.md b/History.md
index 8d09ce9f..d895cac6 100644
--- 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
diff --git a/Mustang-CLI/pom.xml b/Mustang-CLI/pom.xml
index e040777d..77b79394 100644
--- a/Mustang-CLI/pom.xml
+++ b/Mustang-CLI/pom.xml
@@ -3,7 +3,7 @@
org.mustangproject
core
- 2.16.4-SNAPSHOT
+ 2.17.0-SNAPSHOT
4.0.0
org.mustangproject
@@ -12,7 +12,7 @@
should also work for XRechnung/CII.
jar
- 2.16.4-SNAPSHOT
+ 2.17.0-SNAPSHOT
UTF-8
11
@@ -23,7 +23,7 @@
org.mustangproject
validator
- 2.16.4-SNAPSHOT
+ 2.17.0-SNAPSHOT
diff --git a/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java b/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java
index 5ab757fe..9cdb54e2 100755
--- a/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java
+++ b/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java
@@ -73,10 +73,10 @@ public class Main {
+ " For ZUGFeRD v2: INIMUM, BASIC L, ASIC, IUS, N16931, Rechnung, EXENDED\n"
+ " [--attachments ]: list of file attachments (passing a single empty file name prevents prompting)\n"
+ " [--no-additional-attachments]: prevent prompting for attachments\n"
- + " --action ubl convert UN/CEFACT 2016b CII XML to UBL XML\n"
+ + " --action ubl convert UN/CEFACT 2016b CII XML to UBL XML\n"
+ " [--source ]: set input XML file\n"
+ " [--out ]: set output XML file\n"
- + " --action upgrade upgrade ZUGFeRD XML to ZUGFeRD 2 XML\n"
+ + " --action upgrade upgrade ZUGFeRD XML to ZUGFeRD 2 XML\n"
+ " Additional parameters (optional - user will be prompted if not defined)\n"
+ " [--source ]: set input XML ZUGFeRD 1 file\n"
+ " [--out ]: set output XML ZUGFeRD 2 file\n"
@@ -86,14 +86,18 @@ public class Main {
+ " Additional parameters (optional - user will be prompted if not defined)\n"
+ " [--source ]: 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 ]: set output lang (en, fr or de)\n"
+ " [--source ]: 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 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);
diff --git a/Mustang-CLI/src/main/java/org/mustangproject/commandline/ValidatorFileWalker.java b/Mustang-CLI/src/main/java/org/mustangproject/commandline/ValidatorFileWalker.java
index 5b5d8340..a368baaa 100644
--- 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,25 +10,29 @@ 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;
import static org.xmlunit.assertj.XmlAssert.assertThat;
-public class ValidatorFileWalker
- extends SimpleFileVisitor {
+public class ValidatorFileWalker
+ extends SimpleFileVisitor {
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,54 +40,58 @@ public class ValidatorFileWalker
public boolean getResult() {
return allValid;
}
- // Print information about
- // each type of file.
- @Override
- public FileVisitResult visitFile(Path file,
- BasicFileAttributes attr) {
- DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- //get current date time with Date()
- Date date = new Date();
- String expectedString="valid";
- if (!expectValid) {
- expectedString="invalid";
- }
- if ((attr!=null)&&(attr.isRegularFile())) {
- if (matcher.matches(file.getFileName())) {
- String thisResultString=" valid";
- try {
- assertThat(zul.validate(file.toAbsolutePath().toString())).valueByXPath("/validation/summary/@status")
- .asString()
- .isEqualTo(expectedString);
-
- } catch (AssertionError ae) {
- thisResultString="invalid";
- allValid=false;
- }
- LOGGER.info(String.format("\n@%s Testing file %d: %s (%s)", dateFormat.format(date), fileCount++, thisResultString, file));
-
- }
- }
- return FileVisitResult.CONTINUE;
- }
- // Print each directory visited.
- @Override
- public FileVisitResult postVisitDirectory(Path dir,
- IOException exc) {
- LOGGER.info("\nDirectory: %s%n", dir);
- return FileVisitResult.CONTINUE;
- }
+ // Print information about
+ // each type of file.
+ @Override
+ public FileVisitResult visitFile(Path file,
+ BasicFileAttributes attr) {
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ //get current date time with Date()
+ Date date = new Date();
+ String expectedString = "valid";
+ if (!expectValid) {
+ expectedString = "invalid";
+ }
+ if ((attr != null) && (attr.isRegularFile())) {
+ if (matcher.matches(file.getFileName())) {
+ // I could have extended the path matcher but an exclusion list is quite simple
+ if ((excludedFiles == null) || (!Arrays.asList(excludedFiles).contains(file.getFileName().toString()))) {
- // If there is some error accessing
- // the file, let the user know.
- // If you don't override this method
- // and an error occurs, an IOException
- // is thrown.
- @Override
- public FileVisitResult visitFileFailed(Path file,
- IOException exc) {
- LOGGER.error(exc.getMessage(),exc);
- return FileVisitResult.CONTINUE;
- }
+ String thisResultString = " valid";
+ try {
+ assertThat(zul.validate(file.toAbsolutePath().toString())).valueByXPath("/validation/summary/@status")
+ .asString()
+ .isEqualTo(expectedString);
+
+ } catch (AssertionError ae) {
+ thisResultString = "invalid";
+ allValid = false;
+ }
+ LOGGER.info(String.format("\n@%s Testing file %d: %s (%s) ", dateFormat.format(date), fileCount++, thisResultString, file));
+ }
+ }
+ }
+ return FileVisitResult.CONTINUE;
+ }
+
+ // Print each directory visited.
+ @Override
+ public FileVisitResult postVisitDirectory(Path dir,
+ IOException exc) {
+ LOGGER.info(String.format("\nDirectory: %s \n", dir));
+ return FileVisitResult.CONTINUE;
+ }
+
+ // If there is some error accessing
+ // the file, let the user know.
+ // If you don't override this method
+ // and an error occurs, an IOException
+ // is thrown.
+ @Override
+ public FileVisitResult visitFileFailed(Path file,
+ IOException exc) {
+ LOGGER.error(exc.getMessage(), exc);
+ return FileVisitResult.CONTINUE;
+ }
}
diff --git a/library/pom.xml b/library/pom.xml
index 9862a1d5..f9745ed8 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -3,13 +3,13 @@
org.mustangproject
core
- 2.16.4-SNAPSHOT
+ 2.17.0-SNAPSHOT
4.0.0
org.mustangproject
library
- 2.16.4-SNAPSHOT
+ 2.17.0-SNAPSHOT
jar
Library to write, read and validate e-invoices (Factur-X, ZUGFeRD, Order-X, XRechnung/CII)
FOSS Java library to read, write and validate european electronic invoices and orders in the UN/CEFACT
@@ -110,12 +110,12 @@
org.apache.pdfbox
preflight
- 3.0.2
+ 3.0.5
org.apache.pdfbox
pdfbox
- 3.0.2
+ 3.0.5
diff --git a/library/src/main/java/org/mustangproject/Invoice.java b/library/src/main/java/org/mustangproject/Invoice.java
index c1ebc382..e3123b7a 100644
--- 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 Allowances = new ArrayList<>(),
Charges = new ArrayList<>(), LogisticsServiceCharges = new ArrayList<>();
- protected IZUGFeRDPaymentTerms paymentTerms = null;
+ protected ArrayList 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;
}
diff --git a/library/src/main/java/org/mustangproject/Item.java b/library/src/main/java/org/mustangproject/Item.java
index c248d2fe..07067e94 100644
--- 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 includedNotes = new ArrayList<>();
adld.getAllNodes("IncludedNote").forEach(item -> {
diff --git a/library/src/main/java/org/mustangproject/LegalOrganisation.java b/library/src/main/java/org/mustangproject/LegalOrganisation.java
index d5b6d42f..8a9418f3 100644
--- 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,8 +54,8 @@ public class LegalOrganisation implements IZUGFeRDLegalOrganisation {
this.setSchemedID(gid);
}
}
- if (currentItemNode.getLocalName().equals("TradingBusinessName")) {
- setTradingBusinessName(currentItemNode.getFirstChild().getNodeValue());
+ if ((currentItemNode.getLocalName().equals("TradingBusinessName")) && (currentItemNode.getFirstChild() != null)) {
+ setTradingBusinessName(currentItemNode.getFirstChild().getNodeValue());
}
}
}
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/IExportableTransaction.java b/library/src/main/java/org/mustangproject/ZUGFeRD/IExportableTransaction.java
index 686afd44..9ce55ef1 100644
--- 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
*
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/LineCalculator.java b/library/src/main/java/org/mustangproject/ZUGFeRD/LineCalculator.java
index 5fc826a1..c58e177b 100644
--- 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);
}
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java
index eb3ff49c..f6329d52 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java
@@ -506,36 +506,44 @@ 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 = "";
- final IZUGFeRDPaymentDiscountTerms discountTerms = paymentTerms.getDiscountTerms();
- paymentTermsXml += "" + paymentTerms.getDescription() + "";
- if (discountTerms != null) {
- paymentTermsXml += "";
- final String currency = trans.getCurrency();
- final String basisAmount = currencyFormat(calc.getGrandTotal());
- paymentTermsXml += "" + basisAmount + "";
- paymentTermsXml += "" + discountTerms.getCalculationPercentage().toString()
+ for (IZUGFeRDPaymentTerms pt : paymentTerms)
+ {
+ paymentTermsXml += "";
+
+ final IZUGFeRDPaymentDiscountTerms discountTerms = pt.getDiscountTerms();
+ paymentTermsXml += "" + pt.getDescription() + "";
+ if (discountTerms != null)
+ {
+ paymentTermsXml += "";
+ final String currency = trans.getCurrency();
+ final String basisAmount = currencyFormat(calc.getGrandTotal());
+ paymentTermsXml += "" + basisAmount + "";
+ paymentTermsXml += "" + discountTerms.getCalculationPercentage().toString()
+ "";
- if (discountTerms.getBaseDate() != null) {
- final Date baseDate = discountTerms.getBaseDate();
- paymentTermsXml += "";
- paymentTermsXml += DATE.udtFormat(baseDate);
- paymentTermsXml += "";
+ if (discountTerms.getBaseDate() != null)
+ {
+ final Date baseDate = discountTerms.getBaseDate();
+ paymentTermsXml += "";
+ paymentTermsXml += DATE.udtFormat(baseDate);
+ paymentTermsXml += "";
- paymentTermsXml += ""
+ paymentTermsXml += ""
+ discountTerms.getBasePeriodMeasure() + "";
+ }
+
+ paymentTermsXml += "";
}
- paymentTermsXml += "";
+ paymentTermsXml += "";
}
-
- paymentTermsXml += "";
return paymentTermsXml;
}
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/TransactionCalculator.java b/library/src/main/java/org/mustangproject/ZUGFeRD/TransactionCalculator.java
index 9c2b30f3..b8844b63 100644
--- 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 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)) {
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java
index b98abebc..87e6f479 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java
@@ -433,44 +433,57 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider {
}
private String buildPaymentTermsXml() {
- String paymentTermsXml = "";
+ 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) {
- throw new IllegalStateException(
+ String paymentTermsXml = "";
+ if (paymentTerms == null || paymentTerms.length == 0) {
+ return paymentTermsXml;
+ }
+
+ for (IZUGFeRDPaymentTerms pt : paymentTerms)
+ {
+ paymentTermsXml += "";
+
+ 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 += "" + paymentTerms.getDescription() + "";
- if (dueDate != null) {
- paymentTermsXml += "";
- paymentTermsXml += DATE.udtFormat(dueDate);
- paymentTermsXml += "";
- }
-
- if (discountTerms != null) {
- paymentTermsXml += "";
- final String currency = trans.getCurrency();
- final String basisAmount = currencyFormat(calc.getGrandTotal());
- paymentTermsXml += "" + basisAmount + "";
- paymentTermsXml += "" + discountTerms.getCalculationPercentage().toString()
- + "";
-
- if (discountTerms.getBaseDate() != null) {
- final Date baseDate = discountTerms.getBaseDate();
- paymentTermsXml += "";
- paymentTermsXml += DATE.udtFormat(baseDate);
- paymentTermsXml += "";
-
- paymentTermsXml += ""
- + discountTerms.getBasePeriodMeasure() + "";
+ }
+ paymentTermsXml += "" + pt.getDescription() + "";
+ if (dueDate != null)
+ {
+ paymentTermsXml += "";
+ paymentTermsXml += DATE.udtFormat(dueDate);
+ paymentTermsXml += "";
}
- paymentTermsXml += "";
- }
+ if (discountTerms != null)
+ {
+ paymentTermsXml += "";
+ final String currency = trans.getCurrency();
+ final String basisAmount = currencyFormat(calc.getGrandTotal());
+ paymentTermsXml += "" + basisAmount + "";
+ paymentTermsXml += "" + discountTerms.getCalculationPercentage().toString()
+ + "";
- paymentTermsXml += "";
+ if (discountTerms.getBaseDate() != null)
+ {
+ final Date baseDate = discountTerms.getBaseDate();
+ paymentTermsXml += "";
+ paymentTermsXml += DATE.udtFormat(baseDate);
+ paymentTermsXml += "";
+
+ paymentTermsXml += ""
+ + discountTerms.getBasePeriodMeasure() + "";
+ }
+
+ paymentTermsXml += "";
+ }
+
+ paymentTermsXml += "";
+ }
return paymentTermsXml;
}
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
index cbf52cf2..8fe07564 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
@@ -969,56 +969,76 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
}
private String buildPaymentTermsXml() {
- final IZUGFeRDPaymentTerms paymentTerms = trans.getPaymentTerms();
- if (paymentTerms == null) {
+
+ ArrayList paymentTerms = new ArrayList(Arrays.asList(trans.getExtendedPaymentTerms()));
+
+ IZUGFeRDPaymentTerms izpt= trans.getPaymentTerms();
+ if (izpt!=null) {
+ paymentTerms.add(izpt);
+ }
+
+ String paymentTermsXml = "";
+ if (paymentTerms.size() == 0) {
return "";
}
- String paymentTermsXml = "";
- final IZUGFeRDPaymentDiscountTerms discountTerms = paymentTerms.getDiscountTerms();
- final Date dueDate = paymentTerms.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 += "" + paymentTerms.getDescription() + "";
+ for (IZUGFeRDPaymentTerms pt : paymentTerms)
+ {
- if (dueDate != null) {
- paymentTermsXml += "";
- paymentTermsXml += DATE.udtFormat(dueDate);
- paymentTermsXml += "";
- }
+ paymentTermsXml += "";
- if (trans.getTradeSettlement() != null) {
- for (final IZUGFeRDTradeSettlement payment : trans.getTradeSettlement()) {
- if ((payment != null) && (payment instanceof IZUGFeRDTradeSettlementDebit)) {
- paymentTermsXml += payment.getPaymentXML();
+ 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 += "" + pt.getDescription() + "";
+
+ if (dueDate != null)
+ {
+ paymentTermsXml += "";
+ paymentTermsXml += DATE.udtFormat(dueDate);
+ paymentTermsXml += "";
+ }
+
+ if (trans.getTradeSettlement() != null)
+ {
+ for (final IZUGFeRDTradeSettlement payment : trans.getTradeSettlement())
+ {
+ if ((payment != null) && (payment instanceof IZUGFeRDTradeSettlementDebit))
+ {
+ paymentTermsXml += payment.getPaymentXML();
+ }
}
}
- }
- if (discountTerms != null) {
- paymentTermsXml += "";
- final String currency = trans.getCurrency();
- final String basisAmount = currencyFormat(calc.getGrandTotal());
- paymentTermsXml += "" + basisAmount + "";
- paymentTermsXml += "" + discountTerms.getCalculationPercentage().toString()
- + "";
+ if (discountTerms != null)
+ {
+ paymentTermsXml += "";
+ final String currency = trans.getCurrency();
+ final String basisAmount = currencyFormat(calc.getGrandTotal());
+ paymentTermsXml += "" + basisAmount + "";
+ paymentTermsXml += "" + discountTerms.getCalculationPercentage().toString()
+ + "";
- if (discountTerms.getBaseDate() != null) {
- final Date baseDate = discountTerms.getBaseDate();
- paymentTermsXml += "";
- paymentTermsXml += DATE.udtFormat(baseDate);
- paymentTermsXml += "";
+ if (discountTerms.getBaseDate() != null)
+ {
+ final Date baseDate = discountTerms.getBaseDate();
+ paymentTermsXml += "";
+ paymentTermsXml += DATE.udtFormat(baseDate);
+ paymentTermsXml += "";
- paymentTermsXml += ""
- + discountTerms.getBasePeriodMeasure() + "";
+ paymentTermsXml += ""
+ + discountTerms.getBasePeriodMeasure() + "";
+ }
+
+ paymentTermsXml += "";
}
- paymentTermsXml += "";
+ paymentTermsXml += "";
}
-
- paymentTermsXml += "";
return paymentTermsXml;
}
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java
index d138bf15..cbf08b7b 100644
--- 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']");
}
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
index 699dc4f3..19a0084f 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
@@ -449,8 +449,8 @@ 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) {
diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/CalculationTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/CalculationTest.java
index 3a48ff1d..fc3a7041 100644
--- 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());
+ */
}
diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2EdgeTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2EdgeTest.java
index 4708b09a..f095372b 100644
--- 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(
- "14 Tage 2% Skonto, 30 Tage rein netto",
- due,// fälligkeitsdatum
- paymentDiscountTerms //PaymentDiscountTerms
- );
-
+ return new PaymentTerms(
+ "14 Tage 2% Skonto, 30 Tage rein netto",
+ due,// fälligkeitsdatum
+ paymentDiscountTerms //PaymentDiscountTerms
+ );
}
@Override
diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java
index f5ecb15a..3323c168 100644
--- 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()
diff --git a/library/src/test/resources/ubl/XRECHNUNG_teilrechnung.ubl.xml b/library/src/test/resources/ubl/XRECHNUNG_teilrechnung.ubl.xml
new file mode 100644
index 00000000..d745f84a
--- /dev/null
+++ b/library/src/test/resources/ubl/XRECHNUNG_teilrechnung.ubl.xml
@@ -0,0 +1,181 @@
+
+
+ urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_3.0
+ urn:fdc:peppol.eu:2017:poacc:billing:01:1.0
+ 471102
+ 2024-11-15
+ 380
+ Rechnung gemäß Bestellung vom 01.11.2024.
+ #REG#Lieferant GmbH
+Lieferantenstraße 20
+80333 München
+Deutschland
+Geschäftsführer: Hans Muster
+Handelsregisternummer: H A 123
+
+ EUR
+ 04011000-12345-34
+
+
+ info@Mustermann.de
+
+ 4000001123452
+
+
+ Lieferantenstraße 20
+ München
+ 80333
+
+ DE
+
+
+
+ 201/113/40209
+
+ FC
+
+
+
+ DE123456789
+
+ VAT
+
+
+
+ Lieferant GmbH
+
+
+ Max Mustermann
+ +49891234567
+ Max@Mustermann.de
+
+
+
+
+
+ info@kunde.de
+
+ GE2020211
+
+
+ Kundenstraße 15
+ Frankfurt
+ 69876
+
+ DE
+
+
+
+ Kunden AG Mitte
+
+
+
+
+ 2024-11-14
+
+
+ 58
+
+ DE02120300000000202051
+ Kunden AG
+
+ BYLADEM1001
+
+
+
+
+ Zahlbar innerhalb 30 Tagen netto bis 15.12.2024, 3% Skonto innerhalb 10 Tagen bis 25.11.2024
+
+
+ 56.87
+
+ 275
+ 19.25
+
+ S
+ 7
+
+ VAT
+
+
+
+
+ 198
+ 37.62
+
+ S
+ 19
+
+ VAT
+
+
+
+
+
+ 473
+ 473
+ 529.87
+ 0
+ 0
+ 500
+ 29.87
+
+
+ 1
+ 20
+ 198
+
+ Trennblätter A4
+
+ TB100A4
+
+
+ 4012345001235
+
+
+ S
+ 19
+
+ VAT
+
+
+
+
+ 9.9
+
+ false
+ 0
+ 9.9
+
+
+
+
+ 2
+ 50
+ 275
+
+ Joghurt Banane
+
+ ARNR2
+
+
+ 4000050986428
+
+
+ S
+ 7
+
+ VAT
+
+
+
+
+ 5.5
+
+ false
+ 0
+ 5.5
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 5cc3f0ac..c3dbca52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
org.mustangproject
core
- 2.16.4-SNAPSHOT pom
+ 2.17.0-SNAPSHOT pom
Mustang
diff --git a/validator/pom.xml b/validator/pom.xml
index 8d8b7ff0..bce750a1 100644
--- a/validator/pom.xml
+++ b/validator/pom.xml
@@ -3,7 +3,7 @@
org.mustangproject
core
- 2.16.4-SNAPSHOT
+ 2.17.0-SNAPSHOT
4.0.0
org.mustangproject
@@ -11,7 +11,7 @@
Library to validate e-invoices (ZUGFeRD, Factur-X and Xrechnung)
jar
- 2.16.4-SNAPSHOT
+ 2.17.0-SNAPSHOT
@@ -38,7 +38,7 @@
${project.groupId}
library
- 2.16.4-SNAPSHOT
+ 2.17.0-SNAPSHOT
org.dom4j
@@ -59,7 +59,7 @@
org.apache.pdfbox
pdfbox
- 3.0.2
+ 3.0.5
jakarta.xml.bind
@@ -230,10 +230,10 @@
- src/main/resources/xslt/ZF_232/
+ src/main/resources/xslt/ZF_233/
- ${basedir}/src/main/resources/schematron/ZF_232/
+ ${basedir}/src/main/resources/schematron/ZF_233/
**/*.xml
diff --git a/validator/src/main/java/org/mustangproject/validator/PDFValidator.java b/validator/src/main/java/org/mustangproject/validator/PDFValidator.java
index 15a4108a..411eb220 100644
--- a/validator/src/main/java/org/mustangproject/validator/PDFValidator.java
+++ b/validator/src/main/java/org/mustangproject/validator/PDFValidator.java
@@ -267,7 +267,8 @@ public class PDFValidator extends Validator {
final byte[] pdfMachineSignature = "pdfMachine from Broadgun Software".getBytes(StandardCharsets.UTF_8);
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[] 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);
diff --git a/validator/src/main/java/org/mustangproject/validator/XMLValidator.java b/validator/src/main/java/org/mustangproject/validator/XMLValidator.java
index cf911dc6..6f364751 100644
--- 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);
}
diff --git a/validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL.xsd b/validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL.xsd
similarity index 100%
rename from validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL.xsd
rename to validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL.xsd
diff --git 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
new file mode 100644
index 00000000..7819dde5
--- /dev/null
+++ b/validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_codedb.xml
@@ -0,0 +1,2240 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/validator/src/main/resources/schema/ZF_232/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
similarity index 100%
rename from validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
rename to validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
diff --git a/validator/src/main/resources/schema/ZF_232/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
similarity index 97%
rename from validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
rename to validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
index f6345542..45946f97 100644
--- a/validator/src/main/resources/schema/ZF_232/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">
-
-
+
+
diff --git a/validator/src/main/resources/schema/ZF_232/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
similarity index 100%
rename from validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
rename to validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
diff --git a/validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC.xsd b/validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC.xsd
similarity index 100%
rename from validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC.xsd
rename to validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC.xsd
diff --git 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
new file mode 100644
index 00000000..71c8833a
--- /dev/null
+++ b/validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_codedb.xml
@@ -0,0 +1,4842 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/validator/src/main/resources/schema/ZF_232/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
similarity index 100%
rename from validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
rename to validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
diff --git a/validator/src/main/resources/schema/ZF_232/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
similarity index 98%
rename from validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
rename to validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
index 517d0fb0..5c143385 100644
--- a/validator/src/main/resources/schema/ZF_232/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">
-
-
+
+
diff --git a/validator/src/main/resources/schema/ZF_232/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
similarity index 100%
rename from validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
rename to validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
diff --git a/validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931.xsd b/validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931.xsd
similarity index 100%
rename from validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931.xsd
rename to validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931.xsd
diff --git 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
new file mode 100644
index 00000000..0963c68b
--- /dev/null
+++ b/validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_codedb.xml
@@ -0,0 +1,5872 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/validator/src/main/resources/schema/ZF_232/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
similarity index 100%
rename from validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
rename to validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
diff --git a/validator/src/main/resources/schema/ZF_232/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
similarity index 98%
rename from validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
rename to validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
index b9dfd083..7cf89ef8 100644
--- a/validator/src/main/resources/schema/ZF_232/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">
-
-
+
+
diff --git a/validator/src/main/resources/schema/ZF_232/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
similarity index 100%
rename from validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
rename to validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
diff --git a/validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED.xsd b/validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED.xsd
similarity index 100%
rename from validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED.xsd
rename to validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED.xsd
diff --git 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
new file mode 100644
index 00000000..f0bbf327
--- /dev/null
+++ b/validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_codedb.xml
@@ -0,0 +1,6707 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/validator/src/main/resources/schema/ZF_232/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
similarity index 100%
rename from validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
rename to validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
diff --git a/validator/src/main/resources/schema/ZF_232/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
similarity index 99%
rename from validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
rename to validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
index 80ee1129..0f8f31ed 100644
--- a/validator/src/main/resources/schema/ZF_232/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">
-
-
+
+
diff --git a/validator/src/main/resources/schema/ZF_232/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
similarity index 100%
rename from validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
rename to validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
diff --git a/validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM.xsd b/validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM.xsd
similarity index 100%
rename from validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM.xsd
rename to validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM.xsd
diff --git 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
new file mode 100644
index 00000000..f1aba69f
--- /dev/null
+++ b/validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_codedb.xml
@@ -0,0 +1,917 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/validator/src/main/resources/schema/ZF_232/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
similarity index 100%
rename from validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
rename to validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
diff --git a/validator/src/main/resources/schema/ZF_232/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
similarity index 94%
rename from validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
rename to validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
index 389563bd..ecd98451 100644
--- a/validator/src/main/resources/schema/ZF_232/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">
-
-
+
+
diff --git a/validator/src/main/resources/schema/ZF_232/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
similarity index 100%
rename from validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
rename to validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
diff --git a/validator/src/main/resources/schematron/XR_30/README.md b/validator/src/main/resources/schematron/XR_30/README.md
new file mode 100644
index 00000000..1bfad732
--- /dev/null
+++ 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
diff --git a/validator/src/main/resources/schematron/XR_30/XRechnung-CII-validation.sch b/validator/src/main/resources/schematron/XR_30/XRechnung-CII-validation.sch
deleted file mode 100644
index b38a931a..00000000
--- a/validator/src/main/resources/schematron/XR_30/XRechnung-CII-validation.sch
+++ /dev/null
@@ -1,305 +0,0 @@
-
-
- Schematron Version @xr-schematron.version.full@ - XRechnung @xrechnung.version@ compatible - CII
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [BR-DE-30] Wenn "DIRECT DEBIT" BG-19 vorhanden ist, dann muss "Bank assigned creditor identifier" BT-90 übermittelt werden.
- [BR-DE-31] Wenn "DIRECT DEBIT" BG-19 vorhanden ist, dann muss "Debited account identifier" BT-91 übermittelt werden.
-[BR-DE-1] Eine Rechnung (INVOICE) muss Angaben zu "PAYMENT INSTRUCTIONS" (BG-16) enthalten.
- [BR-DE-15] Das Element "Buyer reference" (BT-10) muss übermittelt werden.
- [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.
-
- [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).
- [BR-DE-18] Skonto Zeilen in muessen diesem regulärem Ausdruck entsprechen: . 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.
-
- [BR-DE-22] Not all filename attributes of the embeddedDocumentBinaryObject elements are unique
- [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.
-
-
-
- [BR-DE-21] Das Element "Specification identifier" (BT-24) soll syntaktisch der Kennung des Standards XRechnung entsprechen.
-
-
-
- [BR-DE-2] Die Gruppe "SELLER CONTACT" (BG-6) muss übermittelt werden.
-
-
-
- [BR-DE-3] Das Element "Seller city" (BT-37) muss übermittelt werden.
- [BR-DE-4] Das Element "Seller post code" (BT-38) muss übermittelt werden.
-
-
-
- [BR-DE-5] Das Element "Seller contact point" (BT-41) muss übermittelt werden.
- [BR-DE-6] Das Element "Seller contact telephone number" (BT-42) muss übermittelt werden.
- [BR-DE-7] Das Element "Seller contact email address" (BT-43) muss übermittelt werden.
- [BR-DE-27] In BT-42 sollen mindestens drei Ziffern enthalten sein.
- [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.
-
-
-
- [BR-DE-8] Das Element "Buyer city" (BT-52) muss übermittelt werden.
- [BR-DE-9] Das Element "Buyer post code" (BT-53) muss übermittelt werden.
-
-
- [BR-TMP-2] BT-124 "External document location" muss eine absolute URL mit gültigem Schema enthalten.
-
-
-
- [BR-DE-10] Das Element "Deliver to city" (BT-77) muss übermittelt werden, wenn die Gruppe "DELIVER TO ADDRESS" (BG-15) übermittelt wird.
- [BR-DE-11] Das Element "Deliver to post code" (BT-78) muss übermittelt werden, wenn die Gruppe "DELIVER TO ADDRESS" (BG-15) übermittelt wird.
-
-
-
- [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.
- [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.
- [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.
-
-
-
- [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.
- [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.
-
-
-
- [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.
- [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.
- [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.
-
-
-
- [BR-DE-14] Das Element "VAT category rate" (BT-119) muss übermittelt werden.
-
-
-
-
-
-
-
-
- [BR-DEX-15] This CII file might use the concept of Sub Invoice Lines. However XRechnung does not support this.
-
-
-
-
- [BR-DEX-04] Any scheme identifier in MUST be coded using one of the ISO 6523 ICD list.
-
-
-
- [BR-DEX-05] Any scheme identifier in MUST be coded using one of the ISO 6523 ICD list.
-
-
-
- [BR-DEX-06] Any scheme identifier in MUST be coded using one of the ISO 6523 ICD list.
-
-
-
- [BR-DEX-07] Any scheme identifier for an Endpoint Identifier in MUST belong to the CEF EAS code list.
-
-
-
- [BR-DEX-08] Any scheme identifier for a Delivery location identifier in MUST be coded using one of the ISO 6523 ICD list.
-
-
-
-
- [BR-DEX-01] Das Element "Attached Document" (BT-125) benutzt einen nicht zulässigen MIME-Code: . 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.
-
-
-
diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC-WL.sch b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC-WL.sch
similarity index 100%
rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC-WL.sch
rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC-WL.sch
diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC-WL_codedb.xml b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC-WL_codedb.xml
similarity index 100%
rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC-WL_codedb.xml
rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC-WL_codedb.xml
diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC.sch b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC.sch
similarity index 100%
rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC.sch
rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC.sch
diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC_codedb.xml b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC_codedb.xml
similarity index 100%
rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC_codedb.xml
rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC_codedb.xml
diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_EN16931.sch b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_EN16931.sch
similarity index 100%
rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_EN16931.sch
rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_EN16931.sch
diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_EN16931_codedb.xml b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_EN16931_codedb.xml
similarity index 100%
rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_EN16931_codedb.xml
rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_EN16931_codedb.xml
diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_EXTENDED.sch b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_EXTENDED.sch
similarity index 100%
rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_EXTENDED.sch
rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_EXTENDED.sch
diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_EXTENDED_codedb.xml b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_EXTENDED_codedb.xml
similarity index 100%
rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_EXTENDED_codedb.xml
rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_EXTENDED_codedb.xml
diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_MINIMUM.sch b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_MINIMUM.sch
similarity index 100%
rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_MINIMUM.sch
rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_MINIMUM.sch
diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_MINIMUM_codedb.xml b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_MINIMUM_codedb.xml
similarity index 100%
rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_MINIMUM_codedb.xml
rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_MINIMUM_codedb.xml
diff --git a/validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC-WL.xslt b/validator/src/main/resources/xslt/ZF_233/FACTUR-X_BASIC-WL.xslt
similarity index 73%
rename from validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC-WL.xslt
rename to validator/src/main/resources/xslt/ZF_233/FACTUR-X_BASIC-WL.xslt
index 36484a84..aafee172 100644
--- a/validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC-WL.xslt
+++ b/validator/src/main/resources/xslt/ZF_233/FACTUR-X_BASIC-WL.xslt
@@ -153,7 +153,7 @@
-
+
@@ -486,1054 +486,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Schema for Factur-X; 1.07.2; Accounting, BASIC without Lines
+Schema for Factur-X; 1.07.3; Accounting, BASIC without Lines
@@ -2485,9 +1442,9 @@
-
+
-
+
FX-SCH-A-000093
@@ -2872,9 +1829,9 @@
-
+
-
+
FX-SCH-A-000111
@@ -3354,21 +2311,6 @@
-
-
-
-
-
-
- FX-SCH-A-000132
-
-
-
-
- [BR-CO-27]-Either the IBAN or a Proprietary ID (BT-84) shall be used.
-
-
-
@@ -3385,6 +2327,21 @@
+
+
+
+ FX-SCH-A-000133
+
+
+
+
+ [BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice.
+
+
+
+
+
+
@@ -3408,20 +2365,20 @@
-
-
+
+
-
+
-
- FX-SCH-A-000133
+
+ FX-SCH-A-000132
- [BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice.
+ [BR-CO-27]-Either the IBAN or a Proprietary ID (BT-84) shall be used.
@@ -4063,7 +3020,78 @@
-
+
+
+
+
+
+
+
+
+ FX-SCH-A-000170
+
+
+
+
+ [BR-57]-Each Deliver to address (BG-15) shall contain a Deliver to country code (BT-80).
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ FX-SCH-A-000182
+
+
+
+
+ [BR-55]-Each Preceding Invoice reference (BG-3) shall contain a Preceding Invoice reference (BT-25).
+
+
+
+
+
+
+
+
+
+ FX-SCH-A-000029
+
+
+
+
+ Element 'ram:IssuerAssignedID' must occur exactly 1 times.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4095,23 +3123,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -4119,18 +3140,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -4164,24 +3178,17 @@
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000162
@@ -4191,18 +3198,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -4219,26 +3219,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000022
@@ -4248,26 +3235,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000023
@@ -4277,18 +3257,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -4320,18 +3293,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -4348,23 +3314,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -4372,18 +3331,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -4400,26 +3352,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000026
@@ -4429,23 +3374,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -4453,18 +3385,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -4496,18 +3421,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -4524,18 +3442,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -4548,23 +3459,16 @@
Element 'ram:FormattedIssueDateTime' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -4572,18 +3476,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -4675,18 +3572,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -4703,26 +3593,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000031
@@ -4732,23 +3609,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -4756,18 +3626,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -4799,26 +3662,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000036
@@ -4828,26 +3684,19 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
+
-
+
FX-SCH-A-000031
@@ -4857,18 +3706,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -4881,18 +3723,11 @@
Element 'ram:TradingBusinessName' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -4909,18 +3744,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -4937,26 +3765,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000031
@@ -4966,18 +3781,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -4994,18 +3802,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -5022,26 +3823,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000031
@@ -5051,18 +3839,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -5079,18 +3860,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -5103,23 +3877,16 @@
Element 'ram:FormattedIssueDateTime' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -5127,18 +3894,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -5185,18 +3945,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -5209,18 +3962,11 @@
Element 'ram:GlobalID' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -5233,18 +3979,11 @@
Element 'ram:ID' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -5276,26 +4015,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000036
@@ -5305,18 +4037,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -5329,18 +4054,11 @@
Element 'ram:SpecifiedLegalOrganization' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -5357,18 +4075,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -5385,26 +4096,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000031
@@ -5414,18 +4112,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -5438,18 +4129,11 @@
Element 'ram:URIUniversalCommunication' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -5526,18 +4210,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -5554,26 +4231,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000031
@@ -5583,23 +4247,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -5607,18 +4264,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -5650,26 +4300,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000036
@@ -5679,26 +4322,19 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
+
-
+
FX-SCH-A-000031
@@ -5708,18 +4344,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -5732,18 +4361,11 @@
Element variant 'ram:SpecifiedTaxRegistration[ not(ram:ID/@schemeID="VA") and not(ram:ID/@schemeID="FC")]' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -5760,18 +4382,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -5788,18 +4403,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -5816,18 +4424,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -5844,18 +4445,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -5872,18 +4466,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -5900,26 +4487,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000031
@@ -5929,46 +4503,11 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- FX-SCH-A-000170
-
-
-
-
- [BR-57]-Each Deliver to address (BG-15) shall contain a Deliver to country code (BT-80).
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -5985,18 +4524,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6013,26 +4545,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000022
@@ -6042,18 +4561,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6070,18 +4582,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6094,23 +4599,16 @@
Element 'ram:FormattedIssueDateTime' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -6118,18 +4616,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -6161,18 +4652,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6189,26 +4673,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000031
@@ -6218,23 +4689,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -6242,18 +4706,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -6285,26 +4742,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000036
@@ -6314,18 +4764,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6338,18 +4781,11 @@
Element 'ram:SpecifiedLegalOrganization' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -6362,18 +4798,11 @@
Element 'ram:SpecifiedTaxRegistration' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -6386,18 +4815,11 @@
Element 'ram:URIUniversalCommunication' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -6489,18 +4911,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6562,23 +4977,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -6586,23 +4994,16 @@
Attribute @currencyID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -6610,26 +5011,19 @@
Attribute @currencyID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000179
@@ -6639,26 +5033,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000180
@@ -6668,26 +5055,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000181
@@ -6697,26 +5077,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000023
@@ -6726,18 +5099,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6754,26 +5120,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000022
@@ -6783,18 +5136,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6811,26 +5157,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000022
@@ -6840,23 +5173,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -6864,26 +5190,19 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000040
@@ -6893,61 +5212,11 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- FX-SCH-A-000182
-
-
-
-
- [BR-55]-Each Preceding Invoice reference (BG-3) shall contain a Preceding Invoice reference (BT-25).
-
-
-
-
-
-
-
-
-
- FX-SCH-A-000029
-
-
-
-
- Element 'ram:IssuerAssignedID' must occur exactly 1 times.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -6964,26 +5233,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000022
@@ -6993,23 +5249,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -7017,18 +5266,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7075,18 +5317,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7103,26 +5338,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000031
@@ -7132,23 +5354,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -7156,18 +5371,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7180,26 +5388,19 @@
Element 'ram:PostalTradeAddress' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
+
-
+
FX-SCH-A-000031
@@ -7209,18 +5410,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7233,18 +5427,11 @@
Element 'ram:TradingBusinessName' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7257,18 +5444,11 @@
Element 'ram:SpecifiedTaxRegistration' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7281,23 +5461,16 @@
Element 'ram:URIUniversalCommunication' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -7305,18 +5478,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7329,18 +5495,11 @@
Element variant 'ram:SpecifiedTradeAllowanceCharge[ not(ram:ChargeIndicator/udt:Indicator="false") and not(ram:ChargeIndicator/udt:Indicator="true")]' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7387,23 +5546,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -7411,23 +5563,16 @@
Attribute @currencyID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -7435,18 +5580,11 @@
Attribute @currencyID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7478,18 +5616,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7502,18 +5633,11 @@
Element 'ram:BasisAmount' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7526,26 +5650,19 @@
Element 'ram:CalculatedAmount' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000179
@@ -7555,18 +5672,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7579,18 +5689,11 @@
Element 'ram:DueDateTypeCode' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7603,18 +5706,11 @@
Element 'ram:ExemptionReason' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7627,26 +5723,19 @@
Element 'ram:ExemptionReasonCode' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000023
@@ -7656,26 +5745,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000186
@@ -7685,18 +5767,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7743,23 +5818,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -7767,23 +5835,16 @@
Attribute @currencyID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -7791,18 +5852,11 @@
Attribute @currencyID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7834,18 +5888,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7858,18 +5905,11 @@
Element 'ram:BasisAmount' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7882,26 +5922,19 @@
Element 'ram:CalculatedAmount' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000179
@@ -7911,18 +5944,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7935,18 +5961,11 @@
Element 'ram:DueDateTypeCode' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7959,18 +5978,11 @@
Element 'ram:ExemptionReason' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7983,26 +5995,19 @@
Element 'ram:ExemptionReasonCode' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000023
@@ -8012,26 +6017,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000186
@@ -8041,18 +6039,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -8084,23 +6075,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -8108,18 +6092,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -8136,26 +6113,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000022
@@ -8165,18 +6129,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -8313,23 +6270,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -8337,23 +6287,16 @@
Attribute @currencyID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -8361,23 +6304,16 @@
Attribute @currencyID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -8385,23 +6321,16 @@
Attribute @currencyID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -8409,23 +6338,16 @@
Attribute @currencyID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -8433,23 +6355,16 @@
Attribute @currencyID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -8457,18 +6372,11 @@
Attribute @currencyID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -8481,47 +6389,11 @@
Element variant 'ram:TaxTotalAmount[ not(@currencyID=../../ram:InvoiceCurrencyCode) and not(@currencyID=../../ram:TaxCurrencyCode)]' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- FX-SCH-A-000045
-
-
-
-
- Value of '@currencyID' is not allowed.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -8538,26 +6410,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000045
@@ -8567,18 +6426,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -8595,23 +6447,32 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ FX-SCH-A-000045
+
+
+
+
+ Value of '@currencyID' is not allowed.
+
+
+
+
+
-
-
+
+
-
-
+
+
@@ -8619,18 +6480,11 @@
Attribute @currencyID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -8662,23 +6516,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -8686,23 +6533,16 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -8710,18 +6550,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -8738,23 +6571,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -8762,26 +6588,19 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000023
@@ -8791,26 +6610,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000196
@@ -8820,10 +6632,10 @@
-
+
-
-
-
+
+
+
diff --git a/validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC-WL_codedb.xml b/validator/src/main/resources/xslt/ZF_233/FACTUR-X_BASIC-WL_codedb.xml
similarity index 100%
rename from validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC-WL_codedb.xml
rename to validator/src/main/resources/xslt/ZF_233/FACTUR-X_BASIC-WL_codedb.xml
diff --git a/validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC.xslt b/validator/src/main/resources/xslt/ZF_233/FACTUR-X_BASIC.xslt
similarity index 76%
rename from validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC.xslt
rename to validator/src/main/resources/xslt/ZF_233/FACTUR-X_BASIC.xslt
index e7f52bfa..63de1f9d 100644
--- a/validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC.xslt
+++ b/validator/src/main/resources/xslt/ZF_233/FACTUR-X_BASIC.xslt
@@ -153,7 +153,7 @@
-
+
@@ -591,1446 +591,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Schema for Factur-X; 1.07.2; EN16931-COMPLIANT-BASIC
+Schema for Factur-X; 1.07.3; EN16931-COMPLIANT-BASIC
@@ -3495,9 +2060,9 @@
-
+
-
+
FX-SCH-A-000093
@@ -3882,9 +2447,9 @@
-
+
-
+
FX-SCH-A-000111
@@ -4379,21 +2944,6 @@
-
-
-
-
-
-
- FX-SCH-A-000132
-
-
-
-
- [BR-CO-27]-Either the IBAN or a Proprietary ID (BT-84) shall be used.
-
-
-
@@ -4410,6 +2960,21 @@
+
+
+
+ FX-SCH-A-000133
+
+
+
+
+ [BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice.
+
+
+
+
+
+
@@ -4433,20 +2998,20 @@
-
-
+
+
-
+
-
- FX-SCH-A-000133
+
+ FX-SCH-A-000132
- [BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice.
+ [BR-CO-27]-Either the IBAN or a Proprietary ID (BT-84) shall be used.
@@ -5248,9 +3813,9 @@
-
+
-
+
FX-SCH-A-000247
@@ -5775,7 +4340,78 @@
-
+
+
+
+
+
+
+
+
+ FX-SCH-A-000170
+
+
+
+
+ [BR-57]-Each Deliver to address (BG-15) shall contain a Deliver to country code (BT-80).
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ FX-SCH-A-000182
+
+
+
+
+ [BR-55]-Each Preceding Invoice reference (BG-3) shall contain a Preceding Invoice reference (BT-25).
+
+
+
+
+
+
+
+
+
+ FX-SCH-A-000029
+
+
+
+
+ Element 'ram:IssuerAssignedID' must occur exactly 1 times.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5807,23 +4443,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -5831,18 +4460,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -5876,24 +4498,17 @@
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000162
@@ -5903,18 +4518,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -5931,26 +4539,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000022
@@ -5960,26 +4555,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000023
@@ -5989,18 +4577,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6032,18 +4613,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6060,23 +4634,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -6084,18 +4651,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -6112,26 +4672,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000026
@@ -6141,23 +4694,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -6165,18 +4705,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -6193,18 +4726,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6236,18 +4762,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6264,18 +4783,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6288,23 +4800,16 @@
Element 'ram:FormattedIssueDateTime' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -6312,18 +4817,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -6415,18 +4913,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6443,26 +4934,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000031
@@ -6472,23 +4950,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -6496,18 +4967,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -6539,26 +5003,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000036
@@ -6568,26 +5025,19 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
+
-
+
FX-SCH-A-000031
@@ -6597,18 +5047,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6621,18 +5064,11 @@
Element 'ram:TradingBusinessName' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -6649,18 +5085,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6677,26 +5106,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000031
@@ -6706,18 +5122,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6734,18 +5143,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6762,26 +5164,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000031
@@ -6791,18 +5180,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6819,18 +5201,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6843,23 +5218,16 @@
Element 'ram:FormattedIssueDateTime' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -6867,18 +5235,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -6925,18 +5286,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -6949,18 +5303,11 @@
Element 'ram:GlobalID' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -6973,18 +5320,11 @@
Element 'ram:ID' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7016,26 +5356,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000036
@@ -7045,18 +5378,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7069,18 +5395,11 @@
Element 'ram:SpecifiedLegalOrganization' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7097,18 +5416,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7125,26 +5437,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000031
@@ -7154,18 +5453,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7178,18 +5470,11 @@
Element 'ram:URIUniversalCommunication' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7266,18 +5551,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7294,26 +5572,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000031
@@ -7323,23 +5588,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -7347,18 +5605,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7390,26 +5641,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000036
@@ -7419,26 +5663,19 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
+
-
+
FX-SCH-A-000031
@@ -7448,18 +5685,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7472,18 +5702,11 @@
Element variant 'ram:SpecifiedTaxRegistration[ not(ram:ID/@schemeID="VA") and not(ram:ID/@schemeID="FC")]' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7500,18 +5723,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7528,18 +5744,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7556,18 +5765,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7584,18 +5786,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7612,18 +5807,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7640,26 +5828,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000031
@@ -7669,46 +5844,11 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- FX-SCH-A-000170
-
-
-
-
- [BR-57]-Each Deliver to address (BG-15) shall contain a Deliver to country code (BT-80).
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -7725,18 +5865,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7753,26 +5886,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000022
@@ -7782,18 +5902,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7810,18 +5923,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7834,23 +5940,16 @@
Element 'ram:FormattedIssueDateTime' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -7858,18 +5957,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -7901,18 +5993,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -7929,26 +6014,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000031
@@ -7958,23 +6030,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -7982,18 +6047,11 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -8025,26 +6083,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000036
@@ -8054,18 +6105,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -8078,18 +6122,11 @@
Element 'ram:SpecifiedLegalOrganization' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -8102,18 +6139,11 @@
Element 'ram:SpecifiedTaxRegistration' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -8126,18 +6156,11 @@
Element 'ram:URIUniversalCommunication' is marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
@@ -8229,18 +6252,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -8302,23 +6318,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -8326,23 +6335,16 @@
Attribute @currencyID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -8350,26 +6352,19 @@
Attribute @currencyID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000179
@@ -8379,26 +6374,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000180
@@ -8408,26 +6396,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000181
@@ -8437,26 +6418,19 @@
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000023
@@ -8466,18 +6440,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -8494,26 +6461,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000022
@@ -8523,18 +6477,11 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -8551,26 +6498,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
FX-SCH-A-000022
@@ -8580,23 +6514,16 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -8604,26 +6531,19 @@
Attribute @schemeID' marked as not used in the given context.
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
FX-SCH-A-000040