From 765acb5ea206a39329a94ec32d013c340528db4b Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Thu, 12 Oct 2023 14:34:14 +1300 Subject: [PATCH 01/39] release-schema: Add finalStatus to tender, award and contract --- docs/schema/codelists.md | 30 +++++ schema/codelists/awardFinalStatus.csv | 5 + schema/codelists/contractFinalStatus.csv | 6 + schema/codelists/tenderFinalStatus.csv | 4 + schema/dereferenced-release-schema.json | 102 +++++++++++++++++ schema/release-schema.json | 51 +++++++++ .../versioned-release-validation-schema.json | 108 ++++++++++++++++++ 7 files changed, 306 insertions(+) create mode 100644 schema/codelists/awardFinalStatus.csv create mode 100644 schema/codelists/contractFinalStatus.csv create mode 100644 schema/codelists/tenderFinalStatus.csv diff --git a/docs/schema/codelists.md b/docs/schema/codelists.md index 02d796dab..b66760c72 100644 --- a/docs/schema/codelists.md +++ b/docs/schema/codelists.md @@ -333,3 +333,33 @@ For enterprises without employees, use the 'micro' code. :header-rows: 1 :file: ../../build/current_lang/codelists/partyScale.csv ``` + +### Tender final status + +```{versionadded} 1.2 +``` + +```{csv-table-no-translate} +:header-rows: 1 +:file: ../../build/current_lang/codelists/tenderFinalStatus.csv +``` + +### Award final status + +```{versionadded} 1.2 +``` + +```{csv-table-no-translate} +:header-rows: 1 +:file: ../../build/current_lang/codelists/awardFinalStatus.csv +``` + +### Contract final status + +```{versionadded} 1.2 +``` + +```{csv-table-no-translate} +:header-rows: 1 +:file: ../../build/current_lang/codelists/contractFinalStatus.csv +``` diff --git a/schema/codelists/awardFinalStatus.csv b/schema/codelists/awardFinalStatus.csv new file mode 100644 index 000000000..9aa619781 --- /dev/null +++ b/schema/codelists/awardFinalStatus.csv @@ -0,0 +1,5 @@ +Code,Title,Description +complete,Complete,"The award was made and the standstill period, if any, has ended." +cancelled,Cancelled,"The award was cancelled by the buyer or the procuring entity (e.g. because of a change in needs, insufficient funds, or technical or procedural errors) after the bid submission deadline, but before the award was made or before the standstill period, if any, had ended." +unsuccessful,Unsuccessful,"The award failed (e.g. a review body cancelled the process during the standstill period) after the bid submission deadline, but before the award was made or before the standstill period, if any, had ended." +withdrawn,Withdrawn,No further information on the award is available under this ocid. diff --git a/schema/codelists/contractFinalStatus.csv b/schema/codelists/contractFinalStatus.csv new file mode 100644 index 000000000..3f3bcdd5f --- /dev/null +++ b/schema/codelists/contractFinalStatus.csv @@ -0,0 +1,6 @@ +Code,Title,Description +terminatedSuccessfully,Terminated successfully,"The contract was concluded and in force, and is terminated due to its successful completion." +terminatedEarly,Terminated early,"The contract was concluded and in force, and is terminated early due to some non-completion." +cancelled,Cancelled,"The contracting process was cancelled by the buyer or the procuring entity (e.g. because of a change in needs, insufficient funds, or technical or procedural errors) after the award was made and the standstill period, if any, had ended." +unsuccessful,Unsuccessful,"The contract failed (e.g. the winning bidder(s) refused to sign the contract) after the award was made and the standstill period, if any, had ended, but before the contract was concluded and in force." +withdrawn,Withdrawn,No further information on the contract is available under this ocid. diff --git a/schema/codelists/tenderFinalStatus.csv b/schema/codelists/tenderFinalStatus.csv new file mode 100644 index 000000000..0474e6259 --- /dev/null +++ b/schema/codelists/tenderFinalStatus.csv @@ -0,0 +1,4 @@ +Code,Title,Description +cancelled,Cancelled,"The contracting process was cancelled by the buyer or the procuring entity (for example, because of a change in needs, insufficient funds, or technical or procedural errors) after the contracting documents (for example, procurement documents) were available to potential supppliers, but not later than the bid submission deadline." +unsuccessful,Unsuccessful,"The contracting process failed (for example, no bids were received, all bids were withdrawn by the bidders, all bids were rejected by the buyer or the procuring entity) after the contracting documents (for example, procurement documents) were available to potential suppliers, but not later than the bid submission deadline." +withdrawn,Withdrawn,No further information on this process is available under this ocid. diff --git a/schema/dereferenced-release-schema.json b/schema/dereferenced-release-schema.json index ae77bd7d8..9e9afba7d 100644 --- a/schema/dereferenced-release-schema.json +++ b/schema/dereferenced-release-schema.json @@ -6365,6 +6365,22 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } + }, + "finalStatus": { + "title": "Tender final status", + "description": "The final status of the tender, from the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "tenderFinalStatus.csv", + "openCodelist": false, + "enum": [ + "cancelled", + "unsuccessful", + "withdrawn", + null + ] } }, "patternProperties": { @@ -8936,6 +8952,23 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } + }, + "finalStatus": { + "title": "Award final status", + "description": "The final status of the award, from the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "awardFinalStatus.csv", + "openCodelist": false, + "enum": [ + "complete", + "cancelled", + "unsuccessful", + "withdrawn", + null + ] } }, "patternProperties": { @@ -14274,6 +14307,24 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } + }, + "finalStatus": { + "title": "Contract final status", + "description": "The final status of the contract, from the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "contractFinalStatus.csv", + "openCodelist": false, + "enum": [ + "terminatedSuccessfully", + "terminatedEarly", + "cancelled", + "unsuccessful", + "withdrawn", + null + ] } }, "patternProperties": { @@ -19579,6 +19630,22 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } + }, + "finalStatus": { + "title": "Tender final status", + "description": "The final status of the tender, from the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "tenderFinalStatus.csv", + "openCodelist": false, + "enum": [ + "cancelled", + "unsuccessful", + "withdrawn", + null + ] } }, "patternProperties": { @@ -22146,6 +22213,23 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } + }, + "finalStatus": { + "title": "Award final status", + "description": "The final status of the award, from the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "awardFinalStatus.csv", + "openCodelist": false, + "enum": [ + "complete", + "cancelled", + "unsuccessful", + "withdrawn", + null + ] } }, "patternProperties": { @@ -27478,6 +27562,24 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } + }, + "finalStatus": { + "title": "Contract final status", + "description": "The final status of the contract, from the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "contractFinalStatus.csv", + "openCodelist": false, + "enum": [ + "terminatedSuccessfully", + "terminatedEarly", + "cancelled", + "unsuccessful", + "withdrawn", + null + ] } }, "patternProperties": { diff --git a/schema/release-schema.json b/schema/release-schema.json index 0b1663f6a..16eb2891d 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -513,6 +513,22 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } + }, + "finalStatus": { + "title": "Tender final status", + "description": "The final status of the tender, from the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "tenderFinalStatus.csv", + "openCodelist": false, + "enum": [ + "cancelled", + "unsuccessful", + "withdrawn", + null + ] } }, "patternProperties": { @@ -700,6 +716,23 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } + }, + "finalStatus": { + "title": "Award final status", + "description": "The final status of the award, from the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "awardFinalStatus.csv", + "openCodelist": false, + "enum": [ + "complete", + "cancelled", + "unsuccessful", + "withdrawn", + null + ] } }, "patternProperties": { @@ -883,6 +916,24 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } + }, + "finalStatus": { + "title": "Contract final status", + "description": "The final status of the contract, from the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "contractFinalStatus.csv", + "openCodelist": false, + "enum": [ + "terminatedSuccessfully", + "terminatedEarly", + "cancelled", + "unsuccessful", + "withdrawn", + null + ] } }, "patternProperties": { diff --git a/schema/versioned-release-validation-schema.json b/schema/versioned-release-validation-schema.json index 7e60c6bd8..c5669ff0f 100644 --- a/schema/versioned-release-validation-schema.json +++ b/schema/versioned-release-validation-schema.json @@ -597,6 +597,41 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } + }, + "finalStatus": { + "type": "array", + "items": { + "type": "object", + "properties": { + "releaseDate": { + "format": "date-time", + "type": "string" + }, + "releaseID": { + "type": "string" + }, + "value": { + "type": [ + "string", + "null" + ], + "codelist": "tenderFinalStatus.csv", + "openCodelist": false, + "enum": [ + "cancelled", + "unsuccessful", + "withdrawn", + null + ] + }, + "releaseTag": { + "type": "array", + "items": { + "type": "string" + } + } + } + } } }, "patternProperties": { @@ -754,6 +789,42 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } + }, + "finalStatus": { + "type": "array", + "items": { + "type": "object", + "properties": { + "releaseDate": { + "format": "date-time", + "type": "string" + }, + "releaseID": { + "type": "string" + }, + "value": { + "type": [ + "string", + "null" + ], + "codelist": "awardFinalStatus.csv", + "openCodelist": false, + "enum": [ + "complete", + "cancelled", + "unsuccessful", + "withdrawn", + null + ] + }, + "releaseTag": { + "type": "array", + "items": { + "type": "string" + } + } + } + } } }, "patternProperties": { @@ -946,6 +1017,43 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } + }, + "finalStatus": { + "type": "array", + "items": { + "type": "object", + "properties": { + "releaseDate": { + "format": "date-time", + "type": "string" + }, + "releaseID": { + "type": "string" + }, + "value": { + "type": [ + "string", + "null" + ], + "codelist": "contractFinalStatus.csv", + "openCodelist": false, + "enum": [ + "terminatedSuccessfully", + "terminatedEarly", + "cancelled", + "unsuccessful", + "withdrawn", + null + ] + }, + "releaseTag": { + "type": "array", + "items": { + "type": "string" + } + } + } + } } }, "patternProperties": { From 6f1805121215b99a88df8fea093534dea4510195 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Fri, 13 Oct 2023 12:27:13 +1300 Subject: [PATCH 02/39] release-schema: Clarify the description of tender.datePublished --- docs/history/changelog.md | 1 + schema/dereferenced-release-schema.json | 4 ++-- schema/release-schema.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/history/changelog.md b/docs/history/changelog.md index bd2a21ee4..763c2eee6 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -215,6 +215,7 @@ Per the [normative and non-normative content and changes policy](../governance/n * [#1528](https://github.com/open-contracting/standard/pull/1528) `tender.id`, `tender.hasEnquiries`, to reduce ambiguity and use consistent wording in the description of procurement stages. * [#1618](https://github.com/open-contracting/standard/pull/1618) `tender.enquiryPeriod`, to remove the suggestion to use `tender.submissionMethodDetails` for information about how to submit enquiries. * [#1618](https://github.com/open-contracting/standard/pull/1618) Normalize field descriptions according to a style guide. + * [#1648](https://github.com/open-contracting/standard/pull/1648) `tender.datePublished`, to clarify its relation to bidding documents. * Remove confusing terminology: * [#1487](https://github.com/open-contracting/standard/pull/1487) `planning.budget.project`, to remove sentence about translation options. diff --git a/schema/dereferenced-release-schema.json b/schema/dereferenced-release-schema.json index 9e9afba7d..ccb7696af 100644 --- a/schema/dereferenced-release-schema.json +++ b/schema/dereferenced-release-schema.json @@ -4630,7 +4630,7 @@ ] }, "datePublished": { - "description": "The date on which the tender was published.", + "description": "The date on which the bidding documents were published.", "format": "date-time", "title": "Date published", "type": [ @@ -17895,7 +17895,7 @@ ] }, "datePublished": { - "description": "The date on which the tender was published.", + "description": "The date on which the bidding documents were published.", "format": "date-time", "title": "Date published", "type": [ diff --git a/schema/release-schema.json b/schema/release-schema.json index 16eb2891d..db7d88c02 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -395,7 +395,7 @@ ] }, "datePublished": { - "description": "The date on which the tender was published.", + "description": "The date on which the bidding documents were published.", "format": "date-time", "title": "Date published", "type": [ From 791535466d2f5a77465d59886485481767fb1c80 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 24 Oct 2023 11:52:19 +1300 Subject: [PATCH 03/39] release-schema: Update description of tender.datePublished --- schema/dereferenced-release-schema.json | 4 ++-- schema/release-schema.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/schema/dereferenced-release-schema.json b/schema/dereferenced-release-schema.json index ccb7696af..cf28cbce3 100644 --- a/schema/dereferenced-release-schema.json +++ b/schema/dereferenced-release-schema.json @@ -4630,7 +4630,7 @@ ] }, "datePublished": { - "description": "The date on which the bidding documents were published.", + "description": "The date on which the contracting documents (for example, procurement documents) were published.", "format": "date-time", "title": "Date published", "type": [ @@ -17895,7 +17895,7 @@ ] }, "datePublished": { - "description": "The date on which the bidding documents were published.", + "description": "The date on which the contracting documents (for example, procurement documents) were published.", "format": "date-time", "title": "Date published", "type": [ diff --git a/schema/release-schema.json b/schema/release-schema.json index db7d88c02..cc88a9f04 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -395,7 +395,7 @@ ] }, "datePublished": { - "description": "The date on which the bidding documents were published.", + "description": "The date on which the contracting documents (for example, procurement documents) were published.", "format": "date-time", "title": "Date published", "type": [ From 4e285132c541d5951be91db385401996dda74842 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 24 Oct 2023 11:55:33 +1300 Subject: [PATCH 04/39] Update changelog --- docs/history/changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/history/changelog.md b/docs/history/changelog.md index 763c2eee6..76c0b07c1 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -178,6 +178,7 @@ Per the [normative and non-normative content and changes policy](../governance/n * [#1421](https://github.com/open-contracting/standard/pull/1421) `tender.standstillPeriod` * [#1492](https://github.com/open-contracting/standard/pull/1492) `awards.datePublished` * [#1165](https://github.com/open-contracting/standard/pull/1165) `statusDetails` to `Tender`, `Award` and `Contract` + * [#1648](https://github.com/open-contracting/standard/pull/1648) `finalStatus` to `Tender`, `Award` and `Contract` * [#1208](https://github.com/open-contracting/standard/pull/1326) The estimated and maximum values of framework agreeemnts: * `tender.maximumValue`. Previously, `tender.value` was used for the maximum value. However, this led to double-counting. * `awards.maximumValue`. Previously, `awards.value` was used for the maximum value. However, this led to double-counting. From 1438e302ef2ad18a17f403b664bf21ee7c4dd449 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 24 Oct 2023 13:55:26 +1300 Subject: [PATCH 05/39] schema/codelists: Remove withdrawn codes from finalStatus codelists --- schema/codelists/awardFinalStatus.csv | 1 - schema/codelists/contractFinalStatus.csv | 1 - schema/codelists/tenderFinalStatus.csv | 1 - 3 files changed, 3 deletions(-) diff --git a/schema/codelists/awardFinalStatus.csv b/schema/codelists/awardFinalStatus.csv index 9aa619781..2f74a707c 100644 --- a/schema/codelists/awardFinalStatus.csv +++ b/schema/codelists/awardFinalStatus.csv @@ -2,4 +2,3 @@ Code,Title,Description complete,Complete,"The award was made and the standstill period, if any, has ended." cancelled,Cancelled,"The award was cancelled by the buyer or the procuring entity (e.g. because of a change in needs, insufficient funds, or technical or procedural errors) after the bid submission deadline, but before the award was made or before the standstill period, if any, had ended." unsuccessful,Unsuccessful,"The award failed (e.g. a review body cancelled the process during the standstill period) after the bid submission deadline, but before the award was made or before the standstill period, if any, had ended." -withdrawn,Withdrawn,No further information on the award is available under this ocid. diff --git a/schema/codelists/contractFinalStatus.csv b/schema/codelists/contractFinalStatus.csv index 3f3bcdd5f..8e0fe85bf 100644 --- a/schema/codelists/contractFinalStatus.csv +++ b/schema/codelists/contractFinalStatus.csv @@ -3,4 +3,3 @@ terminatedSuccessfully,Terminated successfully,"The contract was concluded and i terminatedEarly,Terminated early,"The contract was concluded and in force, and is terminated early due to some non-completion." cancelled,Cancelled,"The contracting process was cancelled by the buyer or the procuring entity (e.g. because of a change in needs, insufficient funds, or technical or procedural errors) after the award was made and the standstill period, if any, had ended." unsuccessful,Unsuccessful,"The contract failed (e.g. the winning bidder(s) refused to sign the contract) after the award was made and the standstill period, if any, had ended, but before the contract was concluded and in force." -withdrawn,Withdrawn,No further information on the contract is available under this ocid. diff --git a/schema/codelists/tenderFinalStatus.csv b/schema/codelists/tenderFinalStatus.csv index 0474e6259..656cdcb24 100644 --- a/schema/codelists/tenderFinalStatus.csv +++ b/schema/codelists/tenderFinalStatus.csv @@ -1,4 +1,3 @@ Code,Title,Description cancelled,Cancelled,"The contracting process was cancelled by the buyer or the procuring entity (for example, because of a change in needs, insufficient funds, or technical or procedural errors) after the contracting documents (for example, procurement documents) were available to potential supppliers, but not later than the bid submission deadline." unsuccessful,Unsuccessful,"The contracting process failed (for example, no bids were received, all bids were withdrawn by the bidders, all bids were rejected by the buyer or the procuring entity) after the contracting documents (for example, procurement documents) were available to potential suppliers, but not later than the bid submission deadline." -withdrawn,Withdrawn,No further information on this process is available under this ocid. From 04efe1632e54b00990102552673e2d2111098e21 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 24 Oct 2023 14:00:50 +1300 Subject: [PATCH 06/39] release-schema: Update enum for finalStatus fields --- schema/dereferenced-release-schema.json | 6 ------ schema/release-schema.json | 3 --- schema/versioned-release-validation-schema.json | 3 --- 3 files changed, 12 deletions(-) diff --git a/schema/dereferenced-release-schema.json b/schema/dereferenced-release-schema.json index cf28cbce3..b950e46df 100644 --- a/schema/dereferenced-release-schema.json +++ b/schema/dereferenced-release-schema.json @@ -6378,7 +6378,6 @@ "enum": [ "cancelled", "unsuccessful", - "withdrawn", null ] } @@ -8966,7 +8965,6 @@ "complete", "cancelled", "unsuccessful", - "withdrawn", null ] } @@ -14322,7 +14320,6 @@ "terminatedEarly", "cancelled", "unsuccessful", - "withdrawn", null ] } @@ -19643,7 +19640,6 @@ "enum": [ "cancelled", "unsuccessful", - "withdrawn", null ] } @@ -22227,7 +22223,6 @@ "complete", "cancelled", "unsuccessful", - "withdrawn", null ] } @@ -27577,7 +27572,6 @@ "terminatedEarly", "cancelled", "unsuccessful", - "withdrawn", null ] } diff --git a/schema/release-schema.json b/schema/release-schema.json index cc88a9f04..e64796177 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -526,7 +526,6 @@ "enum": [ "cancelled", "unsuccessful", - "withdrawn", null ] } @@ -730,7 +729,6 @@ "complete", "cancelled", "unsuccessful", - "withdrawn", null ] } @@ -931,7 +929,6 @@ "terminatedEarly", "cancelled", "unsuccessful", - "withdrawn", null ] } diff --git a/schema/versioned-release-validation-schema.json b/schema/versioned-release-validation-schema.json index c5669ff0f..f55a76e1b 100644 --- a/schema/versioned-release-validation-schema.json +++ b/schema/versioned-release-validation-schema.json @@ -620,7 +620,6 @@ "enum": [ "cancelled", "unsuccessful", - "withdrawn", null ] }, @@ -813,7 +812,6 @@ "complete", "cancelled", "unsuccessful", - "withdrawn", null ] }, @@ -1042,7 +1040,6 @@ "terminatedEarly", "cancelled", "unsuccessful", - "withdrawn", null ] }, From 2c85368d3708c3ed95ef094e2403825476e6e3a1 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 14 Nov 2023 09:36:36 +1300 Subject: [PATCH 07/39] Update schema/codelists/awardFinalStatus.csv Co-authored-by: odscjen <95221058+odscjen@users.noreply.github.com> --- schema/codelists/awardFinalStatus.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/codelists/awardFinalStatus.csv b/schema/codelists/awardFinalStatus.csv index 2f74a707c..788529c96 100644 --- a/schema/codelists/awardFinalStatus.csv +++ b/schema/codelists/awardFinalStatus.csv @@ -1,4 +1,4 @@ Code,Title,Description complete,Complete,"The award was made and the standstill period, if any, has ended." -cancelled,Cancelled,"The award was cancelled by the buyer or the procuring entity (e.g. because of a change in needs, insufficient funds, or technical or procedural errors) after the bid submission deadline, but before the award was made or before the standstill period, if any, had ended." +cancelled,Cancelled,"The award was cancelled by the buyer or the procuring entity (for example, because of a change in needs, insufficient funds, or technical or procedural errors) after the bid submission deadline, but before the award was made or before the standstill period, if any, had ended." unsuccessful,Unsuccessful,"The award failed (e.g. a review body cancelled the process during the standstill period) after the bid submission deadline, but before the award was made or before the standstill period, if any, had ended." From aff8a4486ab7ee0369560e37c0317185a214e13c Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 14 Nov 2023 09:38:23 +1300 Subject: [PATCH 08/39] Update schema/codelists/awardFinalStatus.csv Co-authored-by: odscjen <95221058+odscjen@users.noreply.github.com> --- schema/codelists/awardFinalStatus.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/codelists/awardFinalStatus.csv b/schema/codelists/awardFinalStatus.csv index 788529c96..c842f8f0a 100644 --- a/schema/codelists/awardFinalStatus.csv +++ b/schema/codelists/awardFinalStatus.csv @@ -1,4 +1,4 @@ Code,Title,Description complete,Complete,"The award was made and the standstill period, if any, has ended." cancelled,Cancelled,"The award was cancelled by the buyer or the procuring entity (for example, because of a change in needs, insufficient funds, or technical or procedural errors) after the bid submission deadline, but before the award was made or before the standstill period, if any, had ended." -unsuccessful,Unsuccessful,"The award failed (e.g. a review body cancelled the process during the standstill period) after the bid submission deadline, but before the award was made or before the standstill period, if any, had ended." +unsuccessful,Unsuccessful,"The award failed (for example, a review body cancelled the process during the standstill period) after the bid submission deadline, but before the award was made or before the standstill period, if any, had ended." From 97cde593734ea0270e10aeafabfbeb5acfe0acbb Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 14 Nov 2023 09:38:30 +1300 Subject: [PATCH 09/39] Update schema/codelists/contractFinalStatus.csv Co-authored-by: odscjen <95221058+odscjen@users.noreply.github.com> --- schema/codelists/contractFinalStatus.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/codelists/contractFinalStatus.csv b/schema/codelists/contractFinalStatus.csv index 8e0fe85bf..20ff7ccd7 100644 --- a/schema/codelists/contractFinalStatus.csv +++ b/schema/codelists/contractFinalStatus.csv @@ -1,5 +1,5 @@ Code,Title,Description terminatedSuccessfully,Terminated successfully,"The contract was concluded and in force, and is terminated due to its successful completion." terminatedEarly,Terminated early,"The contract was concluded and in force, and is terminated early due to some non-completion." -cancelled,Cancelled,"The contracting process was cancelled by the buyer or the procuring entity (e.g. because of a change in needs, insufficient funds, or technical or procedural errors) after the award was made and the standstill period, if any, had ended." +cancelled,Cancelled,"The contracting process was cancelled by the buyer or the procuring entity (for example, because of a change in needs, insufficient funds, or technical or procedural errors) after the award was made and the standstill period, if any, had ended." unsuccessful,Unsuccessful,"The contract failed (e.g. the winning bidder(s) refused to sign the contract) after the award was made and the standstill period, if any, had ended, but before the contract was concluded and in force." From 995b9d5b865a2282de66c60fe22e008291beb49a Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 14 Nov 2023 09:38:37 +1300 Subject: [PATCH 10/39] Update schema/codelists/contractFinalStatus.csv Co-authored-by: odscjen <95221058+odscjen@users.noreply.github.com> --- schema/codelists/contractFinalStatus.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/codelists/contractFinalStatus.csv b/schema/codelists/contractFinalStatus.csv index 20ff7ccd7..f31dd84b0 100644 --- a/schema/codelists/contractFinalStatus.csv +++ b/schema/codelists/contractFinalStatus.csv @@ -2,4 +2,4 @@ Code,Title,Description terminatedSuccessfully,Terminated successfully,"The contract was concluded and in force, and is terminated due to its successful completion." terminatedEarly,Terminated early,"The contract was concluded and in force, and is terminated early due to some non-completion." cancelled,Cancelled,"The contracting process was cancelled by the buyer or the procuring entity (for example, because of a change in needs, insufficient funds, or technical or procedural errors) after the award was made and the standstill period, if any, had ended." -unsuccessful,Unsuccessful,"The contract failed (e.g. the winning bidder(s) refused to sign the contract) after the award was made and the standstill period, if any, had ended, but before the contract was concluded and in force." +unsuccessful,Unsuccessful,"The contract failed (for example, the winning bidder(s) refused to sign the contract) after the award was made and the standstill period, if any, had ended, but before the contract was concluded and in force." From 082fef99fc2b9d26d1b5f85df9929fd4df8532bf Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 14 Nov 2023 09:39:03 +1300 Subject: [PATCH 11/39] Update schema/release-schema.json Co-authored-by: odscjen <95221058+odscjen@users.noreply.github.com> --- schema/release-schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/release-schema.json b/schema/release-schema.json index 01dd4770d..74c95553e 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -520,7 +520,7 @@ }, "finalStatus": { "title": "Tender final status", - "description": "The final status of the tender, from the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", + "description": "The final status of the tender, using the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", "type": [ "string", "null" From 0788ac8b766b93d12c231beb27f41587f53fee4a Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 14 Nov 2023 09:39:12 +1300 Subject: [PATCH 12/39] Update schema/release-schema.json Co-authored-by: odscjen <95221058+odscjen@users.noreply.github.com> --- schema/release-schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/release-schema.json b/schema/release-schema.json index 74c95553e..bf9187a47 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -927,7 +927,7 @@ }, "finalStatus": { "title": "Contract final status", - "description": "The final status of the contract, from the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", + "description": "The final status of the contract, using the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", "type": [ "string", "null" From d6e6e8ed0a598f20107670d430344938d824acae Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 14 Nov 2023 09:39:21 +1300 Subject: [PATCH 13/39] Update schema/release-schema.json Co-authored-by: odscjen <95221058+odscjen@users.noreply.github.com> --- schema/release-schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/release-schema.json b/schema/release-schema.json index bf9187a47..c8f530961 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -726,7 +726,7 @@ }, "finalStatus": { "title": "Award final status", - "description": "The final status of the award, from the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", + "description": "The final status of the award, using the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", "type": [ "string", "null" From 4bab921b7905faf32c1a52101b733deb20ea7eb5 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 14 Nov 2023 09:41:20 +1300 Subject: [PATCH 14/39] schema/dereferenced-release-schema.json: Run ./manage.py pre-commit --- schema/dereferenced-release-schema.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/schema/dereferenced-release-schema.json b/schema/dereferenced-release-schema.json index 1dc5333f9..af4fbcc3b 100644 --- a/schema/dereferenced-release-schema.json +++ b/schema/dereferenced-release-schema.json @@ -6484,7 +6484,7 @@ }, "finalStatus": { "title": "Tender final status", - "description": "The final status of the tender, from the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", + "description": "The final status of the tender, using the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", "type": [ "string", "null" @@ -9138,7 +9138,7 @@ }, "finalStatus": { "title": "Award final status", - "description": "The final status of the award, from the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", + "description": "The final status of the award, using the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", "type": [ "string", "null" @@ -14622,7 +14622,7 @@ }, "finalStatus": { "title": "Contract final status", - "description": "The final status of the contract, from the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", + "description": "The final status of the contract, using the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", "type": [ "string", "null" @@ -20060,7 +20060,7 @@ }, "finalStatus": { "title": "Tender final status", - "description": "The final status of the tender, from the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", + "description": "The final status of the tender, using the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", "type": [ "string", "null" @@ -22710,7 +22710,7 @@ }, "finalStatus": { "title": "Award final status", - "description": "The final status of the award, from the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", + "description": "The final status of the award, using the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", "type": [ "string", "null" @@ -28188,7 +28188,7 @@ }, "finalStatus": { "title": "Contract final status", - "description": "The final status of the contract, from the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", + "description": "The final status of the contract, using the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", "type": [ "string", "null" From 73513152975b11c70af6c233769996673ce1d1f7 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 27 Feb 2024 12:14:48 +1300 Subject: [PATCH 15/39] docs/schema/codelists.md: Capitalize headings --- docs/schema/codelists.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/schema/codelists.md b/docs/schema/codelists.md index b66760c72..9a2e85ddb 100644 --- a/docs/schema/codelists.md +++ b/docs/schema/codelists.md @@ -334,7 +334,7 @@ For enterprises without employees, use the 'micro' code. :file: ../../build/current_lang/codelists/partyScale.csv ``` -### Tender final status +### Tender Final Status ```{versionadded} 1.2 ``` @@ -344,7 +344,7 @@ For enterprises without employees, use the 'micro' code. :file: ../../build/current_lang/codelists/tenderFinalStatus.csv ``` -### Award final status +### Award Final Status ```{versionadded} 1.2 ``` @@ -354,7 +354,7 @@ For enterprises without employees, use the 'micro' code. :file: ../../build/current_lang/codelists/awardFinalStatus.csv ``` -### Contract final status +### Contract Final Status ```{versionadded} 1.2 ``` From 47c5ab09ffab6d5a09a0b0660f32460875cd10e6 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 27 Feb 2024 12:16:16 +1300 Subject: [PATCH 16/39] release-schema: Update field titles --- schema/release-schema.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/schema/release-schema.json b/schema/release-schema.json index a82f3ed05..9cf4c3576 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -519,7 +519,7 @@ } }, "finalStatus": { - "title": "Tender final status", + "title": "Final status", "description": "The final status of the tender, using the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", "type": [ "string", @@ -725,7 +725,7 @@ } }, "finalStatus": { - "title": "Award final status", + "title": "Final status", "description": "The final status of the award, using the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", "type": [ "string", @@ -926,7 +926,7 @@ } }, "finalStatus": { - "title": "Contract final status", + "title": "Final status", "description": "The final status of the contract, using the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", "type": [ "string", From 6b50bdd75e35a08a04cb7b72730f3577bfc4f836 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 27 Feb 2024 12:26:18 +1300 Subject: [PATCH 17/39] Update schema/codelists/tenderFinalStatus.csv Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com> --- schema/codelists/tenderFinalStatus.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/schema/codelists/tenderFinalStatus.csv b/schema/codelists/tenderFinalStatus.csv index 656cdcb24..3cc58d00a 100644 --- a/schema/codelists/tenderFinalStatus.csv +++ b/schema/codelists/tenderFinalStatus.csv @@ -1,3 +1,4 @@ Code,Title,Description +complete,Complete,The bid submission deadline has passed. cancelled,Cancelled,"The contracting process was cancelled by the buyer or the procuring entity (for example, because of a change in needs, insufficient funds, or technical or procedural errors) after the contracting documents (for example, procurement documents) were available to potential supppliers, but not later than the bid submission deadline." unsuccessful,Unsuccessful,"The contracting process failed (for example, no bids were received, all bids were withdrawn by the bidders, all bids were rejected by the buyer or the procuring entity) after the contracting documents (for example, procurement documents) were available to potential suppliers, but not later than the bid submission deadline." From df3ca4eb6436fd3366f395209f74ca9fa3642246 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 27 Feb 2024 12:32:41 +1300 Subject: [PATCH 18/39] release-schema: Rename statusDetails to finalStatusDetails --- docs/history/changelog.md | 3 +-- schema/release-schema.json | 48 +++++++++++++++++++------------------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/docs/history/changelog.md b/docs/history/changelog.md index acccf23d7..74312a9ec 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -183,8 +183,7 @@ Per the [normative and non-normative content and changes policy](../governance/n * [#1324](https://github.com/open-contracting/standard/pull/1324) `tender.datePublished` * [#1421](https://github.com/open-contracting/standard/pull/1421) `tender.standstillPeriod` * [#1492](https://github.com/open-contracting/standard/pull/1492) `awards.datePublished` - * [#1165](https://github.com/open-contracting/standard/pull/1165) `statusDetails` to `Tender`, `Award` and `Contract` - * [#1648](https://github.com/open-contracting/standard/pull/1648) `finalStatus` to `Tender`, `Award` and `Contract` + * [#1648](https://github.com/open-contracting/standard/pull/1648) `finalStatus` and `finalStatusDetails` to `Tender`, `Award` and `Contract` * [#1208](https://github.com/open-contracting/standard/pull/1326) The estimated and maximum values of framework agreeemnts: * `tender.maximumValue`. Previously, `tender.value` was used for the maximum value. However, this led to double-counting. * `awards.maximumValue`. Previously, `awards.value` was used for the maximum value. However, this led to double-counting. diff --git a/schema/release-schema.json b/schema/release-schema.json index 9cf4c3576..11b29a620 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -256,14 +256,6 @@ "deprecatedVersion": "1.2" } }, - "statusDetails": { - "title": "Status details", - "description": "Additional details on the status of the tender. This field can be used to provide the local name of the status.", - "type": [ - "string", - "null" - ] - }, "procuringEntity": { "title": "Procuring entity", "description": "The organization managing the contracting (or planning) process. If an organization is both a buyer and a procuring entity (as can be the case in simple contracting processes), it should be disclosed using the buyer field, but not this field.", @@ -532,6 +524,14 @@ "unsuccessful", null ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the tender. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] } }, "patternProperties": { @@ -633,14 +633,6 @@ "deprecatedVersion": "1.2" } }, - "statusDetails": { - "title": "Status details", - "description": "Additional details on the status of the award. This field can be used to provide the local name of the status.", - "type": [ - "string", - "null" - ] - }, "date": { "title": "Award date", "description": "The date of the contract award. This is usually the date on which a decision to award was made.", @@ -739,6 +731,14 @@ "unsuccessful", null ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the award. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] } }, "patternProperties": { @@ -830,14 +830,6 @@ "deprecatedVersion": "1.2" } }, - "statusDetails": { - "title": "Status details", - "description": "Additional details on the status of the contract. This field can be used to provide the local name of the status.", - "type": [ - "string", - "null" - ] - }, "dateSigned": { "title": "Date concluded", "description": "The date the contract was concluded. Typically, this is the date when the last buyer or supplier signed the contract. However, if no contract is signed, then the date of contract conclusion may correspond to other dates (e.g. the date when the buyer notified the supplier, which had the legal effect of concluding the contract).", @@ -941,6 +933,14 @@ "unsuccessful", null ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the contract. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] } }, "patternProperties": { From 6ad1ff7814d86ecf1a15524ba0ef4b2258e9db06 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 27 Feb 2024 12:35:17 +1300 Subject: [PATCH 19/39] schema/codelists/contractFinalStatus.csv: Rename codes --- schema/codelists/contractFinalStatus.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schema/codelists/contractFinalStatus.csv b/schema/codelists/contractFinalStatus.csv index f31dd84b0..dcb472979 100644 --- a/schema/codelists/contractFinalStatus.csv +++ b/schema/codelists/contractFinalStatus.csv @@ -1,5 +1,5 @@ Code,Title,Description -terminatedSuccessfully,Terminated successfully,"The contract was concluded and in force, and is terminated due to its successful completion." -terminatedEarly,Terminated early,"The contract was concluded and in force, and is terminated early due to some non-completion." +complete,Complete,"The contract was concluded and in force, and is terminated due to its successful completion." +incomplete,Incomplete,"The contract was concluded and in force, and is terminated early due to some non-completion." cancelled,Cancelled,"The contracting process was cancelled by the buyer or the procuring entity (for example, because of a change in needs, insufficient funds, or technical or procedural errors) after the award was made and the standstill period, if any, had ended." unsuccessful,Unsuccessful,"The contract failed (for example, the winning bidder(s) refused to sign the contract) after the award was made and the standstill period, if any, had ended, but before the contract was concluded and in force." From 71f3226d3c11153c7dd618a316bdc0dd49eadacd Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 27 Feb 2024 12:59:51 +1300 Subject: [PATCH 20/39] docs/examples: Update status fields --- docs/examples/amendments/contract.json | 15 +---- docs/examples/amendments/easy_releases.json | 29 +-------- docs/examples/amendments/tender.json | 18 ++--- docs/examples/beneficial_ownership/award.json | 2 +- .../beneficial_owners_extension.json | 2 +- docs/examples/change_history/award.json | 2 - docs/examples/change_history/contract.json | 4 +- .../change_history/contractAmendment.json | 4 +- .../change_history/records/award.json | 36 +--------- .../change_history/records/contract.json | 61 ++--------------- .../records/contractAmendment.json | 65 +++---------------- .../records/implementation.json | 61 ++--------------- .../change_history/records/tender.json | 14 +--- .../change_history/records/tenderUpdate.json | 16 +---- docs/examples/change_history/tender.json | 2 +- .../change_history/tenderAmendment.json | 2 +- .../examples/change_history/tenderUpdate.json | 2 +- .../suspended_contract.json | 2 +- .../easy_releases/worked_example1/award.json | 2 +- .../worked_example1/contract.json | 4 +- .../easy_releases/worked_example1/tender.json | 2 +- .../worked_example1/tender_update.json | 2 +- .../easy_releases/worked_example2/award.json | 2 +- .../worked_example2/contract.json | 4 +- .../easy_releases/worked_example2/tender.json | 2 +- .../worked_example2/tender_update.json | 2 +- .../frameworks/closed_single_first_stage.json | 2 +- .../frameworks/closed_single_supplier.json | 5 +- .../frameworks/open_multiple_award.json | 3 +- .../frameworks/open_multiple_first_stage.json | 2 +- .../open_multiple_second_stage.json | 2 +- .../frameworks/open_multiple_supplier.json | 2 +- .../merging/deletions/array_award.json | 2 +- .../deletions/array_awardAmendment.json | 2 +- .../merging/deletions/array_record.json | 16 +---- .../merging/deletions/field_record.json | 16 +---- .../merging/deletions/field_tender.json | 2 +- .../merging/deletions/field_tenderUpdate.json | 2 +- .../merging/deletions/object_record.json | 16 +---- .../merging/deletions/object_tender.json | 2 +- .../deletions/object_tenderAmendment.json | 2 +- docs/examples/merging/embedded_releases.json | 22 +++---- docs/examples/merging/updates/award1.json | 2 +- docs/examples/merging/updates/award2.json | 2 +- docs/examples/merging/updates/merged.json | 6 +- docs/examples/merging/updates/tender1.json | 2 +- docs/examples/merging/updates/tender2.json | 2 +- docs/examples/merging/updates/tender3.json | 2 +- docs/examples/merging/updates/versioned.json | 36 +--------- ...entation_financial_milestones_not_met.json | 2 +- ...on_financial_milestones_partially_met.json | 2 +- ...tion_financial_milestones_transaction.json | 2 +- .../planning-tender-milestones-2.json | 2 +- docs/examples/organizations/identifiers.json | 1 - .../dhangadhi_female_chaired_example.json | 2 +- ...ional_wob_organization_classification.json | 2 +- .../moldova_organization_scale.json | 2 - .../uk_organization_classification.json | 1 - .../organizations/organization_reference.json | 3 +- ...nduras_organization_identifier_scheme.json | 1 - .../moldova_organization_extension.json | 2 +- .../paraguay_organization_name.json | 1 - .../organizations/personal_identifier.json | 2 +- .../release_package.json | 5 +- .../unsuccessful_tender/related_process.json | 5 +- docs/examples/unsuccessful_tender/tender.json | 2 +- 66 files changed, 112 insertions(+), 432 deletions(-) diff --git a/docs/examples/amendments/contract.json b/docs/examples/amendments/contract.json index b4e476a73..c37aafaa1 100644 --- a/docs/examples/amendments/contract.json +++ b/docs/examples/amendments/contract.json @@ -13,7 +13,6 @@ ], "contracts": [ { - "status": "active", "description": "Appliances for Tuvalu PPB Residence", "title": "4501062723", "items": [ @@ -97,7 +96,7 @@ ], "contracts": [ { - "status": "active", + "amendments": [ { "id": "1", @@ -183,7 +182,7 @@ "contracts": [ { "id": "CN3562241", - "status": "active", + "description": "Appliances for Tuvalu PPB Residence", "title": "4501062723", "items": [ @@ -280,16 +279,6 @@ "contracts": [ { "id": "CN3562241", - "status": [ - { - "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", - "releaseDate": "2019-02-15T01:00:58Z", - "releaseTag": [ - "contract" - ], - "value": "active" - } - ], "description": [ { "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24", diff --git a/docs/examples/amendments/easy_releases.json b/docs/examples/amendments/easy_releases.json index 893776dc8..7cd906eb6 100644 --- a/docs/examples/amendments/easy_releases.json +++ b/docs/examples/amendments/easy_releases.json @@ -37,15 +37,13 @@ "tender": { "procurementMethod": "limited", "procurementMethodDetails": "Limited tender", - "id": "ocds-d2phr6-6dcfcc44c9933c18d7f3cfa088de3319", - "status": "complete" + "id": "ocds-d2phr6-6dcfcc44c9933c18d7f3cfa088de3319" }, "id": "ocds-d2phr6-1000035663-tender-2015-04-04T00:00:00Z" }, { "contracts": [ { - "status": "active", "description": "Drupal websites in govCMS Platform Solution.", "title": "4400027941", "items": [ @@ -208,13 +206,11 @@ "tender": { "procurementMethod": "limited", "procurementMethodDetails": "Limited tender", - "id": "ocds-d2phr6-6dcfcc44c9933c18d7f3cfa088de3319", - "status": "complete" + "id": "ocds-d2phr6-6dcfcc44c9933c18d7f3cfa088de3319" }, "contracts": [ { "id": "CN3437424", - "status": "active", "description": "Drupal websites in govCMS Platform Solution.", "title": "4400027941", "items": [ @@ -479,32 +475,11 @@ ], "value": "ocds-d2phr6-6dcfcc44c9933c18d7f3cfa088de3319" } - ], - "status": [ - { - "releaseID": "ocds-d2phr6-1000035663-tender-2015-04-04T00:00:00Z", - "releaseDate": "2015-04-04T00:00:00Z", - "releaseTag": [ - "tender" - ], - "value": "complete" - } ] }, "contracts": [ { "id": "CN3437424", - "status": [ - { - "releaseID": "ocds-d2phr6-1000035663-contract-2015-05-04T00:00:00Z", - "releaseDate": "2015-05-04T00:00:00Z", - "releaseTag": [ - "award", - "contract" - ], - "value": "active" - } - ], "description": [ { "releaseID": "ocds-d2phr6-1000035663-contract-2015-05-04T00:00:00Z", diff --git a/docs/examples/amendments/tender.json b/docs/examples/amendments/tender.json index 59975919a..bf092b59c 100644 --- a/docs/examples/amendments/tender.json +++ b/docs/examples/amendments/tender.json @@ -34,7 +34,7 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Data merge tool.", - "status": "active", + "value": { "amount": 1000, "currency": "USD" @@ -81,7 +81,7 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "status": "active", + "value": { "amount": 1000, "currency": "USD" @@ -128,7 +128,7 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "status": "active", + "value": { "amount": 2000, "currency": "USD" @@ -185,7 +185,7 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "status": "active", + "value": { "amount": 2000, "currency": "USD" @@ -343,16 +343,6 @@ "value": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail." } ], - "status": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "active" - } - ], "value": { "amount": [ { diff --git a/docs/examples/beneficial_ownership/award.json b/docs/examples/beneficial_ownership/award.json index 5f7e91fa3..52948648d 100644 --- a/docs/examples/beneficial_ownership/award.json +++ b/docs/examples/beneficial_ownership/award.json @@ -27,7 +27,7 @@ "awards": [ { "id": "6031d3f9-f86b-462c-80b2-4a02c760ddcd", - "status": "active", + "date": "2021-06-07T00:00:00Z", "value": { "amount": 32191, diff --git a/docs/examples/beneficial_ownership/beneficial_owners_extension.json b/docs/examples/beneficial_ownership/beneficial_owners_extension.json index 56d6c84ea..1511c05b5 100644 --- a/docs/examples/beneficial_ownership/beneficial_owners_extension.json +++ b/docs/examples/beneficial_ownership/beneficial_owners_extension.json @@ -35,7 +35,7 @@ "awards": [ { "id": "f867a510-0edf-11eb-a6ca-b5f4fa6e44dc", - "status": "active", + "date": "2020-10-18T12:21:56Z", "value": { "amount": 56660, diff --git a/docs/examples/change_history/award.json b/docs/examples/change_history/award.json index 8c38777ed..c41932fae 100644 --- a/docs/examples/change_history/award.json +++ b/docs/examples/change_history/award.json @@ -78,7 +78,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "complete", "items": [ { "id": "0001", @@ -173,7 +172,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "pending", "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, diff --git a/docs/examples/change_history/contract.json b/docs/examples/change_history/contract.json index 3cce22225..adb4162f7 100644 --- a/docs/examples/change_history/contract.json +++ b/docs/examples/change_history/contract.json @@ -79,7 +79,7 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "active", + "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -142,7 +142,7 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town.", - "status": "active", + "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-08-01T23:59:00Z" diff --git a/docs/examples/change_history/contractAmendment.json b/docs/examples/change_history/contractAmendment.json index 9d9f0b172..b9c995bdb 100644 --- a/docs/examples/change_history/contractAmendment.json +++ b/docs/examples/change_history/contractAmendment.json @@ -79,7 +79,7 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "active", + "date": "2010-05-10T10:30:00Z", "value": { "amount": 11000000, @@ -142,7 +142,7 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "Contract monitoring for cycle lane construction.", - "status": "active", + "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-10-30T23:59:00Z" diff --git a/docs/examples/change_history/records/award.json b/docs/examples/change_history/records/award.json index 038bc9434..ce6107ec4 100644 --- a/docs/examples/change_history/records/award.json +++ b/docs/examples/change_history/records/award.json @@ -49,7 +49,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", @@ -166,7 +166,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", @@ -333,7 +333,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "complete", "items": [ { "id": "0001", @@ -428,7 +427,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "pending", "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -563,7 +561,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "complete", "items": [ { "id": "0001", @@ -658,7 +655,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "pending", "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -1131,24 +1127,6 @@ "value": "Tenders solicited for work to build new cycle lanes in the centre of town." } ], - "status": [ - { - "releaseID": "ocds-213czf-000-00001-02-tender", - "releaseDate": "2010-03-15T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "active" - }, - { - "releaseID": "ocds-213czf-000-00001-04-award", - "releaseDate": "2010-05-10T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "complete" - } - ], "items": [ { "id": "0001", @@ -1674,16 +1652,6 @@ "value": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town." } ], - "status": [ - { - "releaseID": "ocds-213czf-000-00001-04-award", - "releaseDate": "2010-05-10T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "pending" - } - ], "date": [ { "releaseID": "ocds-213czf-000-00001-04-award", diff --git a/docs/examples/change_history/records/contract.json b/docs/examples/change_history/records/contract.json index d10c7edf1..7d726e44c 100644 --- a/docs/examples/change_history/records/contract.json +++ b/docs/examples/change_history/records/contract.json @@ -49,7 +49,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", @@ -166,7 +166,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", @@ -333,7 +333,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "complete", "items": [ { "id": "0001", @@ -428,7 +427,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "pending", "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -563,7 +561,7 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "active", + "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -626,7 +624,7 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town.", - "status": "active", + "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-08-01T23:59:00Z" @@ -755,7 +753,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "complete", "items": [ { "id": "0001", @@ -850,7 +847,7 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "active", + "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -913,7 +910,7 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town.", - "status": "active", + "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-08-01T23:59:00Z" @@ -1380,24 +1377,6 @@ "value": "Tenders solicited for work to build new cycle lanes in the centre of town." } ], - "status": [ - { - "releaseID": "ocds-213czf-000-00001-02-tender", - "releaseDate": "2010-03-15T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "active" - }, - { - "releaseID": "ocds-213czf-000-00001-04-award", - "releaseDate": "2010-05-10T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "complete" - } - ], "items": [ { "id": "0001", @@ -1923,24 +1902,6 @@ "value": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town." } ], - "status": [ - { - "releaseID": "ocds-213czf-000-00001-04-award", - "releaseDate": "2010-05-10T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "pending" - }, - { - "releaseID": "ocds-213czf-000-00001-05-contract", - "releaseDate": "2010-06-10T10:30:00Z", - "releaseTag": [ - "contract" - ], - "value": "active" - } - ], "date": [ { "releaseID": "ocds-213czf-000-00001-04-award", @@ -2236,16 +2197,6 @@ "value": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town." } ], - "status": [ - { - "releaseID": "ocds-213czf-000-00001-05-contract", - "releaseDate": "2010-06-10T10:30:00Z", - "releaseTag": [ - "contract" - ], - "value": "active" - } - ], "period": { "startDate": [ { diff --git a/docs/examples/change_history/records/contractAmendment.json b/docs/examples/change_history/records/contractAmendment.json index be26dea14..27001b831 100644 --- a/docs/examples/change_history/records/contractAmendment.json +++ b/docs/examples/change_history/records/contractAmendment.json @@ -49,7 +49,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", @@ -166,7 +166,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", @@ -333,7 +333,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "complete", "items": [ { "id": "0001", @@ -428,7 +427,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "pending", "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -563,7 +561,7 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "active", + "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -626,7 +624,7 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town.", - "status": "active", + "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-08-01T23:59:00Z" @@ -856,7 +854,7 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "active", + "date": "2010-05-10T10:30:00Z", "value": { "amount": 11000000, @@ -919,7 +917,7 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "Contract monitoring for cycle lane construction.", - "status": "active", + "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-10-30T23:59:00Z" @@ -1057,7 +1055,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "complete", "items": [ { "id": "0001", @@ -1152,7 +1149,7 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "active", + "date": "2010-05-10T10:30:00Z", "value": { "amount": 11000000, @@ -1215,7 +1212,7 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "Contract monitoring for cycle lane construction.", - "status": "active", + "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-10-30T23:59:00Z" @@ -1713,24 +1710,6 @@ "value": "Tenders solicited for work to build new cycle lanes in the centre of town." } ], - "status": [ - { - "releaseID": "ocds-213czf-000-00001-02-tender", - "releaseDate": "2010-03-15T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "active" - }, - { - "releaseID": "ocds-213czf-000-00001-04-award", - "releaseDate": "2010-05-10T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "complete" - } - ], "items": [ { "id": "0001", @@ -2256,24 +2235,6 @@ "value": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town." } ], - "status": [ - { - "releaseID": "ocds-213czf-000-00001-04-award", - "releaseDate": "2010-05-10T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "pending" - }, - { - "releaseID": "ocds-213czf-000-00001-05-contract", - "releaseDate": "2010-06-10T10:30:00Z", - "releaseTag": [ - "contract" - ], - "value": "active" - } - ], "date": [ { "releaseID": "ocds-213czf-000-00001-04-award", @@ -2585,16 +2546,6 @@ "value": "Contract monitoring for cycle lane construction." } ], - "status": [ - { - "releaseID": "ocds-213czf-000-00001-05-contract", - "releaseDate": "2010-06-10T10:30:00Z", - "releaseTag": [ - "contract" - ], - "value": "active" - } - ], "period": { "startDate": [ { diff --git a/docs/examples/change_history/records/implementation.json b/docs/examples/change_history/records/implementation.json index 48f1f1f92..338fa512d 100644 --- a/docs/examples/change_history/records/implementation.json +++ b/docs/examples/change_history/records/implementation.json @@ -49,7 +49,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", @@ -166,7 +166,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", @@ -333,7 +333,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "complete", "items": [ { "id": "0001", @@ -428,7 +427,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "pending", "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -563,7 +561,7 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "active", + "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -626,7 +624,7 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town.", - "status": "active", + "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-08-01T23:59:00Z" @@ -856,7 +854,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "complete", "items": [ { "id": "0001", @@ -951,7 +948,7 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "active", + "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -1014,7 +1011,7 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town.", - "status": "active", + "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-08-01T23:59:00Z" @@ -1503,24 +1500,6 @@ "value": "Tenders solicited for work to build new cycle lanes in the centre of town." } ], - "status": [ - { - "releaseID": "ocds-213czf-000-00001-02-tender", - "releaseDate": "2010-03-15T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "active" - }, - { - "releaseID": "ocds-213czf-000-00001-04-award", - "releaseDate": "2010-05-10T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "complete" - } - ], "items": [ { "id": "0001", @@ -2046,24 +2025,6 @@ "value": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town." } ], - "status": [ - { - "releaseID": "ocds-213czf-000-00001-04-award", - "releaseDate": "2010-05-10T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "pending" - }, - { - "releaseID": "ocds-213czf-000-00001-05-contract", - "releaseDate": "2010-06-10T10:30:00Z", - "releaseTag": [ - "contract" - ], - "value": "active" - } - ], "date": [ { "releaseID": "ocds-213czf-000-00001-04-award", @@ -2359,16 +2320,6 @@ "value": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town." } ], - "status": [ - { - "releaseID": "ocds-213czf-000-00001-05-contract", - "releaseDate": "2010-06-10T10:30:00Z", - "releaseTag": [ - "contract" - ], - "value": "active" - } - ], "period": { "startDate": [ { diff --git a/docs/examples/change_history/records/tender.json b/docs/examples/change_history/records/tender.json index ac9336840..5241c7a72 100644 --- a/docs/examples/change_history/records/tender.json +++ b/docs/examples/change_history/records/tender.json @@ -49,7 +49,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", @@ -167,7 +167,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", @@ -468,16 +468,6 @@ "value": "Tenders solicited for work to build new cycle lanes in the centre of town." } ], - "status": [ - { - "releaseID": "ocds-213czf-000-00001-02-tender", - "releaseDate": "2010-03-15T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "active" - } - ], "items": [ { "id": "0001", diff --git a/docs/examples/change_history/records/tenderUpdate.json b/docs/examples/change_history/records/tenderUpdate.json index fa31db825..3b87a0d8c 100644 --- a/docs/examples/change_history/records/tenderUpdate.json +++ b/docs/examples/change_history/records/tenderUpdate.json @@ -49,7 +49,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", @@ -166,7 +166,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", @@ -303,7 +303,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", @@ -623,16 +623,6 @@ "value": "Tenders solicited for work to build new cycle lanes in the centre of town." } ], - "status": [ - { - "releaseID": "ocds-213czf-000-00001-02-tender", - "releaseDate": "2010-03-15T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "active" - } - ], "items": [ { "id": "0001", diff --git a/docs/examples/change_history/tender.json b/docs/examples/change_history/tender.json index e4b50b541..e383846d6 100644 --- a/docs/examples/change_history/tender.json +++ b/docs/examples/change_history/tender.json @@ -47,7 +47,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", diff --git a/docs/examples/change_history/tenderAmendment.json b/docs/examples/change_history/tenderAmendment.json index 46a32709d..522ce995f 100644 --- a/docs/examples/change_history/tenderAmendment.json +++ b/docs/examples/change_history/tenderAmendment.json @@ -47,7 +47,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", diff --git a/docs/examples/change_history/tenderUpdate.json b/docs/examples/change_history/tenderUpdate.json index 036f795a0..80c36e1f8 100644 --- a/docs/examples/change_history/tenderUpdate.json +++ b/docs/examples/change_history/tenderUpdate.json @@ -47,7 +47,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", diff --git a/docs/examples/contract_suspension/suspended_contract.json b/docs/examples/contract_suspension/suspended_contract.json index e79996884..014a7a685 100644 --- a/docs/examples/contract_suspension/suspended_contract.json +++ b/docs/examples/contract_suspension/suspended_contract.json @@ -104,7 +104,7 @@ "endDate": "2020-08-18T00:00:00+04:30", "startDate": "2019-09-25T00:00:00+04:30" }, - "status": "active", + "statusDetails": "suspended", "awardID": "MOE/W-316/96", "documents": [ diff --git a/docs/examples/easy_releases/worked_example1/award.json b/docs/examples/easy_releases/worked_example1/award.json index 0b53d04bf..dbad6ab01 100644 --- a/docs/examples/easy_releases/worked_example1/award.json +++ b/docs/examples/easy_releases/worked_example1/award.json @@ -35,7 +35,7 @@ "id": "101", "title": "Cleaning services", "description": "Cleaning services for the City Hall, from 01/2020 to 12/2020", - "status": "active", + "procurementMethod": "direct", "value": { "amount": 144300000, diff --git a/docs/examples/easy_releases/worked_example1/contract.json b/docs/examples/easy_releases/worked_example1/contract.json index 5b77987e9..c4cb38bb3 100644 --- a/docs/examples/easy_releases/worked_example1/contract.json +++ b/docs/examples/easy_releases/worked_example1/contract.json @@ -36,7 +36,7 @@ "id": "101", "title": "Cleaning services", "description": "Cleaning services for the City Hall, from 01/2020 to 12/2020", - "status": "active", + "procurementMethod": "direct", "value": { "amount": 144300000, @@ -71,7 +71,7 @@ "awardID": "371630/100", "title": "Cleaning services", "description": "Cleaning services for the City Hall", - "status": "active", + "value": { "amount": 116400000, "currency": "PYG" diff --git a/docs/examples/easy_releases/worked_example1/tender.json b/docs/examples/easy_releases/worked_example1/tender.json index 13d011e8d..af23c16d9 100644 --- a/docs/examples/easy_releases/worked_example1/tender.json +++ b/docs/examples/easy_releases/worked_example1/tender.json @@ -26,7 +26,7 @@ "id": "101", "title": "Cleaning services", "description": "Cleaning services for the City Hall", - "status": "active", + "procurementMethod": "direct", "value": { "amount": 144300000, diff --git a/docs/examples/easy_releases/worked_example1/tender_update.json b/docs/examples/easy_releases/worked_example1/tender_update.json index 1b5702cfd..8ba43319d 100644 --- a/docs/examples/easy_releases/worked_example1/tender_update.json +++ b/docs/examples/easy_releases/worked_example1/tender_update.json @@ -26,7 +26,7 @@ "id": "101", "title": "Cleaning services", "description": "Cleaning services for the City Hall, from 01/2020 to 12/2020", - "status": "active", + "procurementMethod": "direct", "value": { "amount": 144300000, diff --git a/docs/examples/easy_releases/worked_example2/award.json b/docs/examples/easy_releases/worked_example2/award.json index 53c7da677..b4323b8d0 100644 --- a/docs/examples/easy_releases/worked_example2/award.json +++ b/docs/examples/easy_releases/worked_example2/award.json @@ -35,7 +35,7 @@ "id": "101", "title": "Cleaning services", "description": "Cleaning services for the City Hall, from 01/2020 to 12/2020", - "status": "active", + "procurementMethod": "direct", "value": { "amount": 144300000, diff --git a/docs/examples/easy_releases/worked_example2/contract.json b/docs/examples/easy_releases/worked_example2/contract.json index 80e0e54f8..00b281b93 100644 --- a/docs/examples/easy_releases/worked_example2/contract.json +++ b/docs/examples/easy_releases/worked_example2/contract.json @@ -36,7 +36,7 @@ "id": "101", "title": "Cleaning services", "description": "Cleaning services for the City Hall, from 01/2020 to 12/2020", - "status": "active", + "procurementMethod": "direct", "value": { "amount": 144300000, @@ -71,7 +71,7 @@ "awardID": "371630/100", "title": "Cleaning services", "description": "Cleaning services for the City Hall", - "status": "active", + "value": { "amount": 116400000, "currency": "PYG" diff --git a/docs/examples/easy_releases/worked_example2/tender.json b/docs/examples/easy_releases/worked_example2/tender.json index c4fd648d0..efb6a8de0 100644 --- a/docs/examples/easy_releases/worked_example2/tender.json +++ b/docs/examples/easy_releases/worked_example2/tender.json @@ -26,7 +26,7 @@ "id": "101", "title": "Cleaning services", "description": "Cleaning services for the City Hall", - "status": "active", + "procurementMethod": "direct", "value": { "amount": 144300000, diff --git a/docs/examples/easy_releases/worked_example2/tender_update.json b/docs/examples/easy_releases/worked_example2/tender_update.json index 44d10f83a..b33c1ee46 100644 --- a/docs/examples/easy_releases/worked_example2/tender_update.json +++ b/docs/examples/easy_releases/worked_example2/tender_update.json @@ -26,7 +26,7 @@ "id": "101", "title": "Cleaning services", "description": "Cleaning services for the City Hall, from 01/2020 to 12/2020", - "status": "active", + "procurementMethod": "direct", "value": { "amount": 144300000, diff --git a/docs/examples/frameworks/closed_single_first_stage.json b/docs/examples/frameworks/closed_single_first_stage.json index feae5766d..c55ccd171 100644 --- a/docs/examples/frameworks/closed_single_first_stage.json +++ b/docs/examples/frameworks/closed_single_first_stage.json @@ -35,7 +35,7 @@ "id": "NP45719", "title": "Storage and Distribution of Seasonal Influenza Vaccine", "description": "This framework agreement is for the receipt, storage and distribution of seasonal influenza vaccines to GP practices, social care premises, vaccine holding centres and community pharmacies across NHS Scotland.", - "status": "active", + "procurementMethod": "open", "value": { "amount": 1120000, diff --git a/docs/examples/frameworks/closed_single_supplier.json b/docs/examples/frameworks/closed_single_supplier.json index c5640ee13..166261b01 100644 --- a/docs/examples/frameworks/closed_single_supplier.json +++ b/docs/examples/frameworks/closed_single_supplier.json @@ -18,13 +18,12 @@ } ], "tender": { - "id": "NP45719", - "status": "complete" + "id": "NP45719" }, "awards": [ { "id": "NP45719", - "status": "active", + "suppliers": [ { "name": "Movianto UK", diff --git a/docs/examples/frameworks/open_multiple_award.json b/docs/examples/frameworks/open_multiple_award.json index c2de97db4..a761d1f35 100644 --- a/docs/examples/frameworks/open_multiple_award.json +++ b/docs/examples/frameworks/open_multiple_award.json @@ -23,8 +23,7 @@ } ], "tender": { - "id": "547054", - "status": "complete" + "id": "547054" }, "awards": [ { diff --git a/docs/examples/frameworks/open_multiple_first_stage.json b/docs/examples/frameworks/open_multiple_first_stage.json index d8600a5f6..f69284aa1 100644 --- a/docs/examples/frameworks/open_multiple_first_stage.json +++ b/docs/examples/frameworks/open_multiple_first_stage.json @@ -55,7 +55,7 @@ }, "id": "2239-4-LP14", "title": "CM de Artículos de Escritorio y Papelería", - "status": "active", + "procuringEntity": { "name": "Dirección de Compras y Contratación Pública | Dirección de Compras y Contratación Pública", "id": "CL-MP-749218" diff --git a/docs/examples/frameworks/open_multiple_second_stage.json b/docs/examples/frameworks/open_multiple_second_stage.json index 505051ce4..a7f0de39f 100644 --- a/docs/examples/frameworks/open_multiple_second_stage.json +++ b/docs/examples/frameworks/open_multiple_second_stage.json @@ -33,7 +33,7 @@ "tender": { "id": "547054", "title": "Artículos de Escritorio y Papelería", - "status": "active", + "competitive": true, "procuringEntity": { "name": "Servicio Local de Educación Pública Puerto Cordillera | Servicio Local de Educación Pública Puerto Cordillera", diff --git a/docs/examples/frameworks/open_multiple_supplier.json b/docs/examples/frameworks/open_multiple_supplier.json index 711cebf6c..17aab9d15 100644 --- a/docs/examples/frameworks/open_multiple_supplier.json +++ b/docs/examples/frameworks/open_multiple_supplier.json @@ -38,7 +38,7 @@ { "id": "8603354", "title": "Convenio Marco de Artículos de Escritorio y Papelería", - "status": "active", + "date": "2014-12-17T16:33:32Z", "suppliers": [ { diff --git a/docs/examples/merging/deletions/array_award.json b/docs/examples/merging/deletions/array_award.json index 618ad5a93..ab9b8c2af 100644 --- a/docs/examples/merging/deletions/array_award.json +++ b/docs/examples/merging/deletions/array_award.json @@ -64,7 +64,7 @@ }, "awards": [ { - "status": "active", + "description": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "title": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "items": [ diff --git a/docs/examples/merging/deletions/array_awardAmendment.json b/docs/examples/merging/deletions/array_awardAmendment.json index 09f935716..cf49732b8 100644 --- a/docs/examples/merging/deletions/array_awardAmendment.json +++ b/docs/examples/merging/deletions/array_awardAmendment.json @@ -64,7 +64,7 @@ }, "awards": [ { - "status": "active", + "description": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "title": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "items": [ diff --git a/docs/examples/merging/deletions/array_record.json b/docs/examples/merging/deletions/array_record.json index 069427beb..7f691f8d2 100644 --- a/docs/examples/merging/deletions/array_record.json +++ b/docs/examples/merging/deletions/array_record.json @@ -67,7 +67,7 @@ }, "awards": [ { - "status": "active", + "description": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "title": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "items": [ @@ -236,7 +236,7 @@ }, "awards": [ { - "status": "active", + "description": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "title": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "items": [ @@ -373,7 +373,7 @@ "awards": [ { "id": "1201", - "status": "active", + "description": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "title": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "items": [ @@ -781,16 +781,6 @@ "awards": [ { "id": "1201", - "status": [ - { - "releaseID": "ocds-23g63a01-200502-award", - "releaseDate": "2018-12-31T23:00:00Z", - "releaseTag": [ - "award" - ], - "value": "active" - } - ], "description": [ { "releaseID": "ocds-23g63a01-200502-award", diff --git a/docs/examples/merging/deletions/field_record.json b/docs/examples/merging/deletions/field_record.json index c8d70d05f..766a22dff 100644 --- a/docs/examples/merging/deletions/field_record.json +++ b/docs/examples/merging/deletions/field_record.json @@ -42,7 +42,7 @@ "name": "INSTITUTO NACIONAL PENITENCIARIO Y CARCELARIO (INPEC)" }, "tender": { - "status": "active", + "description": "ADQUISICION DE COLCHONETAS PARA LA DOTACION DESTINADOS A LA POBLACION INTERNA DEL EPMSC ARMERO GUAYABAL TOLIMA", "title": "ADQUISICION DE COLCHONETAS PARA LA DOTACION DESTINADOS A LA POBLACION INTERNA DEL EPMSC ARMERO GUAYABAL TOLIMA", "procurementMethod": "open", @@ -100,7 +100,7 @@ "name": "INSTITUTO NACIONAL PENITENCIARIO Y CARCELARIO (INPEC)" }, "tender": { - "status": "active", + "description": null, "title": "ADQUISICION DE COLCHONETAS PARA LA DOTACION DESTINADOS A LA POBLACION INTERNA DEL EPMSC ARMERO GUAYABAL TOLIMA", "procurementMethod": "open", @@ -159,7 +159,7 @@ "name": "INSTITUTO NACIONAL PENITENCIARIO Y CARCELARIO (INPEC)" }, "tender": { - "status": "active", + "title": "ADQUISICION DE COLCHONETAS PARA LA DOTACION DESTINADOS A LA POBLACION INTERNA DEL EPMSC ARMERO GUAYABAL TOLIMA", "procurementMethod": "open", "procurementMethodDetails": "Subasta", @@ -337,16 +337,6 @@ ] }, "tender": { - "status": [ - { - "releaseID": "13-9-368828-tender", - "releaseDate": "2013-07-28T09:40:10.000Z", - "releaseTag": [ - "tender" - ], - "value": "active" - } - ], "description": [ { "releaseID": "13-9-368828-tender", diff --git a/docs/examples/merging/deletions/field_tender.json b/docs/examples/merging/deletions/field_tender.json index 93d2da939..c5063d705 100644 --- a/docs/examples/merging/deletions/field_tender.json +++ b/docs/examples/merging/deletions/field_tender.json @@ -39,7 +39,7 @@ "name": "INSTITUTO NACIONAL PENITENCIARIO Y CARCELARIO (INPEC)" }, "tender": { - "status": "active", + "description": "ADQUISICION DE COLCHONETAS PARA LA DOTACION DESTINADOS A LA POBLACION INTERNA DEL EPMSC ARMERO GUAYABAL TOLIMA", "title": "ADQUISICION DE COLCHONETAS PARA LA DOTACION DESTINADOS A LA POBLACION INTERNA DEL EPMSC ARMERO GUAYABAL TOLIMA", "procurementMethod": "open", diff --git a/docs/examples/merging/deletions/field_tenderUpdate.json b/docs/examples/merging/deletions/field_tenderUpdate.json index a77c746f4..1c60d1ee5 100644 --- a/docs/examples/merging/deletions/field_tenderUpdate.json +++ b/docs/examples/merging/deletions/field_tenderUpdate.json @@ -39,7 +39,7 @@ "name": "INSTITUTO NACIONAL PENITENCIARIO Y CARCELARIO (INPEC)" }, "tender": { - "status": "active", + "description": null, "title": "ADQUISICION DE COLCHONETAS PARA LA DOTACION DESTINADOS A LA POBLACION INTERNA DEL EPMSC ARMERO GUAYABAL TOLIMA", "procurementMethod": "open", diff --git a/docs/examples/merging/deletions/object_record.json b/docs/examples/merging/deletions/object_record.json index 232e13c13..68f1eadab 100644 --- a/docs/examples/merging/deletions/object_record.json +++ b/docs/examples/merging/deletions/object_record.json @@ -42,7 +42,7 @@ }, "tender": { "id": "11-13-651832", - "status": "active", + "description": "CONSTRUCCIÓN DE OBRAS DE REHABILITACIÓN Y MANTENIMIENTO DE LA VÍA CARRETEABLE: VEREDA CURACAS-VEREDA LA MONJITA, EN UNA EXTENSIÓN DE SEIS (06) KILÓMETROS EN MUNICIPIO DE MERCADERES CAUCA.", "procurementMethod": "open", "submissionMethodDetails": "Municipio obtención: Mercaderes, Municipio entrega: Mercaderes, Municipio ejecución: No definido, Lugar aclaraciones: No definido", @@ -103,7 +103,7 @@ }, "tender": { "id": "11-13-651832", - "status": "active", + "description": "CONSTRUCCIÓN DE OBRAS DE REHABILITACIÓN Y MANTENIMIENTO DE LA VÍA CARRETEABLE: VEREDA CURACAS-VEREDA LA MONJITA, EN UNA EXTENSIÓN DE SEIS (06) KILÓMETROS EN MUNICIPIO DE MERCADERES CAUCA.", "procurementMethod": "open", "submissionMethodDetails": "Municipio obtención: Mercaderes, Municipio entrega: Mercaderes, Municipio ejecución: No definido, Lugar aclaraciones: No definido", @@ -175,7 +175,7 @@ }, "tender": { "id": "11-13-651832", - "status": "active", + "description": "CONSTRUCCIÓN DE OBRAS DE REHABILITACIÓN Y MANTENIMIENTO DE LA VÍA CARRETEABLE: VEREDA CURACAS-VEREDA LA MONJITA, EN UNA EXTENSIÓN DE SEIS (06) KILÓMETROS EN MUNICIPIO DE MERCADERES CAUCA.", "procurementMethod": "open", "submissionMethodDetails": "Municipio obtención: Mercaderes, Municipio entrega: Mercaderes, Municipio ejecución: No definido, Lugar aclaraciones: No definido", @@ -364,16 +364,6 @@ "value": "11-13-651832" } ], - "status": [ - { - "releaseID": "11-13-651832-tender", - "releaseDate": "2011-10-14T16:26:49.000Z", - "releaseTag": [ - "tender" - ], - "value": "active" - } - ], "description": [ { "releaseID": "11-13-651832-tender", diff --git a/docs/examples/merging/deletions/object_tender.json b/docs/examples/merging/deletions/object_tender.json index f3b2ed967..f2eff2078 100644 --- a/docs/examples/merging/deletions/object_tender.json +++ b/docs/examples/merging/deletions/object_tender.json @@ -39,7 +39,7 @@ }, "tender": { "id": "11-13-651832", - "status": "active", + "description": "CONSTRUCCIÓN DE OBRAS DE REHABILITACIÓN Y MANTENIMIENTO DE LA VÍA CARRETEABLE: VEREDA CURACAS-VEREDA LA MONJITA, EN UNA EXTENSIÓN DE SEIS (06) KILÓMETROS EN MUNICIPIO DE MERCADERES CAUCA.", "procurementMethod": "open", "submissionMethodDetails": "Municipio obtención: Mercaderes, Municipio entrega: Mercaderes, Municipio ejecución: No definido, Lugar aclaraciones: No definido", diff --git a/docs/examples/merging/deletions/object_tenderAmendment.json b/docs/examples/merging/deletions/object_tenderAmendment.json index 7c2d5e92a..d8500b329 100644 --- a/docs/examples/merging/deletions/object_tenderAmendment.json +++ b/docs/examples/merging/deletions/object_tenderAmendment.json @@ -39,7 +39,7 @@ }, "tender": { "id": "11-13-651832", - "status": "active", + "description": "CONSTRUCCIÓN DE OBRAS DE REHABILITACIÓN Y MANTENIMIENTO DE LA VÍA CARRETEABLE: VEREDA CURACAS-VEREDA LA MONJITA, EN UNA EXTENSIÓN DE SEIS (06) KILÓMETROS EN MUNICIPIO DE MERCADERES CAUCA.", "procurementMethod": "open", "submissionMethodDetails": "Municipio obtención: Mercaderes, Municipio entrega: Mercaderes, Municipio ejecución: No definido, Lugar aclaraciones: No definido", diff --git a/docs/examples/merging/embedded_releases.json b/docs/examples/merging/embedded_releases.json index bb930d37d..cc5f245ff 100644 --- a/docs/examples/merging/embedded_releases.json +++ b/docs/examples/merging/embedded_releases.json @@ -51,7 +51,7 @@ } } ], - "status": "active", + "suppliers": [ { "id": "GB-COH-1234567844", @@ -167,7 +167,7 @@ "endDate": "2011-08-01T23:59:00Z", "startDate": "2010-07-01T00:00:00Z" }, - "status": "active", + "title": "Contract to build new cycle lanes in the centre of town.", "value": { "amount": 11000000, @@ -392,7 +392,7 @@ "id": "GB-LAC-E09000003", "name": "London Borough of Barnet" }, - "status": "active", + "submissionMethodDetails": "Submit through the online portal at http://example.com/submissions/ocds-213czf-000-00001-01/", "tenderPeriod": { "endDate": "2011-04-01T18:00:00Z", @@ -487,7 +487,6 @@ "id": "ocds-213czf-000-00001-01-planning", "title": "Planned cycle lane improvements", "description": "The authority plans to tender for improvements to the cycle lane in early 2010. This notice provides advanced notice of the intention to tender, and details to upcoming consultation events.", - "status": "planned", "items": [ { "id": "0001", @@ -612,7 +611,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", @@ -729,7 +728,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", @@ -873,7 +872,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "items": [ { "id": "0001", @@ -1041,7 +1040,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "AnyCorp Ltd has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "pending", "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -1176,7 +1174,7 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "AnyCorp Ltd has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "active", + "date": "2010-05-10T10:30:00Z", "value": { "amount": 11000000, @@ -1239,7 +1237,7 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "A contract has been signed between the Council and AnyCorp Ltd for construction of new cycle lanes in the centre of town.", - "status": "active", + "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-08-01T23:59:00Z" @@ -1368,7 +1366,7 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "AnyCorp Ltd has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "active", + "date": "2010-05-10T10:30:00Z", "value": { "amount": 11000000, @@ -1431,7 +1429,7 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "Contract monitoring for cycle lane construction.", - "status": "active", + "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-08-01T23:59:00Z" diff --git a/docs/examples/merging/updates/award1.json b/docs/examples/merging/updates/award1.json index 6c94c1d8f..2dcae41ff 100644 --- a/docs/examples/merging/updates/award1.json +++ b/docs/examples/merging/updates/award1.json @@ -33,7 +33,7 @@ "id": "ocds-213czf-000-00002-award-supplier-one", "title": "Award of contract to create the data merging tool.", "description": "Supplier 1 has been commissioned to create the merge tool. A separate contract will be awarded to write the documentation", - "status": "active", + "date": "2016-03-01T09:30:00Z", "value": { "amount": 750, diff --git a/docs/examples/merging/updates/award2.json b/docs/examples/merging/updates/award2.json index aa5db86b2..d24bd7a1d 100644 --- a/docs/examples/merging/updates/award2.json +++ b/docs/examples/merging/updates/award2.json @@ -33,7 +33,7 @@ "id": "ocds-213czf-000-00002-award-supplier-two", "title": "Award of contract to create the data merging tool.", "description": "Supplier 2 has been commissioned to create the documentation. A separate contract will be awarded to create the tool", - "status": "active", + "date": "2016-03-03T09:30:00Z", "value": { "amount": 750, diff --git a/docs/examples/merging/updates/merged.json b/docs/examples/merging/updates/merged.json index ad48e1095..8f9b1425d 100644 --- a/docs/examples/merging/updates/merged.json +++ b/docs/examples/merging/updates/merged.json @@ -70,7 +70,7 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "status": "active", + "value": { "amount": 2000, "currency": "USD" @@ -100,7 +100,7 @@ "id": "ocds-213czf-000-00002-award-supplier-one", "title": "Award of contract to create the data merging tool.", "description": "Supplier 1 has been commissioned to create the merge tool. A separate contract will be awarded to write the documentation", - "status": "active", + "date": "2016-03-01T09:30:00Z", "value": { "amount": 750, @@ -111,7 +111,7 @@ "id": "ocds-213czf-000-00002-award-supplier-two", "title": "Award of contract to create the data merging tool.", "description": "Supplier 2 has been commissioned to create the documentation. A separate contract will be awarded to create the tool", - "status": "active", + "date": "2016-03-03T09:30:00Z", "value": { "amount": 750, diff --git a/docs/examples/merging/updates/tender1.json b/docs/examples/merging/updates/tender1.json index 9ae8a1406..d356ade38 100644 --- a/docs/examples/merging/updates/tender1.json +++ b/docs/examples/merging/updates/tender1.json @@ -32,7 +32,7 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Data merge tool.", - "status": "active", + "value": { "amount": 1000, "currency": "USD" diff --git a/docs/examples/merging/updates/tender2.json b/docs/examples/merging/updates/tender2.json index cc9f44348..da89c6b7e 100644 --- a/docs/examples/merging/updates/tender2.json +++ b/docs/examples/merging/updates/tender2.json @@ -32,7 +32,7 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "status": "active", + "value": { "amount": 1000, "currency": "USD" diff --git a/docs/examples/merging/updates/tender3.json b/docs/examples/merging/updates/tender3.json index cb598e723..4fc843f73 100644 --- a/docs/examples/merging/updates/tender3.json +++ b/docs/examples/merging/updates/tender3.json @@ -32,7 +32,7 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "status": "active", + "value": { "amount": 2000, "currency": "USD" diff --git a/docs/examples/merging/updates/versioned.json b/docs/examples/merging/updates/versioned.json index 4d686b7ea..a6cdb0176 100644 --- a/docs/examples/merging/updates/versioned.json +++ b/docs/examples/merging/updates/versioned.json @@ -70,7 +70,7 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "status": "active", + "value": { "amount": 2000, "currency": "USD" @@ -100,7 +100,7 @@ "id": "ocds-213czf-000-00002-award-supplier-one", "title": "Award of contract to create the data merging tool.", "description": "Supplier 1 has been commissioned to create the merge tool. A separate contract will be awarded to write the documentation", - "status": "active", + "date": "2016-03-01T09:30:00Z", "value": { "amount": 750, @@ -111,7 +111,7 @@ "id": "ocds-213czf-000-00002-award-supplier-two", "title": "Award of contract to create the data merging tool.", "description": "Supplier 2 has been commissioned to create the documentation. A separate contract will be awarded to create the tool", - "status": "active", + "date": "2016-03-03T09:30:00Z", "value": { "amount": 750, @@ -252,16 +252,6 @@ "value": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail." } ], - "status": [ - { - "releaseID": "ocds-213czf-000-00002-01-tender", - "releaseDate": "2016-01-01T09:30:00Z", - "releaseTag": [ - "tender" - ], - "value": "active" - } - ], "value": { "amount": [ { @@ -433,16 +423,6 @@ "value": "Supplier 1 has been commissioned to create the merge tool. A separate contract will be awarded to write the documentation" } ], - "status": [ - { - "releaseID": "ocds-213czf-000-00002-01-award1", - "releaseDate": "2016-03-01T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "active" - } - ], "date": [ { "releaseID": "ocds-213czf-000-00002-01-award1", @@ -498,16 +478,6 @@ "value": "Supplier 2 has been commissioned to create the documentation. A separate contract will be awarded to create the tool" } ], - "status": [ - { - "releaseID": "ocds-213czf-000-00002-01-award2", - "releaseDate": "2016-03-03T09:30:00Z", - "releaseTag": [ - "award" - ], - "value": "active" - } - ], "date": [ { "releaseID": "ocds-213czf-000-00002-01-award2", diff --git a/docs/examples/milestones/implementation_financial_milestones_not_met.json b/docs/examples/milestones/implementation_financial_milestones_not_met.json index e97475d47..9ef10166d 100644 --- a/docs/examples/milestones/implementation_financial_milestones_not_met.json +++ b/docs/examples/milestones/implementation_financial_milestones_not_met.json @@ -4,7 +4,7 @@ { "contracts": [ { - "status": "active", + "title": "School repairs and mantainance projects, Rahman Baba & Khushal Khan Khattak", "implementation": { "milestones": [ diff --git a/docs/examples/milestones/implementation_financial_milestones_partially_met.json b/docs/examples/milestones/implementation_financial_milestones_partially_met.json index 9618258c4..269d35a18 100644 --- a/docs/examples/milestones/implementation_financial_milestones_partially_met.json +++ b/docs/examples/milestones/implementation_financial_milestones_partially_met.json @@ -4,7 +4,7 @@ { "contracts": [ { - "status": "active", + "title": "School repairs and mantainance projects, Rahman Baba & Khushal Khan Khattak", "implementation": { "milestones": [ diff --git a/docs/examples/milestones/implementation_financial_milestones_transaction.json b/docs/examples/milestones/implementation_financial_milestones_transaction.json index 51f131c70..f4d53b82b 100644 --- a/docs/examples/milestones/implementation_financial_milestones_transaction.json +++ b/docs/examples/milestones/implementation_financial_milestones_transaction.json @@ -4,7 +4,7 @@ { "contracts": [ { - "status": "active", + "title": "School repairs and mantainance projects, Rahman Baba & Khushal Khan Khattak", "implementation": { "milestones": [ diff --git a/docs/examples/milestones/planning-tender-milestones-2.json b/docs/examples/milestones/planning-tender-milestones-2.json index 8713937fa..890b5609a 100644 --- a/docs/examples/milestones/planning-tender-milestones-2.json +++ b/docs/examples/milestones/planning-tender-milestones-2.json @@ -10,7 +10,7 @@ ], "tender": { "id": "001002003", - "status": "active", + "milestones": [ { "id": 1, diff --git a/docs/examples/organizations/identifiers.json b/docs/examples/organizations/identifiers.json index e6dcc29a5..b20b251fa 100644 --- a/docs/examples/organizations/identifiers.json +++ b/docs/examples/organizations/identifiers.json @@ -78,7 +78,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Licenses for analytical software", "description": "IBM has been awarded for licenses for the SPSS Statistics software", - "status": "pending", "date": "2010-05-10T09:30:00Z", "value": { "amount": 1096000, diff --git a/docs/examples/organizations/organization_classification/dhangadhi_female_chaired_example.json b/docs/examples/organizations/organization_classification/dhangadhi_female_chaired_example.json index f0ffe7b8b..2fcb29f81 100644 --- a/docs/examples/organizations/organization_classification/dhangadhi_female_chaired_example.json +++ b/docs/examples/organizations/organization_classification/dhangadhi_female_chaired_example.json @@ -39,7 +39,7 @@ "id": "NP-CRO-UC-1160" } ], - "status": "active", + "date": "2019-01-01T00:00:00+05:45", "id": "IMS/1160-awards/1", "title": "धनगढी उदाहरण पुरस्कार" diff --git a/docs/examples/organizations/organization_classification/fictional_wob_organization_classification.json b/docs/examples/organizations/organization_classification/fictional_wob_organization_classification.json index 92b7fd7ae..43360cff5 100644 --- a/docs/examples/organizations/organization_classification/fictional_wob_organization_classification.json +++ b/docs/examples/organizations/organization_classification/fictional_wob_organization_classification.json @@ -38,7 +38,7 @@ "id": "CF-CDC-A564321" } ], - "status": "active", + "date": "2019-01-01T00:00:00+05:45", "id": "ocds-213czf-col-cf-awards/1", "title": "Servicios de proyectos de datos abiertos de la ciudad" diff --git a/docs/examples/organizations/organization_classification/moldova_organization_scale.json b/docs/examples/organizations/organization_classification/moldova_organization_scale.json index 8533b91fe..3d0ee05ff 100644 --- a/docs/examples/organizations/organization_classification/moldova_organization_scale.json +++ b/docs/examples/organizations/organization_classification/moldova_organization_scale.json @@ -30,7 +30,6 @@ "id": "ocds-b3wdp1-MD-1554728148222-tender", "title": "Îmbunătățirea planificată a pistelor ciclice", "description": "Ofertanții au solicitat lucrări pentru construirea de noi biciclete în centrul orașului.", - "status": "complete", "hasEnquiries": false, "submissionMethodDetails": "Lista platformelor: achizitii, ebs, licitatie, yptender", "tenderers": [ @@ -44,7 +43,6 @@ { "id": "e5b771e0-715e-11e9-94b9-f5c641d7a5b5", "description": "Compania mică a primit contractul pentru construirea de noi piste pentru biciclete în centrul orașului.", - "status": "pending", "date": "2019-05-15T10:24:53Z", "value": { "amount": 27089725.78, diff --git a/docs/examples/organizations/organization_classification/uk_organization_classification.json b/docs/examples/organizations/organization_classification/uk_organization_classification.json index e080d6a92..e5e37dba5 100644 --- a/docs/examples/organizations/organization_classification/uk_organization_classification.json +++ b/docs/examples/organizations/organization_classification/uk_organization_classification.json @@ -14,7 +14,6 @@ "tender": { "id": "016248-Zg9B567X-001", "description": "Tender for the provision of borough reablement services, subsection frailty 65+.", - "status": "complete", "mainProcurementCategory": "services", "procurementMethodDetails": "Open procedure", "title": "Reablement — Frailty 65+", diff --git a/docs/examples/organizations/organization_reference.json b/docs/examples/organizations/organization_reference.json index c06123e08..2ca79b738 100644 --- a/docs/examples/organizations/organization_reference.json +++ b/docs/examples/organizations/organization_reference.json @@ -32,7 +32,7 @@ "tender": { "id": "ocds-213czf-000-00001-01-tender", "title": "Open Data publication improvements", - "status": "active", + "tenderers": [ { "id": "GB-COH-09506232", @@ -44,7 +44,6 @@ { "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to improve open data publications.", - "status": "pending", "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, diff --git a/docs/examples/organizations/organizational_units/honduras_organization_identifier_scheme.json b/docs/examples/organizations/organizational_units/honduras_organization_identifier_scheme.json index d121091e0..f2e800d7d 100644 --- a/docs/examples/organizations/organizational_units/honduras_organization_identifier_scheme.json +++ b/docs/examples/organizations/organizational_units/honduras_organization_identifier_scheme.json @@ -45,7 +45,6 @@ "name": "Secretaría de Salud Pública - Hospital San Felipe" }, "tender": { - "status": "planned", "description": "SOLICITADO POR LA BODEGA DE VIVERES, PARA SER UTILIZADO EN LA ALIMENTACION DE PACIENTES INTERNOS Y EMPLEADOS DE ESTE CENTRO ASISTENCIAL, DURANTE EL 4to. TRIMESTRE DEL 2019", "tenderPeriod": { "startDate": "2011-02-23T12:59:00-06:00", diff --git a/docs/examples/organizations/organizational_units/moldova_organization_extension.json b/docs/examples/organizations/organizational_units/moldova_organization_extension.json index bf8b52d57..87d837eb5 100644 --- a/docs/examples/organizations/organizational_units/moldova_organization_extension.json +++ b/docs/examples/organizations/organizational_units/moldova_organization_extension.json @@ -16,7 +16,7 @@ "id": "ocds-b3wdp1-MD-1539840280133", "title": "Piese consumabile pentru aparatele multifuncționale", "description": "Livrarea timp de 30 zile", - "status": "active", + "value": { "amount": 1400000.0, "currency": "MDL" diff --git a/docs/examples/organizations/organizational_units/paraguay_organization_name.json b/docs/examples/organizations/organizational_units/paraguay_organization_name.json index 8354c7388..58867b31b 100644 --- a/docs/examples/organizations/organizational_units/paraguay_organization_name.json +++ b/docs/examples/organizations/organizational_units/paraguay_organization_name.json @@ -51,7 +51,6 @@ "tender": { "id": "359402", "description": "ADQUISICION DE REACTIVOS E INSUMOS DE HEMOCENTRO Y UMT DEL HOSPITAL DE CLINICAS ? AD RERENDUM PRESUPUESTO 2020", - "status": "planned", "procurementMethod": "open", "mainProcurementCategory": "goods", "procuringEntity": { diff --git a/docs/examples/organizations/personal_identifier.json b/docs/examples/organizations/personal_identifier.json index dfd3a15ba..c9faae305 100644 --- a/docs/examples/organizations/personal_identifier.json +++ b/docs/examples/organizations/personal_identifier.json @@ -30,7 +30,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "active", + "tenderers": [ { "id": "COL-IDCARD-1234567", diff --git a/docs/examples/release_schema_reference/release_package.json b/docs/examples/release_schema_reference/release_package.json index 1794e2bc2..916d9530f 100644 --- a/docs/examples/release_schema_reference/release_package.json +++ b/docs/examples/release_schema_reference/release_package.json @@ -121,7 +121,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "status": "complete", "statusDetails": "Evaluating proposals", "procuringEntity": { "id": "GB-LAC-E09000003", @@ -238,7 +237,7 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "AnyCorp Ltd has been awarded the contract to build new cycle lanes in the centre of town.", - "status": "active", + "statusDetails": "Awarded", "date": "2010-05-10T10:30:00Z", "value": { @@ -304,7 +303,7 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "Contract monitoring for cycle lane construction.", - "status": "active", + "statusDetails": "Signed", "dateSigned": "2015-06-10T14:23:12Z", "value": { diff --git a/docs/examples/unsuccessful_tender/related_process.json b/docs/examples/unsuccessful_tender/related_process.json index 96842d7c6..62e8d9392 100644 --- a/docs/examples/unsuccessful_tender/related_process.json +++ b/docs/examples/unsuccessful_tender/related_process.json @@ -6,7 +6,7 @@ "awards": [ { "id": "331547-kurosu-cia-sa-2", - "status": "active", + "date": "2017-10-30T12:00:00-04:00", "value": { "amount": 417343000, @@ -53,7 +53,6 @@ "tender": { "id": "331547-adquisicion-maquinaria-implemento-vehiculo-3", "title": "ADQUISICION DE MAQUINARIA, IMPLEMENTO Y VEHICULO", - "status": "complete", "awardCriteria": "priceOnly", "awardCriteriaDetails": "Por Item", "submissionMethodDetails": "Lugar entrega ofertas: MUNICIPALIDA DE LOMA PLATA || Lugar entrega bien: Según documento del llamado || Fecha entrega bien: Según documento del llamado", @@ -91,7 +90,7 @@ { "id": "ux682+kLP2w=", "title": "2 - ROTATIVA", - "status": "active", + "value": { "amount": 32000000, "currency": "PYG" diff --git a/docs/examples/unsuccessful_tender/tender.json b/docs/examples/unsuccessful_tender/tender.json index 05a676983..54a1932d1 100644 --- a/docs/examples/unsuccessful_tender/tender.json +++ b/docs/examples/unsuccessful_tender/tender.json @@ -6,7 +6,7 @@ "tender": { "id": "331547-servicio-rastreo-satelital-1", "title": "SERVICIO DE RASTREO SATELITAL", - "status": "unsuccessful", + "finalStatus": "unsuccessful", "awardCriteria": "priceOnly", "awardCriteriaDetails": "Por Total", "submissionMethodDetails": "Lugar entrega ofertas: MUNICIPALIDAD DE LOMA PLATA || Lugar entrega bien: Según documento del llamado || Fecha entrega bien: Según documento del llamado", From 9e32f1f1b1d1a4852013abc77a77d16724ef1b68 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 27 Feb 2024 13:09:43 +1300 Subject: [PATCH 21/39] docs/guidance: Update references to status fields in Markdown examples --- docs/guidance/build/change_history.md | 4 ++-- docs/guidance/design/user_needs.md | 2 +- docs/guidance/map/framework_agreements.md | 4 ---- docs/guidance/map/unsuccessful_processes.md | 4 ++-- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/docs/guidance/build/change_history.md b/docs/guidance/build/change_history.md index 16c448e6f..a00b20940 100644 --- a/docs/guidance/build/change_history.md +++ b/docs/guidance/build/change_history.md @@ -64,9 +64,9 @@ The procuring entity makes the decision to award the contract to Balfour Beatty. The publisher creates a new OCDS release for the award. The record has the relevant information in the award section and uses the 'award' tag. -The `parties` array has a new entry with the supplier's information. The complete `tender` section is repeated, with the `status` field set to 'complete'. Previous releases remain unchanged. +The `parties` array has a new entry with the supplier's information. The complete `tender` section is repeated. Previous releases remain unchanged. -The publisher adds the new release to the record. They also update the compiled and versioned releases. The compiled release reflects the changes to the `awards`, `tender` and `parties` sections. The versioned release includes a new change for the `tender.status` field. +The publisher adds the new release to the record. They also update the compiled and versioned releases. The compiled release reflects the changes to the `awards` and `parties` sections. ```{jsoninclude} ../../examples/change_history/award.json :jsonpointer: /releases diff --git a/docs/guidance/design/user_needs.md b/docs/guidance/design/user_needs.md index 578e25099..23d7fa8f3 100644 --- a/docs/guidance/design/user_needs.md +++ b/docs/guidance/design/user_needs.md @@ -64,4 +64,4 @@ Inefficiencies might arise due to inadequate systems or institutional arrangemen Public procurement agencies are particularly interested in identifying areas for efficiency improvements. Interventions might include, for example: analyzing delays; analyzing the duration of different stages of the contracting process; structuring procurement information to improve internal coordination; streamlining internal processes without duplicating effort across different stages of the contracting process; developing market engagement strategies to prepare better tender specifications; or promoting the use of e-procurement systems. -**Key data fields**: The dates for the different stages of the contracting process, and the status of the tender, awards and contracts. +**Key data fields**: The dates for the different stages of the contracting process, and the final status of the tender, awards and contracts. diff --git a/docs/guidance/map/framework_agreements.md b/docs/guidance/map/framework_agreements.md index 55a3b9843..c695d992b 100644 --- a/docs/guidance/map/framework_agreements.md +++ b/docs/guidance/map/framework_agreements.md @@ -110,7 +110,6 @@ The following guidance describes how to model the different stages of a framewor * For each supplier: * Add an `Organization` object to the `parties` array, add 'supplier' to its `.roles` and populate its other fields. * Add an `OrganizationReference` object to the award's `.suppliers` array, and set its `.id` and `.name` to match the supplier's object in the `parties` array. -* If no further suppliers will be added to the framework agreement, set `tender.status` to 'complete'. ### Award of a procurement contract without second-stage competition @@ -184,7 +183,6 @@ NSS issues a [contract award notice](https://ted.europa.eu/udl?uri=TED:NOTICE:26 The notice is modelled as an OCDS release with the same `ocid` as the previous release, a `tag` of 'award', and the following properties: -* Since no further suppliers will be added to the framework agreement, `tender.status` is set to 'complete'. * An `Award` object is added to the `awards` array. * An `Organization` object is added to the `parties` array with the supplier's details. * An `OrganizationReference` object is added to award's `.suppliers` array to reference the supplier's object in the `parties` array. @@ -248,7 +246,6 @@ Chile Compra issues an [award notice](https://www.mercadopublico.cl/Procurement/ The notice is modelled as an OCDS release with the same `ocid` as the previous release, a `tag` of 'award', and the following properties: -* Since other suppliers are still able to submit a request to participate in the framework agreement, no change is made to `tender.status`. * An `Award` object is added to the `awards` array. * An `Organization` object is added to the `parties` array for each supplier with its details. * An `OrganizationReference` object is added to the award's `.suppliers` array for each supplier to reference its object in the `parties` array. @@ -288,7 +285,6 @@ The release has the following properties: * The same `ocid` as the invitation to participate in the second-stage competition is used. * The `relatedProcesses` section is populated with a reference to the contracting process for the first stage. * The `tag` is set to 'award'. -* The `tender.status` is updated to 'complete'. * The `awards` section is populated with the award value, period and items. * The `awards.suppliers` and `parties` fields are populated with the details of the supplier. diff --git a/docs/guidance/map/unsuccessful_processes.md b/docs/guidance/map/unsuccessful_processes.md index 3ce997497..63ff8018d 100644 --- a/docs/guidance/map/unsuccessful_processes.md +++ b/docs/guidance/map/unsuccessful_processes.md @@ -24,11 +24,11 @@ The first data disclosed is about the planning process. Planning data includes a Next, the contracting process is disclosed, using a new `ocid`, 'ocds-03ad3f-331547-1'. The `relatedProcess` block links the planning process and the contracting process, with the relationship set to 'planning'. -The tender was unsuccessful, so the tender's `status` is set to ‘unsuccessful’. +The tender was unsuccessful, so the tender's `finalStatus` is set to ‘unsuccessful’. ```{jsoninclude} ../../examples/unsuccessful_tender/tender.json :jsonpointer: -:expand: releases, relatedProcesses, tender, status +:expand: releases, relatedProcesses, tender, finalStatus :title: unsuccessful-tender-tender ``` From 3fc8aa8dd5ce1c8268bc0750ee563056310e0a84 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 27 Feb 2024 13:19:04 +1300 Subject: [PATCH 22/39] examples: Remove contract_suspension --- .../suspended_contract.json | 718 ------------------ docs/guidance/map.md | 1 - docs/guidance/map/contract_suspension.md | 33 - docs/history/changelog.md | 1 - docs/schema/codelists.md | 2 - 5 files changed, 755 deletions(-) delete mode 100644 docs/examples/contract_suspension/suspended_contract.json delete mode 100644 docs/guidance/map/contract_suspension.md diff --git a/docs/examples/contract_suspension/suspended_contract.json b/docs/examples/contract_suspension/suspended_contract.json deleted file mode 100644 index 014a7a685..000000000 --- a/docs/examples/contract_suspension/suspended_contract.json +++ /dev/null @@ -1,718 +0,0 @@ -{ - "version": "1.1", - "releases": [ - { - "id": "601848b51321e56ae2593b1b-MOE/W-316/96", - "tag": [ - "contract", - "implementation" - ], - "date": "2021-02-01T23:00:13+04:30", - "ocid": "ocds-afalqw-MOE/W-316/96", - "awards": [ - { - "id": "MOE/W-316/96", - "suppliers": [ - { - "id": "AF-TIN-1045408018", - "name": "شرکت ساختمانی و سرکسازی و تولید مواد ساختمانی شهاب وزیری" - } - ] - } - ], - "tender": { - "id": "MOE/W-316/96", - "procuringEntity": { - "id": "AF-COA-27", - "name": "وزارت معارف" - }, - "mainProcurementCategory": "works" - }, - "parties": [ - { - "id": "AF-TIN-1045408018", - "name": "شرکت ساختمانی و سرکسازی و تولید مواد ساختمانی شهاب وزیری", - "roles": [ - "payee", - "supplier" - ], - "identifier": { - "id": "1045408018", - "scheme": "AF-TIN", - "legalName": "شرکت ساختمانی و سرکسازی و تولید مواد ساختمانی شهاب وزیری" - } - }, - { - "id": "AF-COA-27", - "name": "وزارت معارف", - "roles": [ - "procuringEntity" - ], - "address": { - "region": "مرکز", - "locality": null, - "postalCode": null, - "country": "AF", - "streetAddress": null - }, - "identifier": { - "id": "27", - "scheme": "AF-COA", - "legalName": "وزارت معارف" - }, - "contactPoint": { - "name": "شیرمحمد", - "email": "shirmailsiver29@gmail.com", - "telephone": "0771632865" - } - }, - { - "id": "AF-COA-20", - "name": "وزارت مالیه", - "roles": [ - "payer" - ], - "address": { - "region": "مرکز", - "locality": null, - "postalCode": null, - "country": "AF", - "streetAddress": null - }, - "identifier": { - "id": "20", - "scheme": "AF-COA", - "legalName": "وزارت مالیه" - }, - "contactPoint": { - "name": "", - "email": "", - "faxNumber": "", - "telephone": "" - } - } - ], - "contracts": [ - { - "id": "MOE/W-316/96", - "title": "اعمارتعمیر 2+8 صنفی با ملحقات آن، دیوار احاطه به طول 234.5 متر معه دروازه، 10 غرفه مبرز، چاه آب آشامیدنی به عمق 60 متر وکثافت دانی برای مکتب نسوان بابر مربوط ولسوالی ازره ولایت لوگر", - "value": { - "amount": 19718860, - "currency": "" - }, - "period": { - "endDate": "2020-08-18T00:00:00+04:30", - "startDate": "2019-09-25T00:00:00+04:30" - }, - - "statusDetails": "suspended", - "awardID": "MOE/W-316/96", - "documents": [ - { - "id": 74173, - "url": "https://ocds.ageops.net/api/contract-detail/1584439054-903-%D9%85%D9%88%D8%A7%D9%81%D9%82%D8%AA%D9%86%D8%A7%D9%85%D9%87.pdf", - "title": "agreement", - "format": "application/pdf", - "description": "موافقت نامه", - "dateModified": "2020-03-17T18:57:34+04:30", - "documentType": "contractNotice", - "datePublished": "2021-02-01T23:00:13+04:30" - }, - { - "id": 74175, - "url": "https://ocds.ageops.net/api/contract-detail/1584439054-903-%D8%B4%D8%B1%D8%A7%DB%8C%D8%B7+%D8%AE%D8%A7%D8%B5.pdf", - "title": "contract_special_conditions", - "format": "application/pdf", - "description": "شرایط خاص قرارداد", - "dateModified": "2020-03-17T18:57:34+04:30", - "documentType": "contractDraft", - "datePublished": "2021-02-01T23:00:13+04:30" - } - ], - "amendments": [], - "dateSigned": "2019-09-25T00:00:00+04:30", - "description": "اعمارتعمیر 2+8 صنفی با ملحقات آن، دیوار احاطه به طول 234.5 متر معه دروازه، 10 غرفه مبرز، چاه آب آشامیدنی به عمق 60 متر وکثافت دانی برای مکتب نسوان بابر مربوط ولسوالی ازره ولایت لوگر", - "agreedMetrics": [ - { - "id": "deliveryProgress", - "title": "Delivery progress (percent)", - "observations": [ - { - "id": "deliveryProgressPercent-1398-M7", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2019-09-23T00:00:00+04:30", - "startDate": "2019-09-23T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1398-M8", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2019-10-23T00:00:00+04:30", - "startDate": "2019-10-23T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1398-M9", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2019-11-22T00:00:00+04:30", - "startDate": "2019-11-22T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1398-M10", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2019-12-22T00:00:00+04:30", - "startDate": "2019-12-22T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1398-M11", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2020-01-21T00:00:00+04:30", - "startDate": "2020-01-21T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1398-M12", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2020-02-20T00:00:00+04:30", - "startDate": "2020-02-20T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1399-M1", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2020-03-20T00:00:00+04:30", - "startDate": "2020-03-20T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1399-M2", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2020-04-20T00:00:00+04:30", - "startDate": "2020-04-20T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1399-M3", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2020-05-21T00:00:00+04:30", - "startDate": "2020-05-21T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1399-M4", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2020-06-21T00:00:00+04:30", - "startDate": "2020-06-21T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1399-M5", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2020-07-22T00:00:00+04:30", - "startDate": "2020-07-22T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1399-M6", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2020-08-22T00:00:00+04:30", - "startDate": "2020-08-22T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1399-M7", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2020-09-22T00:00:00+04:30", - "startDate": "2020-09-22T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1399-M8", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2020-10-22T00:00:00+04:30", - "startDate": "2020-10-22T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1399-M9", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2020-11-21T00:00:00+04:30", - "startDate": "2020-11-21T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1399-M10", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2020-12-21T00:00:00+04:30", - "startDate": "2020-12-21T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1399-M11", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2021-01-20T00:00:00+04:30", - "startDate": "2021-01-20T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1399-M12", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2021-02-19T00:00:00+04:30", - "startDate": "2021-02-19T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1400-M1", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2021-03-21T00:00:00+04:30", - "startDate": "2021-03-21T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1400-M2", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2021-04-21T00:00:00+04:30", - "startDate": "2021-04-21T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1400-M3", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2021-05-22T00:00:00+04:30", - "startDate": "2021-05-22T00:00:00+04:30" - }, - "measure": "100" - } - ] - }, - { - "id": "financingProgress", - "title": "Financing Progress", - "observations": [ - { - "id": "financingProgress-1398-M7", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2019-09-23T00:00:00+04:30", - "startDate": "2019-09-23T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1398-M8", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2019-10-23T00:00:00+04:30", - "startDate": "2019-10-23T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1398-M9", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2019-11-22T00:00:00+04:30", - "startDate": "2019-11-22T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1398-M10", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2019-12-22T00:00:00+04:30", - "startDate": "2019-12-22T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1398-M11", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2020-01-21T00:00:00+04:30", - "startDate": "2020-01-21T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1398-M12", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2020-02-20T00:00:00+04:30", - "startDate": "2020-02-20T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1399-M1", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2020-03-20T00:00:00+04:30", - "startDate": "2020-03-20T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1399-M2", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2020-04-20T00:00:00+04:30", - "startDate": "2020-04-20T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1399-M3", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2020-05-21T00:00:00+04:30", - "startDate": "2020-05-21T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1399-M4", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2020-06-21T00:00:00+04:30", - "startDate": "2020-06-21T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1399-M5", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2020-07-22T00:00:00+04:30", - "startDate": "2020-07-22T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1399-M6", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2020-08-22T00:00:00+04:30", - "startDate": "2020-08-22T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1399-M7", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2020-09-22T00:00:00+04:30", - "startDate": "2020-09-22T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1399-M8", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2020-10-22T00:00:00+04:30", - "startDate": "2020-10-22T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1399-M9", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2020-11-21T00:00:00+04:30", - "startDate": "2020-11-21T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1399-M10", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2020-12-21T00:00:00+04:30", - "startDate": "2020-12-21T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1399-M11", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2021-01-20T00:00:00+04:30", - "startDate": "2021-01-20T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1399-M12", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2021-02-19T00:00:00+04:30", - "startDate": "2021-02-19T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1400-M1", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2021-03-21T00:00:00+04:30", - "startDate": "2021-03-21T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1400-M2", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2021-04-21T00:00:00+04:30", - "startDate": "2021-04-21T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1400-M3", - "value": { - "amount": 19718860 - }, - "period": { - "endDate": "2021-05-22T00:00:00+04:30", - "startDate": "2021-05-22T00:00:00+04:30" - } - } - ] - } - ], - "implementation": { - "metrics": [ - { - "id": "deliveryProgress", - "title": "Delivery progress (percent)", - "observations": [ - { - "id": "deliveryProgressPercent-1398-M7", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2019-09-23T00:00:00+04:30", - "startDate": "2019-09-23T00:00:00+04:30" - }, - "measure": "0" - }, - { - "id": "deliveryProgressPercent-1400-M3", - "unit": { - "id": "P1", - "name": "percent", - "scheme": "UNCEFACT" - }, - "period": { - "endDate": "2021-05-22T00:00:00+04:30", - "startDate": "2021-05-22T00:00:00+04:30" - }, - "measure": "49" - } - ] - }, - { - "id": "financingProgress", - "title": "Financing Progress", - "observations": [ - { - "id": "financingProgress-1398-M7", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2019-09-23T00:00:00+04:30", - "startDate": "2019-09-23T00:00:00+04:30" - } - }, - { - "id": "financingProgress-1400-M3", - "value": { - "amount": 0 - }, - "period": { - "endDate": "2021-05-22T00:00:00+04:30", - "startDate": "2021-05-22T00:00:00+04:30" - } - } - ] - } - ], - "documents": [], - "milestones": [ - { - "id": "5463-50933-1", - "type": "financing", - "title": "Completing all the payments by the procurement entity", - "status": "notMet", - "dueDate": "2020-07-22T00:00:00+04:30", - "description": "--" - }, - { - "id": "5463-50933-2", - "type": "delivery", - "title": "Completing all the deliverable by the vendor", - "status": "notMet", - "dueDate": "2020-07-22T00:00:00+04:30", - "description": "--" - } - ], - "transactions": [] - } - } - ] - } - ] -} diff --git a/docs/guidance/map.md b/docs/guidance/map.md index 53c35288c..e623f6a15 100644 --- a/docs/guidance/map.md +++ b/docs/guidance/map.md @@ -99,7 +99,6 @@ map/unsuccessful_processes map/framework_agreements map/pre-qualification map/awards_contracts -map/contract_suspension map/electronic_catalogues map/amendments map/milestones diff --git a/docs/guidance/map/contract_suspension.md b/docs/guidance/map/contract_suspension.md deleted file mode 100644 index 46ac9785f..000000000 --- a/docs/guidance/map/contract_suspension.md +++ /dev/null @@ -1,33 +0,0 @@ -```{workedexample} Contract suspension -:tags: contract -``` - -# Contract suspension - -A contract suspension is a temporary cessation of performance. A contract can be suspended after it is signed, and the contract is legally in force until it is terminated. Contract suspension is different from early termination, which is a permanent cessation of performance. - -A contract might be suspended if, for example: - -* the buyer suspends a contract because the supplier fails to perform. -* the supplier suspends a contract because the buyer fails to pay. -* either party suspends a contract due to force majeure. - -In OCDS, the `contracts.status` field describes the status of a contract, using codes from the [contract status codelist](https://standard.open-contracting.org/latest/en/schema/codelists/#contract-status). The `contracts.statusDetails` field can be used to provide additional details on the status of a contract. - -To disclose that a contract is suspended, set the contract's `.status` to 'active' and use its `.statusDetails` field to record that the contract is suspended. - -If you collect other details about contract suspension, such as the rationale for the suspension or the period of the suspension, you can publish the details in an unstructured way in the `.statusDetails` field. - -```{note} -If you want to publish structured data about contract suspension, you can contribute to the [Github issue](https://github.com/open-contracting/standard/issues/758) on suspended contracts. -``` - -## Example: Suspended contracts in Afghanistan - -In the following example, a contract in the [Afghanistan Government Electronic and Open Procurement System](https://ageops.net) is suspended. - -```{jsoninclude} ../../examples/contract_suspension/suspended_contract.json -:jsonpointer: -:expand: releases, contracts -:title: Suspended Contract -``` diff --git a/docs/history/changelog.md b/docs/history/changelog.md index 74312a9ec..c43490551 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -300,7 +300,6 @@ Per the [normative and non-normative content and changes policy](../governance/n * [#1216](https://github.com/open-contracting/standard/pull/1216) Update definitions of contracting process, record, and ocid. Introduce definition of planning process. * [#1307](https://github.com/open-contracting/standard/pull/1307) Clarify uniqueness rules for records. * [#1315](https://github.com/open-contracting/standard/pull/1315) Add rules on setting `id` and `date` for compiled releases to the merging specification. -* [#1344](https://github.com/open-contracting/standard/pull/1344) Add contract suspension worked example. * [#1375](https://github.com/open-contracting/standard/pull/1375) Update guidance for empty fields in the merging documentation. * [#1466](https://github.com/open-contracting/standard/pull/1466) Reference worked examples in release and record reference documentation. * [#1466](https://github.com/open-contracting/standard/pull/1482) Add examples in release reference documentation. diff --git a/docs/schema/codelists.md b/docs/schema/codelists.md index 9a2e85ddb..0fff2df02 100644 --- a/docs/schema/codelists.md +++ b/docs/schema/codelists.md @@ -277,8 +277,6 @@ The `awardStatus` field and codelist is used to indicate when a tender did not r Contracts can move through multiple states. Releases over time can update the status of a contract. -To disclose that a contract is suspended, set the contract's `status` field to 'active' and use its `statusDetails` field to record that the contract is suspended. For more information, see the [contract suspension](../../guidance/map/contract_suspension) worked example. - ```{versionchanged} 1.2 Added the 'terminatedEarly' and 'terminatedSuccessfully' codes. ``` From 1b9c1ca535417d3ad1df390b58b248eaf04a68a7 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 27 Feb 2024 13:20:49 +1300 Subject: [PATCH 23/39] docs/schema/codelists.md: Add deprecation directives, remove paragraphs --- docs/schema/codelists.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/schema/codelists.md b/docs/schema/codelists.md index 0fff2df02..94078703c 100644 --- a/docs/schema/codelists.md +++ b/docs/schema/codelists.md @@ -226,7 +226,8 @@ The country codelist is used to provide the country component of an address, usi ### Tender Status -The `tender.status` field is used to indicate the current status of a tender process. The following options are available: +```{deprecated} 1.2 +``` ```{versionchanged} 1.1 Added the 'planning' and 'withdrawn' codes. @@ -264,9 +265,8 @@ The procurement category codelist is used to indicate the **primary** focus of a ### Award Status -An award moves through multiple states. Releases over time can update the status of an award. - -The `awardStatus` field and codelist is used to indicate when a tender did not result in an award (through the `"awardStatus":"unsuccessful"` value). +```{deprecated} 1.2 +``` ```{csv-table-no-translate} :header-rows: 1 @@ -275,7 +275,8 @@ The `awardStatus` field and codelist is used to indicate when a tender did not r ### Contract Status -Contracts can move through multiple states. Releases over time can update the status of a contract. +```{deprecated} 1.2 +``` ```{versionchanged} 1.2 Added the 'terminatedEarly' and 'terminatedSuccessfully' codes. From 50598ca0b461248b411b9c85dcae81adbf1374da Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 27 Feb 2024 13:23:13 +1300 Subject: [PATCH 24/39] schema/codelists/releaseTag.csv: Update planningUpdate description --- schema/codelists/releaseTag.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/codelists/releaseTag.csv b/schema/codelists/releaseTag.csv index 312542ea8..d88e5abfc 100644 --- a/schema/codelists/releaseTag.csv +++ b/schema/codelists/releaseTag.csv @@ -1,6 +1,6 @@ Code,Title,Description planning,Planning,"Information about, for example, needs identification, budget planning and market research. This information concerns the planning process. This information typically concerns the period before contracting documents (for example, procurement documents) are available to potential suppliers." -planningUpdate,Planning update,"Details of a proposed or planned contracting process are being updated. This might include addition of information and documents from consultation engagement activities, revised details or timelines for a proposed contracting process, or a tender.status update to indicate that a pipeline proposal has been withdrawn." +planningUpdate,Planning update,"Details of a proposed or planned contracting process are being updated. This might include addition of information and documents from consultation engagement activities, or revised details or timelines for a proposed contracting process." tender,Tender,"Information about, for example, the needed items and their estimated value, procurement method, award criteria, and various deadlines. This information concerns either the contracting process or the planning process. For a contracting process, this information typically concerns the period starting with contracting documents (for example, procurement documents) being available to potential suppliers and ending with the bid submission deadline. For a planning process, this information typically concerns the period before the contracting documents are available to potential suppliers." tenderAmendment,Tender amendment,"An amendment to an existing tender release. There should be at least one tender release with the same ocid, but an earlier release date, before a tenderAmendment is published. The term amendment has legal meaning in many jurisdictions." tenderUpdate,Tender update,"An update to an existing tender release. There should be at least one tender release with the same ocid, but an earlier release date, before a tenderUpdate is published. An update may add new information or make corrections to prior published information. It should not be used for formal legal amendments to a tender, for which the tenderAmendment tag should be used." From 52d108cbf1fc5bf701fb931840d4d58e57db6277 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 27 Feb 2024 13:28:45 +1300 Subject: [PATCH 25/39] docs/examples: Reindent --- docs/examples/amendments/contract.json | 2 -- docs/examples/amendments/tender.json | 4 ---- docs/examples/beneficial_ownership/award.json | 1 - .../beneficial_owners_extension.json | 1 - docs/examples/change_history/contract.json | 2 -- docs/examples/change_history/contractAmendment.json | 2 -- docs/examples/change_history/records/award.json | 2 -- docs/examples/change_history/records/contract.json | 6 ------ .../change_history/records/contractAmendment.json | 8 -------- .../change_history/records/implementation.json | 6 ------ docs/examples/change_history/records/tender.json | 2 -- docs/examples/change_history/records/tenderUpdate.json | 3 --- docs/examples/change_history/tender.json | 1 - docs/examples/change_history/tenderAmendment.json | 1 - docs/examples/change_history/tenderUpdate.json | 1 - docs/examples/easy_releases/worked_example1/award.json | 1 - .../easy_releases/worked_example1/contract.json | 2 -- .../examples/easy_releases/worked_example1/tender.json | 1 - .../easy_releases/worked_example1/tender_update.json | 1 - docs/examples/easy_releases/worked_example2/award.json | 1 - .../easy_releases/worked_example2/contract.json | 2 -- .../examples/easy_releases/worked_example2/tender.json | 1 - .../easy_releases/worked_example2/tender_update.json | 1 - .../examples/frameworks/closed_single_first_stage.json | 1 - docs/examples/frameworks/closed_single_supplier.json | 1 - .../examples/frameworks/open_multiple_first_stage.json | 1 - .../frameworks/open_multiple_second_stage.json | 1 - docs/examples/frameworks/open_multiple_supplier.json | 1 - docs/examples/merging/deletions/array_award.json | 1 - .../merging/deletions/array_awardAmendment.json | 1 - docs/examples/merging/deletions/array_record.json | 3 --- docs/examples/merging/deletions/field_record.json | 3 --- docs/examples/merging/deletions/field_tender.json | 1 - .../examples/merging/deletions/field_tenderUpdate.json | 1 - docs/examples/merging/deletions/object_record.json | 3 --- docs/examples/merging/deletions/object_tender.json | 1 - .../merging/deletions/object_tenderAmendment.json | 1 - docs/examples/merging/embedded_releases.json | 10 ---------- docs/examples/merging/updates/award1.json | 1 - docs/examples/merging/updates/award2.json | 1 - docs/examples/merging/updates/merged.json | 3 --- docs/examples/merging/updates/tender1.json | 1 - docs/examples/merging/updates/tender2.json | 1 - docs/examples/merging/updates/tender3.json | 1 - docs/examples/merging/updates/versioned.json | 3 --- .../implementation_financial_milestones_not_met.json | 1 - ...lementation_financial_milestones_partially_met.json | 1 - ...mplementation_financial_milestones_transaction.json | 1 - .../milestones/planning-tender-milestones-2.json | 1 - .../dhangadhi_female_chaired_example.json | 1 - .../fictional_wob_organization_classification.json | 1 - .../examples/organizations/organization_reference.json | 1 - .../moldova_organization_extension.json | 1 - docs/examples/organizations/personal_identifier.json | 1 - .../release_schema_reference/release_package.json | 2 -- docs/examples/unsuccessful_tender/related_process.json | 2 -- 56 files changed, 106 deletions(-) diff --git a/docs/examples/amendments/contract.json b/docs/examples/amendments/contract.json index c37aafaa1..48bd73299 100644 --- a/docs/examples/amendments/contract.json +++ b/docs/examples/amendments/contract.json @@ -96,7 +96,6 @@ ], "contracts": [ { - "amendments": [ { "id": "1", @@ -182,7 +181,6 @@ "contracts": [ { "id": "CN3562241", - "description": "Appliances for Tuvalu PPB Residence", "title": "4501062723", "items": [ diff --git a/docs/examples/amendments/tender.json b/docs/examples/amendments/tender.json index bf092b59c..f666250e3 100644 --- a/docs/examples/amendments/tender.json +++ b/docs/examples/amendments/tender.json @@ -34,7 +34,6 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Data merge tool.", - "value": { "amount": 1000, "currency": "USD" @@ -81,7 +80,6 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "value": { "amount": 1000, "currency": "USD" @@ -128,7 +126,6 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "value": { "amount": 2000, "currency": "USD" @@ -185,7 +182,6 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "value": { "amount": 2000, "currency": "USD" diff --git a/docs/examples/beneficial_ownership/award.json b/docs/examples/beneficial_ownership/award.json index 52948648d..ad47007c2 100644 --- a/docs/examples/beneficial_ownership/award.json +++ b/docs/examples/beneficial_ownership/award.json @@ -27,7 +27,6 @@ "awards": [ { "id": "6031d3f9-f86b-462c-80b2-4a02c760ddcd", - "date": "2021-06-07T00:00:00Z", "value": { "amount": 32191, diff --git a/docs/examples/beneficial_ownership/beneficial_owners_extension.json b/docs/examples/beneficial_ownership/beneficial_owners_extension.json index 1511c05b5..08079e5c4 100644 --- a/docs/examples/beneficial_ownership/beneficial_owners_extension.json +++ b/docs/examples/beneficial_ownership/beneficial_owners_extension.json @@ -35,7 +35,6 @@ "awards": [ { "id": "f867a510-0edf-11eb-a6ca-b5f4fa6e44dc", - "date": "2020-10-18T12:21:56Z", "value": { "amount": 56660, diff --git a/docs/examples/change_history/contract.json b/docs/examples/change_history/contract.json index adb4162f7..13f6a0245 100644 --- a/docs/examples/change_history/contract.json +++ b/docs/examples/change_history/contract.json @@ -79,7 +79,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -142,7 +141,6 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town.", - "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-08-01T23:59:00Z" diff --git a/docs/examples/change_history/contractAmendment.json b/docs/examples/change_history/contractAmendment.json index b9c995bdb..848b48129 100644 --- a/docs/examples/change_history/contractAmendment.json +++ b/docs/examples/change_history/contractAmendment.json @@ -79,7 +79,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "date": "2010-05-10T10:30:00Z", "value": { "amount": 11000000, @@ -142,7 +141,6 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "Contract monitoring for cycle lane construction.", - "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-10-30T23:59:00Z" diff --git a/docs/examples/change_history/records/award.json b/docs/examples/change_history/records/award.json index ce6107ec4..3101d887b 100644 --- a/docs/examples/change_history/records/award.json +++ b/docs/examples/change_history/records/award.json @@ -49,7 +49,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", @@ -166,7 +165,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", diff --git a/docs/examples/change_history/records/contract.json b/docs/examples/change_history/records/contract.json index 7d726e44c..b0e0bca12 100644 --- a/docs/examples/change_history/records/contract.json +++ b/docs/examples/change_history/records/contract.json @@ -49,7 +49,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", @@ -166,7 +165,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", @@ -561,7 +559,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -624,7 +621,6 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town.", - "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-08-01T23:59:00Z" @@ -847,7 +843,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -910,7 +905,6 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town.", - "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-08-01T23:59:00Z" diff --git a/docs/examples/change_history/records/contractAmendment.json b/docs/examples/change_history/records/contractAmendment.json index 27001b831..e5c1f18bf 100644 --- a/docs/examples/change_history/records/contractAmendment.json +++ b/docs/examples/change_history/records/contractAmendment.json @@ -49,7 +49,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", @@ -166,7 +165,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", @@ -561,7 +559,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -624,7 +621,6 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town.", - "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-08-01T23:59:00Z" @@ -854,7 +850,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "date": "2010-05-10T10:30:00Z", "value": { "amount": 11000000, @@ -917,7 +912,6 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "Contract monitoring for cycle lane construction.", - "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-10-30T23:59:00Z" @@ -1149,7 +1143,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "date": "2010-05-10T10:30:00Z", "value": { "amount": 11000000, @@ -1212,7 +1205,6 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "Contract monitoring for cycle lane construction.", - "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-10-30T23:59:00Z" diff --git a/docs/examples/change_history/records/implementation.json b/docs/examples/change_history/records/implementation.json index 338fa512d..6f6ee6194 100644 --- a/docs/examples/change_history/records/implementation.json +++ b/docs/examples/change_history/records/implementation.json @@ -49,7 +49,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", @@ -166,7 +165,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", @@ -561,7 +559,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -624,7 +621,6 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town.", - "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-08-01T23:59:00Z" @@ -948,7 +944,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.", - "date": "2010-05-10T09:30:00Z", "value": { "amount": 11000000, @@ -1011,7 +1006,6 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town.", - "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-08-01T23:59:00Z" diff --git a/docs/examples/change_history/records/tender.json b/docs/examples/change_history/records/tender.json index 5241c7a72..af6d09144 100644 --- a/docs/examples/change_history/records/tender.json +++ b/docs/examples/change_history/records/tender.json @@ -49,7 +49,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", @@ -167,7 +166,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", diff --git a/docs/examples/change_history/records/tenderUpdate.json b/docs/examples/change_history/records/tenderUpdate.json index 3b87a0d8c..a19669f9b 100644 --- a/docs/examples/change_history/records/tenderUpdate.json +++ b/docs/examples/change_history/records/tenderUpdate.json @@ -49,7 +49,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", @@ -166,7 +165,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", @@ -303,7 +301,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", diff --git a/docs/examples/change_history/tender.json b/docs/examples/change_history/tender.json index e383846d6..747b4cff4 100644 --- a/docs/examples/change_history/tender.json +++ b/docs/examples/change_history/tender.json @@ -47,7 +47,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", diff --git a/docs/examples/change_history/tenderAmendment.json b/docs/examples/change_history/tenderAmendment.json index 522ce995f..21fffdb9b 100644 --- a/docs/examples/change_history/tenderAmendment.json +++ b/docs/examples/change_history/tenderAmendment.json @@ -47,7 +47,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", diff --git a/docs/examples/change_history/tenderUpdate.json b/docs/examples/change_history/tenderUpdate.json index 80c36e1f8..a2875372c 100644 --- a/docs/examples/change_history/tenderUpdate.json +++ b/docs/examples/change_history/tenderUpdate.json @@ -47,7 +47,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", diff --git a/docs/examples/easy_releases/worked_example1/award.json b/docs/examples/easy_releases/worked_example1/award.json index dbad6ab01..fe6671454 100644 --- a/docs/examples/easy_releases/worked_example1/award.json +++ b/docs/examples/easy_releases/worked_example1/award.json @@ -35,7 +35,6 @@ "id": "101", "title": "Cleaning services", "description": "Cleaning services for the City Hall, from 01/2020 to 12/2020", - "procurementMethod": "direct", "value": { "amount": 144300000, diff --git a/docs/examples/easy_releases/worked_example1/contract.json b/docs/examples/easy_releases/worked_example1/contract.json index c4cb38bb3..e08983b64 100644 --- a/docs/examples/easy_releases/worked_example1/contract.json +++ b/docs/examples/easy_releases/worked_example1/contract.json @@ -36,7 +36,6 @@ "id": "101", "title": "Cleaning services", "description": "Cleaning services for the City Hall, from 01/2020 to 12/2020", - "procurementMethod": "direct", "value": { "amount": 144300000, @@ -71,7 +70,6 @@ "awardID": "371630/100", "title": "Cleaning services", "description": "Cleaning services for the City Hall", - "value": { "amount": 116400000, "currency": "PYG" diff --git a/docs/examples/easy_releases/worked_example1/tender.json b/docs/examples/easy_releases/worked_example1/tender.json index af23c16d9..3a73d4017 100644 --- a/docs/examples/easy_releases/worked_example1/tender.json +++ b/docs/examples/easy_releases/worked_example1/tender.json @@ -26,7 +26,6 @@ "id": "101", "title": "Cleaning services", "description": "Cleaning services for the City Hall", - "procurementMethod": "direct", "value": { "amount": 144300000, diff --git a/docs/examples/easy_releases/worked_example1/tender_update.json b/docs/examples/easy_releases/worked_example1/tender_update.json index 8ba43319d..bdc9df17c 100644 --- a/docs/examples/easy_releases/worked_example1/tender_update.json +++ b/docs/examples/easy_releases/worked_example1/tender_update.json @@ -26,7 +26,6 @@ "id": "101", "title": "Cleaning services", "description": "Cleaning services for the City Hall, from 01/2020 to 12/2020", - "procurementMethod": "direct", "value": { "amount": 144300000, diff --git a/docs/examples/easy_releases/worked_example2/award.json b/docs/examples/easy_releases/worked_example2/award.json index b4323b8d0..0b9cf5e35 100644 --- a/docs/examples/easy_releases/worked_example2/award.json +++ b/docs/examples/easy_releases/worked_example2/award.json @@ -35,7 +35,6 @@ "id": "101", "title": "Cleaning services", "description": "Cleaning services for the City Hall, from 01/2020 to 12/2020", - "procurementMethod": "direct", "value": { "amount": 144300000, diff --git a/docs/examples/easy_releases/worked_example2/contract.json b/docs/examples/easy_releases/worked_example2/contract.json index 00b281b93..5944fa804 100644 --- a/docs/examples/easy_releases/worked_example2/contract.json +++ b/docs/examples/easy_releases/worked_example2/contract.json @@ -36,7 +36,6 @@ "id": "101", "title": "Cleaning services", "description": "Cleaning services for the City Hall, from 01/2020 to 12/2020", - "procurementMethod": "direct", "value": { "amount": 144300000, @@ -71,7 +70,6 @@ "awardID": "371630/100", "title": "Cleaning services", "description": "Cleaning services for the City Hall", - "value": { "amount": 116400000, "currency": "PYG" diff --git a/docs/examples/easy_releases/worked_example2/tender.json b/docs/examples/easy_releases/worked_example2/tender.json index efb6a8de0..f583f82e8 100644 --- a/docs/examples/easy_releases/worked_example2/tender.json +++ b/docs/examples/easy_releases/worked_example2/tender.json @@ -26,7 +26,6 @@ "id": "101", "title": "Cleaning services", "description": "Cleaning services for the City Hall", - "procurementMethod": "direct", "value": { "amount": 144300000, diff --git a/docs/examples/easy_releases/worked_example2/tender_update.json b/docs/examples/easy_releases/worked_example2/tender_update.json index b33c1ee46..d031281ff 100644 --- a/docs/examples/easy_releases/worked_example2/tender_update.json +++ b/docs/examples/easy_releases/worked_example2/tender_update.json @@ -26,7 +26,6 @@ "id": "101", "title": "Cleaning services", "description": "Cleaning services for the City Hall, from 01/2020 to 12/2020", - "procurementMethod": "direct", "value": { "amount": 144300000, diff --git a/docs/examples/frameworks/closed_single_first_stage.json b/docs/examples/frameworks/closed_single_first_stage.json index c55ccd171..f192289ee 100644 --- a/docs/examples/frameworks/closed_single_first_stage.json +++ b/docs/examples/frameworks/closed_single_first_stage.json @@ -35,7 +35,6 @@ "id": "NP45719", "title": "Storage and Distribution of Seasonal Influenza Vaccine", "description": "This framework agreement is for the receipt, storage and distribution of seasonal influenza vaccines to GP practices, social care premises, vaccine holding centres and community pharmacies across NHS Scotland.", - "procurementMethod": "open", "value": { "amount": 1120000, diff --git a/docs/examples/frameworks/closed_single_supplier.json b/docs/examples/frameworks/closed_single_supplier.json index 166261b01..ac50b61c1 100644 --- a/docs/examples/frameworks/closed_single_supplier.json +++ b/docs/examples/frameworks/closed_single_supplier.json @@ -23,7 +23,6 @@ "awards": [ { "id": "NP45719", - "suppliers": [ { "name": "Movianto UK", diff --git a/docs/examples/frameworks/open_multiple_first_stage.json b/docs/examples/frameworks/open_multiple_first_stage.json index f69284aa1..88fae0663 100644 --- a/docs/examples/frameworks/open_multiple_first_stage.json +++ b/docs/examples/frameworks/open_multiple_first_stage.json @@ -55,7 +55,6 @@ }, "id": "2239-4-LP14", "title": "CM de Artículos de Escritorio y Papelería", - "procuringEntity": { "name": "Dirección de Compras y Contratación Pública | Dirección de Compras y Contratación Pública", "id": "CL-MP-749218" diff --git a/docs/examples/frameworks/open_multiple_second_stage.json b/docs/examples/frameworks/open_multiple_second_stage.json index a7f0de39f..342444234 100644 --- a/docs/examples/frameworks/open_multiple_second_stage.json +++ b/docs/examples/frameworks/open_multiple_second_stage.json @@ -33,7 +33,6 @@ "tender": { "id": "547054", "title": "Artículos de Escritorio y Papelería", - "competitive": true, "procuringEntity": { "name": "Servicio Local de Educación Pública Puerto Cordillera | Servicio Local de Educación Pública Puerto Cordillera", diff --git a/docs/examples/frameworks/open_multiple_supplier.json b/docs/examples/frameworks/open_multiple_supplier.json index 17aab9d15..685876e20 100644 --- a/docs/examples/frameworks/open_multiple_supplier.json +++ b/docs/examples/frameworks/open_multiple_supplier.json @@ -38,7 +38,6 @@ { "id": "8603354", "title": "Convenio Marco de Artículos de Escritorio y Papelería", - "date": "2014-12-17T16:33:32Z", "suppliers": [ { diff --git a/docs/examples/merging/deletions/array_award.json b/docs/examples/merging/deletions/array_award.json index ab9b8c2af..73b42b83e 100644 --- a/docs/examples/merging/deletions/array_award.json +++ b/docs/examples/merging/deletions/array_award.json @@ -64,7 +64,6 @@ }, "awards": [ { - "description": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "title": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "items": [ diff --git a/docs/examples/merging/deletions/array_awardAmendment.json b/docs/examples/merging/deletions/array_awardAmendment.json index cf49732b8..a99edb935 100644 --- a/docs/examples/merging/deletions/array_awardAmendment.json +++ b/docs/examples/merging/deletions/array_awardAmendment.json @@ -64,7 +64,6 @@ }, "awards": [ { - "description": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "title": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "items": [ diff --git a/docs/examples/merging/deletions/array_record.json b/docs/examples/merging/deletions/array_record.json index 7f691f8d2..e9da9bec6 100644 --- a/docs/examples/merging/deletions/array_record.json +++ b/docs/examples/merging/deletions/array_record.json @@ -67,7 +67,6 @@ }, "awards": [ { - "description": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "title": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "items": [ @@ -236,7 +235,6 @@ }, "awards": [ { - "description": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "title": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "items": [ @@ -373,7 +371,6 @@ "awards": [ { "id": "1201", - "description": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "title": "SUPPLY AND DELIVERY OF VARIOUS STATIONERY", "items": [ diff --git a/docs/examples/merging/deletions/field_record.json b/docs/examples/merging/deletions/field_record.json index 766a22dff..acf3e0975 100644 --- a/docs/examples/merging/deletions/field_record.json +++ b/docs/examples/merging/deletions/field_record.json @@ -42,7 +42,6 @@ "name": "INSTITUTO NACIONAL PENITENCIARIO Y CARCELARIO (INPEC)" }, "tender": { - "description": "ADQUISICION DE COLCHONETAS PARA LA DOTACION DESTINADOS A LA POBLACION INTERNA DEL EPMSC ARMERO GUAYABAL TOLIMA", "title": "ADQUISICION DE COLCHONETAS PARA LA DOTACION DESTINADOS A LA POBLACION INTERNA DEL EPMSC ARMERO GUAYABAL TOLIMA", "procurementMethod": "open", @@ -100,7 +99,6 @@ "name": "INSTITUTO NACIONAL PENITENCIARIO Y CARCELARIO (INPEC)" }, "tender": { - "description": null, "title": "ADQUISICION DE COLCHONETAS PARA LA DOTACION DESTINADOS A LA POBLACION INTERNA DEL EPMSC ARMERO GUAYABAL TOLIMA", "procurementMethod": "open", @@ -159,7 +157,6 @@ "name": "INSTITUTO NACIONAL PENITENCIARIO Y CARCELARIO (INPEC)" }, "tender": { - "title": "ADQUISICION DE COLCHONETAS PARA LA DOTACION DESTINADOS A LA POBLACION INTERNA DEL EPMSC ARMERO GUAYABAL TOLIMA", "procurementMethod": "open", "procurementMethodDetails": "Subasta", diff --git a/docs/examples/merging/deletions/field_tender.json b/docs/examples/merging/deletions/field_tender.json index c5063d705..a05d8974d 100644 --- a/docs/examples/merging/deletions/field_tender.json +++ b/docs/examples/merging/deletions/field_tender.json @@ -39,7 +39,6 @@ "name": "INSTITUTO NACIONAL PENITENCIARIO Y CARCELARIO (INPEC)" }, "tender": { - "description": "ADQUISICION DE COLCHONETAS PARA LA DOTACION DESTINADOS A LA POBLACION INTERNA DEL EPMSC ARMERO GUAYABAL TOLIMA", "title": "ADQUISICION DE COLCHONETAS PARA LA DOTACION DESTINADOS A LA POBLACION INTERNA DEL EPMSC ARMERO GUAYABAL TOLIMA", "procurementMethod": "open", diff --git a/docs/examples/merging/deletions/field_tenderUpdate.json b/docs/examples/merging/deletions/field_tenderUpdate.json index 1c60d1ee5..c7bbe7e72 100644 --- a/docs/examples/merging/deletions/field_tenderUpdate.json +++ b/docs/examples/merging/deletions/field_tenderUpdate.json @@ -39,7 +39,6 @@ "name": "INSTITUTO NACIONAL PENITENCIARIO Y CARCELARIO (INPEC)" }, "tender": { - "description": null, "title": "ADQUISICION DE COLCHONETAS PARA LA DOTACION DESTINADOS A LA POBLACION INTERNA DEL EPMSC ARMERO GUAYABAL TOLIMA", "procurementMethod": "open", diff --git a/docs/examples/merging/deletions/object_record.json b/docs/examples/merging/deletions/object_record.json index 68f1eadab..2167ad307 100644 --- a/docs/examples/merging/deletions/object_record.json +++ b/docs/examples/merging/deletions/object_record.json @@ -42,7 +42,6 @@ }, "tender": { "id": "11-13-651832", - "description": "CONSTRUCCIÓN DE OBRAS DE REHABILITACIÓN Y MANTENIMIENTO DE LA VÍA CARRETEABLE: VEREDA CURACAS-VEREDA LA MONJITA, EN UNA EXTENSIÓN DE SEIS (06) KILÓMETROS EN MUNICIPIO DE MERCADERES CAUCA.", "procurementMethod": "open", "submissionMethodDetails": "Municipio obtención: Mercaderes, Municipio entrega: Mercaderes, Municipio ejecución: No definido, Lugar aclaraciones: No definido", @@ -103,7 +102,6 @@ }, "tender": { "id": "11-13-651832", - "description": "CONSTRUCCIÓN DE OBRAS DE REHABILITACIÓN Y MANTENIMIENTO DE LA VÍA CARRETEABLE: VEREDA CURACAS-VEREDA LA MONJITA, EN UNA EXTENSIÓN DE SEIS (06) KILÓMETROS EN MUNICIPIO DE MERCADERES CAUCA.", "procurementMethod": "open", "submissionMethodDetails": "Municipio obtención: Mercaderes, Municipio entrega: Mercaderes, Municipio ejecución: No definido, Lugar aclaraciones: No definido", @@ -175,7 +173,6 @@ }, "tender": { "id": "11-13-651832", - "description": "CONSTRUCCIÓN DE OBRAS DE REHABILITACIÓN Y MANTENIMIENTO DE LA VÍA CARRETEABLE: VEREDA CURACAS-VEREDA LA MONJITA, EN UNA EXTENSIÓN DE SEIS (06) KILÓMETROS EN MUNICIPIO DE MERCADERES CAUCA.", "procurementMethod": "open", "submissionMethodDetails": "Municipio obtención: Mercaderes, Municipio entrega: Mercaderes, Municipio ejecución: No definido, Lugar aclaraciones: No definido", diff --git a/docs/examples/merging/deletions/object_tender.json b/docs/examples/merging/deletions/object_tender.json index f2eff2078..2193d2d91 100644 --- a/docs/examples/merging/deletions/object_tender.json +++ b/docs/examples/merging/deletions/object_tender.json @@ -39,7 +39,6 @@ }, "tender": { "id": "11-13-651832", - "description": "CONSTRUCCIÓN DE OBRAS DE REHABILITACIÓN Y MANTENIMIENTO DE LA VÍA CARRETEABLE: VEREDA CURACAS-VEREDA LA MONJITA, EN UNA EXTENSIÓN DE SEIS (06) KILÓMETROS EN MUNICIPIO DE MERCADERES CAUCA.", "procurementMethod": "open", "submissionMethodDetails": "Municipio obtención: Mercaderes, Municipio entrega: Mercaderes, Municipio ejecución: No definido, Lugar aclaraciones: No definido", diff --git a/docs/examples/merging/deletions/object_tenderAmendment.json b/docs/examples/merging/deletions/object_tenderAmendment.json index d8500b329..49319807d 100644 --- a/docs/examples/merging/deletions/object_tenderAmendment.json +++ b/docs/examples/merging/deletions/object_tenderAmendment.json @@ -39,7 +39,6 @@ }, "tender": { "id": "11-13-651832", - "description": "CONSTRUCCIÓN DE OBRAS DE REHABILITACIÓN Y MANTENIMIENTO DE LA VÍA CARRETEABLE: VEREDA CURACAS-VEREDA LA MONJITA, EN UNA EXTENSIÓN DE SEIS (06) KILÓMETROS EN MUNICIPIO DE MERCADERES CAUCA.", "procurementMethod": "open", "submissionMethodDetails": "Municipio obtención: Mercaderes, Municipio entrega: Mercaderes, Municipio ejecución: No definido, Lugar aclaraciones: No definido", diff --git a/docs/examples/merging/embedded_releases.json b/docs/examples/merging/embedded_releases.json index cc5f245ff..474720b28 100644 --- a/docs/examples/merging/embedded_releases.json +++ b/docs/examples/merging/embedded_releases.json @@ -51,7 +51,6 @@ } } ], - "suppliers": [ { "id": "GB-COH-1234567844", @@ -167,7 +166,6 @@ "endDate": "2011-08-01T23:59:00Z", "startDate": "2010-07-01T00:00:00Z" }, - "title": "Contract to build new cycle lanes in the centre of town.", "value": { "amount": 11000000, @@ -392,7 +390,6 @@ "id": "GB-LAC-E09000003", "name": "London Borough of Barnet" }, - "submissionMethodDetails": "Submit through the online portal at http://example.com/submissions/ocds-213czf-000-00001-01/", "tenderPeriod": { "endDate": "2011-04-01T18:00:00Z", @@ -611,7 +608,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", @@ -728,7 +724,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", @@ -872,7 +867,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "items": [ { "id": "0001", @@ -1174,7 +1168,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "AnyCorp Ltd has been awarded the contract to build new cycle lanes in the centre of town.", - "date": "2010-05-10T10:30:00Z", "value": { "amount": 11000000, @@ -1237,7 +1230,6 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "A contract has been signed between the Council and AnyCorp Ltd for construction of new cycle lanes in the centre of town.", - "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-08-01T23:59:00Z" @@ -1366,7 +1358,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "AnyCorp Ltd has been awarded the contract to build new cycle lanes in the centre of town.", - "date": "2010-05-10T10:30:00Z", "value": { "amount": 11000000, @@ -1429,7 +1420,6 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "Contract monitoring for cycle lane construction.", - "period": { "startDate": "2010-07-01T00:00:00Z", "endDate": "2011-08-01T23:59:00Z" diff --git a/docs/examples/merging/updates/award1.json b/docs/examples/merging/updates/award1.json index 2dcae41ff..b4a4452fb 100644 --- a/docs/examples/merging/updates/award1.json +++ b/docs/examples/merging/updates/award1.json @@ -33,7 +33,6 @@ "id": "ocds-213czf-000-00002-award-supplier-one", "title": "Award of contract to create the data merging tool.", "description": "Supplier 1 has been commissioned to create the merge tool. A separate contract will be awarded to write the documentation", - "date": "2016-03-01T09:30:00Z", "value": { "amount": 750, diff --git a/docs/examples/merging/updates/award2.json b/docs/examples/merging/updates/award2.json index d24bd7a1d..16dfae8c6 100644 --- a/docs/examples/merging/updates/award2.json +++ b/docs/examples/merging/updates/award2.json @@ -33,7 +33,6 @@ "id": "ocds-213czf-000-00002-award-supplier-two", "title": "Award of contract to create the data merging tool.", "description": "Supplier 2 has been commissioned to create the documentation. A separate contract will be awarded to create the tool", - "date": "2016-03-03T09:30:00Z", "value": { "amount": 750, diff --git a/docs/examples/merging/updates/merged.json b/docs/examples/merging/updates/merged.json index 8f9b1425d..137b58cd0 100644 --- a/docs/examples/merging/updates/merged.json +++ b/docs/examples/merging/updates/merged.json @@ -70,7 +70,6 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "value": { "amount": 2000, "currency": "USD" @@ -100,7 +99,6 @@ "id": "ocds-213czf-000-00002-award-supplier-one", "title": "Award of contract to create the data merging tool.", "description": "Supplier 1 has been commissioned to create the merge tool. A separate contract will be awarded to write the documentation", - "date": "2016-03-01T09:30:00Z", "value": { "amount": 750, @@ -111,7 +109,6 @@ "id": "ocds-213czf-000-00002-award-supplier-two", "title": "Award of contract to create the data merging tool.", "description": "Supplier 2 has been commissioned to create the documentation. A separate contract will be awarded to create the tool", - "date": "2016-03-03T09:30:00Z", "value": { "amount": 750, diff --git a/docs/examples/merging/updates/tender1.json b/docs/examples/merging/updates/tender1.json index d356ade38..ef11cea8d 100644 --- a/docs/examples/merging/updates/tender1.json +++ b/docs/examples/merging/updates/tender1.json @@ -32,7 +32,6 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Data merge tool.", - "value": { "amount": 1000, "currency": "USD" diff --git a/docs/examples/merging/updates/tender2.json b/docs/examples/merging/updates/tender2.json index da89c6b7e..a895f18a0 100644 --- a/docs/examples/merging/updates/tender2.json +++ b/docs/examples/merging/updates/tender2.json @@ -32,7 +32,6 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "value": { "amount": 1000, "currency": "USD" diff --git a/docs/examples/merging/updates/tender3.json b/docs/examples/merging/updates/tender3.json index 4fc843f73..993df45f6 100644 --- a/docs/examples/merging/updates/tender3.json +++ b/docs/examples/merging/updates/tender3.json @@ -32,7 +32,6 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "value": { "amount": 2000, "currency": "USD" diff --git a/docs/examples/merging/updates/versioned.json b/docs/examples/merging/updates/versioned.json index a6cdb0176..1cc80020d 100644 --- a/docs/examples/merging/updates/versioned.json +++ b/docs/examples/merging/updates/versioned.json @@ -70,7 +70,6 @@ "id": "ocds-213czf-000-00002-01-tender", "title": "Data merging tool", "description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.", - "value": { "amount": 2000, "currency": "USD" @@ -100,7 +99,6 @@ "id": "ocds-213czf-000-00002-award-supplier-one", "title": "Award of contract to create the data merging tool.", "description": "Supplier 1 has been commissioned to create the merge tool. A separate contract will be awarded to write the documentation", - "date": "2016-03-01T09:30:00Z", "value": { "amount": 750, @@ -111,7 +109,6 @@ "id": "ocds-213czf-000-00002-award-supplier-two", "title": "Award of contract to create the data merging tool.", "description": "Supplier 2 has been commissioned to create the documentation. A separate contract will be awarded to create the tool", - "date": "2016-03-03T09:30:00Z", "value": { "amount": 750, diff --git a/docs/examples/milestones/implementation_financial_milestones_not_met.json b/docs/examples/milestones/implementation_financial_milestones_not_met.json index 9ef10166d..0e8b7bf1d 100644 --- a/docs/examples/milestones/implementation_financial_milestones_not_met.json +++ b/docs/examples/milestones/implementation_financial_milestones_not_met.json @@ -4,7 +4,6 @@ { "contracts": [ { - "title": "School repairs and mantainance projects, Rahman Baba & Khushal Khan Khattak", "implementation": { "milestones": [ diff --git a/docs/examples/milestones/implementation_financial_milestones_partially_met.json b/docs/examples/milestones/implementation_financial_milestones_partially_met.json index 269d35a18..915f6cd28 100644 --- a/docs/examples/milestones/implementation_financial_milestones_partially_met.json +++ b/docs/examples/milestones/implementation_financial_milestones_partially_met.json @@ -4,7 +4,6 @@ { "contracts": [ { - "title": "School repairs and mantainance projects, Rahman Baba & Khushal Khan Khattak", "implementation": { "milestones": [ diff --git a/docs/examples/milestones/implementation_financial_milestones_transaction.json b/docs/examples/milestones/implementation_financial_milestones_transaction.json index f4d53b82b..3fd352f5e 100644 --- a/docs/examples/milestones/implementation_financial_milestones_transaction.json +++ b/docs/examples/milestones/implementation_financial_milestones_transaction.json @@ -4,7 +4,6 @@ { "contracts": [ { - "title": "School repairs and mantainance projects, Rahman Baba & Khushal Khan Khattak", "implementation": { "milestones": [ diff --git a/docs/examples/milestones/planning-tender-milestones-2.json b/docs/examples/milestones/planning-tender-milestones-2.json index 890b5609a..930616985 100644 --- a/docs/examples/milestones/planning-tender-milestones-2.json +++ b/docs/examples/milestones/planning-tender-milestones-2.json @@ -10,7 +10,6 @@ ], "tender": { "id": "001002003", - "milestones": [ { "id": 1, diff --git a/docs/examples/organizations/organization_classification/dhangadhi_female_chaired_example.json b/docs/examples/organizations/organization_classification/dhangadhi_female_chaired_example.json index 2fcb29f81..c5309405d 100644 --- a/docs/examples/organizations/organization_classification/dhangadhi_female_chaired_example.json +++ b/docs/examples/organizations/organization_classification/dhangadhi_female_chaired_example.json @@ -39,7 +39,6 @@ "id": "NP-CRO-UC-1160" } ], - "date": "2019-01-01T00:00:00+05:45", "id": "IMS/1160-awards/1", "title": "धनगढी उदाहरण पुरस्कार" diff --git a/docs/examples/organizations/organization_classification/fictional_wob_organization_classification.json b/docs/examples/organizations/organization_classification/fictional_wob_organization_classification.json index 43360cff5..550068944 100644 --- a/docs/examples/organizations/organization_classification/fictional_wob_organization_classification.json +++ b/docs/examples/organizations/organization_classification/fictional_wob_organization_classification.json @@ -38,7 +38,6 @@ "id": "CF-CDC-A564321" } ], - "date": "2019-01-01T00:00:00+05:45", "id": "ocds-213czf-col-cf-awards/1", "title": "Servicios de proyectos de datos abiertos de la ciudad" diff --git a/docs/examples/organizations/organization_reference.json b/docs/examples/organizations/organization_reference.json index 2ca79b738..1a1588d49 100644 --- a/docs/examples/organizations/organization_reference.json +++ b/docs/examples/organizations/organization_reference.json @@ -32,7 +32,6 @@ "tender": { "id": "ocds-213czf-000-00001-01-tender", "title": "Open Data publication improvements", - "tenderers": [ { "id": "GB-COH-09506232", diff --git a/docs/examples/organizations/organizational_units/moldova_organization_extension.json b/docs/examples/organizations/organizational_units/moldova_organization_extension.json index 87d837eb5..84f4da1e9 100644 --- a/docs/examples/organizations/organizational_units/moldova_organization_extension.json +++ b/docs/examples/organizations/organizational_units/moldova_organization_extension.json @@ -16,7 +16,6 @@ "id": "ocds-b3wdp1-MD-1539840280133", "title": "Piese consumabile pentru aparatele multifuncționale", "description": "Livrarea timp de 30 zile", - "value": { "amount": 1400000.0, "currency": "MDL" diff --git a/docs/examples/organizations/personal_identifier.json b/docs/examples/organizations/personal_identifier.json index c9faae305..c50bde27a 100644 --- a/docs/examples/organizations/personal_identifier.json +++ b/docs/examples/organizations/personal_identifier.json @@ -30,7 +30,6 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", - "tenderers": [ { "id": "COL-IDCARD-1234567", diff --git a/docs/examples/release_schema_reference/release_package.json b/docs/examples/release_schema_reference/release_package.json index 916d9530f..0cc1b53b5 100644 --- a/docs/examples/release_schema_reference/release_package.json +++ b/docs/examples/release_schema_reference/release_package.json @@ -237,7 +237,6 @@ "id": "ocds-213czf-000-00001-award-01", "title": "Award of contract to build new cycle lanes in the centre of town.", "description": "AnyCorp Ltd has been awarded the contract to build new cycle lanes in the centre of town.", - "statusDetails": "Awarded", "date": "2010-05-10T10:30:00Z", "value": { @@ -303,7 +302,6 @@ "awardID": "ocds-213czf-000-00001-award-01", "title": "Contract to build new cycle lanes in the centre of town.", "description": "Contract monitoring for cycle lane construction.", - "statusDetails": "Signed", "dateSigned": "2015-06-10T14:23:12Z", "value": { diff --git a/docs/examples/unsuccessful_tender/related_process.json b/docs/examples/unsuccessful_tender/related_process.json index 62e8d9392..1ca394525 100644 --- a/docs/examples/unsuccessful_tender/related_process.json +++ b/docs/examples/unsuccessful_tender/related_process.json @@ -6,7 +6,6 @@ "awards": [ { "id": "331547-kurosu-cia-sa-2", - "date": "2017-10-30T12:00:00-04:00", "value": { "amount": 417343000, @@ -90,7 +89,6 @@ { "id": "ux682+kLP2w=", "title": "2 - ROTATIVA", - "value": { "amount": 32000000, "currency": "PYG" From 7c80d701c21dfeb8e93c16ab3e3f10741533b591 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 27 Feb 2024 13:29:27 +1300 Subject: [PATCH 26/39] schema: Update codelist enums, run pre-commit script --- schema/dereferenced-release-schema.json | 116 +++++++++--------- schema/release-schema.json | 4 +- .../versioned-release-validation-schema.json | 22 ++-- 3 files changed, 71 insertions(+), 71 deletions(-) diff --git a/schema/dereferenced-release-schema.json b/schema/dereferenced-release-schema.json index f14e4dda6..4ad7088c2 100644 --- a/schema/dereferenced-release-schema.json +++ b/schema/dereferenced-release-schema.json @@ -2497,14 +2497,6 @@ "deprecatedVersion": "1.2" } }, - "statusDetails": { - "title": "Status details", - "description": "Additional details on the status of the tender. This field can be used to provide the local name of the status.", - "type": [ - "string", - "null" - ] - }, "procuringEntity": { "properties": { "name": { @@ -6483,7 +6475,7 @@ } }, "finalStatus": { - "title": "Tender final status", + "title": "Final status", "description": "The final status of the tender, using the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", "type": [ "string", @@ -6496,6 +6488,14 @@ "unsuccessful", null ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the tender. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] } }, "patternProperties": { @@ -6601,14 +6601,6 @@ "deprecatedVersion": "1.2" } }, - "statusDetails": { - "title": "Status details", - "description": "Additional details on the status of the award. This field can be used to provide the local name of the status.", - "type": [ - "string", - "null" - ] - }, "date": { "title": "Award date", "description": "The date of the contract award. This is usually the date on which a decision to award was made.", @@ -9137,7 +9129,7 @@ } }, "finalStatus": { - "title": "Award final status", + "title": "Final status", "description": "The final status of the award, using the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", "type": [ "string", @@ -9151,6 +9143,14 @@ "unsuccessful", null ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the award. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] } }, "patternProperties": { @@ -9269,14 +9269,6 @@ "deprecatedVersion": "1.2" } }, - "statusDetails": { - "title": "Status details", - "description": "Additional details on the status of the contract. This field can be used to provide the local name of the status.", - "type": [ - "string", - "null" - ] - }, "dateSigned": { "title": "Date concluded", "description": "The date the contract was concluded. Typically, this is the date when the last buyer or supplier signed the contract. However, if no contract is signed, then the date of contract conclusion may correspond to other dates (e.g. the date when the buyer notified the supplier, which had the legal effect of concluding the contract).", @@ -14621,7 +14613,7 @@ } }, "finalStatus": { - "title": "Contract final status", + "title": "Final status", "description": "The final status of the contract, using the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", "type": [ "string", @@ -14630,12 +14622,20 @@ "codelist": "contractFinalStatus.csv", "openCodelist": false, "enum": [ - "terminatedSuccessfully", - "terminatedEarly", + "complete", + "incomplete", "cancelled", "unsuccessful", null ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the contract. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] } }, "patternProperties": { @@ -16073,14 +16073,6 @@ "deprecatedVersion": "1.2" } }, - "statusDetails": { - "title": "Status details", - "description": "Additional details on the status of the tender. This field can be used to provide the local name of the status.", - "type": [ - "string", - "null" - ] - }, "procuringEntity": { "properties": { "name": { @@ -20059,7 +20051,7 @@ } }, "finalStatus": { - "title": "Tender final status", + "title": "Final status", "description": "The final status of the tender, using the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", "type": [ "string", @@ -20072,6 +20064,14 @@ "unsuccessful", null ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the tender. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] } }, "patternProperties": { @@ -20173,14 +20173,6 @@ "deprecatedVersion": "1.2" } }, - "statusDetails": { - "title": "Status details", - "description": "Additional details on the status of the award. This field can be used to provide the local name of the status.", - "type": [ - "string", - "null" - ] - }, "date": { "title": "Award date", "description": "The date of the contract award. This is usually the date on which a decision to award was made.", @@ -22709,7 +22701,7 @@ } }, "finalStatus": { - "title": "Award final status", + "title": "Final status", "description": "The final status of the award, using the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", "type": [ "string", @@ -22723,6 +22715,14 @@ "unsuccessful", null ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the award. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] } }, "patternProperties": { @@ -22835,14 +22835,6 @@ "deprecatedVersion": "1.2" } }, - "statusDetails": { - "title": "Status details", - "description": "Additional details on the status of the contract. This field can be used to provide the local name of the status.", - "type": [ - "string", - "null" - ] - }, "dateSigned": { "title": "Date concluded", "description": "The date the contract was concluded. Typically, this is the date when the last buyer or supplier signed the contract. However, if no contract is signed, then the date of contract conclusion may correspond to other dates (e.g. the date when the buyer notified the supplier, which had the legal effect of concluding the contract).", @@ -28187,7 +28179,7 @@ } }, "finalStatus": { - "title": "Contract final status", + "title": "Final status", "description": "The final status of the contract, using the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", "type": [ "string", @@ -28196,12 +28188,20 @@ "codelist": "contractFinalStatus.csv", "openCodelist": false, "enum": [ - "terminatedSuccessfully", - "terminatedEarly", + "complete", + "incomplete", "cancelled", "unsuccessful", null ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the contract. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] } }, "patternProperties": { diff --git a/schema/release-schema.json b/schema/release-schema.json index 11b29a620..10211b040 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -927,8 +927,8 @@ "codelist": "contractFinalStatus.csv", "openCodelist": false, "enum": [ - "terminatedSuccessfully", - "terminatedEarly", + "complete", + "incomplete", "cancelled", "unsuccessful", null diff --git a/schema/versioned-release-validation-schema.json b/schema/versioned-release-validation-schema.json index 290485f15..8d9125fba 100644 --- a/schema/versioned-release-validation-schema.json +++ b/schema/versioned-release-validation-schema.json @@ -259,9 +259,6 @@ } } }, - "statusDetails": { - "$ref": "#/definitions/StringNullVersioned" - }, "procuringEntity": { "$ref": "#/definitions/OrganizationReferenceVersionedId" }, @@ -635,6 +632,9 @@ } } } + }, + "finalStatusDetails": { + "$ref": "#/definitions/StringNullVersioned" } }, "patternProperties": { @@ -741,9 +741,6 @@ } } }, - "statusDetails": { - "$ref": "#/definitions/StringNullVersioned" - }, "date": { "$ref": "#/definitions/StringNullDateTimeVersioned" }, @@ -831,6 +828,9 @@ } } } + }, + "finalStatusDetails": { + "$ref": "#/definitions/StringNullVersioned" } }, "patternProperties": { @@ -964,9 +964,6 @@ } } }, - "statusDetails": { - "$ref": "#/definitions/StringNullVersioned" - }, "dateSigned": { "$ref": "#/definitions/StringNullDateTimeVersioned" }, @@ -1046,8 +1043,8 @@ "codelist": "contractFinalStatus.csv", "openCodelist": false, "enum": [ - "terminatedSuccessfully", - "terminatedEarly", + "complete", + "incomplete", "cancelled", "unsuccessful", null @@ -1061,6 +1058,9 @@ } } } + }, + "finalStatusDetails": { + "$ref": "#/definitions/StringNullVersioned" } }, "patternProperties": { From a3ef96f0dcca7b0b24955c529b932933104e6a8d Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 27 Feb 2024 14:50:11 +1300 Subject: [PATCH 27/39] docs/examples: Reinstate tender.finalStatus = complete --- docs/examples/amendments/easy_releases.json | 16 ++++++++++++++-- docs/examples/change_history/award.json | 1 + docs/examples/change_history/records/award.json | 12 ++++++++++++ .../change_history/records/contract.json | 12 ++++++++++++ .../records/contractAmendment.json | 12 ++++++++++++ .../change_history/records/implementation.json | 12 ++++++++++++ .../frameworks/closed_single_supplier.json | 3 ++- .../examples/frameworks/open_multiple_award.json | 3 ++- .../moldova_organization_scale.json | 1 + .../uk_organization_classification.json | 1 + .../release_package.json | 1 + .../unsuccessful_tender/related_process.json | 1 + docs/guidance/build/change_history.md | 2 +- docs/guidance/map/framework_agreements.md | 4 ++++ 14 files changed, 76 insertions(+), 5 deletions(-) diff --git a/docs/examples/amendments/easy_releases.json b/docs/examples/amendments/easy_releases.json index 7cd906eb6..1e829be4b 100644 --- a/docs/examples/amendments/easy_releases.json +++ b/docs/examples/amendments/easy_releases.json @@ -37,7 +37,8 @@ "tender": { "procurementMethod": "limited", "procurementMethodDetails": "Limited tender", - "id": "ocds-d2phr6-6dcfcc44c9933c18d7f3cfa088de3319" + "id": "ocds-d2phr6-6dcfcc44c9933c18d7f3cfa088de3319", + "finalStatus": "complete" }, "id": "ocds-d2phr6-1000035663-tender-2015-04-04T00:00:00Z" }, @@ -206,7 +207,8 @@ "tender": { "procurementMethod": "limited", "procurementMethodDetails": "Limited tender", - "id": "ocds-d2phr6-6dcfcc44c9933c18d7f3cfa088de3319" + "id": "ocds-d2phr6-6dcfcc44c9933c18d7f3cfa088de3319", + "finalStatus": "complete" }, "contracts": [ { @@ -475,6 +477,16 @@ ], "value": "ocds-d2phr6-6dcfcc44c9933c18d7f3cfa088de3319" } + ], + "finalStatus": [ + { + "releaseID": "ocds-d2phr6-1000035663-tender-2015-04-04T00:00:00Z", + "releaseDate": "2015-04-04T00:00:00Z", + "releaseTag": [ + "tender" + ], + "value": "complete" + } ] }, "contracts": [ diff --git a/docs/examples/change_history/award.json b/docs/examples/change_history/award.json index c41932fae..f25fd6cf0 100644 --- a/docs/examples/change_history/award.json +++ b/docs/examples/change_history/award.json @@ -78,6 +78,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", + "finalStatus": "complete", "items": [ { "id": "0001", diff --git a/docs/examples/change_history/records/award.json b/docs/examples/change_history/records/award.json index 3101d887b..a032f99fc 100644 --- a/docs/examples/change_history/records/award.json +++ b/docs/examples/change_history/records/award.json @@ -331,6 +331,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", + "finalStatus": "complete", "items": [ { "id": "0001", @@ -559,6 +560,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", + "finalStatus": "complete", "items": [ { "id": "0001", @@ -1125,6 +1127,16 @@ "value": "Tenders solicited for work to build new cycle lanes in the centre of town." } ], + "finalStatus": [ + { + "releaseID": "ocds-213czf-000-00001-04-award", + "releaseDate": "2010-05-10T09:30:00Z", + "releaseTag": [ + "award" + ], + "value": "complete" + } + ], "items": [ { "id": "0001", diff --git a/docs/examples/change_history/records/contract.json b/docs/examples/change_history/records/contract.json index b0e0bca12..e1292b20c 100644 --- a/docs/examples/change_history/records/contract.json +++ b/docs/examples/change_history/records/contract.json @@ -331,6 +331,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", + "finalStatus": "complete", "items": [ { "id": "0001", @@ -749,6 +750,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", + "finalStatus": "complete", "items": [ { "id": "0001", @@ -1371,6 +1373,16 @@ "value": "Tenders solicited for work to build new cycle lanes in the centre of town." } ], + "finalStatus": [ + { + "releaseID": "ocds-213czf-000-00001-04-award", + "releaseDate": "2010-05-10T09:30:00Z", + "releaseTag": [ + "award" + ], + "value": "complete" + } + ], "items": [ { "id": "0001", diff --git a/docs/examples/change_history/records/contractAmendment.json b/docs/examples/change_history/records/contractAmendment.json index e5c1f18bf..006851388 100644 --- a/docs/examples/change_history/records/contractAmendment.json +++ b/docs/examples/change_history/records/contractAmendment.json @@ -331,6 +331,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", + "finalStatus": "complete", "items": [ { "id": "0001", @@ -1049,6 +1050,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", + "finalStatus": "complete", "items": [ { "id": "0001", @@ -1702,6 +1704,16 @@ "value": "Tenders solicited for work to build new cycle lanes in the centre of town." } ], + "finalStatus": [ + { + "releaseID": "ocds-213czf-000-00001-04-award", + "releaseDate": "2010-05-10T09:30:00Z", + "releaseTag": [ + "award" + ], + "value": "complete" + } + ], "items": [ { "id": "0001", diff --git a/docs/examples/change_history/records/implementation.json b/docs/examples/change_history/records/implementation.json index 6f6ee6194..894ba1b3f 100644 --- a/docs/examples/change_history/records/implementation.json +++ b/docs/examples/change_history/records/implementation.json @@ -331,6 +331,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", + "finalStatus": "complete", "items": [ { "id": "0001", @@ -850,6 +851,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", + "finalStatus": "complete", "items": [ { "id": "0001", @@ -1494,6 +1496,16 @@ "value": "Tenders solicited for work to build new cycle lanes in the centre of town." } ], + "finalStatus": [ + { + "releaseID": "ocds-213czf-000-00001-04-award", + "releaseDate": "2010-05-10T09:30:00Z", + "releaseTag": [ + "award" + ], + "value": "complete" + } + ], "items": [ { "id": "0001", diff --git a/docs/examples/frameworks/closed_single_supplier.json b/docs/examples/frameworks/closed_single_supplier.json index ac50b61c1..167431fab 100644 --- a/docs/examples/frameworks/closed_single_supplier.json +++ b/docs/examples/frameworks/closed_single_supplier.json @@ -18,7 +18,8 @@ } ], "tender": { - "id": "NP45719" + "id": "NP45719", + "finalStatus": "complete" }, "awards": [ { diff --git a/docs/examples/frameworks/open_multiple_award.json b/docs/examples/frameworks/open_multiple_award.json index 87ec062ae..d75e92058 100644 --- a/docs/examples/frameworks/open_multiple_award.json +++ b/docs/examples/frameworks/open_multiple_award.json @@ -23,7 +23,8 @@ } ], "tender": { - "id": "547054" + "id": "547054", + "finalStatus": "complete" }, "awards": [ { diff --git a/docs/examples/organizations/organization_classification/moldova_organization_scale.json b/docs/examples/organizations/organization_classification/moldova_organization_scale.json index 3d0ee05ff..65d065e29 100644 --- a/docs/examples/organizations/organization_classification/moldova_organization_scale.json +++ b/docs/examples/organizations/organization_classification/moldova_organization_scale.json @@ -30,6 +30,7 @@ "id": "ocds-b3wdp1-MD-1554728148222-tender", "title": "Îmbunătățirea planificată a pistelor ciclice", "description": "Ofertanții au solicitat lucrări pentru construirea de noi biciclete în centrul orașului.", + "finalStatus": "complete", "hasEnquiries": false, "submissionMethodDetails": "Lista platformelor: achizitii, ebs, licitatie, yptender", "tenderers": [ diff --git a/docs/examples/organizations/organization_classification/uk_organization_classification.json b/docs/examples/organizations/organization_classification/uk_organization_classification.json index e5e37dba5..2accb6227 100644 --- a/docs/examples/organizations/organization_classification/uk_organization_classification.json +++ b/docs/examples/organizations/organization_classification/uk_organization_classification.json @@ -14,6 +14,7 @@ "tender": { "id": "016248-Zg9B567X-001", "description": "Tender for the provision of borough reablement services, subsection frailty 65+.", + "finalStatus": "complete", "mainProcurementCategory": "services", "procurementMethodDetails": "Open procedure", "title": "Reablement — Frailty 65+", diff --git a/docs/examples/release_schema_reference/release_package.json b/docs/examples/release_schema_reference/release_package.json index 2fd7931a9..a428e8272 100644 --- a/docs/examples/release_schema_reference/release_package.json +++ b/docs/examples/release_schema_reference/release_package.json @@ -121,6 +121,7 @@ "id": "ocds-213czf-000-00001-01-tender", "title": "Planned cycle lane improvements", "description": "Tenders solicited for work to build new cycle lanes in the centre of town.", + "finalStatus": "complete", "statusDetails": "Evaluating proposals", "procuringEntity": { "id": "GB-LAC-E09000003", diff --git a/docs/examples/unsuccessful_tender/related_process.json b/docs/examples/unsuccessful_tender/related_process.json index 1ca394525..7d54f851a 100644 --- a/docs/examples/unsuccessful_tender/related_process.json +++ b/docs/examples/unsuccessful_tender/related_process.json @@ -52,6 +52,7 @@ "tender": { "id": "331547-adquisicion-maquinaria-implemento-vehiculo-3", "title": "ADQUISICION DE MAQUINARIA, IMPLEMENTO Y VEHICULO", + "finalStatus": "complete", "awardCriteria": "priceOnly", "awardCriteriaDetails": "Por Item", "submissionMethodDetails": "Lugar entrega ofertas: MUNICIPALIDA DE LOMA PLATA || Lugar entrega bien: Según documento del llamado || Fecha entrega bien: Según documento del llamado", diff --git a/docs/guidance/build/change_history.md b/docs/guidance/build/change_history.md index dbe307a87..69e9196e6 100644 --- a/docs/guidance/build/change_history.md +++ b/docs/guidance/build/change_history.md @@ -66,7 +66,7 @@ The publisher creates a new OCDS release for the award. The record has the relev The `parties` array has a new entry with the supplier's information. The complete `tender` section is repeated. Previous releases remain unchanged. -The publisher adds the new release to the record. They also update the compiled and versioned releases. The compiled release reflects the changes to the `awards` and `parties` sections. +The publisher adds the new release to the record. They also update the compiled and versioned releases. The compiled release reflects the changes to the `tender`, `awards` and `parties` sections. The versioned release includes a new change for the `tender.finalStatus` field. ```{jsoninclude} ../../examples/change_history/award.json :jsonpointer: /releases diff --git a/docs/guidance/map/framework_agreements.md b/docs/guidance/map/framework_agreements.md index d07b1451e..9ef31c646 100644 --- a/docs/guidance/map/framework_agreements.md +++ b/docs/guidance/map/framework_agreements.md @@ -110,6 +110,7 @@ The following guidance describes how to model the different stages of a framewor * For each supplier: * Add an `Organization` object to the `parties` array, add 'supplier' to its `.roles` and populate its other fields. * Add an `OrganizationReference` object to the award's `.suppliers` array, and set its `.id` and `.name` to match the supplier's object in the `parties` array. +* If no further suppliers will be added to the framework agreement, set `tender.finalStatus` to 'complete'. ### Award of a procurement contract without second-stage competition @@ -183,6 +184,7 @@ NSS issues a [contract award notice](https://ted.europa.eu/udl?uri=TED:NOTICE:26 The notice is modelled as an OCDS release with the same `ocid` as the previous release, a `tag` of 'award', and the following properties: +* Since no further suppliers will be added to the framework agreement, `tender.finalStatus` is set to 'complete'. * An `Award` object is added to the `awards` array. * An `Organization` object is added to the `parties` array with the supplier's details. * An `OrganizationReference` object is added to award's `.suppliers` array to reference the supplier's object in the `parties` array. @@ -246,6 +248,7 @@ Chile Compra issues an award notice to announce that the framework agreement has The notice is modelled as an OCDS release with the same `ocid` as the previous release, a `tag` of 'award', and the following properties: +* Since other suppliers are still able to submit a request to participate in the framework agreement, `tender.finalStatus` is not set. * An `Award` object is added to the `awards` array. * An `Organization` object is added to the `parties` array for each supplier with its details. * An `OrganizationReference` object is added to the award's `.suppliers` array for each supplier to reference its object in the `parties` array. @@ -285,6 +288,7 @@ The release has the following properties: * The same `ocid` as the invitation to participate in the second-stage competition is used. * The `relatedProcesses` section is populated with a reference to the contracting process for the first stage, including the relevant lot in `.relatedLots`. * The `tag` is set to 'award'. +* The `tender.finalStatus` is set to 'complete'. * The `awards` section is populated with the award value, period and items. * The `awards.suppliers` and `parties` fields are populated with the details of the supplier. From 38ba8c66d92030f05955b0f370b27b358f7c1038 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 27 Feb 2024 14:53:35 +1300 Subject: [PATCH 28/39] schema: Update enum, run pre-commit script --- docs/guidance/map/translations.md | 2 +- schema/dereferenced-release-schema.json | 2 ++ schema/release-schema.json | 1 + schema/versioned-release-validation-schema.json | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/guidance/map/translations.md b/docs/guidance/map/translations.md index e74c7647e..2923ebc57 100644 --- a/docs/guidance/map/translations.md +++ b/docs/guidance/map/translations.md @@ -12,10 +12,10 @@ You can publish the values of these fields in any language: % STARTLIST - `description`, in any location +- `finalStatusDetails`, in any location - `legalName`, in any location - `name`, in any location - `rationale`, in any location -- `statusDetails`, in any location - `title`, in any location - `parties/address/locality` - `parties/address/region` diff --git a/schema/dereferenced-release-schema.json b/schema/dereferenced-release-schema.json index 11772c55d..e1e6b0c76 100644 --- a/schema/dereferenced-release-schema.json +++ b/schema/dereferenced-release-schema.json @@ -6214,6 +6214,7 @@ "codelist": "tenderFinalStatus.csv", "openCodelist": false, "enum": [ + "complete", "cancelled", "unsuccessful", null @@ -19226,6 +19227,7 @@ "codelist": "tenderFinalStatus.csv", "openCodelist": false, "enum": [ + "complete", "cancelled", "unsuccessful", null diff --git a/schema/release-schema.json b/schema/release-schema.json index 5b0f82692..06ff1d90a 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -520,6 +520,7 @@ "codelist": "tenderFinalStatus.csv", "openCodelist": false, "enum": [ + "complete", "cancelled", "unsuccessful", null diff --git a/schema/versioned-release-validation-schema.json b/schema/versioned-release-validation-schema.json index 92d4f2093..a12d22d5a 100644 --- a/schema/versioned-release-validation-schema.json +++ b/schema/versioned-release-validation-schema.json @@ -617,6 +617,7 @@ "codelist": "tenderFinalStatus.csv", "openCodelist": false, "enum": [ + "complete", "cancelled", "unsuccessful", null From 0da5c89e0b428ca3fc0753afcca111d8ffd1a2c2 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 27 Feb 2024 15:00:25 +1300 Subject: [PATCH 29/39] schema/codelists/tenderStatus.csv: Update deprecation note for 'complete' --- schema/codelists/tenderStatus.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/codelists/tenderStatus.csv b/schema/codelists/tenderStatus.csv index fcab442a9..01716382d 100644 --- a/schema/codelists/tenderStatus.csv +++ b/schema/codelists/tenderStatus.csv @@ -2,7 +2,7 @@ Code,Title,Description,Deprecated,Deprecation note planning,Planning,"A future contracting process is being considered. Early information about the process can be provided in the tender section. A process with this status might provide information on early engagement or consultation opportunities, during which the details of a subsequent tender can be shaped.",1.2,"Deprecated as unnecessary, since contracting processes are separate from planning processes (which do not have any states)." planned,Planned,"The contracting process is scheduled, but contracting documents (for example, procurement documents) are not yet available to potential suppliers.",1.2,Deprecated because the same information can be determined by the absence of `tender.datePublished` (new in 1.2). active,Active,"The contracting documents (for example, procurement documents) are available to potential suppliers, and the bid submission deadline has not yet passed.",1.2,Deprecated because the same information can be determined by the presence of `tender.datePublished` (new in 1.2) and by comparing `tender/tenderPeriod/endDate` to `date`. -complete,Complete,The bid submission deadline has passed.,1.2,Deprecated because the same information can be determined by the presence of `tender.datePublished` (new in 1.2) and by comparing `tender.tenderPeriod.endDate` to `date`. +complete,Complete,The bid submission deadline has passed.,1.2,Deprecated in favour of 'complete' in the tender final status codelist (new in 1.2). cancelled,Cancelled,"The contracting process was cancelled by the buyer or the procuring entity (for example, because of a change in needs, insufficient funds, or technical or procedural errors) after the contracting documents (for example, procurement documents) were available to potential suppliers, but not later than the bid submission deadline.",1.2,OCDS 1.2 replaces this code with a new field for final states. unsuccessful,Unsuccessful,"The contracting process failed (for example, no bids were received, all bids were withdrawn by the bidders, all bids were rejected by the buyer or the procuring entity) after the contracting documents (for example, procurement documents) were available to potential suppliers, but not later than the bid submission deadline.",1.2,OCDS 1.2 replaces this code with a new field for final states. withdrawn,Withdrawn,No further information on the contracting process is available under this ocid.,1.2,"This code is deprecated, because it describes the status of the publication, not of the contracting process." From 05b5c445b4d0206c225bdb199f2a2e5d88ea36ab Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Sun, 24 Mar 2024 21:00:10 -0400 Subject: [PATCH 30/39] guidance/build/change_history: Normalize language for versioned release --- docs/guidance/build/change_history.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/guidance/build/change_history.md b/docs/guidance/build/change_history.md index 69e9196e6..9b3c1d3e6 100644 --- a/docs/guidance/build/change_history.md +++ b/docs/guidance/build/change_history.md @@ -44,7 +44,7 @@ The publisher creates a new OCDS release with the 'tenderUpdate' tag. The previous release is not changed. In the new release, the publisher adds a link to the new document in the `tender.documents` section. The `tender.hasEnquiries` field is also set to true. The publisher has decided to keep unchanged fields from the previous releases in the new one. -The record now has two immutable releases, and updated compiled and versioned releases. Note that the compiled release includes the enquiries document in the tender section. Also, the field `tender.hasEnquiries` has more than one entry in the versioned release. +The record now has two immutable releases, and updated compiled and versioned releases. Note that the compiled release includes the enquiries document in the tender section. The versioned release has a new entry for the `tender.hasEnquiries` field. ```{jsoninclude} ../../examples/change_history/tenderUpdate.json :jsonpointer: /releases @@ -86,7 +86,7 @@ By law, the procuring entity has to wait for complaints for a given period of ti The publisher creates a new OCDS release using the 'contract' tag. They include all the relevant information in the `contracts` section. -The record gets updated to include the new release. The compiled and versioned release now have the new `contract` section. There are no updates to other sections. +The record gets updated to include the new release. The compiled and versioned releases now set the `contracts` section. There are no updates to other sections. ```{jsoninclude} ../../examples/change_history/contract.json :jsonpointer: /releases @@ -120,7 +120,7 @@ Because the new release uses the same `ocid`, it is possible to update the recor OCDS can be used to combine data from different systems. For more information refer to the guidance on system architectures. ``` -The publisher adds the new release from the finance system to the releases list in the OCDS record. The compiled and versioned releases get updated to include the new transaction. +The publisher adds the new release from the finance system to the releases list in the OCDS record. The compiled and versioned releases now set the transaction. ```{jsoninclude} ../../examples/change_history/implementation.json :jsonpointer: /releases @@ -142,7 +142,7 @@ The publisher updates their procurement system with the new contract value and p Note that contract amendments in OCDS involves more modelling considerations. Refer to the amendments worked example for guidance on the topic. -The publisher updates the record for the contracting process with the new release. The compiled release has the new values. The versioned release shows new entries for the contract's value and end date. +The publisher updates the record for the contracting process with the new release. The compiled release has the new values. The versioned release has new entries for the contract's value and end date. ```{jsoninclude} ../../examples/change_history/contractAmendment.json :jsonpointer: /releases From 9bb16edb65ba955bc5c93bf27e4acc12280cb974 Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Sun, 24 Mar 2024 21:20:03 -0400 Subject: [PATCH 31/39] guidance/map/unsuccessful_processes: Restore simple quotes --- docs/guidance/map/unsuccessful_processes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guidance/map/unsuccessful_processes.md b/docs/guidance/map/unsuccessful_processes.md index 657d77245..55ce4a007 100644 --- a/docs/guidance/map/unsuccessful_processes.md +++ b/docs/guidance/map/unsuccessful_processes.md @@ -24,7 +24,7 @@ The first data disclosed is about the planning process. Planning data includes a Next, the contracting process is disclosed, using a new `ocid`, 'ocds-03ad3f-331547-1'. The `relatedProcess` block links the planning process and the contracting process, with the relationship set to 'planning'. -The tender was unsuccessful, so the tender's `finalStatus` is set to ‘unsuccessful’. +The tender was unsuccessful, so the tender's `finalStatus` is set to 'unsuccessful'. ```{jsoninclude} ../../examples/unsuccessful_tender/tender.json :jsonpointer: From 69117db80cd81bc6236bf2db527f207b63078353 Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Sun, 24 Mar 2024 21:24:56 -0400 Subject: [PATCH 32/39] changelog: Remove contract suspension changelog entry 3fc8aa8 --- docs/history/changelog.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/history/changelog.md b/docs/history/changelog.md index 2cd06a620..67bf99023 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -337,11 +337,9 @@ Per the [normative and non-normative content and changes policy](../governance/n * [#1618](https://github.com/open-contracting/standard/pull/1618) Add conformance rule about normative statements. * [#1618](https://github.com/open-contracting/standard/pull/1618) Remove validator and application conformance rules. * Examples - * Add examples: - * [#1344](https://github.com/open-contracting/standard/pull/1344) Contract suspension - * [#1665](https://github.com/open-contracting/standard/pull/1665) Translations - * [#1466](https://github.com/open-contracting/standard/pull/1466) Reference examples in release and record reference documentation. + * [#1665](https://github.com/open-contracting/standard/pull/1665) Add translations example. * [#1466](https://github.com/open-contracting/standard/pull/1482) Add examples in release reference documentation. + * [#1466](https://github.com/open-contracting/standard/pull/1466) Reference examples in release and record reference documentation. ## [1.1.5] - 2020-08-20 From cbe3e9aac5c8fe1df157eea23321e9013322b88b Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Sun, 24 Mar 2024 21:39:17 -0400 Subject: [PATCH 33/39] release-schema: Move finalStatus and finalStatusDetails after status --- schema/dereferenced-release-schema.json | 292 +++++++++--------- schema/release-schema.json | 146 ++++----- .../versioned-release-validation-schema.json | 230 +++++++------- 3 files changed, 334 insertions(+), 334 deletions(-) diff --git a/schema/dereferenced-release-schema.json b/schema/dereferenced-release-schema.json index e1e6b0c76..8f5812884 100644 --- a/schema/dereferenced-release-schema.json +++ b/schema/dereferenced-release-schema.json @@ -2339,6 +2339,30 @@ "deprecatedVersion": "1.2" } }, + "finalStatus": { + "title": "Final status", + "description": "The final status of the tender, using the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "tenderFinalStatus.csv", + "openCodelist": false, + "enum": [ + "complete", + "cancelled", + "unsuccessful", + null + ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the tender. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] + }, "procuringEntity": { "properties": { "name": { @@ -6203,30 +6227,6 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } - }, - "finalStatus": { - "title": "Final status", - "description": "The final status of the tender, using the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", - "type": [ - "string", - "null" - ], - "codelist": "tenderFinalStatus.csv", - "openCodelist": false, - "enum": [ - "complete", - "cancelled", - "unsuccessful", - null - ] - }, - "finalStatusDetails": { - "title": "Final status details", - "description": "Additional details on the final status of the tender. This field can be used to provide the local name of the final status.", - "type": [ - "string", - "null" - ] } } }, @@ -6288,6 +6288,30 @@ "deprecatedVersion": "1.2" } }, + "finalStatus": { + "title": "Final status", + "description": "The final status of the award, using the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "awardFinalStatus.csv", + "openCodelist": false, + "enum": [ + "complete", + "cancelled", + "unsuccessful", + null + ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the award. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] + }, "date": { "title": "Award date", "description": "The date of the contract award. This is usually the date on which a decision to award was made.", @@ -8716,30 +8740,6 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } - }, - "finalStatus": { - "title": "Final status", - "description": "The final status of the award, using the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", - "type": [ - "string", - "null" - ], - "codelist": "awardFinalStatus.csv", - "openCodelist": false, - "enum": [ - "complete", - "cancelled", - "unsuccessful", - null - ] - }, - "finalStatusDetails": { - "title": "Final status details", - "description": "Additional details on the final status of the award. This field can be used to provide the local name of the final status.", - "type": [ - "string", - "null" - ] } } }, @@ -8844,6 +8844,31 @@ "deprecatedVersion": "1.2" } }, + "finalStatus": { + "title": "Final status", + "description": "The final status of the contract, using the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "contractFinalStatus.csv", + "openCodelist": false, + "enum": [ + "complete", + "incomplete", + "cancelled", + "unsuccessful", + null + ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the contract. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] + }, "dateSigned": { "title": "Date concluded", "description": "The date the contract was concluded. Typically, this is the date when the last buyer or supplier signed the contract. However, if no contract is signed, then the date of contract conclusion may correspond to other dates (e.g. the date when the buyer notified the supplier, which had the legal effect of concluding the contract).", @@ -13974,31 +13999,6 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } - }, - "finalStatus": { - "title": "Final status", - "description": "The final status of the contract, using the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", - "type": [ - "string", - "null" - ], - "codelist": "contractFinalStatus.csv", - "openCodelist": false, - "enum": [ - "complete", - "incomplete", - "cancelled", - "unsuccessful", - null - ] - }, - "finalStatusDetails": { - "title": "Final status details", - "description": "Additional details on the final status of the contract. This field can be used to provide the local name of the final status.", - "type": [ - "string", - "null" - ] } } }, @@ -15352,6 +15352,30 @@ "deprecatedVersion": "1.2" } }, + "finalStatus": { + "title": "Final status", + "description": "The final status of the tender, using the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "tenderFinalStatus.csv", + "openCodelist": false, + "enum": [ + "complete", + "cancelled", + "unsuccessful", + null + ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the tender. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] + }, "procuringEntity": { "properties": { "name": { @@ -19216,30 +19240,6 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } - }, - "finalStatus": { - "title": "Final status", - "description": "The final status of the tender, using the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", - "type": [ - "string", - "null" - ], - "codelist": "tenderFinalStatus.csv", - "openCodelist": false, - "enum": [ - "complete", - "cancelled", - "unsuccessful", - null - ] - }, - "finalStatusDetails": { - "title": "Final status details", - "description": "Additional details on the final status of the tender. This field can be used to provide the local name of the final status.", - "type": [ - "string", - "null" - ] } } }, @@ -19297,6 +19297,30 @@ "deprecatedVersion": "1.2" } }, + "finalStatus": { + "title": "Final status", + "description": "The final status of the award, using the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "awardFinalStatus.csv", + "openCodelist": false, + "enum": [ + "complete", + "cancelled", + "unsuccessful", + null + ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the award. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] + }, "date": { "title": "Award date", "description": "The date of the contract award. This is usually the date on which a decision to award was made.", @@ -21725,30 +21749,6 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } - }, - "finalStatus": { - "title": "Final status", - "description": "The final status of the award, using the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", - "type": [ - "string", - "null" - ], - "codelist": "awardFinalStatus.csv", - "openCodelist": false, - "enum": [ - "complete", - "cancelled", - "unsuccessful", - null - ] - }, - "finalStatusDetails": { - "title": "Final status details", - "description": "Additional details on the final status of the award. This field can be used to provide the local name of the final status.", - "type": [ - "string", - "null" - ] } } }, @@ -21847,6 +21847,31 @@ "deprecatedVersion": "1.2" } }, + "finalStatus": { + "title": "Final status", + "description": "The final status of the contract, using the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "contractFinalStatus.csv", + "openCodelist": false, + "enum": [ + "complete", + "incomplete", + "cancelled", + "unsuccessful", + null + ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the contract. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] + }, "dateSigned": { "title": "Date concluded", "description": "The date the contract was concluded. Typically, this is the date when the last buyer or supplier signed the contract. However, if no contract is signed, then the date of contract conclusion may correspond to other dates (e.g. the date when the buyer notified the supplier, which had the legal effect of concluding the contract).", @@ -26977,31 +27002,6 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } - }, - "finalStatus": { - "title": "Final status", - "description": "The final status of the contract, using the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", - "type": [ - "string", - "null" - ], - "codelist": "contractFinalStatus.csv", - "openCodelist": false, - "enum": [ - "complete", - "incomplete", - "cancelled", - "unsuccessful", - null - ] - }, - "finalStatusDetails": { - "title": "Final status details", - "description": "Additional details on the final status of the contract. This field can be used to provide the local name of the final status.", - "type": [ - "string", - "null" - ] } } }, diff --git a/schema/release-schema.json b/schema/release-schema.json index 06ff1d90a..329516b4b 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -248,6 +248,30 @@ "deprecatedVersion": "1.2" } }, + "finalStatus": { + "title": "Final status", + "description": "The final status of the tender, using the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "tenderFinalStatus.csv", + "openCodelist": false, + "enum": [ + "complete", + "cancelled", + "unsuccessful", + null + ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the tender. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] + }, "procuringEntity": { "title": "Procuring entity", "description": "The organization managing the contracting (or planning) process. If an organization is both a buyer and a procuring entity (as can be the case in simple contracting processes), it should be disclosed using the buyer field, but not this field.", @@ -509,30 +533,6 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } - }, - "finalStatus": { - "title": "Final status", - "description": "The final status of the tender, using the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.", - "type": [ - "string", - "null" - ], - "codelist": "tenderFinalStatus.csv", - "openCodelist": false, - "enum": [ - "complete", - "cancelled", - "unsuccessful", - null - ] - }, - "finalStatusDetails": { - "title": "Final status details", - "description": "Additional details on the final status of the tender. This field can be used to provide the local name of the final status.", - "type": [ - "string", - "null" - ] } } }, @@ -590,6 +590,30 @@ "deprecatedVersion": "1.2" } }, + "finalStatus": { + "title": "Final status", + "description": "The final status of the award, using the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "awardFinalStatus.csv", + "openCodelist": false, + "enum": [ + "complete", + "cancelled", + "unsuccessful", + null + ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the award. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] + }, "date": { "title": "Award date", "description": "The date of the contract award. This is usually the date on which a decision to award was made.", @@ -672,30 +696,6 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } - }, - "finalStatus": { - "title": "Final status", - "description": "The final status of the award, using the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.", - "type": [ - "string", - "null" - ], - "codelist": "awardFinalStatus.csv", - "openCodelist": false, - "enum": [ - "complete", - "cancelled", - "unsuccessful", - null - ] - }, - "finalStatusDetails": { - "title": "Final status details", - "description": "Additional details on the final status of the award. This field can be used to provide the local name of the final status.", - "type": [ - "string", - "null" - ] } } }, @@ -773,6 +773,31 @@ "deprecatedVersion": "1.2" } }, + "finalStatus": { + "title": "Final status", + "description": "The final status of the contract, using the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", + "type": [ + "string", + "null" + ], + "codelist": "contractFinalStatus.csv", + "openCodelist": false, + "enum": [ + "complete", + "incomplete", + "cancelled", + "unsuccessful", + null + ] + }, + "finalStatusDetails": { + "title": "Final status details", + "description": "Additional details on the final status of the contract. This field can be used to provide the local name of the final status.", + "type": [ + "string", + "null" + ] + }, "dateSigned": { "title": "Date concluded", "description": "The date the contract was concluded. Typically, this is the date when the last buyer or supplier signed the contract. However, if no contract is signed, then the date of contract conclusion may correspond to other dates (e.g. the date when the buyer notified the supplier, which had the legal effect of concluding the contract).", @@ -863,31 +888,6 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } - }, - "finalStatus": { - "title": "Final status", - "description": "The final status of the contract, using the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.", - "type": [ - "string", - "null" - ], - "codelist": "contractFinalStatus.csv", - "openCodelist": false, - "enum": [ - "complete", - "incomplete", - "cancelled", - "unsuccessful", - null - ] - }, - "finalStatusDetails": { - "title": "Final status details", - "description": "Additional details on the final status of the contract. This field can be used to provide the local name of the final status.", - "type": [ - "string", - "null" - ] } } }, diff --git a/schema/versioned-release-validation-schema.json b/schema/versioned-release-validation-schema.json index a12d22d5a..1295e7379 100644 --- a/schema/versioned-release-validation-schema.json +++ b/schema/versioned-release-validation-schema.json @@ -251,6 +251,44 @@ } } }, + "finalStatus": { + "type": "array", + "items": { + "type": "object", + "properties": { + "releaseDate": { + "format": "date-time", + "type": "string" + }, + "releaseID": { + "type": "string" + }, + "value": { + "type": [ + "string", + "null" + ], + "codelist": "tenderFinalStatus.csv", + "openCodelist": false, + "enum": [ + "complete", + "cancelled", + "unsuccessful", + null + ] + }, + "releaseTag": { + "type": "array", + "items": { + "type": "string" + } + } + } + } + }, + "finalStatusDetails": { + "$ref": "#/definitions/StringNullVersioned" + }, "procuringEntity": { "$ref": "#/definitions/OrganizationReferenceVersionedId" }, @@ -596,44 +634,6 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } - }, - "finalStatus": { - "type": "array", - "items": { - "type": "object", - "properties": { - "releaseDate": { - "format": "date-time", - "type": "string" - }, - "releaseID": { - "type": "string" - }, - "value": { - "type": [ - "string", - "null" - ], - "codelist": "tenderFinalStatus.csv", - "openCodelist": false, - "enum": [ - "complete", - "cancelled", - "unsuccessful", - null - ] - }, - "releaseTag": { - "type": "array", - "items": { - "type": "string" - } - } - } - } - }, - "finalStatusDetails": { - "$ref": "#/definitions/StringNullVersioned" } } }, @@ -696,6 +696,44 @@ } } }, + "finalStatus": { + "type": "array", + "items": { + "type": "object", + "properties": { + "releaseDate": { + "format": "date-time", + "type": "string" + }, + "releaseID": { + "type": "string" + }, + "value": { + "type": [ + "string", + "null" + ], + "codelist": "awardFinalStatus.csv", + "openCodelist": false, + "enum": [ + "complete", + "cancelled", + "unsuccessful", + null + ] + }, + "releaseTag": { + "type": "array", + "items": { + "type": "string" + } + } + } + } + }, + "finalStatusDetails": { + "$ref": "#/definitions/StringNullVersioned" + }, "date": { "$ref": "#/definitions/StringNullDateTimeVersioned" }, @@ -748,44 +786,6 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } - }, - "finalStatus": { - "type": "array", - "items": { - "type": "object", - "properties": { - "releaseDate": { - "format": "date-time", - "type": "string" - }, - "releaseID": { - "type": "string" - }, - "value": { - "type": [ - "string", - "null" - ], - "codelist": "awardFinalStatus.csv", - "openCodelist": false, - "enum": [ - "complete", - "cancelled", - "unsuccessful", - null - ] - }, - "releaseTag": { - "type": "array", - "items": { - "type": "string" - } - } - } - } - }, - "finalStatusDetails": { - "$ref": "#/definitions/StringNullVersioned" } } }, @@ -905,6 +905,45 @@ } } }, + "finalStatus": { + "type": "array", + "items": { + "type": "object", + "properties": { + "releaseDate": { + "format": "date-time", + "type": "string" + }, + "releaseID": { + "type": "string" + }, + "value": { + "type": [ + "string", + "null" + ], + "codelist": "contractFinalStatus.csv", + "openCodelist": false, + "enum": [ + "complete", + "incomplete", + "cancelled", + "unsuccessful", + null + ] + }, + "releaseTag": { + "type": "array", + "items": { + "type": "string" + } + } + } + } + }, + "finalStatusDetails": { + "$ref": "#/definitions/StringNullVersioned" + }, "dateSigned": { "$ref": "#/definitions/StringNullDateTimeVersioned" }, @@ -967,45 +1006,6 @@ "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } - }, - "finalStatus": { - "type": "array", - "items": { - "type": "object", - "properties": { - "releaseDate": { - "format": "date-time", - "type": "string" - }, - "releaseID": { - "type": "string" - }, - "value": { - "type": [ - "string", - "null" - ], - "codelist": "contractFinalStatus.csv", - "openCodelist": false, - "enum": [ - "complete", - "incomplete", - "cancelled", - "unsuccessful", - null - ] - }, - "releaseTag": { - "type": "array", - "items": { - "type": "string" - } - } - } - } - }, - "finalStatusDetails": { - "$ref": "#/definitions/StringNullVersioned" } } }, From 4ae83030f76d5eb409b78a1ea62641649ff6cf8f Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Sun, 24 Mar 2024 21:41:20 -0400 Subject: [PATCH 34/39] codelists: Remove versionchanged directive from deprecated contractStatus codelist --- docs/schema/codelists.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/schema/codelists.md b/docs/schema/codelists.md index 69ccf7e51..bd3dc7bc6 100644 --- a/docs/schema/codelists.md +++ b/docs/schema/codelists.md @@ -288,10 +288,6 @@ The procurement category codelist is used to indicate the **primary** focus of a ```{deprecated} 1.2 ``` -```{versionchanged} 1.2 -Added the 'terminatedEarly' and 'terminatedSuccessfully' codes. -``` - ```{csv-table-no-translate} :header-rows: 1 :file: ../../build/current_lang/codelists/contractStatus.csv From b0defa9f68f027c0469a4c3790d49e432bc48a37 Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Sun, 24 Mar 2024 21:46:58 -0400 Subject: [PATCH 35/39] release-schema,tenderStatus(typo): Change favour to favor --- schema/codelists/tenderStatus.csv | 2 +- schema/dereferenced-release-schema.json | 12 ++++++------ schema/release-schema.json | 6 +++--- schema/versioned-release-validation-schema.json | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/schema/codelists/tenderStatus.csv b/schema/codelists/tenderStatus.csv index 01716382d..8c023a777 100644 --- a/schema/codelists/tenderStatus.csv +++ b/schema/codelists/tenderStatus.csv @@ -2,7 +2,7 @@ Code,Title,Description,Deprecated,Deprecation note planning,Planning,"A future contracting process is being considered. Early information about the process can be provided in the tender section. A process with this status might provide information on early engagement or consultation opportunities, during which the details of a subsequent tender can be shaped.",1.2,"Deprecated as unnecessary, since contracting processes are separate from planning processes (which do not have any states)." planned,Planned,"The contracting process is scheduled, but contracting documents (for example, procurement documents) are not yet available to potential suppliers.",1.2,Deprecated because the same information can be determined by the absence of `tender.datePublished` (new in 1.2). active,Active,"The contracting documents (for example, procurement documents) are available to potential suppliers, and the bid submission deadline has not yet passed.",1.2,Deprecated because the same information can be determined by the presence of `tender.datePublished` (new in 1.2) and by comparing `tender/tenderPeriod/endDate` to `date`. -complete,Complete,The bid submission deadline has passed.,1.2,Deprecated in favour of 'complete' in the tender final status codelist (new in 1.2). +complete,Complete,The bid submission deadline has passed.,1.2,Deprecated in favor of 'complete' in the tender final status codelist (new in 1.2). cancelled,Cancelled,"The contracting process was cancelled by the buyer or the procuring entity (for example, because of a change in needs, insufficient funds, or technical or procedural errors) after the contracting documents (for example, procurement documents) were available to potential suppliers, but not later than the bid submission deadline.",1.2,OCDS 1.2 replaces this code with a new field for final states. unsuccessful,Unsuccessful,"The contracting process failed (for example, no bids were received, all bids were withdrawn by the bidders, all bids were rejected by the buyer or the procuring entity) after the contracting documents (for example, procurement documents) were available to potential suppliers, but not later than the bid submission deadline.",1.2,OCDS 1.2 replaces this code with a new field for final states. withdrawn,Withdrawn,No further information on the contracting process is available under this ocid.,1.2,"This code is deprecated, because it describes the status of the publication, not of the contracting process." diff --git a/schema/dereferenced-release-schema.json b/schema/dereferenced-release-schema.json index 8f5812884..e4d755869 100644 --- a/schema/dereferenced-release-schema.json +++ b/schema/dereferenced-release-schema.json @@ -6224,7 +6224,7 @@ } }, "deprecated": { - "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", + "description": "The single amendment object has been deprecated in favor of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } } @@ -8737,7 +8737,7 @@ } }, "deprecated": { - "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", + "description": "The single amendment object has been deprecated in favor of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } } @@ -13996,7 +13996,7 @@ } }, "deprecated": { - "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", + "description": "The single amendment object has been deprecated in favor of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } } @@ -19237,7 +19237,7 @@ } }, "deprecated": { - "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", + "description": "The single amendment object has been deprecated in favor of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } } @@ -21746,7 +21746,7 @@ } }, "deprecated": { - "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", + "description": "The single amendment object has been deprecated in favor of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } } @@ -26999,7 +26999,7 @@ } }, "deprecated": { - "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", + "description": "The single amendment object has been deprecated in favor of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } } diff --git a/schema/release-schema.json b/schema/release-schema.json index 329516b4b..8dadeeec0 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -530,7 +530,7 @@ "description": "The use of individual amendment objects has been deprecated. From OCDS 1.1 information should be provided in the amendments array.", "$ref": "#/definitions/Amendment", "deprecated": { - "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", + "description": "The single amendment object has been deprecated in favor of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } } @@ -693,7 +693,7 @@ "description": "The use of individual amendment objects has been deprecated. From OCDS 1.1 information should be provided in the amendments array.", "$ref": "#/definitions/Amendment", "deprecated": { - "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", + "description": "The single amendment object has been deprecated in favor of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } } @@ -885,7 +885,7 @@ "description": "The use of individual amendment objects has been deprecated. From OCDS 1.1 information should be provided in the amendments array.", "$ref": "#/definitions/Amendment", "deprecated": { - "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", + "description": "The single amendment object has been deprecated in favor of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } } diff --git a/schema/versioned-release-validation-schema.json b/schema/versioned-release-validation-schema.json index 1295e7379..0c8b62e01 100644 --- a/schema/versioned-release-validation-schema.json +++ b/schema/versioned-release-validation-schema.json @@ -631,7 +631,7 @@ "amendment": { "$ref": "#/definitions/Amendment", "deprecated": { - "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", + "description": "The single amendment object has been deprecated in favor of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } } @@ -783,7 +783,7 @@ "amendment": { "$ref": "#/definitions/Amendment", "deprecated": { - "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", + "description": "The single amendment object has been deprecated in favor of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } } @@ -1003,7 +1003,7 @@ "amendment": { "$ref": "#/definitions/Amendment", "deprecated": { - "description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.", + "description": "The single amendment object has been deprecated in favor of including amendments in an amendments (plural) array.", "deprecatedVersion": "1.1" } } From ba485006b0160d55dc6172a876de7f5b274e11cd Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Sun, 24 Mar 2024 21:50:16 -0400 Subject: [PATCH 36/39] tenderStatus: Use same Deprecated wording for 'complete' as for others --- schema/codelists/tenderStatus.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/codelists/tenderStatus.csv b/schema/codelists/tenderStatus.csv index 8c023a777..8debbbdb8 100644 --- a/schema/codelists/tenderStatus.csv +++ b/schema/codelists/tenderStatus.csv @@ -2,7 +2,7 @@ Code,Title,Description,Deprecated,Deprecation note planning,Planning,"A future contracting process is being considered. Early information about the process can be provided in the tender section. A process with this status might provide information on early engagement or consultation opportunities, during which the details of a subsequent tender can be shaped.",1.2,"Deprecated as unnecessary, since contracting processes are separate from planning processes (which do not have any states)." planned,Planned,"The contracting process is scheduled, but contracting documents (for example, procurement documents) are not yet available to potential suppliers.",1.2,Deprecated because the same information can be determined by the absence of `tender.datePublished` (new in 1.2). active,Active,"The contracting documents (for example, procurement documents) are available to potential suppliers, and the bid submission deadline has not yet passed.",1.2,Deprecated because the same information can be determined by the presence of `tender.datePublished` (new in 1.2) and by comparing `tender/tenderPeriod/endDate` to `date`. -complete,Complete,The bid submission deadline has passed.,1.2,Deprecated in favor of 'complete' in the tender final status codelist (new in 1.2). +complete,Complete,The bid submission deadline has passed.,1.2,OCDS 1.2 replaces this code with a new field for final states. cancelled,Cancelled,"The contracting process was cancelled by the buyer or the procuring entity (for example, because of a change in needs, insufficient funds, or technical or procedural errors) after the contracting documents (for example, procurement documents) were available to potential suppliers, but not later than the bid submission deadline.",1.2,OCDS 1.2 replaces this code with a new field for final states. unsuccessful,Unsuccessful,"The contracting process failed (for example, no bids were received, all bids were withdrawn by the bidders, all bids were rejected by the buyer or the procuring entity) after the contracting documents (for example, procurement documents) were available to potential suppliers, but not later than the bid submission deadline.",1.2,OCDS 1.2 replaces this code with a new field for final states. withdrawn,Withdrawn,No further information on the contracting process is available under this ocid.,1.2,"This code is deprecated, because it describes the status of the publication, not of the contracting process." From 2fa5242c49a349ed463031c4e902292c069bf51d Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Sun, 24 Mar 2024 23:05:27 -0400 Subject: [PATCH 37/39] guidance/build/change_history: Use note admonition for sidenote. Add link to example. --- docs/guidance/build/change_history.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/guidance/build/change_history.md b/docs/guidance/build/change_history.md index 9b3c1d3e6..f2dea39db 100644 --- a/docs/guidance/build/change_history.md +++ b/docs/guidance/build/change_history.md @@ -44,7 +44,7 @@ The publisher creates a new OCDS release with the 'tenderUpdate' tag. The previous release is not changed. In the new release, the publisher adds a link to the new document in the `tender.documents` section. The `tender.hasEnquiries` field is also set to true. The publisher has decided to keep unchanged fields from the previous releases in the new one. -The record now has two immutable releases, and updated compiled and versioned releases. Note that the compiled release includes the enquiries document in the tender section. The versioned release has a new entry for the `tender.hasEnquiries` field. +The record now has two immutable releases, and updated compiled and versioned releases. The compiled release now includes the enquiries document in the tender section. The versioned release has a new entry for the `tender.hasEnquiries` field. ```{jsoninclude} ../../examples/change_history/tenderUpdate.json :jsonpointer: /releases @@ -140,7 +140,9 @@ Unexpected complications causes delays in the construction work. Because of them The publisher updates their procurement system with the new contract value and period. They issue a modification notice through the system. They also create a new OCDS with the 'contractAmendment' tag to represent the notice. -Note that contract amendments in OCDS involves more modelling considerations. Refer to the amendments worked example for guidance on the topic. +```{note} +Contract amendments in OCDS involves more modelling considerations. See the [amendments example](../map/amendments). +``` The publisher updates the record for the contracting process with the new release. The compiled release has the new values. The versioned release has new entries for the contract's value and end date. From 7c4759b9d9d453cb65bf745b54eb09c2d0761022 Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Sun, 24 Mar 2024 23:07:58 -0400 Subject: [PATCH 38/39] changelog: Remove second entry about tender.datePublished, which is new in 1.2 --- docs/history/changelog.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/history/changelog.md b/docs/history/changelog.md index 67bf99023..e949e17cc 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -237,7 +237,6 @@ Per the [normative and non-normative content and changes policy](../governance/n * [#1618](https://github.com/open-contracting/standard/pull/1618) `tender.enquiryPeriod`, to remove the suggestion to use `tender.submissionMethodDetails` for information about how to submit enquiries. * [#1645](https://github.com/open-contracting/standard/pull/1645) `relatedProcesses`, to use consistent wording in the description of multi-stage procedures. * [#1618](https://github.com/open-contracting/standard/pull/1618) Normalize field descriptions according to a style guide. - * [#1648](https://github.com/open-contracting/standard/pull/1648) `tender.datePublished`, to clarify its relation to procurement documents. * [#1656](https://github.com/open-contracting/standard/pull/1656) `Award.value` and `Contract.value`, to clarify with respect to changes in contract values. * [#1509](https://github.com/open-contracting/standard/pull/1509) `planning`, `Planning`, `tender` and `Tender` to clarify relationships with the availability of documents. * [#1663](https://github.com/open-contracting/standard/pull/1663) `tender.amendments`, `awards.amendments`, `contracts.amendments` to avoid restating field titles. From ca6245885a20458d0846c35a4a4bf8cca20e6ebc Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Sun, 24 Mar 2024 23:09:24 -0400 Subject: [PATCH 39/39] Apply suggestions from code review guidance/build/change_history: Restore mention of finalStatus in merged releases. changelog: Remove repetitions. --- docs/guidance/build/change_history.md | 4 ++-- docs/history/changelog.md | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/docs/guidance/build/change_history.md b/docs/guidance/build/change_history.md index f2dea39db..7661f52cd 100644 --- a/docs/guidance/build/change_history.md +++ b/docs/guidance/build/change_history.md @@ -64,9 +64,9 @@ The procuring entity makes the decision to award the contract to Balfour Beatty. The publisher creates a new OCDS release for the award. The record has the relevant information in the award section and uses the 'award' tag. -The `parties` array has a new entry with the supplier's information. The complete `tender` section is repeated. Previous releases remain unchanged. +The `parties` array has a new entry with the supplier's information. The complete `tender` section is repeated, and its `finalStatus` field is set to 'complete'. Previous releases remain unchanged. -The publisher adds the new release to the record. They also update the compiled and versioned releases. The compiled release reflects the changes to the `tender`, `awards` and `parties` sections. The versioned release includes a new change for the `tender.finalStatus` field. +The publisher adds the new release to the record. They also update the compiled and versioned releases. The compiled release reflects the changes to the `tender`, `awards` and `parties` sections. The versioned release now sets the `tender.finalStatus` field. ```{jsoninclude} ../../examples/change_history/award.json :jsonpointer: /releases diff --git a/docs/history/changelog.md b/docs/history/changelog.md index e949e17cc..c6fd7e458 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -311,13 +311,6 @@ Per the [normative and non-normative content and changes policy](../governance/n * [#1161](https://github.com/open-contracting/standard/pull/1161) Change recommendation for unknown time component. * [#1208](https://github.com/open-contracting/standard/pull/1208) Update guidance with new field definitions. * [#1216](https://github.com/open-contracting/standard/pull/1216) Update definitions of contracting process, record, and ocid. Introduce definition of planning process. -* [#1307](https://github.com/open-contracting/standard/pull/1307) Clarify uniqueness rules for records. -* [#1315](https://github.com/open-contracting/standard/pull/1315) Add rules on setting `id` and `date` for compiled releases to the merging specification. -* [#1375](https://github.com/open-contracting/standard/pull/1375) Update guidance for empty fields in the merging documentation. -* [#1466](https://github.com/open-contracting/standard/pull/1466) Reference worked examples in release and record reference documentation. -* [#1466](https://github.com/open-contracting/standard/pull/1482) Add examples in release reference documentation. -* [#1618](https://github.com/open-contracting/standard/pull/1618) Add conformance rule about normative statements. -* [#1618](https://github.com/open-contracting/standard/pull/1618) Remove validator and application conformance rules. * [#1618](https://github.com/open-contracting/standard/pull/1618) Move governance policies from Google Docs, updating references for OCDS 1.1.5 and OCDS 1.2.0, and removing references to GitHub issues. * Records * [#1307](https://github.com/open-contracting/standard/pull/1307) Clarify uniqueness rules for records.