Merge branch 'qa' of https://github.com/OpenPEPPOL/logistics-bis into qa

OpenPEPPOL · Oct 24, 2023 · 07e6f39 · 07e6f39
2 parents 97404d1 + 08afe61
commit 07e6f39
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/rules/sch/parts/PEPPOL-M-T120.sch b/rules/sch/parts/PEPPOL-M-T120.sch
@@ -56,7 +56,7 @@
 	</rule>
 
 	<rule context="cac:DespatchLine/cac:Item/cac:CommodityClassification">
-		<assert id="PEPPOL-T120-R040" test="((normalize-space(cbc:ItemClassificationCode/listID) = 'ZZZ') and (cbc:ItemClassificationCode/name)) or (normalize-space(cbc:ItemClassificationCode/listID) != 'ZZZ') or not (cbc:ItemClassificationCode)" flag="warning">A name must be provided if the listID is "ZZZ".</assert>
+		<assert id="PEPPOL-T120-R040" test="((normalize-space(cbc:ItemClassificationCode/listID) = 'ZZZ') and (cbc:ItemClassificationCode/name)) or (normalize-space(cbc:ItemClassificationCode/listID) != 'ZZZ') or (not cbc:ItemClassificationCode)" flag="warning">A name must be provided if the listID is "ZZZ".</assert>
 	</rule>
 
 	<rule context="cac:AdditionalDocumentReference">

diff --git a/structure/source/ubl-advanced-despatch-advice.xml b/structure/source/ubl-advanced-despatch-advice.xml
@@ -1815,6 +1815,15 @@
 					<?unitCode-Description The unit of measure that applies to the Net Weight.?>
 					<?unitCode-usage Mandatory?>
 				</cbc:NetWeightMeasure>
+				<cbc:NetVolumeMeasure unitCode="MTQ">12.3
+					<?Name Net Volume Measure ?>
+					<?Description Net volume of the Hazardous item. ?>
+					<?Cardinality 0..1?>
+					<?unitCode-CodeList UNECERec20?>
+					<?unitCode-Name Measure unit of measure?>
+					<?unitCode-Description The unit of measure that applies to the Net Volume.?>
+					<?unitCode-usage Mandatory?>
+				</cbc:NetVolumeMeasure>
 			</cac:HazardousItem>
 
 			<cac:AdditionalItemProperty>

diff --git a/target/schematron/PEPPOLBIS-T120.sch b/target/schematron/PEPPOLBIS-T120.sch
@@ -1808,11 +1808,14 @@
 		       <assert id="PEPPOL-T120-R007"
                  test="((cbc:OutstandingQuantity) and (cbc:OutstandingReason)) or not(cbc:OutstandingQuantity)"
                  flag="warning">An outstanding quantity reason SHOULD be provided if the despatch line contains an outstanding quantity</assert>
+	     </rule>
+
+	     <rule context="cac:DespatchLine/cac:Item/cac:CommodityClassification">
 		       <assert id="PEPPOL-T120-R040"
-                 test="((cac:Item/cac:CommodityClassification/cbc:ItemClassificationCode/listID = 'ZZZ') and (cac:Item/cac:CommodityClassification/cbc:ItemClassificationCode/name)) or (cac:Item/cac:CommodityClassification/cbc:ItemClassificationCode/listID != 'ZZZ') or not (cac:Item/cac:CommodityClassification/cbc:ItemClassificationCode)"
+                 test="((normalize-space(cbc:ItemClassificationCode/listID) = 'ZZZ') and (cbc:ItemClassificationCode/name)) or (normalize-space(cbc:ItemClassificationCode/listID) != 'ZZZ') or not (cbc:ItemClassificationCode)"
                  flag="warning">A name must be provided if the listID is "ZZZ".</assert>
 	     </rule>
-	
+
 	     <rule context="cac:AdditionalDocumentReference">
 		       <assert id="PEPPOL-T120-R031"
                  test="(cbc:DocumentTypeCode) or (cbc:DocumentType)"