diff --git a/src/main/java/com/divudi/bean/common/EnumController.java b/src/main/java/com/divudi/bean/common/EnumController.java
index 2bfc218602..0e4c7e95eb 100644
--- a/src/main/java/com/divudi/bean/common/EnumController.java
+++ b/src/main/java/com/divudi/bean/common/EnumController.java
@@ -70,7 +70,6 @@ public class EnumController implements Serializable {
     @Inject
     ConfigOptionApplicationController configOptionApplicationController;
     List<PaymentMethod> paymentMethodsForOpdBilling;
-    List<PaymentMethod> paymentMethodsForOpdBillCanceling;
     List<PaymentMethod> paymentMethodsForChanneling;
     List<PaymentMethod> paymentMethodsForChannelSettling;
     List<PaymentMethod> paymentMethodsForPharmacyBilling;
diff --git a/src/main/java/com/divudi/data/Privileges.java b/src/main/java/com/divudi/data/Privileges.java
index 742ec44ab8..a441740357 100644
--- a/src/main/java/com/divudi/data/Privileges.java
+++ b/src/main/java/com/divudi/data/Privileges.java
@@ -6,491 +6,42 @@
 
 public enum Privileges {
 
-    //Main Menu Privileges
-    TheaterIssueBHT,
-    Opd,
-    Inward,
-    Lab,
-    Pharmacy,
-    Payment,
-    Hr,
-    Reports,
-    User,
-    Admin,
-    Channelling,
-    Clinical,
-    Store,
-    Search,
-    CashTransaction,
-    ChangeCreditLimitInCC,
-    //Submenu Privileges
-    OpdBilling,
-    OpdCollectingCentreBillingMenu,
-    OpdCollectingCentreBilling,
-    OpdCollectingCentreBillSearch,
-    OpdPreBilling,
-    OpdBillSearch,
-    OpdBillItemSearch,
-    OpdReprint,
-    OpdCancel,
-    OpdReturn,
-    OpdReactivate,
-    OpdBillSearchEdit,
-    OpdLabReportSearch,
-    OpdReprintOriginalBill,
-    OpdAddNewRefferalDoctor,
-    OpdAddNewCollectingCentre,
+    // Main Menu Privileges
+    TheaterIssueBHT("Theater Issue BHT"),
+    Opd("OPD"),
+    Inward("Inward"),
+    Lab("Lab"),
+    Pharmacy("Pharmacy"),
+    Payment("Payment"),
+    Hr("HR"),
+    Reports("Reports"),
+    User("User"),
+    Admin("Admin"),
+    Channelling("Channelling"),
+    Clinical("Clinical"),
+    Store("Store"),
+    Search("Search"),
+    CashTransaction("Cash Transaction"),
+    ChangeCreditLimitInCC("Change Credit Limit in Collecting Centre"),
+
+    // Submenu Privileges
+    OpdBilling("OPD Billing"),
+    OpdCollectingCentreBillingMenu("OPD Collecting Centre Billing Menu"),
+    OpdCollectingCentreBilling("OPD Collecting Centre Billing"),
+    OpdCollectingCentreBillSearch("OPD Collecting Centre Bill Search"),
+    OpdPreBilling("OPD Pre Billing"),
+    OpdBillSearch("OPD Bill Search"),
+    OpdBillItemSearch("OPD Bill Item Search"),
+    OpdReprint("OPD Reprint"),
+    OpdCancel("OPD Cancel"),
+    OpdReturn("OPD Return"),
+    OpdReactivate("OPD Reactivate"),
+    OpdBillSearchEdit("OPD Bill Search Edit"),
+    OpdLabReportSearch("OPD Lab Report Search"),
+    OpdReprintOriginalBill("OPD Reprint Original Bill"),
+    OpdAddNewRefferalDoctor("OPD Add New Referral Doctor"),
+    OpdAddNewCollectingCentre("OPD Add New Collecting Centre"),
     
-    AddCreditLimitInRegistration,
-    
-    InwardAdmissions,
-    InwardAdmissionsAdmission,
-    InwardAdmissionsEditAdmission,
-    InwardAdmissionsInwardAppoinment,
-    InwardRoom,
-    InwardRoomRoomOccupency,
-    InwardRoomRoomChange,
-    InwardRoomGurdianRoomChange,
-    InwardRoomDischarge,
-    InwardServicesAndItems,
-    InwardServicesAndItemsAddServices,
-    InwardServicesAndItemsAddOutSideCharges,
-    InwardServicesAndItemsAddProfessionalFee,
-    InwardServicesAndItemsAddTimedServices,
-    InwardBilling,
-    InwardBillingInterimBill,
-    InwardBillingInterimBillSearch,
-    InwardSearch,
-    InwardSearchServiceBill,
-    InwardSearchProfessionalBill,
-    InwardSearchFinalBill,
-    InwardReport,
-    InwardFinalBillReportEdit,
-    InwardAdministration,
-    InwardAdditionalPrivilages,
-    InwardBillSearch,
-    InwardBillItemSearch,
-    InwardBillReprint,
-    InwardCancel,
-    InwardReturn,
-    InwardReactivate,
-    InwardCheck,
-    InwardUnCheck,
-    InwardFinalBillCancel,
-    InwardOutSideMarkAsUnPaid,
-    ShowInwardFee,
-    InwardPharmacyMenu,
-    InwardPharmacyIssueRequest,
-    InwardPharmacyIssueRequestSearch,
-    InwardBillSettleWithoutCheck,
-    LabBilling,
-    LabBillCancelSpecial,
-    LabBillRefundSpecial,
-    LabCasheirBillSearch,
-    LabCashier,
-    LabBillSearchCashier,
-    LabBillSearch,
-    LabBillItemSearch,
-    LabBillCancelling,
-    CollectingCentreCancelling,
-    LabBillReturning,
-    LabBillReprint,
-    LabBillRefunding,
-    LabBillReactivating,
-    LabSampleCollecting,
-    LabSampleReceiving,
-    LabReportFormatEditing,
-    LabDataentry,
-    LabAutherizing,
-    LabDeAutherizing,
-    LabRevertSample,
-    LabPrinting,
-    LabReprinting,
-    LabReportEdit,
-    LabReportPrint,
-    AdminReportSearch,
-    LabReportSearchByDepartment,
-    LabSummeries,
-    LabSummeriesLevel1,
-    LabSummeriesLevel2,
-    LabSummeriesLevel3,
-    LabReportSearchOwn,
-    LabReportSearchAll,
-    LabReceive,
-    LabEditPatient,
-    LabInvestigationFee,
-    LabAddInwardServices,
-    LabReportSearchByLoggedInstitution,
-    IncomeReport,
-    LabReport,
-    DuesAndAccess,
-    CheckEnteredData,
-    LabAdiministrator,
-    LabReports,
-    LabItems,
-    LabItemFeeUpadate,
-    LabItemFeeDelete,
-    LabPatientDetailsEdit,
-    LabLists,
-    LabSetUp,
-    LabInwardBilling,
-    LabInwardSearchServiceBill,
-    LabCollectingCentreBilling,
-    LabCCBilling,
-    LabCCBillingSearch,
-    LabReportSearch,
-    LabReporting,
-    //dont remove
-    LabSearchBillLoggedInstitution,
-    PaymentBilling,
-    PaymentBillSearch,
-    PaymentBillReprint,
-    PaymentBillCancel,
-    PaymentBillRefund,
-    PaymentBillReactivation,
-    ReportsSearchCashCardOwn,
-    ReportsSearchCreditOwn,
-    ReportsItemOwn,
-    ReportsSearchCashCardOther,
-    ReportSearchCreditOther,
-    ReportsItemOther,
-    PharmacyOrderCreation,
-    PharmacyOrderApproval,
-    PharmacyOrderCancellation,
-    PharmacySaleWithoutStock,
-    PharmacySaleReprint,
-    PharmacySaleCancel,
-    PharmacySaleReturn,
-    //Wholesale
-    PharmacySaleWh,
-    PharmacySaleReprintWh,
-    PharmacySaleCancelWh,
-    PharmacySaleReturnWh,
-    //end wholesale
-    PharmacyInwardBilling,
-    PharmacyInwardBillingCancel,
-    PharmacyInwardBillingReturn,
-    PharmacyGoodReceive,
-    //Wholesale
-    PharmacyGoodReceiveWh,
-    //end Wholesale
-    PharmacyGoodReceiveCancel,
-    PharmacyGoodReceiveReturn,
-    PharmacyGoodReceiveEdit,
-    PharmacyPurchase,
-    //Wholesale
-    PharmacyPurchaseWh,
-    //theater
-    Theatre,
-    TheatreAddSurgery,
-    TheatreBilling,
-    TheaterTransfer,
-    TheaterTransferRequest,
-    TheaterTransferIssue,
-    TheaterTransferRecieve,
-    TheaterTransferReport,
-    TheaterReports,
-    TheaterSummeries,
-    TheaterIssue,
-    TheaterIssuePharmacy,
-    TheaterIssueStore,
-    TheaterIssueStoreBhtBilling,
-    TheaterIssueStoreBhtSearchBill,
-    TheaterIssueStoreBhtSearchBillItem,
-    TheaterIssueOpd,
-    TheaterIssueOpdForCasheir,
-    TheaterIssueOpdSearchPreBill,
-    TheaterIssueOpdSearchPreBillForReturnItemOnly,
-    TheaterIssueOpdSearchPreBillReturn,
-    TheaterIssueOpdSearchPreBillAddToStock,
-    ClinicalPatientSummery,
-    ClinicalPatientDetails,
-    ClinicalPatientPhoto,
-    ClinicalVisitDetail,
-    ClinicalVisitSummery,
-    ClinicalHistory,
-    ClinicalAdministration,
-    ClinicalPatientDelete,
-    ChannelAdd,
-    ChannelCancel,
-    ChannelRefund,
-    ChannelReturn,
-    ChannelView,
-    ChannelDoctorPayments,
-    ChannelDoctorPaymentCancel,
-    ChannelViewHistory,
-    ChannelCreateSessions,
-    ChannelCreateSpecialSessions,
-    ChannelManageSessions,
-    ChannelAdministration,
-    ChannelAgencyReports,
-    AdminManagingUsers,
-    AdminInstitutions,
-    AdminStaff,
-    AdminItems,
-    AdminPrices,
-    AdminFilterWithoutDepartment,
-    ChangeProfessionalFee,
-    ChangeCollectingCentre,
-    StoreIssue,
-    StoreIssueInwardBilling,
-    StoreIssueSearchBill,
-    StoreIssueBillItems,
-    StorePurchase,
-    StorePurchaseOrder,
-    StorePurchaseOrderApprove,
-    StorePurchaseOrderApproveSearch,
-    StorePurchaseGRNRecive,
-    StorePurchaseGRNReturn,
-    StorePurchasePurchase,
-    StoreTransfer,
-    StoreTransferRequest,
-    StoreTransferIssue,
-    StoreTransferRecive,
-    StoreTransferReport,
-    StoreAdjustment,
-    StoreAdjustmentDepartmentStock,
-    StoreAdjustmentStaffStock,
-    StoreAdjustmentPurchaseRate,
-    StoreAdjustmentSaleRate,
-    StoreDealorPayment,
-    StoreDealorPaymentDueSearch,
-    StoreDealorPaymentDueByAge,
-    StoreDealorPaymentPayment,
-    StoreDealorPaymentPaymentGRN,
-    StoreDealorPaymentPaymentGRNSelect,
-    StoreDealorPaymentGRNDoneSearch,
-    StoreSearch,
-    StoreReports,
-    StoreSummery,
-    StoreAdministration,
-    SearchGrand,
-    CashTransactionCashIn,
-    CashTransactionCashOut,
-    CashTransactionListToCashRecieve,
-    ChannellingChannelBooking,
-    ChannellingFutureChannelBooking,
-    ChannellingPastBooking,
-    ChannellingBookedList,
-    ChannellingDoctorLeave,
-    ChannellingDoctorLeaveByDate,
-    ChannellingDoctorLeaveByServiceSession,
-    ChannellingChannelSheduling,
-    ChannellingSpecialChannelSheduling,
-    ChannellingChannelShedulRemove,
-    ChannellingChannelShedulName,
-    ChannellingChannelShedulStartingNo,
-    ChannellingChannelShedulRoomNo,
-    ChannellingChannelShedulMaxRowNo,
-    ChannellingChannelAgentFee,
-    ChannellingDoctorSessionView,
-    ChannellingPayment,
-    ChannellingPaymentPayDoctor,
-    ChannellingPaymentDueSearch,
-    ChannellingPaymentDoneSearch,
-    ChannellingApoinmentNumberCountEdit,
-    ChannellingEditSerialNo,
-    ChannellingEditPatientDetails,
-    ChannellingPrintInPastBooking,
-    ChannellingEditCreditLimitUserLevel,
-    ChannellingEditCreditLimitAdminLevel,
-    ChannellingReprintOriginalBill,
-    ChannellingPastBookingPatientAttend,
-    ChannelReports,
-    ChannelSummery,
-    ChannelManagement,
-    ChannelAgencyAgencies,
-    ChannelAgencyCreditLimitUpdate,
-    ChannelAgencyCreditLimitUpdateBulk,
-    ChannelAddChannelBookToAgency,
-    ChannelManageSpecialities,
-    ChannelManageConsultants,
-    ChannelEditingAppoinmentCount,
-    ChannelAddChannelingConsultantToInstitutions,
-    ChannelFeeUpdate,
-    ChannelCrdeitNote,
-    ChannelCrdeitNoteSearch,
-    ChannelDebitNote,
-    ChannelDebitNoteSearch,
-    ChannelCashCancelRestriction,
-    ChannelBookingChange,
-    ChannelBookingBokking,
-    ChannelBookingReprint,
-    ChannelBookingCancel,
-    ChannelBookingRefund,
-    ChannelBookingSettle,
-    ChannelBookingSearch,
-    ChannelBookingViews,
-    ChannelBookingDocPay,
-    ChannelBookingRestric,
-    ChannelCashierTransaction,
-    ChannelCashierTransactionIncome,
-    ChannelCashierTransactionIncomeSearch,
-    ChannelCashierTransactionExpencess,
-    ChannelCashierTransactionExpencessSearch,
-    ChannelActiveVat,
-    MemberShip,
-    MemberShipAdd,
-    MemberShipEdit,
-    MembershipReports,
-    MembershipDiscountManagement,
-    MembershipAdministration,
-    MembershipSchemes,
-    MemberShipInwardMemberShip,
-    MemberShipInwardMemberShipSchemesDicounts,
-    MemberShipInwardMemberShipInwardMemberShipReport,
-    MemberShipOpdMemberShipDis,
-    MemberShipOpdMemberShipDisByDepartment,
-    MemberShipOpdMemberShipDisByCategory,
-    MemberShipOpdMemberShipDisOpdMemberShipReport,
-    MemberShipMemberDeActive,
-    MemberShipMemberReActive,
-    HrAdmin,
-    HrReports,
-    HrReportsLevel1,
-    HrReportsLevel2,
-    HrReportsLevel3,
-    EmployeeHistoryReport,
-    hrDeleteLateLeave,
-    HrGenerateSalary,
-    HrGenerateSalarySpecial,
-    HrAdvanceSalary,
-    HrPrintSalary,
-    HrWorkingTime,
-    HrRosterTable,
-    HrUploadAttendance,
-    HrAnalyseAttendenceByRoster,
-    HrAnalyseAttendenceByStaff,
-    HrForms,
-    HrLeaveForms,
-    HrAdditionalForms,
-    HrEditRetiedDate,
-    HrRemoveResignDate,
-    Developers,
-    //Cashier
-    AllCashierSummery,
-    //Administration
-    SearchAll,
-    ChangePreferece,
-    SendBulkSMS,
-    ClinicalAdministrationEditLetter,
-    ClinicalPatientAdd,
-    ClinicalPatientEdit,
-    ClinicalPatientCommentsView,
-    ClinicalPatientCommentsEdit,
-    ClinicalPatientNameChange,
-    ClinicalMembershipAdd,
-    ClinicalMembershipEdit,
-    ClinicalPatientPhoneNumberEdit,
-    //Pharmacy Disbursement
-    PharmacyDisburesementMenu,
-    PharmacyDisbursementRequest,
-    PharmacyDisbursementIssurForRequest,
-    PharmacyDisbursementDirectIssue,
-    PharmacyDisbursementRecieve,
-    PharmacyDisbursementReports,
-    //Pharmacy Inpatient medication management
-    InpatientMedicationManagementMenue,
-    PharmacyDirectIssueToBht,
-    PharmacyDirectIssueToTheaterCases,
-    PharmacyBhtIssueRequest,
-    PharmacySearchInpatientDirectIssuesbyBill,
-    PharmacySearchInpatientDirectIssuesbyItem,
-    PharmacySearchInpatientDirectIssueReturnsbyBill,
-    PharmacysSearchInpatientDirectIssueReturnsbyItem,
-    //Pharmacy Retail Transactions
-    PharmacyRetailTransactionMenue,
-    PharmacyRetailTransaction,
-    PharmacySale,
-    PharmacySaleForCashier,
-    PharmacySaleWithOutStock,
-    PharmacySearchSaleBill,
-    PharmacySearchSalePreBill,
-    PharmacySearchSaleBillItems,
-    PharmacyReturnItemsOnly,
-    PharmacyReturnItemsAndPayments,
-    PharmacySearchReturnBill,
-    PharmacyAddToStock,
-    //Pharmacy Wholesale Transaction
-    PharmacyWholeSaleTransactionMenue,
-    PharmacyWholeSaleTransaction,
-    PharmacyWholesaleSale,
-    PharmacyWholesaleSaleForCashier,
-    PharmacyWholesaleSearchSaleBill,
-    PharmacyWholesaleSearchSaleBillToPay,
-    PharmacyWholesaleSearchSaleBillItems,
-    PharmacyWholesaleReturnItemsOnly,
-    PharmacyWholesaleWholeSaleAddToStock,
-    PharmacyWholeSalePurchase,
-    PharmacySearchReturnBillItems,
-    //Pharmacy Disposal
-    PharmacyDisposalMenue,
-    PharmacyDisposalIssue,
-    PharmacyDisposalSearchIssueBill,
-    PharmacyDisposalSearchIssueBillItems,
-    PharmacyDisposalSearchIssueReturnBill,
-    PharmacyDisposalUnitIssueMargin,
-    //Pharmacy Adjustment
-    PharmacyAdjustmentMenue,
-    PharmacyAdjustmentDepartmentStockQTY,
-    PharmacyAdjustmentDepartmentStockBySingleItemQTY,
-    PharmacyAdjustmentStaffStockAdjustment,
-    PharmacyAdjustmentPurchaseRate,
-    PharmacyAdjustmentSaleRate,
-    PharmacyAdjustmentWholeSaleRate,
-    PharmacyAdjustmentExpiryDate,
-    PharmacyAdjustmentSearchAdjustmentBills,
-    PharmacyAdjustmentTransferAllStock,
-    //Pharmacy Dealer Payments
-    PharmacyDealerPaymentMenue,
-    PharmacyDealerDueSearch,
-    PharmacyDealerDueByAge,
-    PharmacyPayment,
-    PharmacyGRNPaymentApprove,
-    PharmacyGRNPaymentDoneSearch,
-    PharmacyCreditDueAndAccess,
-    //Whalesale
-    PharmacyWholesaleMenue,
-    PharmacyPurchaseReprint,
-    PharmacyPurchaseCancellation,
-    PharmacyPurchaseReturn,
-    PharmacyStockAdjustment,
-    PharmacyStockAdjustmentSingleItem,
-    PharmacyReAddToStock,
-    PharmacyStockIssue,
-    PharmacyDealorPayment,
-    PharmacySearch,
-    PharmacyReports,
-    PharmacyTransfer,
-    PharmacySummery,
-    PharmacyAdministration,
-    PharmacySetReorderLevel,
-    PharmacyReturnWithoutTraising,
-    PharmacyBHTIssueAccept,
-    //Pharmacy Procurement
-    PharmacyProcurementMenu,
-    CreatePurchaseOrder,
-    AutoOrderPModel,
-    AutoOrderQModal,
-    DirectPurchase,
-    PurchaseOrdersApprovel,
-    TransferReciveApproval,
-    GoodsRecipt,
-    ReturnReceviedGoods,
-    ReturnWithoutRecipt,
-    //
-    PharmacyItemSearch,
-    PharmacyGenarateReports,
-    PharmacySummaryViews,
-    //Optician
-    Optician,
-    OpticianPatientManagement,
-    OpticianAppointmentManagement,
-    OpticianEmr,
-    OpticianStockManagement,
-    OpticianProductCatalog,
-    OpticianRepairManagement,
-
     AddCreditLimitInRegistration("Add Credit Limit in Registration"),
     
     InwardAdmissions("Inward Admissions"),