Updated AFStock control to fix duplicate entry in af receipt
fixed remittance. added af control service. Please check you need to table in database afcontrol_transfer
statement for af cotnrol transfer
Merge branch 'master' of https://github.com/ramesesinc/osiris3-server

Conflicts:
	workspace/services/shared/v25/modules/rameses-enterprise-treasury-services.jar/scripts/CashBookPostService
	workspace/services/shared/v25/modules/rameses-enterprise-treasury-services.jar/scripts/CashBookService
	workspace/services/shared/v25/modules/rameses-enterprise-treasury-services.jar/scripts/CashBookSubAcctLookupService
	workspace/services/shared/v25/modules/rameses-enterprise-treasury-services.jar/scripts/CashReceiptService
	workspace/services/shared/v25/modules/rameses-enterprise-treasury-services.jar/scripts/CollectorLookupService
	workspace/services/shared/v25/modules/rameses-enterprise-treasury-services.jar/scripts/LiquidatingOfficerLookupService
	workspace/services/shared/v25/modules/rameses-enterprise-treasury-services.jar/sql/cashbook_subaccount.sql
	workspace/services/shared/v25/modules/rameses-enterprise-treasury-services.jar/sql/collector.sql
	workspace/services/shared/v25/modules/rameses-enterprise-treasury-services.jar/sql/remittance.sql
	workspace/services/shared/v25/modules/rameses-gov-treasury-services.jar/schema/afcontrol.xml
	workspace/services/shared/v25/modules/rameses-gov-treasury-services.jar/scripts/AFControlMgmtService
	workspace/services/shared/v25/modules/rameses-gov-treasury-services.jar/scripts/AFControlService
	workspace/services/shared/v25/modules/rameses-gov-treasury-services.jar/scripts/AFStockPostService
	workspace/services/shared/v25/modules/rameses-gov-treasury-services.jar/sql/af.sql
	workspace/services/shared/v25/modules/rameses-gov-treasury-services.jar/sql/afcontrol.sql
	workspace/services/shared/v25/modules/rameses-gov-treasury-services.jar/sql/ris.sql
updated remittance
Merge branch 'master' of https://github.com/ramesesinc/osiris3-server

Conflicts:
	workspace/services/shared/v25/modules/rameses-enterprise-treasury-services.jar/scripts/LiquidatingOfficerLookupService
	workspace/services/shared/v25/modules/rameses-enterprise-treasury-services.jar/sql/collector.sql
	workspace/services/shared/v25/modules/rameses-enterprise-treasury-services.jar/sql/remittance.sql
	workspace/services/shared/v25/modules/rameses-gov-treasury-services.jar/schema/afcontrol.xml
	workspace/services/shared/v25/modules/rameses-gov-treasury-services.jar/scripts/AFControlMgmtService
	workspace/services/shared/v25/modules/rameses-gov-treasury-services.jar/scripts/AFControlPostService