look for match with one exception

[mahra-in]

I use the below measure for identifying the spend against the filter in it

Contract Reference =
VAR Test =
COUNTROWS (
FILTER (
   'Agreement',
            'Agreement'[Supplier Group] = Sievo[Supplier group]
                     && 'Agreement'[Subcategory] = Sievo[Type]

                               && 'Agreement'[Entity] = Sievo[Entity]
                              && Sievo[PO date] > 'Agreement'[Effective date].[Date] && Sievo[PO date] < 'Agreement'[End date].[Date]
)
)
RETURN
IF ( Test = 0, "No", "Yes" )

But in the above measure I have to insert one exclusion as 

If the value of Entity = Group,  "&& 'Agreement'[Entity] = Sievo[Entity]" shoud not apply

If the Entity is any value but not Group then the filter  "&& 'Agreement'[Entity] = Sievo[Entity]" has to apply on the above measure.

Please help

[v-ljerr-msft · Accepted solution]

Hi @mahra-in,

If I understand you correctly, the formula below should work in your scenario. 

Contract Reference =
VAR Test =
    COUNTROWS (
        FILTER (
            'Agreement',
            'Agreement'[Supplier Group] = Sievo[Supplier group]
                && 'Agreement'[Subcategory] = Sievo[Type]
                && ( 'Agreement'[Entity] = "Group"
                || 'Agreement'[Entity] = Sievo[Entity] )
                && Sievo[PO date] > 'Agreement'[Effective date].[Date]
                && Sievo[PO date] < 'Agreement'[End date].[Date]
        )
    )
RETURN
    IF ( Test = 0, "No", "Yes" )

Regards