diff --git a/src/main/java/com/divudi/bean/common/SearchController.java b/src/main/java/com/divudi/bean/common/SearchController.java
index 1cddbc3fad..9beb3fb9b0 100644
--- a/src/main/java/com/divudi/bean/common/SearchController.java
+++ b/src/main/java/com/divudi/bean/common/SearchController.java
@@ -368,6 +368,14 @@ public class SearchController implements Serializable {
 
     // </editor-fold>  
     // <editor-fold defaultstate="collapsed" desc="Navigators">
+    public String navigateToMyDepartmentAllCashierSummary() {
+        department = sessionController.getDepartment();
+        institution = sessionController.getInstitution();
+        site = sessionController.getDepartment().getSite();
+        webUser=null;
+        return "/cashier/my_department_all_cashier_summary?faces-redirect=true";
+    }
+
     public String navigateToUserDrawerDashboard() {
         Drawer d = drawerController.getUsersDrawer(drawer.getDrawerUser());
         drawerController.setCurrent(d);
@@ -17385,7 +17393,7 @@ public PharmacyAdjustmentRow(Item itm, double purchaseRate, double saleRate, dou
         }
 
         // </editor-fold>  
-    // <editor-fold defaultstate="collapsed" desc="Getters and Setters">
+        // <editor-fold defaultstate="collapsed" desc="Getters and Setters">
         public Item getItm() {
             return itm;
         }
@@ -18146,5 +18154,4 @@ public void prepareDataBillsAndBillItemsDownload() {
     }
 
     // </editor-fold>  
-    
 }
diff --git a/src/main/java/com/divudi/bean/common/UserPrivilageController.java b/src/main/java/com/divudi/bean/common/UserPrivilageController.java
index 8d93a0e97f..2d51984195 100644
--- a/src/main/java/com/divudi/bean/common/UserPrivilageController.java
+++ b/src/main/java/com/divudi/bean/common/UserPrivilageController.java
@@ -502,15 +502,21 @@ private TreeNode<PrivilegeHolder> createPrivilegeHolderTreeNodes() {
         new DefaultTreeNode(new PrivilegeHolder(Privileges.CourierViewStatistics, "Courier View Statistics"), courierNode);
         new DefaultTreeNode(new PrivilegeHolder(Privileges.CourierViewBillReports, "Courier View Bill Reports"), courierNode);
         new DefaultTreeNode(new PrivilegeHolder(Privileges.CourierViewPaymentReports, "Courier View Payment Reports"), courierNode);
+        
+        // User Menu
+        TreeNode userNode = new DefaultTreeNode(new PrivilegeHolder(null, "User"), allNode);
+        new DefaultTreeNode(new PrivilegeHolder(Privileges.UserMenu, "User Menu"), userNode);
+        new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangeMyPassword, "Change User Password"), userNode);
+        new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangeMyTheme, "Change User Theme"), userNode);
+        new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangePreferece, "Change User Preferances"), userNode);
+        new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangeMyApiKeys, "Change API Keys"), userNode);
+        new DefaultTreeNode(new PrivilegeHolder(Privileges.MyFinanacialTransactionManager, "User Financial Transaction Manager"), userNode);
 
         // Search Privileges
         TreeNode searchRootNode = new DefaultTreeNode(new PrivilegeHolder(null, "Search"), allNode);
         new DefaultTreeNode(new PrivilegeHolder(Privileges.Search, "Search Menu"), searchRootNode);
         new DefaultTreeNode(new PrivilegeHolder(Privileges.SearchGrand, "Grand Search"), searchRootNode);
 
-        // User Privileges
-        TreeNode userNode = new DefaultTreeNode(new PrivilegeHolder(null, "User"), allNode);
-        new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangePreferece, "Change Theme"), userNode);
 
         // Cash Transaction Privileges
         TreeNode cashTransactionNode = new DefaultTreeNode(new PrivilegeHolder(null, "Cash Transaction"), allNode);
diff --git a/src/main/java/com/divudi/bean/inward/AdmissionController.java b/src/main/java/com/divudi/bean/inward/AdmissionController.java
index 200957a543..05334f4ac7 100644
--- a/src/main/java/com/divudi/bean/inward/AdmissionController.java
+++ b/src/main/java/com/divudi/bean/inward/AdmissionController.java
@@ -1169,7 +1169,15 @@ public void saveSelected() {
         savePatient();
         savePatientAllergies();
         saveGuardian();
-        bhtText = getInwardBean().getBhtText(getCurrent().getAdmissionType());
+        boolean bhtCanBeEdited = configOptionApplicationController.getBooleanValueByKey("BHT Number can be edited at the time of admission");
+        if(bhtText==null||bhtText.trim().equals("")){
+            bhtText = getInwardBean().getBhtText(getCurrent().getAdmissionType());
+        }else{
+            if(!bhtCanBeEdited){
+             bhtText = getInwardBean().getBhtText(getCurrent().getAdmissionType());
+            }
+        }
+//        bhtText = getInwardBean().getBhtText(getCurrent().getAdmissionType());
         getCurrent().setBhtNo(getBhtText());
 
         //  getCurrent().setBhtNo(bhtText);
diff --git a/src/main/java/com/divudi/bean/pharmacy/BhtIssueReturnController.java b/src/main/java/com/divudi/bean/pharmacy/BhtIssueReturnController.java
index 704140de0f..2c9587100d 100644
--- a/src/main/java/com/divudi/bean/pharmacy/BhtIssueReturnController.java
+++ b/src/main/java/com/divudi/bean/pharmacy/BhtIssueReturnController.java
@@ -66,6 +66,15 @@ public class BhtIssueReturnController implements Serializable {
     @EJB
     private BillItemFacade billItemFacade;
 
+    
+    public String navigateToReturnPharmacyDirectIssueToInpatients(){
+        if(bill==null){
+            JsfUtil.addErrorMessage("No Bill Selected");
+            return null;
+        }
+        return "/inward/pharmacy_bill_return_bht_issue?faces-redirect=true";
+    }
+    
     public Bill getBill() {
         return bill;
     }
diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java b/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java
index d40b96869f..104a95d0fe 100644
--- a/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java
+++ b/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java
@@ -155,6 +155,14 @@ public class PharmacyBillSearch implements Serializable {
     @Inject
     PharmacyRequestForBhtController pharmacyRequestForBhtController;
 
+    public String navigateToCancelPharmacyDirectIssueToInpatients(){
+        if(bill==null){
+            JsfUtil.addErrorMessage("No Bill Selected");
+            return null;
+        }
+        return "/inward/pharmacy_cancel_bill_retail_bht?faces-redirect=true";
+    }
+    
     public String navigatePharmacyReprintPo() {
         return "pharmacy_reprint_po?faces-redirect=true";
     }
diff --git a/src/main/java/com/divudi/bean/report/PharmacyReportController.java b/src/main/java/com/divudi/bean/report/PharmacyReportController.java
index 98f48e003a..0ea1d72dd6 100644
--- a/src/main/java/com/divudi/bean/report/PharmacyReportController.java
+++ b/src/main/java/com/divudi/bean/report/PharmacyReportController.java
@@ -2191,12 +2191,18 @@ public void processExpiryItemReport() {
         if (amp != null) {
             item = amp;
             System.out.println("item = " + item);
-            jpql += "and s.item=:itm ";
+            jpql += "and s.itemBatch.item=:itm ";
             m.put("itm", item);
         }
 
         jpql += " order by s.id ";
         stocks = stockFacade.findByJpql(jpql, m, TemporalType.TIMESTAMP);
+        stockPurchaseValue = 0.0;
+        stockSaleValue = 0.0;
+        for (Stock ts : stocks) {
+            stockPurchaseValue = stockPurchaseValue + (ts.getItemBatch().getPurcahseRate() * ts.getStock());
+            stockSaleValue = stockSaleValue + (ts.getItemBatch().getRetailsaleRate() * ts.getStock());
+        }
     }
     
 public long calculateDaysRemaining(Date dateOfExpire) {
diff --git a/src/main/java/com/divudi/data/Privileges.java b/src/main/java/com/divudi/data/Privileges.java
index c2ea645b50..4090b0755c 100644
--- a/src/main/java/com/divudi/data/Privileges.java
+++ b/src/main/java/com/divudi/data/Privileges.java
@@ -560,6 +560,16 @@ public enum Privileges {
     ChangeCreditLimitInCC("Change Credit Limit in Collecting Centre"),
     ChangeCollectingCentre("Change Collecting Centre"),
     //</editor-fold>
+    
+    //<editor-fold defaultstate="collapsed" desc="User">
+    UserMenu("User Menu"),
+    ChangeMyPassword("Change My Password"),
+    ChangeMyTheme("Change My Theme"),
+    ChangePreferece("Change My Preference"),
+    ChangeMyApiKeys("Change My Api Keys"),
+    MyFinanacialTransactionManager("My Finanacial Transaction Manager"),
+    //</editor-fold>
+    
 
     //<editor-fold defaultstate="collapsed" desc="Admin">
     SearchGrand("Search Grand"),
@@ -575,7 +585,7 @@ public enum Privileges {
     Developers("Developers"),
     // Administration
     SearchAll("Search All"),
-    ChangePreferece("Change Preference"),
+
     SendBulkSMS("Send Bulk SMS"),
     SuperAdmin("Supper Admin"),
     EditData("Edit Data"),
diff --git a/src/main/webapp/cashier/index.xhtml b/src/main/webapp/cashier/index.xhtml
index b6b7ed86b5..ccc7a4b601 100644
--- a/src/main/webapp/cashier/index.xhtml
+++ b/src/main/webapp/cashier/index.xhtml
@@ -299,6 +299,14 @@
                                             ajax="false" 
                                             action="#{financialTransactionController.navigateToMyCashierSummary()}" >
                                         </p:commandButton>
+                                        
+                                        <p:commandButton 
+                                            class="my-1 w-100"
+                                            value="My Department All Cashier SUmmary"
+                                            icon=""
+                                            ajax="false" 
+                                            action="#{searchController.navigateToMyDepartmentAllCashierSummary}" >
+                                        </p:commandButton>
 
                                         <p:commandButton 
                                             class="my-1 w-100"
diff --git a/src/main/webapp/cashier/my_department_all_cashier_summary.xhtml b/src/main/webapp/cashier/my_department_all_cashier_summary.xhtml
new file mode 100644
index 0000000000..2160e3282d
--- /dev/null
+++ b/src/main/webapp/cashier/my_department_all_cashier_summary.xhtml
@@ -0,0 +1,367 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:p="http://primefaces.org/ui"
+      xmlns:ez="http://xmlns.jcp.org/jsf/composite/ezcomp/bundles"
+      xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+    <body>
+
+        <ui:composition template="/cashier/index.xhtml">
+            <ui:define name="subcontent">
+                <h:form >
+
+                    <p:panel   header="All Cashier Summary" class="m-1">
+
+                        <h:panelGrid columns="10" class="w-100">
+                            <p:spacer></p:spacer>
+                            <h:outputLabel value="From"/>
+                            <p:calendar 
+                                class="w-100 " 
+                                inputStyleClass="w-100" 
+                                id="fromDate" 
+                                value="#{searchController.fromDate}" 
+                                pattern="#{sessionController.applicationPreference.longDateTimeFormat}" >
+                            </p:calendar>
+
+                            <p:spacer></p:spacer>
+
+                            <h:outputLabel value="To"/>                                
+                            <p:calendar 
+                                class="w-100 " 
+                                inputStyleClass="w-100" 
+                                id="toDate" 
+                                value="#{searchController.toDate}" 
+                                navigator="false" 
+                                pattern="#{sessionController.applicationPreference.longDateTimeFormat}" >
+                            </p:calendar>
+
+                            <p:spacer ></p:spacer>
+                            <p:spacer ></p:spacer>
+                            <p:spacer ></p:spacer>
+                            <p:spacer></p:spacer>
+                            <p:spacer></p:spacer>
+
+                            <h:outputLabel value="Institution"/>                                
+                            <h:outputLabel class="w-100 " value="#{searchController.institution.name}" >
+                            </h:outputLabel>
+
+                            <p:spacer width="20" ></p:spacer>
+
+                            <h:outputLabel value="Site"/>   
+                            <h:outputLabel class="w-100 " value="#{searchController.site.name}" >
+                            </h:outputLabel>
+
+                            <p:spacer width="20" ></p:spacer>
+
+                            <h:outputLabel value="Department"/>                                
+                            <h:outputLabel class="w-100 " value="#{searchController.department.name}" >
+                            </h:outputLabel>
+                            <p:spacer></p:spacer>
+
+
+                        </h:panelGrid>
+
+
+                        <h:panelGrid columns="6" class="my-2" >
+
+                            <p:commandButton  
+                                value="Process" 
+                                ajax="false"
+                                action="#{searchController.generateAllCashierSummary}" 
+                                class="ui-button-warning" icon="fas fa-cogs">
+                            </p:commandButton>
+
+                            <p:commandButton  
+                                value="Print" 
+                                ajax="false"
+                                class="ui-button-info mx-1" icon="fas fa-print">
+                                <p:printer target="printdata" />
+                            </p:commandButton>
+
+                            <p:commandButton  
+                                value="Excel" 
+                                ajax="false"
+                                class="ui-button-success" icon="fas fa-file-excel">
+                                <p:dataExporter type="xlsx" target="printdata" fileName="All Cashier Summury Report #{sessionController.currentDate} - #{sessionController.institution.name} #{sessionController.department.name}" />
+                            </p:commandButton>
+
+                            <p:commandButton  
+                                value="PDF" 
+                                ajax="false"
+                                class="ui-button-danger mx-1" icon="fas fa-file-pdf">
+                                <p:dataExporter type="pdf" target="printdata" fileName="All Cashier Summury Report #{sessionController.currentDate} - #{sessionController.institution.name} #{sessionController.department.name}" />
+                            </p:commandButton>
+
+                        </h:panelGrid>
+
+
+
+                        <p:dataTable value="#{searchController.bundle.reportTemplateRows}" var="summary"
+                                     paginator="true" rows="10"
+                                     id="printdata"
+                                     paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink}"
+                                     currentPageReportTemplate="(Page {currentPage} of {totalPages})"
+                                     paginatorPosition="bottom">
+
+
+                            <p:column headerText="Cashier" 
+                                      sortBy="#{summary.user.webUserPerson.name}" 
+                                      filterBy="#{summary.user.webUserPerson.name}">
+                                <h:outputText value="#{summary.user.webUserPerson.name} (#{summary.user.name})" />
+                            </p:column>
+                            <p:column headerText="Navigate" exportable="false">
+                                <p:commandButton 
+                                    icon="fa fa-bar-chart" title="Cashier Summary"
+                                    styleClass="m-1"
+                                    ajax="false"
+                                    action="#{searchController.navigateToSelectedCashierSummary(summary.user)}" />
+                                <p:commandButton 
+                                    icon="fa fa-address-card" title="Cashier Details"
+                                    styleClass="m-1"
+                                    ajax="false"
+                                    action="#{searchController.navigateToSelectedCashierDetails(summary.user)}" />
+                                <p:commandButton icon="fa fa-file-alt" title="Bill Types"
+                                                 styleClass="m-1"
+                                                 ajax="false"
+                                                 action="#{searchController.navigateToUserBillTypeList(summary.user)}" />
+                                <p:commandButton icon="fa fa-list-alt" title="Bill List"
+                                                 styleClass="m-1"
+                                                 ajax="false"
+                                                 action="#{searchController.navigateToUserBillList(summary.user)}" />
+                                <p:commandButton icon="fa fa-money-bill-alt" title="Payment List"
+                                                 styleClass="m-1"
+                                                 ajax="false"
+                                                 action="#{searchController.navigateToUserBillPaymentList(summary.user)}" />
+                            </p:column>
+
+
+
+                            <p:column headerText="Institution" sortBy="#{summary.department.institution.name}" filterBy="#{summary.department.institution.name}">
+                                <h:outputText value="#{summary.department.institution.name}" />
+                            </p:column>
+
+                            <p:column headerText="Site" sortBy="#{summary.department.site.name}" filterBy="#{summary.department.site.name}">
+                                <h:outputText value="#{summary.department.site.name}" />
+                            </p:column>
+
+                            <p:column headerText="Department" sortBy="#{summary.department.name}" filterBy="#{summary.department.name}">
+                                <h:outputText value="#{summary.department.name}" />
+                            </p:column>
+
+                            <p:column headerText="Date" sortBy="#{summary.date}" filterBy="#{summary.date}">
+                                <h:outputText value="#{summary.date}">
+                                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateFormat}" />
+                                </h:outputText>
+                            </p:column>
+
+                            <p:column headerText="HandOvered Date" sortBy="#{summary.date}" filterBy="#{summary.date}">
+                                <h:outputText value="#{summary.date}">
+                                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateFormat}" />
+                                </h:outputText>
+                            </p:column>
+
+                            <p:column headerText="Checked By" >
+
+                            </p:column>
+
+                            <p:column headerText="Cash" 
+                                      style="text-align: right;"
+                                      sortBy="#{summary.cashValue}" filterBy="#{summary.cashValue}" rendered="#{searchController.bundle.hasCashTransaction}" >
+                                <h:outputText value="#{summary.cashValue}"  style="text-align: right;">
+                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                </h:outputText>
+                                <f:facet name="footer" >
+                                    <p:outputLabel value="#{searchController.bundle.cashValue}" >
+                                        <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                    </p:outputLabel>
+                                </f:facet>
+
+                            </p:column>
+
+                            <p:column headerText="Card" sortBy="#{summary.cardValue}" filterBy="#{summary.cardValue}"  rendered="#{searchController.bundle.hasCardTransaction}" >
+                                <h:outputText value="#{summary.cardValue}" >
+                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                </h:outputText>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{searchController.bundle.cardValue}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </f:facet>
+                            </p:column>
+
+                            <p:column headerText="Multiple Payment Methods" sortBy="#{summary.multiplePaymentMethodsValue}" filterBy="#{summary.multiplePaymentMethodsValue}"  rendered="false" >
+                                <h:outputText value="#{summary.multiplePaymentMethodsValue}" >
+                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                </h:outputText>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{searchController.bundle.multiplePaymentMethodsValue}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </f:facet>
+                            </p:column>
+
+                            <p:column headerText="Credit" sortBy="#{summary.creditValue}" filterBy="#{summary.creditValue}"  rendered="#{searchController.bundle.hasCreditTransaction}" >
+                                <h:outputText value="#{summary.creditValue}" >
+                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                </h:outputText>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{searchController.bundle.creditValue}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </f:facet>
+                            </p:column>
+
+                            <!-- Continuing from Credit -->
+                            <p:column headerText="Staff Welfare" sortBy="#{summary.staffWelfareValue}" filterBy="#{summary.staffWelfareValue}"  rendered="#{searchController.bundle.hasStaffWelfareTransaction}" >
+                                <h:outputText value="#{summary.staffWelfareValue}" >
+                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                </h:outputText>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{searchController.bundle.staffWelfareValue}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </f:facet>
+                            </p:column>
+
+                            <p:column headerText="Voucher" sortBy="#{summary.voucherValue}" filterBy="#{summary.voucherValue}"  rendered="#{searchController.bundle.hasVoucherTransaction}" >
+                                <h:outputText value="#{summary.voucherValue}" >
+                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                </h:outputText>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{searchController.bundle.voucherValue}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </f:facet>
+                            </p:column>
+
+                            <p:column headerText="IOU" sortBy="#{summary.iouValue}" filterBy="#{summary.iouValue}"  rendered="#{searchController.bundle.hasIouTransaction}" >
+                                <h:outputText value="#{summary.iouValue}" >
+                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                </h:outputText>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{searchController.bundle.iouValue}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </f:facet>
+                            </p:column>
+
+                            <p:column headerText="Agent" sortBy="#{summary.agentValue}" filterBy="#{summary.agentValue}"  rendered="#{searchController.bundle.hasAgentTransaction}" >
+                                <h:outputText value="#{summary.agentValue}" >
+                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                </h:outputText>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{searchController.bundle.agentValue}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </f:facet>
+                            </p:column>
+
+                            <p:column headerText="Cheque" sortBy="#{summary.chequeValue}" filterBy="#{summary.chequeValue}"  rendered="#{searchController.bundle.hasChequeTransaction}" >
+                                <h:outputText value="#{summary.chequeValue}" >
+                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                </h:outputText>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{searchController.bundle.chequeValue}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </f:facet>
+                            </p:column>
+
+                            <p:column headerText="Slip" sortBy="#{summary.slipValue}" filterBy="#{summary.slipValue}"  rendered="#{searchController.bundle.hasSlipTransaction}" >
+                                <h:outputText value="#{summary.slipValue}" >
+                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                </h:outputText>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{searchController.bundle.slipValue}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </f:facet>
+                            </p:column>
+
+                            <p:column headerText="eWallet" sortBy="#{summary.ewalletValue}" filterBy="#{summary.ewalletValue}"  rendered="#{searchController.bundle.hasEWalletTransaction}" >
+                                <h:outputText value="#{summary.ewalletValue}" >
+                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                </h:outputText>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{searchController.bundle.ewalletValue}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </f:facet>
+                            </p:column>
+
+                            <p:column headerText="Patient Deposit" sortBy="#{summary.patientDepositValue}" filterBy="#{summary.patientDepositValue}"  rendered="#{searchController.bundle.hasPatientDepositTransaction}" >
+                                <h:outputText value="#{summary.patientDepositValue}" >
+                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                </h:outputText>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{searchController.bundle.patientDepositValue}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </f:facet>
+                            </p:column>
+
+                            <p:column headerText="Patient Points" sortBy="#{summary.patientPointsValue}" filterBy="#{summary.patientPointsValue}"  rendered="#{searchController.bundle.hasPatientPointsTransaction}" >
+                                <h:outputText value="#{summary.patientPointsValue}" >
+                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                </h:outputText>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{searchController.bundle.patientPointsValue}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </f:facet>
+                            </p:column>
+
+                            <p:column headerText="Online Settlement" sortBy="#{summary.onlineSettlementValue}" filterBy="#{summary.onlineSettlementValue}"  rendered="#{searchController.bundle.hasOnCallTransaction}" >
+                                <h:outputText value="#{summary.onlineSettlementValue}" >
+                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                </h:outputText>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{searchController.bundle.onlineSettlementValue}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </f:facet>
+                            </p:column>
+
+                            <p:column headerText="Grand Total" class="text-end">
+                                <h:outputText value="#{summary.cashValue + 
+                                                       summary.cardValue + 
+                                                       summary.voucherValue + 
+                                                       summary.iouValue + 
+                                                       summary.chequeValue + 
+                                                       summary.creditValue + 
+                                                       summary.slipValue + 
+                                                       summary.ewalletValue }" 
+                                              style="text-align: right;">
+                                    <f:convertNumber pattern="#,##0.00" />
+                                </h:outputText>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{searchController.bundle.cashValue + 
+                                                           searchController.bundle.cardValue + 
+                                                           searchController.bundle.creditValue + 
+                                                           searchController.bundle.voucherValue + 
+                                                           searchController.bundle.iouValue + 
+                                                           searchController.bundle.chequeValue + 
+                                                           searchController.bundle.slipValue + 
+                                                           searchController.bundle.ewalletValue }" 
+                                                  style="text-align: right;">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </f:facet>
+                            </p:column>
+
+
+                        </p:dataTable>
+                    </p:panel>
+
+
+                </h:form>
+
+            </ui:define>
+
+        </ui:composition>
+
+    </body>
+</html>
diff --git a/src/main/webapp/inward/inward_admission.xhtml b/src/main/webapp/inward/inward_admission.xhtml
index 28e0b1eca3..434cce8477 100644
--- a/src/main/webapp/inward/inward_admission.xhtml
+++ b/src/main/webapp/inward/inward_admission.xhtml
@@ -46,6 +46,7 @@
                                     icon="fa fa-user" > <!-- Font Awesome icon for user -->
                                     <f:setPropertyActionListener value="#{admissionController.current.patient}" target="#{patientController.current}" ></f:setPropertyActionListener>
                                 </p:commandButton>
+                                <p:defaultCommand target="admt"/>
                             </div>
                         </div>
                     </f:facet>
@@ -54,53 +55,60 @@
 
 
                     <div class="row">
-                        <div class="col-md-12">
-                            <h:panelGrid columns="8" class="m-2 w-100" > 
-                                <h:panelGroup >
-                                    <p:outputLabel value="Admission Type :" ></p:outputLabel>
-                                    <p:selectOneMenu 
-                                        id="lstSelect"  
-                                        value="#{admissionController.current.admissionType}"
-                                        class="mx-4">
-                                        <f:selectItem itemLabel="Select Admission Type"/>
-                                        <f:selectItems  value="#{admissionTypeController.items}" var="myItem" itemValue="#{myItem}" itemLabel="#{myItem.name}"></f:selectItems>
-                                        <p:ajax event="change" process="@this" update="bh cmbDoc" listener="#{admissionController.bhtNumberCalculation()}" />
-                                    </p:selectOneMenu>
-                                </h:panelGroup>
-                                <h:panelGroup>
-                                    <div class="d-flex align-items-center ">
-                                        <p:outputLabel class="px-2 py-2 " id="bht" value="BHT :"/>
-                                        <div class="border mx-4">
-                                            <p:outputLabel class="px-2 py-2" id="bh" value="#{admissionController.bhtText}"/>
-                                        </div> 
-                                    </div>
-                                </h:panelGroup>
-
-                                <h:panelGroup >
-                                    <p:outputLabel class="mx-1 " value="Room No :" />
-                                    <p:autoComplete  forceSelection="true"  
-                                                     id="cmbDoc" 
-                                                     class="mx-4"
-                                                     disabled="#{admissionController.current.admissionType eq null or admissionController.current.admissionType.roomFacilityCharge ne null}"
-                                                     value="#{admissionController.patientRoom.roomFacilityCharge}" 
-                                                     completeMethod="#{roomFacilityChargeController.completeRoom}"
-                                                     var="rf" itemLabel="#{rf.name}" itemValue="#{rf}" size="30"   
-                                                     >                            
-                                    </p:autoComplete>
-                                </h:panelGroup>
-
-                                <h:panelGroup >
-                                    <p:outputLabel value="Comments :" ></p:outputLabel>
-                                    <p:inputText class="mx-4" id="comment" value="#{admissionController.current.comments}" placeholder="Comment/Reference No"/>
-                                </h:panelGroup>
-                                <p:defaultCommand target="admt"/>
-                                                                
-                            </h:panelGrid>
+                        <div class="col-md-3 p-2">
+                            <p:outputLabel 
+                                class="m-1 form-label"
+                                value="Admission Type :" />
+                            <p:selectOneMenu
+                                id="lstSelect"  
+                                value="#{admissionController.current.admissionType}"
+                                class="m-1 w-100 form-control">
+                                <f:selectItem itemLabel="Select Admission Type" />
+                                <f:selectItems value="#{admissionTypeController.items}" var="myItem" itemValue="#{myItem}" itemLabel="#{myItem.name}" />
+                                <p:ajax event="change" process="@this" update="bh cmbDoc" listener="#{admissionController.bhtNumberCalculation()}" />
+                            </p:selectOneMenu>
+                        </div>
+                        <div class="col-md-3 p-2">
+                            <p:outputLabel 
+                                class="m-1 form-label"
+                                value="BHT :" />
+                            <p:inputText
+                                id="bh"
+                                readonly="#{not configOptionApplicationController.getBooleanValueByKey('BHT Number can be edited at the time of admission',true)}"
+                                value="#{admissionController.bhtText}"
+                                class="m-1 w-100 form-control" />
+                        </div>
+                        <div class="col-md-3 p-2">
+                            <p:outputLabel 
+                                class="m-1 form-label"
+                                value="Room No :" />
+                            <p:autoComplete 
+                                forceSelection="true"
+                                id="cmbDoc"
+                                inputStyleClass="w-100"
+                                class="m-1 w-100"
+                                disabled="#{admissionController.current.admissionType eq null or admissionController.current.admissionType.roomFacilityCharge ne null}"
+                                value="#{admissionController.patientRoom.roomFacilityCharge}" 
+                                completeMethod="#{roomFacilityChargeController.completeRoom}"
+                                var="rf"
+                                itemLabel="#{rf.name}"
+                                itemValue="#{rf}"
+                                size="30" />
+                        </div>
+                        <div class="col-md-3 p-2">
+                            <p:outputLabel 
+                                class="m-1 form-label"
+                                value="Comments :" />
+                            <p:inputText 
+                                id="comment"
+                                value="#{admissionController.current.comments}"
+                                placeholder="Comment/Reference No"
+                                class="m-1 w-100 form-control" />
                         </div>
-
                     </div>
 
 
+
                     <div class="row">
                         <div class="col-5">
                             <h:panelGroup id="ptd">
@@ -242,7 +250,7 @@
                                                         </p:selectOneMenu>
 
 
-                                                                                                                                                                                                                                                                                                                                            </h:panelGrid>
+                                                    </h:panelGrid>
                                                 </p:tab>
                                                 <p:tab title="Appointment" >
                                                     <p:autoComplete forceSelection="true" id="aBill" 
@@ -278,41 +286,41 @@
                                             </p:tabView>
                                         </p:panel>
                                     </div>
-                                     <p:panel header="Payment Detail" style="margin-top: 10px;">
-
-                                <div class="row">
-                                    <div class="col-12">
-                                        <h:panelGrid id="pg1" columns="2" class="my-2 w-100" >
-                                            <p:outputLabel value="Nationality"/>
-                                            <p:selectBooleanCheckbox value="#{admissionController.current.foriegner}"
-                                                                     styleClass="form-control w-100"
-                                                                     class="w-100" 
-                                                                     itemLabel="Mark as Foreigner"/>
-
-                                            <p:outputLabel value="Claimable Status"/>
-                                            <p:selectBooleanCheckbox value="#{admissionController.current.claimable}"
-                                                                     styleClass="form-control w-100"
-                                                                     class="w-100"
-                                                                     itemLabel="Claimable" />
-                                            
-                                            <p:outputLabel value="Last Used Credit Company" rendered="#{admissionController.isPatientHaveALastUsedCreditCompany(admissionController.current.patient)}"/>
-                                            <p:badge value="#{admissionController.lastCreditCompany.name}" 
-                                                     rendered="#{admissionController.isPatientHaveALastUsedCreditCompany(admissionController.current.patient)}"
-                                                                      />
-
-                                            <p:outputLabel value="Payment Method"/>
-                                            <p:selectOneMenu  class="mx-1  w-100" styleClass="form-control w-100" id="cmbPs" value="#{admissionController.current.paymentMethod}"  >
-                                                <f:selectItem itemLabel="Select" />                           
-                                                <f:selectItems value="#{enumController.paymentMethodForAdmission}" />
-                                                <p:ajax process="@this" update="crd pg1" event="change" />
-                                            </p:selectOneMenu>
-                                        </h:panelGrid>
-                                    </div>
-                                </div>
-                                <h:panelGroup id="crd" style="display: #{admissionController.current.paymentMethod eq 'Credit' ? 'block' : 'none'} ; ">
-                                    <credit:inputCredit_admit  patientEncounter="#{admissionController.current}"/>
-                                </h:panelGroup>
-                                     </p:panel>
+                                    <p:panel header="Payment Detail" style="margin-top: 10px;">
+
+                                        <div class="row">
+                                            <div class="col-12">
+                                                <h:panelGrid id="pg1" columns="2" class="my-2 w-100" >
+                                                    <p:outputLabel value="Nationality"/>
+                                                    <p:selectBooleanCheckbox value="#{admissionController.current.foriegner}"
+                                                                             styleClass="form-control w-100"
+                                                                             class="w-100" 
+                                                                             itemLabel="Mark as Foreigner"/>
+
+                                                    <p:outputLabel value="Claimable Status"/>
+                                                    <p:selectBooleanCheckbox value="#{admissionController.current.claimable}"
+                                                                             styleClass="form-control w-100"
+                                                                             class="w-100"
+                                                                             itemLabel="Claimable" />
+
+                                                    <p:outputLabel value="Last Used Credit Company" rendered="#{admissionController.isPatientHaveALastUsedCreditCompany(admissionController.current.patient)}"/>
+                                                    <p:badge value="#{admissionController.lastCreditCompany.name}" 
+                                                             rendered="#{admissionController.isPatientHaveALastUsedCreditCompany(admissionController.current.patient)}"
+                                                             />
+
+                                                    <p:outputLabel value="Payment Method"/>
+                                                    <p:selectOneMenu  class="mx-1  w-100" styleClass="form-control w-100" id="cmbPs" value="#{admissionController.current.paymentMethod}"  >
+                                                        <f:selectItem itemLabel="Select" />                           
+                                                        <f:selectItems value="#{enumController.paymentMethodForAdmission}" />
+                                                        <p:ajax process="@this" update="crd pg1" event="change" />
+                                                    </p:selectOneMenu>
+                                                </h:panelGrid>
+                                            </div>
+                                        </div>
+                                        <h:panelGroup id="crd" style="display: #{admissionController.current.paymentMethod eq 'Credit' ? 'block' : 'none'} ; ">
+                                            <credit:inputCredit_admit  patientEncounter="#{admissionController.current}"/>
+                                        </h:panelGroup>
+                                    </p:panel>
                                 </div>
                             </div>
 
diff --git a/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml b/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml
index 8e78a97a51..ccf91abbb0 100644
--- a/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml
+++ b/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml
@@ -243,7 +243,6 @@
                                             </f:facet>  
                                         </p:cellEditor> 
                                     </p:column>
-
                                     <p:column >  
                                         <p:rowEditor />  
                                     </p:column>  
diff --git a/src/main/webapp/inward/pharmacy_cancel_bill_retail_bht.xhtml b/src/main/webapp/inward/pharmacy_cancel_bill_retail_bht.xhtml
index 03062f5fbd..4909ed20e8 100644
--- a/src/main/webapp/inward/pharmacy_cancel_bill_retail_bht.xhtml
+++ b/src/main/webapp/inward/pharmacy_cancel_bill_retail_bht.xhtml
@@ -5,19 +5,24 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:f="http://xmlns.jcp.org/jsf/core"
+      xmlns:common="http://xmlns.jcp.org/jsf/composite/ezcomp/common"
       xmlns:pharmacy="http://xmlns.jcp.org/jsf/composite/pharmacy/inward"
       xmlns:phi="http://xmlns.jcp.org/jsf/composite/pharmacy">
 
+    <h:head >
+        <h:outputStylesheet library="css" name="ohmis.css" ></h:outputStylesheet>
+    </h:head>
+
     <h:body>
         <ui:composition template="/resources/template/template.xhtml">
             <ui:define name="content">
                 <h:form>
 
-                    <h:panelGroup rendered="#{!pharmacyBillSearch.printPreview}" styleClass="alignTop" >
-                        <p:panel>
+                    <h:panelGroup rendered="#{!pharmacyBillSearch.printPreview}" >
+                        <p:panel class="m-1">
                             <f:facet name="header">
                                 <div class="d-flex justify-content-between">
-                                    <div><h:outputText value="Cancellation" class="mt-2"/></div>
+                                    <div><h:outputText value="Pharmacy Direct Issue to BHT Cancellation" class="mt-2"/></div>
                                     <div class="d-flex gap-2">
                                         <p:inputText placeholder="Enter Comments to Cancel Bill" value="#{pharmacyBillSearch.bill.comments}" style=" width: 400px;"/> 
                                         <p:commandButton 
@@ -31,7 +36,7 @@
                             </f:facet>
                             <div class="row">
                                 <div class="col-md-6">
-                                    <p:panel>
+                                    <p:panel class="w-100 m-1">
                                         <f:facet name="header">
                                             <h:outputText styleClass="fas fa-list-alt"></h:outputText>
                                             <h:outputLabel value="Bill Details" class="mx-2"></h:outputLabel>
@@ -39,20 +44,37 @@
                                         <p:panelGrid columns="2">
                                             <h:outputLabel value="Bill No :" ></h:outputLabel>
                                             <h:outputLabel value="#{pharmacyBillSearch.bill.deptId}" ></h:outputLabel>
-                                            <h:outputLabel value="Total :" ></h:outputLabel>
-                                            <h:outputLabel value="#{pharmacyBillSearch.bill.total}" ></h:outputLabel>
-                                            <h:outputLabel value="Discount :" ></h:outputLabel>
-                                            <h:outputLabel value="#{pharmacyBillSearch.bill.discount}" ><f:convertNumber pattern="#,##0.00"/>
+                                            <h:outputLabel value="Net Total :" ></h:outputLabel>
+                                            <h:outputLabel value="#{pharmacyBillSearch.bill.netTotal}" >
+                                                <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
                                             </h:outputLabel>
+                                        </p:panelGrid>
+                                    </p:panel>
+                                    <common:admission_details admission="#{pharmacyBillSearch.bill.patientEncounter}" ></common:admission_details>
+                                    <common:patient_details_view patient="#{pharmacyBillSearch.bill.patientEncounter.patient}" />
+                                    <p:panel>
+                                        <f:facet name="header">
+                                            <h:outputText styleClass="fas fa-list-alt"></h:outputText>
+                                            <h:outputLabel value="Bill Details" class="mx-2"></h:outputLabel>
+                                        </f:facet>
+                                        <p:panelGrid columns="2">
+                                            <h:outputLabel value="Bill No :" ></h:outputLabel>
+                                            <h:outputLabel value="#{pharmacyBillSearch.bill.deptId}" ></h:outputLabel>
                                             <h:outputLabel value="Net Total :" ></h:outputLabel>
-                                            <h:outputLabel value="#{pharmacyBillSearch.bill.netTotal}" ></h:outputLabel>
+                                            <h:outputLabel value="#{pharmacyBillSearch.bill.netTotal}" >
+                                                <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                            </h:outputLabel>
                                         </p:panelGrid>
                                     </p:panel>
                                 </div>
                                 <div class="col-md-6">
-                                    <p:panel header="Bill Item Details">
-                                        <p:dataTable rowIndexVar="rowIndex" value="#{pharmacyBillSearch.bill.billItems}" var="bip" >
-                                            <p:column width="5%">
+                                    <p:panel header="Item Details">
+                                        <p:dataTable 
+                                            rowIndexVar="rowIndex"
+                                            styleClass="condensed-table"
+                                            value="#{pharmacyBillSearch.bill.billItems}"
+                                            var="bip">
+                                            <p:column width="1em">
                                                 <f:facet name="header" >No</f:facet>
                                                     #{rowIndex+1}
                                             </p:column>
@@ -60,9 +82,22 @@
                                                 <f:facet name="header">Item</f:facet>
                                                     #{bip.item.name}
                                             </p:column>
-                                            <p:column width="20%" style="text-align: right;">
+                                            <p:column  styleClass="text-end" width="5em" >
+                                                <f:facet name="header">Qty</f:facet>
+                                                <h:outputLabel value="#{bip.qty}">
+                                                </h:outputLabel>
+                                            </p:column>
+                                            <p:column styleClass="text-end" width="5em" >
+                                                <f:facet name="header">Rate</f:facet>
+                                                <h:outputLabel value="#{bip.netValue/bip.qty}">
+                                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                                </h:outputLabel>
+                                            </p:column>
+                                            <p:column styleClass="text-end" width="5em" >
                                                 <f:facet name="header">Value</f:facet>
-                                                    #{bip.netValue}
+                                                <h:outputLabel value="#{bip.netValue}">
+                                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                                </h:outputLabel>
                                             </p:column>
                                         </p:dataTable>
                                     </p:panel>
@@ -95,12 +130,15 @@
 
                                 <h:panelGroup  rendered="#{sessionController.departmentPreference.pharmacyBillPaperType eq 'PosPaper'}">
                                     <pharmacy:issueBill bill="#{pharmacyBillSearch.bill.cancelledBill}" cancelled="true" />
-<!--                                <phi:saleBill_prabodha bill="#{pharmacyBillSearch.bill.cancelledBill}"></phi:saleBill_prabodha>-->
                                 </h:panelGroup>
 
                                 <h:panelGroup  rendered="#{sessionController.departmentPreference.pharmacyBillPaperType eq 'FiveFivePaper'}"> 
                                     <phi:saleBill_five_five bill="#{pharmacyBillSearch.bill.cancelledBill}"></phi:saleBill_five_five>
-                                </h:panelGroup>                            
+                                </h:panelGroup> 
+
+                                <h:panelGroup id="gpBillPreviewFiveFiveCustom3" rendered="#{configOptionApplicationController.getBooleanValueByKey('Pharmacy Inward Direct Issue Bill is FiveFiveCustom3',true)}"> 
+                                    <phi:inward_direct_issue_cancellation_bill_five_five_custom_3 bill="#{pharmacyBillSearch.bill.cancelledBill}"/>
+                                </h:panelGroup>
 
                             </h:panelGroup>
 
diff --git a/src/main/webapp/inward/pharmacy_reprint_bill_sale_bht.xhtml b/src/main/webapp/inward/pharmacy_reprint_bill_sale_bht.xhtml
index 45b0103621..2542bf92d3 100644
--- a/src/main/webapp/inward/pharmacy_reprint_bill_sale_bht.xhtml
+++ b/src/main/webapp/inward/pharmacy_reprint_bill_sale_bht.xhtml
@@ -32,13 +32,13 @@
                                         value="To Cancel" 
                                         class="ui-button-danger"
                                         icon="fa fa-ban"
-                                        action="pharmacy_cancel_bill_retail_bht"
+                                        action="#{pharmacyBillSearch.navigateToCancelPharmacyDirectIssueToInpatients}"
                                         disabled="#{pharmacyBillSearch.bill.cancelled}"  >                           
                                     </p:commandButton>
                                     <p:commandButton 
                                         ajax="false" 
                                         value="To Return Item" 
-                                        action="pharmacy_bill_return_bht_issue"   
+                                        action="#{bhtIssueReturnController.navigateToReturnPharmacyDirectIssueToInpatients()}"   
                                         icon="fa fa-undo"
                                         disabled="#{pharmacyBillSearch.bill.cancelled eq true or pharmacyBillSearch.bill.patientEncounter.discharged eq true}"  >                                
                                         <f:setPropertyActionListener 
@@ -85,7 +85,7 @@
                         </div>
 
                         <div class="row mt-3">
-                            <div class="col-md-6">
+                            <div class="col-md-4">
                                 <p:panel>
                                     <f:facet name="header" >
                                         <div class="d-flex justify-content-between">
@@ -177,7 +177,7 @@
                                     </p:dataTable>
                                 </p:panel>
                             </div>
-                            <div class="col-md-6">
+                            <div class="col-md-8">
                                 <p:panel >
                                     <f:facet name="header" >
                                         <div class="d-flex justify-content-between">
@@ -199,7 +199,7 @@
                                         </p:selectOneMenu>
                                         <p:commandButton ajax="false" icon="fa fa-sync-alt" class="ui-button m-1" title="Redraw Bill"></p:commandButton>
                                     </div>
- 
+
                                     <h:panelGroup   id="gpBillPreview" class="mt-2"> 
 
                                         <h:panelGroup   id="gpBillPreviewSingle" rendered="#{sessionController.departmentPreference.pharmacyBillPaperType eq 'PosPaper'}">
@@ -208,7 +208,12 @@
 
                                         <h:panelGroup id="gpBillPreviewFiveFive" rendered="#{sessionController.departmentPreference.pharmacyBillPaperType eq 'FiveFivePaper'}"> 
                                             <phi:saleBill_five_five bill="#{pharmacyBillSearch.bill}"></phi:saleBill_five_five>
-                                        </h:panelGroup>                            
+                                        </h:panelGroup>        
+
+                                        <h:panelGroup id="gpBillPreviewFiveFiveCustom3" rendered="#{configOptionApplicationController.getBooleanValueByKey('Pharmacy Inward Direct Issue Bill is FiveFiveCustom3',true)}"> 
+                                            <phi:inward_direct_issue_bill_five_five_custom_3 bill="#{pharmacyBillSearch.bill}"/>
+                                        </h:panelGroup>
+
                                     </h:panelGroup>  
                                 </p:panel>
                             </div>
diff --git a/src/main/webapp/reports/inventoryReports/expiry_item.xhtml b/src/main/webapp/reports/inventoryReports/expiry_item.xhtml
index 0ab770f3f3..db02740359 100644
--- a/src/main/webapp/reports/inventoryReports/expiry_item.xhtml
+++ b/src/main/webapp/reports/inventoryReports/expiry_item.xhtml
@@ -107,7 +107,6 @@
                             <p:spacer width="20"></p:spacer> 
 
 
-
                             <h:panelGroup layout="block" styleClass="form-group">
                                 <h:outputText styleClass="fa fa-building mr-2" />
                                 <p:outputLabel value="Department" for="phmDept" class="m-3">
@@ -297,24 +296,15 @@
                                     <h:outputText value="#{f.itemBatch.dateOfExpire}" />
                                 </p:column>
                                 <p:column headerText="Supplier" width="10em">
-                                    <h:outputText value="" />
+                                    <h:outputText value="#{f.itemBatch.lastPurchaseBillItem.bill.fromInstitution.name}" />
                                 </p:column>
                                 <p:column headerText="Shelf life remaining (Days)" width="10em">
                                     <h:outputText 
                                         value="#{pharmacyReportController.calculateDaysRemaining(f.itemBatch.dateOfExpire)}"
                                         style="#{pharmacyReportController.calculateDaysRemaining(f.itemBatch.dateOfExpire) &lt; 0 ? 'color:red;' : 'color:green;'}" />
                                 </p:column>
-                                <p:column headerText="Rate" width="10em">
-                                    <h:outputText value="#{f.itemBatch.purcahseRate}" />
-                                </p:column>
-                                <p:column headerText="MRP" width="10em">
-                                    <h:outputText value="#{f.itemBatch.retailsaleRate}" />
-                                </p:column>
-                                <p:column headerText="Qty" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Item Value" width="10em">
-                                    <h:outputText value="#{f.itemBatch.purcahseRate}" />
+                                <p:column headerText="Quantity" width="10em">
+                                    <h:outputText value="#{f.stock}" />
                                 </p:column>
                                 <p:column headerText="Batch wise total" width="10em">
                                     <h:outputText value="" />
@@ -328,6 +318,39 @@
                                 <p:column headerText="Item wise Qty" width="10em">
                                     <h:outputText value="" />
                                 </p:column>
+                                <p:column headerText="Puchase Rate" width="10em">
+                                    <h:outputText value="#{f.itemBatch.purcahseRate}" >
+                                     <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                    </h:outputText>
+                                </p:column>
+                                <p:column headerText="Purchase Value" width="10em">
+                                    <h:outputLabel value="#{f.itemBatch.purcahseRate * f.stock}"  >
+                                        <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                    </h:outputLabel>
+                                    <f:facet name="footer" >
+                                        <h:outputLabel value="#{pharmacyReportController.stockPurchaseValue}" >
+                                            <f:convertNumber parent="#,##0.00" ></f:convertNumber>
+                                        </h:outputLabel>
+                                    </f:facet>
+                                </p:column>
+                                <p:column headerText="Retail Rate(MRP)" width="10em">
+                                    <h:outputLabel value="#{f.itemBatch.retailsaleRate}"  >
+                                        <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                    </h:outputLabel>
+                                </p:column>
+                                <p:column headerText="Retail Rate Value" width="10em">
+                                    <h:outputLabel value="#{f.itemBatch.retailsaleRate * f.stock}"  >
+                                        <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                    </h:outputLabel>
+                                    <f:facet name="footer" >
+                                        <h:outputLabel value="#{pharmacyReportController.stockSaleValue}" >
+                                            <f:convertNumber parent="#,##0.00" ></f:convertNumber>
+                                        </h:outputLabel>
+                                    </f:facet>
+                                </p:column>
+                                
+                                
+                                
 
                             </p:dataTable>
 
diff --git a/src/main/webapp/resources/css/ohmis.css b/src/main/webapp/resources/css/ohmis.css
index 706a2704fb..01818370f4 100644
--- a/src/main/webapp/resources/css/ohmis.css
+++ b/src/main/webapp/resources/css/ohmis.css
@@ -546,3 +546,50 @@ th.align-right-header .ui-column-title {
     background-color: #00a88f !important;
     border-color: #007f6b !important;
 }
+
+/* Ensure the condensed table class applies specifically to this DataTable */
+.condensed-table.ui-datatable {
+    margin: 0 !important;
+    padding: 0 !important;
+    font-size: 1rem !important; /* Adjust font size */
+    line-height: 1 !important;
+    border-collapse: collapse !important;
+}
+
+/* Remove spacing and padding in headers and footers */
+.condensed-table.ui-datatable .ui-datatable-header,
+.condensed-table.ui-datatable .ui-datatable-footer {
+    padding: 0 !important;
+    margin: 0 !important;
+}
+
+/* Remove padding and spacing for table cells */
+.condensed-table.ui-datatable .ui-datatable-thead > tr > th,
+.condensed-table.ui-datatable .ui-datatable-tbody > tr > td {
+    padding: 0 !important;
+    margin: 0 !important;
+    text-align: left !important;
+    border: none !important;
+}
+
+/* Remove padding from the wrapper */
+.condensed-table.ui-datatable .ui-datatable-tablewrapper {
+    padding: 0 !important;
+    margin: 0 !important;
+}
+
+/* Specific adjustments for labels inside cells */
+.condensed-table.ui-datatable .ui-datatable-tbody > tr > td label {
+    margin: 0 !important;
+    padding: 0 !important;
+    font-size: inherit !important;
+    line-height: inherit !important;
+}
+
+/* Ensure the table itself is tightly packed */
+.condensed-table.ui-datatable table {
+    border-collapse: collapse !important;
+    border-spacing: 0 !important;
+    width: 100% !important;
+}
+
diff --git a/src/main/webapp/resources/ezcomp/common/admission_details.xhtml b/src/main/webapp/resources/ezcomp/common/admission_details.xhtml
index a5149084eb..cb67f008f8 100644
--- a/src/main/webapp/resources/ezcomp/common/admission_details.xhtml
+++ b/src/main/webapp/resources/ezcomp/common/admission_details.xhtml
@@ -16,7 +16,7 @@
     <!-- IMPLEMENTATION -->
     <cc:implementation>
 
-        <p:panel class="w-100">
+        <p:panel class="w-100 m-1">
             <f:facet name="header">
                 <h:outputText styleClass="fas fa-id-card-alt"></h:outputText>
                 <h:outputLabel value="Admission Details" class="mx-4"></h:outputLabel>
diff --git a/src/main/webapp/resources/ezcomp/common/patient_details.xhtml b/src/main/webapp/resources/ezcomp/common/patient_details.xhtml
index 7849170fd0..0450b6f993 100644
--- a/src/main/webapp/resources/ezcomp/common/patient_details.xhtml
+++ b/src/main/webapp/resources/ezcomp/common/patient_details.xhtml
@@ -18,7 +18,7 @@
 
     <!-- IMPLEMENTATION -->
     <cc:implementation >
-        <p:panel id="ptImp">
+        <p:panel id="ptImp" class="w-100 m-1">
             <p:growl id="msg"/>
             <f:facet name="header">
                 <h:panelGroup layout="block" styleClass="d-flex justify-content-between align-items-center">
diff --git a/src/main/webapp/resources/ezcomp/common/patient_details_view.xhtml b/src/main/webapp/resources/ezcomp/common/patient_details_view.xhtml
new file mode 100644
index 0000000000..89d4d99b52
--- /dev/null
+++ b/src/main/webapp/resources/ezcomp/common/patient_details_view.xhtml
@@ -0,0 +1,83 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:f="http://xmlns.jcp.org/jsf/core"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:p="http://primefaces.org/ui">
+
+    <!-- INTERFACE -->
+    <cc:interface>
+        <cc:attribute name="patient" type="com.divudi.entity.Patient"  />
+    </cc:interface>
+
+    <!-- IMPLEMENTATION -->
+    <cc:implementation >
+        <p:panel id="ptImp" class="w-100 m-1" header="Patient Details">
+
+            <h:panelGrid columns="3" class="my-1 w-100" id="panelPatientDisplay" rendered="#{cc.attrs.patient ne null}" >
+                <h:outputLabel value="Name " class="mx-3"/>
+                <h:outputLabel value=" : " class="mx-3"/>
+                <h:outputText value="#{cc.attrs.patient.person.nameWithTitle}" />
+
+                <h:outputLabel value="Gender " class="mx-3"/>
+                <h:outputLabel value=" : " class="mx-3"/>
+                <h:outputText value="#{cc.attrs.patient.person.sex}" />
+
+                <h:outputLabel value="Date of Birth " class="mx-3"/>
+                <h:outputLabel value=" : " class="mx-3"/>
+                <h:outputText value="#{cc.attrs.patient.person.dob}" >
+                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateFormat}" ></f:convertDateTime>
+                </h:outputText>
+
+                <h:outputLabel value="Age  " class="mx-3"/>
+                <h:outputLabel value=" : " class="mx-3"/>
+                <h:outputText value="#{cc.attrs.patient.person.ageAsString}" />
+
+                <h:outputLabel value="Mobile No. " class="mx-3"/>
+                <h:outputLabel value=" : " class="mx-3"/>
+                <h:outputText value="#{cc.attrs.patient.person.mobile}" />
+
+                <h:outputLabel value="Phone No. " class="mx-3"/>
+                <h:outputLabel value=" : " class="mx-3"/>
+                <h:outputText value="#{cc.attrs.patient.person.phone}" />
+
+                <h:outputLabel value="Email " class="mx-3"/>
+                <h:outputLabel value=" : " class="mx-3"/>
+                <h:outputText value="#{cc.attrs.patient.person.email}" />
+
+                <h:outputLabel value="National ID No. " class="mx-3"/>
+                <h:outputLabel value=" : " class="mx-3"/>
+                <h:outputText value="#{cc.attrs.patient.person.nic}" />
+
+                <h:outputLabel value="Address " class="mx-3"/>
+                <h:outputLabel value=" : " class="mx-3"/>
+                <h:outputText value="#{cc.attrs.patient.person.address}" />
+
+
+                <h:outputLabel value="Patient Status " class="mx-3" rendered="#{configOptionApplicationController.getBooleanValueByKey('Save the Patient with Patient Status')}"/>
+                <h:outputLabel value=" : " class="mx-3" rendered="#{configOptionApplicationController.getBooleanValueByKey('Save the Patient with Patient Status')}"/>
+                <h:panelGroup rendered="#{configOptionApplicationController.getBooleanValueByKey('Save the Patient with Patient Status')}">
+                    <p:badge
+                        value="#{cc.attrs.patient.person.foreigner?'Patient is Forigner':'Patient is Local'}" 
+                        severity="#{cc.attrs.patient.person.foreigner?'warning':'success'}" 
+                        styleClass="mr-2">
+                    </p:badge>
+                </h:panelGroup>
+
+                <h:outputLabel value="Account Balance " class="mx-3" rendered="#{cc.attrs.patient.hasAnAccount}"/>
+                <h:outputLabel value=" : " class="mx-3" rendered="#{cc.attrs.patient.hasAnAccount}"/>
+                <h:outputText value="#{cc.attrs.patient.runningBalance}" rendered="#{cc.attrs.patient.hasAnAccount}">
+                    <f:convertNumber pattern="#,##0.00" />
+                </h:outputText>
+
+                <h:outputLabel value="Area " class="mx-3"/>
+                <h:outputLabel value=" : " class="mx-3"/>
+                <h:outputText value="#{cc.attrs.patient.person.area.name}" />
+
+            </h:panelGrid>
+
+
+        </p:panel>
+    </cc:implementation>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/resources/ezcomp/menu.xhtml b/src/main/webapp/resources/ezcomp/menu.xhtml
index a16cdd60a4..2bb23baaaa 100644
--- a/src/main/webapp/resources/ezcomp/menu.xhtml
+++ b/src/main/webapp/resources/ezcomp/menu.xhtml
@@ -1505,12 +1505,36 @@
 
                 </p:submenu>
 
-                <p:submenu id="smSettings" icon="pi pi-cog" >
-                    <p:menuitem  ajax="false"  action="#{sessionController.navigateToChangePasswordByUser}" value="Change My Password"></p:menuitem>
-                    <p:menuitem  ajax="false"  action="#{themeController.navigateToChangeOwnTheme()}" value="Change My Theme"  ></p:menuitem>
-                    <p:menuitem  ajax="false"  action="#{sessionController.navigateToManageOwnWebUserPreferences()}" value="Change My Preferences"  ></p:menuitem>
+                <p:submenu
+                    id="smSettings" 
+                    icon="pi pi-cog" 
+                    rendered="#{webUserController.hasPrivilege('UserMenu')}" >
+                    <p:menuitem 
+                        ajax="false"
+                        rendered="#{webUserController.hasPrivilege('MyFinanacialTransactionManager')}" 
+                        styleClass="#{financialTransactionController.nonClosedShiftStartFundBill eq null ? 'bg-warning text-white font-weight-bold' : ''}"
+                        action="#{financialTransactionController.navigateToFinancialTransactionIndex()}"
+                        value="My Financial Transaction Manager" 
+                        icon="fa fa-list-alt">
+                    </p:menuitem>
+                    <p:menuitem 
+                        ajax="false"  
+                        rendered="#{webUserController.hasPrivilege('MyFinanacialTransactionManager')}" 
+                        action="#{sessionController.navigateToChangePasswordByUser}" 
+                        value="Change My Password"></p:menuitem>
+                    <p:menuitem 
+                        ajax="false"  
+                        rendered="#{webUserController.hasPrivilege('ChangeMyTheme')}" 
+                        action="#{themeController.navigateToChangeOwnTheme()}"
+                        value="Change My Theme"  ></p:menuitem>
+                    <p:menuitem 
+                        ajax="false" 
+                        rendered="#{webUserController.hasPrivilege('ChangePreferece')}" 
+                        action="#{sessionController.navigateToManageOwnWebUserPreferences()}"
+                        value="Change My Preferences"  ></p:menuitem>
                     <p:menuitem  
                         ajax="false"  
+                        rendered="#{webUserController.hasPrivilege('ChangeMyApiKeys')}" 
                         action="#{apiKeyController.toManageMyApiKeys()}" 
                         value="Manage My API Keys"  ></p:menuitem>
                     <p:menuitem
diff --git a/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml
index 20c4c4ba48..9c4f945dda 100644
--- a/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml
+++ b/src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml
@@ -97,30 +97,29 @@
                     <thead>
                         <tr>
                             <th>No</th>
-                            <th>Item Name</th>
-                            <th>Rate</th>
-                            <th>Qty</th>
+                            <th colspan="3">Item</th>
+                            <th style="text-align: right">Qty</th>
+                            <th style="text-align: right">Rate</th>
                             <th style="text-align: right">Value</th>
                         </tr>
                     </thead>
                     <tbody>
                         <ui:repeat value="#{cc.attrs.bill.billItems}" var="item" varStatus="s">
                             <tr>
-                                <!-- Display the item number across all items -->
-                                <td>#{s.index +1}</td> <!-- status.index starts from 0, so add 1 for a human-readable count -->
-                                <td>#{item.item.name}</td>
-                                <td>
-                                    <h:outputLabel value="#{item.rate}">
-                                        <f:convertNumber pattern="#,##0.00" />
-                                    </h:outputLabel>
-                                </td>
-                                <td>
+                                <td>#{s.index +1}</td>
+                                <td colspan="3">#{item.item.name}</td>
+                                <td style="text-align: right">
                                     <h:outputLabel value="#{item.qty}">
                                         <f:convertNumber integerOnly="true" />
                                     </h:outputLabel>
                                 </td>
+                                <td  style="text-align: right">
+                                    <h:outputLabel value="#{item.netValue / item.qty }">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
                                 <td style="text-align: right">
-                                    <h:outputLabel value="#{item.grossValue}">
+                                    <h:outputLabel value="#{item.netValue}">
                                         <f:convertNumber pattern="#,##0.00" />
                                     </h:outputLabel>
                                 </td>
@@ -136,33 +135,12 @@
                 <table class="total-table">
                     <tr>
                         <td >Total:</td>
-                        <td  style="text-align: right;">
-                            <h:outputLabel value="#{cc.attrs.bill.total}" >
+                        <td style="text-align: right;">
+                            <h:outputLabel value="#{cc.attrs.bill.netTotal}">
                                 <f:convertNumber pattern="#,##0.00" />
                             </h:outputLabel>
                         </td>
                     </tr>
-
-                    <h:panelGroup rendered="#{cc.attrs.bill.discount ne 0.0}" >
-                        <tr>
-                            <td >Discount:</td>
-                            <td  style="text-align: right;">
-                                <h:outputLabel value="#{cc.attrs.bill.discount ne 0.0 ?'#{-cc.attrs.bill.discount}' : '0.0'}">
-                                    <f:convertNumber pattern="#,##0.00" />
-                                </h:outputLabel>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td >Net Total:</td>
-                            <td style="text-align: right;">
-                                <h:outputLabel value="#{cc.attrs.bill.netTotal}">
-                                    <f:convertNumber pattern="#,##0.00" />
-                                </h:outputLabel>
-                            </td>
-                        </tr>
-
-                    </h:panelGroup>
-
                     <tr>
                         <td >No of Items:</td>
                         <td >
diff --git a/src/main/webapp/resources/pharmacy/inward_direct_issue_cancellation_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/inward_direct_issue_cancellation_bill_five_five_custom_3.xhtml
new file mode 100644
index 0000000000..8a7befab53
--- /dev/null
+++ b/src/main/webapp/resources/pharmacy/inward_direct_issue_cancellation_bill_five_five_custom_3.xhtml
@@ -0,0 +1,231 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:f="http://xmlns.jcp.org/jsf/core"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+      xmlns:p="http://primefaces.org/ui">
+
+    <h:head>
+        <!-- Include the custom CSS for styling -->
+        <h:outputStylesheet library="css" name="inward_direct_issue_bill_five_five_custom_3.css" />
+    </h:head>
+
+    <h:body>
+        <!-- Composite Component Interface -->
+        <cc:interface>
+            <!-- Attributes passed to the component -->
+            <cc:attribute name="bill" required="true"  type="com.divudi.entity.Bill" />
+            <cc:attribute name="duplicate" required="false" />
+        </cc:interface>
+
+        <!-- Composite Component Implementation -->
+        <cc:implementation>
+            <h:outputStylesheet library="css" name="sale_bill_five_five_custom_3.css" />
+
+
+            <div class="receipt-container">
+                <!-- Header Section -->
+                <div class="hospital-name">
+                    <h:outputLabel value="#{cc.attrs.bill.department.name}"/>
+                    <h:outputLabel value="**Duplicate**"  rendered="#{cc.attrs.duplicate eq true}" /> 
+                    <h:outputLabel value="**Cancelled**"  rendered="#{cc.attrs.bill.cancelled eq true}" /> 
+                </div>
+
+                <!-- Separator Line -->
+                <div class="separator"></div>
+
+                <!-- Patient and Bill Information Table -->
+                <table class="info-table">
+                    <h:panelGroup rendered="#{cc.attrs.bill.patient ne null}" >
+                        <tr>
+                            <td >Patient Name:</td>
+                            <td >
+                                <h:outputLabel value="#{cc.attrs.bill.patient.person.nameWithTitle}"/>
+                            </td>
+                            <td class="spacer"></td>
+                            <td >Patient Age/Sex:</td>
+                            <td >
+                                <h:outputLabel value="#{cc.attrs.bill.patient.age}"/>
+                            </td>
+                        </tr>
+                    </h:panelGroup>
+                    <h:panelGroup rendered="#{cc.attrs.bill.patientEncounter ne null}" >
+                        <tr>
+                            <td >BHT:</td>
+                            <td >
+                                <h:outputLabel value="#{cc.attrs.bill.patientEncounter.bhtNo}"/>
+                            </td>
+                            <td class="spacer"></td>
+                            <td >Room No:</td>
+                            <td >
+                                <h:outputLabel value="#{cc.attrs.bill.patientEncounter.currentPatientRoom.name}"/>
+                            </td>
+                        </tr>
+                    </h:panelGroup>
+
+                    
+                    <tr>
+                        <td colspan="5">
+                            <h:outputText value="Original Bill Details" ></h:outputText>
+                        </td>
+                    </tr>
+                    
+                    <tr>
+                        <td >Bill Date:</td>
+                        <td >
+                            <h:outputLabel value="#{cc.attrs.bill.billedBill.createdAt}" >
+                                <f:convertDateTime pattern="yyyy-MM-dd" />
+                            </h:outputLabel>
+                        </td>
+                        <td class="spacer"></td>
+                        <td >Bill Time:</td>
+                        <td >
+                            <h:outputLabel value="#{cc.attrs.bill.billedBill.createdAt}" >
+                                <f:convertDateTime pattern="HH:mm a" />
+                            </h:outputLabel>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td >Bill No:</td>
+                        <td >#{cc.attrs.bill.billedBill.deptId}</td>
+                        <td class="spacer"></td>
+                        <td >Department:</td>
+                        <td >Pharmacy</td>
+                    </tr>
+                    
+                    <tr>
+                        <td colspan="5">
+                            <h:outputText value="Cancellation Bill Details" ></h:outputText>
+                        </td>
+                    </tr>
+                    
+                    <tr>
+                        <td >Bill Date:</td>
+                        <td >
+                            <h:outputLabel value="#{cc.attrs.bill.createdAt}" >
+                                <f:convertDateTime pattern="yyyy-MM-dd" />
+                            </h:outputLabel>
+                        </td>
+                        <td class="spacer"></td>
+                        <td >Bill Time:</td>
+                        <td >
+                            <h:outputLabel value="#{cc.attrs.bill.createdAt}" >
+                                <f:convertDateTime pattern="HH:mm a" />
+                            </h:outputLabel>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td >Bill No:</td>
+                        <td >#{cc.attrs.bill.deptId}</td>
+                        <td class="spacer"></td>
+                        <td >Department:</td>
+                        <td >Pharmacy</td>
+                    </tr>
+                </table>
+
+                <!-- Separator Line -->
+                <div class="separator"></div>
+
+                <!-- Item Table -->
+                <table class="receipt-table">
+                    <thead>
+                        <tr>
+                            <th>No</th>
+                            <th colspan="3">Item</th>
+                            <th style="text-align: right">Qty</th>
+                            <th style="text-align: right">Rate</th>
+                            <th style="text-align: right">Value</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <ui:repeat value="#{cc.attrs.bill.billItems}" var="item" varStatus="s">
+                            <tr>
+                                <td>#{s.index +1}</td>
+                                <td colspan="3">#{item.item.name}</td>
+                                <td style="text-align: right">
+                                    <h:outputLabel value="#{item.qty}">
+                                        <f:convertNumber integerOnly="true" />
+                                    </h:outputLabel>
+                                </td>
+                                <td  style="text-align: right">
+                                    <h:outputLabel value="#{item.netValue / item.qty }">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
+                                <td style="text-align: right">
+                                    <h:outputLabel value="#{item.netValue}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
+                            </tr>
+                        </ui:repeat>
+                    </tbody>
+                </table>
+
+                <!-- Separator Line -->
+                <div class="separator"></div>
+
+                <!-- Totals Table -->
+                <table class="total-table">
+                    <tr>
+                        <td >Total:</td>
+                        <td style="text-align: right;">
+                            <h:outputLabel value="#{cc.attrs.bill.netTotal}">
+                                <f:convertNumber pattern="#,##0.00" />
+                            </h:outputLabel>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td >No of Items:</td>
+                        <td >
+                            <h:outputLabel value="#{cc.attrs.bill.billItems.size()}">
+                                <f:convertNumber integerOnly="true" />
+                            </h:outputLabel>
+                        </td>
+                    </tr>
+                </table>
+
+                <table >
+                    <tr>
+                        <td>
+                            <ui:repeat value="#{cc.attrs.bill.payments}" var="ps" rendered="#{cc.attrs.bill.paymentMethod eq 'MultiplePaymentMethods'}">
+                                <h:panelGroup rendered="#{ps.paymentMethod eq 'Cash' }" >
+                                    <h:outputText 
+                                        style="font-size: 8pt"  
+                                        value="Paid by : Cash #{ps.paidValue}"/><br/>
+                                </h:panelGroup>
+
+                                <h:panelGroup rendered="#{ps.paymentMethod eq 'Card' }" >
+                                    <h:outputText 
+                                        style="font-size: 8pt"  
+                                        value="Paid by : Credit Card:#{ps.paidValue} (Card Last 4 Digits:#{ps.creditCardRefNo})"/><br/>
+                                </h:panelGroup>
+                            </ui:repeat>
+
+                        </td>
+                        <td>
+
+                        </td>
+                        <td>
+                            <h:outputLabel value="Printed By :"/>
+                            <h:outputLabel value="#{sessionController.loggedUser.name}"/>
+                            <h:outputLabel value="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" ></h:outputLabel>
+                            <h:outputLabel value="#{sessionController.currentDate}">
+                                <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"  />
+                            </h:outputLabel>
+                        </td>
+                    </tr>
+                </table>
+
+
+
+            </div>
+
+
+
+        </cc:implementation>
+
+    </h:body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml
index 99a11d7fc3..f4e285fb7c 100644
--- a/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml
+++ b/src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml
@@ -40,13 +40,12 @@
                 <table class="info-table">
                     <h:panelGroup rendered="#{cc.attrs.bill.patient ne null}" >
                         <tr>
-
                             <td style="padding: 2px;">Name :</td>
                             <td style="padding: 2px;" >
                                 <h:outputLabel value="#{cc.attrs.bill.patient.person.nameWithTitle}"/>
                             </td>
                             <td style="padding: 2px;" class="spacer"></td>
-                            <h:panelGroup rendered="#{cc.attrs.bill.patient.age ne null}" >
+                            <h:panelGroup rendered="#{cc.attrs.bill.patient.person.ageAsShortString ne null}" >
                                 <td  style="padding: 2px;">Age/Sex :</td>
                                 <td style="padding: 2px;" >
                                     <h:outputLabel value="#{cc.attrs.bill.patient.person.ageAsShortString} / #{cc.attrs.bill.patient.person.sex.label}"/>
@@ -54,7 +53,7 @@
                             </h:panelGroup>
                         </tr>
                     </h:panelGroup>
-                     
+                    
                     <h:panelGroup rendered="false" >
                     #{pharmacySaleController.printBill.patient.person.sex.shortLabel}
                 </h:panelGroup>
@@ -62,29 +61,24 @@
                     <tr>
                         <td  style="padding: 2px;">Bill Date:</td>
                         <td  style="padding: 2px;">
-
                             <h:outputLabel value="#{cc.attrs.bill.createdAt}" >
                                 <f:convertDateTime pattern="yyyy-MM-dd" />
                             </h:outputLabel>
                         </td>
-
                         <td style="padding: 2px;" class="spacer"></td>
                         <td style="padding: 2px;">Bill Time:</td>
                         <td style="padding: 2px;">
-
                             <h:outputLabel value="#{cc.attrs.bill.createdAt}" >
                                 <f:convertDateTime pattern="HH:mm a" />
                             </h:outputLabel>
                         </td>
                     </tr>
                     <tr>
-
                         <td style="padding: 2px;">Bill No:</td>
                         <td style="padding: 2px;">#{cc.attrs.bill.deptId}</td>
                         <td style="padding: 2px;" class="spacer"></td>
                         <td style="padding: 2px;" ><h:outputLabel value="BHT No : " rendered="#{cc.attrs.bill.patientEncounter ne null}"/></td>
                         <td style="padding: 2px;" ><h:outputLabel value="#{cc.attrs.bill.patientEncounter.bhtNo}" rendered="#{cc.attrs.bill.patientEncounter ne null}"/></td>
-
                     </tr>
                 </table>
 
@@ -146,14 +140,11 @@
                         <tr>
                             <td >Discount:</td>
                             <td  style="text-align: right;">
-
                                 <h:outputLabel  value="#{-cc.attrs.bill.discount}">
-
                                     <f:convertNumber pattern="#,##0.00" />
                                 </h:outputLabel>
                             </td>
                         </tr>
-
                         <tr>
                             <td >Net Total:</td>
                             <td style="text-align: right;">
@@ -222,11 +213,9 @@
                     </table> 
                 </h:panelGroup>
 
-
-                    </h:panelGroup>
+            </div>
 
         </cc:implementation>
 
     </h:body>
 </html>
-
diff --git a/src/main/webapp/resources/template/template.xhtml b/src/main/webapp/resources/template/template.xhtml
index 290726690d..5d0a47e65a 100644
--- a/src/main/webapp/resources/template/template.xhtml
+++ b/src/main/webapp/resources/template/template.xhtml
@@ -24,7 +24,7 @@
             </title>
         </ui:insert>
 
-        <h:outputStylesheet library="css" name="ohmis.css"/>
+
         <link rel="stylesheet" 
               href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.0/css/all.min.css"/>
         <h:panelGroup rendered="false" >
@@ -41,17 +41,17 @@
         <h:outputScript library="js" name="jsfcrud.js"/>
         <h:panelGroup rendered="#{configOptionApplicationController.getBooleanValueByKey('Application Timeout Configuration is Enabled', false )}" >
             <script type="text/javascript">
-            var timeoutInMinutes = #{configOptionApplicationController.getShortTextValueByKey('Application Timeout in Minutes', '15')};
-            var timeoutDuration = timeoutInMinutes * 60000; // Convert minutes to milliseconds
-            var timeoutPageUrl = '#{sessionController.logoutPageUrl}'; // Get the dynamic URL from the bean
-
-            setTimeout(function () {
-                alert('Session has expired. You will now be redirected to the session timeout page.');
-                window.location.href = timeoutPageUrl; // Use the dynamically generated URL
-            }, timeoutDuration);
+                var timeoutInMinutes = #{configOptionApplicationController.getShortTextValueByKey('Application Timeout in Minutes', '15')};
+                var timeoutDuration = timeoutInMinutes * 60000; // Convert minutes to milliseconds
+                var timeoutPageUrl = '#{sessionController.logoutPageUrl}'; // Get the dynamic URL from the bean
+
+                setTimeout(function () {
+                    alert('Session has expired. You will now be redirected to the session timeout page.');
+                    window.location.href = timeoutPageUrl; // Use the dynamically generated URL
+                }, timeoutDuration);
             </script>
         </h:panelGroup>
-
+        <h:outputStylesheet library="css" name="ohmis.css"/>
 
     </h:head>
     <h:body >