Merge branches 'master' and 'ozamirets/value-currency-equality' of ht…

…tps://github.com/ProzorroUKR/standards into ozamirets/value-currency-equality � 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 · cccaed8 · cccaed8
2 parents d50b7ee + 1f6b03f
commit cccaed8
Show file tree

Hide file tree

Showing 19 changed files with 173 additions and 19 deletions.
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
+    },
     "valueCurrencyEquality": {
       "type": "boolean",
       "enum": [
@@ -26,7 +33,9 @@
   },
   "required": [
     "hasAuction",
-    "hasAwardingOrder"
+    "hasAwardingOrder",
+    "hasValueRestriction",
+    "valueCurrencyEquality"
   ],
   "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
+    },
     "valueCurrencyEquality": {
       "type": "boolean",
       "enum": [
@@ -26,7 +33,9 @@
   },
   "required": [
     "hasAuction",
-    "hasAwardingOrder"
+    "hasAwardingOrder",
+    "hasValueRestriction",
+    "valueCurrencyEquality"
   ],
   "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
+    },
     "valueCurrencyEquality": {
       "type": "boolean",
       "enum": [
@@ -26,7 +33,9 @@
   },
   "required": [
     "hasAuction",
-    "hasAwardingOrder"
+    "hasAwardingOrder",
+    "hasValueRestriction",
+    "valueCurrencyEquality"
   ],
   "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
+    },
     "valueCurrencyEquality": {
       "type": "boolean",
       "enum": [
@@ -26,7 +33,9 @@
   },
   "required": [
     "hasAuction",
-    "hasAwardingOrder"
+    "hasAwardingOrder",
+    "hasValueRestriction",
+    "valueCurrencyEquality"
   ],
   "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
+    },
     "valueCurrencyEquality": {
       "type": "boolean",
       "enum": [
@@ -28,7 +36,9 @@
   },
   "required": [
     "hasAuction",
-    "hasAwardingOrder"
+    "hasAwardingOrder",
+    "hasValueRestriction",
+    "valueCurrencyEquality"
   ],
   "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
+    },
     "valueCurrencyEquality": {
       "type": "boolean",
       "enum": [
@@ -25,7 +32,9 @@
   },
   "required": [
     "hasAuction",
-    "hasAwardingOrder"
+    "hasAwardingOrder",
+    "hasValueRestriction",
+    "valueCurrencyEquality"
   ],
   "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
+    },
     "valueCurrencyEquality": {
       "type": "boolean",
       "enum": [
@@ -25,7 +32,9 @@
   },
   "required": [
     "hasAuction",
-    "hasAwardingOrder"
+    "hasAwardingOrder",
+    "hasValueRestriction",
+    "valueCurrencyEquality"
   ],
   "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
+    },
     "valueCurrencyEquality": {
       "type": "boolean",
       "enum": [
@@ -25,7 +32,9 @@
   },
   "required": [
     "hasAuction",
-    "hasAwardingOrder"
+    "hasAwardingOrder",
+    "hasValueRestriction",
+    "valueCurrencyEquality"
   ],
   "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
+    },
     "valueCurrencyEquality": {
       "type": "boolean",
       "enum": [
@@ -25,7 +32,9 @@
   },
   "required": [
     "hasAuction",
-    "hasAwardingOrder"
+    "hasAwardingOrder",
+    "hasValueRestriction",
+    "valueCurrencyEquality"
   ],
   "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
+    },
     "valueCurrencyEquality": {
       "type": "boolean",
       "enum": [
@@ -25,7 +32,9 @@
   },
   "required": [
     "hasAuction",
-    "hasAwardingOrder"
+    "hasAwardingOrder",
+    "hasValueRestriction",
+    "valueCurrencyEquality"
   ],
   "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
+    },
     "valueCurrencyEquality": {
       "type": "boolean",
       "enum": [
@@ -25,7 +32,9 @@
   },
   "required": [
     "hasAuction",
-    "hasAwardingOrder"
+    "hasAwardingOrder",
+    "hasValueRestriction",
+    "valueCurrencyEquality"
   ],
   "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
+    },
     "valueCurrencyEquality": {
       "type": "boolean",
       "enum": [
@@ -25,7 +32,9 @@
   },
   "required": [
     "hasAuction",
-    "hasAwardingOrder"
+    "hasAwardingOrder",
+    "hasValueRestriction",
+    "valueCurrencyEquality"
   ],
   "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
+    },
     "valueCurrencyEquality": {
       "type": "boolean",
       "enum": [
@@ -25,7 +32,9 @@
   },
   "required": [
     "hasAuction",
-    "hasAwardingOrder"
+    "hasAwardingOrder",
+    "hasValueRestriction",
+    "valueCurrencyEquality"
   ],
   "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
+    },
     "valueCurrencyEquality": {
       "type": "boolean",
       "enum": [
@@ -25,7 +32,9 @@
   },
   "required": [
     "hasAuction",
-    "hasAwardingOrder"
+    "hasAwardingOrder",
+    "hasValueRestriction",
+    "valueCurrencyEquality"
   ],
   "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
+    },
     "valueCurrencyEquality": {
       "type": "boolean",
       "enum": [
@@ -25,7 +32,9 @@
   },
   "required": [
     "hasAuction",
-    "hasAwardingOrder"
+    "hasAwardingOrder",
+    "hasValueRestriction",
+    "valueCurrencyEquality"
   ],
   "additionalProperties": false
 }