Skip to content

Commit

Permalink
Merge branch '2024-q4-release' into POACC-760-remove-ZZZ
Browse files Browse the repository at this point in the history
  • Loading branch information
Zumbala authored Oct 31, 2024
2 parents b611b47 + 57544e6 commit 8eda018
Show file tree
Hide file tree
Showing 10 changed files with 1,427 additions and 1,271 deletions.
19 changes: 10 additions & 9 deletions guides/compliance/payload.adoc
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
= Payload compliance to BIS
= Enveloping compliance
[horizontal]

== Processing of rules
* The value of the SBDH element "Sender/Identifier" MUST be equivalent to the value in the sender party's "Party/EndpointID" element and its "schemeID" attribute.
== Enveloping of BIS message in Peppol Business Message Envelope (SBDH)
* When a BIS message is enveloped, the value of the SBDH element *Sender/Identifier* SHALL match the *Party/EndpointID* element value of the sender party, including the value of its *schemeID* attribute.

* The value of the SBDH element "Receiver/Identifier" MUST be equivalent to the value in the receiver's party "Party/EndpointID" element and its "schemeID" attribute.
* When a BIS message is enveloped, the value of the SBDH element *Receiver/Identifier* SHALL match the *Party/EndpointID* element value of the receiver party, including the value of its *schemeID* attribute.

example:
Example:
[attributes]
====
SBDH representation:
<Identifier Authority="iso6523-actorid-upis">0088:7315458756324</Identifier>
UBL representation:
BIS message:
<cbc:EndpointID schemeID="0088">7315458756324</cbc:EndpointID>
SBDH envelope:
<Identifier Authority="iso6523-actorid-upis">0088:7315458756324</Identifier>
====

See Policy for use of Identifiers
See Policy for use of Identifiers for more information on how to represent identifiers in envelope and messages.
7 changes: 3 additions & 4 deletions guides/release-notes/v3.0.14.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ Release date:: November 2024
* BIS Ordering and Order Only
** Added sample file and use case which describes consignment orders and vendor-managed inventory

== Changes to Compliance BIS document
* Added new compliance on SBDH and BIS3 payload
** The value of the SBDH element "Sender/Identifier" MUST be equivalent to the value in the sender party’s "Party/EndpointID" element and its "schemeID" attribute.
** The value of the SBDH element "Receiver/Identifier" MUST be equivalent to the value in the receiver’s party "Party/EndpointID" element and its "schemeID" attribute
== Changes to "BIS compliance" document
* Added new compliance rules on how to use sender/receiver identifiers when enveloping a BIS3 message in Peppol Business Message Envelope (SBDH)

== Changes to syntax
* Order transaction (T01)
Expand All @@ -36,5 +34,6 @@ Release date:: November 2024

== Changes to code lists and validation artefacts
* Added new codelist with code values SSCC (Serial Shipping Container Code) to the optional attribute that indicates the type/scheme for Transport handling unit identifier (in Despatch Advice)
* Changes to codelists 7143, 8273 and UNECERec20-11e

== Other
24 changes: 12 additions & 12 deletions project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<Resource>
<Type>Structure-1</Type>
<Path>structure/syntax/ubl-order.xml</Path>
<Title>Peppol Order transaction 3.4 (T01)</Title>
<Title>Peppol Order transaction 3.5 (T01)</Title>
</Resource>
<Resource>
<Type>Structure-1</Type>
Expand All @@ -36,12 +36,12 @@
<Resource>
<Type>Structure-1</Type>
<Path>structure/syntax/ubl-orderagreement.xml</Path>
<Title>Peppol Order Agreement transaction 3.1 (T110)</Title>
<Title>Peppol Order Agreement transaction 3.2 (T110)</Title>
</Resource>
<Resource>
<Type>Structure-1</Type>
<Path>structure/syntax/ubl-order-change.xml</Path>
<Title>Peppol Order Change transaction 3.0 (T114)</Title>
<Title>Peppol Order Change transaction 3.1 (T114)</Title>
</Resource>
<Resource>
<Type>Structure-1</Type>
Expand All @@ -56,7 +56,7 @@
<Resource>
<Type>Structure-1</Type>
<Path>structure/syntax/ubl-catalogue.xml</Path>
<Title>Peppol Catalogue transaction 3.2 (T19)</Title>
<Title>Peppol Catalogue transaction 3.3 (T19)</Title>
</Resource>
<Resource>
<Type>Structure-1</Type>
Expand All @@ -66,12 +66,12 @@
<Resource>
<Type>Structure-1</Type>
<Path>structure/syntax/ubl-despatch-advice.xml</Path>
<Title>Peppol Despatch Advice transaction 3.2 (T16)</Title>
<Title>Peppol Despatch Advice transaction 3.3 (T16)</Title>
</Resource>
<Resource>
<Type>Structure-1</Type>
<Path>structure/syntax/ubl-shoppingcart.xml</Path>
<Title>Peppol Punch Out transaction 3.2 (T77)</Title>
<Title>Peppol Punch Out transaction 3.3 (T77)</Title>
</Resource>
<Resource>
<Type>Structure-1</Type>
Expand All @@ -94,7 +94,7 @@
<Identifier>T01</Identifier>
<Type>native:Schematron</Type>
<Path>rules/sch/parts/PEPPOL-M-T01.sch</Path>
<Title>Business rules for Peppol Order transaction 3.4 </Title>
<Title>Business rules for Peppol Order transaction 3.5 </Title>
</Resource>
<Resource>
<Identifier>T76</Identifier>
Expand All @@ -106,13 +106,13 @@
<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>
<Title>Business rules for Peppol Order Agreement transaction 3.2</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.2</Title>
<Title>Business rules for Peppol Catalogue transaction 3.3</Title>
</Resource>
<Resource>
<Identifier>T58</Identifier>
Expand All @@ -124,14 +124,14 @@
<Identifier>T16</Identifier>
<Type>native:Schematron</Type>
<Path>rules/sch/parts/PEPPOL-M-T16.sch</Path>
<Title>Business rules for Peppol Despatch Advice transaction 3.2</Title>
<Title>Business rules for Peppol Despatch Advice transaction 3.3</Title>
</Resource>

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

<Resource>
Expand All @@ -151,7 +151,7 @@
<Identifier>T114</Identifier>
<Type>native:Schematron</Type>
<Path>rules/sch/parts/PEPPOL-M-T114.sch</Path>
<Title>Business rules for Peppol Order Change transaction 3.0</Title>
<Title>Business rules for Peppol Order Change transaction 3.1</Title>
</Resource>
<Resource>
<Identifier>T115</Identifier>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>

<Catalogue xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
xmlns="urn:oasis:names:specification:ubl:schema:xsd:Catalogue-2">
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
xmlns="urn:oasis:names:specification:ubl:schema:xsd:Catalogue-2">
<cbc:CustomizationID>urn:fdc:peppol.eu:poacc:trns:catalogue:3</cbc:CustomizationID>
<cbc:ProfileID>urn:fdc:peppol.eu:poacc:bis:catalogue_wo_response:3</cbc:ProfileID>
<cbc:ID>1387</cbc:ID>
Expand Down Expand Up @@ -204,7 +204,8 @@
<cac:ItemSpecificationDocumentReference>
<cbc:ID>12345</cbc:ID>
<cac:Attachment>
<cbc:EmbeddedDocumentBinaryObject mimeCode="image/png" filename="image1.png">UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi</cbc:EmbeddedDocumentBinaryObject>
<cbc:EmbeddedDocumentBinaryObject mimeCode="image/png" filename="image1.png">
UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi</cbc:EmbeddedDocumentBinaryObject>
<cac:ExternalReference>
<cbc:URI>http://www.supplier.com/image1.png</cbc:URI>
</cac:ExternalReference>
Expand All @@ -214,7 +215,8 @@
<cbc:IdentificationCode>NO</cbc:IdentificationCode>
</cac:OriginCountry>
<cac:CommodityClassification>
<cbc:ItemClassificationCode listID="MP" listVersionID="19.0501" name="Office furniture">20101601</cbc:ItemClassificationCode>
<cbc:ItemClassificationCode listID="MP" listVersionID="19.0501"
name="Office furniture">20101601</cbc:ItemClassificationCode>
</cac:CommodityClassification>
<cac:TransactionConditions>
<cbc:ActionCode>CT</cbc:ActionCode>
Expand Down Expand Up @@ -299,15 +301,17 @@
</cac:TaxScheme>
</cac:ClassifiedTaxCategory>
<cac:AdditionalItemProperty>
<cbc:ID schemeDataURI="sdfdf" schemeID="ISO22057" schemeVersionID="2022">77e416eb-a363-4258-a04e-171d843a6460</cbc:ID>
<cbc:ID
schemeDataURI="https://define.cobuilder.no/77e416eb-a363-4258-a04e-171d843a6460/2022/"
schemeID="ISO22057" schemeVersionID="2022">77e416eb-a363-4258-a04e-171d843a6460</cbc:ID>
<cbc:Name>Paper weight in grams</cbc:Name>
<cbc:Value>18</cbc:Value>
</cac:AdditionalItemProperty>
</cac:Item>
</cac:CatalogueLine>
<cac:CatalogueLine><!-- This line handles an item with a deposit -->
<cbc:ID>3</cbc:ID>
<cac:RequiredRelatedItem>
<cac:RequiredRelatedItem>
<cbc:ID>1234</cbc:ID>
<cbc:Quantity unitCode="EA">1</cbc:Quantity>
</cac:RequiredRelatedItem>
Expand Down Expand Up @@ -342,4 +346,4 @@
</cac:SellersItemIdentification>
</cac:Item>
</cac:CatalogueLine>
</Catalogue>
</Catalogue>
28 changes: 15 additions & 13 deletions rules/examples/Order use cases/UC4_Order.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<Order xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="urn:oasis:names:specification:ubl:schema:xsd:Order-2"
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
xmlns="urn:oasis:names:specification:ubl:schema:xsd:Order-2"
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
<cbc:CustomizationID>urn:fdc:peppol.eu:poacc:trns:order:3</cbc:CustomizationID>
<cbc:ProfileID>urn:fdc:peppol.eu:poacc:bis:order_only:3</cbc:ProfileID>
<cbc:ID>5</cbc:ID>
<cbc:IssueDate>2013-07-01</cbc:IssueDate>
<cbc:IssueTime>05:10:10</cbc:IssueTime>
<cbc:Note>Notes regarding the order</cbc:Note>
<cbc:DocumentCurrencyCode listID="ISO4217">EUR</cbc:DocumentCurrencyCode>
<cbc:DocumentCurrencyCode listID="ISO4217">EUR</cbc:DocumentCurrencyCode>
<cbc:AccountingCost>MAFO</cbc:AccountingCost>
<cac:ValidityPeriod>
<cbc:EndDate>2013-07-30</cbc:EndDate>
Expand All @@ -27,7 +27,7 @@
<cbc:ID>100</cbc:ID>
<cbc:DocumentType>Blueprint</cbc:DocumentType>
<cac:Attachment>
<cac:ExternalReference>
<cac:ExternalReference>
<cbc:URI>http://upload.wikimedia.org/wikipedia/commons/1/10/LaBelle_Blueprint.jpg</cbc:URI>
</cac:ExternalReference>
</cac:Attachment>
Expand All @@ -45,7 +45,7 @@
<cbc:Name>City Hospital</cbc:Name>
</cac:PartyName>
<cac:PostalAddress>
<cbc:StreetName>Main street 4</cbc:StreetName>
<cbc:StreetName>Main street 4</cbc:StreetName>
<cbc:AdditionalStreetName>Back door</cbc:AdditionalStreetName>
<cbc:CityName>Eurocity</cbc:CityName>
<cbc:PostalZone>11155</cbc:PostalZone>
Expand Down Expand Up @@ -96,7 +96,7 @@
<cac:PartyLegalEntity>
<cbc:RegistrationName>Cod Liver Oil Limited</cbc:RegistrationName>
</cac:PartyLegalEntity>
<cac:Contact>
<cac:Contact>
<cbc:Name>Öystein</cbc:Name>
<cbc:Telephone>+47555444333</cbc:Telephone>
<cbc:ElectronicMail>[email protected]</cbc:ElectronicMail>
Expand Down Expand Up @@ -196,7 +196,7 @@
<cbc:AllowanceChargeReason>Agreed discount</cbc:AllowanceChargeReason>
<cbc:Amount currencyID="EUR">10</cbc:Amount>
</cac:AllowanceCharge>
<cac:TaxTotal>
<cac:TaxTotal>
<cbc:TaxAmount currencyID="EUR">5</cbc:TaxAmount>
</cac:TaxTotal>
<cac:AnticipatedMonetaryTotal>
Expand All @@ -223,8 +223,8 @@
</cac:RequestedDeliveryPeriod>
</cac:Delivery>
<cac:OriginatorParty>
<cac:PartyIdentification>
<cbc:ID schemeID="0088">7300010000001</cbc:ID>
<cac:PartyIdentification>
<cbc:ID schemeID="0088">7300010000001</cbc:ID>
</cac:PartyIdentification>
<cac:PartyName>
<cbc:Name>Martin</cbc:Name>
Expand Down Expand Up @@ -252,7 +252,7 @@
<cbc:ItemClassificationCode listID="MP">76455</cbc:ItemClassificationCode>
</cac:CommodityClassification>
<cac:ClassifiedTaxCategory>
<cbc:ID schemeID="UNCL5305">S</cbc:ID>
<cbc:ID schemeID="UNCL5305">S</cbc:ID>
<cbc:Percent>10</cbc:Percent>
<cac:TaxScheme>
<cbc:ID>VAT</cbc:ID>
Expand All @@ -263,11 +263,13 @@
<cbc:Value>Left-handed</cbc:Value>
</cac:AdditionalItemProperty>
<cac:AdditionalItemProperty>
<cbc:ID schemeDataURI="sdfdf" schemeID="ISO22057" schemeVersionID="2022">77e416eb-a363-4258-a04e-171d843a6460</cbc:ID>
<cbc:ID
schemeDataURI="https://define.cobuilder.no/77e416eb-a363-4258-a04e-171d843a6460/2022/"
schemeID="ISO22057" schemeVersionID="2022">77e416eb-a363-4258-a04e-171d843a6460</cbc:ID>
<cbc:Name>Purpose</cbc:Name>
<cbc:Value>Snow</cbc:Value>
</cac:AdditionalItemProperty>
</cac:Item>
</cac:LineItem>
</cac:OrderLine>
</Order>
</Order>
32 changes: 20 additions & 12 deletions rules/examples/OrderAgreement_Example.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
-->
<OrderResponse xmlns="urn:oasis:names:specification:ubl:schema:xsd:OrderResponse-2"
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
<cbc:CustomizationID>urn:fdc:peppol.eu:poacc:trns:order_agreement:3</cbc:CustomizationID>
<cbc:ProfileID>urn:fdc:peppol.eu:poacc:bis:order_agreement:3</cbc:ProfileID>
<cbc:ID>0263bf48-9a55-4d15-adf5-2c2921036d1c</cbc:ID>
Expand All @@ -32,7 +32,8 @@
<cbc:ID>147852</cbc:ID>
<cbc:DocumentType>Timesheet</cbc:DocumentType>
<cac:Attachment>
<cbc:EmbeddedDocumentBinaryObject mimeCode="image/tiff" filename="hours-spend.csv">UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi</cbc:EmbeddedDocumentBinaryObject>
<cbc:EmbeddedDocumentBinaryObject mimeCode="image/tiff" filename="hours-spend.csv">
UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi</cbc:EmbeddedDocumentBinaryObject>
<cac:ExternalReference>
<cbc:URI>http://www.example.com/index.html</cbc:URI>
</cac:ExternalReference>
Expand All @@ -47,7 +48,7 @@
<cac:PartyIdentification>
<cbc:ID schemeID="0184">DK12345678</cbc:ID>
</cac:PartyIdentification>

<cac:PostalAddress>
<cbc:StreetName>Storgt. 12</cbc:StreetName>
<cbc:AdditionalStreetName>4. etasje</cbc:AdditionalStreetName>
Expand Down Expand Up @@ -127,10 +128,12 @@
<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
<cbc:AllowanceChargeReasonCode>ABK</cbc:AllowanceChargeReasonCode>
<cbc:AllowanceChargeReason>Miscellaneous services</cbc:AllowanceChargeReason>
<!-- <cbc:MultiplierFactorNumeric>10</cbc:MultiplierFactorNumeric>
--> <cbc:Amount currencyID="EUR">2.00</cbc:Amount>
<!-- <cbc:BaseAmount currencyID="EUR">32.50</cbc:BaseAmount>
--> <cac:TaxCategory>
<!-- <cbc:MultiplierFactorNumeric>10</cbc:MultiplierFactorNumeric>
-->
<cbc:Amount currencyID="EUR">2.00</cbc:Amount>
<!-- <cbc:BaseAmount currencyID="EUR">32.50</cbc:BaseAmount>
-->
<cac:TaxCategory>
<cbc:ID>S</cbc:ID>
<cbc:Percent>25</cbc:Percent>
<cac:TaxScheme>
Expand Down Expand Up @@ -160,7 +163,7 @@
<cbc:TaxAmount currencyID="EUR">7.81</cbc:TaxAmount>
<cac:TaxCategory>
<cbc:ID>S</cbc:ID>
<cbc:Percent>25</cbc:Percent>
<cbc:Percent>25</cbc:Percent>
<cac:TaxScheme>
<cbc:ID>VAT</cbc:ID>
</cac:TaxScheme>
Expand Down Expand Up @@ -218,7 +221,9 @@
<cbc:DocumentTypeCode>TRADE_ITEM_DESCRIPTION</cbc:DocumentTypeCode>
<cbc:DocumentType>Timesheet</cbc:DocumentType>
<cac:Attachment>
<cbc:EmbeddedDocumentBinaryObject mimeCode="image/tiff" filename="hours-spend.csv">UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi</cbc:EmbeddedDocumentBinaryObject>
<cbc:EmbeddedDocumentBinaryObject mimeCode="image/tiff"
filename="hours-spend.csv">
UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi</cbc:EmbeddedDocumentBinaryObject>
<cac:ExternalReference>
<cbc:URI>http://www.example.com/index.html</cbc:URI>
</cac:ExternalReference>
Expand All @@ -238,7 +243,10 @@
</cac:TaxScheme>
</cac:ClassifiedTaxCategory>
<cac:AdditionalItemProperty>
<cbc:ID schemeDataURI="sdfdf" schemeID="ISO22057" schemeVersionID="2022">77e416eb-a363-4258-a04e-171d843a6460</cbc:ID>
<cbc:ID
schemeDataURI="https://define.cobuilder.no/77e416eb-a363-4258-a04e-171d843a6460/2022/"
schemeID="ISO22057" schemeVersionID="2022">
77e416eb-a363-4258-a04e-171d843a6460</cbc:ID>
<cbc:Name>Length</cbc:Name>
<cbc:NameCode listID="NN">test</cbc:NameCode>
<cbc:Value>30 mm</cbc:Value>
Expand Down Expand Up @@ -276,4 +284,4 @@
</cac:Item>
</cac:LineItem>
</cac:OrderLine>
</OrderResponse>
</OrderResponse>
4 changes: 3 additions & 1 deletion rules/examples/PunchOut_Example.xml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,9 @@
</cac:TaxScheme>
</cac:ClassifiedTaxCategory>
<cac:AdditionalItemProperty>
<cbc:ID schemeDataURI="sdfdf" schemeID="ISO22057" schemeVersionID="2022">77e416eb-a363-4258-a04e-171d843a6460</cbc:ID>
<cbc:ID
schemeDataURI="https://define.cobuilder.no/77e416eb-a363-4258-a04e-171d843a6460/2022/"
schemeID="ISO22057" schemeVersionID="2022">77e416eb-a363-4258-a04e-171d843a6460</cbc:ID>
<cbc:Name>Paper weight in grams</cbc:Name>
<cbc:Value>18</cbc:Value>
</cac:AdditionalItemProperty>
Expand Down
Loading

0 comments on commit 8eda018

Please sign in to comment.