Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2023 q4 dev #87

Merged
merged 12 commits into from
Oct 6, 2023
Merged

2023 q4 dev #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b23a186
added empty release notes as initial preparations for Nov release
OGlanzmann Sep 8, 2023
22174a1
Removed listId from <DocumentTypeCode> and ResponseCode> in example f…
OGlanzmann Sep 22, 2023
799d74e
Fixed typo where it said semantic datatype boolean is of primitive da…
MartinForsberg-Ecru Sep 22, 2023
90cae1e
Merge pull request #82 from OpenPEPPOL/POACC-593
MartinForsberg-Ecru Sep 22, 2023
8639fd6
Added a business term name for each order type code and changed the t…
MartinForsberg-Ecru Sep 22, 2023
70f489c
Merge pull request #84 from OpenPEPPOL/POACC-557
MartinForsberg-Ecru Sep 22, 2023
e0f4b36
Added Order type codes
midran Sep 22, 2023
ca41fef
Merge pull request #83 from OpenPEPPOL/POACC-554
jerouris Sep 28, 2023
b350465
Merge pull request #85 from OpenPEPPOL/POACC-486
jerouris Sep 28, 2023
3b8fd57
added "code" to order type
MartinForsberg-Ecru Sep 28, 2023
ea87ec8
Merge pull request #86 from OpenPEPPOL/POACC-557
MartinForsberg-Ecru Sep 28, 2023
ffea209
Corrected release note for POACC-554
OGlanzmann Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions guides/release-notes/main.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ IMPORTANT: Changes in code lists are also reflected by changes in the validation

:leveloffset: +1

include::v3.0.12.adoc[]

include::v3.0.11.adoc[]

include::v3.0.10.adoc[]
Expand Down
23 changes: 23 additions & 0 deletions guides/release-notes/v3.0.12.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
= Version 3.0.12
[horizontal]
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)

** 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)


== 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)

* Example file cleanup: Removed listId from <DocumentTypeCode> and ResponseCode> in example files for Invoice Response. Deleted reference to payment in example file 7 in Invoice Response Examples

== Other
2 changes: 1 addition & 1 deletion guides/shared/datatypes/boolean.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ Boolean indicators are used to specify the two allowed values, _true_ or _false_

|Content
|Mandatory
|String
|Boolean
|true
|===
12 changes: 12 additions & 0 deletions guides/transactions/01-order/description/order-type.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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

|===
4 changes: 2 additions & 2 deletions rules/examples/Invoice reponse use cases/T111-uc001-Invoice in process.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
</cac:ReceiverParty>
<cac:DocumentResponse>
<cac:Response>
<cbc:ResponseCode listID="UNCL4343OpSubset">IP</cbc:ResponseCode>
<cbc:ResponseCode>IP</cbc:ResponseCode>
</cac:Response>
<cac:DocumentReference>
<cbc:ID>inv021</cbc:ID>
<cbc:DocumentTypeCode listID="UNCL1001">380</cbc:DocumentTypeCode>
<cbc:DocumentTypeCode>380</cbc:DocumentTypeCode>
</cac:DocumentReference>
</cac:DocumentResponse>
</ApplicationResponse>
4 changes: 2 additions & 2 deletions rules/examples/Invoice reponse use cases/T111-uc002a-Additional reference data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</cac:ReceiverParty>
<cac:DocumentResponse>
<cac:Response>
<cbc:ResponseCode listID="UNCL4343OpSubset">IP</cbc:ResponseCode>
<cbc:ResponseCode>IP</cbc:ResponseCode>
<cbc:EffectiveDate>2017-12-01</cbc:EffectiveDate>
<cac:Status>
<cbc:StatusReasonCode listID="OPStatusAction">NOA</cbc:StatusReasonCode>
Expand All @@ -45,7 +45,7 @@
</cac:Response>
<cac:DocumentReference>
<cbc:ID>inv021</cbc:ID>
<cbc:DocumentTypeCode listID="UNCL1001">380</cbc:DocumentTypeCode>
<cbc:DocumentTypeCode>380</cbc:DocumentTypeCode>
</cac:DocumentReference>
</cac:DocumentResponse>
</ApplicationResponse>
4 changes: 2 additions & 2 deletions rules/examples/Invoice reponse use cases/T111-uc002b-In process but postponed.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
</cac:ReceiverParty>
<cac:DocumentResponse>
<cac:Response>
<cbc:ResponseCode listID="UNCL4343OpSubset">IP</cbc:ResponseCode>
<cbc:ResponseCode>IP</cbc:ResponseCode>
<cbc:EffectiveDate>2017-12-15</cbc:EffectiveDate>
<cac:Status>
<cbc:StatusReason>Shipment has not yet been received. Invoice processing will be attempted later.</cbc:StatusReason>
</cac:Status>
</cac:Response>
<cac:DocumentReference>
<cbc:ID>inv021</cbc:ID>
<cbc:DocumentTypeCode listID="UNCL1001">380</cbc:DocumentTypeCode>
<cbc:DocumentTypeCode>380</cbc:DocumentTypeCode>
</cac:DocumentReference>
</cac:DocumentResponse>
</ApplicationResponse>
4 changes: 2 additions & 2 deletions rules/examples/Invoice reponse use cases/T111-uc003-Invoice is accepted.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
</cac:ReceiverParty>
<cac:DocumentResponse>
<cac:Response>
<cbc:ResponseCode listID="UNCL4343OpSubset">AP</cbc:ResponseCode>
<cbc:ResponseCode>AP</cbc:ResponseCode>
</cac:Response>
<cac:DocumentReference>
<cbc:ID>inv021</cbc:ID>
<cbc:DocumentTypeCode listID="UNCL1001">380</cbc:DocumentTypeCode>
<cbc:DocumentTypeCode>380</cbc:DocumentTypeCode>
</cac:DocumentReference>
</cac:DocumentResponse>
</ApplicationResponse>
4 changes: 2 additions & 2 deletions rules/examples/Invoice reponse use cases/T111-uc004a-Invoice is rejected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
</cac:ReceiverParty>
<cac:DocumentResponse>
<cac:Response>
<cbc:ResponseCode listID="UNCL4343OpSubset">RE</cbc:ResponseCode>
<cbc:ResponseCode>RE</cbc:ResponseCode>
<cac:Status>
<cbc:StatusReasonCode listID="OPStatusReason">REF</cbc:StatusReasonCode>
<cbc:StatusReason>A textual explanation for why the invoice is being rejected. E.g. PO reference is missing.</cbc:StatusReason>
</cac:Status>
</cac:Response>
<cac:DocumentReference>
<cbc:ID>inv021</cbc:ID>
<cbc:DocumentTypeCode listID="UNCL1001">380</cbc:DocumentTypeCode>
<cbc:DocumentTypeCode>380</cbc:DocumentTypeCode>
</cac:DocumentReference>
</cac:DocumentResponse>
</ApplicationResponse>
4 changes: 2 additions & 2 deletions rules/examples/Invoice reponse use cases/T111-uc004b-Rejected requesting reissue.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</cac:ReceiverParty>
<cac:DocumentResponse>
<cac:Response>
<cbc:ResponseCode listID="UNCL4343OpSubset">RE</cbc:ResponseCode>
<cbc:ResponseCode>RE</cbc:ResponseCode>
<cac:Status>
<cbc:StatusReasonCode listID="OPStatusReason">REF</cbc:StatusReasonCode>
</cac:Status>
Expand All @@ -40,7 +40,7 @@
</cac:Response>
<cac:DocumentReference>
<cbc:ID>inv021</cbc:ID>
<cbc:DocumentTypeCode listID="UNCL1001">380</cbc:DocumentTypeCode>
<cbc:DocumentTypeCode>380</cbc:DocumentTypeCode>
</cac:DocumentReference>
</cac:DocumentResponse>
</ApplicationResponse>
4 changes: 2 additions & 2 deletions rules/examples/Invoice reponse use cases/T111-uc004c-Rejected requesting replacement.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</cac:ReceiverParty>
<cac:DocumentResponse>
<cac:Response>
<cbc:ResponseCode listID="UNCL4343OpSubset">RE</cbc:ResponseCode>
<cbc:ResponseCode>RE</cbc:ResponseCode>
<cac:Status>
<cbc:StatusReasonCode listID="OPStatusReason">REF</cbc:StatusReasonCode>
</cac:Status>
Expand All @@ -43,7 +43,7 @@
</cac:Response>
<cac:DocumentReference>
<cbc:ID>inv021</cbc:ID>
<cbc:DocumentTypeCode listID="UNCL1001">380</cbc:DocumentTypeCode>
<cbc:DocumentTypeCode>380</cbc:DocumentTypeCode>
</cac:DocumentReference>
</cac:DocumentResponse>
</ApplicationResponse>
4 changes: 2 additions & 2 deletions rules/examples/Invoice reponse use cases/T111-uc005-Invoice is conditionally accepted.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</cac:ReceiverParty>
<cac:DocumentResponse>
<cac:Response>
<cbc:ResponseCode listID="UNCL4343OpSubset">CA</cbc:ResponseCode>
<cbc:ResponseCode>CA</cbc:ResponseCode>
<cac:Status>
<cbc:StatusReasonCode listID="OPStatusReason">PAY</cbc:StatusReasonCode>
<cac:Condition>
Expand All @@ -43,7 +43,7 @@
</cac:Response>
<cac:DocumentReference>
<cbc:ID>inv021</cbc:ID>
<cbc:DocumentTypeCode listID="UNCL1001">380</cbc:DocumentTypeCode>
<cbc:DocumentTypeCode>380</cbc:DocumentTypeCode>
</cac:DocumentReference>
</cac:DocumentResponse>
</ApplicationResponse>
4 changes: 2 additions & 2 deletions rules/examples/Invoice reponse use cases/T111-uc006a-Under query missing information.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</cac:ReceiverParty>
<cac:DocumentResponse>
<cac:Response>
<cbc:ResponseCode listID="UNCL4343OpSubset">UQ</cbc:ResponseCode>
<cbc:ResponseCode>UQ</cbc:ResponseCode>
<cbc:EffectiveDate>2017-12-02</cbc:EffectiveDate>
<cac:Status>
<cbc:StatusReasonCode listID="OPStatusReason">REF</cbc:StatusReasonCode>
Expand All @@ -47,7 +47,7 @@
</cac:Response>
<cac:DocumentReference>
<cbc:ID>inv021</cbc:ID>
<cbc:DocumentTypeCode listID="UNCL1001">380</cbc:DocumentTypeCode>
<cbc:DocumentTypeCode>380</cbc:DocumentTypeCode>
</cac:DocumentReference>
</cac:DocumentResponse>
</ApplicationResponse>
4 changes: 2 additions & 2 deletions rules/examples/Invoice reponse use cases/T111-uc006b-Missing PO.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</cac:ReceiverParty>
<cac:DocumentResponse>
<cac:Response>
<cbc:ResponseCode listID="UNCL4343OpSubset">UQ</cbc:ResponseCode>
<cbc:ResponseCode>UQ</cbc:ResponseCode>
<cbc:EffectiveDate>2017-12-02</cbc:EffectiveDate>
<cac:Status>
<cbc:StatusReasonCode listID="OPStatusReason">REF</cbc:StatusReasonCode>
Expand All @@ -47,7 +47,7 @@
</cac:Response>
<cac:DocumentReference>
<cbc:ID>inv021</cbc:ID>
<cbc:DocumentTypeCode listID="UNCL1001">380</cbc:DocumentTypeCode>
<cbc:DocumentTypeCode>380</cbc:DocumentTypeCode>
</cac:DocumentReference>
</cac:DocumentResponse>
</ApplicationResponse>
4 changes: 2 additions & 2 deletions rules/examples/Invoice reponse use cases/T111-uc006c-Wrong detail partial credit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</cac:ReceiverParty>
<cac:DocumentResponse>
<cac:Response>
<cbc:ResponseCode listID="UNCL4343OpSubset">UQ</cbc:ResponseCode>
<cbc:ResponseCode>UQ</cbc:ResponseCode>
<cac:Status>
<cbc:StatusReasonCode listID="OPStatusReason">DEL</cbc:StatusReasonCode>
<cbc:StatusReason>Delivered quantity for line number 1 was 2 units but invoiced quantity is 5 units. Send credit note for 3 unit.</cbc:StatusReason>
Expand All @@ -43,7 +43,7 @@
</cac:Response>
<cac:DocumentReference>
<cbc:ID>inv021</cbc:ID>
<cbc:DocumentTypeCode listID="UNCL1001">380</cbc:DocumentTypeCode>
<cbc:DocumentTypeCode>380</cbc:DocumentTypeCode>
</cac:DocumentReference>
</cac:DocumentResponse>
</ApplicationResponse>
8 changes: 2 additions & 6 deletions rules/examples/Invoice reponse use cases/T111-uc007-Payment has been initiated.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,12 @@
</cac:ReceiverParty>
<cac:DocumentResponse>
<cac:Response>
<cbc:ResponseCode listID="UNCL4343OpSubset">PD</cbc:ResponseCode>
<cbc:ResponseCode>PD</cbc:ResponseCode>
<cbc:EffectiveDate>2017-12-30</cbc:EffectiveDate>
</cac:Response>
<cac:DocumentReference>
<cbc:ID>inv021</cbc:ID>
<cbc:DocumentTypeCode listID="UNCL1001">380</cbc:DocumentTypeCode>
</cac:DocumentReference>
<cac:DocumentReference>
<cbc:ID>PaymentReference</cbc:ID>
<cbc:DocumentTypeCode listID="UNCL1001">481</cbc:DocumentTypeCode>
<cbc:DocumentTypeCode>380</cbc:DocumentTypeCode>
</cac:DocumentReference>
</cac:DocumentResponse>

Expand Down
4 changes: 2 additions & 2 deletions rules/examples/Invoice reponse use cases/T111-uc008-Invoice is accepted by third party.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
</cac:ReceiverParty>
<cac:DocumentResponse>
<cac:Response>
<cbc:ResponseCode listID="UNCL4343OpSubset">AP</cbc:ResponseCode>
<cbc:ResponseCode>AP</cbc:ResponseCode>
</cac:Response>
<cac:DocumentReference>
<cbc:ID>inv021</cbc:ID>
<cbc:DocumentTypeCode listID="UNCL1001">380</cbc:DocumentTypeCode>
<cbc:DocumentTypeCode>380</cbc:DocumentTypeCode>
</cac:DocumentReference>
<cac:RecipientParty>
<cac:PartyIdentification>
Expand Down
15 changes: 15 additions & 0 deletions structure/codelist/UNCL1001_T01.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@
<Agency>UN/CEFACT</Agency>
<Subset>openPEPPOL</Subset>

<Code>
<Id>105</Id>
<Name>Purchase Order</Name>
<Description>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.
</Description>
</Code>

<Code>
<Id>220</Id>
<Name>Order</Name>
Expand Down Expand Up @@ -37,5 +44,13 @@
<Description>Order to deliver goods into stock with agreement on payment when goods are sold out of this stock.
</Description>
</Code>

<Code>
<Id>402</Id>
<Name>Intermediate handling cross docking order</Name>
<Description>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.
</Description>
</Code>


</CodeList>
7 changes: 3 additions & 4 deletions structure/syntax/ubl-order.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,9 @@
</Element>
<Element cardinality="0..1">
<Term>cbc:OrderTypeCode</Term>
<Name>Consignment order indication</Name>
<Description>Indicates wether the order is a purchase order or consignement order.
Default is purchase order.</Description>
<Reference type="BUSINESS_TERM">tir01-153</Reference>
<Name>Order type code</Name>
<Description>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.</Description>
<Reference type="BUSINESS_TERM">tir01-153, tir01-p050, tir01-p051, tir01-p052</Reference>
<Reference type="CODE_LIST">UNCL1001_T01</Reference>
<Value type="EXAMPLE">220</Value>
</Element>
Expand Down
Loading