xxx
xc
xcx
Merge branch 'master' of https://github.com/rumahkecil/TOAD

Conflicts:
	QUERY/CATEGORY/JOURNAL VOUCHER/QRY_CEK_FAKTUR_JV.sql
xx
xcxcx