From b23a186c1fb91d69ccaa717260be16250c5c7a8b Mon Sep 17 00:00:00 2001 From: oscarglanzmann Date: Fri, 8 Sep 2023 15:18:44 +0200 Subject: [PATCH 1/7] added empty release notes as initial preparations for Nov release --- guides/release-notes/main.adoc | 2 ++ guides/release-notes/v3.0.12.adoc | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 guides/release-notes/v3.0.12.adoc diff --git a/guides/release-notes/main.adoc b/guides/release-notes/main.adoc index 00c7ef3d..dfdb3a09 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.12.adoc[] + include::v3.0.11.adoc[] include::v3.0.10.adoc[] diff --git a/guides/release-notes/v3.0.12.adoc b/guides/release-notes/v3.0.12.adoc new file mode 100644 index 00000000..a6adb05e --- /dev/null +++ b/guides/release-notes/v3.0.12.adoc @@ -0,0 +1,16 @@ += Version 3.0.12 +[horizontal] +Release date:: 2023-11-01 + +== BIS documentation + +== Changes to syntax +* Order transaction (T01) + +* Order Response transaction (T76) + + +== Changes to code lists and validation artefacts + + +== Other From 22174a1196f1aab04eca8da0cba30b2c6a6a6877 Mon Sep 17 00:00:00 2001 From: oscarglanzmann Date: Fri, 22 Sep 2023 11:50:34 +0200 Subject: [PATCH 2/7] Removed listId from and ResponseCode> in example files for Invoice Response. Deleted reference to payment in example file 7 in Invoice Response Examples --- .../T111-uc001-Invoice in process.xml | 4 ++-- .../T111-uc002a-Additional reference data.xml | 4 ++-- .../T111-uc002b-In process but postponed.xml | 4 ++-- .../T111-uc003-Invoice is accepted.xml | 4 ++-- .../T111-uc004a-Invoice is rejected.xml | 4 ++-- .../T111-uc004b-Rejected requesting reissue.xml | 4 ++-- .../T111-uc004c-Rejected requesting replacement.xml | 4 ++-- .../T111-uc005-Invoice is conditionally accepted.xml | 4 ++-- .../T111-uc006a-Under query missing information.xml | 4 ++-- .../Invoice reponse use cases/T111-uc006b-Missing PO.xml | 4 ++-- .../T111-uc006c-Wrong detail partial credit.xml | 4 ++-- .../T111-uc007-Payment has been initiated.xml | 8 ++------ .../T111-uc008-Invoice is accepted by third party.xml | 4 ++-- 13 files changed, 26 insertions(+), 30 deletions(-) diff --git a/rules/examples/Invoice reponse use cases/T111-uc001-Invoice in process.xml b/rules/examples/Invoice reponse use cases/T111-uc001-Invoice in process.xml index 15adc3e7..4281ea0c 100644 --- a/rules/examples/Invoice reponse use cases/T111-uc001-Invoice in process.xml +++ b/rules/examples/Invoice reponse use cases/T111-uc001-Invoice in process.xml @@ -30,11 +30,11 @@ - IP + IP inv021 - 380 + 380 \ No newline at end of file diff --git a/rules/examples/Invoice reponse use cases/T111-uc002a-Additional reference data.xml b/rules/examples/Invoice reponse use cases/T111-uc002a-Additional reference data.xml index 9912e9ef..a26ece99 100644 --- a/rules/examples/Invoice reponse use cases/T111-uc002a-Additional reference data.xml +++ b/rules/examples/Invoice reponse use cases/T111-uc002a-Additional reference data.xml @@ -33,7 +33,7 @@ - IP + IP 2017-12-01 NOA @@ -45,7 +45,7 @@ inv021 - 380 + 380 diff --git a/rules/examples/Invoice reponse use cases/T111-uc002b-In process but postponed.xml b/rules/examples/Invoice reponse use cases/T111-uc002b-In process but postponed.xml index 160856bd..55facbfc 100644 --- a/rules/examples/Invoice reponse use cases/T111-uc002b-In process but postponed.xml +++ b/rules/examples/Invoice reponse use cases/T111-uc002b-In process but postponed.xml @@ -30,7 +30,7 @@ - IP + IP 2017-12-15 Shipment has not yet been received. Invoice processing will be attempted later. @@ -38,7 +38,7 @@ inv021 - 380 + 380 diff --git a/rules/examples/Invoice reponse use cases/T111-uc003-Invoice is accepted.xml b/rules/examples/Invoice reponse use cases/T111-uc003-Invoice is accepted.xml index f9dff4cc..07423ebe 100644 --- a/rules/examples/Invoice reponse use cases/T111-uc003-Invoice is accepted.xml +++ b/rules/examples/Invoice reponse use cases/T111-uc003-Invoice is accepted.xml @@ -30,11 +30,11 @@ - AP + AP inv021 - 380 + 380 \ No newline at end of file diff --git a/rules/examples/Invoice reponse use cases/T111-uc004a-Invoice is rejected.xml b/rules/examples/Invoice reponse use cases/T111-uc004a-Invoice is rejected.xml index bc5892aa..043ccb6e 100644 --- a/rules/examples/Invoice reponse use cases/T111-uc004a-Invoice is rejected.xml +++ b/rules/examples/Invoice reponse use cases/T111-uc004a-Invoice is rejected.xml @@ -30,7 +30,7 @@ - RE + RE REF A textual explanation for why the invoice is being rejected. E.g. PO reference is missing. @@ -38,7 +38,7 @@ inv021 - 380 + 380 diff --git a/rules/examples/Invoice reponse use cases/T111-uc004b-Rejected requesting reissue.xml b/rules/examples/Invoice reponse use cases/T111-uc004b-Rejected requesting reissue.xml index 08bf8552..6137ec1b 100644 --- a/rules/examples/Invoice reponse use cases/T111-uc004b-Rejected requesting reissue.xml +++ b/rules/examples/Invoice reponse use cases/T111-uc004b-Rejected requesting reissue.xml @@ -30,7 +30,7 @@ - RE + RE REF @@ -40,7 +40,7 @@ inv021 - 380 + 380 diff --git a/rules/examples/Invoice reponse use cases/T111-uc004c-Rejected requesting replacement.xml b/rules/examples/Invoice reponse use cases/T111-uc004c-Rejected requesting replacement.xml index 447b065a..796e0e15 100644 --- a/rules/examples/Invoice reponse use cases/T111-uc004c-Rejected requesting replacement.xml +++ b/rules/examples/Invoice reponse use cases/T111-uc004c-Rejected requesting replacement.xml @@ -30,7 +30,7 @@ - RE + RE REF @@ -43,7 +43,7 @@ inv021 - 380 + 380 diff --git a/rules/examples/Invoice reponse use cases/T111-uc005-Invoice is conditionally accepted.xml b/rules/examples/Invoice reponse use cases/T111-uc005-Invoice is conditionally accepted.xml index d5b4a1a7..4f74e616 100644 --- a/rules/examples/Invoice reponse use cases/T111-uc005-Invoice is conditionally accepted.xml +++ b/rules/examples/Invoice reponse use cases/T111-uc005-Invoice is conditionally accepted.xml @@ -32,7 +32,7 @@ - CA + CA PAY @@ -43,7 +43,7 @@ inv021 - 380 + 380 diff --git a/rules/examples/Invoice reponse use cases/T111-uc006a-Under query missing information.xml b/rules/examples/Invoice reponse use cases/T111-uc006a-Under query missing information.xml index 6d616180..25e79a89 100644 --- a/rules/examples/Invoice reponse use cases/T111-uc006a-Under query missing information.xml +++ b/rules/examples/Invoice reponse use cases/T111-uc006a-Under query missing information.xml @@ -32,7 +32,7 @@ - UQ + UQ 2017-12-02 REF @@ -47,7 +47,7 @@ inv021 - 380 + 380 diff --git a/rules/examples/Invoice reponse use cases/T111-uc006b-Missing PO.xml b/rules/examples/Invoice reponse use cases/T111-uc006b-Missing PO.xml index 6d616180..25e79a89 100644 --- a/rules/examples/Invoice reponse use cases/T111-uc006b-Missing PO.xml +++ b/rules/examples/Invoice reponse use cases/T111-uc006b-Missing PO.xml @@ -32,7 +32,7 @@ - UQ + UQ 2017-12-02 REF @@ -47,7 +47,7 @@ inv021 - 380 + 380 diff --git a/rules/examples/Invoice reponse use cases/T111-uc006c-Wrong detail partial credit.xml b/rules/examples/Invoice reponse use cases/T111-uc006c-Wrong detail partial credit.xml index 09113fe5..57876f0c 100644 --- a/rules/examples/Invoice reponse use cases/T111-uc006c-Wrong detail partial credit.xml +++ b/rules/examples/Invoice reponse use cases/T111-uc006c-Wrong detail partial credit.xml @@ -32,7 +32,7 @@ - UQ + UQ DEL Delivered quantity for line number 1 was 2 units but invoiced quantity is 5 units. Send credit note for 3 unit. @@ -43,7 +43,7 @@ inv021 - 380 + 380 diff --git a/rules/examples/Invoice reponse use cases/T111-uc007-Payment has been initiated.xml b/rules/examples/Invoice reponse use cases/T111-uc007-Payment has been initiated.xml index a2217f19..4118693f 100644 --- a/rules/examples/Invoice reponse use cases/T111-uc007-Payment has been initiated.xml +++ b/rules/examples/Invoice reponse use cases/T111-uc007-Payment has been initiated.xml @@ -32,16 +32,12 @@ - PD + PD 2017-12-30 inv021 - 380 - - - PaymentReference - 481 + 380 diff --git a/rules/examples/Invoice reponse use cases/T111-uc008-Invoice is accepted by third party.xml b/rules/examples/Invoice reponse use cases/T111-uc008-Invoice is accepted by third party.xml index 1a9d9d67..69ec5216 100644 --- a/rules/examples/Invoice reponse use cases/T111-uc008-Invoice is accepted by third party.xml +++ b/rules/examples/Invoice reponse use cases/T111-uc008-Invoice is accepted by third party.xml @@ -32,11 +32,11 @@ - AP + AP inv021 - 380 + 380 From 799d74e9b234f9e0364917fe0c0190869c72a59a Mon Sep 17 00:00:00 2001 From: Martin Forsberg Date: Fri, 22 Sep 2023 12:22:11 +0200 Subject: [PATCH 3/7] Fixed typo where it said semantic datatype boolean is of primitive data type string --- guides/release-notes/v3.0.12.adoc | 2 ++ guides/shared/datatypes/boolean.adoc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/guides/release-notes/v3.0.12.adoc b/guides/release-notes/v3.0.12.adoc index a6adb05e..de214242 100644 --- a/guides/release-notes/v3.0.12.adoc +++ b/guides/release-notes/v3.0.12.adoc @@ -4,6 +4,8 @@ Release date:: 2023-11-01 == BIS documentation +* Fixed an error in the documentation of semantic datatypes. It previously stated that a Boolean is based on the primitive datatype String, this has been corrected to Boolean. This fix is purely editoriol. + == Changes to syntax * Order transaction (T01) diff --git a/guides/shared/datatypes/boolean.adoc b/guides/shared/datatypes/boolean.adoc index 1d0a2e53..5aee81e4 100644 --- a/guides/shared/datatypes/boolean.adoc +++ b/guides/shared/datatypes/boolean.adoc @@ -14,6 +14,6 @@ Boolean indicators are used to specify the two allowed values, _true_ or _false_ |Content |Mandatory -|String +|Boolean |true |=== From 8639fd6e4a551a7e00b97bf2dbfc917db2a4ce46 Mon Sep 17 00:00:00 2001 From: Martin Forsberg Date: Fri, 22 Sep 2023 12:44:38 +0200 Subject: [PATCH 4/7] Added a business term name for each order type code and changed the term name of the OrderTypeCode. --- guides/release-notes/v3.0.12.adoc | 2 ++ structure/syntax/ubl-order.xml | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/guides/release-notes/v3.0.12.adoc b/guides/release-notes/v3.0.12.adoc index de214242..47b24c91 100644 --- a/guides/release-notes/v3.0.12.adoc +++ b/guides/release-notes/v3.0.12.adoc @@ -9,6 +9,8 @@ Release date:: 2023-11-01 == Changes to syntax * Order transaction (T01) +** Added business terms for all Order Type Codes. Renamed the element cbc:OrderTypeCode from "Consignment Order" to "Order Type" to avoid confusion, as Consignment Order is just one of several types. This change is purely editorial. + * Order Response transaction (T76) diff --git a/structure/syntax/ubl-order.xml b/structure/syntax/ubl-order.xml index 7b6c792c..ead18ca4 100644 --- a/structure/syntax/ubl-order.xml +++ b/structure/syntax/ubl-order.xml @@ -63,10 +63,9 @@ cbc:OrderTypeCode - Consignment order indication - Indicates wether the order is a purchase order or consignement order. - Default is purchase order. - tir01-153 + Order type + Indicates wether the order is a Purchase order (tir01-153), Consignement order (tir01-p050), Blanket order (tir01-p051) or Call of order (tir01-p052). Default is purchase order. See section Order Type in BIS-documentation for handling of order types. + tir01-153, tir01-p050, tir01-p051, tir01-p052 UNCL1001_T01 220 From e0f4b362a46040e2599703e541f5b3c58885ae44 Mon Sep 17 00:00:00 2001 From: Georg Date: Fri, 22 Sep 2023 15:41:53 +0000 Subject: [PATCH 5/7] Added Order type codes POACC-486 --- guides/release-notes/v3.0.12.adoc | 2 ++ .../01-order/description/order-type.adoc | 12 ++++++++++++ structure/codelist/UNCL1001_T01.xml | 15 +++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/guides/release-notes/v3.0.12.adoc b/guides/release-notes/v3.0.12.adoc index 47b24c91..1863afd7 100644 --- a/guides/release-notes/v3.0.12.adoc +++ b/guides/release-notes/v3.0.12.adoc @@ -16,5 +16,7 @@ Release date:: 2023-11-01 == Changes to code lists and validation artefacts +* Added Order type codes 105 (Purchase order) and 402 "Intermediate handling cross docking order" as synonyms for 220 (Order) + == Other diff --git a/guides/transactions/01-order/description/order-type.adoc b/guides/transactions/01-order/description/order-type.adoc index 3c6bbd04..0a92e894 100644 --- a/guides/transactions/01-order/description/order-type.adoc +++ b/guides/transactions/01-order/description/order-type.adoc @@ -27,6 +27,12 @@ h| Source codelist | | Order +| 105 +| Purchase Order +| Document/message issued within an enterprise to initiate the purchase of articles, materials or services required for the production or manufacture of goods to be offered for sale or otherwise supplied to customers. +| 220 +| Order + | 221 | Blanket order | Usage of document/message for general order purposes with later split into quantities and delivery dates and maybe delivery locations. @@ -45,4 +51,10 @@ h| Source codelist | 220 | Order +| 402 +| Intermediate handling cross docking order +| An order requesting the supply of products which will be moved across a dock, de-consolidated and re-consolidated according to the final delivery location requirements. +| 220 +| Order + |=== diff --git a/structure/codelist/UNCL1001_T01.xml b/structure/codelist/UNCL1001_T01.xml index a1130abb..3e6fdfca 100644 --- a/structure/codelist/UNCL1001_T01.xml +++ b/structure/codelist/UNCL1001_T01.xml @@ -7,6 +7,13 @@ UN/CEFACT openPEPPOL + + 105 + Purchase Order + Document/message issued within an enterprise to initiate the purchase of articles, materials or services required for the production or manufacture of goods to be offered for sale or otherwise supplied to customers. + + + 220 Order @@ -37,5 +44,13 @@ Order to deliver goods into stock with agreement on payment when goods are sold out of this stock. + + + 402 + Intermediate handling cross docking order + An order requesting the supply of products which will be moved across a dock, de-consolidated and re-consolidated according to the final delivery location requirements. + + + \ No newline at end of file From 3b8fd57e94a5e8dae607e8a116791741b8b425be Mon Sep 17 00:00:00 2001 From: Martin Forsberg Date: Thu, 28 Sep 2023 16:53:29 +0200 Subject: [PATCH 6/7] added "code" to order type --- structure/syntax/ubl-order.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/structure/syntax/ubl-order.xml b/structure/syntax/ubl-order.xml index ead18ca4..1d2635d4 100644 --- a/structure/syntax/ubl-order.xml +++ b/structure/syntax/ubl-order.xml @@ -63,8 +63,8 @@ cbc:OrderTypeCode - Order type - Indicates wether the order is a Purchase order (tir01-153), Consignement order (tir01-p050), Blanket order (tir01-p051) or Call of order (tir01-p052). Default is purchase order. See section Order Type in BIS-documentation for handling of order types. + Order type code + Indicates wether the order is a Purchase order (tir01-153), Consignement order (tir01-p050), Blanket order (tir01-p051) or Call of order (tir01-p052). Default is purchase order. See section Order Type Code in BIS-documentation for handling of order types. tir01-153, tir01-p050, tir01-p051, tir01-p052 UNCL1001_T01 220 From ffea209f396994f6a32e72a6b638f255394a3930 Mon Sep 17 00:00:00 2001 From: oscarglanzmann Date: Tue, 3 Oct 2023 15:48:25 +0200 Subject: [PATCH 7/7] Corrected release note for POACC-554 --- guides/release-notes/v3.0.12.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/guides/release-notes/v3.0.12.adoc b/guides/release-notes/v3.0.12.adoc index 1863afd7..acdef337 100644 --- a/guides/release-notes/v3.0.12.adoc +++ b/guides/release-notes/v3.0.12.adoc @@ -18,5 +18,6 @@ Release date:: 2023-11-01 * Added Order type codes 105 (Purchase order) and 402 "Intermediate handling cross docking order" as synonyms for 220 (Order) +* Example file cleanup: Removed listId from and ResponseCode> in example files for Invoice Response. Deleted reference to payment in example file 7 in Invoice Response Examples == Other