diff --git a/IRP/src/AccumulationRegisters/R5010B_ReconciliationStatement/R5010B_ReconciliationStatement.mdo b/IRP/src/AccumulationRegisters/R5010B_ReconciliationStatement/R5010B_ReconciliationStatement.mdo index 5c2a8216db..a304658f6f 100644 --- a/IRP/src/AccumulationRegisters/R5010B_ReconciliationStatement/R5010B_ReconciliationStatement.mdo +++ b/IRP/src/AccumulationRegisters/R5010B_ReconciliationStatement/R5010B_ReconciliationStatement.mdo @@ -152,6 +152,10 @@ + + Filter.LegalName + AccumulationRegister.R5010B_ReconciliationStatement.Dimension.LegalName + Use true diff --git a/IRP/src/Catalogs/AddAttributeAndPropertySets/AddAttributeAndPropertySets.mdo b/IRP/src/Catalogs/AddAttributeAndPropertySets/AddAttributeAndPropertySets.mdo index 32d56f5935..fe18eb7588 100644 --- a/IRP/src/Catalogs/AddAttributeAndPropertySets/AddAttributeAndPropertySets.mdo +++ b/IRP/src/Catalogs/AddAttributeAndPropertySets/AddAttributeAndPropertySets.mdo @@ -914,6 +914,13 @@ 148 + + Catalog_Incoterms + + + 149 + + InDialog BothWays diff --git a/IRP/src/Catalogs/BankTerms/BankTerms.mdo b/IRP/src/Catalogs/BankTerms/BankTerms.mdo index 6571f69be5..ebf534bdd4 100644 --- a/IRP/src/Catalogs/BankTerms/BankTerms.mdo +++ b/IRP/src/Catalogs/BankTerms/BankTerms.mdo @@ -296,6 +296,10 @@ + + Filter.LegalName + Catalog.BankTerms.TabularSection.PaymentTypes.Attribute.LegalName + Use Use diff --git a/IRP/src/Catalogs/CashAccounts/CashAccounts.mdo b/IRP/src/Catalogs/CashAccounts/CashAccounts.mdo index accd4fab8d..8da1f0ed78 100644 --- a/IRP/src/Catalogs/CashAccounts/CashAccounts.mdo +++ b/IRP/src/Catalogs/CashAccounts/CashAccounts.mdo @@ -400,6 +400,104 @@ Use Use + + BankCountry + + en + Bank country + + + ru + Страна банка + + + tr + Banka ülkesi + + + CatalogRef.Countries + + + + + Use + Use + + + BankIdentifierCode + + en + Bank identifier code + + + ru + Код банка + + + tr + Banka tanımlama kodu + + + String + + 9 + + + + + + Use + Use + + + BankSWIFTCode + + en + Bank SWIFT code + + + ru + SWIFT-код банка + + + tr + Banka SWIFT kodu + + + String + + 11 + + + + + + Use + Use + + + isIBAN + + en + Is IBAN + + + ru + Это IBAN + + + tr + IBAN mı + + + Boolean + + + + + Use + Use + diff --git a/IRP/src/Catalogs/CashAccounts/Forms/ItemForm/Form.form b/IRP/src/Catalogs/CashAccounts/Forms/ItemForm/Form.form index 9a1b9b4c58..10097abc83 100644 --- a/IRP/src/Catalogs/CashAccounts/Forms/ItemForm/Form.form +++ b/IRP/src/Catalogs/CashAccounts/Forms/ItemForm/Form.form @@ -466,6 +466,49 @@ true + + isIBAN + 63 + true + true + + true + + + Object.isIBAN + + + isIBANExtendedTooltip + 65 + true + true + + true + + Label + true + true + + Left + + + + isIBANContextMenu + 64 + true + true + + true + + true + + CheckBoxField + Enter + true + Left + true + + BankName 6 @@ -516,6 +559,158 @@ true + + BankCountry + 54 + true + true + + true + + + Object.BankCountry + + + BankCountryExtendedTooltip + 56 + true + true + + true + + Label + true + true + + Left + + + + BankCountryContextMenu + 55 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + BankIdentifierCode + 57 + true + true + + true + + + Object.BankIdentifierCode + + + BankIdentifierCodeExtendedTooltip + 59 + true + true + + true + + Label + true + true + + Left + + + + BankIdentifierCodeContextMenu + 58 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + true + + + + BankSWIFTCode + 60 + true + true + + true + + + Object.BankSWIFTCode + + + BankSWIFTCodeExtendedTooltip + 62 + true + true + + true + + Label + true + true + + Left + + + + BankSWIFTCodeContextMenu + 61 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + true + + TransitAccount 23 diff --git a/IRP/src/Catalogs/CashAccounts/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/CashAccounts/Forms/ItemForm/Module.bsl index 56466c355e..4fb22d83f1 100644 --- a/IRP/src/Catalogs/CashAccounts/Forms/ItemForm/Module.bsl +++ b/IRP/src/Catalogs/CashAccounts/Forms/ItemForm/Module.bsl @@ -59,6 +59,10 @@ Procedure SetVisibilityAvailability(Object, Form) Form.Items.CashAccount.Visible = IsPOSCashAccount; Form.Items.FinancialMovementType.Visible = IsPOSCashAccount; Form.Items.Acquiring.Visible = IsPOSAccount; + Form.Items.BankCountry.Visible = IsBankAccount; + Form.Items.BankIdentifierCode.Visible = IsBankAccount; + Form.Items.BankSWIFTCode.Visible = IsBankAccount; + Form.Items.isIBAN.Visible = IsBankAccount; If Form.CurrencyType = "Fixed" Then Form.Items.Currency.Visible = True; diff --git a/IRP/src/Catalogs/Companies/Companies.mdo b/IRP/src/Catalogs/Companies/Companies.mdo index f73fb911fd..70591caea9 100644 --- a/IRP/src/Catalogs/Companies/Companies.mdo +++ b/IRP/src/Catalogs/Companies/Companies.mdo @@ -554,6 +554,32 @@ Use Use + + MainLegalAddress + + en + Main legal address + + + ru + Основной юридический адрес + + + tr + Ana yasal adres + + + String + + 1024 + + + + + + Use + Use + diff --git a/IRP/src/Catalogs/Companies/Forms/ItemForm/Form.form b/IRP/src/Catalogs/Companies/Forms/ItemForm/Form.form index 87508480b6..8370acb36a 100644 --- a/IRP/src/Catalogs/Companies/Forms/ItemForm/Form.form +++ b/IRP/src/Catalogs/Companies/Forms/ItemForm/Form.form @@ -338,6 +338,56 @@ true + + MainLegalAddress + 187 + true + true + + true + + + Object.MainLegalAddress + + + MainLegalAddressExtendedTooltip + 189 + true + true + + true + + Label + true + true + + Left + + + + MainLegalAddressContextMenu + 188 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + MainPhoneNumber 156 diff --git a/IRP/src/Catalogs/Incoterms/Forms/ChoiceForm/Attributes/List/ExtInfo/ListSettings.dcss b/IRP/src/Catalogs/Incoterms/Forms/ChoiceForm/Attributes/List/ExtInfo/ListSettings.dcss new file mode 100644 index 0000000000..705822764a --- /dev/null +++ b/IRP/src/Catalogs/Incoterms/Forms/ChoiceForm/Attributes/List/ExtInfo/ListSettings.dcss @@ -0,0 +1,17 @@ + + + + Normal + e0368c05-f3f8-45ee-bf75-ae197f2d9f4e + + + Normal + 9e7b61d3-f63d-4330-a960-492cdbf789a6 + + + Normal + c4498f86-27f4-42f0-8107-a6d06539107c + + Normal + bd1f4341-c756-4cb1-8ff7-4fc2e9a155bf + \ No newline at end of file diff --git a/IRP/src/Catalogs/Incoterms/Forms/ChoiceForm/Form.form b/IRP/src/Catalogs/Incoterms/Forms/ChoiceForm/Form.form new file mode 100644 index 0000000000..25a0ca95c0 --- /dev/null +++ b/IRP/src/Catalogs/Incoterms/Forms/ChoiceForm/Form.form @@ -0,0 +1,528 @@ + + + + ListSettingsComposerUserSettings + 1 + true + true + + true + + + <key>en</key> + <value>User settings group</value> + + + <key>ru</key> + <value>Группа пользовательских настроек</value> + + + <key>tr</key> + <value>Kullanıcı ayarlar grubu</value> + + false + + ListSettingsComposerUserSettingsExtendedTooltip + 2 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + Vertical + Auto + WeakSeparation + true + true + Auto + Auto + + + + List + 3 + true + true + + true + + + List + + true + None + + Code + 19 + true + true + + true + + + List.Code + + + CodeExtendedTooltip + 21 + true + true + + true + + Label + true + true + + Left + + + + CodeContextMenu + 20 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Description + 22 + true + true + + true + + + List.Description + + + DescriptionExtendedTooltip + 24 + true + true + + true + + Label + true + true + + Left + + + + DescriptionContextMenu + 23 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + Ref + 16 + true + true + + + List.Ref + + true + + RefExtendedTooltip + 18 + true + true + + true + + Label + true + true + + Left + + + + RefContextMenu + 17 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + None + + ListCommandBar + 5 + true + true + + true + + Left + + + true + true + + true + + ListSearchString + 7 + + ListSearchStringExtendedTooltip + 9 + true + true + + true + + Label + true + true + + Left + + + + ListSearchStringContextMenu + 8 + true + true + + true + + true + + ListSearchString + + true + + + + true + true + + true + + ListViewStatus + 10 + + ListViewStatusExtendedTooltip + 12 + true + true + + true + + Label + true + true + + Left + + + + ListViewStatusContextMenu + 11 + true + true + + true + + true + + ViewStatusAddition + ListViewStatus + + true + + + + true + true + + true + + ListSearchControl + 13 + + ListSearchControlExtendedTooltip + 15 + true + true + + true + + Label + true + true + + Left + + + + ListSearchControlContextMenu + 14 + true + true + + true + + true + + SearchControlAddition + ListSearchControl + + true + + + + ListExtendedTooltip + 6 + true + true + + true + + Label + true + true + + Left + + + + ListContextMenu + 4 + true + true + + true + + true + + true + true + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + true + Auto + Auto + ExpandTopLevel + true + true + true + true + AsFileRef + + List.DefaultPicture + + + 60 + + 0001-01-01T00:00:00 + 0001-01-01T00:00:00 + + + true + true + ListSettingsComposerUserSettings + + + + FormCommandBar + -1 + true + true + + true + + Left + true + + + OnCreateAtServer + OnCreateAtServer + + LockOwnerWindow + true + true + Vertical + true + true + true + true + true + + List + 1 + + DynamicList + + + true + + + true + +
true
+ + SELECT + Table.Ref, + Table.DeletionMark, + Table.Code, + Table.Description_en AS Description +FROM + Catalog.Incoterms AS Table + Catalog.Incoterms + true + true + true + true + true + + Ref + Ref + + + DeletionMark + DeletionMark + + + Code + Code + + + Description + Description + + <localValue> + <content> + <key>en</key> + <value>Description</value> + </content> + <content> + <key>ru</key> + <value>Наименование</value> + </content> + <content> + <key>tr</key> + <value>Tanım</value> + </content> + </localValue> + + + + AddAttributes + AddAttributes + + + Predefined + Predefined + + + PredefinedDataName + PredefinedDataName + + + Editor + Editor + + + Description_hash + Description_hash + + + Description_tr + Description_tr + + + Description_ru + Description_ru + + + CreateDate + CreateDate + + + ModifyDate + ModifyDate + + + NotActive + NotActive + + + Author + Author + + + + + + + + + \ No newline at end of file diff --git a/IRP/src/Catalogs/Incoterms/Forms/ChoiceForm/Module.bsl b/IRP/src/Catalogs/Incoterms/Forms/ChoiceForm/Module.bsl new file mode 100644 index 0000000000..8d9c301c8b --- /dev/null +++ b/IRP/src/Catalogs/Incoterms/Forms/ChoiceForm/Module.bsl @@ -0,0 +1,37 @@ + +&AtServer +Procedure OnCreateAtServer(Cancel, StandardProcessing) + ThisObject.List.QueryText = LocalizationEvents.ReplaceDescriptionLocalizationPrefix(ThisObject.List.QueryText); + CatalogsServer.OnCreateAtServerChoiceForm(ThisObject, List, Cancel, StandardProcessing); +EndProcedure + +#Region COMMANDS + +&AtClient +Procedure GeneratedFormCommandActionByName(Command) Export + SelectedRows = Items.List.SelectedRows; + ExternalCommandsClient.GeneratedListChoiceFormCommandActionByName(SelectedRows, ThisObject, Command.Name); + GeneratedFormCommandActionByNameServer(Command.Name, SelectedRows); +EndProcedure + +&AtServer +Procedure GeneratedFormCommandActionByNameServer(CommandName, SelectedRows) Export + ExternalCommandsServer.GeneratedListChoiceFormCommandActionByName(SelectedRows, ThisObject, CommandName); +EndProcedure + +&AtClient +Procedure InternalCommandAction(Command) Export + InternalCommandsClient.RunCommandAction(Command, ThisObject, List, Items.List.SelectedRows); +EndProcedure + +&AtClient +Procedure InternalCommandActionWithServerContext(Command) Export + InternalCommandActionWithServerContextAtServer(Command.Name); +EndProcedure + +&AtServer +Procedure InternalCommandActionWithServerContextAtServer(CommandName) + InternalCommandsServer.RunCommandAction(CommandName, ThisObject, List, Items.List.SelectedRows); +EndProcedure + +#EndRegion \ No newline at end of file diff --git a/IRP/src/Catalogs/Incoterms/Forms/ItemForm/Form.form b/IRP/src/Catalogs/Incoterms/Forms/ItemForm/Form.form new file mode 100644 index 0000000000..327d73de2e --- /dev/null +++ b/IRP/src/Catalogs/Incoterms/Forms/ItemForm/Form.form @@ -0,0 +1,138 @@ + + + + GroupDescriptions + 4 + + Code + 6 + true + true + + true + + + Object.Code + + + CodeExtendedTooltip + 8 + true + true + + true + + Label + true + true + + Left + + + + CodeContextMenu + 7 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + true + true + + true + + + GroupDescriptionsExtendedTooltip + 5 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + HorizontalIfPossible + true + true + Auto + Auto + + + + FormCommandBar + -1 + true + true + + true + + Left + true + + + OnCreateAtServer + OnCreateAtServer + + + NotificationProcessing + NotificationProcessing + + LockOwnerWindow + true + true + Vertical + true + true + true + true + true + + Object + 1 + + CatalogObject.Incoterms + + + true + + + true + +
true
+ true + + + + + + + + BeforeWriteAtServer + BeforeWriteAtServer + + + diff --git a/IRP/src/Catalogs/Incoterms/Forms/ItemForm/Module.bsl b/IRP/src/Catalogs/Incoterms/Forms/ItemForm/Module.bsl new file mode 100644 index 0000000000..8b14aee806 --- /dev/null +++ b/IRP/src/Catalogs/Incoterms/Forms/ItemForm/Module.bsl @@ -0,0 +1,87 @@ + +#Region FormEventHandlers + +&AtServer +Procedure OnCreateAtServer(Cancel, StandardProcessing) + LocalizationEvents.CreateMainFormItemDescription(ThisObject, "GroupDescriptions"); + LocalizationEvents.FillDescription(Parameters.FillingText, Object); + AddAttributesAndPropertiesServer.OnCreateAtServer(ThisObject); + ExtensionServer.AddAttributesFromExtensions(ThisObject, Object.Ref); + CatalogsServer.OnCreateAtServerObject(ThisObject, Object, Cancel, StandardProcessing); +EndProcedure + +&AtServer +Procedure BeforeWriteAtServer(Cancel, CurrentObject, WriteParameters) + AddAttributesAndPropertiesServer.BeforeWriteAtServer(ThisObject, Cancel, CurrentObject, WriteParameters); +EndProcedure + +&AtClient +Procedure NotificationProcessing(EventName, Parameter, Source, AddInfo = Undefined) Export + If EventName = "UpdateAddAttributeAndPropertySets" Then + AddAttributesCreateFormControl(); + EndIf; +EndProcedure + +#EndRegion + +#Region FormItemsEvent + +&AtClient +Procedure DescriptionOpening(Item, StandardProcessing) Export + LocalizationClient.DescriptionOpening(Object, ThisObject, Item, StandardProcessing); +EndProcedure + +#EndRegion + +#Region Private + +#Region AddAttributes + +&AtClient +Procedure AddAttributeStartChoice(Item, ChoiceData, StandardProcessing) Export + AddAttributesAndPropertiesClient.AddAttributeStartChoice(ThisObject, Item, StandardProcessing); +EndProcedure + +&AtServer +Procedure AddAttributesCreateFormControl() + AddAttributesAndPropertiesServer.CreateFormControls(ThisObject); +EndProcedure + +&AtClient +Procedure AddAttributeButtonClick(Item) Export + AddAttributesAndPropertiesClient.AddAttributeButtonClick(ThisObject, Item); +EndProcedure + +#EndRegion + +#Region COMMANDS + +&AtClient +Procedure GeneratedFormCommandActionByName(Command) Export + ExternalCommandsClient.GeneratedFormCommandActionByName(Object, ThisObject, Command.Name); + GeneratedFormCommandActionByNameServer(Command.Name); +EndProcedure + +&AtServer +Procedure GeneratedFormCommandActionByNameServer(CommandName) + ExternalCommandsServer.GeneratedFormCommandActionByName(Object, ThisObject, CommandName); +EndProcedure + +&AtClient +Procedure InternalCommandAction(Command) Export + InternalCommandsClient.RunCommandAction(Command, ThisObject, Object, Object.Ref); +EndProcedure + +&AtClient +Procedure InternalCommandActionWithServerContext(Command) Export + InternalCommandActionWithServerContextAtServer(Command.Name); +EndProcedure + +&AtServer +Procedure InternalCommandActionWithServerContextAtServer(CommandName) + InternalCommandsServer.RunCommandAction(CommandName, ThisObject, Object, Object.Ref); +EndProcedure + +#EndRegion + +#EndRegion diff --git a/IRP/src/Catalogs/Incoterms/Forms/ListForm/Attributes/List/ExtInfo/ListSettings.dcss b/IRP/src/Catalogs/Incoterms/Forms/ListForm/Attributes/List/ExtInfo/ListSettings.dcss new file mode 100644 index 0000000000..739e827a5c --- /dev/null +++ b/IRP/src/Catalogs/Incoterms/Forms/ListForm/Attributes/List/ExtInfo/ListSettings.dcss @@ -0,0 +1,17 @@ + + + + Normal + 74ff824d-c71a-4496-a8e5-eb9e899cf181 + + + Normal + 7e04aa5b-9e94-4948-bd0f-0b0a70b498ed + + + Normal + 3f1b396b-d2d9-4d79-af28-541121ad0e74 + + Normal + ebe54c40-3830-4de6-9b0b-a7b206aad849 + \ No newline at end of file diff --git a/IRP/src/Catalogs/Incoterms/Forms/ListForm/Form.form b/IRP/src/Catalogs/Incoterms/Forms/ListForm/Form.form new file mode 100644 index 0000000000..60cb7063e5 --- /dev/null +++ b/IRP/src/Catalogs/Incoterms/Forms/ListForm/Form.form @@ -0,0 +1,522 @@ + + + + ListSettingsComposerUserSettings + 1 + true + true + + true + + + <key>en</key> + <value>User settings group</value> + + + <key>ru</key> + <value>Группа пользовательских настроек</value> + + + <key>tr</key> + <value>Kullanıcı ayarlar grubu</value> + + false + + ListSettingsComposerUserSettingsExtendedTooltip + 2 + true + true + + true + + Label + true + true + + Left + + + UsualGroup + + Vertical + Auto + WeakSeparation + true + true + Auto + Auto + + + + List + 3 + true + true + + true + + + List + + true + None + + Code + 19 + true + true + + true + + + List.Code + + + CodeExtendedTooltip + 21 + true + true + + true + + Label + true + true + + Left + + + + CodeContextMenu + 20 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Description + 25 + true + true + + true + + + List.Description + + + DescriptionExtendedTooltip + 27 + true + true + + true + + Label + true + true + + Left + + + + DescriptionContextMenu + 26 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + + Ref + 16 + true + true + + + List.Ref + + true + + RefExtendedTooltip + 18 + true + true + + true + + Label + true + true + + Left + + + + RefContextMenu + 17 + true + true + + true + + true + + LabelField + Enter + true + Left + true + + true + true + + + None + + ListCommandBar + 5 + true + true + + true + + Left + + + true + true + + true + + ListSearchString + 7 + + ListSearchStringExtendedTooltip + 9 + true + true + + true + + Label + true + true + + Left + + + + ListSearchStringContextMenu + 8 + true + true + + true + + true + + ListSearchString + + true + + + + true + true + + true + + ListViewStatus + 10 + + ListViewStatusExtendedTooltip + 12 + true + true + + true + + Label + true + true + + Left + + + + ListViewStatusContextMenu + 11 + true + true + + true + + true + + ViewStatusAddition + ListViewStatus + + true + + + + true + true + + true + + ListSearchControl + 13 + + ListSearchControlExtendedTooltip + 15 + true + true + + true + + Label + true + true + + Left + + + + ListSearchControlContextMenu + 14 + true + true + + true + + true + + SearchControlAddition + ListSearchControl + + true + + + + ListExtendedTooltip + 6 + true + true + + true + + Label + true + true + + Left + + + + ListContextMenu + 4 + true + true + + true + + true + + true + true + true + true + true + MultiRow +
true
+ 1 + 1 + AutoUse + AutoUse + true + true + true + Auto + Auto + ExpandTopLevel + true + true + true + true + AsFileRef + + List.DefaultPicture + + + 60 + + 0001-01-01T00:00:00 + 0001-01-01T00:00:00 + + + true + true + ListSettingsComposerUserSettings + + + + FormCommandBar + -1 + true + true + + true + + Left + true + + + OnCreateAtServer + OnCreateAtServer + + true + true + Vertical + true + true + true + true + true + + List + 1 + + DynamicList + + + true + + + true + +
true
+ + SELECT + Table.Ref, + Table.DeletionMark, + Table.Code, + Table.Description_en as Description +FROM + Catalog.Incoterms AS Table + Catalog.Incoterms + true + true + true + true + true + + Ref + Ref + + + DeletionMark + DeletionMark + + + Code + Code + + + Description + Description + + <localValue> + <content> + <key>en</key> + <value>Description</value> + </content> + <content> + <key>ru</key> + <value>Наименование</value> + </content> + <content> + <key>tr</key> + <value>Tanım</value> + </content> + </localValue> + + + + AddAttributes + AddAttributes + + + Predefined + Predefined + + + PredefinedDataName + PredefinedDataName + + + Editor + Editor + + + Description_hash + Description_hash + + + Description_tr + Description_tr + + + Description_ru + Description_ru + + + CreateDate + CreateDate + + + ModifyDate + ModifyDate + + + NotActive + NotActive + + + Author + Author + + + + + + + + + \ No newline at end of file diff --git a/IRP/src/Catalogs/Incoterms/Forms/ListForm/Module.bsl b/IRP/src/Catalogs/Incoterms/Forms/ListForm/Module.bsl new file mode 100644 index 0000000000..0a8b884565 --- /dev/null +++ b/IRP/src/Catalogs/Incoterms/Forms/ListForm/Module.bsl @@ -0,0 +1,37 @@ + +&AtServer +Procedure OnCreateAtServer(Cancel, StandardProcessing) + ThisObject.List.QueryText = LocalizationEvents.ReplaceDescriptionLocalizationPrefix(ThisObject.List.QueryText); + CatalogsServer.OnCreateAtServerListForm(ThisObject, List, Cancel, StandardProcessing); +EndProcedure + +#Region COMMANDS + +&AtClient +Procedure GeneratedFormCommandActionByName(Command) Export + SelectedRows = Items.List.SelectedRows; + ExternalCommandsClient.GeneratedListChoiceFormCommandActionByName(SelectedRows, ThisObject, Command.Name); + GeneratedFormCommandActionByNameServer(Command.Name, SelectedRows); +EndProcedure + +&AtServer +Procedure GeneratedFormCommandActionByNameServer(CommandName, SelectedRows) Export + ExternalCommandsServer.GeneratedListChoiceFormCommandActionByName(SelectedRows, ThisObject, CommandName); +EndProcedure + +&AtClient +Procedure InternalCommandAction(Command) Export + InternalCommandsClient.RunCommandAction(Command, ThisObject, List, Items.List.SelectedRows); +EndProcedure + +&AtClient +Procedure InternalCommandActionWithServerContext(Command) Export + InternalCommandActionWithServerContextAtServer(Command.Name); +EndProcedure + +&AtServer +Procedure InternalCommandActionWithServerContextAtServer(CommandName) + InternalCommandsServer.RunCommandAction(CommandName, ThisObject, List, Items.List.SelectedRows); +EndProcedure + +#EndRegion \ No newline at end of file diff --git a/IRP/src/Catalogs/Incoterms/Incoterms.mdo b/IRP/src/Catalogs/Incoterms/Incoterms.mdo new file mode 100644 index 0000000000..5b0a336669 --- /dev/null +++ b/IRP/src/Catalogs/Incoterms/Incoterms.mdo @@ -0,0 +1,185 @@ + + + + + + + + + + Incoterms + + en + Incoterms + + + ru + Инкотермс + + + tr + Incoterms + + true + Catalog.Incoterms.StandardAttribute.Code + DontUse + Use + Managed + Use + 2 + true + 3 + String + Variable + true + true + AsDescription + InDialog + BothWays + Catalog.Incoterms.Form.ItemForm + Catalog.Incoterms.Form.ListForm + Catalog.Incoterms.Form.ChoiceForm + + + + + + AddAttributes + + en + Additional attributes + + + ru + Дополнительные реквизиты + + + tr + Ek özellikler + + + Property + + en + Property + + + ru + Свойство + + + tr + Özellik + + + ChartOfCharacteristicTypesRef.AddAttributeAndProperty + + + + Use + Use + + + Value + + en + Value + + + ru + Значение + + + tr + Değer + + + Characteristic.AddAttributeAndProperty + + + + + Filter.Owner + Catalog.Incoterms.TabularSection.AddAttributes.Attribute.Property + + Use + Use + + + SearchLiteral + + en + Search literal + + + ru + Текстовая строка + + + tr + Arama metni + + + String + + 500 + + + + + Use + Use + + + + ItemForm + + en + Item form + + + ru + Форма элемента + + + tr + Öğe formu + + PersonalComputer + MobileDevice + + + ListForm + + en + List form + + + ru + Форма списка + + + tr + Liste formu + + PersonalComputer + MobileDevice + + + ChoiceForm + + en + Choice form + + + ru + Форма выбора + + + tr + Seçim formu + + PersonalComputer + MobileDevice + + \ No newline at end of file diff --git a/IRP/src/Catalogs/LegalNameContracts/Forms/ItemForm/Form.form b/IRP/src/Catalogs/LegalNameContracts/Forms/ItemForm/Form.form index c20f0a0c84..823feb6ade 100644 --- a/IRP/src/Catalogs/LegalNameContracts/Forms/ItemForm/Form.form +++ b/IRP/src/Catalogs/LegalNameContracts/Forms/ItemForm/Form.form @@ -100,6 +100,56 @@ true + + ContractNumber + 26 + true + true + + true + + + Object.ContractNumber + + + ContractNumberExtendedTooltip + 28 + true + true + + true + + Label + true + true + + Left + + + + ContractNumberContextMenu + 27 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + GroupDates 19 @@ -295,129 +345,120 @@ true - - GroupBankAccount - 21 - - PartnerBankAccount - 16 + + LegalName + 32 + true + true + + true + + + Object.LegalName + + + LegalNameExtendedTooltip + 34 true true true - - Object.PartnerBankAccount - - - PartnerBankAccountExtendedTooltip - 18 - true - true - - true - - Label - true - true - - Left - - - - PartnerBankAccountContextMenu - 17 - true - true - - true - - true - - InputField - EnterOnInput - true - Left - true - - true - true - true - true - true - true + Label + true + true + + Left - - - PartnerBankAccountCurrency - 23 + + + LegalNameContextMenu + 33 true true true - - Object.PartnerBankAccount.Currency - - - PartnerBankAccountCurrencyExtendedTooltip - 25 - true - true - - true - - Label - true - true - - Left - - - - PartnerBankAccountCurrencyContextMenu - 24 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + Currency + 29 + true + true + + true + + + Object.Currency + + + CurrencyExtendedTooltip + 31 + true + true + + true + + Label + true + true + + Left - + + + CurrencyContextMenu + 30 + true + true + + true + + true + + InputField + Enter + true + Left + true + + true + true + true + true + true + true + + + + PartnerBankAccount + 16 true true true - - <key>en</key> - <value>Bank account</value> - - - <key>ru</key> - <value>Банковский счет</value> - - - <key>tr</key> - <value>Banka hesabı</value> - + + Object.PartnerBankAccount + - GroupBankAccountExtendedTooltip - 22 + PartnerBankAccountExtendedTooltip + 18 true true @@ -430,13 +471,28 @@ Left - UsualGroup - - Vertical - true - true - Auto - Auto + + PartnerBankAccountContextMenu + 17 + true + true + + true + + true + + InputField + EnterOnInput + true + Left + true + + true + true + true + true + true + true diff --git a/IRP/src/Catalogs/LegalNameContracts/LegalNameContracts.mdo b/IRP/src/Catalogs/LegalNameContracts/LegalNameContracts.mdo index bdfc02feab..58b1173526 100644 --- a/IRP/src/Catalogs/LegalNameContracts/LegalNameContracts.mdo +++ b/IRP/src/Catalogs/LegalNameContracts/LegalNameContracts.mdo @@ -86,18 +86,6 @@ Use Description - - en - Contract number - - - ru - Номер договора - - - tr - Kontrat numarası - ShowError Use @@ -244,6 +232,12 @@ + + Filter.OurCompany + + true + + true Use @@ -272,6 +266,78 @@ Use Use + + ContractNumber + + en + Contract number + + + ru + Номер договора + + + tr + Kontrat numarası + + + String + + 50 + + + + + + Use + Use + + + Currency + + en + Currency + + + ru + Валюта + + + tr + Döviz + + + CatalogRef.Currencies + + + + + Use + Use + + + LegalName + + en + Legal name + + + ru + Контрагент + + + tr + Fatura hesabı + + + CatalogRef.Companies + + + + + Use + Use + diff --git a/IRP/src/CommonAttributes/Author/Author.mdo b/IRP/src/CommonAttributes/Author/Author.mdo index 1597fdf876..0b2dab9bfa 100644 --- a/IRP/src/CommonAttributes/Author/Author.mdo +++ b/IRP/src/CommonAttributes/Author/Author.mdo @@ -21,411 +21,411 @@ Use - Document.ManualRegisterEntry + Catalog.PaymentTerminals Use - Document.MoneyTransfer + Catalog.Agreements Use - Document.SalesOrder + Document.VisitorCounter Use - Document.PurchaseReturnOrder + Catalog.AgingPeriods Use - Document.ChequeBondTransaction + Document.ProductionCostsAllocation Use - Document.AdditionalCostAllocation + Document.ManualRegisterEntry Use - Document.SalesReturn + Catalog.FileStorageVolumes Use - Document.SalesReportFromTradeAgent + Catalog.Items Use - Document.ReconciliationStatement + Document.MoneyTransfer Use - Document.RetailReturnReceipt + Catalog.SpecialOfferTypes Use - Document.WorkOrder + Document.DepreciationCalculation Use - Document.CashExpense + Document.SalesOrder Use - Document.StockAdjustmentAsSurplus + Catalog.LegalNameContracts Use - Document.PhysicalInventory + Catalog.Units Use - Document.PhysicalCountByLocation + Catalog.PaymentSchedules Use - Document.InventoryTransfer + Catalog.FixedAssetsLedgerTypes Use - Document.PurchaseReturn + Document.PurchaseReturnOrder Use - Document.ConsolidatedRetailSales + Document.RetailGoodsReceipt Use - Document.SalesInvoice + Catalog.PartnerSegments Use - Document.CashRevenue + Document.ChequeBondTransaction Use - Document.ShipmentConfirmation + Catalog.Users Use - Document.ProductionPlanning + Catalog.AddAttributeAndPropertySets Use - Document.Production + Catalog.InterfaceGroups Use - Catalog.ReportOptions + Catalog.CurrencyMovementSets Use - Document.ItemStockAdjustment + Catalog.AdvancesKeys Use - Document.SalesReportToConsignor + Catalog.FileStoragesInfo Use - Document.AdditionalRevenueAllocation + Document.AdditionalCostAllocation Use - Document.Unbundling + Catalog.Countries Use - Document.WorkSheet + Document.SalesReturn Use - Document.OpeningEntry + Document.SalesReportFromTradeAgent Use - Document.ProductionPlanningClosing + Catalog.Batches Use - Document.Bundling + Catalog.CashAccounts Use - Document.PurchaseOrderClosing + Catalog.AddAttributeAndPropertyValues Use - Document.OutgoingPaymentOrder + Catalog.FillingTemplates Use - Document.SalesOrderClosing + Document.EmployeeSickLeave Use - Document.RetailSalesReceipt + Document.AdditionalDeduction Use - Document.StockAdjustmentAsWriteOff + Catalog.BankTerms Use - Document.PriceList + Catalog.SpecialOffers Use - Document.IncomingPaymentOrder + Catalog.Workstations Use - Document.CashReceipt + Document.ReconciliationStatement Use - Document.DebitNote + Catalog.TaxRates Use - Document.SalesReturnOrder + Document.RetailReturnReceipt Use - Document.JournalEntry + Document.WorkOrder Use - Document.PurchaseInvoice + Document.CashExpense Use - Document.InventoryTransferOrder + Catalog.IDInfoSets Use - Document.ProductionPlanningCorrection + Document.StockAdjustmentAsSurplus Use - Document.GoodsReceipt + Catalog.PlanningPeriods Use - Document.PurchaseOrder + Catalog.LedgerTypes Use - Document.PlannedReceiptReservation + Catalog.AccrualAndDeductionTypes Use - Document.CreditNote + Catalog.ItemKeys Use - Document.BankPayment + Catalog.CashStatementStatuses Use - Document.InternalSupplyRequest + Document.EmployeeTransfer Use - Document.CashPayment + Document.PhysicalInventory Use - Document.CashTransferOrder + Catalog.ItemSegments Use - Document.ChequeBondTransactionItem + Catalog.VehicleTypes Use - Document.BankReceipt + Document.PhysicalCountByLocation Use - Document.CashStatement + Catalog.FixedAssets Use - Document.EmployeeCashAdvance + Catalog.IntegrationSettings Use - Document.ProductionCostsAllocation + Document.CommissioningOfFixedAsset Use - Document.Payroll + Catalog.BillOfMaterials Use - Document.TimeSheet + Catalog.Taxes Use - Document.RetailShipmentConfirmation + Document.InventoryTransfer Use - Document.RetailGoodsReceipt + Catalog.SpecialOfferRules Use - Document.CommissioningOfFixedAsset + Document.PurchaseReturn Use - Document.CommissioningOfFixedAsset + Catalog.UnitsOfMeasurement Use - Document.DecommissioningOfFixedAsset + Document.TimeSheet Use - Document.FixedAssetTransfer + Document.ConsolidatedRetailSales Use - Document.DepreciationCalculation + Catalog.Files Use - Document.ModernizationOfFixedAsset + Document.SalesInvoice Use - Document.EmployeeHiring + Catalog.Stores Use - Document.EmployeeTransfer + Catalog.AccessProfiles Use - Document.EmployeeFiring + Document.CashRevenue Use - Document.EmployeeVacation + Catalog.AccessGroups Use - Document.EmployeeSickLeave + Document.AdditionalAccrual Use - Document.AdditionalDeduction + Document.ShipmentConfirmation Use - Document.AdditionalAccrual + Document.ProductionPlanning Use - Document.VisitorCounter + Document.EmployeeHiring Use - Document.RetailReceiptCorrection + Catalog.Hardware Use - Catalog.Agreements + Catalog.Specifications Use - Catalog.BankTerms + Catalog.BatchKeys Use - Catalog.BusinessUnits + Document.Production Use - Catalog.CashAccounts + Catalog.CancelReturnReasons Use - Catalog.Companies + Catalog.ReportOptions Use - Catalog.Countries + Catalog.DataMappingItems Use - Catalog.CurrencyMovementSets + Document.ItemStockAdjustment Use - Catalog.AccessGroups + Document.SalesReportToConsignor Use - Catalog.AccessProfiles + Document.RetailShipmentConfirmation Use - Catalog.AccountingOperations + Catalog.Currencies Use - Catalog.AccrualAndDeductionTypes + Document.AdditionalRevenueAllocation Use - Catalog.AddAttributeAndPropertyValues + Document.DecommissioningOfFixedAsset Use - Catalog.AddAttributeAndPropertySets + Catalog.EmployeeSchedule Use - Catalog.Addresses + Catalog.AccountingOperations Use - Catalog.AdvancesKeys + Document.Payroll Use - Catalog.BillOfMaterials + Catalog.LockDataModificationReasons Use - Catalog.CancelReturnReasons + Document.Unbundling Use - Catalog.CashStatementStatuses + Document.WorkSheet Use - Catalog.ChequeBonds + Catalog.BusinessUnits Use - Catalog.Batches + Document.OpeningEntry Use - Catalog.BatchKeys + Catalog.Addresses Use - Catalog.Currencies + Document.ProductionPlanningClosing Use - Catalog.DataMappingItems + Document.Bundling Use - Catalog.EmployeePositions + Document.PurchaseOrderClosing Use @@ -433,67 +433,67 @@ Use - Catalog.ExternalDataProc + Catalog.EmployeePositions Use - Catalog.ExternalFunctions + Catalog.ExternalDataProc Use - Catalog.Files + Document.ModernizationOfFixedAsset Use - Catalog.FileStoragesInfo + Document.OutgoingPaymentOrder Use - Catalog.FileStorageVolumes + Document.SalesOrderClosing Use - Catalog.FillingTemplates + Document.RetailSalesReceipt Use - Catalog.FixedAssets + Document.StockAdjustmentAsWriteOff Use - Catalog.FixedAssetsLedgerTypes + Document.DebitCreditNote Use - Catalog.Hardware + Catalog.Partners Use - Catalog.IDInfoAddresses + Catalog.Incoterms Use - Catalog.IDInfoSets + Document.EmployeeVacation Use - Catalog.IntegrationSettings + Catalog.ExternalFunctions Use - Catalog.InterfaceGroups + Document.PriceList Use - Catalog.ItemKeys + Document.IncomingPaymentOrder Use - Catalog.Items + Catalog.SourceOfOrigins Use - Catalog.ItemSegments + Catalog.ChequeBonds Use @@ -501,155 +501,155 @@ Use - Catalog.LedgerTypes + Document.CashReceipt Use - Catalog.LedgerTypeVariants + Document.DebitNote Use - Catalog.LegalNameContracts + Document.SalesReturnOrder Use - Catalog.LockDataModificationReasons + Document.EmployeeFiring Use - Catalog.MovementRules + Document.JournalEntry Use - Catalog.ObjectAccessKeys + Document.RetailReceiptCorrection Use - Catalog.ObjectStatuses + Catalog.LedgerTypeVariants Use - Catalog.PartnerItems + Document.EmployeeCashAdvance Use - Catalog.Partners + Document.PurchaseInvoice Use - Catalog.PartnersBankAccounts + Catalog.PartnerItems Use - Catalog.PartnerSegments + Catalog.Projects Use - Catalog.PaymentSchedules + Catalog.IDInfoAddresses Use - Catalog.PaymentTerminals + Document.InventoryTransferOrder Use - Catalog.PaymentTypes + Catalog.PriceTypes Use - Catalog.PlanningPeriods + Document.ProductionPlanningCorrection Use - Catalog.PriceTypes + Catalog.PartnersBankAccounts Use - Catalog.RetailCustomers + Document.GoodsReceipt Use - Catalog.SerialLotNumbers + Document.PurchaseOrder Use - Catalog.SourceOfOrigins + Document.PlannedReceiptReservation Use - Catalog.SpecialOfferRules + Catalog.RetailCustomers Use - Catalog.SpecialOffers + Catalog.PaymentTypes Use - Catalog.SpecialOfferTypes + Catalog.Vehicles Use - Catalog.Specifications + Catalog.ObjectAccessKeys Use - Catalog.Stores + Catalog.SerialLotNumbers Use - Catalog.TaxAnalytics + Catalog.UserGroups Use - Catalog.Taxes + Document.CreditNote Use - Catalog.TaxRates + Document.BankPayment Use - Catalog.Units + Document.InternalSupplyRequest Use - Catalog.UnitsOfMeasurement + Catalog.MovementRules Use - Catalog.UserGroups + Catalog.ObjectStatuses Use - Catalog.Users + Document.CashPayment Use - Catalog.Vehicles + Document.CashTransferOrder Use - Catalog.VehicleTypes + Document.ChequeBondTransactionItem Use - Catalog.Workstations + Document.BankReceipt Use - Catalog.EmployeeSchedule + Catalog.Companies Use - Catalog.Projects + Catalog.TaxAnalytics Use - Document.DebitCreditNote + Document.CashStatement Use - Catalog.AgingPeriods + Document.FixedAssetTransfer Use DontUse diff --git a/IRP/src/CommonAttributes/CreateDate/CreateDate.mdo b/IRP/src/CommonAttributes/CreateDate/CreateDate.mdo index 890263fa59..e482287de6 100644 --- a/IRP/src/CommonAttributes/CreateDate/CreateDate.mdo +++ b/IRP/src/CommonAttributes/CreateDate/CreateDate.mdo @@ -22,411 +22,411 @@ Use - Document.ManualRegisterEntry + Catalog.PaymentTerminals Use - Document.MoneyTransfer + Catalog.Agreements Use - Document.SalesOrder + Document.VisitorCounter Use - Document.PurchaseReturnOrder + Catalog.AgingPeriods Use - Document.ChequeBondTransaction + Document.ProductionCostsAllocation Use - Document.AdditionalCostAllocation + Document.ManualRegisterEntry Use - Document.SalesReturn + Catalog.FileStorageVolumes Use - Document.SalesReportFromTradeAgent + Catalog.Items Use - Document.ReconciliationStatement + Document.MoneyTransfer Use - Document.RetailReturnReceipt + Catalog.SpecialOfferTypes Use - Document.WorkOrder + Document.DepreciationCalculation Use - Document.CashExpense + Document.SalesOrder Use - Document.StockAdjustmentAsSurplus + Catalog.LegalNameContracts Use - Document.PhysicalInventory + Catalog.Units Use - Document.PhysicalCountByLocation + Catalog.PaymentSchedules Use - Document.InventoryTransfer + Catalog.FixedAssetsLedgerTypes Use - Document.PurchaseReturn + Document.PurchaseReturnOrder Use - Document.ConsolidatedRetailSales + Document.RetailGoodsReceipt Use - Document.SalesInvoice + Catalog.PartnerSegments Use - Document.CashRevenue + Document.ChequeBondTransaction Use - Document.ShipmentConfirmation + Catalog.Users Use - Document.ProductionPlanning + Catalog.AddAttributeAndPropertySets Use - Document.Production + Catalog.InterfaceGroups Use - Catalog.ReportOptions + Catalog.CurrencyMovementSets Use - Document.ItemStockAdjustment + Catalog.AdvancesKeys Use - Document.SalesReportToConsignor + Catalog.FileStoragesInfo Use - Document.AdditionalRevenueAllocation + Document.AdditionalCostAllocation Use - Document.Unbundling + Catalog.Countries Use - Document.WorkSheet + Document.SalesReturn Use - Document.OpeningEntry + Document.SalesReportFromTradeAgent Use - Document.ProductionPlanningClosing + Catalog.Batches Use - Document.Bundling + Catalog.CashAccounts Use - Document.PurchaseOrderClosing + Catalog.AddAttributeAndPropertyValues Use - Document.OutgoingPaymentOrder + Catalog.FillingTemplates Use - Document.SalesOrderClosing + Document.EmployeeSickLeave Use - Document.RetailSalesReceipt + Document.AdditionalDeduction Use - Document.StockAdjustmentAsWriteOff + Catalog.BankTerms Use - Document.PriceList + Catalog.SpecialOffers Use - Document.IncomingPaymentOrder + Catalog.Workstations Use - Document.CashReceipt + Document.ReconciliationStatement Use - Document.DebitNote + Catalog.TaxRates Use - Document.SalesReturnOrder + Document.RetailReturnReceipt Use - Document.JournalEntry + Document.WorkOrder Use - Document.PurchaseInvoice + Document.CashExpense Use - Document.InventoryTransferOrder + Catalog.IDInfoSets Use - Document.ProductionPlanningCorrection + Document.StockAdjustmentAsSurplus Use - Document.GoodsReceipt + Catalog.PlanningPeriods Use - Document.PurchaseOrder + Catalog.LedgerTypes Use - Document.PlannedReceiptReservation + Catalog.AccrualAndDeductionTypes Use - Document.CreditNote + Catalog.ItemKeys Use - Document.BankPayment + Catalog.CashStatementStatuses Use - Document.InternalSupplyRequest + Document.EmployeeTransfer Use - Document.CashPayment + Document.PhysicalInventory Use - Document.CashTransferOrder + Catalog.ItemSegments Use - Document.ChequeBondTransactionItem + Catalog.VehicleTypes Use - Document.BankReceipt + Document.PhysicalCountByLocation Use - Document.CashStatement + Catalog.FixedAssets Use - Document.EmployeeCashAdvance + Catalog.IntegrationSettings Use - Document.ProductionCostsAllocation + Document.CommissioningOfFixedAsset Use - Document.Payroll + Catalog.BillOfMaterials Use - Document.TimeSheet + Catalog.Taxes Use - Document.RetailShipmentConfirmation + Document.InventoryTransfer Use - Document.RetailGoodsReceipt + Catalog.SpecialOfferRules Use - Document.CommissioningOfFixedAsset + Document.PurchaseReturn Use - Document.CommissioningOfFixedAsset + Catalog.UnitsOfMeasurement Use - Document.DecommissioningOfFixedAsset + Document.TimeSheet Use - Document.FixedAssetTransfer + Document.ConsolidatedRetailSales Use - Document.DepreciationCalculation + Catalog.Files Use - Document.ModernizationOfFixedAsset + Document.SalesInvoice Use - Document.EmployeeHiring + Catalog.Stores Use - Document.EmployeeTransfer + Catalog.AccessProfiles Use - Document.EmployeeFiring + Document.CashRevenue Use - Document.EmployeeVacation + Catalog.AccessGroups Use - Document.EmployeeSickLeave + Document.AdditionalAccrual Use - Document.AdditionalDeduction + Document.ShipmentConfirmation Use - Document.AdditionalAccrual + Document.ProductionPlanning Use - Document.VisitorCounter + Document.EmployeeHiring Use - Document.RetailReceiptCorrection + Catalog.Hardware Use - Catalog.Agreements + Catalog.Specifications Use - Catalog.BankTerms + Catalog.BatchKeys Use - Catalog.BusinessUnits + Document.Production Use - Catalog.CashAccounts + Catalog.CancelReturnReasons Use - Catalog.Companies + Catalog.ReportOptions Use - Catalog.Countries + Catalog.DataMappingItems Use - Catalog.CurrencyMovementSets + Document.ItemStockAdjustment Use - Catalog.AccessGroups + Document.SalesReportToConsignor Use - Catalog.AccessProfiles + Document.RetailShipmentConfirmation Use - Catalog.AccountingOperations + Catalog.Currencies Use - Catalog.AccrualAndDeductionTypes + Document.AdditionalRevenueAllocation Use - Catalog.AddAttributeAndPropertyValues + Document.DecommissioningOfFixedAsset Use - Catalog.AddAttributeAndPropertySets + Catalog.EmployeeSchedule Use - Catalog.Addresses + Catalog.AccountingOperations Use - Catalog.AdvancesKeys + Document.Payroll Use - Catalog.BillOfMaterials + Catalog.LockDataModificationReasons Use - Catalog.CancelReturnReasons + Document.Unbundling Use - Catalog.CashStatementStatuses + Document.WorkSheet Use - Catalog.ChequeBonds + Catalog.BusinessUnits Use - Catalog.Batches + Document.OpeningEntry Use - Catalog.BatchKeys + Catalog.Addresses Use - Catalog.Currencies + Document.ProductionPlanningClosing Use - Catalog.DataMappingItems + Document.Bundling Use - Catalog.EmployeePositions + Document.PurchaseOrderClosing Use @@ -434,67 +434,67 @@ Use - Catalog.ExternalDataProc + Catalog.EmployeePositions Use - Catalog.ExternalFunctions + Catalog.ExternalDataProc Use - Catalog.Files + Document.ModernizationOfFixedAsset Use - Catalog.FileStoragesInfo + Document.OutgoingPaymentOrder Use - Catalog.FileStorageVolumes + Document.SalesOrderClosing Use - Catalog.FillingTemplates + Document.RetailSalesReceipt Use - Catalog.FixedAssets + Document.StockAdjustmentAsWriteOff Use - Catalog.FixedAssetsLedgerTypes + Document.DebitCreditNote Use - Catalog.Hardware + Catalog.Partners Use - Catalog.IDInfoAddresses + Catalog.Incoterms Use - Catalog.IDInfoSets + Document.EmployeeVacation Use - Catalog.IntegrationSettings + Catalog.ExternalFunctions Use - Catalog.InterfaceGroups + Document.PriceList Use - Catalog.ItemKeys + Document.IncomingPaymentOrder Use - Catalog.Items + Catalog.SourceOfOrigins Use - Catalog.ItemSegments + Catalog.ChequeBonds Use @@ -502,155 +502,155 @@ Use - Catalog.LedgerTypes + Document.CashReceipt Use - Catalog.LedgerTypeVariants + Document.DebitNote Use - Catalog.LegalNameContracts + Document.SalesReturnOrder Use - Catalog.LockDataModificationReasons + Document.EmployeeFiring Use - Catalog.MovementRules + Document.JournalEntry Use - Catalog.ObjectAccessKeys + Document.RetailReceiptCorrection Use - Catalog.ObjectStatuses + Catalog.LedgerTypeVariants Use - Catalog.PartnerItems + Document.EmployeeCashAdvance Use - Catalog.Partners + Document.PurchaseInvoice Use - Catalog.PartnersBankAccounts + Catalog.PartnerItems Use - Catalog.PartnerSegments + Catalog.Projects Use - Catalog.PaymentSchedules + Catalog.IDInfoAddresses Use - Catalog.PaymentTerminals + Document.InventoryTransferOrder Use - Catalog.PaymentTypes + Catalog.PriceTypes Use - Catalog.PlanningPeriods + Document.ProductionPlanningCorrection Use - Catalog.PriceTypes + Catalog.PartnersBankAccounts Use - Catalog.RetailCustomers + Document.GoodsReceipt Use - Catalog.SerialLotNumbers + Document.PurchaseOrder Use - Catalog.SourceOfOrigins + Document.PlannedReceiptReservation Use - Catalog.SpecialOfferRules + Catalog.RetailCustomers Use - Catalog.SpecialOffers + Catalog.PaymentTypes Use - Catalog.SpecialOfferTypes + Catalog.Vehicles Use - Catalog.Specifications + Catalog.ObjectAccessKeys Use - Catalog.Stores + Catalog.SerialLotNumbers Use - Catalog.TaxAnalytics + Catalog.UserGroups Use - Catalog.Taxes + Document.CreditNote Use - Catalog.TaxRates + Document.BankPayment Use - Catalog.Units + Document.InternalSupplyRequest Use - Catalog.UnitsOfMeasurement + Catalog.MovementRules Use - Catalog.UserGroups + Catalog.ObjectStatuses Use - Catalog.Users + Document.CashPayment Use - Catalog.Vehicles + Document.CashTransferOrder Use - Catalog.VehicleTypes + Document.ChequeBondTransactionItem Use - Catalog.Workstations + Document.BankReceipt Use - Catalog.EmployeeSchedule + Catalog.Companies Use - Catalog.Projects + Catalog.TaxAnalytics Use - Document.DebitCreditNote + Document.CashStatement Use - Catalog.AgingPeriods + Document.FixedAssetTransfer Use DontUse diff --git a/IRP/src/CommonAttributes/Description_en/Description_en.mdo b/IRP/src/CommonAttributes/Description_en/Description_en.mdo index c8bca51b34..802deb5afb 100644 --- a/IRP/src/CommonAttributes/Description_en/Description_en.mdo +++ b/IRP/src/CommonAttributes/Description_en/Description_en.mdo @@ -28,6 +28,10 @@ Catalog.Agreements Use + + Catalog.AgingPeriods + Use + Catalog.DataBaseStatus Use @@ -36,6 +40,10 @@ Catalog.Items Use + + Catalog.DepreciationSchedules + Use + Catalog.SpecialOfferTypes Use @@ -48,6 +56,10 @@ Catalog.PaymentSchedules Use + + Catalog.FixedAssetsLedgerTypes + Use + Catalog.PartnerSegments Use @@ -108,6 +120,10 @@ Catalog.LedgerTypes Use + + Catalog.AccrualAndDeductionTypes + Use + Catalog.ItemKeys Use @@ -120,10 +136,18 @@ Catalog.ItemSegments Use + + Catalog.VehicleTypes + Use + ChartOfCharacteristicTypes.CustomUserSettings Use + + Catalog.FixedAssets + Use + Catalog.IntegrationSettings DontUse @@ -172,10 +196,18 @@ Catalog.ReportOptions DontUse + + Catalog.PrintInfo + Use + Catalog.Currencies Use + + Catalog.EmployeeSchedule + Use + Catalog.AccountingOperations Use @@ -188,10 +220,18 @@ Catalog.BusinessUnits Use + + Catalog.Addresses + Use + Catalog.ExpenseAndRevenueTypes Use + + Catalog.EmployeePositions + Use + Catalog.ExternalDataProc Use @@ -200,6 +240,10 @@ Catalog.Partners Use + + Catalog.Incoterms + Use + Catalog.PrintTemplates Use @@ -216,6 +260,10 @@ Catalog.PartnerItems Use + + Catalog.Projects + Use + Catalog.IDInfoAddresses Use @@ -260,50 +308,6 @@ ChartOfCharacteristicTypes.IDInfoTypes Use - - Catalog.AccrualAndDeductionTypes - Use - - - Catalog.EmployeePositions - Use - - - Catalog.VehicleTypes - Use - - - Catalog.Addresses - Use - - - Catalog.FixedAssets - Use - - - Catalog.DepreciationSchedules - Use - - - Catalog.FixedAssetsLedgerTypes - Use - - - Catalog.EmployeeSchedule - Use - - - Catalog.Projects - Use - - - Catalog.PrintInfo - Use - - - Catalog.AgingPeriods - Use - DontUse DontUse DontUse diff --git a/IRP/src/CommonAttributes/Description_hash/Description_hash.mdo b/IRP/src/CommonAttributes/Description_hash/Description_hash.mdo index b047e03b12..2a52477c03 100644 --- a/IRP/src/CommonAttributes/Description_hash/Description_hash.mdo +++ b/IRP/src/CommonAttributes/Description_hash/Description_hash.mdo @@ -28,6 +28,10 @@ Catalog.Agreements Use + + Catalog.AgingPeriods + Use + Catalog.DataBaseStatus Use @@ -36,6 +40,10 @@ Catalog.Items Use + + Catalog.DepreciationSchedules + Use + Catalog.SpecialOfferTypes Use @@ -48,6 +56,10 @@ Catalog.PaymentSchedules Use + + Catalog.FixedAssetsLedgerTypes + Use + Catalog.PartnerSegments Use @@ -108,6 +120,10 @@ Catalog.LedgerTypes Use + + Catalog.AccrualAndDeductionTypes + Use + Catalog.ItemKeys Use @@ -120,10 +136,18 @@ Catalog.ItemSegments Use + + Catalog.VehicleTypes + Use + ChartOfCharacteristicTypes.CustomUserSettings Use + + Catalog.FixedAssets + Use + Catalog.IntegrationSettings DontUse @@ -172,10 +196,18 @@ Catalog.ReportOptions DontUse + + Catalog.PrintInfo + Use + Catalog.Currencies Use + + Catalog.EmployeeSchedule + Use + Catalog.AccountingOperations Use @@ -188,10 +220,18 @@ Catalog.BusinessUnits Use + + Catalog.Addresses + Use + Catalog.ExpenseAndRevenueTypes Use + + Catalog.EmployeePositions + Use + Catalog.ExternalDataProc Use @@ -200,6 +240,10 @@ Catalog.Partners Use + + Catalog.Incoterms + Use + Catalog.ItemTypes Use @@ -212,6 +256,10 @@ Catalog.PartnerItems Use + + Catalog.Projects + Use + Catalog.IDInfoAddresses Use @@ -256,50 +304,6 @@ ChartOfCharacteristicTypes.IDInfoTypes Use - - Catalog.AccrualAndDeductionTypes - Use - - - Catalog.EmployeePositions - Use - - - Catalog.VehicleTypes - Use - - - Catalog.Addresses - Use - - - Catalog.FixedAssets - Use - - - Catalog.DepreciationSchedules - Use - - - Catalog.FixedAssetsLedgerTypes - Use - - - Catalog.EmployeeSchedule - Use - - - Catalog.Projects - Use - - - Catalog.PrintInfo - Use - - - Catalog.AgingPeriods - Use - DontUse DontUse DontUse diff --git a/IRP/src/CommonAttributes/Description_ru/Description_ru.mdo b/IRP/src/CommonAttributes/Description_ru/Description_ru.mdo index 849d7b9c41..dbd349ea72 100644 --- a/IRP/src/CommonAttributes/Description_ru/Description_ru.mdo +++ b/IRP/src/CommonAttributes/Description_ru/Description_ru.mdo @@ -28,6 +28,10 @@ Catalog.Agreements Use + + Catalog.AgingPeriods + Use + Catalog.DataBaseStatus Use @@ -36,6 +40,10 @@ Catalog.Items Use + + Catalog.DepreciationSchedules + Use + Catalog.SpecialOfferTypes Use @@ -48,6 +56,10 @@ Catalog.PaymentSchedules Use + + Catalog.FixedAssetsLedgerTypes + Use + Catalog.PartnerSegments Use @@ -108,6 +120,10 @@ Catalog.LedgerTypes Use + + Catalog.AccrualAndDeductionTypes + Use + Catalog.ItemKeys Use @@ -120,10 +136,18 @@ Catalog.ItemSegments Use + + Catalog.VehicleTypes + Use + ChartOfCharacteristicTypes.CustomUserSettings Use + + Catalog.FixedAssets + Use + Catalog.IntegrationSettings DontUse @@ -172,10 +196,18 @@ Catalog.ReportOptions DontUse + + Catalog.PrintInfo + Use + Catalog.Currencies Use + + Catalog.EmployeeSchedule + Use + Catalog.AccountingOperations Use @@ -188,10 +220,18 @@ Catalog.BusinessUnits Use + + Catalog.Addresses + Use + Catalog.ExpenseAndRevenueTypes Use + + Catalog.EmployeePositions + Use + Catalog.ExternalDataProc Use @@ -200,6 +240,10 @@ Catalog.Partners Use + + Catalog.Incoterms + Use + Catalog.PrintTemplates Use @@ -216,6 +260,10 @@ Catalog.PartnerItems Use + + Catalog.Projects + Use + Catalog.IDInfoAddresses Use @@ -260,50 +308,6 @@ ChartOfCharacteristicTypes.IDInfoTypes Use - - Catalog.AccrualAndDeductionTypes - Use - - - Catalog.EmployeePositions - Use - - - Catalog.VehicleTypes - Use - - - Catalog.Addresses - Use - - - Catalog.FixedAssets - Use - - - Catalog.DepreciationSchedules - Use - - - Catalog.FixedAssetsLedgerTypes - Use - - - Catalog.EmployeeSchedule - Use - - - Catalog.Projects - Use - - - Catalog.PrintInfo - Use - - - Catalog.AgingPeriods - Use - DontUse DontUse DontUse diff --git a/IRP/src/CommonAttributes/Description_tr/Description_tr.mdo b/IRP/src/CommonAttributes/Description_tr/Description_tr.mdo index bee42d221e..f7fb4ab0d8 100644 --- a/IRP/src/CommonAttributes/Description_tr/Description_tr.mdo +++ b/IRP/src/CommonAttributes/Description_tr/Description_tr.mdo @@ -28,6 +28,10 @@ Catalog.Agreements Use + + Catalog.AgingPeriods + Use + Catalog.DataBaseStatus Use @@ -36,6 +40,10 @@ Catalog.Items Use + + Catalog.DepreciationSchedules + Use + Catalog.SpecialOfferTypes Use @@ -48,6 +56,10 @@ Catalog.PaymentSchedules Use + + Catalog.FixedAssetsLedgerTypes + Use + Catalog.PartnerSegments Use @@ -108,6 +120,10 @@ Catalog.LedgerTypes Use + + Catalog.AccrualAndDeductionTypes + Use + Catalog.ItemKeys Use @@ -120,10 +136,18 @@ Catalog.ItemSegments Use + + Catalog.VehicleTypes + Use + ChartOfCharacteristicTypes.CustomUserSettings Use + + Catalog.FixedAssets + Use + Catalog.IntegrationSettings DontUse @@ -172,10 +196,18 @@ Catalog.ReportOptions DontUse + + Catalog.PrintInfo + Use + Catalog.Currencies Use + + Catalog.EmployeeSchedule + Use + Catalog.AccountingOperations Use @@ -188,10 +220,18 @@ Catalog.BusinessUnits Use + + Catalog.Addresses + Use + Catalog.ExpenseAndRevenueTypes Use + + Catalog.EmployeePositions + Use + Catalog.ExternalDataProc Use @@ -200,6 +240,10 @@ Catalog.Partners Use + + Catalog.Incoterms + Use + Catalog.PrintTemplates Use @@ -216,6 +260,10 @@ Catalog.PartnerItems Use + + Catalog.Projects + Use + Catalog.IDInfoAddresses Use @@ -260,50 +308,6 @@ ChartOfCharacteristicTypes.IDInfoTypes Use - - Catalog.AccrualAndDeductionTypes - Use - - - Catalog.EmployeePositions - Use - - - Catalog.VehicleTypes - Use - - - Catalog.Addresses - Use - - - Catalog.FixedAssets - Use - - - Catalog.DepreciationSchedules - Use - - - Catalog.FixedAssetsLedgerTypes - Use - - - Catalog.EmployeeSchedule - Use - - - Catalog.Projects - Use - - - Catalog.PrintInfo - Use - - - Catalog.AgingPeriods - Use - DontUse DontUse DontUse diff --git a/IRP/src/CommonAttributes/Editor/Editor.mdo b/IRP/src/CommonAttributes/Editor/Editor.mdo index 7fa36981c1..17aa9f7a88 100644 --- a/IRP/src/CommonAttributes/Editor/Editor.mdo +++ b/IRP/src/CommonAttributes/Editor/Editor.mdo @@ -21,411 +21,411 @@ Use - Document.ManualRegisterEntry + Catalog.PaymentTerminals Use - Document.MoneyTransfer + Catalog.Agreements Use - Document.SalesOrder + Document.VisitorCounter Use - Document.PurchaseReturnOrder + Catalog.AgingPeriods Use - Document.ChequeBondTransaction + Document.ProductionCostsAllocation Use - Document.AdditionalCostAllocation + Document.ManualRegisterEntry Use - Document.SalesReturn + Catalog.FileStorageVolumes Use - Document.SalesReportFromTradeAgent + Catalog.Items Use - Document.ReconciliationStatement + Document.MoneyTransfer Use - Document.RetailReturnReceipt + Catalog.SpecialOfferTypes Use - Document.WorkOrder + Document.DepreciationCalculation Use - Document.CashExpense + Document.SalesOrder Use - Document.StockAdjustmentAsSurplus + Catalog.LegalNameContracts Use - Document.PhysicalInventory + Catalog.Units Use - Document.PhysicalCountByLocation + Catalog.PaymentSchedules Use - Document.InventoryTransfer + Catalog.FixedAssetsLedgerTypes Use - Document.PurchaseReturn + Document.PurchaseReturnOrder Use - Document.ConsolidatedRetailSales + Document.RetailGoodsReceipt Use - Document.SalesInvoice + Catalog.PartnerSegments Use - Document.CashRevenue + Document.ChequeBondTransaction Use - Document.ShipmentConfirmation + Catalog.Users Use - Document.ProductionPlanning + Catalog.AddAttributeAndPropertySets Use - Document.Production + Catalog.InterfaceGroups Use - Catalog.ReportOptions + Catalog.CurrencyMovementSets Use - Document.ItemStockAdjustment + Catalog.AdvancesKeys Use - Document.SalesReportToConsignor + Catalog.FileStoragesInfo Use - Document.AdditionalRevenueAllocation + Document.AdditionalCostAllocation Use - Document.Unbundling + Catalog.Countries Use - Document.WorkSheet + Document.SalesReturn Use - Document.OpeningEntry + Document.SalesReportFromTradeAgent Use - Document.ProductionPlanningClosing + Catalog.Batches Use - Document.Bundling + Catalog.CashAccounts Use - Document.PurchaseOrderClosing + Catalog.AddAttributeAndPropertyValues Use - Document.OutgoingPaymentOrder + Catalog.FillingTemplates Use - Document.SalesOrderClosing + Document.EmployeeSickLeave Use - Document.RetailSalesReceipt + Document.AdditionalDeduction Use - Document.StockAdjustmentAsWriteOff + Catalog.BankTerms Use - Document.PriceList + Catalog.SpecialOffers Use - Document.IncomingPaymentOrder + Catalog.Workstations Use - Document.CashReceipt + Document.ReconciliationStatement Use - Document.DebitNote + Catalog.TaxRates Use - Document.SalesReturnOrder + Document.RetailReturnReceipt Use - Document.JournalEntry + Document.WorkOrder Use - Document.PurchaseInvoice + Document.CashExpense Use - Document.InventoryTransferOrder + Catalog.IDInfoSets Use - Document.ProductionPlanningCorrection + Document.StockAdjustmentAsSurplus Use - Document.GoodsReceipt + Catalog.PlanningPeriods Use - Document.PurchaseOrder + Catalog.LedgerTypes Use - Document.PlannedReceiptReservation + Catalog.AccrualAndDeductionTypes Use - Document.CreditNote + Catalog.ItemKeys Use - Document.BankPayment + Catalog.CashStatementStatuses Use - Document.InternalSupplyRequest + Document.EmployeeTransfer Use - Document.CashPayment + Document.PhysicalInventory Use - Document.CashTransferOrder + Catalog.ItemSegments Use - Document.ChequeBondTransactionItem + Catalog.VehicleTypes Use - Document.BankReceipt + Document.PhysicalCountByLocation Use - Document.CashStatement + Catalog.FixedAssets Use - Document.EmployeeCashAdvance + Catalog.IntegrationSettings Use - Document.ProductionCostsAllocation + Document.CommissioningOfFixedAsset Use - Document.Payroll + Catalog.BillOfMaterials Use - Document.TimeSheet + Catalog.Taxes Use - Document.RetailShipmentConfirmation + Document.InventoryTransfer Use - Document.RetailGoodsReceipt + Catalog.SpecialOfferRules Use - Document.CommissioningOfFixedAsset + Document.PurchaseReturn Use - Document.CommissioningOfFixedAsset + Catalog.UnitsOfMeasurement Use - Document.DecommissioningOfFixedAsset + Document.TimeSheet Use - Document.FixedAssetTransfer + Document.ConsolidatedRetailSales Use - Document.DepreciationCalculation + Catalog.Files Use - Document.ModernizationOfFixedAsset + Document.SalesInvoice Use - Document.EmployeeHiring + Catalog.Stores Use - Document.EmployeeTransfer + Catalog.AccessProfiles Use - Document.EmployeeFiring + Document.CashRevenue Use - Document.EmployeeVacation + Catalog.AccessGroups Use - Document.EmployeeSickLeave + Document.AdditionalAccrual Use - Document.AdditionalDeduction + Document.ShipmentConfirmation Use - Document.AdditionalAccrual + Document.ProductionPlanning Use - Document.VisitorCounter + Document.EmployeeHiring Use - Document.RetailReceiptCorrection + Catalog.Hardware Use - Catalog.Agreements + Catalog.Specifications Use - Catalog.BankTerms + Catalog.BatchKeys Use - Catalog.BusinessUnits + Document.Production Use - Catalog.CashAccounts + Catalog.CancelReturnReasons Use - Catalog.Companies + Catalog.ReportOptions Use - Catalog.Countries + Catalog.DataMappingItems Use - Catalog.CurrencyMovementSets + Document.ItemStockAdjustment Use - Catalog.AccessGroups + Document.SalesReportToConsignor Use - Catalog.AccessProfiles + Document.RetailShipmentConfirmation Use - Catalog.AccountingOperations + Catalog.Currencies Use - Catalog.AccrualAndDeductionTypes + Document.AdditionalRevenueAllocation Use - Catalog.AddAttributeAndPropertyValues + Document.DecommissioningOfFixedAsset Use - Catalog.AddAttributeAndPropertySets + Catalog.EmployeeSchedule Use - Catalog.Addresses + Catalog.AccountingOperations Use - Catalog.AdvancesKeys + Document.Payroll Use - Catalog.BillOfMaterials + Catalog.LockDataModificationReasons Use - Catalog.CancelReturnReasons + Document.Unbundling Use - Catalog.CashStatementStatuses + Document.WorkSheet Use - Catalog.ChequeBonds + Catalog.BusinessUnits Use - Catalog.Batches + Document.OpeningEntry Use - Catalog.BatchKeys + Catalog.Addresses Use - Catalog.Currencies + Document.ProductionPlanningClosing Use - Catalog.DataMappingItems + Document.Bundling Use - Catalog.EmployeePositions + Document.PurchaseOrderClosing Use @@ -433,67 +433,67 @@ Use - Catalog.ExternalDataProc + Catalog.EmployeePositions Use - Catalog.ExternalFunctions + Catalog.ExternalDataProc Use - Catalog.Files + Document.ModernizationOfFixedAsset Use - Catalog.FileStoragesInfo + Document.OutgoingPaymentOrder Use - Catalog.FileStorageVolumes + Document.SalesOrderClosing Use - Catalog.FillingTemplates + Document.RetailSalesReceipt Use - Catalog.FixedAssets + Document.StockAdjustmentAsWriteOff Use - Catalog.FixedAssetsLedgerTypes + Document.DebitCreditNote Use - Catalog.Hardware + Catalog.Partners Use - Catalog.IDInfoAddresses + Catalog.Incoterms Use - Catalog.IDInfoSets + Document.EmployeeVacation Use - Catalog.IntegrationSettings + Catalog.ExternalFunctions Use - Catalog.InterfaceGroups + Document.PriceList Use - Catalog.ItemKeys + Document.IncomingPaymentOrder Use - Catalog.Items + Catalog.SourceOfOrigins Use - Catalog.ItemSegments + Catalog.ChequeBonds Use @@ -501,155 +501,155 @@ Use - Catalog.LedgerTypes + Document.CashReceipt Use - Catalog.LedgerTypeVariants + Document.DebitNote Use - Catalog.LegalNameContracts + Document.SalesReturnOrder Use - Catalog.LockDataModificationReasons + Document.EmployeeFiring Use - Catalog.MovementRules + Document.JournalEntry Use - Catalog.ObjectAccessKeys + Document.RetailReceiptCorrection Use - Catalog.ObjectStatuses + Catalog.LedgerTypeVariants Use - Catalog.PartnerItems + Document.EmployeeCashAdvance Use - Catalog.Partners + Document.PurchaseInvoice Use - Catalog.PartnersBankAccounts + Catalog.PartnerItems Use - Catalog.PartnerSegments + Catalog.Projects Use - Catalog.PaymentSchedules + Catalog.IDInfoAddresses Use - Catalog.PaymentTerminals + Document.InventoryTransferOrder Use - Catalog.PaymentTypes + Catalog.PriceTypes Use - Catalog.PlanningPeriods + Document.ProductionPlanningCorrection Use - Catalog.PriceTypes + Catalog.PartnersBankAccounts Use - Catalog.RetailCustomers + Document.GoodsReceipt Use - Catalog.SerialLotNumbers + Document.PurchaseOrder Use - Catalog.SourceOfOrigins + Document.PlannedReceiptReservation Use - Catalog.SpecialOfferRules + Catalog.RetailCustomers Use - Catalog.SpecialOffers + Catalog.PaymentTypes Use - Catalog.SpecialOfferTypes + Catalog.Vehicles Use - Catalog.Specifications + Catalog.ObjectAccessKeys Use - Catalog.Stores + Catalog.SerialLotNumbers Use - Catalog.TaxAnalytics + Catalog.UserGroups Use - Catalog.Taxes + Document.CreditNote Use - Catalog.TaxRates + Document.BankPayment Use - Catalog.Units + Document.InternalSupplyRequest Use - Catalog.UnitsOfMeasurement + Catalog.MovementRules Use - Catalog.UserGroups + Catalog.ObjectStatuses Use - Catalog.Users + Document.CashPayment Use - Catalog.Vehicles + Document.CashTransferOrder Use - Catalog.VehicleTypes + Document.ChequeBondTransactionItem Use - Catalog.Workstations + Document.BankReceipt Use - Catalog.EmployeeSchedule + Catalog.Companies Use - Catalog.Projects + Catalog.TaxAnalytics Use - Document.DebitCreditNote + Document.CashStatement Use - Catalog.AgingPeriods + Document.FixedAssetTransfer Use DontUse diff --git a/IRP/src/CommonAttributes/ModifyDate/ModifyDate.mdo b/IRP/src/CommonAttributes/ModifyDate/ModifyDate.mdo index 264da98d58..cb7283b6f1 100644 --- a/IRP/src/CommonAttributes/ModifyDate/ModifyDate.mdo +++ b/IRP/src/CommonAttributes/ModifyDate/ModifyDate.mdo @@ -22,411 +22,411 @@ Use - Document.ManualRegisterEntry + Catalog.PaymentTerminals Use - Document.MoneyTransfer + Catalog.Agreements Use - Document.SalesOrder + Document.VisitorCounter Use - Document.PurchaseReturnOrder + Catalog.AgingPeriods Use - Document.ChequeBondTransaction + Document.ProductionCostsAllocation Use - Document.AdditionalCostAllocation + Document.ManualRegisterEntry Use - Document.SalesReturn + Catalog.FileStorageVolumes Use - Document.SalesReportFromTradeAgent + Catalog.Items Use - Document.ReconciliationStatement + Document.MoneyTransfer Use - Document.RetailReturnReceipt + Catalog.SpecialOfferTypes Use - Document.WorkOrder + Document.DepreciationCalculation Use - Document.CashExpense + Document.SalesOrder Use - Document.StockAdjustmentAsSurplus + Catalog.LegalNameContracts Use - Document.PhysicalInventory + Catalog.Units Use - Document.PhysicalCountByLocation + Catalog.PaymentSchedules Use - Document.InventoryTransfer + Catalog.FixedAssetsLedgerTypes Use - Document.PurchaseReturn + Document.PurchaseReturnOrder Use - Document.ConsolidatedRetailSales + Document.RetailGoodsReceipt Use - Document.SalesInvoice + Catalog.PartnerSegments Use - Document.CashRevenue + Document.ChequeBondTransaction Use - Document.ShipmentConfirmation + Catalog.Users Use - Document.ProductionPlanning + Catalog.AddAttributeAndPropertySets Use - Document.Production + Catalog.InterfaceGroups Use - Catalog.ReportOptions + Catalog.CurrencyMovementSets Use - Document.ItemStockAdjustment + Catalog.AdvancesKeys Use - Document.SalesReportToConsignor + Catalog.FileStoragesInfo Use - Document.AdditionalRevenueAllocation + Document.AdditionalCostAllocation Use - Document.Unbundling + Catalog.Countries Use - Document.WorkSheet + Document.SalesReturn Use - Document.OpeningEntry + Document.SalesReportFromTradeAgent Use - Document.ProductionPlanningClosing + Catalog.Batches Use - Document.Bundling + Catalog.CashAccounts Use - Document.PurchaseOrderClosing + Catalog.AddAttributeAndPropertyValues Use - Document.OutgoingPaymentOrder + Catalog.FillingTemplates Use - Document.SalesOrderClosing + Document.EmployeeSickLeave Use - Document.RetailSalesReceipt + Document.AdditionalDeduction Use - Document.StockAdjustmentAsWriteOff + Catalog.BankTerms Use - Document.PriceList + Catalog.SpecialOffers Use - Document.IncomingPaymentOrder + Catalog.Workstations Use - Document.CashReceipt + Document.ReconciliationStatement Use - Document.DebitNote + Catalog.TaxRates Use - Document.SalesReturnOrder + Document.RetailReturnReceipt Use - Document.JournalEntry + Document.WorkOrder Use - Document.PurchaseInvoice + Document.CashExpense Use - Document.InventoryTransferOrder + Catalog.IDInfoSets Use - Document.ProductionPlanningCorrection + Document.StockAdjustmentAsSurplus Use - Document.GoodsReceipt + Catalog.PlanningPeriods Use - Document.PurchaseOrder + Catalog.LedgerTypes Use - Document.PlannedReceiptReservation + Catalog.AccrualAndDeductionTypes Use - Document.CreditNote + Catalog.ItemKeys Use - Document.BankPayment + Catalog.CashStatementStatuses Use - Document.InternalSupplyRequest + Document.EmployeeTransfer Use - Document.CashPayment + Document.PhysicalInventory Use - Document.CashTransferOrder + Catalog.ItemSegments Use - Document.ChequeBondTransactionItem + Catalog.VehicleTypes Use - Document.BankReceipt + Document.PhysicalCountByLocation Use - Document.CashStatement + Catalog.FixedAssets Use - Document.EmployeeCashAdvance + Catalog.IntegrationSettings Use - Document.ProductionCostsAllocation + Document.CommissioningOfFixedAsset Use - Document.Payroll + Catalog.BillOfMaterials Use - Document.TimeSheet + Catalog.Taxes Use - Document.RetailShipmentConfirmation + Document.InventoryTransfer Use - Document.RetailGoodsReceipt + Catalog.SpecialOfferRules Use - Document.CommissioningOfFixedAsset + Document.PurchaseReturn Use - Document.CommissioningOfFixedAsset + Catalog.UnitsOfMeasurement Use - Document.DecommissioningOfFixedAsset + Document.TimeSheet Use - Document.FixedAssetTransfer + Document.ConsolidatedRetailSales Use - Document.DepreciationCalculation + Catalog.Files Use - Document.ModernizationOfFixedAsset + Document.SalesInvoice Use - Document.EmployeeHiring + Catalog.Stores Use - Document.EmployeeTransfer + Catalog.AccessProfiles Use - Document.EmployeeFiring + Document.CashRevenue Use - Document.EmployeeVacation + Catalog.AccessGroups Use - Document.EmployeeSickLeave + Document.AdditionalAccrual Use - Document.AdditionalDeduction + Document.ShipmentConfirmation Use - Document.AdditionalAccrual + Document.ProductionPlanning Use - Document.VisitorCounter + Document.EmployeeHiring Use - Document.RetailReceiptCorrection + Catalog.Hardware Use - Catalog.Agreements + Catalog.Specifications Use - Catalog.BankTerms + Catalog.BatchKeys Use - Catalog.BusinessUnits + Document.Production Use - Catalog.CashAccounts + Catalog.CancelReturnReasons Use - Catalog.Companies + Catalog.ReportOptions Use - Catalog.Countries + Catalog.DataMappingItems Use - Catalog.CurrencyMovementSets + Document.ItemStockAdjustment Use - Catalog.AccessGroups + Document.SalesReportToConsignor Use - Catalog.AccessProfiles + Document.RetailShipmentConfirmation Use - Catalog.AccountingOperations + Catalog.Currencies Use - Catalog.AccrualAndDeductionTypes + Document.AdditionalRevenueAllocation Use - Catalog.AddAttributeAndPropertyValues + Document.DecommissioningOfFixedAsset Use - Catalog.AddAttributeAndPropertySets + Catalog.EmployeeSchedule Use - Catalog.Addresses + Catalog.AccountingOperations Use - Catalog.AdvancesKeys + Document.Payroll Use - Catalog.BillOfMaterials + Catalog.LockDataModificationReasons Use - Catalog.CancelReturnReasons + Document.Unbundling Use - Catalog.CashStatementStatuses + Document.WorkSheet Use - Catalog.ChequeBonds + Catalog.BusinessUnits Use - Catalog.Batches + Document.OpeningEntry Use - Catalog.BatchKeys + Catalog.Addresses Use - Catalog.Currencies + Document.ProductionPlanningClosing Use - Catalog.DataMappingItems + Document.Bundling Use - Catalog.EmployeePositions + Document.PurchaseOrderClosing Use @@ -434,67 +434,67 @@ Use - Catalog.ExternalDataProc + Catalog.EmployeePositions Use - Catalog.ExternalFunctions + Catalog.ExternalDataProc Use - Catalog.Files + Document.ModernizationOfFixedAsset Use - Catalog.FileStoragesInfo + Document.OutgoingPaymentOrder Use - Catalog.FileStorageVolumes + Document.SalesOrderClosing Use - Catalog.FillingTemplates + Document.RetailSalesReceipt Use - Catalog.FixedAssets + Document.StockAdjustmentAsWriteOff Use - Catalog.FixedAssetsLedgerTypes + Document.DebitCreditNote Use - Catalog.Hardware + Catalog.Partners Use - Catalog.IDInfoAddresses + Catalog.Incoterms Use - Catalog.IDInfoSets + Document.EmployeeVacation Use - Catalog.IntegrationSettings + Catalog.ExternalFunctions Use - Catalog.InterfaceGroups + Document.PriceList Use - Catalog.ItemKeys + Document.IncomingPaymentOrder Use - Catalog.Items + Catalog.SourceOfOrigins Use - Catalog.ItemSegments + Catalog.ChequeBonds Use @@ -502,155 +502,155 @@ Use - Catalog.LedgerTypes + Document.CashReceipt Use - Catalog.LedgerTypeVariants + Document.DebitNote Use - Catalog.LegalNameContracts + Document.SalesReturnOrder Use - Catalog.LockDataModificationReasons + Document.EmployeeFiring Use - Catalog.MovementRules + Document.JournalEntry Use - Catalog.ObjectAccessKeys + Document.RetailReceiptCorrection Use - Catalog.ObjectStatuses + Catalog.LedgerTypeVariants Use - Catalog.PartnerItems + Document.EmployeeCashAdvance Use - Catalog.Partners + Document.PurchaseInvoice Use - Catalog.PartnersBankAccounts + Catalog.PartnerItems Use - Catalog.PartnerSegments + Catalog.Projects Use - Catalog.PaymentSchedules + Catalog.IDInfoAddresses Use - Catalog.PaymentTerminals + Document.InventoryTransferOrder Use - Catalog.PaymentTypes + Catalog.PriceTypes Use - Catalog.PlanningPeriods + Document.ProductionPlanningCorrection Use - Catalog.PriceTypes + Catalog.PartnersBankAccounts Use - Catalog.RetailCustomers + Document.GoodsReceipt Use - Catalog.SerialLotNumbers + Document.PurchaseOrder Use - Catalog.SourceOfOrigins + Document.PlannedReceiptReservation Use - Catalog.SpecialOfferRules + Catalog.RetailCustomers Use - Catalog.SpecialOffers + Catalog.PaymentTypes Use - Catalog.SpecialOfferTypes + Catalog.Vehicles Use - Catalog.Specifications + Catalog.ObjectAccessKeys Use - Catalog.Stores + Catalog.SerialLotNumbers Use - Catalog.TaxAnalytics + Catalog.UserGroups Use - Catalog.Taxes + Document.CreditNote Use - Catalog.TaxRates + Document.BankPayment Use - Catalog.Units + Document.InternalSupplyRequest Use - Catalog.UnitsOfMeasurement + Catalog.MovementRules Use - Catalog.UserGroups + Catalog.ObjectStatuses Use - Catalog.Users + Document.CashPayment Use - Catalog.Vehicles + Document.CashTransferOrder Use - Catalog.VehicleTypes + Document.ChequeBondTransactionItem Use - Catalog.Workstations + Document.BankReceipt Use - Catalog.EmployeeSchedule + Catalog.Companies Use - Catalog.Projects + Catalog.TaxAnalytics Use - Document.DebitCreditNote + Document.CashStatement Use - Catalog.AgingPeriods + Document.FixedAssetTransfer Use DontUse diff --git a/IRP/src/CommonAttributes/NotActive/NotActive.mdo b/IRP/src/CommonAttributes/NotActive/NotActive.mdo index 2fee8130ff..7f0c2fb74e 100644 --- a/IRP/src/CommonAttributes/NotActive/NotActive.mdo +++ b/IRP/src/CommonAttributes/NotActive/NotActive.mdo @@ -21,7 +21,7 @@ Use - Catalog.ReportOptions + Catalog.PaymentTerminals Use @@ -29,55 +29,55 @@ Use - Catalog.BankTerms + Catalog.AgingPeriods Use - Catalog.BusinessUnits + Catalog.FileStorageVolumes Use - Catalog.CashAccounts + Catalog.Items Use - Catalog.Companies + Catalog.SpecialOfferTypes Use - Catalog.Countries + Catalog.LegalNameContracts Use - Catalog.CurrencyMovementSets + Catalog.Units Use - Catalog.AccessGroups + Catalog.PaymentSchedules Use - Catalog.AccessProfiles + Catalog.FixedAssetsLedgerTypes Use - Catalog.AccountingOperations + Catalog.PartnerSegments Use - Catalog.AccrualAndDeductionTypes + Catalog.Users Use - Catalog.AddAttributeAndPropertyValues + Catalog.AddAttributeAndPropertySets Use - Catalog.AddAttributeAndPropertySets + Catalog.InterfaceGroups Use - Catalog.Addresses + Catalog.CurrencyMovementSets Use @@ -85,183 +85,187 @@ Use - Catalog.BillOfMaterials + Catalog.FileStoragesInfo Use - Catalog.CancelReturnReasons + Catalog.Countries Use - Catalog.CashStatementStatuses + Catalog.Batches Use - Catalog.ChequeBonds + Catalog.CashAccounts Use - Catalog.Batches + Catalog.AddAttributeAndPropertyValues Use - Catalog.BatchKeys + Catalog.FillingTemplates Use - Catalog.Currencies + Catalog.BankTerms Use - Catalog.DataMappingItems + Catalog.SpecialOffers Use - Catalog.EmployeePositions + Catalog.Workstations Use - Catalog.ExpenseAndRevenueTypes + Catalog.TaxRates Use - Catalog.ExternalDataProc + Catalog.IDInfoSets Use - Catalog.ExternalFunctions + Catalog.PlanningPeriods Use - Catalog.Files + Catalog.LedgerTypes Use - Catalog.FileStoragesInfo + Catalog.AccrualAndDeductionTypes Use - Catalog.FileStorageVolumes + Catalog.ItemKeys Use - Catalog.FillingTemplates + Catalog.CashStatementStatuses Use - Catalog.FixedAssets + Catalog.ItemSegments Use - Catalog.FixedAssetsLedgerTypes + Catalog.VehicleTypes Use - Catalog.Hardware + Catalog.FixedAssets Use - Catalog.IDInfoAddresses + Catalog.IntegrationSettings Use - Catalog.IDInfoSets + Catalog.BillOfMaterials Use - Catalog.IntegrationSettings + Catalog.Taxes Use - Catalog.InterfaceGroups + Catalog.SpecialOfferRules Use - Catalog.ItemKeys + Catalog.UnitsOfMeasurement Use - Catalog.Items + Catalog.Files Use - Catalog.ItemSegments + Catalog.Stores Use - Catalog.ItemTypes + Catalog.AccessProfiles Use - Catalog.LedgerTypes + Catalog.AccessGroups Use - Catalog.LedgerTypeVariants + Catalog.Hardware Use - Catalog.LegalNameContracts + Catalog.Specifications Use - Catalog.LockDataModificationReasons + Catalog.BatchKeys Use - Catalog.MovementRules + Catalog.CancelReturnReasons Use - Catalog.ObjectAccessKeys + Catalog.ReportOptions Use - Catalog.ObjectStatuses + Catalog.DataMappingItems Use - Catalog.PartnerItems + Catalog.Currencies Use - Catalog.Partners + Catalog.EmployeeSchedule Use - Catalog.PartnersBankAccounts + Catalog.AccountingOperations Use - Catalog.PartnerSegments + Catalog.LockDataModificationReasons Use - Catalog.PaymentSchedules + Catalog.BusinessUnits Use - Catalog.PaymentTerminals + Catalog.Addresses Use - Catalog.PaymentTypes + Catalog.ExpenseAndRevenueTypes Use - Catalog.PlanningPeriods + Catalog.EmployeePositions Use - Catalog.PriceTypes + Catalog.ExternalDataProc Use - Catalog.RetailCustomers + Catalog.Partners Use - Catalog.SerialLotNumbers + Catalog.Incoterms + Use + + + Catalog.ExternalFunctions Use @@ -269,71 +273,75 @@ Use - Catalog.SpecialOfferRules + Catalog.ChequeBonds Use - Catalog.SpecialOffers + Catalog.ItemTypes Use - Catalog.SpecialOfferTypes + Catalog.LedgerTypeVariants Use - Catalog.Specifications + Catalog.PartnerItems Use - Catalog.Stores + Catalog.Projects Use - Catalog.TaxAnalytics + Catalog.IDInfoAddresses Use - Catalog.Taxes + Catalog.PriceTypes Use - Catalog.TaxRates + Catalog.PartnersBankAccounts Use - Catalog.Units + Catalog.RetailCustomers Use - Catalog.UnitsOfMeasurement + Catalog.PaymentTypes Use - Catalog.UserGroups + Catalog.Vehicles Use - Catalog.Users + Catalog.ObjectAccessKeys Use - Catalog.Vehicles + Catalog.SerialLotNumbers Use - Catalog.VehicleTypes + Catalog.UserGroups Use - Catalog.Workstations + Catalog.MovementRules Use - Catalog.EmployeeSchedule + Catalog.ObjectStatuses Use - Catalog.Projects + Catalog.Companies + Use + + + Catalog.TaxAnalytics Use DontUse diff --git a/IRP/src/CommonModules/CatalogsServer/Module.bsl b/IRP/src/CommonModules/CatalogsServer/Module.bsl index 3fe4b77146..2679dd5b31 100644 --- a/IRP/src/CommonModules/CatalogsServer/Module.bsl +++ b/IRP/src/CommonModules/CatalogsServer/Module.bsl @@ -111,7 +111,8 @@ EndProcedure // Boolean - This is editing exception Function ThisIsEditingException(CatalogName) - If CatalogName = "Catalog.Currencies" + If CatalogName = "Catalog.Currencies" + OR CatalogName = "Catalog.Incoterms" OR CatalogName = "Catalog.RetailCustomers" Then Return True; EndIf; diff --git a/IRP/src/CommonModules/Localization/Module.bsl b/IRP/src/CommonModules/Localization/Module.bsl index 98e4d4a509..c3829d8259 100644 --- a/IRP/src/CommonModules/Localization/Module.bsl +++ b/IRP/src/CommonModules/Localization/Module.bsl @@ -376,6 +376,7 @@ // * Exc_009 - String - // * Exc_010 - String - // * Exc_011 - String - +// * Exc_012 - String - // * Saas_001 - String - // * Saas_002 - String - // * Saas_003 - String - @@ -2085,6 +2086,9 @@ Function Strings(Lang) Export Strings.Insert("Exc_011", NStr("en='Unknown command name: %1'; |ru='Неизвестное имя команды: %1'; |tr='Bilinmeyen komut adı: %1'", Lang)); + Strings.Insert("Exc_012", NStr("en='Save error! Changing ""%1"" is available only for user ""%2""'; + |ru='Ошибка сохранения! Изменение ""%1"" доступно только для пользователя ""%2""'; + |tr='Kayıt hatası! ""%1"" değişikliği yalnızca ""%2"" kullanıcısı için mümkündür'", Lang)); #EndRegion #Region Saas diff --git a/IRP/src/Configuration/Configuration.mdo b/IRP/src/Configuration/Configuration.mdo index 59e678295c..36872302ec 100644 --- a/IRP/src/Configuration/Configuration.mdo +++ b/IRP/src/Configuration/Configuration.mdo @@ -1174,6 +1174,7 @@ Catalog.VehicleTypes Catalog.Workstations Catalog.AgingPeriods + Catalog.Incoterms Document.AdditionalAccrual Document.AdditionalCostAllocation Document.AdditionalDeduction diff --git a/IRP/src/DefinedTypes/typeAddPropertyOwners/typeAddPropertyOwners.mdo b/IRP/src/DefinedTypes/typeAddPropertyOwners/typeAddPropertyOwners.mdo index fb00f35b85..b447e6e4e7 100644 --- a/IRP/src/DefinedTypes/typeAddPropertyOwners/typeAddPropertyOwners.mdo +++ b/IRP/src/DefinedTypes/typeAddPropertyOwners/typeAddPropertyOwners.mdo @@ -163,5 +163,6 @@ CatalogRef.Projects DocumentRef.DebitCreditNote CatalogRef.AgingPeriods + CatalogRef.Incoterms \ No newline at end of file diff --git a/IRP/src/Documents/BankPayment/BankPayment.mdo b/IRP/src/Documents/BankPayment/BankPayment.mdo index c412fd3a2d..0454470948 100644 --- a/IRP/src/Documents/BankPayment/BankPayment.mdo +++ b/IRP/src/Documents/BankPayment/BankPayment.mdo @@ -780,7 +780,7 @@ - Filter.Company + Filter.LegalName Document.BankPayment.TabularSection.PaymentList.Attribute.Payee Use diff --git a/IRP/src/Documents/BankReceipt/BankReceipt.mdo b/IRP/src/Documents/BankReceipt/BankReceipt.mdo index 805e2af47f..0eb871835c 100644 --- a/IRP/src/Documents/BankReceipt/BankReceipt.mdo +++ b/IRP/src/Documents/BankReceipt/BankReceipt.mdo @@ -834,7 +834,7 @@ - Filter.Company + Filter.LegalName Document.BankReceipt.TabularSection.PaymentList.Attribute.Payer Use diff --git a/IRP/src/Documents/CashPayment/CashPayment.mdo b/IRP/src/Documents/CashPayment/CashPayment.mdo index a8259863af..ed8a53e04e 100644 --- a/IRP/src/Documents/CashPayment/CashPayment.mdo +++ b/IRP/src/Documents/CashPayment/CashPayment.mdo @@ -599,7 +599,7 @@ - Filter.Company + Filter.LegalName Document.CashPayment.TabularSection.PaymentList.Attribute.Payee Use diff --git a/IRP/src/Documents/CashReceipt/CashReceipt.mdo b/IRP/src/Documents/CashReceipt/CashReceipt.mdo index 46c9b446e8..abeb969122 100644 --- a/IRP/src/Documents/CashReceipt/CashReceipt.mdo +++ b/IRP/src/Documents/CashReceipt/CashReceipt.mdo @@ -667,7 +667,7 @@ - Filter.Company + Filter.LegalName Document.CashReceipt.TabularSection.PaymentList.Attribute.Payer Use diff --git a/IRP/src/Documents/ChequeBondTransaction/ChequeBondTransaction.mdo b/IRP/src/Documents/ChequeBondTransaction/ChequeBondTransaction.mdo index 7032b09af7..c5f2db136b 100644 --- a/IRP/src/Documents/ChequeBondTransaction/ChequeBondTransaction.mdo +++ b/IRP/src/Documents/ChequeBondTransaction/ChequeBondTransaction.mdo @@ -373,7 +373,7 @@ - Filter.Company + Filter.LegalName Document.ChequeBondTransaction.TabularSection.ChequeBonds.Attribute.LegalName Use diff --git a/IRP/src/Documents/ChequeBondTransactionItem/ChequeBondTransactionItem.mdo b/IRP/src/Documents/ChequeBondTransactionItem/ChequeBondTransactionItem.mdo index ce00c6cdd6..0e0621b005 100644 --- a/IRP/src/Documents/ChequeBondTransactionItem/ChequeBondTransactionItem.mdo +++ b/IRP/src/Documents/ChequeBondTransactionItem/ChequeBondTransactionItem.mdo @@ -262,6 +262,10 @@ + + Filter.LegalName + Document.ChequeBondTransactionItem.Attribute.LegalName + Use Use diff --git a/IRP/src/Documents/CreditNote/CreditNote.mdo b/IRP/src/Documents/CreditNote/CreditNote.mdo index 8954df9614..80716c5080 100644 --- a/IRP/src/Documents/CreditNote/CreditNote.mdo +++ b/IRP/src/Documents/CreditNote/CreditNote.mdo @@ -410,7 +410,7 @@ - Filter.Company + Filter.LegalName Document.CreditNote.TabularSection.Transactions.Attribute.LegalName Use diff --git a/IRP/src/Documents/DebitCreditNote/DebitCreditNote.mdo b/IRP/src/Documents/DebitCreditNote/DebitCreditNote.mdo index 31cf5381e4..aaa3db178c 100644 --- a/IRP/src/Documents/DebitCreditNote/DebitCreditNote.mdo +++ b/IRP/src/Documents/DebitCreditNote/DebitCreditNote.mdo @@ -219,6 +219,10 @@ + + Filter.LegalName + Document.DebitCreditNote.Attribute.SendLegalName + Use Use @@ -404,6 +408,10 @@ + + Filter.LegalName + Document.DebitCreditNote.Attribute.ReceiveLegalName + Use Use diff --git a/IRP/src/Documents/DebitNote/DebitNote.mdo b/IRP/src/Documents/DebitNote/DebitNote.mdo index 523351077d..84f7e44959 100644 --- a/IRP/src/Documents/DebitNote/DebitNote.mdo +++ b/IRP/src/Documents/DebitNote/DebitNote.mdo @@ -410,7 +410,7 @@ - Filter.Company + Filter.LegalName Document.DebitNote.TabularSection.Transactions.Attribute.LegalName Use diff --git a/IRP/src/Documents/OpeningEntry/OpeningEntry.mdo b/IRP/src/Documents/OpeningEntry/OpeningEntry.mdo index 0981c49a23..58aa1b0319 100644 --- a/IRP/src/Documents/OpeningEntry/OpeningEntry.mdo +++ b/IRP/src/Documents/OpeningEntry/OpeningEntry.mdo @@ -610,8 +610,8 @@ - Filter.Company - Document.OpeningEntry.Attribute.Company + Filter.LegalName + Document.OpeningEntry.TabularSection.AdvanceFromCustomers.Attribute.LegalName Use Use @@ -813,8 +813,8 @@ - Filter.Company - Document.OpeningEntry.Attribute.Company + Filter.LegalName + Document.OpeningEntry.TabularSection.AdvanceToSuppliers.Attribute.LegalName Use Use @@ -1039,8 +1039,8 @@ - Filter.Company - Document.OpeningEntry.Attribute.Company + Filter.LegalName + Document.OpeningEntry.TabularSection.AccountPayableByAgreements.Attribute.LegalName Use Use @@ -1243,8 +1243,8 @@ - Filter.Company - Document.OpeningEntry.Attribute.Company + Filter.LegalName + Document.OpeningEntry.TabularSection.AccountPayableByDocuments.Attribute.LegalName Use Use @@ -1447,8 +1447,8 @@ - Filter.Company - Document.OpeningEntry.Attribute.Company + Filter.LegalName + Document.OpeningEntry.TabularSection.AccountReceivableByDocuments.Attribute.LegalName Use Use @@ -1651,8 +1651,8 @@ - Filter.Company - Document.OpeningEntry.Attribute.Company + Filter.LegalName + Document.OpeningEntry.TabularSection.AccountReceivableByAgreements.Attribute.LegalName Use Use @@ -3570,8 +3570,8 @@ - Filter.Company - Document.OpeningEntry.Attribute.Company + Filter.LegalName + Document.OpeningEntry.TabularSection.AccountReceivableOther.Attribute.LegalName Use Use @@ -3752,8 +3752,8 @@ - Filter.Company - Document.OpeningEntry.Attribute.Company + Filter.LegalName + Document.OpeningEntry.TabularSection.AccountPayableOther.Attribute.LegalName Use Use diff --git a/IRP/src/Documents/PurchaseInvoice/PurchaseInvoice.mdo b/IRP/src/Documents/PurchaseInvoice/PurchaseInvoice.mdo index edcb6ad9ac..8771337a55 100644 --- a/IRP/src/Documents/PurchaseInvoice/PurchaseInvoice.mdo +++ b/IRP/src/Documents/PurchaseInvoice/PurchaseInvoice.mdo @@ -349,7 +349,7 @@ - Filter.Company + Filter.LegalName Document.PurchaseInvoice.Attribute.LegalName diff --git a/IRP/src/Documents/PurchaseReturn/PurchaseReturn.mdo b/IRP/src/Documents/PurchaseReturn/PurchaseReturn.mdo index c924fc8a94..cf9e8b95f6 100644 --- a/IRP/src/Documents/PurchaseReturn/PurchaseReturn.mdo +++ b/IRP/src/Documents/PurchaseReturn/PurchaseReturn.mdo @@ -392,7 +392,7 @@ - Filter.Company + Filter.LegalName Document.PurchaseReturn.Attribute.LegalName diff --git a/IRP/src/Documents/RetailReceiptCorrection/RetailReceiptCorrection.mdo b/IRP/src/Documents/RetailReceiptCorrection/RetailReceiptCorrection.mdo index f3c7e2a8c0..485e2c86d8 100644 --- a/IRP/src/Documents/RetailReceiptCorrection/RetailReceiptCorrection.mdo +++ b/IRP/src/Documents/RetailReceiptCorrection/RetailReceiptCorrection.mdo @@ -405,7 +405,7 @@ - Filter.Company + Filter.LegalName Document.RetailReceiptCorrection.Attribute.LegalName @@ -2118,6 +2118,10 @@ + + Filter.LegalName + Document.RetailReceiptCorrection.TabularSection.Payments.Attribute.PaymentAgentLegalName + Use Use diff --git a/IRP/src/Documents/RetailReturnReceipt/RetailReturnReceipt.mdo b/IRP/src/Documents/RetailReturnReceipt/RetailReturnReceipt.mdo index 1beaaa4c09..01d3dd11f0 100644 --- a/IRP/src/Documents/RetailReturnReceipt/RetailReturnReceipt.mdo +++ b/IRP/src/Documents/RetailReturnReceipt/RetailReturnReceipt.mdo @@ -408,7 +408,7 @@ - Filter.Company + Filter.LegalName Document.RetailReturnReceipt.Attribute.LegalName @@ -2335,6 +2335,10 @@ + + Filter.LegalName + Document.RetailReturnReceipt.TabularSection.Payments.Attribute.PaymentAgentLegalName + Use Use diff --git a/IRP/src/Documents/RetailSalesReceipt/RetailSalesReceipt.mdo b/IRP/src/Documents/RetailSalesReceipt/RetailSalesReceipt.mdo index 3debc1fa6e..38043a316a 100644 --- a/IRP/src/Documents/RetailSalesReceipt/RetailSalesReceipt.mdo +++ b/IRP/src/Documents/RetailSalesReceipt/RetailSalesReceipt.mdo @@ -447,7 +447,7 @@ - Filter.Company + Filter.LegalName Document.RetailSalesReceipt.Attribute.LegalName @@ -2243,6 +2243,10 @@ + + Filter.LegalName + Document.RetailSalesReceipt.TabularSection.Payments.Attribute.PaymentAgentLegalName + Use Use diff --git a/IRP/src/Documents/SalesInvoice/SalesInvoice.mdo b/IRP/src/Documents/SalesInvoice/SalesInvoice.mdo index 1d412ec376..7e81d4d880 100644 --- a/IRP/src/Documents/SalesInvoice/SalesInvoice.mdo +++ b/IRP/src/Documents/SalesInvoice/SalesInvoice.mdo @@ -404,7 +404,7 @@ - Filter.Company + Filter.LegalName Document.SalesInvoice.Attribute.LegalName diff --git a/IRP/src/Documents/SalesReportFromTradeAgent/SalesReportFromTradeAgent.mdo b/IRP/src/Documents/SalesReportFromTradeAgent/SalesReportFromTradeAgent.mdo index 3de1d0de75..383375e4b6 100644 --- a/IRP/src/Documents/SalesReportFromTradeAgent/SalesReportFromTradeAgent.mdo +++ b/IRP/src/Documents/SalesReportFromTradeAgent/SalesReportFromTradeAgent.mdo @@ -272,7 +272,7 @@ - Filter.Company + Filter.LegalName Document.SalesReportFromTradeAgent.Attribute.LegalName diff --git a/IRP/src/Documents/SalesReportToConsignor/SalesReportToConsignor.mdo b/IRP/src/Documents/SalesReportToConsignor/SalesReportToConsignor.mdo index 8e34ea1efa..8e37237748 100644 --- a/IRP/src/Documents/SalesReportToConsignor/SalesReportToConsignor.mdo +++ b/IRP/src/Documents/SalesReportToConsignor/SalesReportToConsignor.mdo @@ -264,7 +264,7 @@ - Filter.Company + Filter.LegalName Document.SalesReportToConsignor.Attribute.LegalName diff --git a/IRP/src/Documents/SalesReturn/SalesReturn.mdo b/IRP/src/Documents/SalesReturn/SalesReturn.mdo index 9c102d721a..4257cc20c0 100644 --- a/IRP/src/Documents/SalesReturn/SalesReturn.mdo +++ b/IRP/src/Documents/SalesReturn/SalesReturn.mdo @@ -393,7 +393,7 @@ - Filter.Company + Filter.LegalName Document.SalesReturn.Attribute.LegalName diff --git a/IRP/src/Roles/FullAccess/Rights.rights b/IRP/src/Roles/FullAccess/Rights.rights index feb0f1853f..42bbfa1446 100644 --- a/IRP/src/Roles/FullAccess/Rights.rights +++ b/IRP/src/Roles/FullAccess/Rights.rights @@ -2843,4 +2843,27 @@ false + + Catalog.Incoterms + + InteractiveDelete + false + + + InteractiveDeletePredefinedData + false + + + InteractiveSetDeletionMarkPredefinedData + false + + + InteractiveClearDeletionMarkPredefinedData + false + + + InteractiveDeleteMarkedPredefinedData + false + + diff --git a/IRP/src/Roles/FullAccessOnlyRead/Rights.rights b/IRP/src/Roles/FullAccessOnlyRead/Rights.rights index 33753ce371..3c7e60070c 100644 --- a/IRP/src/Roles/FullAccessOnlyRead/Rights.rights +++ b/IRP/src/Roles/FullAccessOnlyRead/Rights.rights @@ -16863,4 +16863,31 @@ true + + Catalog.Incoterms + + Read + true + + + View + true + + + InputByString + true + + + ReadDataHistory + true + + + ViewDataHistory + true + + + ReadDataHistoryOfMissingData + true + + diff --git a/IRP/src/Roles/TemplateCatalogs/Rights.rights b/IRP/src/Roles/TemplateCatalogs/Rights.rights index 931c122125..25f2107eaa 100644 --- a/IRP/src/Roles/TemplateCatalogs/Rights.rights +++ b/IRP/src/Roles/TemplateCatalogs/Rights.rights @@ -1516,6 +1516,112 @@ true + + Catalog.Incoterms + + Read + true + + + View + true + + + InputByString + true + + + + Catalog.Incoterms.TabularSection.AddAttributes.Attribute.Property + + Edit + false + + + + Catalog.Incoterms.StandardAttribute.Code + + Edit + false + + + + Catalog.Incoterms.StandardAttribute.IsFolder + + Edit + false + + + + Catalog.Incoterms.StandardAttribute.PredefinedDataName + + Edit + false + + + + Catalog.Incoterms.StandardAttribute.DeletionMark + + Edit + false + + + + Catalog.Incoterms.StandardAttribute.Owner + + Edit + false + + + + Catalog.Incoterms.TabularSection.AddAttributes.Attribute.SearchLiteral + + Edit + false + + + + Catalog.Incoterms.StandardAttribute.Ref + + Edit + false + + + + Catalog.Incoterms.TabularSection.AddAttributes + + Edit + false + + + + Catalog.Incoterms.StandardAttribute.Parent + + Edit + false + + + + Catalog.Incoterms.StandardAttribute.Predefined + + Edit + false + + + + Catalog.Incoterms.TabularSection.AddAttributes.Attribute.Value + + Edit + false + + + + Catalog.Incoterms.StandardAttribute.Description + + Edit + false + + Access(KeySynonym, AttributePath, AdditionalRule) // Table WHERE #Access("Company", "Company", "") diff --git a/IRP/src/SettingsStorages/ReportOptions/Forms/SaveForm/Module.bsl b/IRP/src/SettingsStorages/ReportOptions/Forms/SaveForm/Module.bsl index a8689a371d..27ce0cec2c 100644 --- a/IRP/src/SettingsStorages/ReportOptions/Forms/SaveForm/Module.bsl +++ b/IRP/src/SettingsStorages/ReportOptions/Forms/SaveForm/Module.bsl @@ -71,8 +71,11 @@ Procedure SaveSettingAtClient() QueryButtons = QuestionDialogMode.YesNo; ShowQueryBox(OptionDescription, QueryText, QueryButtons); Else - Notify = New NotifyDescription("SaveAsEnd", ThisObject); OptionDescription = ServiceSystemServer.GetObjectAttribute(CurrentData.ReportOption, "Description"); + AdditionalParameters = New Structure; + AdditionalParameters.Insert("Description", OptionDescription); + AdditionalParameters.Insert("Author", CurrentData.Author); + Notify = New NotifyDescription("SaveAsEnd", ThisObject, AdditionalParameters); ShowInputString(Notify, OptionDescription, R().SuggestionToUser_3, 150); EndIf; EndIf; @@ -83,6 +86,15 @@ Procedure SaveAsEnd(Result, AdditionalParameters) Export If Result = Undefined Then Return; EndIf; + + If TypeOf(AdditionalParameters) = Type("Structure") Then + If Result = AdditionalParameters.Description Then + WarningText = StrTemplate(R().Exc_012, AdditionalParameters.Description, AdditionalParameters.Author); + ShowMessageBox(, WarningText); + Return; + EndIf; + EndIf; + SaveChosenSetting(Result); EndProcedure diff --git a/IRP/src/Subsystems/MasterData/Subsystems/PurchaseAndSales/PurchaseAndSales.mdo b/IRP/src/Subsystems/MasterData/Subsystems/PurchaseAndSales/PurchaseAndSales.mdo index b8b86ca4de..13310aefdf 100644 --- a/IRP/src/Subsystems/MasterData/Subsystems/PurchaseAndSales/PurchaseAndSales.mdo +++ b/IRP/src/Subsystems/MasterData/Subsystems/PurchaseAndSales/PurchaseAndSales.mdo @@ -30,5 +30,6 @@ Catalog.PaymentSchedules Catalog.CancelReturnReasons Document.PriceList + Catalog.Incoterms Subsystem.MasterData \ No newline at end of file diff --git a/Unit/src/CommonModules/Unit_CatalogCodeAndDocumentNumber/Module.bsl b/Unit/src/CommonModules/Unit_CatalogCodeAndDocumentNumber/Module.bsl index 772a4559af..665227c499 100644 --- a/Unit/src/CommonModules/Unit_CatalogCodeAndDocumentNumber/Module.bsl +++ b/Unit/src/CommonModules/Unit_CatalogCodeAndDocumentNumber/Module.bsl @@ -82,6 +82,7 @@ Function GetExclude_Catalogs() ArrayOfExcluded.Add("Catalog.RetailCustomers"); ArrayOfExcluded.Add("Catalog.ExternalFunctions"); ArrayOfExcluded.Add("Catalog.ObjectAccessKeys"); + ArrayOfExcluded.Add("Catalog.Incoterms"); ArrayOfExcluded.Add("Catalog.TR_Cities"); ArrayOfExcluded.Add("Catalog.TR_CitySubdivisions"); ArrayOfExcluded.Add("Catalog.TR_ESF_Address"); diff --git a/features/External/ImportData.feature b/features/External/ImportData.feature index 733db5d59f..411a3751ce 100644 --- a/features/External/ImportData.feature +++ b/features/External/ImportData.feature @@ -2300,6 +2300,13 @@ Scenario: Create catalog BankTerms objects | 'e1cib/data/Catalog.BankTerms?ref=aa7d120ed92fbced11eb096728fa8ee7' | 'e1cib/data/Catalog.PaymentTypes?ref=aa78120ed92fbced11eaf12effe70fd1' | 'e1cib/data/Catalog.CashAccounts?ref=aa78120ed92fbced11eaf113ba6c186f' | 2 | +Scenario: Create catalog Incoterms objects + + And I check or create catalog "Incoterms" objects: + | 'Ref' | 'DeletionMark' | 'Description_en' | 'Description_hash' | 'Description_ru' | 'Description_tr' |'Code' | + | 'e1cib/data/Catalog.Incoterms?ref=aa7d120ed92fbced11eb096728fa8ee7' | 'False' | 'CIF' | '' | '' | '' |'CIF' | + + Scenario: Create catalog SpecialOfferRules objects (Test) And I check or create catalog "SpecialOfferRules" objects: @@ -2579,8 +2586,8 @@ Scenario: Create catalog PartnersBankAccounts objects And I check or create catalog "PartnersBankAccounts" objects: | 'Ref' | 'DeletionMark' | 'Code' | 'BankName' | 'Number' | 'Branch' | 'Currency' | 'Partner' | 'LegalEntity' | 'Description_en' | 'Description_hash' | 'Description_ru' | 'Description_tr' | - | 'e1cib/data/Catalog.PartnersBankAccounts?ref=b75dad46e66c4c2c11eb4522c1c161a1' | 'False' | '000000000002' | 'Bank name' | '0000000000000000' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1857' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'Partner bank account (Ferron)' | '' | 'Банковский счет партнера (Ferron)' | 'Partner bank account (Ferron) TR' | - | 'e1cib/data/Catalog.PartnersBankAccounts?ref=b75dad46e66c4c2c11eb451e00a38c06' | 'False' | '000000000001' | 'Bank name' | '56788888888888689' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1857' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf128cde918b9' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a3' | 'Partner bank account (Partner Kalipso)' | '' | 'Банковский счет партнера (Partner Kalipso)' | 'Partner bank account (Partner Kalipso) TR' | + | 'e1cib/data/Catalog.PartnersBankAccounts?ref=b75dad46e66c4c2c11eb4522c1c161a1' | 'False' | '000000000011' | 'Bank name' | '0000000000000000' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1857' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'Partner bank account (Ferron)' | '' | 'Банковский счет партнера (Ferron)' | 'Partner bank account (Ferron) TR' | + | 'e1cib/data/Catalog.PartnersBankAccounts?ref=b75dad46e66c4c2c11eb451e00a38c06' | 'False' | '000000000012' | 'Bank name' | '56788888888888689' | '' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1857' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf128cde918b9' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a3' | 'Partner bank account (Partner Kalipso)' | '' | 'Банковский счет партнера (Partner Kalipso)' | 'Partner bank account (Partner Kalipso) TR' | Scenario: Create Document discount @@ -2700,11 +2707,19 @@ Scenario: Create catalog Partners objects (Customer) Scenario: Create catalog LegalNameContracts objects And I check or create catalog "LegalNameContracts" objects: - | 'Ref' | 'DeletionMark' | 'Code' | 'Description' | 'BeginDate' | 'EndDate' | 'Company' | 'PartnerBankAccount' | - | 'e1cib/data/Catalog.LegalNameContracts?ref=b76d88abafbd4c5e11ebf1c565207b8a' | 'False' | '1' | 'Contract Ferron BP' | '01.01.2021 00:00:00' | '01.01.0001 00:00:00' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.PartnersBankAccounts?ref=b75dad46e66c4c2c11eb4522c1c161a1' | - | 'e1cib/data/Catalog.LegalNameContracts?ref=b76e892a86cabee011ec0b3161ae719f' | 'False' | '2' | 'DFC Legal name contract' | '01.01.0001 00:00:00' | '01.01.0001 00:00:00' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | '' | - | 'e1cib/data/Catalog.LegalNameContracts?ref=b76d88abafbd4c5e11ebf1c694dd9b44' | 'False' | '3' | 'Contract Ferron BP New' | '01.07.2021 00:00:00' | '01.01.0001 00:00:00' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.PartnersBankAccounts?ref=b75dad46e66c4c2c11eb4522c1c161a1' | - | 'e1cib/data/Catalog.LegalNameContracts?ref=b76d88abafbd4c5e11ebf1c989218108' | 'False' | '4' | 'Contract Kalipso' | '01.01.2021 00:00:00' | '01.01.0001 00:00:00' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a3' | 'e1cib/data/Catalog.PartnersBankAccounts?ref=b75dad46e66c4c2c11eb451e00a38c06' | + | 'Ref' | 'DeletionMark' | 'Code' | 'Description' | 'BeginDate' | 'EndDate' | 'Company' | 'PartnerBankAccount' | 'ContractNumber' | 'Currency' | 'LegalName' | 'Author' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | 'NotActive' | + | 'e1cib/data/Catalog.LegalNameContracts?ref=b76d88abafbd4c5e11ebf1c565207b8a' | 'False' | 1 | 'Contract Ferron BP' | '01.01.2021 00:00:00' | '31.12.2025 00:00:00' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.PartnersBankAccounts?ref=b7b7f539c58cb9f711eee2cb1a21e4be' | '1' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '15.03.2024 15:36:06' | '15.03.2024 15:39:59' | 'False' | + | 'e1cib/data/Catalog.LegalNameContracts?ref=b76e892a86cabee011ec0b3161ae719f' | 'False' | 2 | 'DFC Legal name contract' | '01.01.2022 00:00:00' | '01.01.0001 00:00:00' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | '' | '2' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf124a9ba086b' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '15.03.2024 15:37:03' | '15.03.2024 15:40:42' | 'False' | + | 'e1cib/data/Catalog.LegalNameContracts?ref=b76d88abafbd4c5e11ebf1c694dd9b44' | 'False' | 3 | 'Contract Ferron BP New' | '01.07.2021 00:00:00' | '01.01.0001 00:00:00' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf113ba6c185c' | 'e1cib/data/Catalog.PartnersBankAccounts?ref=b7b7f539c58cb9f711eee2cb1a21e4be' | '3' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '15.03.2024 15:37:03' | '15.03.2024 15:39:55' | 'False' | + | 'e1cib/data/Catalog.LegalNameContracts?ref=b76d88abafbd4c5e11ebf1c989218108' | 'False' | 4 | 'Contract Kalipso' | '01.01.2021 00:00:00' | '01.01.0001 00:00:00' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf128cde918b4' | 'e1cib/data/Catalog.PartnersBankAccounts?ref=b7b7f539c58cb9f711eee2cb1a21e4bb' | '4' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1855' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a3' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '15.03.2024 15:37:03' | '15.03.2024 15:40:22' | 'False' | + + // Catalog.PartnersBankAccounts + + And I check or create catalog "PartnersBankAccounts" objects: + | 'Ref' | 'DeletionMark' | 'Code' | 'BankName' | 'Number' | 'Branch' | 'Currency' | 'Partner' | 'LegalEntity' | 'Author' | 'Description_en' | 'Description_hash' | 'Description_ru' | 'Description_tr' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | 'NotActive' | + | 'e1cib/data/Catalog.PartnersBankAccounts?ref=b7b7f539c58cb9f711eee2cb1a21e4be' | 'False' | 2 | 'Bank name' | '56788888888888690' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1857' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1870' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a2' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Partner bank account Ferron' | '' | 'Банковский счет партнера' | 'Partner bank account TR' | '' | '' | '15.03.2024 15:38:54' | '01.01.0001 00:00:00' | 'False' | + | 'e1cib/data/Catalog.PartnersBankAccounts?ref=b7b7f539c58cb9f711eee2cb1a21e4bb' | 'False' | 1 | 'Bank name' | '56788888888888689' | 'e1cib/data/Catalog.BusinessUnits?ref=aa78120ed92fbced11eaf114c59ef023' | 'e1cib/data/Catalog.Currencies?ref=aa78120ed92fbced11eaf113ba6c1857' | 'e1cib/data/Catalog.Partners?ref=aa78120ed92fbced11eaf113ba6c1871' | 'e1cib/data/Catalog.Companies?ref=aa78120ed92fbced11eaf116b32709a3' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | 'Partner bank account' | '' | 'Банковский счет партнера' | 'Partner bank account TR' | '' | '' | '15.03.2024 15:13:20' | '01.01.0001 00:00:00' | 'False' | + Scenario: Create CustomUserSettings objects (CheckSerialLotNumber balance) diff --git a/features/External/TestDataBase.feature b/features/External/TestDataBase.feature index b9b2f48f8a..13d4e7e310 100644 --- a/features/External/TestDataBase.feature +++ b/features/External/TestDataBase.feature @@ -3274,9 +3274,10 @@ Scenario: Create catalog EmployeeSchedule objects (test data base) Scenario: Create catalog LegalNameContracts objects (test data base) And I check or create catalog "LegalNameContracts" objects: - | 'Ref' | 'DeletionMark' | 'Code' | 'Description' | 'BeginDate' | 'EndDate' | 'Company' | 'PartnerBankAccount' | 'Author' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | - | 'e1cib/data/Catalog.LegalNameContracts?ref=b7b5ac6d7ba6186311eec0f02fc4a1b5' | 'False' | 1 | 'VD-7889' | '01.01.2023 00:00:00' | '01.01.2027 00:00:00' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb766bf96b276f' | 'e1cib/data/Catalog.PartnersBankAccounts?ref=b762b13668d0905011eb766bf96b2770' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '01.02.2024 13:07:35' | '01.02.2024 13:08:45' | - | 'e1cib/data/Catalog.LegalNameContracts?ref=b7b5ac6d7ba6186311eec0f02fc4a1b6' | 'False' | 2 | 'CM-9008' | '01.01.2023 00:00:00' | '01.01.2027 00:00:00' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb7674324a4a2a' | 'e1cib/data/Catalog.PartnersBankAccounts?ref=b7b5ac6d7ba6186311eec0f02fc4a1b7' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '01.02.2024 13:08:38' | '01.02.2024 13:10:00' | + | 'Ref' | 'DeletionMark' | 'Code' | 'Description' | 'BeginDate' | 'EndDate' | 'Company' | 'PartnerBankAccount' | 'ContractNumber' | 'Currency' | 'LegalName' | 'Author' | 'SourceNodeID' | 'Editor' | 'CreateDate' | 'ModifyDate' | 'NotActive' | + | 'e1cib/data/Catalog.LegalNameContracts?ref=b7b5ac6d7ba6186311eec0f02fc4a1b5' | 'False' | 1 | 'VD-7889' | '01.01.2023 00:00:00' | '01.01.2027 00:00:00' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb7663e35d7964' | 'e1cib/data/Catalog.PartnersBankAccounts?ref=b762b13668d0905011eb766bf96b2770' | '7889' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb766bf96b276f' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '15.03.2024 13:29:00' | '15.03.2024 15:47:31' | 'False' | + | 'e1cib/data/Catalog.LegalNameContracts?ref=b7b5ac6d7ba6186311eec0f02fc4a1b6' | 'False' | 2 | 'CM-9008' | '01.01.2023 00:00:00' | '01.01.2027 00:00:00' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb7663e35d7964' | 'e1cib/data/Catalog.PartnersBankAccounts?ref=b7b5ac6d7ba6186311eec0f02fc4a1b7' | '9008' | 'e1cib/data/Catalog.Currencies?ref=b762b13668d0905011eb7663e35d795e' | 'e1cib/data/Catalog.Companies?ref=b762b13668d0905011eb7674324a4a2a' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '' | 'e1cib/data/Catalog.Users?ref=aa7f120ed92fbced11eb13d7279770c0' | '15.03.2024 13:29:00' | '15.03.2024 15:47:49' | 'False' | + Scenario: Create catalog Projects objects (test data base) diff --git a/features/Internal/_0040 BasicCheck/_0040BasiccheckCatalogs.feature b/features/Internal/_0040 BasicCheck/_0040BasiccheckCatalogs.feature index f047ac7def..1f6406dfa4 100644 --- a/features/Internal/_0040 BasicCheck/_0040BasiccheckCatalogs.feature +++ b/features/Internal/_0040 BasicCheck/_0040BasiccheckCatalogs.feature @@ -1283,3 +1283,16 @@ Scenario: Open choise form "Projects" Then I raise "Failed to open catalog choise form Projects" exception And I close current window +Scenario: Open list form "Incoterms" + + Given I open "Incoterms" catalog default form + If the warning is displayed then + Then I raise "Failed to open catalog form Incoterms" exception + And I close current window + +Scenario: Open object form "Incoterms" + And I close all client application windows + Given I open "Incoterms" reference main form + If the warning is displayed then + Then I raise "Failed to open catalog form Incoterms" exception + And I close current window \ No newline at end of file diff --git a/features/Internal/_0050 Catalogs/_00503CashBankAccountsCatalog.feature b/features/Internal/_0050 Catalogs/_00503CashBankAccountsCatalog.feature index 0591eca6b1..b051e1af13 100644 --- a/features/Internal/_0050 Catalogs/_00503CashBankAccountsCatalog.feature +++ b/features/Internal/_0050 Catalogs/_00503CashBankAccountsCatalog.feature @@ -24,6 +24,11 @@ Scenario: _005018 filling in the "Cash/Bank accounts" catalog Given I open hyperlink "e1cib/list/Catalog.CashAccounts" And Delay 2 And I click the button named "FormCreate" + * Check field visibility + And field "BankCountry" is not present on the form + And field "BankIdentifierCode" is not present on the form + And field "BankSWIFTCode" is not present on the form + And field "isIBAN" is not present on the form * Create and check the creation of Cash account: Cash desk №1 (with fix currency), Cash desk №2 (multi currency) And I click Open button of the field named "Description_en" And I input "Cash desk №1" text in the field named "Description_en" @@ -100,6 +105,10 @@ Scenario: _005018 filling in the "Cash/Bank accounts" catalog | Code | Description | | TRY | Turkish lira | And I select current line in "List" table + And I set checkbox "Is IBAN" + And I select from "Bank country" drop-down list by "Turkey" string + And I input "24667788" text in "Bank identifier code" field + And I input "45566778789" text in "Bank SWIFT code" field And I click the button named "FormWrite" * Check data save Then the form attribute named "Type" became equal to "Bank" @@ -109,6 +118,10 @@ Scenario: _005018 filling in the "Cash/Bank accounts" catalog Then the form attribute named "Description_en" became equal to "Bank account, TRY" Then the form attribute named "CurrencyType" became equal to "Fixed" Then the form attribute named "Currency" became equal to "TRY" + Then the form attribute named "BankCountry" became equal to "Turkey" + Then the form attribute named "BankIdentifierCode" became equal to "24667788" + Then the form attribute named "BankSWIFTCode" became equal to "45566778789" + And I wait "Yes" value of the attribute named "isIBAN" for 3 seconds And I click the button named "FormWriteAndClose" And Delay 5 Then I check for the "CashAccounts" catalog element with the "Description_en" "Bank account, TRY" diff --git a/features/Internal/_0050 Catalogs/_00504CompaniesCatalog.feature b/features/Internal/_0050 Catalogs/_00504CompaniesCatalog.feature index 1ffa0f1b36..8fe55caec1 100644 --- a/features/Internal/_0050 Catalogs/_00504CompaniesCatalog.feature +++ b/features/Internal/_0050 Catalogs/_00504CompaniesCatalog.feature @@ -17,6 +17,9 @@ Background: Scenario: _005013 filling in the "Companies" catalog When set True value to the constant + Given I open hyperlink "e1cib/app/DataProcessor.SystemSettings" + And I set checkbox "Number editing available" + And I close "System settings" window * Preparation And I close all client application windows When Create catalog IntegrationSettings objects @@ -174,4 +177,23 @@ Scenario: _005016 name uniqueness control (Projects) And I click the button named "FormWriteAndClose" Then there are lines in TestClient message log |'Description not unique [Project 01]'| - And I close all client application windows \ No newline at end of file + And I close all client application windows + +Scenario: _0050161 create Incoterms + * Open a creation form Incoterms + Given I open hyperlink "e1cib/list/Catalog.Incoterms" + * Create + And I click the button named "FormCreate" + And I click Open button of the field named "Description_en" + And I input "Cost and Freight" text in the field named "Description_en" + And I input "Cost and Freight TR" text in the field named "Description_tr" + And I input "Cost and Freight RU" text in "RU" field + And I click "Ok" button + And I input "CFR" text in the field named "Code" + And I click "Yes" button + And I click the button named "FormWriteAndClose" + And Delay 3 + * Check creation + Then I check for the "Incoterms" catalog element with the "Description_en" "Cost and Freight" + Then I check for the "Incoterms" catalog element with the "Description_tr" "Cost and Freight TR" + Then I check for the "Incoterms" catalog element with the "Description_ru" "Cost and Freight RU" \ No newline at end of file diff --git a/features/Internal/_0050 Catalogs/_00522PartnersBankAccounts.feature b/features/Internal/_0050 Catalogs/_00522PartnersBankAccounts.feature index 1f9b7836ec..9403d8539d 100644 --- a/features/Internal/_0050 Catalogs/_00522PartnersBankAccounts.feature +++ b/features/Internal/_0050 Catalogs/_00522PartnersBankAccounts.feature @@ -1,9 +1,9 @@ -#language: en +#language: en @tree @Positive @PartnerCatalogs -Feature: filling in Partners bank account +Feature: filling in Partners bank account and Legal name contract As an owner I want to fill out information on the company @@ -61,4 +61,39 @@ Scenario: _005022 filling in the "Partners bank account" catalog Then I check for the "PartnersBankAccounts" catalog element with the "Description_en" "Partner bank account" - +Scenario: _005025 filling in the "Legal name contracts" catalog + And I close all client application windows + * Open "Legal name contracts" catalog + Given I open hyperlink "e1cib/list/Catalog.LegalNameContracts" + And I click the button named "FormCreate" + * Filling details + Then "Legal name contract (create)" window is opened + And I input "Legal name contract 1 dated 01.01.2023" text in the field named "Description" + And I input "1" text in "Contract number" field + And I input "01.01.2023" text in "Begin date" field + And I input "31.12.2023" text in "End date" field + And I select from the drop-down list named "Company" by "Main Company" string + And I select from "Legal name" drop-down list by "Company Kalipso" string + And I select from the drop-down list named "Currency" by "EUR" string + And I click Select button of "Partner bank account" field + Then "Partners bank accounts" window is opened + And I go to line in "List" table + | 'Description' | 'Number' | + | 'Partner bank account' | '56788888888888689' | + And I select current line in "List" table + And I click "Save" button + * Check data save + And the editing text of form attribute named "BeginDate" became equal to "01.01.2023" + Then the form attribute named "Company" became equal to "Main Company" + Then the form attribute named "ContractNumber" became equal to "1" + Then the form attribute named "Currency" became equal to "EUR" + Then the form attribute named "Description" became equal to "Legal name contract 1 dated 01.01.2023" + And the editing text of form attribute named "EndDate" became equal to "31.12.2023" + Then the form attribute named "LegalName" became equal to "Company Kalipso" + Then the form attribute named "PartnerBankAccount" became equal to "Partner bank account" + And I click "Save and close" button + * Check for created Partners bank account + And "List" table contains lines + | 'Description' | 'Begin date' | 'End date' | 'Company' | 'Partner bank account' | + | 'Legal name contract 1 dated 01.01.2023' | '01.01.2023' | '31.12.2023' | 'Main Company' | 'Partner bank account' | + And I close all client application windows \ No newline at end of file diff --git a/features/Internal/_0910 Forms/_1535AdditionalAttributes.feature b/features/Internal/_0910 Forms/_1535AdditionalAttributes.feature index c248ca8d84..184b82bcad 100644 --- a/features/Internal/_0910 Forms/_1535AdditionalAttributes.feature +++ b/features/Internal/_0910 Forms/_1535AdditionalAttributes.feature @@ -69,6 +69,7 @@ Scenario: _0153500 preparation When Create catalog PaymentTerminals objects When Create catalog RetailCustomers objects When Create catalog BankTerms objects + When Create catalog Incoterms objects When Create catalog SpecialOfferRules objects (Test) When Create catalog SpecialOfferTypes objects (Test) When Create catalog SpecialOffers objects (Test) @@ -3991,8 +3992,8 @@ Scenario: _015400704 check that additional attributes and properties are display * Open LegalNameContracts form Given I open hyperlink "e1cib/list/Catalog.LegalNameContracts" And I go to line in "List" table - | Contract number | - | Test | + | Description | + | Test | And I select current line in "List" table And field "Test" is not present on the form * Adding by selected LegalNameContracts additional Test attribute without closing the form @@ -5282,6 +5283,50 @@ Scenario: _015400664 check that additional attributes and properties are display | 'Test 1' | '' | And I close all client application windows +Scenario: _0154006831 check that additional attributes and properties are displayed on the form without reopening (Catalog_Incoterms) + Then I check for the "AddAttributeAndPropertyValues" charts of characteristic types with the Description Eng "Test" + * Open a form to create Incoterms + Given I open hyperlink "e1cib/list/Catalog.Incoterms" + And I click the button named "FormCreate" + And field "Test" is not present on the form + * Adding additional Test attribute without closing the form + Given I open hyperlink "e1cib/list/Catalog.AddAttributeAndPropertySets" + And I go to line in "List" table + | Predefined data name | + | Catalog_Incoterms | + And I select current line in "List" table + And in the table "Attributes" I click the button named "AttributesAdd" + And I click choice button of "Attribute" attribute in "Attributes" table + And I go to line in "List" table + | Description | + | Test | + And I select current line in "List" table + And I finish line editing in "Attributes" table + And I move to "Properties" tab + And in the table "Properties" I click the button named "PropertiesAdd" + And I click choice button of "Property" attribute in "Properties" table + And I go to line in "List" table + | 'Description' | + | 'Test 1' | + And I select current line in "List" table + And I finish line editing in "Properties" table + And I input "Incoterms" text in the field named "Description_en" + And I click "Save and close" button + * Check that the additional Test attribute has been displayed on the form + When in opened panel I select "Incoterms" + And I activate "Incoterms (create)" window + And field "Test" is present on the form + And I close current window + And I go to line in "List" table + | 'Description' | + | 'CIF' | + And I select current line in "List" table + And I click "Add properties" button + And "Properties" table became equal + | 'Property' | 'Value' | + | 'Test 1' | '' | + And I close all client application windows + Scenario: _015400665 check that additional attributes and properties are displayed on the form without reopening (document SalesReportFromTradeAgent) Then I check for the "AddAttributeAndPropertyValues" charts of characteristic types with the Description Eng "Test" * Open a form to create Sales report from trade agent @@ -5964,6 +6009,7 @@ Scenario: _015400670 check AddAttribute with type hyperlink And I click the button named "OK" And I close all client application windows + Scenario: _015400680 check add attributes (collection, Projects and Stores) And I close all client application windows * Setting additional attributes collection for SI diff --git a/features/Internal/_4000 TestWithExtension/_40001ReportForm.feature b/features/Internal/_4000 TestWithExtension/_40001ReportForm.feature index 4f9de07a43..2921fd2843 100644 --- a/features/Internal/_4000 TestWithExtension/_40001ReportForm.feature +++ b/features/Internal/_4000 TestWithExtension/_40001ReportForm.feature @@ -1,4 +1,4 @@ -#language: en +#language: en @tree @Positive @ExtensionReportForm @@ -322,3 +322,33 @@ Scenario: _4000128 check reports option share | 'Total' | '' | And I close TestClient session Then I connect launched Test client "Этот клиент" + +Scenario: _4000129 check that report created by another user cannot be overwritten + And I close all client application windows + And I connect "TestAdmin" TestClient using "ABrown" login and "" password + * Open test report + And In the command interface I select "Reports" "Barcodes" + * Try change (not report author) + And I click "Save option..." button + And I activate "Report option" field in "OptionsList" table + And I go to line in "OptionsList" table + | 'Author' | 'Report option' | + | 'CI' | 'test2' | + And I select current line in "OptionsList" table + Then "Enter an option name" window is opened + And I click the button named "OK" + Then "1C:Enterprise" window is opened + And I click "OK" button + And I close TestClient session + * Try change (report author) + Then I connect launched Test client "Этот клиент" + And In the command interface I select "Reports" "Barcodes" + And I click "Save option..." button + And I activate "Report option" field in "OptionsList" table + And I go to line in "OptionsList" table + | 'Author' | 'Report option' | + | 'CI' | 'test2' | + And I select current line in "OptionsList" table + Then "1C:Enterprise" window is opened + And I click "Yes" button + And I close all client application windows \ No newline at end of file