diff --git a/clearing-parent/backend-api/src/main/resources/meta/data.xml b/clearing-parent/backend-api/src/main/resources/meta/data.xml
index 4fb3405e5..5cc07adaf 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/data.xml
+++ b/clearing-parent/backend-api/src/main/resources/meta/data.xml
@@ -427,6 +427,7 @@
+
@@ -531,7 +532,7 @@
-
+
diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.json b/clearing-parent/backend-api/src/main/resources/meta/meta.json
index f38db6df2..a1c79cd96 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/meta.json
+++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json
@@ -1,6 +1,6 @@
{
- "version": "3.8.0.57",
+ "version": "3.8.0.58",
"enums": {
@@ -4263,7 +4263,7 @@
}
,
{"code": "account",
- "type": 2,"length": 50,"name": "Номер счета","shortname": "Счет","required": true
+ "type": 2,"length": 50,"name": "Номер счета","shortname": "Счет"
}
,
{"code": "status",
diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml
index d19bfe011..0873a9139 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml
+++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml
@@ -1,6 +1,6 @@
-
+
@@ -988,7 +988,7 @@
-
+
diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json
index f38db6df2..a1c79cd96 100644
--- a/clearing-parent/backend-api/src/test/resources/meta.json
+++ b/clearing-parent/backend-api/src/test/resources/meta.json
@@ -1,6 +1,6 @@
{
- "version": "3.8.0.57",
+ "version": "3.8.0.58",
"enums": {
@@ -4263,7 +4263,7 @@
}
,
{"code": "account",
- "type": 2,"length": 50,"name": "Номер счета","shortname": "Счет","required": true
+ "type": 2,"length": 50,"name": "Номер счета","shortname": "Счет"
}
,
{"code": "status",
diff --git a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql
index 86f5f59bb..e410b2c68 100644
--- a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql
+++ b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql
@@ -1,4 +1,4 @@
--- DB version: 3.8.0.55
+-- DB version: 3.8.0.58
-- DATA version: 3.5.0.13
@@ -492,6 +492,10 @@ INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (24, 'GREF', 'Формиро
INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (25, 'FDFF', 'Формирование ДФ-05 с кодом 9 (финальный)') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (26, 'SDEP', 'Время начала возврата депозитов') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+
+INSERT INTO TASK_DICTIONARY(ID, CODE, NAME) values (27, 'EDEP', 'Время завершения возврата депозитов') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+
INSERT INTO TASK_STATUS_DICTIONARY(ID, CODE, NAME) values (1, 'ACTV', 'Активна') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO TASK_STATUS_DICTIONARY(ID, CODE, NAME) values (2, 'BLKD', 'Не активна') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
@@ -824,6 +828,8 @@ INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5022, 'ACNT', 'Для
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5023, 'ACNT', 'Счет %s уже используется.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5024, 'ACNT', 'Не указан номер счета.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5200, 'BLNC', 'Общая ошибка модуля balance-service.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5210, 'BLNC', 'Клиринговая сессия неактивна.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
@@ -916,6 +922,8 @@ INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5431, 'CLRN', 'Дат
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5432, 'CLRN', 'После сверки обнаружена разница между плановым и фактическим балансом') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5433, 'CLRN', 'Сессия по возврату депозита не может исполняться вне временного интервала, установленного в системе') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5600, 'DBFI', 'Общая ошибка модуля dbf-importer.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5800, 'DBFE', 'Общая ошибка модуля dbf-exporter.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;