Skip to content

Commit

Permalink
Merge pull request #69 from OpenPEPPOL/2022-q3-release-candidate
Browse files Browse the repository at this point in the history
2022 q3 release candidate
  • Loading branch information
jerouris authored Nov 2, 2022
2 parents 1e957b9 + 7900959 commit 98772b3
Show file tree
Hide file tree
Showing 54 changed files with 854 additions and 382 deletions.
1 change: 1 addition & 0 deletions guides/changes/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
:source-language: xml
:sectanchors:
:sectnums:
:last-update-label!:

The following list give a general overview of the changes made to the specifications as part of the alignment with the EN 16931 invoice. This list does not address the additional RFC that were approved and adopted.

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

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.

Expand Down
2 changes: 1 addition & 1 deletion guides/methodology/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ v0.1.0
:source-language: xml
:sectanchors:
:sectnums:

:last-update-label!:

:leveloffset: +1

Expand Down
1 change: 1 addition & 0 deletions guides/methodology/schematron/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
:source-language: xml
:sectanchors:
:sectnums:
:last-update-label!:

This document gives a guidance in how to develop schematron artefacts in openPeppol Post Award Coordinating Community.

Expand Down
2 changes: 1 addition & 1 deletion guides/migration/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Draft, OpenPeppol AISBL, Post-Award Coordinating Community
:sectnums:
:CIUS: Core Invoice Usage Specification (CIUS)
:title-logo-image: ../images/peppol.jpg

:last-update-label!:

This document specifies the migration plan for transition from the current versions of Peppol BIS specifications, as listed below, to the updated Peppol BIS specifications (BIS version 3), as well as the phase out of the current Peppol BIS version 2 specifications. This plan is based on the {migration-policy}.

Expand Down
1 change: 1 addition & 0 deletions guides/profiles/1-catalogueonly/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ include::../../shared/links.adoc[]
:snippet-dir: ../../../../rules/snippets/catalogue
:catalogue-path: ../../transactions/19-catalogue
:response-path: ../../transactions/58-catalogue-response
:last-update-label!:

{description}

Expand Down
1 change: 1 addition & 0 deletions guides/profiles/18-punchout/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ include::../../shared/links.adoc[]
:source-language: xml
:sectanchors:
:sectnums:
:last-update-label!:
:title-logo-image: ../../shared/images/peppol.png
:snippet-dir: ../../../../rules/snippets/punchout
= image:../../shared/images/peppol.png[float="right"]BIS Punch Out 3.1
Expand Down
3 changes: 2 additions & 1 deletion guides/profiles/28-ordering/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ include::../../shared/links.adoc[]
:source-language: xml
:sectanchors:
:sectnums:
:last-update-label!:
:title-logo-image: ../../shared/images/peppol.png
:order: ../../transactions/01-order
:order-resp: ../../transactions/76-order-response
:snippet-dir: ../../../../rules/snippets/order
:snippet-response-dir: ../../../../rules/snippets/order-response

= image:../../shared/images/peppol.png[float="right"]BIS Ordering 3.2
= image:../../shared/images/peppol.png[float="right"]BIS Ordering 3.3
{author}


Expand Down
3 changes: 2 additions & 1 deletion guides/profiles/3-order-only/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ include::../../shared/links.adoc[]
:source-language: xml
:sectanchors:
:sectnums:
:last-update-label!:
:transaction-path: ../../transactions/01-order
:snippet-dir: ../../../../rules/snippets/order

= image:../../shared/images/peppol.png[float="right"]BIS Order only 3.2
= image:../../shared/images/peppol.png[float="right"]BIS Order only 3.3
{author}

{description}
Expand Down
1 change: 1 addition & 0 deletions guides/profiles/30-despatchadvice/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ include::../../shared/links.adoc[]
:source-language: xml
:sectanchors:
:sectnums:
:last-update-label!:
:title-logo-image: ../images/peppol.jpg
:snippet-dir: ../../../../rules/snippets/despatch
= image:../../shared/images/peppol.png[float="right"]Peppol BIS Despatch Advice 3.1
Expand Down
1 change: 1 addition & 0 deletions guides/profiles/36-mlr/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ include::../../shared/links.adoc[]
:source-language: xml
:sectanchors:
:sectnums:
:last-update-label!:
:title-logo-image: ../../shared/images/peppol.png
:snippet-dir: ../../../../rules/snippets/mlr
= image:../../shared/images/peppol.png[float="right"]BIS Message Level Response 3.0
Expand Down
1 change: 1 addition & 0 deletions guides/profiles/42-orderagreement/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ include::../../shared/links.adoc[]
:source-language: xml
:sectanchors:
:sectnums:
:last-update-label!:
:title-logo-image: ../../shared/images/peppol.png
:snippet-dir: ../../../../rules/snippets/order-agreement

Expand Down
12 changes: 6 additions & 6 deletions guides/profiles/63-invoiceresponse/descriptions/parties.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ This should not be general company email and phone unless the sender has in plac
<cac:PartyIdentification>
<cbc:ID schemeID="0088">senderif12345</cbc:ID>
</cac:PartyIdentification>
<cac:PartyName>
<cbc:Name>Buyer organization</cbc:Name>
</cac:PartyName>
<cac:PartyLegalEntity>
<cbc:RegistrationName>Buyer organization</cbc:RegistrationName>
</cac:PartyLegalEntity>
<cac:Contact>
<cbc:Name>Invoice processing department</cbc:Name>
<cbc:Telephone>012312312345</cbc:Telephone>
Expand All @@ -52,9 +52,9 @@ If this is a service provider, then the actual Seller may be identified as part
<cac:PartyIdentification>
<cbc:ID schemeID="0088">receiver12345</cbc:ID>
</cac:PartyIdentification>
<cac:PartyName>
<cbc:Name>Seller company</cbc:Name>
</cac:PartyName>
<cac:PartyLegalEntity>
<cbc:RegistrationName>Seller company</cbc:RegistrationName>
</cac:PartyLegalEntity>
</cac:ReceiverParty>
----

Expand Down
3 changes: 2 additions & 1 deletion guides/profiles/63-invoiceresponse/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ include::../../shared/links.adoc[]
:source-language: xml
:sectanchors:
:sectnums:
:last-update-label!:
:title-logo-image: ../../shared/images/peppol.png
:snippet-dir: ../../../../rules/snippets/imr

= image:../../shared/images/peppol.png[float="right"]BIS Invoice Response 3.1
= image:../../shared/images/peppol.png[float="right"]BIS Invoice Response 3.2
{author}

{description}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ The Seller may still respond externally if he has comments or objections to the
|RE |Rejected |Indication that the referenced offer or transaction (e.g., cargo booking or quotation request) is not accepted. |Status is used only when the Buyer will not process the referenced Invoice any further. +
Buyer is rejecting this invoice but not necessarily the commercial transaction.
Although it can be used also for rejection for commercial reasons (invoice not corresponding to delivery). |YES |YES |YES |YES
|AP |Accepted |Indication that the referenced offer or transaction (e.g., cargo booking or quotation request) has been accepted. |Status is used only when the Buyer has given a final approval of the invoice and the next step is payment |NO |NO |YES |YES
|AP |Accepted |Indication that the referenced offer or transaction (e.g., cargo booking or quotation request) has been accepted. |Status is used only when the Buyer has given a final approval of the invoice and the next step is payment |NO |NO |YES |NO
|PD with PPD (1) |Partially Paid |Indicates that the referenced document or transaction has been partially paid. |Status is used together with Clarification Reason code PPD, only when the Buyer has initiated the payment of the invoice without having paid the accepted amount in full. |NO |NO |NO |NO
|PD |Fully Paid |Indicates that the referenced document or transaction has been paid. |Status is used only when the Buyer has initiated the payment of the invoice. |NO |NO |NO |NO
|PD |Fully Paid |Indicates that the referenced document or transaction has been paid. |Status is used only when the Buyer has initiated the payment of the invoice. |NO |NO |NO |YES

|====

Expand Down
1 change: 1 addition & 0 deletions guides/profiles/64-catalogue-wo-response/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ include::../../shared/links.adoc[]
:source-language: xml
:sectanchors:
:sectnums:
:last-update-label!:
:snippet-dir: ../../../../rules/snippets/catalogue
:catalogue-path: ../../transactions/19-catalogue

Expand Down
1 change: 1 addition & 0 deletions guides/profiles/99-Sandbox/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ v3.0.0
:source-language: xml
:sectanchors:
:sectnums:
:last-update-label!:
:title-logo-image: ../../shared/images/peppol.png

{description}
Expand Down
2 changes: 1 addition & 1 deletion guides/release-notes/3-0-0/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
:source-highlighter: coderay
:source-language: xml
:sectanchors:

:last-update-label!:

This release is a new non-backwards compatible major upgrade of all OpenPeppol BIS specifications, other than the BIS Billing 3.0.

Expand Down
3 changes: 3 additions & 0 deletions guides/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,8 @@ IMPORTANT: Changes in code lists are also reflected by changes in the validation

:leveloffset: +1

include::v3.0.10.adoc[]

include::v3.0.9.adoc[]

include::v3.0.8.adoc[]
Expand Down
47 changes: 47 additions & 0 deletions guides/release-notes/v3.0.10.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
= Version 3.0.10
[horizontal]
Release date:: 2022-11-03

== BIS documentation
* Invoice Response
** Definition of status codes in section Status Codes corrected to be in line with rule OP-BR111-R012 so that Accepted is not a final status and Paid is a final status.
** Correction of examples in chapter 6.3
* 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.
* Order Response example in the BIS documentation (sectino 7.1.1) has been corrected. The example shows a response with type "Received" (code AB) but the example said that there was amendments in the details (which is not allowed with code AB)
* Catalogue with response
** Removed broken link to example files in section 6.8 and pointed out the main page Appendix A instead.
* Catalogue without response
** Removed broken link to example files in section 6.8 and pointed out the main page Appendix A instead.
* Correction of a bullet point explaining the example in section "Line TAX Category" in all BISes that uses it.

== Changes to syntax
* Despatch Advice transaction (T16)
** Reference to Sales Order Line number is added as an optional business term on Despatch advice line.
** Commodity Classification code added as an optional business term on Despatch advice line.
** Optional additional Document reference (incl business terms for attachments) added on header level. Optional business terms for Document references (no attachments) also added on line level.
** Optional business term for Carrier Party Identification added to the Carrier Party information.
** Optional TransportModeCode added on header level with codes from UN/ECE Rec 19.
** Cardinality of DeliveredQuantity on Despatch line changed to mandatory in syntax to correctly reflect the intention of the BIS.
** Examples updated
* Order transaction (T01)
** New business terms for RequestedDeliveryPeriod, Start time (tir01-p042) and End time (tir01-p043). Example updated.
** New business term for Project reference/ID (tir01-p044). Example updated.
* Order Response transaction (T76)
** New business terms for PromisedDeliveryPeriod, Start time (tir76-p010) and End time (tir76-p011). Added to example.
* Order Agreement transaction (T110)
** Optional element DocumentTypeCode (tir110-p008) added on ItemSpecificationDocumentReference level. Example updated.
** Optional element CompanyID added for PartyLegalEntity in both Buyer (tir110-p009) and Seller (tir110-p010). Example updated.

== Changes to code lists and validation artefacts

* Validation of code values for Tax Category codes are removed to allow for non-EU categories. In previous release (3.0.4), the TaxScheme/ID was generalized to allow for other schemes than VAT but also that category code should have been generalized. This release addresses this shortcoming (with a consequence that category code isn't validated). The change affects the following transactions:
** Order transaction (T01)
** Order Response transaction (T76)
** Catalogue transaction (T19)
** Order Agreement transaction (T110)
** Punch Out transaction (T77)
* Added DocumentType codes for Order transactions (T01) to allow for blanket orders (code 221) and Call-off (code 226). Applies in BIS specifications Order Only and Ordering.
* 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
* Added eas codes 9959. Removed 9906 and 9907.
* Added icd codes 0217, 0218, 0219, 0220
1 change: 1 addition & 0 deletions guides/review/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
:source-language: xml
:sectanchors:
:sectnums:
:last-update-label!:

:leveloffset: +1

Expand Down
3 changes: 2 additions & 1 deletion guides/shared/files/vat-cat-line.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ Each line may have the item TAX information including category code and percenta
include::../snippets/snippet-common.xml[tags=vat-line]
----
<1> TAX category according to codelist {vat-codes}
<2> Value must identify the correct tax type. For example VAT, GST or sales tax.
<2> The TAX percentage rate that applies to the item unless specific trade reasons apply such as exemptions
<3> Value must identify the correct tax type. For example VAT, GST or sales tax.
2 changes: 1 addition & 1 deletion guides/shared/links.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
:order-UC: https://github.com/OpenPEPPOL/poacc-upgrade-3/tree/master/rules/use-case-examples/order[Use case example files]
:order-response-UC: https://github.com/OpenPEPPOL/poacc-upgrade-3/tree/master/rules/use-case-examples/order-response[Use case example files]
:imr-UC: https://docs.peppol.eu/poacc/upgrade-3/files/PEPPOLBIS-Examples.zip[Use case example files]
:examples-zip: http://test-docs.peppol.eu/poacc/upgrade-3/files/PEPPOLBIS-Examples.zip[Example files (ZIP)]
:examples-zip: http://docs.peppol.eu/poacc/upgrade-3/files/PEPPOLBIS-Examples.zip[Example files (ZIP)]

//internal
:link-codelist: link:/poacc/upgrade-3/codelist/[Code list section]
Expand Down
2 changes: 2 additions & 0 deletions guides/transactions/01-order/description/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ include::tax-total.adoc[]

include::../../../shared/files/vat-cat-line.adoc[]

include::order-type.adoc[]

:leveloffset: -1
48 changes: 48 additions & 0 deletions guides/transactions/01-order/description/order-type.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
= Order Type Code
Following values may be uses as order type code but shall be treated as synonyms with 220 and process in the same way, unless bi-laterally agreed differently.


[cols="1,4"]
|===
h| Document location
| `cbc:OrderTypeCode`
h| Source codelist
|
link:http://www.unece.org/fileadmin/DAM/trade/untdid/d16b/tred/tred1001.htm[UN/CEFACT code list 1001, D.16B]
|===


[cols="1h,2s,4a,1,1m", options="header"]
.Code list
|===
| Code
| Name
| Description
| Synonym with
| UBL Message type

| 220
| Order
| Document/message by means of which a buyer initiates a transaction with a seller involving the supply of goods or services as specified, according to conditions set out in an offer, or otherwise known to the buyer.
|
| Order

| 221
| Blanket order
| Usage of document/message for general order purposes with later split into quantities and delivery dates and maybe delivery locations.
| 220
| Order

| 226
| Call off order
| Document/message to provide split quantities and delivery dates referring to a previous blanket order.
| 220
| Order

| 227
| Consignment order
| Order to deliver goods into stock with agreement on payment when goods are sold out of this stock.
| 220
| Order

|===
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
== Quantities and units

The table below lists quantities and units in the catalogue transaction. All quantities must be based on a Unit Of Measure (UOM) according UNECE Recommendation 20 and Recommendation 21 for UOM.
For xml-examples for quantities and units, we refer to {examples-zip}.
For xml-examples for quantities and units, we refer to Appendix A on the main page.

Following are two examples showing the use of different elements.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ a|
include::{snippet-response-dir}/snippet-1.xml[tags=response-header]
----

.UBL example of an order response using response code "AB" (order is received
.UBL example of an order response using response code "AB" (order is received)
[source, xml, indent=0]
----
include::{snippet-response-dir}/snippet-2.xml[tags=received]
Expand Down
1 change: 1 addition & 0 deletions guides/work/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
:source-language: xml
:sectanchors:
:sectnums:
:last-update-label!:

:leveloffset: +1

Expand Down
1 change: 1 addition & 0 deletions guides/work/rules/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
:source-language: xml
:sectanchors:
:sectnums:
:last-update-label!:

:leveloffset: +1

Expand Down
Loading

0 comments on commit 98772b3

Please sign in to comment.