-- add campaign no and pr no in item details table
-- fix error in dashboard
Merge remote-tracking branch 'upstream/master'
-- remove duplication in pr nos in print
-- add dr date in all transaction modules
-- inbound update
dispaly all quarters in total national module
modify computation of par attendance
change coloring of bar graphs
Merge remote-tracking branch 'upstream/master'

Conflicts:
	protected/modules/pome/views/default/_viewtotalnational.php
-- set unset attachments transaction id
Merge pull request #48 from jhe012/master

modify pome dashboard
fix link of js highchart widget
-- parse unit price and amount as decimal format
Merge pull request #50 from jhe012/master

fix link of js highchart widget
Merge remote-tracking branch 'upstream/master'

Conflicts:
	protected/modules/inventory/controllers/CustomerItemController.php
	protected/modules/inventory/controllers/IncomingInventoryController.php
	protected/modules/inventory/controllers/OutgoingInventoryController.php
	protected/modules/inventory/models/CustomerItem.php
	protected/modules/inventory/models/CustomerItemDetail.php
	protected/modules/inventory/models/IncomingInventory.php
	protected/modules/inventory/models/OutgoingInventory.php
	protected/modules/inventory/models/ReceivingInventory.php
	protected/modules/inventory/views/customerItem/admin.php
	protected/modules/inventory/views/customerItem/customerItemForm.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/outgoingInventory/outgoingForm.php
Merge remote-tracking branch 'upstream/master'
Merge pull request #51 from jttorate/master

-- transaction updates and solved conflicts
Merge remote-tracking branch 'upstream/master'

Conflicts:
	protected/modules/inventory/controllers/CustomerItemController.php
	protected/modules/inventory/models/IncomingInventory.php
	protected/modules/inventory/models/OutgoingInventory.php