Separate files for appendix

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

Hide file tree

Showing 7 changed files with 134 additions and 18 deletions.
diff --git a/src/eusr/docs/bis/doc-section/appendix/a1.adoc b/src/eusr/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-end_user_statistics/example/end-user-statistics-reporting-1.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
@@ -3,9 +3,8 @@
 
 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.
-This implies, that the "Subsets per Dataset Type, Process ID and End User Country" is not contained.
 
 [source, xml]
 ----
-include::../../../../trn-end_user_statistics/example/end-user-statistics-reporting-2.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
@@ -6,5 +6,5 @@ This example represents a message in case no transmissions were performed within
 
 [source, xml]
 ----
-include::../../../../trn-end_user_statistics/example/end-user-statistics-reporting-empty.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
@@ -0,0 +1,65 @@
+<?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>
+    </ReportPeriod>
+    <ReporterID schemeID="CertSubjectCN">POP000360</ReporterID>
+  </Header>
+  <!-- Full set -->
+  <FullSet>
+    <SendingEndUsers>5</SendingEndUsers>
+    <ReceivingEndUsers>3</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>6</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>
+    <ReceivingEndUsers>2</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>5</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>
+    <ReceivingEndUsers>2</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>5</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">FI</Key>
+    <SendingEndUsers>3</SendingEndUsers>
+    <ReceivingEndUsers>2</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>4</SendingOrReceivingEndUsers>
+  </Subset>
+  <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>
+    <ReceivingEndUsers>2</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>3</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>5</SendingEndUsers>
+    <ReceivingEndUsers>2</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>6</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>
+</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
@@ -0,0 +1,48 @@
+<?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>
+    </ReportPeriod>
+    <ReporterID schemeID="CertSubjectCN">POP000360</ReporterID>
+  </Header>
+  <!-- Full set -->
+  <FullSet>
+    <SendingEndUsers>5</SendingEndUsers>
+    <ReceivingEndUsers>0</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>5</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>
+    <ReceivingEndUsers>0</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>4</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>
+    <ReceivingEndUsers>0</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>5</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>
+    <ReceivingEndUsers>0</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>1</SendingOrReceivingEndUsers>
+  </Subset>
+  <!-- Subsets per End User Country -->
+  <Subset type="PerEUC">
+    <Key metaSchemeID="CC" schemeID="EndUserCountry">PT</Key>
+    <SendingEndUsers>1</SendingEndUsers>
+    <ReceivingEndUsers>0</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>1</SendingOrReceivingEndUsers>
+  </Subset>
+</EndUserStatisticsReport>
diff --git a/src/eusr/trn-end_user_statistics/example/end-user-statistics-reporting-appendix3.xml b/src/eusr/trn-end_user_statistics/example/end-user-statistics-reporting-appendix3.xml
@@ -0,0 +1,18 @@
+<?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>
+    </ReportPeriod>
+    <ReporterID schemeID="CertSubjectCN">POP000360</ReporterID>
+  </Header>
+  <!-- Full set -->
+  <FullSet>
+    <SendingEndUsers>0</SendingEndUsers>
+    <ReceivingEndUsers>0</ReceivingEndUsers>
+    <SendingOrReceivingEndUsers>0</SendingOrReceivingEndUsers>
+  </FullSet>
+</EndUserStatisticsReport>
diff --git a/src/tsr/trn-transaction_statistics/example/transaction-statistics-appendix1.xml b/src/tsr/trn-transaction_statistics/example/transaction-statistics-appendix1.xml
@@ -9,22 +9,17 @@
     </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">
@@ -34,23 +29,20 @@
     <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>
@@ -59,8 +51,6 @@
     <Outgoing>12</Outgoing>
   </Subtotal>
   <!-- endregion -->
-
-
   <!-- region PerSP-DT-PR-CC -->
   <!-- Subtotals must match Total -->
   <Subtotal type="PerSP-DT-PR-CC">
@@ -72,7 +62,6 @@
     <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>
@@ -82,7 +71,6 @@
     <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>
@@ -92,7 +80,6 @@
     <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>
@@ -102,7 +89,6 @@
     <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>