-- library updates and add other transaction links in inventory tab
-- commit conflict
Merge remote-tracking branch 'upstream/master'

Conflicts:
	protected/modules/inventory/models/InventoryHistory.php
	protected/modules/inventory/views/inventory/admin.php
-- incoming module
-- update incoming inv form
Merge remote-tracking branch 'upstream/master'
-- goods movements inv and receiving module update
Merge pull request #18 from jttorate/master

-- incoming module and other library updates