-- transaction module updates
Merge pull request #24 from Gryphyn23/master

added viewing of uploaded attachments in receiving inventory
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
update in admin.php of the 3 transactions