diff --git a/guides/release-notes/v3.0.13.adoc b/guides/release-notes/v3.0.13.adoc index 1808e693..bb215bd9 100644 --- a/guides/release-notes/v3.0.13.adoc +++ b/guides/release-notes/v3.0.13.adoc @@ -17,5 +17,6 @@ Release date:: May 2024 * Update of PEPPOL-COMMON-R049 which validates identifiers using ICD/EAS 0007. The change is adding validation of the check number of a Swedish Organization number. +* Added rule to check that an OrderResponse with ResponseTypeCode CA (accepted with amendment on line level) actually has order response lines. The rule is introduced with severity warning and will be changed to severity fatal in next release. The rule is added to both T76 (Order Responseand) and T116 (Order Response Advanced). == Other diff --git a/rules/sch/PEPPOLBIS-T01.sch b/rules/sch/PEPPOLBIS-T01.sch index e0f0fbe3..626c145e 100644 --- a/rules/sch/PEPPOLBIS-T01.sch +++ b/rules/sch/PEPPOLBIS-T01.sch @@ -26,6 +26,8 @@ + + diff --git a/rules/sch/PEPPOLBIS-T110.sch b/rules/sch/PEPPOLBIS-T110.sch index 5a3be200..f04563c8 100644 --- a/rules/sch/PEPPOLBIS-T110.sch +++ b/rules/sch/PEPPOLBIS-T110.sch @@ -25,6 +25,7 @@ + diff --git a/rules/sch/PEPPOLBIS-T111.sch b/rules/sch/PEPPOLBIS-T111.sch index 807bfd3f..602e85fb 100644 --- a/rules/sch/PEPPOLBIS-T111.sch +++ b/rules/sch/PEPPOLBIS-T111.sch @@ -23,6 +23,7 @@ + diff --git a/rules/sch/PEPPOLBIS-T114.sch b/rules/sch/PEPPOLBIS-T114.sch index f90c8020..db394bb5 100644 --- a/rules/sch/PEPPOLBIS-T114.sch +++ b/rules/sch/PEPPOLBIS-T114.sch @@ -18,14 +18,15 @@ - - - - - - - - + + + + + + + + + diff --git a/rules/sch/PEPPOLBIS-T115.sch b/rules/sch/PEPPOLBIS-T115.sch index e9ae9c58..db8e6394 100644 --- a/rules/sch/PEPPOLBIS-T115.sch +++ b/rules/sch/PEPPOLBIS-T115.sch @@ -19,14 +19,15 @@ - - - - - - - - + + + + + + + + + diff --git a/rules/sch/PEPPOLBIS-T116.sch b/rules/sch/PEPPOLBIS-T116.sch index 9594a5a6..cc0e9f7e 100644 --- a/rules/sch/PEPPOLBIS-T116.sch +++ b/rules/sch/PEPPOLBIS-T116.sch @@ -25,6 +25,7 @@ + diff --git a/rules/sch/PEPPOLBIS-T16.sch b/rules/sch/PEPPOLBIS-T16.sch index e179f3fd..a4f91ec1 100644 --- a/rules/sch/PEPPOLBIS-T16.sch +++ b/rules/sch/PEPPOLBIS-T16.sch @@ -23,6 +23,7 @@ + diff --git a/rules/sch/PEPPOLBIS-T19.sch b/rules/sch/PEPPOLBIS-T19.sch index 449f6ea3..8aac324d 100644 --- a/rules/sch/PEPPOLBIS-T19.sch +++ b/rules/sch/PEPPOLBIS-T19.sch @@ -24,6 +24,7 @@ + diff --git a/rules/sch/PEPPOLBIS-T58.sch b/rules/sch/PEPPOLBIS-T58.sch index ee5cfa03..3899ef21 100644 --- a/rules/sch/PEPPOLBIS-T58.sch +++ b/rules/sch/PEPPOLBIS-T58.sch @@ -24,6 +24,7 @@ + diff --git a/rules/sch/PEPPOLBIS-T71.sch b/rules/sch/PEPPOLBIS-T71.sch index aeb57dd5..ce066821 100644 --- a/rules/sch/PEPPOLBIS-T71.sch +++ b/rules/sch/PEPPOLBIS-T71.sch @@ -25,6 +25,7 @@ + diff --git a/rules/sch/PEPPOLBIS-T76.sch b/rules/sch/PEPPOLBIS-T76.sch index bebe7653..464b825a 100644 --- a/rules/sch/PEPPOLBIS-T76.sch +++ b/rules/sch/PEPPOLBIS-T76.sch @@ -25,6 +25,7 @@ + diff --git a/rules/sch/PEPPOLBIS-T77.sch b/rules/sch/PEPPOLBIS-T77.sch index cb4abda4..8e478bff 100644 --- a/rules/sch/PEPPOLBIS-T77.sch +++ b/rules/sch/PEPPOLBIS-T77.sch @@ -23,6 +23,7 @@ + diff --git a/rules/sch/parts/PEPPOL-M-T116.sch b/rules/sch/parts/PEPPOL-M-T116.sch index 2f880d26..a4cf279d 100644 --- a/rules/sch/parts/PEPPOL-M-T116.sch +++ b/rules/sch/parts/PEPPOL-M-T116.sch @@ -45,6 +45,13 @@ flag="fatal">Promised Delivery Period MUST only be stated on document or on line level. --> + + An order response with code CA (Conditionally accepted) must provide order lines. + + + Each order response line SHALL have a document line identifier that is unique within the order. + + An order response with code CA (Conditionally accepted) must provide order lines. + \ No newline at end of file diff --git a/rules/sch/parts/common.sch b/rules/sch/parts/common.sch index 250921f2..58506616 100644 --- a/rules/sch/parts/common.sch +++ b/rules/sch/parts/common.sch @@ -18,7 +18,7 @@ - + diff --git a/rules/sch/parts/function/checkSEOrgnr.xml b/rules/sch/parts/function/checkSEOrgnr.xml index 91af2624..e741db1e 100644 --- a/rules/sch/parts/function/checkSEOrgnr.xml +++ b/rules/sch/parts/function/checkSEOrgnr.xml @@ -1,7 +1,6 @@ - - - - + + + @@ -24,4 +23,4 @@ - + diff --git a/rules/unit-order-response-advanced/PEPPOL-T116-R007.xml b/rules/unit-order-response-advanced/PEPPOL-T116-R007.xml new file mode 100644 index 00000000..93373651 --- /dev/null +++ b/rules/unit-order-response-advanced/PEPPOL-T116-R007.xml @@ -0,0 +1,82 @@ + + + + An order response with code CA (Conditionally accepted) must provide order lines. + PEPPOL-T116-R007 + + + + + + PEPPOL-T116-R007 + + + + + RE + + + + + + + + + + + PEPPOL-T116-R007 + + + + + CA + + + + + + + + + + + + + + + + PEPPOL-T116-R007 + + + + CA + + + + + + + + + + diff --git a/rules/unit-order-response/PEPPOL-T76-R007.xml b/rules/unit-order-response/PEPPOL-T76-R007.xml new file mode 100644 index 00000000..7d5c34b4 --- /dev/null +++ b/rules/unit-order-response/PEPPOL-T76-R007.xml @@ -0,0 +1,82 @@ + + + + An order response with code CA (Conditionally accepted) must provide order lines. + PEPPOL-T76-R007 + + + + + + PEPPOL-T76-R007 + + + + + RE + + + + + + + + + + + PEPPOL-T76-R007 + + + + + CA + + + + + + + + + + + + + + + + PEPPOL-T76-R007 + + + + CA + + + + + + + + + + diff --git a/structure/syntax/ubl-order-response-advanced.xml b/structure/syntax/ubl-order-response-advanced.xml index 7d957db0..aa3884f9 100644 --- a/structure/syntax/ubl-order-response-advanced.xml +++ b/structure/syntax/ubl-order-response-advanced.xml @@ -64,11 +64,12 @@ cbc:OrderResponseCode Response code A code that indicates whether the referenced order has been received and not yet processed, - or is Accepted or Rejected as whole, alternatively, Accepted with change or already delivered.If response code is Accept or + or is Accepted or Rejected as whole, alternatively, Accepted with change or already delivered. If response code is Accept or Reject there may not be any response lines. Code tir116-200 UNCL4343-T76 + PEPPOL-T116-R007 AP diff --git a/structure/syntax/ubl-order-response.xml b/structure/syntax/ubl-order-response.xml index 7391664e..65d21c3a 100644 --- a/structure/syntax/ubl-order-response.xml +++ b/structure/syntax/ubl-order-response.xml @@ -72,12 +72,12 @@ cbc:OrderResponseCode Response code A code that indicates whether the referenced order has been received and not yet processed, - or is Accepted or Rejected as whole, alternatively, Accepted with change or already delivered.If response code is Accept or + or is Accepted or Rejected as whole, alternatively, Accepted with change or already delivered. If response code is Accept or Reject there may not be any response lines. Code tir76-200 UNCL4343-T76 - + PEPPOL-T76-R007 AP