-- 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