Merge branches 'master' and 'min-bids-number-config' of https://githu…

…b.com/ProzorroUKR/standards into min-bids-number-config � Conflicts: � data_model/schema/TenderConfig/aboveThreshold.json � data_model/schema/TenderConfig/aboveThresholdEU.json � data_model/schema/TenderConfig/aboveThresholdUA.defense.json � data_model/schema/TenderConfig/aboveThresholdUA.json � data_model/schema/TenderConfig/belowThreshold.json � data_model/schema/TenderConfig/closeFrameworkAgreementSelectionUA.json � data_model/schema/TenderConfig/closeFrameworkAgreementUA.json � data_model/schema/TenderConfig/competitiveDialogueEU.json � data_model/schema/TenderConfig/competitiveDialogueEU.stage2.json � data_model/schema/TenderConfig/competitiveDialogueUA.json � data_model/schema/TenderConfig/competitiveDialogueUA.stage2.json � data_model/schema/TenderConfig/esco.json � data_model/schema/TenderConfig/negotiation.json � data_model/schema/TenderConfig/negotiation.quick.json � data_model/schema/TenderConfig/priceQuotation.json � data_model/schema/TenderConfig/reporting.json � data_model/schema/TenderConfig/simple.defense.json
ProzorroUKR · Jun 20, 2023 · 150c866 · 150c866
2 parents b7625ee + 1f6b03f
commit 150c866
Show file tree

Hide file tree

Showing 18 changed files with 138 additions and 1 deletion.
diff --git a/data_model/schema/TenderConfig/aboveThreshold.json b/data_model/schema/TenderConfig/aboveThreshold.json
@@ -16,6 +16,13 @@
       ],
       "default": true
     },
+    "hasValueRestriction": {
+      "type": "boolean",
+      "enum": [
+        false
+      ],
+      "default": false
+    },
     "minBidsNumber": {
       "type": "integer",
       "minimum": 1,
@@ -26,6 +33,7 @@
   "required": [
     "hasAuction",
     "hasAwardingOrder",
+    "hasValueRestriction",
     "minBidsNumber"
   ],
   "additionalProperties": false

diff --git a/data_model/schema/TenderConfig/aboveThresholdEU.json b/data_model/schema/TenderConfig/aboveThresholdEU.json
@@ -16,6 +16,13 @@
       ],
       "default": true
     },
+    "hasValueRestriction": {
+      "type": "boolean",
+      "enum": [
+        true
+      ],
+      "default": true
+    },
     "minBidsNumber": {
       "type": "integer",
       "minimum": 2,
@@ -26,6 +33,7 @@
   "required": [
     "hasAuction",
     "hasAwardingOrder",
+    "hasValueRestriction",
     "minBidsNumber"
   ],
   "additionalProperties": false

diff --git a/data_model/schema/TenderConfig/aboveThresholdUA.defense.json b/data_model/schema/TenderConfig/aboveThresholdUA.defense.json
@@ -16,6 +16,13 @@
       ],
       "default": true
     },
+    "hasValueRestriction": {
+      "type": "boolean",
+      "enum": [
+        true
+      ],
+      "default": true
+    },
     "minBidsNumber": {
       "type": "integer",
       "minimum": 1,
@@ -26,6 +33,7 @@
   "required": [
     "hasAuction",
     "hasAwardingOrder",
+    "hasValueRestriction",
     "minBidsNumber"
   ],
   "additionalProperties": false

diff --git a/data_model/schema/TenderConfig/aboveThresholdUA.json b/data_model/schema/TenderConfig/aboveThresholdUA.json
@@ -16,6 +16,13 @@
       ],
       "default": true
     },
+    "hasValueRestriction": {
+      "type": "boolean",
+      "enum": [
+        true
+      ],
+      "default": true
+    },
     "minBidsNumber": {
       "type": "integer",
       "minimum": 1,
@@ -26,6 +33,7 @@
   "required": [
     "hasAuction",
     "hasAwardingOrder",
+    "hasValueRestriction",
     "minBidsNumber"
   ],
   "additionalProperties": false

diff --git a/data_model/schema/TenderConfig/belowThreshold.json b/data_model/schema/TenderConfig/belowThreshold.json
@@ -17,6 +17,14 @@
       ],
       "default": true
     },
+    "hasValueRestriction": {
+      "type": "boolean",
+      "enum": [
+        true,
+        false
+      ],
+      "default": true
+    },
     "minBidsNumber": {
       "type": "integer",
       "minimum": 1,
@@ -27,6 +35,7 @@
   "required": [
     "hasAuction",
     "hasAwardingOrder",
+    "hasValueRestriction",
     "minBidsNumber"
   ],
   "additionalProperties": false

diff --git a/data_model/schema/TenderConfig/closeFrameworkAgreementSelectionUA.json b/data_model/schema/TenderConfig/closeFrameworkAgreementSelectionUA.json
@@ -15,6 +15,13 @@
       ],
       "default": true
     },
+    "hasValueRestriction": {
+      "type": "boolean",
+      "enum": [
+        true
+      ],
+      "default": true
+    },
     "minBidsNumber": {
       "type": "integer",
       "minimum": 1,
@@ -25,6 +32,7 @@
   "required": [
     "hasAuction",
     "hasAwardingOrder",
+    "hasValueRestriction",
     "minBidsNumber"
   ],
   "additionalProperties": false

diff --git a/data_model/schema/TenderConfig/closeFrameworkAgreementUA.json b/data_model/schema/TenderConfig/closeFrameworkAgreementUA.json
@@ -15,6 +15,13 @@
       ],
       "default": true
     },
+    "hasValueRestriction": {
+      "type": "boolean",
+      "enum": [
+        true
+      ],
+      "default": true
+    },
     "minBidsNumber": {
       "type": "integer",
       "minimum": 3,
@@ -25,6 +32,7 @@
   "required": [
     "hasAuction",
     "hasAwardingOrder",
+    "hasValueRestriction",
     "minBidsNumber"
   ],
   "additionalProperties": false

diff --git a/data_model/schema/TenderConfig/competitiveDialogueEU.json b/data_model/schema/TenderConfig/competitiveDialogueEU.json
@@ -15,6 +15,13 @@
       ],
       "default": true
     },
+    "hasValueRestriction": {
+      "type": "boolean",
+      "enum": [
+        true
+      ],
+      "default": true
+    },
     "minBidsNumber": {
       "type": "integer",
       "minimum": 3,
@@ -25,6 +32,7 @@
   "required": [
     "hasAuction",
     "hasAwardingOrder",
+    "hasValueRestriction",
     "minBidsNumber"
   ],
   "additionalProperties": false

diff --git a/data_model/schema/TenderConfig/competitiveDialogueEU.stage2.json b/data_model/schema/TenderConfig/competitiveDialogueEU.stage2.json
@@ -15,6 +15,13 @@
       ],
       "default": true
     },
+    "hasValueRestriction": {
+      "type": "boolean",
+      "enum": [
+        true
+      ],
+      "default": true
+    },
     "minBidsNumber": {
       "type": "integer",
       "minimum": 2,
@@ -25,6 +32,7 @@
   "required": [
     "hasAuction",
     "hasAwardingOrder",
+    "hasValueRestriction",
     "minBidsNumber"
   ],
   "additionalProperties": false

diff --git a/data_model/schema/TenderConfig/competitiveDialogueUA.json b/data_model/schema/TenderConfig/competitiveDialogueUA.json
@@ -15,6 +15,13 @@
       ],
       "default": true
     },
+    "hasValueRestriction": {
+      "type": "boolean",
+      "enum": [
+        true
+      ],
+      "default": true
+    },
     "minBidsNumber": {
       "type": "integer",
       "minimum": 3,
@@ -25,6 +32,7 @@
   "required": [
     "hasAuction",
     "hasAwardingOrder",
+    "hasValueRestriction",
     "minBidsNumber"
   ],
   "additionalProperties": false

diff --git a/data_model/schema/TenderConfig/competitiveDialogueUA.stage2.json b/data_model/schema/TenderConfig/competitiveDialogueUA.stage2.json
@@ -15,6 +15,13 @@
       ],
       "default": true
     },
+    "hasValueRestriction": {
+      "type": "boolean",
+      "enum": [
+        true
+      ],
+      "default": true
+    },
     "minBidsNumber": {
       "type": "integer",
       "minimum": 2,
@@ -25,6 +32,7 @@
   "required": [
     "hasAuction",
     "hasAwardingOrder",
+    "hasValueRestriction",
     "minBidsNumber"
   ],
   "additionalProperties": false

diff --git a/data_model/schema/TenderConfig/esco.json b/data_model/schema/TenderConfig/esco.json
@@ -15,6 +15,13 @@
       ],
       "default": true
     },
+    "hasValueRestriction": {
+      "type": "boolean",
+      "enum": [
+        true
+      ],
+      "default": true
+    },
     "minBidsNumber": {
       "type": "integer",
       "minimum": 2,
@@ -25,6 +32,7 @@
   "required": [
     "hasAuction",
     "hasAwardingOrder",
+    "hasValueRestriction",
     "minBidsNumber"
   ],
   "additionalProperties": false

diff --git a/data_model/schema/TenderConfig/negotiation.json b/data_model/schema/TenderConfig/negotiation.json
@@ -15,6 +15,13 @@
       ],
       "default": true
     },
+    "hasValueRestriction": {
+      "type": "boolean",
+      "enum": [
+        true
+      ],
+      "default": true
+    },
     "minBidsNumber": {
       "type": "integer",
       "minimum": 1,
@@ -25,6 +32,7 @@
   "required": [
     "hasAuction",
     "hasAwardingOrder",
+    "hasValueRestriction",
     "minBidsNumber"
   ],
   "additionalProperties": false

diff --git a/data_model/schema/TenderConfig/negotiation.quick.json b/data_model/schema/TenderConfig/negotiation.quick.json
@@ -15,6 +15,13 @@
       ],
       "default": true
     },
+    "hasValueRestriction": {
+      "type": "boolean",
+      "enum": [
+        true
+      ],
+      "default": true
+    },
     "minBidsNumber": {
       "type": "integer",
       "minimum": 1,
@@ -25,6 +32,7 @@
   "required": [
     "hasAuction",
     "hasAwardingOrder",
+    "hasValueRestriction",
     "minBidsNumber"
   ],
   "additionalProperties": false

diff --git a/data_model/schema/TenderConfig/priceQuotation.json b/data_model/schema/TenderConfig/priceQuotation.json
@@ -15,6 +15,13 @@
       ],
       "default": true
     },
+    "hasValueRestriction": {
+      "type": "boolean",
+      "enum": [
+        true
+      ],
+      "default": true
+    },
     "minBidsNumber": {
       "type": "integer",
       "minimum": 1,
@@ -25,6 +32,7 @@
   "required": [
     "hasAuction",
     "hasAwardingOrder",
+    "hasValueRestriction",
     "minBidsNumber"
   ],
   "additionalProperties": false

diff --git a/data_model/schema/TenderConfig/reporting.json b/data_model/schema/TenderConfig/reporting.json
@@ -15,6 +15,13 @@
       ],
       "default": true
     },
+    "hasValueRestriction": {
+      "type": "boolean",
+      "enum": [
+        true
+      ],
+      "default": true
+    },
     "minBidsNumber": {
       "type": "integer",
       "minimum": 1,
@@ -25,6 +32,7 @@
   "required": [
     "hasAuction",
     "hasAwardingOrder",
+    "hasValueRestriction",
     "minBidsNumber"
   ],
   "additionalProperties": false

diff --git a/data_model/schema/TenderConfig/simple.defense.json b/data_model/schema/TenderConfig/simple.defense.json
@@ -16,6 +16,13 @@
       ],
       "default": true
     },
+    "hasValueRestriction": {
+      "type": "boolean",
+      "enum": [
+        true
+      ],
+      "default": true
+    },
     "minBidsNumber": {
       "type": "integer",
       "minimum": 1,
@@ -26,6 +33,7 @@
   "required": [
     "hasAuction",
     "hasAwardingOrder",
+    "hasValueRestriction",
     "minBidsNumber"
   ],
   "additionalProperties": false

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name="standards",
-    version="1.0.57",
+    version="1.0.58",
     description="Prozorro standards",
     python_requires=">=2.7",
     package_dir={'standards': '.'},