1c/IRP
1
0
Fork 0
mirror of https://github.com/IRPTeam/IRP.git synced 2025-09-16 08:56:27 +02:00
Code Activity

update to CallbackDescription

Browse Source
This commit is contained in:
Dmitry Sherstobitov
2025-07-20 19:35:49 +03:00
parent 8fd55b6a5d
commit f297880c98
144 changed files with 295 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
IRP/src/Catalogs/AccessGroups/Forms/ItemForm/Module.bsl
View File

@@ -32,7 +32,7 @@ EndProcedure
&AtClient
Procedure CopySettings(Command)
NotifyOnClose = New NotifyDescription("CopySettingsAfterSelect", ThisObject);
NotifyOnClose = New CallbackDescription("CopySettingsAfterSelect", ThisObject);
OpenForm("Catalog.AccessGroups.ChoiceForm", , , , , , NotifyOnClose);
EndProcedure

4
IRP/src/Catalogs/AddAttributeAndPropertySets/Forms/ItemForm/Module.bsl
View File

@@ -380,7 +380,7 @@ Procedure SetCondition(TableName, ColumnName)
NotifyParameters.Insert("CurrentData" , CurrentData[ColumnName]);
If Not ValueIsFilled(Object.Ref) Or ThisObject.Modified Then
Notify = New NotifyDescription("SetConditionNotify", ThisObject, NotifyParameters);
Notify = New CallbackDescription("SetConditionNotify", ThisObject, NotifyParameters);
ShowQueryBox(Notify, R().QuestionToUser_001, QuestionDialogMode.YesNo);
Else
SetConditionNotify(DialogReturnCode.Yes, NotifyParameters);
@@ -390,7 +390,7 @@ EndProcedure
&AtClient
Procedure SetConditionNotify(Result, AdditionalParameters) Export
If Result = DialogReturnCode.Yes And Write() Then
Notify = New NotifyDescription("OnFinishEditFilter", ThisObject, AdditionalParameters);
Notify = New CallbackDescription("OnFinishEditFilter", ThisObject, AdditionalParameters);
OpeningParameters = New Structure();
OpeningParameters.Insert("SavedSettings", GetSettings(AdditionalParameters));
OpeningParameters.Insert("Ref", Object.Ref);

2
IRP/src/Catalogs/AttachedDocumentSettings/Forms/ItemForm/Module.bsl
View File

@@ -3,7 +3,7 @@
Procedure DescriptionStartChoice(Item, ChoiceData, StandardProcessing)
StandardProcessing = False;
CallbackDescription = New NotifyDescription("AfterDocTypeSelect", ThisObject, New Structure);
CallbackDescription = New CallbackDescription("AfterDocTypeSelect", ThisObject, New Structure);
OpenForm(
"Catalog.AttachedDocumentSettings.Form.FormChoiseDocsName",
,

2
IRP/src/Catalogs/BillOfMaterials/Forms/ItemForm/Module.bsl
View File

@@ -232,7 +232,7 @@ EndFunction
&AtClient
Procedure SetAsDefault(Command)
If Not ValueIsFilled(Object.Ref) Or ThisObject.Modified Then
Notify = New NotifyDescription("SetAsDefaultContinue", ThisObject);
Notify = New CallbackDescription("SetAsDefaultContinue", ThisObject);
ShowQueryBox(Notify, R().QuestionToUser_001, QuestionDialogMode.YesNo);
Else
SetAsDefaultAtServer();

4
IRP/src/Catalogs/Currencies/Forms/ListForm/Module.bsl
View File

@@ -7,8 +7,8 @@ EndProcedure
&AtClient
Procedure Integrations(Command)
NotifyDescription = New NotifyDescription("SelectIntegrationEnd", ThisObject);
OpenForm("Catalog.Currencies.Form.SelectIntegration", , ThisObject, , , , NotifyDescription);
CallbackDescription = New CallbackDescription("SelectIntegrationEnd", ThisObject);
OpenForm("Catalog.Currencies.Form.SelectIntegration", , ThisObject, , , , CallbackDescription);
EndProcedure
&AtClient

18
IRP/src/Catalogs/EquipmentDrivers/Forms/ItemForm/Module.bsl
View File

@@ -36,16 +36,16 @@ EndProcedure
&AtClient
Procedure AddFile(Command)
PutFilesDialogParameters = New PutFilesDialogParameters();
EndCall = New NotifyDescription("AddFileEndCall", ThisObject);
ProgressCall = New NotifyDescription("AddFileProgressCall", ThisObject);
BeforeStartCall = New NotifyDescription("AddFileBeforeStartCall", ThisObject);
EndCall = New CallbackDescription("AddFileEndCall", ThisObject);
ProgressCall = New CallbackDescription("AddFileProgressCall", ThisObject);
BeforeStartCall = New CallbackDescription("AddFileBeforeStartCall", ThisObject);
BeginPutFileToServer(EndCall, ProgressCall, BeforeStartCall, , PutFilesDialogParameters, ThisObject.UUID);
EndProcedure
&AtClient
Procedure SaveFile(Command)
If Parameters.Key.IsEmpty() Then
QuestionToUserNotify = New NotifyDescription("SaveFileNewObjectContinue", ThisObject);
QuestionToUserNotify = New CallbackDescription("SaveFileNewObjectContinue", ThisObject);
ShowQueryBox(QuestionToUserNotify, R().QuestionToUser_001, QuestionDialogMode.YesNo);
Return;
EndIf;
@@ -55,8 +55,8 @@ EndProcedure
&AtClient
Procedure Install(Command)
If Modified Then
NotifyDescription = New NotifyDescription("InstallDriver_End", ThisObject);
ShowQueryBox(NotifyDescription, R().QuestionToUser_001, QuestionDialogMode.YesNo);
CallbackDescription = New CallbackDescription("InstallDriver_End", ThisObject);
ShowQueryBox(CallbackDescription, R().QuestionToUser_001, QuestionDialogMode.YesNo);
Else
InstallDriver();
EndIf;
@@ -120,7 +120,7 @@ Async Procedure BeginGetDriverEnd(DriverObject, Params) Export
Object.RevisionNumber = InterfaceRevision;
ThisObject.Modified = True;
EndIf;
Notify = New NotifyDescription("BeginGetDriverEndAfter", ThisObject);
Notify = New CallbackDescription("BeginGetDriverEndAfter", ThisObject);
HardwareClient.Device_GetDescription_Begin(Settings, DriverObject, Notify);
EndTry;
EndIf;
@@ -185,7 +185,7 @@ Procedure UpdateDriverStatus()
DriverData.Insert("Driver", Object.Ref);
DriverData.Insert("AddInID", Object.AddInID);
Notify = New NotifyDescription("BeginGetDriverEnd", ThisObject);
Notify = New CallbackDescription("BeginGetDriverEnd", ThisObject);
HardwareClient.BeginGetDriver(Notify, DriverData);
EndProcedure
@@ -197,7 +197,7 @@ Procedure InstallDriver()
Return;
EndIf;
Notify = New NotifyDescription("InstallDriverFromZIPEnd", ThisObject);
Notify = New CallbackDescription("InstallDriverFromZIPEnd", ThisObject);
HardwareClient.InstallDriver(Object.Ref, Notify);
EndProcedure

8
IRP/src/Catalogs/Extensions/Forms/ItemForm/Module.bsl
View File

@@ -20,16 +20,16 @@ EndProcedure
&AtClient
Procedure AddFile(Command)
PutFilesDialogParameters = New PutFilesDialogParameters(, , "(*.cfe)|*.cfe");
EndCall = New NotifyDescription("AddFileEndCall", ThisObject);
ProgressCall = New NotifyDescription("AddFileProgressCall", ThisObject);
BeforeStartCall = New NotifyDescription("AddFileBeforeStartCall", ThisObject);
EndCall = New CallbackDescription("AddFileEndCall", ThisObject);
ProgressCall = New CallbackDescription("AddFileProgressCall", ThisObject);
BeforeStartCall = New CallbackDescription("AddFileBeforeStartCall", ThisObject);
BeginPutFileToServer(EndCall, ProgressCall, BeforeStartCall, , PutFilesDialogParameters, ThisObject.UUID);
EndProcedure
&AtClient
Procedure SaveFile(Command)
If Parameters.Key.IsEmpty() Then
QuestionToUserNotify = New NotifyDescription("SaveFileNewObjectContinue", ThisObject);
QuestionToUserNotify = New CallbackDescription("SaveFileNewObjectContinue", ThisObject);
ShowQueryBox(QuestionToUserNotify, R().QuestionToUser_001, QuestionDialogMode.YesNo);
Return;
EndIf;

4
IRP/src/Catalogs/ExternalDataProc/Forms/ItemForm/Module.bsl
View File

@@ -14,7 +14,7 @@ EndProcedure
&AtClient
Procedure AddExtDataProc(Command)
NotifyEndPut = New NotifyDescription("AddExtDataProcEnd", ThisObject);
NotifyEndPut = New CallbackDescription("AddExtDataProcEnd", ThisObject);
//@skip-warning
BeginPutFile(NotifyEndPut, , , True);
EndProcedure
@@ -56,7 +56,7 @@ EndProcedure
&AtClient
Procedure ExportExtDataProc(Command)
FileDialog = New FileDialog(FileDialogMode.ChooseDirectory);
Notify = New NotifyDescription("ChooseDirectoryEnding", ThisObject);
Notify = New CallbackDescription("ChooseDirectoryEnding", ThisObject);
FileDialog.Show(Notify);
EndProcedure

2
IRP/src/Catalogs/ExternalFunctions/Forms/ItemForm/Module.bsl
View File

@@ -184,7 +184,7 @@ Procedure Scheduler(Command)
ScheduledJob = JobScheduleInfo; // JobSchedule
EndIf;
EditSchedule = New ScheduledJobDialog(ScheduledJob);
EditSchedule.Show(New NotifyDescription("AfterSchedulerChange", ThisObject));
EditSchedule.Show(New CallbackDescription("AfterSchedulerChange", ThisObject));
EndProcedure
// After scheduler change.

6
IRP/src/Catalogs/Hardware/Forms/ItemForm/Module.bsl
View File

@@ -154,7 +154,7 @@ Async Procedure ReloadSettings(Command)
If ValueIsFilled(Parameters.Key) And Not Object.Ref.IsEmpty() And Not Object.Driver.IsEmpty() Then
DriverParameter.Clear();
Settings = Await HardwareClient.FillDriverParametersSettings(Object.Ref);
Settings.Callback = New NotifyDescription("FillDriverParameters_End", ThisObject);
Settings.Callback = New CallbackDescription("FillDriverParameters_End", ThisObject);
HardwareClient.FillDriverParameters(Settings);
EndIf;
EndProcedure
@@ -167,7 +167,7 @@ Async Procedure WriteSettings(Command)
EndIf;
Settings = Await HardwareClient.FillDriverParametersSettings(Object.Ref);
Settings.ServiceCallback = New NotifyDescription("EndWriteSettings", ThisObject, Settings);
Settings.ServiceCallback = New CallbackDescription("EndWriteSettings", ThisObject, Settings);
HardwareClient.SetParameter_End(True, Undefined, Settings);
EndProcedure
@@ -190,7 +190,7 @@ Async Procedure Test(Command)
EndIf;
Settings = Await HardwareClient.FillDriverParametersSettings(Object.Ref);
Settings.Callback = New NotifyDescription("EndTestDevice", ThisObject, Settings);
Settings.Callback = New CallbackDescription("EndTestDevice", ThisObject, Settings);
Settings.AdditionalCommand = "CheckHealth";
HardwareClient.TestDevice(Settings);

4
IRP/src/Catalogs/IDInfoSets/Forms/ItemForm/Module.bsl
View File

@@ -30,7 +30,7 @@ Procedure SetCondition(TableName, ColumnName, AddInfo = Undefined)
AddInfo.Insert("ColumnName", ColumnName);
If Not ValueIsFilled(Object.Ref) Or ThisObject.Modified Then
QuestionToUserNotify = New NotifyDescription("SetConditionNotify", ThisObject, AddInfo);
QuestionToUserNotify = New CallbackDescription("SetConditionNotify", ThisObject, AddInfo);
ShowQueryBox(QuestionToUserNotify, R().QuestionToUser_001, QuestionDialogMode.YesNo);
Else
SetConditionNotify(DialogReturnCode.Yes, AddInfo);
@@ -47,7 +47,7 @@ Procedure SetConditionNotify(Result, AddInfo = Undefined) Export
AddInfo.Insert("Element", CurrentRow[AddInfo.ColumnName]);
Notify = New NotifyDescription("OnFinishEditFilter", ThisObject, AddInfo);
Notify = New CallbackDescription("OnFinishEditFilter", ThisObject, AddInfo);
OpeningParameters = New Structure();
OpeningParameters.Insert("SavedSettings", GetSettings(CurrentRow[AddInfo.ColumnName], AddInfo));
OpeningParameters.Insert("Ref", Object.Ref);

4
IRP/src/Catalogs/IntegrationSettings/Forms/ItemForm/Module.bsl
View File

@@ -188,8 +188,8 @@ Procedure ExternalDataProcSettings(Command)
Info.Insert("Settings", ThisObject.AddressResult);
CallMethodAddDataProc(Info);
NotifyDescription = New NotifyDescription("OpenFormProcSettingsEnd", ThisObject);
AddDataProcClient.OpenFormAddDataProc(Info, NotifyDescription, "Settings");
CallbackDescription = New CallbackDescription("OpenFormProcSettingsEnd", ThisObject);
AddDataProcClient.OpenFormAddDataProc(Info, CallbackDescription, "Settings");
EndProcedure
&AtServer

4
IRP/src/Catalogs/ItemKeys/Forms/ChoiceForm/Module.bsl
View File

@@ -91,7 +91,7 @@ EndProcedure
&AtClient
Procedure CreateNewItemKey(Command)
NotifyDescription = New NotifyDescription("CreateNewItemsFinish", ThisObject);
CallbackDescription = New CallbackDescription("CreateNewItemsFinish", ThisObject);
OpenParameters = New Structure();
OpenParameters.Insert("Item", ThisObject.Item);
OpenParameters.Insert("SelectedFilters", New Array());
@@ -102,7 +102,7 @@ Procedure CreateNewItemKey(Command)
EndIf;
EndDo;
OpenForm("Catalog.ItemKeys.Form.ItemForm", OpenParameters, ThisObject, New UUID(), , , NotifyDescription,
OpenForm("Catalog.ItemKeys.Form.ItemForm", OpenParameters, ThisObject, New UUID(), , , CallbackDescription,
FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

2
IRP/src/Catalogs/ItemSegments/Commands/AddToSegment/CommandModule.bsl
View File

@@ -15,7 +15,7 @@ Procedure CommandProcessing(CommandParameter, CommandExecuteParameters)
FormParameters.Insert("MultipleChoice", False);
FormParameters.Insert("CloseOnChoice", True);
Notify = New NotifyDescription("ChoiceSegmentEnd", ThisObject, New Structure("Items", CommandParameter));
Notify = New CallbackDescription("ChoiceSegmentEnd", ThisObject, New Structure("Items", CommandParameter));
OpenForm("Catalog.ItemSegments.ChoiceForm",
FormParameters,

2
IRP/src/Catalogs/ItemSegments/Forms/ItemForm/Module.bsl
View File

@@ -157,7 +157,7 @@ Procedure ContentSegmentBeforeAddRow(Item, Cancel, Clone, Parent, IsFolder, Para
FormParameters = New Structure("FillingValues", FillingValues);
OpenForm("InformationRegister.ItemSegments.RecordForm", FormParameters,,,,,
New NotifyDescription("AddRowFinish", ThisObject));
New CallbackDescription("AddRowFinish", ThisObject));
EndProcedure
&AtClient

4
IRP/src/Catalogs/ItemTypes/Forms/ItemForm/Module.bsl
View File

@@ -205,7 +205,7 @@ EndProcedure
&AtClient
Procedure EditItemTemplate(TemplateName)
// If ThisObject.Modified Then
// ShowQueryBox(New NotifyDescription("EditItemTemplateEnd", ThisObject, New Structure("TemplateName", TemplateName)),
// ShowQueryBox(New CallbackDescription("EditItemTemplateEnd", ThisObject, New Structure("TemplateName", TemplateName)),
// R().QuestionToUser_001, QuestionDialogMode.OKCancel);
// Else
EditItemTemplateAtClient(TemplateName);
@@ -230,7 +230,7 @@ Procedure EditItemTemplateAtClient(AttributeName)
TemplateName = ?(isItemKey, "ItemKeyTemplate", "ItemTemplate");
SourceName = ?(isItemKey, "ItemKey", "Item");
Notify = New NotifyDescription("OnFinishEditItemTemplate", ThisObject, New Structure("TemplateName", AttributeName));
Notify = New CallbackDescription("OnFinishEditItemTemplate", ThisObject, New Structure("TemplateName", AttributeName));
FormParameters = New Structure();
FormParameters.Insert("Formula", Object[AttributeName]);
FormParameters.Insert("SourceName" , SourceName);

2
IRP/src/Catalogs/Items/Forms/ItemForm/Module.bsl
View File

@@ -292,7 +292,7 @@ EndProcedure
&AtClient
Procedure FillDescriptionByTemplate(Command)
If ThisObject.Modified Then
ShowQueryBox(New NotifyDescription("FillDescriptionByTemplateEnd", ThisObject, New Structure("CommandName", Command.Name)),
ShowQueryBox(New CallbackDescription("FillDescriptionByTemplateEnd", ThisObject, New Structure("CommandName", Command.Name)),
R().QuestionToUser_001, QuestionDialogMode.OKCancel);
Else
FillDescriptionByTemplateAtClient(Command.Name);

2
IRP/src/Catalogs/LockDataModificationReasons/Forms/ItemForm/Module.bsl
View File

@@ -131,7 +131,7 @@ Procedure RuleListTypeStartChoice(Item, ChoiceData, StandardProcessing)
InitialValue = CurrentList.FindByValue(CurrentType);
EndIf;
ListNotify = New NotifyDescription("ChooseTypeEnd", ThisObject);
ListNotify = New CallbackDescription("ChooseTypeEnd", ThisObject);
If InitialValue = Undefined Then
ShowChooseFromList(ListNotify, CurrentList, Item);
Else

4
IRP/src/Catalogs/PaymentTypes/Forms/ItemForm/Module.bsl
View File

@@ -83,7 +83,7 @@ EndProcedure
Procedure IconClick(Item, StandardProcessing)
StandardProcessing = False;
If Object.isIconSet Then
Notify = New NotifyDescription("IconOnClickEnd", ThisObject);
Notify = New CallbackDescription("IconOnClickEnd", ThisObject);
QueryText = R().QuestionToUser_016;
QueryButtons = New ValueList();
QueryButtons.Add("Change", R().Form_017);
@@ -105,7 +105,7 @@ EndProcedure
&AtClient
Procedure AskForChangeIcon()
Var OpenFileDialog;
Notify = New NotifyDescription("SelectFileEnd", ThisObject);
Notify = New CallbackDescription("SelectFileEnd", ThisObject);
OpenFileDialog = New FileDialog(FileDialogMode.Open);
OpenFileDialog.Multiselect = False;
OpenFileDialog.Title = R().S_026;

4
IRP/src/Catalogs/PriceTypes/Forms/ItemForm/Module.bsl
View File

@@ -47,8 +47,8 @@ Procedure ExternalDataProcSettings(Command)
Info.Insert("Settings", ThisObject.AddressResult);
CallMethodAddDataProc(Info);
NotifyDescription = New NotifyDescription("OpenFormProcSettingsEnd", ThisObject);
AddDataProcClient.OpenFormAddDataProc(Info, NotifyDescription, "Settings");
CallbackDescription = New CallbackDescription("OpenFormProcSettingsEnd", ThisObject);
AddDataProcClient.OpenFormAddDataProc(Info, CallbackDescription, "Settings");
EndProcedure
&AtServer

2
IRP/src/Catalogs/SerialLotNumbers/Forms/EditListOfSerialLotNumbers/Module.bsl
View File

@@ -65,7 +65,7 @@ Procedure SerialLotNumbersSerialLotNumberCreating(Item, StandardProcessing)
FormParameters.Insert("ItemKey", ThisObject.ItemKey);
FormParameters.Insert("Description", Item.EditText);
OpenForm("Catalog.SerialLotNumbers.ObjectForm", FormParameters, ThisObject, , , , New NotifyDescription("AfterCreateNewSerial", ThisObject));
OpenForm("Catalog.SerialLotNumbers.ObjectForm", FormParameters, ThisObject, , , , New CallbackDescription("AfterCreateNewSerial", ThisObject));
EndProcedure
&AtClient

2
IRP/src/Catalogs/SourceOfOrigins/Forms/EditSourceOfOrigins/Module.bsl
View File

@@ -54,7 +54,7 @@ Procedure SourceOfOriginsSourceOfOriginCreating(Item, StandardProcessing)
FormParameters.Insert("Item" , ThisObject.Item);
FormParameters.Insert("ItemKey" , ThisObject.ItemKey);
FormParameters.Insert("Description" , Item.EditText);
OpenForm("Catalog.SourceOfOrigins.ObjectForm", FormParameters, ThisObject, , , , New NotifyDescription("AfterCreateNewSourceOfOrigin", ThisObject));
OpenForm("Catalog.SourceOfOrigins.ObjectForm", FormParameters, ThisObject, , , , New CallbackDescription("AfterCreateNewSourceOfOrigin", ThisObject));
EndProcedure
&AtClient

4
IRP/src/Catalogs/SpecialOfferRules/Forms/ItemForm/Module.bsl
View File

@@ -55,8 +55,8 @@ Procedure SetSettings(Command)
Info = AddDataProcServer.AddDataProcInfo(Object.Ref);
Info.Insert("Settings", AddressResult);
CallMethodAddDataProc(Info);
NotifyDescription = New NotifyDescription("OpenFormAddDataProcEnd", ThisObject);
AddDataProcClient.OpenFormAddDataProc(Info, NotifyDescription, "RuleForm");
CallbackDescription = New CallbackDescription("OpenFormAddDataProcEnd", ThisObject);
AddDataProcClient.OpenFormAddDataProc(Info, CallbackDescription, "RuleForm");
EndProcedure
&AtServerNoContext

4
IRP/src/Catalogs/SpecialOfferTypes/Forms/ItemForm/Module.bsl
View File

@@ -56,8 +56,8 @@ Procedure SetSettings(Command)
Info.Insert("Settings", AddressResult);
CallMethodAddDataProc(Info);
NotifyDescription = New NotifyDescription("OpenFormAddDataProcEnd", ThisObject);
AddDataProcClient.OpenFormAddDataProc(Info, NotifyDescription, ?(Object.GroupTypes, "GroupTypeForm",
CallbackDescription = New CallbackDescription("OpenFormAddDataProcEnd", ThisObject);
AddDataProcClient.OpenFormAddDataProc(Info, CallbackDescription, ?(Object.GroupTypes, "GroupTypeForm",
"ElementTypeForm"));
EndProcedure

2
IRP/src/Catalogs/Taxes/Forms/ItemForm/Module.bsl
View File

@@ -104,7 +104,7 @@ Procedure SetTransactionTypes(Command)
OpenParameters = New Structure();
OpenParameters.Insert("DocumentName", CurrentData.DocumentName);
OpenParameters.Insert("TransactionTypes", ArrayOfAllTransactionTypes);
Notify = new NotifyDescription("ChoiceTransactionTypesEnd", ThisObject);
Notify = new CallbackDescription("ChoiceTransactionTypesEnd", ThisObject);
OpenForm("Catalog.Taxes.Form.ChoiceTransactionTypes", OpenParameters, ThisObject, , , , Notify,
FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

2
IRP/src/Catalogs/UserGroups/Forms/ItemForm/Module.bsl
View File

@@ -57,7 +57,7 @@ EndProcedure
&AtClient
Procedure Settings(Command)
If Not ValueIsFilled(Object.Ref) Or ThisObject.Modified Then
Notify = New NotifyDescription("EditUserSettingsProceed", ThisObject);
Notify = New CallbackDescription("EditUserSettingsProceed", ThisObject);
ShowQueryBox(Notify, R().QuestionToUser_001, QuestionDialogMode.YesNo);
Else
EditUserSettingsProceed(DialogReturnCode.Yes);

4
IRP/src/Catalogs/Users/Forms/ItemForm/Module.bsl
View File

@@ -125,7 +125,7 @@ EndProcedure
Procedure SetPassword(Command)
OpenArgs = New Structure();
OpenArgs.Insert("Password", Password);
OpenForm("Catalog.Users.Form.InputPassword", OpenArgs, ThisObject, , , , New NotifyDescription("SetPasswordFinish",
OpenForm("Catalog.Users.Form.InputPassword", OpenArgs, ThisObject, , , , New CallbackDescription("SetPasswordFinish",
ThisObject));
EndProcedure
@@ -147,7 +147,7 @@ EndProcedure
&AtClient
Procedure Settings(Command)
If Not ValueIsFilled(Object.Ref) Or ThisObject.Modified Then
Notify = New NotifyDescription("EditUserSettingsProceed", ThisObject);
Notify = New CallbackDescription("EditUserSettingsProceed", ThisObject);
//@skip-check property-return-type
//@skip-check invocation-parameter-type-intersect
ShowQueryBox(Notify, R().QuestionToUser_001, QuestionDialogMode.YesNo);

2
IRP/src/ChartsOfCharacteristicTypes/CustomUserSettings/Forms/ItemForm/Module.bsl
View File

@@ -60,7 +60,7 @@ Procedure AddRefersToObject(Command)
For Each Row In Object.RefersToObjects Do
ArrayOfSelectedObjects.Add(Row.FullName);
EndDo;
Notify = New NotifyDescription("AddRefersToObjectEnd", ThisObject);
Notify = New CallbackDescription("AddRefersToObjectEnd", ThisObject);
OpenForm("ChartOfCharacteristicTypes.CustomUserSettings.Form.SelectMetadataForm",
New Structure("ArrayOfSelectedObjects", ArrayOfSelectedObjects), ThisObject, , , , Notify);
EndProcedure

4
IRP/src/ChartsOfCharacteristicTypes/IDInfoTypes/Forms/ItemForm/Module.bsl
View File

@@ -33,8 +33,8 @@ Procedure SetSettings(Command)
Info.Insert("Country", CurrentRow.Country);
CallMethodAddDataProc(Info);
NotifyDescription = New NotifyDescription("OpenFormAddDataProcEnd", ThisObject);
AddDataProcClient.OpenFormAddDataProc(Info, NotifyDescription, "Settings");
CallbackDescription = New CallbackDescription("OpenFormAddDataProcEnd", ThisObject);
AddDataProcClient.OpenFormAddDataProc(Info, CallbackDescription, "Settings");
EndProcedure
&AtServerNoContext

2
IRP/src/CommonForms/CheckPhoneNumber/Module.bsl
View File

@@ -68,7 +68,7 @@ EndProcedure
&AtClient
Procedure OnOpen(Cancel)
If IntegrationSettings.IsEmpty() Then
ExecuteNotifyProcessing(OnCloseNotifyDescription, CloseOK());
ExecuteNotifyProcessing(OnCloseCallbackDescription, CloseOK());
EndIf;
EndProcedure

2
IRP/src/CommonForms/CopyToClipboardSettings/Module.bsl
View File

@@ -24,7 +24,7 @@ Procedure FillSettingsAndClose()
Settings = CopyPasteClient.CopySettings();
FillPropertyValues(Settings, ThisObject);
Close();
ExecuteNotifyProcessing(ThisObject.OnCloseNotifyDescription, Settings);
ExecuteNotifyProcessing(ThisObject.OnCloseCallbackDescription, Settings);
EndProcedure
&AtClient

4
IRP/src/CommonForms/EditIDInfo/Module.bsl
View File

@@ -59,7 +59,7 @@ Procedure IDInfoBeforeRowChange(Item, Cancel)
OpenFormArgs = New Structure();
OpenFormArgs.Insert("ArrayOfCountry", ArrayOfCountry);
Notify = New NotifyDescription("StartEditIDInfo", ThisObject, Args);
Notify = New CallbackDescription("StartEditIDInfo", ThisObject, Args);
OpenForm("ChartOfCharacteristicTypes.IDInfoTypes.Form.SelectCountryForm", OpenFormArgs, ThisObject, , , ,
Notify);
ElsIf ArrayOfCountry.Count() = 1 Then
@@ -88,7 +88,7 @@ Procedure StartEditIDInfo(Result, Parameters) Export
Parameters.Insert("Country", Result.Country);
CallMethodAddDataProc(OpenFormArgs);
Notify = New NotifyDescription("EndEditIDInfo", ThisObject, Parameters);
Notify = New CallbackDescription("EndEditIDInfo", ThisObject, Parameters);
AddDataProcClient.OpenFormAddDataProc(OpenFormArgs, Notify, "Form");
EndProcedure

4
IRP/src/CommonForms/FormulaEditor/Module.bsl
View File

@@ -132,7 +132,7 @@ EndProcedure
Procedure OperatorsDragEnd(Item, DragParameters, StandardProcessing)
If Item.CurrentData.Operator = "Format(,)" Then
Wizard = New FormatStringWizard();
Wizard.Show(New NotifyDescription("InsertOperatorToFormulaDragEnd",
Wizard.Show(New CallbackDescription("InsertOperatorToFormulaDragEnd",
ThisObject, New Structure("Wizard",Wizard)));
EndIf;
EndProcedure
@@ -215,7 +215,7 @@ EndProcedure
Procedure InsertOperatorToFormula()
If Items.Operators.CurrentData.Operator = "Format(,)" Then
Wizard = New FormatStringWizard();
Wizard.Show(New NotifyDescription("InsertOperatorToFormulaEnd",
Wizard.Show(New CallbackDescription("InsertOperatorToFormulaEnd",
ThisObject, New Structure("Wizard",Wizard)));
Return;
Else

2
IRP/src/CommonForms/PasteFromClipboardSettings/Module.bsl
View File

@@ -20,7 +20,7 @@ Procedure FillSettingsAndClose()
Settings = CopyPasteClient.PasteSettings();
FillPropertyValues(Settings, ThisObject);
ExecuteNotifyProcessing(ThisObject.OnCloseNotifyDescription, Settings);
ExecuteNotifyProcessing(ThisObject.OnCloseCallbackDescription, Settings);
EndProcedure
&AtClient

8
IRP/src/CommonForms/PickupSpecialOffers/Module.bsl
View File

@@ -64,9 +64,9 @@ Procedure OffersSelection(Item, SelectedRow, Field, StandardProcessing)
CallMethodAddDataProc(Info);
NotifyDescription = New NotifyDescription("InputManualValueForOfferEnd", ThisObject);
CallbackDescription = New CallbackDescription("InputManualValueForOfferEnd", ThisObject);
AddDataProcClient.OpenFormAddDataProc(Info, NotifyDescription, "InputManualValue");
AddDataProcClient.OpenFormAddDataProc(Info, CallbackDescription, "InputManualValue");
EndIf;
If Field.Name <> "OffersSelect" And OfferHaveManualInputValue(thisString.Offer)
@@ -83,9 +83,9 @@ Procedure OffersSelection(Item, SelectedRow, Field, StandardProcessing)
CallMethodAddDataProc(Info);
NotifyDescription = New NotifyDescription("InputManualValueForOfferEnd", ThisObject);
CallbackDescription = New CallbackDescription("InputManualValueForOfferEnd", ThisObject);
AddDataProcClient.OpenFormAddDataProc(Info, NotifyDescription, "InputManualValue");
AddDataProcClient.OpenFormAddDataProc(Info, CallbackDescription, "InputManualValue");
EndIf;

2
IRP/src/CommonForms/ReportForm/Module.bsl
View File

@@ -117,7 +117,7 @@ Procedure ResultDetailProcessing(Item, Details, StandardProcessing, AdditionalPa
NotifyParameters = New Structure("Details, DetailsInfo, ReportName", Details, DetailsInfo, _ReportName);
Notify = New NotifyDescription("DoDetailProcess", ThisObject, NotifyParameters);
Notify = New CallbackDescription("DoDetailProcess", ThisObject, NotifyParameters);
DetailsProcess.ShowActionChoice(Notify, Details, StandardActions, DetailsInfo.AdditionalDetailsActions.MenuList);
EndProcedure

6
IRP/src/CommonModules/AccountingClient/Module.bsl
View File

@@ -8,7 +8,7 @@ Procedure OpenFormEditAccounting(Object, Form, CurrentData, TableName) Export
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , Form);
Notify = New NotifyDescription("EditAccounting", ThisObject, NotifyParameters);
Notify = New CallbackDescription("EditAccounting", ThisObject, NotifyParameters);
OpenForm("CommonForm.EditAccounting", FormParameters, Form, , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
@@ -18,7 +18,7 @@ Procedure OpenFormSelectLedgerType(FormOwner, BasisRef, ArrayOfJournalEntries) E
NotifyParameters = New Structure();
NotifyParameters.Insert("FormOwner" , FormOwner);
NotifyParameters.Insert("BasisRef" , BasisRef);
Notify = New NotifyDescription("SelectLedgerType", ThisObject, NotifyParameters);
Notify = New CallbackDescription("SelectLedgerType", ThisObject, NotifyParameters);
OpenForm("Document.JournalEntry.Form.SelectLedgerType", FormParameters, FormOwner, , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
@@ -30,7 +30,7 @@ Procedure OpenFormSelectLedgerType_MultipleDocuments(FormOwner, ArrayOfDocuments
NotifyParameters = New Structure();
NotifyParameters.Insert("FormOwner" , FormOwner);
NotifyParameters.Insert("ArrayOfDocuments" , ArrayOfDocuments);
Notify = New NotifyDescription("SelectLedgerType_MultipleDocuments", ThisObject, NotifyParameters);
Notify = New CallbackDescription("SelectLedgerType_MultipleDocuments", ThisObject, NotifyParameters);
OpenForm("Document.JournalEntry.Form.SelectLedgerType", FormParameters, FormOwner, , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

2
IRP/src/CommonModules/AddAttributesAndPropertiesClient/Module.bsl
View File

@@ -14,7 +14,7 @@ Procedure SetRequiredAtAllSets(Object, Form, Command) Export
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form", Form);
Notify = New NotifyDescription("SetRequiredAtAllSetsEnd", ThisObject, NotifyParameters);
Notify = New CallbackDescription("SetRequiredAtAllSetsEnd", ThisObject, NotifyParameters);
ShowInputValue(Notify, False, R().SuggestionToUser_1, Types);
EndProcedure

4
IRP/src/CommonModules/AddDataProcClient/Module.bsl
View File

@@ -1,6 +1,6 @@
#Region Public
Function OpenFormAddDataProc(Info, NotifyDescription = Undefined, FormName = Undefined, AddInfo = Undefined) Export
Function OpenFormAddDataProc(Info, CallbackDescription = Undefined, FormName = Undefined, AddInfo = Undefined) Export
ExternalOrInternalDataProcessor = "";
If AddDataProcServer.UseInternalDataProcessor(Info.ExternalDataProcName) Then
ExternalOrInternalDataProcessor = "DataProcessor";
@@ -9,7 +9,7 @@ Function OpenFormAddDataProc(Info, NotifyDescription = Undefined, FormName = Und
EndIf;
FormName = ExternalOrInternalDataProcessor + "." + Info.ExternalDataProcName + ".Form" + ?(ValueIsFilled(FormName),
"." + FormName, "");
OpenForm(FormName, Info, , , , , NotifyDescription, FormWindowOpeningMode.LockWholeInterface);
OpenForm(FormName, Info, , , , , CallbackDescription, FormWindowOpeningMode.LockWholeInterface);
Return Undefined;
EndFunction

14
IRP/src/CommonModules/BarcodeClient/Module.bsl
View File

@@ -67,24 +67,24 @@ EndFunction
// Settings - See GetBarcodeSettings
Procedure SearchByBarcode(Barcode, Settings) Export
NotifyDescription = New NotifyDescription("InputBarcodeEnd", BarcodeClient, Settings);
CallbackDescription = New CallbackDescription("InputBarcodeEnd", BarcodeClient, Settings);
//@skip-warning
NotifyScan = New NotifyDescription("ScanBarcodeEndMobile", Settings.MobileBarcodeModule, Settings);
NotifyScan = New CallbackDescription("ScanBarcodeEndMobile", Settings.MobileBarcodeModule, Settings);
If IsBlankString(Barcode) Then
DescriptionField = R().SuggestionToUser_2; // String
#If MobileClient Then
If MultimediaTools.BarcodeScanningSupported() Then
NotifyScanCancel = New NotifyDescription("InputBarcodeCancel", BarcodeClient, Settings);
NotifyScanCancel = New CallbackDescription("InputBarcodeCancel", BarcodeClient, Settings);
MultimediaTools.ShowBarcodeScanning(DescriptionField, NotifyScan, NotifyScanCancel, BarcodeType.All);
EndIf;
#Else
OpenForm("CommonForm.InputBarcode", , , , , , NotifyDescription, FormWindowOpeningMode.LockOwnerWindow);
OpenForm("CommonForm.InputBarcode", , , , , , CallbackDescription, FormWindowOpeningMode.LockOwnerWindow);
#EndIf
Else
#If MobileClient Then
Settings.MobileBarcodeModule.ScanBarcodeEndMobile(Barcode, True, "", Settings);
#Else
ExecuteNotifyProcessing(NotifyDescription, Barcode);
ExecuteNotifyProcessing(CallbackDescription, Barcode);
#EndIf
EndIf;
EndProcedure
@@ -181,8 +181,8 @@ Function ProcessBarcodes(Barcodes, Settings)
Settings.Result.Barcodes = BarcodeResult.Barcodes;
//@skip-warning
NotifyDescription = New NotifyDescription("SearchByBarcodeEnd", ReturnCallToModule, Settings);
ExecuteNotifyProcessing(NotifyDescription, Settings.Result);
CallbackDescription = New CallbackDescription("SearchByBarcodeEnd", ReturnCallToModule, Settings);
ExecuteNotifyProcessing(CallbackDescription, Settings.Result);
If Settings.Result.FoundedItems.Count() Then
ReturnResult = True;
EndIf;

2
IRP/src/CommonModules/CommonFormActions/Module.bsl
View File

@@ -3,7 +3,7 @@ Procedure EditMultilineText(Form, Item, StandardProcessing) Export
StandardProcessing = False;
OpenForm("CommonForm.EditMultilineText", New Structure("ItemName", Item.Name), Form, , , ,
New NotifyDescription("OnEditedMultilineTextEnd", ThisObject, New Structure("Form, ItemName", Form, Item.Name)),
New CallbackDescription("OnEditedMultilineTextEnd", ThisObject, New Structure("Form, ItemName", Form, Item.Name)),
FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

4
IRP/src/CommonModules/CopyPasteClient/Module.bsl
View File

@@ -9,7 +9,7 @@
// Form - ClientApplicationForm - Form
Procedure CopyToClipboard(Object, Form) Export
//@skip-check wrong-string-literal-content
Notify = New NotifyDescription("CopyToClipboardAfterSetSettings", Form);
Notify = New CallbackDescription("CopyToClipboardAfterSetSettings", Form);
OpenSettings = New Structure;
If Not Object = Undefined Then
//@skip-check unknown-method-property
@@ -60,7 +60,7 @@ EndProcedure
// Form - ClientApplicationForm - Form
Procedure PasteFromClipboard(Object, Form) Export
//@skip-check wrong-string-literal-content
Notify = New NotifyDescription("PasteFromClipboardAfterSetSettings", Form);
Notify = New CallbackDescription("PasteFromClipboardAfterSetSettings", Form);
OpenSettings = New Structure;
If Not Object = Undefined Then
//@skip-check unknown-method-property

2
IRP/src/CommonModules/DPPointOfSaleClient/Module.bsl
View File

@@ -43,7 +43,7 @@ Procedure BeforeStartNewTransaction(Object, Form, DocRef) Export
EndProcedure
Procedure SearchCustomer(Object, Form) Export
Notify = New NotifyDescription("SetRetailCustomer", Form);
Notify = New CallbackDescription("SetRetailCustomer", Form);
Settings = New Structure;
Settings.Insert("RetailCustomer", Object.RetailCustomer);
Settings.Insert("Company", Object.Company);

4
IRP/src/CommonModules/DocBankPaymentClient/Module.bsl
View File

@@ -319,7 +319,7 @@ Procedure PaymentListBasisDocumentStartChoice(Object, Form, Item, ChoiceData, St
NotifyParameters = New Structure("Object, Form", Object, Form);
NotifyParameters.Insert("CurrentData", CurrentData);
Notify = New NotifyDescription("PaymentListBasisDocumentStartChoiceEnd", ThisObject, NotifyParameters);
Notify = New CallbackDescription("PaymentListBasisDocumentStartChoiceEnd", ThisObject, NotifyParameters);
Parameters.Insert("Notify", Notify);
Parameters.Insert("TableName", "DocumentsForOutgoingPayment");
Parameters.Insert("OpeningEntryTableName1", "AccountPayableByDocuments");
@@ -432,7 +432,7 @@ Procedure PaymentListOrderStartChoice(Object, Form, Item, ChoiceData, StandardPr
NotifyParameters = New Structure("Object, Form", Object, Form);
NotifyParameters.Insert("CurrentData", CurrentData);
Notify = New NotifyDescription("PaymentListOrderStartChoiceEnd", ThisObject, NotifyParameters);
Notify = New CallbackDescription("PaymentListOrderStartChoiceEnd", ThisObject, NotifyParameters);
Parameters.Insert("Notify" , Notify);
Parameters.Insert("TableName" , "DocumentsForOutgoingPayment");
Parameters.Insert("Ref" , Object.Ref);

4
IRP/src/CommonModules/DocBankReceiptClient/Module.bsl
View File

@@ -311,7 +311,7 @@ Procedure PaymentListBasisDocumentStartChoice(Object, Form, Item, ChoiceData, St
NotifyParameters = New Structure("Object, Form", Object, Form);
NotifyParameters.Insert("CurrentData", CurrentData);
Notify = New NotifyDescription("PaymentListBasisDocumentStartChoiceEnd", ThisObject, NotifyParameters);
Notify = New CallbackDescription("PaymentListBasisDocumentStartChoiceEnd", ThisObject, NotifyParameters);
Parameters.Insert("Notify", Notify);
Parameters.Insert("TableName", "DocumentsForIncomingPayment");
Parameters.Insert("OpeningEntryTableName1", "AccountPayableByDocuments");
@@ -440,7 +440,7 @@ Procedure PaymentListOrderStartChoice(Object, Form, Item, ChoiceData, StandardPr
NotifyParameters = New Structure("Object, Form", Object, Form);
NotifyParameters.Insert("CurrentData", CurrentData);
Notify = New NotifyDescription("PaymentListOrderStartChoiceEnd", ThisObject, NotifyParameters);
Notify = New CallbackDescription("PaymentListOrderStartChoiceEnd", ThisObject, NotifyParameters);
Parameters.Insert("Notify" , Notify);
Parameters.Insert("TableName" , "DocumentsForIncomingPayment");
Parameters.Insert("Ref" , Object.Ref);

4
IRP/src/CommonModules/DocCashPaymentClient/Module.bsl
View File

@@ -286,7 +286,7 @@ Procedure PaymentListBasisDocumentStartChoice(Object, Form, Item, ChoiceData, St
NotifyParameters = New Structure("Object, Form", Object, Form);
NotifyParameters.Insert("CurrentData", CurrentData);
Notify = New NotifyDescription("PaymentListBasisDocumentStartChoiceEnd", ThisObject, NotifyParameters);
Notify = New CallbackDescription("PaymentListBasisDocumentStartChoiceEnd", ThisObject, NotifyParameters);
Parameters.Insert("Notify", Notify);
Parameters.Insert("TableName", "DocumentsForOutgoingPayment");
Parameters.Insert("OpeningEntryTableName1", "AccountPayableByDocuments");
@@ -401,7 +401,7 @@ Procedure PaymentListOrderStartChoice(Object, Form, Item, ChoiceData, StandardPr
NotifyParameters = New Structure("Object, Form", Object, Form);
NotifyParameters.Insert("CurrentData", CurrentData);
Notify = New NotifyDescription("PaymentListOrderStartChoiceEnd", ThisObject, NotifyParameters);
Notify = New CallbackDescription("PaymentListOrderStartChoiceEnd", ThisObject, NotifyParameters);
Parameters.Insert("Notify" , Notify);
Parameters.Insert("TableName" , "DocumentsForOutgoingPayment");
Parameters.Insert("Ref" , Object.Ref);

4
IRP/src/CommonModules/DocCashReceiptClient/Module.bsl
View File

@@ -293,7 +293,7 @@ Procedure PaymentListBasisDocumentStartChoice(Object, Form, Item, ChoiceData, St
NotifyParameters = New Structure("Object, Form", Object, Form);
NotifyParameters.Insert("CurrentData", CurrentData);
Notify = New NotifyDescription("PaymentListBasisDocumentStartChoiceEnd", ThisObject, NotifyParameters);
Notify = New CallbackDescription("PaymentListBasisDocumentStartChoiceEnd", ThisObject, NotifyParameters);
Parameters.Insert("Notify", Notify);
Parameters.Insert("TableName", "DocumentsForIncomingPayment");
Parameters.Insert("OpeningEntryTableName1", "AccountPayableByDocuments");
@@ -467,7 +467,7 @@ Procedure PaymentListOrderStartChoice(Object, Form, Item, ChoiceData, StandardPr
NotifyParameters = New Structure("Object, Form", Object, Form);
NotifyParameters.Insert("CurrentData", CurrentData);
Notify = New NotifyDescription("PaymentListOrderStartChoiceEnd", ThisObject, NotifyParameters);
Notify = New CallbackDescription("PaymentListOrderStartChoiceEnd", ThisObject, NotifyParameters);
Parameters.Insert("Notify" , Notify);
Parameters.Insert("TableName" , "DocumentsForIncomingPayment");
Parameters.Insert("Ref" , Object.Ref);

4
IRP/src/CommonModules/DocChequeBondTransactionClient/Module.bsl
View File

@@ -335,7 +335,7 @@ Procedure ChequeBondsBasisDocumentStartChoice(Object, Form, Item, ChoiceData, St
Parameters.Insert("FilterFromCurrentData", "Partner, Agreement");
NotifyParameters = New Structure("Object, Form", Object, Form);
Notify = New NotifyDescription("ChequeBondsBasisDocumentStartChoiceEnd", ThisObject, NotifyParameters);
Notify = New CallbackDescription("ChequeBondsBasisDocumentStartChoiceEnd", ThisObject, NotifyParameters);
Parameters.Insert("Notify", Notify);
IsPartnerCheque = ServiceSystemServer.GetObjectAttribute(CurrentData.Cheque, "Type")
@@ -419,7 +419,7 @@ Procedure ChequeBondsOrderStartChoice(Object, Form, Item, ChoiceData, StandardPr
Parameters.Insert("FilterFromCurrentData", "Partner, Agreement");
NotifyParameters = New Structure("Object, Form", Object, Form);
Notify = New NotifyDescription("ChequeBondsOrderStartChoiceEnd", ThisObject, NotifyParameters);
Notify = New CallbackDescription("ChequeBondsOrderStartChoiceEnd", ThisObject, NotifyParameters);
Parameters.Insert("Notify" , Notify);
If IsPartnerCheque Then

2
IRP/src/CommonModules/DocPayrollClient/Module.bsl
View File

@@ -234,7 +234,7 @@ Procedure ChoiceByAccrual(Object, Form) Export
EndDo;
OpenParameters.Insert("ArrayOfEmployee", ArrayOfEmployee);
Notify = New NotifyDescription("ChoiceByAccrualEnd", ThisObject,New Structure("Object, Form", Object, Form));
Notify = New CallbackDescription("ChoiceByAccrualEnd", ThisObject,New Structure("Object, Form", Object, Form));
OpenForm("Document.Payroll.Form.ChoiceByAccrualForm", OpenParameters, Form, New UUID(), , ,
Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

4
IRP/src/CommonModules/DocPhysicalInventoryClient/Module.bsl
View File

@@ -92,8 +92,8 @@ Procedure CreatePhysicalCount(ObjectRef) Export
AddInfo = New Structure("ObjectRef", ObjectRef);
AddInfo.Insert("CountDocsToCreate", CountDocsToCreate);
NotifyDescription = New NotifyDescription("CreatePhysicalCountEnd", ThisObject, AddInfo);
ShowInputNumber(NotifyDescription, CountDocsToCreate, R().QuestionToUser_017, 3, 0);
CallbackDescription = New CallbackDescription("CreatePhysicalCountEnd", ThisObject, AddInfo);
ShowInputNumber(CallbackDescription, CountDocsToCreate, R().QuestionToUser_017, 3, 0);
EndProcedure
Procedure CreatePhysicalCountEnd(CountDocsToCreate, AdditionalParameters) Export

4
IRP/src/CommonModules/DocSalesOrderClient/Module.bsl
View File

@@ -412,8 +412,8 @@ Procedure SetProcurementMethods(Object, Form, Command) Export
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form", Form);
NotifyDescription = New NotifyDescription("PickupProcurementEnd", ThisObject, NotifyParameters);
OpenForm("Enum.ProcurementMethods.ChoiceForm", , Form, , , , NotifyDescription);
CallbackDescription = New CallbackDescription("PickupProcurementEnd", ThisObject, NotifyParameters);
OpenForm("Enum.ProcurementMethods.ChoiceForm", , Form, , , , CallbackDescription);
EndProcedure
Procedure PickupProcurementEnd(Result, AdditionalParameters) Export

10
IRP/src/CommonModules/DocumentsClient/Module.bsl
View File

@@ -723,10 +723,10 @@ Async Procedure OpenScanForm(Object, Form, Module) Export
NotifyParameters = New Structure;
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form", Form);
NotifyDescription = New NotifyDescription("OpenScanFormEnd", ThisObject, NotifyParameters);
CallbackDescription = New CallbackDescription("OpenScanFormEnd", ThisObject, NotifyParameters);
OpenFormParameters = New Structure;
OpenFormParameters.Insert("Basis", Object.Ref);
OpenForm("DataProcessor.ScanBarcode.Form.Form", OpenFormParameters, Form, , , , NotifyDescription, FormWindowOpeningMode.LockOwnerWindow);
OpenForm("DataProcessor.ScanBarcode.Form.Form", OpenFormParameters, Form, , , , CallbackDescription, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
Procedure OpenScanFormEnd(Result, AdditionalParameters) Export
@@ -1233,7 +1233,7 @@ Procedure OpenLinkedDocuments(Object, Form, TableName, DocumentColumnName, Quant
AdditionalParameters.Insert("Form" , Form);
AdditionalParameters.Insert("TableName" , TableName);
Notify = New NotifyDescription("LinkedDocumentsEnd", ThisObject, AdditionalParameters);
Notify = New CallbackDescription("LinkedDocumentsEnd", ThisObject, AdditionalParameters);
OpenForm("CommonForm.LinkedDocuments", FormParameters, Form, , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
@@ -1369,11 +1369,11 @@ Procedure OpenPickupItems(Object, Form) Export
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form", Form);
NotifyParameters.Insert("Filter" , New Structure("DisableIfIsService", False));
NotifyDescription = New NotifyDescription("PickupItemsEnd", ThisObject, NotifyParameters);
CallbackDescription = New CallbackDescription("PickupItemsEnd", ThisObject, NotifyParameters);
OpenFormParameters = PickupItemsParameters(Object, Form);
OpenFormParameters.Insert("AssociatedTableName", "ItemList");
OpenFormParameters.Insert("Object", Object);
OpenForm("CommonForm.PickUpItems", OpenFormParameters, Form, , , , NotifyDescription);
OpenForm("CommonForm.PickUpItems", OpenFormParameters, Form, , , , CallbackDescription);
EndProcedure
Function PickupItemsParameters(Object, Form)

4
IRP/src/CommonModules/HardwareClient/Module.bsl
View File

@@ -14,10 +14,10 @@ Procedure BeginGetDriver(NotifyOnClose, DriverInfo) Export
ObjectName.Add(ObjectName[1]);
Params = New Structure("ProgID, NotifyOnClose, EquipmentDriver", StrConcat(ObjectName, "."), NotifyOnClose,
DriverInfo.Driver);
NotifyDescription = New CallbackDescription("BeginAttachingAddIn_End", ThisObject, Params);
CallbackDescription = New CallbackDescription("BeginAttachingAddIn_End", ThisObject, Params);
LinkOnDriver = GetURL(DriverInfo.Driver, "Driver");
BeginAttachingAddIn(NotifyDescription, LinkOnDriver, ObjectName[1]);
BeginAttachingAddIn(CallbackDescription, LinkOnDriver, ObjectName[1]);
EndProcedure
// Begin attaching add in end.

6
IRP/src/CommonModules/IDInfoClient/Module.bsl
View File

@@ -6,7 +6,7 @@ Procedure IDInfoOpening(Item, StandardProcessing, Object, Form) Export
AddInfo.Insert("Object", Object);
AddInfo.Insert("Form", Form);
If Not ValueIsFilled(Object.Ref) Or Form.Modified Then
QuestionToUserNotify = New NotifyDescription("IDInfoOpeningNotify", ThisObject, AddInfo);
QuestionToUserNotify = New CallbackDescription("IDInfoOpeningNotify", ThisObject, AddInfo);
ShowQueryBox(QuestionToUserNotify, R().QuestionToUser_001, QuestionDialogMode.YesNo);
Else
IDInfoOpeningNotify(DialogReturnCode.Yes, AddInfo);
@@ -38,7 +38,7 @@ Procedure IDInfoOpeningNotify(Result, AddInfo = Undefined) Export
OpenFormArgs.Insert("ArrayOfCountry", ArrayOfCountry);
//@skip-warning
Notify = New NotifyDescription("StartEditIDInfo", AddInfo.Form, Args);
Notify = New CallbackDescription("StartEditIDInfo", AddInfo.Form, Args);
OpenForm("ChartOfCharacteristicTypes.IDInfoTypes.Form.SelectCountryForm", OpenFormArgs, AddInfo.Form, , , ,
Notify);
ElsIf ArrayOfCountry.Count() = 1 Then
@@ -71,7 +71,7 @@ Procedure StartEditIDInfo(Form, Result, Parameters) Export
//@skip-warning
AddDataProcServer.CallMethodAddDataProc(OpenFormArgs, New Structure("ClientCall", True));
Notify = New NotifyDescription("EndEditIDInfo", Form, Parameters);
Notify = New CallbackDescription("EndEditIDInfo", Form, Parameters);
AddDataProcClient.OpenFormAddDataProc(OpenFormArgs, Notify, "Form");
EndProcedure

4
IRP/src/CommonModules/LocalizationClient/Module.bsl
View File

@@ -27,7 +27,7 @@ Procedure DescriptionOpening(Object, Form, Item, StandardProcessing, Description
AdditionalParameters.Insert("Form", Form);
//@skip-check invocation-parameter-type-intersect
OpenForm("CommonForm.EditDescriptions", OpenArgs, Form, , , , New NotifyDescription("DescriptionEditEnd",
OpenForm("CommonForm.EditDescriptions", OpenArgs, Form, , , , New CallbackDescription("DescriptionEditEnd",
ThisObject, AdditionalParameters));
EndProcedure
@@ -51,7 +51,7 @@ Procedure DescriptionInTableOpening(TableRow, Form, Item, StandardProcessing) Ex
AdditionalParameters.Insert("Form", Form);
//@skip-check invocation-parameter-type-intersect
OpenForm("CommonForm.EditDescriptions", OpenArgs, Form, , , , New NotifyDescription("DescriptionEditEnd",
OpenForm("CommonForm.EditDescriptions", OpenArgs, Form, , , , New CallbackDescription("DescriptionEditEnd",
ThisObject, AdditionalParameters));
EndProcedure

6
IRP/src/CommonModules/OffersClient/Module.bsl
View File

@@ -1,7 +1,7 @@
Procedure OpenFormPickupSpecialOffers_ForDocument(Object, Form, NotifyEditFinish, AddInfo = Undefined) Export
OpenFormArgs = OffersClientServer.GetOpenFormArgsPickupSpecialOffers_ForDocument(Object);
NotifyDescription = New NotifyDescription(NotifyEditFinish, Form, AddInfo);
OpenForm("CommonForm.PickupSpecialOffers", New Structure("Info", OpenFormArgs), , , , , NotifyDescription,
CallbackDescription = New CallbackDescription(NotifyEditFinish, Form, AddInfo);
OpenForm("CommonForm.PickupSpecialOffers", New Structure("Info", OpenFormArgs), , , , , CallbackDescription,
FormWindowOpeningMode.LockWholeInterface);
EndProcedure
@@ -19,7 +19,7 @@ EndProcedure
Procedure OpenFormPickupSpecialOffers_ForRow(Object, CurrentRow, Form, NotifyEditFinish, AddInfo = Undefined) Export
OpenFormArgs = GetOpenFormArgsPickupSpecialOffers_ForRow(Object, CurrentRow);
OpenForm("CommonForm.PickupSpecialOffers", New Structure("Info", OpenFormArgs), Form, , , ,
New NotifyDescription(NotifyEditFinish, Form, AddInfo), FormWindowOpeningMode.LockWholeInterface);
New CallbackDescription(NotifyEditFinish, Form, AddInfo), FormWindowOpeningMode.LockWholeInterface);
EndProcedure
Function GetOpenFormArgsPickupSpecialOffers_ForRow(Object, CurrentRow) Export

2
IRP/src/CommonModules/PictureViewerClient/Module.bsl
View File

@@ -268,7 +268,7 @@ Procedure HTMLEvent(Form, Object, Val Data, AddInfo = Undefined) Export
If Data.value = "add_picture" Then
Upload(Form, Object);
ElsIf Data.value = "addImagesFromGallery" Then
NotifyOnClose = New NotifyDescription("AddPictureFromGallery", ThisObject, New Structure("Object, Form",
NotifyOnClose = New CallbackDescription("AddPictureFromGallery", ThisObject, New Structure("Object, Form",
Object, Form));
OpenForm("CommonForm.PictureGalleryForm", , ThisObject, , , , NotifyOnClose);
ElsIf Data.value = "update_slider" Then

4
IRP/src/CommonModules/RowIDInfoClient/Module.bsl
View File

@@ -268,7 +268,7 @@ Procedure OpenForm_LinkUnlinkDocumentRows(Object, Form, FormParameters,
NotifyParameters.Insert("Form", ThisObject);
OpenForm("CommonForm.LinkUnlinkDocumentRows", FormParameters, , , , ,
New NotifyDescription(ProcedureName, Form, NotifyParameters),
New CallbackDescription(ProcedureName, Form, NotifyParameters),
FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
@@ -279,7 +279,7 @@ Procedure OpenForm_AddLinkedDocumentRows(Object, Form, FormParameters,
NotifyParameters.Insert("Form", ThisObject);
OpenForm("CommonForm.AddLinkedDocumentRows", FormParameters, , , , ,
New NotifyDescription(ProcedureName, Form, NotifyParameters),
New CallbackDescription(ProcedureName, Form, NotifyParameters),
FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

4
IRP/src/CommonModules/SerialLotNumberClient/Module.bsl
View File

@@ -5,7 +5,7 @@ Procedure PresentationStartChoice(Object, Form, Item, ChoiceData, StandardProces
Return;
EndIf;
Notify = New NotifyDescription("OnFinishEditSerialLotNumbers", ThisObject,
Notify = New CallbackDescription("OnFinishEditSerialLotNumbers", ThisObject,
New Structure("Object, Form, AddInfo", Object, Form, AddInfo));
OpeningParameters = New Structure();
OpeningParameters.Insert("Item" , CurrentData.Item);
@@ -37,7 +37,7 @@ Procedure StartChoiceSingle(Object, Form, Item, ChoiceData, StandardProcessing,
Return;
EndIf;
Notify = New NotifyDescription("OnFinishEditSerialLotNumbersSingle", ThisObject,
Notify = New CallbackDescription("OnFinishEditSerialLotNumbersSingle", ThisObject,
New Structure("Object, Form, AddInfo", Object, Form, AddInfo));
OpeningParameters = New Structure();
OpeningParameters.Insert("Item", CurrentData.Item);

2
IRP/src/CommonModules/SourceOfOriginClient/Module.bsl
View File

@@ -6,7 +6,7 @@ Procedure PresentationStartChoice(Object, Form, Item, ChoiceData, StandardProces
Return;
EndIf;
Notify = New NotifyDescription("OnFinishEditSourceOfOrigins", ThisObject, New Structure("Object, Form", Object, Form));
Notify = New CallbackDescription("OnFinishEditSourceOfOrigins", ThisObject, New Structure("Object, Form", Object, Form));
OpeningParameters = New Structure();
OpeningParameters.Insert("Item" , CurrentData.Item);
OpeningParameters.Insert("ItemKey" , CurrentData.ItemKey);

2
IRP/src/CommonModules/UsersEventClient/Module.bsl
View File

@@ -9,7 +9,7 @@ Procedure OpenChangePasswordForm() Export
OpenForm("Catalog.Users.Form.InputPassword",
New Structure("Password", ""),
ThisObject, , , ,
New NotifyDescription("CloseChangePasswordForm", ThisObject));
New CallbackDescription("CloseChangePasswordForm", ThisObject));
EndProcedure

20
IRP/src/CommonModules/ViewClient_V2/Module.bsl
View File

@@ -471,7 +471,7 @@ Procedure __tmp_CommonDocuments_OnChainComplete(Parameters, IsRetail)
If QuestionsParameters.Count() Then
NotifyParameters = New Structure("Parameters, ChangedPoints", Parameters, ChangedPoints);
Notify = New NotifyDescription("QuestionsOnUserChangeContinue", ThisObject, NotifyParameters);
Notify = New CallbackDescription("QuestionsOnUserChangeContinue", ThisObject, NotifyParameters);
OpenForm("CommonForm.UpdateItemListInfo",
New Structure("QuestionsParameters", QuestionsParameters),
Parameters.Form, , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
@@ -497,7 +497,7 @@ Procedure __tmp_MoneyTransfer_OnChainComplete(Parameters)
Or IsChangedProperty(Parameters, "Receiver").IsChanged) Then
NotifyParameters = New Structure("Parameters", Parameters);
ShowQueryBox(New NotifyDescription("__tmp_MoneyTransfer_CompanyOnUserChangeContinue", ThisObject, NotifyParameters),
ShowQueryBox(New CallbackDescription("__tmp_MoneyTransfer_CompanyOnUserChangeContinue", ThisObject, NotifyParameters),
R().QuestionToUser_015, QuestionDialogMode.OKCancel);
Else
__tmp_MoneyTransfer_CommitChanges(Parameters);
@@ -518,7 +518,7 @@ Procedure __tmp_MoneyTransfer_OnChainComplete(Parameters)
Or IsChangedProperty(Parameters, "ReceiveAmount").IsChanged) Then
NotifyParameters = New Structure("Parameters", Parameters);
ShowQueryBox(New NotifyDescription("__tmp_MoneyTransfer_CashTransferOrderOnUserChangeContinue", ThisObject, NotifyParameters),
ShowQueryBox(New CallbackDescription("__tmp_MoneyTransfer_CashTransferOrderOnUserChangeContinue", ThisObject, NotifyParameters),
R().QuestionToUser_023, QuestionDialogMode.OKCancel);
Else
__tmp_MoneyTransfer_CommitChanges(Parameters);
@@ -564,7 +564,7 @@ Procedure __tmp_ProductionPlanning_OnChainComplete(Parameters)
If ChangedPropertyInfo.IsChanged And ValueIsFilled(ChangedPropertyInfo.OldValue) Then
NotifyParameters = New Structure("Parameters", Parameters);
ShowQueryBox(New NotifyDescription("__tmp_ProductionPlanning_BusinessUnitOrDateOnUserChangeContinue", ThisObject, NotifyParameters),
ShowQueryBox(New CallbackDescription("__tmp_ProductionPlanning_BusinessUnitOrDateOnUserChangeContinue", ThisObject, NotifyParameters),
R().QuestionToUser_024, QuestionDialogMode.YesNo);
Else
__tmp_ProductionPlanning_CommitChanges(Parameters);
@@ -601,7 +601,7 @@ Procedure __tmp_CashTransferOrder_OnChainComplete(Parameters)
Or IsChangedProperty(Parameters, "Receiver").IsChanged) Then
NotifyParameters = New Structure("Parameters", Parameters);
ShowQueryBox(New NotifyDescription("__tmp_CashTransferOrder_CompanyOnUserChangeContinue", ThisObject, NotifyParameters),
ShowQueryBox(New CallbackDescription("__tmp_CashTransferOrder_CompanyOnUserChangeContinue", ThisObject, NotifyParameters),
R().QuestionToUser_015, QuestionDialogMode.OKCancel);
Else
__tmp_CashTransferOrder_CommitChanges(Parameters);
@@ -638,7 +638,7 @@ Procedure __tmp_CashExpenseRevenue_OnChainComplete(Parameters)
If IsChangedProperty(Parameters, "PaymentList.Currency").IsChanged
And Parameters.Object.PaymentList.Count() Then
NotifyParameters = New Structure("Parameters", Parameters);
ShowQueryBox(New NotifyDescription("__tmp_CashExpenseRevenue_AccountOnUserChangeContinue", ThisObject, NotifyParameters),
ShowQueryBox(New CallbackDescription("__tmp_CashExpenseRevenue_AccountOnUserChangeContinue", ThisObject, NotifyParameters),
R().QuestionToUser_006, QuestionDialogMode.YesNo);
Else
__tmp_CashExpenseRevenue_CommitChanges(Parameters);
@@ -649,7 +649,7 @@ Procedure __tmp_CashExpenseRevenue_OnChainComplete(Parameters)
If IsChangedProperty(Parameters, "PaymentList.VatRate").IsChanged
And Parameters.Object.PaymentList.Count() Then
NotifyParameters = New Structure("Parameters", Parameters);
ShowQueryBox(New NotifyDescription("__tmp_CashExpenseRevenue_DateOnUserChangeContinue", ThisObject, NotifyParameters),
ShowQueryBox(New CallbackDescription("__tmp_CashExpenseRevenue_DateOnUserChangeContinue", ThisObject, NotifyParameters),
R().QuestionToUser_025, QuestionDialogMode.YesNo);
Else
__tmp_CashExpenseRevenue_CommitChanges(Parameters);
@@ -663,7 +663,7 @@ Procedure __tmp_CashExpenseRevenue_OnChainComplete(Parameters)
QuestionsParameters.Add(New Structure("Action, QuestionText", "TaxRates", R().QuestionToUser_031));
NotifyParameters = New Structure("Parameters, ChangedPoints", Parameters, ChangedPoints);
Notify = New NotifyDescription("QuestionsOnUserChangeContinue", ThisObject, NotifyParameters);
Notify = New CallbackDescription("QuestionsOnUserChangeContinue", ThisObject, NotifyParameters);
OpenForm("CommonForm.UpdateItemListInfo",
New Structure("QuestionsParameters", QuestionsParameters),
Parameters.Form, , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
@@ -714,7 +714,7 @@ Procedure __tmp_BankCashPaymentReceipt_OnChainComplete(Parameters)
If IsChangedProperty(Parameters, "TransactionType").IsChanged
And Parameters.Object.PaymentList.Count() And Not Parameters.Object.DetailsByRow Then
NotifyParameters = New Structure("Parameters", Parameters);
ShowQueryBox(New NotifyDescription("__tmp_BankCashPaymentReceipt_TransactionTypeOnUserChangeContinue", ThisObject, NotifyParameters),
ShowQueryBox(New CallbackDescription("__tmp_BankCashPaymentReceipt_TransactionTypeOnUserChangeContinue", ThisObject, NotifyParameters),
R().QuestionToUser_014, QuestionDialogMode.OKCancel);
Else
__tmp_BankCashPaymentReceipt_CommitChanges(Parameters);
@@ -766,7 +766,7 @@ Procedure __tmp_GoodsShipmentReceipt_OnChainComplete(Parameters)
If NeedQueryStoreOnUserChange(Parameters) Then
// refill question ItemList.Store
NotifyParameters = New Structure("Parameters", Parameters);
ShowQueryBox(New NotifyDescription("__tmp_GoodsShipmentReceipt_StoreOnUserChangeContinue", ThisObject, NotifyParameters),
ShowQueryBox(New CallbackDescription("__tmp_GoodsShipmentReceipt_StoreOnUserChangeContinue", ThisObject, NotifyParameters),
R().QuestionToUser_005, QuestionDialogMode.YesNoCancel);
Else
__tmp_GoodsShipmentReceipt_CommitChanges(Parameters);

4
IRP/src/DataProcessors/AttachedFilesToDocumentsControl/Forms/Form/Module.bsl
View File

@@ -944,8 +944,8 @@ Procedure AttachOther(Command)
Structure = GetOtherAttachmentSettings(CurrentDocStructure);
NotifyDescription = New NotifyDescription("AfterOtherAttachmentInput", ThisObject, Structure);
ShowInputString(NotifyDescription, "", R().InfoMessage_037, , True);
CallbackDescription = New CallbackDescription("AfterOtherAttachmentInput", ThisObject, Structure);
ShowInputString(CallbackDescription, "", R().InfoMessage_037, , True);
EndProcedure

2
IRP/src/DataProcessors/CreateRegExp/Forms/Form/Module.bsl
View File

@@ -357,7 +357,7 @@ Procedure SetRegExpValue(Type, FindElement)
FindElement.RegExp = "(" + FindElement.RegExp + ")";
OpenParameter = New Structure("PartRow", FindElement);
OpenForm("Catalog.ExternalFunctions.ChoiceForm", , , , , ,
New NotifyDescription("SetExternalFunction", ThisObject, OpenParameter),
New CallbackDescription("SetExternalFunction", ThisObject, OpenParameter),
FormWindowOpeningMode.LockOwnerWindow);
Else
FindElement.RegExp = ".*";

2
IRP/src/DataProcessors/InternalCommands/Forms/LoadDataFromTable/Module.bsl
View File

@@ -47,7 +47,7 @@ Procedure RunCommandAction(Targets, Form, CommandFormItem, MainAttribute, AddInf
AddInfoNotify.Insert("DocumentObject", MainAttribute);
AddInfoNotify.Insert("TableForLoading", TableForLoading);
NotifyContext = ?(Form[CommandFormItem.CommandName + "_UseFormNotify"] = True, Form, ThisObject);
EndNotify = New NotifyDescription(Form[CommandFormItem.CommandName + "_EndNotify"], NotifyContext, AddInfoNotify);
EndNotify = New CallbackDescription(Form[CommandFormItem.CommandName + "_EndNotify"], NotifyContext, AddInfoNotify);
FormParameters = New Structure;
FormParameters.Insert("FieldsForLoadData", Form[CommandFormItem.CommandName + "_Fields"]);

4
IRP/src/DataProcessors/MobileCreateDocument/Forms/Form/Module.bsl
View File

@@ -59,7 +59,7 @@ Async Procedure SearchByBarcodeEnd(Result, AdditionalParameters) Export
If Row.UseSerialLotNumber And Not ValueIsFilled(Row.SerialLotNumber) Then
MobileSubsystem.Play(Sound.NeedSerialLot);
EndIf;
NotifyOnClosing = New NotifyDescription("OnEditQuantityEnd", ThisObject);
NotifyOnClosing = New CallbackDescription("OnEditQuantityEnd", ThisObject);
FormParameters = New Structure("FillingData, UseSerialLot", Row, Row.UseSerialLotNumber);
OpenForm("DataProcessor.MobileCreateDocument.Form.RowForm", FormParameters, ThisObject, , , , NotifyOnClosing);
Else
@@ -114,7 +114,7 @@ Procedure ItemListOnChange(Item) Export
Return;
EndIf;
NotifyOnClosing = New NotifyDescription("OnEditQuantityEnd", ThisObject);
NotifyOnClosing = New CallbackDescription("OnEditQuantityEnd", ThisObject);
FormParameters = New Structure("FillingData, UseSerialLot", CurrentRow, CurrentRow.UseSerialLotNumber);
OpenForm("DataProcessor.MobileCreateDocument.Form.RowForm", FormParameters, ThisObject, , , , NotifyOnClosing);
EndProcedure

2
IRP/src/DataProcessors/MobileCreateDocument/Forms/RowForm/Module.bsl
View File

@@ -78,7 +78,7 @@ Procedure SerialLotNumberCreating(Item, StandardProcessing)
FormParameters.Insert("ItemKey", ThisObject.ItemKey);
FormParameters.Insert("Description", Item.EditText);
OpenForm("Catalog.SerialLotNumbers.ObjectForm", FormParameters, ThisObject, , , , New NotifyDescription("AfterCreateNewSerial", ThisObject));
OpenForm("Catalog.SerialLotNumbers.ObjectForm", FormParameters, ThisObject, , , , New CallbackDescription("AfterCreateNewSerial", ThisObject));
EndProcedure
&AtClient

8
IRP/src/DataProcessors/MobileInvent/Forms/Form/Module.bsl
View File

@@ -29,7 +29,7 @@ EndProcedure
&AtClient
Procedure InputBarcode(Command)
Barcode = 0;
ShowInputNumber(New NotifyDescription("AddBarcodeAfterEnd", ThisObject), Barcode, R().SuggestionToUser_2);
ShowInputNumber(New CallbackDescription("AddBarcodeAfterEnd", ThisObject), Barcode, R().SuggestionToUser_2);
EndProcedure
&AtClient
@@ -242,7 +242,7 @@ Procedure StartEditQuantity(Val RowSelected, AutoMode = False)
Structure.Insert("Quantity", ItemListRow.PhysCount);
Structure.Insert("RowID", RowSelected);
Structure.Insert("AutoMode", AutoMode);
NotifyOnClosing = New NotifyDescription("OnEditQuantityEnd", ThisObject);
NotifyOnClosing = New CallbackDescription("OnEditQuantityEnd", ThisObject);
OpenForm("DataProcessor.MobileInvent.Form.RowForm", Structure, ThisObject, , , , NotifyOnClosing);
EndProcedure
@@ -264,14 +264,14 @@ Procedure CompleteLocation()
CommonFunctionsClientServer.ShowUsersMessage(R().InfoMessage_011);
SaveAndUpdateDocument();
Else
NotifyDescription = New NotifyDescription("InputQuantityEnd", ThisObject);
CallbackDescription = New CallbackDescription("InputQuantityEnd", ThisObject);
If Not SecondTryToInputQuantity Then
Write();
Text = R().QuestionToUser_018;
Else
Text = R().InfoMessage_009;
EndIf;
ShowInputNumber(NotifyDescription, "", Text);
ShowInputNumber(CallbackDescription, "", Text);
EndIf;
EndProcedure

18
IRP/src/DataProcessors/ObjectPropertyEditor/Forms/Form/Module.bsl
View File

@@ -141,7 +141,7 @@ Procedure PropertiesTableValueStartChoice(Item, ChoiceData, StandardProcessing)
OpenForm("DataProcessor.ObjectPropertyEditor.Form.EditMultilineText",
New Structure("ExternalText", CurrentFieldValue),
ThisObject, , , ,
New NotifyDescription("OnEditedMultilineTextEnd",
New CallbackDescription("OnEditedMultilineTextEnd",
ThisObject,
New Structure("SelectedRows, FieldName", SelectedRows, FieldName)),
FormWindowOpeningMode.LockOwnerWindow);
@@ -188,7 +188,7 @@ Procedure FieldSettings(Command)
OpenForm("DataProcessor.ObjectPropertyEditor.Form.FieldSettings",
FormParameters,
ThisObject, , , ,
New NotifyDescription("FieldSettingsEnd", ThisObject),
New CallbackDescription("FieldSettingsEnd", ThisObject),
FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
@@ -305,7 +305,7 @@ Procedure CopyThisRowValueToMarkedRows(Command)
New Structure("RowData", RowDescription),
ThisObject,
UUID, , ,
New NotifyDescription("CopyThisRowValueToMarkedRowsEnd", ThisObject),
New CallbackDescription("CopyThisRowValueToMarkedRowsEnd", ThisObject),
FormWindowOpeningMode.LockWholeInterface);
EndProcedure
@@ -354,7 +354,7 @@ Procedure FilterFromQuery(Command)
Return;
#EndIf
QueryWizard.Show(New NotifyDescription("QueryWizardClose", ThisObject));
QueryWizard.Show(New CallbackDescription("QueryWizardClose", ThisObject));
EndProcedure
&AtClient
@@ -368,7 +368,7 @@ EndProcedure
#EndRegion
#Region NotifyDescriptions
#Region CallbackDescriptions
// On edited multiline text end.
//
@@ -716,7 +716,7 @@ Procedure SettingNewValueForRows(SelectedRows)
OpenForm("DataProcessor.ObjectPropertyEditor.Form.EditMultilineText",
New Structure("ExternalText", CurrentRowValue),
ThisObject, , , ,
New NotifyDescription("OnEditedMultilineTextEnd",
New CallbackDescription("OnEditedMultilineTextEnd",
ThisObject,
New Structure("SelectedRows, FieldName", SelectedRows, Field)),
FormWindowOpeningMode.LockOwnerWindow);
@@ -725,7 +725,7 @@ Procedure SettingNewValueForRows(SelectedRows)
OpenForm("DataProcessor.ObjectPropertyEditor.Form.EditValueList",
New Structure("List, ItemType", CurrentRowValue, ClearType),
ThisObject, , , ,
New NotifyDescription("SetValueForSelectedRowsEnd",
New CallbackDescription("SetValueForSelectedRowsEnd",
ThisObject,
New Structure("SelectedRows, FieldName", SelectedRows, Field)),
FormWindowOpeningMode.LockOwnerWindow);
@@ -737,14 +737,14 @@ Procedure SettingNewValueForRows(SelectedRows)
OpenForm(FieldDescription.ValueChoiceForm,
OpenFormParameters,
ThisObject, , , ,
New NotifyDescription("SetValueForSelectedRowsEnd",
New CallbackDescription("SetValueForSelectedRowsEnd",
ThisObject,
New Structure("FieldName, SelectedRows", Field, SelectedRows)),
FormWindowOpeningMode.LockOwnerWindow);
Else
ShowInputValue(
New NotifyDescription("SetValueForSelectedRowsEnd",
New CallbackDescription("SetValueForSelectedRowsEnd",
ThisObject,
New Structure("FieldName, SelectedRows", Field, SelectedRows)),
CurrentRowValue,

2
IRP/src/DataProcessors/ObjectPropertyEditor/Forms/PropertyPackEditor/Module.bsl
View File

@@ -75,7 +75,7 @@ Procedure PropertiesTableValueStartChoice(Item, ChoiceData, StandardProcessing)
OpenForm("DataProcessor.ObjectPropertyEditor.Form.EditMultilineText",
New Structure("ExternalText", CurrentFieldValue),
ThisObject, , , ,
New NotifyDescription("OnEditedMultilineTextEnd",
New CallbackDescription("OnEditedMultilineTextEnd",
ThisObject,
New Structure("SelectedRows", SelectedRows)),
FormWindowOpeningMode.LockOwnerWindow);

30
IRP/src/DataProcessors/PointOfSale/Forms/Form/Module.bsl
View File

@@ -194,11 +194,11 @@ Procedure CloseSession(Command)
, CommonFunctionsServer.GetRefAttribute(Object.Workstation, "AutoCreateMoneyTransferAtSessionClosing"));
FormParameters.Insert("ConsolidatedRetailSales", Object.ConsolidatedRetailSales);
NotifyDescription = New NotifyDescription("CloseSessionFinish", ThisObject);
CallbackDescription = New CallbackDescription("CloseSessionFinish", ThisObject);
OpenForm(
"DataProcessor.PointOfSale.Form.SessionClosing",
FormParameters, ThisObject, UUID, , , NotifyDescription, FormWindowOpeningMode.LockWholeInterface);
FormParameters, ThisObject, UUID, , , CallbackDescription, FormWindowOpeningMode.LockWholeInterface);
EndProcedure
&AtClient
@@ -539,7 +539,7 @@ EndProcedure
Procedure ChangeRollbackRight(Command)
If Not Items.ChangeRollbackRight.Check Then
OpenForm("DataProcessor.PointOfSale.Form.ChangeRight", , ThisObject, , , ,
New NotifyDescription("ChangeRightEnd", ThisObject ) , FormWindowOpeningMode.LockOwnerWindow);
New CallbackDescription("ChangeRightEnd", ThisObject ) , FormWindowOpeningMode.LockOwnerWindow);
Else
Items.ChangeRollbackRight.Check = False;
ThisObject.KeepRights = False;
@@ -576,7 +576,7 @@ Procedure qPayment(Command)
Return;
EndIf;
OpenFormNotifyDescription = New NotifyDescription("PaymentFormClose", ThisObject);
OpenFormCallbackDescription = New CallbackDescription("PaymentFormClose", ThisObject);
ObjectParameters = New Structure();
ObjectParameters.Insert("Amount", Object.ItemList.Total("TotalAmount"));
ObjectParameters.Insert("Branch", Object.Branch);
@@ -589,7 +589,7 @@ Procedure qPayment(Command)
ObjectParameters.Insert("Discount", Object.ItemList.Total("OffersAmount"));
ObjectParameters.Insert("ConsolidatedRetailSales", ConsolidatedRetailSales);
OpenForm("DataProcessor.PointOfSale.Form.Payment", ObjectParameters, ThisObject, UUID, , ,
OpenFormNotifyDescription, FormWindowOpeningMode.LockOwnerWindow);
OpenFormCallbackDescription, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
&AtServer
@@ -651,7 +651,7 @@ Procedure Advance(Command)
Return;
EndIf;
OpenFormNotifyDescription = New NotifyDescription("AdvanceFormClose", ThisObject);
OpenFormCallbackDescription = New CallbackDescription("AdvanceFormClose", ThisObject);
ObjectParameters = New Structure();
ObjectParameters.Insert("Amount", Object.ItemList.Total("TotalAmount"));
ObjectParameters.Insert("Branch", Object.Branch);
@@ -662,7 +662,7 @@ Procedure Advance(Command)
ObjectParameters.Insert("Company", Object.Company);
ObjectParameters.Insert("ConsolidatedRetailSales", ConsolidatedRetailSales);
OpenForm("DataProcessor.PointOfSale.Form.Payment", ObjectParameters, ThisObject, UUID, , ,
OpenFormNotifyDescription, FormWindowOpeningMode.LockWholeInterface);
OpenFormCallbackDescription, FormWindowOpeningMode.LockWholeInterface);
EndProcedure
&AtClient
@@ -814,7 +814,7 @@ Procedure ItemListControlCodeStringStateClick(SerialLotNumberForCheck = Undefine
//@skip-check unknown-method-property
Params.Insert("LineNumber", CurrentData.LineNumber);
Params.Insert("isReturn", isReturn);
Notify = New NotifyDescription("ItemListControlCodeStringStateOpeningEnd", ThisObject, Params);
Notify = New CallbackDescription("ItemListControlCodeStringStateOpeningEnd", ThisObject, Params);
OpenForm("CommonForm.CodeStringCheck", Params, ThisObject, , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
@@ -1562,7 +1562,7 @@ Procedure CashInListSelection(Item, RowSelected, Field, StandardProcessing)
"Document.CashReceipt.ObjectForm",
New Structure("FillingValues", FillingData), ,
New UUID(), , ,
New NotifyDescription("CreateCashInFinish", ThisObject),
New CallbackDescription("CreateCashInFinish", ThisObject),
FormWindowOpeningMode.LockWholeInterface);
EndProcedure
@@ -1649,7 +1649,7 @@ Procedure CreateCashOut(Command, AutoCreateMoneyTransfer = False)
OpenForm("DataProcessor.PointOfSale.Form.CashOut",
OpenFormParameters, ,
UUID, , ,
New NotifyDescription("CreateCashOutFinish", ThisObject),
New CallbackDescription("CreateCashOutFinish", ThisObject),
FormWindowOpeningMode.LockWholeInterface);
EndProcedure
@@ -1768,9 +1768,9 @@ Procedure FindRetailBasis(RowID)
FormParameters.Insert("ItemKey", CurrentRow.ItemKey);
EndIf;
NotifyDescription = New NotifyDescription("FindRetailBasisFinish", ThisObject, RowID);
CallbackDescription = New CallbackDescription("FindRetailBasisFinish", ThisObject, RowID);
OpenForm("CommonForm.SelectionRetailBasisForReturn",
FormParameters, ThisObject, UUID, , , NotifyDescription, FormWindowOpeningMode.LockWholeInterface);
FormParameters, ThisObject, UUID, , , CallbackDescription, FormWindowOpeningMode.LockWholeInterface);
EndProcedure
&AtClient
@@ -2177,10 +2177,10 @@ EndProcedure
&AtClient
Procedure SelectBasisDocument(Command)
OpenFormNotifyDescription = New NotifyDescription("SelectBasisDocumentClose", ThisObject);
OpenFormCallbackDescription = New CallbackDescription("SelectBasisDocumentClose", ThisObject);
FormParameters = New Structure();
FormParameters.Insert("RetailCustomer", Object.RetailCustomer);
OpenForm("DataProcessor.PointOfSale.Form.SelectBasisDocument", FormParameters, ThisObject, , , , OpenFormNotifyDescription, FormWindowOpeningMode.LockOwnerWindow);
OpenForm("DataProcessor.PointOfSale.Form.SelectBasisDocument", FormParameters, ThisObject, , , , OpenFormCallbackDescription, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
// Select basis document close.
@@ -2361,7 +2361,7 @@ Procedure OpenPostponedReceipt(Command)
Return;
EndIf;
Notification = New NotifyDescription("SelectPostponedReceiptNotify", ThisObject);
Notification = New CallbackDescription("SelectPostponedReceiptNotify", ThisObject);
OpenForm("DataProcessor.PointOfSale.Form.SelectPostponedReceipt",
New Structure("Branch", Object.Branch), , , , ,
Notification, FormWindowOpeningMode.LockWholeInterface);

10
IRP/src/DataProcessors/PointOfSale/Forms/Payment/Module.bsl
View File

@@ -293,7 +293,7 @@ Async Procedure Enter(Command)
FormCanBeClosed = True;
Items.Enter.Enabled = False;
ExecuteNotifyProcessing(OnCloseNotifyDescription, ReturnValue);
ExecuteNotifyProcessing(OnCloseCallbackDescription, ReturnValue);
EndProcedure
&AtClient
@@ -419,7 +419,7 @@ Procedure OpenPaymentForm(PaymentTypesTable, PaymentType, CertStatus = Undefined
If PaymentTypesTable.Count() > 1 Then
NotifyParameters = New Structure();
NotifyParameters.Insert("CertStatus", CertStatus);
NotifyDescription = New NotifyDescription("FillPayments", ThisObject, NotifyParameters);
CallbackDescription = New CallbackDescription("FillPayments", ThisObject, NotifyParameters);
PayButtons = New Array();
For Each CollectionItem In PaymentTypesTable Do
ButtonSettings = POSClient.ButtonSettings();
@@ -431,7 +431,7 @@ Procedure OpenPaymentForm(PaymentTypesTable, PaymentType, CertStatus = Undefined
OpeningFormParameters = New Structure();
OpeningFormParameters.Insert("PayButtons", PayButtons);
OpenForm("DataProcessor.PointOfSale.Form.PaymentTypes", OpeningFormParameters, ThisObject, UUID, , ,
NotifyDescription, FormWindowOpeningMode.LockWholeInterface);
CallbackDescription, FormWindowOpeningMode.LockWholeInterface);
Else
ButtonSettings = POSClient.ButtonSettings();
@@ -890,7 +890,7 @@ Procedure Payment_CancelPaymentByPaymentCardManual(Command)
Return;
EndIf;
Notify = New NotifyDescription(
Notify = New CallbackDescription(
"Payment_CancelPaymentByPaymentCardManual_End", ThisObject, PaymentRow);
OpenForm(
"DataProcessor.PointOfSale.Form.CancellationConfirmation",
@@ -943,7 +943,7 @@ Async Procedure Payment_RevertLastPaymentManual(Command)
Return;
EndIf;
Notify = New NotifyDescription(
Notify = New CallbackDescription(
"Payment_RevertLastPaymentManual_End", ThisObject, PaymentRow);
OpenForm(
"DataProcessor.PointOfSale.Form.CancellationConfirmation",

2
IRP/src/DataProcessors/PointOfSale/Forms/SessionClosing/Module.bsl
View File

@@ -193,7 +193,7 @@ EndProcedure
Procedure EditDoc(Command)
CurrentRow = Items.ListOfWarningDocuments.CurrentRow;
Notify = New NotifyDescription("EditDocFinish", ThisObject);
Notify = New CallbackDescription("EditDocFinish", ThisObject);
If TypeOf(CurrentRow) = Type("DocumentRef.RetailSalesReceipt") Then
OpenForm("Document.RetailSalesReceipt.Form.DocumentForm",
New Structure("Key", CurrentRow),

2
IRP/src/DataProcessors/ReplaceSerialLotNumber/Forms/Form/Module.bsl
View File

@@ -9,7 +9,7 @@ EndProcedure
&AtClient
Procedure Load(Command)
_notify = New NotifyDescription("OnLoadContinue", ThisObject);
_notify = New CallbackDescription("OnLoadContinue", ThisObject);
OpenForm("DataProcessor.ReplaceSerialLotNumber.Form.LoadSerialLotNumbers", , ThisObject, , , , _notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

2
IRP/src/DataProcessors/ScanBarcode/Forms/Form/Module.bsl
View File

@@ -316,7 +316,7 @@ Async Procedure SearchByBarcodeEnd(Result, AdditionalParameters) Export
If ThisObject.UseSerialLot And Row.UseSerialLotNumber And Not ValueIsFilled(Row.SerialLotNumber) Then
MobileSubsystem.Play(Sound.NeedSerialLot);
EndIf;
NotifyOnClosing = New NotifyDescription("OnEditQuantityEnd", ThisObject);
NotifyOnClosing = New CallbackDescription("OnEditQuantityEnd", ThisObject);
FormParameters = New Structure("FillingData, UseSerialLot",
Row, ThisObject.UseSerialLot And Row.UseSerialLotNumber);
OpenForm("DataProcessor.ScanBarcode.Form.RowForm", FormParameters, ThisObject, , , , NotifyOnClosing);

2
IRP/src/DataProcessors/ScanBarcode/Forms/RowForm/Module.bsl
View File

@@ -78,7 +78,7 @@ Procedure SerialLotNumberCreating(Item, StandardProcessing)
FormParameters.Insert("ItemKey", ThisObject.ItemKey);
FormParameters.Insert("Description", Item.EditText);
OpenForm("Catalog.SerialLotNumbers.ObjectForm", FormParameters, ThisObject, , , , New NotifyDescription("AfterCreateNewSerial", ThisObject));
OpenForm("Catalog.SerialLotNumbers.ObjectForm", FormParameters, ThisObject, , , , New CallbackDescription("AfterCreateNewSerial", ThisObject));
EndProcedure
&AtClient

2
IRP/src/Documents/AdditionalAccrual/Forms/DocumentForm/Module.bsl
View File

@@ -248,7 +248,7 @@ Procedure EditCurrencies(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

8
IRP/src/Documents/AdditionalCostAllocation/Forms/DocumentForm/Module.bsl
View File

@@ -207,7 +207,7 @@ EndProcedure
&AtClient
Procedure CostDocumentsDocumentStartChoice(Item, ChoiceData, StandardProcessing)
StandardProcessing = False;
Notify = New NotifyDescription("CostDocumentsDocumentStartChoiceEnd", ThisObject);
Notify = New CallbackDescription("CostDocumentsDocumentStartChoiceEnd", ThisObject);
FormParameters = New Structure();
FormParameters.Insert("Company" , Object.Company);
FormParameters.Insert("Ref" , Object.Ref);
@@ -321,7 +321,7 @@ Procedure AllocationRowsBeforeAddRow(Item, Cancel, Clone, Parent, IsFolder, Para
Return;
EndIf;
Notify = New NotifyDescription("AllocationRowsBeforeAddRowEnd", ThisObject);
Notify = New CallbackDescription("AllocationRowsBeforeAddRowEnd", ThisObject);
FormParameters = New Structure();
FormParameters.Insert("Company" , Object.Company);
FormParameters.Insert("BasisRowID", CurrentData.RowID);
@@ -405,7 +405,7 @@ EndProcedure
&AtClient
Procedure CostRowsBeforeAddRow(Item, Cancel, Clone, Parent, IsFolder, Parameter)
Cancel = True;
Notify = New NotifyDescription("CostRowsBeforeAddRowEnd", ThisObject);
Notify = New CallbackDescription("CostRowsBeforeAddRowEnd", ThisObject);
FormParameters = New Structure();
FormParameters.Insert("Company" , Object.Company);
FormParameters.Insert("Ref" , Object.Ref);
@@ -796,7 +796,7 @@ EndProcedure
&AtClient
Procedure AllocationDocumentsDocumentStartChoice(Item, ChoiceData, StandardProcessing)
StandardProcessing = False;
Notify = New NotifyDescription("AllocationDocumentsDocumentStartChoiceEnd", ThisObject);
Notify = New CallbackDescription("AllocationDocumentsDocumentStartChoiceEnd", ThisObject);
FormParameters = New Structure();
FormParameters.Insert("Company" , Object.Company);

2
IRP/src/Documents/AdditionalDeduction/Forms/DocumentForm/Module.bsl
View File

@@ -248,7 +248,7 @@ Procedure EditCurrencies(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

8
IRP/src/Documents/AdditionalRevenueAllocation/Forms/DocumentForm/Module.bsl
View File

@@ -202,7 +202,7 @@ EndProcedure
&AtClient
Procedure RevenueDocumentsDocumentStartChoice(Item, ChoiceData, StandardProcessing)
StandardProcessing = False;
Notify = New NotifyDescription("RevenueDocumentsDocumentStartChoiceEnd", ThisObject);
Notify = New CallbackDescription("RevenueDocumentsDocumentStartChoiceEnd", ThisObject);
FormParameters = New Structure();
FormParameters.Insert("Company" , Object.Company);
FormParameters.Insert("Ref" , Object.Ref);
@@ -316,7 +316,7 @@ Procedure AllocationRowsBeforeAddRow(Item, Cancel, Clone, Parent, IsFolder, Para
Return;
EndIf;
Notify = New NotifyDescription("AllocationRowsBeforeAddRowEnd", ThisObject);
Notify = New CallbackDescription("AllocationRowsBeforeAddRowEnd", ThisObject);
FormParameters = New Structure();
FormParameters.Insert("Company" , Object.Company);
FormParameters.Insert("BasisRowID", CurrentData.RowID);
@@ -400,7 +400,7 @@ EndProcedure
&AtClient
Procedure RevenueRowsBeforeAddRow(Item, Cancel, Clone, Parent, IsFolder, Parameter)
Cancel = True;
Notify = New NotifyDescription("RevenueRowsBeforeAddRowEnd", ThisObject);
Notify = New CallbackDescription("RevenueRowsBeforeAddRowEnd", ThisObject);
FormParameters = New Structure();
FormParameters.Insert("Company" , Object.Company);
FormParameters.Insert("Ref" , Object.Ref);
@@ -791,7 +791,7 @@ EndProcedure
&AtClient
Procedure AllocationDocumentsDocumentStartChoice(Item, ChoiceData, StandardProcessing)
StandardProcessing = False;
Notify = New NotifyDescription("AllocationDocumentsDocumentStartChoiceEnd", ThisObject);
Notify = New CallbackDescription("AllocationDocumentsDocumentStartChoiceEnd", ThisObject);
FormParameters = New Structure();
FormParameters.Insert("Company" , Object.Company);

6
IRP/src/Documents/BankPayment/Forms/DocumentForm/Module.bsl
View File

@@ -1255,7 +1255,7 @@ Procedure _EditCurrencies(CurrentData)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
@@ -1325,7 +1325,7 @@ Procedure PaymentByDocuments(Command)
FormParameters.SelectedPositionWithoutDocuments.Add(PositionStructure);
EndIf;
EndDo;
Notify = New NotifyDescription("PaymentByDocumentSelectionEnd", ThisObject);
Notify = New CallbackDescription("PaymentByDocumentSelectionEnd", ThisObject);
OpenForm("CommonForm.PaymentDistribution", FormParameters, ThisObject,,,,Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
@@ -1374,7 +1374,7 @@ Procedure ReturnToCard(Command)
Settings.Hardware = Hardware;
Settings.Interactive = True;
Settings.isReturn = True;
NotifyOnClose = New NotifyDescription("PayByCardEnd", ThisObject);
NotifyOnClose = New CallbackDescription("PayByCardEnd", ThisObject);
OpenForm("CommonForm.PaymentByAcquiring", New Structure("OpenSettings", Settings), ThisObject, , , , NotifyOnClose, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

6
IRP/src/Documents/BankReceipt/Forms/DocumentForm/Module.bsl
View File

@@ -1344,7 +1344,7 @@ Procedure _EditCurrencies(CurrentData)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
@@ -1414,7 +1414,7 @@ Procedure PaymentByDocuments(Command)
FormParameters.SelectedPositionWithoutDocuments.Add(PositionStructure);
EndIf;
EndDo;
Notify = New NotifyDescription("PaymentByDocumentSelectionEnd", ThisObject);
Notify = New CallbackDescription("PaymentByDocumentSelectionEnd", ThisObject);
OpenForm("CommonForm.PaymentDistribution", FormParameters, ThisObject,,,,Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
@@ -1462,7 +1462,7 @@ Procedure PayByCard(Command)
Settings.Amount = Object.DocumentAmount;
Settings.Hardware = Hardware;
NotifyOnClose = New NotifyDescription("PayByCardEnd", ThisObject);
NotifyOnClose = New CallbackDescription("PayByCardEnd", ThisObject);
OpenForm("CommonForm.PaymentByAcquiring", New Structure("OpenSettings", Settings), ThisObject, , , , NotifyOnClose, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

2
IRP/src/Documents/CashExpense/Forms/DocumentForm/Module.bsl
View File

@@ -361,7 +361,7 @@ Procedure EditCurrencies(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

4
IRP/src/Documents/CashPayment/Forms/DocumentForm/Module.bsl
View File

@@ -1058,7 +1058,7 @@ Procedure _EditCurrencies(CurrentData)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
@@ -1128,7 +1128,7 @@ Procedure PaymentByDocuments(Command)
FormParameters.SelectedPositionWithoutDocuments.Add(PositionStructure);
EndIf;
EndDo;
Notify = New NotifyDescription("PaymentByDocumentSelectionEnd", ThisObject);
Notify = New CallbackDescription("PaymentByDocumentSelectionEnd", ThisObject);
OpenForm("CommonForm.PaymentDistribution", FormParameters, ThisObject,,,,Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

4
IRP/src/Documents/CashReceipt/Forms/DocumentForm/Module.bsl
View File

@@ -999,7 +999,7 @@ Procedure _EditCurrencies(CurrentData)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
@@ -1074,7 +1074,7 @@ Procedure PaymentByDocuments(Command)
FormParameters.SelectedPositionWithoutDocuments.Add(PositionStructure);
EndIf;
EndDo;
Notify = New NotifyDescription("PaymentByDocumentSelectionEnd", ThisObject);
Notify = New CallbackDescription("PaymentByDocumentSelectionEnd", ThisObject);
OpenForm("CommonForm.PaymentDistribution", FormParameters, ThisObject,,,,Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

2
IRP/src/Documents/CashRevenue/Forms/DocumentForm/Module.bsl
View File

@@ -335,7 +335,7 @@ Procedure EditCurrencies(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

2
IRP/src/Documents/CashStatement/Forms/DocumentForm/Module.bsl
View File

@@ -273,7 +273,7 @@ Procedure EditCurrencies(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

4
IRP/src/Documents/CashTransferOrder/Forms/DocumentForm/Module.bsl
View File

@@ -322,7 +322,7 @@ Procedure EditCurrenciesSender(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
@@ -333,7 +333,7 @@ Procedure EditCurrenciesReceiver(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

6
IRP/src/Documents/ChequeBondTransaction/Forms/DocumentForm/Module.bsl
View File

@@ -390,11 +390,11 @@ Procedure PickupCheques(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Form" , ThisObject);
NotifyParameters.Insert("Object" , Object);
NotifyDescription = New NotifyDescription("FillChequesContinue", ThisObject, NotifyParameters);
CallbackDescription = New CallbackDescription("FillChequesContinue", ThisObject, NotifyParameters);
OpenForm("Catalog.ChequeBonds.Form.PickUpForm",
FormParameters, ThisObject, , , ,
NotifyDescription, FormWindowOpeningMode.LockOwnerWindow);
CallbackDescription, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
&AtClient
@@ -427,7 +427,7 @@ Procedure EditCurrencies(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

2
IRP/src/Documents/CommissioningOfFixedAsset/Forms/DocumentForm/Module.bsl
View File

@@ -459,7 +459,7 @@ Procedure EditCurrencies(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

4
IRP/src/Documents/ConsolidatedRetailSales/Commands/CloseSession/CommandModule.bsl
View File

@@ -20,11 +20,11 @@ Async Procedure CommandProcessing(ConsolidatedRetailSales, CommandExecuteParamet
FormParameters.Insert("AutoCreateMoneyTransfer", False);
FormParameters.Insert("ConsolidatedRetailSales", ConsolidatedRetailSales);
NotifyDescription = New NotifyDescription("CloseSessionFinish", ThisObject);
CallbackDescription = New CallbackDescription("CloseSessionFinish", ThisObject);
OpenForm(
"DataProcessor.PointOfSale.Form.SessionClosing",
FormParameters, ThisObject, , , , NotifyDescription, FormWindowOpeningMode.LockWholeInterface);
FormParameters, ThisObject, , , , CallbackDescription, FormWindowOpeningMode.LockWholeInterface);
EndProcedure
&AtClient

2
IRP/src/Documents/CreditNote/Forms/DocumentForm/Module.bsl
View File

@@ -314,7 +314,7 @@ Procedure EditCurrencies(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

4
IRP/src/Documents/DebitCreditNote/Forms/DocumentForm/Module.bsl
View File

@@ -408,7 +408,7 @@ Procedure EditCurrenciesSender(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
@@ -419,7 +419,7 @@ Procedure EditCurrenciesReceiver(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

2
IRP/src/Documents/DebitNote/Forms/DocumentForm/Module.bsl
View File

@@ -314,7 +314,7 @@ Procedure EditCurrencies(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

2
IRP/src/Documents/DecommissioningOfFixedAsset/Forms/DocumentForm/Module.bsl
View File

@@ -463,7 +463,7 @@ Procedure EditCurrencies(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

2
IRP/src/Documents/DepreciationCalculation/Forms/DocumentForm/Module.bsl
View File

@@ -78,7 +78,7 @@ Procedure EditCurrencies(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

2
IRP/src/Documents/EmployeeCashAdvance/Forms/DocumentForm/Module.bsl
View File

@@ -300,7 +300,7 @@ Procedure EditCurrencies(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

4
IRP/src/Documents/ExpenseAccruals/Forms/DocumentForm/Module.bsl
View File

@@ -281,7 +281,7 @@ Procedure EditCurrencies(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form", ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure
@@ -333,7 +333,7 @@ Async Procedure OpenPickupForm()
Object.CostList.Clear();
Notify = New NotifyDescription("AfterExpensePickup", ThisObject);
Notify = New CallbackDescription("AfterExpensePickup", ThisObject);
FormParameters = New Structure();
FormParameters.Insert("Company", Object.Company);
FormParameters.Insert("Branch", Object.Branch);

2
IRP/src/Documents/ExternalAccountingOperation/Forms/DocumentForm/Module.bsl
View File

@@ -247,7 +247,7 @@ Procedure EditCurrencies(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

2
IRP/src/Documents/FixedAssetRevaluation/Forms/DocumentForm/Module.bsl
View File

@@ -81,7 +81,7 @@ Procedure EditCurrencies(Command)
NotifyParameters = New Structure();
NotifyParameters.Insert("Object", Object);
NotifyParameters.Insert("Form" , ThisObject);
Notify = New NotifyDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
Notify = New CallbackDescription("EditCurrenciesContinue", CurrenciesClient, NotifyParameters);
OpenForm("CommonForm.EditCurrencies", FormParameters, , , , , Notify, FormWindowOpeningMode.LockOwnerWindow);
EndProcedure

Some files were not shown because too many files have changed in this diff Show More