Skip to content

Commit 226a45a

Browse files
PredragMaricicPredragMaricic
authored
QM Setup page - UX changes (#6284)
#### Summary QM Setup page - UX changes #### Work Item(s) Fixes [AB#618899](https://dynamicssmb2.visualstudio.com/Dynamics%20SMB/_workitems/edit/618899) Fixes [AB#619135](https://dynamicssmb2.visualstudio.com/Dynamics%20SMB/_workitems/edit/619135)
1 parent fedece9 commit 226a45a

39 files changed

Lines changed: 838 additions & 1079 deletions

File tree

‎src/Apps/W1/Quality Management/Test Library/src/QltyInspectionUtility.Codeunit.al‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ codeunit 139940 "Qlty. Inspection Utility"
5454
begin
5555
QltyAutoConfigure.EnsureBasicSetupExists(false);
5656
QltyManagementSetup.Get();
57-
QltyManagementSetup."When to show inspections" := QltyManagementSetup."When to show inspections"::"Do not show created inspections";
57+
QltyManagementSetup."When to show inspections" := QltyManagementSetup."When to show inspections"::"Never";
5858
QltyManagementSetup.Modify();
5959

6060
UserPermissionsLibrary.AssignPermissionSetToUser(UserSecurityId(), 'QltyGeneral');
@@ -636,12 +636,12 @@ codeunit 139940 "Qlty. Inspection Utility"
636636

637637
internal procedure ClearSetupTriggerDefaults(var QltyManagementSetup: Record "Qlty. Management Setup")
638638
begin
639-
QltyManagementSetup."Purchase Trigger" := QltyManagementSetup."Purchase Trigger"::NoTrigger;
639+
QltyManagementSetup."Purchase Order Trigger" := QltyManagementSetup."Purchase Order Trigger"::NoTrigger;
640640
QltyManagementSetup."Sales Return Trigger" := QltyManagementSetup."Sales Return Trigger"::NoTrigger;
641-
QltyManagementSetup."Warehouse Receive Trigger" := QltyManagementSetup."Warehouse Receive Trigger"::NoTrigger;
641+
QltyManagementSetup."Warehouse Receipt Trigger" := QltyManagementSetup."Warehouse Receipt Trigger"::NoTrigger;
642642
QltyManagementSetup."Warehouse Trigger" := QltyManagementSetup."Warehouse Trigger"::NoTrigger;
643-
QltyManagementSetup."Transfer Trigger" := QltyManagementSetup."Transfer Trigger"::NoTrigger;
644-
QltyManagementSetup."Production Trigger" := QltyManagementSetup."Production Trigger"::NoTrigger;
643+
QltyManagementSetup."Transfer Order Trigger" := QltyManagementSetup."Transfer Order Trigger"::NoTrigger;
644+
QltyManagementSetup."Production Order Trigger" := QltyManagementSetup."Production Order Trigger"::NoTrigger;
645645
QltyManagementSetup."Assembly Trigger" := QltyManagementSetup."Assembly Trigger"::NoTrigger;
646646
QltyManagementSetup.Modify();
647647
end;
@@ -778,15 +778,15 @@ codeunit 139940 "Qlty. Inspection Utility"
778778
CreateTemplate(QltyInspectionTemplateHdr, 1);
779779
CreatePrioritizedRule(QltyInspectionTemplateHdr, Database::"Purchase Line", CreatedQltyInspectionGenRule);
780780

781-
CreatedQltyInspectionGenRule."Purchase Trigger" := CreatedQltyInspectionGenRule."Purchase Trigger"::OnPurchaseOrderPostReceive;
781+
CreatedQltyInspectionGenRule."Purchase Order Trigger" := CreatedQltyInspectionGenRule."Purchase Order Trigger"::OnPurchaseOrderPostReceive;
782782
CreatedQltyInspectionGenRule.Modify();
783783

784784
CreateLotTrackedItem(Item);
785785

786786
Item.SetRecFilter();
787787
CreatedQltyInspectionGenRule."Item Filter" := CopyStr(Item.GetView(), 1, MaxStrLen(CreatedQltyInspectionGenRule."Item Filter"));
788788
CreatedQltyInspectionGenRule."Activation Trigger" := CreatedQltyInspectionGenRule."Activation Trigger"::"Manual or Automatic";
789-
CreatedQltyInspectionGenRule."Purchase Trigger" := CreatedQltyInspectionGenRule."Purchase Trigger"::OnPurchaseOrderPostReceive;
789+
CreatedQltyInspectionGenRule."Purchase Order Trigger" := CreatedQltyInspectionGenRule."Purchase Order Trigger"::OnPurchaseOrderPostReceive;
790790
CreatedQltyInspectionGenRule.Modify();
791791

792792
OrdQltyPurOrderGenerator.CreatePurchaseOrder(Quantity, Location, Item, PurchaseHeader, OutPurchaseLine, OutReservationEntry);

‎src/Apps/W1/Quality Management/app/src/Configuration/GenerationRule/JobQueue/QltyScheduleInspection.Report.al‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ report 20412 "Qlty. Schedule Inspection"
4848
{
4949
Caption = 'Warning';
5050
Visible = ShowWarningIfCreateInspection;
51-
InstructionalText = 'On your Quality Management Setup page you have the Create Inspection Behavior set to a setting that will cause inspections to be created whenever this report is run even if there are already inspections for that item and lot. Make sure this is compatible with the scenario you are solving.';
51+
InstructionalText = 'On your Quality Management Setup page you have the Inspection Creation Option set to a setting that will cause inspections to be created whenever this report is run even if there are already inspections for that item and lot. Make sure this is compatible with the scenario you are solving.';
5252

5353
field(ChooseOpenQualityManagementSetup; 'Click here to open the Quality Management Setup page.')
5454
{
@@ -58,7 +58,7 @@ report 20412 "Qlty. Schedule Inspection"
5858
trigger OnDrillDown()
5959
begin
6060
QltyManagementSetup.Get();
61-
Page.RunModal(Page::"Qlty. Management Setup", QltyManagementSetup, QltyManagementSetup.FieldNo("Create Inspection Behavior"));
61+
Page.RunModal(Page::"Qlty. Management Setup", QltyManagementSetup, QltyManagementSetup.FieldNo("Inspection Creation Option"));
6262
end;
6363
}
6464
}
@@ -78,7 +78,7 @@ report 20412 "Qlty. Schedule Inspection"
7878
trigger OnInitReport()
7979
begin
8080
QltyManagementSetup.Get();
81-
if QltyManagementSetup."Create Inspection Behavior" in [QltyManagementSetup."Create Inspection Behavior"::"Always create new inspection", QltyManagementSetup."Create Inspection Behavior"::"Always create re-inspection"] then
81+
if QltyManagementSetup."Inspection Creation Option" in [QltyManagementSetup."Inspection Creation Option"::"Always create new inspection", QltyManagementSetup."Inspection Creation Option"::"Always create re-inspection"] then
8282
ShowWarningIfCreateInspection := true;
8383
end;
8484

@@ -125,4 +125,4 @@ report 20412 "Qlty. Schedule Inspection"
125125
if SourceRecordRef.FindSet() then
126126
QltyInspectionCreate.CreateMultipleInspectionsWithoutDisplaying(SourceRecordRef, GuiAllowed(), QltyInspectionGenRule, CreatedQltyInspectionIds);
127127
end;
128-
}
128+
}

‎src/Apps/W1/Quality Management/app/src/Configuration/GenerationRule/QltyInspectionGenRule.Table.al‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -143,32 +143,32 @@ table 20404 "Qlty. Inspection Gen. Rule"
143143
InitValue = "Manual or Automatic";
144144
ToolTip = 'Specifies whether the generation rule is active for manually created inspections only, automatically created inspections only, both, or disabled entirely.';
145145
}
146-
field(22; "Warehouse Receive Trigger"; Enum "Qlty. Whse. Receive Trigger")
146+
field(22; "Warehouse Receipt Trigger"; Enum "Qlty. Whse. Receipt Trigger")
147147
{
148-
Caption = 'Warehouse Receive Trigger';
149-
ToolTip = 'Specifies whether the generation rule should be used to automatically create inspections based on a warehouse receive trigger.';
148+
Caption = 'Warehouse Receipt Trigger';
149+
ToolTip = 'Specifies whether the generation rule should be used to automatically create inspections based on a Warehouse Receipt Trigger.';
150150

151151
trigger OnValidate()
152152
var
153153
QltyNotificationMgmt: Codeunit "Qlty. Notification Mgmt.";
154154
begin
155155
ConfirmUpdateManualTriggerStatus();
156-
if (Rec."Activation Trigger" = Rec."Activation Trigger"::Disabled) and (Rec."Template Code" <> '') and (Rec."Warehouse Receive Trigger" <> Rec."Warehouse Receive Trigger"::NoTrigger) and GuiAllowed() then
157-
QltyNotificationMgmt.Notify(StrSubstNo(RuleCurrentlyDisabledLbl, Rec."Sort Order", Rec."Template Code", Rec."Warehouse Receive Trigger"));
156+
if (Rec."Activation Trigger" = Rec."Activation Trigger"::Disabled) and (Rec."Template Code" <> '') and (Rec."Warehouse Receipt Trigger" <> Rec."Warehouse Receipt Trigger"::NoTrigger) and GuiAllowed() then
157+
QltyNotificationMgmt.Notify(StrSubstNo(RuleCurrentlyDisabledLbl, Rec."Sort Order", Rec."Template Code", Rec."Warehouse Receipt Trigger"));
158158
end;
159159
}
160-
field(23; "Purchase Trigger"; Enum "Qlty. Purchase Trigger")
160+
field(23; "Purchase Order Trigger"; Enum "Qlty. Purchase Order Trigger")
161161
{
162-
Caption = 'Purchase Trigger';
162+
Caption = 'Purchase Order Trigger';
163163
ToolTip = 'Specifies whether the generation rule should be used to automatically create inspections based on a purchase receive trigger.';
164164

165165
trigger OnValidate()
166166
var
167167
QltyNotificationMgmt: Codeunit "Qlty. Notification Mgmt.";
168168
begin
169169
ConfirmUpdateManualTriggerStatus();
170-
if (Rec."Activation Trigger" = Rec."Activation Trigger"::Disabled) and (Rec."Template Code" <> '') and (Rec."Purchase Trigger" <> Rec."Purchase Trigger"::NoTrigger) and GuiAllowed() then
171-
QltyNotificationMgmt.Notify(StrSubstNo(RuleCurrentlyDisabledLbl, Rec."Sort Order", Rec."Template Code", Rec."Purchase Trigger"));
170+
if (Rec."Activation Trigger" = Rec."Activation Trigger"::Disabled) and (Rec."Template Code" <> '') and (Rec."Purchase Order Trigger" <> Rec."Purchase Order Trigger"::NoTrigger) and GuiAllowed() then
171+
QltyNotificationMgmt.Notify(StrSubstNo(RuleCurrentlyDisabledLbl, Rec."Sort Order", Rec."Template Code", Rec."Purchase Order Trigger"));
172172
end;
173173
}
174174
field(24; "Sales Return Trigger"; Enum "Qlty. Sales Return Trigger")
@@ -185,32 +185,32 @@ table 20404 "Qlty. Inspection Gen. Rule"
185185
QltyNotificationMgmt.Notify(StrSubstNo(RuleCurrentlyDisabledLbl, Rec."Sort Order", Rec."Template Code", Rec."Sales Return Trigger"));
186186
end;
187187
}
188-
field(25; "Transfer Trigger"; Enum "Qlty. Transfer Trigger")
188+
field(25; "Transfer Order Trigger"; Enum "Qlty. Transfer Order Trigger")
189189
{
190-
Caption = 'Transfer Trigger';
190+
Caption = 'Transfer Order Trigger';
191191
ToolTip = 'Specifies whether the generation rule should be used to automatically create inspections based on a transfer receive trigger.';
192192

193193
trigger OnValidate()
194194
var
195195
QltyNotificationMgmt: Codeunit "Qlty. Notification Mgmt.";
196196
begin
197197
ConfirmUpdateManualTriggerStatus();
198-
if (Rec."Activation Trigger" = Rec."Activation Trigger"::Disabled) and (Rec."Template Code" <> '') and (Rec."Transfer Trigger" <> Rec."Transfer Trigger"::NoTrigger) and GuiAllowed() then
199-
QltyNotificationMgmt.Notify(StrSubstNo(RuleCurrentlyDisabledLbl, Rec."Sort Order", Rec."Template Code", Rec."Transfer Trigger"));
198+
if (Rec."Activation Trigger" = Rec."Activation Trigger"::Disabled) and (Rec."Template Code" <> '') and (Rec."Transfer Order Trigger" <> Rec."Transfer Order Trigger"::NoTrigger) and GuiAllowed() then
199+
QltyNotificationMgmt.Notify(StrSubstNo(RuleCurrentlyDisabledLbl, Rec."Sort Order", Rec."Template Code", Rec."Transfer Order Trigger"));
200200
end;
201201
}
202-
field(26; "Production Trigger"; Enum "Qlty. Production Trigger")
202+
field(26; "Production Order Trigger"; Enum "Qlty. Production Order Trigger")
203203
{
204-
Caption = 'Production Trigger';
205-
ToolTip = 'Specifies whether the generation rule should be used to automatically create inspections based on a production trigger.';
204+
Caption = 'Production Order Trigger';
205+
ToolTip = 'Specifies whether the generation rule should be used to automatically create inspections based on a Production Order Trigger.';
206206

207207
trigger OnValidate()
208208
var
209209
QltyNotificationMgmt: Codeunit "Qlty. Notification Mgmt.";
210210
begin
211211
ConfirmUpdateManualTriggerStatus();
212-
if (Rec."Activation Trigger" = Rec."Activation Trigger"::Disabled) and (Rec."Template Code" <> '') and (Rec."Production Trigger" <> Rec."Production Trigger"::NoTrigger) and GuiAllowed() then
213-
QltyNotificationMgmt.Notify(StrSubstNo(RuleCurrentlyDisabledLbl, Rec."Sort Order", Rec."Template Code", Rec."Production Trigger"));
212+
if (Rec."Activation Trigger" = Rec."Activation Trigger"::Disabled) and (Rec."Template Code" <> '') and (Rec."Production Order Trigger" <> Rec."Production Order Trigger"::NoTrigger) and GuiAllowed() then
213+
QltyNotificationMgmt.Notify(StrSubstNo(RuleCurrentlyDisabledLbl, Rec."Sort Order", Rec."Template Code", Rec."Production Order Trigger"));
214214
end;
215215
}
216216
field(27; "Assembly Trigger"; Enum "Qlty. Assembly Trigger")
@@ -426,27 +426,27 @@ table 20404 "Qlty. Inspection Gen. Rule"
426426
InferredIntent::Assembly:
427427
Rec."Assembly Trigger" := QltyManagementSetup."Assembly Trigger";
428428
InferredIntent::Production:
429-
Rec."Production Trigger" := QltyManagementSetup."Production Trigger";
429+
Rec."Production Order Trigger" := QltyManagementSetup."Production Order Trigger";
430430
InferredIntent::Purchase:
431-
Rec."Purchase Trigger" := QltyManagementSetup."Purchase Trigger";
431+
Rec."Purchase Order Trigger" := QltyManagementSetup."Purchase Order Trigger";
432432
InferredIntent::"Sales Return":
433433
Rec."Sales Return Trigger" := QltyManagementSetup."Sales Return Trigger";
434434
InferredIntent::Transfer:
435-
Rec."Transfer Trigger" := QltyManagementSetup."Transfer Trigger";
435+
Rec."Transfer Order Trigger" := QltyManagementSetup."Transfer Order Trigger";
436436
InferredIntent::"Warehouse Movement":
437437
Rec."Warehouse Movement Trigger" := QltyManagementSetup."Warehouse Trigger";
438438
InferredIntent::"Warehouse Receipt":
439-
Rec."Warehouse Receive Trigger" := QltyManagementSetup."Warehouse Receive Trigger";
439+
Rec."Warehouse Receipt Trigger" := QltyManagementSetup."Warehouse Receipt Trigger";
440440
end;
441441
end;
442442
end;
443443

444444
local procedure ConfirmUpdateManualTriggerStatus()
445445
begin
446446
if (Rec."Activation Trigger" = Rec."Activation Trigger"::"Manual only") and GuiAllowed() then
447-
if not ((Rec."Assembly Trigger" = Rec."Assembly Trigger"::NoTrigger) and (Rec."Transfer Trigger" = Rec."Transfer Trigger"::NoTrigger) and
448-
(Rec."Production Trigger" = Rec."Production Trigger"::NoTrigger) and (Rec."Purchase Trigger" = Rec."Purchase Trigger"::NoTrigger) and
449-
(Rec."Sales Return Trigger" = Rec."Sales Return Trigger"::NoTrigger) and (Rec."Warehouse Receive Trigger" = Rec."Warehouse Receive Trigger"::NoTrigger) and
447+
if not ((Rec."Assembly Trigger" = Rec."Assembly Trigger"::NoTrigger) and (Rec."Transfer Order Trigger" = Rec."Transfer Order Trigger"::NoTrigger) and
448+
(Rec."Production Order Trigger" = Rec."Production Order Trigger"::NoTrigger) and (Rec."Purchase Order Trigger" = Rec."Purchase Order Trigger"::NoTrigger) and
449+
(Rec."Sales Return Trigger" = Rec."Sales Return Trigger"::NoTrigger) and (Rec."Warehouse Receipt Trigger" = Rec."Warehouse Receipt Trigger"::NoTrigger) and
450450
(Rec."Warehouse Movement Trigger" = Rec."Warehouse Movement Trigger"::NoTrigger))
451451
then
452452
if Confirm(StrSubstNo(TriggerNotActiveConfirmQst, Rec."Activation Trigger", Rec."Activation Trigger"::"Manual or Automatic")) then
@@ -455,11 +455,11 @@ table 20404 "Qlty. Inspection Gen. Rule"
455455

456456
local procedure SetDefaultTriggerValuesToNoTrigger()
457457
begin
458-
Rec."Warehouse Receive Trigger" := Rec."Warehouse Receive Trigger"::NoTrigger;
459-
Rec."Purchase Trigger" := Rec."Purchase Trigger"::NoTrigger;
458+
Rec."Warehouse Receipt Trigger" := Rec."Warehouse Receipt Trigger"::NoTrigger;
459+
Rec."Purchase Order Trigger" := Rec."Purchase Order Trigger"::NoTrigger;
460460
Rec."Sales Return Trigger" := Rec."Sales Return Trigger"::NoTrigger;
461-
Rec."Transfer Trigger" := Rec."Transfer Trigger"::NoTrigger;
462-
Rec."Production Trigger" := Rec."Production Trigger"::NoTrigger;
461+
Rec."Transfer Order Trigger" := Rec."Transfer Order Trigger"::NoTrigger;
462+
Rec."Production Order Trigger" := Rec."Production Order Trigger"::NoTrigger;
463463
Rec."Assembly Trigger" := Rec."Assembly Trigger"::NoTrigger;
464464
Rec."Warehouse Movement Trigger" := Rec."Warehouse Movement Trigger"::NoTrigger;
465465
end;
@@ -702,7 +702,7 @@ table 20404 "Qlty. Inspection Gen. Rule"
702702
if not QltyManagementSetup.Get() then
703703
exit(false);
704704

705-
if QltyManagementSetup."Purchase Trigger" <> QltyManagementSetup."Purchase Trigger"::NoTrigger then begin
705+
if QltyManagementSetup."Purchase Order Trigger" <> QltyManagementSetup."Purchase Order Trigger"::NoTrigger then begin
706706
TriggerCount += 1;
707707
if IntentToCheck = IntentToCheck::Purchase then
708708
IntentSet := true;
@@ -712,7 +712,7 @@ table 20404 "Qlty. Inspection Gen. Rule"
712712
if IntentToCheck = IntentToCheck::"Sales Return" then
713713
IntentSet := true;
714714
end;
715-
if QltyManagementSetup."Warehouse Receive Trigger" <> QltyManagementSetup."Warehouse Receive Trigger"::NoTrigger then begin
715+
if QltyManagementSetup."Warehouse Receipt Trigger" <> QltyManagementSetup."Warehouse Receipt Trigger"::NoTrigger then begin
716716
TriggerCount += 1;
717717
if IntentToCheck = IntentToCheck::"Warehouse Receipt" then
718718
IntentSet := true;
@@ -722,12 +722,12 @@ table 20404 "Qlty. Inspection Gen. Rule"
722722
if IntentToCheck = IntentToCheck::"Warehouse Movement" then
723723
IntentSet := true;
724724
end;
725-
if QltyManagementSetup."Transfer Trigger" <> QltyManagementSetup."Transfer Trigger"::NoTrigger then begin
725+
if QltyManagementSetup."Transfer Order Trigger" <> QltyManagementSetup."Transfer Order Trigger"::NoTrigger then begin
726726
TriggerCount += 1;
727727
if IntentToCheck = IntentToCheck::Transfer then
728728
IntentSet := true;
729729
end;
730-
if QltyManagementSetup."Production Trigger" <> QltyManagementSetup."Production Trigger"::NoTrigger then begin
730+
if QltyManagementSetup."Production Order Trigger" <> QltyManagementSetup."Production Order Trigger"::NoTrigger then begin
731731
TriggerCount += 1;
732732
if IntentToCheck = IntentToCheck::Production then
733733
IntentSet := true;

0 commit comments

Comments
 (0)