Merge remote-tracking branch 'origin/issues/503-ubl' into issues/503-ubl

History.md

@@ -1,21 +1,37 @@
+2.15.1
+=======
+- #566
+- have a bean contructor for direct debit
+-? lineTotalAmount is null 
+? be able to access ID in error message
+- closes #579
+- #581
+- #576
+- #578
+- log error ids
+- #503 import more ubl
+
 2.15.0
 =======
-2024-
-- 435 use invoiceimporter as common technical basis also for zugferdimporter 
+2024-11-18
+- #435 use invoiceimporter as common technical basis also for zugferdimporter 
 - also import delivery address
-- 527 metrics may raise error on some pdf files
-- 517 read product GlobalID
-- 380 Added test for input stream validation
-- 518 corrently validate more XRechnung versions
+- #527 metrics may raise error on some pdf files
+- #517 read product GlobalID
+- #380 Added test for input stream validation
+- #518 corrently validate more XRechnung versions
 - make document charges and allowances serializable
-- 523 Verapdf claims PDF-A/3s created witth visualize are invalid
-- 530 duedate can not be set directly
-- 532 support validation warnings!
-- 534 new signature
-- 538 Mustang validator always claims PDF is invalid if flavour is PDF/A-3A
-- 555 be able to validate ubl credit notes
+- #523 Verapdf claims PDF-A/3s created witth visualize are invalid
+- #530 duedate can not be set directly
+- #532 support validation warnings!
+- #534 new signature
+- #538 Mustang validator always claims PDF is invalid if flavour is PDF/A-3A
+- #555 be able to validate ubl credit notes
 - when parsing now distinguishing between the parseExceptions StructureException and ArithmetricException
-
+- #554 Import IncludedNotes on invoice extraction 
+- #542 Visualize SpecifiedLogisticsServiceCharge 
+- #531 Support ZUGFeRD 2.3.2 
+- #480 Support netherlands Euro
 
 2.14.2
 =======

Mustang-CLI/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.mustangproject</groupId>
         <artifactId>core</artifactId>
-        <version>2.15.0-SNAPSHOT</version>
+        <version>2.15.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.mustangproject</groupId>
@@ -12,7 +12,7 @@
         should also work for XRechnung/CII.
     </name>
     <packaging>jar</packaging>
-    <version>2.15.0-SNAPSHOT</version>
+    <version>2.15.1-SNAPSHOT</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.compilerVersion>11</maven.compiler.compilerVersion>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.mustangproject</groupId>
             <artifactId>validator</artifactId>
-            <version>2.15.0-SNAPSHOT</version>
+            <version>2.15.1-SNAPSHOT</version>
             <!-- prototypes of new mustangproject versions can be installed by referring to them and installed to the local repo from a jar file with
            mvn install:install-file -Dfile=mustang-1.5.4-SNAPSHOT.jar -DgroupId=org.mustangproject.ZUGFeRD -DartifactId=mustang -Dversion=1.5.4 -Dpackaging=jar -DgeneratePom=true
            -->

README.md

@@ -32,9 +32,10 @@ If you set up a Maven project, you can reference the mustang artifact like this:
 
 ```xml
 <dependency>
-  <groupId>org.mustangproject</groupId>
-  <artifactId>library</artifactId>
- <version>2.14.0</version>
+    <groupId>org.mustangproject</groupId>
+    <artifactId>validator</artifactId>
+    <version>2.15.0</version>
+    <classifier>shaded</classifier>
 </dependency>
 ```
 

library/pom.xml

@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.mustangproject</groupId>
         <artifactId>core</artifactId>
-        <version>2.15.0-SNAPSHOT</version>
+        <version>2.15.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.mustangproject</groupId>
     <artifactId>library</artifactId>
-    <version>2.15.0-SNAPSHOT</version>
+    <version>2.15.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Library to write, read and validate e-invoices (Factur-X, ZUGFeRD, Order-X, XRechnung/CII)</name>
     <description>FOSS Java library to read, write and validate european electronic invoices and orders in the UN/CEFACT

library/src/main/java/org/mustangproject/CalculatedInvoice.java

@@ -11,11 +11,13 @@ import java.math.BigDecimal;
 
 public class CalculatedInvoice extends Invoice implements Serializable {
 
-    protected BigDecimal grandTotal=null;
+	protected BigDecimal grandTotal=null;
+	protected BigDecimal lineTotalAmount=null;
 
     public void calculate() {
         TransactionCalculator tc=new TransactionCalculator(this);
         grandTotal=tc.getGrandTotal();
+		lineTotalAmount=tc.getValue();
     }
 	public BigDecimal getGrandTotal() {
 		if (grandTotal==null) {
@@ -27,4 +29,15 @@ public class CalculatedInvoice extends Invoice implements Serializable {
 		grandTotal=grand;
 		return this;
 	}
+	public BigDecimal getLineTotalAmount() {
+		if (lineTotalAmount==null) {
+			calculate();
+		}
+		return lineTotalAmount;
+	}
+	public CalculatedInvoice setLineTotalAmount(BigDecimal total) {
+		lineTotalAmount=total;
+		return this;
+	}
+
 }

library/src/main/java/org/mustangproject/DirectDebit.java

@@ -9,12 +9,19 @@ public class DirectDebit implements IZUGFeRDTradeSettlementDebit {
 	/**
 	 * Debited account identifier (BT-91)
 	 */
-	protected final String IBAN;
+	protected String IBAN;
 
 	/**
 	 * Mandate reference identifier (BT-89)
 	 */
-	protected final String mandate;
+	protected String mandate;
+
+	/**
+	 * bean constructor
+	 */
+	public DirectDebit() {
+
+	}
 
 	/***
 	 * constructor for normal use :-)

library/src/main/java/org/mustangproject/FileAttachment.java

@@ -8,6 +8,14 @@ public class FileAttachment {
 	protected String description;
 	protected byte[] data;
 
+
+	/***
+	 * bean contructor
+	 */
+	public FileAttachment() {
+
+	}
+
 	public FileAttachment(String filename, String mimetype, String relation, byte[] data) {
 		this.filename = filename;
 		this.mimetype = mimetype;

library/src/main/java/org/mustangproject/IncludedNote.java

@@ -4,8 +4,8 @@ package org.mustangproject;
  * A grouping of business terms to indicate accounting-relevant free texts including a qualification of these.
  */
 public class IncludedNote {
-  private final String content;
-  private final SubjectCode subjectCode;
+  private String content;
+  private SubjectCode subjectCode;
 
   private static final String INCLUDE_START = "<ram:IncludedNote>";
   private static final String INCLUDE_END = "</ram:IncludedNote>";
@@ -19,6 +19,13 @@ public class IncludedNote {
     this.subjectCode = subjectCode;
   }
 
+	/**
+	 * bean constructor
+	 */
+	public  IncludedNote() {
+
+	}
+
   public static IncludedNote generalNote(String content) {
     return new IncludedNote(content, SubjectCode.AAI);
   }

library/src/main/java/org/mustangproject/Invoice.java

@@ -66,6 +66,7 @@ public class Invoice implements IExportableTransaction {
 	protected String despatchAdviceReferencedDocumentID = null;
 	protected String vatDueDateTypeCode = null;
 	protected String creditorReferenceID; // required when direct debit is used.
+	private BigDecimal roundingAmount=null;
 
 	public Invoice() {
 		ZFItems = new ArrayList<>();
@@ -467,6 +468,26 @@ public class Invoice implements IExportableTransaction {
 		return sender;
 	}
 
+	/***
+	 * for currency rounding differences to 5ct e.g. in Netherlands ("Rappenrundung")
+	 * @return null if not set, otherwise BigDecimal of Euros
+	 */
+	@Override
+	public BigDecimal getRoundingAmount() {
+		return roundingAmount;
+	}
+
+	/***
+	 * set the cent e.g. to reach the next 5ct mark for currencies in certain countries
+	 * e.g. in the Netherlands ("Rappenrundung")
+	 * @param amount
+	 * @return fluent setter
+	 */
+	public Invoice setRoundingAmount(BigDecimal amount) {
+		 roundingAmount=amount;
+		 return this;
+	}
+
 	/***
 	 * sets a named sender contact
 	 * @deprecated use setSender
@@ -524,8 +545,8 @@ public class Invoice implements IExportableTransaction {
 
 	/***
 	 * this is wrong and only used from jackson
-	 * @param iza
-	 * @return
+	 * @param iza the Array of allowances/charges
+	 * @return fluent setter
 	 */
 	public Invoice setZFAllowances(Allowance[] iza) {
 		Allowances=new ArrayList<>();
@@ -548,8 +569,8 @@ public class Invoice implements IExportableTransaction {
 
 	/***
 	 * this is wrong and only used from jackson
-	 * @param iza
-	 * @return
+	 * @param iza the array of charges
+	 * @return fluent setter
 	 */
 	public Invoice setZFCharges(Charge[] iza) {
 		Charges=new ArrayList<>();

library/src/main/java/org/mustangproject/Item.java

@@ -97,6 +97,9 @@ public class Item implements IZUGFeRDExportableItem {
 			icnm.getAsNodeMap("ClassifiedTaxCategory").flatMap(m -> m.getAsBigDecimal("Percent"))
 				.ifPresent(product::setVATPercent);
 		});
+		itemMap.getAsNodeMap("AssociatedDocumentLineDocument").ifPresent(icnm -> {
+			icnm.getAsString("LineID").ifPresent(this::setId);
+		});
 
 		itemMap.getAsNodeMap("Price").ifPresent(icnm -> {
 			// ubl

library/src/main/java/org/mustangproject/XMLTools.java

@@ -92,7 +92,7 @@ public class XMLTools extends XMLWriter {
 	/***
 	 * formats a number so that at least minDecimals are displayed but at the maximum maxDecimals are there, i.e.
 	 * cuts potential 0s off the end until minDecimals
-	 * @param value
+	 * @param value the value to be formatted
 	 * @param maxDecimals number of maximal scale
 	 * @param minDecimals number of minimal scale
 	 * @return value as String with decimals in the specified range
@@ -138,7 +138,7 @@ public class XMLTools extends XMLWriter {
 	}
 
 	/***
-	 * relplaces some entities like < , > and & with their escaped pendant like &lt;
+	 * relplaces some entities like &lt; , &gt; and &amp; with their escaped pendant like &amp;lt;
 	 * @param s the string
 	 * @return the "safe" string
 	 */

library/src/main/java/org/mustangproject/ZUGFeRD/IExportableTransaction.java

@@ -321,6 +321,15 @@ public interface IExportableTransaction {
 		return false;
 	}
 
+	/**
+	 * supplier identification assigned by the costumer
+	 *
+	 * @return the sender's identification
+	 */
+	default BigDecimal getRoundingAmount() {
+		return null;
+	}
+
 	/**
 	 * get reference document number typically used for Invoice Corrections Will be
 	 * added as IncludedNote in comfort profile

library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableItem.java

@@ -153,4 +153,12 @@ public interface IZUGFeRDExportableItem extends IAbsoluteValueProvider{
 		return null;
 	}
 
+
+	/***
+	 *
+	 * @return the line ID
+	 */
+	default String getId()  {
+		return null;
+	}
 }

library/src/main/java/org/mustangproject/ZUGFeRD/TransactionCalculator.java

@@ -10,7 +10,7 @@ import java.util.stream.Stream;
 /***
  * The Transactioncalculator e.g. adds the line totals and applies VAT on whole
  * invoices
- * 
+ *
  * @see LineCalculator
  */
 public class TransactionCalculator implements IAbsoluteValueProvider {
@@ -27,7 +27,7 @@ public class TransactionCalculator implements IAbsoluteValueProvider {
 	/***
 	 * if something had already been paid in advance, this will get it from the
 	 * transaction
-	 * 
+	 *
 	 * @return prepaid amount
 	 */
 	protected BigDecimal getTotalPrepaid() {
@@ -41,19 +41,19 @@ public class TransactionCalculator implements IAbsoluteValueProvider {
 	/***
 	 * the invoice total with VAT, allowances and
 	 * charges, WITHOUT considering prepaid amount
-	 * 
+	 *
 	 * @return the invoice total including taxes
 	 */
 	public BigDecimal getGrandTotal() {
 
-		final BigDecimal res = getTaxBasis();
+		BigDecimal basis = getTaxBasis();
 		return getVATPercentAmountMap().values().stream().map(VATAmount::getCalculated)
-				.map(p -> p.setScale(2, RoundingMode.HALF_UP)).reduce(BigDecimal.ZERO, BigDecimal::add).add(res);
+			.map(p -> p.setScale(2, RoundingMode.HALF_UP)).reduce(BigDecimal.ZERO, BigDecimal::add).add(basis);
 	}
 
 	/***
 	 * returns total of charges for this tax rate
-	 * 
+	 *
 	 * @param percent a specific rate, or null for any rate
 	 * @return the total amount
 	 */
@@ -77,7 +77,7 @@ public class TransactionCalculator implements IAbsoluteValueProvider {
 	/***
 	 * returns a (potentially concatenated) string of charge reasons, or "Charges"
 	 * if none are defined
-	 * 
+	 *
 	 * @param percent a specific rate, or null for any rate
 	 * @return the space separated String
 	 */
@@ -95,7 +95,7 @@ public class TransactionCalculator implements IAbsoluteValueProvider {
 		if ((charges != null) && (charges.length > 0)) {
 			for (IZUGFeRDAllowanceCharge currentCharge : charges) {
 				if ((percent == null) || (currentCharge.getTaxPercent().compareTo(percent) == 0)
-						&& currentCharge.getReason() != null) {
+					&& currentCharge.getReason() != null) {
 					res += currentCharge.getReason() + " ";
 				}
 			}
@@ -107,7 +107,7 @@ public class TransactionCalculator implements IAbsoluteValueProvider {
 	/***
 	 * returns a (potentially concatenated) string of allowance reasons, or
 	 * "Allowances", if none are defined
-	 * 
+	 *
 	 * @param percent a specific rate, or null for any rate
 	 * @return the space separated String
 	 */
@@ -122,7 +122,7 @@ public class TransactionCalculator implements IAbsoluteValueProvider {
 
 	/***
 	 * returns total of allowances for this tax rate
-	 * 
+	 *
 	 * @param percent a specific rate, or null for any rate
 	 * @return the total amount
 	 */
@@ -134,25 +134,25 @@ public class TransactionCalculator implements IAbsoluteValueProvider {
 	/***
 	 * returns the total net value of all items, without document level
 	 * charges/allowances
-	 * 
+	 *
 	 * @return item sum
 	 */
 	protected BigDecimal getTotal() {
 		BigDecimal dec = Stream.of(trans.getZFItems()).map(LineCalculator::new)
-				.map(LineCalculator::getItemTotalNetAmount).reduce(ZERO, BigDecimal::add);
+			.map(LineCalculator::getItemTotalNetAmount).reduce(ZERO, BigDecimal::add);
 		return dec;
 	}
 
 	/***
 	 * returns the total net value of the invoice, including charges/allowances on
 	 * document level
-	 * 
+	 *
 	 * @return item sum +- charges/allowances
 	 */
 	protected BigDecimal getTaxBasis() {
 		return getTotal().add(getChargesForPercent(null).setScale(2, RoundingMode.HALF_UP))
-				.subtract(getAllowancesForPercent(null).setScale(2, RoundingMode.HALF_UP))
-				.setScale(2, RoundingMode.HALF_UP);
+			.subtract(getAllowancesForPercent(null).setScale(2, RoundingMode.HALF_UP))
+			.setScale(2, RoundingMode.HALF_UP);
 	}
 
 	/**
@@ -171,9 +171,9 @@ public class TransactionCalculator implements IAbsoluteValueProvider {
 			if (percent != null) {
 				LineCalculator lc = new LineCalculator(currentItem);
 				VATAmount itemVATAmount = new VATAmount(lc.getItemTotalNetAmount(), lc.getItemTotalVATAmount(),
-						currentItem.getProduct().getTaxCategoryCode(), vatDueDateTypeCode);
-				String reasonText=currentItem.getProduct().getTaxExemptionReason();
-				if (reasonText!=null) {
+					currentItem.getProduct().getTaxCategoryCode(), vatDueDateTypeCode);
+				String reasonText = currentItem.getProduct().getTaxExemptionReason();
+				if (reasonText != null) {
 					itemVATAmount.setVatExemptionReasonText(reasonText);
 				}
 				VATAmount current = hm.get(percent.stripTrailingZeros());
@@ -193,8 +193,8 @@ public class TransactionCalculator implements IAbsoluteValueProvider {
 					VATAmount theAmount = hm.get(taxPercent.stripTrailingZeros());
 					if (theAmount == null) {
 						theAmount = new VATAmount(BigDecimal.ZERO, BigDecimal.ZERO,
-								currentCharge.getCategoryCode() != null ? currentCharge.getCategoryCode() : "S",
-								vatDueDateTypeCode);
+							currentCharge.getCategoryCode() != null ? currentCharge.getCategoryCode() : "S",
+							vatDueDateTypeCode);
 					}
 					theAmount.setBasis(theAmount.getBasis().add(currentCharge.getTotalAmount(this)));
 					BigDecimal factor = taxPercent.divide(new BigDecimal(100));
@@ -211,8 +211,8 @@ public class TransactionCalculator implements IAbsoluteValueProvider {
 					VATAmount theAmount = hm.get(taxPercent.stripTrailingZeros());
 					if (theAmount == null) {
 						theAmount = new VATAmount(BigDecimal.ZERO, BigDecimal.ZERO,
-								currentAllowance.getCategoryCode() != null ? currentAllowance.getCategoryCode() : "S",
-								vatDueDateTypeCode);
+							currentAllowance.getCategoryCode() != null ? currentAllowance.getCategoryCode() : "S",
+							vatDueDateTypeCode);
 					}
 					theAmount.setBasis(theAmount.getBasis().subtract(currentAllowance.getTotalAmount(this)));
 					BigDecimal factor = taxPercent.divide(new BigDecimal(100));
@@ -239,4 +239,11 @@ public class TransactionCalculator implements IAbsoluteValueProvider {
 		return getAllowancesForPercent(null).setScale(2, RoundingMode.HALF_UP);
 	}
 
+	public BigDecimal getDuePayable() {
+		BigDecimal res = getGrandTotal().subtract(getTotalPrepaid());
+		if (trans.getRoundingAmount() != null) {
+			res = res.add(trans.getRoundingAmount());
+		}
+		return res;
+	}
 }

library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java

@@ -334,7 +334,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 		this.trans = trans;
 		this.calc = new TransactionCalculator(trans);
 
-		boolean hasDueDate = trans.getDueDate()!=null;
+		boolean hasDueDate = trans.getDueDate() != null;
 		final SimpleDateFormat germanDateFormat = new SimpleDateFormat("dd.MM.yyyy");
 
 		String exemptionReason = "";
@@ -401,6 +401,10 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 		int lineID = 0;
 		for (final IZUGFeRDExportableItem currentItem : trans.getZFItems()) {
 			lineID++;
+			String lineIDStr = Integer.toString(lineID);
+			if (currentItem.getId()!=null) {
+				lineIDStr=currentItem.getId();
+			}
 			if (currentItem.getProduct().getTaxExemptionReason() != null) {
 				exemptionReason = "<ram:ExemptionReason>" + XMLTools.encodeXML(currentItem.getProduct().getTaxExemptionReason()) + "</ram:ExemptionReason>";
 			}
@@ -408,7 +412,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 			if ((getProfile() != Profiles.getByName("Minimum")) && (getProfile() != Profiles.getByName("BasicWL"))) {
 				xml += "<ram:IncludedSupplyChainTradeLineItem>" +
 					"<ram:AssociatedDocumentLineDocument>"
-					+ "<ram:LineID>" + lineID + "</ram:LineID>"
+					+ "<ram:LineID>" + lineIDStr + "</ram:LineID>"
 					+ buildItemNotes(currentItem)
 					+ "</ram:AssociatedDocumentLineDocument>"
 
@@ -454,7 +458,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 				if (currentItem.getProduct().getClassifications() != null && currentItem.getProduct().getClassifications().length > 0) {
 					for (IDesignatedProductClassification classification : currentItem.getProduct().getClassifications()) {
 						xml += "<ram:DesignatedProductClassification>"
-							+ "<ram:ClassCode listId=\"" +  XMLTools.encodeXML(classification.getClassCode().getListID()) + "\"";
+							+ "<ram:ClassCode listId=\"" + XMLTools.encodeXML(classification.getClassCode().getListID()) + "\"";
 						if (classification.getClassCode().getListVersionID() != null) {
 							xml += " listVersionID=\"" + XMLTools.encodeXML(classification.getClassCode().getListVersionID()) + "\"";
 						}
@@ -856,7 +860,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 		final String chargesTotalLine = "<ram:ChargeTotalAmount>" + currencyFormat(calc.getChargesForPercent(null)) + "</ram:ChargeTotalAmount>";
 
 		xml += "<ram:SpecifiedTradeSettlementHeaderMonetarySummation>";
-		if (getProfile() != Profiles.getByName("Minimum")) {
+		if ((getProfile() != Profiles.getByName("Minimum")) && (getProfile() != Profiles.getByName("BASICWL"))) {
 			xml += "<ram:LineTotalAmount>" + currencyFormat(calc.getTotal()) + "</ram:LineTotalAmount>";
 			xml += chargesTotalLine
 				+ allowanceTotalLine;
@@ -865,14 +869,18 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 			// //
 			// currencyID=\"EUR\"
 			+ "<ram:TaxTotalAmount currencyID=\"" + trans.getCurrency() + "\">"
-			+ currencyFormat(calc.getGrandTotal().subtract(calc.getTaxBasis())) + "</ram:TaxTotalAmount>"
-			+ "<ram:GrandTotalAmount>" + currencyFormat(calc.getGrandTotal()) + "</ram:GrandTotalAmount>";
+			+ currencyFormat(calc.getGrandTotal().subtract(calc.getTaxBasis())) + "</ram:TaxTotalAmount>";
+		if (trans.getRoundingAmount() != null) {
+			xml += "<ram:RoundingAmount>" + currencyFormat(trans.getRoundingAmount()) + "</ram:RoundingAmount>";
+		}
+
+		xml += "<ram:GrandTotalAmount>" + currencyFormat(calc.getGrandTotal()) + "</ram:GrandTotalAmount>";
 		// //
 		// currencyID=\"EUR\"
 		if (getProfile() != Profiles.getByName("Minimum")) {
 			xml += "<ram:TotalPrepaidAmount>" + currencyFormat(calc.getTotalPrepaid()) + "</ram:TotalPrepaidAmount>";
 		}
-		xml += "<ram:DuePayableAmount>" + currencyFormat(calc.getGrandTotal().subtract(calc.getTotalPrepaid())) + "</ram:DuePayableAmount>"
+		xml += "<ram:DuePayableAmount>" + currencyFormat(calc.getDuePayable()) + "</ram:DuePayableAmount>"
 			+ "</ram:SpecifiedTradeSettlementHeaderMonetarySummation>";
 		if (trans.getInvoiceReferencedDocumentID() != null) {
 			xml += "<ram:InvoiceReferencedDocument>"

library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java

@@ -655,6 +655,7 @@ public class ZUGFeRDImporter extends ZUGFeRDInvoiceImporter {
 
 	/**
 	 * returns a list of LineItems
+	 * @deprecated use invoiceimporter getZFItems
 	 *
 	 * @return a List of LineItem instances
 	 */

library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java

@@ -102,7 +102,7 @@ public class ZUGFeRDInvoiceImporter {
 
 	/***
 	 * return the file names of all files embedded into the PDF
-	 * @see for XML embedded files please use ZUGFeRDInvoiceImporter.getFileAttachmentsXML
+	 * @see ZUGFeRDInvoiceImporter for XML embedded files please use ZUGFeRDInvoiceImporter.getFileAttachmentsXML
 	 * @return a ArrayList of FileAttachments, empty if none
 	 */
 	public List<FileAttachment> getFileAttachmentsPDF() {
@@ -229,7 +229,7 @@ public class ZUGFeRDInvoiceImporter {
 	 * set the xml of a CII invoice
 	 * @param rawXML the xml string
 	 * @param doParse automatically parse input for zugferdImporter (not ZUGFeRDInvoiceImporter)
-	 * @throws IOException
+	 * @throws IOException if parsing xml throws it (unlikely its string based)
 	 */
 	public void setRawXML(byte[] rawXML, boolean doParse) throws IOException {
 		this.containsMeta = true;
@@ -249,7 +249,7 @@ public class ZUGFeRDInvoiceImporter {
 	/***
 	 * set the xml of a CII invoice, simple version
 	 * @param rawXML the cii(?) as a string
-	 * @throws IOException
+	 * @throws IOException  if parsing xml throws it (unlikely its string based)
 	 */
 	public void setRawXML(byte[] rawXML) throws IOException {
 		setRawXML(rawXML, true);
@@ -400,12 +400,21 @@ public class ZUGFeRDInvoiceImporter {
 			}
 		}
 
-		xpr = xpath.compile("//*[local-name()=\"PrepaidAmount\"]");
+		xpr = xpath.compile("//*[local-name()=\"TotalPrepaidAmount\"]|//*[local-name()=\"PrepaidAmount\"]");
 		NodeList prepaidNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
 		if (prepaidNodes.getLength() > 0) {
 			zpp.setTotalPrepaidAmount(new BigDecimal(XMLTools.trimOrNull(prepaidNodes.item(0))));
 		}
 
+
+		xpr = xpath.compile("//*[local-name()=\"SpecifiedTradeSettlementHeaderMonetarySummation\"]/*[local-name()=\"LineTotalAmount\"]|//*[local-name()=\"LegalMonetaryTotal\"]/*[local-name()=\"LineExtensionAmount\"]");
+		NodeList lineTotalNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
+		if (lineTotalNodes.getLength() > 0) {
+			if (zpp instanceof CalculatedInvoice) {
+				((CalculatedInvoice) zpp).setLineTotalAmount(new BigDecimal(XMLTools.trimOrNull(lineTotalNodes.item(0))));
+			}
+		}
+
 		Date issueDate = null;
 		Date dueDate = null;
 		Date deliveryDate = null;
@@ -430,6 +439,34 @@ public class ZUGFeRDInvoiceImporter {
 						}
 					}
 				}
+				List<IncludedNote> includedNotes = new ArrayList<>();
+				if ((item.getLocalName() != null) && (item.getLocalName().equals("IncludedNote"))) {
+					String subjectCode = "";
+					String content = null;
+					NodeList includedNodeChilds = item.getChildNodes();
+					for (int issueDateChildIndex = 0; issueDateChildIndex < includedNodeChilds.getLength(); issueDateChildIndex++) {
+						if ((includedNodeChilds.item(issueDateChildIndex).getLocalName() != null)
+							&& (includedNodeChilds.item(issueDateChildIndex).getLocalName().equals("Content"))) {
+							content = XMLTools.trimOrNull(includedNodeChilds.item(issueDateChildIndex));
+						}
+						if ((includedNodeChilds.item(issueDateChildIndex).getLocalName() != null)
+							&& (includedNodeChilds.item(issueDateChildIndex).getLocalName().equals("SubjectCode"))) {
+							subjectCode = XMLTools.trimOrNull(includedNodeChilds.item(issueDateChildIndex));
+						}
+					}
+					switch (subjectCode){
+						case "AAI": includedNotes.add(IncludedNote.generalNote(content)); break;
+						case "REG": includedNotes.add(IncludedNote.regulatoryNote(content)); break;
+						case "ABL": includedNotes.add(IncludedNote.legalNote(content)); break;
+						case "CUS": includedNotes.add(IncludedNote.customsNote(content)); break;
+						case "SUR": includedNotes.add(IncludedNote.sellerNote(content)); break;
+						case "TXD": includedNotes.add(IncludedNote.taxNote(content)); break;
+						case "ACY": includedNotes.add(IncludedNote.introductionNote(content)); break;
+						case "AAK": includedNotes.add(IncludedNote.discountBonusNote(content)); break;
+						default: includedNotes.add(IncludedNote.unspecifiedNote(content)); break;
+					}
+				}
+				zpp.addNotes(includedNotes);
 			}
 		}
 		String rootNode = extractString("local-name(/*)");
@@ -686,11 +723,16 @@ public class ZUGFeRDInvoiceImporter {
 
 		zpp.setOwnOrganisationName(extractString("//*[local-name()=\"SellerTradeParty\"]/*[local-name()=\"Name\"]|//*[local-name()=\"AccountingSupplierParty\"]/*[local-name()=\"Party\"]/*[local-name()=\"PartyName\"]").trim());
 
+		String rounding=extractString("//*[local-name()=\"SpecifiedTradeSettlementHeaderMonetarySummation\"]/*[local-name()=\"RoundingAmount\"]|//*[local-name()=\"LegalMonetaryTotal\"]/*[local-name()=\"Party\"]/*[local-name()=\"PayableRoundingAmount\"]");
+		if ((rounding!=null)&&(!rounding.isEmpty())) {
+			zpp.setRoundingAmount(new BigDecimal(rounding.trim()));
+		}
+
 		xpr = xpath.compile("//*[local-name()=\"BuyerReference\"]");
 		String buyerReference = null;
-		prepaidNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
-		if (prepaidNodes.getLength() > 0) {
-			buyerReference = XMLTools.trimOrNull(prepaidNodes.item(0));
+		lineTotalNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
+		if (lineTotalNodes.getLength() > 0) {
+			buyerReference = XMLTools.trimOrNull(lineTotalNodes.item(0));
 		}
 		if (buyerReference != null) {
 			zpp.setReferenceNumber(buyerReference);

library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDVisualizer.java

@@ -249,6 +249,12 @@ public class ZUGFeRDVisualizer {
 		EStandard theStandard = findOutStandardFromRootNode(fis);
 		fis = new FileInputStream(xmlFilename);//rewind :-(
 
+		return toFOP(fis, theStandard);
+	}
+
+	protected String toFOP(InputStream is, EStandard theStandard)
+		throws FileNotFoundException, TransformerException {
+			
 		try {
 			if (mXsltPDFTemplate == null) {
 				mXsltPDFTemplate = mFactory.newTemplates(
@@ -263,11 +269,11 @@ public class ZUGFeRDVisualizer {
 
 		//zf2 or fx
 		if (theStandard == EStandard.facturx) {
-			applyZF2XSLT(fis, iaos);
+			applyZF2XSLT(is, iaos);
 		} else if (theStandard == EStandard.ubl) {
-			applyUBL2XSLT(fis, iaos);
+			applyUBL2XSLT(is, iaos);
 		} else if (theStandard == EStandard.ubl_creditnote) {
-			applyUBLCreditNote2XSLT(fis, iaos);
+			applyUBLCreditNote2XSLT(is, iaos);
 		}
 
 

library/src/main/resources/stylesheets/cii-xr.xsl

@@ -154,6 +154,8 @@
                                  select="./rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='false']"/>
             <xsl:apply-templates mode="BG-21"
                                  select="./rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='true']"/>
+            <xsl:apply-templates mode="BG-X-42"
+                                 select="./rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedLogisticsServiceCharge"/>                     
             <xsl:apply-templates mode="BG-22"
                                  select="./rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementHeaderMonetarySummation"/>
             <xsl:apply-templates mode="BG-23"
@@ -1633,6 +1635,57 @@
             <!-- End: Jan Thiele -->
         </xr:Document_level_charge_reason_code>
     </xsl:template>
+    <xsl:template mode="BG-X-42"
+                  match="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedLogisticsServiceCharge">
+        <xsl:variable name="bg-contents"
+                      as="item()*"><!--Der Pfad /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedLogisticsServiceCharge der Instanz in konkreter Syntax wird auf 4 Objekte abgebildet. -->
+            <xsl:apply-templates mode="BT-X-271" select="./ram:Description"/>
+            <xsl:apply-templates mode="BT-X-272" select="./ram:AppliedAmount"/>
+            <xsl:apply-templates mode="BT-X-273" select="./ram:AppliedTradeTax/ram:CategoryCode"/>
+            <xsl:apply-templates mode="BT-X-274" select="./ram:AppliedTradeTax/ram:RateApplicablePercent"/>
+        </xsl:variable>
+        <xsl:if test="$bg-contents">
+            <xr:LOGISTICS_SERVICE_CHARGES>
+                <xsl:attribute name="xr:id" select="'BG-X-42'"/>
+                <xsl:attribute name="xr:src" select="xr:src-path(.)"/>
+                <xsl:sequence select="$bg-contents"/>
+            </xr:LOGISTICS_SERVICE_CHARGES>
+        </xsl:if>
+    </xsl:template>
+    <xsl:template mode="BT-X-271"
+                  match="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedLogisticsServiceCharge/ram:Description">
+        <xr:Logistics_service_charge_description>
+            <xsl:attribute name="xr:id" select="'BT-X-271'"/>
+            <xsl:attribute name="xr:src" select="xr:src-path(.)"/>
+            <xsl:call-template name="amount"/>
+        </xr:Logistics_service_charge_description>
+    </xsl:template>
+    <xsl:template mode="BT-X-272"
+                  match="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedLogisticsServiceCharge/ram:AppliedAmount">
+        <xr:Logistics_service_charge_amount>
+            <xsl:attribute name="xr:id" select="'BT-X-272'"/>
+            <xsl:attribute name="xr:src" select="xr:src-path(.)"/>
+            <xsl:call-template name="amount"/>
+        </xr:Logistics_service_charge_amount>
+    </xsl:template>
+    <xsl:template mode="BT-X-273"
+                  match="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedLogisticsServiceCharge/ram:AppliedTradeTax/ram:CategoryCode">
+        <xr:Logistics_service_charge_VAT_category_code>
+            <xsl:attribute name="xr:id" select="'BT-X-273'"/>
+            <xsl:attribute name="xr:src" select="xr:src-path(.)"/>
+            <xsl:call-template name="code.UNTDID.5305">
+                <xsl:with-param name="myparam" select="."/>
+            </xsl:call-template>
+        </xr:Logistics_service_charge_VAT_category_code>
+    </xsl:template>
+    <xsl:template mode="BT-X-274"
+                  match="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedLogisticsServiceCharge/ram:AppliedTradeTax/ram:RateApplicablePercent">
+        <xr:Logistics_service_charge_VAT_rate>
+            <xsl:attribute name="xr:id" select="'BT-X-274'"/>
+            <xsl:attribute name="xr:src" select="xr:src-path(.)"/>
+            <xsl:call-template name="percentage"/>
+        </xr:Logistics_service_charge_VAT_rate>
+    </xsl:template>
     <xsl:template mode="BG-22"
                   match="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementHeaderMonetarySummation">
         <xsl:variable name="bg-contents"

library/src/test/java/org/mustangproject/ZUGFeRD/DeSerializationTest.java

@@ -28,11 +28,17 @@ import org.junit.FixMethodOrder;
 import org.junit.runners.MethodSorters;
 import org.mustangproject.*;
 
+import javax.xml.xpath.XPathExpressionException;
+import java.io.File;
+import java.io.IOException;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.text.ParseException;
 import java.util.Date;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class DeSerializationTest extends TestCase {
+public class DeSerializationTest extends  ResourceCase {
 	public void testJackson() throws JsonProcessingException {
 
 		ObjectMapper mapper = new ObjectMapper();
@@ -50,6 +56,33 @@ public class DeSerializationTest extends TestCase {
 
 	}
 
+	public void testInvoiceLine() throws JsonProcessingException {
+		File inputCII = getResourceAsFile("factur-x.xml");
+		boolean hasExceptions = false;
+
+		ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter();
+		try {
+			zii.fromXML(new String(Files.readAllBytes(inputCII.toPath()), StandardCharsets.UTF_8));
+
+		} catch (IOException e) {
+			hasExceptions = true;
+		}
+
+		CalculatedInvoice ci=new CalculatedInvoice();
+		try {
+			zii.extractInto(ci);
+		} catch (XPathExpressionException e) {
+			hasExceptions = true;
+		} catch (ParseException e) {
+			hasExceptions = true;
+		}
+		ObjectMapper mapper = new ObjectMapper();
+		String jsonArray = mapper.writeValueAsString(ci);
+		assertFalse(hasExceptions);
+		assertTrue(jsonArray.contains("lineTotalAmount"));
+
+	}
+
 	public void testAllowanceRead() throws JsonProcessingException {
 
 		ObjectMapper mapper = new ObjectMapper();

library/src/test/java/org/mustangproject/ZUGFeRD/VisualizationTest.java

@@ -1,33 +1,34 @@
-
-/** **********************************************************************
- *
+/**
+ * *********************************************************************
+ * <p>
  * Copyright 2019 Jochen Staerk
- *
+ * <p>
  * Use is subject to license terms.
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy
  * of the License at http://www.apache.org/licenses/LICENSE-2.0.
- *
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
+ * <p>
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
- *********************************************************************** */
+ * <p>
+ * **********************************************************************
+ */
 package org.mustangproject.ZUGFeRD;
 
-import org.apache.commons.io.IOUtils;
 import org.junit.FixMethodOrder;
 import org.junit.runners.MethodSorters;
 import org.mustangproject.util.ByteArraySearcher;
 import org.xml.sax.SAXException;
 
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.*;
-import java.io.*;
+import javax.xml.transform.TransformerException;
+import java.io.File;
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -51,31 +52,83 @@ public class VisualizationTest extends ResourceCase {
 			/* remove file endings so that tests can also pass after checking
 			   out from git with arbitrary options (which may include CSRF changes)
 			 */
-			result = zvi.visualize(CIIinputFile.getAbsolutePath(),ZUGFeRDVisualizer.Language.FR).replace("\r","").replace("\n","");
+			result = zvi.visualize(CIIinputFile.getAbsolutePath(), ZUGFeRDVisualizer.Language.FR)
+				.replace("\r", "")
+				.replace("\n", "")
+				.replace("\t", "")
+				.replace(" ", "");
 
-			File expectedResult=getResourceAsFile("factur-x-vis.fr.html");
-			expected = new String(Files.readAllBytes(expectedResult.toPath()), StandardCharsets.UTF_8).replace("\r","").replace("\n","");
+			File expectedResult = getResourceAsFile("factur-x-vis.fr.html");
+			expected = new String(Files.readAllBytes(expectedResult.toPath()), StandardCharsets.UTF_8)
+				.replace("\r", "")
+				.replace("\n", "")
+				.replace("\t", "")
+				.replace(" ", "");
 			// remove linebreaks as well...
 
 		} catch (UnsupportedOperationException e) {
-			fail("UnsupportedOperationException should not happen: "+e.getMessage());
+			fail("UnsupportedOperationException should not happen: " + e.getMessage());
 		} catch (IllegalArgumentException e) {
-			fail("IllegalArgumentException should not happen: "+e.getMessage());
+			fail("IllegalArgumentException should not happen: " + e.getMessage());
 		} catch (TransformerException e) {
-			fail("TransformerException should not happen: "+e.getMessage());
+			fail("TransformerException should not happen: " + e.getMessage());
 		} catch (IOException e) {
-			fail("IOException should not happen: "+e.getMessage());
+			fail("IOException should not happen: " + e.getMessage());
 		} catch (ParserConfigurationException e) {
-			fail("ParserConfigurationException should not happen: "+e.getMessage());
-        } catch (SAXException e) {
-			fail("SAXException should not happen: "+e.getMessage());
-        }
+			fail("ParserConfigurationException should not happen: " + e.getMessage());
+		} catch (SAXException e) {
+			fail("SAXException should not happen: " + e.getMessage());
+		}
 
 
-        assertNotNull(result);
+		assertNotNull(result);
 		// Reading ZUGFeRD
 		assertEquals(expected, result);
 	}
+
+	public void testCIIVisualizationExtended() {
+
+		// the writing part
+		String sourceFilename = "factur-x-extended.xml";
+		File CIIinputFile = getResourceAsFile(sourceFilename);
+
+		String expected = null;
+		String result = null;
+		try {
+			ZUGFeRDVisualizer zvi = new ZUGFeRDVisualizer();
+			/* remove file endings so that tests can also pass after checking
+			   out from git with arbitrary options (which may include CSRF changes)
+			 */
+			result = zvi.visualize(CIIinputFile.getAbsolutePath(), ZUGFeRDVisualizer.Language.DE).replace("\r", "").replace("\n", "")
+				.replace("\t", "")
+				.replace(" ", "");
+
+			File expectedResult = getResourceAsFile("factur-x-vis-extended.de.html");
+			expected = new String(Files.readAllBytes(expectedResult.toPath()), StandardCharsets.UTF_8).replace("\r", "").replace("\n", "")
+				.replace("\t", "")
+				.replace(" ", "");
+			// remove linebreaks as well...
+
+		} catch (UnsupportedOperationException e) {
+			fail("UnsupportedOperationException should not happen: " + e.getMessage());
+		} catch (IllegalArgumentException e) {
+			fail("IllegalArgumentException should not happen: " + e.getMessage());
+		} catch (TransformerException e) {
+			fail("TransformerException should not happen: " + e.getMessage());
+		} catch (IOException e) {
+			fail("IOException should not happen: " + e.getMessage());
+		} catch (ParserConfigurationException e) {
+			fail("ParserConfigurationException should not happen: " + e.getMessage());
+		} catch (SAXException e) {
+			fail("SAXException should not happen: " + e.getMessage());
+		}
+
+
+		assertNotNull(result);
+		// Reading ZUGFeRD
+		assertEquals(expected, result);
+	}
+
 	public void testUBLCreditNoteVisualizationBasic() {
 
 		// the writing part
@@ -88,31 +141,33 @@ public class VisualizationTest extends ResourceCase {
 			/* remove file endings so that tests can also pass after checking
 			   out from git with arbitrary options (which may include CSRF changes)
 			 */
-			result = zvi.visualize(UBLinputFile.getAbsolutePath(),ZUGFeRDVisualizer.Language.EN).replace("\r","").replace("\n","").replace(" ","").replace("\t","");
+			result = zvi.visualize(UBLinputFile.getAbsolutePath(), ZUGFeRDVisualizer.Language.EN).replace("\r", "").replace("\n", "").replace("\t", "").replace(" ", "");
 
-			File expectedResult=getResourceAsFile("factur-x-vis-ubl-creditnote.en.html");
-			expected = new String(Files.readAllBytes(expectedResult.toPath()), StandardCharsets.UTF_8).replace("\r","").replace("\n","").replace(" ","").replace("\t","");
+			File expectedResult = getResourceAsFile("factur-x-vis-ubl-creditnote.en.html");
+			expected = new String(Files.readAllBytes(expectedResult.toPath()), StandardCharsets.UTF_8).replace("\r", "").replace("\n", "").replace("\t", "").replace(" ", "");
 			// remove linebreaks as well...
 
 		} catch (UnsupportedOperationException e) {
-			fail("UnsupportedOperationException should not happen: "+e.getMessage());
+			fail("UnsupportedOperationException should not happen: " + e.getMessage());
 		} catch (IllegalArgumentException e) {
-			fail("IllegalArgumentException should not happen: "+e.getMessage());
+			fail("IllegalArgumentException should not happen: " + e.getMessage());
 		} catch (TransformerException e) {
-			fail("TransformerException should not happen: "+e.getMessage());
+			fail("TransformerException should not happen: " + e.getMessage());
 		} catch (IOException e) {
-			fail("IOException should not happen: "+e.getMessage());
+			fail("IOException should not happen: " + e.getMessage());
 		} catch (ParserConfigurationException e) {
-			fail("ParserConfigurationException should not happen: "+e.getMessage());
-        } catch (SAXException e) {
-			fail("SAXException should not happen: "+e.getMessage());
+			fail("ParserConfigurationException should not happen: " + e.getMessage());
+		} catch (SAXException e) {
+			fail("SAXException should not happen: " + e.getMessage());
 		}
 
 
-        assertNotNull(result);
+		assertNotNull(result);
 		// Reading ZUGFeRD
 		assertEquals(expected, result);
 	}
+
+
 	public void testUBLVisualizationBasic() {
 
 		// the writing part
@@ -125,28 +180,32 @@ public class VisualizationTest extends ResourceCase {
 			/* remove file endings so that tests can also pass after checking
 			   out from git with arbitrary options (which may include CSRF changes)
 			 */
-			result = zvi.visualize(UBLinputFile.getAbsolutePath(),ZUGFeRDVisualizer.Language.EN).replace("\r","").replace("\n","");
+			result = zvi.visualize(UBLinputFile.getAbsolutePath(), ZUGFeRDVisualizer.Language.EN).replace("\r", "").replace("\n", "")
+				.replace("\t", "")
+				.replace(" ", "");
 
-			File expectedResult=getResourceAsFile("factur-x-vis-ubl.en.html");
-			expected = new String(Files.readAllBytes(expectedResult.toPath()), StandardCharsets.UTF_8).replace("\r","").replace("\n","");
+			File expectedResult = getResourceAsFile("factur-x-vis-ubl.en.html");
+			expected = new String(Files.readAllBytes(expectedResult.toPath()), StandardCharsets.UTF_8).replace("\r", "").replace("\n", "")
+				.replace("\t", "")
+				.replace(" ", "");
 			// remove linebreaks as well...
 
 		} catch (UnsupportedOperationException e) {
-			fail("UnsupportedOperationException should not happen: "+e.getMessage());
+			fail("UnsupportedOperationException should not happen: " + e.getMessage());
 		} catch (IllegalArgumentException e) {
-			fail("IllegalArgumentException should not happen: "+e.getMessage());
+			fail("IllegalArgumentException should not happen: " + e.getMessage());
 		} catch (TransformerException e) {
-			fail("TransformerException should not happen: "+e.getMessage());
+			fail("TransformerException should not happen: " + e.getMessage());
 		} catch (IOException e) {
-			fail("IOException should not happen: "+e.getMessage());
+			fail("IOException should not happen: " + e.getMessage());
 		} catch (ParserConfigurationException e) {
-			fail("ParserConfigurationException should not happen: "+e.getMessage());
-        } catch (SAXException e) {
-			fail("SAXException should not happen: "+e.getMessage());
-        }
+			fail("ParserConfigurationException should not happen: " + e.getMessage());
+		} catch (SAXException e) {
+			fail("SAXException should not happen: " + e.getMessage());
+		}
 
 
-        assertNotNull(result);
+		assertNotNull(result);
 		// Reading ZUGFeRD
 		assertEquals(expected, result);
 	}
@@ -163,9 +222,9 @@ public class VisualizationTest extends ResourceCase {
 			ZUGFeRDVisualizer zvi = new ZUGFeRDVisualizer();
 			zvi.toPDF(CIIinputFile.getAbsolutePath(), TARGET_PDF_CII);
 		} catch (UnsupportedOperationException e) {
-			fail("UnsupportedOperationException should not happen: "+e.getMessage());
+			fail("UnsupportedOperationException should not happen: " + e.getMessage());
 		} catch (IllegalArgumentException e) {
-			fail("IllegalArgumentException should not happen: "+e.getMessage());
+			fail("IllegalArgumentException should not happen: " + e.getMessage());
 		}
 
 		try {
@@ -188,9 +247,9 @@ public class VisualizationTest extends ResourceCase {
 			ZUGFeRDVisualizer zvi = new ZUGFeRDVisualizer();
 			zvi.toPDF(UBLinputFile.getAbsolutePath(), TARGET_PDF_UBL);
 		} catch (UnsupportedOperationException e) {
-			fail("UnsupportedOperationException should not happen: "+e.getMessage());
+			fail("UnsupportedOperationException should not happen: " + e.getMessage());
 		} catch (IllegalArgumentException e) {
-			fail("IllegalArgumentException should not happen: "+e.getMessage());
+			fail("IllegalArgumentException should not happen: " + e.getMessage());
 		}
 
 
@@ -214,9 +273,9 @@ public class VisualizationTest extends ResourceCase {
 			ZUGFeRDVisualizer zvi = new ZUGFeRDVisualizer();
 			zvi.toPDF(UBLinputFile.getAbsolutePath(), TARGET_PDF_UBL);
 		} catch (UnsupportedOperationException e) {
-			fail("UnsupportedOperationException should not happen: "+e.getMessage());
+			fail("UnsupportedOperationException should not happen: " + e.getMessage());
 		} catch (IllegalArgumentException e) {
-			fail("IllegalArgumentException should not happen: "+e.getMessage());
+			fail("IllegalArgumentException should not happen: " + e.getMessage());
 		}
 
 

library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java

@@ -61,9 +61,9 @@ public class ZF2PushTest extends TestCase {
 	final String TARGET_REVERSECHARGEPDF = "./target/testout-ZF2PushReverseCharge.pdf";
 
 	public void testPushExport() {
-	/***
- 	* This writes to a filename like an official sample, please consider when changing (probably better not?)
- 	*/
+		/***
+		 * This writes to a filename like an official sample, please consider when changing (probably better not?)
+		 */
 		// the writing part
 		String orgname = "Bei Spiel GmbH";
 		String number = "RE-20201121/508";
@@ -88,6 +88,7 @@ public class ZF2PushTest extends TestCase {
 				.addItem(new Item(new Product("Design (hours)", "Of a sample invoice", "HUR", new BigDecimal(7)), price, new BigDecimal(1.0)))
 				.addItem(new Item(new Product("Ballons", "various colors, ~2000ml", "H87", new BigDecimal(19)), new BigDecimal("0.79"), new BigDecimal(400.0)))
 				.addItem(new Item(new Product("Hot air „heiße Luft“ (litres)", "", "LTR", new BigDecimal(19)), new BigDecimal("0.025"), new BigDecimal(800.0)))
+				.setRoundingAmount(new BigDecimal("1"))
 			);
 
 			ze.export(TARGET_PDF);
@@ -95,6 +96,15 @@ public class ZF2PushTest extends TestCase {
 			fail("Exception should not be raised");
 		}
 
+		ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter(TARGET_PDF);
+		Invoice i = new Invoice();
+		try {
+			zii.extractInto(i);
+		} catch (XPathExpressionException e) {
+			throw new RuntimeException(e);
+		} catch (ParseException e) {
+			throw new RuntimeException(e);
+		}
 
 
 		// now check the contents (like MustangReaderTest)
@@ -154,7 +164,7 @@ public class ZF2PushTest extends TestCase {
 			fail("IOException should not be raised");
 		}
 		ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter(TARGET_ATTACHMENTSPDF);
-		Invoice i= null;
+		Invoice i = null;
 		try {
 			i = zii.extractInvoice();
 		} catch (XPathExpressionException e) {
@@ -162,7 +172,7 @@ public class ZF2PushTest extends TestCase {
 		} catch (ParseException e) {
 			throw new RuntimeException(e);
 		}
-		assertEquals(senderDescription,i.getSender().getDescription());
+		assertEquals(senderDescription, i.getSender().getDescription());
 
 		// now check the contents (like MustangReaderTest)
 		ZUGFeRDImporter zi = new ZUGFeRDImporter(TARGET_ATTACHMENTSPDF);
@@ -292,7 +302,7 @@ public class ZF2PushTest extends TestCase {
 			//					.addItem(new Item(new Product("Testprodukt", "", "C62", new BigDecimal(19)), amount, new BigDecimal(1.0)).addAllowance(new Allowance().setPercent(new BigDecimal(50)))));
 
 			ze.setTransaction(new Invoice().setDueDate(new Date()).setIssueDate(new Date()).setDeliveryDate(new Date())
-				.setSender(new TradeParty(orgname, "teststr", "55232", "teststadt", "DE").addVATID("DE0815").addTaxID ("4711"))
+				.setSender(new TradeParty(orgname, "teststr", "55232", "teststadt", "DE").addVATID("DE0815").addTaxID("4711"))
 				.setRecipient(new TradeParty("Franz Müller", "teststr.12", "55232", "Entenhausen", "DE").addVATID("DE0816")
 					.setContact(new Contact("contact testname", "123456", "contact.testemail@example.org").setFax("0911623562")))
 				.setDeliveryAddress(new TradeParty("Franz Müller", "teststr.12", "55232", "Entenhausen", "DE").addVATID("DE0816"))
@@ -362,7 +372,7 @@ public class ZF2PushTest extends TestCase {
 			fail("IOException should not be raised");
 		}
 		ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter(TARGET_INTRACOMMUNITYSUPPLYMANUALPDF);
-		Invoice i= null;
+		Invoice i = null;
 		try {
 			i = zii.extractInvoice();
 		} catch (XPathExpressionException e) {
@@ -520,7 +530,7 @@ public class ZF2PushTest extends TestCase {
 					.setContractReferencedDocument(contractID)
 					.setRecipient(new TradeParty("Franz Müller", "teststr.12", "55232", "Entenhausen", "DE").addGlobalID(gln).setEmail("recipient@test.org").addVATID("DE4711")
 						.setContact(new Contact("Franz Müller", "01779999999", "franz@mueller.de", "teststr. 12", "55232", "Entenhausen", "DE").setFax("++49555123456")).setAdditionalAddress("Hinterhaus 3"))
-					.addItem(new Item(new Product("Testprodukt", "", "C62", new BigDecimal(16)).addGlobalID(gtin).setSellerAssignedID("4711"), price, new BigDecimal(1.0)).addReferencedLineID("xxx").addNote("item level 1/1").addAllowance(new Allowance(new BigDecimal(0.02)).setReason("item discount").setTaxPercent(new BigDecimal(16))).setDetailedDeliveryPeriod(sdf.parse("2020-01-13"), sdf.parse("2020-01-15")))
+					.addItem(new Item(new Product("Testprodukt", "", "H87", new BigDecimal(16)).addGlobalID(gtin).setSellerAssignedID("4711"), price, new BigDecimal(1.0)).setId("a123").addReferencedLineID("xxx").addNote("item level 1/1").addAllowance(new Allowance(new BigDecimal(0.02)).setReason("item discount").setTaxPercent(new BigDecimal(16))).setDetailedDeliveryPeriod(sdf.parse("2020-01-13"), sdf.parse("2020-01-15")))
 					.addCharge(new Charge(new BigDecimal(0.5)).setReason("quick delivery charge").setTaxPercent(new BigDecimal(16)))
 					.addAllowance(new Allowance(new BigDecimal(0.2)).setReason("discount").setTaxPercent(new BigDecimal(16)))
 					.addCashDiscount(new CashDiscount(new BigDecimal(2), 14))
@@ -552,7 +562,7 @@ public class ZF2PushTest extends TestCase {
 		assertTrue(zi.getUTF8().contains(occurrenceFrom));
 		assertTrue(zi.getUTF8().contains(occurrenceTo));
 		assertTrue(zi.getUTF8().contains(contractID));
-
+		assertEquals(zi.importedInvoice.getZFItems()[0].getId(), "a123");
 		assertTrue(zi.getUTF8().contains("20200113")); // to contain item delivery periods
 		assertTrue(zi.getUTF8().contains("20200115")); // to contain item delivery periods
 

library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java

@@ -1,4 +1,3 @@
-
 /**
  * *********************************************************************
  * <p>
@@ -23,10 +22,14 @@ package org.mustangproject.ZUGFeRD;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.Test;
 import org.mustangproject.*;
 
 import javax.xml.xpath.XPathExpressionException;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -35,6 +38,9 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 
 /***
@@ -304,7 +310,7 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase {
 
 		assertTrue(invoice.getTradeSettlement().length==1);
 		assertTrue(invoice.getTradeSettlement()[0] instanceof IZUGFeRDTradeSettlementPayment);
-		IZUGFeRDTradeSettlementPayment paym=(IZUGFeRDTradeSettlementPayment)invoice.getTradeSettlement()[0];
+		IZUGFeRDTradeSettlementPayment paym = (IZUGFeRDTradeSettlementPayment) invoice.getTradeSettlement()[0];
 		assertEquals("DE12500105170648489890", paym.getOwnIBAN());
 		assertEquals("COBADEFXXX", paym.getOwnBIC());
 
@@ -315,19 +321,19 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase {
 
 	/**
 	 * testing if other files embedded in pdf additionally to the invoice can be read correctly
-	 * */
+	 */
 	public void testDetach() {
 		boolean hasExceptions = false;
 
-		byte[] fileA=null;
-		byte[] fileB=null;
+		byte[] fileA = null;
+		byte[] fileB = null;
 
 		ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter("./target/testout-ZF2PushAttachments.pdf");
-		for (FileAttachment fa:zii.getFileAttachmentsPDF()) {
+		for (FileAttachment fa : zii.getFileAttachmentsPDF()) {
 			if (fa.getFilename().equals("one.pdf")) {
-				fileA=fa.getData();
+				fileA = fa.getData();
 			} else if (fa.getFilename().equals("two.pdf")) {
-				fileB=fa.getData();
+				fileB = fa.getData();
 			}
 		}
 		byte[] b = {12, 13}; // the sample data that was used to write the files
@@ -339,19 +345,18 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase {
 	}
 
 
-
 	public void testImportDebit() {
 		File CIIinputFile = getResourceAsFile("cii/minimalDebit.xml");
 		try {
 			ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter(new FileInputStream(CIIinputFile));
-			Invoice i=zii.extractInvoice();
+			Invoice i = zii.extractInvoice();
 
 			assertEquals("DE21860000000086001055", i.getSender().getBankDetails().get(0).getIBAN());
 			ObjectMapper mapper = new ObjectMapper();
 
 			String jsonArray = mapper.writeValueAsString(i);
 
-	//		assertEquals("",jsonArray);
+			//		assertEquals("",jsonArray);
 
 		} catch (IOException e) {
 			fail("IOException not expected");
@@ -363,14 +368,14 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase {
 
 
 	}
-	
-	public void testImportMinimum() {
+
+  public void testImportMinimum() {
 		File CIIinputFile = getResourceAsFile("cii/facturFrMinimum.xml");
 		try {
 			ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter(new FileInputStream(CIIinputFile));
 
 
-			CalculatedInvoice i=new CalculatedInvoice();
+			CalculatedInvoice i = new CalculatedInvoice();
 			zii.extractInto(i);
 			assertEquals("671.15", i.getGrandTotal().toString());
 
@@ -441,4 +446,49 @@ this would test if for all elements/attributes
 
 	}
 
+	@Test
+	public void testImportPrepaid() throws XPathExpressionException, ParseException {
+		InputStream inputStream = this.getClass()
+			.getResourceAsStream("/EN16931_1_Teilrechnung.pdf");
+		ZUGFeRDInvoiceImporter importer = new ZUGFeRDInvoiceImporter();
+		importer.doIgnoreCalculationErrors();
+		importer.setInputStream(inputStream);
+
+		CalculatedInvoice invoice = new CalculatedInvoice();
+		importer.extractInto(invoice);
+
+		boolean isBD=invoice.getTotalPrepaidAmount() instanceof BigDecimal;
+		assertTrue(isBD);
+		BigDecimal expectedPrepaid=new BigDecimal(50);
+		BigDecimal expectedLineTotal=new BigDecimal("180.76");
+		if (isBD) {
+			BigDecimal amread=invoice.getTotalPrepaidAmount();
+			BigDecimal amline=invoice.getLineTotalAmount();
+			assertTrue(amread.compareTo(expectedPrepaid) == 0);
+			assertTrue(amline.compareTo(expectedLineTotal) == 0);
+		}
+
+	}
+
+
+	@Test
+	public void testImportIncludedNotes() throws XPathExpressionException, ParseException {
+		InputStream inputStream = this.getClass()
+			.getResourceAsStream("/EN16931_Einfach.pdf");
+		ZUGFeRDInvoiceImporter importer = new ZUGFeRDInvoiceImporter(inputStream);
+		Invoice invoice = importer.extractInvoice();
+		List<IncludedNote> notesWithSubjectCode = invoice.getNotesWithSubjectCode();
+		assertThat(notesWithSubjectCode).hasSize(2);
+		assertThat(notesWithSubjectCode.get(0).getSubjectCode()).isNull();
+		assertThat(notesWithSubjectCode.get(0).getContent()).isEqualTo("Rechnung gemäß Bestellung vom 01.11.2024.");
+		assertThat(notesWithSubjectCode.get(1).getSubjectCode()).isEqualTo(SubjectCode.REG);
+		assertThat(notesWithSubjectCode.get(1).getContent()).isEqualTo("Lieferant GmbH\t\t\t\t\n"
+			+ "Lieferantenstraße 20\t\t\t\t\n"
+			+ "80333 München\t\t\t\t\n"
+			+ "Deutschland\t\t\t\t\n"
+			+ "Geschäftsführer: Hans Muster\n"
+			+ "Handelsregisternummer: H A 123");
+
+	}
+
 }

library/src/test/resources/factur-x-extended.xml

@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- English disclaimer below.-->
+<!--Nutzungsrechte 
+ZUGFeRD Datenformat Version 2.3.0, 18.09.2024
+Beispiel Version 18.09.2024
+ 
+Zweck des Forums elektronisch Rechnung Deutschland, welches am 31. März 2010 unter der Arbeitsgemeinschaft für 
+wirtschaftliche Verwaltung e. V. gegründet wurde, ist u. a. die Schaffung und Spezifizierung eines offenen Datenformats 
+für strukturierten elektronischen Datenaustausch auf der Grundlage offener und nicht diskriminierender, standardisierter 
+Technologien („ZUGFeRD Datenformat“).
+ 
+Das ZUGFeRD Datenformat wird nach Maßgabe des FeRD sowohl Unternehmen als auch der öffentlichen Verwaltung 
+frei zugänglich gemacht. Hierfür bietet FeRD allen Unternehmen und Organisationen der öffentlichen Verwaltung eine 
+Lizenz für die Nutzung des urheberrechtlich geschützten ZUGFeRD-Datenformats zu fairen, sachgerechten und nicht 
+diskriminierenden Bedingungen an.
+ 
+Die Spezifikation des FeRD zur Implementierung des ZUGFeRD Datenformats ist in ihrer jeweils geltenden Fassung 
+abrufbar unter www.ferd-net.de.
+ 
+Im Einzelnen schließt die Nutzungsgewährung ein: 
+=====================================
+ 
+FeRD räumt eine Lizenz für die Nutzung des urheberrechtlich geschützten ZUGFeRD Datenformats in der jeweils 
+geltenden und akzeptierten Fassung (www.ferd-net.de) ein. 
+Die Lizenz beinhaltet ein unwiderrufliches Nutzungsrecht einschließlich des Rechts der Weiterentwicklung, 
+Weiterbearbeitung und Verbindung mit anderen Produkten.
+Die Lizenz gilt insbesondere für die Entwicklung, die Gestaltung, die Herstellung, den Verkauf, die Nutzung oder 
+anderweitige Verwendung des ZUGFeRD Datenformats für Hardware- und/oder Softwareprodukte sowie sonstige 
+Anwendungen und Dienste. 
+Diese Lizenz schließt nicht die wesentlichen Patente der Mitglieder von FeRD ein. Als wesentliche Patente sind Patente 
+und Patentanmeldungen weltweit zu verstehen, die einen oder mehrere Patentansprüche beinhalten, bei denen es sich um 
+notwendige Ansprüche handelt. Notwendige Ansprüche sind lediglich jene Ansprüche der Wesentlichen Patente, die durch 
+die Implementierung des ZUGFeRD Datenformats notwendigerweise verletzt würden. 
+Der Lizenznehmer ist berechtigt, seinen jeweiligen Konzerngesellschaften ein unbefristetes, weltweites, nicht übertragbares, 
+unwiderrufliches Nutzungsrecht einschließlich des Rechts der Weiterentwicklung, Weiterbearbeitung und Verbindung mit 
+anderen Produkten einzuräumen. 
+ 
+Die Lizenz wird kostenfrei zur Verfügung gestellt. 
+ 
+Außer im Falle vorsätzlichen Verschuldens oder grober Fahrlässigkeit haftet FeRD weder für Nutzungsausfall, entgangenen 
+Gewinn, Datenverlust, Kommunikationsverlust, Einnahmeausfall, Vertragseinbußen, Geschäftsausfall oder für Kosten, 
+Schäden, Verluste oder Haftpflichten im Zusammenhang mit einer Unterbrechung der Geschäftstätigkeit, noch für konkrete, 
+beiläufig entstandene, mittelbare Schäden, Straf- oder Folgeschäden und zwar auch dann nicht, wenn die Möglichkeit der 
+Kosten, Verluste bzw. Schäden hätte normalerweise vorhergesehen werden können.-->
+ 
+ <!--Right of use 
+ZUGFeRD Data format version 2.3.0, September 18th, 2024
+ 
+The purpose of the Forum elektronische Rechnung Deutschland (FeRD), which was founded on March 31, 2010 under the 
+umbrella of Arbeitsgemeinschaft für wirtschaftliche Verwaltung e. V., is, among other things, to create and specify an 
+open data format for structured electronic data exchange on the basis of open and non discriminatory, standardised 
+technologies ("ZUGFeRD data format").
+ 
+The ZUGFeRD data format is used by both companies and public administration according to the FeRD 
+made freely accessible. For this purpose FeRD offers all companies and organisations of the public administration a 
+License to use the copyrighted ZUGFeRD data format in a fair, appropriate and non 
+discriminatory conditions.
+ 
+The specification of the FeRD for the implementation of the ZUGFeRD data format is, in its currently valid version 
+available at www.ferd-net.de.
+ 
+In detail, the grant of use includes 
+=====================================
+ 
+FeRD grants a license for the use of the copyrighted ZUGFeRD data format in the respective 
+valid and accepted version (www.ferd-net.de). 
+The license includes an irrevocable right of use including the right of further development, 
+Further processing and connection with other products.
+The license applies in particular to the development, design, production, sale, use or 
+other use of the ZUGFeRD data format for hardware and/or software products and other 
+applications and services. 
+This license does not include the essential patents of the members of FeRD. The essential patents are patents 
+and patent applications worldwide which contain one or more claims that are 
+necessary claims. Necessary claims are only those claims of the essential patents which are 
+the implementation of the ZUGFeRD data format would necessarily be violated. 
+The Licensee is entitled to provide its respective group companies with an unlimited, worldwide, non-transferable, 
+irrevocable right of use including the right of further development, further processing and connection with 
+other products. 
+ 
+The license is provided free of charge. 
+ 
+Except in the case of intentional fault or gross negligence, FeRD is not liable for loss of use, loss of 
+Profit, loss of data, loss of communication, loss of revenue, loss of contracts, loss of business or for costs 
+damages, losses or liabilities in connection with an interruption of business, nor for concrete, 
+incidental, indirect, punitive or consequential damages, even if the possibility of 
+costs, losses or damages could normally have been foreseen.-->
+
+<rsm:CrossIndustryInvoice xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
+	<rsm:ExchangedDocumentContext>
+		<ram:TestIndicator>
+			<udt:Indicator>true</udt:Indicator>
+		</ram:TestIndicator>
+		<ram:GuidelineSpecifiedDocumentContextParameter>
+			<ram:ID>urn:cen.eu:en16931:2017#conformant#urn:factur-x.eu:1p0:extended</ram:ID>
+		</ram:GuidelineSpecifiedDocumentContextParameter>
+	</rsm:ExchangedDocumentContext>
+	<rsm:ExchangedDocument>
+		<ram:ID>KR87654321012</ram:ID>
+		<ram:Name>KOSTENRECHNUNG</ram:Name>
+		<ram:TypeCode>380</ram:TypeCode>
+		<ram:IssueDateTime>
+			<udt:DateTimeString format="102">20241115</udt:DateTimeString>
+		</ram:IssueDateTime>
+		<ram:IncludedNote>
+			<ram:ContentCode>ST3</ram:ContentCode>
+			<ram:Content>Es bestehen Rabatt- oder Bonusvereinbarungen.</ram:Content>
+			<ram:SubjectCode>AAK</ram:SubjectCode>
+		</ram:IncludedNote>
+		<ram:IncludedNote>
+			<ram:ContentCode>EEV</ram:ContentCode>
+			<ram:Content>Der Verkäufer bleibt Eigentümer der Waren bis zur vollständigen Erfüllung der Kaufpreisforderung.</ram:Content>
+			<ram:SubjectCode>AAJ</ram:SubjectCode>
+		</ram:IncludedNote>
+		<ram:IncludedNote>
+			<ram:Content>MUSTERLIEFERANT GMBH
+BAHNHOFSTRASSE 99
+99199 MUSTERHAUSEN
+Geschäftsführung:
+Max Mustermann
+USt-IdNr: DE123456789
+Telefon: +49 932 431 0
+www.musterlieferant.de
+HRB Nr. 372876
+Amtsgericht Musterstadt
+GLN 4304171000002
+      </ram:Content>
+			<ram:SubjectCode>REG</ram:SubjectCode>
+		</ram:IncludedNote>
+	</rsm:ExchangedDocument>
+	<rsm:SupplyChainTradeTransaction>
+		<ram:IncludedSupplyChainTradeLineItem>
+			<ram:AssociatedDocumentLineDocument>
+				<ram:LineID>1</ram:LineID>
+			</ram:AssociatedDocumentLineDocument>
+			<ram:SpecifiedTradeProduct>
+				<ram:GlobalID schemeID="0088">4123456000014</ram:GlobalID>
+				<ram:SellerAssignedID>WA997</ram:SellerAssignedID>
+				<ram:Name>Wirkarbeit HT</ram:Name>
+				<ram:ApplicableProductCharacteristic>
+					<ram:Description>Zählpunkt</ram:Description>
+					<ram:Value>DE0001346484600000000000000100038</ram:Value>
+				</ram:ApplicableProductCharacteristic>
+			</ram:SpecifiedTradeProduct>
+			<ram:SpecifiedLineTradeAgreement>
+				<ram:GrossPriceProductTradePrice>
+					<ram:ChargeAmount>0.0520</ram:ChargeAmount>
+				</ram:GrossPriceProductTradePrice>
+				<ram:NetPriceProductTradePrice>
+					<ram:ChargeAmount>0.0520</ram:ChargeAmount>
+				</ram:NetPriceProductTradePrice>
+			</ram:SpecifiedLineTradeAgreement>
+			<ram:SpecifiedLineTradeDelivery>
+				<ram:BilledQuantity unitCode="KWH">1000.0000</ram:BilledQuantity>
+			</ram:SpecifiedLineTradeDelivery>
+			<ram:SpecifiedLineTradeSettlement>
+				<ram:ApplicableTradeTax>
+					<ram:TypeCode>VAT</ram:TypeCode>
+					<ram:CategoryCode>S</ram:CategoryCode>
+					<ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+				</ram:ApplicableTradeTax>
+				<ram:SpecifiedTradeSettlementLineMonetarySummation>
+					<ram:LineTotalAmount>52.00</ram:LineTotalAmount>
+				</ram:SpecifiedTradeSettlementLineMonetarySummation>
+			</ram:SpecifiedLineTradeSettlement>
+		</ram:IncludedSupplyChainTradeLineItem>
+		<ram:IncludedSupplyChainTradeLineItem>
+			<ram:AssociatedDocumentLineDocument>
+				<ram:LineID>2</ram:LineID>
+			</ram:AssociatedDocumentLineDocument>
+			<ram:SpecifiedTradeProduct>
+				<ram:GlobalID schemeID="0088">4123456000021</ram:GlobalID>
+				<ram:SellerAssignedID>ÖST250</ram:SellerAssignedID>
+				<ram:Name>Ökosteuer Lieferant</ram:Name>
+			</ram:SpecifiedTradeProduct>
+			<ram:SpecifiedLineTradeAgreement>
+				<ram:GrossPriceProductTradePrice>
+					<ram:ChargeAmount>0.0205</ram:ChargeAmount>
+				</ram:GrossPriceProductTradePrice>
+				<ram:NetPriceProductTradePrice>
+					<ram:ChargeAmount>0.0205</ram:ChargeAmount>
+				</ram:NetPriceProductTradePrice>
+			</ram:SpecifiedLineTradeAgreement>
+			<ram:SpecifiedLineTradeDelivery>
+				<ram:BilledQuantity unitCode="KWH">1000.0000</ram:BilledQuantity>
+			</ram:SpecifiedLineTradeDelivery>
+			<ram:SpecifiedLineTradeSettlement>
+				<ram:ApplicableTradeTax>
+					<ram:TypeCode>VAT</ram:TypeCode>
+					<ram:CategoryCode>S</ram:CategoryCode>
+					<ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+				</ram:ApplicableTradeTax>
+				<ram:SpecifiedTradeSettlementLineMonetarySummation>
+					<ram:LineTotalAmount>20.50</ram:LineTotalAmount>
+				</ram:SpecifiedTradeSettlementLineMonetarySummation>
+			</ram:SpecifiedLineTradeSettlement>
+		</ram:IncludedSupplyChainTradeLineItem>
+		<ram:IncludedSupplyChainTradeLineItem>
+			<ram:AssociatedDocumentLineDocument>
+				<ram:LineID>3</ram:LineID>
+			</ram:AssociatedDocumentLineDocument>
+			<ram:SpecifiedTradeProduct>
+				<ram:GlobalID schemeID="0088">4260331811362</ram:GlobalID>
+				<ram:Name>Kommissionierer 1250032 D. Muster</ram:Name>
+				<ram:Description>Besteller: Hr. Mayer, Personalnr. 4488</ram:Description>
+			</ram:SpecifiedTradeProduct>
+			<ram:SpecifiedLineTradeAgreement>
+				<ram:GrossPriceProductTradePrice>
+					<ram:ChargeAmount>15.0000</ram:ChargeAmount>
+					<ram:AppliedTradeAllowanceCharge>
+						<ram:ChargeIndicator>
+							<udt:Indicator>false</udt:Indicator>
+						</ram:ChargeIndicator>
+						<ram:ActualAmount>4.50</ram:ActualAmount>
+						<ram:Reason>Artikelrabatt 1</ram:Reason>
+					</ram:AppliedTradeAllowanceCharge>
+				</ram:GrossPriceProductTradePrice>
+				<ram:NetPriceProductTradePrice>
+					<ram:ChargeAmount>10.5000</ram:ChargeAmount>
+				</ram:NetPriceProductTradePrice>
+			</ram:SpecifiedLineTradeAgreement>
+			<ram:SpecifiedLineTradeDelivery>
+				<ram:BilledQuantity unitCode="HUR">27.5000</ram:BilledQuantity>
+			</ram:SpecifiedLineTradeDelivery>
+			<ram:SpecifiedLineTradeSettlement>
+				<ram:ApplicableTradeTax>
+					<ram:TypeCode>VAT</ram:TypeCode>
+					<ram:CategoryCode>S</ram:CategoryCode>
+					<ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+				</ram:ApplicableTradeTax>
+				<ram:SpecifiedTradeSettlementLineMonetarySummation>
+					<ram:LineTotalAmount>288.75</ram:LineTotalAmount>
+				</ram:SpecifiedTradeSettlementLineMonetarySummation>
+			</ram:SpecifiedLineTradeSettlement>
+		</ram:IncludedSupplyChainTradeLineItem>
+		<ram:IncludedSupplyChainTradeLineItem>
+			<ram:AssociatedDocumentLineDocument>
+				<ram:LineID>4</ram:LineID>
+			</ram:AssociatedDocumentLineDocument>
+			<ram:SpecifiedTradeProduct>
+				<ram:GlobalID schemeID="0088">2001015001325</ram:GlobalID>
+				<ram:SellerAssignedID>FB05</ram:SellerAssignedID>
+				<ram:Name>FALTENBEUTEL 16x6x28 CM</ram:Name>
+			</ram:SpecifiedTradeProduct>
+			<ram:SpecifiedLineTradeAgreement>
+				<ram:GrossPriceProductTradePrice>
+					<ram:ChargeAmount>0.0105</ram:ChargeAmount>
+				</ram:GrossPriceProductTradePrice>
+				<ram:NetPriceProductTradePrice>
+					<ram:ChargeAmount>0.0105</ram:ChargeAmount>
+				</ram:NetPriceProductTradePrice>
+			</ram:SpecifiedLineTradeAgreement>
+			<ram:SpecifiedLineTradeDelivery>
+				<ram:BilledQuantity unitCode="H87">3500.0000</ram:BilledQuantity>
+			</ram:SpecifiedLineTradeDelivery>
+			<ram:SpecifiedLineTradeSettlement>
+				<ram:ApplicableTradeTax>
+					<ram:TypeCode>VAT</ram:TypeCode>
+					<ram:CategoryCode>S</ram:CategoryCode>
+					<ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+				</ram:ApplicableTradeTax>
+				<ram:SpecifiedTradeSettlementLineMonetarySummation>
+					<ram:LineTotalAmount>36.75</ram:LineTotalAmount>
+				</ram:SpecifiedTradeSettlementLineMonetarySummation>
+			</ram:SpecifiedLineTradeSettlement>
+		</ram:IncludedSupplyChainTradeLineItem>
+		<ram:IncludedSupplyChainTradeLineItem>
+			<ram:AssociatedDocumentLineDocument>
+				<ram:LineID>5</ram:LineID>
+			</ram:AssociatedDocumentLineDocument>
+			<ram:SpecifiedTradeProduct>
+				<ram:GlobalID schemeID="0088">4123456000038</ram:GlobalID>
+				<ram:SellerAssignedID>KOP05</ram:SellerAssignedID>
+				<ram:Name>Kopierpapier A4</ram:Name>
+				<ram:Description>Zählerstand von-bis: 543210 - 544420</ram:Description>
+				<ram:ApplicableProductCharacteristic>
+					<ram:Description>Zähler-Nr.</ram:Description>
+					<ram:Value>MG-X79318</ram:Value>
+				</ram:ApplicableProductCharacteristic>
+			</ram:SpecifiedTradeProduct>
+			<ram:SpecifiedLineTradeAgreement>
+				<ram:GrossPriceProductTradePrice>
+					<ram:ChargeAmount>0.0100</ram:ChargeAmount>
+				</ram:GrossPriceProductTradePrice>
+				<ram:NetPriceProductTradePrice>
+					<ram:ChargeAmount>0.0100</ram:ChargeAmount>
+				</ram:NetPriceProductTradePrice>
+			</ram:SpecifiedLineTradeAgreement>
+			<ram:SpecifiedLineTradeDelivery>
+				<ram:BilledQuantity unitCode="H87">1210.0000</ram:BilledQuantity>
+			</ram:SpecifiedLineTradeDelivery>
+			<ram:SpecifiedLineTradeSettlement>
+				<ram:ApplicableTradeTax>
+					<ram:TypeCode>VAT</ram:TypeCode>
+					<ram:CategoryCode>S</ram:CategoryCode>
+					<ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+				</ram:ApplicableTradeTax>
+				<ram:SpecifiedTradeSettlementLineMonetarySummation>
+					<ram:LineTotalAmount>12.10</ram:LineTotalAmount>
+				</ram:SpecifiedTradeSettlementLineMonetarySummation>
+			</ram:SpecifiedLineTradeSettlement>
+		</ram:IncludedSupplyChainTradeLineItem>
+		<ram:ApplicableHeaderTradeAgreement>
+			<ram:SellerTradeParty>
+				<ram:ID>549910</ram:ID>
+				<ram:GlobalID schemeID="0088">4333741000005</ram:GlobalID>
+				<ram:Name>MUSTERLIEFERANT GMBH</ram:Name>
+				<ram:DefinedTradeContact>
+					<ram:TelephoneUniversalCommunication>
+						<ram:CompleteNumber>+49 932 431 500</ram:CompleteNumber>
+					</ram:TelephoneUniversalCommunication>
+					<ram:EmailURIUniversalCommunication>
+						<ram:URIID>max.mustermann@musterlieferant.de</ram:URIID>
+					</ram:EmailURIUniversalCommunication>
+				</ram:DefinedTradeContact>
+				<ram:PostalTradeAddress>
+					<ram:PostcodeCode>99199</ram:PostcodeCode>
+					<ram:LineOne>BAHNHOFSTRASSE 99</ram:LineOne>
+					<ram:CityName>MUSTERHAUSEN</ram:CityName>
+					<ram:CountryID>DE</ram:CountryID>
+				</ram:PostalTradeAddress>
+				<ram:SpecifiedTaxRegistration>
+					<ram:ID schemeID="FC">201/113/40209</ram:ID>
+				</ram:SpecifiedTaxRegistration>
+			</ram:SellerTradeParty>
+			<ram:BuyerTradeParty>
+				<ram:ID>339420</ram:ID>
+				<ram:GlobalID schemeID="0088">4304171000002</ram:GlobalID>
+				<ram:Name>MUSTER-KUNDE GMBH</ram:Name>
+				<ram:PostalTradeAddress>
+					<ram:PostcodeCode>40235</ram:PostcodeCode>
+					<ram:LineOne>KUNDENWEG 88</ram:LineOne>
+					<ram:CityName>DUESSELDORF</ram:CityName>
+					<ram:CountryID>DE</ram:CountryID>
+				</ram:PostalTradeAddress>
+			</ram:BuyerTradeParty>
+			<ram:AdditionalReferencedDocument>
+				<ram:IssuerAssignedID>A777123</ram:IssuerAssignedID>
+				<ram:TypeCode>130</ram:TypeCode>
+			</ram:AdditionalReferencedDocument>
+		</ram:ApplicableHeaderTradeAgreement>
+		<ram:ApplicableHeaderTradeDelivery>
+			<ram:ShipToTradeParty>
+				<ram:GlobalID schemeID="0088">4304171088093</ram:GlobalID>
+				<ram:Name>MUSTER-MARKT</ram:Name>
+				<ram:DefinedTradeContact>
+					<ram:DepartmentName>7322</ram:DepartmentName>
+				</ram:DefinedTradeContact>
+				<ram:PostalTradeAddress>
+					<ram:PostcodeCode>31157</ram:PostcodeCode>
+					<ram:LineOne>HAUPTSTRASSE 44</ram:LineOne>
+					<ram:CityName>SARSTEDT</ram:CityName>
+					<ram:CountryID>DE</ram:CountryID>
+				</ram:PostalTradeAddress>
+			</ram:ShipToTradeParty>
+			<ram:ActualDeliverySupplyChainEvent>
+				<ram:OccurrenceDateTime>
+					<udt:DateTimeString format="102">20241030</udt:DateTimeString>
+				</ram:OccurrenceDateTime>
+			</ram:ActualDeliverySupplyChainEvent>
+			<ram:DeliveryNoteReferencedDocument>
+				<ram:IssuerAssignedID>L87654321012</ram:IssuerAssignedID>
+			</ram:DeliveryNoteReferencedDocument>
+		</ram:ApplicableHeaderTradeDelivery>
+		<ram:ApplicableHeaderTradeSettlement>
+			<ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>
+			<ram:InvoiceeTradeParty>
+				<ram:ID>339420</ram:ID>
+				<ram:GlobalID schemeID="0088">4304171000002</ram:GlobalID>
+				<ram:Name>MUSTER-KUNDE GMBH</ram:Name>
+				<ram:PostalTradeAddress>
+					<ram:PostcodeCode>40235</ram:PostcodeCode>
+					<ram:LineOne>KUNDENWEG 88</ram:LineOne>
+					<ram:CityName>DUESSELDORF</ram:CityName>
+					<ram:CountryID>DE</ram:CountryID>
+				</ram:PostalTradeAddress>
+			</ram:InvoiceeTradeParty>
+			<ram:ApplicableTradeTax>
+				<ram:CalculatedAmount>76.67</ram:CalculatedAmount>
+				<ram:TypeCode>VAT</ram:TypeCode>
+				<ram:BasisAmount>403.55</ram:BasisAmount>
+				<ram:LineTotalBasisAmount>410.10</ram:LineTotalBasisAmount>
+				<ram:AllowanceChargeBasisAmount>-6.55</ram:AllowanceChargeBasisAmount>
+				<ram:CategoryCode>S</ram:CategoryCode>
+				<ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+			</ram:ApplicableTradeTax>
+			<ram:SpecifiedTradeAllowanceCharge>
+				<ram:ChargeIndicator>
+					<udt:Indicator>false</udt:Indicator>
+				</ram:ChargeIndicator>
+				<ram:BasisAmount>410.10</ram:BasisAmount>
+				<ram:ActualAmount>21.55</ram:ActualAmount>
+				<ram:Reason>Sonderrabatt</ram:Reason>
+				<ram:CategoryTradeTax>
+					<ram:TypeCode>VAT</ram:TypeCode>
+					<ram:CategoryCode>S</ram:CategoryCode>
+					<ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+				</ram:CategoryTradeTax>
+			</ram:SpecifiedTradeAllowanceCharge>
+			<ram:SpecifiedLogisticsServiceCharge>
+				<ram:Description>Transportkosten: Frachbetrag</ram:Description>
+				<ram:AppliedAmount>15.00</ram:AppliedAmount>
+				<ram:AppliedTradeTax>
+					<ram:TypeCode>VAT</ram:TypeCode>
+					<ram:CategoryCode>S</ram:CategoryCode>
+					<ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+				</ram:AppliedTradeTax>
+			</ram:SpecifiedLogisticsServiceCharge>
+			<ram:SpecifiedTradePaymentTerms>
+				<ram:Description>Skontovereinbarung: 2% bei Zahlung innerhalb 10 Tagen nach Rechnungsdatum</ram:Description>
+				<ram:ApplicableTradePaymentDiscountTerms>
+					<ram:BasisPeriodMeasure unitCode="DAY">10</ram:BasisPeriodMeasure>
+					<ram:CalculationPercent>2.00</ram:CalculationPercent>
+				</ram:ApplicableTradePaymentDiscountTerms>
+			</ram:SpecifiedTradePaymentTerms>
+			<ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+				<ram:LineTotalAmount>410.10</ram:LineTotalAmount>
+				<ram:ChargeTotalAmount>15.00</ram:ChargeTotalAmount>
+				<ram:AllowanceTotalAmount>21.55</ram:AllowanceTotalAmount>
+				<ram:TaxBasisTotalAmount>403.55</ram:TaxBasisTotalAmount>
+				<ram:TaxTotalAmount currencyID="EUR">76.67</ram:TaxTotalAmount>
+				<ram:GrandTotalAmount>480.22</ram:GrandTotalAmount>
+				<ram:TotalPrepaidAmount>0.00</ram:TotalPrepaidAmount>
+				<ram:DuePayableAmount>480.22</ram:DuePayableAmount>
+			</ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+		</ram:ApplicableHeaderTradeSettlement>
+	</rsm:SupplyChainTradeTransaction>
+</rsm:CrossIndustryInvoice>

library/src/test/resources/factur-x-vis-ubl-creditnote.en.html

@@ -1359,6 +1359,7 @@
                   </div>
                   <div class="boxabstand"></div>
                </div>
+               <div class="boxtabelle boxabstandtop boxtabelleZweispaltig"></div>
                <div class="boxtabelle boxabstandtop boxtabelleZweispaltig first">
                   <div class="boxzeile">
                      <div id="uebersichtZahlungsinformationen" class="box subBox">
@@ -2625,4 +2626,4 @@ function downloadData (element_id) {
 });
 //
 
-            </script></html>
+            </script></html>

library/src/test/resources/factur-x-vis-ubl.en.html

@@ -1221,6 +1221,7 @@
                </div>
                <div class="boxtabelle boxabstandtop boxtabelleZweispaltig"></div>
                <div class="boxtabelle boxabstandtop boxtabelleZweispaltig"></div>
+               <div class="boxtabelle boxabstandtop boxtabelleZweispaltig"></div>
                <div class="boxtabelle boxabstandtop boxtabelleZweispaltig first">
                   <div class="boxzeile">
                      <div id="uebersichtZahlungsinformationen" class="box subBox">
@@ -1946,4 +1947,4 @@ function downloadData (element_id) {
 });
 //
 
-            </script></html>
+            </script></html>

library/src/test/resources/factur-x-vis.fr.html

@@ -1252,6 +1252,7 @@
                </div>
                <div class="boxtabelle boxabstandtop boxtabelleZweispaltig"></div>
                <div class="boxtabelle boxabstandtop boxtabelleZweispaltig"></div>
+               <div class="boxtabelle boxabstandtop boxtabelleZweispaltig"></div>
                <div class="boxtabelle boxabstandtop boxtabelleZweispaltig first">
                   <div class="boxzeile">
                      <div id="uebersichtZahlungsinformationen" class="box subBox">
@@ -2118,4 +2119,4 @@ function downloadData (element_id) {
 });
 //
 
-            </script></html>
+            </script></html>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.mustangproject</groupId>
     <artifactId>core</artifactId>
-    <version>2.15.0-SNAPSHOT</version>
+    <version>2.15.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Mustang</name>
 

validator/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.mustangproject</groupId>
         <artifactId>core</artifactId>
-        <version>2.15.0-SNAPSHOT</version>
+        <version>2.15.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.mustangproject</groupId>
@@ -11,7 +11,7 @@
     <name>Library to validate e-invoices (ZUGFeRD, Factur-X and Xrechnung)</name>
 
     <packaging>jar</packaging>
-    <version>2.15.0-SNAPSHOT</version>
+    <version>2.15.1-SNAPSHOT</version>
     <repositories>
         <repository>
             <!-- for jargs -->
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>library</artifactId>
-            <version>2.15.0-SNAPSHOT</version>
+            <version>2.15.1-SNAPSHOT</version>
         </dependency>
 		<dependency>
 			<groupId>org.dom4j</groupId>
@@ -224,10 +224,10 @@
                         </goals>
 
                         <configuration>
-                            <outputDirectory>${basedir}/src/main/resources/xslt/ZF_230/</outputDirectory>
+                            <outputDirectory>src/main/resources/xslt/ZF_232/</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>${basedir}/src/main/resources/schematron/ZF_230/</directory>
+                                    <directory>${basedir}/src/main/resources/schematron/ZF_232/</directory>
                                     <includes>
                                         <include>**/*.xml</include>
                                     </includes>

validator/src/main/java/org/mustangproject/validator/PDFValidator.java

@@ -122,7 +122,9 @@ public class PDFValidator extends Validator {
 		}
 
 		// step 2 validate XMP
-		final ZUGFeRDImporter zi = new ZUGFeRDImporter(inputStream);
+		final ZUGFeRDImporter zi = new ZUGFeRDImporter();
+		zi.doIgnoreCalculationErrors();//of course the calculation will still be schematron checked
+		zi.setInputStream(inputStream);
 		final String xmp = zi.getXMP();
 
 		final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();

validator/src/main/java/org/mustangproject/validator/ValidationContext.java

@@ -135,6 +135,22 @@ public class ValidationContext {
 		return String.join(",", errorcodes);
 	}
 
+	/***
+	 *
+	 * @return the unique error IDs as comma separated string
+	 */
+	public String getCSVIDResult() {
+		final ArrayList<String> errorIDs = new ArrayList<>();
+		for (final ValidationResultItem validationResultItem : results) {
+			if (!validationResultItem.getID().isEmpty()) {
+				final String errorID=validationResultItem.getID();
+				errorIDs.add(errorID);
+
+			}
+		}
+		return String.join(",", errorIDs);
+	}
+
 	public void setInvalid() {
 		isValid = false;
 	}

validator/src/main/java/org/mustangproject/validator/ValidationResultItem.java

@@ -12,6 +12,7 @@ public class ValidationResultItem {
 	
 	protected String message, location=null;
 	protected int section =-1;
+	protected String id =""; // e.g. "FX-SCH-A-000026"
 
 
 	private ESeverity severity=ESeverity.error;
@@ -103,6 +104,15 @@ public class ValidationResultItem {
 		return severity;
 	}
 
+	public ValidationResultItem setID(String id) {
+		this.id=id;
+		return this;
+	}
+
+	public String getID() {
+		return id;
+	}
+
 	public int getSection() {
 		return section;
 	}

validator/src/main/java/org/mustangproject/validator/XMLValidator.java

@@ -190,7 +190,7 @@ public class XMLValidator extends Validator {
 				boolean isEN16931 = false;
 				boolean isExtended = false;
 				boolean isXRechnung = false;
-				String currentZFVersionDir = "ZF_230";
+				String currentZFVersionDir = "ZF_232";
 				int mainSchematronSectionErrorTypeCode=4;
 				String xsltFilename = null;
 				// urn:ferd:CrossIndustryDocument:invoice:1p0:extended,
@@ -453,6 +453,7 @@ public class XMLValidator extends Validator {
 
 				String thisFailText = "";
 				String thisFailID = "";
+				String thisFailIDStr = "";
 				String thisFailTest = "";
 				String thisFailLocation = "";
 				if (failedAsserts.getLength() > 0) {
@@ -461,7 +462,8 @@ public class XMLValidator extends Validator {
 						//nodes.item(i).getTextContent())) {
 						Node currentFailNode = failedAsserts.item(nodeIndex);
 						if (currentFailNode.getAttributes().getNamedItem("id") != null) {
-							thisFailID = " [ID " + currentFailNode.getAttributes().getNamedItem("id").getNodeValue() + "]";
+							thisFailID = currentFailNode.getAttributes().getNamedItem("id").getNodeValue();
+							thisFailIDStr = " [ID " + thisFailID + "]";
 						}
 						if (currentFailNode.getAttributes().getNamedItem("test") != null) {
 							thisFailTest = currentFailNode.getAttributes().getNamedItem("test").getNodeValue();
@@ -494,8 +496,8 @@ public class XMLValidator extends Validator {
 
 						LOGGER.info("FailedAssert ", thisFailText);
 
-						context.addResultItem(new ValidationResultItem(severity, thisFailText + thisFailID + " from " + xsltFilename + ")")
-								.setLocation(thisFailLocation).setCriterion(thisFailTest).setSection(section)
+						context.addResultItem(new ValidationResultItem(severity, thisFailText + thisFailIDStr + " from " + xsltFilename + ")")
+								.setLocation(thisFailLocation).setCriterion(thisFailTest).setSection(section).setID(thisFailID)
 								.setPart(EPart.fx));
 						failedRules++;
 

validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java

@@ -318,7 +318,7 @@ public class ZUGFeRDValidator {
 		LOGGER.info("Parsed PDF:" + pdfResult + " XML:" + (xmlValidity ? "valid" : "invalid")
 			+ " Signature:" + Signature + " Checksum:" + sha1Checksum + " Profile:" + context.getProfile()
 			+ " Version:" + context.getGeneration() + " Took:" + duration + "ms Errors:[" + context.getCSVResult()
-			+ "] " + toBeAppended);
+			+ "] ErrorIDs: [" + context.getCSVIDResult()  + "]" + toBeAppended);
 		wasCompletelyValid = ((pdfValidity) && (xmlValidity));
 		return sw.toString();
 	}

validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd

@@ -5,8 +5,8 @@
     xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"
     targetNamespace="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
     elementFormDefault="qualified">
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="Factur-X_1.0.07_BASICWL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="Factur-X_1.0.07_BASICWL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="Factur-X_1.07.2_BASICWL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="Factur-X_1.07.2_BASICWL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
   <xs:complexType name="CreditorFinancialAccountType">
     <xs:sequence>
       <xs:element name="IBANID" type="udt:IDType" minOccurs="0"/>

validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd

@@ -5,8 +5,8 @@
     xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"
     targetNamespace="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
     elementFormDefault="qualified">
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="Factur-X_1.0.07_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="Factur-X_1.0.07_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="Factur-X_1.07.2_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="Factur-X_1.07.2_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
   <xs:complexType name="CreditorFinancialAccountType">
     <xs:sequence>
       <xs:element name="IBANID" type="udt:IDType" minOccurs="0"/>

validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd

@@ -5,8 +5,8 @@
     xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"
     targetNamespace="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
     elementFormDefault="qualified">
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="Factur-X_1.0.07_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="Factur-X_1.0.07_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="Factur-X_1.07.2_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="Factur-X_1.07.2_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
   <xs:complexType name="CreditorFinancialAccountType">
     <xs:sequence>
       <xs:element name="IBANID" type="udt:IDType" minOccurs="0"/>

validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd

@@ -5,8 +5,8 @@
     xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"
     targetNamespace="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
     elementFormDefault="qualified">
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="Factur-X_1.0.07_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="Factur-X_1.0.07_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="Factur-X_1.07.2_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="Factur-X_1.07.2_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
   <xs:complexType name="AdvancePaymentType">
     <xs:sequence>
       <xs:element name="PaidAmount" type="udt:AmountType"/>

validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd

@@ -5,8 +5,8 @@
     xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"
     targetNamespace="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
     elementFormDefault="qualified">
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="Factur-X_1.0.07_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
-  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="Factur-X_1.0.07_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" schemaLocation="Factur-X_1.07.2_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd"/>
+  <xs:import namespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" schemaLocation="Factur-X_1.07.2_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd"/>
   <xs:complexType name="DocumentContextParameterType">
     <xs:sequence>
       <xs:element name="ID" type="udt:IDType"/>

validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC-WL.sch

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2" schemaVersion="iso">
-  <title>Schema for Factur-X; 1.0.07; Accounting, BASIC without Lines</title>
+  <title>Schema for Factur-X; 1.07.2; Accounting, BASIC without Lines</title>
   <ns prefix="rsm" uri="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"/>
   <ns prefix="qdt" uri="urn:un:unece:uncefact:data:standard:QualifiedDataType:100"/>
   <ns prefix="ram" uri="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"/>
@@ -164,7 +164,7 @@
     <rule context="//ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='false']/ram:CategoryTradeTax[ram:CategoryCode = 'M']">
       <assert id="FX-SCH-A-000091" test="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = ('VA', 'FC')] or /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = 'VA']">
 	[BR-AG-03]-An Invoice that contains a Document level allowance (BG-20) where the Document level allowance VAT category code (BT-95) is "IPSI" shall contain the Seller VAT Identifier (BT-31), the Seller Tax registration identifier (BT-32) and/or the Seller tax representative VAT identifier (BT-63).</assert>
-      <assert id="FX-SCH-A-000092" test="ram:RateApplicablePercent &gt; 0">
+      <assert id="FX-SCH-A-000092" test="ram:RateApplicablePercent &gt;= 0">
 	[BR-AG-06]-In a Document level allowance (BG-20) where the Document level allowance VAT category code (BT-95) is "IPSI" the Document level allowance VAT rate (BT-96) shall be 0 (zero) or greater than zero.</assert>
     </rule>
   </pattern>
@@ -236,7 +236,7 @@
     <rule context="//ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='true']/ram:CategoryTradeTax[ram:CategoryCode = 'M']">
       <assert id="FX-SCH-A-000109" test="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = ('VA', 'FC')] or /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = 'VA']">
 	[BR-AG-04]-An Invoice that contains a Document level charge (BG-21) where the Document level charge VAT category code (BT-102) is "IPSI" shall contain the Seller VAT Identifier (BT-31), the Seller Tax registration identifier (BT-32) and/or the Seller tax representative VAT identifier (BT-63).</assert>
-      <assert id="FX-SCH-A-000110" test="ram:RateApplicablePercent &gt; 0">
+      <assert id="FX-SCH-A-000110" test="ram:RateApplicablePercent &gt;= 0">
 	[BR-AG-07]-In a Document level charge (BG-21) where the Document level charge VAT category code (BT-102) is "IPSI" the Document level charge VAT rate (BT-103) shall be 0 (zero) or greater than zero.</assert>
     </rule>
   </pattern>
@@ -322,12 +322,16 @@
 	[BR-CO-27]-Either the IBAN or a Proprietary ID (BT-84) shall be used.</assert>
     </rule>
   </pattern>
+  <pattern>
+    <rule context="//ram:SpecifiedTradeSettlementPaymentMeans[ram:TypeCode='30' or ram:TypeCode='58']/ram:PayeePartyCreditorFinancialAccount">
+      <assert id="FX-SCH-A-000134" test="(ram:IBANID) or (ram:ProprietaryID)">
+	[BR-61]-If the Payment means type code (BT-81) means SEPA credit transfer, Local credit transfer or Non-SEPA international credit transfer, the Payment account identifier (BT-84) shall be present.</assert>
+    </rule>
+  </pattern>
   <pattern>
     <rule context="//ram:SpecifiedTradeSettlementPaymentMeans[ram:TypeCode='30' or ram:TypeCode='58']/ram:PayerPartyDebtorFinancialAccount">
       <assert id="FX-SCH-A-000133" test="(ram:IBANID) or (ram:ProprietaryID)">
 	[BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice.</assert>
-      <assert id="FX-SCH-A-000134" test="(ram:IBANID) or (ram:ProprietaryID)">
-	[BR-61]-If the Payment means type code (BT-81) means SEPA credit transfer, Local credit transfer or Non-SEPA international credit transfer, the Payment account identifier (BT-84) shall be present.</assert>
     </rule>
   </pattern>
   <pattern>

validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC-WL_codedb.xml

@@ -2,6 +2,7 @@
 <codedb>
   <cl id="1">
     <enumeration value="urn:factur-x.eu:1p0:basicwl"/>
+    <enumeration value="urn:zugferd.de:2p0:basicwl"/>
   </cl>
   <cl id="2">
     <enumeration value="71"/>
@@ -692,6 +693,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="6">
     <enumeration value="0002"/>
@@ -919,6 +928,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="7">
     <enumeration value="AD"/>
@@ -1189,6 +1206,7 @@
     <enumeration value="0147"/>
     <enumeration value="0151"/>
     <enumeration value="0170"/>
+    <enumeration value="0177"/>
     <enumeration value="0183"/>
     <enumeration value="0184"/>
     <enumeration value="0188"/>
@@ -1220,6 +1238,7 @@
     <enumeration value="0221"/>
     <enumeration value="0225"/>
     <enumeration value="0230"/>
+    <enumeration value="0235"/>
     <enumeration value="9901"/>
     <enumeration value="9910"/>
     <enumeration value="9913"/>
@@ -1336,7 +1355,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -1429,6 +1447,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -1453,6 +1472,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="12">
@@ -1588,6 +1608,8 @@
     <enumeration value="VATEX-EU-143-1J"/>
     <enumeration value="VATEX-EU-143-1K"/>
     <enumeration value="VATEX-EU-143-1L"/>
+    <enumeration value="VATEX-EU-144"/>
+    <enumeration value="VATEX-EU-146-1E"/>
     <enumeration value="VATEX-EU-148"/>
     <enumeration value="VATEX-EU-148-A"/>
     <enumeration value="VATEX-EU-148-B"/>
@@ -1603,6 +1625,7 @@
     <enumeration value="VATEX-EU-151-1C"/>
     <enumeration value="VATEX-EU-151-1D"/>
     <enumeration value="VATEX-EU-151-1E"/>
+    <enumeration value="VATEX-EU-159"/>
     <enumeration value="VATEX-EU-309"/>
     <enumeration value="VATEX-EU-79-C"/>
     <enumeration value="VATEX-EU-AE"/>
@@ -1884,7 +1907,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -1977,6 +1999,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -2001,6 +2024,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="20">
@@ -2065,7 +2089,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -2158,6 +2181,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -2182,6 +2206,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="21">

validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC.sch

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2" schemaVersion="iso">
-  <title>Schema for Factur-X; 1.0.07; EN16931-COMPLIANT-BASIC</title>
+  <title>Schema for Factur-X; 1.07.2; EN16931-COMPLIANT-BASIC</title>
   <ns prefix="rsm" uri="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"/>
   <ns prefix="qdt" uri="urn:un:unece:uncefact:data:standard:QualifiedDataType:100"/>
   <ns prefix="ram" uri="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"/>
@@ -118,7 +118,7 @@
 	[BR-65]-The Item classification identifier (BT-158) shall have a Scheme identifier.</assert>
       <assert id="FX-SCH-A-000210" test="(ram:SpecifiedLineTradeSettlement/ram:ApplicableTradeTax[upper-case(ram:TypeCode) = 'VAT']/ram:CategoryCode)">
 	[BR-CO-04]-Each Invoice line (BG-25) shall be categorized with an Invoiced item VAT category code (BT-151).</assert>
-      <assert id="FX-SCH-A-000211" test="string-length(substring-after(ram:SpecifiedTradeSettlement/ram:SpecifiedTradeSettlementLineMonetarySummation/ram:LineTotalAmount,'.'))&lt;=2">
+      <assert id="FX-SCH-A-000211" test="string-length(substring-after(ram:SpecifiedLineTradeSettlement/ram:SpecifiedTradeSettlementLineMonetarySummation/ram:LineTotalAmount,'.'))&lt;=2">
 	[BR-DEC-23]-The allowed maximum number of decimals for the Invoice line net amount (BT-131) is 2.</assert>
     </rule>
   </pattern>
@@ -246,7 +246,7 @@
     <rule context="//ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='false']/ram:CategoryTradeTax[ram:CategoryCode = 'M']">
       <assert id="FX-SCH-A-000091" test="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = ('VA', 'FC')] or /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = 'VA']">
 	[BR-AG-03]-An Invoice that contains a Document level allowance (BG-20) where the Document level allowance VAT category code (BT-95) is "IPSI" shall contain the Seller VAT Identifier (BT-31), the Seller Tax registration identifier (BT-32) and/or the Seller tax representative VAT identifier (BT-63).</assert>
-      <assert id="FX-SCH-A-000092" test="ram:RateApplicablePercent &gt; 0">
+      <assert id="FX-SCH-A-000092" test="ram:RateApplicablePercent &gt;= 0">
 	[BR-AG-06]-In a Document level allowance (BG-20) where the Document level allowance VAT category code (BT-95) is "IPSI" the Document level allowance VAT rate (BT-96) shall be 0 (zero) or greater than zero.</assert>
     </rule>
   </pattern>
@@ -318,7 +318,7 @@
     <rule context="//ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='true']/ram:CategoryTradeTax[ram:CategoryCode = 'M']">
       <assert id="FX-SCH-A-000109" test="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = ('VA', 'FC')] or /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = 'VA']">
 	[BR-AG-04]-An Invoice that contains a Document level charge (BG-21) where the Document level charge VAT category code (BT-102) is "IPSI" shall contain the Seller VAT Identifier (BT-31), the Seller Tax registration identifier (BT-32) and/or the Seller tax representative VAT identifier (BT-63).</assert>
-      <assert id="FX-SCH-A-000110" test="ram:RateApplicablePercent &gt; 0">
+      <assert id="FX-SCH-A-000110" test="ram:RateApplicablePercent &gt;= 0">
 	[BR-AG-07]-In a Document level charge (BG-21) where the Document level charge VAT category code (BT-102) is "IPSI" the Document level charge VAT rate (BT-103) shall be 0 (zero) or greater than zero.</assert>
     </rule>
   </pattern>
@@ -406,12 +406,16 @@
 	[BR-CO-27]-Either the IBAN or a Proprietary ID (BT-84) shall be used.</assert>
     </rule>
   </pattern>
+  <pattern>
+    <rule context="//ram:SpecifiedTradeSettlementPaymentMeans[ram:TypeCode='30' or ram:TypeCode='58']/ram:PayeePartyCreditorFinancialAccount">
+      <assert id="FX-SCH-A-000134" test="(ram:IBANID) or (ram:ProprietaryID)">
+	[BR-61]-If the Payment means type code (BT-81) means SEPA credit transfer, Local credit transfer or Non-SEPA international credit transfer, the Payment account identifier (BT-84) shall be present.</assert>
+    </rule>
+  </pattern>
   <pattern>
     <rule context="//ram:SpecifiedTradeSettlementPaymentMeans[ram:TypeCode='30' or ram:TypeCode='58']/ram:PayerPartyDebtorFinancialAccount">
       <assert id="FX-SCH-A-000133" test="(ram:IBANID) or (ram:ProprietaryID)">
 	[BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice.</assert>
-      <assert id="FX-SCH-A-000134" test="(ram:IBANID) or (ram:ProprietaryID)">
-	[BR-61]-If the Payment means type code (BT-81) means SEPA credit transfer, Local credit transfer or Non-SEPA international credit transfer, the Payment account identifier (BT-84) shall be present.</assert>
     </rule>
   </pattern>
   <pattern>
@@ -546,7 +550,7 @@
     <rule context="//rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedLineTradeSettlement/ram:ApplicableTradeTax[ram:CategoryCode = 'M']">
       <assert id="FX-SCH-A-000245" test="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = ('VA', 'FC')] or /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = 'VA']">
 	[BR-AG-02]-An Invoice that contains an Invoice line (BG-25) where the Invoiced item VAT category code (BT-151) is "IPSI" shall contain the Seller VAT Identifier (BT-31), the Seller tax registration identifier (BT-32) and/or the Seller tax representative VAT identifier (BT-63).</assert>
-      <assert id="FX-SCH-A-000246" test="ram:RateApplicablePercent &gt; 0">
+      <assert id="FX-SCH-A-000246" test="ram:RateApplicablePercent &gt;= 0">
 	[BR-AG-05]-In an Invoice line (BG-25) where the Invoiced item VAT category code (BT-151) is "IPSI" the Invoiced item VAT rate (BT-152) shall be 0 (zero) or greater than zero.</assert>
     </rule>
   </pattern>

validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC_codedb.xml

@@ -2,6 +2,7 @@
 <codedb>
   <cl id="1">
     <enumeration value="urn:cen.eu:en16931:2017#compliant#urn:factur-x.eu:1p0:basic"/>
+    <enumeration value="urn:cen.eu:en16931:2017#compliant#urn:zugferd.de:2p0:basic"/>
   </cl>
   <cl id="2">
     <enumeration value="71"/>
@@ -692,6 +693,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="6">
     <enumeration value="10"/>
@@ -3298,6 +3307,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="12">
     <enumeration value="0002"/>
@@ -3525,6 +3542,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="13">
     <enumeration value="AD"/>
@@ -3795,6 +3820,7 @@
     <enumeration value="0147"/>
     <enumeration value="0151"/>
     <enumeration value="0170"/>
+    <enumeration value="0177"/>
     <enumeration value="0183"/>
     <enumeration value="0184"/>
     <enumeration value="0188"/>
@@ -3826,6 +3852,7 @@
     <enumeration value="0221"/>
     <enumeration value="0225"/>
     <enumeration value="0230"/>
+    <enumeration value="0235"/>
     <enumeration value="9901"/>
     <enumeration value="9910"/>
     <enumeration value="9913"/>
@@ -3942,7 +3969,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -4035,6 +4061,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -4059,6 +4086,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="18">
@@ -4180,6 +4208,8 @@
     <enumeration value="VATEX-EU-143-1J"/>
     <enumeration value="VATEX-EU-143-1K"/>
     <enumeration value="VATEX-EU-143-1L"/>
+    <enumeration value="VATEX-EU-144"/>
+    <enumeration value="VATEX-EU-146-1E"/>
     <enumeration value="VATEX-EU-148"/>
     <enumeration value="VATEX-EU-148-A"/>
     <enumeration value="VATEX-EU-148-B"/>
@@ -4195,6 +4225,7 @@
     <enumeration value="VATEX-EU-151-1C"/>
     <enumeration value="VATEX-EU-151-1D"/>
     <enumeration value="VATEX-EU-151-1E"/>
+    <enumeration value="VATEX-EU-159"/>
     <enumeration value="VATEX-EU-309"/>
     <enumeration value="VATEX-EU-79-C"/>
     <enumeration value="VATEX-EU-AE"/>
@@ -4476,7 +4507,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -4569,6 +4599,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -4593,6 +4624,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="24">
@@ -4657,7 +4689,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -4750,6 +4781,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -4774,6 +4806,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="25">

validator/src/main/resources/schematron/ZF_232/FACTUR-X_EN16931.sch

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2" schemaVersion="iso">
-  <title>Schema for Factur-X; 1.0.07; EN16931-COMPLIANT (FULLY)</title>
+  <title>Schema for Factur-X; 1.07.2; EN16931-COMPLIANT (FULLY)</title>
   <ns prefix="rsm" uri="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"/>
   <ns prefix="qdt" uri="urn:un:unece:uncefact:data:standard:QualifiedDataType:100"/>
   <ns prefix="ram" uri="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"/>
@@ -130,7 +130,7 @@
 	[BR-65]-The Item classification identifier (BT-158) shall have a Scheme identifier.</assert>
       <assert id="FX-SCH-A-000210" test="(ram:SpecifiedLineTradeSettlement/ram:ApplicableTradeTax[upper-case(ram:TypeCode) = 'VAT']/ram:CategoryCode)">
 	[BR-CO-04]-Each Invoice line (BG-25) shall be categorized with an Invoiced item VAT category code (BT-151).</assert>
-      <assert id="FX-SCH-A-000211" test="string-length(substring-after(ram:SpecifiedTradeSettlement/ram:SpecifiedTradeSettlementLineMonetarySummation/ram:LineTotalAmount,'.'))&lt;=2">
+      <assert id="FX-SCH-A-000211" test="string-length(substring-after(ram:SpecifiedLineTradeSettlement/ram:SpecifiedTradeSettlementLineMonetarySummation/ram:LineTotalAmount,'.'))&lt;=2">
 	[BR-DEC-23]-The allowed maximum number of decimals for the Invoice line net amount (BT-131) is 2.</assert>
     </rule>
   </pattern>
@@ -258,7 +258,7 @@
     <rule context="//ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='false']/ram:CategoryTradeTax[ram:CategoryCode = 'M']">
       <assert id="FX-SCH-A-000091" test="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = ('VA', 'FC')] or /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = 'VA']">
 	[BR-AG-03]-An Invoice that contains a Document level allowance (BG-20) where the Document level allowance VAT category code (BT-95) is "IPSI" shall contain the Seller VAT Identifier (BT-31), the Seller Tax registration identifier (BT-32) and/or the Seller tax representative VAT identifier (BT-63).</assert>
-      <assert id="FX-SCH-A-000092" test="ram:RateApplicablePercent &gt; 0">
+      <assert id="FX-SCH-A-000092" test="ram:RateApplicablePercent &gt;= 0">
 	[BR-AG-06]-In a Document level allowance (BG-20) where the Document level allowance VAT category code (BT-95) is "IPSI" the Document level allowance VAT rate (BT-96) shall be 0 (zero) or greater than zero.</assert>
     </rule>
   </pattern>
@@ -330,7 +330,7 @@
     <rule context="//ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='true']/ram:CategoryTradeTax[ram:CategoryCode = 'M']">
       <assert id="FX-SCH-A-000109" test="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = ('VA', 'FC')] or /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = 'VA']">
 	[BR-AG-04]-An Invoice that contains a Document level charge (BG-21) where the Document level charge VAT category code (BT-102) is "IPSI" shall contain the Seller VAT Identifier (BT-31), the Seller Tax registration identifier (BT-32) and/or the Seller tax representative VAT identifier (BT-63).</assert>
-      <assert id="FX-SCH-A-000110" test="ram:RateApplicablePercent &gt; 0">
+      <assert id="FX-SCH-A-000110" test="ram:RateApplicablePercent &gt;= 0">
 	[BR-AG-07]-In a Document level charge (BG-21) where the Document level charge VAT category code (BT-102) is "IPSI" the Document level charge VAT rate (BT-103) shall be 0 (zero) or greater than zero.</assert>
     </rule>
   </pattern>
@@ -418,12 +418,16 @@
 	[BR-CO-27]-Either the IBAN or a Proprietary ID (BT-84) shall be used.</assert>
     </rule>
   </pattern>
+  <pattern>
+    <rule context="//ram:SpecifiedTradeSettlementPaymentMeans[ram:TypeCode='30' or ram:TypeCode='58']/ram:PayeePartyCreditorFinancialAccount">
+      <assert id="FX-SCH-A-000134" test="(ram:IBANID) or (ram:ProprietaryID)">
+	[BR-61]-If the Payment means type code (BT-81) means SEPA credit transfer, Local credit transfer or Non-SEPA international credit transfer, the Payment account identifier (BT-84) shall be present.</assert>
+    </rule>
+  </pattern>
   <pattern>
     <rule context="//ram:SpecifiedTradeSettlementPaymentMeans[ram:TypeCode='30' or ram:TypeCode='58']/ram:PayerPartyDebtorFinancialAccount">
       <assert id="FX-SCH-A-000133" test="(ram:IBANID) or (ram:ProprietaryID)">
 	[BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice.</assert>
-      <assert id="FX-SCH-A-000134" test="(ram:IBANID) or (ram:ProprietaryID)">
-	[BR-61]-If the Payment means type code (BT-81) means SEPA credit transfer, Local credit transfer or Non-SEPA international credit transfer, the Payment account identifier (BT-84) shall be present.</assert>
     </rule>
   </pattern>
   <pattern>
@@ -558,7 +562,7 @@
     <rule context="//rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedLineTradeSettlement/ram:ApplicableTradeTax[ram:CategoryCode = 'M']">
       <assert id="FX-SCH-A-000245" test="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = ('VA', 'FC')] or /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = 'VA']">
 	[BR-AG-02]-An Invoice that contains an Invoice line (BG-25) where the Invoiced item VAT category code (BT-151) is "IPSI" shall contain the Seller VAT Identifier (BT-31), the Seller tax registration identifier (BT-32) and/or the Seller tax representative VAT identifier (BT-63).</assert>
-      <assert id="FX-SCH-A-000246" test="ram:RateApplicablePercent &gt; 0">
+      <assert id="FX-SCH-A-000246" test="ram:RateApplicablePercent &gt;= 0">
 	[BR-AG-05]-In an Invoice line (BG-25) where the Invoiced item VAT category code (BT-151) is "IPSI" the Invoiced item VAT rate (BT-152) shall be 0 (zero) or greater than zero.</assert>
     </rule>
   </pattern>

validator/src/main/resources/schematron/ZF_232/FACTUR-X_EN16931_codedb.xml

@@ -692,6 +692,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="6">
     <enumeration value="AA"/>
@@ -4561,6 +4569,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="16">
     <enumeration value="0002"/>
@@ -4788,6 +4804,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="17">
     <enumeration value="0002"/>
@@ -4805,6 +4829,7 @@
     <enumeration value="0147"/>
     <enumeration value="0151"/>
     <enumeration value="0170"/>
+    <enumeration value="0177"/>
     <enumeration value="0183"/>
     <enumeration value="0184"/>
     <enumeration value="0188"/>
@@ -4836,6 +4861,7 @@
     <enumeration value="0221"/>
     <enumeration value="0225"/>
     <enumeration value="0230"/>
+    <enumeration value="0235"/>
     <enumeration value="9901"/>
     <enumeration value="9910"/>
     <enumeration value="9913"/>
@@ -4969,7 +4995,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -5062,6 +5087,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -5086,6 +5112,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="25">
@@ -5207,6 +5234,8 @@
     <enumeration value="VATEX-EU-143-1J"/>
     <enumeration value="VATEX-EU-143-1K"/>
     <enumeration value="VATEX-EU-143-1L"/>
+    <enumeration value="VATEX-EU-144"/>
+    <enumeration value="VATEX-EU-146-1E"/>
     <enumeration value="VATEX-EU-148"/>
     <enumeration value="VATEX-EU-148-A"/>
     <enumeration value="VATEX-EU-148-B"/>
@@ -5222,6 +5251,7 @@
     <enumeration value="VATEX-EU-151-1C"/>
     <enumeration value="VATEX-EU-151-1D"/>
     <enumeration value="VATEX-EU-151-1E"/>
+    <enumeration value="VATEX-EU-159"/>
     <enumeration value="VATEX-EU-309"/>
     <enumeration value="VATEX-EU-79-C"/>
     <enumeration value="VATEX-EU-AE"/>
@@ -5506,7 +5536,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -5599,6 +5628,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -5623,6 +5653,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="32">
@@ -5687,7 +5718,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -5780,6 +5810,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -5804,6 +5835,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="33">

validator/src/main/resources/schematron/ZF_232/FACTUR-X_EXTENDED.sch

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2" schemaVersion="iso">
-  <title>Schema for Factur-X; 1.0.07; EN16931-CONFORMANT-EXTENDED</title>
+  <title>Schema for Factur-X; 1.07.2; EN16931-CONFORMANT-EXTENDED</title>
   <ns prefix="rsm" uri="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"/>
   <ns prefix="qdt" uri="urn:un:unece:uncefact:data:standard:QualifiedDataType:100"/>
   <ns prefix="ram" uri="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"/>
@@ -102,6 +102,12 @@
 	[BR-54]-Each Item attribute (BG-32) shall contain an Item attribute name (BT-160) and an Item attribute value (BT-161).</assert>
     </rule>
   </pattern>
+  <pattern>
+    <rule context="//ram:ApplicableProductCharacteristic/ram:TypeCode">
+      <assert flag="warning" id="FX-SCH-A-000345" test="not(contains(normalize-space(.), ' ')) and contains(' A AAA AAB AAC AAD AAF AAG AAH AAI AAJ AAK AAM AAN AAO AAP AAQ AAR AAS AAT AAU AAV AAW AAX AAY AAZ ABA ABB ABC ABD ABE ABF ABG ABH ABI ABJ ABK ABL ABM ABN ABO ABP ABS ABT ABX ABY ABZ ACA ACE ACG ACN ACP ACS ACV ACW ACX ADR ADS ADT ADU ADV ADW ADX ADY ADZ AEA AEB AEC AED AEE AEF AEG AEH AEI AEJ AEK AEL AEM AEN AEO AEP AEQ AER AES AET AEU AEV AEW AEX AEY AEZ AF AFA AFB AFC AFD AFE AFF AFG AFH AFI AFJ AFK AFL AFM AFN AFO AFP AFQ AFR AFS AFT AFU AFV AFW AFX B BL BMY BMZ BNA BNB BNC BND BNE BNF BNG BNH BNI BNJ BNK BNL BNM BNN BNO BNP BNQ BNR BNS BNT BNU BNV BNW BNX BNY BNZ BR BRA BRB BRC BRD BRE BRF BRG BRH BRI BRJ BRK BRL BRM BRN BRO BRP BRQ BRR BRS BRT BRU BRV BS BSW BSX BSY BSZ BTA BTB BTC BTD BTE BTF BTG BTH BTI BTJ BTK BTL BTM BW CHN CHO CM CT CV CZ D DI DL DN DP DR DS DW E EA F FI FL FN FV GG GW HF HM HT IB ID L LM LN LND M MO MW N OD PRS PTN RA RF RJ RMW RP RUN RY SQ T TC TH TN TT VGM VH VW WA WD WM WU XH XQ XZ YS ZAL ZAS ZB ZBI ZC ZCA ZCB ZCE ZCL ZCO ZCR ZCU ZFE ZFS ZGE ZH ZK ZMG ZMN ZMO ZN ZNA ZNB ZNI ZO ZP ZPB ZS ZSB ZSE ZSI ZSL ZSN ZTA ZTE ZTI ZV ZW ZWA ZZN ZZR ZZZ BEST_BEFORE_DATE COLOR_TEXT COMMISSION DEPOSIT_SYSTEM DEPOSIT_TYPE ENERGY_CLASS EXPIRATION_DATE FEE KIND_OF_ARTICLE MATERIAL METER_LOCATION METER_NUMBER ORGANIC_CONTROL_BODY PACKAGING_MATERIAL PACKAGING_TYPE PROMOTIONAL_VARIANT SEAL_NUMBER SIZE_CODE SIZE_TEXT TRADING_UNIT WASTE_CODE WASTE_FRACTION WEEE_NUMBER ', concat(' ', normalize-space(.), ' '))">
+	[BR-FXEXT-04]-To ensure automated processing of the article attributes without bilateral reconciliation, only values from the code list UNTDED 6313+Factur-X-Extension should be used. </assert>
+    </rule>
+  </pattern>
   <pattern>
     <rule context="//ram:ApplicableTradeSettlementFinancialCard">
       <assert id="FX-SCH-A-000281" test="string-length(ram:ID)&lt;=10">
@@ -138,7 +144,7 @@
 	[BR-65]-The Item classification identifier (BT-158) shall have a Scheme identifier.</assert>
       <assert id="FX-SCH-A-000210" test="(ram:SpecifiedLineTradeSettlement/ram:ApplicableTradeTax[upper-case(ram:TypeCode) = 'VAT']/ram:CategoryCode)">
 	[BR-CO-04]-Each Invoice line (BG-25) shall be categorized with an Invoiced item VAT category code (BT-151).</assert>
-      <assert id="FX-SCH-A-000211" test="string-length(substring-after(ram:SpecifiedTradeSettlement/ram:SpecifiedTradeSettlementLineMonetarySummation/ram:LineTotalAmount,'.'))&lt;=2">
+      <assert id="FX-SCH-A-000211" test="string-length(substring-after(ram:SpecifiedLineTradeSettlement/ram:SpecifiedTradeSettlementLineMonetarySummation/ram:LineTotalAmount,'.'))&lt;=2">
 	[BR-DEC-23]-The allowed maximum number of decimals for the Invoice line net amount (BT-131) is 2.</assert>
     </rule>
   </pattern>
@@ -272,7 +278,7 @@
     <rule context="//ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='false']/ram:CategoryTradeTax[ram:CategoryCode = 'M']">
       <assert id="FX-SCH-A-000091" test="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = ('VA', 'FC')] or /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = 'VA']">
 	[BR-AG-03]-An Invoice that contains a Document level allowance (BG-20) where the Document level allowance VAT category code (BT-95) is "IPSI" shall contain the Seller VAT Identifier (BT-31), the Seller Tax registration identifier (BT-32) and/or the Seller tax representative VAT identifier (BT-63).</assert>
-      <assert id="FX-SCH-A-000092" test="ram:RateApplicablePercent &gt; 0">
+      <assert id="FX-SCH-A-000092" test="ram:RateApplicablePercent &gt;= 0">
 	[BR-AG-06]-In a Document level allowance (BG-20) where the Document level allowance VAT category code (BT-95) is "IPSI" the Document level allowance VAT rate (BT-96) shall be 0 (zero) or greater than zero.</assert>
     </rule>
   </pattern>
@@ -342,7 +348,7 @@
     <rule context="//ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='true']/ram:CategoryTradeTax[ram:CategoryCode = 'M']">
       <assert id="FX-SCH-A-000109" test="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = ('VA', 'FC')] or /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = 'VA']">
 	[BR-AG-04]-An Invoice that contains a Document level charge (BG-21) where the Document level charge VAT category code (BT-102) is "IPSI" shall contain the Seller VAT Identifier (BT-31), the Seller Tax registration identifier (BT-32) and/or the Seller tax representative VAT identifier (BT-63).</assert>
-      <assert id="FX-SCH-A-000110" test="ram:RateApplicablePercent &gt; 0">
+      <assert id="FX-SCH-A-000110" test="ram:RateApplicablePercent &gt;= 0">
 	[BR-AG-07]-In a Document level charge (BG-21) where the Document level charge VAT category code (BT-102) is "IPSI" the Document level charge VAT rate (BT-103) shall be 0 (zero) or greater than zero.</assert>
     </rule>
   </pattern>
@@ -380,9 +386,9 @@
 	[BR-14]-An Invoice shall have the Invoice total amount with VAT (BT-112).</assert>
       <assert id="FX-SCH-A-000005" test="(ram:DuePayableAmount)">
 	[BR-15]-An Invoice shall have the Amount due for payment (BT-115).</assert>
-      <assert id="FX-SCH-A-000304" test="for $calculatedAmount in xs:decimal(round(sum(/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='false']/ram:ActualAmount)* 10 * 10 ) div 100),&#13;&#10;            $totalAmount in xs:decimal(ram:AllowanceTotalAmount),&#13;&#10;            $nbAllowanceItems in xs:decimal(count(../ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='false'])),&#13;&#10;            $tolerance in xs:decimal(0.01),&#13;&#10;            $maxTolerance in $nbAllowanceItems * $tolerance,&#13;&#10;            $diff in xs:decimal($totalAmount - $calculatedAmount),&#13;&#10;            $abs in xs:decimal(abs($diff))&#13;&#10;        return&#13;&#10;        $abs le $maxTolerance or (not(/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='false']) and not (ram:AllowanceTotalAmount))">
+      <assert id="FX-SCH-A-000304" test="(not(/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='false']) and not (ram:AllowanceTotalAmount)) or&#13;&#10;(for $calculatedAmount in xs:decimal(round(sum(/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='false']/ram:ActualAmount)* 10 * 10 ) div 100),&#13;&#10;            $totalAmount in xs:decimal(ram:AllowanceTotalAmount),&#13;&#10;            $nbAllowanceItems in xs:decimal(count(../ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='false'])),&#13;&#10;            $tolerance in xs:decimal(0.01),&#13;&#10;            $maxTolerance in $nbAllowanceItems * $tolerance,&#13;&#10;            $diff in xs:decimal($totalAmount - $calculatedAmount),&#13;&#10;            $abs in xs:decimal(abs($diff))&#13;&#10;        return&#13;&#10;        $abs le $maxTolerance)">
 	[BR-FXEXT-CO-11]-Absolute Value of (Sum of allowances on document level (BT-107) - Σ Document level allowance amounts (BT-92))&lt;= 0,01 * Number of Document level allowance amounts (BT-92).</assert>
-      <assert id="FX-SCH-A-000305" test="for $calculatedAmount in xs:decimal(xs:decimal(round(sum(/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='true']/ram:ActualAmount)* 100 ) div 100)+ xs:decimal(round(sum(/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedLogisticsServiceCharge/ram:AppliedAmount)* 10 * 10 ) div 100)),&#13;&#10;            $totalAmount in xs:decimal(ram:ChargeTotalAmount),&#13;&#10;                        $nbChargeItems in xs:decimal(count(../ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='true']) + count(../ram:SpecifiedLogisticsServiceCharge)),&#13;&#10;            $tolerance in xs:decimal(0.01),&#13;&#10;            $maxTolerance in $nbChargeItems * $tolerance,&#13;&#10;            $diff in xs:decimal($totalAmount - $calculatedAmount),&#13;&#10;            $abs in xs:decimal(abs($diff))&#13;&#10;        return&#13;&#10;        $abs le $maxTolerance or (not(/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='true'])and not (ram:ChargeTotalAmount))">
+      <assert id="FX-SCH-A-000305" test="(not(/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='true'])and not (ram:ChargeTotalAmount)) &#13;&#10;or&#13;&#10;(for $calculatedAmount in xs:decimal(xs:decimal(round(sum(/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='true']/ram:ActualAmount)* 100 ) div 100)+ xs:decimal(round(sum(/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedLogisticsServiceCharge/ram:AppliedAmount)* 10 * 10 ) div 100)),&#13;&#10;            $totalAmount in xs:decimal(ram:ChargeTotalAmount),&#13;&#10;                        $nbChargeItems in xs:decimal(count(../ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='true']) + count(../ram:SpecifiedLogisticsServiceCharge)),&#13;&#10;            $tolerance in xs:decimal(0.01),&#13;&#10;            $maxTolerance in $nbChargeItems * $tolerance,&#13;&#10;            $diff in xs:decimal($totalAmount - $calculatedAmount),&#13;&#10;            $abs in xs:decimal(abs($diff))&#13;&#10;        return&#13;&#10;        $abs le $maxTolerance)">
 	[BR-FXEXT-CO-12]-Absolute Value of (Sum of charges on document level (BT-108) - Σ Document level charge amounts (BT-99) - Σ Logistics Service fee amounts (BT-x-272))&lt;= 0,01 * (Number of Document level charge amounts (BT-99) + Number of Logistics Service fee amounts (BT-X-272)).</assert>
       <assert id="FX-SCH-A-000306" test="for $BT109 in xs:decimal(ram:TaxBasisTotalAmount),&#13;&#10;   $BT131Sum in xs:decimal(round(sum(../../ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedLineTradeSettlement/ram:SpecifiedTradeSettlementLineMonetarySummation/ram:LineTotalAmount) * xs:decimal(100)) div xs:decimal(100)),&#13;&#10;   $BT92Sum in xs:decimal(round(sum(/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='false']/ram:ActualAmount)* 10 * 10 ) div 100),&#13;&#10;   $BT99Sum in xs:decimal(xs:decimal(round(sum(/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='true']/ram:ActualAmount)* 100 ) div 100)+ xs:decimal(round(sum(/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedLogisticsServiceCharge/ram:AppliedAmount)* 10 * 10 ) div 100)),&#13;&#10;   $nbLineItems in xs:decimal(count(../../ram:IncludedSupplyChainTradeLineItem)),&#13;&#10;   $nbAllowanceItems in xs:decimal(count(../ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='false'])),&#13;&#10;   $nbChargeItems in xs:decimal(count(../ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='true']) + count(../ram:SpecifiedLogisticsServiceCharge)),&#13;&#10;            $tolerance in xs:decimal(0.01),&#13;&#10;            $maxTolerance in $tolerance * ($nbLineItems + $nbAllowanceItems + $nbChargeItems),&#13;&#10;            $diff in xs:decimal($BT109 - $BT131Sum + $BT92Sum - $BT99Sum),&#13;&#10;            $abs in xs:decimal(abs($diff))&#13;&#10;        return&#13;&#10;        $abs le $maxTolerance">
 	[BR-FXEXT-CO-13]-Absolute Value of (Invoice total amount without VAT (BT-109) - ∑ Invoice line net amounts (BT-131) + Σ Document level allowance amounts (BT-92) - Σ Document level charge amounts (BT-99)) &lt;= 0,01 * (Number of line net amounts (BT-131) + Number of Document level allowance amounts (BT-92) + Number of Document level charge amounts (BT-99)).</assert>
@@ -428,12 +434,16 @@
 	[BR-CO-27]-Either the IBAN or a Proprietary ID (BT-84) shall be used.</assert>
     </rule>
   </pattern>
+  <pattern>
+    <rule context="//ram:SpecifiedTradeSettlementPaymentMeans[ram:TypeCode='30' or ram:TypeCode='58']/ram:PayeePartyCreditorFinancialAccount">
+      <assert id="FX-SCH-A-000134" test="(ram:IBANID) or (ram:ProprietaryID)">
+	[BR-61]-If the Payment means type code (BT-81) means SEPA credit transfer, Local credit transfer or Non-SEPA international credit transfer, the Payment account identifier (BT-84) shall be present.</assert>
+    </rule>
+  </pattern>
   <pattern>
     <rule context="//ram:SpecifiedTradeSettlementPaymentMeans[ram:TypeCode='30' or ram:TypeCode='58']/ram:PayerPartyDebtorFinancialAccount">
       <assert id="FX-SCH-A-000133" test="(ram:IBANID) or (ram:ProprietaryID)">
 	[BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice.</assert>
-      <assert id="FX-SCH-A-000134" test="(ram:IBANID) or (ram:ProprietaryID)">
-	[BR-61]-If the Payment means type code (BT-81) means SEPA credit transfer, Local credit transfer or Non-SEPA international credit transfer, the Payment account identifier (BT-84) shall be present.</assert>
     </rule>
   </pattern>
   <pattern>
@@ -560,7 +570,7 @@
     <rule context="//rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedLineTradeSettlement/ram:ApplicableTradeTax[ram:CategoryCode = 'M']">
       <assert id="FX-SCH-A-000245" test="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = ('VA', 'FC')] or /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID = 'VA']">
 	[BR-AG-02]-An Invoice that contains an Invoice line (BG-25) where the Invoiced item VAT category code (BT-151) is "IPSI" shall contain the Seller VAT Identifier (BT-31), the Seller tax registration identifier (BT-32) and/or the Seller tax representative VAT identifier (BT-63).</assert>
-      <assert id="FX-SCH-A-000246" test="ram:RateApplicablePercent &gt; 0">
+      <assert id="FX-SCH-A-000246" test="ram:RateApplicablePercent &gt;= 0">
 	[BR-AG-05]-In an Invoice line (BG-25) where the Invoiced item VAT category code (BT-151) is "IPSI" the Invoiced item VAT rate (BT-152) shall be 0 (zero) or greater than zero.</assert>
     </rule>
   </pattern>
@@ -1131,8 +1141,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:BuyerAgentTradeParty/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -1165,8 +1175,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:BuyerAgentTradeParty/ram:SpecifiedLegalOrganization/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -1371,8 +1381,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:BuyerTaxRepresentativeTradeParty/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -1405,8 +1415,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:BuyerTaxRepresentativeTradeParty/ram:SpecifiedLegalOrganization/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -1548,8 +1558,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:BuyerTradeParty/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -1582,8 +1592,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:BuyerTradeParty/ram:SpecifiedLegalOrganization/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -1796,8 +1806,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:ProductEndUserTradeParty/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -1830,8 +1840,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:ProductEndUserTradeParty/ram:SpecifiedLegalOrganization/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -2036,8 +2046,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SalesAgentTradeParty/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -2070,8 +2080,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SalesAgentTradeParty/ram:SpecifiedLegalOrganization/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -2278,8 +2288,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -2312,8 +2322,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty/ram:SpecifiedLegalOrganization/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -2462,8 +2472,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -2496,8 +2506,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:SpecifiedLegalOrganization/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -2849,6 +2859,13 @@
 	Element 'ram:ModeCode' must occur exactly 1 times.</assert>
     </rule>
   </pattern>
+  <pattern>
+    <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeDelivery/ram:RelatedSupplyChainConsignment/ram:SpecifiedLogisticsTransportMovement/ram:ModeCode">
+      <let name="codeValue34" value="."/>
+      <assert id="FX-SCH-A-000346" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=34]/enumeration[@value=$codeValue34]">
+	Value of 'ram:ModeCode' is not allowed.</assert>
+    </rule>
+  </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeDelivery/ram:ShipFromTradeParty">
       <assert id="FX-SCH-A-000163" test="count(ram:ID)&lt;=1">
@@ -2938,8 +2955,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeDelivery/ram:ShipFromTradeParty/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -2972,8 +2989,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeDelivery/ram:ShipFromTradeParty/ram:SpecifiedLegalOrganization/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -3115,8 +3132,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeDelivery/ram:ShipToTradeParty/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -3149,8 +3166,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeDelivery/ram:ShipToTradeParty/ram:SpecifiedLegalOrganization/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -3292,8 +3309,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeDelivery/ram:UltimateShipToTradeParty/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -3326,8 +3343,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeDelivery/ram:UltimateShipToTradeParty/ram:SpecifiedLegalOrganization/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -3435,8 +3452,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:ApplicableTradeTax/ram:DueDateTypeCode">
-      <let name="codeValue37" value="."/>
-      <assert id="FX-SCH-A-000180" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=37]/enumeration[@value=$codeValue37]">
+      <let name="codeValue38" value="."/>
+      <assert id="FX-SCH-A-000180" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=38]/enumeration[@value=$codeValue38]">
 	Value of 'ram:DueDateTypeCode' is not allowed.</assert>
     </rule>
   </pattern>
@@ -3473,8 +3490,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:ApplicableTradeTax/ram:TaxPointDate/udt:DateString[@format]">
-      <let name="codeValue36" value="@format"/>
-      <assert id="FX-SCH-A-000022" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=36]/enumeration[@value=$codeValue36]">
+      <let name="codeValue37" value="@format"/>
+      <assert id="FX-SCH-A-000022" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=37]/enumeration[@value=$codeValue37]">
 	Value of '@format' is not allowed.</assert>
     </rule>
   </pattern>
@@ -3531,8 +3548,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:InvoiceCurrencyCode">
-      <let name="codeValue34" value="."/>
-      <assert id="FX-SCH-A-000040" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=34]/enumeration[@value=$codeValue34]">
+      <let name="codeValue35" value="."/>
+      <assert id="FX-SCH-A-000040" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=35]/enumeration[@value=$codeValue35]">
 	Value of 'ram:InvoiceCurrencyCode' is not allowed.</assert>
     </rule>
   </pattern>
@@ -3589,8 +3606,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:InvoiceReferencedDocument/ram:TypeCode">
-      <let name="codeValue42" value="."/>
-      <assert id="FX-SCH-A-000023" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=42]/enumeration[@value=$codeValue42]">
+      <let name="codeValue43" value="."/>
+      <assert id="FX-SCH-A-000023" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=43]/enumeration[@value=$codeValue43]">
 	Value of 'ram:TypeCode' is not allowed.</assert>
     </rule>
   </pattern>
@@ -3691,8 +3708,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:InvoiceeTradeParty/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -3725,8 +3742,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:InvoiceeTradeParty/ram:SpecifiedLegalOrganization/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -3870,8 +3887,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:InvoicerTradeParty/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -3904,8 +3921,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:InvoicerTradeParty/ram:SpecifiedLegalOrganization/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -4049,8 +4066,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:PayeeTradeParty/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -4083,8 +4100,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:PayeeTradeParty/ram:SpecifiedLegalOrganization/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -4228,8 +4245,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:PayerTradeParty/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -4262,8 +4279,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:PayerTradeParty/ram:SpecifiedLegalOrganization/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -4324,8 +4341,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:ReceivableSpecifiedTradeAccountingAccount/ram:TypeCode">
-      <let name="codeValue43" value="."/>
-      <assert id="FX-SCH-A-000023" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=43]/enumeration[@value=$codeValue43]">
+      <let name="codeValue44" value="."/>
+      <assert id="FX-SCH-A-000023" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=44]/enumeration[@value=$codeValue44]">
 	Value of 'ram:TypeCode' is not allowed.</assert>
     </rule>
   </pattern>
@@ -4480,8 +4497,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedAdvancePayment/ram:InvoiceSpecifiedReferencedDocument/ram:TypeCode">
-      <let name="codeValue44" value="."/>
-      <assert id="FX-SCH-A-000023" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=44]/enumeration[@value=$codeValue44]">
+      <let name="codeValue45" value="."/>
+      <assert id="FX-SCH-A-000023" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=45]/enumeration[@value=$codeValue45]">
 	Value of 'ram:TypeCode' is not allowed.</assert>
     </rule>
   </pattern>
@@ -4692,8 +4709,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator=&quot;false&quot;]/ram:ReasonCode">
-      <let name="codeValue38" value="."/>
-      <assert id="FX-SCH-A-000186" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=38]/enumeration[@value=$codeValue38]">
+      <let name="codeValue39" value="."/>
+      <assert id="FX-SCH-A-000186" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=39]/enumeration[@value=$codeValue39]">
 	Value of 'ram:ReasonCode' is not allowed.</assert>
     </rule>
   </pattern>
@@ -4798,8 +4815,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator=&quot;true&quot;]/ram:ReasonCode">
-      <let name="codeValue39" value="."/>
-      <assert id="FX-SCH-A-000186" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=39]/enumeration[@value=$codeValue39]">
+      <let name="codeValue40" value="."/>
+      <assert id="FX-SCH-A-000186" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=40]/enumeration[@value=$codeValue40]">
 	Value of 'ram:ReasonCode' is not allowed.</assert>
     </rule>
   </pattern>
@@ -4987,8 +5004,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:PayeeTradeParty/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -5021,8 +5038,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:PayeeTradeParty/ram:SpecifiedLegalOrganization/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -5149,8 +5166,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementHeaderMonetarySummation/ram:TaxTotalAmount[@currencyID=../../ram:InvoiceCurrencyCode and @currencyID]">
-      <let name="codeValue40" value="@currencyID"/>
-      <assert id="FX-SCH-A-000045" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=40]/enumeration[@value=$codeValue40]">
+      <let name="codeValue41" value="@currencyID"/>
+      <assert id="FX-SCH-A-000045" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=41]/enumeration[@value=$codeValue41]">
 	Value of '@currencyID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -5162,8 +5179,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementHeaderMonetarySummation/ram:TaxTotalAmount[@currencyID=../../ram:TaxCurrencyCode and @currencyID]">
-      <let name="codeValue41" value="@currencyID"/>
-      <assert id="FX-SCH-A-000045" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=41]/enumeration[@value=$codeValue41]">
+      <let name="codeValue42" value="@currencyID"/>
+      <assert id="FX-SCH-A-000045" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=42]/enumeration[@value=$codeValue42]">
 	Value of '@currencyID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -5239,8 +5256,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans/ram:TypeCode">
-      <let name="codeValue35" value="."/>
-      <assert id="FX-SCH-A-000023" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=35]/enumeration[@value=$codeValue35]">
+      <let name="codeValue36" value="."/>
+      <assert id="FX-SCH-A-000023" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=36]/enumeration[@value=$codeValue36]">
 	Value of 'ram:TypeCode' is not allowed.</assert>
     </rule>
   </pattern>
@@ -5259,22 +5276,22 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:TaxApplicableTradeCurrencyExchange/ram:SourceCurrencyCode">
-      <let name="codeValue34" value="."/>
-      <assert id="FX-SCH-A-000332" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=34]/enumeration[@value=$codeValue34]">
+      <let name="codeValue35" value="."/>
+      <assert id="FX-SCH-A-000332" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=35]/enumeration[@value=$codeValue35]">
 	Value of 'ram:SourceCurrencyCode' is not allowed.</assert>
     </rule>
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:TaxApplicableTradeCurrencyExchange/ram:TargetCurrencyCode">
-      <let name="codeValue34" value="."/>
-      <assert id="FX-SCH-A-000333" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=34]/enumeration[@value=$codeValue34]">
+      <let name="codeValue35" value="."/>
+      <assert id="FX-SCH-A-000333" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=35]/enumeration[@value=$codeValue35]">
 	Value of 'ram:TargetCurrencyCode' is not allowed.</assert>
     </rule>
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:TaxCurrencyCode">
-      <let name="codeValue34" value="."/>
-      <assert id="FX-SCH-A-000196" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=34]/enumeration[@value=$codeValue34]">
+      <let name="codeValue35" value="."/>
+      <assert id="FX-SCH-A-000196" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=35]/enumeration[@value=$codeValue35]">
 	Value of 'ram:TaxCurrencyCode' is not allowed.</assert>
     </rule>
   </pattern>
@@ -6273,8 +6290,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedLineTradeDelivery/ram:ShipToTradeParty/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -6435,8 +6452,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedLineTradeDelivery/ram:UltimateShipToTradeParty/ram:PostalTradeAddress/ram:CountryID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000036" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:CountryID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -6915,13 +6932,6 @@
 	Element 'ram:Value' must occur exactly 1 times.</assert>
     </rule>
   </pattern>
-  <pattern>
-    <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedTradeProduct/ram:ApplicableProductCharacteristic/ram:TypeCode">
-      <let name="codeValue8" value="."/>
-      <assert id="FX-SCH-A-000023" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=8]/enumeration[@value=$codeValue8]">
-	Value of 'ram:TypeCode' is not allowed.</assert>
-    </rule>
-  </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedTradeProduct/ram:ApplicableProductCharacteristic/ram:TypeCode[@listID]">
       <report test="true()">
@@ -6960,8 +6970,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedTradeProduct/ram:DesignatedProductClassification/ram:ClassCode[@listID]">
-      <let name="codeValue9" value="@listID"/>
-      <assert id="FX-SCH-A-000297" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
+      <let name="codeValue8" value="@listID"/>
+      <assert id="FX-SCH-A-000297" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=8]/enumeration[@value=$codeValue8]">
 	Value of '@listID' is not allowed.</assert>
     </rule>
   </pattern>
@@ -7010,6 +7020,13 @@
 	Attribute '@schemeID' is required in this context.</assert>
     </rule>
   </pattern>
+  <pattern>
+    <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedTradeProduct/ram:IncludedReferencedProduct/ram:GlobalID[@schemeID]">
+      <let name="codeValue10" value="@schemeID"/>
+      <assert id="FX-SCH-A-000031" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+	Value of '@schemeID' is not allowed.</assert>
+    </rule>
+  </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedTradeProduct/ram:IncludedReferencedProduct/ram:ID[@schemeID]">
       <report test="true()">
@@ -7073,8 +7090,8 @@
   </pattern>
   <pattern>
     <rule context="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedTradeProduct/ram:OriginTradeCountry/ram:ID">
-      <let name="codeValue10" value="."/>
-      <assert id="FX-SCH-A-000026" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=10]/enumeration[@value=$codeValue10]">
+      <let name="codeValue9" value="."/>
+      <assert id="FX-SCH-A-000026" test="document('FACTUR-X_EXTENDED_codedb.xml')//cl[@id=9]/enumeration[@value=$codeValue9]">
 	Value of 'ram:ID' is not allowed.</assert>
     </rule>
   </pattern>

validator/src/main/resources/schematron/ZF_232/FACTUR-X_MINIMUM.sch

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2" schemaVersion="iso">
-  <title>Schema for Factur-X; 1.0.07; Accounting, MINIMUM</title>
+  <title>Schema for Factur-X; 1.07.2; Accounting, MINIMUM</title>
   <ns prefix="rsm" uri="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"/>
   <ns prefix="qdt" uri="urn:un:unece:uncefact:data:standard:QualifiedDataType:100"/>
   <ns prefix="ram" uri="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"/>

validator/src/main/resources/schematron/ZF_232/FACTUR-X_MINIMUM_codedb.xml

@@ -2,6 +2,7 @@
 <codedb>
   <cl id="1">
     <enumeration value="urn:factur-x.eu:1p0:minimum"/>
+    <enumeration value="urn:zugferd.de:2p0:minimum"/>
   </cl>
   <cl id="2">
     <enumeration value="71"/>
@@ -289,6 +290,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="5">
     <enumeration value="AD"/>
@@ -605,7 +614,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -698,6 +706,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -722,6 +731,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="7">
@@ -786,7 +796,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -879,6 +888,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -903,6 +913,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
 </codedb>

validator/src/main/resources/xslt/XR_22/XRechnung-CII-validation.xslt

@@ -211,7 +211,7 @@
   <xsl:variable name="CEF-EAS-EXT-CODES" select="' 0002 0007 0009 0037 0060 0088 0096 0097 0106 0130 0135 0142 0151 0183 0184 0190 0191 0192 0193 0194 0195 0196 0198 0199 0200 0201 0202 0203 0204 0208 0209 0210 0211 0212 0213 9901 9902 9904 9905 9906 9907 9910 9913 9914 9915 9918 9919 9920 9922 9923 9924 9925 9926 9927 9928 9929 9930 9931 9932 9933 9934 9935 9936 9937 9938 9939 9940 9941 9942 9943 9944 9945 9946 9947 9948 9949 9950 9951 9952 9953 9955 9957 AN AQ AS AU EM XR01 XR02 XR03 '" />
   <xsl:template match="text()" mode="M7" priority="-1" />
   <xsl:template match="@*|node()" mode="M7" priority="-2">
-    <xsl:apply-templates mode="M7" select="*" />
+    <xsl:apply-templates mode="M7" select="@*|*" />
   </xsl:template>
 
 <!--PATTERN cii-pattern-->
@@ -344,7 +344,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -365,7 +365,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -386,7 +386,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -422,7 +422,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -503,7 +503,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -539,7 +539,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -575,7 +575,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -626,7 +626,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -662,7 +662,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -713,7 +713,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -734,11 +734,11 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
   <xsl:template match="text()" mode="M8" priority="-1" />
   <xsl:template match="@*|node()" mode="M8" priority="-2">
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 <!--PATTERN cii-extension-pattern-->
@@ -764,7 +764,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M9" select="*" />
+    <xsl:apply-templates mode="M9" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -787,7 +787,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M9" select="*" />
+    <xsl:apply-templates mode="M9" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -810,7 +810,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M9" select="*" />
+    <xsl:apply-templates mode="M9" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -833,7 +833,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M9" select="*" />
+    <xsl:apply-templates mode="M9" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -856,10 +856,10 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M9" select="*" />
+    <xsl:apply-templates mode="M9" select="@*|*" />
   </xsl:template>
   <xsl:template match="text()" mode="M9" priority="-1" />
   <xsl:template match="@*|node()" mode="M9" priority="-2">
-    <xsl:apply-templates mode="M9" select="*" />
+    <xsl:apply-templates mode="M9" select="@*|*" />
   </xsl:template>
 </xsl:stylesheet>

validator/src/main/resources/xslt/XR_23/XRechnung-CII-validation.xslt

@@ -214,7 +214,7 @@
   <xsl:variable name="CEF-EAS-EXT-CODES" select="concat($DIGA-CODES, $CEF-EAS-CODES)" />
   <xsl:template match="text()" mode="M7" priority="-1" />
   <xsl:template match="@*|node()" mode="M7" priority="-2">
-    <xsl:apply-templates mode="M7" select="*" />
+    <xsl:apply-templates mode="M7" select="@*|*" />
   </xsl:template>
 
 <!--PATTERN cii-pattern-->
@@ -396,7 +396,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -417,7 +417,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -438,7 +438,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -474,7 +474,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -555,7 +555,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -591,7 +591,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -627,7 +627,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -678,7 +678,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -714,7 +714,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -765,7 +765,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -786,11 +786,11 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
   <xsl:template match="text()" mode="M8" priority="-1" />
   <xsl:template match="@*|node()" mode="M8" priority="-2">
-    <xsl:apply-templates mode="M8" select="*" />
+    <xsl:apply-templates mode="M8" select="@*|*" />
   </xsl:template>
 
 <!--PATTERN cii-extension-pattern-->
@@ -816,7 +816,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M9" select="*" />
+    <xsl:apply-templates mode="M9" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -839,7 +839,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M9" select="*" />
+    <xsl:apply-templates mode="M9" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -862,7 +862,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M9" select="*" />
+    <xsl:apply-templates mode="M9" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -885,7 +885,7 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M9" select="*" />
+    <xsl:apply-templates mode="M9" select="@*|*" />
   </xsl:template>
 
 	<!--RULE -->
@@ -908,10 +908,10 @@
         </svrl:failed-assert>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates mode="M9" select="*" />
+    <xsl:apply-templates mode="M9" select="@*|*" />
   </xsl:template>
   <xsl:template match="text()" mode="M9" priority="-1" />
   <xsl:template match="@*|node()" mode="M9" priority="-2">
-    <xsl:apply-templates mode="M9" select="*" />
+    <xsl:apply-templates mode="M9" select="@*|*" />
   </xsl:template>
 </xsl:stylesheet>

validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC-WL_codedb.xml

@@ -2,6 +2,7 @@
 <codedb>
   <cl id="1">
     <enumeration value="urn:factur-x.eu:1p0:basicwl"/>
+    <enumeration value="urn:zugferd.de:2p0:basicwl"/>
   </cl>
   <cl id="2">
     <enumeration value="71"/>
@@ -692,6 +693,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="6">
     <enumeration value="0002"/>
@@ -919,6 +928,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="7">
     <enumeration value="AD"/>
@@ -1189,6 +1206,7 @@
     <enumeration value="0147"/>
     <enumeration value="0151"/>
     <enumeration value="0170"/>
+    <enumeration value="0177"/>
     <enumeration value="0183"/>
     <enumeration value="0184"/>
     <enumeration value="0188"/>
@@ -1220,6 +1238,7 @@
     <enumeration value="0221"/>
     <enumeration value="0225"/>
     <enumeration value="0230"/>
+    <enumeration value="0235"/>
     <enumeration value="9901"/>
     <enumeration value="9910"/>
     <enumeration value="9913"/>
@@ -1336,7 +1355,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -1429,6 +1447,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -1453,6 +1472,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="12">
@@ -1588,6 +1608,8 @@
     <enumeration value="VATEX-EU-143-1J"/>
     <enumeration value="VATEX-EU-143-1K"/>
     <enumeration value="VATEX-EU-143-1L"/>
+    <enumeration value="VATEX-EU-144"/>
+    <enumeration value="VATEX-EU-146-1E"/>
     <enumeration value="VATEX-EU-148"/>
     <enumeration value="VATEX-EU-148-A"/>
     <enumeration value="VATEX-EU-148-B"/>
@@ -1603,6 +1625,7 @@
     <enumeration value="VATEX-EU-151-1C"/>
     <enumeration value="VATEX-EU-151-1D"/>
     <enumeration value="VATEX-EU-151-1E"/>
+    <enumeration value="VATEX-EU-159"/>
     <enumeration value="VATEX-EU-309"/>
     <enumeration value="VATEX-EU-79-C"/>
     <enumeration value="VATEX-EU-AE"/>
@@ -1884,7 +1907,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -1977,6 +1999,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -2001,6 +2024,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="20">
@@ -2065,7 +2089,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -2158,6 +2181,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -2182,6 +2206,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="21">

validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC_codedb.xml

@@ -2,6 +2,7 @@
 <codedb>
   <cl id="1">
     <enumeration value="urn:cen.eu:en16931:2017#compliant#urn:factur-x.eu:1p0:basic"/>
+    <enumeration value="urn:cen.eu:en16931:2017#compliant#urn:zugferd.de:2p0:basic"/>
   </cl>
   <cl id="2">
     <enumeration value="71"/>
@@ -692,6 +693,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="6">
     <enumeration value="10"/>
@@ -3298,6 +3307,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="12">
     <enumeration value="0002"/>
@@ -3525,6 +3542,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="13">
     <enumeration value="AD"/>
@@ -3795,6 +3820,7 @@
     <enumeration value="0147"/>
     <enumeration value="0151"/>
     <enumeration value="0170"/>
+    <enumeration value="0177"/>
     <enumeration value="0183"/>
     <enumeration value="0184"/>
     <enumeration value="0188"/>
@@ -3826,6 +3852,7 @@
     <enumeration value="0221"/>
     <enumeration value="0225"/>
     <enumeration value="0230"/>
+    <enumeration value="0235"/>
     <enumeration value="9901"/>
     <enumeration value="9910"/>
     <enumeration value="9913"/>
@@ -3942,7 +3969,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -4035,6 +4061,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -4059,6 +4086,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="18">
@@ -4180,6 +4208,8 @@
     <enumeration value="VATEX-EU-143-1J"/>
     <enumeration value="VATEX-EU-143-1K"/>
     <enumeration value="VATEX-EU-143-1L"/>
+    <enumeration value="VATEX-EU-144"/>
+    <enumeration value="VATEX-EU-146-1E"/>
     <enumeration value="VATEX-EU-148"/>
     <enumeration value="VATEX-EU-148-A"/>
     <enumeration value="VATEX-EU-148-B"/>
@@ -4195,6 +4225,7 @@
     <enumeration value="VATEX-EU-151-1C"/>
     <enumeration value="VATEX-EU-151-1D"/>
     <enumeration value="VATEX-EU-151-1E"/>
+    <enumeration value="VATEX-EU-159"/>
     <enumeration value="VATEX-EU-309"/>
     <enumeration value="VATEX-EU-79-C"/>
     <enumeration value="VATEX-EU-AE"/>
@@ -4476,7 +4507,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -4569,6 +4599,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -4593,6 +4624,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="24">
@@ -4657,7 +4689,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -4750,6 +4781,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -4774,6 +4806,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="25">

validator/src/main/resources/xslt/ZF_232/FACTUR-X_EN16931_codedb.xml

@@ -692,6 +692,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="6">
     <enumeration value="AA"/>
@@ -4561,6 +4569,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="16">
     <enumeration value="0002"/>
@@ -4788,6 +4804,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="17">
     <enumeration value="0002"/>
@@ -4805,6 +4829,7 @@
     <enumeration value="0147"/>
     <enumeration value="0151"/>
     <enumeration value="0170"/>
+    <enumeration value="0177"/>
     <enumeration value="0183"/>
     <enumeration value="0184"/>
     <enumeration value="0188"/>
@@ -4836,6 +4861,7 @@
     <enumeration value="0221"/>
     <enumeration value="0225"/>
     <enumeration value="0230"/>
+    <enumeration value="0235"/>
     <enumeration value="9901"/>
     <enumeration value="9910"/>
     <enumeration value="9913"/>
@@ -4969,7 +4995,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -5062,6 +5087,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -5086,6 +5112,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="25">
@@ -5207,6 +5234,8 @@
     <enumeration value="VATEX-EU-143-1J"/>
     <enumeration value="VATEX-EU-143-1K"/>
     <enumeration value="VATEX-EU-143-1L"/>
+    <enumeration value="VATEX-EU-144"/>
+    <enumeration value="VATEX-EU-146-1E"/>
     <enumeration value="VATEX-EU-148"/>
     <enumeration value="VATEX-EU-148-A"/>
     <enumeration value="VATEX-EU-148-B"/>
@@ -5222,6 +5251,7 @@
     <enumeration value="VATEX-EU-151-1C"/>
     <enumeration value="VATEX-EU-151-1D"/>
     <enumeration value="VATEX-EU-151-1E"/>
+    <enumeration value="VATEX-EU-159"/>
     <enumeration value="VATEX-EU-309"/>
     <enumeration value="VATEX-EU-79-C"/>
     <enumeration value="VATEX-EU-AE"/>
@@ -5506,7 +5536,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -5599,6 +5628,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -5623,6 +5653,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="32">
@@ -5687,7 +5718,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -5780,6 +5810,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -5804,6 +5835,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="33">

validator/src/main/resources/xslt/ZF_232/FACTUR-X_MINIMUM.xslt

@@ -153,7 +153,7 @@
 
 <!--SCHEMA SETUP-->
 <xsl:template match="/">
-    <svrl:schematron-output schemaVersion="iso" title="Schema for Factur-X; 1.0.07; Accounting, MINIMUM">
+    <svrl:schematron-output schemaVersion="iso" title="Schema for Factur-X; 1.07.2; Accounting, MINIMUM">
       <xsl:comment>
         <xsl:value-of select="$archiveDirParameter" />   
 		 <xsl:value-of select="$archiveNameParameter" />  
@@ -455,7 +455,7 @@
   </xsl:template>
 
 <!--SCHEMATRON PATTERNS-->
-<svrl:text>Schema for Factur-X; 1.0.07; Accounting, MINIMUM</svrl:text>
+<svrl:text>Schema for Factur-X; 1.07.2; Accounting, MINIMUM</svrl:text>
 
 <!--PATTERN -->
 

validator/src/main/resources/xslt/ZF_232/FACTUR-X_MINIMUM_codedb.xml

@@ -2,6 +2,7 @@
 <codedb>
   <cl id="1">
     <enumeration value="urn:factur-x.eu:1p0:minimum"/>
+    <enumeration value="urn:zugferd.de:2p0:minimum"/>
   </cl>
   <cl id="2">
     <enumeration value="71"/>
@@ -289,6 +290,14 @@
     <enumeration value="0228"/>
     <enumeration value="0229"/>
     <enumeration value="0230"/>
+    <enumeration value="0231"/>
+    <enumeration value="0232"/>
+    <enumeration value="0233"/>
+    <enumeration value="0234"/>
+    <enumeration value="0235"/>
+    <enumeration value="0236"/>
+    <enumeration value="0237"/>
+    <enumeration value="0238"/>
   </cl>
   <cl id="5">
     <enumeration value="AD"/>
@@ -605,7 +614,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -698,6 +706,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -722,6 +731,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
   <cl id="7">
@@ -786,7 +796,6 @@
     <enumeration value="GYD"/>
     <enumeration value="HKD"/>
     <enumeration value="HNL"/>
-    <enumeration value="HRK"/>
     <enumeration value="HTG"/>
     <enumeration value="HUF"/>
     <enumeration value="IDR"/>
@@ -879,6 +888,7 @@
     <enumeration value="UYU"/>
     <enumeration value="UYW"/>
     <enumeration value="UZS"/>
+    <enumeration value="VED"/>
     <enumeration value="VES"/>
     <enumeration value="VND"/>
     <enumeration value="VUV"/>
@@ -903,6 +913,7 @@
     <enumeration value="YER"/>
     <enumeration value="ZAR"/>
     <enumeration value="ZMW"/>
+    <enumeration value="ZWG"/>
     <enumeration value="ZWL"/>
   </cl>
 </codedb>

validator/src/test/java/org/mustangproject/validator/XMLValidatorTest.java

@@ -204,6 +204,36 @@ public class XMLValidatorTest extends ResourceCase {
 
 	}
 
+	public void testXRCIIPeppolFailureValidation() {
+		final ValidationContext ctx = new ValidationContext(null);
+		final XMLValidator xv = new XMLValidator(ctx);
+		final XPathEngine xpath = new JAXPXPathEngine();
+
+		// GIVEN XRechnung CII with Peppol rule violation
+		File file = getResourceAsFile("CII_XRechnung_with_Peppol_violation.xml");
+
+		boolean noExceptions = true;
+		try {
+			xv.setFilename(file.getAbsolutePath());
+
+			// WHEN validated
+			xv.validate();
+
+			Source source = Input.fromString("<validation>" + xv.getXMLResult() + "</validation>").build();
+
+			// THEN validation returns only warning message
+			boolean onlyWarnings = Boolean.parseBoolean(xpath.evaluate("not(//messages/*[not(self::warning)])", source));
+			assertTrue(onlyWarnings);
+
+			// THEN validation returns summary status valid
+			String status = xpath.evaluate("/validation/summary/@status", source);
+			assertEquals("valid", status);
+		} catch (IrrecoverableValidationError e) {
+			noExceptions = false;
+		}
+		assertTrue(noExceptions);
+	}
+
 	public void testXRValidation() {
 		final ValidationContext ctx = new ValidationContext(null);
 		final XMLValidator xv = new XMLValidator(ctx);

validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java

@@ -2,15 +2,6 @@ package org.mustangproject.validator;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.xmlunit.builder.Input;
-import org.xmlunit.xpath.JAXPXPathEngine;
-import org.xmlunit.xpath.XPathEngine;
 
 import static org.xmlunit.assertj.XmlAssert.assertThat;
 
@@ -34,13 +25,13 @@ public class ZUGFeRDValidatorTest extends ResourceCase {
 
 
 		assertThat(res).valueByXPath("/validation/pdf/summary/@status")
-				.isEqualTo("invalid");
+			.isEqualTo("invalid");
 
 		assertThat(res).valueByXPath("/validation/xml/summary/@status")
-				.isEqualTo("valid");
+			.isEqualTo("valid");
 
 		assertThat(res).valueByXPath("/validation/summary/@status")
-				.isEqualTo("invalid");
+			.isEqualTo("invalid");
 
 
 		tempFile = getResourceAsFile("validAvoir_FR_type380_BASICWL.pdf");
@@ -48,20 +39,20 @@ public class ZUGFeRDValidatorTest extends ResourceCase {
 
 		res = zfv.validate(tempFile.getAbsolutePath());
 		assertThat(res).valueByXPath("/validation/summary/@status")
-				.isEqualTo("valid");
+			.isEqualTo("valid");
 
 		tempFile = getResourceAsFile("validAvoir_FR_type380_BASICWL.pdf");
 		zfv = new ZUGFeRDValidator();
 
 		res = zfv.validate(tempFile.getAbsolutePath());
 		assertThat(res).valueByXPath("/validation/summary/@status")
-				.isEqualTo("valid");
+			.isEqualTo("valid");
 
 		tempFile = getResourceAsFile("validXRechnung.pdf");
 		zfv = new ZUGFeRDValidator();
 		res = zfv.validate(tempFile.getAbsolutePath());
 		assertThat(res).valueByXPath("/validation/summary/@status")
-				.isEqualTo("valid");
+			.isEqualTo("valid");
 /*
 		tempFile = getResourceAsFile("testout-OX.pdf");
 		zfv = new ZUGFeRDValidator();
@@ -79,67 +70,67 @@ public class ZUGFeRDValidatorTest extends ResourceCase {
 		zfv = new ZUGFeRDValidator();
 		res = zfv.validate(tempFile.getAbsolutePath());
 		assertThat(res).valueByXPath("/validation/summary/@status")
-				.isEqualTo("invalid");
+			.isEqualTo("invalid");
 
 		zfv = new ZUGFeRDValidator();
 		res = zfv.validate("/does/not/exist");
 		assertThat(res).valueByXPath("/validation/summary/@status")
-				.isEqualTo("invalid");
+			.isEqualTo("invalid");
 
 	}
 
-  public void testPDFValidationInputStream() {
-    byte[] fileBytes = getResourceAsByteArray("invalidPDF.pdf");
-    /**used to be Rule  Status
-     Specification: ISO 19005-3:2012, Clause: 6.2.11.4, Test number: 4
-     If the FontDescriptor dictionary of an embedded CID font contains a CIDSet stream, then it shall identify all CIDs which are present in the font program, regardless of whether a CID in the font is referenced or used by the PDF or not. Failed
-     2 occurrences  Hide
-     PDCIDFont
-     fontFile_size == 0 || fontName.search(/[A-Z]{6}\+/) != 0 || CIDSet_size == 0 || cidSetListsAllGlyphs == true
-     root/document[0]/pages[1](9 0 obj PDPage)/contentStream[0](18 0 obj PDContentStream)/operators[166]/font[0](WIUIIO+CIDFont+F2)/DescendantFonts[0](WIUIIO+CIDFont+F2)
-     root/document[0]/pages[1](9 0 obj PDPage)/contentStream[0](18 0 obj PDContentStream)/operators[192]/font[0](VEXQUA+CIDFont+F1)/DescendantFonts[0](VEXQUA+CIDFont+F1)
-     but new sample since that has been downgraded to warning
-     */
-    ZUGFeRDValidator zfv = new ZUGFeRDValidator();
+	public void testPDFValidationInputStream() {
+		byte[] fileBytes = getResourceAsByteArray("invalidPDF.pdf");
+		/**used to be Rule  Status
+		 Specification: ISO 19005-3:2012, Clause: 6.2.11.4, Test number: 4
+		 If the FontDescriptor dictionary of an embedded CID font contains a CIDSet stream, then it shall identify all CIDs which are present in the font program, regardless of whether a CID in the font is referenced or used by the PDF or not. Failed
+		 2 occurrences  Hide
+		 PDCIDFont
+		 fontFile_size == 0 || fontName.search(/[A-Z]{6}\+/) != 0 || CIDSet_size == 0 || cidSetListsAllGlyphs == true
+		 root/document[0]/pages[1](9 0 obj PDPage)/contentStream[0](18 0 obj PDContentStream)/operators[166]/font[0](WIUIIO+CIDFont+F2)/DescendantFonts[0](WIUIIO+CIDFont+F2)
+		 root/document[0]/pages[1](9 0 obj PDPage)/contentStream[0](18 0 obj PDContentStream)/operators[192]/font[0](VEXQUA+CIDFont+F1)/DescendantFonts[0](VEXQUA+CIDFont+F1)
+		 but new sample since that has been downgraded to warning
+		 */
+		ZUGFeRDValidator zfv = new ZUGFeRDValidator();
 
-    String res = zfv.validate(new ByteArrayInputStream (fileBytes), "invalidPDF.pdf");
+		String res = zfv.validate(new ByteArrayInputStream(fileBytes), "invalidPDF.pdf");
 
 
-    assertThat(res).valueByXPath("/validation/pdf/summary/@status")
-        .isEqualTo("invalid");
+		assertThat(res).valueByXPath("/validation/pdf/summary/@status")
+			.isEqualTo("invalid");
 
-    assertThat(res).valueByXPath("/validation/xml/summary/@status")
-        .isEqualTo("valid");
+		assertThat(res).valueByXPath("/validation/xml/summary/@status")
+			.isEqualTo("valid");
 
-    assertThat(res).valueByXPath("/validation/summary/@status")
-        .isEqualTo("invalid");
+		assertThat(res).valueByXPath("/validation/summary/@status")
+			.isEqualTo("invalid");
 
 
-    fileBytes = getResourceAsByteArray("validAvoir_FR_type380_BASICWL.pdf");
-    zfv = new ZUGFeRDValidator();
+		fileBytes = getResourceAsByteArray("validAvoir_FR_type380_BASICWL.pdf");
+		zfv = new ZUGFeRDValidator();
 
-    res = zfv.validate(new ByteArrayInputStream (fileBytes), "validAvoir_FR_type380_BASICWL.pdf");
-    assertThat(res).valueByXPath("/validation/summary/@status")
-        .isEqualTo("valid");
+		res = zfv.validate(new ByteArrayInputStream(fileBytes), "validAvoir_FR_type380_BASICWL.pdf");
+		assertThat(res).valueByXPath("/validation/summary/@status")
+			.isEqualTo("valid");
 
-    fileBytes = getResourceAsByteArray("validXRechnung.pdf");
-    zfv = new ZUGFeRDValidator();
-    res = zfv.validate(new ByteArrayInputStream (fileBytes), "validXRechnung.pdf");
-    assertThat(res).valueByXPath("/validation/summary/@status")
-        .isEqualTo("valid");
+		fileBytes = getResourceAsByteArray("validXRechnung.pdf");
+		zfv = new ZUGFeRDValidator();
+		res = zfv.validate(new ByteArrayInputStream(fileBytes), "validXRechnung.pdf");
+		assertThat(res).valueByXPath("/validation/summary/@status")
+			.isEqualTo("valid");
 
-    fileBytes = getResourceAsByteArray("invalidXRechnung.pdf");
-    zfv = new ZUGFeRDValidator();
-    res = zfv.validate(new ByteArrayInputStream (fileBytes), "invalidXRechnung.pdf");
-    assertThat(res).valueByXPath("/validation/summary/@status")
-        .isEqualTo("invalid");
+		fileBytes = getResourceAsByteArray("invalidXRechnung.pdf");
+		zfv = new ZUGFeRDValidator();
+		res = zfv.validate(new ByteArrayInputStream(fileBytes), "invalidXRechnung.pdf");
+		assertThat(res).valueByXPath("/validation/summary/@status")
+			.isEqualTo("invalid");
 
-    zfv = new ZUGFeRDValidator();
-    res = zfv.validate(new ByteArrayInputStream (new byte[0]), "/does/not/exist");
-    assertThat(res).valueByXPath("/validation/summary/@status")
-        .isEqualTo("invalid");
+		zfv = new ZUGFeRDValidator();
+		res = zfv.validate(new ByteArrayInputStream(new byte[0]), "/does/not/exist");
+		assertThat(res).valueByXPath("/validation/summary/@status")
+			.isEqualTo("invalid");
 
-  }
+	}
 
 	public void testPDFA3AValidation() {
 		File tempFile = getResourceAsFile("zugferd_2p1_EXTENDED_PDFA-3A.pdf");
@@ -163,15 +154,15 @@ public class ZUGFeRDValidatorTest extends ResourceCase {
 		String res = zfv.validate(tempFile.getAbsolutePath());
 
 		assertThat(res).valueByXPath("count(//error)")
-				.asInt()
-				.isNotEqualTo(0);
+			.asInt()
+			.isNotEqualTo(0);
 
 		assertThat(res).valueByXPath("/validation/summary/@status")
-				.asString()
-				.isEqualTo("invalid");// expect to be valid because XR notices are, well, only notices
+			.asString()
+			.isEqualTo("invalid");// expect to be valid because XR notices are, well, only notices
 		assertThat(res).valueByXPath("/validation/xml/summary/@status")
-				.asString()
-				.isEqualTo("invalid");
+			.asString()
+			.isEqualTo("invalid");
 
 	}
 
@@ -198,6 +189,7 @@ public class ZUGFeRDValidatorTest extends ResourceCase {
 
 
 	}
+
 	public void testXR30Validation() {
 
 		File tempFile = getResourceAsFile("validXRV30.xml");
@@ -242,10 +234,10 @@ public class ZUGFeRDValidatorTest extends ResourceCase {
 
 	}
 
-		/***
-		 * the XMLValidatorTests only cover the <xml></xml> part, this one includes the root element and
-		 * the global <summary></summary> part as well
-		 */
+	/***
+	 * the XMLValidatorTests only cover the <xml></xml> part, this one includes the root element and
+	 * the global <summary></summary> part as well
+	 */
 	public void testXMLValidation() {
 		File tempFile = getResourceAsFile("validV2.xml");
 		ZUGFeRDValidator zfv = new ZUGFeRDValidator();
@@ -253,18 +245,18 @@ public class ZUGFeRDValidatorTest extends ResourceCase {
 		String res = zfv.validate(tempFile.getAbsolutePath());
 
 		assertThat(res).valueByXPath("count(//error)")
-				.asInt()
-				.isEqualTo(0);
+			.asInt()
+			.isEqualTo(0);
 
 		assertThat(res).valueByXPath("count(//notice)")
-				.asInt()
-				.isEqualTo(12); // 12 notices RE XRechnung 3.0
+			.asInt()
+			.isEqualTo(12); // 12 notices RE XRechnung 3.0
 		assertThat(res).valueByXPath("/validation/summary/@status")
-				.asString()
-				.isEqualTo("valid");// expect to be valid because XR notices are, well, only notices
+			.asString()
+			.isEqualTo("valid");// expect to be valid because XR notices are, well, only notices
 		assertThat(res).valueByXPath("/validation/xml/summary/@status")
-				.asString()
-				.isEqualTo("valid");
+			.asString()
+			.isEqualTo("valid");
 
 	}
 }

validator/src/test/resources/CII_XRechnung_with_Peppol_violation.xml

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<rsm:CrossIndustryInvoice xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100">
+    <rsm:ExchangedDocumentContext>
+        <ram:BusinessProcessSpecifiedDocumentContextParameter>
+            <ram:ID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</ram:ID>
+        </ram:BusinessProcessSpecifiedDocumentContextParameter>
+        <ram:GuidelineSpecifiedDocumentContextParameter>
+            <ram:ID>urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_3.0</ram:ID>
+        </ram:GuidelineSpecifiedDocumentContextParameter>
+    </rsm:ExchangedDocumentContext>
+    <rsm:ExchangedDocument>
+        <ram:ID>RE0021</ram:ID>
+        <ram:TypeCode>380</ram:TypeCode>
+        <ram:IssueDateTime>
+            <udt:DateTimeString format="102">20241002</udt:DateTimeString>
+        </ram:IssueDateTime>
+        <ram:IncludedNote>
+            <ram:Content>Rechnung</ram:Content>
+            <ram:SubjectCode>AFM</ram:SubjectCode>
+        </ram:IncludedNote>
+        <ram:IncludedNote>
+            <ram:Content>Unsere Lieferungen/Leistungen stellen wir Ihnen wie folgt in Rechnung.</ram:Content>
+            <ram:SubjectCode>AAI</ram:SubjectCode>
+        </ram:IncludedNote>
+        <ram:IncludedNote>
+            <ram:Content>Vielen Dank für die gute Zusammenarbeit.</ram:Content>
+            <ram:SubjectCode>SUR</ram:SubjectCode>
+        </ram:IncludedNote>
+    </rsm:ExchangedDocument>
+    <rsm:SupplyChainTradeTransaction>
+        <ram:IncludedSupplyChainTradeLineItem>
+            <ram:AssociatedDocumentLineDocument>
+                <ram:LineID>1</ram:LineID>
+            </ram:AssociatedDocumentLineDocument>
+            <ram:SpecifiedTradeProduct>
+                <ram:Name>1</ram:Name>
+            </ram:SpecifiedTradeProduct>
+            <ram:SpecifiedLineTradeAgreement>
+                <ram:NetPriceProductTradePrice>
+                    <ram:ChargeAmount>140.0000</ram:ChargeAmount>
+                    <ram:BasisQuantity unitCode="H87">1.0000</ram:BasisQuantity>
+                </ram:NetPriceProductTradePrice>
+            </ram:SpecifiedLineTradeAgreement>
+            <ram:SpecifiedLineTradeDelivery>
+                <ram:BilledQuantity unitCode="H87">1.0000</ram:BilledQuantity>
+            </ram:SpecifiedLineTradeDelivery>
+            <ram:SpecifiedLineTradeSettlement>
+                <ram:ApplicableTradeTax>
+                    <ram:TypeCode>VAT</ram:TypeCode>
+                    <ram:CategoryCode>S</ram:CategoryCode>
+                    <ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+                </ram:ApplicableTradeTax>
+                <ram:SpecifiedTradeSettlementLineMonetarySummation>
+                    <ram:LineTotalAmount>140.00</ram:LineTotalAmount>
+                </ram:SpecifiedTradeSettlementLineMonetarySummation>
+            </ram:SpecifiedLineTradeSettlement>
+        </ram:IncludedSupplyChainTradeLineItem>
+        <ram:ApplicableHeaderTradeAgreement>
+            <ram:BuyerReference>992-90009-96</ram:BuyerReference>
+            <ram:SellerTradeParty>
+                <ram:ID>231132</ram:ID>
+                <ram:Name>Max Muster</ram:Name>
+                <ram:DefinedTradeContact>
+                    <ram:PersonName>Max Muster</ram:PersonName>
+                    <ram:TelephoneUniversalCommunication>
+                        <ram:CompleteNumber>0192435345</ram:CompleteNumber>
+                    </ram:TelephoneUniversalCommunication>
+                    <ram:EmailURIUniversalCommunication>
+                        <ram:URIID>muster@example.com</ram:URIID>
+                    </ram:EmailURIUniversalCommunication>
+                </ram:DefinedTradeContact>
+                <ram:PostalTradeAddress>
+                    <ram:PostcodeCode>12345</ram:PostcodeCode>
+                    <ram:LineOne>Straße</ram:LineOne>
+                    <ram:CityName>Stadt</ram:CityName>
+                    <ram:CountryID>DE</ram:CountryID>
+                </ram:PostalTradeAddress>
+                <ram:URIUniversalCommunication>
+                    <ram:URIID schemeID="EM">muster@example.com</ram:URIID>
+                </ram:URIUniversalCommunication>
+                <ram:SpecifiedTaxRegistration>
+                    <ram:ID schemeID="FC">DE99999/99999</ram:ID>
+                </ram:SpecifiedTaxRegistration>
+                <ram:SpecifiedTaxRegistration>
+                    <ram:ID schemeID="VA">DE325845615</ram:ID>
+                </ram:SpecifiedTaxRegistration>
+            </ram:SellerTradeParty>
+            <ram:BuyerTradeParty>
+                <ram:Name>KUnde</ram:Name>
+                <ram:PostalTradeAddress>
+                    <ram:PostcodeCode>12345</ram:PostcodeCode>
+                    <ram:LineOne>Straße</ram:LineOne>
+                    <ram:CityName>Stadt</ram:CityName>
+                    <ram:CountryID>DE</ram:CountryID>
+                </ram:PostalTradeAddress>
+            </ram:BuyerTradeParty>
+        </ram:ApplicableHeaderTradeAgreement>
+        <ram:ApplicableHeaderTradeDelivery>
+            <ram:ActualDeliverySupplyChainEvent>
+                <ram:OccurrenceDateTime>
+                    <udt:DateTimeString format="102">20241002</udt:DateTimeString>
+                </ram:OccurrenceDateTime>
+            </ram:ActualDeliverySupplyChainEvent>
+        </ram:ApplicableHeaderTradeDelivery>
+        <ram:ApplicableHeaderTradeSettlement>
+            <ram:PaymentReference>RE0021</ram:PaymentReference>
+            <ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>
+            <ram:SpecifiedTradeSettlementPaymentMeans>
+                <ram:TypeCode>1</ram:TypeCode>
+                <ram:Information>Überweisung</ram:Information>
+                <ram:PayeePartyCreditorFinancialAccount>
+                    <ram:IBANID>DE50110101002129646573</ram:IBANID>
+                    <ram:AccountName>Max Muster</ram:AccountName>
+                </ram:PayeePartyCreditorFinancialAccount>
+                <ram:PayeeSpecifiedCreditorFinancialInstitution>
+                    <ram:BICID>BEVODEBBXXX</ram:BICID>
+                </ram:PayeeSpecifiedCreditorFinancialInstitution>
+            </ram:SpecifiedTradeSettlementPaymentMeans>
+            <ram:ApplicableTradeTax>
+                <ram:CalculatedAmount>26.60</ram:CalculatedAmount>
+                <ram:TypeCode>VAT</ram:TypeCode>
+                <ram:BasisAmount>140.00</ram:BasisAmount>
+                <ram:CategoryCode>S</ram:CategoryCode>
+                <ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+            </ram:ApplicableTradeTax>
+            <ram:SpecifiedTradePaymentTerms>
+                <ram:Description>Zahlbar sofort, rein netto</ram:Description>
+                <ram:DueDateDateTime>
+                    <udt:DateTimeString format="102">20241002</udt:DateTimeString>
+                </ram:DueDateDateTime>
+            </ram:SpecifiedTradePaymentTerms>
+            <ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+                <ram:LineTotalAmount>140.00</ram:LineTotalAmount>
+                <ram:ChargeTotalAmount>0.00</ram:ChargeTotalAmount>
+                <ram:AllowanceTotalAmount>0.00</ram:AllowanceTotalAmount>
+                <ram:TaxBasisTotalAmount>140.00</ram:TaxBasisTotalAmount>
+                <ram:TaxTotalAmount currencyID="EUR">26.60</ram:TaxTotalAmount>
+                <ram:GrandTotalAmount>166.60</ram:GrandTotalAmount>
+                <ram:TotalPrepaidAmount>0.00</ram:TotalPrepaidAmount>
+                <ram:DuePayableAmount>166.60</ram:DuePayableAmount>
+            </ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+        </ram:ApplicableHeaderTradeSettlement>
+    </rsm:SupplyChainTradeTransaction>
+</rsm:CrossIndustryInvoice>