Merge pull request #762 from OP-TED/updates-before-1.10

Last updates before 1.10
OP-TED · Nov 15, 2023 · ebf17b3 · ebf17b3
2 parents d2e7d69 + b3b6e64
commit ebf17b3
Show file tree

Hide file tree

Showing 145 changed files with 812,796 additions and 812,973 deletions.
diff --git a/fields/fields.json b/fields/fields.json
@@ -2,8 +2,8 @@
   "ublVersion" : "2.3",
   "sdkVersion" : "eforms-sdk-1.10.0-SNAPSHOT",
   "metadataDatabase" : {
-    "version" : "1.9.161",
-    "createdOn" : "2023-11-10T16:32:03"
+    "version" : "1.9.164",
+    "createdOn" : "2023-11-14T10:57:24"
   },
   "xmlStructure" : [ {
     "id" : "ND-Root",
@@ -4714,11 +4714,6 @@
         "value" : "{ND-Lot} ${BT-137-Lot is unique in /BT-137-Lot}",
         "severity" : "ERROR",
         "message" : "rule|text|BR-BT-00137-0201"
-      }, {
-        "condition" : "{ND-Lot} ${(OPP-070-notice in ('E1','T01','7','8','9','10','11','CEI','12','13','14','15','16','17','18','19','E3','20','21','22','23','24','25','26','27','28')) and (count(/BT-137-Lot) > 1)}",
-        "value" : "{ND-Lot} ${BT-137-Lot != 'LOT-0000'}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00137-0207"
       }, {
         "condition" : "{ND-Lot} ${(OPP-070-notice in ('25','26','27','28','29','30','31','32','E4','T02','33','34','35','36','37','38','39','40','E5')) and BT-13713-LotResult is present}",
         "value" : "{ND-Lot} ${(BT-137-Lot in BT-13713-LotResult)}",
@@ -4854,11 +4849,6 @@
         "value" : "{ND-Part} ${BT-137-Part is unique in /BT-137-Part}",
         "severity" : "ERROR",
         "message" : "rule|text|BR-BT-00137-0202"
-      }, {
-        "condition" : "{ND-Part} ${(OPP-070-notice in ('4','5','6','E2')) and (count(/BT-137-Part) > 1)}",
-        "value" : "{ND-Part} ${BT-137-Part != 'PAR-0000'}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00137-0208"
       } ]
     }
   }, {

diff --git a/schematrons/dynamic/validation-stage-5.sch b/schematrons/dynamic/validation-stage-5.sch
@@ -48,7 +48,6 @@
 	</rule>
 	<rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']">
 		<assert id="BR-BT-00137-0201" role="ERROR" diagnostics="BT-137-Lot" test="count(for $x in cbc:ID, $y in /*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID[. = $x] return $y) = 1">rule|text|BR-BT-00137-0201</assert>
-		<assert id="BR-BT-00137-0207" role="ERROR" diagnostics="BT-137-Lot" test="(cbc:ID/normalize-space(text()) != 'LOT-0000') or not((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('E1','T01','7','8','9','10','11','CEI','12','13','14','15','16','17','18','19','E3','20','21','22','23','24','25','26','27','28')) and (count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) > 1))">rule|text|BR-BT-00137-0207</assert>
 		<assert id="BR-BT-00137-0209" role="ERROR" diagnostics="BT-137-Lot" test="((cbc:ID/normalize-space(text()) = ../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:TenderLot/cbc:ID/normalize-space(text()))) or not((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('25','26','27','28','29','30','31','32','E4','T02','33','34','35','36','37','38','39','40','E5')) and ../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:TenderLot/cbc:ID)">rule|text|BR-BT-00137-0209</assert>
 		<assert id="BR-BT-00137-0214" role="ERROR" diagnostics="BT-137-Lot" test="((cac:ProcurementProject/cac:PlannedPeriod/cbc:DurationMeasure) or (cac:ProcurementProject/cac:PlannedPeriod/cbc:StartDate and cac:ProcurementProject/cac:PlannedPeriod/cbc:EndDate) or (cac:ProcurementProject/cac:PlannedPeriod/cbc:DescriptionCode)) or not(../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('7','8','9','10','11','15','16','17','18','19','22'))">rule|text|BR-BT-00137-0214</assert>
 	</rule>
@@ -230,7 +229,6 @@
 	</rule>
 	<rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']">
 		<assert id="BR-BT-00137-0202" role="ERROR" diagnostics="BT-137-Part" test="count(for $x in cbc:ID, $y in /*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cbc:ID[. = $x] return $y) = 1">rule|text|BR-BT-00137-0202</assert>
-		<assert id="BR-BT-00137-0208" role="ERROR" diagnostics="BT-137-Part" test="(cbc:ID/normalize-space(text()) != 'PAR-0000') or not((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('4','5','6','E2')) and (count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cbc:ID/normalize-space(text())) > 1))">rule|text|BR-BT-00137-0208</assert>
 	</rule>
 	<rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject">
 		<assert id="BR-BT-00023-0204" role="ERROR" diagnostics="BT-23-Part" test="(not(cbc:ProcurementTypeCode[@listName='contract-nature']/normalize-space(text()) = cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']/cbc:ProcurementTypeCode/normalize-space(text()))) or not((cbc:ProcurementTypeCode[@listName='contract-nature']) and (cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']/cbc:ProcurementTypeCode))">rule|text|BR-BT-00023-0204</assert>

diff --git a/schematrons/static/validation-stage-5.sch b/schematrons/static/validation-stage-5.sch
@@ -48,7 +48,6 @@
 	</rule>
 	<rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']">
 		<assert id="BR-BT-00137-0201" role="ERROR" diagnostics="BT-137-Lot" test="count(for $x in cbc:ID, $y in /*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID[. = $x] return $y) = 1">rule|text|BR-BT-00137-0201</assert>
-		<assert id="BR-BT-00137-0207" role="ERROR" diagnostics="BT-137-Lot" test="(cbc:ID/normalize-space(text()) != 'LOT-0000') or not((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('E1','T01','7','8','9','10','11','CEI','12','13','14','15','16','17','18','19','E3','20','21','22','23','24','25','26','27','28')) and (count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/normalize-space(text())) > 1))">rule|text|BR-BT-00137-0207</assert>
 		<assert id="BR-BT-00137-0209" role="ERROR" diagnostics="BT-137-Lot" test="((cbc:ID/normalize-space(text()) = ../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:TenderLot/cbc:ID/normalize-space(text()))) or not((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('25','26','27','28','29','30','31','32','E4','T02','33','34','35','36','37','38','39','40','E5')) and ../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:TenderLot/cbc:ID)">rule|text|BR-BT-00137-0209</assert>
 		<assert id="BR-BT-00137-0214" role="ERROR" diagnostics="BT-137-Lot" test="((cac:ProcurementProject/cac:PlannedPeriod/cbc:DurationMeasure) or (cac:ProcurementProject/cac:PlannedPeriod/cbc:StartDate and cac:ProcurementProject/cac:PlannedPeriod/cbc:EndDate) or (cac:ProcurementProject/cac:PlannedPeriod/cbc:DescriptionCode)) or not(../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('7','8','9','10','11','15','16','17','18','19','22'))">rule|text|BR-BT-00137-0214</assert>
 	</rule>
@@ -230,7 +229,6 @@
 	</rule>
 	<rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']">
 		<assert id="BR-BT-00137-0202" role="ERROR" diagnostics="BT-137-Part" test="count(for $x in cbc:ID, $y in /*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cbc:ID[. = $x] return $y) = 1">rule|text|BR-BT-00137-0202</assert>
-		<assert id="BR-BT-00137-0208" role="ERROR" diagnostics="BT-137-Part" test="(cbc:ID/normalize-space(text()) != 'PAR-0000') or not((../ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/normalize-space(text()) = ('4','5','6','E2')) and (count(/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cbc:ID/normalize-space(text())) > 1))">rule|text|BR-BT-00137-0208</assert>
 	</rule>
 	<rule context="/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject">
 		<assert id="BR-BT-00023-0204" role="ERROR" diagnostics="BT-23-Part" test="(not(cbc:ProcurementTypeCode[@listName='contract-nature']/normalize-space(text()) = cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']/cbc:ProcurementTypeCode/normalize-space(text()))) or not((cbc:ProcurementTypeCode[@listName='contract-nature']) and (cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']/cbc:ProcurementTypeCode))">rule|text|BR-BT-00023-0204</assert>