Skip to content

Commit

Permalink
Merge pull request #73 from OpenPEPPOL/2020-Fall-ReleaseCandidate
Browse files Browse the repository at this point in the history
2020 fall release candidate
  • Loading branch information
jerouris authored Nov 2, 2020
2 parents 9f74863 + 150304f commit c65092d
Show file tree
Hide file tree
Showing 52 changed files with 3,713 additions and 1,295 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ tmp*
.idea
/.settings/
/.project
vagrant/.vagrant/machines/dev/virtualbox/private_key
*.xpr
4 changes: 2 additions & 2 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

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 specifiction.
.
Please use our link:https://openpeppol.atlassian.net/servicedesk/customer/portal/1[Service desk] to report any issues related to the specification.
.
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
PROJECT=$(dirname $(readlink -f "$0"))

if [ -e $PROJECT/target ]; then
docker run --rm -i -v $PROJECT:/src alpine:3.6 rm -rf /src/target
docker run --rm -i -v $PROJECT:/src alpine:3.11 rm -rf /src/target
fi

# Structure
docker run --rm -i \
-v $PROJECT:/src \
-v $PROJECT/target:/target \
difi/vefa-structure:0.6
difi/vefa-structure:0.7


# Validator
Expand All @@ -37,4 +37,4 @@ docker run --rm -i -v $PROJECT:/documents -v $PROJECT/target:/target difi/asciid


# Fix ownership
docker run --rm -i -v $PROJECT:/src alpine:3.6 chown -R $(id -g $USER).$(id -g $USER) /src/target
docker run --rm -i -v $PROJECT:/src alpine:3.11 chown -R $(id -g $USER).$(id -g $USER) /src/target
24 changes: 24 additions & 0 deletions guide/compliance/main.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
= Compliance to BIS
openPEPPOL AISBL <http://www.peppol.eu/>
:icons: font
:source-highlighter: coderay
:toc: left
:toclevels: 2
:sourcedir: .
:imagesdir: images
:title-logo-image: peppol.png

This section provides an overview of rules that receivers and/or senders of documents must fulfil to be compliant to a BIS. This is not a complete or normative listing of applicable rules.

A message is considered compliant to this BIS if no fatal errors are detected when validating with the current validation artefacts.

A message is also considered compliant to this BIS if only warnings (and no fatal errors) are detected when validating with the current validation artefacts.


:leveloffset: +1

include::sender.adoc[]

include::receiver.adoc[]

:leveloffset: -1
9 changes: 9 additions & 0 deletions guide/compliance/receiver.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
= Receivers compliance to BIS
[horizontal]

== Processing of rules
* A receiver SHALL NOT reject receiving messages which are compliant to the BIS.

* A receiver MAY reject receiving messages which are not compliant to the BIS.


5 changes: 5 additions & 0 deletions guide/compliance/sender.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
= Senders compliance to BIS
[horizontal]

== Processing of rules
* A sender SHALL NOT send messages that are not compliant to the BIS.
2 changes: 2 additions & 0 deletions guide/release-notes/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ IMPORTANT: Changes in code lists are also reflected by changes in the validation

:leveloffset: +1

include::v3.0.8.adoc[]

include::v3.0.7-hotfix.adoc[]

include::v3.0.6.adoc[]
Expand Down
17 changes: 17 additions & 0 deletions guide/release-notes/v3.0.7.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
= Version 3.0.8
[horizontal]
Release date:: 2020-11-01

== Changes to BIS document


== Changes to support documents


== Changes to code lists and validation artefacts
* Rule PEPPOL-COMMON-R040: "GLN must have a valid format according to GS1 rules". Changed from severity "warning" to "fatal". (The rule was introduced in fall 2019 with severity "warning" to avoid disruptions but with the intention to be changed to severity "fatal" after 6-12 months). Issue: [POACC-333] and [POACC-341]
* EAS code list, added code 0209, removed code 9958. Rule updated accordingly.
* ICD code list, added code 0209. Rule updated accordingly. Names and descriptions added where missing.
* VATEX code list, added code VATEX-EU-79C for repayment of expenditure. Codes put in upper case.
* Duplicate currency codes removed from ISO4217 code list. Issue: [POACC-339]

21 changes: 21 additions & 0 deletions guide/release-notes/v3.0.8.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
= Version 3.0.8
[horizontal]
Release date:: 2020-11-01

== Changes to BIS document
* Definitions for EndPoint identifiers BT-34 and BT-49 aligned with defintion in EN16931. Issue: [POACC-331]
* Migration plan from BIS2 to BIS3 removed. Is completed.
* Use GLN as the only examlpe in section 10.2. Delivery Details (Date and Location). Removed reference to GSRN from the description text. [POACC-332]
* Updating rule references in the Bis Syntax document to align with the schematron rules in use. Issue: [POACC-334]

== Changes to support documents


== Changes to code lists and validation artefacts
* Rule PEPPOL-COMMON-R040: "GLN must have a valid format according to GS1 rules". Changed from severity "warning" to "fatal". (The rule was introduced in fall 2019 with severity "warning" to avoid disruptions but with the intention to be changed to severity "fatal" after 6-12 months). Issue: [POACC-333] and [POACC-341]
* EAS code list, added code 0209, removed code 9958. Rule updated accordingly.
* ICD code list, added code 0209. Rule updated accordingly. Names and descriptions added where missing.
* VATEX code list, added code VATEX-EU-79C for repayment of expenditure. Rule updated accordingly.
* Duplicate currency codes removed from ISO4217 code list. Issue: [POACC-339]
* New national Swedish validation rule (SE-R-012) which gives warning on use of payment means code (31) which is often incorrectly used between Swedish suppliers and buyers. The rule only triggers if both buyer and supplier are Swedish.
* Added Greek PA National Rules
2 changes: 1 addition & 1 deletion guide/transaction-spec/descriptions/delivery-details.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ Delivery details may be given at document level.

Place and date of delivery is recommended, and should be sent unless this does not affect the ability to ensure the correctness of the invoice.

The delivery element contains information on name, address and delivery location identifier (`cac:Delivery/cac:DeliveryLocation/cbc:ID`) which may be used if the place of delivery is defined through an identifier. Examples are GLN (Global Location Number) or GSRN (Global Service Relationship Number) both issued by GS1.
The delivery element contains information on name, address and delivery location identifier (`cac:Delivery/cac:DeliveryLocation/cbc:ID`) which may be used if the place of delivery is defined through an identifier. For example GLN (Global Location Number)issued by GS1.

include::../../syntax/delivery.adoc[]
21 changes: 19 additions & 2 deletions project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,26 @@
<Name>PEPPOL BIS Billing 3.0</Name>

<Documentation path="bis/">Business Interoperability Specifications (BIS)</Documentation>
<Documentation path="migration/">Migration plan</Documentation>
<Documentation path="compliance/">BIS compliance</Documentation>
<Documentation path="release-notes/">Release notes</Documentation>

<!-- Documentation -->
<Resource>
<Type>Doc-1</Type>
<Path>bis/</Path>
<Title>Business Interoperability Specifications (BIS)</Title>
</Resource>
<Resource>
<Type>Doc-1</Type>
<Path>compliance/</Path>
<Title>BIS compliance</Title>
</Resource>
<Resource>
<Type>Doc-1</Type>
<Path>release-notes/</Path>
<Title>Release notes</Title>
</Resource>

<!-- Syntax -->
<Resource>
<Type>Structure-1</Type>
Expand Down Expand Up @@ -69,7 +86,7 @@
<Resource>
<Type>CodeList-1</Type>
<Path>structure/codelist/UNCL1001-inv.xml</Path>
</Resource>
</Resource>
<Resource>
<Type>CodeList-1</Type>
<Path>structure/codelist/UNCL1001-cn.xml</Path>
Expand Down
165 changes: 83 additions & 82 deletions rules/buildconfig.xml
Original file line number Diff line number Diff line change
@@ -1,82 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>
<buildConfigurations xmlns="http://difi.no/xsd/vefa/validator/1.0">

<package url="http://docs.peppol.eu/poacc/billing/3.0/">PEPPOL BIS Billing 3.0</package>

<testfolder>examples</testfolder>
<testfolder>snippets</testfolder>
<testfolder>unit-CII-PEPPOL</testfolder>
<testfolder>unit-CII-NO</testfolder>
<testfolder>unit-CII-IT</testfolder>
<testfolder>unit-CII-DK</testfolder>
<testfolder>unit-CII-SE</testfolder>
<testfolder>unit-UBL-PEPPOL</testfolder>
<testfolder>unit-UBL-NO</testfolder>
<testfolder>unit-UBL-IT</testfolder>
<testfolder>unit-UBL-DK</testfolder>
<testfolder>unit-UBL-SE</testfolder>

<!-- CII -->

<configuration>
<identifier>peppolbis-en16931-cen-cii</identifier>
<title>CEN TC434 UBL</title>
<file path="sch/CEN-EN16931-CII.sch"/>
</configuration>

<configuration>
<identifier>peppolbis-en16931-base-3.0-cii</identifier>
<title>PEPPOL BIS Billing 3.0 (Base)</title>
<file path="sch/PEPPOL-EN16931-CII.sch"/>
</configuration>

<configuration>
<identifier>peppolbis-en16931-01-3.0-cii</identifier>
<title>PEPPOL BIS Billing 3.0 (Profile 01)</title>
<declaration type="xml.uncefact">CrossIndustryInvoice::urn:fdc:peppol.eu:2017:poacc:billing:01:1.0::urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</declaration>
<inherit>uncefact-d16b-cii-uncoupled</inherit>
<inherit>peppolbis-en16931-cen-cii</inherit>
<inherit>peppolbis-en16931-base-3.0-cii</inherit>
</configuration>

<!-- UBL -->

<configuration>
<identifier>peppolbis-en16931-cen-ubl</identifier>
<title>CEN TC434 UBL</title>
<file path="sch/CEN-EN16931-UBL.sch" infoUrl="http://docs.peppol.eu/poacc/billing/3.0/rules/{}/"/>
</configuration>

<configuration>
<identifier>peppolbis-en16931-base-3.0-ubl</identifier>
<title>PEPPOL BIS Billing 3.0 (Base)</title>
<file path="sch/PEPPOL-EN16931-UBL.sch" infoUrl="http://docs.peppol.eu/poacc/billing/3.0/rules/{}/"/>
</configuration>

<configuration>
<identifier>peppolbis-en16931-stylesheet-3.0-ubl</identifier>
<title>PEPPOL BIS Billing 3.0 Stylesheet</title>
<stylesheet identifier="peppol-bis-billing-v3-ubl" source="../stylesheet/stylesheet-ubl.xslt" path="stylesheet/stylesheet-ubl.xslt"/>
</configuration>

<configuration>
<identifier>peppolbis-en16931-01-3.0-ubl-invoice</identifier>
<title>PEPPOL BIS Billing 3.0 (Profile 01)</title>
<declaration type="xml.ubl">Invoice::urn:fdc:peppol.eu:2017:poacc:billing:01:1.0#urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</declaration>
<inherit>ubl-invoice-2.1</inherit>
<inherit>peppolbis-en16931-cen-ubl</inherit>
<inherit>peppolbis-en16931-base-3.0-ubl</inherit>
<inherit>peppolbis-en16931-stylesheet-3.0-ubl</inherit>
</configuration>

<configuration>
<identifier>peppolbis-en16931-01-3.0-ubl-creditnote</identifier>
<title>PEPPOL BIS Billing 3.0 (Profile 01)</title>
<declaration type="xml.ubl">CreditNote::urn:fdc:peppol.eu:2017:poacc:billing:01:1.0#urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</declaration>
<inherit>ubl-creditnote-2.1</inherit>
<inherit>peppolbis-en16931-cen-ubl</inherit>
<inherit>peppolbis-en16931-base-3.0-ubl</inherit>
<inherit>peppolbis-en16931-stylesheet-3.0-ubl</inherit>
</configuration>

</buildConfigurations>
<?xml version="1.0" encoding="UTF-8"?>
<buildConfigurations xmlns="http://difi.no/xsd/vefa/validator/1.0">

<package url="http://docs.peppol.eu/poacc/billing/3.0/">PEPPOL BIS Billing 3.0</package>

<testfolder>examples</testfolder>
<testfolder>snippets</testfolder>
<testfolder>unit-CII-PEPPOL</testfolder>
<testfolder>unit-CII-NO</testfolder>
<testfolder>unit-CII-IT</testfolder>
<testfolder>unit-CII-DK</testfolder>
<testfolder>unit-CII-SE</testfolder>
<testfolder>unit-UBL-PEPPOL</testfolder>
<testfolder>unit-UBL-NO</testfolder>
<testfolder>unit-UBL-IT</testfolder>
<testfolder>unit-UBL-DK</testfolder>
<testfolder>unit-UBL-SE</testfolder>
<testfolder>unit-UBL-GR</testfolder>

<!-- CII -->

<configuration>
<identifier>peppolbis-en16931-cen-cii</identifier>
<title>CEN TC434 UBL</title>
<file path="sch/CEN-EN16931-CII.sch"/>
</configuration>

<configuration>
<identifier>peppolbis-en16931-base-3.0-cii</identifier>
<title>PEPPOL BIS Billing 3.0 (Base)</title>
<file path="sch/PEPPOL-EN16931-CII.sch"/>
</configuration>

<configuration>
<identifier>peppolbis-en16931-01-3.0-cii</identifier>
<title>PEPPOL BIS Billing 3.0 (Profile 01)</title>
<declaration type="xml.uncefact">CrossIndustryInvoice::urn:fdc:peppol.eu:2017:poacc:billing:01:1.0::urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</declaration>
<inherit>uncefact-d16b-cii-uncoupled</inherit>
<inherit>peppolbis-en16931-cen-cii</inherit>
<inherit>peppolbis-en16931-base-3.0-cii</inherit>
</configuration>

<!-- UBL -->

<configuration>
<identifier>peppolbis-en16931-cen-ubl</identifier>
<title>CEN TC434 UBL</title>
<file path="sch/CEN-EN16931-UBL.sch" infoUrl="http://docs.peppol.eu/poacc/billing/3.0/rules/{}/"/>
</configuration>

<configuration>
<identifier>peppolbis-en16931-base-3.0-ubl</identifier>
<title>PEPPOL BIS Billing 3.0 (Base)</title>
<file path="sch/PEPPOL-EN16931-UBL.sch" infoUrl="http://docs.peppol.eu/poacc/billing/3.0/rules/{}/"/>
</configuration>

<configuration>
<identifier>peppolbis-en16931-stylesheet-3.0-ubl</identifier>
<title>PEPPOL BIS Billing 3.0 Stylesheet</title>
<stylesheet identifier="peppol-bis-billing-v3-ubl" source="../stylesheet/stylesheet-ubl.xslt" path="stylesheet/stylesheet-ubl.xslt"/>
</configuration>

<configuration>
<identifier>peppolbis-en16931-01-3.0-ubl-invoice</identifier>
<title>PEPPOL BIS Billing 3.0 (Profile 01)</title>
<declaration type="xml.ubl">Invoice::urn:fdc:peppol.eu:2017:poacc:billing:01:1.0#urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</declaration>
<inherit>ubl-invoice-2.1</inherit>
<inherit>peppolbis-en16931-cen-ubl</inherit>
<inherit>peppolbis-en16931-base-3.0-ubl</inherit>
<inherit>peppolbis-en16931-stylesheet-3.0-ubl</inherit>
</configuration>

<configuration>
<identifier>peppolbis-en16931-01-3.0-ubl-creditnote</identifier>
<title>PEPPOL BIS Billing 3.0 (Profile 01)</title>
<declaration type="xml.ubl">CreditNote::urn:fdc:peppol.eu:2017:poacc:billing:01:1.0#urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</declaration>
<inherit>ubl-creditnote-2.1</inherit>
<inherit>peppolbis-en16931-cen-ubl</inherit>
<inherit>peppolbis-en16931-base-3.0-ubl</inherit>
<inherit>peppolbis-en16931-stylesheet-3.0-ubl</inherit>
</configuration>

</buildConfigurations>
Loading

0 comments on commit c65092d

Please sign in to comment.