diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/BankAccountValidationConfig.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/BankAccountValidationConfig.java index a708769cd..2fbb58b85 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/BankAccountValidationConfig.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/BankAccountValidationConfig.java @@ -56,10 +56,6 @@ public class BankAccountValidationConfig { AccountError.RequiredFieldEmpty, AccountError.CompanyNotFound, false), - FieldNotBlankRequiredRule.instance("account", - BankAccountNewRequest::getAccount, - AccountError.RequiredFieldEmpty - ), new SameAccountValidationRule<>(AccountType.Bank, BankAccountNewRequest::getAccount), DictionaryPresentRule.instance("currency", BankAccountNewRequest::getCurrency, 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 19a53abc9..7eeceff53 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.12.4.97", + "version": "3.12.8.98", "enums": { @@ -5024,7 +5024,7 @@ } , {"code": "account", - "type": 2,"length": 50,"name": "Номер счета","shortname": "Счет","required": true + "type": 2,"length": 50,"name": "Номер счета","shortname": "Счет","required": false } , {"code": "companyId", @@ -5891,7 +5891,7 @@ } , {"code": "correspondentAccountId", - "type": 1,"group": "Получатель","name": "Корреспондентский счет","shortname": "Корр. счет","link": "bankAccount","linkCode": "correspondentAccountName","linkKeyCode": "id","required": true,"enabled": true + "type": 1,"group": "Получатель","name": "Корреспондентский счет","shortname": "Корр. счет","linkCode": "correspondentAccountName","linkKeyCode": "id","required": true,"enabled": true } , {"code": "debitLeg_accountId", 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 08a63081e..7e4afa3c2 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 @@ - + @@ -1167,7 +1167,7 @@ - + @@ -1368,7 +1368,7 @@ - + diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index 19a53abc9..7eeceff53 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.12.4.97", + "version": "3.12.8.98", "enums": { @@ -5024,7 +5024,7 @@ } , {"code": "account", - "type": 2,"length": 50,"name": "Номер счета","shortname": "Счет","required": true + "type": 2,"length": 50,"name": "Номер счета","shortname": "Счет","required": false } , {"code": "companyId", @@ -5891,7 +5891,7 @@ } , {"code": "correspondentAccountId", - "type": 1,"group": "Получатель","name": "Корреспондентский счет","shortname": "Корр. счет","link": "bankAccount","linkCode": "correspondentAccountName","linkKeyCode": "id","required": true,"enabled": true + "type": 1,"group": "Получатель","name": "Корреспондентский счет","shortname": "Корр. счет","linkCode": "correspondentAccountName","linkKeyCode": "id","required": true,"enabled": true } , {"code": "debitLeg_accountId",