Merge pull request #16065 from deepeshgarg007/supplier-customer-dashboard-fix

Customer/Supplier dashboard fix for multi company setup