Skip to content

Feature/ДЗ ГрупповаяРазработка #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Feature/ДЗ ГрупповаяРазработка #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3854ade
Добавил справочники Контактные лица и должность
rosohaserg Apr 11, 2024
5032b76
Добавления поле Контактное лицо в документы.
rosohaserg Apr 16, 2024
581cdd5
Revert "Добавления поле Контактное лицо в документы."
rosohaserg Apr 16, 2024
d7ef863
Добавил поле "Контактное лицо" в документы.
rosohaserg Apr 16, 2024
4f560fc
Создал и добавил поле согласованная скидка и добавил команду пересчитать
rosohaserg Apr 16, 2024
9c1e07a
Написал алгоритм расчёта Скидки в документах.
rosohaserg Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions onec-mid-base-11/src/Catalogs/ДЗ_Должность/ДЗ_Должность.mdo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<mdclass:Catalog xmlns:mdclass="http://g5.1c.ru/v8/dt/metadata/mdclass" uuid="7adebee3-d47e-4cf1-829c-8d4ecc52760e">
<producedTypes>
<objectType typeId="cb189232-31fe-44b6-80da-05ff45811cb5" valueTypeId="8f2fd6b0-d039-4878-a429-cadf43ca0632"/>
<refType typeId="84cd7cb0-3cce-4eaa-acc5-cdde54cd0821" valueTypeId="409167c8-0edb-47b3-ae43-b4ec86fc3652"/>
<selectionType typeId="63b8515a-eeb1-48fd-a5ba-fada8154bf0e" valueTypeId="3c1c6d0a-606e-4bbe-8e33-14ed80d6ba4d"/>
<listType typeId="58af1226-7d90-4679-ae94-731f187af9ea" valueTypeId="375dcd50-6ec1-481f-95c6-0ef7f7455493"/>
<managerType typeId="926e1d62-ef16-4f97-b3bd-1c18fe8e9a59" valueTypeId="b2d3dd31-b293-4e19-8846-38585d988864"/>
</producedTypes>
<name>ДЗ_Должность</name>
<synonym>
<key>ru</key>
<value>Должность</value>
</synonym>
<useStandardCommands>true</useStandardCommands>
<inputByString>Catalog.ДЗ_Должность.StandardAttribute.Code</inputByString>
<inputByString>Catalog.ДЗ_Должность.StandardAttribute.Description</inputByString>
<fullTextSearchOnInputByString>DontUse</fullTextSearchOnInputByString>
<createOnInput>Use</createOnInput>
<dataLockControlMode>Managed</dataLockControlMode>
<fullTextSearch>Use</fullTextSearch>
<objectPresentation>
<key>ru</key>
<value>Должности</value>
</objectPresentation>
<levelCount>2</levelCount>
<foldersOnTop>true</foldersOnTop>
<codeLength>9</codeLength>
<descriptionLength>25</descriptionLength>
<codeType>String</codeType>
<codeAllowedLength>Variable</codeAllowedLength>
<checkUnique>true</checkUnique>
<autonumbering>true</autonumbering>
<defaultPresentation>AsDescription</defaultPresentation>
<editType>InDialog</editType>
<choiceMode>BothWays</choiceMode>
</mdclass:Catalog>
105 changes: 105 additions & 0 deletions onec-mid-base-11/src/Catalogs/ДЗ_КонтактноеЛицо/ДЗ_КонтактноеЛицо.mdo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
<?xml version="1.0" encoding="UTF-8"?>
<mdclass:Catalog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:core="http://g5.1c.ru/v8/dt/mcore" xmlns:mdclass="http://g5.1c.ru/v8/dt/metadata/mdclass" uuid="805e553f-63c7-48a3-b3f7-6176ce980617">
<producedTypes>
<objectType typeId="5b28b6d6-4305-4a83-911b-7017ef0c78bd" valueTypeId="724d7bd3-0485-481d-8f33-b9961880fc7d"/>
<refType typeId="5ad5cceb-fcbf-49dc-89bf-04f1c175b7bd" valueTypeId="5c5dd4c9-7254-49c4-b135-8fbe147c57dc"/>
<selectionType typeId="f9ec03f2-8aa0-4b19-b850-aa073ab32a8c" valueTypeId="6b038a5c-f43f-461a-9dad-4d9b3bffd9e5"/>
<listType typeId="7e8f0008-a880-46ff-b23f-b976ca7540b5" valueTypeId="26f8f81b-701f-47ff-b9b7-c131c9aed29e"/>
<managerType typeId="e004c78c-a534-4e77-bcaa-6f8c66702d6b" valueTypeId="9fff4d01-cd15-45e5-bb64-dae64204cc5c"/>
</producedTypes>
<name>ДЗ_КонтактноеЛицо</name>
<synonym>
<key>ru</key>
<value>Контактное лицо</value>
</synonym>
<useStandardCommands>true</useStandardCommands>
<inputByString>Catalog.ДЗ_КонтактноеЛицо.StandardAttribute.Code</inputByString>
<inputByString>Catalog.ДЗ_КонтактноеЛицо.StandardAttribute.Description</inputByString>
<fullTextSearchOnInputByString>DontUse</fullTextSearchOnInputByString>
<createOnInput>Use</createOnInput>
<dataLockControlMode>Managed</dataLockControlMode>
<fullTextSearch>Use</fullTextSearch>
<objectPresentation>
<key>ru</key>
<value>Контактные лица</value>
</objectPresentation>
<levelCount>2</levelCount>
<foldersOnTop>true</foldersOnTop>
<owners>Catalog.Контрагенты</owners>
<codeLength>9</codeLength>
<descriptionLength>25</descriptionLength>
<codeType>String</codeType>
<codeAllowedLength>Variable</codeAllowedLength>
<checkUnique>true</checkUnique>
<autonumbering>true</autonumbering>
<defaultPresentation>AsDescription</defaultPresentation>
<editType>InDialog</editType>
<choiceMode>BothWays</choiceMode>
<attributes uuid="e0ff1d4f-1eef-44d6-b0ac-cb7bcec380cf">
<name>ДЗ_КонтактныйНомер</name>
<synonym>
<key>ru</key>
<value>Контактный номер</value>
</synonym>
<type>
<types>String</types>
<stringQualifiers>
<length>15</length>
</stringQualifiers>
</type>
<minValue xsi:type="core:UndefinedValue"/>
<maxValue xsi:type="core:UndefinedValue"/>
<fillValue xsi:type="core:UndefinedValue"/>
<fullTextSearch>Use</fullTextSearch>
<dataHistory>Use</dataHistory>
</attributes>
<attributes uuid="761f36d0-26f5-4e3e-a5cc-3d3b5230254e">
<name>ДЗ_Должность</name>
<synonym>
<key>ru</key>
<value>Должность</value>
</synonym>
<type>
<types>CatalogRef.ДЗ_Должность</types>
</type>
<minValue xsi:type="core:UndefinedValue"/>
<maxValue xsi:type="core:UndefinedValue"/>
<fillValue xsi:type="core:UndefinedValue"/>
<fullTextSearch>Use</fullTextSearch>
<dataHistory>Use</dataHistory>
</attributes>
<attributes uuid="2a36318f-fceb-4a02-a463-4a4611b6a1f8">
<name>ДЗ_ДействуетНаОсновании</name>
<synonym>
<key>ru</key>
<value>Действует на основании</value>
</synonym>
<type>
<types>String</types>
<stringQualifiers>
<length>150</length>
</stringQualifiers>
</type>
<minValue xsi:type="core:UndefinedValue"/>
<maxValue xsi:type="core:UndefinedValue"/>
<fillValue xsi:type="core:UndefinedValue"/>
<fullTextSearch>Use</fullTextSearch>
<dataHistory>Use</dataHistory>
</attributes>
<attributes uuid="cdad93fc-83e6-48b8-901b-5bd15e55feb2">
<name>ДЗ_Заметка</name>
<synonym>
<key>ru</key>
<value>Заметка</value>
</synonym>
<type>
<types>String</types>
<stringQualifiers/>
</type>
<minValue xsi:type="core:UndefinedValue"/>
<maxValue xsi:type="core:UndefinedValue"/>
<fillValue xsi:type="core:UndefinedValue"/>
<fullTextSearch>Use</fullTextSearch>
<dataHistory>Use</dataHistory>
</attributes>
</mdclass:Catalog>
2 changes: 2 additions & 0 deletions onec-mid-base-11/src/Configuration/Configuration.mdo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,6 +1213,8 @@
<catalogs>Catalog.УчетныеЗаписиСинхронизацииФайлов</catalogs>
<catalogs>Catalog.УчетныеЗаписиЭлектроннойПочты</catalogs>
<catalogs>Catalog.Файлы</catalogs>
<catalogs>Catalog.ДЗ_Должность</catalogs>
<catalogs>Catalog.ДЗ_КонтактноеЛицо</catalogs>
<documents>Document.ЗаказПокупателя</documents>
<documents>Document.ОплатаОтПокупателя</documents>
<documents>Document.ОплатаПоставщику</documents>
Expand Down
193 changes: 193 additions & 0 deletions onec-mid-base-11/src/Documents/ЗаказПокупателя/Forms/ФормаДокумента/Form.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,128 @@
<textEdit>true</textEdit>
</extInfo>
</items>
<items xsi:type="form:FormGroup">
<name>Скидка</name>
<id>179</id>
<items xsi:type="form:FormField">
<name>ДЗ_СогласованнаяСкидка</name>
<id>172</id>
<visible>true</visible>
<enabled>true</enabled>
<userVisible>
<common>true</common>
</userVisible>
<dataPath xsi:type="form:DataPath">
<segments>Объект.ДЗ_СогласованнаяСкидка</segments>
</dataPath>
<handlers>
<event>OnChange</event>
<name>ДЗ_СогласованнаяСкидкаПриИзменении</name>
</handlers>
<extendedTooltip>
<name>ДЗ_СогласованнаяСкидкаРасширеннаяПодсказка</name>
<id>174</id>
<visible>true</visible>
<enabled>true</enabled>
<userVisible>
<common>true</common>
</userVisible>
<type>Label</type>
<autoMaxWidth>true</autoMaxWidth>
<autoMaxHeight>true</autoMaxHeight>
<extInfo xsi:type="form:LabelDecorationExtInfo">
<horizontalAlign>Left</horizontalAlign>
</extInfo>
</extendedTooltip>
<contextMenu>
<name>ДЗ_СогласованнаяСкидкаКонтекстноеМеню</name>
<id>173</id>
<visible>true</visible>
<enabled>true</enabled>
<userVisible>
<common>true</common>
</userVisible>
<autoFill>true</autoFill>
</contextMenu>
<type>InputField</type>
<editMode>Enter</editMode>
<showInHeader>true</showInHeader>
<headerHorizontalAlign>Left</headerHorizontalAlign>
<showInFooter>true</showInFooter>
<extInfo xsi:type="form:InputFieldExtInfo">
<autoMaxWidth>true</autoMaxWidth>
<autoMaxHeight>true</autoMaxHeight>
<wrap>true</wrap>
<chooseType>true</chooseType>
<typeDomainEnabled>true</typeDomainEnabled>
<textEdit>true</textEdit>
</extInfo>
</items>
<items xsi:type="form:Button">
<name>ПересчитатьСкидку</name>
<id>175</id>
<visible>true</visible>
<enabled>true</enabled>
<userVisible>
<common>true</common>
</userVisible>
<extendedTooltip>
<name>ПересчитатьСкидкуРасширеннаяПодсказка</name>
<id>176</id>
<visible>true</visible>
<enabled>true</enabled>
<userVisible>
<common>true</common>
</userVisible>
<type>Label</type>
<autoMaxWidth>true</autoMaxWidth>
<autoMaxHeight>true</autoMaxHeight>
<extInfo xsi:type="form:LabelDecorationExtInfo">
<horizontalAlign>Left</horizontalAlign>
</extInfo>
</extendedTooltip>
<type>UsualButton</type>
<commandName>Form.Command.ПересчитатьСкидку</commandName>
<representation>Auto</representation>
<autoMaxWidth>true</autoMaxWidth>
<autoMaxHeight>true</autoMaxHeight>
<placementArea>UserCmds</placementArea>
<representationInContextMenu>Auto</representationInContextMenu>
</items>
<visible>true</visible>
<enabled>true</enabled>
<userVisible>
<common>true</common>
</userVisible>
<title>
<key>ru</key>
<value>Скидка</value>
</title>
<extendedTooltip>
<name>СкидкаРасширеннаяПодсказка</name>
<id>180</id>
<visible>true</visible>
<enabled>true</enabled>
<userVisible>
<common>true</common>
</userVisible>
<type>Label</type>
<autoMaxWidth>true</autoMaxWidth>
<autoMaxHeight>true</autoMaxHeight>
<extInfo xsi:type="form:LabelDecorationExtInfo">
<horizontalAlign>Left</horizontalAlign>
</extInfo>
</extendedTooltip>
<type>UsualGroup</type>
<extInfo xsi:type="form:UsualGroupExtInfo">
<group>HorizontalIfPossible</group>
<behavior>Auto</behavior>
<showLeftMargin>true</showLeftMargin>
<united>true</united>
<throughAlign>Auto</throughAlign>
<currentRowUse>Auto</currentRowUse>
</extInfo>
</items>
<visible>true</visible>
<enabled>true</enabled>
<userVisible>
Expand Down Expand Up @@ -338,6 +460,56 @@
<textEdit>true</textEdit>
</extInfo>
</items>
<items xsi:type="form:FormField">
<name>ДЗ_КонтактноеЛицо</name>
<id>169</id>
<visible>true</visible>
<enabled>true</enabled>
<userVisible>
<common>true</common>
</userVisible>
<dataPath xsi:type="form:DataPath">
<segments>Объект.ДЗ_КонтактноеЛицо</segments>
</dataPath>
<extendedTooltip>
<name>ДЗ_КонтактноеЛицоРасширеннаяПодсказка</name>
<id>171</id>
<visible>true</visible>
<enabled>true</enabled>
<userVisible>
<common>true</common>
</userVisible>
<type>Label</type>
<autoMaxWidth>true</autoMaxWidth>
<autoMaxHeight>true</autoMaxHeight>
<extInfo xsi:type="form:LabelDecorationExtInfo">
<horizontalAlign>Left</horizontalAlign>
</extInfo>
</extendedTooltip>
<contextMenu>
<name>ДЗ_КонтактноеЛицоКонтекстноеМеню</name>
<id>170</id>
<visible>true</visible>
<enabled>true</enabled>
<userVisible>
<common>true</common>
</userVisible>
<autoFill>true</autoFill>
</contextMenu>
<type>InputField</type>
<editMode>Enter</editMode>
<showInHeader>true</showInHeader>
<headerHorizontalAlign>Left</headerHorizontalAlign>
<showInFooter>true</showInFooter>
<extInfo xsi:type="form:InputFieldExtInfo">
<autoMaxWidth>true</autoMaxWidth>
<autoMaxHeight>true</autoMaxHeight>
<wrap>true</wrap>
<chooseType>true</chooseType>
<typeDomainEnabled>true</typeDomainEnabled>
<textEdit>true</textEdit>
</extInfo>
</items>
<visible>true</visible>
<enabled>true</enabled>
<userVisible>
Expand Down Expand Up @@ -1878,6 +2050,27 @@
<main>true</main>
<savedData>true</savedData>
</attributes>
<formCommands>
<name>ПересчитатьСкидку</name>
<title>
<key>ru</key>
<value>Пересчитать скидку</value>
</title>
<id>1</id>
<use>
<common>true</common>
</use>
<picture xsi:type="core:PictureRef">
<picture>CommonPicture.МетаданныеПерерасчеты</picture>
</picture>
<action xsi:type="form:FormCommandHandlerContainer">
<handler>
<name>ПересчитатьСкидку</name>
</handler>
</action>
<representation>Picture</representation>
<currentRowUse>Auto</currentRowUse>
</formCommands>
<commandInterface>
<navigationPanel/>
<commandBar/>
Expand Down
Loading