Skip to content

Commit

Permalink
Merge pull request #2 from IgorKilipenko/sprint4/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@IgorKilipenko
IgorKilipenko committed Jan 31, 2024
2 parents 5140180 + f457cea commit 240041c
Show file tree
Hide file tree
Showing 74 changed files with 6,580 additions and 224 deletions.
15 changes: 11 additions & 4 deletions .bsl-language-server.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,16 @@
"CodeOutOfRegion": {
"checkUnknownModuleType": false
},
"IfElseIfEndsWithElse": false,
"DuplicateStringLiteral": false
"NestedTernaryOperator": false,
"LineLength": {
"maxLineLength": 140,
"checkMethodDescription": true
},
"RedundantAccessToObject": {
"checkObjectModule": false,
"checkFormModule": false,
"checkRecordSetModule": true
}
}
},
"configurationRoot": "./src"
}
}
5 changes: 1 addition & 4 deletions .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,5 @@
"language-1c-bsl.onescriptPath": "",

// Путь по умолчанию к корню файла конфигурации (./src/cf) относительно каталога workspace для правильного autocomplete
"language-1c-bsl.rootPath": "",
"cSpell.words": [
"Неопределено"
],
"language-1c-bsl.rootPath": ""
}
21 changes: 21 additions & 0 deletions cspell.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// cSpell Settings
{
// Version of the setting file. Always 0.2
"version": "0.2",
// language - current active spelling language
"language": "en,ru,ru-RU",
// Specify file types to spell check.
"enabledLanguageIds": [
"bsl",
"sdbl"
],
// words - list of words to be always considered correct
"words": [
"FEFO",
"ЕСТЬNULL",
"неопределено",
"Подотчетника",
"Подотчетнику",
"Эквайринговый"
]
}
127 changes: 127 additions & 0 deletions src/AccumulationRegisters/БезналичнаяОплата.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
<?xml version="1.0" encoding="UTF-8"?>
<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.16">
<AccumulationRegister uuid="67c40785-09c9-4085-948c-6b86c9d134d7">
<InternalInfo>
<xr:GeneratedType name="AccumulationRegisterRecord.БезналичнаяОплата" category="Record">
<xr:TypeId>df7e78b0-4b9c-4182-8f07-cc4d4bf36a84</xr:TypeId>
<xr:ValueId>33051de1-0be1-4f1f-95ac-46f8fd670a4b</xr:ValueId>
</xr:GeneratedType>
<xr:GeneratedType name="AccumulationRegisterManager.БезналичнаяОплата" category="Manager">
<xr:TypeId>59f54fa5-121c-4365-bf75-f4e9c793291d</xr:TypeId>
<xr:ValueId>914eaca2-c3bc-472c-aac4-6ea2dc33ac94</xr:ValueId>
</xr:GeneratedType>
<xr:GeneratedType name="AccumulationRegisterSelection.БезналичнаяОплата" category="Selection">
<xr:TypeId>06e76b5d-25a2-4d81-929c-ab6e20ac38a5</xr:TypeId>
<xr:ValueId>fcd62568-9267-4d41-aed5-88e60cc86d4e</xr:ValueId>
</xr:GeneratedType>
<xr:GeneratedType name="AccumulationRegisterList.БезналичнаяОплата" category="List">
<xr:TypeId>e16e28cf-fcf0-4e72-af1a-98229164fb34</xr:TypeId>
<xr:ValueId>fa089566-ca53-460c-a610-7cf2cfe730d8</xr:ValueId>
</xr:GeneratedType>
<xr:GeneratedType name="AccumulationRegisterRecordSet.БезналичнаяОплата" category="RecordSet">
<xr:TypeId>c74495be-30e1-46c8-9eb6-826b406dee52</xr:TypeId>
<xr:ValueId>71bbba11-831e-4bf2-b58b-788fe08d6ce7</xr:ValueId>
</xr:GeneratedType>
<xr:GeneratedType name="AccumulationRegisterRecordKey.БезналичнаяОплата" category="RecordKey">
<xr:TypeId>d741e05d-3846-4fdf-8d21-b18912736b73</xr:TypeId>
<xr:ValueId>52f13575-61e0-4b9c-84db-5735be8797a0</xr:ValueId>
</xr:GeneratedType>
</InternalInfo>
<Properties>
<Name>БезналичнаяОплата</Name>
<Synonym>
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Безналичная оплата</v8:content>
</v8:item>
</Synonym>
<Comment/>
<UseStandardCommands>true</UseStandardCommands>
<DefaultListForm/>
<AuxiliaryListForm/>
<RegisterType>Balance</RegisterType>
<IncludeHelpInContents>false</IncludeHelpInContents>
<DataLockControlMode>Managed</DataLockControlMode>
<FullTextSearch>DontUse</FullTextSearch>
<EnableTotalsSplitting>true</EnableTotalsSplitting>
<ListPresentation/>
<ExtendedListPresentation/>
<Explanation/>
</Properties>
<ChildObjects>
<Resource uuid="45051d74-0fcc-4a92-91c6-a5411259fbc0">
<Properties>
<Name>Сумма</Name>
<Synonym>
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Сумма</v8:content>
</v8:item>
</Synonym>
<Comment/>
<Type>
<v8:TypeSet>cfg:DefinedType.ФинансовыеДанные</v8:TypeSet>
</Type>
<PasswordMode>false</PasswordMode>
<Format/>
<EditFormat/>
<ToolTip/>
<MarkNegatives>false</MarkNegatives>
<Mask/>
<MultiLine>false</MultiLine>
<ExtendedEdit>false</ExtendedEdit>
<MinValue xsi:nil="true"/>
<MaxValue xsi:nil="true"/>
<FillChecking>DontCheck</FillChecking>
<ChoiceFoldersAndItems>Items</ChoiceFoldersAndItems>
<ChoiceParameterLinks/>
<ChoiceParameters/>
<QuickChoice>Auto</QuickChoice>
<CreateOnInput>Auto</CreateOnInput>
<ChoiceForm/>
<LinkByType/>
<ChoiceHistoryOnInput>Auto</ChoiceHistoryOnInput>
<FullTextSearch>Use</FullTextSearch>
</Properties>
</Resource>
<Dimension uuid="fe390d79-e159-4d68-91e9-ffb43c396aec">
<Properties>
<Name>ЭквайринговыйТерминал</Name>
<Synonym>
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Эквайринговый терминал</v8:content>
</v8:item>
</Synonym>
<Comment/>
<Type>
<v8:Type>cfg:CatalogRef.ЭквайринговыеТерминалы</v8:Type>
</Type>
<PasswordMode>false</PasswordMode>
<Format/>
<EditFormat/>
<ToolTip/>
<MarkNegatives>false</MarkNegatives>
<Mask/>
<MultiLine>false</MultiLine>
<ExtendedEdit>false</ExtendedEdit>
<MinValue xsi:nil="true"/>
<MaxValue xsi:nil="true"/>
<FillChecking>DontCheck</FillChecking>
<ChoiceFoldersAndItems>Items</ChoiceFoldersAndItems>
<ChoiceParameterLinks/>
<ChoiceParameters/>
<QuickChoice>Auto</QuickChoice>
<CreateOnInput>Auto</CreateOnInput>
<ChoiceForm/>
<LinkByType/>
<ChoiceHistoryOnInput>Auto</ChoiceHistoryOnInput>
<DenyIncompleteValues>true</DenyIncompleteValues>
<Indexing>DontIndex</Indexing>
<FullTextSearch>Use</FullTextSearch>
<UseInTotals>true</UseInTotals>
</Properties>
</Dimension>
</ChildObjects>
</AccumulationRegister>
</MetaDataObject>
165 changes: 165 additions & 0 deletions src/AccumulationRegisters/ДенежныеСредства.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
<?xml version="1.0" encoding="UTF-8"?>
<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.16">
<AccumulationRegister uuid="5f3d5a1f-a2c2-4549-bac9-c8cbe44a7ceb">
<InternalInfo>
<xr:GeneratedType name="AccumulationRegisterRecord.ДенежныеСредства" category="Record">
<xr:TypeId>e84d24fe-5af9-457b-a40b-bd5240159406</xr:TypeId>
<xr:ValueId>8801e553-16ac-491e-908d-e4417bd09198</xr:ValueId>
</xr:GeneratedType>
<xr:GeneratedType name="AccumulationRegisterManager.ДенежныеСредства" category="Manager">
<xr:TypeId>29c1428c-e9a5-46d9-8a35-610997919532</xr:TypeId>
<xr:ValueId>1b9a9af8-a8ac-4f19-b9b5-491248339c8a</xr:ValueId>
</xr:GeneratedType>
<xr:GeneratedType name="AccumulationRegisterSelection.ДенежныеСредства" category="Selection">
<xr:TypeId>f07c7a5c-d4bb-4e41-936a-59cae5dc4d31</xr:TypeId>
<xr:ValueId>5cdffbfb-16d4-4b1a-b27b-00a723f29948</xr:ValueId>
</xr:GeneratedType>
<xr:GeneratedType name="AccumulationRegisterList.ДенежныеСредства" category="List">
<xr:TypeId>050f5a0a-c7ff-477d-b12a-06c89a2452cb</xr:TypeId>
<xr:ValueId>2f6cc493-4b24-434d-ac07-95d88cd51128</xr:ValueId>
</xr:GeneratedType>
<xr:GeneratedType name="AccumulationRegisterRecordSet.ДенежныеСредства" category="RecordSet">
<xr:TypeId>cfffae98-1bdc-4601-88bc-cf1893ab4e80</xr:TypeId>
<xr:ValueId>99721ecc-93a1-4c1f-886a-da8f8284d03c</xr:ValueId>
</xr:GeneratedType>
<xr:GeneratedType name="AccumulationRegisterRecordKey.ДенежныеСредства" category="RecordKey">
<xr:TypeId>2539fb02-7477-4a37-abc2-9e3b14e7566e</xr:TypeId>
<xr:ValueId>b7f98c97-a998-4305-9837-ed8dddd419df</xr:ValueId>
</xr:GeneratedType>
</InternalInfo>
<Properties>
<Name>ДенежныеСредства</Name>
<Synonym>
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Денежные средства</v8:content>
</v8:item>
</Synonym>
<Comment/>
<UseStandardCommands>true</UseStandardCommands>
<DefaultListForm/>
<AuxiliaryListForm/>
<RegisterType>Balance</RegisterType>
<IncludeHelpInContents>false</IncludeHelpInContents>
<DataLockControlMode>Managed</DataLockControlMode>
<FullTextSearch>DontUse</FullTextSearch>
<EnableTotalsSplitting>true</EnableTotalsSplitting>
<ListPresentation/>
<ExtendedListPresentation/>
<Explanation/>
</Properties>
<ChildObjects>
<Resource uuid="02ccd692-22c9-431f-9bc5-1e4452c8e4e4">
<Properties>
<Name>Сумма</Name>
<Synonym>
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Сумма</v8:content>
</v8:item>
</Synonym>
<Comment/>
<Type>
<v8:TypeSet>cfg:DefinedType.ФинансовыеДанные</v8:TypeSet>
</Type>
<PasswordMode>false</PasswordMode>
<Format/>
<EditFormat/>
<ToolTip/>
<MarkNegatives>false</MarkNegatives>
<Mask/>
<MultiLine>false</MultiLine>
<ExtendedEdit>false</ExtendedEdit>
<MinValue xsi:nil="true"/>
<MaxValue xsi:nil="true"/>
<FillChecking>DontCheck</FillChecking>
<ChoiceFoldersAndItems>Items</ChoiceFoldersAndItems>
<ChoiceParameterLinks/>
<ChoiceParameters/>
<QuickChoice>Auto</QuickChoice>
<CreateOnInput>Auto</CreateOnInput>
<ChoiceForm/>
<LinkByType/>
<ChoiceHistoryOnInput>Auto</ChoiceHistoryOnInput>
<FullTextSearch>Use</FullTextSearch>
</Properties>
</Resource>
<Dimension uuid="4890f48f-c316-48c8-a991-c3f338c11922">
<Properties>
<Name>ТипДенежныхСредств</Name>
<Synonym>
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Тип денежных средств</v8:content>
</v8:item>
</Synonym>
<Comment/>
<Type>
<v8:Type>cfg:EnumRef.ТипыДенежныхСредств</v8:Type>
</Type>
<PasswordMode>false</PasswordMode>
<Format/>
<EditFormat/>
<ToolTip/>
<MarkNegatives>false</MarkNegatives>
<Mask/>
<MultiLine>false</MultiLine>
<ExtendedEdit>false</ExtendedEdit>
<MinValue xsi:nil="true"/>
<MaxValue xsi:nil="true"/>
<FillChecking>DontCheck</FillChecking>
<ChoiceFoldersAndItems>Items</ChoiceFoldersAndItems>
<ChoiceParameterLinks/>
<ChoiceParameters/>
<QuickChoice>Auto</QuickChoice>
<CreateOnInput>Auto</CreateOnInput>
<ChoiceForm/>
<LinkByType/>
<ChoiceHistoryOnInput>Auto</ChoiceHistoryOnInput>
<DenyIncompleteValues>true</DenyIncompleteValues>
<Indexing>DontIndex</Indexing>
<FullTextSearch>Use</FullTextSearch>
<UseInTotals>true</UseInTotals>
</Properties>
</Dimension>
<Dimension uuid="8044146b-ca3c-42ff-afa7-34c8ff09aedd">
<Properties>
<Name>БанковскийСчетКасса</Name>
<Synonym>
<v8:item>
<v8:lang>ru</v8:lang>
<v8:content>Банковский счет касса</v8:content>
</v8:item>
</Synonym>
<Comment/>
<Type>
<v8:Type>cfg:CatalogRef.Кассы</v8:Type>
</Type>
<PasswordMode>false</PasswordMode>
<Format/>
<EditFormat/>
<ToolTip/>
<MarkNegatives>false</MarkNegatives>
<Mask/>
<MultiLine>false</MultiLine>
<ExtendedEdit>false</ExtendedEdit>
<MinValue xsi:nil="true"/>
<MaxValue xsi:nil="true"/>
<FillChecking>DontCheck</FillChecking>
<ChoiceFoldersAndItems>Items</ChoiceFoldersAndItems>
<ChoiceParameterLinks/>
<ChoiceParameters/>
<QuickChoice>Auto</QuickChoice>
<CreateOnInput>Auto</CreateOnInput>
<ChoiceForm/>
<LinkByType/>
<ChoiceHistoryOnInput>Auto</ChoiceHistoryOnInput>
<DenyIncompleteValues>true</DenyIncompleteValues>
<Indexing>DontIndex</Indexing>
<FullTextSearch>Use</FullTextSearch>
<UseInTotals>true</UseInTotals>
</Properties>
</Dimension>
</ChildObjects>
</AccumulationRegister>
</MetaDataObject>
Loading

0 comments on commit 240041c

Please sign in to comment.