diff --git a/History.md b/History.md index dc7128ab..225d887a 100644 --- a/History.md +++ b/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 ======= diff --git a/Mustang-CLI/pom.xml b/Mustang-CLI/pom.xml index 1c108da5..249b47c1 100644 --- a/Mustang-CLI/pom.xml +++ b/Mustang-CLI/pom.xml @@ -3,7 +3,7 @@ org.mustangproject core - 2.15.0-SNAPSHOT + 2.15.1-SNAPSHOT 4.0.0 org.mustangproject @@ -12,7 +12,7 @@ should also work for XRechnung/CII. jar - 2.15.0-SNAPSHOT + 2.15.1-SNAPSHOT UTF-8 11 @@ -23,7 +23,7 @@ org.mustangproject validator - 2.15.0-SNAPSHOT + 2.15.1-SNAPSHOT diff --git a/README.md b/README.md index f41a4671..43ea3671 100644 --- a/README.md +++ b/README.md @@ -32,9 +32,10 @@ If you set up a Maven project, you can reference the mustang artifact like this: ```xml - org.mustangproject - library - 2.14.0 + org.mustangproject + validator + 2.15.0 + shaded ``` diff --git a/library/pom.xml b/library/pom.xml index a6e875df..6e5e6daa 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -3,13 +3,13 @@ org.mustangproject core - 2.15.0-SNAPSHOT + 2.15.1-SNAPSHOT 4.0.0 org.mustangproject library - 2.15.0-SNAPSHOT + 2.15.1-SNAPSHOT jar Library to write, read and validate e-invoices (Factur-X, ZUGFeRD, Order-X, XRechnung/CII) FOSS Java library to read, write and validate european electronic invoices and orders in the UN/CEFACT diff --git a/library/src/main/java/org/mustangproject/CalculatedInvoice.java b/library/src/main/java/org/mustangproject/CalculatedInvoice.java index 729d0f9b..c6a24fb1 100644 --- a/library/src/main/java/org/mustangproject/CalculatedInvoice.java +++ b/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; + } + } diff --git a/library/src/main/java/org/mustangproject/DirectDebit.java b/library/src/main/java/org/mustangproject/DirectDebit.java index 4eef6cb3..d90ba661 100644 --- a/library/src/main/java/org/mustangproject/DirectDebit.java +++ b/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 :-) diff --git a/library/src/main/java/org/mustangproject/FileAttachment.java b/library/src/main/java/org/mustangproject/FileAttachment.java index d17aa727..dfced588 100644 --- a/library/src/main/java/org/mustangproject/FileAttachment.java +++ b/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; diff --git a/library/src/main/java/org/mustangproject/IncludedNote.java b/library/src/main/java/org/mustangproject/IncludedNote.java index 95536afb..eff8385b 100644 --- a/library/src/main/java/org/mustangproject/IncludedNote.java +++ b/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 = ""; private static final String INCLUDE_END = ""; @@ -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); } diff --git a/library/src/main/java/org/mustangproject/Invoice.java b/library/src/main/java/org/mustangproject/Invoice.java index 346c5f43..88e6cc53 100644 --- a/library/src/main/java/org/mustangproject/Invoice.java +++ b/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<>(); diff --git a/library/src/main/java/org/mustangproject/Item.java b/library/src/main/java/org/mustangproject/Item.java index 0c31afe6..bb48a528 100644 --- a/library/src/main/java/org/mustangproject/Item.java +++ b/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 diff --git a/library/src/main/java/org/mustangproject/XMLTools.java b/library/src/main/java/org/mustangproject/XMLTools.java index dbccd4b0..d890c3d1 100644 --- a/library/src/main/java/org/mustangproject/XMLTools.java +++ b/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 < + * relplaces some entities like < , > and & with their escaped pendant like &lt; * @param s the string * @return the "safe" string */ diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/IExportableTransaction.java b/library/src/main/java/org/mustangproject/ZUGFeRD/IExportableTransaction.java index f43b5f62..0a67a6be 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/IExportableTransaction.java +++ b/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 diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableItem.java b/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableItem.java index e5e25cae..3dcd3692 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableItem.java +++ b/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; + } } diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/TransactionCalculator.java b/library/src/main/java/org/mustangproject/ZUGFeRD/TransactionCalculator.java index 1e1f757f..1eb1a6d2 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/TransactionCalculator.java +++ b/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; + } } diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java index 03ed3099..ff5aa321 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java +++ b/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 = "" + XMLTools.encodeXML(currentItem.getProduct().getTaxExemptionReason()) + ""; } @@ -408,7 +412,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { if ((getProfile() != Profiles.getByName("Minimum")) && (getProfile() != Profiles.getByName("BasicWL"))) { xml += "" + "" - + "" + lineID + "" + + "" + lineIDStr + "" + buildItemNotes(currentItem) + "" @@ -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 += "" - + ""; xml += ""; - if (getProfile() != Profiles.getByName("Minimum")) { + if ((getProfile() != Profiles.getByName("Minimum")) && (getProfile() != Profiles.getByName("BASICWL"))) { xml += "" + currencyFormat(calc.getTotal()) + ""; xml += chargesTotalLine + allowanceTotalLine; @@ -865,14 +869,18 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { // // // currencyID=\"EUR\" + "" - + currencyFormat(calc.getGrandTotal().subtract(calc.getTaxBasis())) + "" - + "" + currencyFormat(calc.getGrandTotal()) + ""; + + currencyFormat(calc.getGrandTotal().subtract(calc.getTaxBasis())) + ""; + if (trans.getRoundingAmount() != null) { + xml += "" + currencyFormat(trans.getRoundingAmount()) + ""; + } + + xml += "" + currencyFormat(calc.getGrandTotal()) + ""; // // // currencyID=\"EUR\" if (getProfile() != Profiles.getByName("Minimum")) { xml += "" + currencyFormat(calc.getTotalPrepaid()) + ""; } - xml += "" + currencyFormat(calc.getGrandTotal().subtract(calc.getTotalPrepaid())) + "" + xml += "" + currencyFormat(calc.getDuePayable()) + "" + ""; if (trans.getInvoiceReferencedDocumentID() != null) { xml += "" diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java index cebeb824..a5d16dae 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java +++ b/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 */ diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java index 951076c8..27f7b4ea 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java +++ b/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 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 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); diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDVisualizer.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDVisualizer.java index b2e47e3c..64e14fc3 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDVisualizer.java +++ b/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); } diff --git a/library/src/main/resources/stylesheets/cii-xr.xsl b/library/src/main/resources/stylesheets/cii-xr.xsl index a27035b5..421fe673 100644 --- a/library/src/main/resources/stylesheets/cii-xr.xsl +++ b/library/src/main/resources/stylesheets/cii-xr.xsl @@ -154,6 +154,8 @@ select="./rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge[ram:ChargeIndicator/udt:Indicator='false']"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + @@ -87,6 +84,11 @@ + + + + + @@ -220,2293 +222,6 @@ - - - - - - - - - - - - <xsl:value-of select="$i18n.title"/> - - - - -
- -
-
-
- - - - - -
-
- - - -
- - - -
-
-
-
- - - -
- - - -
-
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
-
- - -
-
- -
-
- - -
-
- -
-
- -
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
-
-
-

:

-
-
-
:
-
-
-
-
:
-
-
-
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-

:

- -
-
-
-
-
- - -
-
-
:
-
-
-
-
:
-
-
-
-
- - - -
-
-
-
-
-
-
netto
-
-
-
-
-
netto
-
-
-
-
-
netto
-
-
-
-
-
netto
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
brutto
-
-
-
-
-
brutto
-
-
-
-
-
brutto
-
-
-
-
-
brutto
-
-
-
-
-
-
- - - -
-
-
-
-
-
:
-
-
-
-
-
-
netto
-
-
-
-
-
-
%
-
-
-
-
-
-
-
- -
-
:
-
:
-
-
-
-
- - - -
-
-
-
-
-
:
-
-
-
-
-
-
netto
-
-
-
-
-
-
%
-
-
-
-
netto
-
-
-
-
-
-
-
-
-
-
:
-
:
-
-
-
-
-
- - - -
-
-
-
-
-
:
-
-
-
-
-
-
netto
-
-
-
-
-
-
%
-
-
-
-
netto
-
-
-
-
-
-
-
-
-
-
:
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
- - - -
-
-
-
-
-
-
:
-
- - - -
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
- -
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
- -
-
- - - -
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-

:

-
-
:
-
-
-
-
:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
%
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
%
-
-
-
-
-
-
-
-
:
-
:
-
-
-
-
-
- -
-
-
-
-
-
-
-
%
-
-
-
-
-
-
-
-
:
-
:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-

:

- -
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
-
-
-
-
- -
- - -
-
-
-
-
- - -
-
-
-
-
- - - -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
- - - -
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
-
- -
-
-
-
-
- - - -
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
- Öffnen -
- - -
-
-
:
-
-
-
-
:
-
-
-
-
- - - -
-
-
-
-
- -
-
-
-
-
- - - -
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
+
diff --git a/library/src/main/resources/stylesheets/xrechnung-html.en.xsl b/library/src/main/resources/stylesheets/xrechnung-html.en.xsl index 7fcecea5..dd251fb7 100644 --- a/library/src/main/resources/stylesheets/xrechnung-html.en.xsl +++ b/library/src/main/resources/stylesheets/xrechnung-html.en.xsl @@ -1,11 +1,5 @@ - - - + @@ -90,6 +84,11 @@ + + + + + @@ -223,2294 +222,6 @@ - - - - - - - - - - - - - <xsl:value-of select="$i18n.title"/> - - - - -
- -
-
-
- - - - - -
-
- - - -
- - - -
-
-
-
- - - -
- - - -
-
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
-
- - -
-
- -
-
- - -
-
- -
-
- -
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
-
-
-

:

-
-
-
:
-
-
-
-
:
-
-
-
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-

:

- -
-
-
-
-
- - -
-
-
:
-
-
-
-
:
-
-
-
-
- - - -
-
-
-
-
-
-
netto
-
-
-
-
-
netto
-
-
-
-
-
netto
-
-
-
-
-
netto
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
brutto
-
-
-
-
-
brutto
-
-
-
-
-
brutto
-
-
-
-
-
brutto
-
-
-
-
-
-
- - - -
-
-
-
-
-
:
-
-
-
-
-
-
netto
-
-
-
-
-
-
%
-
-
-
-
-
-
-
- -
-
:
-
:
-
-
-
-
- - - -
-
-
-
-
-
:
-
-
-
-
-
-
netto
-
-
-
-
-
-
%
-
-
-
-
netto
-
-
-
-
-
-
-
-
-
-
:
-
:
-
-
-
-
-
- - - -
-
-
-
-
-
:
-
-
-
-
-
-
netto
-
-
-
-
-
-
%
-
-
-
-
netto
-
-
-
-
-
-
-
-
-
-
:
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
- - - -
-
-
-
-
-
-
:
-
- - - -
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
- -
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
- -
-
- - - -
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-

:

-
-
:
-
-
-
-
:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
%
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
%
-
-
-
-
-
-
-
-
:
-
:
-
-
-
-
-
- -
-
-
-
-
-
-
-
%
-
-
-
-
-
-
-
-
:
-
:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-

:

- -
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
-
-
-
-
- -
- - -
-
-
-
-
- - -
-
-
-
-
- - - -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
- - - -
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
-
- -
-
-
-
-
- - - -
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
- Öffnen -
- - -
-
-
:
-
-
-
-
:
-
-
-
-
- - - -
-
-
-
-
- -
-
-
-
-
- - - -
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
+
diff --git a/library/src/main/resources/stylesheets/xrechnung-html.fr.xsl b/library/src/main/resources/stylesheets/xrechnung-html.fr.xsl index 486827b9..ccbafdd0 100644 --- a/library/src/main/resources/stylesheets/xrechnung-html.fr.xsl +++ b/library/src/main/resources/stylesheets/xrechnung-html.fr.xsl @@ -1,9 +1,5 @@ - + @@ -88,6 +84,11 @@ + + + + + @@ -221,2294 +222,6 @@ - - - - - - - - - - - - - <xsl:value-of select="$i18n.title"/> - - - - -
- -
-
-
- - - - - -
-
- - - -
- - - -
-
-
-
- - - -
- - - -
-
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
-
- - -
-
- -
-
- - -
-
- -
-
- -
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
-
-
-

:

-
-
-
:
-
-
-
-
:
-
-
-
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-

:

- -
-
-
-
-
- - -
-
-
:
-
-
-
-
:
-
-
-
-
- - - -
-
-
-
-
-
-
netto
-
-
-
-
-
netto
-
-
-
-
-
netto
-
-
-
-
-
netto
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
brutto
-
-
-
-
-
brutto
-
-
-
-
-
brutto
-
-
-
-
-
brutto
-
-
-
-
-
-
- - - -
-
-
-
-
-
:
-
-
-
-
-
-
netto
-
-
-
-
-
-
%
-
-
-
-
-
-
-
- -
-
:
-
:
-
-
-
-
- - - -
-
-
-
-
-
:
-
-
-
-
-
-
netto
-
-
-
-
-
-
%
-
-
-
-
netto
-
-
-
-
-
-
-
-
-
-
:
-
:
-
-
-
-
-
- - - -
-
-
-
-
-
:
-
-
-
-
-
-
netto
-
-
-
-
-
-
%
-
-
-
-
netto
-
-
-
-
-
-
-
-
-
-
:
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
- - - -
-
-
-
-
-
-
:
-
- - - -
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
- -
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
- -
-
- - - -
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-

:

-
-
:
-
-
-
-
:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
%
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
%
-
-
-
-
-
-
-
-
:
-
:
-
-
-
-
-
- -
-
-
-
-
-
-
-
%
-
-
-
-
-
-
-
-
:
-
:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-

:

- -
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
-
-
-
-
- -
- - -
-
-
-
-
- - -
-
-
-
-
- - - -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
- - - -
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
-
- - - -
-
-
-
-
-
- -
-
-
-
-
- - - -
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
- Öffnen -
- - -
-
-
:
-
-
-
-
:
-
-
-
-
- - - -
-
-
-
-
- -
-
-
-
-
- - - -
-
-
-
-
-
-
:
-
-
-
-
:
-
-
-
-
:
-
-
-
-
+
diff --git a/library/src/main/resources/stylesheets/xrechnung-html.univ.xsl b/library/src/main/resources/stylesheets/xrechnung-html.univ.xsl new file mode 100644 index 00000000..21b2883d --- /dev/null +++ b/library/src/main/resources/stylesheets/xrechnung-html.univ.xsl @@ -0,0 +1,2330 @@ + + + + + + + + + + + + + + <xsl:value-of select="$i18n.title"/> + + + + +
+ +
+
+
+ + + + + +
+
+ + + +
+ + + +
+
+
+
+ + + +
+ + + +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+
+
+ + + +
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
+
+
+
+

:

+
+
+
:
+
+
+
+
:
+
+
+
+
+
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+

:

+ +
+
+
+
+
+ + +
+
+
:
+
+
+
+
:
+
+
+
+
+ + + +
+
+
+
+
+
+
netto
+
+
+
+
+
netto
+
+
+
+
+
netto
+
+
+
+
+
netto
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
brutto
+
+
+
+
+
brutto
+
+
+
+
+
brutto
+
+
+
+
+
brutto
+
+
+
+
+
+
+ + + +
+
+
+
+
+
:
+
+
+
+
+
+
netto
+
+
+
+
+
+
%
+
+
+
+
+
+
+
+ +
+
:
+
:
+
+
+
+
+ + + +
+
+
+
+
+
:
+
+
+
+
+
+
netto
+
+
+
+
+
+
%
+
+
+
+
netto
+
+
+
+
+
+
+
+
+
+
:
+
:
+
+
+
+
+
+ + + +
+
+
+
+
+
:
+
+
+
+
+
+
netto
+
+
+
+
+
+
%
+
+
+
+
netto
+
+
+
+
+
+
+
+
+
+
:
+
:
+
+
+
+
+
+ + + +
+
+
+
+
+
:
+
+
+
+
+
+
netto
+
+
+
+
+
+
+
+
+
+
:
+
+
+
+
+
+ + + +
+
+
+
+
:
+
+ + + +
+
+
+
+
+
+
:
+
+ + + +
+
+
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
+
+ + + +
+
+
+
+
:
+
+
+
+
:
+
+
+
+
+
+ + + +
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
+
+ + + +
+
+ +
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
+
+
+ + + +
+
+
+
+
:
+
+
+
+
:
+
+
+
+
+
+ + + +
+
+ +
+
+ + + +
+
+
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+

:

+
+
:
+
+
+
+
:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
%
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
%
+
+
+
+
+
+
+
+
:
+
:
+
+
+
+
+
+ +
+
+
+
+
+
+
+
%
+
+
+
+
+
+
+
+
:
+
:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+

:

+ +
+
+
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
+
+
+
+
+
+ +
+ + +
+
+
+
+
+ + +
+
+
+
+
+ + + +
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ + + +
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
+
+ + + +
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
+
+ + + +
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+ + + +
+
+
+
+
+
+
:
+
+
+
+
:
+
+
+
+
+
+ + + +
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
+
+ + + +
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
+
+ + + +
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
+
+ + + +
+
+
+
+
+
+ +
+
+
+
+
+ + + +
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+ Öffnen +
+ + +
+
+
:
+
+
+
+
:
+
+
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+ + + +
+
+
+
+
+
+
:
+
+
+
+
:
+
+
+
+
:
+
+
+
+
+ +
diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/DeSerializationTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/DeSerializationTest.java index 7c6d409d..0dbd2dc0 100644 --- a/library/src/test/java/org/mustangproject/ZUGFeRD/DeSerializationTest.java +++ b/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(); diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/VisualizationTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/VisualizationTest.java index 416eed72..a59199f4 100644 --- a/library/src/test/java/org/mustangproject/ZUGFeRD/VisualizationTest.java +++ b/library/src/test/java/org/mustangproject/ZUGFeRD/VisualizationTest.java @@ -1,33 +1,34 @@ - -/** ********************************************************************** - * +/** + * ********************************************************************* + *

* Copyright 2019 Jochen Staerk - * + *

* Use is subject to license terms. - * + *

* 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. - * + *

* 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. - * + *

* See the License for the specific language governing permissions and * limitations under the License. - * - *********************************************************************** */ + *

+ * ********************************************************************** + */ 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()); } diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java index be949c34..24c73e0f 100644 --- a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java +++ b/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 diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java index 40ee39de..a0b6ad16 100644 --- a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java +++ b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java @@ -1,4 +1,3 @@ - /** * ********************************************************************* *

@@ -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 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"); + + } + } diff --git a/library/src/test/resources/EN16931_1_Teilrechnung.pdf b/library/src/test/resources/EN16931_1_Teilrechnung.pdf new file mode 100644 index 00000000..0bc3ea77 Binary files /dev/null and b/library/src/test/resources/EN16931_1_Teilrechnung.pdf differ diff --git a/library/src/test/resources/EN16931_Einfach.pdf b/library/src/test/resources/EN16931_Einfach.pdf new file mode 100755 index 00000000..802b7282 Binary files /dev/null and b/library/src/test/resources/EN16931_Einfach.pdf differ diff --git a/library/src/test/resources/factur-x-extended.xml b/library/src/test/resources/factur-x-extended.xml new file mode 100644 index 00000000..cfb77358 --- /dev/null +++ b/library/src/test/resources/factur-x-extended.xml @@ -0,0 +1,427 @@ + + + + + + + + + + true + + + urn:cen.eu:en16931:2017#conformant#urn:factur-x.eu:1p0:extended + + + + KR87654321012 + KOSTENRECHNUNG + 380 + + 20241115 + + + ST3 + Es bestehen Rabatt- oder Bonusvereinbarungen. + AAK + + + EEV + Der Verkäufer bleibt Eigentümer der Waren bis zur vollständigen Erfüllung der Kaufpreisforderung. + AAJ + + + 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 + + REG + + + + + + 1 + + + 4123456000014 + WA997 + Wirkarbeit HT + + Zählpunkt + DE0001346484600000000000000100038 + + + + + 0.0520 + + + 0.0520 + + + + 1000.0000 + + + + VAT + S + 19.00 + + + 52.00 + + + + + + 2 + + + 4123456000021 + ÖST250 + Ökosteuer Lieferant + + + + 0.0205 + + + 0.0205 + + + + 1000.0000 + + + + VAT + S + 19.00 + + + 20.50 + + + + + + 3 + + + 4260331811362 + Kommissionierer 1250032 D. Muster + Besteller: Hr. Mayer, Personalnr. 4488 + + + + 15.0000 + + + false + + 4.50 + Artikelrabatt 1 + + + + 10.5000 + + + + 27.5000 + + + + VAT + S + 19.00 + + + 288.75 + + + + + + 4 + + + 2001015001325 + FB05 + FALTENBEUTEL 16x6x28 CM + + + + 0.0105 + + + 0.0105 + + + + 3500.0000 + + + + VAT + S + 19.00 + + + 36.75 + + + + + + 5 + + + 4123456000038 + KOP05 + Kopierpapier A4 + Zählerstand von-bis: 543210 - 544420 + + Zähler-Nr. + MG-X79318 + + + + + 0.0100 + + + 0.0100 + + + + 1210.0000 + + + + VAT + S + 19.00 + + + 12.10 + + + + + + 549910 + 4333741000005 + MUSTERLIEFERANT GMBH + + + +49 932 431 500 + + + max.mustermann@musterlieferant.de + + + + 99199 + BAHNHOFSTRASSE 99 + MUSTERHAUSEN + DE + + + 201/113/40209 + + + + 339420 + 4304171000002 + MUSTER-KUNDE GMBH + + 40235 + KUNDENWEG 88 + DUESSELDORF + DE + + + + A777123 + 130 + + + + + 4304171088093 + MUSTER-MARKT + + 7322 + + + 31157 + HAUPTSTRASSE 44 + SARSTEDT + DE + + + + + 20241030 + + + + L87654321012 + + + + EUR + + 339420 + 4304171000002 + MUSTER-KUNDE GMBH + + 40235 + KUNDENWEG 88 + DUESSELDORF + DE + + + + 76.67 + VAT + 403.55 + 410.10 + -6.55 + S + 19.00 + + + + false + + 410.10 + 21.55 + Sonderrabatt + + VAT + S + 19.00 + + + + Transportkosten: Frachbetrag + 15.00 + + VAT + S + 19.00 + + + + Skontovereinbarung: 2% bei Zahlung innerhalb 10 Tagen nach Rechnungsdatum + + 10 + 2.00 + + + + 410.10 + 15.00 + 21.55 + 403.55 + 76.67 + 480.22 + 0.00 + 480.22 + + + + diff --git a/library/src/test/resources/factur-x-vis-extended.de.html b/library/src/test/resources/factur-x-vis-extended.de.html new file mode 100644 index 00000000..bec60374 --- /dev/null +++ b/library/src/test/resources/factur-x-vis-extended.de.html @@ -0,0 +1,2419 @@ + + + + + XRechnung + + + + +

+ +
+
+
+
+
Wir übernehmen keine Haftung für die Richtigkeit der Daten.
+
+
+
+
Informationen zum Käufer
+
+
+
Leitweg-ID:
+
+
+
+
Name:
+
MUSTER-KUNDE GMBH
+
+
+
Straße / Haus-Nr.:
+
KUNDENWEG 88
+
+
+
Postfach:
+
+
+
+
Adresszusatz:
+
+
+
+
PLZ:
+
40235
+
+
+
Ort:
+
DUESSELDORF
+
+
+
Bundesland:
+
+
+
+
Land:
+
DE (Deutschland)
+
+
+
Kennung / Kunden-Nr.:
+
4304171000002
+
+
+
Schema der Kennung:
+
0088 (EAN + Location Code) +
+
+
+
Name:
+
+
+
+
Telefon:
+
+
+
+
E-Mail-Adresse:
+
+
+
+
+
+
+
Informationen zum Verkäufer
+
+
+
+
+
+
+
Firmenname:
+
MUSTERLIEFERANT GMBH
+
+
+
Straße / Haus-Nr.:
+
BAHNHOFSTRASSE 99
+
+
+
Postfach:
+
+
+
+
Adresszusatz:
+
+
+
+
PLZ:
+
99199
+
+
+
Ort:
+
MUSTERHAUSEN
+
+
+
Bundesland:
+
+
+
+
Ländercode:
+
DE (Deutschland)
+
+
+
Kennung:
+
4333741000005
+
+
+
Schema der Kennung:
+
0088 (EAN + Location Code) +
+
+
+
Name:
+
+
+
+
Telefon:
+
+49 932 431 500
+
+
+
E-Mail-Adresse:
+
max.mustermann@musterlieferant.de +
+
+
+
+
+
+
+
+
+
Rechnungsdaten
+
+
+
+
+
Rechnungsnummer:
+
KR87654321012
+
+
+
Rechnungsdatum:
+
15.11.2024
+
+
+
Rechnungsart:
+
380 (Commercial invoice)
+
+
+
Währung
+
EUR (Euro)
+
+
+

Abrechnungszeitraum:

+
+
+
von:
+
+
+
+
bis:
+
+
+
+
+
+
+
+
+
Projektnummer:
+
+
+
+
Vertragsnummer:
+
+
+
+
Bestellnummer:
+
+
+
+
Auftragsnummer:
+
+
+
+

Vorausgegangene Rechnungen:

+
+
+
+
+
+
+
+
+
Gesamtbeträge der Rechnung
+
+
+
Summe aller Positionen
+
netto
+
410,10
+
+
+
Summe Nachlässe
+
netto
+
21,55
+
+
+
Summe Zuschläge
+
netto
+
+ 15,00 +
+
+
+
Gesamtsumme
+
netto
+
403,55
+
+
+
Summe Umsatzsteuer
+
+
+
+
+
Summe Umsatzsteuer in + Abrechnungswährung +
+
+
+ 76,67 +
+
+
+
Gesamtsumme
+
brutto
+
480,22
+
+
+
Gezahlter Betrag
+
brutto
+
0,00
+
+
+
Rundungsbetrag
+
brutto
+
+
+
+
Fälliger Betrag
+
brutto
+
480,22 +
+
+
+
+
+
+
+
+
+
Aufschlüsselung der Umsatzsteuer auf Ebene der + Rechnung +
+
+
+
Umsatzsteuerkategorie: S (Standard rate) +
+
+
+
+
+
Gesamtsumme
+
netto
+
403,55
+
+
+
Umsatzsteuersatz
+
+
19.00%
+
+
+
Umsatzsteuerbetrag
+
+
76,67
+
+
+
+
Befreiungsgrund:
+
Kennung für den Befreiungsgrund: +
+
+
+
+
+
+
+
+
Nachlass auf Ebene der Rechnung
+
+
+
Umsatzsteuerkategorie des Nachlasses: S (Standard rate)
+
+
+
+
+
Grundbetrag
+
netto
+
410,10
+
+
+
Prozentsatz
+
+
%
+
+
+
Nachlass
+
netto
+
21,55
+
+
+
Umsatzsteuersatz des Nachlasses
+
+
19.00
+
+
+
+
Grund für den Nachlass: Sonderrabatt +
+
Document level allowance reason code:
+
+
+
+
+
+
+
+
+
+
Versandkosten
+
+
+
Umsatzsteuerkategorie der Versandkosten: S (Standard rate)
+
+
+
+
+
Betrag
+
netto
+
15,00
+
+
+
Umsatzsteuersatz der Versandkosten
+
+
19.00
+
+
+
+
Versandkostenbeschreibung: Transportkosten: Frachbetrag +
+
+
+
+
+
+
+
+
+
Zahlungsdaten
+
+
+
Skonto; weitere Zahlungsbed.:
+
#SKONTO# TAGE =10#PROZENT=2.00# + Skontovereinbarung: 2% bei Zahlung innerhalb 10 Tagen nach Rechnungsdatum +
+
+
+
Fälligkeitsdatum:
+
+
+
+
Code für das Zahlungsmittel:
+
+
+
+
Zahlungsmittel:
+
+
+
+
Verwendungszweck:
+
+
+
+
+
+
Karteninformation
+
+
+
Kartennummer:
+
+
+
+
Karteninhaber:
+
+
+
+
+
+
+
+
+
+
Lastschrift
+
+
+
Mandatsreferenznr.:
+
+
+
+
IBAN:
+
+
+
+
Gläubiger-ID:
+
+
+
+
+
+
Überweisung
+
+
+
+
+
+
+
Bemerkung zur Rechnung
+
+
+
Betreff:
+
AAK (Price conditions)
+
+
+
Bemerkung:
+
Es bestehen Rabatt- oder + Bonusvereinbarungen. +
+
+
+
+
+
Bemerkung zur Rechnung
+
+
+
Betreff:
+
AAJ (Additional conditions of + sale/purchase) +
+
+
+
Bemerkung:
+
Der Verkäufer bleibt Eigentümer der + Waren bis zur vollständigen Erfüllung der Kaufpreisforderung. +
+
+
+
+
+
Bemerkung zur Rechnung
+
+
+
Betreff:
+
REG (Regulatory information)
+
+
+
Bemerkung:
+
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 +
+
+
+
+
+
+
+
+
Wir übernehmen keine Haftung für die Richtigkeit der Daten.
+
+
+
+
Position1
+
+
+
Freitext:
+
+
+
+
Objektkennung:
+
+
+
+
Schema der Objektkennung:
+
+
+
+
Nummer der Auftragsposition:
+
+
+
+
Kontierungshinweis /Kostenstelle:
+
+
+

Abrechnungszeitraum:

+
+
von:
+
+
+
+
bis:
+
+
+
+
+
+
Preiseinzelheiten
+
+
+
Menge
+
1000.0000
+
+
+
Einheit
+
KWH (kilowatt hour)
+
+
+
Preis pro Einheit (netto)
+
0,05
+
+
+
Gesamtpreis (netto)
+
52,00
+
+
+
+
+
Rabatt (netto):
+
+
+
+
Listenpreis (netto):
+
0,05
+
+
+
Anzahl der Einheit:
+
+
+
+
Code der Maßeinheit:
+
+
+
+
Umsatzsteuer:
+
S (Standard rate)
+
+
+
Umsatzsteuersatz in %:
+
19%
+
+
+
+
+
+
+
+
+
Nachlässe auf Ebene der + Rechnungsposition +
+
+
+
Zuschläge auf Ebene der + Rechnungsposition +
+
+
+
+
+
+
+
Artikelinformationen
+
+
+
+
+
+
Bezeichnung:
+
Wirkarbeit HT +
+
+
+
Beschreibung:
+
+
+
+
Artikelnummer:
+
WA997
+
+
+
Kunden-Material-Nr.:
+
+
+

Eigenschaften des Artikels:

+
+
Zählpunkt
+
+ DE0001346484600000000000000100038 +
+
+
+
+
+
+
+
+
Artikelkennung (EAN):
+
4123456000014
+
+
+
Schema der Artikelkennung:
+
+ 0088 (EAN Location Code) +
+
+
+
Code der Artikelklassifizierung:
+
+
+
+
Kennung zur Bildung des Schemas:
+
+
+
+
Version zur Bildung des Schemas:
+
+
+
+
Code des Herkunftslandes:
+
+
+
+
+
+
+
+
+
+
+
+
+
Position2
+
+
+
Freitext:
+
+
+
+
Objektkennung:
+
+
+
+
Schema der Objektkennung:
+
+
+
+
Nummer der Auftragsposition:
+
+
+
+
Kontierungshinweis /Kostenstelle:
+
+
+

Abrechnungszeitraum:

+
+
von:
+
+
+
+
bis:
+
+
+
+
+
+
Preiseinzelheiten
+
+
+
Menge
+
1000.0000
+
+
+
Einheit
+
KWH (kilowatt hour)
+
+
+
Preis pro Einheit (netto)
+
0,02
+
+
+
Gesamtpreis (netto)
+
20,50
+
+
+
+
+
Rabatt (netto):
+
+
+
+
Listenpreis (netto):
+
0,02
+
+
+
Anzahl der Einheit:
+
+
+
+
Code der Maßeinheit:
+
+
+
+
Umsatzsteuer:
+
S (Standard rate)
+
+
+
Umsatzsteuersatz in %:
+
19%
+
+
+
+
+
+
+
+
+
Nachlässe auf Ebene der + Rechnungsposition +
+
+
+
Zuschläge auf Ebene der + Rechnungsposition +
+
+
+
+
+
+
+
Artikelinformationen
+
+
+
+
+
+
Bezeichnung:
+
Ökosteuer + Lieferant +
+
+
+
Beschreibung:
+
+
+
+
Artikelnummer:
+
ÖST250
+
+
+
Kunden-Material-Nr.:
+
+
+

Eigenschaften des Artikels:

+
+
+
+
+
+
Artikelkennung (EAN):
+
4123456000021
+
+
+
Schema der Artikelkennung:
+
+ 0088 (EAN Location Code) +
+
+
+
Code der Artikelklassifizierung:
+
+
+
+
Kennung zur Bildung des Schemas:
+
+
+
+
Version zur Bildung des Schemas:
+
+
+
+
Code des Herkunftslandes:
+
+
+
+
+
+
+
+
+
+
+
+
+
Position3
+
+
+
Freitext:
+
+
+
+
Objektkennung:
+
+
+
+
Schema der Objektkennung:
+
+
+
+
Nummer der Auftragsposition:
+
+
+
+
Kontierungshinweis /Kostenstelle:
+
+
+

Abrechnungszeitraum:

+
+
von:
+
+
+
+
bis:
+
+
+
+
+
+
Preiseinzelheiten
+
+
+
Menge
+
27.5000
+
+
+
Einheit
+
HUR (hour)
+
+
+
Preis pro Einheit (netto)
+
10,50
+
+
+
Gesamtpreis (netto)
+
288,75
+
+
+
+
+
Rabatt (netto):
+
4,50
+
+
+
Listenpreis (netto):
+
15,00
+
+
+
Anzahl der Einheit:
+
+
+
+
Code der Maßeinheit:
+
+
+
+
Umsatzsteuer:
+
S (Standard rate)
+
+
+
Umsatzsteuersatz in %:
+
19%
+
+
+
+
+
+
+
+
+
Nachlässe auf Ebene der + Rechnungsposition +
+
+
+
Zuschläge auf Ebene der + Rechnungsposition +
+
+
+
+
+
+
+
Artikelinformationen
+
+
+
+
+
+
Bezeichnung:
+
Kommissionierer + 1250032 D. Muster +
+
+
+
Beschreibung:
+
Besteller: Hr. Mayer, + Personalnr. 4488 +
+
+
+
Artikelnummer:
+
+
+
+
Kunden-Material-Nr.:
+
+
+

Eigenschaften des Artikels:

+
+
+
+
+
+
Artikelkennung (EAN):
+
4260331811362
+
+
+
Schema der Artikelkennung:
+
+ 0088 (EAN Location Code) +
+
+
+
Code der Artikelklassifizierung:
+
+
+
+
Kennung zur Bildung des Schemas:
+
+
+
+
Version zur Bildung des Schemas:
+
+
+
+
Code des Herkunftslandes:
+
+
+
+
+
+
+
+
+
+
+
+
+
Position4
+
+
+
Freitext:
+
+
+
+
Objektkennung:
+
+
+
+
Schema der Objektkennung:
+
+
+
+
Nummer der Auftragsposition:
+
+
+
+
Kontierungshinweis /Kostenstelle:
+
+
+

Abrechnungszeitraum:

+
+
von:
+
+
+
+
bis:
+
+
+
+
+
+
Preiseinzelheiten
+
+
+
Menge
+
3500.0000
+
+
+
Einheit
+
H87 (piece)
+
+
+
Preis pro Einheit (netto)
+
0,01
+
+
+
Gesamtpreis (netto)
+
36,75
+
+
+
+
+
Rabatt (netto):
+
+
+
+
Listenpreis (netto):
+
0,01
+
+
+
Anzahl der Einheit:
+
+
+
+
Code der Maßeinheit:
+
+
+
+
Umsatzsteuer:
+
S (Standard rate)
+
+
+
Umsatzsteuersatz in %:
+
19%
+
+
+
+
+
+
+
+
+
Nachlässe auf Ebene der + Rechnungsposition +
+
+
+
Zuschläge auf Ebene der + Rechnungsposition +
+
+
+
+
+
+
+
Artikelinformationen
+
+
+
+
+
+
Bezeichnung:
+
FALTENBEUTEL + 16x6x28 CM +
+
+
+
Beschreibung:
+
+
+
+
Artikelnummer:
+
FB05
+
+
+
Kunden-Material-Nr.:
+
+
+

Eigenschaften des Artikels:

+
+
+
+
+
+
Artikelkennung (EAN):
+
2001015001325
+
+
+
Schema der Artikelkennung:
+
+ 0088 (EAN Location Code) +
+
+
+
Code der Artikelklassifizierung:
+
+
+
+
Kennung zur Bildung des Schemas:
+
+
+
+
Version zur Bildung des Schemas:
+
+
+
+
Code des Herkunftslandes:
+
+
+
+
+
+
+
+
+
+
+
+
+
Position5
+
+
+
Freitext:
+
+
+
+
Objektkennung:
+
+
+
+
Schema der Objektkennung:
+
+
+
+
Nummer der Auftragsposition:
+
+
+
+
Kontierungshinweis /Kostenstelle:
+
+
+

Abrechnungszeitraum:

+
+
von:
+
+
+
+
bis:
+
+
+
+
+
+
Preiseinzelheiten
+
+
+
Menge
+
1210.0000
+
+
+
Einheit
+
H87 (piece)
+
+
+
Preis pro Einheit (netto)
+
0,01
+
+
+
Gesamtpreis (netto)
+
12,10
+
+
+
+
+
Rabatt (netto):
+
+
+
+
Listenpreis (netto):
+
0,01
+
+
+
Anzahl der Einheit:
+
+
+
+
Code der Maßeinheit:
+
+
+
+
Umsatzsteuer:
+
S (Standard rate)
+
+
+
Umsatzsteuersatz in %:
+
19%
+
+
+
+
+
+
+
+
+
Nachlässe auf Ebene der + Rechnungsposition +
+
+
+
Zuschläge auf Ebene der + Rechnungsposition +
+
+
+
+
+
+
+
Artikelinformationen
+
+
+
+
+
+
Bezeichnung:
+
Kopierpapier A4 +
+
+
+
Beschreibung:
+
Zählerstand von-bis: + 543210 - 544420 +
+
+
+
Artikelnummer:
+
KOP05
+
+
+
Kunden-Material-Nr.:
+
+
+

Eigenschaften des Artikels:

+
+
Zähler-Nr.
+
MG-X79318
+
+
+
+
+
+
+
+
Artikelkennung (EAN):
+
4123456000038
+
+
+
Schema der Artikelkennung:
+
+ 0088 (EAN Location Code) +
+
+
+
Code der Artikelklassifizierung:
+
+
+
+
Kennung zur Bildung des Schemas:
+
+
+
+
Version zur Bildung des Schemas:
+
+
+
+
Code des Herkunftslandes:
+
+
+
+
+
+
+
+
+
+
+
+
Wir übernehmen keine Haftung für die Richtigkeit der Daten.
+
+
+
+
Informationen zum Verkäufer
+
+
+
Abweichender Handelsname:
+
+
+
+
Bundesland:
+
+
+
+
Elektronische Adresse:
+
+
+
+
Schema der elektronischen Adresse:
+
+
+
+
Register-/Registriernummer:
+
+
+
+
Umsatzsteuer-ID:
+
+
+
+
Steuernummer:
+
201/113/40209
+
+
+
Schema der Steuernummer:
+
+
+
+
Weitere rechtliche Informationen:
+
+
+
+
Code der Umsatzsteuerwährung:
+
+
+
+
+
+
+
+
+
+
+
Informationen zum Käufer
+
+
+
Abweichender Handelsname:
+
+
+
+
Bundesland:
+
+
+
+
Elektronische Adresse:
+
+
+
+
Schema der elektronischen Adresse:
+
+
+
+
Register-/Registriernummer:
+
+
+
+
Schema der Register-/Registriernummer:
+
+
+
+
Umsatzsteuer-ID:
+
+
+
+
Abrechnungsdatum der Umsatzsteuer:
+
+
+
+
Code des Umsatzsteuer-Abrechnungsdatums:
+
+
+
+
Kontierungsinformation / Kostenstelle:
+
+
+
+
+
+
+
Lieferinformationen
+
+
+
Kennung des Lieferorts:
+
4304171088093
+
+
+
Schema der Kennung:
+
0088
+
+
+
Lieferdatum:
+
30.10.2024
+
+
+
Name des Empfängers:
+
MUSTER-MARKT
+
+
+
Straße / Haus-Nr.:
+
HAUPTSTRASSE 44
+
+
+
Postfach:
+
+
+
+
Adresszusatz:
+
+
+
+
PLZ:
+
31157
+
+
+
Ort:
+
SARSTEDT
+
+
+
Bundesland:
+
+
+
+
Land:
+
DE (Deutschland)
+
+
+
+
+
+
+
+
+
Vertragsdaten
+
+
+
Vergabenummer:
+
+
+
+
Kennung der Empfangsbestätigung:
+
+
+
+
Kennung der Versandanzeige:
+
+
+
+
Prozesskennung:
+
+
+
+
Spezifikationskennung:
+
+ urn:cen.eu:en16931:2017#conformant#urn:factur-x.eu:1p0:extended +
+
+
+
Objektkennung:
+
A777123
+
+
+
Schema der Objektkennung:
+
+
+
+
+
+
+
+
+
+
Wir übernehmen keine Haftung für die Richtigkeit der Daten.
+
+
+
+
Rechnungsbegründende Unterlagen
+
+
+
+
+
+
+
+
+
Bearbeitungshistorie
+
+
+
+
+
+
+ + + diff --git a/library/src/test/resources/factur-x-vis-ubl-creditnote.en.html b/library/src/test/resources/factur-x-vis-ubl-creditnote.en.html index f5855ab2..9e849b32 100644 --- a/library/src/test/resources/factur-x-vis-ubl-creditnote.en.html +++ b/library/src/test/resources/factur-x-vis-ubl-creditnote.en.html @@ -1359,6 +1359,7 @@
+
@@ -2625,4 +2626,4 @@ function downloadData (element_id) { }); // - \ No newline at end of file + diff --git a/library/src/test/resources/factur-x-vis-ubl.en.html b/library/src/test/resources/factur-x-vis-ubl.en.html index 7f80320c..9dd2506a 100644 --- a/library/src/test/resources/factur-x-vis-ubl.en.html +++ b/library/src/test/resources/factur-x-vis-ubl.en.html @@ -1221,6 +1221,7 @@
+
@@ -1946,4 +1947,4 @@ function downloadData (element_id) { }); // - \ No newline at end of file + diff --git a/library/src/test/resources/factur-x-vis.fr.html b/library/src/test/resources/factur-x-vis.fr.html index 76efd248..0b91ac44 100644 --- a/library/src/test/resources/factur-x-vis.fr.html +++ b/library/src/test/resources/factur-x-vis.fr.html @@ -1252,6 +1252,7 @@
+
@@ -2118,4 +2119,4 @@ function downloadData (element_id) { }); // - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 1752f94e..7d58b324 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.mustangproject core - 2.15.0-SNAPSHOT + 2.15.1-SNAPSHOT pom Mustang diff --git a/validator/pom.xml b/validator/pom.xml index 362ce454..b09a497b 100644 --- a/validator/pom.xml +++ b/validator/pom.xml @@ -3,7 +3,7 @@ org.mustangproject core - 2.15.0-SNAPSHOT + 2.15.1-SNAPSHOT 4.0.0 org.mustangproject @@ -11,7 +11,7 @@ Library to validate e-invoices (ZUGFeRD, Factur-X and Xrechnung) jar - 2.15.0-SNAPSHOT + 2.15.1-SNAPSHOT @@ -38,7 +38,7 @@ ${project.groupId} library - 2.15.0-SNAPSHOT + 2.15.1-SNAPSHOT org.dom4j @@ -224,10 +224,10 @@ - ${basedir}/src/main/resources/xslt/ZF_230/ + src/main/resources/xslt/ZF_232/ - ${basedir}/src/main/resources/schematron/ZF_230/ + ${basedir}/src/main/resources/schematron/ZF_232/ **/*.xml diff --git a/validator/src/main/java/org/mustangproject/validator/PDFValidator.java b/validator/src/main/java/org/mustangproject/validator/PDFValidator.java index c42caa9e..f967eb15 100644 --- a/validator/src/main/java/org/mustangproject/validator/PDFValidator.java +++ b/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(); diff --git a/validator/src/main/java/org/mustangproject/validator/ValidationContext.java b/validator/src/main/java/org/mustangproject/validator/ValidationContext.java index a74c9f1c..73b95f2e 100644 --- a/validator/src/main/java/org/mustangproject/validator/ValidationContext.java +++ b/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 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; } diff --git a/validator/src/main/java/org/mustangproject/validator/ValidationResultItem.java b/validator/src/main/java/org/mustangproject/validator/ValidationResultItem.java index d5a9b244..b0d6b5a1 100644 --- a/validator/src/main/java/org/mustangproject/validator/ValidationResultItem.java +++ b/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; } diff --git a/validator/src/main/java/org/mustangproject/validator/XMLValidator.java b/validator/src/main/java/org/mustangproject/validator/XMLValidator.java index c2124b87..632b56f8 100644 --- a/validator/src/main/java/org/mustangproject/validator/XMLValidator.java +++ b/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++; diff --git a/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java b/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java index edd9a73d..d21317b1 100644 --- a/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java +++ b/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(); } diff --git a/validator/src/main/resources/schema/ZF_230/BASIC-WL/FACTUR-X_BASIC-WL.xsd b/validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_230/BASIC-WL/FACTUR-X_BASIC-WL.xsd rename to validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL.xsd diff --git a/validator/src/main/resources/schema/ZF_230/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_230/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_230/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd similarity index 98% rename from validator/src/main/resources/schema/ZF_230/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd rename to validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd index 89d8a099..f6345542 100644 --- a/validator/src/main/resources/schema/ZF_230/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd +++ b/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"> - - + + diff --git a/validator/src/main/resources/schema/ZF_230/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_230/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_230/BASIC/FACTUR-X_BASIC.xsd b/validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_230/BASIC/FACTUR-X_BASIC.xsd rename to validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC.xsd diff --git a/validator/src/main/resources/schema/ZF_230/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_230/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_230/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd similarity index 99% rename from validator/src/main/resources/schema/ZF_230/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd rename to validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd index 35458e59..517d0fb0 100644 --- a/validator/src/main/resources/schema/ZF_230/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd +++ b/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"> - - + + diff --git a/validator/src/main/resources/schema/ZF_230/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_230/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_230/EN16931/FACTUR-X_EN16931.xsd b/validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_230/EN16931/FACTUR-X_EN16931.xsd rename to validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931.xsd diff --git a/validator/src/main/resources/schema/ZF_230/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_230/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_230/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd similarity index 99% rename from validator/src/main/resources/schema/ZF_230/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd rename to validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd index 62bcf3dd..b9dfd083 100644 --- a/validator/src/main/resources/schema/ZF_230/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd +++ b/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"> - - + + diff --git a/validator/src/main/resources/schema/ZF_230/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_230/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_230/EXTENDED/FACTUR-X_EXTENDED.xsd b/validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_230/EXTENDED/FACTUR-X_EXTENDED.xsd rename to validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED.xsd diff --git a/validator/src/main/resources/schema/ZF_230/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_230/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_230/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd similarity index 99% rename from validator/src/main/resources/schema/ZF_230/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd rename to validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd index 7e42a4f8..80ee1129 100644 --- a/validator/src/main/resources/schema/ZF_230/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd +++ b/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"> - - + + diff --git a/validator/src/main/resources/schema/ZF_230/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_230/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_230/MINIMUM/FACTUR-X_MINIMUM.xsd b/validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_230/MINIMUM/FACTUR-X_MINIMUM.xsd rename to validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM.xsd diff --git a/validator/src/main/resources/schema/ZF_230/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_230/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_230/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd similarity index 97% rename from validator/src/main/resources/schema/ZF_230/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd rename to validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd index 8fad95ed..389563bd 100644 --- a/validator/src/main/resources/schema/ZF_230/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd +++ b/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"> - - + + diff --git a/validator/src/main/resources/schema/ZF_230/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_230/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_BASIC-WL.sch b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC-WL.sch similarity index 99% rename from validator/src/main/resources/schematron/ZF_230/FACTUR-X_BASIC-WL.sch rename to validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC-WL.sch index 9a08c305..29de139b 100644 --- a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_BASIC-WL.sch +++ b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC-WL.sch @@ -1,5 +1,5 @@ - Schema for Factur-X; 1.0.07; Accounting, BASIC without Lines + Schema for Factur-X; 1.07.2; Accounting, BASIC without Lines @@ -164,7 +164,7 @@ [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). - + [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. @@ -236,7 +236,7 @@ [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). - + [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. @@ -322,12 +322,16 @@ [BR-CO-27]-Either the IBAN or a Proprietary ID (BT-84) shall be used. + + + + [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. + + [BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice. - - [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. diff --git a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_BASIC-WL_codedb.xml b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC-WL_codedb.xml similarity index 98% rename from validator/src/main/resources/schematron/ZF_230/FACTUR-X_BASIC-WL_codedb.xml rename to validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC-WL_codedb.xml index cc567d65..b5fef2d7 100644 --- a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_BASIC-WL_codedb.xml +++ b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC-WL_codedb.xml @@ -2,6 +2,7 @@ + @@ -692,6 +693,14 @@ + + + + + + + + @@ -919,6 +928,14 @@ + + + + + + + + @@ -1189,6 +1206,7 @@ + @@ -1220,6 +1238,7 @@ + @@ -1336,7 +1355,6 @@ - @@ -1429,6 +1447,7 @@ + @@ -1453,6 +1472,7 @@ + @@ -1588,6 +1608,8 @@ + + @@ -1603,6 +1625,7 @@ + @@ -1884,7 +1907,6 @@ - @@ -1977,6 +1999,7 @@ + @@ -2001,6 +2024,7 @@ + @@ -2065,7 +2089,6 @@ - @@ -2158,6 +2181,7 @@ + @@ -2182,6 +2206,7 @@ + diff --git a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_BASIC.sch b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC.sch similarity index 99% rename from validator/src/main/resources/schematron/ZF_230/FACTUR-X_BASIC.sch rename to validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC.sch index dfaefe8b..9a8304eb 100644 --- a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_BASIC.sch +++ b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC.sch @@ -1,5 +1,5 @@ - Schema for Factur-X; 1.0.07; EN16931-COMPLIANT-BASIC + Schema for Factur-X; 1.07.2; EN16931-COMPLIANT-BASIC @@ -118,7 +118,7 @@ [BR-65]-The Item classification identifier (BT-158) shall have a Scheme identifier. [BR-CO-04]-Each Invoice line (BG-25) shall be categorized with an Invoiced item VAT category code (BT-151). - + [BR-DEC-23]-The allowed maximum number of decimals for the Invoice line net amount (BT-131) is 2. @@ -246,7 +246,7 @@ [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). - + [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. @@ -318,7 +318,7 @@ [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). - + [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. @@ -406,12 +406,16 @@ [BR-CO-27]-Either the IBAN or a Proprietary ID (BT-84) shall be used. + + + + [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. + + [BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice. - - [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. @@ -546,7 +550,7 @@ [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). - + [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. diff --git a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_BASIC_codedb.xml b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC_codedb.xml similarity index 99% rename from validator/src/main/resources/xslt/ZF_230/FACTUR-X_BASIC_codedb.xml rename to validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC_codedb.xml index ce1fdffe..d8154cdc 100644 --- a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_BASIC_codedb.xml +++ b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC_codedb.xml @@ -2,6 +2,7 @@ + @@ -692,6 +693,14 @@ + + + + + + + + @@ -3298,6 +3307,14 @@ + + + + + + + + @@ -3525,6 +3542,14 @@ + + + + + + + + @@ -3795,6 +3820,7 @@ + @@ -3826,6 +3852,7 @@ + @@ -3942,7 +3969,6 @@ - @@ -4035,6 +4061,7 @@ + @@ -4059,6 +4086,7 @@ + @@ -4180,6 +4208,8 @@ + + @@ -4195,6 +4225,7 @@ + @@ -4476,7 +4507,6 @@ - @@ -4569,6 +4599,7 @@ + @@ -4593,6 +4624,7 @@ + @@ -4657,7 +4689,6 @@ - @@ -4750,6 +4781,7 @@ + @@ -4774,6 +4806,7 @@ + diff --git a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_EN16931.sch b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_EN16931.sch similarity index 99% rename from validator/src/main/resources/schematron/ZF_230/FACTUR-X_EN16931.sch rename to validator/src/main/resources/schematron/ZF_232/FACTUR-X_EN16931.sch index 179768be..86eefe5a 100644 --- a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_EN16931.sch +++ b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_EN16931.sch @@ -1,5 +1,5 @@ - Schema for Factur-X; 1.0.07; EN16931-COMPLIANT (FULLY) + Schema for Factur-X; 1.07.2; EN16931-COMPLIANT (FULLY) @@ -130,7 +130,7 @@ [BR-65]-The Item classification identifier (BT-158) shall have a Scheme identifier. [BR-CO-04]-Each Invoice line (BG-25) shall be categorized with an Invoiced item VAT category code (BT-151). - + [BR-DEC-23]-The allowed maximum number of decimals for the Invoice line net amount (BT-131) is 2. @@ -258,7 +258,7 @@ [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). - + [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. @@ -330,7 +330,7 @@ [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). - + [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. @@ -418,12 +418,16 @@ [BR-CO-27]-Either the IBAN or a Proprietary ID (BT-84) shall be used. + + + + [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. + + [BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice. - - [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. @@ -558,7 +562,7 @@ [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). - + [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. diff --git a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_EN16931_codedb.xml b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_EN16931_codedb.xml similarity index 99% rename from validator/src/main/resources/schematron/ZF_230/FACTUR-X_EN16931_codedb.xml rename to validator/src/main/resources/schematron/ZF_232/FACTUR-X_EN16931_codedb.xml index d0ad2b33..ae1b08a2 100644 --- a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_EN16931_codedb.xml +++ b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_EN16931_codedb.xml @@ -692,6 +692,14 @@ + + + + + + + + @@ -4561,6 +4569,14 @@ + + + + + + + + @@ -4788,6 +4804,14 @@ + + + + + + + + @@ -4805,6 +4829,7 @@ + @@ -4836,6 +4861,7 @@ + @@ -4969,7 +4995,6 @@ - @@ -5062,6 +5087,7 @@ + @@ -5086,6 +5112,7 @@ + @@ -5207,6 +5234,8 @@ + + @@ -5222,6 +5251,7 @@ + @@ -5506,7 +5536,6 @@ - @@ -5599,6 +5628,7 @@ + @@ -5623,6 +5653,7 @@ + @@ -5687,7 +5718,6 @@ - @@ -5780,6 +5810,7 @@ + @@ -5804,6 +5835,7 @@ + diff --git a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_EXTENDED.sch b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_EXTENDED.sch similarity index 98% rename from validator/src/main/resources/schematron/ZF_230/FACTUR-X_EXTENDED.sch rename to validator/src/main/resources/schematron/ZF_232/FACTUR-X_EXTENDED.sch index c17c0359..75f84b54 100644 --- a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_EXTENDED.sch +++ b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_EXTENDED.sch @@ -1,5 +1,5 @@ - Schema for Factur-X; 1.0.07; EN16931-CONFORMANT-EXTENDED + Schema for Factur-X; 1.07.2; EN16931-CONFORMANT-EXTENDED @@ -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). + + + + [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. + + @@ -138,7 +144,7 @@ [BR-65]-The Item classification identifier (BT-158) shall have a Scheme identifier. [BR-CO-04]-Each Invoice line (BG-25) shall be categorized with an Invoiced item VAT category code (BT-151). - + [BR-DEC-23]-The allowed maximum number of decimals for the Invoice line net amount (BT-131) is 2. @@ -272,7 +278,7 @@ [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). - + [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. @@ -342,7 +348,7 @@ [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). - + [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. @@ -380,9 +386,9 @@ [BR-14]-An Invoice shall have the Invoice total amount with VAT (BT-112). [BR-15]-An Invoice shall have the Amount due for payment (BT-115). - + [BR-FXEXT-CO-11]-Absolute Value of (Sum of allowances on document level (BT-107) - Σ Document level allowance amounts (BT-92))<= 0,01 * Number of Document level allowance amounts (BT-92). - + [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))<= 0,01 * (Number of Document level charge amounts (BT-99) + Number of Logistics Service fee amounts (BT-X-272)). [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)) <= 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)). @@ -428,12 +434,16 @@ [BR-CO-27]-Either the IBAN or a Proprietary ID (BT-84) shall be used. + + + + [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. + + [BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice. - - [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. @@ -560,7 +570,7 @@ [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). - + [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. @@ -1131,8 +1141,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -1165,8 +1175,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -1371,8 +1381,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -1405,8 +1415,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -1548,8 +1558,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -1582,8 +1592,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -1796,8 +1806,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -1830,8 +1840,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -2036,8 +2046,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -2070,8 +2080,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -2278,8 +2288,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -2312,8 +2322,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -2462,8 +2472,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -2496,8 +2506,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -2849,6 +2859,13 @@ Element 'ram:ModeCode' must occur exactly 1 times. + + + + + Value of 'ram:ModeCode' is not allowed. + + @@ -2938,8 +2955,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -2972,8 +2989,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -3115,8 +3132,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -3149,8 +3166,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -3292,8 +3309,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -3326,8 +3343,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -3435,8 +3452,8 @@ - - + + Value of 'ram:DueDateTypeCode' is not allowed. @@ -3473,8 +3490,8 @@ - - + + Value of '@format' is not allowed. @@ -3531,8 +3548,8 @@ - - + + Value of 'ram:InvoiceCurrencyCode' is not allowed. @@ -3589,8 +3606,8 @@ - - + + Value of 'ram:TypeCode' is not allowed. @@ -3691,8 +3708,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -3725,8 +3742,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -3870,8 +3887,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -3904,8 +3921,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -4049,8 +4066,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -4083,8 +4100,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -4228,8 +4245,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -4262,8 +4279,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -4324,8 +4341,8 @@ - - + + Value of 'ram:TypeCode' is not allowed. @@ -4480,8 +4497,8 @@ - - + + Value of 'ram:TypeCode' is not allowed. @@ -4692,8 +4709,8 @@ - - + + Value of 'ram:ReasonCode' is not allowed. @@ -4798,8 +4815,8 @@ - - + + Value of 'ram:ReasonCode' is not allowed. @@ -4987,8 +5004,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -5021,8 +5038,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -5149,8 +5166,8 @@ - - + + Value of '@currencyID' is not allowed. @@ -5162,8 +5179,8 @@ - - + + Value of '@currencyID' is not allowed. @@ -5239,8 +5256,8 @@ - - + + Value of 'ram:TypeCode' is not allowed. @@ -5259,22 +5276,22 @@ - - + + Value of 'ram:SourceCurrencyCode' is not allowed. - - + + Value of 'ram:TargetCurrencyCode' is not allowed. - - + + Value of 'ram:TaxCurrencyCode' is not allowed. @@ -6273,8 +6290,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -6435,8 +6452,8 @@ - - + + Value of 'ram:CountryID' is not allowed. @@ -6915,13 +6932,6 @@ Element 'ram:Value' must occur exactly 1 times. - - - - - Value of 'ram:TypeCode' is not allowed. - - @@ -6960,8 +6970,8 @@ - - + + Value of '@listID' is not allowed. @@ -7010,6 +7020,13 @@ Attribute '@schemeID' is required in this context. + + + + + Value of '@schemeID' is not allowed. + + @@ -7073,8 +7090,8 @@ - - + + Value of 'ram:ID' is not allowed. diff --git a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_EXTENDED_codedb.xml b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_EXTENDED_codedb.xml similarity index 95% rename from validator/src/main/resources/schematron/ZF_230/FACTUR-X_EXTENDED_codedb.xml rename to validator/src/main/resources/schematron/ZF_232/FACTUR-X_EXTENDED_codedb.xml index c1e94944..62d10ca4 100644 --- a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_EXTENDED_codedb.xml +++ b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_EXTENDED_codedb.xml @@ -2,6 +2,7 @@ + @@ -818,302 +819,16 @@ + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1299,7 +1014,7 @@ - + @@ -1552,6 +1267,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4804,6 +4754,8 @@ + + @@ -4819,6 +4771,7 @@ + @@ -5058,6 +5011,14 @@ + + + + + + + + @@ -5285,6 +5246,14 @@ + + + + + + + + @@ -5302,6 +5271,7 @@ + @@ -5333,6 +5303,7 @@ + @@ -5728,6 +5699,18 @@ + + + + + + + + + + + + @@ -5789,7 +5772,6 @@ - @@ -5882,6 +5864,7 @@ + @@ -5906,9 +5889,10 @@ + - + @@ -5994,15 +5978,15 @@ - + - + - + @@ -6023,7 +6007,7 @@ - + @@ -6203,187 +6187,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6446,7 +6249,6 @@ - @@ -6539,6 +6341,7 @@ + @@ -6563,9 +6366,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6622,7 +6608,7 @@ - + @@ -6631,7 +6617,7 @@ - + diff --git a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_MINIMUM.sch b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_MINIMUM.sch similarity index 99% rename from validator/src/main/resources/schematron/ZF_230/FACTUR-X_MINIMUM.sch rename to validator/src/main/resources/schematron/ZF_232/FACTUR-X_MINIMUM.sch index 82fde99f..dd86da5b 100644 --- a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_MINIMUM.sch +++ b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_MINIMUM.sch @@ -1,5 +1,5 @@ - Schema for Factur-X; 1.0.07; Accounting, MINIMUM + Schema for Factur-X; 1.07.2; Accounting, MINIMUM diff --git a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_MINIMUM_codedb.xml b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_MINIMUM_codedb.xml similarity index 98% rename from validator/src/main/resources/xslt/ZF_230/FACTUR-X_MINIMUM_codedb.xml rename to validator/src/main/resources/schematron/ZF_232/FACTUR-X_MINIMUM_codedb.xml index 74a7b49c..c07e49f4 100644 --- a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_MINIMUM_codedb.xml +++ b/validator/src/main/resources/schematron/ZF_232/FACTUR-X_MINIMUM_codedb.xml @@ -2,6 +2,7 @@ + @@ -289,6 +290,14 @@ + + + + + + + + @@ -605,7 +614,6 @@ - @@ -698,6 +706,7 @@ + @@ -722,6 +731,7 @@ + @@ -786,7 +796,6 @@ - @@ -879,6 +888,7 @@ + @@ -903,6 +913,7 @@ + diff --git a/validator/src/main/resources/xslt/XR_22/XRechnung-CII-validation.xslt b/validator/src/main/resources/xslt/XR_22/XRechnung-CII-validation.xslt index 58c2e721..a9d2063b 100644 --- a/validator/src/main/resources/xslt/XR_22/XRechnung-CII-validation.xslt +++ b/validator/src/main/resources/xslt/XR_22/XRechnung-CII-validation.xslt @@ -211,7 +211,7 @@ - + @@ -344,7 +344,7 @@ - + @@ -365,7 +365,7 @@ - + @@ -386,7 +386,7 @@ - + @@ -422,7 +422,7 @@ - + @@ -503,7 +503,7 @@ - + @@ -539,7 +539,7 @@ - + @@ -575,7 +575,7 @@ - + @@ -626,7 +626,7 @@ - + @@ -662,7 +662,7 @@ - + @@ -713,7 +713,7 @@ - + @@ -734,11 +734,11 @@ - + - + @@ -764,7 +764,7 @@ - + @@ -787,7 +787,7 @@ - + @@ -810,7 +810,7 @@ - + @@ -833,7 +833,7 @@ - + @@ -856,10 +856,10 @@ - + - + diff --git a/validator/src/main/resources/xslt/XR_23/XRechnung-CII-validation.xslt b/validator/src/main/resources/xslt/XR_23/XRechnung-CII-validation.xslt index 9732db99..4306177e 100644 --- a/validator/src/main/resources/xslt/XR_23/XRechnung-CII-validation.xslt +++ b/validator/src/main/resources/xslt/XR_23/XRechnung-CII-validation.xslt @@ -214,7 +214,7 @@ - + @@ -396,7 +396,7 @@ - + @@ -417,7 +417,7 @@ - + @@ -438,7 +438,7 @@ - + @@ -474,7 +474,7 @@ - + @@ -555,7 +555,7 @@ - + @@ -591,7 +591,7 @@ - + @@ -627,7 +627,7 @@ - + @@ -678,7 +678,7 @@ - + @@ -714,7 +714,7 @@ - + @@ -765,7 +765,7 @@ - + @@ -786,11 +786,11 @@ - + - + @@ -816,7 +816,7 @@ - + @@ -839,7 +839,7 @@ - + @@ -862,7 +862,7 @@ - + @@ -885,7 +885,7 @@ - + @@ -908,10 +908,10 @@ - + - + diff --git a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_BASIC-WL.xslt b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC-WL.xslt similarity index 97% rename from validator/src/main/resources/xslt/ZF_230/FACTUR-X_BASIC-WL.xslt rename to validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC-WL.xslt index 931cc737..36484a84 100644 --- a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_BASIC-WL.xslt +++ b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC-WL.xslt @@ -153,7 +153,7 @@ - +     @@ -1522,11 +1522,18 @@ + + + + + + + -Schema for Factur-X; 1.0.07; Accounting, BASIC without Lines +Schema for Factur-X; 1.07.2; Accounting, BASIC without Lines @@ -2450,9 +2457,9 @@ - + - + FX-SCH-A-000092 @@ -2837,9 +2844,9 @@ - + - + FX-SCH-A-000110 @@ -3373,23 +3380,8 @@ - - - - - - - - - FX-SCH-A-000133 - - - - - [BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice. - - - + + @@ -3416,7 +3408,35 @@ - + + + + + + + + + FX-SCH-A-000133 + + + + + [BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice. + + + + + + + + + + + + + + + @@ -3433,18 +3453,18 @@ - + - - - + + + - + @@ -3476,18 +3496,18 @@ - + - - - + + + - + @@ -3519,18 +3539,18 @@ - + - - - + + + - + @@ -3562,18 +3582,18 @@ - + - - - + + + - + @@ -3635,18 +3655,18 @@ - + - - - + + + - + @@ -3678,18 +3698,18 @@ - + - - - + + + - + @@ -3721,18 +3741,18 @@ - + - - - + + + - + @@ -3809,18 +3829,18 @@ - + - - - + + + - + @@ -4032,18 +4052,18 @@ - + - - - + + + - + @@ -4075,18 +4095,18 @@ - + - - - + + + - + @@ -4099,18 +4119,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -4142,18 +4162,18 @@ - + - - - + + + - + @@ -4171,18 +4191,18 @@ - + - - - + + + - + @@ -4199,18 +4219,18 @@ - + - - - + + + - + @@ -4228,18 +4248,18 @@ - + - - - + + + - + @@ -4257,18 +4277,18 @@ - + - - - + + + - + @@ -4300,18 +4320,18 @@ - + - - - + + + - + @@ -4328,18 +4348,18 @@ - + - - - + + + - + @@ -4352,18 +4372,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -4380,18 +4400,18 @@ - + - - - + + + - + @@ -4409,18 +4429,18 @@ - + - - - + + + - + @@ -4433,18 +4453,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -4476,18 +4496,18 @@ - + - - - + + + - + @@ -4504,30 +4524,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. - - @@ -4539,8 +4535,8 @@ - - + + @@ -4549,7 +4545,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. @@ -4563,7 +4559,31 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -4655,18 +4675,18 @@ - + - - - + + + - + @@ -4683,18 +4703,18 @@ - + - - - + + + - + @@ -4712,18 +4732,18 @@ - + - - - + + + - + @@ -4736,18 +4756,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -4779,18 +4799,18 @@ - + - - - + + + - + @@ -4808,18 +4828,18 @@ - + - - - + + + - + @@ -4837,18 +4857,18 @@ - + - - - + + + - + @@ -4861,18 +4881,18 @@ Element 'ram:TradingBusinessName' is marked as not used in the given context. - + - - - + + + - + @@ -4889,18 +4909,18 @@ - + - - - + + + - + @@ -4917,18 +4937,18 @@ - + - - - + + + - + @@ -4946,18 +4966,18 @@ - + - - - + + + - + @@ -4974,18 +4994,18 @@ - + - - - + + + - + @@ -5002,18 +5022,18 @@ - + - - - + + + - + @@ -5031,18 +5051,18 @@ - + - - - + + + - + @@ -5059,30 +5079,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. - - @@ -5094,8 +5090,8 @@ - - + + @@ -5104,7 +5100,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. @@ -5118,7 +5114,31 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -5165,30 +5185,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:GlobalID' is marked as not used in the given context. - - @@ -5200,8 +5196,8 @@ - - + + @@ -5210,7 +5206,7 @@ - Element 'ram:ID' is marked as not used in the given context. + Element 'ram:GlobalID' is marked as not used in the given context. @@ -5224,7 +5220,31 @@ - + + + + + + + + + + + Element 'ram:ID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -5256,18 +5276,18 @@ - + - - - + + + - + @@ -5285,18 +5305,18 @@ - + - - - + + + - + @@ -5309,18 +5329,18 @@ Element 'ram:SpecifiedLegalOrganization' is marked as not used in the given context. - + - - - + + + - + @@ -5337,18 +5357,18 @@ - + - - - + + + - + @@ -5365,18 +5385,18 @@ - + - - - + + + - + @@ -5394,18 +5414,18 @@ - + - - - + + + - + @@ -5418,18 +5438,18 @@ Element 'ram:URIUniversalCommunication' is marked as not used in the given context. - + - - - + + + - + @@ -5506,18 +5526,18 @@ - + - - - + + + - + @@ -5534,18 +5554,18 @@ - + - - - + + + - + @@ -5563,18 +5583,18 @@ - + - - - + + + - + @@ -5587,18 +5607,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -5630,18 +5650,18 @@ - + - - - + + + - + @@ -5659,18 +5679,18 @@ - + - - - + + + - + @@ -5688,18 +5708,18 @@ - + - - - + + + - + @@ -5712,18 +5732,18 @@ Element variant 'ram:SpecifiedTaxRegistration[ not(ram:ID/@schemeID="VA") and not(ram:ID/@schemeID="FC")]' is marked as not used in the given context. - + - - - + + + - + @@ -5740,18 +5760,18 @@ - + - - - + + + - + @@ -5768,18 +5788,18 @@ - + - - - + + + - + @@ -5796,18 +5816,18 @@ - + - - - + + + - + @@ -5824,18 +5844,18 @@ - + - - - + + + - + @@ -5852,18 +5872,18 @@ - + - - - + + + - + @@ -5880,18 +5900,18 @@ - + - - - + + + - + @@ -5909,18 +5929,18 @@ - + - - - + + + - + @@ -5937,18 +5957,18 @@ - + - - - + + + - + @@ -5965,18 +5985,18 @@ - + - - - + + + - + @@ -5993,18 +6013,18 @@ - + - - - + + + - + @@ -6022,18 +6042,18 @@ - + - - - + + + - + @@ -6050,30 +6070,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. - - @@ -6085,8 +6081,8 @@ - - + + @@ -6095,7 +6091,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. @@ -6109,7 +6105,31 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -6141,18 +6161,18 @@ - + - - - + + + - + @@ -6169,18 +6189,18 @@ - + - - - + + + - + @@ -6198,18 +6218,18 @@ - + - - - + + + - + @@ -6222,18 +6242,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -6265,18 +6285,18 @@ - + - - - + + + - + @@ -6294,30 +6314,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:SpecifiedLegalOrganization' is marked as not used in the given context. - - @@ -6329,8 +6325,8 @@ - - + + @@ -6339,7 +6335,7 @@ - Element 'ram:SpecifiedTaxRegistration' is marked as not used in the given context. + Element 'ram:SpecifiedLegalOrganization' is marked as not used in the given context. @@ -6353,8 +6349,8 @@ - - + + @@ -6363,7 +6359,7 @@ - Element 'ram:URIUniversalCommunication' is marked as not used in the given context. + Element 'ram:SpecifiedTaxRegistration' is marked as not used in the given context. @@ -6377,7 +6373,31 @@ - + + + + + + + + + + + Element 'ram:URIUniversalCommunication' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -6469,18 +6489,18 @@ - + - - - + + + - + @@ -6542,30 +6562,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -6577,8 +6573,8 @@ - - + + @@ -6601,7 +6597,31 @@ - + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -6619,18 +6639,18 @@ - + - - - + + + - + @@ -6648,18 +6668,18 @@ - + - - - + + + - + @@ -6677,18 +6697,18 @@ - + - - - + + + - + @@ -6706,18 +6726,18 @@ - + - - - + + + - + @@ -6734,18 +6754,18 @@ - + - - - + + + - + @@ -6763,18 +6783,18 @@ - + - - - + + + - + @@ -6791,18 +6811,18 @@ - + - - - + + + - + @@ -6820,18 +6840,18 @@ - + - - - + + + - + @@ -6844,18 +6864,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -6873,18 +6893,18 @@ - + - - - + + + - + @@ -6916,18 +6936,18 @@ - + - - - + + + - + @@ -6944,18 +6964,18 @@ - + - - - + + + - + @@ -6973,18 +6993,18 @@ - + - - - + + + - + @@ -6997,18 +7017,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -7055,18 +7075,18 @@ - + - - - + + + - + @@ -7083,18 +7103,18 @@ - + - - - + + + - + @@ -7112,30 +7132,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - @@ -7147,8 +7143,8 @@ - - + + @@ -7157,7 +7153,7 @@ - Element 'ram:PostalTradeAddress' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -7171,7 +7167,31 @@ - + + + + + + + + + + + Element 'ram:PostalTradeAddress' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -7189,30 +7209,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:TradingBusinessName' is marked as not used in the given context. - - @@ -7224,8 +7220,8 @@ - - + + @@ -7234,7 +7230,7 @@ - Element 'ram:SpecifiedTaxRegistration' is marked as not used in the given context. + Element 'ram:TradingBusinessName' is marked as not used in the given context. @@ -7248,8 +7244,8 @@ - - + + @@ -7258,7 +7254,7 @@ - Element 'ram:URIUniversalCommunication' is marked as not used in the given context. + Element 'ram:SpecifiedTaxRegistration' is marked as not used in the given context. @@ -7272,8 +7268,8 @@ - - + + @@ -7282,7 +7278,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:URIUniversalCommunication' is marked as not used in the given context. @@ -7296,8 +7292,8 @@ - - + + @@ -7306,7 +7302,7 @@ - Element variant 'ram:SpecifiedTradeAllowanceCharge[ not(ram:ChargeIndicator/udt:Indicator="false") and not(ram:ChargeIndicator/udt:Indicator="true")]' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -7320,7 +7316,31 @@ - + + + + + + + + + + + Element variant 'ram:SpecifiedTradeAllowanceCharge[ not(ram:ChargeIndicator/udt:Indicator="false") and not(ram:ChargeIndicator/udt:Indicator="true")]' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -7367,30 +7387,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -7402,8 +7398,8 @@ - - + + @@ -7426,7 +7422,31 @@ - + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -7458,30 +7478,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:BasisAmount' is marked as not used in the given context. - - @@ -7493,8 +7489,8 @@ - - + + @@ -7503,7 +7499,7 @@ - Element 'ram:CalculatedAmount' is marked as not used in the given context. + Element 'ram:BasisAmount' is marked as not used in the given context. @@ -7517,7 +7513,31 @@ - + + + + + + + + + + + Element 'ram:CalculatedAmount' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -7535,30 +7555,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:DueDateTypeCode' is marked as not used in the given context. - - @@ -7570,8 +7566,8 @@ - - + + @@ -7580,7 +7576,7 @@ - Element 'ram:ExemptionReason' is marked as not used in the given context. + Element 'ram:DueDateTypeCode' is marked as not used in the given context. @@ -7594,8 +7590,8 @@ - - + + @@ -7604,7 +7600,7 @@ - Element 'ram:ExemptionReasonCode' is marked as not used in the given context. + Element 'ram:ExemptionReason' is marked as not used in the given context. @@ -7618,7 +7614,31 @@ - + + + + + + + + + + + Element 'ram:ExemptionReasonCode' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -7636,18 +7656,18 @@ - + - - - + + + - + @@ -7665,18 +7685,18 @@ - + - - - + + + - + @@ -7723,30 +7743,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -7758,8 +7754,8 @@ - - + + @@ -7782,7 +7778,31 @@ - + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -7814,30 +7834,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:BasisAmount' is marked as not used in the given context. - - @@ -7849,8 +7845,8 @@ - - + + @@ -7859,7 +7855,7 @@ - Element 'ram:CalculatedAmount' is marked as not used in the given context. + Element 'ram:BasisAmount' is marked as not used in the given context. @@ -7873,7 +7869,31 @@ - + + + + + + + + + + + Element 'ram:CalculatedAmount' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -7891,30 +7911,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:DueDateTypeCode' is marked as not used in the given context. - - @@ -7926,8 +7922,8 @@ - - + + @@ -7936,7 +7932,7 @@ - Element 'ram:ExemptionReason' is marked as not used in the given context. + Element 'ram:DueDateTypeCode' is marked as not used in the given context. @@ -7950,8 +7946,8 @@ - - + + @@ -7960,7 +7956,7 @@ - Element 'ram:ExemptionReasonCode' is marked as not used in the given context. + Element 'ram:ExemptionReason' is marked as not used in the given context. @@ -7974,7 +7970,31 @@ - + + + + + + + + + + + Element 'ram:ExemptionReasonCode' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -7992,18 +8012,18 @@ - + - - - + + + - + @@ -8021,18 +8041,18 @@ - + - - - + + + - + @@ -8064,18 +8084,18 @@ - + - - - + + + - + @@ -8088,18 +8108,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -8116,18 +8136,18 @@ - + - - - + + + - + @@ -8145,18 +8165,18 @@ - + - - - + + + - + @@ -8293,30 +8313,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -8328,8 +8324,8 @@ - - + + @@ -8352,8 +8348,8 @@ - - + + @@ -8376,8 +8372,8 @@ - - + + @@ -8400,8 +8396,8 @@ - - + + @@ -8424,8 +8420,8 @@ - - + + @@ -8448,8 +8444,8 @@ - - + + @@ -8458,7 +8454,7 @@ - Element variant 'ram:TaxTotalAmount[ not(@currencyID=../../ram:InvoiceCurrencyCode) and not(@currencyID=../../ram:TaxCurrencyCode)]' is marked as not used in the given context. + Attribute @currencyID' marked as not used in the given context. @@ -8472,7 +8468,31 @@ - + + + + + + + + + + + Element variant 'ram:TaxTotalAmount[ not(@currencyID=../../ram:InvoiceCurrencyCode) and not(@currencyID=../../ram:TaxCurrencyCode)]' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -8490,18 +8510,18 @@ - + - - - + + + - + @@ -8518,18 +8538,18 @@ - + - - - + + + - + @@ -8547,18 +8567,18 @@ - + - - - + + + - + @@ -8575,18 +8595,18 @@ - + - - - + + + - + @@ -8599,18 +8619,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -8642,30 +8662,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - @@ -8677,8 +8673,8 @@ - - + + @@ -8701,7 +8697,31 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -8718,18 +8738,18 @@ - + - - - + + + - + @@ -8742,18 +8762,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -8771,18 +8791,18 @@ - + - - - + + + - + @@ -8800,10 +8820,10 @@ - + - - - + + + diff --git a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_BASIC-WL_codedb.xml b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC-WL_codedb.xml similarity index 98% rename from validator/src/main/resources/xslt/ZF_230/FACTUR-X_BASIC-WL_codedb.xml rename to validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC-WL_codedb.xml index cc567d65..b5fef2d7 100644 --- a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_BASIC-WL_codedb.xml +++ b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC-WL_codedb.xml @@ -2,6 +2,7 @@ + @@ -692,6 +693,14 @@ + + + + + + + + @@ -919,6 +928,14 @@ + + + + + + + + @@ -1189,6 +1206,7 @@ + @@ -1220,6 +1238,7 @@ + @@ -1336,7 +1355,6 @@ - @@ -1429,6 +1447,7 @@ + @@ -1453,6 +1472,7 @@ + @@ -1588,6 +1608,8 @@ + + @@ -1603,6 +1625,7 @@ + @@ -1884,7 +1907,6 @@ - @@ -1977,6 +1999,7 @@ + @@ -2001,6 +2024,7 @@ + @@ -2065,7 +2089,6 @@ - @@ -2158,6 +2181,7 @@ + @@ -2182,6 +2206,7 @@ + diff --git a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_BASIC.xslt b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC.xslt similarity index 97% rename from validator/src/main/resources/xslt/ZF_230/FACTUR-X_BASIC.xslt rename to validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC.xslt index 0d4386e3..e7f52bfa 100644 --- a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_BASIC.xslt +++ b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC.xslt @@ -153,7 +153,7 @@ - +     @@ -2019,11 +2019,18 @@ + + + + + + + -Schema for Factur-X; 1.0.07; EN16931-COMPLIANT-BASIC +Schema for Factur-X; 1.07.2; EN16931-COMPLIANT-BASIC @@ -2755,9 +2762,9 @@ - + - + FX-SCH-A-000211 @@ -3460,9 +3467,9 @@ - + - + FX-SCH-A-000092 @@ -3847,9 +3854,9 @@ - + - + FX-SCH-A-000110 @@ -4398,23 +4405,8 @@ - - - - - - - - - FX-SCH-A-000133 - - - - - [BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice. - - - + + @@ -4441,7 +4433,35 @@ - + + + + + + + + + FX-SCH-A-000133 + + + + + [BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice. + + + + + + + + + + + + + + + @@ -4458,18 +4478,18 @@ - + - - - + + + - + @@ -4516,18 +4536,18 @@ - + - - - + + + - + @@ -4574,18 +4594,18 @@ - + - - - + + + - + @@ -4632,18 +4652,18 @@ - + - - - + + + - + @@ -4720,18 +4740,18 @@ - + - - - + + + - + @@ -4778,18 +4798,18 @@ - + - - - + + + - + @@ -4836,18 +4856,18 @@ - + - - - + + + - + @@ -4954,18 +4974,18 @@ - + - - - + + + - + @@ -4997,18 +5017,18 @@ - + - - - + + + - + @@ -5040,18 +5060,18 @@ - + - - - + + + - + @@ -5083,18 +5103,18 @@ - + - - - + + + - + @@ -5126,18 +5146,18 @@ - + - - - + + + - + @@ -5169,18 +5189,18 @@ - + - - - + + + - + @@ -5200,9 +5220,9 @@ - + - + FX-SCH-A-000246 @@ -5212,18 +5232,18 @@ - + - - - + + + - + @@ -5255,18 +5275,18 @@ - + - - - + + + - + @@ -5298,18 +5318,18 @@ - + - - - + + + - + @@ -5341,18 +5361,18 @@ - + - - - + + + - + @@ -5744,18 +5764,18 @@ - + - - - + + + - + @@ -5787,18 +5807,18 @@ - + - - - + + + - + @@ -5811,18 +5831,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -5854,18 +5874,18 @@ - + - - - + + + - + @@ -5883,18 +5903,18 @@ - + - - - + + + - + @@ -5911,18 +5931,18 @@ - + - - - + + + - + @@ -5940,18 +5960,18 @@ - + - - - + + + - + @@ -5969,18 +5989,18 @@ - + - - - + + + - + @@ -6012,18 +6032,18 @@ - + - - - + + + - + @@ -6040,18 +6060,18 @@ - + - - - + + + - + @@ -6064,18 +6084,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -6092,18 +6112,18 @@ - + - - - + + + - + @@ -6121,18 +6141,18 @@ - + - - - + + + - + @@ -6145,18 +6165,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -6173,18 +6193,18 @@ - + - - - + + + - + @@ -6216,18 +6236,18 @@ - + - - - + + + - + @@ -6244,30 +6264,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. - - @@ -6279,8 +6275,8 @@ - - + + @@ -6289,7 +6285,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. @@ -6303,7 +6299,31 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -6395,18 +6415,18 @@ - + - - - + + + - + @@ -6423,18 +6443,18 @@ - + - - - + + + - + @@ -6452,18 +6472,18 @@ - + - - - + + + - + @@ -6476,18 +6496,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -6519,18 +6539,18 @@ - + - - - + + + - + @@ -6548,18 +6568,18 @@ - + - - - + + + - + @@ -6577,18 +6597,18 @@ - + - - - + + + - + @@ -6601,18 +6621,18 @@ Element 'ram:TradingBusinessName' is marked as not used in the given context. - + - - - + + + - + @@ -6629,18 +6649,18 @@ - + - - - + + + - + @@ -6657,18 +6677,18 @@ - + - - - + + + - + @@ -6686,18 +6706,18 @@ - + - - - + + + - + @@ -6714,18 +6734,18 @@ - + - - - + + + - + @@ -6742,18 +6762,18 @@ - + - - - + + + - + @@ -6771,18 +6791,18 @@ - + - - - + + + - + @@ -6799,30 +6819,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. - - @@ -6834,8 +6830,8 @@ - - + + @@ -6844,7 +6840,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. @@ -6858,7 +6854,31 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -6905,30 +6925,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:GlobalID' is marked as not used in the given context. - - @@ -6940,8 +6936,8 @@ - - + + @@ -6950,7 +6946,7 @@ - Element 'ram:ID' is marked as not used in the given context. + Element 'ram:GlobalID' is marked as not used in the given context. @@ -6964,7 +6960,31 @@ - + + + + + + + + + + + Element 'ram:ID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -6996,18 +7016,18 @@ - + - - - + + + - + @@ -7025,18 +7045,18 @@ - + - - - + + + - + @@ -7049,18 +7069,18 @@ Element 'ram:SpecifiedLegalOrganization' is marked as not used in the given context. - + - - - + + + - + @@ -7077,18 +7097,18 @@ - + - - - + + + - + @@ -7105,18 +7125,18 @@ - + - - - + + + - + @@ -7134,18 +7154,18 @@ - + - - - + + + - + @@ -7158,18 +7178,18 @@ Element 'ram:URIUniversalCommunication' is marked as not used in the given context. - + - - - + + + - + @@ -7246,18 +7266,18 @@ - + - - - + + + - + @@ -7274,18 +7294,18 @@ - + - - - + + + - + @@ -7303,18 +7323,18 @@ - + - - - + + + - + @@ -7327,18 +7347,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -7370,18 +7390,18 @@ - + - - - + + + - + @@ -7399,18 +7419,18 @@ - + - - - + + + - + @@ -7428,18 +7448,18 @@ - + - - - + + + - + @@ -7452,18 +7472,18 @@ Element variant 'ram:SpecifiedTaxRegistration[ not(ram:ID/@schemeID="VA") and not(ram:ID/@schemeID="FC")]' is marked as not used in the given context. - + - - - + + + - + @@ -7480,18 +7500,18 @@ - + - - - + + + - + @@ -7508,18 +7528,18 @@ - + - - - + + + - + @@ -7536,18 +7556,18 @@ - + - - - + + + - + @@ -7564,18 +7584,18 @@ - + - - - + + + - + @@ -7592,18 +7612,18 @@ - + - - - + + + - + @@ -7620,18 +7640,18 @@ - + - - - + + + - + @@ -7649,18 +7669,18 @@ - + - - - + + + - + @@ -7677,18 +7697,18 @@ - + - - - + + + - + @@ -7705,18 +7725,18 @@ - + - - - + + + - + @@ -7733,18 +7753,18 @@ - + - - - + + + - + @@ -7762,18 +7782,18 @@ - + - - - + + + - + @@ -7790,30 +7810,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. - - @@ -7825,8 +7821,8 @@ - - + + @@ -7835,7 +7831,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. @@ -7849,7 +7845,31 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -7881,18 +7901,18 @@ - + - - - + + + - + @@ -7909,18 +7929,18 @@ - + - - - + + + - + @@ -7938,18 +7958,18 @@ - + - - - + + + - + @@ -7962,18 +7982,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -8005,18 +8025,18 @@ - + - - - + + + - + @@ -8034,30 +8054,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:SpecifiedLegalOrganization' is marked as not used in the given context. - - @@ -8069,8 +8065,8 @@ - - + + @@ -8079,7 +8075,7 @@ - Element 'ram:SpecifiedTaxRegistration' is marked as not used in the given context. + Element 'ram:SpecifiedLegalOrganization' is marked as not used in the given context. @@ -8093,8 +8089,8 @@ - - + + @@ -8103,7 +8099,7 @@ - Element 'ram:URIUniversalCommunication' is marked as not used in the given context. + Element 'ram:SpecifiedTaxRegistration' is marked as not used in the given context. @@ -8117,7 +8113,31 @@ - + + + + + + + + + + + Element 'ram:URIUniversalCommunication' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -8209,18 +8229,18 @@ - + - - - + + + - + @@ -8282,30 +8302,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -8317,8 +8313,8 @@ - - + + @@ -8341,7 +8337,31 @@ - + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -8359,18 +8379,18 @@ - + - - - + + + - + @@ -8388,18 +8408,18 @@ - + - - - + + + - + @@ -8417,18 +8437,18 @@ - + - - - + + + - + @@ -8446,18 +8466,18 @@ - + - - - + + + - + @@ -8474,18 +8494,18 @@ - + - - - + + + - + @@ -8503,18 +8523,18 @@ - + - - - + + + - + @@ -8531,18 +8551,18 @@ - + - - - + + + - + @@ -8560,18 +8580,18 @@ - + - - - + + + - + @@ -8584,18 +8604,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -8613,18 +8633,18 @@ - + - - - + + + - + @@ -8656,18 +8676,18 @@ - + - - - + + + - + @@ -8684,18 +8704,18 @@ - + - - - + + + - + @@ -8713,18 +8733,18 @@ - + - - - + + + - + @@ -8737,18 +8757,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -8795,18 +8815,18 @@ - + - - - + + + - + @@ -8823,18 +8843,18 @@ - + - - - + + + - + @@ -8852,30 +8872,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - @@ -8887,8 +8883,8 @@ - - + + @@ -8897,7 +8893,7 @@ - Element 'ram:PostalTradeAddress' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -8911,7 +8907,31 @@ - + + + + + + + + + + + Element 'ram:PostalTradeAddress' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -8929,30 +8949,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:TradingBusinessName' is marked as not used in the given context. - - @@ -8964,8 +8960,8 @@ - - + + @@ -8974,7 +8970,7 @@ - Element 'ram:SpecifiedTaxRegistration' is marked as not used in the given context. + Element 'ram:TradingBusinessName' is marked as not used in the given context. @@ -8988,8 +8984,8 @@ - - + + @@ -8998,7 +8994,7 @@ - Element 'ram:URIUniversalCommunication' is marked as not used in the given context. + Element 'ram:SpecifiedTaxRegistration' is marked as not used in the given context. @@ -9012,8 +9008,8 @@ - - + + @@ -9022,7 +9018,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:URIUniversalCommunication' is marked as not used in the given context. @@ -9036,8 +9032,8 @@ - - + + @@ -9046,7 +9042,7 @@ - Element variant 'ram:SpecifiedTradeAllowanceCharge[ not(ram:ChargeIndicator/udt:Indicator="false") and not(ram:ChargeIndicator/udt:Indicator="true")]' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -9060,7 +9056,31 @@ - + + + + + + + + + + + Element variant 'ram:SpecifiedTradeAllowanceCharge[ not(ram:ChargeIndicator/udt:Indicator="false") and not(ram:ChargeIndicator/udt:Indicator="true")]' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -9107,30 +9127,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -9142,8 +9138,8 @@ - - + + @@ -9166,7 +9162,31 @@ - + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -9198,30 +9218,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:BasisAmount' is marked as not used in the given context. - - @@ -9233,8 +9229,8 @@ - - + + @@ -9243,7 +9239,7 @@ - Element 'ram:CalculatedAmount' is marked as not used in the given context. + Element 'ram:BasisAmount' is marked as not used in the given context. @@ -9257,7 +9253,31 @@ - + + + + + + + + + + + Element 'ram:CalculatedAmount' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -9275,30 +9295,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:DueDateTypeCode' is marked as not used in the given context. - - @@ -9310,8 +9306,8 @@ - - + + @@ -9320,7 +9316,7 @@ - Element 'ram:ExemptionReason' is marked as not used in the given context. + Element 'ram:DueDateTypeCode' is marked as not used in the given context. @@ -9334,8 +9330,8 @@ - - + + @@ -9344,7 +9340,7 @@ - Element 'ram:ExemptionReasonCode' is marked as not used in the given context. + Element 'ram:ExemptionReason' is marked as not used in the given context. @@ -9358,7 +9354,31 @@ - + + + + + + + + + + + Element 'ram:ExemptionReasonCode' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -9376,18 +9396,18 @@ - + - - - + + + - + @@ -9405,18 +9425,18 @@ - + - - - + + + - + @@ -9463,30 +9483,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -9498,8 +9494,8 @@ - - + + @@ -9522,7 +9518,31 @@ - + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -9554,30 +9574,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:BasisAmount' is marked as not used in the given context. - - @@ -9589,8 +9585,8 @@ - - + + @@ -9599,7 +9595,7 @@ - Element 'ram:CalculatedAmount' is marked as not used in the given context. + Element 'ram:BasisAmount' is marked as not used in the given context. @@ -9613,7 +9609,31 @@ - + + + + + + + + + + + Element 'ram:CalculatedAmount' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -9631,30 +9651,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:DueDateTypeCode' is marked as not used in the given context. - - @@ -9666,8 +9662,8 @@ - - + + @@ -9676,7 +9672,7 @@ - Element 'ram:ExemptionReason' is marked as not used in the given context. + Element 'ram:DueDateTypeCode' is marked as not used in the given context. @@ -9690,8 +9686,8 @@ - - + + @@ -9700,7 +9696,7 @@ - Element 'ram:ExemptionReasonCode' is marked as not used in the given context. + Element 'ram:ExemptionReason' is marked as not used in the given context. @@ -9714,7 +9710,31 @@ - + + + + + + + + + + + Element 'ram:ExemptionReasonCode' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -9732,18 +9752,18 @@ - + - - - + + + - + @@ -9761,18 +9781,18 @@ - + - - - + + + - + @@ -9804,18 +9824,18 @@ - + - - - + + + - + @@ -9828,18 +9848,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -9856,18 +9876,18 @@ - + - - - + + + - + @@ -9885,18 +9905,18 @@ - + - - - + + + - + @@ -10033,30 +10053,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -10068,8 +10064,8 @@ - - + + @@ -10092,8 +10088,8 @@ - - + + @@ -10116,8 +10112,8 @@ - - + + @@ -10140,8 +10136,8 @@ - - + + @@ -10164,8 +10160,8 @@ - - + + @@ -10188,8 +10184,8 @@ - - + + @@ -10198,7 +10194,7 @@ - Element variant 'ram:TaxTotalAmount[ not(@currencyID=../../ram:InvoiceCurrencyCode) and not(@currencyID=../../ram:TaxCurrencyCode)]' is marked as not used in the given context. + Attribute @currencyID' marked as not used in the given context. @@ -10212,7 +10208,31 @@ - + + + + + + + + + + + Element variant 'ram:TaxTotalAmount[ not(@currencyID=../../ram:InvoiceCurrencyCode) and not(@currencyID=../../ram:TaxCurrencyCode)]' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -10230,18 +10250,18 @@ - + - - - + + + - + @@ -10258,18 +10278,18 @@ - + - - - + + + - + @@ -10287,18 +10307,18 @@ - + - - - + + + - + @@ -10315,18 +10335,18 @@ - + - - - + + + - + @@ -10339,18 +10359,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -10382,30 +10402,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - @@ -10417,8 +10413,8 @@ - - + + @@ -10441,7 +10437,31 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -10458,18 +10478,18 @@ - + - - - + + + - + @@ -10482,18 +10502,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -10511,18 +10531,18 @@ - + - - - + + + - + @@ -10540,18 +10560,18 @@ - + - - - + + + - + @@ -10613,18 +10633,18 @@ - + - - - + + + - + @@ -10656,18 +10676,18 @@ - + - - - + + + - + @@ -10684,30 +10704,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:SubjectCode' is marked as not used in the given context. - - @@ -10719,8 +10715,8 @@ - - + + @@ -10729,7 +10725,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:SubjectCode' is marked as not used in the given context. @@ -10743,7 +10739,31 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -10760,18 +10780,18 @@ - + - - - + + + - + @@ -10803,18 +10823,18 @@ - + - - - + + + - + @@ -10827,18 +10847,18 @@ Element variant 'ram:AppliedTradeAllowanceCharge[ not(ram:ChargeIndicator/udt:Indicator="false") and not(ram:ChargeIndicator/udt:Indicator="true")]' is marked as not used in the given context. - + - - - + + + - + @@ -10870,30 +10890,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -10905,8 +10901,8 @@ - - + + @@ -10915,7 +10911,7 @@ - Element 'ram:BasisAmount' is marked as not used in the given context. + Attribute @currencyID' marked as not used in the given context. @@ -10929,8 +10925,8 @@ - - + + @@ -10939,7 +10935,7 @@ - Element 'ram:CalculationPercent' is marked as not used in the given context. + Element 'ram:BasisAmount' is marked as not used in the given context. @@ -10953,8 +10949,8 @@ - - + + @@ -10963,7 +10959,7 @@ - Element 'ram:CategoryTradeTax' is marked as not used in the given context. + Element 'ram:CalculationPercent' is marked as not used in the given context. @@ -10977,8 +10973,8 @@ - - + + @@ -10987,7 +10983,7 @@ - Element 'ram:Reason' is marked as not used in the given context. + Element 'ram:CategoryTradeTax' is marked as not used in the given context. @@ -11001,8 +10997,8 @@ - - + + @@ -11011,7 +11007,7 @@ - Element 'ram:ReasonCode' is marked as not used in the given context. + Element 'ram:Reason' is marked as not used in the given context. @@ -11025,7 +11021,31 @@ - + + + + + + + + + + + Element 'ram:ReasonCode' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -11043,18 +11063,18 @@ - + - - - + + + - + @@ -11067,18 +11087,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -11095,18 +11115,18 @@ - + - - - + + + - + @@ -11119,18 +11139,18 @@ Element 'ram:AppliedTradeAllowanceCharge' is marked as not used in the given context. - + - - - + + + - + @@ -11148,18 +11168,18 @@ - + - - - + + + - + @@ -11172,18 +11192,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -11200,18 +11220,18 @@ - + - - - + + + - + @@ -11228,18 +11248,18 @@ - + - - - + + + - + @@ -11257,18 +11277,18 @@ - + - - - + + + - + @@ -11300,18 +11320,18 @@ - + - - - + + + - + @@ -11343,30 +11363,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:BasisAmount' is marked as not used in the given context. - - @@ -11378,8 +11374,8 @@ - - + + @@ -11388,7 +11384,7 @@ - Element 'ram:CalculatedAmount' is marked as not used in the given context. + Element 'ram:BasisAmount' is marked as not used in the given context. @@ -11402,7 +11398,31 @@ - + + + + + + + + + + + Element 'ram:CalculatedAmount' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -11420,30 +11440,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:DueDateTypeCode' is marked as not used in the given context. - - @@ -11455,8 +11451,8 @@ - - + + @@ -11465,7 +11461,7 @@ - Element 'ram:ExemptionReason' is marked as not used in the given context. + Element 'ram:DueDateTypeCode' is marked as not used in the given context. @@ -11479,8 +11475,8 @@ - - + + @@ -11489,7 +11485,7 @@ - Element 'ram:ExemptionReasonCode' is marked as not used in the given context. + Element 'ram:ExemptionReason' is marked as not used in the given context. @@ -11503,7 +11499,31 @@ - + + + + + + + + + + + Element 'ram:ExemptionReasonCode' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -11521,18 +11541,18 @@ - + - - - + + + - + @@ -11549,18 +11569,18 @@ - + - - - + + + - + @@ -11578,18 +11598,18 @@ - + - - - + + + - + @@ -11606,18 +11626,18 @@ - + - - - + + + - + @@ -11635,18 +11655,18 @@ - + - - - + + + - + @@ -11659,18 +11679,18 @@ Element variant 'ram:SpecifiedTradeAllowanceCharge[ not(ram:ChargeIndicator/udt:Indicator="false") and not(ram:ChargeIndicator/udt:Indicator="true")]' is marked as not used in the given context. - + - - - + + + - + @@ -11702,30 +11722,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -11737,8 +11733,8 @@ - - + + @@ -11747,7 +11743,7 @@ - Element 'ram:BasisAmount' is marked as not used in the given context. + Attribute @currencyID' marked as not used in the given context. @@ -11761,8 +11757,8 @@ - - + + @@ -11771,7 +11767,7 @@ - Element 'ram:CalculationPercent' is marked as not used in the given context. + Element 'ram:BasisAmount' is marked as not used in the given context. @@ -11785,8 +11781,8 @@ - - + + @@ -11795,7 +11791,7 @@ - Element 'ram:CategoryTradeTax' is marked as not used in the given context. + Element 'ram:CalculationPercent' is marked as not used in the given context. @@ -11809,7 +11805,31 @@ - + + + + + + + + + + + Element 'ram:CategoryTradeTax' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -11827,18 +11847,18 @@ - + - - - + + + - + @@ -11870,30 +11890,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -11905,8 +11901,8 @@ - - + + @@ -11915,7 +11911,7 @@ - Element 'ram:BasisAmount' is marked as not used in the given context. + Attribute @currencyID' marked as not used in the given context. @@ -11929,8 +11925,8 @@ - - + + @@ -11939,7 +11935,7 @@ - Element 'ram:CalculationPercent' is marked as not used in the given context. + Element 'ram:BasisAmount' is marked as not used in the given context. @@ -11953,8 +11949,8 @@ - - + + @@ -11963,7 +11959,7 @@ - Element 'ram:CategoryTradeTax' is marked as not used in the given context. + Element 'ram:CalculationPercent' is marked as not used in the given context. @@ -11977,7 +11973,31 @@ - + + + + + + + + + + + Element 'ram:CategoryTradeTax' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -11995,18 +12015,18 @@ - + - - - + + + - + @@ -12023,18 +12043,18 @@ - + - - - + + + - + @@ -12047,18 +12067,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -12075,18 +12095,18 @@ - + - - - + + + - + @@ -12103,18 +12123,18 @@ - + - - - + + + - + @@ -12132,10 +12152,10 @@ - + - - - + + + diff --git a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_BASIC_codedb.xml b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC_codedb.xml similarity index 99% rename from validator/src/main/resources/schematron/ZF_230/FACTUR-X_BASIC_codedb.xml rename to validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC_codedb.xml index ce1fdffe..d8154cdc 100644 --- a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_BASIC_codedb.xml +++ b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_BASIC_codedb.xml @@ -2,6 +2,7 @@ + @@ -692,6 +693,14 @@ + + + + + + + + @@ -3298,6 +3307,14 @@ + + + + + + + + @@ -3525,6 +3542,14 @@ + + + + + + + + @@ -3795,6 +3820,7 @@ + @@ -3826,6 +3852,7 @@ + @@ -3942,7 +3969,6 @@ - @@ -4035,6 +4061,7 @@ + @@ -4059,6 +4086,7 @@ + @@ -4180,6 +4208,8 @@ + + @@ -4195,6 +4225,7 @@ + @@ -4476,7 +4507,6 @@ - @@ -4569,6 +4599,7 @@ + @@ -4593,6 +4624,7 @@ + @@ -4657,7 +4689,6 @@ - @@ -4750,6 +4781,7 @@ + @@ -4774,6 +4806,7 @@ + diff --git a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_EN16931.xslt b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_EN16931.xslt similarity index 97% rename from validator/src/main/resources/xslt/ZF_230/FACTUR-X_EN16931.xslt rename to validator/src/main/resources/xslt/ZF_232/FACTUR-X_EN16931.xslt index b03d1084..5709d20e 100644 --- a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_EN16931.xslt +++ b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_EN16931.xslt @@ -153,7 +153,7 @@ - +     @@ -2971,11 +2971,18 @@ + + + + + + + -Schema for Factur-X; 1.0.07; EN16931-COMPLIANT (FULLY) +Schema for Factur-X; 1.07.2; EN16931-COMPLIANT (FULLY) @@ -3763,9 +3770,9 @@ - + - + FX-SCH-A-000211 @@ -4468,9 +4475,9 @@ - + - + FX-SCH-A-000092 @@ -4855,9 +4862,9 @@ - + - + FX-SCH-A-000110 @@ -5406,23 +5413,8 @@ - - - - - - - - - FX-SCH-A-000133 - - - - - [BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice. - - - + + @@ -5449,7 +5441,35 @@ - + + + + + + + + + FX-SCH-A-000133 + + + + + [BR-50]-A Payment account identifier (BT-84) shall be present if Credit transfer (BG-16) information is provided in the Invoice. + + + + + + + + + + + + + + + @@ -5466,18 +5486,18 @@ - + - - - + + + - + @@ -5524,18 +5544,18 @@ - + - - - + + + - + @@ -5582,18 +5602,18 @@ - + - - - + + + - + @@ -5640,18 +5660,18 @@ - + - - - + + + - + @@ -5728,18 +5748,18 @@ - + - - - + + + - + @@ -5786,18 +5806,18 @@ - + - - - + + + - + @@ -5844,18 +5864,18 @@ - + - - - + + + - + @@ -5962,18 +5982,18 @@ - + - - - + + + - + @@ -6005,18 +6025,18 @@ - + - - - + + + - + @@ -6048,18 +6068,18 @@ - + - - - + + + - + @@ -6091,18 +6111,18 @@ - + - - - + + + - + @@ -6134,18 +6154,18 @@ - + - - - + + + - + @@ -6177,18 +6197,18 @@ - + - - - + + + - + @@ -6208,9 +6228,9 @@ - + - + FX-SCH-A-000246 @@ -6220,18 +6240,18 @@ - + - - - + + + - + @@ -6263,18 +6283,18 @@ - + - - - + + + - + @@ -6306,18 +6326,18 @@ - + - - - + + + - + @@ -6349,18 +6369,18 @@ - + - - - + + + - + @@ -6752,18 +6772,18 @@ - + - - - + + + - + @@ -6795,18 +6815,18 @@ - + - - - + + + - + @@ -6819,18 +6839,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -6862,18 +6882,18 @@ - + - - - + + + - + @@ -6891,30 +6911,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @listID' marked as not used in the given context. - - @@ -6926,8 +6922,8 @@ - - + + @@ -6936,7 +6932,7 @@ - Attribute @listVersionID' marked as not used in the given context. + Attribute @listID' marked as not used in the given context. @@ -6950,7 +6946,31 @@ - + + + + + + + + + + + Attribute @listVersionID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -6967,18 +6987,18 @@ - + - - - + + + - + @@ -6996,18 +7016,18 @@ - + - - - + + + - + @@ -7025,18 +7045,18 @@ - + - - - + + + - + @@ -7068,18 +7088,18 @@ - + - - - + + + - + @@ -7096,18 +7116,18 @@ - + - - - + + + - + @@ -7120,18 +7140,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -7148,18 +7168,18 @@ - + - - - + + + - + @@ -7177,18 +7197,18 @@ - + - - - + + + - + @@ -7201,18 +7221,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -7229,18 +7249,18 @@ - + - - - + + + - + @@ -7272,18 +7292,18 @@ - + - - - + + + - + @@ -7296,18 +7316,18 @@ Element variant 'ram:AdditionalReferencedDocument[ not(ram:TypeCode="916") and not(ram:TypeCode="50") and not(ram:TypeCode="130")]' is marked as not used in the given context. - + - - - + + + - + @@ -7339,30 +7359,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - - @@ -7374,8 +7370,8 @@ - - + + @@ -7384,7 +7380,7 @@ - Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. + Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. @@ -7398,8 +7394,8 @@ - - + + @@ -7408,7 +7404,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. @@ -7422,8 +7418,8 @@ - - + + @@ -7432,7 +7428,7 @@ - Element 'ram:LineID' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -7446,8 +7442,8 @@ - - + + @@ -7456,7 +7452,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -7470,7 +7466,31 @@ - + + + + + + + + + + + Element 'ram:Name' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -7488,18 +7508,18 @@ - + - - - + + + - + @@ -7517,18 +7537,18 @@ - + - - - + + + - + @@ -7541,18 +7561,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -7584,30 +7604,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - - @@ -7619,8 +7615,8 @@ - - + + @@ -7629,7 +7625,7 @@ - Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. + Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. @@ -7643,8 +7639,8 @@ - - + + @@ -7653,7 +7649,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. @@ -7667,8 +7663,8 @@ - - + + @@ -7677,7 +7673,7 @@ - Element 'ram:LineID' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -7691,8 +7687,8 @@ - - + + @@ -7701,7 +7697,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -7715,8 +7711,8 @@ - - + + @@ -7725,7 +7721,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -7739,7 +7735,31 @@ - + + + + + + + + + + + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -7757,18 +7777,18 @@ - + - - - + + + - + @@ -7781,18 +7801,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -7854,18 +7874,18 @@ - + - - - + + + - + @@ -7897,18 +7917,18 @@ - + - - - + + + - + @@ -7926,30 +7946,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. - - @@ -7961,8 +7957,8 @@ - - + + @@ -7971,7 +7967,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. @@ -7985,8 +7981,8 @@ - - + + @@ -7995,7 +7991,7 @@ - Element 'ram:LineID' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -8009,8 +8005,8 @@ - - + + @@ -8019,7 +8015,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -8033,7 +8029,31 @@ - + + + + + + + + + + + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -8051,18 +8071,18 @@ - + - - - + + + - + @@ -8075,18 +8095,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -8103,30 +8123,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - - @@ -8138,8 +8134,8 @@ - - + + @@ -8148,7 +8144,7 @@ - Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. + Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. @@ -8162,8 +8158,8 @@ - - + + @@ -8172,7 +8168,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. @@ -8186,8 +8182,8 @@ - - + + @@ -8196,7 +8192,7 @@ - Element 'ram:LineID' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -8210,8 +8206,8 @@ - - + + @@ -8220,7 +8216,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -8234,8 +8230,8 @@ - - + + @@ -8244,7 +8240,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -8258,8 +8254,8 @@ - - + + @@ -8268,7 +8264,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -8282,8 +8278,8 @@ - - + + @@ -8292,7 +8288,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:TypeCode' is marked as not used in the given context. @@ -8306,7 +8302,31 @@ - + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -8413,18 +8433,18 @@ - + - - - + + + - + @@ -8441,30 +8461,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:CompleteNumber' is marked as not used in the given context. - - @@ -8476,8 +8472,8 @@ - - + + @@ -8486,7 +8482,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:CompleteNumber' is marked as not used in the given context. @@ -8500,7 +8496,31 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -8517,30 +8537,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:URIID' is marked as not used in the given context. - - @@ -8552,8 +8548,8 @@ - - + + @@ -8562,7 +8558,7 @@ - Element 'ram:Description' is marked as not used in the given context. + Element 'ram:URIID' is marked as not used in the given context. @@ -8576,7 +8572,31 @@ - + + + + + + + + + + + Element 'ram:Description' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -8593,18 +8613,18 @@ - + - - - + + + - + @@ -8622,18 +8642,18 @@ - + - - - + + + - + @@ -8646,18 +8666,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -8689,18 +8709,18 @@ - + - - - + + + - + @@ -8718,30 +8738,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @listID' marked as not used in the given context. - - @@ -8753,8 +8749,8 @@ - - + + @@ -8763,7 +8759,7 @@ - Attribute @listVersionID' marked as not used in the given context. + Attribute @listID' marked as not used in the given context. @@ -8777,7 +8773,31 @@ - + + + + + + + + + + + Attribute @listVersionID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -8795,18 +8815,18 @@ - + - - - + + + - + @@ -8823,18 +8843,18 @@ - + - - - + + + - + @@ -8851,18 +8871,18 @@ - + - - - + + + - + @@ -8880,18 +8900,18 @@ - + - - - + + + - + @@ -8908,18 +8928,18 @@ - + - - - + + + - + @@ -8932,18 +8952,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -8960,18 +8980,18 @@ - + - - - + + + - + @@ -8989,18 +9009,18 @@ - + - - - + + + - + @@ -9017,30 +9037,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - - @@ -9052,8 +9048,8 @@ - - + + @@ -9062,7 +9058,7 @@ - Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. + Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. @@ -9076,8 +9072,8 @@ - - + + @@ -9086,7 +9082,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. @@ -9100,8 +9096,8 @@ - - + + @@ -9110,7 +9106,7 @@ - Element 'ram:LineID' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -9124,8 +9120,8 @@ - - + + @@ -9134,7 +9130,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -9148,8 +9144,8 @@ - - + + @@ -9158,7 +9154,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -9172,8 +9168,8 @@ - - + + @@ -9182,7 +9178,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -9196,8 +9192,8 @@ - - + + @@ -9206,7 +9202,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:TypeCode' is marked as not used in the given context. @@ -9220,7 +9216,31 @@ - + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -9237,30 +9257,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - - @@ -9272,8 +9268,8 @@ - - + + @@ -9282,7 +9278,7 @@ - Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. + Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. @@ -9296,8 +9292,8 @@ - - + + @@ -9306,7 +9302,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. @@ -9320,8 +9316,8 @@ - - + + @@ -9330,7 +9326,7 @@ - Element 'ram:LineID' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -9344,8 +9340,8 @@ - - + + @@ -9354,7 +9350,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -9368,8 +9364,8 @@ - - + + @@ -9378,7 +9374,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -9392,8 +9388,8 @@ - - + + @@ -9402,7 +9398,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -9416,8 +9412,8 @@ - - + + @@ -9426,7 +9422,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:TypeCode' is marked as not used in the given context. @@ -9440,7 +9436,31 @@ - + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -9487,30 +9507,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:DefinedTradeContact' is marked as not used in the given context. - - @@ -9522,8 +9518,8 @@ - - + + @@ -9532,7 +9528,7 @@ - Element 'ram:Description' is marked as not used in the given context. + Element 'ram:DefinedTradeContact' is marked as not used in the given context. @@ -9546,8 +9542,8 @@ - - + + @@ -9556,7 +9552,7 @@ - Element 'ram:GlobalID' is marked as not used in the given context. + Element 'ram:Description' is marked as not used in the given context. @@ -9570,8 +9566,8 @@ - - + + @@ -9580,7 +9576,7 @@ - Element 'ram:ID' is marked as not used in the given context. + Element 'ram:GlobalID' is marked as not used in the given context. @@ -9594,7 +9590,31 @@ - + + + + + + + + + + + Element 'ram:ID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -9626,18 +9646,18 @@ - + - - - + + + - + @@ -9655,30 +9675,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @listID' marked as not used in the given context. - - @@ -9690,8 +9686,8 @@ - - + + @@ -9700,7 +9696,7 @@ - Attribute @listVersionID' marked as not used in the given context. + Attribute @listID' marked as not used in the given context. @@ -9714,8 +9710,8 @@ - - + + @@ -9724,7 +9720,7 @@ - Element 'ram:SpecifiedLegalOrganization' is marked as not used in the given context. + Attribute @listVersionID' marked as not used in the given context. @@ -9738,7 +9734,31 @@ - + + + + + + + + + + + Element 'ram:SpecifiedLegalOrganization' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -9755,18 +9775,18 @@ - + - - - + + + - + @@ -9783,18 +9803,18 @@ - + - - - + + + - + @@ -9812,18 +9832,18 @@ - + - - - + + + - + @@ -9836,18 +9856,18 @@ Element 'ram:URIUniversalCommunication' is marked as not used in the given context. - + - - - + + + - + @@ -9954,18 +9974,18 @@ - + - - - + + + - + @@ -9982,30 +10002,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:CompleteNumber' is marked as not used in the given context. - - @@ -10017,8 +10013,8 @@ - - + + @@ -10027,7 +10023,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:CompleteNumber' is marked as not used in the given context. @@ -10041,7 +10037,31 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -10058,18 +10078,18 @@ - + - - - + + + - + @@ -10082,18 +10102,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -10110,18 +10130,18 @@ - + - - - + + + - + @@ -10139,18 +10159,18 @@ - + - - - + + + - + @@ -10163,18 +10183,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -10206,18 +10226,18 @@ - + - - - + + + - + @@ -10235,30 +10255,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @listID' marked as not used in the given context. - - @@ -10270,8 +10266,8 @@ - - + + @@ -10280,7 +10276,7 @@ - Attribute @listVersionID' marked as not used in the given context. + Attribute @listID' marked as not used in the given context. @@ -10294,7 +10290,31 @@ - + + + + + + + + + + + Attribute @listVersionID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -10312,18 +10332,18 @@ - + - - - + + + - + @@ -10336,18 +10356,18 @@ Element variant 'ram:SpecifiedTaxRegistration[ not(ram:ID/@schemeID="VA") and not(ram:ID/@schemeID="FC")]' is marked as not used in the given context. - + - - - + + + - + @@ -10364,18 +10384,18 @@ - + - - - + + + - + @@ -10392,18 +10412,18 @@ - + - - - + + + - + @@ -10420,18 +10440,18 @@ - + - - - + + + - + @@ -10448,18 +10468,18 @@ - + - - - + + + - + @@ -10476,18 +10496,18 @@ - + - - - + + + - + @@ -10500,18 +10520,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -10528,18 +10548,18 @@ - + - - - + + + - + @@ -10557,18 +10577,18 @@ - + - - - + + + - + @@ -10581,18 +10601,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -10609,18 +10629,18 @@ - + - - - + + + - + @@ -10637,18 +10657,18 @@ - + - - - + + + - + @@ -10665,18 +10685,18 @@ - + - - - + + + - + @@ -10694,18 +10714,18 @@ - + - - - + + + - + @@ -10722,30 +10742,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - - @@ -10757,8 +10753,8 @@ - - + + @@ -10767,7 +10763,7 @@ - Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. + Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. @@ -10781,8 +10777,8 @@ - - + + @@ -10791,7 +10787,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. @@ -10805,8 +10801,8 @@ - - + + @@ -10815,7 +10811,7 @@ - Element 'ram:LineID' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -10829,8 +10825,8 @@ - - + + @@ -10839,7 +10835,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -10853,8 +10849,8 @@ - - + + @@ -10863,7 +10859,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -10877,8 +10873,8 @@ - - + + @@ -10887,7 +10883,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -10901,8 +10897,8 @@ - - + + @@ -10911,7 +10907,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:TypeCode' is marked as not used in the given context. @@ -10925,7 +10921,31 @@ - + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -10942,30 +10962,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - - @@ -10977,8 +10973,8 @@ - - + + @@ -10987,7 +10983,7 @@ - Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. + Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. @@ -11001,8 +10997,8 @@ - - + + @@ -11011,7 +11007,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. @@ -11025,8 +11021,8 @@ - - + + @@ -11035,7 +11031,7 @@ - Element 'ram:LineID' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -11049,8 +11045,8 @@ - - + + @@ -11059,7 +11055,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -11073,8 +11069,8 @@ - - + + @@ -11083,7 +11079,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -11097,8 +11093,8 @@ - - + + @@ -11107,7 +11103,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -11121,8 +11117,8 @@ - - + + @@ -11131,7 +11127,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:TypeCode' is marked as not used in the given context. @@ -11145,7 +11141,31 @@ - + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -11177,30 +11197,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:DefinedTradeContact' is marked as not used in the given context. - - @@ -11212,8 +11208,8 @@ - - + + @@ -11222,7 +11218,7 @@ - Element 'ram:Description' is marked as not used in the given context. + Element 'ram:DefinedTradeContact' is marked as not used in the given context. @@ -11236,7 +11232,31 @@ - + + + + + + + + + + + Element 'ram:Description' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -11253,18 +11273,18 @@ - + - - - + + + - + @@ -11282,18 +11302,18 @@ - + - - - + + + - + @@ -11306,18 +11326,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -11349,18 +11369,18 @@ - + - - - + + + - + @@ -11378,30 +11398,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @listID' marked as not used in the given context. - - @@ -11413,8 +11409,8 @@ - - + + @@ -11423,7 +11419,7 @@ - Attribute @listVersionID' marked as not used in the given context. + Attribute @listID' marked as not used in the given context. @@ -11437,8 +11433,8 @@ - - + + @@ -11447,7 +11443,7 @@ - Element 'ram:SpecifiedLegalOrganization' is marked as not used in the given context. + Attribute @listVersionID' marked as not used in the given context. @@ -11461,8 +11457,8 @@ - - + + @@ -11471,7 +11467,7 @@ - Element 'ram:SpecifiedTaxRegistration' is marked as not used in the given context. + Element 'ram:SpecifiedLegalOrganization' is marked as not used in the given context. @@ -11485,8 +11481,8 @@ - - + + @@ -11495,7 +11491,7 @@ - Element 'ram:URIUniversalCommunication' is marked as not used in the given context. + Element 'ram:SpecifiedTaxRegistration' is marked as not used in the given context. @@ -11509,7 +11505,31 @@ - + + + + + + + + + + + Element 'ram:URIUniversalCommunication' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -11601,18 +11621,18 @@ - + - - - + + + - + @@ -11674,30 +11694,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -11709,8 +11705,8 @@ - - + + @@ -11733,7 +11729,31 @@ - + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -11751,18 +11771,18 @@ - + - - - + + + - + @@ -11780,18 +11800,18 @@ - + - - - + + + - + @@ -11809,30 +11829,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @listID' marked as not used in the given context. - - @@ -11844,8 +11840,8 @@ - - + + @@ -11854,7 +11850,7 @@ - Attribute @listVersionID' marked as not used in the given context. + Attribute @listID' marked as not used in the given context. @@ -11868,7 +11864,31 @@ - + + + + + + + + + + + Attribute @listVersionID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -11885,18 +11905,18 @@ - + - - - + + + - + @@ -11914,18 +11934,18 @@ - + - - - + + + - + @@ -11943,18 +11963,18 @@ - + - - - + + + - + @@ -11971,18 +11991,18 @@ - + - - - + + + - + @@ -12000,18 +12020,18 @@ - + - - - + + + - + @@ -12028,18 +12048,18 @@ - + - - - + + + - + @@ -12057,18 +12077,18 @@ - + - - - + + + - + @@ -12081,18 +12101,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -12110,18 +12130,18 @@ - + - - - + + + - + @@ -12153,18 +12173,18 @@ - + - - - + + + - + @@ -12177,18 +12197,18 @@ Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - + - - - + + + - + @@ -12205,18 +12225,18 @@ - + - - - + + + - + @@ -12234,30 +12254,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - @@ -12269,8 +12265,8 @@ - - + + @@ -12279,7 +12275,7 @@ - Element 'ram:LineID' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -12293,8 +12289,8 @@ - - + + @@ -12303,7 +12299,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -12317,8 +12313,8 @@ - - + + @@ -12327,7 +12323,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -12341,8 +12337,8 @@ - - + + @@ -12351,7 +12347,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -12365,8 +12361,8 @@ - - + + @@ -12375,7 +12371,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:TypeCode' is marked as not used in the given context. @@ -12389,7 +12385,31 @@ - + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -12436,30 +12456,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:DefinedTradeContact' is marked as not used in the given context. - - @@ -12471,8 +12467,8 @@ - - + + @@ -12481,7 +12477,7 @@ - Element 'ram:Description' is marked as not used in the given context. + Element 'ram:DefinedTradeContact' is marked as not used in the given context. @@ -12495,7 +12491,31 @@ - + + + + + + + + + + + Element 'ram:Description' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -12512,18 +12532,18 @@ - + - - - + + + - + @@ -12541,30 +12561,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - @@ -12576,8 +12572,8 @@ - - + + @@ -12586,7 +12582,7 @@ - Element 'ram:PostalTradeAddress' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -12600,7 +12596,31 @@ - + + + + + + + + + + + Element 'ram:PostalTradeAddress' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -12618,30 +12638,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:TradingBusinessName' is marked as not used in the given context. - - @@ -12653,8 +12649,8 @@ - - + + @@ -12663,7 +12659,7 @@ - Element 'ram:SpecifiedTaxRegistration' is marked as not used in the given context. + Element 'ram:TradingBusinessName' is marked as not used in the given context. @@ -12677,8 +12673,8 @@ - - + + @@ -12687,7 +12683,7 @@ - Element 'ram:URIUniversalCommunication' is marked as not used in the given context. + Element 'ram:SpecifiedTaxRegistration' is marked as not used in the given context. @@ -12701,8 +12697,8 @@ - - + + @@ -12711,7 +12707,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:URIUniversalCommunication' is marked as not used in the given context. @@ -12725,8 +12721,8 @@ - - + + @@ -12735,7 +12731,7 @@ - Element variant 'ram:SpecifiedTradeAllowanceCharge[ not(ram:ChargeIndicator/udt:Indicator="false") and not(ram:ChargeIndicator/udt:Indicator="true")]' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -12749,7 +12745,31 @@ - + + + + + + + + + + + Element variant 'ram:SpecifiedTradeAllowanceCharge[ not(ram:ChargeIndicator/udt:Indicator="false") and not(ram:ChargeIndicator/udt:Indicator="true")]' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -12796,30 +12816,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -12831,8 +12827,8 @@ - - + + @@ -12855,7 +12851,31 @@ - + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -12887,30 +12907,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:BasisAmount' is marked as not used in the given context. - - @@ -12922,8 +12918,8 @@ - - + + @@ -12932,7 +12928,7 @@ - Element 'ram:CalculatedAmount' is marked as not used in the given context. + Element 'ram:BasisAmount' is marked as not used in the given context. @@ -12946,7 +12942,31 @@ - + + + + + + + + + + + Element 'ram:CalculatedAmount' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -12964,30 +12984,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:DueDateTypeCode' is marked as not used in the given context. - - @@ -12999,8 +12995,8 @@ - - + + @@ -13009,7 +13005,7 @@ - Element 'ram:ExemptionReason' is marked as not used in the given context. + Element 'ram:DueDateTypeCode' is marked as not used in the given context. @@ -13023,8 +13019,8 @@ - - + + @@ -13033,7 +13029,7 @@ - Element 'ram:ExemptionReasonCode' is marked as not used in the given context. + Element 'ram:ExemptionReason' is marked as not used in the given context. @@ -13047,8 +13043,8 @@ - - + + @@ -13057,7 +13053,7 @@ - Element 'ram:TaxPointDate' is marked as not used in the given context. + Element 'ram:ExemptionReasonCode' is marked as not used in the given context. @@ -13071,7 +13067,31 @@ - + + + + + + + + + + + Element 'ram:TaxPointDate' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -13089,18 +13109,18 @@ - + - - - + + + - + @@ -13118,18 +13138,18 @@ - + - - - + + + - + @@ -13176,30 +13196,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -13211,8 +13207,8 @@ - - + + @@ -13235,7 +13231,31 @@ - + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -13267,30 +13287,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:BasisAmount' is marked as not used in the given context. - - @@ -13302,8 +13298,8 @@ - - + + @@ -13312,7 +13308,7 @@ - Element 'ram:CalculatedAmount' is marked as not used in the given context. + Element 'ram:BasisAmount' is marked as not used in the given context. @@ -13326,7 +13322,31 @@ - + + + + + + + + + + + Element 'ram:CalculatedAmount' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -13344,30 +13364,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:DueDateTypeCode' is marked as not used in the given context. - - @@ -13379,8 +13375,8 @@ - - + + @@ -13389,7 +13385,7 @@ - Element 'ram:ExemptionReason' is marked as not used in the given context. + Element 'ram:DueDateTypeCode' is marked as not used in the given context. @@ -13403,8 +13399,8 @@ - - + + @@ -13413,7 +13409,7 @@ - Element 'ram:ExemptionReasonCode' is marked as not used in the given context. + Element 'ram:ExemptionReason' is marked as not used in the given context. @@ -13427,8 +13423,8 @@ - - + + @@ -13437,7 +13433,7 @@ - Element 'ram:TaxPointDate' is marked as not used in the given context. + Element 'ram:ExemptionReasonCode' is marked as not used in the given context. @@ -13451,7 +13447,31 @@ - + + + + + + + + + + + Element 'ram:TaxPointDate' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -13469,18 +13489,18 @@ - + - - - + + + - + @@ -13498,18 +13518,18 @@ - + - - - + + + - + @@ -13541,18 +13561,18 @@ - + - - - + + + - + @@ -13565,18 +13585,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -13593,18 +13613,18 @@ - + - - - + + + - + @@ -13622,18 +13642,18 @@ - + - - - + + + - + @@ -13785,30 +13805,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -13820,8 +13816,8 @@ - - + + @@ -13844,8 +13840,8 @@ - - + + @@ -13868,8 +13864,8 @@ - - + + @@ -13892,8 +13888,8 @@ - - + + @@ -13916,8 +13912,8 @@ - - + + @@ -13940,8 +13936,8 @@ - - + + @@ -13964,8 +13960,8 @@ - - + + @@ -13974,7 +13970,7 @@ - Element variant 'ram:TaxTotalAmount[ not(@currencyID=../../ram:InvoiceCurrencyCode) and not(@currencyID=../../ram:TaxCurrencyCode)]' is marked as not used in the given context. + Attribute @currencyID' marked as not used in the given context. @@ -13988,7 +13984,31 @@ - + + + + + + + + + + + Element variant 'ram:TaxTotalAmount[ not(@currencyID=../../ram:InvoiceCurrencyCode) and not(@currencyID=../../ram:TaxCurrencyCode)]' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -14006,18 +14026,18 @@ - + - - - + + + - + @@ -14034,18 +14054,18 @@ - + - - - + + + - + @@ -14063,18 +14083,18 @@ - + - - - + + + - + @@ -14091,18 +14111,18 @@ - + - - - + + + - + @@ -14115,18 +14135,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -14173,18 +14193,18 @@ - + - - - + + + - + @@ -14201,30 +14221,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - @@ -14236,8 +14232,8 @@ - - + + @@ -14260,8 +14256,8 @@ - - + + @@ -14284,7 +14280,31 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -14301,18 +14321,18 @@ - + - - - + + + - + @@ -14325,18 +14345,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -14353,18 +14373,18 @@ - + - - - + + + - + @@ -14377,18 +14397,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -14406,18 +14426,18 @@ - + - - - + + + - + @@ -14435,18 +14455,18 @@ - + - - - + + + - + @@ -14508,18 +14528,18 @@ - + - - - + + + - + @@ -14551,18 +14571,18 @@ - + - - - + + + - + @@ -14579,30 +14599,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:SubjectCode' is marked as not used in the given context. - - @@ -14614,8 +14610,8 @@ - - + + @@ -14624,7 +14620,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:SubjectCode' is marked as not used in the given context. @@ -14638,7 +14634,31 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -14655,30 +14675,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - - @@ -14690,8 +14686,8 @@ - - + + @@ -14700,7 +14696,7 @@ - Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. + Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. @@ -14714,8 +14710,8 @@ - - + + @@ -14724,7 +14720,7 @@ - Element 'ram:IssuerAssignedID' is marked as not used in the given context. + Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. @@ -14738,8 +14734,8 @@ - - + + @@ -14748,7 +14744,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:IssuerAssignedID' is marked as not used in the given context. @@ -14762,8 +14758,8 @@ - - + + @@ -14772,7 +14768,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -14786,8 +14782,8 @@ - - + + @@ -14796,7 +14792,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -14810,8 +14806,8 @@ - - + + @@ -14820,7 +14816,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -14834,8 +14830,8 @@ - - + + @@ -14844,7 +14840,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:TypeCode' is marked as not used in the given context. @@ -14858,7 +14854,31 @@ - + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -14890,18 +14910,18 @@ - + - - - + + + - + @@ -14914,18 +14934,18 @@ Element variant 'ram:AppliedTradeAllowanceCharge[ not(ram:ChargeIndicator/udt:Indicator="false") and not(ram:ChargeIndicator/udt:Indicator="true")]' is marked as not used in the given context. - + - - - + + + - + @@ -14957,30 +14977,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -14992,8 +14988,8 @@ - - + + @@ -15002,7 +14998,7 @@ - Element 'ram:BasisAmount' is marked as not used in the given context. + Attribute @currencyID' marked as not used in the given context. @@ -15016,8 +15012,8 @@ - - + + @@ -15026,7 +15022,7 @@ - Element 'ram:CalculationPercent' is marked as not used in the given context. + Element 'ram:BasisAmount' is marked as not used in the given context. @@ -15040,8 +15036,8 @@ - - + + @@ -15050,7 +15046,7 @@ - Element 'ram:CategoryTradeTax' is marked as not used in the given context. + Element 'ram:CalculationPercent' is marked as not used in the given context. @@ -15064,8 +15060,8 @@ - - + + @@ -15074,7 +15070,7 @@ - Element 'ram:Reason' is marked as not used in the given context. + Element 'ram:CategoryTradeTax' is marked as not used in the given context. @@ -15088,8 +15084,8 @@ - - + + @@ -15098,7 +15094,7 @@ - Element 'ram:ReasonCode' is marked as not used in the given context. + Element 'ram:Reason' is marked as not used in the given context. @@ -15112,7 +15108,31 @@ - + + + + + + + + + + + Element 'ram:ReasonCode' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -15130,18 +15150,18 @@ - + - - - + + + - + @@ -15154,18 +15174,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -15182,18 +15202,18 @@ - + - - - + + + - + @@ -15206,18 +15226,18 @@ Element 'ram:AppliedTradeAllowanceCharge' is marked as not used in the given context. - + - - - + + + - + @@ -15235,18 +15255,18 @@ - + - - - + + + - + @@ -15259,18 +15279,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -15287,18 +15307,18 @@ - + - - - + + + - + @@ -15315,18 +15335,18 @@ - + - - - + + + - + @@ -15344,18 +15364,18 @@ - + - - - + + + - + @@ -15417,18 +15437,18 @@ - + - - - + + + - + @@ -15460,30 +15480,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - - @@ -15495,8 +15491,8 @@ - - + + @@ -15505,7 +15501,7 @@ - Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. + Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. @@ -15519,8 +15515,8 @@ - - + + @@ -15529,7 +15525,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. @@ -15543,8 +15539,8 @@ - - + + @@ -15553,7 +15549,7 @@ - Element 'ram:LineID' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -15567,8 +15563,8 @@ - - + + @@ -15577,7 +15573,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -15591,7 +15587,31 @@ - + + + + + + + + + + + Element 'ram:Name' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -15609,18 +15629,18 @@ - + - - - + + + - + @@ -15638,18 +15658,18 @@ - + - - - + + + - + @@ -15662,18 +15682,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -15705,30 +15725,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:BasisAmount' is marked as not used in the given context. - - @@ -15740,8 +15736,8 @@ - - + + @@ -15750,7 +15746,7 @@ - Element 'ram:CalculatedAmount' is marked as not used in the given context. + Element 'ram:BasisAmount' is marked as not used in the given context. @@ -15764,7 +15760,31 @@ - + + + + + + + + + + + Element 'ram:CalculatedAmount' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -15782,30 +15802,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:DueDateTypeCode' is marked as not used in the given context. - - @@ -15817,8 +15813,8 @@ - - + + @@ -15827,7 +15823,7 @@ - Element 'ram:ExemptionReason' is marked as not used in the given context. + Element 'ram:DueDateTypeCode' is marked as not used in the given context. @@ -15841,8 +15837,8 @@ - - + + @@ -15851,7 +15847,7 @@ - Element 'ram:ExemptionReasonCode' is marked as not used in the given context. + Element 'ram:ExemptionReason' is marked as not used in the given context. @@ -15865,8 +15861,8 @@ - - + + @@ -15875,7 +15871,7 @@ - Element 'ram:TaxPointDate' is marked as not used in the given context. + Element 'ram:ExemptionReasonCode' is marked as not used in the given context. @@ -15889,7 +15885,31 @@ - + + + + + + + + + + + Element 'ram:TaxPointDate' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -15907,18 +15927,18 @@ - + - - - + + + - + @@ -15935,18 +15955,18 @@ - + - - - + + + - + @@ -15964,18 +15984,18 @@ - + - - - + + + - + @@ -15992,18 +16012,18 @@ - + - - - + + + - + @@ -16021,30 +16041,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - @@ -16056,8 +16052,8 @@ - - + + @@ -16066,7 +16062,7 @@ - Element variant 'ram:SpecifiedTradeAllowanceCharge[ not(ram:ChargeIndicator/udt:Indicator="false") and not(ram:ChargeIndicator/udt:Indicator="true")]' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -16080,7 +16076,31 @@ - + + + + + + + + + + + Element variant 'ram:SpecifiedTradeAllowanceCharge[ not(ram:ChargeIndicator/udt:Indicator="false") and not(ram:ChargeIndicator/udt:Indicator="true")]' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -16112,30 +16132,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -16147,8 +16143,8 @@ - - + + @@ -16171,8 +16167,8 @@ - - + + @@ -16181,7 +16177,7 @@ - Element 'ram:CategoryTradeTax' is marked as not used in the given context. + Attribute @currencyID' marked as not used in the given context. @@ -16195,7 +16191,31 @@ - + + + + + + + + + + + Element 'ram:CategoryTradeTax' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -16213,18 +16233,18 @@ - + - - - + + + - + @@ -16256,30 +16276,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -16291,8 +16287,8 @@ - - + + @@ -16315,8 +16311,8 @@ - - + + @@ -16325,7 +16321,7 @@ - Element 'ram:CategoryTradeTax' is marked as not used in the given context. + Attribute @currencyID' marked as not used in the given context. @@ -16339,7 +16335,31 @@ - + + + + + + + + + + + Element 'ram:CategoryTradeTax' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -16357,18 +16377,18 @@ - + - - - + + + - + @@ -16385,18 +16405,18 @@ - + - - - + + + - + @@ -16409,18 +16429,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -16452,18 +16472,18 @@ - + - - - + + + - + @@ -16495,18 +16515,18 @@ - + - - - + + + - + @@ -16519,18 +16539,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -16547,18 +16567,18 @@ - + - - - + + + - + @@ -16576,18 +16596,18 @@ - + - - - + + + - + @@ -16604,18 +16624,18 @@ - + - - - + + + - + @@ -16633,18 +16653,18 @@ - + - - - + + + - + @@ -16661,18 +16681,18 @@ - + - - - + + + - + @@ -16690,18 +16710,18 @@ - + - - - + + + - + @@ -16714,10 +16734,10 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + diff --git a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_EN16931_codedb.xml b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_EN16931_codedb.xml similarity index 99% rename from validator/src/main/resources/xslt/ZF_230/FACTUR-X_EN16931_codedb.xml rename to validator/src/main/resources/xslt/ZF_232/FACTUR-X_EN16931_codedb.xml index d0ad2b33..ae1b08a2 100644 --- a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_EN16931_codedb.xml +++ b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_EN16931_codedb.xml @@ -692,6 +692,14 @@ + + + + + + + + @@ -4561,6 +4569,14 @@ + + + + + + + + @@ -4788,6 +4804,14 @@ + + + + + + + + @@ -4805,6 +4829,7 @@ + @@ -4836,6 +4861,7 @@ + @@ -4969,7 +4995,6 @@ - @@ -5062,6 +5087,7 @@ + @@ -5086,6 +5112,7 @@ + @@ -5207,6 +5234,8 @@ + + @@ -5222,6 +5251,7 @@ + @@ -5506,7 +5536,6 @@ - @@ -5599,6 +5628,7 @@ + @@ -5623,6 +5653,7 @@ + @@ -5687,7 +5718,6 @@ - @@ -5780,6 +5810,7 @@ + @@ -5804,6 +5835,7 @@ + diff --git a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_EXTENDED.xslt b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_EXTENDED.xslt similarity index 96% rename from validator/src/main/resources/xslt/ZF_230/FACTUR-X_EXTENDED.xslt rename to validator/src/main/resources/xslt/ZF_232/FACTUR-X_EXTENDED.xslt index b317bcb5..c3b9ce37 100644 --- a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_EXTENDED.xslt +++ b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_EXTENDED.xslt @@ -153,7 +153,7 @@ - +     @@ -7472,11 +7472,32 @@ + + + + + + + + + + + + + + + + + + + + + -Schema for Factur-X; 1.0.07; EN16931-CONFORMANT-EXTENDED +Schema for Factur-X; 1.07.2; EN16931-CONFORMANT-EXTENDED @@ -8064,7 +8085,36 @@ - + + + + + + + + + FX-SCH-A-000345 + warning + + + + + [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. + + + + + + + + + + + + + + + @@ -8081,18 +8131,18 @@ - + - - - + + + - + @@ -8109,18 +8159,18 @@ - + - - - + + + - + @@ -8290,9 +8340,9 @@ - + - + FX-SCH-A-000211 @@ -8302,18 +8352,18 @@ - + - - - + + + - + @@ -8330,18 +8380,18 @@ - + - - - + + + - + @@ -8403,18 +8453,18 @@ - + - - - + + + - + @@ -8431,18 +8481,18 @@ - + - - - + + + - + @@ -8474,18 +8524,18 @@ - + - - - + + + - + @@ -8502,18 +8552,18 @@ - + - - - + + + - + @@ -8590,18 +8640,18 @@ - + - - - + + + - + @@ -8693,18 +8743,18 @@ - + - - - + + + - + @@ -8721,18 +8771,18 @@ - + - - - + + + - + @@ -8749,18 +8799,18 @@ - + - - - + + + - + @@ -8777,18 +8827,18 @@ - + - - - + + + - + @@ -8820,18 +8870,18 @@ - + - - - + + + - + @@ -8863,18 +8913,18 @@ - + - - - + + + - + @@ -8906,18 +8956,18 @@ - + - - - + + + - + @@ -8949,18 +8999,18 @@ - + - - - + + + - + @@ -8992,18 +9042,18 @@ - + - - - + + + - + @@ -9023,9 +9073,9 @@ - + - + FX-SCH-A-000092 @@ -9035,18 +9085,18 @@ - + - - - + + + - + @@ -9063,18 +9113,18 @@ - + - - - + + + - + @@ -9106,18 +9156,18 @@ - + - - - + + + - + @@ -9149,18 +9199,18 @@ - + - - - + + + - + @@ -9192,18 +9242,18 @@ - + - - - + + + - + @@ -9235,18 +9285,18 @@ - + - - - + + + - + @@ -9278,18 +9328,18 @@ - + - - - + + + - + @@ -9321,18 +9371,18 @@ - + - - - + + + - + @@ -9364,18 +9414,18 @@ - + - - - + + + - + @@ -9395,9 +9445,9 @@ - + - + FX-SCH-A-000110 @@ -9407,18 +9457,18 @@ - + - - - + + + - + @@ -9435,18 +9485,18 @@ - + - - - + + + - + @@ -9478,18 +9528,18 @@ - + - - - + + + - + @@ -9521,18 +9571,18 @@ - + - - - + + + - + @@ -9612,9 +9662,9 @@ - + - + FX-SCH-A-000304 @@ -9627,9 +9677,9 @@ - + - + FX-SCH-A-000305 @@ -9849,18 +9899,18 @@ - + - - - + + + - + @@ -9877,18 +9927,18 @@ - + - - - + + + - + @@ -9920,18 +9970,46 @@ - + - - - + + + - + + + + + + + + + FX-SCH-A-000134 + + + + + [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. + + + + + + + + + + + + + + + @@ -9948,33 +10026,18 @@ - - - - - - - FX-SCH-A-000134 - - - - - [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. - - - - + - - - + + + - + @@ -9991,18 +10054,18 @@ - + - - - + + + - + @@ -10049,18 +10112,18 @@ - + - - - + + + - + @@ -10107,18 +10170,18 @@ - + - - - + + + - + @@ -10165,18 +10228,18 @@ - + - - - + + + - + @@ -10253,18 +10316,18 @@ - + - - - + + + - + @@ -10311,18 +10374,18 @@ - + - - - + + + - + @@ -10369,18 +10432,18 @@ - + - - - + + + - + @@ -10427,18 +10490,18 @@ - + - - - + + + - + @@ -10470,18 +10533,18 @@ - + - - - + + + - + @@ -10513,18 +10576,18 @@ - + - - - + + + - + @@ -10556,18 +10619,18 @@ - + - - - + + + - + @@ -10599,18 +10662,18 @@ - + - - - + + + - + @@ -10642,18 +10705,18 @@ - + - - - + + + - + @@ -10673,9 +10736,9 @@ - + - + FX-SCH-A-000246 @@ -10685,18 +10748,18 @@ - + - - - + + + - + @@ -10713,18 +10776,18 @@ - + - - - + + + - + @@ -10756,18 +10819,18 @@ - + - - - + + + - + @@ -10799,18 +10862,18 @@ - + - - - + + + - + @@ -11202,18 +11265,18 @@ - + - - - + + + - + @@ -11275,18 +11338,18 @@ - + - - - + + + - + @@ -11303,18 +11366,18 @@ - + - - - + + + - + @@ -11331,18 +11394,18 @@ - + - - - + + + - + @@ -11360,54 +11423,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:Description' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:EndDateTime' is marked as not used in the given context. - - @@ -11419,8 +11434,8 @@ - - + + @@ -11429,7 +11444,7 @@ - Element 'ram:StartDateTime' is marked as not used in the given context. + Element 'ram:Description' is marked as not used in the given context. @@ -11443,8 +11458,8 @@ - - + + @@ -11453,7 +11468,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:EndDateTime' is marked as not used in the given context. @@ -11467,7 +11482,55 @@ - + + + + + + + + + + + Element 'ram:StartDateTime' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -11499,18 +11562,18 @@ - + - - - + + + - + @@ -11523,18 +11586,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -11547,18 +11610,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -11576,18 +11639,18 @@ - + - - - + + + - + @@ -11600,18 +11663,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -11624,18 +11687,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -11652,18 +11715,18 @@ - + - - - + + + - + @@ -11680,18 +11743,18 @@ - + - - - + + + - + @@ -11709,18 +11772,18 @@ - + - - - + + + - + @@ -11733,18 +11796,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -11762,18 +11825,18 @@ - + - - - + + + - + @@ -11805,58 +11868,6 @@ - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000019 - - - - - Element 'ram:ID' must occur exactly 1 times. - - - - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - @@ -11868,8 +11879,8 @@ - - + + @@ -11896,7 +11907,59 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000019 + + + + + Element 'ram:ID' must occur exactly 1 times. + + + + + + + + + + + + + + + @@ -11914,18 +11977,18 @@ - + - - - + + + - + @@ -11938,18 +12001,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -11966,18 +12029,18 @@ - + - - - + + + - + @@ -12009,18 +12072,18 @@ - + - - - + + + - + @@ -12033,18 +12096,18 @@ Element variant 'ram:AdditionalReferencedDocument[ not(ram:TypeCode="916") and not(ram:TypeCode="50") and not(ram:TypeCode="130")]' is marked as not used in the given context. - + - - - + + + - + @@ -12076,18 +12139,18 @@ - + - - - + + + - + @@ -12100,18 +12163,18 @@ Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - + - - - + + + - + @@ -12128,18 +12191,18 @@ - + - - - + + + - + @@ -12157,54 +12220,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:LineID' is marked as not used in the given context. - - @@ -12216,8 +12231,8 @@ - - + + @@ -12226,7 +12241,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -12240,7 +12255,55 @@ - + + + + + + + + + + + Element 'ram:LineID' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:Name' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -12258,18 +12321,18 @@ - + - - - + + + - + @@ -12287,18 +12350,18 @@ - + - - - + + + - + @@ -12311,18 +12374,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -12354,18 +12417,18 @@ - + - - - + + + - + @@ -12378,18 +12441,18 @@ Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - + - - - + + + - + @@ -12406,18 +12469,18 @@ - + - - - + + + - + @@ -12435,54 +12498,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:LineID' is marked as not used in the given context. - - @@ -12494,8 +12509,8 @@ - - + + @@ -12504,7 +12519,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -12518,8 +12533,8 @@ - - + + @@ -12528,7 +12543,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -12542,7 +12557,55 @@ - + + + + + + + + + + + Element 'ram:Name' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -12560,18 +12623,18 @@ - + - - - + + + - + @@ -12584,18 +12647,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -12657,18 +12720,18 @@ - + - - - + + + - + @@ -12700,18 +12763,18 @@ - + - - - + + + - + @@ -12729,18 +12792,18 @@ - + - - - + + + - + @@ -12757,18 +12820,18 @@ - + - - - + + + - + @@ -12786,54 +12849,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:LineID' is marked as not used in the given context. - - @@ -12845,8 +12860,8 @@ - - + + @@ -12855,7 +12870,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -12869,7 +12884,55 @@ - + + + + + + + + + + + Element 'ram:LineID' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -12887,18 +12950,18 @@ - + - - - + + + - + @@ -12911,18 +12974,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -12939,18 +13002,18 @@ - + - - - + + + - + @@ -12968,18 +13031,18 @@ - + - - - + + + - + @@ -13056,18 +13119,18 @@ - + - - - + + + - + @@ -13084,18 +13147,18 @@ - + - - - + + + - + @@ -13108,58 +13171,6 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000289 - - - - - Element 'ram:CompleteNumber' must occur exactly 1 times. - - - @@ -13171,8 +13182,8 @@ - - + + @@ -13181,7 +13192,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -13195,8 +13206,8 @@ - - + + @@ -13223,8 +13234,8 @@ - - + + @@ -13247,7 +13258,59 @@ - + + + + + + + + + FX-SCH-A-000289 + + + + + Element 'ram:CompleteNumber' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -13260,18 +13323,18 @@ Element 'ram:Description' is marked as not used in the given context. - + - - - + + + - + @@ -13288,18 +13351,18 @@ - + - - - + + + - + @@ -13317,18 +13380,18 @@ - + - - - + + + - + @@ -13341,18 +13404,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -13384,26 +13447,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -13413,18 +13476,18 @@ - + - - - + + + - + @@ -13437,18 +13500,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -13461,18 +13524,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -13490,18 +13553,18 @@ - + - - - + + + - + @@ -13533,26 +13596,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -13562,18 +13625,18 @@ - + - - - + + + - + @@ -13586,18 +13649,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -13610,18 +13673,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -13638,18 +13701,18 @@ - + - - - + + + - + @@ -13666,18 +13729,18 @@ - + - - - + + + - + @@ -13694,18 +13757,18 @@ - + - - - + + + - + @@ -13718,18 +13781,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -13746,18 +13809,18 @@ - + - - - + + + - + @@ -13775,18 +13838,18 @@ - + - - - + + + - + @@ -13803,18 +13866,18 @@ - + - - - + + + - + @@ -13827,18 +13890,18 @@ Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - + - - - + + + - + @@ -13855,18 +13918,18 @@ - + - - - + + + - + @@ -13884,54 +13947,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:LineID' is marked as not used in the given context. - - @@ -13943,8 +13958,8 @@ - - + + @@ -13953,7 +13968,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -13967,8 +13982,8 @@ - - + + @@ -13977,7 +13992,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -13991,8 +14006,8 @@ - - + + @@ -14001,7 +14016,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -14015,8 +14030,8 @@ - - + + @@ -14025,7 +14040,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -14039,7 +14054,55 @@ - + + + + + + + + + + + Element 'ram:TypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -14116,18 +14179,18 @@ - + - - - + + + - + @@ -14144,18 +14207,18 @@ - + - - - + + + - + @@ -14168,58 +14231,6 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000289 - - - - - Element 'ram:CompleteNumber' must occur exactly 1 times. - - - @@ -14231,8 +14242,8 @@ - - + + @@ -14241,7 +14252,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -14255,8 +14266,8 @@ - - + + @@ -14283,8 +14294,8 @@ - - + + @@ -14307,7 +14318,59 @@ - + + + + + + + + + FX-SCH-A-000289 + + + + + Element 'ram:CompleteNumber' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -14320,18 +14383,18 @@ Element 'ram:Description' is marked as not used in the given context. - + - - - + + + - + @@ -14348,18 +14411,18 @@ - + - - - + + + - + @@ -14377,18 +14440,18 @@ - + - - - + + + - + @@ -14401,18 +14464,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -14444,26 +14507,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -14473,18 +14536,18 @@ - + - - - + + + - + @@ -14497,18 +14560,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -14521,18 +14584,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -14550,18 +14613,18 @@ - + - - - + + + - + @@ -14593,26 +14656,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -14622,18 +14685,18 @@ - + - - - + + + - + @@ -14646,18 +14709,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -14670,18 +14733,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -14698,18 +14761,18 @@ - + - - - + + + - + @@ -14726,18 +14789,18 @@ - + - - - + + + - + @@ -14754,18 +14817,18 @@ - + - - - + + + - + @@ -14778,18 +14841,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -14806,18 +14869,18 @@ - + - - - + + + - + @@ -14835,18 +14898,18 @@ - + - - - + + + - + @@ -14953,18 +15016,18 @@ - + - - - + + + - + @@ -14981,18 +15044,18 @@ - + - - - + + + - + @@ -15005,58 +15068,6 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000289 - - - - - Element 'ram:CompleteNumber' must occur exactly 1 times. - - - @@ -15068,8 +15079,8 @@ - - + + @@ -15078,7 +15089,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -15092,8 +15103,8 @@ - - + + @@ -15120,8 +15131,8 @@ - - + + @@ -15144,7 +15155,59 @@ - + + + + + + + + + FX-SCH-A-000289 + + + + + Element 'ram:CompleteNumber' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -15161,18 +15224,18 @@ - + - - - + + + - + @@ -15190,18 +15253,18 @@ - + - - - + + + - + @@ -15214,18 +15277,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -15257,26 +15320,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -15286,18 +15349,18 @@ - + - - - + + + - + @@ -15310,18 +15373,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -15334,18 +15397,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -15363,18 +15426,18 @@ - + - - - + + + - + @@ -15406,26 +15469,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -15435,18 +15498,18 @@ - + - - - + + + - + @@ -15459,18 +15522,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -15483,18 +15546,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -15511,18 +15574,18 @@ - + - - - + + + - + @@ -15539,18 +15602,18 @@ - + - - - + + + - + @@ -15568,18 +15631,18 @@ - + - - - + + + - + @@ -15596,18 +15659,18 @@ - + - - - + + + - + @@ -15620,18 +15683,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -15648,18 +15711,18 @@ - + - - - + + + - + @@ -15677,18 +15740,18 @@ - + - - - + + + - + @@ -15705,18 +15768,18 @@ - + - - - + + + - + @@ -15729,18 +15792,18 @@ Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - + - - - + + + - + @@ -15757,18 +15820,18 @@ - + - - - + + + - + @@ -15786,54 +15849,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:LineID' is marked as not used in the given context. - - @@ -15845,8 +15860,8 @@ - - + + @@ -15855,7 +15870,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -15869,7 +15884,55 @@ - + + + + + + + + + + + Element 'ram:LineID' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:Name' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -15887,18 +15950,18 @@ - + - - - + + + - + @@ -15911,18 +15974,18 @@ Element 'ram:TypeCode' is marked as not used in the given context. - + - - - + + + - + @@ -15935,18 +15998,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -16023,18 +16086,18 @@ - + - - - + + + - + @@ -16051,18 +16114,18 @@ - + - - - + + + - + @@ -16075,58 +16138,6 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000289 - - - - - Element 'ram:CompleteNumber' must occur exactly 1 times. - - - @@ -16138,8 +16149,8 @@ - - + + @@ -16148,7 +16159,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -16162,8 +16173,8 @@ - - + + @@ -16190,8 +16201,8 @@ - - + + @@ -16214,7 +16225,59 @@ - + + + + + + + + + FX-SCH-A-000289 + + + + + Element 'ram:CompleteNumber' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -16227,18 +16290,18 @@ Element 'ram:Description' is marked as not used in the given context. - + - - - + + + - + @@ -16255,18 +16318,18 @@ - + - - - + + + - + @@ -16284,18 +16347,18 @@ - + - - - + + + - + @@ -16308,18 +16371,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -16351,26 +16414,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -16380,18 +16443,18 @@ - + - - - + + + - + @@ -16404,18 +16467,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -16428,18 +16491,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -16457,18 +16520,18 @@ - + - - - + + + - + @@ -16500,26 +16563,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -16529,18 +16592,18 @@ - + - - - + + + - + @@ -16553,18 +16616,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -16577,18 +16640,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -16605,18 +16668,18 @@ - + - - - + + + - + @@ -16633,18 +16696,18 @@ - + - - - + + + - + @@ -16661,18 +16724,18 @@ - + - - - + + + - + @@ -16685,18 +16748,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -16713,18 +16776,18 @@ - + - - - + + + - + @@ -16742,18 +16805,18 @@ - + - - - + + + - + @@ -16770,18 +16833,18 @@ - + - - - + + + - + @@ -16794,18 +16857,18 @@ Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - + - - - + + + - + @@ -16822,18 +16885,18 @@ - + - - - + + + - + @@ -16851,54 +16914,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:LineID' is marked as not used in the given context. - - @@ -16910,8 +16925,8 @@ - - + + @@ -16920,7 +16935,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -16934,8 +16949,8 @@ - - + + @@ -16944,7 +16959,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -16958,8 +16973,8 @@ - - + + @@ -16968,7 +16983,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -16982,8 +16997,8 @@ - - + + @@ -16992,7 +17007,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -17006,7 +17021,55 @@ - + + + + + + + + + + + Element 'ram:TypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -17083,18 +17146,18 @@ - + - - - + + + - + @@ -17111,18 +17174,18 @@ - + - - - + + + - + @@ -17135,58 +17198,6 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000289 - - - - - Element 'ram:CompleteNumber' must occur exactly 1 times. - - - @@ -17198,8 +17209,8 @@ - - + + @@ -17208,7 +17219,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -17222,8 +17233,8 @@ - - + + @@ -17250,8 +17261,8 @@ - - + + @@ -17274,7 +17285,59 @@ - + + + + + + + + + FX-SCH-A-000289 + + + + + Element 'ram:CompleteNumber' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -17287,18 +17350,18 @@ Element 'ram:Description' is marked as not used in the given context. - + - - - + + + - + @@ -17315,18 +17378,18 @@ - + - - - + + + - + @@ -17344,18 +17407,18 @@ - + - - - + + + - + @@ -17368,18 +17431,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -17411,26 +17474,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -17440,18 +17503,18 @@ - + - - - + + + - + @@ -17464,18 +17527,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -17488,18 +17551,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -17517,18 +17580,18 @@ - + - - - + + + - + @@ -17560,26 +17623,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -17589,18 +17652,18 @@ - + - - - + + + - + @@ -17613,18 +17676,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -17637,18 +17700,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -17665,18 +17728,18 @@ - + - - - + + + - + @@ -17693,18 +17756,18 @@ - + - - - + + + - + @@ -17721,18 +17784,18 @@ - + - - - + + + - + @@ -17745,18 +17808,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -17773,18 +17836,18 @@ - + - - - + + + - + @@ -17802,18 +17865,18 @@ - + - - - + + + - + @@ -17830,18 +17893,18 @@ - + - - - + + + - + @@ -17854,18 +17917,18 @@ Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - + - - - + + + - + @@ -17882,18 +17945,18 @@ - + - - - + + + - + @@ -17911,54 +17974,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:LineID' is marked as not used in the given context. - - @@ -17970,8 +17985,8 @@ - - + + @@ -17980,7 +17995,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -17994,8 +18009,8 @@ - - + + @@ -18004,7 +18019,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -18018,8 +18033,8 @@ - - + + @@ -18028,7 +18043,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -18042,8 +18057,8 @@ - - + + @@ -18052,7 +18067,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -18066,7 +18081,55 @@ - + + + + + + + + + + + Element 'ram:TypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -18158,18 +18221,18 @@ - + - - - + + + - + @@ -18186,18 +18249,18 @@ - + - - - + + + - + @@ -18210,58 +18273,6 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000289 - - - - - Element 'ram:CompleteNumber' must occur exactly 1 times. - - - @@ -18273,8 +18284,8 @@ - - + + @@ -18283,7 +18294,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -18297,8 +18308,8 @@ - - + + @@ -18325,8 +18336,8 @@ - - + + @@ -18349,7 +18360,59 @@ - + + + + + + + + + FX-SCH-A-000289 + + + + + Element 'ram:CompleteNumber' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -18362,18 +18425,18 @@ Element 'ram:Description' is marked as not used in the given context. - + - - - + + + - + @@ -18390,18 +18453,18 @@ - + - - - + + + - + @@ -18419,18 +18482,18 @@ - + - - - + + + - + @@ -18443,18 +18506,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -18486,26 +18549,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -18515,18 +18578,18 @@ - + - - - + + + - + @@ -18539,18 +18602,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -18563,18 +18626,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -18592,18 +18655,18 @@ - + - - - + + + - + @@ -18635,26 +18698,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -18664,18 +18727,18 @@ - + - - - + + + - + @@ -18688,18 +18751,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -18712,18 +18775,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -18740,18 +18803,18 @@ - + - - - + + + - + @@ -18768,18 +18831,18 @@ - + - - - + + + - + @@ -18797,18 +18860,18 @@ - + - - - + + + - + @@ -18825,18 +18888,18 @@ - + - - - + + + - + @@ -18849,18 +18912,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -18877,18 +18940,18 @@ - + - - - + + + - + @@ -18906,18 +18969,18 @@ - + - - - + + + - + @@ -19024,18 +19087,18 @@ - + - - - + + + - + @@ -19052,18 +19115,18 @@ - + - - - + + + - + @@ -19076,58 +19139,6 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000289 - - - - - Element 'ram:CompleteNumber' must occur exactly 1 times. - - - @@ -19139,8 +19150,8 @@ - - + + @@ -19149,7 +19160,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -19163,8 +19174,8 @@ - - + + @@ -19191,8 +19202,8 @@ - - + + @@ -19215,7 +19226,59 @@ - + + + + + + + + + FX-SCH-A-000289 + + + + + Element 'ram:CompleteNumber' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -19232,18 +19295,18 @@ - + - - - + + + - + @@ -19261,18 +19324,18 @@ - + - - - + + + - + @@ -19285,18 +19348,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -19328,26 +19391,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -19357,18 +19420,18 @@ - + - - - + + + - + @@ -19381,18 +19444,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -19405,18 +19468,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -19434,18 +19497,18 @@ - + - - - + + + - + @@ -19477,59 +19540,6 @@ - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000036 - - - - - Value of 'ram:CountryID' is not allowed. - - - - - - - - - - - - - - - - - - - - - - - - - Attribute @listID' marked as not used in the given context. - - @@ -19541,19 +19551,24 @@ - - + + + - - - - - - - - Attribute @listVersionID' marked as not used in the given context. - - + + + + + + FX-SCH-A-000036 + + + + + Value of 'ram:CountryID' is not allowed. + + + @@ -19565,8 +19580,8 @@ - - + + @@ -19575,7 +19590,7 @@ - Element variant 'ram:SpecifiedTaxRegistration[ not(ram:ID/@schemeID="VA") and not(ram:ID/@schemeID="FC")]' is marked as not used in the given context. + Attribute @listID' marked as not used in the given context. @@ -19589,23 +19604,19 @@ - - + + - - - - - - FX-SCH-A-000019 - - - - - Element 'ram:ID' must occur exactly 1 times. - - - + + + + + + + + Attribute @listVersionID' marked as not used in the given context. + + @@ -19617,23 +19628,19 @@ - - + + - - - - - - FX-SCH-A-000037 - - - - - Attribute '@schemeID' is required in this context. - - - + + + + + + + + Element variant 'ram:SpecifiedTaxRegistration[ not(ram:ID/@schemeID="VA") and not(ram:ID/@schemeID="FC")]' is marked as not used in the given context. + + @@ -19645,8 +19652,8 @@ - - + + @@ -19673,8 +19680,8 @@ - - + + @@ -19701,7 +19708,63 @@ - + + + + + + + + + FX-SCH-A-000019 + + + + + Element 'ram:ID' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000037 + + + + + Attribute '@schemeID' is required in this context. + + + + + + + + + + + + + + + @@ -19718,18 +19781,18 @@ - + - - - + + + - + @@ -19742,18 +19805,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -19770,18 +19833,18 @@ - + - - - + + + - + @@ -19799,18 +19862,18 @@ - + - - - + + + - + @@ -19823,18 +19886,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -19851,18 +19914,18 @@ - + - - - + + + - + @@ -19875,18 +19938,18 @@ Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - + - - - + + + - + @@ -19903,18 +19966,18 @@ - + - - - + + + - + @@ -19932,54 +19995,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:LineID' is marked as not used in the given context. - - @@ -19991,8 +20006,8 @@ - - + + @@ -20001,7 +20016,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -20015,8 +20030,8 @@ - - + + @@ -20025,7 +20040,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -20039,8 +20054,8 @@ - - + + @@ -20049,7 +20064,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -20063,8 +20078,8 @@ - - + + @@ -20073,7 +20088,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -20087,7 +20102,55 @@ - + + + + + + + + + + + Element 'ram:TypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -20104,18 +20167,18 @@ - + - - - + + + - + @@ -20132,18 +20195,18 @@ - + - - - + + + - + @@ -20160,18 +20223,18 @@ - + - - - + + + - + @@ -20189,18 +20252,18 @@ - + - - - + + + - + @@ -20217,18 +20280,18 @@ - + - - - + + + - + @@ -20241,18 +20304,18 @@ Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - + - - - + + + - + @@ -20269,18 +20332,18 @@ - + - - - + + + - + @@ -20298,54 +20361,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:LineID' is marked as not used in the given context. - - @@ -20357,8 +20372,8 @@ - - + + @@ -20367,7 +20382,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -20381,8 +20396,8 @@ - - + + @@ -20391,7 +20406,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -20405,8 +20420,8 @@ - - + + @@ -20415,7 +20430,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -20429,8 +20444,8 @@ - - + + @@ -20439,7 +20454,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -20453,7 +20468,55 @@ - + + + + + + + + + + + Element 'ram:TypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -20470,18 +20533,18 @@ - + - - - + + + - + @@ -20494,18 +20557,18 @@ Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - + - - - + + + - + @@ -20522,18 +20585,18 @@ - + - - - + + + - + @@ -20551,54 +20614,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:LineID' is marked as not used in the given context. - - @@ -20610,8 +20625,8 @@ - - + + @@ -20620,7 +20635,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -20634,8 +20649,8 @@ - - + + @@ -20644,7 +20659,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -20658,8 +20673,8 @@ - - + + @@ -20668,7 +20683,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -20682,8 +20697,8 @@ - - + + @@ -20692,7 +20707,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -20706,7 +20721,55 @@ - + + + + + + + + + + + Element 'ram:TypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -20723,18 +20786,18 @@ - + - - - + + + - + @@ -20747,18 +20810,18 @@ Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - + - - - + + + - + @@ -20775,18 +20838,18 @@ - + - - - + + + - + @@ -20804,54 +20867,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:LineID' is marked as not used in the given context. - - @@ -20863,8 +20878,8 @@ - - + + @@ -20873,7 +20888,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -20887,8 +20902,8 @@ - - + + @@ -20897,7 +20912,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Element 'ram:LineID' is marked as not used in the given context. @@ -20911,8 +20926,8 @@ - - + + @@ -20921,7 +20936,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -20935,8 +20950,8 @@ - - + + @@ -20945,7 +20960,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -20959,7 +20974,55 @@ - + + + + + + + + + + + Element 'ram:TypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -20976,18 +21039,47 @@ - + - - - + + + - + + + + + + + + + + FX-SCH-A-000346 + + + + + Value of 'ram:ModeCode' is not allowed. + + + + + + + + + + + + + + + @@ -21049,18 +21141,18 @@ - + - - - + + + - + @@ -21077,18 +21169,18 @@ - + - - - + + + - + @@ -21101,18 +21193,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -21125,18 +21217,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -21153,18 +21245,18 @@ - + - - - + + + - + @@ -21177,18 +21269,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -21205,18 +21297,18 @@ - + - - - + + + - + @@ -21229,18 +21321,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -21253,18 +21345,18 @@ Element 'ram:Description' is marked as not used in the given context. - + - - - + + + - + @@ -21281,18 +21373,18 @@ - + - - - + + + - + @@ -21310,18 +21402,18 @@ - + - - - + + + - + @@ -21334,18 +21426,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -21377,26 +21469,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -21406,18 +21498,18 @@ - + - - - + + + - + @@ -21430,18 +21522,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -21454,18 +21546,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -21483,18 +21575,18 @@ - + - - - + + + - + @@ -21526,26 +21618,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -21555,18 +21647,18 @@ - + - - - + + + - + @@ -21579,18 +21671,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -21603,18 +21695,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -21631,86 +21723,6 @@ - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000037 - - - - - Attribute '@schemeID' is required in this context. - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000168 - - - - - Element 'ram:URIID' must occur exactly 1 times. - - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:CompleteNumber' is marked as not used in the given context. - - @@ -21722,8 +21734,8 @@ - - + + @@ -21750,7 +21762,87 @@ - + + + + + + + + + FX-SCH-A-000168 + + + + + Element 'ram:URIID' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:CompleteNumber' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000037 + + + + + Attribute '@schemeID' is required in this context. + + + + + + + + + + + + + + + @@ -21768,18 +21860,18 @@ - + - - - + + + - + @@ -21841,18 +21933,18 @@ - + - - - + + + - + @@ -21869,18 +21961,18 @@ - + - - - + + + - + @@ -21893,18 +21985,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -21917,18 +22009,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -21945,18 +22037,18 @@ - + - - - + + + - + @@ -21969,18 +22061,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -21997,18 +22089,18 @@ - + - - - + + + - + @@ -22021,18 +22113,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -22045,18 +22137,18 @@ Element 'ram:Description' is marked as not used in the given context. - + - - - + + + - + @@ -22073,18 +22165,18 @@ - + - - - + + + - + @@ -22102,18 +22194,18 @@ - + - - - + + + - + @@ -22126,18 +22218,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -22169,26 +22261,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -22198,18 +22290,18 @@ - + - - - + + + - + @@ -22222,18 +22314,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -22246,18 +22338,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -22275,18 +22367,18 @@ - + - - - + + + - + @@ -22318,26 +22410,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -22347,18 +22439,18 @@ - + - - - + + + - + @@ -22371,18 +22463,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -22395,18 +22487,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -22423,86 +22515,6 @@ - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000037 - - - - - Attribute '@schemeID' is required in this context. - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000168 - - - - - Element 'ram:URIID' must occur exactly 1 times. - - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:CompleteNumber' is marked as not used in the given context. - - @@ -22514,8 +22526,8 @@ - - + + @@ -22542,7 +22554,87 @@ - + + + + + + + + + FX-SCH-A-000168 + + + + + Element 'ram:URIID' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:CompleteNumber' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000037 + + + + + Attribute '@schemeID' is required in this context. + + + + + + + + + + + + + + + @@ -22560,18 +22652,18 @@ - + - - - + + + - + @@ -22633,18 +22725,18 @@ - + - - - + + + - + @@ -22661,18 +22753,18 @@ - + - - - + + + - + @@ -22685,18 +22777,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -22709,18 +22801,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -22737,18 +22829,18 @@ - + - - - + + + - + @@ -22761,18 +22853,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -22789,18 +22881,18 @@ - + - - - + + + - + @@ -22813,18 +22905,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -22837,18 +22929,18 @@ Element 'ram:Description' is marked as not used in the given context. - + - - - + + + - + @@ -22865,18 +22957,18 @@ - + - - - + + + - + @@ -22894,18 +22986,18 @@ - + - - - + + + - + @@ -22918,18 +23010,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -22961,26 +23053,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -22990,18 +23082,18 @@ - + - - - + + + - + @@ -23014,18 +23106,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -23038,18 +23130,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -23067,18 +23159,18 @@ - + - - - + + + - + @@ -23110,26 +23202,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -23139,18 +23231,18 @@ - + - - - + + + - + @@ -23163,18 +23255,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -23187,18 +23279,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -23215,86 +23307,6 @@ - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000037 - - - - - Attribute '@schemeID' is required in this context. - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000168 - - - - - Element 'ram:URIID' must occur exactly 1 times. - - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:CompleteNumber' is marked as not used in the given context. - - @@ -23306,8 +23318,8 @@ - - + + @@ -23334,7 +23346,87 @@ - + + + + + + + + + FX-SCH-A-000168 + + + + + Element 'ram:URIID' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:CompleteNumber' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000037 + + + + + Attribute '@schemeID' is required in this context. + + + + + + + + + + + + + + + @@ -23352,18 +23444,18 @@ - + - - - + + + - + @@ -23425,18 +23517,18 @@ - + - - - + + + - + @@ -23528,18 +23620,18 @@ - + - - - + + + - + @@ -23552,18 +23644,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -23576,18 +23668,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -23600,18 +23692,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -23629,26 +23721,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000180 @@ -23658,18 +23750,18 @@ - + - - - + + + - + @@ -23687,18 +23779,18 @@ - + - - - + + + - + @@ -23711,18 +23803,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -23735,18 +23827,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -23759,18 +23851,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -23787,26 +23879,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000022 @@ -23816,18 +23908,18 @@ - + - - - + + + - + @@ -23845,18 +23937,18 @@ - + - - - + + + - + @@ -23873,18 +23965,18 @@ - + - - - + + + - + @@ -23897,18 +23989,18 @@ Element 'ram:CompleteDateTime' is marked as not used in the given context. - + - - - + + + - + @@ -23925,18 +24017,18 @@ - + - - - + + + - + @@ -23954,18 +24046,18 @@ - + - - - + + + - + @@ -23982,18 +24074,18 @@ - + - - - + + + - + @@ -24011,18 +24103,18 @@ - + - - - + + + - + @@ -24035,26 +24127,26 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + - + - + - + FX-SCH-A-000040 @@ -24064,18 +24156,18 @@ - + - - - + + + - + @@ -24107,18 +24199,18 @@ - + - - - + + + - + @@ -24131,18 +24223,18 @@ Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - + - - - + + + - + @@ -24159,18 +24251,18 @@ - + - - - + + + - + @@ -24188,78 +24280,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:LineID' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:Name' is marked as not used in the given context. - - @@ -24271,8 +24291,8 @@ - - + + @@ -24281,7 +24301,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -24295,24 +24315,19 @@ - - - + + - - - - - - FX-SCH-A-000023 - - - - - Value of 'ram:TypeCode' is not allowed. - - - + + + + + + + + Element 'ram:LineID' is marked as not used in the given context. + + @@ -24324,8 +24339,8 @@ - - + + @@ -24334,7 +24349,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -24348,7 +24363,84 @@ - + + + + + + + + + + + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000023 + + + + + Value of 'ram:TypeCode' is not allowed. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -24425,18 +24517,18 @@ - + - - - + + + - + @@ -24453,18 +24545,18 @@ - + - - - + + + - + @@ -24477,18 +24569,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -24501,18 +24593,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -24529,18 +24621,18 @@ - + - - - + + + - + @@ -24553,18 +24645,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -24581,18 +24673,18 @@ - + - - - + + + - + @@ -24605,18 +24697,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -24629,18 +24721,18 @@ Element 'ram:Description' is marked as not used in the given context. - + - - - + + + - + @@ -24657,18 +24749,18 @@ - + - - - + + + - + @@ -24686,18 +24778,18 @@ - + - - - + + + - + @@ -24710,18 +24802,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -24753,26 +24845,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -24782,18 +24874,18 @@ - + - - - + + + - + @@ -24806,18 +24898,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -24830,18 +24922,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -24859,18 +24951,18 @@ - + - - - + + + - + @@ -24902,26 +24994,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -24931,18 +25023,18 @@ - + - - - + + + - + @@ -24955,18 +25047,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -24979,18 +25071,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -25007,86 +25099,6 @@ - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000037 - - - - - Attribute '@schemeID' is required in this context. - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000168 - - - - - Element 'ram:URIID' must occur exactly 1 times. - - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:CompleteNumber' is marked as not used in the given context. - - @@ -25098,8 +25110,8 @@ - - + + @@ -25126,7 +25138,87 @@ - + + + + + + + + + FX-SCH-A-000168 + + + + + Element 'ram:URIID' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:CompleteNumber' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000037 + + + + + Attribute '@schemeID' is required in this context. + + + + + + + + + + + + + + + @@ -25144,18 +25236,18 @@ - + - - - + + + - + @@ -25232,18 +25324,18 @@ - + - - - + + + - + @@ -25260,18 +25352,18 @@ - + - - - + + + - + @@ -25284,18 +25376,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -25308,18 +25400,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -25336,18 +25428,18 @@ - + - - - + + + - + @@ -25360,18 +25452,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -25388,18 +25480,18 @@ - + - - - + + + - + @@ -25412,18 +25504,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -25436,18 +25528,18 @@ Element 'ram:Description' is marked as not used in the given context. - + - - - + + + - + @@ -25464,18 +25556,18 @@ - + - - - + + + - + @@ -25493,18 +25585,18 @@ - + - - - + + + - + @@ -25517,18 +25609,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -25560,26 +25652,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -25589,18 +25681,18 @@ - + - - - + + + - + @@ -25613,18 +25705,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -25637,18 +25729,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -25666,18 +25758,18 @@ - + - - - + + + - + @@ -25709,26 +25801,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -25738,18 +25830,18 @@ - + - - - + + + - + @@ -25762,18 +25854,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -25786,18 +25878,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -25814,86 +25906,6 @@ - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000037 - - - - - Attribute '@schemeID' is required in this context. - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000168 - - - - - Element 'ram:URIID' must occur exactly 1 times. - - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:CompleteNumber' is marked as not used in the given context. - - @@ -25905,8 +25917,8 @@ - - + + @@ -25933,7 +25945,87 @@ - + + + + + + + + + FX-SCH-A-000168 + + + + + Element 'ram:URIID' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:CompleteNumber' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000037 + + + + + Attribute '@schemeID' is required in this context. + + + + + + + + + + + + + + + @@ -25951,18 +26043,18 @@ - + - - - + + + - + @@ -26039,18 +26131,18 @@ - + - - - + + + - + @@ -26067,18 +26159,18 @@ - + - - - + + + - + @@ -26091,18 +26183,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -26115,18 +26207,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -26143,18 +26235,18 @@ - + - - - + + + - + @@ -26167,18 +26259,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -26195,18 +26287,18 @@ - + - - - + + + - + @@ -26219,18 +26311,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -26243,18 +26335,18 @@ Element 'ram:Description' is marked as not used in the given context. - + - - - + + + - + @@ -26271,18 +26363,18 @@ - + - - - + + + - + @@ -26300,18 +26392,18 @@ - + - - - + + + - + @@ -26324,18 +26416,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -26367,26 +26459,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -26396,18 +26488,18 @@ - + - - - + + + - + @@ -26420,18 +26512,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -26444,18 +26536,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -26473,18 +26565,18 @@ - + - - - + + + - + @@ -26516,26 +26608,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -26545,18 +26637,18 @@ - + - - - + + + - + @@ -26569,18 +26661,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -26593,18 +26685,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -26621,86 +26713,6 @@ - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000037 - - - - - Attribute '@schemeID' is required in this context. - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000168 - - - - - Element 'ram:URIID' must occur exactly 1 times. - - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:CompleteNumber' is marked as not used in the given context. - - @@ -26712,8 +26724,8 @@ - - + + @@ -26740,7 +26752,87 @@ - + + + + + + + + + FX-SCH-A-000168 + + + + + Element 'ram:URIID' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:CompleteNumber' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000037 + + + + + Attribute '@schemeID' is required in this context. + + + + + + + + + + + + + + + @@ -26758,18 +26850,18 @@ - + - - - + + + - + @@ -26846,18 +26938,18 @@ - + - - - + + + - + @@ -26874,18 +26966,18 @@ - + - - - + + + - + @@ -26898,18 +26990,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -26922,18 +27014,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -26950,18 +27042,18 @@ - + - - - + + + - + @@ -26974,18 +27066,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -27002,18 +27094,18 @@ - + - - - + + + - + @@ -27026,18 +27118,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -27050,18 +27142,18 @@ Element 'ram:Description' is marked as not used in the given context. - + - - - + + + - + @@ -27078,18 +27170,18 @@ - + - - - + + + - + @@ -27107,18 +27199,18 @@ - + - - - + + + - + @@ -27131,18 +27223,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -27174,26 +27266,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -27203,18 +27295,18 @@ - + - - - + + + - + @@ -27227,18 +27319,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -27251,18 +27343,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -27280,18 +27372,18 @@ - + - - - + + + - + @@ -27323,26 +27415,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -27352,18 +27444,18 @@ - + - - - + + + - + @@ -27376,18 +27468,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -27400,18 +27492,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -27428,86 +27520,6 @@ - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000037 - - - - - Attribute '@schemeID' is required in this context. - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000168 - - - - - Element 'ram:URIID' must occur exactly 1 times. - - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:CompleteNumber' is marked as not used in the given context. - - @@ -27519,8 +27531,8 @@ - - + + @@ -27547,7 +27559,87 @@ - + + + + + + + + + FX-SCH-A-000168 + + + + + Element 'ram:URIID' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:CompleteNumber' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000037 + + + + + Attribute '@schemeID' is required in this context. + + + + + + + + + + + + + + + @@ -27565,18 +27657,18 @@ - + - - - + + + - + @@ -27589,26 +27681,26 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + - + - + - + FX-SCH-A-000023 @@ -27618,18 +27710,18 @@ - + - - - + + + - + @@ -27661,18 +27753,18 @@ - + - - - + + + - + @@ -27689,18 +27781,18 @@ - + - - - + + + - + @@ -27718,18 +27810,18 @@ - + - - - + + + - + @@ -27776,18 +27868,18 @@ - + - - - + + + - + @@ -27800,18 +27892,18 @@ Element 'ram:AllowanceChargeBasisAmount' is marked as not used in the given context. - + - - - + + + - + @@ -27824,18 +27916,18 @@ Element 'ram:BasisAmount' is marked as not used in the given context. - + - - - + + + - + @@ -27848,18 +27940,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -27877,18 +27969,18 @@ - + - - - + + + - + @@ -27901,18 +27993,18 @@ Element 'ram:DueDateTypeCode' is marked as not used in the given context. - + - - - + + + - + @@ -27930,78 +28022,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @listID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @listVersionID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:LineTotalBasisAmount' is marked as not used in the given context. - - @@ -28013,8 +28033,8 @@ - - + + @@ -28023,7 +28043,7 @@ - Element 'ram:TaxPointDate' is marked as not used in the given context. + Attribute @listID' marked as not used in the given context. @@ -28037,7 +28057,79 @@ - + + + + + + + + + + + Attribute @listVersionID' marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:LineTotalBasisAmount' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:TaxPointDate' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -28055,18 +28147,18 @@ - + - - - + + + - + @@ -28083,18 +28175,18 @@ - + - - - + + + - + @@ -28107,18 +28199,18 @@ Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - + - - - + + + - + @@ -28135,18 +28227,18 @@ - + - - - + + + - + @@ -28164,78 +28256,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:LineID' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:Name' is marked as not used in the given context. - - @@ -28247,8 +28267,8 @@ - - + + @@ -28257,7 +28277,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -28271,24 +28291,19 @@ - - - + + - - - - - - FX-SCH-A-000023 - - - - - Value of 'ram:TypeCode' is not allowed. - - - + + + + + + + + Element 'ram:LineID' is marked as not used in the given context. + + @@ -28300,8 +28315,8 @@ - - + + @@ -28310,7 +28325,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -28324,8 +28339,8 @@ - - + + @@ -28334,7 +28349,7 @@ - Attribute @currencyID' marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -28348,7 +28363,84 @@ - + + + + + + + + + + FX-SCH-A-000023 + + + + + Value of 'ram:TypeCode' is not allowed. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -28395,18 +28487,18 @@ - + - - - + + + - + @@ -28419,18 +28511,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -28477,18 +28569,18 @@ - + - - - + + + - + @@ -28501,18 +28593,18 @@ Element 'ram:AllowanceChargeBasisAmount' is marked as not used in the given context. - + - - - + + + - + @@ -28525,18 +28617,18 @@ Element 'ram:BasisAmount' is marked as not used in the given context. - + - - - + + + - + @@ -28549,18 +28641,18 @@ Element 'ram:CalculatedAmount' is marked as not used in the given context. - + - - - + + + - + @@ -28578,78 +28670,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:DueDateTypeCode' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:ExemptionReason' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:ExemptionReasonCode' is marked as not used in the given context. - - @@ -28661,8 +28681,8 @@ - - + + @@ -28671,7 +28691,7 @@ - Element 'ram:LineTotalBasisAmount' is marked as not used in the given context. + Element 'ram:DueDateTypeCode' is marked as not used in the given context. @@ -28685,8 +28705,8 @@ - - + + @@ -28695,7 +28715,7 @@ - Element 'ram:TaxPointDate' is marked as not used in the given context. + Element 'ram:ExemptionReason' is marked as not used in the given context. @@ -28709,7 +28729,79 @@ - + + + + + + + + + + + Element 'ram:ExemptionReasonCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:LineTotalBasisAmount' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:TaxPointDate' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -28727,18 +28819,18 @@ - + - - - + + + - + @@ -28751,18 +28843,18 @@ Element variant 'ram:SpecifiedTradeAllowanceCharge[ not(ram:ChargeIndicator/udt:Indicator="false") and not(ram:ChargeIndicator/udt:Indicator="true")]' is marked as not used in the given context. - + - - - + + + - + @@ -28809,18 +28901,18 @@ - + - - - + + + - + @@ -28833,18 +28925,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -28857,18 +28949,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -28886,18 +28978,18 @@ - + - - - + + + - + @@ -28929,18 +29021,18 @@ - + - - - + + + - + @@ -28953,18 +29045,18 @@ Element 'ram:AllowanceChargeBasisAmount' is marked as not used in the given context. - + - - - + + + - + @@ -28977,18 +29069,18 @@ Element 'ram:BasisAmount' is marked as not used in the given context. - + - - - + + + - + @@ -29001,18 +29093,18 @@ Element 'ram:CalculatedAmount' is marked as not used in the given context. - + - - - + + + - + @@ -29030,78 +29122,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:DueDateTypeCode' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:ExemptionReason' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:ExemptionReasonCode' is marked as not used in the given context. - - @@ -29113,8 +29133,8 @@ - - + + @@ -29123,7 +29143,7 @@ - Element 'ram:LineTotalBasisAmount' is marked as not used in the given context. + Element 'ram:DueDateTypeCode' is marked as not used in the given context. @@ -29137,8 +29157,8 @@ - - + + @@ -29147,7 +29167,7 @@ - Element 'ram:TaxPointDate' is marked as not used in the given context. + Element 'ram:ExemptionReason' is marked as not used in the given context. @@ -29161,7 +29181,79 @@ - + + + + + + + + + + + Element 'ram:ExemptionReasonCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:LineTotalBasisAmount' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:TaxPointDate' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -29179,26 +29271,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000186 @@ -29208,18 +29300,18 @@ - + - - - + + + - + @@ -29266,18 +29358,18 @@ - + - - - + + + - + @@ -29290,18 +29382,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -29314,18 +29406,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -29343,18 +29435,18 @@ - + - - - + + + - + @@ -29386,18 +29478,18 @@ - + - - - + + + - + @@ -29410,18 +29502,18 @@ Element 'ram:AllowanceChargeBasisAmount' is marked as not used in the given context. - + - - - + + + - + @@ -29434,18 +29526,18 @@ Element 'ram:BasisAmount' is marked as not used in the given context. - + - - - + + + - + @@ -29458,18 +29550,18 @@ Element 'ram:CalculatedAmount' is marked as not used in the given context. - + - - - + + + - + @@ -29487,78 +29579,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:DueDateTypeCode' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:ExemptionReason' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:ExemptionReasonCode' is marked as not used in the given context. - - @@ -29570,8 +29590,8 @@ - - + + @@ -29580,7 +29600,7 @@ - Element 'ram:LineTotalBasisAmount' is marked as not used in the given context. + Element 'ram:DueDateTypeCode' is marked as not used in the given context. @@ -29594,8 +29614,8 @@ - - + + @@ -29604,7 +29624,7 @@ - Element 'ram:TaxPointDate' is marked as not used in the given context. + Element 'ram:ExemptionReason' is marked as not used in the given context. @@ -29618,7 +29638,79 @@ - + + + + + + + + + + + Element 'ram:ExemptionReasonCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:LineTotalBasisAmount' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:TaxPointDate' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -29636,26 +29728,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000186 @@ -29665,18 +29757,18 @@ - + - - - + + + - + @@ -29738,18 +29830,18 @@ - + - - - + + + - + @@ -29762,87 +29854,6 @@ Attribute @currencyID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000021 - - - - - Attribute '@format' is required in this context. - - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000022 - - - - - Value of '@format' is not allowed. - - - @@ -29854,8 +29865,8 @@ - - + + @@ -29878,7 +29889,88 @@ - + + + + + + + + + FX-SCH-A-000021 + + + + + Attribute '@format' is required in this context. + + + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000022 + + + + + Value of '@format' is not allowed. + + + + + + + + + + + + + + + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -29891,18 +29983,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -29919,18 +30011,18 @@ - + - - - + + + - + @@ -29948,18 +30040,18 @@ - + - - - + + + - + @@ -29976,18 +30068,18 @@ - + - - - + + + - + @@ -30000,18 +30092,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -30028,18 +30120,18 @@ - + - - - + + + - + @@ -30057,18 +30149,18 @@ - + - - - + + + - + @@ -30081,18 +30173,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -30169,18 +30261,18 @@ - + - - - + + + - + @@ -30197,18 +30289,18 @@ - + - - - + + + - + @@ -30221,18 +30313,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -30245,18 +30337,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -30273,18 +30365,18 @@ - + - - - + + + - + @@ -30297,18 +30389,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -30325,18 +30417,18 @@ - + - - - + + + - + @@ -30349,18 +30441,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -30373,18 +30465,18 @@ Element 'ram:Description' is marked as not used in the given context. - + - - - + + + - + @@ -30401,18 +30493,18 @@ - + - - - + + + - + @@ -30430,18 +30522,18 @@ - + - - - + + + - + @@ -30454,18 +30546,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -30497,26 +30589,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -30526,18 +30618,18 @@ - + - - - + + + - + @@ -30550,18 +30642,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -30574,18 +30666,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -30603,18 +30695,18 @@ - + - - - + + + - + @@ -30646,26 +30738,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -30675,18 +30767,18 @@ - + - - - + + + - + @@ -30699,18 +30791,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -30723,18 +30815,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -30751,86 +30843,6 @@ - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000037 - - - - - Attribute '@schemeID' is required in this context. - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000168 - - - - - Element 'ram:URIID' must occur exactly 1 times. - - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:CompleteNumber' is marked as not used in the given context. - - @@ -30842,8 +30854,8 @@ - - + + @@ -30870,7 +30882,87 @@ - + + + + + + + + + FX-SCH-A-000168 + + + + + Element 'ram:URIID' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:CompleteNumber' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000037 + + + + + Attribute '@schemeID' is required in this context. + + + + + + + + + + + + + + + @@ -30888,18 +30980,18 @@ - + - - - + + + - + @@ -31051,78 +31143,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -31134,8 +31154,8 @@ - - + + @@ -31158,8 +31178,8 @@ - - + + @@ -31182,8 +31202,8 @@ - - + + @@ -31206,8 +31226,8 @@ - - + + @@ -31230,8 +31250,8 @@ - - + + @@ -31240,7 +31260,7 @@ - Element variant 'ram:TaxTotalAmount[ not(@currencyID=../../ram:InvoiceCurrencyCode) and not(@currencyID=../../ram:TaxCurrencyCode)]' is marked as not used in the given context. + Attribute @currencyID' marked as not used in the given context. @@ -31254,24 +31274,19 @@ - - - + + - - - - - - FX-SCH-A-000045 - - - - - Value of '@currencyID' is not allowed. - - - + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + @@ -31283,23 +31298,19 @@ - - + + - - - - - - FX-SCH-A-000046 - - - - - Attribute '@currencyID' is required in this context. - - - + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + @@ -31311,8 +31322,32 @@ - - + + + + + + + + + + + Element variant 'ram:TaxTotalAmount[ not(@currencyID=../../ram:InvoiceCurrencyCode) and not(@currencyID=../../ram:TaxCurrencyCode)]' is marked as not used in the given context. + + + + + + + + + + + + + + + @@ -31329,18 +31364,75 @@ - + - - - + + + - + + + + + + + + + FX-SCH-A-000046 + + + + + Attribute '@currencyID' is required in this context. + + + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000045 + + + + + Value of '@currencyID' is not allowed. + + + + + + + + + + + + + + + @@ -31357,18 +31449,18 @@ - + - - - + + + - + @@ -31381,18 +31473,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -31439,18 +31531,18 @@ - + - - - + + + - + @@ -31467,18 +31559,18 @@ - + - - - + + + - + @@ -31491,82 +31583,6 @@ Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000292 - - - - - Element 'ram:BICID' must occur exactly 1 times. - - - @@ -31578,8 +31594,8 @@ - - + + @@ -31602,7 +31618,83 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000292 + + + + + Element 'ram:BICID' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -31619,18 +31711,18 @@ - + - - - + + + - + @@ -31643,26 +31735,26 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + - + - + - + FX-SCH-A-000023 @@ -31672,18 +31764,18 @@ - + - - - + + + - + @@ -31700,18 +31792,18 @@ - + - - - + + + - + @@ -31729,93 +31821,6 @@ - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000332 - - - - - Value of 'ram:SourceCurrencyCode' is not allowed. - - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000333 - - - - - Value of 'ram:TargetCurrencyCode' is not allowed. - - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000196 - - - - - Value of 'ram:TaxCurrencyCode' is not allowed. - - - @@ -31827,7 +31832,94 @@ - + + + + + + + + + + FX-SCH-A-000332 + + + + + Value of 'ram:SourceCurrencyCode' is not allowed. + + + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000333 + + + + + Value of 'ram:TargetCurrencyCode' is not allowed. + + + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000196 + + + + + Value of 'ram:TaxCurrencyCode' is not allowed. + + + + + + + + + + + + + + + @@ -31889,18 +31981,18 @@ - + - - - + + + - + @@ -31917,18 +32009,18 @@ - + - - - + + + - + @@ -31960,83 +32052,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @listID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @listVersionID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000162 - - - - - Value of 'ram:SubjectCode' is not allowed. - - - @@ -32048,8 +32063,8 @@ - - + + @@ -32072,8 +32087,8 @@ - - + + @@ -32096,7 +32111,84 @@ - + + + + + + + + + + FX-SCH-A-000162 + + + + + Value of 'ram:SubjectCode' is not allowed. + + + + + + + + + + + + + + + + + + + + + + + + + Attribute @listID' marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Attribute @listVersionID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -32109,18 +32201,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -32138,18 +32230,18 @@ - + - - - + + + - + @@ -32167,18 +32259,18 @@ - + - - - + + + - + @@ -32191,18 +32283,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -32215,18 +32307,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -32239,18 +32331,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -32267,18 +32359,18 @@ - + - - - + + + - + @@ -32340,18 +32432,18 @@ - + - - - + + + - + @@ -32383,18 +32475,18 @@ - + - - - + + + - + @@ -32412,18 +32504,18 @@ - + - - - + + + - + @@ -32440,18 +32532,18 @@ - + - - - + + + - + @@ -32469,18 +32561,18 @@ - + - - - + + + - + @@ -32493,88 +32585,6 @@ Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000282 - - - - - Value of 'ram:ReferenceTypeCode' is not allowed. - - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000023 - - - - - Value of 'ram:TypeCode' is not allowed. - - - @@ -32586,8 +32596,8 @@ - - + + @@ -32610,7 +32620,89 @@ - + + + + + + + + + + FX-SCH-A-000282 + + + + + Value of 'ram:ReferenceTypeCode' is not allowed. + + + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000023 + + + + + Value of 'ram:TypeCode' is not allowed. + + + + + + + + + + + + + + + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -32623,18 +32715,18 @@ Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - + - - - + + + - + @@ -32651,18 +32743,18 @@ - + - - - + + + - + @@ -32680,78 +32772,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:Name' is marked as not used in the given context. - - @@ -32763,8 +32783,8 @@ - - + + @@ -32773,7 +32793,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -32787,8 +32807,8 @@ - - + + @@ -32797,7 +32817,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -32811,8 +32831,8 @@ - - + + @@ -32821,7 +32841,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -32835,8 +32855,8 @@ - - + + @@ -32845,7 +32865,7 @@ - Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -32859,7 +32879,79 @@ - + + + + + + + + + + + Element 'ram:TypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -32876,18 +32968,18 @@ - + - - - + + + - + @@ -32905,78 +32997,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:Name' is marked as not used in the given context. - - @@ -32988,8 +33008,8 @@ - - + + @@ -32998,7 +33018,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -33012,8 +33032,8 @@ - - + + @@ -33022,7 +33042,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -33036,8 +33056,8 @@ - - + + @@ -33046,7 +33066,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -33060,7 +33080,79 @@ - + + + + + + + + + + + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:TypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -33077,18 +33169,18 @@ - + - - - + + + - + @@ -33101,18 +33193,18 @@ Element variant 'ram:AppliedTradeAllowanceCharge[ not(ram:ChargeIndicator/udt:Indicator="false") and not(ram:ChargeIndicator/udt:Indicator="true")]' is marked as not used in the given context. - + - - - + + + - + @@ -33144,78 +33236,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:BasisQuantity' is marked as not used in the given context. - - @@ -33227,8 +33247,8 @@ - - + + @@ -33237,7 +33257,7 @@ - Element 'ram:CategoryTradeTax' is marked as not used in the given context. + Attribute @currencyID' marked as not used in the given context. @@ -33251,7 +33271,79 @@ - + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:BasisQuantity' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:CategoryTradeTax' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -33269,18 +33361,18 @@ - + - - - + + + - + @@ -33293,18 +33385,18 @@ Element 'ram:SequenceNumeric' is marked as not used in the given context. - + - - - + + + - + @@ -33336,78 +33428,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:BasisQuantity' is marked as not used in the given context. - - @@ -33419,8 +33439,8 @@ - - + + @@ -33429,7 +33449,7 @@ - Element 'ram:CategoryTradeTax' is marked as not used in the given context. + Attribute @currencyID' marked as not used in the given context. @@ -33443,7 +33463,79 @@ - + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:BasisQuantity' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:CategoryTradeTax' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -33461,18 +33553,18 @@ - + - - - + + + - + @@ -33485,18 +33577,18 @@ Element 'ram:SequenceNumeric' is marked as not used in the given context. - + - - - + + + - + @@ -33514,18 +33606,18 @@ - + - - - + + + - + @@ -33538,18 +33630,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -33562,18 +33654,18 @@ Element 'ram:IncludedTradeTax' is marked as not used in the given context. - + - - - + + + - + @@ -33605,18 +33697,18 @@ - + - - - + + + - + @@ -33629,18 +33721,18 @@ Element 'ram:AppliedTradeAllowanceCharge' is marked as not used in the given context. - + - - - + + + - + @@ -33658,18 +33750,18 @@ - + - - - + + + - + @@ -33682,18 +33774,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -33755,18 +33847,18 @@ - + - - - + + + - + @@ -33779,18 +33871,18 @@ Element 'ram:AllowanceChargeBasisAmount' is marked as not used in the given context. - + - - - + + + - + @@ -33803,18 +33895,18 @@ Element 'ram:BasisAmount' is marked as not used in the given context. - + - - - + + + - + @@ -33827,18 +33919,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -33856,18 +33948,18 @@ - + - - - + + + - + @@ -33880,18 +33972,18 @@ Element 'ram:DueDateTypeCode' is marked as not used in the given context. - + - - - + + + - + @@ -33909,78 +34001,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @listID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @listVersionID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:LineTotalBasisAmount' is marked as not used in the given context. - - @@ -33992,8 +34012,8 @@ - - + + @@ -34002,7 +34022,7 @@ - Element 'ram:TaxPointDate' is marked as not used in the given context. + Attribute @listID' marked as not used in the given context. @@ -34016,7 +34036,79 @@ - + + + + + + + + + + + Attribute @listVersionID' marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:LineTotalBasisAmount' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:TaxPointDate' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -34034,18 +34126,18 @@ - + - - - + + + - + @@ -34058,18 +34150,18 @@ Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - + - - - + + + - + @@ -34086,18 +34178,18 @@ - + - - - + + + - + @@ -34115,78 +34207,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:Name' is marked as not used in the given context. - - @@ -34198,8 +34218,8 @@ - - + + @@ -34208,7 +34228,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -34222,8 +34242,8 @@ - - + + @@ -34232,7 +34252,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -34246,8 +34266,8 @@ - - + + @@ -34256,7 +34276,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -34270,8 +34290,8 @@ - - + + @@ -34280,7 +34300,7 @@ - Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -34294,7 +34314,79 @@ - + + + + + + + + + + + Element 'ram:TypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -34311,18 +34403,18 @@ - + - - - + + + - + @@ -34340,78 +34432,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:Name' is marked as not used in the given context. - - @@ -34423,8 +34443,8 @@ - - + + @@ -34433,7 +34453,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -34447,8 +34467,8 @@ - - + + @@ -34457,7 +34477,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -34471,8 +34491,8 @@ - - + + @@ -34481,7 +34501,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -34495,8 +34515,8 @@ - - + + @@ -34505,7 +34525,7 @@ - Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -34519,7 +34539,79 @@ - + + + + + + + + + + + Element 'ram:TypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -34536,18 +34628,18 @@ - + - - - + + + - + @@ -34565,78 +34657,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:Name' is marked as not used in the given context. - - @@ -34648,8 +34668,8 @@ - - + + @@ -34658,7 +34678,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -34672,8 +34692,8 @@ - - + + @@ -34682,7 +34702,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -34696,8 +34716,8 @@ - - + + @@ -34706,7 +34726,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -34720,7 +34740,79 @@ - + + + + + + + + + + + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:TypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -34737,18 +34829,18 @@ - + - - - + + + - + @@ -34765,18 +34857,18 @@ - + - - - + + + - + @@ -34793,18 +34885,18 @@ - + - - - + + + - + @@ -34822,18 +34914,18 @@ - + - - - + + + - + @@ -34850,18 +34942,18 @@ - + - - - + + + - + @@ -34879,18 +34971,18 @@ - + - - - + + + - + @@ -34907,18 +34999,18 @@ - + - - - + + + - + @@ -34936,18 +35028,18 @@ - + - - - + + + - + @@ -34960,18 +35052,18 @@ Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - + - - - + + + - + @@ -34988,18 +35080,18 @@ - + - - - + + + - + @@ -35017,78 +35109,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:Name' is marked as not used in the given context. - - @@ -35100,8 +35120,8 @@ - - + + @@ -35110,7 +35130,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -35124,8 +35144,8 @@ - - + + @@ -35134,7 +35154,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -35148,8 +35168,8 @@ - - + + @@ -35158,7 +35178,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -35172,8 +35192,8 @@ - - + + @@ -35182,7 +35202,7 @@ - Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. @@ -35196,7 +35216,79 @@ - + + + + + + + + + + + Element 'ram:TypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -35213,18 +35305,18 @@ - + - - - + + + - + @@ -35242,78 +35334,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:Name' is marked as not used in the given context. - - @@ -35325,8 +35345,8 @@ - - + + @@ -35335,7 +35355,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -35349,8 +35369,8 @@ - - + + @@ -35359,7 +35379,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -35373,8 +35393,8 @@ - - + + @@ -35383,7 +35403,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -35397,7 +35417,79 @@ - + + + + + + + + + + + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:TypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -35414,18 +35506,18 @@ - + - - - + + + - + @@ -35443,18 +35535,18 @@ - + - - - + + + - + @@ -35467,18 +35559,18 @@ Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - + - - - + + + - + @@ -35495,18 +35587,18 @@ - + - - - + + + - + @@ -35524,78 +35616,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:Name' is marked as not used in the given context. - - @@ -35607,8 +35627,8 @@ - - + + @@ -35617,7 +35637,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -35631,8 +35651,8 @@ - - + + @@ -35641,7 +35661,7 @@ - Element 'ram:TypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -35655,8 +35675,8 @@ - - + + @@ -35665,7 +35685,7 @@ - Element 'ram:URIID' is marked as not used in the given context. + Element 'ram:Name' is marked as not used in the given context. @@ -35679,7 +35699,79 @@ - + + + + + + + + + + + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:TypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:URIID' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -35741,18 +35833,18 @@ - + - - - + + + - + @@ -35769,18 +35861,18 @@ - + - - - + + + - + @@ -35793,18 +35885,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -35817,18 +35909,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -35845,18 +35937,18 @@ - + - - - + + + - + @@ -35869,18 +35961,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -35897,18 +35989,18 @@ - + - - - + + + - + @@ -35921,18 +36013,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -35945,18 +36037,18 @@ Element 'ram:Description' is marked as not used in the given context. - + - - - + + + - + @@ -35973,18 +36065,18 @@ - + - - - + + + - + @@ -36002,18 +36094,18 @@ - + - - - + + + - + @@ -36026,18 +36118,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -36069,26 +36161,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -36098,18 +36190,18 @@ - + - - - + + + - + @@ -36122,18 +36214,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -36146,18 +36238,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -36174,18 +36266,18 @@ - + - - - + + + - + @@ -36203,18 +36295,18 @@ - + - - - + + + - + @@ -36227,18 +36319,18 @@ Element 'ram:PostalTradeAddress' is marked as not used in the given context. - + - - - + + + - + @@ -36255,86 +36347,6 @@ - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000037 - - - - - Attribute '@schemeID' is required in this context. - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000168 - - - - - Element 'ram:URIID' must occur exactly 1 times. - - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:CompleteNumber' is marked as not used in the given context. - - @@ -36346,8 +36358,8 @@ - - + + @@ -36374,7 +36386,87 @@ - + + + + + + + + + FX-SCH-A-000168 + + + + + Element 'ram:URIID' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:CompleteNumber' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000037 + + + + + Attribute '@schemeID' is required in this context. + + + + + + + + + + + + + + + @@ -36392,18 +36484,18 @@ - + - - - + + + - + @@ -36465,18 +36557,18 @@ - + - - - + + + - + @@ -36493,18 +36585,18 @@ - + - - - + + + - + @@ -36517,18 +36609,18 @@ Element 'ram:CompleteNumber' is marked as not used in the given context. - + - - - + + + - + @@ -36541,18 +36633,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -36569,18 +36661,18 @@ - + - - - + + + - + @@ -36593,18 +36685,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -36621,18 +36713,18 @@ - + - - - + + + - + @@ -36645,18 +36737,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -36669,18 +36761,18 @@ Element 'ram:Description' is marked as not used in the given context. - + - - - + + + - + @@ -36697,18 +36789,18 @@ - + - - - + + + - + @@ -36726,18 +36818,18 @@ - + - - - + + + - + @@ -36750,18 +36842,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -36793,26 +36885,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000036 @@ -36822,18 +36914,18 @@ - + - - - + + + - + @@ -36846,18 +36938,18 @@ Attribute @listID' marked as not used in the given context. - + - - - + + + - + @@ -36870,18 +36962,18 @@ Attribute @listVersionID' marked as not used in the given context. - + - - - + + + - + @@ -36899,18 +36991,18 @@ - + - - - + + + - + @@ -36923,18 +37015,18 @@ Element 'ram:PostalTradeAddress' is marked as not used in the given context. - + - - - + + + - + @@ -36951,86 +37043,6 @@ - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000037 - - - - - Attribute '@schemeID' is required in this context. - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000168 - - - - - Element 'ram:URIID' must occur exactly 1 times. - - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:CompleteNumber' is marked as not used in the given context. - - @@ -37042,8 +37054,8 @@ - - + + @@ -37070,7 +37082,87 @@ - + + + + + + + + + FX-SCH-A-000168 + + + + + Element 'ram:URIID' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:CompleteNumber' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000037 + + + + + Attribute '@schemeID' is required in this context. + + + + + + + + + + + + + + + @@ -37088,18 +37180,18 @@ - + - - - + + + - + @@ -37161,18 +37253,18 @@ - + - - - + + + - + @@ -37204,78 +37296,6 @@ - - - - - - - - - - - - - - - - - - - - - - Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - @@ -37287,8 +37307,8 @@ - - + + @@ -37297,7 +37317,7 @@ - Element 'ram:LineID' is marked as not used in the given context. + Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. @@ -37311,8 +37331,8 @@ - - + + @@ -37321,7 +37341,7 @@ - Element 'ram:Name' is marked as not used in the given context. + Element 'ram:FormattedIssueDateTime' is marked as not used in the given context. @@ -37335,7 +37355,79 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:LineID' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:Name' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -37353,18 +37445,18 @@ - + - - - + + + - + @@ -37382,18 +37474,18 @@ - + - - - + + + - + @@ -37406,18 +37498,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -37464,18 +37556,18 @@ - + - - - + + + - + @@ -37488,18 +37580,18 @@ Element 'ram:AllowanceChargeBasisAmount' is marked as not used in the given context. - + - - - + + + - + @@ -37512,18 +37604,18 @@ Element 'ram:BasisAmount' is marked as not used in the given context. - + - - - + + + - + @@ -37536,18 +37628,18 @@ Attribute @currencyID' marked as not used in the given context. - + - - - + + + - + @@ -37565,18 +37657,18 @@ - + - - - + + + - + @@ -37589,18 +37681,18 @@ Element 'ram:DueDateTypeCode' is marked as not used in the given context. - + - - - + + + - + @@ -37618,78 +37710,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @listID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @listVersionID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:LineTotalBasisAmount' is marked as not used in the given context. - - @@ -37701,8 +37721,8 @@ - - + + @@ -37711,7 +37731,7 @@ - Element 'ram:TaxPointDate' is marked as not used in the given context. + Attribute @listID' marked as not used in the given context. @@ -37725,7 +37745,79 @@ - + + + + + + + + + + + Attribute @listVersionID' marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:LineTotalBasisAmount' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:TaxPointDate' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -37743,18 +37835,18 @@ - + - - - + + + - + @@ -37767,18 +37859,18 @@ Element 'ram:CompleteDateTime' is marked as not used in the given context. - + - - - + + + - + @@ -37791,18 +37883,18 @@ Element 'ram:Description' is marked as not used in the given context. - + - - - + + + - + @@ -37819,18 +37911,18 @@ - + - - - + + + - + @@ -37848,87 +37940,6 @@ - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000021 - - - - - Attribute '@format' is required in this context. - - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000022 - - - - - Value of '@format' is not allowed. - - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. - - @@ -37940,8 +37951,8 @@ - - + + @@ -37968,15 +37979,15 @@ - - - + + + - + - + FX-SCH-A-000022 @@ -37997,8 +38008,8 @@ - - + + @@ -38007,7 +38018,7 @@ - Attribute @schemeID' marked as not used in the given context. + Element 'ram:AttachmentBinaryObject' is marked as not used in the given context. @@ -38021,19 +38032,23 @@ - - + + - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - + + + + + + FX-SCH-A-000021 + + + + + Attribute '@format' is required in this context. + + + @@ -38045,19 +38060,24 @@ - - + + + - - - - - - - - Element 'ram:Name' is marked as not used in the given context. - - + + + + + + FX-SCH-A-000022 + + + + + Value of '@format' is not allowed. + + + @@ -38069,8 +38089,8 @@ - - + + @@ -38079,7 +38099,7 @@ - Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + Attribute @schemeID' marked as not used in the given context. @@ -38093,7 +38113,79 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:Name' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:ReferenceTypeCode' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -38111,18 +38203,18 @@ - + - - - + + + - + @@ -38135,18 +38227,18 @@ Element 'ram:URIID' is marked as not used in the given context. - + - - - + + + - + @@ -38159,18 +38251,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -38183,18 +38275,18 @@ Element variant 'ram:SpecifiedTradeAllowanceCharge[ not(ram:ChargeIndicator/udt:Indicator="false") and not(ram:ChargeIndicator/udt:Indicator="true")]' is marked as not used in the given context. - + - - - + + + - + @@ -38226,78 +38318,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:BasisQuantity' is marked as not used in the given context. - - @@ -38309,8 +38329,8 @@ - - + + @@ -38319,7 +38339,7 @@ - Element 'ram:CategoryTradeTax' is marked as not used in the given context. + Attribute @currencyID' marked as not used in the given context. @@ -38333,7 +38353,79 @@ - + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:BasisQuantity' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:CategoryTradeTax' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -38351,18 +38443,18 @@ - + - - - + + + - + @@ -38375,18 +38467,18 @@ Element 'ram:SequenceNumeric' is marked as not used in the given context. - + - - - + + + - + @@ -38418,78 +38510,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Element 'ram:BasisQuantity' is marked as not used in the given context. - - @@ -38501,8 +38521,8 @@ - - + + @@ -38511,7 +38531,7 @@ - Element 'ram:CategoryTradeTax' is marked as not used in the given context. + Attribute @currencyID' marked as not used in the given context. @@ -38525,7 +38545,79 @@ - + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:BasisQuantity' is marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Element 'ram:CategoryTradeTax' is marked as not used in the given context. + + + + + + + + + + + + + + @@ -38543,18 +38635,18 @@ - + - - - + + + - + @@ -38567,18 +38659,18 @@ Element 'ram:SequenceNumeric' is marked as not used in the given context. - + - - - + + + - + @@ -38670,78 +38762,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @currencyID' marked as not used in the given context. - - @@ -38753,8 +38773,8 @@ - - + + @@ -38777,8 +38797,8 @@ - - + + @@ -38801,8 +38821,8 @@ - - + + @@ -38825,7 +38845,79 @@ - + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Attribute @currencyID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -38857,18 +38949,18 @@ - + - - - + + + - + @@ -38900,83 +38992,6 @@ - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000023 - - - - - Value of 'ram:TypeCode' is not allowed. - - - - - - - - - - - - - - - - - - - - - - - - - Attribute @listID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - - - Attribute @listVersionID' marked as not used in the given context. - - @@ -38988,8 +39003,8 @@ - - + + @@ -38998,7 +39013,7 @@ - Attribute @schemeID' marked as not used in the given context. + Attribute @listID' marked as not used in the given context. @@ -39012,8 +39027,8 @@ - - + + @@ -39022,7 +39037,7 @@ - Attribute @schemeID' marked as not used in the given context. + Attribute @listVersionID' marked as not used in the given context. @@ -39036,7 +39051,55 @@ - + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -39053,18 +39116,18 @@ - + - - - + + + - + @@ -39081,26 +39144,26 @@ - + - - - + + + - + - + - + - + FX-SCH-A-000297 @@ -39110,18 +39173,18 @@ - + - - - + + + - + @@ -39138,18 +39201,18 @@ - + - - - + + + - + @@ -39167,18 +39230,18 @@ - + - - - + + + - + @@ -39191,18 +39254,18 @@ Attribute @schemeID' marked as not used in the given context. - + - - - + + + - + @@ -39279,58 +39342,6 @@ - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000037 - - - - - Attribute '@schemeID' is required in this context. - - - @@ -39342,8 +39353,8 @@ - - + + @@ -39366,7 +39377,88 @@ - + + + + + + + + + FX-SCH-A-000037 + + + + + Attribute '@schemeID' is required in this context. + + + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000031 + + + + + Value of '@schemeID' is not allowed. + + + + + + + + + + + + + + + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + + + + + + + @@ -39379,87 +39471,6 @@ Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000277 - - - - - Attribute '@unitCode' is required in this context. - - - - - - - - - - - - - - - - - - - - - - - - FX-SCH-A-000275 - - - - - Value of '@unitCode' is not allowed. - - - @@ -39471,8 +39482,8 @@ - - + + @@ -39495,19 +39506,23 @@ - - + + - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - + + + + + + FX-SCH-A-000277 + + + + + Attribute '@unitCode' is required in this context. + + + @@ -39519,19 +39534,24 @@ - - + + + - - - - - - - - Attribute @schemeID' marked as not used in the given context. - - + + + + + + FX-SCH-A-000275 + + + + + Value of '@unitCode' is not allowed. + + + @@ -39543,8 +39563,8 @@ - - + + @@ -39567,23 +39587,19 @@ - - + + - - - - - - FX-SCH-A-000019 - - - - - Element 'ram:ID' must occur exactly 1 times. - - - + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + @@ -39595,24 +39611,19 @@ - - - + + - - - - - - FX-SCH-A-000026 - - - - - Value of 'ram:ID' is not allowed. - - - + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + @@ -39624,8 +39635,8 @@ - - + + @@ -39643,4 +39654,85 @@ + + + + + + + + + + + + + + FX-SCH-A-000019 + + + + + Element 'ram:ID' must occur exactly 1 times. + + + + + + + + + + + + + + + + + + + + + + + + FX-SCH-A-000026 + + + + + Value of 'ram:ID' is not allowed. + + + + + + + + + + + + + + + + + + + + + + + + + Attribute @schemeID' marked as not used in the given context. + + + + + + + + diff --git a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_EXTENDED_codedb.xml b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_EXTENDED_codedb.xml similarity index 95% rename from validator/src/main/resources/xslt/ZF_230/FACTUR-X_EXTENDED_codedb.xml rename to validator/src/main/resources/xslt/ZF_232/FACTUR-X_EXTENDED_codedb.xml index c1e94944..62d10ca4 100644 --- a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_EXTENDED_codedb.xml +++ b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_EXTENDED_codedb.xml @@ -2,6 +2,7 @@ + @@ -818,302 +819,16 @@ + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1299,7 +1014,7 @@ - + @@ -1552,6 +1267,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4804,6 +4754,8 @@ + + @@ -4819,6 +4771,7 @@ + @@ -5058,6 +5011,14 @@ + + + + + + + + @@ -5285,6 +5246,14 @@ + + + + + + + + @@ -5302,6 +5271,7 @@ + @@ -5333,6 +5303,7 @@ + @@ -5728,6 +5699,18 @@ + + + + + + + + + + + + @@ -5789,7 +5772,6 @@ - @@ -5882,6 +5864,7 @@ + @@ -5906,9 +5889,10 @@ + - + @@ -5994,15 +5978,15 @@ - + - + - + @@ -6023,7 +6007,7 @@ - + @@ -6203,187 +6187,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6446,7 +6249,6 @@ - @@ -6539,6 +6341,7 @@ + @@ -6563,9 +6366,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6622,7 +6608,7 @@ - + @@ -6631,7 +6617,7 @@ - + diff --git a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_MINIMUM.xslt b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_MINIMUM.xslt similarity index 99% rename from validator/src/main/resources/xslt/ZF_230/FACTUR-X_MINIMUM.xslt rename to validator/src/main/resources/xslt/ZF_232/FACTUR-X_MINIMUM.xslt index 39e52c86..fed7601c 100644 --- a/validator/src/main/resources/xslt/ZF_230/FACTUR-X_MINIMUM.xslt +++ b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_MINIMUM.xslt @@ -153,7 +153,7 @@ - +     @@ -455,7 +455,7 @@ -Schema for Factur-X; 1.0.07; Accounting, MINIMUM +Schema for Factur-X; 1.07.2; Accounting, MINIMUM diff --git a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_MINIMUM_codedb.xml b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_MINIMUM_codedb.xml similarity index 98% rename from validator/src/main/resources/schematron/ZF_230/FACTUR-X_MINIMUM_codedb.xml rename to validator/src/main/resources/xslt/ZF_232/FACTUR-X_MINIMUM_codedb.xml index 74a7b49c..c07e49f4 100644 --- a/validator/src/main/resources/schematron/ZF_230/FACTUR-X_MINIMUM_codedb.xml +++ b/validator/src/main/resources/xslt/ZF_232/FACTUR-X_MINIMUM_codedb.xml @@ -2,6 +2,7 @@ + @@ -289,6 +290,14 @@ + + + + + + + + @@ -605,7 +614,6 @@ - @@ -698,6 +706,7 @@ + @@ -722,6 +731,7 @@ + @@ -786,7 +796,6 @@ - @@ -879,6 +888,7 @@ + @@ -903,6 +913,7 @@ + diff --git a/validator/src/test/java/org/mustangproject/validator/XMLValidatorTest.java b/validator/src/test/java/org/mustangproject/validator/XMLValidatorTest.java index 5477b25c..2fda10ef 100644 --- a/validator/src/test/java/org/mustangproject/validator/XMLValidatorTest.java +++ b/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("" + xv.getXMLResult() + "").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); diff --git a/validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java b/validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java index d0e17daa..2eb284f9 100644 --- a/validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java +++ b/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 part, this one includes the root element and - * the global part as well - */ + /*** + * the XMLValidatorTests only cover the part, this one includes the root element and + * the global 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"); } } diff --git a/validator/src/test/resources/CII_XRechnung_with_Peppol_violation.xml b/validator/src/test/resources/CII_XRechnung_with_Peppol_violation.xml new file mode 100644 index 00000000..8e023db5 --- /dev/null +++ b/validator/src/test/resources/CII_XRechnung_with_Peppol_violation.xml @@ -0,0 +1,144 @@ + + + + + urn:fdc:peppol.eu:2017:poacc:billing:01:1.0 + + + urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_3.0 + + + + RE0021 + 380 + + 20241002 + + + Rechnung + AFM + + + Unsere Lieferungen/Leistungen stellen wir Ihnen wie folgt in Rechnung. + AAI + + + Vielen Dank für die gute Zusammenarbeit. + SUR + + + + + + 1 + + + 1 + + + + 140.0000 + 1.0000 + + + + 1.0000 + + + + VAT + S + 19.00 + + + 140.00 + + + + + 992-90009-96 + + 231132 + Max Muster + + Max Muster + + 0192435345 + + + muster@example.com + + + + 12345 + Straße + Stadt + DE + + + muster@example.com + + + DE99999/99999 + + + DE325845615 + + + + KUnde + + 12345 + Straße + Stadt + DE + + + + + + + 20241002 + + + + + RE0021 + EUR + + 1 + Überweisung + + DE50110101002129646573 + Max Muster + + + BEVODEBBXXX + + + + 26.60 + VAT + 140.00 + S + 19.00 + + + Zahlbar sofort, rein netto + + 20241002 + + + + 140.00 + 0.00 + 0.00 + 140.00 + 26.60 + 166.60 + 0.00 + 166.60 + + + +