Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/POACC-629' into POACC-629
Browse files Browse the repository at this point in the history
  • Loading branch information
DanOvergaard committed Feb 22, 2024
2 parents 41ad2d0 + 058e990 commit 3e416cc
Show file tree
Hide file tree
Showing 43 changed files with 753 additions and 1,140 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 @@ -19,4 +19,4 @@ jobs:
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 }}/${GITHUB_REF#refs/heads/}
aws s3 sync --acl public-read --region eu-west-1 target/site ${{ secrets.AWS_S3_PATH }}/poacc/billing/3.0/${GITHUB_REF#refs/heads/}
4 changes: 4 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,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.xquery -o:/target/PEPPOL-EN16931-UBL-GENERAL.sch.adoc
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 .


# Guides
docker run --rm -i -v $PROJECT:/documents -v $PROJECT/target:/target difi/asciidoctor
Expand Down
3 changes: 1 addition & 2 deletions guide/bis/appendix/examples.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
[[examples]]
= Example files

The example files are published on GitHub. In addition, several example files have been developed in order to extract snippets into this guide. You might freely use them, but be aware that they include several comments used to extract the snippets.
The example files can be downloaded from the main page of this specification. In addition, several example files have been developed in order to extract snippets into this guide. You might freely use them, but be aware that they include several comments used to extract the snippets.

* {link-examples}
* {link-snippets}
1 change: 1 addition & 0 deletions guide/bis/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ v{version}
:source-language: xml
:sectanchors:
:sectnums:
:last-update-label!:
:CIUS: Core Invoice Usage Specification (CIUS)
:title-logo-image: ../images/peppol.jpg

Expand Down
3 changes: 1 addition & 2 deletions guide/bis/settings.adoc
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
:lang: en

:doctitle: image:../shared/images/peppol.jpg[float="right", width=100%] Peppol BIS Billing
:version: 3.0.10
:shared-dir: ../../shared
:snippet-dir: ../../rules/snippets

:version: 3.0.15
:name-op-en: OpenPeppol AISBL, Post-Award Coordinating Community


Expand Down
1 change: 1 addition & 0 deletions guide/compliance/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ openPeppol AISBL <http://www.peppol.eu/>
:toc: left
:toclevels: 2
:sourcedir: .
:last-update-label!:
:imagesdir: images
:title-logo-image: peppol.png

Expand Down
1 change: 1 addition & 0 deletions guide/migration/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ OpenPeppol AISBL, Post-Award Community
:source-language: xml
:sectanchors:
:sectnums:
:last-update-label!:
:CIUS: Core Invoice Usage Specification (CIUS)
:title-logo-image: ../images/peppol.jpg

Expand Down
1 change: 1 addition & 0 deletions guide/national-rules/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ v{revision}
:source-language: xml
:sectanchors:
:sectnums:
:last-update-label!:
:CIUS: Core Invoice Usage Specification (CIUS)
:title-logo-image: ../images/peppol.jpg

Expand Down
12 changes: 12 additions & 0 deletions guide/profile/codes/invoice-specific.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ 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 @@ -81,6 +87,12 @@ 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
7 changes: 7 additions & 0 deletions guide/release-notes/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ openPeppol AISBL <http://www.peppol.eu/>
:toc: left
:toclevels: 2
:sourcedir: .
:last-update-label!:
:imagesdir: images
:title-logo-image: peppol.png

Expand All @@ -14,6 +15,12 @@ IMPORTANT: Changes in code lists are also reflected by changes in the validation

:leveloffset: +1

include::v3.0.16.adoc[]

include::v3.0.15.adoc[]

include::v3.0.14.adoc[]

include::v3.0.13.adoc[]

include::v3.0.12.adoc[]
Expand Down
23 changes: 23 additions & 0 deletions guide/release-notes/v3.0.14.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
= Version 3.0.14
[horizontal]
Release date:: 2022-11-03

== Changes to BIS document
* Editorial change in the documentaion templates. Many pages in previous releases had a "Last updated" timestamp in the page footer. The timestamp indicated when the HTML-page was generated by the documentation tool, not when the actual content of the page was updated/changed. The timestamp is now removed since it caused a lot of confusion.
* Example files added to zip-file that can be downloaded from the main page of the BIS.

== Changes to code lists and validation artefacts
* Rule PEPPOL-COMMON-R049 (ICD 0007 - Swedish organization number) changed from severity warning to fatal (as announced in the may 2022 release)
* Correction in Rule PEPPOL-COMMON-R050 (validation of Australian Business Number (ABN)) corrected
* Adopted EN 16931 validation artefacts release 1.3.9
** Added EAS codes 9959
** Removed EAS codes 9906 and 9907
** Added ICD codes 0217, 0218, 0219 and 0220
** Correction to validation rules as listed https://github.com/ConnectingEurope/eInvoicing-EN16931/releases/tag/validation-1.3.9

== Changes to Country-Specific Rules

* Rules GR-S-008-1, GR-R-008-2 and GR-R-008-3 have been updated, expecting the string \##INVOICE|URL## instead of \##INVOICE-URL## (POAC-518)
* Rule DK-R-015 removed
* Error text changes to DK-R-004 PEPPOL UBL & CII rules
* Error text changes to DK-R-003 Peppol CII rules
22 changes: 22 additions & 0 deletions guide/release-notes/v3.0.15.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
= Version 3.0.15
[horizontal]
Release date:: 2023-05-01

== Changes to BIS document


== Changes to code lists and validation artefacts

* Rule PEPPOL-COMMON-R050 (validation of Australian Business Number (ABN)) changed from severity warning to fatal (as announced in earlier release)
* Adopted EN 16931 validation artefacts release 1.3.10
** Added EAS codes 0221, 0230
** Removed EAS codes 9955
** Added ICD codes 0221, 0222, 0223, 0224, 0225, 0226, 0227, 0228, 0229, 0230
** Added Item type identification code (CL7143) EMD (EMDN (European Medical Device Nomenclature))
** Correction to validation rules as listed https://github.com/ConnectingEurope/eInvoicing-EN16931/releases/tag/validation-1.3.10

== Changes to Country-Specific Rules
* Removed Rules GR-R-007-1, GR-R-007-2 and GR-R-007-3
* Changed application context in rules GR-R-004-1 and GR-R-004-2: Rules do not apply now when Tax Representative is Greek
* Added Rule GR-R-011 making the Greek Tax Identification Number Mandatory for the supplier
* Renamed rule GR-R-011 to GR-S-011 and changed from fatal to warning
31 changes: 31 additions & 0 deletions guide/release-notes/v3.0.16.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
= Version 3.0.16
[horizontal]
Release date:: November 2023

== Changes to BIS document

* A recommendation has been added to the Sales Order Reference element for handling cases where there is no Purchase Order Reference. This clarifies what to do with the mandatory UBL element for Purchase Order Reference. Example file is added which illustrates this.

* Text in section 4.6 on negative invoices edited to remove historic comparison to BIS2 and justification for the change. No functional change.

== Changes to code lists and validation artefacts

* The validation rule identified as PEPPOL-EN16931-R006, which ensures that only one Invoice Object is allowed at the document level in an invoice/credit note, has been removed. This is because it duplicates the European standard rule UBL-SR-04, making it redundant and unnecessary.

* The structure of the Peppol Schematron rule set has been improved for better quality. A function that was previously located in the Greek rules section is now correctly positioned alongside other functions.

== EN 16931 schematrons updated
* Adopted version 1.3.11 of EN 16931 validation artefacts (# numbers refer to EN GitHub issues).
** Cardinality of DesignatedProductClassification in CII might stop the check BR-65 #355
** CII Missing check on DefinedTradeContact cardinality #354
** CII BT-17 and BT-18 checks to be improved #353
** UBL-SR-43 using attribute scheme instead of schemeID #351
** CII - missing cardinality check for ApplicableTradeTax (BG-30) #349
** Error in Validation of Rule BR-E-08 #348
** UBL-SR-51 does not check cac:DeliveryLocation #347
** Typo in rule-text UBL-CR-282, UBL-CR-247 and UBL-CR-183 (UBL) #346
** Typo in rule-text UBL-CR-583, UBL-CR-577 and UBL-CR-572 (UBL) #345
** BR-17 rule checks too hard? #344
** CII - missing cardinality check for SpecifiedTradePaymentTerms #343
** add missing currency codes #356
** Add EAS Code 0218 list #359
4 changes: 2 additions & 2 deletions guide/transaction-spec/codes/credit-note-types-en.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ The codes below can be used in business term Invoice Type Code (BT-3) for credit
|Credit note:: Document/message for providing credit information to the relevant party.


|384
|Corrected invoice:: Commercial invoice that includes revised information differing from an earlier submission of the same invoice.
// |384
// |Corrected invoice:: Commercial invoice that includes revised information differing from an earlier submission of the same invoice.


|81
Expand Down
14 changes: 4 additions & 10 deletions guide/transaction-spec/functionality/negative-invoices.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,15 @@
= Negative invoices and credit notes


In line with requirements of {EN16931} this BIS supports negative grand totals. This represents a significant change in comparison to {openpeppol}’s previous specifications where invoices and credit notes have non-negative total.

The argument for negative invoices is to open up for a wider spectrum of invoicing processes.
In line with requirements of {EN16931} this BIS supports negative grand totals in order to open up for a wider spectrum of invoicing processes.

Examples of such processes are

* Preliminary (estimated) consumption invoice that is balanced out in a later meter-based invoice;
* Pre-payment (with or without VAT) is settled through a final invoice; and
* Preliminary (estimated) consumption invoice that is balanced out in a later meter-based invoice;
* Pre-payment (with or without VAT) is settled through a final invoice; and
* Some user communities prefer to use negative invoice rather than credit note when correcting transactions.

====
NOTE: Buyers who value automatic matching of e-invoices to orders or invoicing objects may wish to limit the areas and situations where complex transactions can be accepted and voice their requirements at time of procurement.
====

The decision has the following implications on the transaction format:
This has the following implications on the transaction format:

* The invoice (now with “negative invoice capacity”) can function as an alternative to the credit note. Invoice-generating systems may implement either option, while invoice-receiving systems have to support both of them.
* The transaction format for credit note has to be designed to accommodate for negative grand total, as well; this is because an entire negative invoice may have to be balanced out by means of a credit note.
Expand Down
10 changes: 9 additions & 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</Name>
<Name>Peppol BIS Billing 3.0 - November 2023 Release</Name>

<Documentation path="bis/">Business Interoperability Specifications (BIS)</Documentation>
<Documentation path="compliance/">BIS compliance</Documentation>
Expand Down Expand Up @@ -144,6 +144,14 @@
<Title>Stylesheet for UBL instances</Title>
<Property key="download">stylesheet-ubl.xslt</Property>
</Resource>

<Resource>
<Type>native:File</Type>
<Path>project.xml</Path>
<Title>Example files</Title>
<Property key="download">BIS-Billing3-Examples.zip</Property>
<Property key="filename">BIS-Billing3-Examples.zip</Property>
</Resource>

<Resource>
<Type>native:File</Type>
Expand Down
Loading

0 comments on commit 3e416cc

Please sign in to comment.