Merge pull request #1842 from anandpdoshi/anand-wip

Warehouse query filtered by Company, Fixed Gantt Chart query for task