Merge pull request #125 from OpenPEPPOL/POACC-822_2

Poacc 822 2
OpenPEPPOL · Feb 17, 2025 · a81ef39 · a81ef39
2 parents 9a27b34 + 81d7bbc
commit a81ef39
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 120 deletions.
diff --git a/guides/release-notes/v3.0.15.adoc b/guides/release-notes/v3.0.15.adoc
@@ -14,11 +14,11 @@ Release date:: May 2025
 * Order Change(T114)
 ** RELEASE NOTES
 * Order Agreement(T110) 
-** RELEASE NOTES
-* Order Response transaction (T76)
-** RELEASE NOTES
-* Order Response transaction Advanced (T116)
-** RELEASE NOTES
+** RELEASE NOTES 
+* Order Response transaction (T76) [MINOR CHANGE TO TRANSACTION VERSION NUMBER]
+** Rule PEPPOL-T76-R007 that checks that order responses with code CA (conditional changes) has lines, is changed from warning to fatal in line with previous release notes.
+* Order Response transaction Advanced (T116) [MINOR CHANGE TO TRANSACTION VERSION NUMBER]
+** Rule PEPPOL-T116-R007 that checks that order responses with code CA (conditional changes) has lines, is changed from warning to fatal in line with previous release notes.
 * Despatch Advice (T16) [MINOR CHANGE TO TRANSACTION VERSION NUMBER]
 ** New code values for net weight and net volume used for Despatch Advice (T16) line level measurement dimensions. Description of the elements updated accordingly (cbc:AttributeID and cbc:Measure).
 ** Added ProductTraceID to Despatch Advise for the implementation of UDI (Unique Device Identifier) information for Medical Devices

diff --git a/rules/examples/Advanced Ordering scenarios/advanced_ordering_sc5/OrderResponse_sc5.xml b/rules/examples/Advanced Ordering scenarios/advanced_ordering_sc5/OrderResponse_sc5.xml
@@ -36,37 +36,4 @@
       </cac:PartyLegalEntity>
     </cac:Party>
   </cac:BuyerCustomerParty>
-  <cac:OrderLine>
-    <cac:LineItem>
-      <cbc:ID>1</cbc:ID>
-      <cbc:Note>Deletion of line</cbc:Note>
-      <cbc:LineStatusCode>7</cbc:LineStatusCode>
-      <cbc:Quantity unitCode="NAR">5</cbc:Quantity>
-      <cac:Item>
-        <cbc:Name>Item 1</cbc:Name>
-        <cac:SellersItemIdentification>
-          <cbc:ID>SN-1</cbc:ID>
-        </cac:SellersItemIdentification>
-      </cac:Item>
-    </cac:LineItem>
-    <cac:OrderLineReference>
-      <cbc:LineID>1</cbc:LineID>
-    </cac:OrderLineReference>
-  </cac:OrderLine>
-  <cac:OrderLine>
-    <cac:LineItem>
-      <cbc:ID>2</cbc:ID>
-      <cbc:Note>Deletion of line</cbc:Note>
-      <cbc:LineStatusCode>7</cbc:LineStatusCode>
-      <cbc:Quantity unitCode="NAR">50</cbc:Quantity>
-      <cac:Item>
-        <cbc:Name>Item 2</cbc:Name>
-        <cac:SellersItemIdentification>
-          <cbc:ID>SN-2</cbc:ID>
-        </cac:SellersItemIdentification>
-      </cac:Item>
-    </cac:LineItem>
-    <cac:OrderLineReference>
-      <cbc:LineID>2</cbc:LineID>
-    </cac:OrderLineReference>
-  </cac:OrderLine></OrderResponse>
+  </OrderResponse>
diff --git a/rules/sch/parts/PEPPOL-M-T116.sch b/rules/sch/parts/PEPPOL-M-T116.sch
@@ -48,7 +48,7 @@
 	<rule context="cbc:OrderResponseCode">
 		<assert id="PEPPOL-T116-R007"
 			 test="(normalize-space(.) = 'CA' and count(../cac:OrderLine) > 0) or normalize-space(.) != 'CA'"
-			 flag="warning">An order response with code CA (Conditionally accepted) must provide order lines.</assert>
+			 flag="fatal">An order response with code CA (Conditionally accepted) must provide order lines.</assert>
         <assert id="PEPPOL-T116-R008"
         test="(normalize-space(.) = 'AP' and count(../cac:OrderLine) = 0) or normalize-space(.) != 'AP'"
         flag="warning">An order response with code AP (Accepted) should NOT provide order lines.</assert>

diff --git a/rules/sch/parts/PEPPOL-M-T76.sch b/rules/sch/parts/PEPPOL-M-T76.sch
@@ -49,7 +49,7 @@
 	<rule context="cbc:OrderResponseCode">
 		<assert id="PEPPOL-T76-R007"
         test="(normalize-space(.) = 'CA' and count(../cac:OrderLine) > 0) or normalize-space(.) != 'CA'"
-        flag="warning">An order response with code CA (Conditionally accepted) must provide order lines.</assert>
+        flag="fatal">An order response with code CA (Conditionally accepted) must provide order lines.</assert>
         <assert id="PEPPOL-T76-R008"
         test="(normalize-space(.) = 'AP' and count(../cac:OrderLine) = 0) or normalize-space(.) != 'AP'"
         flag="warning">An order response with code AP (Accepted) should NOT provide order lines.</assert>

diff --git a/rules/unit-order-response-advanced/PEPPOL-T116-R007.xml b/rules/unit-order-response-advanced/PEPPOL-T116-R007.xml
@@ -56,7 +56,7 @@
 
 	<test>
 		<assert>		
-			<warning>PEPPOL-T116-R007</warning>
+			<error>PEPPOL-T116-R007</error>
 		</assert>
 		<OrderResponse xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
 			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"

diff --git a/rules/unit-order-response-advanced/PEPPOL-T116-R008.xml b/rules/unit-order-response-advanced/PEPPOL-T116-R008.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testSet xmlns="http://difi.no/xsd/vefa/validator/1.0"
-	configuration="peppolbis-t76-base-3.0">
+	configuration="peppolbis-t116-base-3.0">
 	<assert>
 		<description>An order response with code AP (Accepted) should NOT provide order lines.</description>
 		<scope>PEPPOL-T116-R008</scope>

diff --git a/rules/unit-order-response-advanced/PEPPOL-T116-R009.xml b/rules/unit-order-response-advanced/PEPPOL-T116-R009.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testSet xmlns="http://difi.no/xsd/vefa/validator/1.0"
-	configuration="peppolbis-t76-base-3.0">
+	configuration="peppolbis-t116-base-3.0">
 	<assert>
 		<description>An order response with code RE (Rejected) should NOT provide order lines.</description>
 		<scope>PEPPOL-T116-R009</scope>

diff --git a/rules/unit-order-response-advanced/PEPPOL-T116-R010.xml b/rules/unit-order-response-advanced/PEPPOL-T116-R010.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testSet xmlns="http://difi.no/xsd/vefa/validator/1.0"
-	configuration="peppolbis-t76-base-3.0">
+	configuration="peppolbis-t116-base-3.0">
 	<assert>
 		<description>An order response with code AB (Acknowledged) must NOT provide order lines.</description>
 		<scope>PEPPOL-T116-R010</scope>

diff --git a/rules/unit-order-response/PEPPOL-T76-R007.xml b/rules/unit-order-response/PEPPOL-T76-R007.xml
@@ -56,7 +56,7 @@
 
 	<test>
 		<assert>		
-			<warning>PEPPOL-T76-R007</warning>
+			<error>PEPPOL-T76-R007</error>
 		</assert>
 		<OrderResponse xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
 			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"

diff --git a/rules/use-case-examples/advanced-ordering-sc5/OrderResponse_sc5.xml b/rules/use-case-examples/advanced-ordering-sc5/OrderResponse_sc5.xml
@@ -36,37 +36,4 @@
       </cac:PartyLegalEntity>
     </cac:Party>
   </cac:BuyerCustomerParty>
-  <cac:OrderLine>
-    <cac:LineItem>
-      <cbc:ID>1</cbc:ID>
-      <cbc:Note>Deletion of line</cbc:Note>
-      <cbc:LineStatusCode>7</cbc:LineStatusCode>
-      <cbc:Quantity unitCode="NAR">5</cbc:Quantity>
-      <cac:Item>
-        <cbc:Name>Item 1</cbc:Name>
-        <cac:SellersItemIdentification>
-          <cbc:ID>SN-1</cbc:ID>
-        </cac:SellersItemIdentification>
-      </cac:Item>
-    </cac:LineItem>
-    <cac:OrderLineReference>
-      <cbc:LineID>1</cbc:LineID>
-    </cac:OrderLineReference>
-  </cac:OrderLine>
-  <cac:OrderLine>
-    <cac:LineItem>
-      <cbc:ID>2</cbc:ID>
-      <cbc:Note>Deletion of line</cbc:Note>
-      <cbc:LineStatusCode>7</cbc:LineStatusCode>
-      <cbc:Quantity unitCode="NAR">50</cbc:Quantity>
-      <cac:Item>
-        <cbc:Name>Item 2</cbc:Name>
-        <cac:SellersItemIdentification>
-          <cbc:ID>SN-2</cbc:ID>
-        </cac:SellersItemIdentification>
-      </cac:Item>
-    </cac:LineItem>
-    <cac:OrderLineReference>
-      <cbc:LineID>2</cbc:LineID>
-    </cac:OrderLineReference>
-  </cac:OrderLine></OrderResponse>
+</OrderResponse>
diff --git a/rules/use-case-examples/order-response/UC2_Order_response.xml b/rules/use-case-examples/order-response/UC2_Order_response.xml
@@ -40,40 +40,5 @@
       <cbc:EndDate>2013-07-16</cbc:EndDate>
     </cac:PromisedDeliveryPeriod>
   </cac:Delivery>
-  <cac:OrderLine>
-    <cac:LineItem>
-      <cbc:ID>1</cbc:ID>
-      <cbc:LineStatusCode>5</cbc:LineStatusCode>
-	  <cac:Item>
-			<cbc:Name>Item 1, color red, size 43</cbc:Name>
-			<cac:SellersItemIdentification>
-			  <cbc:ID>4545423</cbc:ID>
-			</cac:SellersItemIdentification>
-			<cac:StandardItemIdentification>
-			  <cbc:ID schemeID="0160">05432167890984</cbc:ID>
-			</cac:StandardItemIdentification>
-		</cac:Item>
-      </cac:LineItem>
-      <cac:OrderLineReference>
-		  <cbc:LineID>1</cbc:LineID>
-      </cac:OrderLineReference>
-  </cac:OrderLine>
-  <cac:OrderLine>
-    <cac:LineItem>
-      <cbc:ID>2</cbc:ID>
-      <cbc:LineStatusCode>5</cbc:LineStatusCode>
-      <cac:Item>
-			<cbc:Name>Item 2, color yellow, size 36</cbc:Name>
-			<cac:SellersItemIdentification>
-			  <cbc:ID>64534543</cbc:ID>
-			</cac:SellersItemIdentification>
-			<cac:StandardItemIdentification>
-			  <cbc:ID schemeID="0160">05476154389097</cbc:ID>
-			</cac:StandardItemIdentification>
-		</cac:Item>
-      </cac:LineItem>
-      <cac:OrderLineReference>
-		  <cbc:LineID>2</cbc:LineID>
-      </cac:OrderLineReference>
-  </cac:OrderLine>
+
   </OrderResponse>
diff --git a/structure/syntax/ubl-order-response-advanced.xml b/structure/syntax/ubl-order-response-advanced.xml
@@ -64,12 +64,14 @@
 			<Term>cbc:OrderResponseCode</Term>
 			<Name>Response code</Name>
 			<Description>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
-                Reject there may not be any response lines.</Description>
+				or is Accepted or Rejected as whole, alternatively, Accepted with change or already delivered.</Description>
 			<DataType>Code</DataType>
 			<Reference type="BUSINESS_TERM">tir116-200</Reference>
 			<Reference type="CODE_LIST">UNCL4343-T76</Reference>
 			<Reference type="RULE">PEPPOL-T116-R007</Reference>
+			<Reference type="RULE">PEPPOL-T116-R008</Reference>
+			<Reference type="RULE">PEPPOL-T116-R009</Reference>
+			<Reference type="RULE">PEPPOL-T116-R010</Reference>			
 			<Value type="EXAMPLE">AP</Value>
 		</Element>
 		<Element cardinality="0..1">

diff --git a/structure/syntax/ubl-order-response.xml b/structure/syntax/ubl-order-response.xml
@@ -72,12 +72,14 @@
 			<Term>cbc:OrderResponseCode</Term>
 			<Name>Response code</Name>
 			<Description>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
-                Reject there may not be any response lines.</Description>
+				or is Accepted or Rejected as whole, alternatively, Accepted with change or already delivered.</Description>
 			<DataType>Code</DataType>
 			<Reference type="BUSINESS_TERM">tir76-200</Reference>
 			<Reference type="CODE_LIST">UNCL4343-T76</Reference>
 			<Reference type="RULE">PEPPOL-T76-R007</Reference>
+			<Reference type="RULE">PEPPOL-T76-R008</Reference>
+			<Reference type="RULE">PEPPOL-T76-R009</Reference>
+			<Reference type="RULE">PEPPOL-T76-R010</Reference>
 			<Value type="EXAMPLE">AP</Value>
 		</Element>
 		<Element cardinality="0..1">