Merge branch 'master' of github.com:OpenPEPPOL/peppol-bis-invoice-3

.postasciidoctor.sh

@@ -1,4 +1,9 @@
 #!/bin/sh
 
-mv /target/guide/* /target/site
+if [ -d "/target/site" ]; then
+    mv /target/guide/* /target/site
+else
+    mkdir -p /target/site
+    mv /target/guide/* /target/site
+fi
 rm -r /target/guide

build-billing.bat

@@ -0,0 +1,72 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+call :dashed "Set the project directory"
+set PROJECT=%~dp0
+set "PROJECT=%PROJECT:~0,-1%"  :: Remove trailing backslash if any
+echo PROJECT folder = %PROJECT%
+
+call :dashed "Check if target directory exists, and if so, remove it"
+if exist "%PROJECT%/target" (
+    echo Remove src/target and bind to %PROJECT%/target
+    docker run --rm -v "%PROJECT%:/src" alpine:3.11 rm -rf /src/target
+)
+
+call :dashed "Structure"
+docker run --rm -v "%PROJECT%:/src" -v "%PROJECT%/target:/target" difi/vefa-structure:0.7
+
+call :dashed "Validator"
+docker run --rm -v "%PROJECT%:/src" anskaffelser/validator:2.1.0 build -x -t -n eu.peppol.postaward.v3.billing -a rules,guide -target target/validator /src
+
+call :dashed "Generate adoc-files from rules"
+ECHO CEN-EN16931-UBL
+docker run --rm -v "%PROJECT%:/src" -v "%PROJECT%/target/generated:/target" --entrypoint java klakegg/saxon:9.8.0-7 -cp /saxon.jar net.sf.saxon.Query -s:/src/rules/sch/CEN-EN16931-UBL.sch -q:tools/xquery/rules_asciidoc_cen.xquery -o:/target/CEN-EN16931-UBL-GENERAL.sch.adoc
+docker run --rm -v "%PROJECT%:/src" -v "%PROJECT%/target/generated:/target" --entrypoint java klakegg/saxon:9.8.0-7 -cp /saxon.jar net.sf.saxon.Query -s:/src/rules/sch/CEN-EN16931-UBL.sch -q:tools/xquery/rules_asciidoc_cen_syntax.xquery -o:/target/CEN-EN16931-UBL-SYNTAX.sch.adoc
+
+ECHO PEPPOL-EN16931-UBL
+docker run --rm -v "%PROJECT%:/src" -v "%PROJECT%/target/generated:/target" --entrypoint java klakegg/saxon:9.8.0-7 -cp /saxon.jar net.sf.saxon.Query -s:/src/rules/sch/PEPPOL-EN16931-UBL.sch -q:tools/xquery/rules_asciidoc_peppol.xquery -o:/target/PEPPOL-EN16931-UBL-GENERAL.sch.adoc
+docker run --rm -v "%PROJECT%:/src" -v "%PROJECT%/target/generated:/target" --entrypoint java klakegg/saxon:9.8.0-7 -cp /saxon.jar net.sf.saxon.Query -s:/src/rules/sch/PEPPOL-EN16931-UBL.sch -q:tools/xquery/rules_asciidoc_peppol_national.xquery -o:/target/PEPPOL-EN16931-UBL-NATIONAL.sch.adoc
+
+call :dashed "Remove old example files if they exist"
+set zip="%PROJECT%\target\site\files\BIS-Billing3-Examples.zip"
+if exist %zip% (
+    echo remove %zip%
+    del %zip%
+)
+
+call :dashed "Create zip of examples"
+powershell -command "Compress-Archive -Path '%PROJECT%/rules/examples' -DestinationPath '%PROJECT%/target/site/files/BIS-Billing3-Examples.zip' -Force"
+
+call :dashed "Create Guides"
+docker run --rm -i -v "%PROJECT%:/documents" -v "%PROJECT%/target:/target" difi/asciidoctor
+
+REM Ownership fix is Linux-specific and skipped
+endlocal
+goto :eof
+
+:dashed
+REM Function to print text with surrounding dashes, up to 80 characters total
+set "text=%~1"
+set "maxLength=80"
+
+REM Calculate the length of the text
+set "len=0"
+for /l %%i in (12,-1,0) do (
+    set /a "len|=1<<%%i"
+    for %%j in (!len!) do if "!text:~%%j,1!"=="" set /a "len&=~1<<%%i"
+)
+
+REM Calculate the number of dashes needed on each side
+set /a "totalDashes=maxLength-len-2"
+set /a "sideDashes=totalDashes/2"
+
+REM Create the dash strings for each side
+set "leftDashes="
+for /l %%i in (1,1,%sideDashes%) do set "leftDashes=!leftDashes!-"
+
+set "rightDashes=%leftDashes%"
+if %totalDashes% neq %sideDashes% set "rightDashes=%rightDashes%-"
+
+REM Print the final line with dashes, text, and additional dashes
+echo !leftDashes! %text% !rightDashes!
+goto :eof

guide/bis/settings.adoc

@@ -3,7 +3,7 @@
 :doctitle: image:../shared/images/peppol.jpg[float="right", width=100%] Peppol BIS Billing
 :shared-dir: ../../shared
 :snippet-dir: ../../rules/snippets
-:version: 3.0.17
+:version: 3.0.18
 :name-op-en: OpenPeppol AISBL, Post-Award Coordinating Community
 
 

guide/compliance/main.adoc

@@ -22,4 +22,6 @@ include::sender.adoc[]
 
 include::receiver.adoc[]
 
+include::payload.adoc[]
+
 :leveloffset: -1

guide/compliance/payload.adoc

@@ -0,0 +1,20 @@
+= Enveloping compliance
+[horizontal]
+
+== Enveloping of BIS message in Peppol Business Message Envelope (SBDH)
+* When a BIS message is enveloped, the value of the SBDH element *Sender/Identifier* SHALL match the *Party/EndpointID* element value of the sender party, including the value of its *schemeID* attribute.
+
+* When a BIS message is enveloped, the value of the SBDH element *Receiver/Identifier* SHALL match the *Party/EndpointID* element value of the receiver party, including the value of its *schemeID* attribute.
+
+Example:
+[attributes]
+====
+    BIS message: 
+        <cbc:EndpointID schemeID="0088">7315458756324</cbc:EndpointID>
+
+    SBDH envelope: 
+        <Identifier Authority="iso6523-actorid-upis">0088:7315458756324</Identifier>
+====
+
+See Policy for use of Identifiers for more information on how to represent identifiers in envelope and messages.
+

guide/profile/codes/invoice-specific.adoc

@@ -63,12 +63,6 @@ include::../../syntax/codelists/inv-type.adoc[]
 | 380
 | Invoice
 
-// |326
-// |Partial invoice
-// |Document/message specifying details of an incomplete invoice.
-// | 380
-// | Invoice
-
 |331
 |Commercial invoice which includes a packing list
 |Commercial transaction (invoice) will include a packing list.
@@ -87,12 +81,6 @@ 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
-
 |386
 |Prepayment invoice
 |An invoice to pay amounts for goods and services in advance; these amounts will be subtracted from the final invoice.

guide/release-notes/main.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/v3.0.18.adoc

@@ -0,0 +1,28 @@
+= Version 3.0.18
+[horizontal]
+Release date:: November 2024
+
+== Changes to BIS document
+
+== Changes to "BIS compliance" document
+* Added new compliance rules on how to use sender/receiver identifiers when enveloping a BIS3 message in Peppol Business Message Envelope (SBDH) 
+
+== Changes to code lists and validation artefacts
+
+* 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
+
+* Update for country-specific rule NL-R-008 Make rule domestic-only.
+* Correction in UNECERec20-11e for code HWE
+* CEN UBL and CII new version  1.3.13 of schematrons
+** Multiple allowances on one item #395
+** Update validation artafacts with Nov 24 codes #390
+** CII Schematron - BT-8 - [CII-SR-462] - Only one DueDateTypeCode shall be present - #387
+** Artefacts v1.3.12 (CII) do not check BR-62 / BR-63 correct any more #381
+** Contradicting message #379
+** CII special ID elements without attributes - not handled correctly #375
+** Commit did overwrite PR changes #374
+* Severity of Swedish country specific rules SE-R-003, SE-R-004 and SE-R-013 which verifies format of Swedish organization numbers are changed from warning to fatal.
+

guide/transaction-spec/codes/invoice-types-en.adoc

@@ -46,10 +46,6 @@ The codes below can be used in business term Invoice Type Code (BT-3) for invoic
 |Proforma invoice:: Document/message serving as a preliminary invoice, containing - on the whole - the same information as the final invoice, but not actually claiming payment.
 
 
-|326
-|Partial invoice:: Document/message specifying details of an incomplete invoice.
-
-
 |380
 |Commercial invoice:: Document/message claiming payment for goods or services supplied under conditions agreed between seller and buyer.
 

project.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project xmlns="urn:fdc:difi.no:2017:vefa:structure:Project-1">
 
-    <Name>Peppol BIS Billing 3.0 - May 2024 Release</Name>
+    <Name>Peppol BIS Billing 3.0 - November 2024 Release</Name>
 
     <Documentation path="bis/">Business Interoperability Specifications (BIS)</Documentation>
     <Documentation path="compliance/">BIS compliance</Documentation>

rules/buildconfig.xml

@@ -10,12 +10,15 @@
   <testfolder>unit-CII-IT</testfolder>  
   <testfolder>unit-CII-DK</testfolder> 
   <testfolder>unit-CII-SE</testfolder>  
+  <testfolder>unit-CII-NL</testfolder>  
   <testfolder>unit-UBL-PEPPOL</testfolder>
   <testfolder>unit-UBL-NO</testfolder>
   <testfolder>unit-UBL-IT</testfolder> 
   <testfolder>unit-UBL-DK</testfolder> 
+  <testfolder>unit-UBL-DE</testfolder>
   <testfolder>unit-UBL-SE</testfolder> 
-  <testfolder>unit-UBL-GR</testfolder> 
+  <testfolder>unit-UBL-GR</testfolder>
+  <testfolder>unit-UBL-NL</testfolder>
 
   <!-- CII -->