Merge branch 'OBPM_705_706'

DESKTOP-0K9VGFE\hp

2022-03-11 0913862c088ba845fee09a2fb713b2affc2c0b5a

 force-app/main/default/classes/ControllerUtilTest.cls

@@ -158,6 +158,7 @@
        Oly_TriggerHandler.bypass('PowerBIBaseHandler');
        Oly_TriggerHandler.bypass('AgencyOppUpdHandler');
        Oly_TriggerHandler.bypass('UpdateContractAimAmountHandler');
        Oly_TriggerHandler.bypass('NFM701ControllerHandler');
        StaticParameter.EscapeNFM001AgencyContractTrigger = true;
        ControllerUtil.EscapeNFM001Trigger = true;
       
@@ -333,6 +334,7 @@
        Oly_TriggerHandler.bypass('PowerBIBaseHandler');
        Oly_TriggerHandler.bypass('AgencyOppUpdHandler');
        Oly_TriggerHandler.bypass('UpdateContractAimAmountHandler');
        Oly_TriggerHandler.bypass('NFM701ControllerHandler');
        StaticParameter.EscapeNFM001AgencyContractTrigger = true;
        ControllerUtil.EscapeNFM001Trigger = true;