From 191ff9954d33ed086a03d9a85e1d225600356336 Mon Sep 17 00:00:00 2001
From: Paul Donohoe <paul.donohoe@ext.publications.europa.eu>
Date: Tue, 24 Oct 2023 14:58:25 +0200
Subject: [PATCH] TEDEFO-2783 Notice dispatch date - added parentheses around
 second expression, after " or "; updated comment to include both fields

---
 schematrons/dynamic/validation-stage-6b.sch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/schematrons/dynamic/validation-stage-6b.sch b/schematrons/dynamic/validation-stage-6b.sch
index e65fb4971..b832bac6a 100644
--- a/schematrons/dynamic/validation-stage-6b.sch
+++ b/schematrons/dynamic/validation-stage-6b.sch
@@ -5,8 +5,8 @@
 
 <!-- Notice dispatch date -->
 <rule context="/*">
-	<!-- BT-05(a)-notice Dispatch date is with one day of current date -->
-	<assert id="D-0001" role="ERROR" test="((ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:TransmissionDate) and ((current-date() - xs:date(ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:TransmissionDate/text())) le xs:dayTimeDuration('P2D')) and ((current-date() - xs:date(ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:TransmissionDate/text())) ge xs:dayTimeDuration('-P1D'))) or ((current-date() - xs:date(cbc:IssueDate/text())) le xs:dayTimeDuration('P2D')) and ((current-date() - xs:date(cbc:IssueDate/text())) ge xs:dayTimeDuration('-P1D'))">
+	<!-- BT-803(d)-notice Notice Dispatch Date eSender or BT-05(a)-notice Notice Dispatch Date is with one day of current date -->
+	<assert id="D-0001" role="ERROR" test="((ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:TransmissionDate) and ((current-date() - xs:date(ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:TransmissionDate/text())) le xs:dayTimeDuration('P2D')) and ((current-date() - xs:date(ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:TransmissionDate/text())) ge xs:dayTimeDuration('-P1D'))) or (((current-date() - xs:date(cbc:IssueDate/text())) le xs:dayTimeDuration('P2D')) and ((current-date() - xs:date(cbc:IssueDate/text())) ge xs:dayTimeDuration('-P1D')))">
 		Notice Dispatch Date eSender (BT-803), or by default Notice Dispatch Date (BT-05), must be between 0 and 24 hours before the current date.
 	</assert>
 </rule>