Updated TSR examples for Appendix

OpenPEPPOL · Dec 11, 2023 · e760b6f · e760b6f
1 parent f4e0a30
commit e760b6f
Show file tree

Hide file tree

Showing 5 changed files with 129 additions and 2 deletions.
diff --git a/src/tsr/docs/bis/doc-section/1intro/changelog.adoc b/src/tsr/docs/bis/doc-section/1intro/changelog.adoc
@@ -9,6 +9,7 @@
 * Removed the operational statement on the number of calendar days before a reminder is sent
 * Added a statement, that empty subtotals are not allowed
 * Extended the country code list based on ISO-3166 to allow the `ZZ` value
+* Updated the example in Appendix 1 to be fully consistent
 
 == Version 1.0.1 (2023-03-14)
 

diff --git a/src/tsr/docs/bis/doc-section/appendix/a1.adoc b/src/tsr/docs/bis/doc-section/appendix/a1.adoc
@@ -6,5 +6,5 @@ This example represents the data for a Service Provider that both sent and recei
 
 [source, xml]
 ----
-include::../../../../trn-transaction_statistics/example/transaction-statistics-2.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
@@ -6,5 +6,5 @@ This example represents a message in case no transmissions were performed within
 
 [source, xml]
 ----
-include::../../../../trn-transaction_statistics/example/transaction-statistics-empty.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
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TransactionStatisticsReport xmlns="urn:fdc:peppol:transaction-statistics-report:1.0">
+  <CustomizationID>urn:fdc:peppol.eu:edec:trns:transaction-statistics-reporting:1.0</CustomizationID>
+  <ProfileID>urn:fdc:peppol.eu:edec:bis:reporting:1.0</ProfileID>
+  <Header>
+    <ReportPeriod>
+      <StartDate>2023-12-01</StartDate>
+      <EndDate>2023-12-31</EndDate>
+    </ReportPeriod>
+    <ReporterID schemeID="CertSubjectCN">POP000360</ReporterID>
+  </Header>
+
+  <!-- Totals -->
+  <Total>
+    <Incoming>27</Incoming>
+    <Outgoing>23</Outgoing>
+  </Total>
+
+  <!-- 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 -->
+  <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>
+    <Key metaSchemeID="PR" schemeID="cenbii-procid-ubl">urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</Key>
+    <Incoming>2</Incoming>
+    <Outgoing>0</Outgoing>
+  </Subtotal>
+  <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: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>
+    <Incoming>13</Incoming>
+    <Outgoing>11</Outgoing>
+  </Subtotal>
+  <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: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>
+    <Incoming>12</Incoming>
+    <Outgoing>0</Outgoing>
+  </Subtotal>
+  <Subtotal type="PerSP-DT-PR">
+    <Key metaSchemeID="SP" schemeID="CertSubjectCN">POP000002</Key>
+    <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>
+    <Incoming>0</Incoming>
+    <Outgoing>12</Outgoing>
+  </Subtotal>
+  <!-- endregion -->
+
+  <!-- region PerSP-DT-PR-CC -->
+  <!-- Subtotals must match Total -->
+  <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>
+    <Key metaSchemeID="PR" schemeID="cenbii-procid-ubl">urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</Key>
+    <Key metaSchemeID="CC" schemeID="SenderCountry">BE</Key>
+    <Key metaSchemeID="CC" schemeID="ReceiverCountry">DE</Key>
+    <Incoming>2</Incoming>
+    <Outgoing>0</Outgoing>
+  </Subtotal>
+  <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: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="SenderCountry">DE</Key>
+    <Key metaSchemeID="CC" schemeID="ReceiverCountry">AT</Key>
+    <Incoming>4</Incoming>
+    <Outgoing>0</Outgoing>
+  </Subtotal>
+  <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: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="SenderCountry">DE</Key>
+    <Key metaSchemeID="CC" schemeID="ReceiverCountry">DE</Key>
+    <Incoming>9</Incoming>
+    <Outgoing>0</Outgoing>
+  </Subtotal>
+  <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: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="SenderCountry">DE</Key>
+    <Key metaSchemeID="CC" schemeID="ReceiverCountry">AT</Key>
+    <Incoming>7</Incoming>
+    <Outgoing>0</Outgoing>
+  </Subtotal>
+  <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: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="SenderCountry">DE</Key>
+    <Key metaSchemeID="CC" schemeID="ReceiverCountry">DE</Key>
+    <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
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TransactionStatisticsReport xmlns="urn:fdc:peppol:transaction-statistics-report:1.0">
+  <CustomizationID>urn:fdc:peppol.eu:edec:trns:transaction-statistics-reporting:1.0</CustomizationID>
+  <ProfileID>urn:fdc:peppol.eu:edec:bis:reporting:1.0</ProfileID>
+  <Header>
+    <ReportPeriod>
+      <StartDate>2023-12-01</StartDate>
+      <EndDate>2023-12-31</EndDate>
+    </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>