From 3e8cbc023022b8321c61a94add3ce2572bdd537e Mon Sep 17 00:00:00 2001 From: odscjen Date: Wed, 18 May 2022 09:58:43 +0100 Subject: [PATCH 1/6] adding amountNet and amountGross to value, updating value definition --- schema/dereferenced-release-schema.json | 864 +++++++++++++++++- schema/release-schema.json | 18 +- .../versioned-release-validation-schema.json | 54 ++ 3 files changed, 887 insertions(+), 49 deletions(-) diff --git a/schema/dereferenced-release-schema.json b/schema/dereferenced-release-schema.json index d2e2d09b3..b792948a4 100644 --- a/schema/dereferenced-release-schema.json +++ b/schema/dereferenced-release-schema.json @@ -1241,7 +1241,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -2027,7 +2043,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -3180,7 +3212,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -3541,7 +3589,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -3871,7 +3935,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -4201,7 +4281,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -5827,7 +5923,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -6499,7 +6611,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -6829,7 +6957,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -7159,7 +7303,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -8200,7 +8360,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -9076,7 +9252,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -9406,7 +9598,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -9736,7 +9944,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -10244,7 +10468,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -10833,7 +11073,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -12226,7 +12482,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -12924,7 +13196,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -13736,7 +14024,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -14455,7 +14759,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -15241,7 +15561,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -16394,7 +16730,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -16755,7 +17107,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -17085,7 +17453,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -17415,7 +17799,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -19041,7 +19441,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -19709,7 +20125,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -20039,7 +20471,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -20369,7 +20817,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -21410,7 +21874,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -22280,7 +22760,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -22610,7 +23106,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -22940,7 +23452,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -23448,7 +23976,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -24037,7 +24581,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -25430,7 +25990,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -26128,7 +26704,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -26940,7 +27532,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -27546,7 +28154,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -28939,7 +29563,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -29637,7 +30277,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -30379,7 +31035,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -30883,7 +31555,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -31309,7 +31997,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -32702,7 +33406,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -34401,7 +35121,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -35337,7 +36073,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" @@ -35800,7 +36552,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" diff --git a/schema/release-schema.json b/schema/release-schema.json index 2b6062e97..e80430ce0 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -2191,7 +2191,23 @@ "properties": { "amount": { "title": "Amount", - "description": "Amount as a number.", + "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "type": [ + "number", + "null" + ] + }, + "amountNet": { + "title": "Net amount", + "description": "The amount excluding all taxes as a number.", + "type": [ + "number", + "null" + ] + }, + "amountGross": { + "title": "Gross amount", + "description": "The amount including all taxes as a number.", "type": [ "number", "null" diff --git a/schema/versioned-release-validation-schema.json b/schema/versioned-release-validation-schema.json index f0c10a6e1..4ba2fda22 100644 --- a/schema/versioned-release-validation-schema.json +++ b/schema/versioned-release-validation-schema.json @@ -2394,6 +2394,60 @@ } } }, + "amountNet": { + "type": "array", + "items": { + "type": "object", + "properties": { + "releaseDate": { + "format": "date-time", + "type": "string" + }, + "releaseID": { + "type": "string" + }, + "value": { + "type": [ + "number", + "null" + ] + }, + "releaseTag": { + "type": "array", + "items": { + "type": "string" + } + } + } + } + }, + "amountGross": { + "type": "array", + "items": { + "type": "object", + "properties": { + "releaseDate": { + "format": "date-time", + "type": "string" + }, + "releaseID": { + "type": "string" + }, + "value": { + "type": [ + "number", + "null" + ] + }, + "releaseTag": { + "type": "array", + "items": { + "type": "string" + } + } + } + } + }, "currency": { "type": "array", "items": { From cd4e6cc04de890d13e2120bd50ba278a18c07bdc Mon Sep 17 00:00:00 2001 From: odscjen Date: Wed, 18 May 2022 10:36:57 +0100 Subject: [PATCH 2/6] update changelog.md --- docs/history/changelog.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/history/changelog.md b/docs/history/changelog.md index 199c89807..7eb4cf5f2 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -184,6 +184,7 @@ Per the [normative and non-normative content and changes policy](https://docs.go * [#1455](https://github.com/open-contracting/standard/pull/1455) `Milestone.dueAfterDate` * [#1434](https://github.com/open-contracting/standard/pull/1434) `Milestone.value` * [#1490](https://github.com/open-contracting/standard/pull/1490) `SimpleIdentifier` + * [#1519](https://github.com/open-contracting/standard/pull/1519) `amountNet` and `amountGross` to `value` * Deprecate some fields: * [#1200](https://github.com/open-contracting/standard/pull/1200) `tender.submissionMethod`, because all codes from the `submissionMethod` codelist are deprecated. @@ -200,6 +201,7 @@ Per the [normative and non-normative content and changes policy](https://docs.go * [#1189](https://github.com/open-contracting/standard/pull/1189) `Document.url`, to use precise wording and to describe how to indicate a part of a document. * [#1229](https://github.com/open-contracting/standard/pull/1229) Standardize the descriptions of `planning.documents`, `tender.documents`, `awards.documents`, `contracts.documents`, and `contracts.implementation.documents`. * [#1335](https://github.com/open-contracting/standard/pull/1335) Standardize the descriptions of `planning`, `planning.rationale`, `planning.budget`, `planning.documents`, and `planning.milestones`. + * [#1519](https://github.com/open-contracting/standard/pull/1519) `value.amount`, to clarify amount from tender/award/contract notcie document. * Remove confusing terminology: * [#1487](https://github.com/open-contracting/standard/pull/1487) `planning.budget.project`, to remove sentence about translation options. From 7a2a3d55e3bc04e6cdcb674a4921567fcae29fb6 Mon Sep 17 00:00:00 2001 From: odscjen Date: Wed, 18 May 2022 11:17:08 +0100 Subject: [PATCH 3/6] correct typo in changelog.md --- docs/history/changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/history/changelog.md b/docs/history/changelog.md index 7eb4cf5f2..f7beb1278 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -201,7 +201,7 @@ Per the [normative and non-normative content and changes policy](https://docs.go * [#1189](https://github.com/open-contracting/standard/pull/1189) `Document.url`, to use precise wording and to describe how to indicate a part of a document. * [#1229](https://github.com/open-contracting/standard/pull/1229) Standardize the descriptions of `planning.documents`, `tender.documents`, `awards.documents`, `contracts.documents`, and `contracts.implementation.documents`. * [#1335](https://github.com/open-contracting/standard/pull/1335) Standardize the descriptions of `planning`, `planning.rationale`, `planning.budget`, `planning.documents`, and `planning.milestones`. - * [#1519](https://github.com/open-contracting/standard/pull/1519) `value.amount`, to clarify amount from tender/award/contract notcie document. + * [#1519](https://github.com/open-contracting/standard/pull/1519) `value.amount`, to clarify amount from tender/award/contract notice document. * Remove confusing terminology: * [#1487](https://github.com/open-contracting/standard/pull/1487) `planning.budget.project`, to remove sentence about translation options. From c73af0988b168d21a78c6e179945e48fa0be9d95 Mon Sep 17 00:00:00 2001 From: odscjen Date: Mon, 1 Aug 2022 11:04:30 +0100 Subject: [PATCH 4/6] value: update amount fields based on review and add explanation to schema/reference.md --- docs/history/changelog.md | 2 +- docs/schema/reference.md | 8 +- schema/dereferenced-release-schema.json | 288 ++++++++++++------------ schema/release-schema.json | 6 +- 4 files changed, 154 insertions(+), 150 deletions(-) diff --git a/docs/history/changelog.md b/docs/history/changelog.md index 8c4811513..50d35fe20 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -207,7 +207,7 @@ Per the [normative and non-normative content and changes policy](https://docs.go * [#1335](https://github.com/open-contracting/standard/pull/1335) Standardize the descriptions of `planning`, `planning.rationale`, `planning.budget`, `planning.documents`, and `planning.milestones`. * [#1530](https://github.com/open-contracting/standard/pull/1530) `Buyer`, `tender.items`, `awards.items`, `contracts.items`, `Item`, `Item.description`, `Item.unit`, `Unit`, `transaction.providerOrganization`, `transaction.receiverOrganization` to use consistent wording for "goods, services and/or works". * [#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. - * [#1519](https://github.com/open-contracting/standard/pull/1519) `value.amount`, to clarify amount from tender/award/contract notice document. + * [#1519](https://github.com/open-contracting/standard/pull/1519) `value.amount`, to clarify amount taken from system or document. * Remove confusing terminology: * [#1487](https://github.com/open-contracting/standard/pull/1487) `planning.budget.project`, to remove sentence about translation options. diff --git a/docs/schema/reference.md b/docs/schema/reference.md index 4b3b75684..5a8c283fc 100644 --- a/docs/schema/reference.md +++ b/docs/schema/reference.md @@ -655,7 +655,11 @@ For delivery milestones, if there is a time frame for delivery, use `.dueAfterDa ### Value -Financial values should be published with a currency attached. +Financial values should be published with a currency attached. There are three fields available for providing the value amount: + +* When it is known that the value includes all taxes use `value/amountGross`; +* When it is known that the value excludes all taxes use `value/amountNet`; +* When it is unknown if the value includes all taxes or not use `value/amount`. ````{admonition} Example :class: hint @@ -670,7 +674,7 @@ Financial values should be published with a currency attached. :pointer: /definitions/Value ``` -Support for exchange rates, and tax information, can be provided using extensions. +Support for exchange rates can be provided using extensions. ### RelatedProcess diff --git a/schema/dereferenced-release-schema.json b/schema/dereferenced-release-schema.json index 8dc86ab01..c12e43a1e 100644 --- a/schema/dereferenced-release-schema.json +++ b/schema/dereferenced-release-schema.json @@ -1241,7 +1241,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -1249,7 +1249,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -1257,7 +1257,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -2043,7 +2043,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -2051,7 +2051,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -2059,7 +2059,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -3212,7 +3212,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -3220,7 +3220,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -3228,7 +3228,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -3589,7 +3589,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -3597,7 +3597,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -3605,7 +3605,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -3935,7 +3935,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -3943,7 +3943,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -3951,7 +3951,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -4281,7 +4281,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -4289,7 +4289,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -4297,7 +4297,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -5923,7 +5923,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -5931,7 +5931,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -5939,7 +5939,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -6611,7 +6611,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -6619,7 +6619,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -6627,7 +6627,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -6957,7 +6957,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -6965,7 +6965,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -6973,7 +6973,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -7303,7 +7303,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -7311,7 +7311,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -7319,7 +7319,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -8360,7 +8360,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -8368,7 +8368,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -8376,7 +8376,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -9252,7 +9252,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -9260,7 +9260,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -9268,7 +9268,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -9598,7 +9598,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -9606,7 +9606,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -9614,7 +9614,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -9944,7 +9944,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -9952,7 +9952,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -9960,7 +9960,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -10468,7 +10468,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -10476,7 +10476,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -10484,7 +10484,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -11073,7 +11073,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -11081,7 +11081,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -11089,7 +11089,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -12482,7 +12482,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -12490,7 +12490,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -12498,7 +12498,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -13196,7 +13196,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -13204,7 +13204,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -13212,7 +13212,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -14024,7 +14024,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -14032,7 +14032,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -14040,7 +14040,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -14759,7 +14759,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -14767,7 +14767,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -14775,7 +14775,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -15561,7 +15561,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -15569,7 +15569,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -15577,7 +15577,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -16730,7 +16730,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -16738,7 +16738,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -16746,7 +16746,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -17107,7 +17107,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -17115,7 +17115,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -17123,7 +17123,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -17453,7 +17453,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -17461,7 +17461,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -17469,7 +17469,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -17799,7 +17799,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -17807,7 +17807,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -17815,7 +17815,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -19441,7 +19441,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -19449,7 +19449,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -19457,7 +19457,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -20125,7 +20125,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -20133,7 +20133,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -20141,7 +20141,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -20471,7 +20471,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -20479,7 +20479,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -20487,7 +20487,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -20817,7 +20817,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -20825,7 +20825,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -20833,7 +20833,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -21874,7 +21874,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -21882,7 +21882,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -21890,7 +21890,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -22760,7 +22760,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -22768,7 +22768,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -22776,7 +22776,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -23106,7 +23106,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -23114,7 +23114,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -23122,7 +23122,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -23452,7 +23452,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -23460,7 +23460,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -23468,7 +23468,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -23976,7 +23976,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -23984,7 +23984,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -23992,7 +23992,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -24581,7 +24581,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -24589,7 +24589,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -24597,7 +24597,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -25990,7 +25990,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -25998,7 +25998,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -26006,7 +26006,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -26704,7 +26704,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -26712,7 +26712,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -26720,7 +26720,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -27532,7 +27532,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -27540,7 +27540,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -27548,7 +27548,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -28154,7 +28154,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -28162,7 +28162,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -28170,7 +28170,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -29563,7 +29563,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -29571,7 +29571,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -29579,7 +29579,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -30277,7 +30277,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -30285,7 +30285,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -30293,7 +30293,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -31035,7 +31035,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -31043,7 +31043,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -31051,7 +31051,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -31555,7 +31555,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -31563,7 +31563,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -31571,7 +31571,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -31997,7 +31997,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -32005,7 +32005,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -32013,7 +32013,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -33406,7 +33406,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -33414,7 +33414,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -33422,7 +33422,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -35121,7 +35121,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -35129,7 +35129,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -35137,7 +35137,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -36073,7 +36073,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -36081,7 +36081,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -36089,7 +36089,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" @@ -36552,7 +36552,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -36560,7 +36560,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -36568,7 +36568,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" diff --git a/schema/release-schema.json b/schema/release-schema.json index 641cf32c4..1352c6219 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -2191,7 +2191,7 @@ "properties": { "amount": { "title": "Amount", - "description": "The amount as stated in the tender notice / award notice / contract notice document as a number.", + "description": "The amount as entered into a system or published in a document.", "type": [ "number", "null" @@ -2199,7 +2199,7 @@ }, "amountNet": { "title": "Net amount", - "description": "The amount excluding all taxes as a number.", + "description": "The amount excluding all taxes.", "type": [ "number", "null" @@ -2207,7 +2207,7 @@ }, "amountGross": { "title": "Gross amount", - "description": "The amount including all taxes as a number.", + "description": "The amount including all taxes.", "type": [ "number", "null" From c2666f9e89c5657803fbc96439fcc98842927a0e Mon Sep 17 00:00:00 2001 From: odscjen <95221058+odscjen@users.noreply.github.com> Date: Wed, 3 Aug 2022 09:51:09 +0100 Subject: [PATCH 5/6] Update docs/schema/reference.md Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com> --- docs/schema/reference.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/schema/reference.md b/docs/schema/reference.md index 5a8c283fc..39bf54d15 100644 --- a/docs/schema/reference.md +++ b/docs/schema/reference.md @@ -655,11 +655,14 @@ For delivery milestones, if there is a time frame for delivery, use `.dueAfterDa ### Value -Financial values should be published with a currency attached. There are three fields available for providing the value amount: +`currency`, `amountNet` and `amountGross` should be provided, wherever possible. -* When it is known that the value includes all taxes use `value/amountGross`; -* When it is known that the value excludes all taxes use `value/amountNet`; -* When it is unknown if the value includes all taxes or not use `value/amount`. +`amount` is defined as: + +```{field-description} ../../build/current_lang/release-schema.json /definitions/Value/properties/amount +``` + +If both the `amountNet` and the `amountGross` match this definition, enter the `amountNet` as the `amount`. ````{admonition} Example :class: hint From a56036744c15a0faa68bb068567ea48e15aef632 Mon Sep 17 00:00:00 2001 From: odscjen <95221058+odscjen@users.noreply.github.com> Date: Wed, 3 Aug 2022 09:51:17 +0100 Subject: [PATCH 6/6] Update docs/history/changelog.md Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com> --- docs/history/changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/history/changelog.md b/docs/history/changelog.md index 50d35fe20..a1e6a79cc 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -186,7 +186,7 @@ Per the [normative and non-normative content and changes policy](https://docs.go * [#1455](https://github.com/open-contracting/standard/pull/1455) `Milestone.dueAfterDate` * [#1434](https://github.com/open-contracting/standard/pull/1434) `Milestone.value` * [#1490](https://github.com/open-contracting/standard/pull/1490) `SimpleIdentifier` - * [#1519](https://github.com/open-contracting/standard/pull/1519) `amountNet` and `amountGross` to `value` + * [#1519](https://github.com/open-contracting/standard/pull/1519) `Value.amountNet` and `Value.amountGross` * Deprecate some fields: * [#1200](https://github.com/open-contracting/standard/pull/1200) `tender.submissionMethod`, because all codes from the `submissionMethod` codelist are deprecated.