-- transaction module updates
Merge remote-tracking branch 'upstream/master'

Conflicts:
	protected/modules/inventory/controllers/IncomingInventoryController.php
	protected/modules/inventory/models/IncomingInventory.php
	protected/modules/inventory/views/incomingInventory/admin.php
	protected/modules/inventory/views/incomingInventory/incomingForm.php
	protected/modules/inventory/views/outgoingInventory/admin.php
	protected/modules/inventory/views/receivingInventory/receivingForm.php
Merge pull request #25 from jttorate/master

-- transaction module updates
-- outgoing controller updates and update incoming form upload button click
-- incoming form upload button click
-- change inventory dashboard label to Inventory Management
-- add parseInt in checking actual quantity in incoming form
-- add name column in incoming main table in admin
Merge pull request #26 from jttorate/master

-- transaction enhancement on table and in form
-- change outgoing details column name return date to status
-- update - updated by and date of outgoing base on incoming transaction
update in admin.php of the 3 transactions
Merge pull request #27 from Gryphyn23/master

update in admin.php of the 3 transactions
-- closed db column in outgoing for closing transaction if already received items
Merge remote-tracking branch 'upstream/master'
Merge pull request #28 from jttorate/master

--  add closed if incoming item already received by salesoffice
-- receiving admin table update
update in employee module
-- forms updates
Merge pull request #29 from Gryphyn23/master

update in employee module