updated etracs bayombong 2
updated revenueitem entry
master-credit memo
master-credit memo
afserial control and bank deposit
updated revenueitem to include type='INCOME'
Merge branch 'master' of https://github.com/ramesesinc/projects
Merge branch 'master' of https://github.com/ramesesinc/projects
updated
updated af
Merge branch 'revenueitem_rename' into v2.5.04

Conflicts:
	client/rameses-gov-etracs-bpls/test/datasources/etracsds
	client/rameses-gov-treasury/src/workunits/cashreceipt_sharing.xml
	server/gov-lgu-iligan-services.jar/scripts/EtracsBrgyService
	server/gov-lgu-iligan-services.jar/sql/remittanceitemupdate.sql
	server/gov-lgu-iligan-services.jar/sql/tracsmigration.sql
updated af issuance
updated af_inventory scripts
renamed check payment to noncash payment
treasury updates..
updated remittance. not yet completed
remittance_af update
Merge branch 'v2.5.04' of https://github.com/ramesesinc/projects into v2.5.04
updated liquidation
Merge branch 'v2.5.04' of https://github.com/ramesesinc/projects into v2.5.04