diff --git a/.github/counter.txt b/.github/counter.txt
index 209e3ef4b6..2edeafb09d 100644
--- a/.github/counter.txt
+++ b/.github/counter.txt
@@ -1 +1 @@
-20
+20
\ No newline at end of file
diff --git a/src/main/java/com/divudi/bean/common/SearchController.java b/src/main/java/com/divudi/bean/common/SearchController.java
index 83293c859b..5a0a31a121 100644
--- a/src/main/java/com/divudi/bean/common/SearchController.java
+++ b/src/main/java/com/divudi/bean/common/SearchController.java
@@ -2475,6 +2475,11 @@ public void listPharmacyBills(BillType bt, Class bc) {
             m.put("dep", "%" + getSearchKeyword().getToDepartment().trim().toUpperCase() + "%");
         }
 
+        if (getSearchKeyword().getToDepartment() != null && !getSearchKeyword().getToDepartment().trim().equals("")) {
+            sql += " and  ((b.toDepartment.name) like :dep )";
+            m.put("dep", "%" + getSearchKeyword().getToDepartment().trim().toUpperCase() + "%");
+        }
+
         if (getSearchKeyword().getNetTotal() != null && !getSearchKeyword().getNetTotal().trim().equals("")) {
             sql += " and  ((b.netTotal) like :netTotal )";
             m.put("netTotal", "%" + getSearchKeyword().getNetTotal().trim().toUpperCase() + "%");
@@ -2567,7 +2572,6 @@ public void createTableBht(BillType btp) {
         m.put("fd", getFromDate());
         m.put("td", getToDate());
         m.put("ins", getSessionController().getInstitution());
-        m.put("dep", getSessionController().getDepartment());
         String sql;
 
         sql = "Select b from Bill b "
@@ -2576,9 +2580,18 @@ public void createTableBht(BillType btp) {
                 + " and b.createdAt between :fd and :td "
                 + " and b.billType=:bt"
                 + " and b.institution=:ins "
-                + " and b.department=:dep "
                 + " and type(b)=:class ";
 
+        if (webUserController.hasPrivilege("StoreAdministration")) {
+            if (getSearchKeyword().getDepartment() != null && !getSearchKeyword().getDepartment().trim().equals("")) {
+                sql += " and  ((b.department.name) like :dep )";
+                m.put("dep", "%" + getSearchKeyword().getDepartment().trim().toUpperCase() + "%");
+            }
+        } else {
+            sql += "and b.department=:dep ";
+            m.put("dep", getSessionController().getDepartment());
+
+        }
         if (getSearchKeyword().getPatientName() != null && !getSearchKeyword().getPatientName().trim().equals("")) {
             sql += " and  ((b.patientEncounter.patient.person.name) like :patientName )";
             m.put("patientName", "%" + getSearchKeyword().getPatientName().trim().toUpperCase() + "%");
@@ -7194,39 +7207,6 @@ public void createCollectingCentreBillSearch() {
 
     }
 
-    public void createStaffCreditBillList() {
-        String jpql;
-        Map m = new HashMap();
-        List<BillTypeAtomic> btas = new ArrayList<>();
-        jpql = "select b from Bill b "
-                + "where b.toStaff is not null "
-                + "and b.createdAt between :fromDate and :toDate "
-                + "and b.retired = false "
-                + "and b.cancelled = false "
-                + "and b.refunded = false ";
-        jpql += " and b.billTypeAtomic in :btas ";
-        if (staff != null) {
-            jpql += " and b.toStaff=:staff ";
-            m.put("staff", staff);
-        }
-
-        btas.addAll(BillTypeAtomic.findByServiceType(ServiceType.OPD));
-        btas.addAll(BillTypeAtomic.findByServiceType(ServiceType.CHANNELLING));
-        btas.removeAll(BillTypeAtomic.findByCategory(BillCategory.PAYMENTS));
-
-        jpql += " order by b.createdAt desc";
-
-        m.put("fromDate", fromDate);
-        m.put("toDate", toDate);
-        m.put("btas", btas);
-
-        System.out.println("m = " + m);
-        System.out.println("jpql = " + jpql);
-
-        bills = getBillFacade().findByJpql(jpql, m, TemporalType.TIMESTAMP);
-        System.out.println("bills = " + bills);
-    }
-
     public void createGeneralCreditBillList() {
         String jpql;
         Map m = new HashMap();
diff --git a/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java b/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java
index bafdb994ee..6c65889662 100644
--- a/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java
+++ b/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java
@@ -664,6 +664,7 @@ public void setStk(List<Stock> stk) {
         this.stk = stk;
     }
 
+
 //    public void fillSelectStock(){
 //        List<Stock> items = new ArrayList<>();
 //        
diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt
index 03f2b3a014..e2ccadd347 100644
--- a/src/main/resources/VERSION.txt
+++ b/src/main/resources/VERSION.txt
@@ -1 +1 @@
-3.0.0.20240807.20
+3.0.0.20240807.20
\ No newline at end of file
diff --git a/src/main/webapp/resources/store/inward/issueBill.xhtml b/src/main/webapp/resources/store/inward/issueBill.xhtml
index 7e947e49a6..4ded7130db 100644
--- a/src/main/webapp/resources/store/inward/issueBill.xhtml
+++ b/src/main/webapp/resources/store/inward/issueBill.xhtml
@@ -207,8 +207,6 @@
                 <h:outputLabel value="-----------------------------------------------"   />                           
             </div>
 
-
-
             <div  >
 
                 <table style="width: 100%;" >
diff --git a/src/main/webapp/store/store_retail_sale_bht.xhtml b/src/main/webapp/store/store_retail_sale_bht.xhtml
index f76e051f1d..34ff5fb2e5 100644
--- a/src/main/webapp/store/store_retail_sale_bht.xhtml
+++ b/src/main/webapp/store/store_retail_sale_bht.xhtml
@@ -103,7 +103,7 @@
                                                     <p:outputLabel value="Add Items" class="mx-2" ></p:outputLabel>
                                                 </f:facet>
                                                 <div class="d-flex justify-content-between">
-                                                    <div>
+                                                    <div class="d-flex gap-2">
                                                         <p:autoComplete 
                                                             accesskey="i"   
                                                             forceSelection="true"  
@@ -111,25 +111,28 @@
                                                             value="#{storeSaleBhtController.stock}" 
                                                             completeMethod="#{storeSaleBhtController.completeAvailableStocksStore}" 
                                                             var="i" 
+                                                            style="width: 400px;"
+                                                            inputStyleClass="form-control"
+                                                            maxResults="25"
+                                                            scrollHeight="600"
                                                             itemLabel="#{i.itemBatch.item.name}" 
                                                             itemValue="#{i}" 
-                                                            placeholder="Medicines/Devices"
+                                                            placeholder="Store Item / Devices"
                                                             >
-                                                            
-                                                            <p:column headerText="Item">
+                                                            <p:column headerText="Item" style="padding:6px; width: 500px;">
                                                                 <h:outputLabel value="#{i.itemBatch.item.name}" ></h:outputLabel>
                                                             </p:column>
-                                                            <p:column headerText="Code">
+                                                            <p:column headerText="Code" style="padding:6px; width: 100px;">
                                                                 <h:outputLabel value="#{i.itemBatch.item.code}" ></h:outputLabel>
                                                             </p:column>
-                                                            <p:column headerText="Stocks"> 
-                                                                <h:outputLabel value="#{i.stock}" >
-                                                                    <f:convertNumber pattern="#,###.0" ></f:convertNumber>
+                                                            <p:column headerText="Stocks" style="padding:6px; width: 80px;"> 
+                                                                <h:outputLabel value="#{i.stock}" style="text-align: right;" class="w-100">
+                                                                    <f:convertNumber pattern="#,###" ></f:convertNumber>
                                                                 </h:outputLabel>
                                                             </p:column>
-                                                            <p:column headerText="Expiry">
+                                                            <p:column headerText="Expiry" style="padding:6px; width: 130px;">
                                                                 <h:outputLabel value="#{i.itemBatch.dateOfExpire}" >
-                                                                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateFormat}" ></f:convertDateTime>
+                                                                    <f:convertDateTime pattern="#{sessionController.applicationPreference.shortDateFormat}" ></f:convertDateTime>
                                                                 </h:outputLabel>
                                                             </p:column>
                                                             <p:ajax event="focus" process="acStock" ></p:ajax>
@@ -141,9 +144,9 @@
                                                             autocomplete="off"  
                                                             accesskey="q"   
                                                             id="txtQty" 
+                                                            style="width: 150px;"
                                                             value="#{storeSaleBhtController.qty}" 
                                                             placeholder="Quantity"
-                                                            class="mx-5"
                                                             >
                                                             <p:ajax event="keyup"  listener="#{storeSaleBhtController.calculateBillItemListner}" process="acStock txtQty"></p:ajax>
                                                             <p:ajax event="blur"  listener="#{storeSaleBhtController.calculateBillItemListner}" process="acStock txtQty"></p:ajax>
diff --git a/src/main/webapp/store/store_search_sale_bill_bht.xhtml b/src/main/webapp/store/store_search_sale_bill_bht.xhtml
index 6999455310..289b9fbc49 100644
--- a/src/main/webapp/store/store_search_sale_bill_bht.xhtml
+++ b/src/main/webapp/store/store_search_sale_bill_bht.xhtml
@@ -14,64 +14,79 @@
                         <f:facet name="header" >                          
                             <h:outputLabel value="Store Bill Search Sale Bill  "/>                         
                         </f:facet>
-                        <h:panelGroup class="d-flex gap-2">
-                            <h:panelGrid class="col-1 mx-1">
-                                <h:panelGrid columns="1" class="mt-1">
-                                    <h:outputLabel value="From Date"/>
-                                    <p:calendar 
-                                        styleClass="dateTimePicker" 
-                                        id="fromDate" 
-                                        value="#{searchController.fromDate}" 
-                                        navigator="false" 
-                                        pattern="#{sessionController.applicationPreference.longDateTimeFormat}" >      
-                                    </p:calendar>
-                                    <h:outputLabel value="To Date"/>
-                                    <p:calendar 
-                                        id="toDate" 
-                                        value="#{searchController.toDate}" 
-                                        navigator="false" 
-                                        pattern="#{sessionController.applicationPreference.longDateTimeFormat}" >                                                                              
-                                    </p:calendar>
-                                    <p:commandButton 
-                                        id="btnSearch" 
-                                        ajax="false" 
-                                        value="Search" 
-                                        class="mt-2  w-100"
-                                        action="#{searchController.createStoreTableBht}"/>
-                                </h:panelGrid>
 
-                                <h:panelGrid columns="1" class="mt-2">
-                                    <h:outputLabel value="Bill No"/>
-                                    <p:inputText autocomplete="off"  value="#{searchController.searchKeyword.billNo}" />
-                                    <h:outputLabel value="Bht No"/>
-                                    <p:inputText autocomplete="off"  value="#{searchController.searchKeyword.bhtNo}" />
-                                    <h:outputLabel value="Patient Name"/>
-                                    <p:inputText autocomplete="off" value="#{searchController.searchKeyword.patientName}" />
-                                    <h:outputLabel value="Department Name"/> 
-                                    <p:inputText autocomplete="off"  value="#{searchController.searchKeyword.department}" />
+                        <div class="d-flex gap-2">
+                            <div class="col-2">
+                                <h:outputLabel value="From Date"/>
+                                <p:calendar 
+                                    styleClass="dateTimePicker" 
+                                    id="fromDate" 
+                                    class="w-100"
+                                    inputStyleClass="form-control"
+                                    value="#{searchController.fromDate}" 
+                                    navigator="false" 
+                                    pattern="#{sessionController.applicationPreference.longDateTimeFormat}" >      
+                                </p:calendar>
+                                <h:outputLabel value="To Date"/>
+                                <p:calendar 
+                                    id="toDate" 
+                                    value="#{searchController.toDate}" 
+                                    navigator="false" 
+                                    inputStyleClass="form-control"
+                                    class="w-100"
+                                    pattern="#{sessionController.applicationPreference.longDateTimeFormat}" >                                                                              
+                                </p:calendar>
+                                <p:commandButton 
+                                    id="btnSearch" 
+                                    ajax="false" 
+                                    value="Search" 
+                                    icon="fa fa-search"
+                                    class="mt-2 mb-3 w-100 ui-button-warning"
+                                    action="#{searchController.createStoreTableBht}"/>
+
+                                <h:outputLabel value="Bill No"/>
+                                <p:inputText autocomplete="off" class="w-100" value="#{searchController.searchKeyword.billNo}" />
+                                <h:outputLabel value="Bht No"/>
+                                <p:inputText autocomplete="off" class="w-100" value="#{searchController.searchKeyword.bhtNo}" />
+                                <h:outputLabel value="Patient Name"/>
+                                <p:inputText autocomplete="off" class="w-100" value="#{searchController.searchKeyword.patientName}" />
+                                <h:panelGroup  rendered="#{(webUserController.hasPrivilege('ShowInwardFee'))}">
+                                <h:outputLabel value="Department Name"/> 
+                                <p:inputText autocomplete="off" class="w-100" value="#{searchController.searchKeyword.department}" />
+                                </h:panelGroup>
+                                <h:panelGroup  rendered="#{(webUserController.hasPrivilege('ShowInwardFee'))}">
                                     <h:outputLabel value="Total"/>
-                                    <p:inputText autocomplete="off"  value="#{searchController.searchKeyword.total}" />
+                                    <p:inputText autocomplete="off" class="w-100" value="#{searchController.searchKeyword.total}" />
                                     <h:outputLabel value="Net Total"/>
-                                    <p:inputText autocomplete="off" value="#{searchController.searchKeyword.netTotal}"/>
-                                </h:panelGrid>
-                            </h:panelGrid>
-
-                            <p:panel>
+                                    <p:inputText autocomplete="off" class="w-100" value="#{searchController.searchKeyword.netTotal}"/>
+                                </h:panelGroup>
+                            </div>
+                            <div class="col-10">
                                 <p:dataTable 
                                     rowIndexVar="i" 
                                     id="tblBills" value="#{searchController.bills}" 
                                     var="bill"   
                                     paginator="true"
+                                    rows="10"
+                                    paginatorPosition="bottom"
                                     paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-                                    rowsPerPageTemplate="5,10,15"
+                                    rowsPerPageTemplate="10,20,50"
                                     >
 
-                                    <p:column headerText="No" styleClass="alignTop">
+                                    <p:column headerText="No" width="20" styleClass="alignTop">
                                         <h:outputLabel value="#{i+1}"/>
                                     </p:column>
 
-                                    <p:column headerText="Bill No" >                                
-                                        <h:outputLabel  value="#{bill.deptId}"  />
+                                    <p:column headerText="Bill No" >  
+                                        <p:commandLink 
+                                            ajax="false"
+                                            value="#{bill.deptId}"
+                                            action="store_reprint_bill_sale?faces-redirect=true"
+                                            >
+                                            <f:setPropertyActionListener 
+                                                value="#{bill}" 
+                                                target="#{storeBillSearch.bill}"/>  
+                                        </p:commandLink>
                                     </p:column>
 
                                     <p:column headerText="BHT No" >                                
@@ -82,7 +97,7 @@
                                         <h:outputLabel  value="#{bill.patientEncounter.patient.person.name}"  />
                                     </p:column>
 
-                                    <p:column headerText="Department"  >                                
+                                    <p:column headerText="Department"  >      
                                         <h:outputLabel value="#{bill.department.name}" />                                    
                                     </p:column>   
 
@@ -90,13 +105,13 @@
                                         <h:outputLabel value="#{bill.createdAt}" >
                                             <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
                                         </h:outputLabel>
-
+ 
                                         <br/>
                                         <h:panelGroup rendered="#{bill.cancelled}" >
                                             <h:outputLabel style="color: red;" value="Cancelled at " />
                                             <h:outputLabel style="color: red;" rendered="#{bill.cancelled}" 
                                                            value="#{bill.cancelledBill.createdAt}" >
-                                                <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                                <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.shortDateTimeFormat}" />
                                             </h:outputLabel>
                                         </h:panelGroup>                                
                                     </p:column>                 
@@ -111,20 +126,12 @@
                                         </h:panelGroup>                             
                                     </p:column>                      
 
-                                    <p:column headerText="Net Value"  >
+                                    <p:column headerText="Net Value"  rendered="#{webUserController.hasPrivilege('ShowInwardFee')}" >
                                         <h:outputLabel value="#{bill.netTotal}" >
                                             <f:convertNumber pattern="#,##0.00"/>
                                         </h:outputLabel>
                                     </p:column>
 
-                                    <p:column headerText="View">
-                                        <p:commandButton ajax="false" value="View Bill"
-                                                         action="store_reprint_bill_sale">
-                                            <f:setPropertyActionListener value="#{bill}" 
-                                                                         target="#{storeBillSearch.bill}"/>   
-                                        </p:commandButton>
-                                    </p:column>
-
                                     <p:column>
                                         <p:dataTable value="#{bill.returnBhtIssueBills}" var="rb">
                                             <p:column  >                                                               
@@ -168,8 +175,9 @@
                                         </p:dataTable>
                                     </p:column>
                                 </p:dataTable>
-                            </p:panel>
-                        </h:panelGroup>
+                            </div>
+                        </div>
+
                     </p:panel>
                 </h:form>
             </ui:define>