Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
ending inventory report
Ending and Infra Inventory reports
--  add role and apply filter
composer.json update
--  user identity
Merge pull request #63 from Gryphyn23/master

Ending and Infra Inventory reports
Merge remote-tracking branch 'upstream/master'
-- add excel declaration in Globals model
-- add infra inventoty report in menu
Merge pull request #64 from jttorate/master

-- adding role and inventory report
-- 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
update in infra inventory
-- 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