Updated EUSR examples to be consistent

OpenPEPPOL · Dec 11, 2023 · daacb96 · daacb96
1 parent 06f31d0
commit daacb96
Show file tree

Hide file tree

Showing 10 changed files with 152 additions and 64 deletions.
diff --git a/src/eusr/docs/bis/doc-section/1intro/changelog.adoc b/src/eusr/docs/bis/doc-section/1intro/changelog.adoc
@@ -7,6 +7,7 @@
 * Updated the Schematron rules to v1.1.4
 * Fixed some editorial bugs
 * Added a statement, that empty subsets are not allowed
+* Updated the example in Appendix 1 and Appendix 2 to be fully consistent
 
 == Version 1.1.0 (2023-06-30)
 

diff --git a/src/eusr/docs/bis/doc-section/appendix/a1.adoc b/src/eusr/docs/bis/doc-section/appendix/a1.adoc
@@ -4,6 +4,7 @@
 The following example report represents a valid example message.
 This example represents the data for a Service Provider that both sent and received documents within a Reporting Period.
 
+// Note: empty lines in the source code kill the XML formatting
 [source, xml]
 ----
 include::../../../../trn-end_user_statistics/example/end-user-statistics-reporting-appendix1.xml[]

diff --git a/src/eusr/docs/bis/doc-section/appendix/a2.adoc b/src/eusr/docs/bis/doc-section/appendix/a2.adoc
@@ -4,6 +4,7 @@
 The following example report represents a valid example message.
 This example represents the data for a Service Provider that only sent documents within a Reporting Period.
 
+// Note: empty lines in the source code kill the XML formatting
 [source, xml]
 ----
 include::../../../../trn-end_user_statistics/example/end-user-statistics-reporting-appendix2.xml[]

diff --git a/src/eusr/docs/bis/doc-section/appendix/a3.adoc b/src/eusr/docs/bis/doc-section/appendix/a3.adoc
@@ -4,6 +4,7 @@
 The following example report represents a valid example message.
 This example represents a message in case no transmissions were performed within a Reporting Period.
 
+// Note: empty lines in the source code kill the XML formatting
 [source, xml]
 ----
 include::../../../../trn-end_user_statistics/example/end-user-statistics-reporting-appendix3.xml[]

diff --git a/src/eusr/trn-end_user_statistics/example/end-user-statistics-reporting-appendix1.xml b/src/eusr/trn-end_user_statistics/example/end-user-statistics-reporting-appendix1.xml
@@ -1,65 +1,122 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <EndUserStatisticsReport xmlns="urn:fdc:peppol:end-user-statistics-report:1.1">
   <CustomizationID>urn:fdc:peppol.eu:edec:trns:end-user-statistics-report:1.1</CustomizationID>
   <ProfileID>urn:fdc:peppol.eu:edec:bis:reporting:1.0</ProfileID>
   <Header>
     <ReportPeriod>
-      <StartDate>2022-01-01</StartDate>
-      <EndDate>2022-01-31</EndDate>
+      <StartDate>2023-12-01</StartDate>
+      <EndDate>2023-12-31</EndDate>
     </ReportPeriod>
-    <ReporterID schemeID="CertSubjectCN">POP000360</ReporterID>
+    <ReporterID schemeID="CertSubjectCN">PDE000001</ReporterID>
   </Header>
   <!-- Full set -->
   <FullSet>
-    <SendingEndUsers>5</SendingEndUsers>
-    <ReceivingEndUsers>3</ReceivingEndUsers>
-    <SendingOrReceivingEndUsers>6</SendingOrReceivingEndUsers>
+    <SendingEndUsers>9</SendingEndUsers>
+    <ReceivingEndUsers>4</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
   </FullSet>
   <!-- Subsets per Dataset Type and Process ID -->
   <Subset type="PerDT-PR">
-    <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1</Key>
+    <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1</Key>
     <Key metaSchemeID="PR" schemeID="cenbii-procid-ubl">urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</Key>
-    <SendingEndUsers>4</SendingEndUsers>
+    <SendingEndUsers>0</SendingEndUsers>
     <ReceivingEndUsers>2</ReceivingEndUsers>
-    <SendingOrReceivingEndUsers>5</SendingOrReceivingEndUsers>
+    <SendingOrReceivingEndUsers>2</SendingOrReceivingEndUsers>
   </Subset>
   <Subset type="PerDT-PR">
-    <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1</Key>
+    <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1</Key>
     <Key metaSchemeID="PR" schemeID="cenbii-procid-ubl">urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</Key>
-    <SendingEndUsers>5</SendingEndUsers>
+    <SendingEndUsers>9</SendingEndUsers>
+    <ReceivingEndUsers>4</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
+  </Subset>
+  <Subset type="PerDT-PR">
+    <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1</Key>
+    <Key metaSchemeID="PR" schemeID="cenbii-procid-ubl">urn:fdc:peppol.eu:poacc:bis:ordering:3</Key>
+    <SendingEndUsers>9</SendingEndUsers>
+    <ReceivingEndUsers>0</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
+  </Subset>
+  <Subset type="PerDT-PR">
+    <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:OrderResponse-2::OrderResponse##urn:fdc:peppol.eu:poacc:trns:order_response:3::2.1</Key>
+    <Key metaSchemeID="PR" schemeID="cenbii-procid-ubl">urn:fdc:peppol.eu:poacc:bis:ordering:3</Key>
+    <SendingEndUsers>0</SendingEndUsers>
+    <ReceivingEndUsers>4</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>4</SendingOrReceivingEndUsers>
+  </Subset>
+  <!-- Subsets per End User Country -->
+  <Subset type="PerEUC">
+    <Key metaSchemeID="CC" schemeID="EndUserCountry">DE</Key>
+    <SendingEndUsers>9</SendingEndUsers>
+    <ReceivingEndUsers>4</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
+  </Subset>
+  <Subset type="PerEUC">
+    <Key metaSchemeID="CC" schemeID="EndUserCountry">NO</Key>
+    <SendingEndUsers>9</SendingEndUsers>
+    <ReceivingEndUsers>4</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
+  </Subset>
+  <!-- Subsets per Dataset Type and End User Country -->
+  <Subset type="PerDT-EUC">
+    <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1</Key>
+    <Key metaSchemeID="CC" schemeID="EndUserCountry">DE</Key>
+    <SendingEndUsers>0</SendingEndUsers>
     <ReceivingEndUsers>2</ReceivingEndUsers>
-    <SendingOrReceivingEndUsers>5</SendingOrReceivingEndUsers>
+    <SendingOrReceivingEndUsers>2</SendingOrReceivingEndUsers>
   </Subset>
-  <!-- Subsets per Dataset Type, Process ID and End User Country -->
-  <Subset type="PerDT-PR-EUC">
+  <Subset type="PerDT-EUC">
     <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1</Key>
-    <Key metaSchemeID="PR" schemeID="cenbii-procid-ubl">urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</Key>
-    <Key metaSchemeID="CC" schemeID="EndUserCountry">FI</Key>
-    <SendingEndUsers>3</SendingEndUsers>
-    <ReceivingEndUsers>2</ReceivingEndUsers>
+    <Key metaSchemeID="CC" schemeID="EndUserCountry">DE</Key>
+    <SendingEndUsers>9</SendingEndUsers>
+    <ReceivingEndUsers>4</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
+  </Subset>
+  <Subset type="PerDT-EUC">
+    <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1</Key>
+    <Key metaSchemeID="CC" schemeID="EndUserCountry">NO</Key>
+    <SendingEndUsers>9</SendingEndUsers>
+    <ReceivingEndUsers>0</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
+  </Subset>
+  <Subset type="PerDT-EUC">
+    <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:OrderResponse-2::OrderResponse##urn:fdc:peppol.eu:poacc:trns:order_response:3::2.1</Key>
+    <Key metaSchemeID="CC" schemeID="EndUserCountry">NO</Key>
+    <SendingEndUsers>0</SendingEndUsers>
+    <ReceivingEndUsers>4</ReceivingEndUsers>
     <SendingOrReceivingEndUsers>4</SendingOrReceivingEndUsers>
   </Subset>
+  <!-- Subsets per Dataset Type, Process ID and End User Country -->
   <Subset type="PerDT-PR-EUC">
     <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1</Key>
     <Key metaSchemeID="PR" schemeID="cenbii-procid-ubl">urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</Key>
-    <Key metaSchemeID="CC" schemeID="EndUserCountry">NO</Key>
-    <SendingEndUsers>2</SendingEndUsers>
+    <Key metaSchemeID="CC" schemeID="EndUserCountry">DE</Key>
+    <SendingEndUsers>0</SendingEndUsers>
     <ReceivingEndUsers>2</ReceivingEndUsers>
-    <SendingOrReceivingEndUsers>3</SendingOrReceivingEndUsers>
+    <SendingOrReceivingEndUsers>2</SendingOrReceivingEndUsers>
   </Subset>
-  <!-- Subsets per Dataset Type and End User Country -->
-  <Subset type="PerDT-EUC">
+  <Subset type="PerDT-PR-EUC">
     <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1</Key>
-    <Key metaSchemeID="CC" schemeID="EndUserCountry">PT</Key>
-    <SendingEndUsers>5</SendingEndUsers>
-    <ReceivingEndUsers>2</ReceivingEndUsers>
-    <SendingOrReceivingEndUsers>6</SendingOrReceivingEndUsers>
+    <Key metaSchemeID="PR" schemeID="cenbii-procid-ubl">urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</Key>
+    <Key metaSchemeID="CC" schemeID="EndUserCountry">DE</Key>
+    <SendingEndUsers>9</SendingEndUsers>
+    <ReceivingEndUsers>4</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
   </Subset>
-  <!-- Subsets per End User Country -->
-  <Subset type="PerEUC">
-    <Key metaSchemeID="CC" schemeID="EndUserCountry">PT</Key>
-    <SendingEndUsers>1</SendingEndUsers>
-    <ReceivingEndUsers>2</ReceivingEndUsers>
-    <SendingOrReceivingEndUsers>3</SendingOrReceivingEndUsers>
+  <Subset type="PerDT-PR-EUC">
+    <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1</Key>
+    <Key metaSchemeID="PR" schemeID="cenbii-procid-ubl">urn:fdc:peppol.eu:poacc:bis:ordering:3</Key>
+    <Key metaSchemeID="CC" schemeID="EndUserCountry">NO</Key>
+    <SendingEndUsers>9</SendingEndUsers>
+    <ReceivingEndUsers>0</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
+  </Subset>
+  <Subset type="PerDT-PR-EUC">
+    <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:OrderResponse-2::OrderResponse##urn:fdc:peppol.eu:poacc:trns:order_response:3::2.1</Key>
+    <Key metaSchemeID="PR" schemeID="cenbii-procid-ubl">urn:fdc:peppol.eu:poacc:bis:ordering:3</Key>
+    <Key metaSchemeID="CC" schemeID="EndUserCountry">NO</Key>
+    <SendingEndUsers>0</SendingEndUsers>
+    <ReceivingEndUsers>4</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>4</SendingOrReceivingEndUsers>
   </Subset>
 </EndUserStatisticsReport>
diff --git a/src/eusr/trn-end_user_statistics/example/end-user-statistics-reporting-appendix2.xml b/src/eusr/trn-end_user_statistics/example/end-user-statistics-reporting-appendix2.xml
@@ -1,48 +1,78 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <EndUserStatisticsReport xmlns="urn:fdc:peppol:end-user-statistics-report:1.1">
   <CustomizationID>urn:fdc:peppol.eu:edec:trns:end-user-statistics-report:1.1</CustomizationID>
   <ProfileID>urn:fdc:peppol.eu:edec:bis:reporting:1.0</ProfileID>
   <Header>
     <ReportPeriod>
-      <StartDate>2022-01-01</StartDate>
-      <EndDate>2022-01-31</EndDate>
+      <StartDate>2023-12-01</StartDate>
+      <EndDate>2023-12-31</EndDate>
     </ReportPeriod>
-    <ReporterID schemeID="CertSubjectCN">POP000360</ReporterID>
+    <ReporterID schemeID="CertSubjectCN">PDE000001</ReporterID>
   </Header>
   <!-- Full set -->
   <FullSet>
-    <SendingEndUsers>5</SendingEndUsers>
+    <SendingEndUsers>9</SendingEndUsers>
     <ReceivingEndUsers>0</ReceivingEndUsers>
-    <SendingOrReceivingEndUsers>5</SendingOrReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
   </FullSet>
   <!-- Subsets per Dataset Type and Process ID -->
   <Subset type="PerDT-PR">
     <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1</Key>
     <Key metaSchemeID="PR" schemeID="cenbii-procid-ubl">urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</Key>
-    <SendingEndUsers>4</SendingEndUsers>
+    <SendingEndUsers>9</SendingEndUsers>
     <ReceivingEndUsers>0</ReceivingEndUsers>
-    <SendingOrReceivingEndUsers>4</SendingOrReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
   </Subset>
   <Subset type="PerDT-PR">
-    <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1</Key>
-    <Key metaSchemeID="PR" schemeID="cenbii-procid-ubl">urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</Key>
-    <SendingEndUsers>5</SendingEndUsers>
+    <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1</Key>
+    <Key metaSchemeID="PR" schemeID="cenbii-procid-ubl">urn:fdc:peppol.eu:poacc:bis:ordering:3</Key>
+    <SendingEndUsers>9</SendingEndUsers>
+    <ReceivingEndUsers>0</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
+  </Subset>
+  <!-- Subsets per End User Country -->
+  <Subset type="PerEUC">
+    <Key metaSchemeID="CC" schemeID="EndUserCountry">DE</Key>
+    <SendingEndUsers>9</SendingEndUsers>
     <ReceivingEndUsers>0</ReceivingEndUsers>
-    <SendingOrReceivingEndUsers>5</SendingOrReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
+  </Subset>
+  <Subset type="PerEUC">
+    <Key metaSchemeID="CC" schemeID="EndUserCountry">NO</Key>
+    <SendingEndUsers>9</SendingEndUsers>
+    <ReceivingEndUsers>0</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
   </Subset>
   <!-- Subsets per Dataset Type and End User Country -->
   <Subset type="PerDT-EUC">
     <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1</Key>
-    <Key metaSchemeID="CC" schemeID="EndUserCountry">PT</Key>
-    <SendingEndUsers>1</SendingEndUsers>
+    <Key metaSchemeID="CC" schemeID="EndUserCountry">DE</Key>
+    <SendingEndUsers>9</SendingEndUsers>
     <ReceivingEndUsers>0</ReceivingEndUsers>
-    <SendingOrReceivingEndUsers>1</SendingOrReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
   </Subset>
-  <!-- Subsets per End User Country -->
-  <Subset type="PerEUC">
-    <Key metaSchemeID="CC" schemeID="EndUserCountry">PT</Key>
-    <SendingEndUsers>1</SendingEndUsers>
+  <Subset type="PerDT-EUC">
+    <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1</Key>
+    <Key metaSchemeID="CC" schemeID="EndUserCountry">NO</Key>
+    <SendingEndUsers>9</SendingEndUsers>
+    <ReceivingEndUsers>0</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
+  </Subset>
+  <!-- Subsets per Dataset Type, Process ID and End User Country -->
+  <Subset type="PerDT-PR-EUC">
+    <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1</Key>
+    <Key metaSchemeID="PR" schemeID="cenbii-procid-ubl">urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</Key>
+    <Key metaSchemeID="CC" schemeID="EndUserCountry">DE</Key>
+    <SendingEndUsers>9</SendingEndUsers>
+    <ReceivingEndUsers>0</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
+  </Subset>
+  <Subset type="PerDT-PR-EUC">
+    <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1</Key>
+    <Key metaSchemeID="PR" schemeID="cenbii-procid-ubl">urn:fdc:peppol.eu:poacc:bis:ordering:3</Key>
+    <Key metaSchemeID="CC" schemeID="EndUserCountry">NO</Key>
+    <SendingEndUsers>9</SendingEndUsers>
     <ReceivingEndUsers>0</ReceivingEndUsers>
-    <SendingOrReceivingEndUsers>1</SendingOrReceivingEndUsers>
+    <SendingOrReceivingEndUsers>9</SendingOrReceivingEndUsers>
   </Subset>
 </EndUserStatisticsReport>
diff --git a/src/tsr/docs/bis/doc-section/appendix/a1.adoc b/src/tsr/docs/bis/doc-section/appendix/a1.adoc
@@ -4,6 +4,7 @@
 The following example report represents a valid example message.
 This example represents the data for a Service Provider that both sent and received documents within a Reporting Period.
 
+// Note: empty lines in the source code kill the XML formatting
 [source, xml]
 ----
 include::../../../../trn-transaction_statistics/example/transaction-statistics-appendix1.xml[]

diff --git a/src/tsr/docs/bis/doc-section/appendix/a2.adoc b/src/tsr/docs/bis/doc-section/appendix/a2.adoc
@@ -4,6 +4,7 @@
 The following example report represents a valid example message.
 This example represents a message in case no transmissions were performed within a Reporting Period.
 
+// Note: empty lines in the source code kill the XML formatting
 [source, xml]
 ----
 include::../../../../trn-transaction_statistics/example/transaction-statistics-appendix2.xml[]

diff --git a/src/tsr/trn-transaction_statistics/example/transaction-statistics-appendix1.xml b/src/tsr/trn-transaction_statistics/example/transaction-statistics-appendix1.xml
@@ -14,14 +14,15 @@
     <Incoming>27</Incoming>
     <Outgoing>23</Outgoing>
   </Total>
+  <!-- SubTotals per Transport Protocol -->
   <!-- Sum per TP must match TotalCount -->
   <Subtotal type="PerTP">
     <Key metaSchemeID="TP" schemeID="Peppol">peppol-transport-as4-v2_0</Key>
     <Incoming>27</Incoming>
     <Outgoing>23</Outgoing>
   </Subtotal>
-  <!-- region PerSP-DT-PR -->
-  <!-- Subtotals must match Total -->
+  <!-- SubTotals per Service Provider, Dataset Type and Process ID -->
+  <!-- Sum must match TotalCount -->
   <Subtotal type="PerSP-DT-PR">
     <Key metaSchemeID="SP" schemeID="CertSubjectCN">POP000001</Key>
     <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1</Key>
@@ -50,9 +51,8 @@
     <Incoming>0</Incoming>
     <Outgoing>12</Outgoing>
   </Subtotal>
-  <!-- endregion -->
-  <!-- region PerSP-DT-PR-CC -->
-  <!-- Subtotals must match Total -->
+  <!-- SubTotals per Service Provider, Dataset Type, Process ID and Country Codes -->
+  <!-- Sum of incoming must match TotalCount -->
   <Subtotal type="PerSP-DT-PR-CC">
     <Key metaSchemeID="SP" schemeID="CertSubjectCN">POP000001</Key>
     <Key metaSchemeID="DT" schemeID="busdox-docid-qns">urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1</Key>
@@ -98,5 +98,4 @@
     <Incoming>5</Incoming>
     <Outgoing>0</Outgoing>
   </Subtotal>
-  <!-- endregion -->
 </TransactionStatisticsReport>
diff --git a/src/tsr/trn-transaction_statistics/example/transaction-statistics-appendix2.xml b/src/tsr/trn-transaction_statistics/example/transaction-statistics-appendix2.xml
@@ -9,14 +9,10 @@
     </ReportPeriod>
     <ReporterID schemeID="CertSubjectCN">POP000360</ReporterID>
   </Header>
-
-
   <!-- Totals -->
   <Total>
     <Incoming>0</Incoming>
     <Outgoing>0</Outgoing>
   </Total>
-
-
   <!-- No Subtotal because they would all contain only zeroes -->
 </TransactionStatisticsReport>