-- post recover and filled text field in infra inv report
Merge remote-tracking branch 'upstream/master'
-- add condition to filter zone in transaction modules
-- add checkAcccess in update company
-- change duplicate label in ending inv report
-- add ajax queue for loading zones in role
Merge pull request #66 from Gryphyn23/master

update in infra inventory
Merge remote-tracking branch 'upstream/master'

Conflicts:
	protected/modules/reports/views/infraInventory/index.php
--add recover post in infra inv report
-- disable sorting on ending inv preview table
Merge pull request #68 from jttorate/master

-- apply zone filter in transaction module and updates on report
update in ending inventory revisions