Merge remote-tracking branch 'upstream/2024-q4-dev' into development-nrs

Author: phax

.github/workflows/build-and-deploy-master.yml

@@ -12,4 +12,11 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build Spec
-        run: bash ./build2.sh
+        run: bash ./build.sh
+
+      - name: Deploy on S3
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        run: |
+          aws s3 sync --acl public-read --region eu-west-1 target/site ${{ secrets.AWS_S3_PATH }}/poacc/billing/3.0

README.adoc

@@ -3,4 +3,3 @@
 This repository contains the resources making up PEPPOL BIS Billing 3.0.
 
 Please use our link:https://openpeppol.atlassian.net/servicedesk/customer/portal/1[Service desk] to report any issues related to the specification.
-

build.sh

@@ -14,7 +14,7 @@ docker run --rm -i \
 
 
 # Validator
-docker run --rm -i -v $PROJECT:/src phelger/vefa-validator:2.3.0 build -x -t -n eu.peppol.postaward.v3.billing -a rules,guide -target target/validator /src
+docker run --rm -i -v $PROJECT:/src phelger/vefa-validator:latest build -x -t -n eu.peppol.postaward.v3.billing -a rules,guide -target target/validator /src
 
 
 # Generate adoc-files from rules

build2.sh

@@ -63,11 +63,11 @@ include::../../syntax/codelists/inv-type.adoc[]
 | 380
 | Invoice
 
-// |326
-// |Partial invoice
-// |Document/message specifying details of an incomplete invoice.
-// | 380
-// | Invoice
+|326
+|Partial invoice
+|Document/message specifying details of an incomplete invoice.
+| 380
+| Invoice
 
 |331
 |Commercial invoice which includes a packing list
@@ -87,11 +87,11 @@ include::../../syntax/codelists/inv-type.adoc[]
 | 380
 | Invoice
 
-// |384
-// |Corrected invoice
-// |Commercial invoice that includes revised information differing from an earlier submission of the same invoice.
-// | 380
-// | Invoice
+|384
+|Corrected invoice
+|Commercial invoice that includes revised information differing from an earlier submission of the same invoice.
+| 380
+| Invoice
 
 |386
 |Prepayment invoice

guide/profile/codes/invoice-specific.adoc

@@ -15,6 +15,8 @@ IMPORTANT: Changes in code lists are also reflected by changes in the validation
 
 :leveloffset: +1
 
+include::v3.0.18.adoc[]
+
 include::v3.0.17.adoc[]
 
 include::v3.0.16.adoc[]

guide/release-notes/main.adoc

@@ -0,0 +1,14 @@
+= Version 3.0.18
+[horizontal]
+Release date:: November 2024
+
+== Changes to BIS document
+
+
+== Changes to code lists and validation artefacts
+
+* Invoice Type codes 326 (Partial invoice) and 384 (Corrected invoice) added to the codelist and listed as synonyms with type code 380 (Commercial Invoice)
+* German country specific validation rules added.
+* The rule (PEPPOL-EN16931-R002), which ensures that the Invoice Note (BT-22) appears no more than once, will not apply if both the buyer and seller are German organizations.
+
+==  EN 16931 schematrons updated

guide/release-notes/v3.0.18.adoc

@@ -566,7 +566,7 @@ Last update: 2024 May release 3.0.17.
     </rule>
     <rule context="ram:ExchangedDocument/ram:TypeCode">
       <assert id="PEPPOL-EN16931-P0100" test="
-                    $profile != '01' or (some $code in tokenize('71 102 218 219 331 382 553 817 870 875 876 877 380 383 386 388 393 82 80 84 395 575 623 780 381 396 81 83 532', '\s')
+                    $profile != '01' or (some $code in tokenize('71 102 218 219 326 331 382 553 817 870 875 876 877 380 383 384 386 388 393 82 80 84 395 575 623 780 381 396 81 83 532', '\s')
                         satisfies normalize-space(text()) = $code)" flag="fatal">Invoice type code MUST be set according to the profile.</assert>
     </rule>
     <!-- PEPPOL-EN16931-P0101 is part of PEPPOL-EN16931-P0100. -->

rules/sch/PEPPOL-EN16931-CII.sch

@@ -38,6 +38,11 @@ Last update: 2024 May release 3.0.17.
 		else
 		'XX'"/>
   <!-- -->
+  <let name="supplierCountryIsDE"
+	  value="(upper-case(normalize-space(/*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)) = 'DE')"/>
+  <let name="customerCountryIsDE"
+	  value="(upper-case(normalize-space(/*/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)) = 'DE')"/>
+	  
   <let name="documentCurrencyCode" value="/*/cbc:DocumentCurrencyCode"/>
   <!-- Functions -->
   <function xmlns="http://www.w3.org/1999/XSL/Transform" name="u:gln" as="xs:boolean">
@@ -252,7 +257,7 @@ Last update: 2024 May release 3.0.17.
     <rule context="ubl-creditnote:CreditNote | ubl-invoice:Invoice">
       <assert id="PEPPOL-EN16931-R001" test="cbc:ProfileID" flag="fatal">Business process MUST be provided.</assert>
       <assert id="PEPPOL-EN16931-R007" test="$profile != 'Unknown'" flag="fatal">Business process MUST be in the format 'urn:fdc:peppol.eu:2017:poacc:billing:NN:1.0' where NN indicates the process number.</assert>
-      <assert id="PEPPOL-EN16931-R002" test="count(cbc:Note) &lt;= 1" flag="fatal">No more than one note is allowed on document level.</assert>
+      <assert id="PEPPOL-EN16931-R002" test="count(cbc:Note) &lt;= 1 or ($supplierCountryIsDE and $customerCountryIsDE)" flag="fatal">No more than one note is allowed on document level, unless both the buyer and seller are German organizations.</assert>
       <assert id="PEPPOL-EN16931-R003" test="cbc:BuyerReference or cac:OrderReference/cbc:ID" flag="fatal">A buyer reference or purchase order reference MUST be provided.</assert>
       <assert id="PEPPOL-EN16931-R004" test="starts-with(normalize-space(cbc:CustomizationID/text()), 'urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0')" flag="fatal">Specification identifier MUST have the value 'urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0'.</assert>
       <assert id="PEPPOL-EN16931-R053" test="count(cac:TaxTotal[cac:TaxSubtotal]) = 1" flag="fatal">Only one tax total with tax subtotals MUST be provided.</assert>
@@ -684,10 +689,6 @@ Last update: 2024 May release 3.0.17.
   </pattern>
   <!-- German rules -->
   <pattern id="german-rules">
-    <let name="supplierCountryIsDE"
-      value="(upper-case(normalize-space(/*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)) = 'DE')"/>
-    <let name="customerCountryIsDE"
-      value="(upper-case(normalize-space(/*/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)) = 'DE')"/>
     <let name="XR-SKONTO-REGEX"
       value="'#(SKONTO)#TAGE=([0-9]+#PROZENT=[0-9]+\.[0-9]{2})(#BASISBETRAG=-?[0-9]+\.[0-9]{2})?#$'"/>
     <let name="XR-EMAIL-REGEX"
@@ -847,7 +848,7 @@ Last update: 2024 May release 3.0.17.
     </rule>
     <rule context="cbc:InvoiceTypeCode">
       <assert id="PEPPOL-EN16931-P0100" test="
-          $profile != '01' or (some $code in tokenize('71 80 82 84 102 218 219 331 380 382 383 386 388 393 395 553 575 623 780 817 870 875 876 877', '\s')
+          $profile != '01' or (some $code in tokenize('71 80 82 84 102 218 219 326 331 380 382 383 384 386 388 393 395 553 575 623 780 817 870 875 876 877', '\s')
             satisfies normalize-space(text()) = $code)" flag="fatal">Invoice type code MUST be set according to the profile.</assert>
     </rule>
     <rule context="cbc:CreditNoteTypeCode">

rules/sch/PEPPOL-EN16931-UBL.sch

@@ -57,11 +57,11 @@
         <Description> A request for payment for completed units.</Description>
     </Code>
 
-    <!-- <Code>
+    <Code>
         <Id>326</Id>
         <Name>Partial invoice</Name>
         <Description>Document/message specifying details of an incomplete invoice.</Description>
-    </Code> -->
+    </Code> 
 
     <Code>
         <Id>331</Id>
@@ -92,11 +92,11 @@
         </Description>
     </Code>
 
-    <!-- <Code>
+    <Code>
         <Id>384</Id>
         <Name>Corrected invoice</Name>
         <Description>Commercial invoice that includes revised information differing from an earlier submission of the same invoice.</Description>
-    </Code> -->
+    </Code> 
 
     <Code>
         <Id>386</Id>

structure/codelist/UNCL1001-inv.xml

@@ -91,7 +91,7 @@
             <Value type="EXAMPLE">381</Value>
         </Element>
 
-        <Element cardinality="0..1">
+        <Element cardinality="0..n">
             <Term>cbc:Note</Term>
             <Name>Invoice note</Name>
             <Description>A textual note that gives unstructured information that is relevant to the Invoice as a whole.Such as the reason for any correction or

structure/syntax/ubl-creditnote.xml

@@ -82,7 +82,7 @@
             <Value type="EXAMPLE">380</Value>
         </Element>
 
-        <Element cardinality="0..1">
+        <Element cardinality="0..n">
             <Term>cbc:Note</Term>
             <Name>Invoice note</Name>
             <Description>A textual note that gives unstructured information that is relevant to the Invoice as a whole.Such as the reason for any correction or assignment note in case the invoice has been factored. </Description>