RPTBilling : add rputype and barangay option