Skip to content

Commit

Permalink
Merge pull request #81 from OpenPEPPOL/2023-q2-post-member-review
Browse files Browse the repository at this point in the history
2023 q2 post member review
  • Loading branch information
jerouris authored May 5, 2023
2 parents 79ba36a + 3bcdf4a commit 9ac0529
Show file tree
Hide file tree
Showing 17 changed files with 253 additions and 40 deletions.
2 changes: 2 additions & 0 deletions guides/release-notes/main.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ IMPORTANT: Changes in code lists are also reflected by changes in the validation

:leveloffset: +1

include::v3.0.11.adoc[]

include::v3.0.10.adoc[]

include::v3.0.9.adoc[]
Expand Down
31 changes: 31 additions & 0 deletions guides/release-notes/v3.0.11.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
= Version 3.0.11
[horizontal]
Release date:: 2023-05-01

== BIS documentation

== Changes to syntax
* Order transaction (T01)
** Editorial fix to remove example values from profileID definition
** New optional business term for requesting priority level for delivery (tir01-p47). Example updated.
** New optional business terms for start (tir01-p48) and end (tir01-p49) times in requested delivery period on line.
** New optional business term for Catalogue reference (tir01-p45)
** New optional business term for Manufacturers item identification (tir01-p46). Example updated.
* Order Response transaction (T76)
** New optional business terms for start (tir76-p012) and end (tir76-p013) times in promised delivery period on line.
* Catalogue transaction (T19)
** Editorial fix to remove example values from profileID definition.
** Adjusted definition of "PriceLeadTime" to reflect intendend use.


== Changes to code lists and validation artefacts
* Added code list 4219 for Requested shipping priority
* Rule PEPPOL-COMMON-R050 (validation of Australian Business Number (ABN)) is changed to fatal.
* Alignment with 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))

== Other
* Editorial correction of version numbers on links to business rules (on main documentation page).
2 changes: 1 addition & 1 deletion guides/shared/files/vat-cat-line.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +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> The TAX percentage rate that applies to the item unless specific trade reasons apply such as exemptions
<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.
54 changes: 33 additions & 21 deletions project.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Project xmlns="urn:fdc:difi.no:2017:vefa:structure:Project-1">
<Name>Peppol BIS version 3</Name>
<Name>Peppol BIS version 3 - May 2023 Release</Name>
<!-- Introduction -->
<Documentation path="">INTRODUCTION</Documentation>
<Documentation path="compliance/">BIS compliance</Documentation>
Expand All @@ -26,12 +26,12 @@
<Resource>
<Type>Structure-1</Type>
<Path>structure/syntax/ubl-order.xml</Path>
<Title>Peppol Order transaction 3.3 (T01)</Title>
<Title>Peppol Order transaction 3.4 (T01)</Title>
</Resource>
<Resource>
<Type>Structure-1</Type>
<Path>structure/syntax/ubl-order-response.xml</Path>
<Title>Peppol Order Response transaction 3.1 (T76)</Title>
<Title>Peppol Order Response transaction 3.2 (T76)</Title>
</Resource>
<Resource>
<Type>Structure-1</Type>
Expand Down Expand Up @@ -94,38 +94,46 @@
<Identifier>T01</Identifier>
<Type>native:Schematron</Type>
<Path>rules/sch/parts/PEPPOL-M-T01.sch</Path>
<Title>Business rules for Peppol Order transaction 3.0 </Title>
<Title>Business rules for Peppol Order transaction 3.4 </Title>
</Resource>
<Resource>
<Identifier>T16</Identifier>
<Resource>
<Identifier>T76</Identifier>
<Type>native:Schematron</Type>
<Path>rules/sch/parts/PEPPOL-M-T16.sch</Path>
<Title>Business rules for Peppol Despatch Advice transaction 3.0</Title>
<Path>rules/sch/parts/PEPPOL-M-T76.sch</Path>
<Title>Business rules for Peppol Order Response transaction 3.2</Title>
</Resource>
<Resource>
<Resource>
<Identifier>T110</Identifier>
<Type>native:Schematron</Type>
<Path>rules/sch/parts/PEPPOL-M-T110.sch</Path>
<Title>Business rules for Peppol Order Agreement transaction 3.1</Title>
</Resource>
<Resource>
<Identifier>T19</Identifier>
<Type>native:Schematron</Type>
<Path>rules/sch/parts/PEPPOL-M-T19.sch</Path>
<Title>Business rules for Peppol Catalogue transaction 3.0</Title>
<Title>Business rules for Peppol Catalogue transaction 3.2</Title>
</Resource>
<Resource>
<Identifier>T76</Identifier>
<Resource>
<Identifier>T58</Identifier>
<Type>native:Schematron</Type>
<Path>rules/sch/parts/PEPPOL-M-T76.sch</Path>
<Title>Business rules for Peppol Order Response transaction 3.0</Title>
<Path>rules/sch/parts/PEPPOL-M-T58.sch</Path>
<Title>Business rules for Peppol Catalogue Response transaction 3.0</Title>
</Resource>
<Resource>
<Identifier>T77</Identifier>
<Identifier>T16</Identifier>
<Type>native:Schematron</Type>
<Path>rules/sch/parts/PEPPOL-M-T77.sch</Path>
<Title>Business rules for Peppol Punch Out transaction 3.0</Title>
<Path>rules/sch/parts/PEPPOL-M-T16.sch</Path>
<Title>Business rules for Peppol Despatch Advice transaction 3.2</Title>
</Resource>

<Resource>
<Identifier>T110</Identifier>
<Identifier>T77</Identifier>
<Type>native:Schematron</Type>
<Path>rules/sch/parts/PEPPOL-M-T110.sch</Path>
<Title>Business rules for Peppol Order Agreement transaction 3.0</Title>
<Path>rules/sch/parts/PEPPOL-M-T77.sch</Path>
<Title>Business rules for Peppol Punch Out transaction 3.2</Title>
</Resource>

<Resource>
<Identifier>T71</Identifier>
<Type>native:Schematron</Type>
Expand All @@ -137,7 +145,7 @@
<Identifier>T111</Identifier>
<Type>native:Schematron</Type>
<Path>rules/sch/parts/PEPPOL-M-T111.sch</Path>
<Title>Business rules for Peppol Invoice Response transaction 3.0</Title>
<Title>Business rules for Peppol Invoice Response transaction 3.1</Title>
</Resource>
<Resource>
<Identifier>T114</Identifier>
Expand Down Expand Up @@ -261,6 +269,10 @@
<Resource>
<Type>CodeList-1</Type>
<Path>structure/codelist/UNCL5387.xml</Path>
</Resource>
<Resource>
<Type>CodeList-1</Type>
<Path>structure/codelist/UNCL4219.xml</Path>
</Resource>
<Resource>
<Type>CodeList-1</Type>
Expand Down
2 changes: 2 additions & 0 deletions rules/examples/OrderResponse_Example.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@
<cac:Delivery>
<cac:PromisedDeliveryPeriod>
<cbc:StartDate>2018-08-10</cbc:StartDate>
<cbc:StartTime>12:30:00</cbc:StartTime>
<cbc:EndDate>2018-08-12</cbc:EndDate>
<cbc:EndTime>18:00:00</cbc:EndTime>
</cac:PromisedDeliveryPeriod>
</cac:Delivery>
<cac:Price>
Expand Down
12 changes: 12 additions & 0 deletions rules/examples/Order_Example.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
<cac:OriginatorDocumentReference>
<cbc:ID>MAFO</cbc:ID>
</cac:OriginatorDocumentReference>
<cac:CatalogueReference>
<cbc:ID>Cat2023-03-07</cbc:ID>
</cac:CatalogueReference>
<cac:AdditionalDocumentReference>
<cbc:ID>Doc1</cbc:ID>
<cbc:DocumentType>Timesheet</cbc:DocumentType>
Expand Down Expand Up @@ -224,6 +227,10 @@
<cbc:ElectronicMail>[email protected]</cbc:ElectronicMail>
</cac:Contact>
</cac:DeliveryParty>
<cac:Shipment>
<cbc:ID>NA</cbc:ID>
<cbc:ShippingPriorityLevelCode>1</cbc:ShippingPriorityLevelCode>
</cac:Shipment>
</cac:Delivery>
<cac:DeliveryTerms>
<cbc:ID>FOB</cbc:ID>
Expand Down Expand Up @@ -287,7 +294,9 @@
<cac:Delivery>
<cac:RequestedDeliveryPeriod>
<cbc:StartDate>2010-02-10</cbc:StartDate>
<cbc:StartTime>12:30:00</cbc:StartTime>
<cbc:EndDate>2010-02-25</cbc:EndDate>
<cbc:EndTime>18:00:00</cbc:EndTime>
</cac:RequestedDeliveryPeriod>
</cac:Delivery>
<cac:OriginatorParty>
Expand Down Expand Up @@ -330,6 +339,9 @@
<cac:SellersItemIdentification>
<cbc:ID>121212</cbc:ID>
</cac:SellersItemIdentification>
<cac:ManufacturersItemIdentification>
<cbc:ID>manid659</cbc:ID>
</cac:ManufacturersItemIdentification>
<cac:StandardItemIdentification>
<cbc:ID schemeID="0160">7560000012345</cbc:ID>
</cac:StandardItemIdentification>
Expand Down
2 changes: 1 addition & 1 deletion rules/sch/PEPPOLBIS-T01.sch
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
schemaVersion="iso" queryBinding="xslt2">

<title>Rules for PEPPOL Order transaction 3.3</title>
<title>Rules for PEPPOL Order transaction 3.4</title>

<ns uri="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" prefix="cbc"/>
<ns uri="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" prefix="cac"/>
Expand Down
2 changes: 1 addition & 1 deletion rules/sch/PEPPOLBIS-T76.sch
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
schemaVersion="iso" queryBinding="xslt2">

<title>Rules for PEPPOL Order Response transaction 3.1</title>
<title>Rules for PEPPOL Order Response transaction 3.2</title>

<ns uri="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" prefix="cbc"/>
<ns uri="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" prefix="cac"/>
Expand Down
2 changes: 1 addition & 1 deletion rules/sch/parts/common/rules.sch
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@
<assert id="PEPPOL-COMMON-R049" test="string-length(normalize-space()) = 10 and string(number(normalize-space())) != 'NaN'" flag="fatal">Swedish organization number MUST be stated in the correct format.</assert>
</rule>
<rule context="cbc:EndpointID[@schemeID = '0151'] | cac:PartyIdentification/cbc:ID[@schemeID = '0151'] | cbc:CompanyID[@schemeID = '0151']">
<assert id="PEPPOL-COMMON-R050" test="matches(normalize-space(), '^[0-9]{11}$') and u:abn(normalize-space())" flag="warning">Australian Business Number (ABN) MUST be stated in the correct format.</assert>
<assert id="PEPPOL-COMMON-R050" test="matches(normalize-space(), '^[0-9]{11}$') and u:abn(normalize-space())" flag="fatal">Australian Business Number (ABN) MUST be stated in the correct format.</assert>
</rule>
</pattern>
4 changes: 2 additions & 2 deletions rules/unit-common/PEPPOL-COMMON-R050.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<test>
<assert>
<warning>PEPPOL-COMMON-R050</warning>
<error>PEPPOL-COMMON-R050</error>
</assert>
<Order xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
Expand All @@ -42,7 +42,7 @@

<test>
<assert>
<warning>PEPPOL-COMMON-R050</warning>
<error>PEPPOL-COMMON-R050</error>
</assert>
<Order xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
Expand Down
50 changes: 50 additions & 0 deletions structure/codelist/ICD.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1102,5 +1102,55 @@ Classes moyennes et Energie</Description>
<Name>The Register of Natural Persons (Latvia)</Name>
<Description>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.</Description>
</Code>
<Code>
<Id>0221</Id>
<Name>The registered number of the qualified invoice issuer</Name>
<Description>Intended Purpose/App. Area: The registered number of the qualified invoice issuer is used on the invoice-based method for Japanese consumption tax, which will be implemented on 1 October 2023. Issuing agency: National Tax Agency Japan</Description>
</Code>
<Code>
<Id>0222</Id>
<Name>Metadata Registry Support</Name>
<Description>Intended Purpose/App. Area: Database of metadata supporting description of object-data-information-etc. Issuing agency: Farance Inc.</Description>
</Code>
<Code>
<Id>0223</Id>
<Name>EU based company</Name>
<Description>Intended Purpose/App. Area: To provide identifiers for organizations based in EU. Issuing agency: AIFE (Agence pour l’Informatique Financière de l’Etat)</Description>
</Code>
<Code>
<Id>0224</Id>
<Name>FTCTC CODE ROUTAGE</Name>
<Description>Intended Purpose/App. Area: To provide identifiers used in electronic invoices for routing among accredited platforms for the French Continuous Transactional Control reform on e-invoicing. Issuing agency: AIFE (Agence pour l’Informatique Financière de l’Etat)</Description>
</Code>
<Code>
<Id>0225</Id>
<Name>FRCTC ELECTRONIC ADDRESS</Name>
<Description>Intended Purpose/App. Area: To provide identifiers used as electronic addresses in the context of the French Continuous Transactional Control reform on e-invoicing. Issuing agency: AIFE (Agence pour l’Informatique Financière de l’Etat)</Description>
</Code>
<Code>
<Id>0226</Id>
<Name>FRCTC Particulier</Name>
<Description>Intended Purpose/App. Area: To provide identifiers for French citizen sending invoices to the French Public Sector. Issuing agency: AIFE (Agence pour l’Informatique Financière de l’Etat)</Description>
</Code>
<Code>
<Id>0227</Id>
<Name>NON - EU based company</Name>
<Description>Intended Purpose/App. Area: NON - EU based company. Issuing agency: AIFE (Agence pour l’Informatique Financière de l’Etat)</Description>
</Code>
<Code>
<Id>0228</Id>
<Name>Répertoire des Entreprises et des Etablissements (RIDET)</Name>
<Description>Intended Purpose/App. Area: To provide identifiers for organizations at national level in Nouvelle Caledonie (French). Issuing agency: AIFE (Agence pour l’Informatique Financière de l’Etat)</Description>
</Code>
<Code>
<Id>0229</Id>
<Name>T.A.H.I.T.I (traitement automatique hiérarchisé des institutions de Tahiti et des îles)</Name>
<Description>Intended Purpose/App. Area: To provide identifiers for organizations at national level in TAHITI (French). Issuing agency: AIFE (Agence pour l’Informatique Financière de l’Etat)</Description>
</Code>
<Code>
<Id>0230</Id>
<Name>National e-Invoicing Framework</Name>
<Description>Intended Purpose/App. Area: Identifier for  organizations. Issuing agency: Malaysia Digital Economy Corporation Sdn Bhd (MDEC)</Description>
</Code>

</CodeList>
31 changes: 31 additions & 0 deletions structure/codelist/UNCL4219.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<CodeList xmlns="urn:fdc:difi.no:2017:vefa:structure:CodeList-1">

<Title>Transport service priority code (UNCL4219)</Title>
<Identifier>UNCL4219</Identifier>
<Version>D.17A</Version>
<Agency>UN/CEFACT</Agency>
<Subset>openPEPPOL</Subset>

<Code>
<Id>1</Id>
<Name>Express</Name>
<Description>Express</Description>
</Code>
<Code>
<Id>2</Id>
<Name>High speed</Name>
<Description>High speed</Description>
</Code>
<Code>
<Id>3</Id>
<Name>Normal speed</Name>
<Description>Normal speed</Description>
</Code>
<Code>
<Id>4</Id>
<Name>Post service</Name>
<Description>Post service</Description>
</Code>

</CodeList>
5 changes: 5 additions & 0 deletions structure/codelist/UNCL7143.xml
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,11 @@
<Id>EF</Id>
<Name>Material code</Name>
<Description>Code defining the material's type, surface, geometric form plus various classifying characteristics.</Description>
</Code>
<Code>
<Id>EMD</Id>
<Name>EMDN (European Medical Device Nomenclature)</Name>
<Description>Nomenclature system for identification of medical devices based on European Medical Device Nomenclature classification system.</Description>
</Code>
<Code>
<Id>EN</Id>
Expand Down
12 changes: 8 additions & 4 deletions structure/codelist/eas.xml
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,14 @@
<Code>
<Id>0216</Id>
<Name>OVTcode</Name>
</Code>
<Code>
<Id>0221</Id>
<Name>The registered number of the qualified invoice issuer (Japan)</Name>
</Code>
<Code>
<Id>0230</Id>
<Name>National e-Invoicing Framework (Malaysia)</Name>
</Code>
<Code>
<Id>9901</Id>
Expand Down Expand Up @@ -310,10 +318,6 @@
<Id>9953</Id>
<Name>Holy See (Vatican City State) VAT number</Name>
</Code>
<Code>
<Id>9955</Id>
<Name>Swedish VAT number</Name>
</Code>
<Code>
<Id>9957</Id>
<Name>French VAT number</Name>
Expand Down
Loading

0 comments on commit 9ac0529

Please sign in to comment.