From 59ed90a95b93abfee74dedbb1da64c585e2d05d3 Mon Sep 17 00:00:00 2001 From: oscarglanzmann Date: Wed, 28 Aug 2024 14:43:17 +0200 Subject: [PATCH 01/39] POACC-736 --- structure/syntax/ubl-catalogue.xml | 24 ++++++++++++++++++++++++ structure/syntax/ubl-despatch-advice.xml | 24 ++++++++++++++++++++++++ structure/syntax/ubl-order-change.xml | 24 ++++++++++++++++++++++++ structure/syntax/ubl-order.xml | 24 ++++++++++++++++++++++++ structure/syntax/ubl-orderagreement.xml | 24 ++++++++++++++++++++++++ structure/syntax/ubl-shoppingcart.xml | 24 ++++++++++++++++++++++++ 6 files changed, 144 insertions(+) diff --git a/structure/syntax/ubl-catalogue.xml b/structure/syntax/ubl-catalogue.xml index e2cb756f..b811db71 100644 --- a/structure/syntax/ubl-catalogue.xml +++ b/structure/syntax/ubl-catalogue.xml @@ -1690,6 +1690,30 @@ cac:AdditionalItemProperty Additional item property A group of business terms providing information about properties of the goods and services invoiced. + + cbc:ID + ID + ID of the property if assigned by an Agency + 77e416eb-a363-4258-a04e-171d843a6460 + + @schemeDataURI + Scheme Data URI + Scheme Data URI + sdfdf + + + @schemeID + Scheme identifier + Scheme identifier + ISO22057 + + + @schemeVersionID + Scheme version identifier + Scheme version identifier + 2022 + + cbc:Name Item property name diff --git a/structure/syntax/ubl-despatch-advice.xml b/structure/syntax/ubl-despatch-advice.xml index 3548cd19..33d50911 100644 --- a/structure/syntax/ubl-despatch-advice.xml +++ b/structure/syntax/ubl-despatch-advice.xml @@ -1327,6 +1327,30 @@ Additional item property information A group of business terms providing information about properties of the goods and services invoiced. + + cbc:ID + ID + ID of the property if assigned by an Agency + 77e416eb-a363-4258-a04e-171d843a6460 + + @schemeDataURI + Scheme Data URI + Scheme Data URI + sdfdf + + + @schemeID + Scheme identifier + Scheme identifier + ISO22057 + + + @schemeVersionID + Scheme version identifier + Scheme version identifier + 2022 + + cbc:Name Item property name diff --git a/structure/syntax/ubl-order-change.xml b/structure/syntax/ubl-order-change.xml index 2d04f642..3a9d6883 100644 --- a/structure/syntax/ubl-order-change.xml +++ b/structure/syntax/ubl-order-change.xml @@ -2221,6 +2221,30 @@ cac:AdditionalItemProperty Additional item property information A group of business terms providing information about properties of the goods and services invoiced. + + cbc:ID + ID + ID of the property if assigned by an Agency + 77e416eb-a363-4258-a04e-171d843a6460 + + @schemeDataURI + Scheme Data URI + Scheme Data URI + sdfdf + + + @schemeID + Scheme identifier + Scheme identifier + ISO22057 + + + @schemeVersionID + Scheme version identifier + Scheme version identifier + 2022 + + cbc:Name Item property name diff --git a/structure/syntax/ubl-order.xml b/structure/syntax/ubl-order.xml index 1d2635d4..baa6fc81 100644 --- a/structure/syntax/ubl-order.xml +++ b/structure/syntax/ubl-order.xml @@ -2263,6 +2263,30 @@ cac:AdditionalItemProperty Additional item property information A group of business terms providing information about properties of the goods and services invoiced. + + cbc:ID + ID + ID of the property if assigned by an Agency + 77e416eb-a363-4258-a04e-171d843a6460 + + @schemeDataURI + Scheme Data URI + Scheme Data URI + sdfdf + + + @schemeID + Scheme identifier + Scheme identifier + ISO22057 + + + @schemeVersionID + Scheme version identifier + Scheme version identifier + 2022 + + cbc:Name Item property name diff --git a/structure/syntax/ubl-orderagreement.xml b/structure/syntax/ubl-orderagreement.xml index 781786ff..12b72aae 100644 --- a/structure/syntax/ubl-orderagreement.xml +++ b/structure/syntax/ubl-orderagreement.xml @@ -1705,6 +1705,30 @@ cac:AdditionalItemProperty Additional item property information A group of business terms providing information about properties of the goods and services invoiced. + + cbc:ID + ID + ID of the property if assigned by an Agency + 77e416eb-a363-4258-a04e-171d843a6460 + + @schemeDataURI + Scheme Data URI + Scheme Data URI + sdfdf + + + @schemeID + Scheme identifier + Scheme identifier + ISO22057 + + + @schemeVersionID + Scheme version identifier + Scheme version identifier + 2022 + + cbc:Name Item property name diff --git a/structure/syntax/ubl-shoppingcart.xml b/structure/syntax/ubl-shoppingcart.xml index 43894cbf..91a578fa 100644 --- a/structure/syntax/ubl-shoppingcart.xml +++ b/structure/syntax/ubl-shoppingcart.xml @@ -712,6 +712,30 @@ cac:AdditionalItemProperty Additional item property information Used to for item properties and also configured product identifier and item is service indicator + + cbc:ID + ID + ID of the property if assigned by an Agency + 77e416eb-a363-4258-a04e-171d843a6460 + + @schemeDataURI + Scheme Data URI + Scheme Data URI + sdfdf + + + @schemeID + Scheme identifier + Scheme identifier + ISO22057 + + + @schemeVersionID + Scheme version identifier + Scheme version identifier + 2022 + + cbc:Name Item property name From e73201314b967bd53e2080546408fd64639d4747 Mon Sep 17 00:00:00 2001 From: oscarglanzmann Date: Wed, 28 Aug 2024 14:50:38 +0200 Subject: [PATCH 02/39] POACC-477 --- structure/syntax/ubl-despatch-advice.xml | 144 +++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/structure/syntax/ubl-despatch-advice.xml b/structure/syntax/ubl-despatch-advice.xml index 3548cd19..81e7cb11 100644 --- a/structure/syntax/ubl-despatch-advice.xml +++ b/structure/syntax/ubl-despatch-advice.xml @@ -981,6 +981,150 @@ tir16-045 + + cac:DeliveryParty + Delivery party + + cac:PartyIdentification + Party identification + Identification of the delivery party. The party to whom the goods are delivered + + cbc:ID + Delivery party identifier + In this BIS: The identifier of the party that should receive the + ordered items + tir01-101 + + schemeID + Deliver party registration identifier identification scheme + identifier + The identification scheme identifier of the deliverparty + identifier. + ICD + 0002 + + 987654321 + + + + cac:PartyName + Party name + + cbc:Name + Delivery party name + In this + BIS: The name of the party that should receive the delivery + Text + tir01-102 + Surgery department + + + + cac:PostalAddress + Final Delivery address + The final address for the delivery + + cbc:StreetName + Address line 1 + The main address line in a postal address usually the street + name and number. + Text + tir01-p029 + + + cbc:AdditionalStreetName + Address line 2 + An additional address line in a postal address that can be used + to give further details supplementing the main line. Common use are + secondary house number in a complex or in a building. + Text + tir01-p030 + + + cbc:CityName + City + The common name of the city where the postal address is. The + name is written in full rather than as a code. + Text + tir01-p031 + + + cbc:PostalZone + Post code + The identifier for an addressable group of properties according + to the relevant national postal service, such as a ZIP code or Post + Code. + Text + tir01-p032 + + + cbc:CountrySubentity + Country subdivision + For specifying a region, county, state, province etc. within a + country by using text. + Text + tir01-p033 + + + cac:AddressLine + Address line + + cbc:Line + Address line 3 + An additional address line in an address that can be used + to give further details supplementing the main line. + Text + tir01-p034 + Gate 34 + + + + cac:Country + Country + + cbc:IdentificationCode + Country code + A code that identifies the country.The lists of valid + countries are registered with the ISO 3166-1 Maintenance agency, + "Codes for the representation of names of countries and their + subdivisions". Codes must be according to the alpha-2 + representation. + Code + tir01-p035 + ISO3166 + NL + + + + + cac:Contact + Contact information + Contact information for the delivery party + + cbc:Name + Contact person name + The name of the contact person. + Text + tir01-103 + + + cbc:Telephone + Contact telephone number + A phone number for the contact person. If the person has a + direct number, this is that number. + Text + tir01-104 + + + cbc:ElectronicMail + Contact email address + The e-mail address for the contact person. If the person has a + direct e-mail this is that email. + Text + tir01-106 + + + cac:Despatch Actual or expected despatch period From bf2ed9ec15c51248d6fc1ded9249139abbdeac57 Mon Sep 17 00:00:00 2001 From: Martin Forsberg Date: Wed, 28 Aug 2024 16:50:48 +0200 Subject: [PATCH 03/39] POACC-737 --- .../profiles/28-ordering/process/index.adoc | 2 + .../28-ordering/process/use-case6.adoc | 39 ++++++++ .../profiles/3-order-only/process/index.adoc | 2 + .../3-order-only/process/use-case6.adoc | 39 ++++++++ guides/release-notes/main.adoc | 2 + guides/release-notes/v3.0.14.adoc | 21 ++++ rules/examples/Order use cases/UC6_Order.xml | 99 +++++++++++++++++++ 7 files changed, 204 insertions(+) create mode 100644 guides/profiles/28-ordering/process/use-case6.adoc create mode 100644 guides/profiles/3-order-only/process/use-case6.adoc create mode 100644 guides/release-notes/v3.0.14.adoc create mode 100644 rules/examples/Order use cases/UC6_Order.xml diff --git a/guides/profiles/28-ordering/process/index.adoc b/guides/profiles/28-ordering/process/index.adoc index 6ff89c5a..78c4140c 100644 --- a/guides/profiles/28-ordering/process/index.adoc +++ b/guides/profiles/28-ordering/process/index.adoc @@ -59,4 +59,6 @@ include::use-case4.adoc[] include::use-case5.adoc[] +include::use-case6.adoc[] + :leveloffset: -1 diff --git a/guides/profiles/28-ordering/process/use-case6.adoc b/guides/profiles/28-ordering/process/use-case6.adoc new file mode 100644 index 00000000..fd45d863 --- /dev/null +++ b/guides/profiles/28-ordering/process/use-case6.adoc @@ -0,0 +1,39 @@ +[[use-case-6-consignment-order]] += Use case 6 – Vendor-Managed Inventory with Consignment Ordering + +This use case describes a scenario where the buyer has an on-premise inventory that is regularly refilled and managed by the seller. When items are withdrawn from the inventory, a consignment order is automatically sent to the seller. + +[cols="1s,5",options="header"] +|==== +|Use Case number +|6 + +|Use Case Name +|Vendor-Managed Inventory with Consignment Ordering + +|Use Case Description +|A hospital is using a vendor-managed inventory. A consigment order is issued by they buyer when items are withdrawn. + +|Parties involved +|Buyer + +Seller + + + +|Assumptions +|The buyer has an inventory which is managed by the seller. The seller keeps track on available quantity and replenish when necessary. + + +|The flow +|The buyer withdraws 10 boxes of surgical gloves from the inventory. + +The buyer registers the purchase by scanning the barcodes of the boxes. + +A consignment order is automatically issued (with type code 227) and is sent to the seller. + +The seller receives the order and sends an order response with an acknowledgment. + +The seller updates the record of available quantity. + +|Result +|The buyer uses the withdrawn items. + +The seller has an updated record of available quantity. + +If the invoice has an order reference, the invoice can be matched automatically. + +|XML example file +|See Appendix A for a sample file illustrating Use Case 6 in the download section on the main page. +|==== diff --git a/guides/profiles/3-order-only/process/index.adoc b/guides/profiles/3-order-only/process/index.adoc index 9ef9eace..e3d49ec2 100644 --- a/guides/profiles/3-order-only/process/index.adoc +++ b/guides/profiles/3-order-only/process/index.adoc @@ -37,4 +37,6 @@ include::use-case4.adoc[] include::use-case5.adoc[] +include::use-case6.adoc[] + :leveloffset: -1 diff --git a/guides/profiles/3-order-only/process/use-case6.adoc b/guides/profiles/3-order-only/process/use-case6.adoc new file mode 100644 index 00000000..e4805c07 --- /dev/null +++ b/guides/profiles/3-order-only/process/use-case6.adoc @@ -0,0 +1,39 @@ +[[use-case-6-consignment-order]] += Use case 6 – Vendor-Managed Inventory with Consignment Ordering + +This use case describes a scenario where the buyer has an on-premise inventory that is regularly refilled and managed by the seller. When items are withdrawn from the inventory, a consignment order is automatically sent to the seller. + +[cols="1s,5",options="header"] +|==== +|Use Case number +|6 + +|Use Case Name +|Vendor-Managed Inventory with Consignment Ordering + +|Use Case Description +|A hospital is using a vendor-managed inventory. A consigment order is issued by they buyer when items are withdrawn. + +|Parties involved +|Buyer + +Seller + + + +|Assumptions +|The buyer has an inventory which is managed by the seller. The seller keeps track on available quantity and replenish when necessary + + +|The flow +|The buyer withdraws 10 boxes of surgical gloves from the inventory. + +The buyer registers the purchase by scanning the barcodes of the boxes. + +A consignment order is automatically issued (with type code 227) and is sent to the seller. + +The seller receives the order. + +The seller updates the record of available quantity. + +|Result +|The buyer uses the withdrawn items. + +The seller has an updated record of available quantity. + +If the invoice has an order reference, the invoice can be matched automatically. + +|XML example file +|See Appendix A for a sample file illustrating Use Case 6 in the download section on the main page. +|==== diff --git a/guides/release-notes/main.adoc b/guides/release-notes/main.adoc index ef41bdb7..a14ca3e0 100644 --- a/guides/release-notes/main.adoc +++ b/guides/release-notes/main.adoc @@ -15,6 +15,8 @@ IMPORTANT: Changes in code lists are also reflected by changes in the validation :leveloffset: +1 +include::v3.0.14.adoc[] + include::v3.0.13.adoc[] include::v3.0.12.adoc[] diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc new file mode 100644 index 00000000..dd0401b7 --- /dev/null +++ b/guides/release-notes/v3.0.14.adoc @@ -0,0 +1,21 @@ += Version 3.0.14 +[horizontal] +Release date:: November 2024 + +== BIS documentation + +* BIS Catalogue +** Added and sample file and use case which describes consignment orders and vendor-managed inventory for Order Only and Ordering BIS. + +== Changes to syntax +* Order transaction (T01) + +* Order Response transaction (T76) +* Order Response transaction Advanced (T116) + +* Catalogue transaction (T19) + +== Changes to code lists and validation artefacts + + +== Other diff --git a/rules/examples/Order use cases/UC6_Order.xml b/rules/examples/Order use cases/UC6_Order.xml new file mode 100644 index 00000000..46ace85e --- /dev/null +++ b/rules/examples/Order use cases/UC6_Order.xml @@ -0,0 +1,99 @@ + + + urn:fdc:peppol.eu:poacc:trns:order:3 + urn:fdc:peppol.eu:poacc:bis:order_only:3 + 1 + 2024-08-28 + 05:10:10 + 227 + EUR + + 2024-08-28 + + + C1 + + + + 7300010000001 + + 7300010000001 + + + City Hospital + + + City Hospital 345433 + 7300010000001 + + Eurocity + + SE + + + + + Martin Foggerty + +46555785488 + martin.foggerty@cityhospital.se + + + + + + 987654325 + + 987654325 + + + Harbour street + Dock 45 + Bergen + 5005 + Region West + + Gate 34 + + + NO + + + + The Supplier AB + + + + + 100 + + + 400 + 500 + + + + 1 + 10 + 400 + + 40 + + + Surgical gloves, box of 100 pairs + + 05704066204093 + + + S + 25 + + VAT + + + + + + From 689bf8d277066f55fdd7c08b929a82141dd066ac Mon Sep 17 00:00:00 2001 From: Martin Forsberg Date: Wed, 28 Aug 2024 16:55:59 +0200 Subject: [PATCH 04/39] editorial fix --- guides/profiles/28-ordering/process/use-case6.adoc | 4 ++-- guides/profiles/3-order-only/process/use-case6.adoc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/guides/profiles/28-ordering/process/use-case6.adoc b/guides/profiles/28-ordering/process/use-case6.adoc index fd45d863..d31613ad 100644 --- a/guides/profiles/28-ordering/process/use-case6.adoc +++ b/guides/profiles/28-ordering/process/use-case6.adoc @@ -1,5 +1,5 @@ [[use-case-6-consignment-order]] -= Use case 6 – Vendor-Managed Inventory with Consignment Ordering += Use case 6 – Vendor-managed inventory with consignment ordering This use case describes a scenario where the buyer has an on-premise inventory that is regularly refilled and managed by the seller. When items are withdrawn from the inventory, a consignment order is automatically sent to the seller. @@ -9,7 +9,7 @@ This use case describes a scenario where the buyer has an on-premise inventory t |6 |Use Case Name -|Vendor-Managed Inventory with Consignment Ordering +|Vendor-managed inventory with consignment ordering |Use Case Description |A hospital is using a vendor-managed inventory. A consigment order is issued by they buyer when items are withdrawn. diff --git a/guides/profiles/3-order-only/process/use-case6.adoc b/guides/profiles/3-order-only/process/use-case6.adoc index e4805c07..01a231ae 100644 --- a/guides/profiles/3-order-only/process/use-case6.adoc +++ b/guides/profiles/3-order-only/process/use-case6.adoc @@ -1,5 +1,5 @@ [[use-case-6-consignment-order]] -= Use case 6 – Vendor-Managed Inventory with Consignment Ordering += Use case 6 – Vendor-managed inventory with consignment ordering This use case describes a scenario where the buyer has an on-premise inventory that is regularly refilled and managed by the seller. When items are withdrawn from the inventory, a consignment order is automatically sent to the seller. @@ -9,7 +9,7 @@ This use case describes a scenario where the buyer has an on-premise inventory t |6 |Use Case Name -|Vendor-Managed Inventory with Consignment Ordering +|Vendor-managed inventory with consignment ordering |Use Case Description |A hospital is using a vendor-managed inventory. A consigment order is issued by they buyer when items are withdrawn. From d33acd016a488380fd4b0086d0f910b721f5a026 Mon Sep 17 00:00:00 2001 From: Martin Forsberg Date: Wed, 28 Aug 2024 16:58:32 +0200 Subject: [PATCH 05/39] test --- guides/profiles/28-ordering/process/use-case6.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/profiles/28-ordering/process/use-case6.adoc b/guides/profiles/28-ordering/process/use-case6.adoc index d31613ad..5c847e98 100644 --- a/guides/profiles/28-ordering/process/use-case6.adoc +++ b/guides/profiles/28-ordering/process/use-case6.adoc @@ -2,7 +2,7 @@ = Use case 6 – Vendor-managed inventory with consignment ordering This use case describes a scenario where the buyer has an on-premise inventory that is regularly refilled and managed by the seller. When items are withdrawn from the inventory, a consignment order is automatically sent to the seller. - + [cols="1s,5",options="header"] |==== |Use Case number From 83d1a2b72f054e590ec1cdfb116c4082ccaa7571 Mon Sep 17 00:00:00 2001 From: MartinForsberg-Ecru Date: Wed, 28 Aug 2024 20:12:47 +0200 Subject: [PATCH 06/39] updated release notes --- guides/release-notes/v3.0.14.adoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc index dd0401b7..a16905b7 100644 --- a/guides/release-notes/v3.0.14.adoc +++ b/guides/release-notes/v3.0.14.adoc @@ -7,12 +7,11 @@ Release date:: November 2024 * BIS Catalogue ** Added and sample file and use case which describes consignment orders and vendor-managed inventory for Order Only and Ordering BIS. + == Changes to syntax * Order transaction (T01) - * Order Response transaction (T76) * Order Response transaction Advanced (T116) - * Catalogue transaction (T19) == Changes to code lists and validation artefacts From ccad394a31976f1a9636b420b1c7c62473dc8760 Mon Sep 17 00:00:00 2001 From: oscarglanzmann Date: Thu, 29 Aug 2024 19:32:22 +0200 Subject: [PATCH 07/39] POACC-477 --- guides/profiles/30-despatchadvice/principles/parties.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/guides/profiles/30-despatchadvice/principles/parties.adoc b/guides/profiles/30-despatchadvice/principles/parties.adoc index 5bc1a3ca..5fb90a71 100644 --- a/guides/profiles/30-despatchadvice/principles/parties.adoc +++ b/guides/profiles/30-despatchadvice/principles/parties.adoc @@ -56,6 +56,10 @@ a| *(UBL:OriginatorCustomerParty)* |The party who will eventually receive and consume the goods and on whose behalf the buyer makes the purchase. + +*Delivery party* +*(cac:Delivery/cac:DeliveryParty)* + |A unit to where the consignee forwards the goods. A final delivery point. |==== The diagram below shows the roles in the fulfillment process. From 40886c82891cf4e7e41f648bccb72c8321f4eccb Mon Sep 17 00:00:00 2001 From: Hans Petersen Date: Sat, 31 Aug 2024 14:10:06 +0200 Subject: [PATCH 08/39] =?UTF-8?q?Add=20=E2=80=9Dcac:DocumentReference?= =?UTF-8?q?=E2=80=9D=20to=20Certificate=20in=20Peppol=20PunchOut.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.bat | 38 +++++ guides/release-notes/v3.0.14.adoc | 1 + rules/examples/PunchOut_Example.xml | 12 +- structure/syntax/ubl-shoppingcart.xml | 226 ++++++++++++++++---------- 4 files changed, 185 insertions(+), 92 deletions(-) create mode 100644 build.bat diff --git a/build.bat b/build.bat new file mode 100644 index 00000000..764d4854 --- /dev/null +++ b/build.bat @@ -0,0 +1,38 @@ +@echo off +setlocal + +:: Get the directory of the script +set "PROJECT=%~dp0" +set "PROJECT=%PROJECT:~0,-1%" :: Remove trailing backslash if any + +:: Delete target folder if found +if exist "%PROJECT%\target" ( + docker run --rm -i -v "%PROJECT%:/src" alpine:3.6 rm -rf /src/target +) + +:: Structure +docker run --rm -i -v "%PROJECT%:/src" -v "%PROJECT%\target:/target" difi/vefa-structure:0.6.1 + +:: Testing validation rules +docker run --rm -i -v "%PROJECT%:/src" anskaffelser/validator:2.1.0 build -x -t -n eu.peppol.poacc.upgrade.v3 -a rules -target target/validator-test /src + +:: Schematron +for %%s in ("%PROJECT%\rules\sch\*.sch") do ( + docker run --rm -i -v "%PROJECT%:/src" -v "%PROJECT%\target\schematron:/target" klakegg/schematron prepare /src/rules/sch/%%~nxs /target/%%~nxs +) + +docker run --rm -i -v "%PROJECT%\target\site\files:/src" alpine:3.6 rm -rf /src/PEPPOLBIS-Upgrade-Schematron.zip +docker run --rm -i -v "%PROJECT%\target\schematron:/src" -v "%PROJECT%\target\site\files:/target" -w /src kramos/alpine-zip -r /target/PEPPOLBIS-Upgrade-Schematron.zip . + +:: Example files +docker run --rm -i -v "%PROJECT%\target\site\files:/src" alpine:3.6 rm -rf /src/PEPPOLBIS-Examples.zip +docker run --rm -i -v "%PROJECT%\rules\examples:/src" -v "%PROJECT%\target\site\files:/target" -w /src kramos/alpine-zip -r /target/PEPPOLBIS-Examples.zip . + +:: Guides +docker run --rm -i -v "%PROJECT%:/documents" -v "%PROJECT%\target:/target" difi/asciidoctor + +:: Fix ownership (Windows doesn't use the same concept of user/group ownership, so this part is usually not necessary) +:: You can skip this part or just leave it for Unix-like environments using Docker. + +endlocal +pause diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc index a16905b7..9f8c4339 100644 --- a/guides/release-notes/v3.0.14.adoc +++ b/guides/release-notes/v3.0.14.adoc @@ -13,6 +13,7 @@ Release date:: November 2024 * Order Response transaction (T76) * Order Response transaction Advanced (T116) * Catalogue transaction (T19) +* Punchout transaction (T77) == Changes to code lists and validation artefacts diff --git a/rules/examples/PunchOut_Example.xml b/rules/examples/PunchOut_Example.xml index e26f065f..5bc2c026 100644 --- a/rules/examples/PunchOut_Example.xml +++ b/rules/examples/PunchOut_Example.xml @@ -1,8 +1,8 @@ + xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" + xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"> urn:fdc:peppol.eu:poacc:trns:punch_out:3 urn:fdc:peppol.eu:poacc:bis:punch_out:3 1387 @@ -84,7 +84,8 @@ 12345 - UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi + + UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi @@ -124,6 +125,9 @@ NA + + https://someref/to/123450 + @@ -166,4 +170,4 @@ - + \ No newline at end of file diff --git a/structure/syntax/ubl-shoppingcart.xml b/structure/syntax/ubl-shoppingcart.xml index 43894cbf..d14e4d3d 100644 --- a/structure/syntax/ubl-shoppingcart.xml +++ b/structure/syntax/ubl-shoppingcart.xml @@ -13,10 +13,12 @@ cbc:CustomizationID Specification identification - An identification of the specification containing the total set of rules regarding semantic content, cardinalities and business rules to which the data contained in the instance document conforms. + An identification of the specification containing the total set of rules + regarding semantic content, cardinalities and business rules to which the data + contained in the instance document conforms. Identifier tir77-007 - + urn:fdc:peppol.eu:poacc:trns:punch_out:3 @@ -24,7 +26,7 @@ cbc:ProfileID Business process type identifier Identifies the business process context in which the transaction appears. - It enables the buyer to process the document in an appropriate way. + It enables the buyer to process the document in an appropriate way. Identifier tir77-006 @@ -42,9 +44,10 @@ cbc:ActionCode Complete cart indicator - Indicate if only a complete shopping cart can be ordered ("true"). That is, that - the information and prices in the shopping cart is only valid if the complete cart - is ordered. + Indicate if only a complete shopping cart can be ordered ("true"). That is, + that + the information and prices in the shopping cart is only valid if the complete cart + is ordered. Code tir77-005 TrueFalse @@ -75,8 +78,8 @@ cbc:EndDate Period end date The date is the last day of the period.Date until which information - and prices stated in the shopping cart are valid. The date on which the period - ends.Format= "YYYY-MM-DD" + and prices stated in the shopping cart are valid. The date on which the period + ends.Format= "YYYY-MM-DD" Date tir77-008 2018-05-31 @@ -85,7 +88,7 @@ cbc:EndTime Period end time The end time of the period.Date until which information and prices - stated in the shopping cart are valid.Format ="hh:mm:ss" + stated in the shopping cart are valid.Format ="hh:mm:ss" Time tir77-009 12:00:00 @@ -98,7 +101,8 @@ cbc:ID Contract identifier - A reference that uniquely identifies a contract that relates to this transaction. + A reference that uniquely identifies a contract that relates to this + transaction. Document reference tir77-020 frame123 @@ -111,7 +115,7 @@ cbc:EndpointID Seller electronic address Identifies the seller's electronic address to which a business - document may be delivered. + document may be delivered. Identifier OP-T77-001 @@ -165,7 +169,7 @@ cbc:EndpointID Buyer electronic address Identifies the buyers electronic address to which the business - document should be delivered. + document should be delivered. Identifier OP-T77-002 @@ -184,8 +188,8 @@ cbc:ID Buyer identifier A identifier for the buyer that is issued by the party that sends - the document in which the identifier is used.An identifier for the - buyer. + the document in which the identifier is used.An identifier for the + buyer. Identifier tir77-011 tir77-012 @@ -208,7 +212,8 @@ Buyer name The full name of the buyer. Text - tir77-010Buyer name + tir77-010 + Buyer name @@ -219,8 +224,10 @@ cbc:ID Buyer reference identifier An identifier assigned by the Buyer used for internal routing - purposes. - This reference should be placed in the order which may follow after the PunchOut transaction is received by the Buyer(contact ID, department, office id, project code) + purposes. + This reference should be placed in the order which may follow after the + PunchOut transaction is received by the Buyer(contact ID, department, office + id, project code) Identifier tir77-045 abc234 @@ -234,7 +241,7 @@ cbc:ID Shopping cart line identifier An identifier for an individual line that is unique within a shopping - cart. + cart. Identifier tir77-015 @@ -243,7 +250,8 @@ cbc:ContractSubdivision Contracted item indicator - Reference to the contract when the item is offered in accordance to an existing contract + Reference to the contract when the item is offered in accordance to an + existing contract Identifier tir77-019 ct24342 @@ -251,14 +259,17 @@ cac:LineValidityPeriod Availability date information - A shopping cart line may state the item availability date, which is first day before the end of which the particular item - can and will be shipped from the seller. If availability date is before the cart issue date then the item is immediately available. - The availability of all items in the cart ends when the validity period of the cart ends. + A shopping cart line may state the item availability date, which is + first day before the end of which the particular item + can and will be shipped from the seller. If availability date is before the cart + issue date then the item is immediately available. + The availability of all items in the cart ends when the validity period of the + cart ends. cbc:StartDate Item availability date The date when the item will be available for - ordering. Format = "YYYY-MM-DD" + ordering. Format = "YYYY-MM-DD" Date tir77-027 2018-05-01 @@ -266,7 +277,8 @@ cbc:EndDate Cart line validity date - Date until which information and prices stated in the shopping cart line are valid. + Date until which information and prices stated in the shopping cart + line are valid. Date OP-T77-013 2018-05-31 @@ -274,7 +286,8 @@ cbc:EndTime Cart line validity time - The time of the end date until which information and prices stated in the shopping cart line are valid. + The time of the end date until which information and prices stated + in the shopping cart line are valid. Time OP-T77-014 23:59:59 @@ -283,12 +296,16 @@ cac:RequiredItemLocationQuantity Item location quantity information - Properties of the item in this shopping cart line that are dependent on location and quantity. + Properties of the item in this shopping cart line that are dependent on + location and quantity. cbc:LeadTimeMeasure Shopping cart line delivery lead days - This is the maximum number of working days that may pass from the day the seller receives an order until the day the item is shipped from the seller. The seller may ship earlier. A lead day of one (1) means that an item will be shipped no later than the - end of next working day according to the sellers regional calendar. + This is the maximum number of working days that may pass from the + day the seller receives an order until the day the item is shipped from the + seller. The seller may ship earlier. A lead day of one (1) means that an + item will be shipped no later than the + end of next working day according to the sellers regional calendar. Text tir77-016 @@ -309,7 +326,7 @@ cbc:StreetName Address line 1 The main address line in a postal address usually the street - name and number. + name and number. Text OP-T77-007 @@ -317,8 +334,8 @@ cbc:AdditionalStreetName Address line 2 An additional address line in a postal address that can be - used to give further details supplementing the main line. Common use are - secondary house number in a complex or in a building. + used to give further details supplementing the main line. Common use are + secondary house number in a complex or in a building. Text OP-T77-008 @@ -326,7 +343,7 @@ cbc:CityName City The common name of the city where the postal address is. The - name is written in full rather than as a code. + name is written in full rather than as a code. Text OP-T77-010 @@ -334,8 +351,8 @@ cbc:PostalZone Post code The identifier for an addressable group of properties - according to the relevant national postal service, such as a ZIP code or - Post Code. + according to the relevant national postal service, such as a ZIP code or + Post Code. Text OP-T77-011 @@ -343,7 +360,7 @@ cbc:CountrySubentity Country subdivision For specifying a region, county, state, province etc. within a - country by using text. + country by using text. Text OP-T77-012 @@ -353,7 +370,8 @@ cbc:Line Address line 3 - An additional address line in an address that can be used to give further details supplementing the main line. + An additional address line in an address that can be used + to give further details supplementing the main line. Text OP-T77-009 Gate 34 @@ -367,10 +385,10 @@ cbc:IdentificationCode Country code A code that identifies the country.The lists of valid - countries are registered with the ISO 3166-1 Maintenance agency, - "Codes for the representation of names of countries and their - subdivisions". Codes must be according to the alpha-2 - representation. + countries are registered with the ISO 3166-1 Maintenance agency, + "Codes for the representation of names of countries and their + subdivisions". Codes must be according to the alpha-2 + representation. Code tir01-033 ISO3166 @@ -402,7 +420,9 @@ cbc:BaseQuantity Item price base quantity - The number of item units to which the price applies. UOM should be stated by using UN/ECE Recommandation 20, including Rec 21 codes - prefixed with X + The number of item units to which the price applies. UOM should + be stated by using UN/ECE Recommandation 20, including Rec 21 codes - + prefixed with X Quantity tir77-033 @@ -418,7 +438,8 @@ cbc:PriceType Price type - The type of the item price. The type may be given by using codes from UN/CEFACT code list 5387. + The type of the item price. The type may be given by using + codes from UN/CEFACT code list 5387. Text OP-T77-015 @@ -429,7 +450,9 @@ cbc:BatchQuantity Shopping cart line quantity - The number of item units requested by the buyer. UOM should be stated by using UN/ECE Recommandation 20, including Rec 21 codes - prefixed with X + The number of item units requested by the buyer. UOM should be + stated by using UN/ECE Recommandation 20, including Rec 21 codes - + prefixed with X Quantity tir77-017 @@ -527,7 +550,8 @@ schemeID Item standard identifier identification scheme identifier - The identification scheme identifier of the Item standard identifier + The identification scheme identifier of the Item standard + identifier ICD 0160 @@ -541,7 +565,7 @@ cbc:ID Attachment/image identifier An identifier that can be used to reference the attached - document, such as an unique identifier. + document, such as an unique identifier. Identifier tir77-036 OP-T77-003 @@ -550,7 +574,8 @@ cbc:DocumentTypeCode Attachment/image description code - A functional description of the attachment/image expressed as code + A functional description of the attachment/image expressed as + code Code UNCL1001 Image @@ -562,7 +587,7 @@ cbc:DocumentDescription Attachment descriptionAttached image description A short description of the attached documentA short - description of the attached document + description of the attached document Text tir77-037 OP-T77-004 @@ -575,8 +600,10 @@ cbc:EmbeddedDocumentBinaryObject Attached document/image - 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 + 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 tir77-038 @@ -603,7 +630,7 @@ cbc:URI External item specifications URI reference to external item information or - specifications. E.g. web address + specifications. E.g. web address tir77-p003 http://www.test.no/image.jpg @@ -617,10 +644,10 @@ cbc:IdentificationCode Item country of origin A code that identifies the country.The lists of valid - countries are registered with the ISO 3166-1 Maintenance agency, - "Codes for the representation of names of countries and their - subdivisions". Codes must be according to the alpha-2 - representation. + countries are registered with the ISO 3166-1 Maintenance agency, + "Codes for the representation of names of countries and their + subdivisions". Codes must be according to the alpha-2 + representation. Code ISO3166 tir77-029 @@ -633,9 +660,10 @@ cbc:ItemClassificationCode Item commodity classification - 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. + 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 tir77-028 @@ -643,22 +671,25 @@ listID Item classification identifier identification scheme identifier - The identification scheme identifier of the Item classification identifier + The identification scheme identifier of the Item + classification identifier UNCL7143 MP listVersionID - Item classification identifier version identification scheme identifier - The identification scheme version identifier of the Item classification identifier + 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 - + Office furniture + 9873242 @@ -668,7 +699,8 @@ cbc:ActionCode Contracted item indicator - The code CT indicates that the item is offered in accordance to the referenced contract. + The code CT indicates that the item is offered in accordance to + the referenced contract. Code tir77-019 CT @@ -683,18 +715,16 @@ The TAX category code for the item. Code tir77-034 - Z cbc:Percent Item TAX rate A TAX rate of zero percent is applied for calculation purposes - even if the item is outside the scope of TAX. The TAX rate, represented - as percentage that applies to the item. + even if the item is outside the scope of TAX. The TAX rate, represented + as percentage that applies to the item. Percentage tir77-035 - 0 @@ -703,19 +733,22 @@ cbc:ID Tax scheme. E.g. “VAT” or “GST” - tir77-p004 - VAT or GST + tir77-p004 + VAT or GST cac:AdditionalItemProperty Additional item property information - Used to for item properties and also configured product identifier and item is service indicator + Used to for item properties and also configured product identifier + and item is service indicator cbc:Name Item property name - The name of the property.The name must be sufficiently descriptive to define the value. The definition may be supplemented with the property unit of measure when relevant. + The name of the property.The name must be sufficiently + descriptive to define the value. The definition may be supplemented with + the property unit of measure when relevant. Text tir77-018 tir77-026 @@ -727,13 +760,14 @@ cbc:NameCode Item property code Code for the item property according to a property code - system + system Code tir77-040 listID Name code list id. - An identifier for the code list used for the Name code, this is bilaterally agreed. + An identifier for the code list used for the Name code, + this is bilaterally agreed. eClass 2397824 @@ -749,7 +783,8 @@ cbc:ValueQuantity Item property unit of measure - The unit of measure in which the property value is stated, if relevant. May not be relevant when properties are descriptive. + The unit of measure in which the property value is stated, if + relevant. May not be relevant when properties are descriptive. Quantity tir77-041 @@ -763,12 +798,12 @@ 120 - cbc:ValueQualifier - Property classification - Standardized and predefined classification of items properties. - Text - tir77-p001 - + cbc:ValueQualifier + Property classification + Standardized and predefined classification of items properties. + Text + tir77-p001 + cac:ManufacturerParty @@ -790,7 +825,8 @@ cac:Certificate Item label information - Information about the items environmental, social, ethical and quality type of labelling. + Information about the items environmental, social, ethical and + quality type of labelling. cbc:ID Item label name @@ -803,8 +839,9 @@ cbc:CertificateTypeCode Certificate type code - The UBL structure used for item labeling requires this elements, - use the value NA. + The UBL structure used for item labeling requires this + elements, + use the value NA. Code NA @@ -812,10 +849,9 @@ cbc:CertificateType Item label type The label type such environmental, quality, social - etc. + etc. Text tir77-031 - Environmental @@ -834,8 +870,9 @@ cbc:Name Issuer name - The UBL structure used for item labeling requires this elements, - use the value NA. + The UBL structure used for item labeling requires this + elements, + use the value NA. Text tir77-030 @@ -843,8 +880,21 @@ + + cac:DocumentReference + Label document + + cbc:ID + Item label reference + A reference to where the label specification can be + found, e.g. a URI. + Document reference + tir77-p005 + http://www.label.eu/test/ + + - + \ No newline at end of file From 50e9a3bc70fca91cdada19d2665be5de698b56a3 Mon Sep 17 00:00:00 2001 From: MartinForsberg-Ecru Date: Mon, 2 Sep 2024 19:34:24 +0200 Subject: [PATCH 09/39] POACC-760 --- project.xml | 6 ++++++ .../TransportHandlingUnitIDschemeID.xml | 21 +++++++++++++++++++ structure/syntax/ubl-despatch-advice.xml | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 structure/codelist/TransportHandlingUnitIDschemeID.xml diff --git a/project.xml b/project.xml index 1644e476..6f645e8b 100644 --- a/project.xml +++ b/project.xml @@ -302,6 +302,12 @@ CodeList-1 structure/codelist/StatusReason.xml + + CodeList-1 + structure/codelist/TransportHandlingUnitIDschemeID.xml + + + native:File diff --git a/structure/codelist/TransportHandlingUnitIDschemeID.xml b/structure/codelist/TransportHandlingUnitIDschemeID.xml new file mode 100644 index 00000000..486f1028 --- /dev/null +++ b/structure/codelist/TransportHandlingUnitIDschemeID.xml @@ -0,0 +1,21 @@ + + + + Transport Handling Unit ID scheme(openPEPPOL) + TransportHandlingUnitIDschemID + 1.0 + OpenPEPPOL + OpenPEPPOL + + + SSCC + Serial Shipping Container Code + Code used to identify a logistic unit + + + ZZZ + Mutually defined + Identifier scheme which is mutually defined by the trading partners + + + \ No newline at end of file diff --git a/structure/syntax/ubl-despatch-advice.xml b/structure/syntax/ubl-despatch-advice.xml index 3548cd19..3e589b29 100644 --- a/structure/syntax/ubl-despatch-advice.xml +++ b/structure/syntax/ubl-despatch-advice.xml @@ -1447,6 +1447,8 @@ Handling unit identifier Identifies the transport handling unit. tir16-061 + TransportHandlingUnitIDschemID + SSCC cbc:TransportHandlingUnitTypeCode From 1940197249baa9dc534bc7a7b5e263b96c2f79ca Mon Sep 17 00:00:00 2001 From: MartinForsberg-Ecru Date: Mon, 2 Sep 2024 19:40:48 +0200 Subject: [PATCH 10/39] Quick-fix of release notes --- guides/release-notes/v3.0.14.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc index a16905b7..40022862 100644 --- a/guides/release-notes/v3.0.14.adoc +++ b/guides/release-notes/v3.0.14.adoc @@ -15,6 +15,6 @@ Release date:: November 2024 * Catalogue transaction (T19) == Changes to code lists and validation artefacts - +* Added new codelist with code values SSCC (Serial Shipping Container Code) and ZZZ (Mutually defined) to the optional attribute that indicates the type/scheme for Transport handling unit identifier (in Despatch Advice) == Other From 37f5ce2d370df897419d46e526022f04603d4a00 Mon Sep 17 00:00:00 2001 From: MartinForsberg-Ecru Date: Mon, 2 Sep 2024 19:48:24 +0200 Subject: [PATCH 11/39] Corrected syntax report --- structure/syntax/ubl-despatch-advice.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/structure/syntax/ubl-despatch-advice.xml b/structure/syntax/ubl-despatch-advice.xml index 3e589b29..c30e3841 100644 --- a/structure/syntax/ubl-despatch-advice.xml +++ b/structure/syntax/ubl-despatch-advice.xml @@ -1447,8 +1447,15 @@ Handling unit identifier Identifies the transport handling unit. tir16-061 - TransportHandlingUnitIDschemID - SSCC + 173500538500000016 + + schemeID + Scheme identifier + Scheme identifier for the handling unit identifier + TransportHandlingUnitIDschemID + SSCC + + cbc:TransportHandlingUnitTypeCode From c53c41284ead68f0c111b2a72e3b99d7161f5201 Mon Sep 17 00:00:00 2001 From: MartinForsberg-Ecru Date: Tue, 3 Sep 2024 10:01:16 +0200 Subject: [PATCH 12/39] new attribute set to optional --- structure/syntax/ubl-despatch-advice.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/structure/syntax/ubl-despatch-advice.xml b/structure/syntax/ubl-despatch-advice.xml index c30e3841..050ea9ea 100644 --- a/structure/syntax/ubl-despatch-advice.xml +++ b/structure/syntax/ubl-despatch-advice.xml @@ -1448,13 +1448,13 @@ Identifies the transport handling unit. tir16-061 173500538500000016 - + schemeID Scheme identifier Scheme identifier for the handling unit identifier TransportHandlingUnitIDschemID SSCC - + From 19e94eb13537d7760b9de32553e94af90d3098a8 Mon Sep 17 00:00:00 2001 From: MartinForsberg-Ecru Date: Wed, 11 Sep 2024 11:24:26 +0200 Subject: [PATCH 13/39] POAC-767 updated release notes --- guides/release-notes/v3.0.14.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc index 40022862..65ebb685 100644 --- a/guides/release-notes/v3.0.14.adoc +++ b/guides/release-notes/v3.0.14.adoc @@ -5,7 +5,9 @@ Release date:: November 2024 == BIS documentation * BIS Catalogue -** Added and sample file and use case which describes consignment orders and vendor-managed inventory for Order Only and Ordering BIS. + +* BIS Ordering and Order Only +** Added and sample file and use case which describes consignment orders and vendor-managed inventory == Changes to syntax From 94aa48ffc96451161d7016200336bd65528cbb6f Mon Sep 17 00:00:00 2001 From: MartinForsberg-Ecru Date: Wed, 11 Sep 2024 11:30:48 +0200 Subject: [PATCH 14/39] editorial --- guides/release-notes/v3.0.14.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc index 65ebb685..223cd444 100644 --- a/guides/release-notes/v3.0.14.adoc +++ b/guides/release-notes/v3.0.14.adoc @@ -7,7 +7,7 @@ Release date:: November 2024 * BIS Catalogue * BIS Ordering and Order Only -** Added and sample file and use case which describes consignment orders and vendor-managed inventory +** Added sample file and use case which describes consignment orders and vendor-managed inventory == Changes to syntax From 89117c5272e83a6880fd65558c70b465270e29b4 Mon Sep 17 00:00:00 2001 From: MartinForsberg-Ecru Date: Wed, 11 Sep 2024 11:46:20 +0200 Subject: [PATCH 15/39] POACC-760 improved release notes --- guides/release-notes/v3.0.14.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc index 223cd444..02c0c415 100644 --- a/guides/release-notes/v3.0.14.adoc +++ b/guides/release-notes/v3.0.14.adoc @@ -14,6 +14,8 @@ Release date:: November 2024 * Order transaction (T01) * Order Response transaction (T76) * Order Response transaction Advanced (T116) +* Despatch Advice (T16) +** Optional attribute added to indicate the scheme of the Transport Handling Unit identifier. * Catalogue transaction (T19) == Changes to code lists and validation artefacts From 449ccbe06f53ca930376d8f7f63677245604ecc2 Mon Sep 17 00:00:00 2001 From: oscarglanzmann Date: Thu, 12 Sep 2024 13:41:12 +0200 Subject: [PATCH 16/39] POACC-477 --- guides/release-notes/v3.0.14.adoc | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 guides/release-notes/v3.0.14.adoc diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc new file mode 100644 index 00000000..e908b703 --- /dev/null +++ b/guides/release-notes/v3.0.14.adoc @@ -0,0 +1,27 @@ += Version 3.0.14 +[horizontal] +Release date:: November 2024 + +== BIS documentation + +* BIS Catalogue + +* BIS Ordering and Order Only +** Added sample file and use case which describes consignment orders and vendor-managed inventory + +* BIS Despatch Advice +** Optional party Delivery Party added to align with Order. + +== Changes to syntax +* Order transaction (T01) +* Order Response transaction (T76) +* Order Response transaction Advanced (T116) +* Despatch Advice (T16) +** Optional attribute added to indicate the scheme of the Transport Handling Unit identifier. +** Optional element group Delivery Party added. +* Catalogue transaction (T19) + +== Changes to code lists and validation artefacts +* Added new codelist with code values SSCC (Serial Shipping Container Code) and ZZZ (Mutually defined) to the optional attribute that indicates the type/scheme for Transport handling unit identifier (in Despatch Advice) + +== Other From 27b91b3722f8c81b995acd2f0cb39a8bb0d446fe Mon Sep 17 00:00:00 2001 From: oscarglanzmann Date: Thu, 12 Sep 2024 14:31:07 +0200 Subject: [PATCH 17/39] POACC-736 --- guides/release-notes/v3.0.14.adoc | 34 +++++++++++++++++++ .../catalogue-wo-response-use-case-5.xml | 1 + rules/examples/Order use cases/UC4_Order.xml | 1 + rules/examples/OrderAgreement_Example.xml | 2 +- rules/examples/PunchOut_Example.xml | 1 + 5 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 guides/release-notes/v3.0.14.adoc diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc new file mode 100644 index 00000000..04a2ec89 --- /dev/null +++ b/guides/release-notes/v3.0.14.adoc @@ -0,0 +1,34 @@ += Version 3.0.14 +[horizontal] +Release date:: November 2024 + +== BIS documentation + +* BIS Catalogue + +* BIS Ordering and Order Only +** Added sample file and use case which describes consignment orders and vendor-managed inventory + + +== Changes to syntax +* Order transaction (T01) +** Added optional element ID to AdditionalItemProperty with corresponding update in Use Case 4. +* Order Change(T114) +** Added optional element ID to AdditionalItemProperty. +* Order Agreement(T110) +** Added optional element ID to AdditionalItemProperty with corresponding update in Use Case in Appendix A. +* Order Response transaction (T76) +* Punch Out(T77) +** Added optional element ID to AdditionalItemProperty with corresponding update in Use Case in Appendix A. +* Order Response transaction Advanced (T116) +* Despatch Advice (T16) +** Optional attribute added to indicate the scheme of the Transport Handling Unit identifier. +** Added optional element ID to AdditionalItemProperty . +* Catalogue transaction (T19) +** Added optional element ID to AdditionalItemProperty with corresponding update in Use Case 5. + +== Changes to code lists and validation artefacts +* Added new codelist with code values SSCC (Serial Shipping Container Code) and ZZZ (Mutually defined) to the optional attribute that indicates the type/scheme for Transport handling unit identifier (in Despatch Advice) + +== Other + diff --git a/rules/examples/Cataloge wo response use cases/catalogue-wo-response-use-case-5.xml b/rules/examples/Cataloge wo response use cases/catalogue-wo-response-use-case-5.xml index d142b39f..94c162a4 100644 --- a/rules/examples/Cataloge wo response use cases/catalogue-wo-response-use-case-5.xml +++ b/rules/examples/Cataloge wo response use cases/catalogue-wo-response-use-case-5.xml @@ -299,6 +299,7 @@ + 77e416eb-a363-4258-a04e-171d843a6460 Paper weight in grams 18 diff --git a/rules/examples/Order use cases/UC4_Order.xml b/rules/examples/Order use cases/UC4_Order.xml index 5f933b8d..13f66da6 100644 --- a/rules/examples/Order use cases/UC4_Order.xml +++ b/rules/examples/Order use cases/UC4_Order.xml @@ -263,6 +263,7 @@ Left-handed + 77e416eb-a363-4258-a04e-171d843a6460 Purpose Snow diff --git a/rules/examples/OrderAgreement_Example.xml b/rules/examples/OrderAgreement_Example.xml index a4ec664c..b7659e53 100644 --- a/rules/examples/OrderAgreement_Example.xml +++ b/rules/examples/OrderAgreement_Example.xml @@ -238,10 +238,10 @@ + 77e416eb-a363-4258-a04e-171d843a6460 Length test 30 mm - EU EcoLabel diff --git a/rules/examples/PunchOut_Example.xml b/rules/examples/PunchOut_Example.xml index e26f065f..4e501c93 100644 --- a/rules/examples/PunchOut_Example.xml +++ b/rules/examples/PunchOut_Example.xml @@ -161,6 +161,7 @@ + 77e416eb-a363-4258-a04e-171d843a6460 Paper weight in grams 18 From 5f99d610a5cdd9ff24d0e510a3fd109643e64a00 Mon Sep 17 00:00:00 2001 From: Hans Petersen Date: Fri, 13 Sep 2024 14:12:39 +0200 Subject: [PATCH 18/39] adjusted release note --- guides/release-notes/v3.0.14.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc index 9f8c4339..6df22c83 100644 --- a/guides/release-notes/v3.0.14.adoc +++ b/guides/release-notes/v3.0.14.adoc @@ -5,7 +5,7 @@ Release date:: November 2024 == BIS documentation * BIS Catalogue -** Added and sample file and use case which describes consignment orders and vendor-managed inventory for Order Only and Ordering BIS. +** Added sample file and use case which describes consignment orders and vendor-managed inventory for Order Only and Ordering BIS. == Changes to syntax @@ -14,6 +14,8 @@ Release date:: November 2024 * Order Response transaction Advanced (T116) * Catalogue transaction (T19) * Punchout transaction (T77) + Add ”cac:DocumentReference” to Certificate. + this may contain vital information regarding the label and has a simular function as in Catalogue. == Changes to code lists and validation artefacts From a4b778b5bbeb307849c505489825c9db3d6dbd4b Mon Sep 17 00:00:00 2001 From: Jerry Dimitriou Date: Wed, 18 Sep 2024 14:38:08 +0300 Subject: [PATCH 19/39] Update project.xml --- project.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.xml b/project.xml index 6f645e8b..7f8b7798 100644 --- a/project.xml +++ b/project.xml @@ -1,6 +1,6 @@ - Peppol BIS version 3 - May 2024 Release + Peppol BIS version 3 - November 2024 Release - Member Review INTRODUCTION BIS compliance From 0840f27382d5b2b1720d1674862d4f6631440254 Mon Sep 17 00:00:00 2001 From: Jerry Dimitriou Date: Thu, 19 Sep 2024 15:52:29 +0300 Subject: [PATCH 20/39] fixed zip file build --- .github/workflows/build-and-deploy-branch.yml | 3 +++ build.sh | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-deploy-branch.yml b/.github/workflows/build-and-deploy-branch.yml index 28eadc18..968dd87d 100644 --- a/.github/workflows/build-and-deploy-branch.yml +++ b/.github/workflows/build-and-deploy-branch.yml @@ -10,6 +10,9 @@ jobs: steps: - name: Checkout source code uses: actions/checkout@v2 + + - name: Install zip + run: apt install -y zip - name: Build Spec run: bash ./build.sh diff --git a/build.sh b/build.sh index de221e2e..d478584b 100755 --- a/build.sh +++ b/build.sh @@ -20,12 +20,11 @@ docker run --rm -i -v $PROJECT:/src anskaffelser/validator:2.1.0 build -x -t -n for sch in $PROJECT/rules/sch/*.sch; do docker run --rm -i -v $PROJECT:/src -v $PROJECT/target/schematron:/target klakegg/schematron prepare /src/rules/sch/$(basename $sch) /target/$(basename $sch) done -docker run --rm -i -v $PROJECT/target/site/files:/src alpine:3.6 rm -rf /src/PEPPOLBIS-Upgrade-Schematron.zip -docker run --rm -i -v $PROJECT/target/schematron:/src -v $PROJECT/target/site/files:/target -w /src kramos/alpine-zip -r /target/PEPPOLBIS-Upgrade-Schematron.zip . +rm -rf /src/PEPPOLBIS-Upgrade-Schematron.zip +zip -r target/site/files/PEPPOLBIS-Upgrade-Schematron.zip target/schematron # Example files -docker run --rm -i -v $PROJECT/target/site/files:/src alpine:3.6 rm -rf /src/PEPPOLBIS-Examples.zip -docker run --rm -i -v $PROJECT/rules/examples:/src -v $PROJECT/target/site/files:/target -w /src kramos/alpine-zip -r /target/PEPPOLBIS-Examples.zip . +zip -r target/site/files/PEPPOLBIS-Examples.zip rules/examples # Guides docker run --rm -i -v $PROJECT:/documents -v $PROJECT/target:/target difi/asciidoctor From d43f6293f264dc81a74b947e120bcc60cdf56c8c Mon Sep 17 00:00:00 2001 From: Jerry Dimitriou Date: Thu, 19 Sep 2024 16:00:39 +0300 Subject: [PATCH 21/39] removed zip install --- .github/workflows/build-and-deploy-branch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-deploy-branch.yml b/.github/workflows/build-and-deploy-branch.yml index 968dd87d..79d4c457 100644 --- a/.github/workflows/build-and-deploy-branch.yml +++ b/.github/workflows/build-and-deploy-branch.yml @@ -11,8 +11,8 @@ jobs: - name: Checkout source code uses: actions/checkout@v2 - - name: Install zip - run: apt install -y zip +# - name: Install zip +# run: apt install -y zip - name: Build Spec run: bash ./build.sh From 611384f024e3c268721a96424b3b8b0aa4f23d2b Mon Sep 17 00:00:00 2001 From: Jerry Dimitriou Date: Thu, 19 Sep 2024 17:34:01 +0300 Subject: [PATCH 22/39] zip fix --- build.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index d478584b..5a993223 100755 --- a/build.sh +++ b/build.sh @@ -20,11 +20,16 @@ docker run --rm -i -v $PROJECT:/src anskaffelser/validator:2.1.0 build -x -t -n for sch in $PROJECT/rules/sch/*.sch; do docker run --rm -i -v $PROJECT:/src -v $PROJECT/target/schematron:/target klakegg/schematron prepare /src/rules/sch/$(basename $sch) /target/$(basename $sch) done -rm -rf /src/PEPPOLBIS-Upgrade-Schematron.zip -zip -r target/site/files/PEPPOLBIS-Upgrade-Schematron.zip target/schematron + +# Fix ownership +docker run --rm -i -v $PROJECT:/src alpine:3.6 chown -R $(id -g $USER).$(id -g $USER) /src/target + +rm -rf $PROJECT/target/site/files/PEPPOLBIS-Upgrade-Schematron.zip +zip -r $PROJECT/target/site/files/PEPPOLBIS-Upgrade-Schematron.zip target/schematron # Example files -zip -r target/site/files/PEPPOLBIS-Examples.zip rules/examples +rm -rf $PROJECT/target/site/files/PEPPOLBIS-Examples.zip +zip -r $PROJECT/target/site/files/PEPPOLBIS-Examples.zip $PROJECT/rules/examples # Guides docker run --rm -i -v $PROJECT:/documents -v $PROJECT/target:/target difi/asciidoctor From f6fd216cc65d4693e288934c3971a8394ce4c554 Mon Sep 17 00:00:00 2001 From: Jerry Dimitriou Date: Thu, 19 Sep 2024 17:43:07 +0300 Subject: [PATCH 23/39] debug info --- build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 5a993223..834365d9 100755 --- a/build.sh +++ b/build.sh @@ -21,10 +21,15 @@ for sch in $PROJECT/rules/sch/*.sch; do docker run --rm -i -v $PROJECT:/src -v $PROJECT/target/schematron:/target klakegg/schematron prepare /src/rules/sch/$(basename $sch) /target/$(basename $sch) done +# Show permissions +ls -Rla # Fix ownership docker run --rm -i -v $PROJECT:/src alpine:3.6 chown -R $(id -g $USER).$(id -g $USER) /src/target -rm -rf $PROJECT/target/site/files/PEPPOLBIS-Upgrade-Schematron.zip +# Show permissions +ls -Rla + +sudo rm -rf $PROJECT/target/site/files/PEPPOLBIS-Upgrade-Schematron.zip zip -r $PROJECT/target/site/files/PEPPOLBIS-Upgrade-Schematron.zip target/schematron # Example files From 04b4fb63ba1f7fed0e543390d4686d2de9beb17a Mon Sep 17 00:00:00 2001 From: Jerry Dimitriou Date: Thu, 19 Sep 2024 17:47:35 +0300 Subject: [PATCH 24/39] remove debug --- build.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build.sh b/build.sh index 834365d9..f5812727 100755 --- a/build.sh +++ b/build.sh @@ -21,14 +21,9 @@ for sch in $PROJECT/rules/sch/*.sch; do docker run --rm -i -v $PROJECT:/src -v $PROJECT/target/schematron:/target klakegg/schematron prepare /src/rules/sch/$(basename $sch) /target/$(basename $sch) done -# Show permissions -ls -Rla # Fix ownership docker run --rm -i -v $PROJECT:/src alpine:3.6 chown -R $(id -g $USER).$(id -g $USER) /src/target -# Show permissions -ls -Rla - sudo rm -rf $PROJECT/target/site/files/PEPPOLBIS-Upgrade-Schematron.zip zip -r $PROJECT/target/site/files/PEPPOLBIS-Upgrade-Schematron.zip target/schematron From 011a9eab38685cdd3b74f78282056d0d37dacb81 Mon Sep 17 00:00:00 2001 From: Jerry Dimitriou Date: Thu, 19 Sep 2024 17:49:28 +0300 Subject: [PATCH 25/39] sudo --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index f5812727..0c6bddcf 100755 --- a/build.sh +++ b/build.sh @@ -25,11 +25,11 @@ done docker run --rm -i -v $PROJECT:/src alpine:3.6 chown -R $(id -g $USER).$(id -g $USER) /src/target sudo rm -rf $PROJECT/target/site/files/PEPPOLBIS-Upgrade-Schematron.zip -zip -r $PROJECT/target/site/files/PEPPOLBIS-Upgrade-Schematron.zip target/schematron +sudo zip -r $PROJECT/target/site/files/PEPPOLBIS-Upgrade-Schematron.zip target/schematron # Example files -rm -rf $PROJECT/target/site/files/PEPPOLBIS-Examples.zip -zip -r $PROJECT/target/site/files/PEPPOLBIS-Examples.zip $PROJECT/rules/examples +sudo rm -rf $PROJECT/target/site/files/PEPPOLBIS-Examples.zip +sudo zip -r $PROJECT/target/site/files/PEPPOLBIS-Examples.zip $PROJECT/rules/examples # Guides docker run --rm -i -v $PROJECT:/documents -v $PROJECT/target:/target difi/asciidoctor From c601690354fe9ae972cba5b4fdc033b47235bc68 Mon Sep 17 00:00:00 2001 From: Jerry Dimitriou Date: Thu, 19 Sep 2024 18:02:01 +0300 Subject: [PATCH 26/39] fixes paths inside zip --- build-actions.sh | 40 ++++++++++++++++++++++++++++++++++++++++ build.sh | 11 +++++++---- 2 files changed, 47 insertions(+), 4 deletions(-) create mode 100755 build-actions.sh diff --git a/build-actions.sh b/build-actions.sh new file mode 100755 index 00000000..cfc6b8c8 --- /dev/null +++ b/build-actions.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +PROJECT=$(dirname $(readlink -f "$0")) + +# Delete target folder if found +if [ -e $PROJECT/target ]; then + docker run --rm -i -v $PROJECT:/src alpine:3.6 rm -rf /src/target +fi + +# Structure +docker run --rm -i \ + -v $PROJECT:/src \ + -v $PROJECT/target:/target \ + difi/vefa-structure:0.6.1 + +# Testing validation rules +docker run --rm -i -v $PROJECT:/src anskaffelser/validator:2.1.0 build -x -t -n eu.peppol.poacc.upgrade.v3 -a rules -target target/validator-test /src + +# Schematron +for sch in $PROJECT/rules/sch/*.sch; do + docker run --rm -i -v $PROJECT:/src -v $PROJECT/target/schematron:/target klakegg/schematron prepare /src/rules/sch/$(basename $sch) /target/$(basename $sch) +done + +# Fix ownership +docker run --rm -i -v $PROJECT:/src alpine:3.6 chown -R $(id -g $USER).$(id -g $USER) /src/target + +rm -rf $PROJECT/target/site/files/PEPPOLBIS-Upgrade-Schematron.zip +rm -rf $PROJECT/target/site/files/PEPPOLBIS-Examples.zip + +cd $PROJECT/target +zip -r site/files/PEPPOLBIS-Upgrade-Schematron.zip schematron/ + +cd $PROJECT +zip -r target/site/files/PEPPOLBIS-Examples.zip rules/examples + +# Guides +docker run --rm -i -v $PROJECT:/documents -v $PROJECT/target:/target difi/asciidoctor + +# Fix ownership +docker run --rm -i -v $PROJECT:/src alpine:3.6 chown -R $(id -g $USER).$(id -g $USER) /src/target diff --git a/build.sh b/build.sh index 0c6bddcf..4b8aa2de 100755 --- a/build.sh +++ b/build.sh @@ -24,12 +24,15 @@ done # Fix ownership docker run --rm -i -v $PROJECT:/src alpine:3.6 chown -R $(id -g $USER).$(id -g $USER) /src/target -sudo rm -rf $PROJECT/target/site/files/PEPPOLBIS-Upgrade-Schematron.zip -sudo zip -r $PROJECT/target/site/files/PEPPOLBIS-Upgrade-Schematron.zip target/schematron +rm -rf $PROJECT/target/site/files/PEPPOLBIS-Upgrade-Schematron.zip +rm -rf $PROJECT/target/site/files/PEPPOLBIS-Examples.zip + +cd $PROJECT/target +zip -r site/files/PEPPOLBIS-Upgrade-Schematron.zip schematron/ # Example files -sudo rm -rf $PROJECT/target/site/files/PEPPOLBIS-Examples.zip -sudo zip -r $PROJECT/target/site/files/PEPPOLBIS-Examples.zip $PROJECT/rules/examples +cd $PROJECT +zip -r target/site/files/PEPPOLBIS-Examples.zip rules/examples # Guides docker run --rm -i -v $PROJECT:/documents -v $PROJECT/target:/target difi/asciidoctor From 3bbdc41463433c8c243dd23ba4d8c7aa35df00cd Mon Sep 17 00:00:00 2001 From: Jerry Dimitriou Date: Thu, 19 Sep 2024 18:02:17 +0300 Subject: [PATCH 27/39] Added script --- .github/workflows/build-and-deploy-branch.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build-and-deploy-branch.yml b/.github/workflows/build-and-deploy-branch.yml index 79d4c457..64baa212 100644 --- a/.github/workflows/build-and-deploy-branch.yml +++ b/.github/workflows/build-and-deploy-branch.yml @@ -11,11 +11,8 @@ jobs: - name: Checkout source code uses: actions/checkout@v2 -# - name: Install zip -# run: apt install -y zip - - name: Build Spec - run: bash ./build.sh + run: bash ./build-actions.sh - name: Deploy on S3 env: From 1890c627f6d55e374fdad1b5d966d6160d2ab6e9 Mon Sep 17 00:00:00 2001 From: Jerry Dimitriou Date: Thu, 19 Sep 2024 18:06:22 +0300 Subject: [PATCH 28/39] missing sudo --- build-actions.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-actions.sh b/build-actions.sh index cfc6b8c8..b8884718 100755 --- a/build-actions.sh +++ b/build-actions.sh @@ -24,14 +24,14 @@ done # Fix ownership docker run --rm -i -v $PROJECT:/src alpine:3.6 chown -R $(id -g $USER).$(id -g $USER) /src/target -rm -rf $PROJECT/target/site/files/PEPPOLBIS-Upgrade-Schematron.zip -rm -rf $PROJECT/target/site/files/PEPPOLBIS-Examples.zip +sudo rm -rf $PROJECT/target/site/files/PEPPOLBIS-Upgrade-Schematron.zip +sudo rm -rf $PROJECT/target/site/files/PEPPOLBIS-Examples.zip cd $PROJECT/target -zip -r site/files/PEPPOLBIS-Upgrade-Schematron.zip schematron/ +sudo zip -r site/files/PEPPOLBIS-Upgrade-Schematron.zip schematron/ cd $PROJECT -zip -r target/site/files/PEPPOLBIS-Examples.zip rules/examples +sudo zip -r target/site/files/PEPPOLBIS-Examples.zip rules/examples # Guides docker run --rm -i -v $PROJECT:/documents -v $PROJECT/target:/target difi/asciidoctor From dedd0bef41b0c910217fc013bd6545cae16b9cb1 Mon Sep 17 00:00:00 2001 From: Hans Petersen Date: Tue, 24 Sep 2024 12:24:57 +0200 Subject: [PATCH 29/39] Payload compliance and spelling issues --- guides/compliance/main.adoc | 2 ++ guides/compliance/payload.adoc | 18 ++++++++++++++++++ guides/release-notes/v3.0.14.adoc | 12 +++++++++--- 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 guides/compliance/payload.adoc diff --git a/guides/compliance/main.adoc b/guides/compliance/main.adoc index f8c5fc88..882abe0b 100644 --- a/guides/compliance/main.adoc +++ b/guides/compliance/main.adoc @@ -22,4 +22,6 @@ include::sender.adoc[] include::receiver.adoc[] +include::payload.adoc[] + :leveloffset: -1 diff --git a/guides/compliance/payload.adoc b/guides/compliance/payload.adoc new file mode 100644 index 00000000..e98bf1e7 --- /dev/null +++ b/guides/compliance/payload.adoc @@ -0,0 +1,18 @@ += Payload compliance to BIS +[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. + +* 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. + +example: +[attributes] +==== + SBDH representation: + 0088:7315458756324 + UBL representation: + 7315458756324 +==== + +See Policy for use of Identifiers diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc index d97b7184..d917580f 100644 --- a/guides/release-notes/v3.0.14.adoc +++ b/guides/release-notes/v3.0.14.adoc @@ -10,6 +10,11 @@ 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 syntax * Order transaction (T01) ** Added optional element ID to AdditionalItemProperty with corresponding update in Use Case 4. @@ -23,12 +28,13 @@ Release date:: November 2024 * Order Response transaction Advanced (T116) * Despatch Advice (T16) ** Optional attribute added to indicate the scheme of the Transport Handling Unit identifier. -** Added optional element ID to AdditionalItemProperty . +** Added optional element ID to AdditionalItemProperty. * Catalogue transaction (T19) ** Added optional element ID to AdditionalItemProperty with corresponding update in Use Case 5. * Punchout transaction (T77) - Add ”cac:DocumentReference” to Certificate. - this may contain vital information regarding the label and has a simular function as in Catalogue. +** Added optional element ID to AdditionalItemProperty. +** Added ”cac:DocumentReference” to Certificate. +*** this may contain vital information regarding the label and has a similar function as in Catalogue. == Changes to code lists and validation artefacts * Added new codelist with code values SSCC (Serial Shipping Container Code) and ZZZ (Mutually defined) to the optional attribute that indicates the type/scheme for Transport handling unit identifier (in Despatch Advice) From b036a226db90f852151bca86a3d4cdf2c1cdcd17 Mon Sep 17 00:00:00 2001 From: Hans Petersen Date: Tue, 24 Sep 2024 15:11:02 +0200 Subject: [PATCH 30/39] missing release text from POACC-477 --- .vscode/settings.json | 1 + guides/release-notes/v3.0.14.adoc | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc index d917580f..f4f57aea 100644 --- a/guides/release-notes/v3.0.14.adoc +++ b/guides/release-notes/v3.0.14.adoc @@ -23,16 +23,17 @@ Release date:: November 2024 * Order Agreement(T110) ** Added optional element ID to AdditionalItemProperty with corresponding update in Use Case in Appendix A. * Order Response transaction (T76) -* Punch Out(T77) -** Added optional element ID to AdditionalItemProperty with corresponding update in Use Case in Appendix A. +** No changes * Order Response transaction Advanced (T116) +** No changes * Despatch Advice (T16) -** Optional attribute added to indicate the scheme of the Transport Handling Unit identifier. +** Optional attribute added to indicate the scheme of the Transport Handling Unit identifier. +** Optional Delivery Party added to align with Order. ** Added optional element ID to AdditionalItemProperty. * Catalogue transaction (T19) ** Added optional element ID to AdditionalItemProperty with corresponding update in Use Case 5. * Punchout transaction (T77) -** Added optional element ID to AdditionalItemProperty. +** Added optional element ID to AdditionalItemProperty with corresponding update in Use Case in Appendix A. ** Added ”cac:DocumentReference” to Certificate. *** this may contain vital information regarding the label and has a similar function as in Catalogue. From ade391937fffaabf596d55ddf03536be550a4ac1 Mon Sep 17 00:00:00 2001 From: Hans Petersen Date: Tue, 24 Sep 2024 16:14:23 +0200 Subject: [PATCH 31/39] changes release note and principles despatch advice --- guides/profiles/30-despatchadvice/principles/parties.adoc | 7 ++++--- guides/release-notes/v3.0.14.adoc | 3 --- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/guides/profiles/30-despatchadvice/principles/parties.adoc b/guides/profiles/30-despatchadvice/principles/parties.adoc index 5fb90a71..eddd3f89 100644 --- a/guides/profiles/30-despatchadvice/principles/parties.adoc +++ b/guides/profiles/30-despatchadvice/principles/parties.adoc @@ -55,11 +55,12 @@ a| *(UBL:OriginatorCustomerParty)* - |The party who will eventually receive and consume the goods and on whose behalf the buyer makes the purchase. + |The party who will eventually receive and consume the goods and on whose behalf the buyer makes the purchase.| *Delivery party* -*(cac:Delivery/cac:DeliveryParty)* - |A unit to where the consignee forwards the goods. A final delivery point. + +*(UBL:Delivery/UBL:DeliveryParty)* + |A unit to where the consignee forwards the goods. A final delivery point.| |==== The diagram below shows the roles in the fulfillment process. diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc index f4f57aea..77f6d268 100644 --- a/guides/release-notes/v3.0.14.adoc +++ b/guides/release-notes/v3.0.14.adoc @@ -4,9 +4,6 @@ Release date:: November 2024 == BIS documentation -* BIS Catalogue -** Added sample file and use case which describes consignment orders and vendor-managed inventory for Order Only and Ordering BIS. - * BIS Ordering and Order Only ** Added sample file and use case which describes consignment orders and vendor-managed inventory From b611b47acd048bc85414594d2b5f278505ae214c Mon Sep 17 00:00:00 2001 From: Hans Petersen Date: Tue, 29 Oct 2024 16:12:37 +0100 Subject: [PATCH 32/39] remove ZZZ --- guides/release-notes/v3.0.14.adoc | 2 +- structure/codelist/TransportHandlingUnitIDschemeID.xml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc index 77f6d268..0e3c09df 100644 --- a/guides/release-notes/v3.0.14.adoc +++ b/guides/release-notes/v3.0.14.adoc @@ -35,6 +35,6 @@ Release date:: November 2024 *** this may contain vital information regarding the label and has a similar function as in Catalogue. == Changes to code lists and validation artefacts -* Added new codelist with code values SSCC (Serial Shipping Container Code) and ZZZ (Mutually defined) to the optional attribute that indicates the type/scheme for Transport handling unit identifier (in Despatch Advice) +* 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) == Other diff --git a/structure/codelist/TransportHandlingUnitIDschemeID.xml b/structure/codelist/TransportHandlingUnitIDschemeID.xml index 486f1028..3ec75663 100644 --- a/structure/codelist/TransportHandlingUnitIDschemeID.xml +++ b/structure/codelist/TransportHandlingUnitIDschemeID.xml @@ -12,10 +12,4 @@ Serial Shipping Container Code Code used to identify a logistic unit - - ZZZ - Mutually defined - Identifier scheme which is mutually defined by the trading partners - - \ No newline at end of file From bbab34286117cc28a8b3e25f19d48e8870e085f6 Mon Sep 17 00:00:00 2001 From: Hans Petersen Date: Wed, 30 Oct 2024 09:15:30 +0100 Subject: [PATCH 33/39] initial commit --- guides/release-notes/v3.0.14.adoc | 1 + structure/codelist/UNCL7143.xml | 235 ++- structure/codelist/UNCL8273.xml | 113 +- structure/codelist/UNECERec20-11e.xml | 2218 ++++++++++++------------- 4 files changed, 1354 insertions(+), 1213 deletions(-) diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc index 77f6d268..29a999c9 100644 --- a/guides/release-notes/v3.0.14.adoc +++ b/guides/release-notes/v3.0.14.adoc @@ -36,5 +36,6 @@ Release date:: November 2024 == Changes to code lists and validation artefacts * Added new codelist with code values SSCC (Serial Shipping Container Code) and ZZZ (Mutually defined) to the optional attribute that indicates the type/scheme for Transport handling unit identifier (in Despatch Advice) +* Changes to codelists 7143 and 8273 == Other diff --git a/structure/codelist/UNCL7143.xml b/structure/codelist/UNCL7143.xml index 88436478..1df6ffd2 100644 --- a/structure/codelist/UNCL7143.xml +++ b/structure/codelist/UNCL7143.xml @@ -5,10 +5,11 @@ D.19A UN/CEFACT - + AA Product version number - Number assigned by manufacturer or seller to identify the release of a product. + Number assigned by manufacturer or seller to identify the release of a + product. AB @@ -18,7 +19,8 @@ AC HIBC (Health Industry Bar Code) - Article identifier used within health sector to indicate data used conforms to HIBC. + Article identifier used within health sector to indicate data used conforms to + HIBC. AD @@ -49,7 +51,8 @@ AI UPC (Universal Product Code) Consumer package code (1-5-5-1) - A 12-digit code that uniquely identifies the consumer packaging of a product, including a check digit. + A 12-digit code that uniquely identifies the consumer packaging of a product, + including a check digit. AJ @@ -59,23 +62,27 @@ AK Pack number - Number assigned to a pack containing a stack of items put together (e.g. cold roll sheets (steel product)). + Number assigned to a pack containing a stack of items put together (e.g. cold + roll sheets (steel product)). AL UPC (Universal Product Code) Shipping container code (1-2-5-5) - A 13-digit code that uniquely identifies the manufacturer's shipping unit, including the packaging indicator. + A 13-digit code that uniquely identifies the manufacturer's shipping unit, + including the packaging indicator. AM - UPC (Universal Product Code)/EAN (European article number) Shipping container code (1-2-5-5-1) + UPC (Universal Product Code)/EAN (European article number) Shipping container code + (1-2-5-5-1) Shipping container code (1-2-5-5-1)manufacturer's shipping unit, including the packagingindicator and the check digit. AN UPC (Universal Product Code) suffix - A suffix used in conjunction with a higher level UPC (Universal product code) to define packing variations for a product. + A suffix used in conjunction with a higher level UPC (Universal product code) + to define packing variations for a product. AO @@ -85,7 +92,8 @@ AP Heat number - Number assigned to the heat (also known as the iron charge) for the production of steel products. + Number assigned to the heat (also known as the iron charge) for the production + of steel products. AQ @@ -105,12 +113,14 @@ AT Price look up number - Identification number on a product allowing a quick electronic retrieval of price information for that product. + Identification number on a product allowing a quick electronic retrieval of + price information for that product. AU NSN (North Atlantic Treaty Organization Stock Number) - Number assigned under the NATO (North Atlantic Treaty Organization) codification system to provide the identification of an approved item of supply. + Number assigned under the NATO (North Atlantic Treaty Organization) + codification system to provide the identification of an approved item of supply. AV @@ -185,7 +195,8 @@ BJ Next higher assembly number - A number specifying the next higher assembly or component into which the product is being incorporated. + A number specifying the next higher assembly or component into which the + product is being incorporated. BK @@ -250,7 +261,8 @@ BW Periodical statement of activities within a bilaterally agreed time period - Periodical statement listing activities within a bilaterally agreed time period. + Periodical statement listing activities within a bilaterally agreed time + period. BX @@ -275,7 +287,8 @@ CG Commodity grouping - Code for a group of articles with common characteristics (e.g. used for statistical purposes). + Code for a group of articles with common characteristics (e.g. used for + statistical purposes). CL @@ -290,12 +303,14 @@ CV Customs article number - Code defined by Customs authorities to an article or a group of articles for Customs purposes. + Code defined by Customs authorities to an article or a group of articles for + Customs purposes. DR Drawing revision number - Reference number indicating that a change or revision has been applied to a drawing. + Reference number indicating that a change or revision has been applied to a + drawing. DW @@ -305,22 +320,26 @@ EC Engineering change level - Reference number indicating that a change or revision has been applied to an article's specification. + Reference number indicating that a change or revision has been applied to an + article's specification. EF Material code - Code defining the material's type, surface, geometric form plus various classifying characteristics. + Code defining the material's type, surface, geometric form plus various + classifying characteristics. - + EMD EMDN (European Medical Device Nomenclature) - Nomenclature system for identification of medical devices based on European Medical Device Nomenclature classification system. + Nomenclature system for identification of medical devices based on European + Medical Device Nomenclature classification system. EN International Article Numbering Association (EAN) - Number assigned to a manufacturer's product according to the International Article Numbering Association. + Number assigned to a manufacturer's product according to the International + Article Numbering Association. FS @@ -332,6 +351,13 @@ Buyer's internal product group code Product group code used within a buyer's internal systems. + + GMN + Global model number + The GMN is the GS1-identification key used to identify a product model or + product family based on attributes common to the model or family as defined by industry + or regulation. + GN National product group code @@ -345,7 +371,9 @@ HS Harmonised system - The item number is part of, or is generated in the context of the Harmonised Commodity Description and Coding System (Harmonised System), as developed and maintained by the World Customs Organization (WCO). + The item number is part of, or is generated in the context of the Harmonised + Commodity Description and Coding System (Harmonised System), as developed and maintained + by the World Customs Organization (WCO). IB @@ -365,12 +393,14 @@ IT Buyer's style number - Number given by the buyer to a specific style or form of an article, especially used for garments. + Number given by the buyer to a specific style or form of an article, especially + used for garments. IZ Buyer's size code - Code given by the buyer to designate the size of an article in textile and shoe industry. + Code given by the buyer to designate the size of an article in textile and shoe + industry. MA @@ -385,7 +415,8 @@ MN Model number - Reference number assigned by the manufacturer to differentiate variations in similar products in a class or group. + Reference number assigned by the manufacturer to differentiate variations in + similar products in a class or group. MP @@ -405,12 +436,14 @@ PD Part number description - Reference number identifying a description associated with a number ultimately used to identify an article. + Reference number identifying a description associated with a number ultimately + used to identify an article. PL Purchaser's order line number - Reference number identifying a line entry in a customer's order for goods or services. + Reference number identifying a line entry in a customer's order for goods or + services. PO @@ -440,7 +473,8 @@ RU Run number - The item number identifies the production or manufacturing run or sequence in which the item was manufactured, processed or assembled. + The item number identifies the production or manufacturing run or sequence in + which the item was manufactured, processed or assembled. RY @@ -455,7 +489,8 @@ SG Standard group of products (mixed assortment) - The item number relates to a standard group of other items (mixed) which are grouped together as a single item for identification purposes. + The item number relates to a standard group of other items (mixed) which are + grouped together as a single item for identification purposes. SK @@ -465,7 +500,8 @@ SN Serial number - Identification number of an item which distinguishes this specific item out of a number of identical items. + Identification number of an item which distinguishes this specific item out of + a number of identical items. SRS @@ -475,17 +511,20 @@ SRT IFLS (Institut Francais du Libre Service) 5 digit product classification code - 5 digit code for product classification managed by the Institut Francais du Libre Service. + 5 digit code for product classification managed by the Institut Francais du + Libre Service. SRU IFLS (Institut Francais du Libre Service) 9 digit product classification code - 9 digit code for product classification managed by the Institut Francais du Libre Service. + 9 digit code for product classification managed by the Institut Francais du + Libre Service. SRV GS1 Global Trade Item Number - A unique number, up to 14-digits, assigned according to the numbering structure of the GS1 system. + A unique number, up to 14-digits, assigned according to the numbering structure + of the GS1 system. SRW @@ -495,7 +534,8 @@ SRX Slaughter number - Unique number given by a slaughterhouse to an animal or a group of animals of the same breed. + Unique number given by a slaughterhouse to an animal or a group of animals of + the same breed. SRY @@ -505,7 +545,8 @@ SRZ Harmonized tariff schedule - The international Harmonized Tariff Schedule (HTS) to classify the article for customs, statistical and other purposes. + The international Harmonized Tariff Schedule (HTS) to classify the article for + customs, statistical and other purposes. SS @@ -515,22 +556,27 @@ SSA 46 Level DOT Code - A US Department of Transportation (DOT) code to identify hazardous (dangerous) goods, managed by the Customs and Border Protection (CBP) agency. + A US Department of Transportation (DOT) code to identify hazardous (dangerous) + goods, managed by the Customs and Border Protection (CBP) agency. SSB Airline Tariff 6D - A US code agreed to by the airline industry to identify hazardous (dangerous) goods, managed by the Customs and Border Protection (CBP) agency. + A US code agreed to by the airline industry to identify hazardous (dangerous) + goods, managed by the Customs and Border Protection (CBP) agency. SSC Title 49 Code of Federal Regulations - A US Customs and Border Protection (CBP) code used to identify hazardous (dangerous) goods. + A US Customs and Border Protection (CBP) code used to identify hazardous + (dangerous) goods. SSD International Civil Aviation Administration code - A US Department of Transportation/Federal Aviation Administration code used to identify hazardous (dangerous) goods, managed by the Customs and Border Protection (CBP) agency. + A US Department of Transportation/Federal Aviation Administration code used to + identify hazardous (dangerous) goods, managed by the Customs and Border Protection (CBP) + agency. SSE @@ -541,7 +587,8 @@ SSF Endorsement - A US Customs and Border Protection (CBP) code used to identify hazardous (dangerous) goods. + A US Customs and Border Protection (CBP) code used to identify hazardous + (dangerous) goods. SSG @@ -557,7 +604,8 @@ SSI Chemical Abstract Service (CAS) registry number - A unique numerical identifier for for chemical compounds, polymers, biological sequences, mixtures and alloys. + A unique numerical identifier for for chemical compounds, polymers, biological + sequences, mixtures and alloys. SSJ @@ -567,22 +615,26 @@ SSK Institutional Meat Purchase Specifications (IMPS) Number - A number assigned by agricultural authorities to identify and track meat and meat products. + A number assigned by agricultural authorities to identify and track meat and + meat products. SSL Price Look-Up code (PLU) - A number assigned by agricultural authorities to identify and track meat and meat products. + A number assigned by agricultural authorities to identify and track meat and + meat products. SSM International Maritime Organization (IMO) Code - An International Maritime Organization (IMO) code used to identify hazardous (dangerous) goods. + An International Maritime Organization (IMO) code used to identify hazardous + (dangerous) goods. SSN Bureau of Explosives 600-A (rail) - A Department of Transportation/Federal Railroad Administration code used to identify hazardous (dangerous) goods. + A Department of Transportation/Federal Railroad Administration code used to + identify hazardous (dangerous) goods. SSO @@ -592,17 +644,20 @@ SSP International Code of Botanical Nomenclature (ICBN) - A code established by the International Code of Botanical Nomenclature (ICBN) used to classify and identify botanical articles and commodities. + A code established by the International Code of Botanical Nomenclature (ICBN) + used to classify and identify botanical articles and commodities. SSQ International Code of Zoological Nomenclature (ICZN) - A code established by the International Code of Zoological Nomenclature (ICZN) used to classify and identify animals. + A code established by the International Code of Zoological Nomenclature (ICZN) + used to classify and identify animals. SSR International Code of Nomenclature for Cultivated Plants (ICNCP) - A code established by the International Code of Nomenclature for Cultivated Plants (ICNCP) used to classify and identify animals. + A code established by the International Code of Nomenclature for Cultivated + Plants (ICNCP) used to classify and identify animals. SSS @@ -647,7 +702,8 @@ ST Style number - Number given to a specific style or form of an article, especially used for garments. + Number given to a specific style or form of an article, especially used for + garments. STA @@ -662,7 +718,8 @@ STC European Union dairy subsidy eligibility classification - Category of product eligible for EU subsidy (applies for certain dairy products with specific level of fat content). + Category of product eligible for EU subsidy (applies for certain dairy products + with specific level of fat content). STD @@ -677,7 +734,8 @@ STF Federal Agency on Technical Regulating and Metrology of the Russian Federation - A Russian government agency that serves as a national standardization body of the Russian Federation. + A Russian government agency that serves as a national standardization body of + the Russian Federation. STG @@ -702,22 +760,26 @@ STK AHFS (American Hospital Formulary Service) pharmacologic -therapeutic classification - Pharmacologic -therapeutic classification maintained by the American Hospital Formulary Service (AHFS). + Pharmacologic -therapeutic classification maintained by the American Hospital + Formulary Service (AHFS). STL ATC (Anatomical Therapeutic Chemical) classification system - Anatomical Therapeutic Chemical classification system maintained by the World Health Organisation (WHO). + Anatomical Therapeutic Chemical classification system maintained by the World + Health Organisation (WHO). STM CLADIMED (Classification des Dispositifs Médicaux) - A five level classification system for medical decvices maintained by the CLADIMED organisation used in the French market. + A five level classification system for medical decvices maintained by the + CLADIMED organisation used in the French market. STN CMDR (Canadian Medical Device Regulations) classification system - Classification system related to the Canadian Medical Device Regulations maintained by Health Canada. + Classification system related to the Canadian Medical Device Regulations + maintained by Health Canada. STO @@ -732,12 +794,14 @@ STQ eCl@ss - Standardized material and service classification and dictionary maintained by eClass e.V. + Standardized material and service classification and dictionary maintained by + eClass e.V. STR EDMA (European Diagnostic Manufacturers Association) Product Classification - Classification for in vitro diagnostics medical devices maintained by the European Diagnostic Manufacturers Association. + Classification for in vitro diagnostics medical devices maintained by the + European Diagnostic Manufacturers Association. STS @@ -747,7 +811,8 @@ STT GMDN (Global Medical Devices Nomenclature) - Nomenclature system for identification of medical devices officially apprroved by the European Union. + Nomenclature system for identification of medical devices officially apprroved + by the European Union. STU @@ -767,7 +832,8 @@ STX MedDRA (Medical Dictionary for Regulatory Activities) - A medical dictionary maintained by the International Federation of Pharmaceutical Manufacturers and Associations (IFPMA). + A medical dictionary maintained by the International Federation of + Pharmaceutical Manufacturers and Associations (IFPMA). STY @@ -787,32 +853,40 @@ SUB US FDA (Food and Drug Administration) Product Code Classification Database - US FDA Product Code Classification Database contains medical device names and associated information developed by the Center for Devices and Radiological Health (CDRH). + US FDA Product Code Classification Database contains medical device names and + associated information developed by the Center for Devices and Radiological Health + (CDRH). SUC SNOMED CT (Systematized Nomenclature of Medicine-Clinical Terms) - A medical nomenclature system developed between the NHS and the College of American Pathologists. + A medical nomenclature system developed between the NHS and the College of + American Pathologists. SUD UMDNS (Universal Medical Device Nomenclature System) - A standard international nomenclature and computer coding system for medical devices maintained by the Emergency Care Research Institute (ECRI). + A standard international nomenclature and computer coding system for medical + devices maintained by the Emergency Care Research Institute (ECRI). SUE GS1 Global Returnable Asset Identifier, non-serialised - A unique, 13-digit number assigned according to the numbering structure of the GS1 system and used to identify a type of Reusable Transport Item (RTI). + A unique, 13-digit number assigned according to the numbering structure of the + GS1 system and used to identify a type of Reusable Transport Item (RTI). SUF IMEI - The International Mobile Station Equipment Identity (IMEI) is a unique number to identify mobile phones. It includes the origin, model and serial number of the device. The structure is specified in 3GPP TS 23.003. + The International Mobile Station Equipment Identity (IMEI) is a unique number + to identify mobile phones. It includes the origin, model and serial number of the + device. The structure is specified in 3GPP TS 23.003. SUG Waste Type (EMSA) - Classification of waste as defined by the European Maritime Safety Agency (EMSA). + Classification of waste as defined by the European Maritime Safety Agency + (EMSA). SUH @@ -832,38 +906,47 @@ SUK IMDG packing group - Packing group as defined in the International Marititme Dangerous Goods (IMDG) specification. + Packing group as defined in the International Marititme Dangerous Goods (IMDG) + specification. SUL MARPOL Code IBC - International Bulk Chemical (IBC) code defined by the International Convention for the Prevention of Pollution from Ships (MARPOL). + International Bulk Chemical (IBC) code defined by the International Convention + for the Prevention of Pollution from Ships (MARPOL). SUM IMDG subsidiary risk class - Subsidiary risk class as defined in the International Maritime Dangerous Goods (IMDG) specification. + Subsidiary risk class as defined in the International Maritime Dangerous Goods + (IMDG) specification. TG Transport group number - (8012) Additional number to form article groups for packing and/or transportation purposes. + (8012) Additional number to form article groups for packing and/or + transportation purposes. TSN Taxonomic Serial Number - A unique number assigned to a taxonomic entity, commonly to a species of plants or animals, providing information on their hierarchical classification, scientific name, taxonomic rank, associated synonyms and vernacular names where appropriate, data source information and data quality indicators. + A unique number assigned to a taxonomic entity, commonly to a species of plants + or animals, providing information on their hierarchical classification, scientific name, + taxonomic rank, associated synonyms and vernacular names where appropriate, data source + information and data quality indicators. TSO IMDG main hazard class - Main hazard class as defined in the International Maritime Dangerous Goods (IMDG) specification. + Main hazard class as defined in the International Maritime Dangerous Goods + (IMDG) specification. TSP EU Combined Nomenclature - The number is part of, or is generated in the context of the Combined Nomenclature classification, as developed and maintained by the European Union (EU). + The number is part of, or is generated in the context of the Combined + Nomenclature classification, as developed and maintained by the European Union (EU). @@ -912,12 +995,14 @@ VP Vendor's (seller's) part number - Reference number assigned by a vendor/seller identifying a product/service/article. + Reference number assigned by a vendor/seller identifying a + product/service/article. VS Vendor's supplemental item number - The item number is a specified by the vendor as a supplemental number for the vendor's purposes. + The item number is a specified by the vendor as a supplemental number for the + vendor's purposes. VX @@ -930,4 +1015,4 @@ Item type identification mutually agreed between interchanging parties. - + \ No newline at end of file diff --git a/structure/codelist/UNCL8273.xml b/structure/codelist/UNCL8273.xml index 7279ce0b..ae5ff1af 100644 --- a/structure/codelist/UNCL8273.xml +++ b/structure/codelist/UNCL8273.xml @@ -3,61 +3,100 @@ Dangerous goods regulations code (UNCL8273) UNCL8273 - D.17A + D.23A UN/CEFACT ADR European agreement on the international carriage of dangerous goods on road (ADR) - European agreement on the international carriage of dangerous goods on road. ADR is the - abbreviation of "Accord europeen relatif au transport international des marchandises dangereuses par route". + European agreement on the international carriage of dangerous goods on road. + ADR is the + abbreviation of "Accord europeen relatif au transport international des marchandises + dangereuses par route". ADS NDR European agreement for the transport of dangerous goods on the river Rhine - European agreement giving regulations for the transport of dangerous goods on the river Rhine, - officially known as: "Accord europeen relatif au transport international des marchandises dangereuses par + European agreement giving regulations for the transport of dangerous goods on + the river Rhine, + officially known as: "Accord europeen relatif au transport international des + marchandises dangereuses par navigation sur le Rhin.". ADT CA, Transport Canada's dangerous goods requirements - Canadian transport of dangerous goods requirements as published by Transport Canada in the Canadian + Canadian transport of dangerous goods requirements as published by Transport + Canada in the Canadian Gazette, Part II. ADU JP, Japanese maritime safety agency dangerous goods regulation code - Regulation regarding the handling of dangerous goods on vessels issued by Japanese maritime safety + Regulation regarding the handling of dangerous goods on vessels issued by + Japanese maritime safety agency. + + ADY + IBC Code + The international Code for the Construction and + Equipment of Ships carrying Dangerous Chemicals in Bulk + + + + ADZ + IGC Code + The International Code of the Construction and Equipment + of Ships Carrying Liquefied Gases in Bulk + + ADV MARPOL 73/78 - International Convention for the Prevention of Pollution from Ships, 1973, as modified by the + International Convention for the Prevention of Pollution from Ships, 1973, as + modified by the Protocol of 1978 relating. ADW GHS regulation - The United Nations Globally Harmonized System of Classification and Labelling of Chemicals. + The United Nations Globally Harmonized System of Classification and Labelling + of Chemicals. ADX Transport emergency (TREM) card - A card providing details on procedures for emergencies during transportation according to ADR. + A card providing details on procedures for emergencies during transportation + according to ADR. + + + + AEA + IMSBC Code + The International Maritime Solid Bulk Cargoes Code + + + + AEB + MARPOL Annex I + The International Convention for the Prevention of + Pollution from Ships (MARPOL) - Prevention of Pollution + by Oil AGS DE, ADR and GGVS combined regulations for combined transport - Combined German and European regulations for the transportation of dangerous goods on German and - other European roads. ADR means: Accord Europeen relatif au Transport international des marchandises + Combined German and European regulations for the transportation of dangerous + goods on German and + other European roads. ADR means: Accord Europeen relatif au Transport international des + marchandises Dangereuses par Route. GGVS means: Gefahrgutverordnung Strasse. @@ -69,25 +108,32 @@ ARD DE, ARD and RID - Combined regulations for combined transport - Combined European regulations for the combined transportation of dangerous goods on roads and - rails. ARD means: Autorisation de transport par Route de matieres dangereuses. RID means: Reglement + Combined European regulations for the combined transportation of dangerous + goods on roads and + rails. ARD means: Autorisation de transport par Route de matieres dangereuses. RID + means: Reglement International concernant le transport des marchandises Dangereuses par chemin de fer. CFR US, 49 Code of federal regulations - United States federal regulations issued by the US Department of transportation covering the + United States federal regulations issued by the US Department of transportation + covering the domestic transportation of dangerous goods by truck, rail, water and air. COM DE, ADR, RID, GGVS and GGVE - Combined regulations for combined transport - Combined German and European regulations for the combined transportation of dangerous goods on - German and other European roads and rails. ADR means: Accord Europeen relatif au transport international des - marchandises Dangereuse par Route. RID means: Reglement International concernant le transport des - marchandises Dangereuses par chemin de fer. GGVS means: Gefahrgutverordnung Strasse. GGVE means: + Combined German and European regulations for the combined transportation of + dangerous goods on + German and other European roads and rails. ADR means: Accord Europeen relatif au + transport international des + marchandises Dangereuse par Route. RID means: Reglement International concernant le + transport des + marchandises Dangereuses par chemin de fer. GGVS means: Gefahrgutverordnung Strasse. + GGVE means: Gefahrgutverordnung Eisenbahn. @@ -104,45 +150,54 @@ ICA IATA ICAO - Regulations covering the international transportation of dangerous goods issued by the - International Air Transport Association and the International Civil Aviation Organization. + Regulations covering the international transportation of dangerous goods issued + by the + International Air Transport Association and the International Civil Aviation + Organization. IMD IMO IMDG code - Regulations regarding the transportation of dangerous goods on ocean-going vessels issued by the + Regulations regarding the transportation of dangerous goods on ocean-going + vessels issued by the International Maritime Organization. RGE DE, RID and GGVE, Combined regulations for combined transport on rails - Combined German and European regulations for the transportation of dangerous goods on German and - other European rails. RID means: Reglement International concernant le transport des marchandises + Combined German and European regulations for the transportation of dangerous + goods on German and + other European rails. RID means: Reglement International concernant le transport des + marchandises Dangereuses par chemin de fer. GGVE means: Gefahrgutverordnung Eisenbahn. RID Railroad dangerous goods book (RID) - International regulations concerning the international carriage of dangerous goods by rail. RID is - the abbreviation of "Reglement International concernant le transport des marchandises Dangereuses par chemin + International regulations concerning the international carriage of dangerous + goods by rail. RID is + the abbreviation of "Reglement International concernant le transport des marchandises + Dangereuses par chemin de fer". UI UK IMO book - The United Kingdom (UK) version of the International Maritime Organisation (IMO) book on dangerous + The United Kingdom (UK) version of the International Maritime Organisation + (IMO) book on dangerous goods. ZZZ Mutually defined - Additional and/or other information for the transportation of dangerous goods which are mutually + Additional and/or other information for the transportation of dangerous goods + which are mutually defined. - + \ No newline at end of file diff --git a/structure/codelist/UNECERec20-11e.xml b/structure/codelist/UNECERec20-11e.xml index 5162a47e..0b2d7e65 100644 --- a/structure/codelist/UNECERec20-11e.xml +++ b/structure/codelist/UNECERec20-11e.xml @@ -6,7 +6,7 @@ Revision 11e UN/ECE - + 10 group @@ -51,12 +51,12 @@ 22 decilitre per gram - + 23 gram per cubic centimetre - + 24 @@ -67,7 +67,7 @@ 25 gram per square centimetre - + 27 @@ -78,42 +78,42 @@ 28 kilogram per square metre - + 33 kilopascal square metre per gram - + 34 kilopascal per millimetre - + 35 millilitre per square centimetre second - + 37 ounce per square foot - + 38 ounce per square foot per 0,01inch - + 40 millilitre per second - + 41 millilitre per minute - + 56 @@ -151,42 +151,42 @@ 74 millipascal - + 77 milli-inch - + 80 pound per square inch absolute - + 81 henry - + 85 foot pound-force - + 87 pound per cubic foot - + 89 poise - + 91 stokes - + 1I @@ -207,7 +207,7 @@ 2C roentgen - + 2G @@ -223,32 +223,32 @@ 2I British thermal unit (international table) per hour - + 2J cubic centimetre per second - + 2K cubic foot per hour - + 2L cubic foot per minute - + 2M centimetre per second - + 2N decibel - + 2P @@ -258,37 +258,37 @@ 2Q kilobecquerel - + 2R kilocurie - + 2U megagram - + 2X metre per minute - + 2Y milliroentgen - + 2Z millivolt - + 3B megajoule - + 3C @@ -299,22 +299,22 @@ 4C centistokes - + 4G microlitre - + 4H micrometre (micron) - + 4K milliampere - + 4L @@ -324,57 +324,57 @@ 4M milligram per hour - + 4N megabecquerel - + 4O microfarad - + 4P newton per metre - + 4Q ounce inch - + 4R ounce foot - + 4T picofarad - + 4U pound per hour - + 4W ton (US) per hour - + 4X kilolitre per hour - + 5A barrel (US) per minute - + 5B @@ -397,178 +397,178 @@ A10 ampere square metre per joule second - + A11 angstrom - + A12 astronomical unit - + A13 attojoule - + A14 barn - + A15 barn per electronvolt - + A16 barn per steradian electronvolt - + A17 barn per steradian - + A18 becquerel per kilogram - + A19 becquerel per cubic metre - + A2 ampere per centimetre - + A20 British thermal unit (international table) per second square foot degree Rankine - + A21 British thermal unit (international table) per pound degree Rankine - + A22 British thermal unit (international table) per second foot degree Rankine - + A23 British thermal unit (international table) per hour square foot degree Rankine - + A24 candela per square metre - + A26 coulomb metre - + A27 coulomb metre squared per volt - + A28 coulomb per cubic centimetre - + A29 coulomb per cubic metre - + A3 ampere per millimetre - + A30 coulomb per cubic millimetre - + A31 coulomb per kilogram second - + A32 coulomb per mole - + A33 coulomb per square centimetre - + A34 coulomb per square metre - + A35 coulomb per square millimetre - + A36 cubic centimetre per mole - + A37 cubic decimetre per mole - + A38 cubic metre per coulomb - + A39 cubic metre per kilogram - + A4 ampere per square centimetre - + A40 cubic metre per mole - + A41 ampere per square metre - + A42 curie per kilogram - + A43 @@ -580,12 +580,12 @@ A44 decalitre - + A45 decametre - + A47 @@ -607,27 +607,27 @@ A5 ampere square metre - + A53 electronvolt - + A54 electronvolt per metre - + A55 electronvolt square metre - + A56 electronvolt square metre per kilogram - + A59 @@ -638,42 +638,42 @@ A6 ampere per square metre kelvin squared - + A68 exajoule - + A69 farad per metre - + A7 ampere per square millimetre - + A70 femtojoule - + A71 femtometre - + A73 foot per second squared - + A74 foot pound-force per second - + A75 @@ -685,42 +685,42 @@ A76 gal - + A8 ampere second - + A84 gigacoulomb per cubic metre - + A85 gigaelectronvolt - + A86 gigahertz - + A87 gigaohm - + A88 gigaohm metre - + A89 gigapascal - + A9 @@ -731,7 +731,7 @@ A90 gigawatt - + A91 @@ -741,32 +741,32 @@ A93 gram per cubic metre - + A94 gram per mole - + A95 gray - + A96 gray per second - + A97 hectopascal - + A98 henry per metre - + A99 @@ -787,7 +787,7 @@ ACR acre - + ACT @@ -803,7 +803,7 @@ AE ampere per metre - + AH @@ -820,7 +820,7 @@ AK fathom - + AL @@ -836,7 +836,7 @@ AMP ampere - + ANN @@ -846,7 +846,7 @@ APZ troy ounce or apothecary ounce - + AQ @@ -873,7 +873,7 @@ ATM standard atmosphere - + AWG @@ -890,12 +890,12 @@ AZ British thermal unit (international table) per pound - + B1 barrel (US) per day - + B10 @@ -905,12 +905,12 @@ B11 joule per kilogram kelvin - + B12 joule per metre - + B13 @@ -920,17 +920,17 @@ B14 joule per metre to the fourth power - + B15 joule per mole - + B16 joule per mole kelvin - + B17 @@ -941,7 +941,7 @@ B18 joule second - + B19 @@ -952,52 +952,52 @@ B20 joule square metre per kilogram - + B21 kelvin per watt - + B22 kiloampere - + B23 kiloampere per square metre - + B24 kiloampere per metre - + B25 kilobecquerel per kilogram - + B26 kilocoulomb - + B27 kilocoulomb per cubic metre - + B28 kilocoulomb per square metre - + B29 kiloelectronvolt - + B3 @@ -1012,27 +1012,27 @@ B31 kilogram metre per second - + B32 kilogram metre squared - + B33 kilogram metre squared per second - + B34 kilogram per cubic decimetre - + B35 kilogram per litre - + B4 @@ -1043,77 +1043,77 @@ B41 kilojoule per kelvin - + B42 kilojoule per kilogram - + B43 kilojoule per kilogram kelvin - + B44 kilojoule per mole - + B45 kilomole - + B46 kilomole per cubic metre - + B47 kilonewton - + B48 kilonewton metre - + B49 kiloohm - + B50 kiloohm metre - + B52 kilosecond - + B53 kilosiemens - + B54 kilosiemens per metre - + B55 kilovolt per metre - + B56 kiloweber per metre - + B57 @@ -1124,47 +1124,47 @@ B58 litre per mole - + B59 lumen hour - + B60 lumen per square metre - + B61 lumen per watt - + B62 lumen second - + B63 lux hour - + B64 lux second - + B66 megaampere per square metre - + B67 megabecquerel per kilogram - + B68 @@ -1174,7 +1174,7 @@ B69 megacoulomb per cubic metre - + B7 @@ -1185,57 +1185,57 @@ B70 megacoulomb per square metre - + B71 megaelectronvolt - + B72 megagram per cubic metre - + B73 meganewton - + B74 meganewton metre - + B75 megaohm - + B76 megaohm metre - + B77 megasiemens per metre - + B78 megavolt - + B79 megavolt per metre - + B8 joule per cubic metre - + B80 @@ -1246,7 +1246,7 @@ B81 reciprocal metre squared reciprocal second - + B82 @@ -1256,92 +1256,92 @@ B83 metre to the fourth power - + B84 microampere - + B85 microbar - + B86 microcoulomb - + B87 microcoulomb per cubic metre - + B88 microcoulomb per square metre - + B89 microfarad per metre - + B90 microhenry - + B91 microhenry per metre - + B92 micronewton - + B93 micronewton metre - + B94 microohm - + B95 microohm metre - + B96 micropascal - + B97 microradian - + B98 microsecond - + B99 microsiemens - + BAR bar [unit of pressure] - + BB @@ -1358,7 +1358,7 @@ BHP brake horse power - + BIL @@ -1368,12 +1368,12 @@ BLD dry barrel (US) - + BLL barrel (US) - + BP @@ -1388,22 +1388,22 @@ BQL becquerel - + BTU British thermal unit (international table) - + BUA bushel (US) - + BUI bushel (UK) - + C0 @@ -1414,57 +1414,57 @@ C10 millifarad - + C11 milligal - + C12 milligram per metre - + C13 milligray - + C14 millihenry - + C15 millijoule - + C16 millimetre per second - + C17 millimetre squared per second - + C18 millimole - + C19 mole per kilogram - + C20 millinewton - + C21 @@ -1474,82 +1474,82 @@ C22 millinewton per metre - + C23 milliohm metre - + C24 millipascal second - + C25 milliradian - + C26 millisecond - + C27 millisiemens - + C28 millisievert - + C29 millitesla - + C3 microvolt per metre - + C30 millivolt per metre - + C31 milliwatt - + C32 milliwatt per square metre - + C33 milliweber - + C34 mole - + C35 mole per cubic decimetre - + C36 mole per cubic metre - + C37 @@ -1559,107 +1559,107 @@ C38 mole per litre - + C39 nanoampere - + C40 nanocoulomb - + C41 nanofarad - + C42 nanofarad per metre - + C43 nanohenry - + C44 nanohenry per metre - + C45 nanometre - + C46 nanoohm metre - + C47 nanosecond - + C48 nanotesla - + C49 nanowatt - + C50 neper - + C51 neper per second - + C52 picometre - + C53 newton metre second - + C54 newton metre squared per kilogram squared - + C55 newton per square metre - + C56 newton per square millimetre - + C57 newton second - + C58 newton second per metre - + C59 @@ -1670,12 +1670,12 @@ C60 ohm centimetre - + C61 ohm metre - + C62 @@ -1685,32 +1685,32 @@ C63 parsec - + C64 pascal per kelvin - + C65 pascal second - + C66 pascal second per cubic metre - + C67 pascal second per metre - + C68 petajoule - + C69 @@ -1722,27 +1722,27 @@ C7 centipoise - + C70 picoampere - + C71 picocoulomb - + C72 picofarad per metre - + C73 picohenry - + C74 @@ -1753,17 +1753,17 @@ C75 picowatt - + C76 picowatt per square metre - + C78 pound-force - + C79 @@ -1774,42 +1774,42 @@ C8 millicoulomb per kilogram - + C80 rad - + C81 radian - + C82 radian square metre per mole - + C83 radian square metre per kilogram - + C84 radian per metre - + C85 reciprocal angstrom - + C86 reciprocal cubic metre - + C87 @@ -1819,12 +1819,12 @@ C88 reciprocal electron volt per cubic metre - + C89 reciprocal henry - + C9 @@ -1836,17 +1836,17 @@ C90 reciprocal joule per cubic metre - + C91 reciprocal kelvin or kelvin to the power minus one - + C92 reciprocal metre - + C93 @@ -1856,27 +1856,27 @@ C94 reciprocal minute - + C95 reciprocal mole - + C96 reciprocal pascal or pascal to the power minus one - + C97 reciprocal second - + C99 reciprocal second per metre squared - + CCT @@ -1887,7 +1887,7 @@ CDL candela - + CEL @@ -1908,12 +1908,12 @@ CGM centigram - + CKG coulomb per kilogram - + CLF @@ -1924,22 +1924,22 @@ CLT centilitre - + CMK square centimetre - + CMQ cubic centimetre - + CMT centimetre - + CNP @@ -1955,7 +1955,7 @@ COU coulomb - + CTG @@ -1966,7 +1966,7 @@ CTM metric carat - + CTN @@ -1977,17 +1977,17 @@ CUR curie - + CWA hundred pound (cwt) / hundred weight (US) - + CWI hundred weight (UK) - + D03 @@ -2003,12 +2003,12 @@ D1 reciprocal second per steradian - + D10 siemens per metre - + D11 @@ -2019,12 +2019,12 @@ D12 siemens square metre per mole - + D13 sievert - + D15 @@ -2035,42 +2035,42 @@ D16 square centimetre per erg - + D17 square centimetre per steradian erg - + D18 metre kelvin - + D19 square metre kelvin per watt - + D2 reciprocal second per steradian metre squared - + D20 square metre per joule - + D21 square metre per kilogram - + D22 square metre per mole - + D23 @@ -2081,47 +2081,47 @@ D24 square metre per steradian - + D25 square metre per steradian joule - + D26 square metre per volt second - + D27 steradian - + D29 terahertz - + D30 terajoule - + D31 terawatt - + D32 terawatt hour - + D33 tesla - + D34 @@ -2138,17 +2138,17 @@ D41 tonne per cubic metre - + D42 tropical year - + D43 unified atomic mass unit - + D44 @@ -2158,102 +2158,102 @@ D45 volt squared per kelvin squared - + D46 volt - ampere - + D47 volt per centimetre - + D48 volt per kelvin - + D49 millivolt per kelvin - + D5 kilogram per square centimetre - + D50 volt per metre - + D51 volt per millimetre - + D52 watt per kelvin - + D53 watt per metre kelvin - + D54 watt per square metre - + D55 watt per square metre kelvin - + D56 watt per square metre kelvin to the fourth power - + D57 watt per steradian - + D58 watt per steradian square metre - + D59 weber per metre - + D6 roentgen per second - + D60 weber per millimetre - + D61 minute [unit of angle] - + D62 second [unit of angle] - + D63 @@ -2275,22 +2275,22 @@ D69 inch to the fourth power - + D73 joule square metre - + D74 kilogram per mole - + D77 megacoulomb - + D78 @@ -2301,72 +2301,72 @@ D80 microwatt - + D81 microtesla - + D82 microvolt - + D83 millinewton metre - + D85 microwatt per square metre - + D86 millicoulomb - + D87 millimole per kilogram - + D88 millicoulomb per cubic metre - + D89 millicoulomb per square metre - + D91 rem - + D93 second per cubic metre - + D94 second per cubic metre radian - + D95 joule per gram - + DAA decare - + DAD @@ -2376,7 +2376,7 @@ DAY day - + DB @@ -2385,17 +2385,17 @@ water content of the product. - DBM + DBM Decibel-milliwatts - DBW + DBW Decibel watt DD degree [unit of angle] - + DEC @@ -2406,27 +2406,27 @@ DG decigram - + DJ decagram - + DLT decilitre - + DMA cubic decametre - + DMK square decimetre - + DMO @@ -2438,17 +2438,17 @@ DMQ cubic decimetre - + DMT decimetre - + DN decinewton metre - + DPC @@ -2498,7 +2498,7 @@ DWT pennyweight - + DZN @@ -2713,7 +2713,7 @@ E45 milliohm - + E46 @@ -2964,52 +2964,52 @@ E90 reciprocal centimetre - + E91 reciprocal day - + E92 cubic decimetre per hour - + E93 kilogram per hour - + E94 kilomole per second - + E95 mole per second - + E96 degree per second - + E97 millimetre per degree Celcius metre - + E98 degree Celsius per kelvin - + E99 hectopascal per bar - + EA @@ -3037,52 +3037,52 @@ F02 kelvin per kelvin - + F03 kilopascal per bar - + F04 millibar per bar - + F05 megapascal per bar - + F06 poise per bar - + F07 pascal per bar - + F08 milliampere per inch - + F10 kelvin per hour - + F11 kelvin per minute - + F12 kelvin per second - + F13 @@ -3093,177 +3093,177 @@ F14 gram per kelvin - + F15 kilogram per kelvin - + F16 milligram per kelvin - + F17 pound-force per foot - + F18 kilogram square centimetre - + F19 kilogram square millimetre - + F20 pound inch squared - + F21 pound-force inch - + F22 pound-force foot per ampere - + F23 gram per cubic decimetre - + F24 kilogram per kilomol - + F25 gram per hertz - + F26 gram per day - + F27 gram per hour - + F28 gram per minute - + F29 gram per second - + F30 kilogram per day - + F31 kilogram per minute - + F32 milligram per day - + F33 milligram per minute - + F34 milligram per second - + F35 gram per day kelvin - + F36 gram per hour kelvin - + F37 gram per minute kelvin - + F38 gram per second kelvin - + F39 kilogram per day kelvin - + F40 kilogram per hour kelvin - + F41 kilogram per minute kelvin - + F42 kilogram per second kelvin - + F43 milligram per day kelvin - + F44 milligram per hour kelvin - + F45 milligram per minute kelvin - + F46 milligram per second kelvin - + F47 newton per millimetre - + F48 pound-force per inch - + F49 @@ -3273,152 +3273,152 @@ F50 micrometre per kelvin - + F51 centimetre per kelvin - + F52 metre per kelvin - + F53 millimetre per kelvin - + F54 milliohm per metre - + F55 ohm per mile (statute mile) - + F56 ohm per kilometre - + F57 milliampere per pound-force per square inch - + F58 reciprocal bar - + F59 milliampere per bar - + F60 degree Celsius per bar - + F61 kelvin per bar - + F62 gram per day bar - + F63 gram per hour bar - + F64 gram per minute bar - + F65 gram per second bar - + F66 kilogram per day bar - + F67 kilogram per hour bar - + F68 kilogram per minute bar - + F69 kilogram per second bar - + F70 milligram per day bar - + F71 milligram per hour bar - + F72 milligram per minute bar - + F73 milligram per second bar - + F74 gram per bar - + F75 milligram per bar - + F76 milliampere per millimetre - + F77 pascal second per kelvin - + F78 inch of water - + F79 inch of mercury - + F80 @@ -3430,97 +3430,97 @@ F81 bar per kelvin - + F82 hectopascal per kelvin - + F83 kilopascal per kelvin - + F84 millibar per kelvin - + F85 megapascal per kelvin - + F86 poise per kelvin - + F87 volt per litre minute - + F88 newton centimetre - + F89 newton metre per degree - + F90 newton metre per ampere - + F91 bar litre per second - + F92 bar cubic metre per second - + F93 hectopascal litre per second - + F94 hectopascal cubic metre per second - + F95 millibar litre per second - + F96 millibar cubic metre per second - + F97 megapascal litre per second - + F98 megapascal cubic metre per second - + F99 pascal litre per second - + FAH @@ -3530,7 +3530,7 @@ FAR farad - + FBM @@ -3551,7 +3551,7 @@ FH micromole - + FIT @@ -3567,533 +3567,533 @@ small flattish fragment). - FNU + FNU Formazin nephelometric unit - + FOT foot - + FP pound per square foot - + FR foot per minute - + FS foot per second - + FTK square foot - + FTQ cubic foot - + G01 pascal cubic metre per second - + G04 centimetre per bar - + G05 metre per bar - + G06 millimetre per bar - + G08 square inch per second - + G09 square metre per second kelvin - + G10 stokes per kelvin - + G11 gram per cubic centimetre bar - + G12 gram per cubic decimetre bar - + G13 gram per litre bar - + G14 gram per cubic metre bar - + G15 gram per millilitre bar - + G16 kilogram per cubic centimetre bar - + G17 kilogram per litre bar - + G18 kilogram per cubic metre bar - + G19 newton metre per kilogram - + G2 US gallon per minute - + G20 pound-force foot per pound - + G21 cup [unit of volume] - + G23 peck - + G24 tablespoon (US) - + G25 teaspoon (US) - + G26 stere - + G27 cubic centimetre per kelvin - + G28 litre per kelvin - + G29 cubic metre per kelvin - + G3 Imperial gallon per minute - + G30 millilitre per kelvin - + G31 kilogram per cubic centimetre - + G32 ounce (avoirdupois) per cubic yard - + G33 gram per cubic centimetre kelvin - + G34 gram per cubic decimetre kelvin - + G35 gram per litre kelvin - + G36 gram per cubic metre kelvin - + G37 gram per millilitre kelvin - + G38 kilogram per cubic centimetre kelvin - + G39 kilogram per litre kelvin - + G40 kilogram per cubic metre kelvin - + G41 square metre per second bar - + G42 microsiemens per centimetre - + G43 microsiemens per metre - + G44 nanosiemens per centimetre - + G45 nanosiemens per metre - + G46 stokes per bar - + G47 cubic centimetre per day - + G48 cubic centimetre per hour - + G49 cubic centimetre per minute - + G50 gallon (US) per hour - + G51 litre per second - + G52 cubic metre per day - + G53 cubic metre per minute - + G54 millilitre per day - + G55 millilitre per hour - + G56 cubic inch per hour - + G57 cubic inch per minute - + G58 cubic inch per second - + G59 milliampere per litre minute - + G60 volt per bar - + G61 cubic centimetre per day kelvin - + G62 cubic centimetre per hour kelvin - + G63 cubic centimetre per minute kelvin - + G64 cubic centimetre per second kelvin - + G65 litre per day kelvin - + G66 litre per hour kelvin - + G67 litre per minute kelvin - + G68 litre per second kelvin - + G69 cubic metre per day kelvin - + G70 cubic metre per hour kelvin - + G71 cubic metre per minute kelvin - + G72 cubic metre per second kelvin - + G73 millilitre per day kelvin - + G74 millilitre per hour kelvin - + G75 millilitre per minute kelvin - + G76 millilitre per second kelvin - + G77 millimetre to the fourth power - + G78 cubic centimetre per day bar - + G79 cubic centimetre per hour bar - + G80 cubic centimetre per minute bar - + G81 cubic centimetre per second bar - + G82 litre per day bar - + G83 litre per hour bar - + G84 litre per minute bar - + G85 litre per second bar - + G86 cubic metre per day bar - + G87 cubic metre per hour bar - + G88 cubic metre per minute bar - + G89 cubic metre per second bar - + G90 millilitre per day bar - + G91 millilitre per hour bar - + G92 millilitre per minute bar - + G93 millilitre per second bar - + G94 cubic centimetre per bar - + G95 litre per bar - + G96 cubic metre per bar - + G97 millilitre per bar - + G98 microhenry per kiloohm - + G99 microhenry per ohm - + GB gallon (US) per day - + GBQ gigabecquerel - + GDW @@ -4104,12 +4104,12 @@ GE pound per gallon (US) - + GF gram per metre (gram per 100 centimetres) - + GFI @@ -4127,7 +4127,7 @@ GIA gill (US) - + GIC @@ -4138,7 +4138,7 @@ GII gill (UK) - + GIP @@ -4149,57 +4149,57 @@ GJ gram per millilitre - + GL gram per litre - + GLD dry gallon (US) - + GLI gallon (UK) - + GLL gallon (US) - + GM gram per square metre - + GO milligram per square metre - + GP milligram per cubic metre - + GQ microgram per cubic metre - + GRM gram - + GRN grain - + GRO @@ -4210,77 +4210,77 @@ GV gigajoule - + GWH gigawatt hour - + H03 henry per kiloohm - + H04 henry per ohm - + H05 millihenry per kiloohm - + H06 millihenry per ohm - + H07 pascal second per bar - + H08 microbecquerel - + H09 reciprocal year - + H10 reciprocal hour - + H11 reciprocal month - + H12 degree Celsius per hour - + H13 degree Celsius per minute - + H14 degree Celsius per second - + H15 square centimetre per gram - + H16 @@ -4295,12 +4295,12 @@ H19 cubic hectometre - + H20 cubic kilometre - + H21 @@ -4310,17 +4310,17 @@ H22 volt square inch per pound-force - + H23 volt per inch - + H24 volt per microsecond - + H25 @@ -4331,227 +4331,227 @@ H26 ohm per metre - + H27 degree per metre - + H28 microfarad per kilometre - + H29 microgram per litre - + H30 square micrometre (square micron) - + H31 ampere per kilogram - + H32 ampere squared second - + H33 farad per kilometre - + H34 hertz metre - + H35 kelvin metre per watt - + H36 megaohm per kilometre - + H37 megaohm per metre - + H38 megaampere - + H39 megahertz kilometre - + H40 newton per ampere - + H41 newton metre watt to the power minus 0,5 - + H42 pascal per metre - + H43 siemens per centimetre - + H44 teraohm - + H45 volt second per metre - + H46 volt per second - + H47 watt per cubic metre - + H48 attofarad - + H49 centimetre per hour - + H50 reciprocal cubic centimetre - + H51 decibel per kilometre - + H52 decibel per metre - + H53 kilogram per bar - + H54 kilogram per cubic decimetre kelvin - + H55 kilogram per cubic decimetre bar - + H56 kilogram per square metre second - + H57 inch per two pi radiant - + H58 metre per volt second - + H59 square metre per newton - + H60 cubic metre per cubic metre - + H61 millisiemens per centimetre - + H62 millivolt per minute - + H63 milligram per square centimetre - + H64 milligram per gram - + H65 millilitre per cubic metre - + H66 millimetre per year - + H67 millimetre per hour - + H68 millimole per gram - + H69 picopascal per kilometre - + H70 picosecond - + H71 @@ -4573,17 +4573,17 @@ H74 watt per metre - + H75 decapascal - + H76 gram per millimetre - + H77 @@ -4608,7 +4608,7 @@ H81 millimetre per minute - + H82 @@ -4620,17 +4620,17 @@ H83 litre per kilogram - + H84 gram millimetre - + H85 reciprocal week - + H87 @@ -4641,7 +4641,7 @@ H88 megaohm kilometre - + H89 @@ -4707,13 +4707,13 @@ A unit of length, typically for yarn. - HAD + HAD Piece Day HBA hectobar - + HBX @@ -4742,7 +4742,7 @@ HGM hectogram - + HH @@ -4764,15 +4764,15 @@ HLT hectolitre - + HM mile per hour (statute mile) - + - HMO + HMO Piece Month @@ -4783,7 +4783,7 @@ HMT hectometre - + HPA @@ -4793,21 +4793,21 @@ HTZ hertz - + HUR hour - - - HWE + + + + HWE Piece Week - IA inch pound (pound inch) - + IE @@ -4817,12 +4817,12 @@ INH inch - + INK square inch - + INQ @@ -4838,16 +4838,16 @@ IU inch per second - + - + IUG international unit per gram IV inch per second squared - + J10 @@ -4897,48 +4897,48 @@ J19 degree Fahrenheit hour square foot per British thermal unit (thermochemical) - + J2 joule per kilogram - + J20 degree Fahrenheit per kelvin - + J21 degree Fahrenheit per bar - + J22 degree Fahrenheit hour square foot per British thermal unit (international table) - + J23 degree Fahrenheit per hour - + J24 degree Fahrenheit per minute - + J25 degree Fahrenheit per second - + J26 reciprocal degree Fahrenheit - + J27 @@ -4949,17 +4949,17 @@ J28 degree Rankine per hour - + J29 degree Rankine per minute - + J30 degree Rankine per second - + J31 @@ -4970,27 +4970,27 @@ J32 micropoise - + J33 microgram per kilogram - + J34 microgram per cubic metre kelvin - + J35 microgram per cubic metre bar - + J36 microlitre per litre - + J38 @@ -5001,83 +5001,83 @@ J39 British thermal unit (mean) - + J40 British thermal unit (international table) foot per hour square foot degree Fahrenheit - + J41 British thermal unit (international table) inch per hour square foot degree Fahrenheit - + J42 British thermal unit (international table) inch per second square foot degree Fahrenheit - + J43 British thermal unit (international table) per pound degree Fahrenheit - + J44 British thermal unit (international table) per minute - + J45 British thermal unit (international table) per second - + J46 British thermal unit (thermochemical) foot per hour square foot degree Fahrenheit - + J47 British thermal unit (thermochemical) per hour - + J48 British thermal unit (thermochemical) inch per hour square foot degree Fahrenheit - + J49 British thermal unit (thermochemical) inch per second square foot degree Fahrenheit - + J50 British thermal unit (thermochemical) per pound degree Fahrenheit - + J51 British thermal unit (thermochemical) per minute - + J52 British thermal unit (thermochemical) per second - + J53 coulomb square metre per kilogram - + J54 @@ -5088,212 +5088,212 @@ J55 watt second - + J56 bar per bar - + J57 barrel (UK petroleum) - + J58 barrel (UK petroleum) per minute - + J59 barrel (UK petroleum) per day - + J60 barrel (UK petroleum) per hour - + J61 barrel (UK petroleum) per second - + J62 barrel (US petroleum) per hour - + J63 barrel (US petroleum) per second - + J64 bushel (UK) per day - + J65 bushel (UK) per hour - + J66 bushel (UK) per minute - + J67 bushel (UK) per second - + J68 bushel (US dry) per day - + J69 bushel (US dry) per hour - + J70 bushel (US dry) per minute - + J71 bushel (US dry) per second - + J72 centinewton metre - + J73 centipoise per kelvin - + J74 centipoise per bar - + J75 calorie (mean) - + J76 calorie (international table) per gram degree Celsius - + J78 calorie (thermochemical) per centimetre second degree Celsius - + J79 calorie (thermochemical) per gram degree Celsius - + J81 calorie (thermochemical) per minute - + J82 calorie (thermochemical) per second - + J83 clo - + J84 centimetre per second kelvin - + J85 centimetre per second bar - + J87 cubic centimetre per cubic metre - + J90 cubic decimetre per day - + J91 cubic decimetre per cubic metre - + J92 cubic decimetre per minute - + J93 cubic decimetre per second - + J95 ounce (UK fluid) per day - + J96 ounce (UK fluid) per hour - + J97 ounce (UK fluid) per minute - + J98 ounce (UK fluid) per second - + J99 ounce (US fluid) per day - + JE joule per kelvin - + JK megajoule per kilogram - + JM megajoule per cubic metre - + JNT @@ -5303,7 +5303,7 @@ JOU joule - + JPS @@ -5325,52 +5325,52 @@ K10 ounce (US fluid) per hour - + K11 ounce (US fluid) per minute - + K12 ounce (US fluid) per second - + K13 foot per degree Fahrenheit - + K14 foot per hour - + K15 foot pound-force per hour - + K16 foot pound-force per minute - + K17 foot per psi - + K18 foot per second degree Fahrenheit - + K19 foot per second psi - + K2 @@ -5381,37 +5381,37 @@ K20 reciprocal cubic foot - + K21 cubic foot per degree Fahrenheit - + K22 cubic foot per day - + K23 cubic foot per psi - + K26 gallon (UK) per day - + K27 gallon (UK) per hour - + K28 gallon (UK) per second - + K3 @@ -5422,97 +5422,97 @@ K30 gallon (US liquid) per second - + K31 gram-force per square centimetre - + K32 gill (UK) per day - + K33 gill (UK) per hour - + K34 gill (UK) per minute - + K35 gill (UK) per second - + K36 gill (US) per day - + K37 gill (US) per hour - + K38 gill (US) per minute - + K39 gill (US) per second - + K40 standard acceleration of free fall - + K41 grain per gallon (US) - + K42 horsepower (boiler) - + K43 horsepower (electric) - + K45 inch per degree Fahrenheit - + K46 inch per psi - + K47 inch per second degree Fahrenheit - + K48 inch per second psi - + K49 reciprocal cubic inch - + K50 @@ -5523,237 +5523,237 @@ K51 kilocalorie (mean) - + K52 kilocalorie (international table) per hour metre degree Celsius - + K53 kilocalorie (thermochemical) - + K54 kilocalorie (thermochemical) per minute - + K55 kilocalorie (thermochemical) per second - + K58 kilomole per hour - + K59 kilomole per cubic metre kelvin - + K6 kilolitre - + K60 kilomole per cubic metre bar - + K61 kilomole per minute - + K62 litre per litre - + K63 reciprocal litre - + K64 pound (avoirdupois) per degree Fahrenheit - + K65 pound (avoirdupois) square foot - + K66 pound (avoirdupois) per day - + K67 pound per foot hour - + K68 pound per foot second - + K69 pound (avoirdupois) per cubic foot degree Fahrenheit - + K70 pound (avoirdupois) per cubic foot psi - + K71 pound (avoirdupois) per gallon (UK) - + K73 pound (avoirdupois) per hour degree Fahrenheit - + K74 pound (avoirdupois) per hour psi - + K75 pound (avoirdupois) per cubic inch degree Fahrenheit - + K76 pound (avoirdupois) per cubic inch psi - + K77 pound (avoirdupois) per psi - + K78 pound (avoirdupois) per minute - + K79 pound (avoirdupois) per minute degree Fahrenheit - + K80 pound (avoirdupois) per minute psi - + K81 pound (avoirdupois) per second - + K82 pound (avoirdupois) per second degree Fahrenheit - + K83 pound (avoirdupois) per second psi - + K84 pound per cubic yard - + K85 pound-force per square foot - + K86 pound-force per square inch degree Fahrenheit - + K87 psi cubic inch per second - + K88 psi litre per second - + K89 psi cubic metre per second - + K90 psi cubic yard per second - + K91 pound-force second per square foot - + K92 pound-force second per square inch - + K93 reciprocal psi - + K94 quart (UK liquid) per day - + K95 quart (UK liquid) per hour - + K96 quart (UK liquid) per minute - + K97 quart (UK liquid) per second - + K98 quart (US liquid) per day - + K99 quart (US liquid) per hour - + KA @@ -5775,7 +5775,7 @@ KBA kilobar - + KCC @@ -5801,7 +5801,7 @@ KGS kilogram per second - + KHY @@ -5811,12 +5811,12 @@ KHZ kilohertz - + KI kilogram per millimetre width - + KIC @@ -5838,12 +5838,12 @@ KJO kilojoule - + KL kilogram per metre - + KLK @@ -5864,12 +5864,12 @@ KMH kilometre per hour - + KMK square kilometre - + KMQ @@ -5880,7 +5880,7 @@ KMT kilometre - + KNI @@ -5900,7 +5900,7 @@ KNT knot - + KO @@ -5912,7 +5912,7 @@ KPA kilopascal - + KPH @@ -5934,7 +5934,7 @@ KR kiloroentgen - + KSD @@ -5957,7 +5957,7 @@ KTN kilotonne - + KUR @@ -5967,29 +5967,29 @@ KVA kilovolt - ampere - + KVR kilovar - + KVT kilovolt - + KW kilogram per millimetre - + KWH kilowatt hour - + - + KWN Kilowatt hour per normalized cubic metre @@ -6005,456 +6005,456 @@ KWT kilowatt - + - KWY + KWY kilowatt year KX millilitre per kilogram - + L10 quart (US liquid) per minute - + L11 quart (US liquid) per second - + L12 metre per second kelvin - + L13 metre per second bar - + L14 square metre hour degree Celsius per kilocalorie (international table) - + L15 millipascal second per kelvin - + L16 millipascal second per bar - + L17 milligram per cubic metre kelvin - + L18 milligram per cubic metre bar - + L19 millilitre per litre - + L2 litre per minute - + L20 reciprocal cubic millimetre - + L21 cubic millimetre per cubic metre - + L23 mole per hour - + L24 mole per kilogram kelvin - + L25 mole per kilogram bar - + L26 mole per litre kelvin - + L27 mole per litre bar - + L28 mole per cubic metre kelvin - + L29 mole per cubic metre bar - + L30 mole per minute - + L31 milliroentgen aequivalent men - + L32 nanogram per kilogram - + L33 ounce (avoirdupois) per day - + L34 ounce (avoirdupois) per hour - + L35 ounce (avoirdupois) per minute - + L36 ounce (avoirdupois) per second - + L37 ounce (avoirdupois) per gallon (UK) - + L38 ounce (avoirdupois) per gallon (US) - + L39 ounce (avoirdupois) per cubic inch - + L40 ounce (avoirdupois)-force - + L41 ounce (avoirdupois)-force inch - + L42 picosiemens per metre - + L43 peck (UK) - + L44 peck (UK) per day - + L45 peck (UK) per hour - + L46 peck (UK) per minute - + L47 peck (UK) per second - + L48 peck (US dry) per day - + L49 peck (US dry) per hour - + L50 peck (US dry) per minute - + L51 peck (US dry) per second - + L52 psi per psi - + L53 pint (UK) per day - + L54 pint (UK) per hour - + L55 pint (UK) per minute - + L56 pint (UK) per second - + L57 pint (US liquid) per day - + L58 pint (US liquid) per hour - + L59 pint (US liquid) per minute - + L60 pint (US liquid) per second - + L63 slug per day - + L64 slug per foot second - + L65 slug per cubic foot - + L66 slug per hour - + L67 slug per minute - + L68 slug per second - + L69 tonne per kelvin - + L70 tonne per bar - + L71 tonne per day - + L72 tonne per day kelvin - + L73 tonne per day bar - + L74 tonne per hour kelvin - + L75 tonne per hour bar - + L76 tonne per cubic metre kelvin - + L77 tonne per cubic metre bar - + L78 tonne per minute - + L79 tonne per minute kelvin - + L80 tonne per minute bar - + L81 tonne per second - + L82 tonne per second kelvin - + L83 tonne per second bar - + L84 ton (UK shipping) - + L85 ton long per day - + L86 ton (US shipping) - + L87 ton short per degree Fahrenheit - + L88 ton short per day - + L89 ton short per hour degree Fahrenheit - + L90 ton short per hour psi - + L91 ton short per psi - + L92 ton (UK long) per cubic yard - + L93 ton (US short) per cubic yard - + L94 ton-force (US short) - + L95 common year - + L96 sidereal year - + L98 yard per degree Fahrenheit - + L99 yard per psi - + LA pound per cubic inch - + LAC @@ -6465,17 +6465,17 @@ LBR pound - + LBT troy pound (US) - + LD litre per day - + LEF @@ -6546,7 +6546,7 @@ LTR litre - + LUB @@ -6557,12 +6557,12 @@ LUM lumen - + LUX lux - + LY @@ -6573,52 +6573,52 @@ M1 milligram per litre - + M10 reciprocal cubic yard - + M11 cubic yard per degree Fahrenheit - + M12 cubic yard per day - + M13 cubic yard per hour - + M14 cubic yard per psi - + M15 cubic yard per minute - + M16 cubic yard per second - + M17 kilohertz metre - + M18 gigahertz metre - + M19 @@ -6630,27 +6630,27 @@ M20 reciprocal megakelvin or megakelvin to the power minus one - + M21 reciprocal kilovolt - ampere reciprocal hour - + M22 millilitre per square centimetre minute - + M23 newton per centimetre - + M24 ohm kilometre - + M25 @@ -6661,47 +6661,47 @@ M26 gigaohm per metre - + M27 megahertz metre - + M29 kilogram per kilogram - + M30 reciprocal volt - ampere reciprocal second - + M31 kilogram per kilometre - + M32 pascal second per litre - + M33 millimole per litre - + M34 newton metre per square metre - + M35 millivolt - ampere - + M36 @@ -6793,7 +6793,7 @@ M5 microcurie - + M50 @@ -6904,7 +6904,7 @@ M7 micro-inch - + M70 @@ -7025,7 +7025,7 @@ M9 million Btu per 1000 cubic foot - + M90 @@ -7098,12 +7098,12 @@ MAL megalitre - + MAM megametre - + MAR @@ -7133,17 +7133,17 @@ MBR millibar - + MC microgram - + MCU millicurie - + MD @@ -7154,32 +7154,32 @@ MGM milligram - + MHZ megahertz - + MIK square mile (statute mile) - + MIL thousand - + MIN minute [unit of time] - + MIO million - + MIU @@ -7187,15 +7187,15 @@ A unit of count defining the number of international units in multiples of 10. - MKD + MKD Square Metre Day - MKM + MKM Square Metre Month - MKW + MKW Square Metre Week @@ -7206,22 +7206,22 @@ MLT millilitre - + MMK square millimetre - + MMQ cubic millimetre - + MMT millimetre - + MND @@ -7230,7 +7230,7 @@ water content of the product. - MNJ + MNJ Mega Joule per Normalised cubic Metre @@ -7241,51 +7241,51 @@ MPA megapascal - + - MQD + MQD Cubic Metre Day MQH cubic metre per hour - + - MQM + MQM Cubic Metre Month MQS cubic metre per second - + - MQW + MQW Cubic Metre Week - MRD + MRD Metre Day - MRM + MRM Metre Month - MRW + MRW Metre Week MSK metre per second squared - + MTK square metre - + MTQ @@ -7295,21 +7295,21 @@ MTR metre - + MTS metre per second - + - MTZ + MTZ milihertz MVA megavolt - ampere - + MWH @@ -7462,7 +7462,7 @@ N3 print point - + N30 @@ -7890,7 +7890,7 @@ NA milligram per kilogram - + NAR @@ -7906,7 +7906,7 @@ NEW newton - + NF @@ -7938,7 +7938,7 @@ NMI nautical mile - + NMP @@ -7959,13 +7959,13 @@ Convention on tonnage measurement of Ships. - NTU + NTU Nephelometric turbidity unit - + NU newton metre - + NX @@ -8000,17 +8000,17 @@ OHM ohm - + ON ounce per square yard - + ONZ ounce (avoirdupois) - + OPM @@ -8025,12 +8025,12 @@ OZA fluid ounce (US) - + OZI fluid ounce (UK) - + P1 @@ -8094,7 +8094,7 @@ P2 pound per foot - + P20 @@ -8581,7 +8581,7 @@ PAL pascal - + PD @@ -8620,7 +8620,7 @@ PO pound per inch of length - + PQ @@ -8637,22 +8637,22 @@ PS pound-force per square inch - + PTD dry pint (US) - + PTI pint (UK) - + PTL liquid pint (US) - + PTN @@ -8795,22 +8795,22 @@ Q31 kilojoule per gram - + Q32 femtolitre - + Q33 picolitre - + Q34 nanolitre - + Q35 @@ -8888,17 +8888,17 @@ QTD dry quart (US) - + QTI quart (UK) - + QTL liquid quart (US) - + QTR @@ -8979,12 +8979,12 @@ SCR scruple - + SEC second [unit of time] - + SET @@ -9000,7 +9000,7 @@ SIE siemens - + SM3 @@ -9011,7 +9011,7 @@ SMI mile (statute mile) - + SQ @@ -9040,7 +9040,7 @@ STI stone (UK) - + STK @@ -9097,7 +9097,7 @@ TAH kiloampere hour (thousand ampere hour) - + TAN @@ -9109,7 +9109,7 @@ TI thousand square inch - + TIC @@ -9164,7 +9164,7 @@ TRL trillion (EUR) - + TST @@ -9203,12 +9203,12 @@ VA volt - ampere per kilogram - + VLT volt - + VP @@ -9225,7 +9225,7 @@ WA watt per kilogram - + WB @@ -9248,12 +9248,12 @@ WEB weber - + WEE week - + WG @@ -9263,7 +9263,7 @@ WHR watt hour - + WM @@ -9279,7 +9279,7 @@ WTT watt - + X1 @@ -9289,17 +9289,17 @@ YDK square yard - + YDQ cubic yard - + YRD yard - + Z11 @@ -9307,7 +9307,7 @@ A unit of count defining the number of hanging containers. - Z9 + Z9 nanomole @@ -9321,9 +9321,9 @@ A unit of measure as agreed in common between two or more parties. - - - + + + X1A Drum, steel @@ -10176,39 +10176,39 @@ Net, tube, textile - XO1 + XO1 Two sided cage on wheels with fixing strap - XO2 + XO2 Trolley - XO3 + XO3 Oneway pallet ISO 0 - 1/2 EURO Pallet - XO4 + XO4 Oneway pallet ISO 1 - 1/1 EURO Pallet - XO5 + XO5 Oneway pallet ISO 2 - 2/1 EURO Pallet - XO6 + XO6 Pallet with exceptional dimensions - XO7 - Wooden pallet 40 cm x 80 cm + XO7 + Wooden pallet 40 cm x 80 cm - XO8 + XO8 Plastic pallet SRS 60 cm x 80 cm - XO9 + XO9 Plastic pallet SRS 80 cm x 120 cm @@ -10248,15 +10248,15 @@ weight. - XOG + XOG Pallet ISO 0 - 1/2 EURO Pallet - XOH + XOH Pallet ISO 1 - 1/1 EURO Pallet - XOI + XOI Pallet ISO 2 – 2/1 EURO Pallet @@ -10266,43 +10266,43 @@ sides. - XOJ + XOJ 1/4 EURO Pallet - XOL + XOL 1/8 EURO Pallet - XOM + XOM Synthetic pallet ISO 1 - XON + XON Synthetic pallet ISO 2 - XOP + XOP Wholesaler pallet - XOQ + XOQ Pallet 80 X 100 cm - XOR + XOR Pallet 60 X 100 cm - XOS + XOS Oneway pallet - XOV + XOV Returnable pallet - XOW + XOW Large bag, pallet sized @@ -10318,19 +10318,19 @@ otherwise specified as transport equipment. - XOX + XOX A wheeled pallet with raised rim (81 x 67 x 135) - XOY + XOY A Wheeled pallet with raised rim (81 x 72 x 135) - XOZ + XOZ Wheeled pallet with raised rim ( 81 x 60 x 16) - XP1 + XP1 CHEP pallet 60 cm x 80 cm @@ -10339,11 +10339,11 @@ A shallow, wide, open container, usually of metal. - XP3 + XP3 LPR pallet 60 cm x 80 cm - XP4 + XP4 LPR pallet 80 cm x 120 cm @@ -10624,7 +10624,7 @@ then shrunk tightly on to the goods. - XSX + XSX Set @@ -11094,7 +11094,7 @@ - + - + \ No newline at end of file From 8e12c6d19c22075a4173277057a113f3ffe508c8 Mon Sep 17 00:00:00 2001 From: Hans Petersen Date: Wed, 30 Oct 2024 09:16:58 +0100 Subject: [PATCH 34/39] change to release note --- guides/release-notes/v3.0.14.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc index 29a999c9..54d3aea5 100644 --- a/guides/release-notes/v3.0.14.adoc +++ b/guides/release-notes/v3.0.14.adoc @@ -36,6 +36,6 @@ Release date:: November 2024 == Changes to code lists and validation artefacts * Added new codelist with code values SSCC (Serial Shipping Container Code) and ZZZ (Mutually defined) to the optional attribute that indicates the type/scheme for Transport handling unit identifier (in Despatch Advice) -* Changes to codelists 7143 and 8273 +* Changes to codelists 7143, 8273 and UNECERec20-11e == Other From 37897725d7c7a88383f39a18286f2b222a43acc7 Mon Sep 17 00:00:00 2001 From: Hans Petersen Date: Wed, 30 Oct 2024 09:26:23 +0100 Subject: [PATCH 35/39] Initial commit --- .../catalogue-wo-response-use-case-5.xml | 18 +++++++---- rules/examples/Order use cases/UC4_Order.xml | 28 ++++++++-------- rules/examples/OrderAgreement_Example.xml | 32 ++++++++++++------- rules/examples/PunchOut_Example.xml | 4 ++- 4 files changed, 49 insertions(+), 33 deletions(-) diff --git a/rules/examples/Cataloge wo response use cases/catalogue-wo-response-use-case-5.xml b/rules/examples/Cataloge wo response use cases/catalogue-wo-response-use-case-5.xml index 94c162a4..3de2d9aa 100644 --- a/rules/examples/Cataloge wo response use cases/catalogue-wo-response-use-case-5.xml +++ b/rules/examples/Cataloge wo response use cases/catalogue-wo-response-use-case-5.xml @@ -1,8 +1,8 @@ + xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" + xmlns="urn:oasis:names:specification:ubl:schema:xsd:Catalogue-2"> urn:fdc:peppol.eu:poacc:trns:catalogue:3 urn:fdc:peppol.eu:poacc:bis:catalogue_wo_response:3 1387 @@ -204,7 +204,8 @@ 12345 - UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi + + UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi http://www.supplier.com/image1.png @@ -214,7 +215,8 @@ NO - 20101601 + 20101601 CT @@ -299,7 +301,9 @@ - 77e416eb-a363-4258-a04e-171d843a6460 + 77e416eb-a363-4258-a04e-171d843a6460 Paper weight in grams 18 @@ -307,7 +311,7 @@ 3 - + 1234 1 @@ -342,4 +346,4 @@ - + \ No newline at end of file diff --git a/rules/examples/Order use cases/UC4_Order.xml b/rules/examples/Order use cases/UC4_Order.xml index 13f66da6..fa6c26e1 100644 --- a/rules/examples/Order use cases/UC4_Order.xml +++ b/rules/examples/Order use cases/UC4_Order.xml @@ -1,15 +1,15 @@ + 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"> urn:fdc:peppol.eu:poacc:trns:order:3 urn:fdc:peppol.eu:poacc:bis:order_only:3 5 2013-07-01 05:10:10 Notes regarding the order - EUR + EUR MAFO 2013-07-30 @@ -27,7 +27,7 @@ 100 Blueprint - + http://upload.wikimedia.org/wikipedia/commons/1/10/LaBelle_Blueprint.jpg @@ -45,7 +45,7 @@ City Hospital - Main street 4 + Main street 4 Back door Eurocity 11155 @@ -96,7 +96,7 @@ Cod Liver Oil Limited - + Öystein +47555444333 oystein@codliveroil.no @@ -196,7 +196,7 @@ Agreed discount 10 - + 5 @@ -223,8 +223,8 @@ - - 7300010000001 + + 7300010000001 Martin @@ -252,7 +252,7 @@ 76455 - S + S 10 VAT @@ -263,11 +263,13 @@ Left-handed - 77e416eb-a363-4258-a04e-171d843a6460 + 77e416eb-a363-4258-a04e-171d843a6460 Purpose Snow - + \ No newline at end of file diff --git a/rules/examples/OrderAgreement_Example.xml b/rules/examples/OrderAgreement_Example.xml index b7659e53..2ef2fc02 100644 --- a/rules/examples/OrderAgreement_Example.xml +++ b/rules/examples/OrderAgreement_Example.xml @@ -11,8 +11,8 @@ --> + xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" + xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"> urn:fdc:peppol.eu:poacc:trns:order_agreement:3 urn:fdc:peppol.eu:poacc:bis:order_agreement:3 0263bf48-9a55-4d15-adf5-2c2921036d1c @@ -32,7 +32,8 @@ 147852 Timesheet - UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi + + UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi http://www.example.com/index.html @@ -47,7 +48,7 @@ DK12345678 - + Storgt. 12 4. etasje @@ -127,10 +128,12 @@ true ABK Miscellaneous services - 2.00 - + + 2.00 + + S 25 @@ -160,7 +163,7 @@ 7.81 S - 25 + 25 VAT @@ -218,7 +221,9 @@ TRADE_ITEM_DESCRIPTION Timesheet - UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi + + UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi http://www.example.com/index.html @@ -238,7 +243,10 @@ - 77e416eb-a363-4258-a04e-171d843a6460 + + 77e416eb-a363-4258-a04e-171d843a6460 Length test 30 mm @@ -276,4 +284,4 @@ - + \ No newline at end of file diff --git a/rules/examples/PunchOut_Example.xml b/rules/examples/PunchOut_Example.xml index 5630b08b..391f6aaf 100644 --- a/rules/examples/PunchOut_Example.xml +++ b/rules/examples/PunchOut_Example.xml @@ -165,7 +165,9 @@ - 77e416eb-a363-4258-a04e-171d843a6460 + 77e416eb-a363-4258-a04e-171d843a6460 Paper weight in grams 18 From 2e6c05e3e94333b8f6e6222727202d38a77fcdec Mon Sep 17 00:00:00 2001 From: MartinForsberg-Ecru Date: Wed, 30 Oct 2024 10:57:12 +0100 Subject: [PATCH 36/39] Updated compliance on sbdh and bis identifiers --- guides/compliance/payload.adoc | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/guides/compliance/payload.adoc b/guides/compliance/payload.adoc index e98bf1e7..d1033465 100644 --- a/guides/compliance/payload.adoc +++ b/guides/compliance/payload.adoc @@ -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: - 0088:7315458756324 - UBL representation: + BIS message: 7315458756324 + + SBDH envelope: + 0088:7315458756324 ==== -See Policy for use of Identifiers +See Policy for use of Identifiers for more information on how to represent identifiers in envelope and messages. \ No newline at end of file From 3460859ab2b7e7d183dd6028361f9657b4f085e8 Mon Sep 17 00:00:00 2001 From: MartinForsberg-Ecru Date: Thu, 31 Oct 2024 11:00:13 +0100 Subject: [PATCH 37/39] fixed versions and release notes --- guides/release-notes/v3.0.14.adoc | 6 ++---- project.xml | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc index 77f6d268..0e3e52cb 100644 --- a/guides/release-notes/v3.0.14.adoc +++ b/guides/release-notes/v3.0.14.adoc @@ -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) nd its "schemeID" attribute == Changes to syntax * Order transaction (T01) diff --git a/project.xml b/project.xml index 7f8b7798..a85157cd 100644 --- a/project.xml +++ b/project.xml @@ -26,7 +26,7 @@ Structure-1 structure/syntax/ubl-order.xml - Peppol Order transaction 3.4 (T01) + Peppol Order transaction 3.5 (T01) Structure-1 @@ -36,12 +36,12 @@ Structure-1 structure/syntax/ubl-orderagreement.xml - Peppol Order Agreement transaction 3.1 (T110) + Peppol Order Agreement transaction 3.2 (T110) Structure-1 structure/syntax/ubl-order-change.xml - Peppol Order Change transaction 3.0 (T114) + Peppol Order Change transaction 3.1 (T114) Structure-1 @@ -56,7 +56,7 @@ Structure-1 structure/syntax/ubl-catalogue.xml - Peppol Catalogue transaction 3.2 (T19) + Peppol Catalogue transaction 3.3 (T19) Structure-1 @@ -66,12 +66,12 @@ Structure-1 structure/syntax/ubl-despatch-advice.xml - Peppol Despatch Advice transaction 3.2 (T16) + Peppol Despatch Advice transaction 3.3 (T16) Structure-1 structure/syntax/ubl-shoppingcart.xml - Peppol Punch Out transaction 3.2 (T77) + Peppol Punch Out transaction 3.3 (T77) Structure-1 @@ -94,7 +94,7 @@ T01 native:Schematron rules/sch/parts/PEPPOL-M-T01.sch - Business rules for Peppol Order transaction 3.4 + Business rules for Peppol Order transaction 3.5 T76 @@ -106,13 +106,13 @@ T110 native:Schematron rules/sch/parts/PEPPOL-M-T110.sch - Business rules for Peppol Order Agreement transaction 3.1 + Business rules for Peppol Order Agreement transaction 3.2 T19 native:Schematron rules/sch/parts/PEPPOL-M-T19.sch - Business rules for Peppol Catalogue transaction 3.2 + Business rules for Peppol Catalogue transaction 3.3 T58 @@ -124,14 +124,14 @@ T16 native:Schematron rules/sch/parts/PEPPOL-M-T16.sch - Business rules for Peppol Despatch Advice transaction 3.2 + Business rules for Peppol Despatch Advice transaction 3.3 T77 native:Schematron rules/sch/parts/PEPPOL-M-T77.sch - Business rules for Peppol Punch Out transaction 3.2 + Business rules for Peppol Punch Out transaction 3.3 @@ -151,7 +151,7 @@ T114 native:Schematron rules/sch/parts/PEPPOL-M-T114.sch - Business rules for Peppol Order Change transaction 3.0 + Business rules for Peppol Order Change transaction 3.1 T115 From 132946b1387373ab0002b53c03acb59ccfab88b3 Mon Sep 17 00:00:00 2001 From: MartinForsberg-Ecru Date: Thu, 31 Oct 2024 11:04:17 +0100 Subject: [PATCH 38/39] Fixed typo --- guides/release-notes/v3.0.14.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/release-notes/v3.0.14.adoc b/guides/release-notes/v3.0.14.adoc index 0e3e52cb..b1efcb38 100644 --- a/guides/release-notes/v3.0.14.adoc +++ b/guides/release-notes/v3.0.14.adoc @@ -8,7 +8,7 @@ Release date:: November 2024 ** Added sample file and use case which describes consignment orders and vendor-managed inventory == 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) nd its "schemeID" attribute +* 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) From 5c0bf598222785642511ccece3d2a33b4997bc58 Mon Sep 17 00:00:00 2001 From: Georg Date: Wed, 13 Nov 2024 15:10:55 +0000 Subject: [PATCH 39/39] Updating code list to EN code list release #POACC-717 --- structure/codelist/ICD.xml | 60 +++++++++++++++++++++++------ structure/codelist/ISO4217_2015.xml | 26 ++++++++----- structure/codelist/eas.xml | 9 ++++- 3 files changed, 72 insertions(+), 23 deletions(-) diff --git a/structure/codelist/ICD.xml b/structure/codelist/ICD.xml index f937c7fd..5ed13228 100644 --- a/structure/codelist/ICD.xml +++ b/structure/codelist/ICD.xml @@ -1044,40 +1044,37 @@ Classes moyennes et Energie GS1 identification keys Intended Purpose/App. Area: GS1 identification keys and key qualifiers may be used by an information system to refer unambiguously to an entity such as a trade item, logistics unit, physical location, document, or service relationship. Issuing agency: GS1, a global organization. - + 0210 CODICE FISCALE Intended Purpose/App. Area: Electronic Invoicing and e-procurement. Issuing agency: Agenzia delle Entrate, Italy. - + 0211 PARTITA IVA Intended Purpose/App. Area: Electronic Invoicing and e-procurement. Issuing agency: Agenzia delle Entrate, Italy. - + 0212 Finnish Organization Identifier Intended Purpose/App. Area: Identification scheme will be used for electronic trade purposes in e-invoicing, purchasing, electronic receipts. Issuing agency: State Treasury of Finland / Valtiokonttor. - + 0213 Finnish Organization Value Add Tax Identifier Intended Purpose/App. Area: Identification scheme will be used for electronic trade purposes in e-invoicing, purchasing, electronic receipts. Issuing agency: State Treasury of Finland / Valtiokonttor. - - + 0214 Tradeplace TradePI Standard Intended Purpose/App. Area: Tradeplace is an independent company, set up as a joint venture of several Home Appliance- and Consumer Electronics manufacturers. Tradeplace has launched their TradePI (Product Information) initiative for home appliances, consumer electronics, DIY and affiliated industries that are connected to Tradeplace. The initiative introduces an enhanced standard structure for product information. The TradePI Standard helps retailers to take full advantage of electronic communication and data processing, as the Internet and ICT are fundamentally changing how products and services are offered, bought, and sold. Issuing agency: Tradeplace B.V., The Netherlands. - - + 0215 Net service ID Intended Purpose/App. Area: Identification scheme will be used for electronic trade purposes in e-invoicing, purchasing, electronic receipts. Issuing agency: Tieto Finland Oy, FINLAND. - - + 0216 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. @@ -1101,7 +1098,7 @@ Classes moyennes et Energie 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. - + 0221 The registered number of the qualified invoice issuer @@ -1151,6 +1148,45 @@ Classes moyennes et Energie 0230 National e-Invoicing Framework Intended Purpose/App. Area: Identifier for  organizations. Issuing agency: Malaysia Digital Economy Corporation Sdn Bhd (MDEC) + + + 0231 + Single taxable company (France) + 'Intended Purpose/App. Area: Provide identifiers to companies in a single taxable company regime. Issuing agency: AIFE (Agence pour l’Informatique Financière de l’Etat)' + + + 0232 + NOBB product number + Intended Purpose/App. Area: . Issuing agency: ' + + + 0233 + Name not known + Description not known + + + 0234 + Toimitusosoite ID + 'Intended Purpose/App. Area: Identification scheme is used to identify delivery locations of the Finnish government accounting units. Issuing agency: Toimitusosoite ID' + + + 0235 + UAE Tax Identification Number (TIN) + 'Intended Purpose/App. Area: A unique number issued to a range of persons required to be identified for tax purposes. Issuing agency: UAE Federal Tax Authority' + + + 0236 + Name not known + Description not known + + + 0237 + CPR (Danish person civil registration number) + 'Intended Purpose/App. Area: . Issuing agency: ' + + + 0238 + Plateforme.s agréée.s à la facturation électronique (PPF/PDP) + 'Intended Purpose/App. Area: To provide identifiers for E-invoicing Public Platform and Partner Dematerialisation Platform. Issuing agency: AIFE (Agence pour l’Informatique Financière de l’Etat)' - diff --git a/structure/codelist/ISO4217_2015.xml b/structure/codelist/ISO4217_2015.xml index 671f69e3..8de4e1bc 100644 --- a/structure/codelist/ISO4217_2015.xml +++ b/structure/codelist/ISO4217_2015.xml @@ -1,6 +1,6 @@ - Currency codes (ISO 4217) + ISO 4217 Currency codes ISO4217 2018-01-01 ISO @@ -248,10 +248,6 @@ HNL Lempira - - HRK - Kuna - HTG Gourde @@ -521,8 +517,8 @@ Saint Helena Pound - SLL - Leone + SLE + Sierra Leone SOS @@ -612,15 +608,22 @@ UYU Peso Uruguayo + + UYW + Unidad Previsional + UZS Uzbekistan Sum - VEF - Bolívar + VED + Bolívar Soberano, new valuation + VES + Bolívar Soberano + VND Dong @@ -696,7 +699,6 @@ XUA ADB Unit of Account - YER Yemeni Rial @@ -709,6 +711,10 @@ ZMW Zambian Kwacha + + ZWG + Zimbabwe Gold + ZWL Zimbabwe Dollar diff --git a/structure/codelist/eas.xml b/structure/codelist/eas.xml index de50ea0f..65f7a80a 100644 --- a/structure/codelist/eas.xml +++ b/structure/codelist/eas.xml @@ -57,6 +57,10 @@ 0151 Australian Business Number (ABN) Scheme + + 0177 + Odette International Limited + 0183 Numéro d'identification suisse des enterprises (IDE), Swiss Unique Business @@ -162,7 +166,10 @@ 0230 National e-Invoicing Framework (Malaysia) - + + 0235 + UAE Tax Identification Number (TIN) + 9901 Danish Ministry of the Interior and Health