Skip to content

Commit

Permalink
Merge branch '2024-q4-release' into revert-153-POACC-508
Browse files Browse the repository at this point in the history
  • Loading branch information
Zumbala authored Oct 31, 2024
2 parents 3fbe7ad + 5d35102 commit 393eb62
Show file tree
Hide file tree
Showing 23 changed files with 2,260 additions and 1,581 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-deploy-barnch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
uses: actions/checkout@v2

- name: Build Spec
run: bash ./build.sh
run: sudo bash ./build.sh

- name: Deploy on S3
env:
Expand Down
7 changes: 4 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ docker run --rm -i \


# Validator
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
docker run --rm -i -v $PROJECT:/src anskaffelser/validator:2.1.0 build -x -t -n eu.peppol.postaward.v3.billing -a rules,guide -target target/validator /src


# Generate adoc-files from rules
Expand All @@ -32,9 +32,10 @@ docker run --rm -i -v $PROJECT:/src -v $PROJECT/target/generated:/target --entry
docker run --rm -i -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

# Example files
docker run --rm -i -v $PROJECT/target/site/files:/src alpine:3.6 rm -rf /src/BIS-Billing3-Examples.zip
docker run --rm -i -v $PROJECT/rules/examples:/src -v $PROJECT/target/site/files:/target -w /src kramos/alpine-zip -r /target/BIS-Billing3-Examples.zip .
rm -rf $PROJECT/target/site/files/BIS-Billing3-Examples.zip

cd $PROJECT
zip -r target/site/files/BIS-Billing3-Examples.zip rules/examples

# Guides
docker run --rm -i -v $PROJECT:/documents -v $PROJECT/target:/target difi/asciidoctor
Expand Down
2 changes: 2 additions & 0 deletions guide/compliance/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,6 @@ include::sender.adoc[]

include::receiver.adoc[]

include::payload.adoc[]

:leveloffset: -1
20 changes: 20 additions & 0 deletions guide/compliance/payload.adoc
Original file line number Diff line number Diff line change
@@ -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.

12 changes: 0 additions & 12 deletions guide/profile/codes/invoice-specific.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down
16 changes: 15 additions & 1 deletion guide/release-notes/v3.0.18.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,26 @@ 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

* 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.
* Update for rule NL-R-008 (mandatory payment means), the check should not fire if the document is a credit note with a positive amount.

== 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.

4 changes: 0 additions & 4 deletions guide/transaction-spec/codes/invoice-types-en.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion project.xml
Original file line number Diff line number Diff line change
@@ -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 - Member Review</Name>

<Documentation path="bis/">Business Interoperability Specifications (BIS)</Documentation>
<Documentation path="compliance/">BIS compliance</Documentation>
Expand Down
Loading

0 comments on commit 393eb62

Please sign in to comment.