From ddf9dfba479417cd629dc00e49cfca1778a443a9 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Wed, 4 Jan 2023 11:56:50 +0200 Subject: [PATCH] decimal mark thousand separator options --- .../Resources/metadata/entityDefs/Preferences.json | 13 +++++++++++-- .../Resources/metadata/entityDefs/Settings.json | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/application/Espo/Resources/metadata/entityDefs/Preferences.json b/application/Espo/Resources/metadata/entityDefs/Preferences.json index 39cd9374c2..983b59fa7b 100644 --- a/application/Espo/Resources/metadata/entityDefs/Preferences.json +++ b/application/Espo/Resources/metadata/entityDefs/Preferences.json @@ -26,13 +26,22 @@ "type": "varchar", "default": ",", "maxLength": 1, - "view": "views/settings/fields/thousand-separator" + "view": "views/settings/fields/thousand-separator", + "options": [ + ".", + ",", + "'" + ] }, "decimalMark": { "type": "varchar", "default": ".", "required": true, - "maxLength": 1 + "maxLength": 1, + "options": [ + ".", + "," + ] }, "dashboardLayout": { "type": "jsonArray", diff --git a/application/Espo/Resources/metadata/entityDefs/Settings.json b/application/Espo/Resources/metadata/entityDefs/Settings.json index d39adc0c64..8a99cfe850 100644 --- a/application/Espo/Resources/metadata/entityDefs/Settings.json +++ b/application/Espo/Resources/metadata/entityDefs/Settings.json @@ -142,13 +142,22 @@ "type": "varchar", "default": ",", "maxLength": 1, - "view": "views/settings/fields/thousand-separator" + "view": "views/settings/fields/thousand-separator", + "options": [ + ".", + ",", + "'" + ] }, "decimalMark": { "type": "varchar", "default": ".", "required": true, - "maxLength": 1 + "maxLength": 1, + "options": [ + ".", + "," + ] }, "currencyList": { "type": "multiEnum",