Merge pull request #5539 from saurabh6790/merge_acc_type_warehouse_and_stock_to_stock

Merge acc type warehouse and stock to stock