Merge pull request #5543 from nabinhait/warehouse_fix

[fix] Identify account group for warehouse based on account type