diff --git a/guides/changes/main.adoc b/guides/changes/main.adoc index 85cb4068..4d3b5137 100644 --- a/guides/changes/main.adoc +++ b/guides/changes/main.adoc @@ -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. diff --git a/guides/compliance/main.adoc b/guides/compliance/main.adoc index 8118fc4c..f8c5fc88 100644 --- a/guides/compliance/main.adoc +++ b/guides/compliance/main.adoc @@ -7,6 +7,7 @@ openPeppol AISBL :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. diff --git a/guides/methodology/main.adoc b/guides/methodology/main.adoc index 11bcf1d4..19109890 100644 --- a/guides/methodology/main.adoc +++ b/guides/methodology/main.adoc @@ -12,7 +12,7 @@ v0.1.0 :source-language: xml :sectanchors: :sectnums: - +:last-update-label!: :leveloffset: +1 diff --git a/guides/methodology/schematron/main.adoc b/guides/methodology/schematron/main.adoc index 4a17b012..ecf63ee9 100644 --- a/guides/methodology/schematron/main.adoc +++ b/guides/methodology/schematron/main.adoc @@ -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. diff --git a/guides/migration/main.adoc b/guides/migration/main.adoc index 83054d6b..e4020b78 100644 --- a/guides/migration/main.adoc +++ b/guides/migration/main.adoc @@ -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}. diff --git a/guides/profiles/1-catalogueonly/main.adoc b/guides/profiles/1-catalogueonly/main.adoc index b80643f2..f8de7032 100644 --- a/guides/profiles/1-catalogueonly/main.adoc +++ b/guides/profiles/1-catalogueonly/main.adoc @@ -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} diff --git a/guides/profiles/18-punchout/main.adoc b/guides/profiles/18-punchout/main.adoc index 6c4cf752..e2a128d2 100644 --- a/guides/profiles/18-punchout/main.adoc +++ b/guides/profiles/18-punchout/main.adoc @@ -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 diff --git a/guides/profiles/28-ordering/main.adoc b/guides/profiles/28-ordering/main.adoc index 24fec9bc..85e2aa4c 100644 --- a/guides/profiles/28-ordering/main.adoc +++ b/guides/profiles/28-ordering/main.adoc @@ -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} diff --git a/guides/profiles/3-order-only/main.adoc b/guides/profiles/3-order-only/main.adoc index f3248faf..ff6536de 100644 --- a/guides/profiles/3-order-only/main.adoc +++ b/guides/profiles/3-order-only/main.adoc @@ -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} diff --git a/guides/profiles/30-despatchadvice/main.adoc b/guides/profiles/30-despatchadvice/main.adoc index 0fabd593..c627b840 100644 --- a/guides/profiles/30-despatchadvice/main.adoc +++ b/guides/profiles/30-despatchadvice/main.adoc @@ -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 diff --git a/guides/profiles/36-mlr/main.adoc b/guides/profiles/36-mlr/main.adoc index 4bcb49ca..f7fcd685 100644 --- a/guides/profiles/36-mlr/main.adoc +++ b/guides/profiles/36-mlr/main.adoc @@ -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 diff --git a/guides/profiles/42-orderagreement/main.adoc b/guides/profiles/42-orderagreement/main.adoc index 1944506d..8479521c 100644 --- a/guides/profiles/42-orderagreement/main.adoc +++ b/guides/profiles/42-orderagreement/main.adoc @@ -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 diff --git a/guides/profiles/63-invoiceresponse/descriptions/parties.adoc b/guides/profiles/63-invoiceresponse/descriptions/parties.adoc index 3f19937f..87540c9a 100644 --- a/guides/profiles/63-invoiceresponse/descriptions/parties.adoc +++ b/guides/profiles/63-invoiceresponse/descriptions/parties.adoc @@ -25,9 +25,9 @@ This should not be general company email and phone unless the sender has in plac senderif12345 - - Buyer organization - + + Buyer organization + Invoice processing department 012312312345 @@ -52,9 +52,9 @@ If this is a service provider, then the actual Seller may be identified as part receiver12345 - - Seller company - + + Seller company + ---- diff --git a/guides/profiles/63-invoiceresponse/main.adoc b/guides/profiles/63-invoiceresponse/main.adoc index 27a9951c..31433c30 100644 --- a/guides/profiles/63-invoiceresponse/main.adoc +++ b/guides/profiles/63-invoiceresponse/main.adoc @@ -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} diff --git a/guides/profiles/63-invoiceresponse/process/code-policy/status-codes.adoc b/guides/profiles/63-invoiceresponse/process/code-policy/status-codes.adoc index a9f85b9a..496d806f 100644 --- a/guides/profiles/63-invoiceresponse/process/code-policy/status-codes.adoc +++ b/guides/profiles/63-invoiceresponse/process/code-policy/status-codes.adoc @@ -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 |==== diff --git a/guides/profiles/64-catalogue-wo-response/main.adoc b/guides/profiles/64-catalogue-wo-response/main.adoc index 5f930c73..36a43ad6 100644 --- a/guides/profiles/64-catalogue-wo-response/main.adoc +++ b/guides/profiles/64-catalogue-wo-response/main.adoc @@ -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 diff --git a/guides/profiles/99-Sandbox/main.adoc b/guides/profiles/99-Sandbox/main.adoc index 0a5818c3..db2fccea 100644 --- a/guides/profiles/99-Sandbox/main.adoc +++ b/guides/profiles/99-Sandbox/main.adoc @@ -13,6 +13,7 @@ v3.0.0 :source-language: xml :sectanchors: :sectnums: +:last-update-label!: :title-logo-image: ../../shared/images/peppol.png {description} diff --git a/guides/release-notes/3-0-0/main.adoc b/guides/release-notes/3-0-0/main.adoc index ed2734ba..0cdafbfa 100644 --- a/guides/release-notes/3-0-0/main.adoc +++ b/guides/release-notes/3-0-0/main.adoc @@ -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. diff --git a/guides/release-notes/main.adoc b/guides/release-notes/main.adoc index a1300085..82465ae6 100644 --- a/guides/release-notes/main.adoc +++ b/guides/release-notes/main.adoc @@ -5,6 +5,7 @@ openPeppol AISBL :toc: left :toclevels: 2 :sourcedir: . +:last-update-label!: :imagesdir: images :title-logo-image: peppol.png @@ -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[] diff --git a/guides/release-notes/v3.0.10.adoc b/guides/release-notes/v3.0.10.adoc new file mode 100644 index 00000000..d8920bee --- /dev/null +++ b/guides/release-notes/v3.0.10.adoc @@ -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 diff --git a/guides/review/main.adoc b/guides/review/main.adoc index 3f9549dd..cf0016c5 100644 --- a/guides/review/main.adoc +++ b/guides/review/main.adoc @@ -8,6 +8,7 @@ :source-language: xml :sectanchors: :sectnums: +:last-update-label!: :leveloffset: +1 diff --git a/guides/shared/files/vat-cat-line.adoc b/guides/shared/files/vat-cat-line.adoc index d08098fa..a4c3a1fa 100644 --- a/guides/shared/files/vat-cat-line.adoc +++ b/guides/shared/files/vat-cat-line.adoc @@ -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. diff --git a/guides/shared/links.adoc b/guides/shared/links.adoc index f735ee78..c96d6bd2 100644 --- a/guides/shared/links.adoc +++ b/guides/shared/links.adoc @@ -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] diff --git a/guides/transactions/01-order/description/index.adoc b/guides/transactions/01-order/description/index.adoc index bc49dc4e..ed52c23d 100644 --- a/guides/transactions/01-order/description/index.adoc +++ b/guides/transactions/01-order/description/index.adoc @@ -25,4 +25,6 @@ include::tax-total.adoc[] include::../../../shared/files/vat-cat-line.adoc[] +include::order-type.adoc[] + :leveloffset: -1 diff --git a/guides/transactions/01-order/description/order-type.adoc b/guides/transactions/01-order/description/order-type.adoc new file mode 100644 index 00000000..3c6bbd04 --- /dev/null +++ b/guides/transactions/01-order/description/order-type.adoc @@ -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 + +|=== diff --git a/guides/transactions/19-catalogue/description/quantitiesandunits.adoc b/guides/transactions/19-catalogue/description/quantitiesandunits.adoc index 1d73f69f..0163723d 100644 --- a/guides/transactions/19-catalogue/description/quantitiesandunits.adoc +++ b/guides/transactions/19-catalogue/description/quantitiesandunits.adoc @@ -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. diff --git a/guides/transactions/76-order-response/description/response-code.adoc b/guides/transactions/76-order-response/description/response-code.adoc index e8e179c3..d36acef4 100644 --- a/guides/transactions/76-order-response/description/response-code.adoc +++ b/guides/transactions/76-order-response/description/response-code.adoc @@ -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] diff --git a/guides/work/main.adoc b/guides/work/main.adoc index ebac4a4b..0fc44cb8 100644 --- a/guides/work/main.adoc +++ b/guides/work/main.adoc @@ -8,6 +8,7 @@ :source-language: xml :sectanchors: :sectnums: +:last-update-label!: :leveloffset: +1 diff --git a/guides/work/rules/main.adoc b/guides/work/rules/main.adoc index b4c3a35b..3a46f1b8 100644 --- a/guides/work/rules/main.adoc +++ b/guides/work/rules/main.adoc @@ -8,6 +8,7 @@ :source-language: xml :sectanchors: :sectnums: +:last-update-label!: :leveloffset: +1 diff --git a/project.xml b/project.xml index fb5a10d3..f0c4608a 100644 --- a/project.xml +++ b/project.xml @@ -8,15 +8,15 @@ - Overview of alignments BIS DOCUMENTS - - Peppol BIS Order only 3.2 - - Peppol BIS Ordering 3.2 + - Peppol BIS Order only 3.3 + - Peppol BIS Ordering 3.3 - Peppol BIS Catalogue with response 3.1 - Peppol BIS Catalogue without response 3.1 - Peppol BIS Despatch Advice 3.1 - Peppol BIS Punch Out 3.1 - Peppol BIS Order Agreement 3.0 - Peppol BIS Message Level Response 3.0 - - Peppol BIS Invoice Response 3.1 + - Peppol BIS Invoice Response 3.2 @@ -25,22 +25,22 @@ Structure-1 structure/syntax/ubl-order.xml - Peppol Order transaction 3.2 (T01) + Peppol Order transaction 3.3 (T01) Structure-1 structure/syntax/ubl-order-response.xml - Peppol Order Response transaction 3.0 (T76) + Peppol Order Response transaction 3.1 (T76) Structure-1 structure/syntax/ubl-orderagreement.xml - Peppol Order Agreement transaction 3.0 (T110) + Peppol Order Agreement transaction 3.1 (T110) Structure-1 structure/syntax/ubl-catalogue.xml - Peppol Catalogue transaction 3.1 (T19) + Peppol Catalogue transaction 3.2 (T19) Structure-1 @@ -50,12 +50,12 @@ Structure-1 structure/syntax/ubl-despatch-advice.xml - Peppol Despatch Advice transaction 3.1 (T16) + Peppol Despatch Advice transaction 3.2 (T16) Structure-1 structure/syntax/ubl-shoppingcart.xml - Peppol Punch Out transaction 3.1 (T77) + Peppol Punch Out transaction 3.2 (T77) Structure-1 @@ -110,6 +110,13 @@ rules/sch/parts/PEPPOL-M-T110.sch Business rules for Peppol Order Agreement transaction 3.0 + + T71 + native:Schematron + rules/sch/parts/PEPPOL-M-T71.sch + Business rules for Peppol Message Level Response transaction 3.0 + + T111 native:Schematron @@ -217,6 +224,11 @@ CodeList-1 structure/codelist/UNCL5387.xml + + CodeList-1 + structure/codelist/UNECERec19.xml + + CodeList-1 structure/codelist/UNECERec20-11e.xml diff --git a/rules/examples/Despatch Advice use cases/DespatchAdvice-BIS3_UseCase5.xml b/rules/examples/Despatch Advice use cases/DespatchAdvice-BIS3_UseCase5.xml index 1483e6b5..d78232b9 100644 --- a/rules/examples/Despatch Advice use cases/DespatchAdvice-BIS3_UseCase5.xml +++ b/rules/examples/Despatch Advice use cases/DespatchAdvice-BIS3_UseCase5.xml @@ -1,309 +1,327 @@ - urn:fdc:peppol.eu:poacc:trns:despatch_advice:3 - urn:fdc:peppol.eu:poacc:bis:despatch_advice:3 - 1234 - 2019-03-15 - 08:00:00 - Use Case 5 Demonstrates the use of most of the existing terms available in the Despatch advice message - - 4321 - - - - 7385000000124 - - 7385000000124 - - - - Sellerstreet - Sstaden - 12355 - - SE - - - - Consortial - - - John - 123456789 - John@Sseler.se - - - - - - 7398000000124 - - 7390000435951 - - - - Leveransgatan 1 - Lastkaj 2 - Kstaden - 12345 - - Lastkajen - - - SE - - - - IYT Corporation - - - - Tony Erwing - 01272653214 - tony@buyer.se - - - - - - 7390000400003 - - - Köparen - - - Köpargatan 1 - Hus A - Kstaden - 12345 - - SE - - - - - - - - 7390000435968 - - - Godsmottagaren - - - Leveransgatan 1 - Avdelning 2 - Kstaden - 12345 - - Rum 7 - - - SE - - - - - - 57098761234567890 - Free text information relating to the Shipment - 20 - 0.5 - - 570987698767654567898767876765 - - - Danske post - - - - - 1178298510DK - - 2019-03-15 - 08:00:00 - 2019-03-16 - 12:00:00 - - - - - 1 - Free text information relating to the despatch line - 23 - - 1 - - 4321 - - - - Item123 - - 07311100000047 - 123 - - - OR250RHZ444 - - 898A123 - 2021-07-01 - - - - - NA - - 173111000000000013 - BX - - AAB - 7.00 - - - - - - 2 - Free text information relating to the despatch line - 6 - - 2 - - 4321 - - - - Item456 - - 010120402 - 123 - - - 2019-05-01 - - - - NA - - 173111000000000013 - PA - - AAB - 5.00 - - - - - - 3A - Free text information relating to the despatch line - 3.0 - - 3 - - 4321 - - - - Item789 - - 010120403 - - - 2021-04-15 - - - - NA - - 173111000000000020 - CT - - AAB - 3.1 - - - - - - 3B - Free text information relating to the despatch line - 0.975 - - 3 - - 4321 - - - - Item789 - - 010120403 - - - 2021-04-25 - - - - NA - - 173111000000000037 - CT - - AAB - 1.0 - - - - - - 4 - Free text information relating to the despatch line - 3 - - 5 - - 4321 - - - - Item987 - - 7611104117059 - - - ADR - 2.3 - - - OR250RHZ4464 - - 898A129 - - - - OR250RHZ445 - - - OR250RHZ446 - - - - NA - - 173111000000000044 - PA - true - - AAB - 3.60 - - - - - + urn:fdc:peppol.eu:poacc:trns:despatch_advice:3 + urn:fdc:peppol.eu:poacc:bis:despatch_advice:3 + 1234 + 2019-03-15 + 08:00:00 + Use Case 5 Demonstrates the use of most of the existing terms available in the Despatch advice message + + 4321 + + + doc-34 + Timesheet + + QklTIE9yZGVyIEFncmVlbWVudCAtIDQyQQ== + + http://www.example.com/image.jpg + + + + + + 7385000000124 + + 7385000000124 + + + Sellerstreet + Sstaden + 12355 + + SE + + + + Consortial + + + John + 123456789 + John@Sseler.se + + + + + + 7398000000124 + + 7390000435951 + + + Leveransgatan 1 + Lastkaj 2 + Kstaden + 12345 + + Lastkajen + + + SE + + + + IYT Corporation + + + + Tony Erwing + 01272653214 + tony@buyer.se + + + + + + 7390000400003 + + + Köparen + + + Köpargatan 1 + Hus A + Kstaden + 12345 + + SE + + + + + + + + 7390000435968 + + + Godsmottagaren + + + Leveransgatan 1 + Avdelning 2 + Kstaden + 12345 + + Rum 7 + + + SE + + + + + + 57098761234567890 + Free text information relating to the Shipment + 20 + 0.5 + + 570987698767654567898767876765 + + + 5533221100 + + + Danske post + + + + + 2 + + + 1178298510DK + + 2019-03-15 + 08:00:00 + 2019-03-16 + 12:00:00 + + + + + 1 + Free text information relating to the despatch line + 23 + + 1 + 10 + + 4321 + + + + doc-30 + Weight statement + + + Item123 + + 07311100000047 + 123 + + + 9873242 + + + OR250RHZ444 + + 898A123 + 2021-07-01 + + + + + NA + + 173111000000000013 + BX + + AAB + 7.00 + + + + + + 2 + Free text information relating to the despatch line + 6 + + 2 + + 4321 + + + + Item456 + + 010120402 + 123 + + + 2019-05-01 + + + + NA + + 173111000000000013 + PA + + AAB + 5.00 + + + + + + 3A + Free text information relating to the despatch line + 3.0 + + 3 + + 4321 + + + + Item789 + + 010120403 + + + 2021-04-15 + + + + NA + + 173111000000000020 + CT + + AAB + 3.1 + + + + + + 3B + Free text information relating to the despatch line + 0.975 + + 3 + + 4321 + + + + Item789 + + 010120403 + + + 2021-04-25 + + + + NA + + 173111000000000037 + CT + + AAB + 1.0 + + + + + + 4 + Free text information relating to the despatch line + 3 + + 5 + + 4321 + + + + Item987 + + 7611104117059 + + + ADR + 2.3 + + + OR250RHZ4464 + + 898A129 + + + + OR250RHZ445 + + + OR250RHZ446 + + + + NA + + 173111000000000044 + PA + true + + AAB + 3.60 + + + + + \ No newline at end of file diff --git a/rules/examples/OrderAgreement_Example.xml b/rules/examples/OrderAgreement_Example.xml index 6d3e89f9..a4ec664c 100644 --- a/rules/examples/OrderAgreement_Example.xml +++ b/rules/examples/OrderAgreement_Example.xml @@ -63,6 +63,7 @@ The Supplier AB + 123456789 John Doe @@ -92,6 +93,7 @@ City Hospital + 931186755 @@ -213,6 +215,7 @@ 147852 + TRADE_ITEM_DESCRIPTION Timesheet UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi diff --git a/rules/examples/OrderResponse_Example.xml b/rules/examples/OrderResponse_Example.xml index b683e2a5..1494c23c 100644 --- a/rules/examples/OrderResponse_Example.xml +++ b/rules/examples/OrderResponse_Example.xml @@ -41,7 +41,9 @@ 2013-07-15 + 12:30:00 2013-07-16 + 18:00:00 diff --git a/rules/examples/Order_Example.xml b/rules/examples/Order_Example.xml index a497d79d..2562a046 100644 --- a/rules/examples/Order_Example.xml +++ b/rules/examples/Order_Example.xml @@ -46,6 +46,9 @@ 34322 + + PID33 + 987654325 @@ -204,7 +207,9 @@ 2012-10-10 + 12:30:00 2012-10-20 + 18:00:00 diff --git a/rules/sch/PEPPOLBIS-T01.sch b/rules/sch/PEPPOLBIS-T01.sch index ef9eaa0e..be064267 100644 --- a/rules/sch/PEPPOLBIS-T01.sch +++ b/rules/sch/PEPPOLBIS-T01.sch @@ -3,7 +3,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" schemaVersion="iso" queryBinding="xslt2"> - Rules for PEPPOL Order transaction 3.0 + Rules for PEPPOL Order transaction 3.3 diff --git a/rules/sch/PEPPOLBIS-T110.sch b/rules/sch/PEPPOLBIS-T110.sch index 4a7bb5ef..5a3be200 100644 --- a/rules/sch/PEPPOLBIS-T110.sch +++ b/rules/sch/PEPPOLBIS-T110.sch @@ -3,7 +3,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" schemaVersion="iso" queryBinding="xslt2"> - Rules for PEPPOL Order Agreement transaction 3.0 + Rules for PEPPOL Order Agreement transaction 3.1 diff --git a/rules/sch/PEPPOLBIS-T111.sch b/rules/sch/PEPPOLBIS-T111.sch index a4ea923e..807bfd3f 100644 --- a/rules/sch/PEPPOLBIS-T111.sch +++ b/rules/sch/PEPPOLBIS-T111.sch @@ -3,7 +3,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" schemaVersion="iso" queryBinding="xslt2"> - Rules for PEPPOL Invoice Response transaction 3.0 + Rules for PEPPOL Invoice Response transaction 3.1 diff --git a/rules/sch/PEPPOLBIS-T16.sch b/rules/sch/PEPPOLBIS-T16.sch index e9f84ca4..e179f3fd 100644 --- a/rules/sch/PEPPOLBIS-T16.sch +++ b/rules/sch/PEPPOLBIS-T16.sch @@ -3,7 +3,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" schemaVersion="iso" queryBinding="xslt2"> - Rules for PEPPOL Despatch Advice transaction 3.0 + Rules for PEPPOL Despatch Advice transaction 3.2 diff --git a/rules/sch/PEPPOLBIS-T19.sch b/rules/sch/PEPPOLBIS-T19.sch index 76446bdb..449f6ea3 100644 --- a/rules/sch/PEPPOLBIS-T19.sch +++ b/rules/sch/PEPPOLBIS-T19.sch @@ -3,7 +3,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" schemaVersion="iso" queryBinding="xslt2"> - Rules for PEPPOL Catalogue transaction 3.0 + Rules for PEPPOL Catalogue transaction 3.2 diff --git a/rules/sch/PEPPOLBIS-T76.sch b/rules/sch/PEPPOLBIS-T76.sch index 85edaba9..cb26c012 100644 --- a/rules/sch/PEPPOLBIS-T76.sch +++ b/rules/sch/PEPPOLBIS-T76.sch @@ -3,7 +3,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" schemaVersion="iso" queryBinding="xslt2"> - Rules for PEPPOL Order Response transaction 3.0 + Rules for PEPPOL Order Response transaction 3.1 diff --git a/rules/sch/PEPPOLBIS-T77.sch b/rules/sch/PEPPOLBIS-T77.sch index f2899b02..cb4abda4 100644 --- a/rules/sch/PEPPOLBIS-T77.sch +++ b/rules/sch/PEPPOLBIS-T77.sch @@ -3,7 +3,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" schemaVersion="iso" queryBinding="xslt2"> - Rules for PEPPOL Punch Out transaction 3.0 + Rules for PEPPOL Punch Out transaction 3.2 diff --git a/rules/sch/parts/common/rules.sch b/rules/sch/parts/common/rules.sch index c8bbe622..4c3a9020 100644 --- a/rules/sch/parts/common/rules.sch +++ b/rules/sch/parts/common/rules.sch @@ -44,9 +44,9 @@ Italian VAT Code (Partita Iva) must be stated in the correct format - Swedish organization number MUST be stated in the correct format. + Swedish organization number MUST be stated in the correct format. - Australian Business Number (ABN) MUST be stated in the correct format. + Australian Business Number (ABN) MUST be stated in the correct format. diff --git a/rules/snippets/order-response/snippet-2.xml b/rules/snippets/order-response/snippet-2.xml index 6917e24c..af72517d 100644 --- a/rules/snippets/order-response/snippet-2.xml +++ b/rules/snippets/order-response/snippet-2.xml @@ -10,7 +10,6 @@ 2013-07-01 06:10:10 AB - Response message with amendments in the details EUR YourRef @@ -38,11 +37,6 @@ - - - 2013-07-15 - 2013-07-16 - - + diff --git a/rules/unit-common/PEPPOL-COMMON-R049.xml b/rules/unit-common/PEPPOL-COMMON-R049.xml index 7e397c80..7aeb82ed 100644 --- a/rules/unit-common/PEPPOL-COMMON-R049.xml +++ b/rules/unit-common/PEPPOL-COMMON-R049.xml @@ -26,7 +26,7 @@ - PEPPOL-COMMON-R049 + PEPPOL-COMMON-R049 - PEPPOL-COMMON-R049 + PEPPOL-COMMON-R049 OVTcode Intended Purpose/App. Area: Identification scheme will be used for electronic trade purposes in e-invoicing, purchasing, electronic receipts. Issuing agency: TIEKE- Tietoyhteiskunnan kehittamiskeskus, FINLAND. + + 0217 + The Netherlands Chamber of Commerce and Industry establishment number + Intended Purpose/App. Area: Electronic invoicing. Issuing agency: Nederlands Normalisatie Instituut (NEN) + + + 0218 + Unified registration number (Latvia) + Intended Purpose/App. Area: Each legal entity registered with the Register of Enterprises of the Republic of Latvia is assigned a unique unified registration number. This unique unified registration number is used to identify legal subjects for every purpose where it might be necessary, including for the use of the tax authority. Issuing agency: The Register of Enterprises of the Republic of Latvia. + + + 0219 + Taxpayer registration code (Latvia) + Intended Purpose/App. Area: For use in Electronic data interchange (EDI) to identify private and public organizations. Issuing agency: State Revenue Service of the Republic of Latvia. + + + 0220 + The Register of Natural Persons (Latvia) + Intended Purpose/App. Area: The Register combines the functionality of the current information system of the Population Register and Civil Register. The Register is a uniform state registration and recording system of information and natural persons that provides identification of natural persons, data processing and accumulation, and includes and updates information about civil entries. The data included in the Register is used for statistical surveys, tax forecasting and calculation, organizing of elections and other processes of national importance. When entering information regarding a person in the Register, the Office of Citizenship and Migration Affairs of the Republic of Latvia shall assign an automatically generated individual personal identity number thereto. Issuing agency: Office of Citizenship and Migration Affairs of the Republic of Latvia. + + diff --git a/structure/codelist/UNCL1001_T01.xml b/structure/codelist/UNCL1001_T01.xml index 72f56828..a1130abb 100644 --- a/structure/codelist/UNCL1001_T01.xml +++ b/structure/codelist/UNCL1001_T01.xml @@ -7,8 +7,7 @@ UN/CEFACT openPEPPOL - - + 220 Order Document/message by means of which a buyer initiates a @@ -17,12 +16,25 @@ out in an offer, or otherwise known to the buyer. - + + + 221 + Blanket order + Usage of document/message for general order purposes with later split into quantities and delivery dates and maybe delivery locations. + + + + + 226 + Call off order + Document/message to provide split quantities and delivery dates referring to a previous blanket order. + + + 227 Consignment order - Order to deliver goods into stock with agreement on - payment when goods are sold out of this stock. + Order to deliver goods into stock with agreement on payment when goods are sold out of this stock. diff --git a/structure/codelist/UNECERec19.xml b/structure/codelist/UNECERec19.xml new file mode 100644 index 00000000..a95c5dea --- /dev/null +++ b/structure/codelist/UNECERec19.xml @@ -0,0 +1,61 @@ + + + + Recommandation 19 (UN/ECE) + UNECERec19 + TRADE/CEFACT/2001/19 + UN/ECE + + + + 0 + Transport mode not specified + Transport mode has not been specified + + + 1 + Maritime transport + Transport of goods and/or persons is by sea + + + 2 + Rail transport + Transport of goods and/or persons is by rail + + + 3 + Road transport + Transport of goods and/or persons is by road + + + 4 + Air transport + Transport of goods and/or persons is by air + + + 5 + Mail + Method to convey goods is by mail + + + 6 + Multimodal transport + Method to convey goods and/or persons is by multimodal transport + + + 7 + Fixed transport installation + Transport of item is via a fixed transport installation + + + 8 + Inland water transport + Transport of goods and/or persons is by inland water + + + 9 + Transport mode not applicable + The mode of transport is not applicable + + + diff --git a/structure/codelist/eas.xml b/structure/codelist/eas.xml index 9ab5410b..b87003d1 100644 --- a/structure/codelist/eas.xml +++ b/structure/codelist/eas.xml @@ -53,18 +53,10 @@ 0142 SECETI Object Identifiers - - 0147 - Standard Company Code - 0151 Australian Business Number (ABN) Scheme - - 0170 - Teikoku Company Code - 0183 Numéro d'identification suisse des enterprises (IDE), Swiss Unique Business @@ -162,14 +154,6 @@ 9901 Danish Ministry of the Interior and Health - - 9906 - Ufficio responsabile gestione partite IVA - - - 9907 - TAX Authority - 9910 Hungary VAT number @@ -334,5 +318,9 @@ 9957 French VAT number + + 9959 + Employer Identification Number (EIN, USA) + diff --git a/structure/syntax/ubl-catalogue.xml b/structure/syntax/ubl-catalogue.xml index 124b25ed..b39ac040 100644 --- a/structure/syntax/ubl-catalogue.xml +++ b/structure/syntax/ubl-catalogue.xml @@ -1661,7 +1661,6 @@ Code tir19-094 - UNCL5305 S diff --git a/structure/syntax/ubl-despatch-advice.xml b/structure/syntax/ubl-despatch-advice.xml index 9ffecf09..3548cd19 100644 --- a/structure/syntax/ubl-despatch-advice.xml +++ b/structure/syntax/ubl-despatch-advice.xml @@ -73,6 +73,66 @@ tir16-006 + + cac:AdditionalDocumentReference + Additional documents + + cbc:ID + Document identifier + An identifier for the referenced document. + tir16-p049 + doc-34 + + + cbc:DocumentType + Document description + Textual description of the document. + Text + tir16-p050 + Timesheet + + + cac:Attachment + Attachment(s) + + cbc:EmbeddedDocumentBinaryObject + Attached document + The attached document embeded as binary object, coded as Base64. + The binary object has two supplementary components: a Mime Code, which specifies the Mime type of the attachment and a Filename that is provided by (or on behalf of) the sender of the document + Binary object + tir16-p051 + + mimeCode + Attached document Mime code + The mime code of the attached document. + MimeCode + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + + + filename + Attached document filename + The file name of the attached document + Hours-spent.xlsx + + QklTIE9yZGVyIEFncmVlbWVudCAtIDQyQQ== + + + cac:ExternalReference + External reference + Reference to external document + + cbc:URI + External document URI + The Uniform Resource Identifier (URI) that identifies where the + external document is located. + Text + tir16-p052 + http://www.example.com/image.jpg + + + + + cac:DespatchSupplierParty Despatching party information @@ -819,6 +879,25 @@ cac:CarrierParty Carrier party + + cac:PartyIdentification + Party identification + + cbc:ID + Carrier party identifier + The carrier party identifier. + Identifier + tir16-p055 + + schemeID + Scheme identifier + Scheme identifier for party identification + ICD + 0007 + + 5533221100 + + cac:PartyName Party name @@ -853,6 +932,17 @@ + + cac:ShipmentStage + Shipment stage information + + cbc:TransportModeCode + Mode of transport + The mode of transport with which the goods were delivered. + tir16-p056 + UNECERec19 + + cac:Delivery Delivery information @@ -1005,7 +1095,7 @@ information that is not contained explicitly in another structure. tir16-047 - + cbc:DeliveredQuantity Delivererd quantity The quantity that is despatched in the line. @@ -1055,6 +1145,16 @@ To uniquely identify the line of the order that is being despatched. tir16-051 + 1 + + + cbc:SalesOrderLineID + Sales Order Line number. + To uniquely identify the line of the sales order that is being + despatched. + + tir16-p047 + 10 cac:OrderReference @@ -1069,6 +1169,25 @@ + + cac:DocumentReference + Document reference + + cbc:ID + Document identifier + An identifier for the referenced document. + tir16-p053 + doc-30 + + + cbc:DocumentType + Document description + Textual description of the document. + Text + tir16-p054 + Weight statement + + cac:Item Item information @@ -1144,6 +1263,44 @@ tir16-056 + + cac:CommodityClassification + Commodity classification information + + cbc:ItemClassificationCode + Item classification code + A code for classifying the item by its type or nature. + Classification codes are used to allow grouping of similar items for + a various purposes e.g. public procurement (CPV), e-Commerce + (UNSPSC) etc. + Code + tir16-p048 + + listID + Item classification identifier identification scheme + identifier + The identification scheme identifier of the Item + classification identifier + UNCL7143 + STI + + + listVersionID + Item classification identifier version identification scheme + identifier + The identification scheme version identifier of the + Item classification identifier + 20.0602 + + + name + Clear text name equivalent of classification code + The textual equivalent of the code value + Office furniture + + 9873242 + + cac:HazardousItem Hazardous item information diff --git a/structure/syntax/ubl-order-response.xml b/structure/syntax/ubl-order-response.xml index b1aef473..bf710724 100644 --- a/structure/syntax/ubl-order-response.xml +++ b/structure/syntax/ubl-order-response.xml @@ -257,6 +257,14 @@ PEPPOL-T76-R004 2018-06-01 + + cbc:StartTime + Period start time + The time at which this period begins. Format = "hh:mm:ss" + Time + tir76-p010 + 12:30:00 + cbc:EndDate Period end date @@ -267,6 +275,14 @@ PEPPOL-T76-R004 2018-06-30 + + cbc:EndTime + Period end time + The time at which this period end. Format = "hh:mm:ss" + Time + tir76-p011 + 18:00:00 + @@ -567,7 +583,6 @@ Code tir76-150 - UNCL5305 S diff --git a/structure/syntax/ubl-order.xml b/structure/syntax/ubl-order.xml index 2c416e19..ff93e0ad 100644 --- a/structure/syntax/ubl-order.xml +++ b/structure/syntax/ubl-order.xml @@ -238,6 +238,21 @@ tir01-019 + + + cac:ProjectReference + PROJECT REFERENCE + + + cbc:ID + Project reference + The identification of the project the order refers to. + Document Reference + tir01-p044 + PID33 + + + cac:BuyerCustomerParty Buyer information @@ -1147,6 +1162,14 @@ Date tir01-099 + + cbc:StartTime + Period start time + The time at which this period begins. Format = "hh:mm:ss" + Time + tir01-p042 + 12:30:00 + cbc:EndDate Period end date @@ -1155,6 +1178,14 @@ Date tir01-100 + + cbc:EndTime + Period end time + The time at which this period end. Format = "hh:mm:ss" + Time + tir01-p043 + 18:00:00 + cac:DeliveryParty @@ -1465,7 +1496,6 @@ The TAX category code that applies to the document level allowance or charge. Code - UNCL5305 tir01-p011 S @@ -2155,7 +2185,6 @@ The TAX category code for the item. Code tir01-150 - UNCL5305 S diff --git a/structure/syntax/ubl-orderagreement.xml b/structure/syntax/ubl-orderagreement.xml index 92addfb0..781786ff 100644 --- a/structure/syntax/ubl-orderagreement.xml +++ b/structure/syntax/ubl-orderagreement.xml @@ -325,6 +325,23 @@ tir110-013 Seller company Ltd. + + cbc:CompanyID + Seller legal registration identifier + Identifies a company as registered with the company + registration scheme. + Identifier + tir110-p010 + + schemeID + Scheme identifier + The identification scheme identifier of the buyer legal + registration identifier. + ICD + 0002 + + 987654321 + cac:Contact @@ -488,6 +505,23 @@ tir110-010 Customer AS + + cbc:CompanyID + Buyers legal registration identifier + Identifies a company as registered with the company + registration scheme. + Identifier + tir110-p009 + + schemeID + Scheme identifier + The identification scheme identifier of the buyer legal + registration identifier. + ICD + 0002 + + 987654321 + @@ -961,7 +995,6 @@ Document level allowance or charge TAX category code A coded identification of what TAX category applies to the document level allowance or charge. Code - UNCL5305 S @@ -1054,7 +1087,6 @@ Coded identification of a TAX category. Code OP-110-005 - UNCL5305 S @@ -1531,6 +1563,15 @@ tir110-102 docid7687 + + cbc:DocumentTypeCode + External Item Specifications Type + A functional description of the attachment/image expressed as code + Code + UNCL1001 + Image + tir110-p008 + cbc:DocumentType Document description @@ -1637,7 +1678,6 @@ The TAX category code for the item. Code tir110-106 - UNCL5305 S diff --git a/structure/syntax/ubl-shoppingcart.xml b/structure/syntax/ubl-shoppingcart.xml index 9ae50e8d..43894cbf 100644 --- a/structure/syntax/ubl-shoppingcart.xml +++ b/structure/syntax/ubl-shoppingcart.xml @@ -684,7 +684,6 @@ Code tir77-034 - UNCL5305 Z