diff --git a/tests/skills/cases/form-compile/attributes-types.json b/tests/skills/cases/form-compile/attributes-types.json index 869df26e..f32bb3e4 100644 --- a/tests/skills/cases/form-compile/attributes-types.json +++ b/tests/skills/cases/form-compile/attributes-types.json @@ -22,7 +22,7 @@ { "input": "Булево", "path": "Булево" } ], "attributes": [ - { "name": "Объект", "type": "ExternalDataProcessorObject.Типы", "main": true }, + { "name": "Объект", "type": "DataProcessorObject.Типы", "main": true }, { "name": "Строка", "type": "string(200)" }, { "name": "Число", "type": "decimal(10,0,nonneg)" }, { "name": "Дата", "type": "dateTime" }, diff --git a/tests/skills/cases/form-compile/commands.json b/tests/skills/cases/form-compile/commands.json index 45136914..6cef4705 100644 --- a/tests/skills/cases/form-compile/commands.json +++ b/tests/skills/cases/form-compile/commands.json @@ -23,7 +23,7 @@ { "input": "Результат", "path": "Результат", "multiLine": true, "height": 8, "readOnly": true } ], "attributes": [ - { "name": "Объект", "type": "ExternalDataProcessorObject.Команды", "main": true }, + { "name": "Объект", "type": "DataProcessorObject.Команды", "main": true }, { "name": "Результат", "type": "string" } ], "commands": [ diff --git a/tests/skills/cases/form-compile/events.json b/tests/skills/cases/form-compile/events.json index ba625ad5..05bd48b0 100644 --- a/tests/skills/cases/form-compile/events.json +++ b/tests/skills/cases/form-compile/events.json @@ -22,7 +22,7 @@ { "label": "Подсказка", "title": "Нажмите для перехода", "hyperlink": true, "on": ["Click"] } ], "attributes": [ - { "name": "Объект", "type": "ExternalDataProcessorObject.События", "main": true }, + { "name": "Объект", "type": "DataProcessorObject.События", "main": true }, { "name": "Организация", "type": "string" }, { "name": "Период", "type": "date" } ] diff --git a/tests/skills/cases/form-compile/file-dialog.json b/tests/skills/cases/form-compile/file-dialog.json index c12b848b..8853099f 100644 --- a/tests/skills/cases/form-compile/file-dialog.json +++ b/tests/skills/cases/form-compile/file-dialog.json @@ -29,7 +29,7 @@ ]} ], "attributes": [ - { "name": "Объект", "type": "ExternalDataProcessorObject.ЗагрузкаИзФайла", "main": true }, + { "name": "Объект", "type": "DataProcessorObject.ЗагрузкаИзФайла", "main": true }, { "name": "ИмяФайла", "type": "string" }, { "name": "ПерваяСтрокаЗаголовок", "type": "boolean" }, { "name": "Результат", "type": "string" } diff --git a/tests/skills/cases/form-compile/groups.json b/tests/skills/cases/form-compile/groups.json index 6b4c91d1..fa474f58 100644 --- a/tests/skills/cases/form-compile/groups.json +++ b/tests/skills/cases/form-compile/groups.json @@ -26,7 +26,7 @@ ]} ], "attributes": [ - { "name": "Объект", "type": "ExternalDataProcessorObject.СГруппами", "main": true }, + { "name": "Объект", "type": "DataProcessorObject.СГруппами", "main": true }, { "name": "Поле1", "type": "string" }, { "name": "Поле2", "type": "decimal(15,2)" }, { "name": "Поле3", "type": "date" } diff --git a/tests/skills/cases/form-compile/input-fields.json b/tests/skills/cases/form-compile/input-fields.json index 44c9f237..27c45e99 100644 --- a/tests/skills/cases/form-compile/input-fields.json +++ b/tests/skills/cases/form-compile/input-fields.json @@ -24,7 +24,7 @@ { "check": "Флаг", "path": "Флаг", "title": "Включено" } ], "attributes": [ - { "name": "Объект", "type": "ExternalDataProcessorObject.ПоляВвода", "main": true }, + { "name": "Объект", "type": "DataProcessorObject.ПоляВвода", "main": true }, { "name": "ОбычноеПоле", "type": "string(100)" }, { "name": "МногострочноеПоле", "type": "string" }, { "name": "ПолеПароля", "type": "string(50)" }, diff --git a/tests/skills/cases/form-compile/pages.json b/tests/skills/cases/form-compile/pages.json index 93c23bce..c1e79c44 100644 --- a/tests/skills/cases/form-compile/pages.json +++ b/tests/skills/cases/form-compile/pages.json @@ -31,7 +31,7 @@ ]} ], "attributes": [ - { "name": "Объект", "type": "ExternalDataProcessorObject.Мастер", "main": true }, + { "name": "Объект", "type": "DataProcessorObject.Мастер", "main": true }, { "name": "Параметр1", "type": "string" }, { "name": "Итог", "type": "string" } ], diff --git a/tests/skills/cases/form-compile/snapshots/attributes-types/DataProcessors/Типы/Forms/Форма/Ext/Form.xml b/tests/skills/cases/form-compile/snapshots/attributes-types/DataProcessors/Типы/Forms/Форма/Ext/Form.xml index de215cc3..772b90d8 100644 --- a/tests/skills/cases/form-compile/snapshots/attributes-types/DataProcessors/Типы/Forms/Форма/Ext/Form.xml +++ b/tests/skills/cases/form-compile/snapshots/attributes-types/DataProcessors/Типы/Forms/Форма/Ext/Form.xml @@ -35,7 +35,7 @@ - cfg:ExternalDataProcessorObject.Типы + cfg:DataProcessorObject.Типы true diff --git a/tests/skills/cases/form-compile/snapshots/commands/DataProcessors/Команды/Forms/Форма/Ext/Form.xml b/tests/skills/cases/form-compile/snapshots/commands/DataProcessors/Команды/Forms/Форма/Ext/Form.xml index 29373db5..1e28a424 100644 --- a/tests/skills/cases/form-compile/snapshots/commands/DataProcessors/Команды/Forms/Форма/Ext/Form.xml +++ b/tests/skills/cases/form-compile/snapshots/commands/DataProcessors/Команды/Forms/Форма/Ext/Form.xml @@ -36,7 +36,7 @@ - cfg:ExternalDataProcessorObject.Команды + cfg:DataProcessorObject.Команды true diff --git a/tests/skills/cases/form-compile/snapshots/events/DataProcessors/События/Forms/Форма/Ext/Form.xml b/tests/skills/cases/form-compile/snapshots/events/DataProcessors/События/Forms/Форма/Ext/Form.xml index 3f09f910..e9d2fd6e 100644 --- a/tests/skills/cases/form-compile/snapshots/events/DataProcessors/События/Forms/Форма/Ext/Form.xml +++ b/tests/skills/cases/form-compile/snapshots/events/DataProcessors/События/Forms/Форма/Ext/Form.xml @@ -47,7 +47,7 @@ - cfg:ExternalDataProcessorObject.События + cfg:DataProcessorObject.События true diff --git a/tests/skills/cases/form-compile/snapshots/file-dialog/DataProcessors/ЗагрузкаИзФайла/Forms/Форма/Ext/Form.xml b/tests/skills/cases/form-compile/snapshots/file-dialog/DataProcessors/ЗагрузкаИзФайла/Forms/Форма/Ext/Form.xml index a070c812..a1f7070d 100644 --- a/tests/skills/cases/form-compile/snapshots/file-dialog/DataProcessors/ЗагрузкаИзФайла/Forms/Форма/Ext/Form.xml +++ b/tests/skills/cases/form-compile/snapshots/file-dialog/DataProcessors/ЗагрузкаИзФайла/Forms/Форма/Ext/Form.xml @@ -79,7 +79,7 @@ - cfg:ExternalDataProcessorObject.ЗагрузкаИзФайла + cfg:DataProcessorObject.ЗагрузкаИзФайла true diff --git a/tests/skills/cases/form-compile/snapshots/groups/DataProcessors/СГруппами/Forms/Форма/Ext/Form.xml b/tests/skills/cases/form-compile/snapshots/groups/DataProcessors/СГруппами/Forms/Форма/Ext/Form.xml index f7568682..4ba7c8d8 100644 --- a/tests/skills/cases/form-compile/snapshots/groups/DataProcessors/СГруппами/Forms/Форма/Ext/Form.xml +++ b/tests/skills/cases/form-compile/snapshots/groups/DataProcessors/СГруппами/Forms/Форма/Ext/Form.xml @@ -69,7 +69,7 @@ - cfg:ExternalDataProcessorObject.СГруппами + cfg:DataProcessorObject.СГруппами true diff --git a/tests/skills/cases/form-compile/snapshots/input-fields/DataProcessors/ПоляВвода/Forms/Форма/Ext/Form.xml b/tests/skills/cases/form-compile/snapshots/input-fields/DataProcessors/ПоляВвода/Forms/Форма/Ext/Form.xml index cb84824e..d0cc3653 100644 --- a/tests/skills/cases/form-compile/snapshots/input-fields/DataProcessors/ПоляВвода/Forms/Форма/Ext/Form.xml +++ b/tests/skills/cases/form-compile/snapshots/input-fields/DataProcessors/ПоляВвода/Forms/Форма/Ext/Form.xml @@ -91,7 +91,7 @@ - cfg:ExternalDataProcessorObject.ПоляВвода + cfg:DataProcessorObject.ПоляВвода true diff --git a/tests/skills/cases/form-compile/snapshots/pages/DataProcessors/Мастер/Forms/Форма/Ext/Form.xml b/tests/skills/cases/form-compile/snapshots/pages/DataProcessors/Мастер/Forms/Форма/Ext/Form.xml index d1cea7e0..b826493d 100644 --- a/tests/skills/cases/form-compile/snapshots/pages/DataProcessors/Мастер/Forms/Форма/Ext/Form.xml +++ b/tests/skills/cases/form-compile/snapshots/pages/DataProcessors/Мастер/Forms/Форма/Ext/Form.xml @@ -81,7 +81,7 @@ - cfg:ExternalDataProcessorObject.Мастер + cfg:DataProcessorObject.Мастер true diff --git a/tests/skills/cases/form-compile/snapshots/table/DataProcessors/Таблица/Forms/Форма/Ext/Form.xml b/tests/skills/cases/form-compile/snapshots/table/DataProcessors/Таблица/Forms/Форма/Ext/Form.xml index 1e377ee7..8cffd9b3 100644 --- a/tests/skills/cases/form-compile/snapshots/table/DataProcessors/Таблица/Forms/Форма/Ext/Form.xml +++ b/tests/skills/cases/form-compile/snapshots/table/DataProcessors/Таблица/Forms/Форма/Ext/Form.xml @@ -41,7 +41,7 @@ - cfg:ExternalDataProcessorObject.Таблица + cfg:DataProcessorObject.Таблица true diff --git a/tests/skills/cases/form-compile/table.json b/tests/skills/cases/form-compile/table.json index 025d12aa..bdd3e9b3 100644 --- a/tests/skills/cases/form-compile/table.json +++ b/tests/skills/cases/form-compile/table.json @@ -23,7 +23,7 @@ ]} ], "attributes": [ - { "name": "Объект", "type": "ExternalDataProcessorObject.Таблица", "main": true }, + { "name": "Объект", "type": "DataProcessorObject.Таблица", "main": true }, { "name": "Данные", "type": "ValueTable", "columns": [ { "name": "Дата", "type": "date" }, { "name": "Сумма", "type": "decimal(15,2)" }, diff --git a/tests/skills/cases/form-edit/add-attribute.json b/tests/skills/cases/form-edit/add-attribute.json index b2c2c006..42df59f7 100644 --- a/tests/skills/cases/form-edit/add-attribute.json +++ b/tests/skills/cases/form-edit/add-attribute.json @@ -14,7 +14,7 @@ "script": "form-compile/scripts/form-compile", "input": { "title": "Реквизиты", - "attributes": [{ "name": "Объект", "type": "ExternalDataProcessorObject.Реквизиты", "main": true }] + "attributes": [{ "name": "Объект", "type": "DataProcessorObject.Реквизиты", "main": true }] }, "args": { "-JsonPath": "{inputFile}", "-OutputPath": "{workDir}/DataProcessors/Реквизиты/Forms/Форма/Ext/Form.xml" } } diff --git a/tests/skills/cases/form-edit/add-command.json b/tests/skills/cases/form-edit/add-command.json index d27c2924..d5c9dad5 100644 --- a/tests/skills/cases/form-edit/add-command.json +++ b/tests/skills/cases/form-edit/add-command.json @@ -14,7 +14,7 @@ "script": "form-compile/scripts/form-compile", "input": { "title": "Команды", - "attributes": [{ "name": "Объект", "type": "ExternalDataProcessorObject.КомандыТест", "main": true }] + "attributes": [{ "name": "Объект", "type": "DataProcessorObject.КомандыТест", "main": true }] }, "args": { "-JsonPath": "{inputFile}", "-OutputPath": "{workDir}/DataProcessors/КомандыТест/Forms/Форма/Ext/Form.xml" } } diff --git a/tests/skills/cases/form-edit/add-element.json b/tests/skills/cases/form-edit/add-element.json index e29d0c7a..6cd60356 100644 --- a/tests/skills/cases/form-edit/add-element.json +++ b/tests/skills/cases/form-edit/add-element.json @@ -14,7 +14,7 @@ "script": "form-compile/scripts/form-compile", "input": { "title": "Тест", - "attributes": [{ "name": "Объект", "type": "ExternalDataProcessorObject.Тест", "main": true }], + "attributes": [{ "name": "Объект", "type": "DataProcessorObject.Тест", "main": true }], "elements": [ { "input": "Поле1", "path": "Поле1", "title": "Поле 1" } ] diff --git a/tests/skills/cases/form-edit/add-group-with-fields.json b/tests/skills/cases/form-edit/add-group-with-fields.json index c98f0bf7..dc799c54 100644 --- a/tests/skills/cases/form-edit/add-group-with-fields.json +++ b/tests/skills/cases/form-edit/add-group-with-fields.json @@ -14,7 +14,7 @@ "script": "form-compile/scripts/form-compile", "input": { "title": "Группа", - "attributes": [{ "name": "Объект", "type": "ExternalDataProcessorObject.Группа", "main": true }], + "attributes": [{ "name": "Объект", "type": "DataProcessorObject.Группа", "main": true }], "elements": [ { "input": "Поле1", "path": "Поле1", "title": "Существующее поле" } ] diff --git a/tests/skills/cases/form-edit/snapshots/add-attribute/DataProcessors/Реквизиты/Forms/Форма/Ext/Form.xml b/tests/skills/cases/form-edit/snapshots/add-attribute/DataProcessors/Реквизиты/Forms/Форма/Ext/Form.xml index ab2bfdf3..27422818 100644 --- a/tests/skills/cases/form-edit/snapshots/add-attribute/DataProcessors/Реквизиты/Forms/Форма/Ext/Form.xml +++ b/tests/skills/cases/form-edit/snapshots/add-attribute/DataProcessors/Реквизиты/Forms/Форма/Ext/Form.xml @@ -13,7 +13,7 @@ - cfg:ExternalDataProcessorObject.Реквизиты + cfg:DataProcessorObject.Реквизиты true diff --git a/tests/skills/cases/form-edit/snapshots/add-command/DataProcessors/КомандыТест/Forms/Форма/Ext/Form.xml b/tests/skills/cases/form-edit/snapshots/add-command/DataProcessors/КомандыТест/Forms/Форма/Ext/Form.xml index 3b02c66d..211cf302 100644 --- a/tests/skills/cases/form-edit/snapshots/add-command/DataProcessors/КомандыТест/Forms/Форма/Ext/Form.xml +++ b/tests/skills/cases/form-edit/snapshots/add-command/DataProcessors/КомандыТест/Forms/Форма/Ext/Form.xml @@ -20,7 +20,7 @@ - cfg:ExternalDataProcessorObject.КомандыТест + cfg:DataProcessorObject.КомандыТест true diff --git a/tests/skills/cases/form-edit/snapshots/add-element/DataProcessors/Тест/Forms/Форма/Ext/Form.xml b/tests/skills/cases/form-edit/snapshots/add-element/DataProcessors/Тест/Forms/Форма/Ext/Form.xml index b4a71915..21b0561d 100644 --- a/tests/skills/cases/form-edit/snapshots/add-element/DataProcessors/Тест/Forms/Форма/Ext/Form.xml +++ b/tests/skills/cases/form-edit/snapshots/add-element/DataProcessors/Тест/Forms/Форма/Ext/Form.xml @@ -37,7 +37,7 @@ - cfg:ExternalDataProcessorObject.Тест + cfg:DataProcessorObject.Тест true diff --git a/tests/skills/cases/form-edit/snapshots/add-group-with-fields/DataProcessors/Группа/Forms/Форма/Ext/Form.xml b/tests/skills/cases/form-edit/snapshots/add-group-with-fields/DataProcessors/Группа/Forms/Форма/Ext/Form.xml index 7c45f847..3b4bcfd6 100644 --- a/tests/skills/cases/form-edit/snapshots/add-group-with-fields/DataProcessors/Группа/Forms/Форма/Ext/Form.xml +++ b/tests/skills/cases/form-edit/snapshots/add-group-with-fields/DataProcessors/Группа/Forms/Форма/Ext/Form.xml @@ -60,7 +60,7 @@ - cfg:ExternalDataProcessorObject.Группа + cfg:DataProcessorObject.Группа true diff --git a/tests/skills/cases/meta-compile/calculation-register.json b/tests/skills/cases/meta-compile/calculation-register.json index 30dae748..bc7b37ad 100644 --- a/tests/skills/cases/meta-compile/calculation-register.json +++ b/tests/skills/cases/meta-compile/calculation-register.json @@ -5,8 +5,6 @@ "name": "Начисления", "chartOfCalculationTypes": "ChartOfCalculationTypes.ВидыНачислений", "periodicity": "Month", - "actionPeriod": true, - "basePeriod": true, "dimensions": ["Сотрудник: CatalogRef.Сотрудники"], "resources": ["Результат: Number(15,2)", "ОтработаноДней: Number(5,0)"] }, diff --git a/tests/skills/cases/meta-compile/chart-of-accounts.json b/tests/skills/cases/meta-compile/chart-of-accounts.json index b835e0f5..6d7d8dff 100644 --- a/tests/skills/cases/meta-compile/chart-of-accounts.json +++ b/tests/skills/cases/meta-compile/chart-of-accounts.json @@ -5,9 +5,8 @@ "name": "Хозрасчетный", "codeLength": 4, "descriptionLength": 120, - "maxExtDimensionCount": 3, - "accountingFlags": ["Валютный", "Количественный"], - "extDimensionAccountingFlags": ["СуммовойУчет"] + "maxExtDimensionCount": 0, + "accountingFlags": ["Валютный", "Количественный"] }, "validatePath": "ChartsOfAccounts/Хозрасчетный", "expect": { diff --git a/tests/skills/cases/meta-compile/document-multiple-tabparts.json b/tests/skills/cases/meta-compile/document-multiple-tabparts.json index ae804b92..81da00d0 100644 --- a/tests/skills/cases/meta-compile/document-multiple-tabparts.json +++ b/tests/skills/cases/meta-compile/document-multiple-tabparts.json @@ -3,7 +3,6 @@ "input": { "type": "Document", "name": "РеализацияТоваров", - "registerRecords": ["AccumulationRegister.Продажи"], "attributes": [ "Организация: CatalogRef.Организации", "Контрагент: CatalogRef.Контрагенты", diff --git a/tests/skills/cases/meta-compile/snapshots/calculation-register/CalculationRegisters/Начисления.xml b/tests/skills/cases/meta-compile/snapshots/calculation-register/CalculationRegisters/Начисления.xml index af1347b2..cee46588 100644 --- a/tests/skills/cases/meta-compile/snapshots/calculation-register/CalculationRegisters/Начисления.xml +++ b/tests/skills/cases/meta-compile/snapshots/calculation-register/CalculationRegisters/Начисления.xml @@ -45,8 +45,8 @@ ChartOfCalculationTypes.ВидыНачислений Month - true - true + false + false diff --git a/tests/skills/cases/meta-compile/snapshots/chart-of-accounts/ChartsOfAccounts/Хозрасчетный.xml b/tests/skills/cases/meta-compile/snapshots/chart-of-accounts/ChartsOfAccounts/Хозрасчетный.xml index be8a1acb..6b826fc2 100644 --- a/tests/skills/cases/meta-compile/snapshots/chart-of-accounts/ChartsOfAccounts/Хозрасчетный.xml +++ b/tests/skills/cases/meta-compile/snapshots/chart-of-accounts/ChartsOfAccounts/Хозрасчетный.xml @@ -42,7 +42,7 @@ true - 3 + 0 4 120 @@ -522,38 +522,6 @@ Auto - - - СуммовойУчет - - - ru - Суммовой учет - - - - - xs:boolean - - false - - - - false - - false - false - - - DontCheck - - - Auto - - - Auto - - diff --git a/tests/skills/cases/meta-compile/snapshots/document-multiple-tabparts/Documents/РеализацияТоваров.xml b/tests/skills/cases/meta-compile/snapshots/document-multiple-tabparts/Documents/РеализацияТоваров.xml index fd3986a8..07d01121 100644 --- a/tests/skills/cases/meta-compile/snapshots/document-multiple-tabparts/Documents/РеализацияТоваров.xml +++ b/tests/skills/cases/meta-compile/snapshots/document-multiple-tabparts/Documents/РеализацияТоваров.xml @@ -192,9 +192,7 @@ AutoDelete WriteModified AutoFill - - AccumulationRegister.Продажи - + true true false diff --git a/tests/skills/cases/role-compile/explicit-rights.json b/tests/skills/cases/role-compile/explicit-rights.json index 60b67ebb..71483723 100644 --- a/tests/skills/cases/role-compile/explicit-rights.json +++ b/tests/skills/cases/role-compile/explicit-rights.json @@ -5,7 +5,9 @@ "script": "meta-compile/scripts/meta-compile", "input": { "type": "InformationRegister", - "name": "Цены" + "name": "Цены", + "dimensions": ["Номенклатура: String(100)"], + "resources": ["Цена: Number(15,2)"] }, "args": { "-JsonPath": "{inputFile}", diff --git a/tests/skills/cases/role-compile/snapshots/explicit-rights/InformationRegisters/Цены.xml b/tests/skills/cases/role-compile/snapshots/explicit-rights/InformationRegisters/Цены.xml index cc5c147c..9abe7a85 100644 --- a/tests/skills/cases/role-compile/snapshots/explicit-rights/InformationRegisters/Цены.xml +++ b/tests/skills/cases/role-compile/snapshots/explicit-rights/InformationRegisters/Цены.xml @@ -169,6 +169,97 @@ false false - + + + + Цена + + + ru + Цена + + + + + xs:decimal + + 15 + 2 + Any + + + false + + + + false + + false + false + + + false + + DontCheck + Items + + + Auto + Auto + + + Auto + DontIndex + Use + Use + + + + + Номенклатура + + + ru + Номенклатура + + + + + xs:string + + 100 + Variable + + + false + + + + false + + false + false + + + false + + DontCheck + Items + + + Auto + Auto + + + Auto + false + false + false + DontIndex + Use + Use + + +