Merge branch '2020-Spring' of https://github.com/OpenPEPPOL/poacc-upg…

…rade-3 into 2020-Spring
OpenPEPPOL · Apr 21, 2020 · c04a02c · c04a02c
2 parents ddb631a + fbf228f
commit c04a02c
Show file tree

Hide file tree

Showing 12 changed files with 110 additions and 80 deletions.
diff --git a/rules/sch/parts/PEPPOL-M-T01.sch b/rules/sch/parts/PEPPOL-M-T01.sch
@@ -13,9 +13,9 @@
                         flag="fatal">An order transaction SHALL use profile order only or ordering.</assert>
         </rule>
 
-		<rule>
+		<rule context="cbc:CustomizationID">
 				<assert id="PEPPOL-T01-R034" 
-						test="starts-with(normalize-space(cbc:CustomizationID/text()), 'urn:fdc:peppol.eu:poacc:trns:order:3')" 
+						test="starts-with(normalize-space(.), 'urn:fdc:peppol.eu:poacc:trns:order:3')"
 						flag="fatal">Specification identifier SHALL start with the value 'urn:fdc:peppol.eu:poacc:trns:order:3'.</assert>
 		</rule>
 

diff --git a/rules/sch/parts/PEPPOL-M-T110.sch b/rules/sch/parts/PEPPOL-M-T110.sch
@@ -7,9 +7,9 @@
 	<let name="taxCategories" value="for $cat in /ubl:OrderResponse/cac:TaxTotal/cac:TaxSubtotal/cac:TaxCategory return normalize-space($cat/cbc:ID)"/>		
 	<let name="documentCurrencyCode" value="/ubl:OrderResponse/cbc:DocumentCurrencyCode"/>
 
-	<rule>
+	<rule context="cbc:CustomizationID">
 			<assert id="PEPPOL-T110-R030" 
-					test="starts-with(normalize-space(cbc:CustomizationID/text()), 'urn:fdc:peppol.eu:poacc:trns:order_agreement:3')" 
+					test="starts-with(normalize-space(.), 'urn:fdc:peppol.eu:poacc:trns:order_agreement:3')"
 					flag="fatal">Specification identifier SHALL start with the value 'urn:fdc:peppol.eu:poacc:trns:order_agreement:3'.</assert>
 	</rule>
 

diff --git a/rules/sch/parts/PEPPOL-M-T111.sch b/rules/sch/parts/PEPPOL-M-T111.sch
@@ -13,9 +13,9 @@
 				flag="warning">If Clarification code is OTH then Clarification reason SHOULD be provided.</assert>
 	</rule>
 
-	<rule>
+	<rule context="cbc:CustomizationID">
 		<assert id="PEPPOL-T111-R003" 
-				test="starts-with(normalize-space(cbc:CustomizationID/text()), 'urn:fdc:peppol.eu:poacc:trns:invoice_response:3')" 
+				test="starts-with(normalize-space(.), 'urn:fdc:peppol.eu:poacc:trns:invoice_response:3')"
 				flag="fatal">Specification identifier SHALL start with the value 'urn:fdc:peppol.eu:poacc:trns:invoice_response:3'.</assert>
 	</rule>
 

diff --git a/rules/sch/parts/PEPPOL-M-T16.sch b/rules/sch/parts/PEPPOL-M-T16.sch
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>    
 <pattern xmlns="http://purl.oclc.org/dsdl/schematron">
 
-	<rule>
+	<rule context="cbc:CustomizationID">
 			<assert id="PEPPOL-T16-R011" 
-					test="starts-with(normalize-space(cbc:CustomizationID/text()), 'urn:fdc:peppol.eu:poacc:trns:despatch_advice:3')" 
+					test="starts-with(normalize-space(.), 'urn:fdc:peppol.eu:poacc:trns:despatch_advice:3')"
 					flag="fatal">Specification identifier SHALL start with the value 'urn:fdc:peppol.eu:poacc:trns:despatch_advice:3'.</assert>
 	</rule>
 

diff --git a/rules/sch/parts/PEPPOL-M-T19.sch b/rules/sch/parts/PEPPOL-M-T19.sch
@@ -12,9 +12,9 @@
             flag="fatal">An order transaction SHALL use profile catalogue only or catalogue without response.</assert>
     </rule>
 
-	<rule>
+	<rule context="cbc:CustomizationID">
 			<assert id="PEPPOL-T19-R018" 
-					test="starts-with(normalize-space(cbc:CustomizationID/text()), 'urn:fdc:peppol.eu:poacc:trns:catalogue:3')" 
+					test="starts-with(normalize-space(.), 'urn:fdc:peppol.eu:poacc:trns:catalogue:3')"
 					flag="fatal">Specification identifier SHALL start with the value 'urn:fdc:peppol.eu:poacc:trns:catalogue:3'.</assert>
 	</rule>    
 

diff --git a/rules/sch/parts/PEPPOL-M-T58.sch b/rules/sch/parts/PEPPOL-M-T58.sch
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pattern xmlns="http://purl.oclc.org/dsdl/schematron">
 
-	<rule>
+	<rule context="cbc:CustomizationID">
 		<assert id="PEPPOL-T58-R001" 
-				test="starts-with(normalize-space(cbc:CustomizationID/text()), 'urn:fdc:peppol.eu:poacc:trns:catalogue_response:3')" 
+				test="starts-with(normalize-space(.), 'urn:fdc:peppol.eu:poacc:trns:catalogue_response:3')"
 				flag="fatal">Specification identifier SHALL start with the value 'urn:fdc:peppol.eu:poacc:trns:catalogue_response:3'.</assert>
 	</rule>
 

diff --git a/rules/sch/parts/PEPPOL-M-T71.sch b/rules/sch/parts/PEPPOL-M-T71.sch
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pattern xmlns="http://purl.oclc.org/dsdl/schematron">
 
-	<rule>
+	<rule context="cbc:CustomizationID">
 		<assert id="PEPPOL-T71-R001" 
-				test="starts-with(normalize-space(cbc:CustomizationID/text()), 'urn:fdc:peppol.eu:poacc:trns:mlr:3')" 
+				test="starts-with(normalize-space(.), 'urn:fdc:peppol.eu:poacc:trns:mlr:3')"
 				flag="fatal">Specification identifier SHALL start with the value 'urn:fdc:peppol.eu:poacc:trns:mlr:3'.</assert>
 	</rule>
 

diff --git a/rules/sch/parts/PEPPOL-M-T76.sch b/rules/sch/parts/PEPPOL-M-T76.sch
@@ -4,9 +4,9 @@
     <let name="documentCurrencyCode" value="/ubl:OrderResponse/cbc:DocumentCurrencyCode"/>
 
     <!-- CustomzationID -->
-	<rule>
+	<rule context="cbc:CustomizationID">
 			<assert id="PEPPOL-T76-R006" 
-					test="starts-with(normalize-space(cbc:CustomizationID/text()), 'urn:fdc:peppol.eu:poacc:trns:order_response:3')" 
+					test="starts-with(normalize-space(.), 'urn:fdc:peppol.eu:poacc:trns:order_response:3')"
 					flag="fatal">Specification identifier SHALL start with the value 'urn:fdc:peppol.eu:poacc:trns:order_response:3'.</assert>
 	</rule>
 

diff --git a/rules/sch/parts/PEPPOL-M-T77.sch b/rules/sch/parts/PEPPOL-M-T77.sch
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>	
 <pattern xmlns="http://purl.oclc.org/dsdl/schematron">
 
-	<rule>
+	<rule context="cbc:CustomizationID">
 			<assert id="PEPPOL-T77-R010" 
-					test="starts-with(normalize-space(cbc:CustomizationID/text()), 'urn:fdc:peppol.eu:poacc:trns:punch_out:3')" 
+					test="starts-with(normalize-space(.), 'urn:fdc:peppol.eu:poacc:trns:punch_out:3')"
 					flag="fatal">Specification identifier SHALL start with the value 'urn:fdc:peppol.eu:poacc:trns:punch_out:3'.</assert>
 	</rule>
 

diff --git a/rules/unit-catalogue/PEPPOL-T19-R011.xml b/rules/unit-catalogue/PEPPOL-T19-R011.xml
@@ -200,7 +200,7 @@
 		</Catalogue>
 	</test>
 
-		<test id="7">
+		<test id="8">
 		<assert>
 			<error>PEPPOL-T19-R011</error>
 		</assert>

diff --git a/rules/unit-common/PEPPOL-COMMON-R040.xml b/rules/unit-common/PEPPOL-COMMON-R040.xml
@@ -21,7 +21,7 @@
 	</test>
 	<test id="2">
 		<assert>
-			<error>PEPPOL-COMMON-R040</error>
+			<warning>PEPPOL-COMMON-R040</warning>
 		</assert>
 		<Order 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-agreement/PEPPOL-T110-R026.xml b/rules/unit-order-agreement/PEPPOL-T110-R026.xml
@@ -66,16 +66,15 @@
 
 		</OrderResponse>
 	</test>
-	<test id="7">
+
+	<test id="3">
 		<assert>
-			<success>PEPPOL-T110-R026</success>
+			<error>PEPPOL-T110-R026</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"
 			xmlns="urn:oasis:names:specification:ubl:schema:xsd:OrderResponse-2">
 
-<!-- Allow for situations where no tax total (Jira POACC-302)
-
 			<cac:TaxTotal>
 				<cac:TaxSubtotal>
 					<cac:TaxCategory>
@@ -84,31 +83,28 @@
 					</cac:TaxCategory>
 				</cac:TaxSubtotal>
 			</cac:TaxTotal>
--->
+
 			<cac:OrderLine>
 				<cac:LineItem>
 				<cac:Item>
 					<cac:ClassifiedTaxCategory>
 						<cbc:ID>S</cbc:ID>
-						<cbc:Percent>25.00</cbc:Percent>
+						<cbc:Percent>24.99</cbc:Percent>
 					</cac:ClassifiedTaxCategory>
 				</cac:Item>
 				</cac:LineItem>
 			</cac:OrderLine>
 
 		</OrderResponse>
-	</test>	
-	<test id="8">
+	</test>
+	<test id="4">
 		<assert>
-
 			<success>PEPPOL-T110-R026</success>
 		</assert>
 		<OrderResponse xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
 			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
 			xmlns="urn:oasis:names:specification:ubl:schema:xsd:OrderResponse-2">
 
-<!-- Allow for situations where no tax total (Jira POACC-302)
-
 			<cac:TaxTotal>
 				<cac:TaxSubtotal>
 					<cac:TaxCategory>
@@ -117,24 +113,19 @@
 					</cac:TaxCategory>
 				</cac:TaxSubtotal>
 			</cac:TaxTotal>
--->
 
-			<cac:OrderLine>
-				<cac:LineItem>
-				<cac:Item>
-					<cac:ClassifiedTaxCategory>
-						<cbc:ID>S</cbc:ID>
-						<cbc:Percent>25</cbc:Percent>
-					</cac:ClassifiedTaxCategory>
-				</cac:Item>
-				</cac:LineItem>
-			</cac:OrderLine>
+			<cac:AllowanceCharge>
+				<cac:TaxCategory>
+					<cbc:ID>S</cbc:ID>
+					<cbc:Percent>25</cbc:Percent>
+				</cac:TaxCategory>
+			</cac:AllowanceCharge>
 
 		</OrderResponse>
-	</test>	
-	<test id="3">
+	</test>
+	<test id="5">
 		<assert>
-			<error>PEPPOL-T110-R026</error>
+			<success>PEPPOL-T110-R026</success>
 		</assert>
 		<OrderResponse xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
 			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
@@ -149,22 +140,18 @@
 				</cac:TaxSubtotal>
 			</cac:TaxTotal>
 
-			<cac:OrderLine>
-				<cac:LineItem>
-				<cac:Item>
-					<cac:ClassifiedTaxCategory>
-						<cbc:ID>S</cbc:ID>
-						<cbc:Percent>24.99</cbc:Percent>
-					</cac:ClassifiedTaxCategory>
-				</cac:Item>
-				</cac:LineItem>
-			</cac:OrderLine>
+			<cac:AllowanceCharge>
+				<cac:TaxCategory>
+					<cbc:ID>S</cbc:ID>
+					<cbc:Percent>25.00</cbc:Percent>
+				</cac:TaxCategory>
+			</cac:AllowanceCharge>
 
 		</OrderResponse>
 	</test>
-	<test id="4">
+	<test id="6">
 		<assert>
-			<success>PEPPOL-T110-R026</success>
+			<error>PEPPOL-T110-R026</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"
@@ -182,39 +169,78 @@
 			<cac:AllowanceCharge>
 				<cac:TaxCategory>
 					<cbc:ID>S</cbc:ID>
-					<cbc:Percent>25</cbc:Percent>
+					<cbc:Percent>24.99</cbc:Percent>
 				</cac:TaxCategory>
 			</cac:AllowanceCharge>
 
 		</OrderResponse>
 	</test>
-	<test id="5">
+
+	<test id="7">
 		<assert>
 			<success>PEPPOL-T110-R026</success>
 		</assert>
 		<OrderResponse xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
 			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
 			xmlns="urn:oasis:names:specification:ubl:schema:xsd:OrderResponse-2">
 
-			<cac:TaxTotal>
-				<cac:TaxSubtotal>
-					<cac:TaxCategory>
-						<cbc:ID>S</cbc:ID>
-						<cbc:Percent>25</cbc:Percent>
-					</cac:TaxCategory>
-				</cac:TaxSubtotal>
-			</cac:TaxTotal>
+			<!-- Allow for situations where no tax total (Jira POACC-302)
 
-			<cac:AllowanceCharge>
-				<cac:TaxCategory>
-					<cbc:ID>S</cbc:ID>
-					<cbc:Percent>25.00</cbc:Percent>
-				</cac:TaxCategory>
-			</cac:AllowanceCharge>
+            <cac:TaxTotal>
+              <cac:TaxSubtotal>
+                <cac:TaxCategory>
+                  <cbc:ID>S</cbc:ID>
+                  <cbc:Percent>25</cbc:Percent>
+                </cac:TaxCategory>
+              </cac:TaxSubtotal>
+            </cac:TaxTotal>
+      -->
+			<cac:OrderLine>
+				<cac:LineItem>
+					<cac:Item>
+						<cac:ClassifiedTaxCategory>
+							<cbc:ID>S</cbc:ID>
+							<cbc:Percent>25.00</cbc:Percent>
+						</cac:ClassifiedTaxCategory>
+					</cac:Item>
+				</cac:LineItem>
+			</cac:OrderLine>
 
 		</OrderResponse>
 	</test>
-	<test id="6">
+
+	<test id="8">
+		<assert>
+			<success>PEPPOL-T110-R026</success>
+		</assert>
+		<OrderResponse xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:OrderResponse-2">
+
+            <cac:TaxTotal>
+              <cac:TaxSubtotal>
+                <cac:TaxCategory>
+                  <cbc:ID>S</cbc:ID>
+                  <cbc:Percent>25</cbc:Percent>
+                </cac:TaxCategory>
+              </cac:TaxSubtotal>
+            </cac:TaxTotal>
+
+			<cac:OrderLine>
+				<cac:LineItem>
+					<cac:Item>
+						<cac:ClassifiedTaxCategory>
+							<cbc:ID>S</cbc:ID>
+							<cbc:Percent>25</cbc:Percent>
+						</cac:ClassifiedTaxCategory>
+					</cac:Item>
+				</cac:LineItem>
+			</cac:OrderLine>
+
+		</OrderResponse>
+	</test>
+
+	<test id="9">
 		<assert>
 			<error>PEPPOL-T110-R026</error>
 		</assert>
@@ -231,12 +257,16 @@
 				</cac:TaxSubtotal>
 			</cac:TaxTotal>
 
-			<cac:AllowanceCharge>
-				<cac:TaxCategory>
-					<cbc:ID>S</cbc:ID>
-					<cbc:Percent>24.99</cbc:Percent>
-				</cac:TaxCategory>
-			</cac:AllowanceCharge>
+			<cac:OrderLine>
+				<cac:LineItem>
+					<cac:Item>
+						<cac:ClassifiedTaxCategory>
+							<cbc:ID>M</cbc:ID>
+							<cbc:Percent>25</cbc:Percent>
+						</cac:ClassifiedTaxCategory>
+					</cac:Item>
+				</cac:LineItem>
+			</cac:OrderLine>
 
 		</OrderResponse>
 	</test>