[fix] [minor] match condition fixes for customer and supplier
[minor] merge conflict
Merge pull request #1184 from nabinhait/hotfix

[fix] [minor] match condition fixes for customer and supplier