diff --git a/src/main/java/com/divudi/bean/common/SearchController.java b/src/main/java/com/divudi/bean/common/SearchController.java
index 4c2420a0eb..c383d137ff 100644
--- a/src/main/java/com/divudi/bean/common/SearchController.java
+++ b/src/main/java/com/divudi/bean/common/SearchController.java
@@ -2426,6 +2426,11 @@ public void listPharmacyBills(BillType bt, Class bc) {
             sql += " and  ((b.department.name) like :dep )";
             m.put("dep", "%" + getSearchKeyword().getDepartment().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 )";
diff --git a/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java b/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java
index d888ee88f6..d8bba1621b 100644
--- a/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java
+++ b/src/main/java/com/divudi/bean/store/StoreAdjustmentController.java
@@ -664,6 +664,39 @@ public void setStk(List<Stock> stk) {
         this.stk = stk;
     }
 
+    public void fillSelectStock() {
+        List<Stock> items = new ArrayList<>();
+        if (stock == null) {
+            stk = items;
+            return;
+        }
+        String sql;
+        Map<String, Object> m = new HashMap<>();
+
+        sql = "select i "
+                + " from Stock i "
+                + " where i.department=:d "
+                + " and i.itemBatch.item.code=:stationary "
+                + " order by i.stock desc";
+
+        m.put("d", sessionController.getDepartment());
+        m.put("stationary", stock.getItemBatch().getItem().getCode());  // Assuming stk contains the item
+
+        items = getStockFacade().findByJpql(sql, m);
+
+        if (items != null) {
+            stk = items;
+        }
+    }
+
+    public List<Stock> getStk() {
+        return stk;
+    }
+
+    public void setStk(List<Stock> stk) {
+        this.stk = stk;
+    }
+
     public void fillSelectStock(){
         List<Stock> items = new ArrayList<>();
         
diff --git a/src/main/java/com/divudi/bean/store/StoreIssueController.java b/src/main/java/com/divudi/bean/store/StoreIssueController.java
index 6e03e1d640..acdf8c627c 100644
--- a/src/main/java/com/divudi/bean/store/StoreIssueController.java
+++ b/src/main/java/com/divudi/bean/store/StoreIssueController.java
@@ -38,6 +38,7 @@
 import com.divudi.facade.StockFacade;
 import com.divudi.facade.StockHistoryFacade;
 import com.divudi.bean.common.util.JsfUtil;
+import com.divudi.data.BillTypeAtomic;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -414,6 +415,8 @@ private void savePreBillFinally() {
         getPreBill().setBillTime(new Date());
         getPreBill().setFromDepartment(getSessionController().getLoggedUser().getDepartment());
         getPreBill().setFromInstitution(getSessionController().getLoggedUser().getDepartment().getInstitution());
+        getPreBill().setBillType(BillType.StoreIssue);
+        getPreBill().setBillTypeAtomic(BillTypeAtomic.STORE_ORDER);
 
         if (getPreBill().getId() == null) {
             getBillFacade().create(getPreBill());
@@ -542,7 +545,7 @@ public void settleBill() {
         }
         
         getPreBill().setPaidAmount(getPreBill().getTotal());
-        //   ////System.out.println("getPreBill().getPaidAmount() = " + getPreBill().getPaidAmount());
+        
         List<BillItem> tmpBillItems = getPreBill().getBillItems();
         getPreBill().setBillItems(null);
 
@@ -973,7 +976,6 @@ public PreBill getPreBill() {
         if (preBill == null) {
             preBill = new PreBill();
             preBill.setBillType(BillType.StoreIssue);
-            //   preBill.setPaymentScheme(getPaymentSchemeController().getItems().get(0));
         }
         return preBill;
     }
diff --git a/src/main/webapp/resources/store/issue.xhtml b/src/main/webapp/resources/store/issue.xhtml
index 04702e05d2..e1aab72504 100644
--- a/src/main/webapp/resources/store/issue.xhtml
+++ b/src/main/webapp/resources/store/issue.xhtml
@@ -266,12 +266,12 @@
                             </td>
                             <td  styleClass="itemsBlockRight"  style="text-align: right; padding-right: 30px;" >
                                 <h:outputLabel    value="#{bip.netRate}" >
-                                    <f:convertNumber pattern="#,####0.0000" />
+                                    <f:convertNumber pattern="#,####0.00" />
                                 </h:outputLabel>
                             </td>
                             <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 30px;" >
                                 <h:outputLabel    value="#{bip.netValue}"    >
-                                    <f:convertNumber pattern="#,####0.0000" />
+                                    <f:convertNumber pattern="#,####0.00" />
                                 </h:outputLabel>
                             </td>
 
@@ -306,7 +306,7 @@
                         </td>
                         <td  class="totalsBlock" style="text-align: right!important;font-weight: bold; ; padding-right: 30px; ">
                             <h:outputLabel value="#{cc.attrs.bill.netTotal}">
-                                <f:convertNumber pattern="#,##0.0000" />   
+                                <f:convertNumber pattern="#,##0.00" />   
                             </h:outputLabel>
                         </td>
                     </tr>
@@ -326,16 +326,6 @@
 
             </div>
 
-
-            <div class="footer">
-                <br/>
-                THANK YOU. PLEASE COME AGAIN<br/>
-                Returns Accepted only within 3 days<br/>
-                Software by www.lakmedi.com - 0715812399<br/>
-            </div>
-
-
-
         </div>
     </cc:implementation>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/store/store_adjustment_department.xhtml b/src/main/webapp/store/store_adjustment_department.xhtml
index b4f8380b88..ca304842cc 100644
--- a/src/main/webapp/store/store_adjustment_department.xhtml
+++ b/src/main/webapp/store/store_adjustment_department.xhtml
@@ -78,7 +78,7 @@
                                         <h:outputLabel value="Batches" class="my-2"></h:outputLabel>
                                         <p:dataTable 
                                             id="tblStock"
-                                            value="#{storeAdjustmentController.stock}"
+                                            value="#{storeAdjustmentController.stk}"
                                             var="i"
                                             rows="10"
                                             selectionMode="single"
diff --git a/src/main/webapp/store/store_issue.xhtml b/src/main/webapp/store/store_issue.xhtml
index dbf6d8cc6f..026a041aa6 100644
--- a/src/main/webapp/store/store_issue.xhtml
+++ b/src/main/webapp/store/store_issue.xhtml
@@ -15,11 +15,8 @@
 
             <ui:define name="content">
 
-
-
                 <h:form id="bill" >
                     <p:growl id="panelError" />
-                    <p:commandButton id="nullButton2" value="No Action" action="#" style="display: none;" ></p:commandButton>
                     <p:defaultCommand  target="btnAdd" />  
 
                     <p:panel rendered="#{!storeIssueController.billPreview}"  >
@@ -37,80 +34,6 @@
                             </p:commandButton>
                         </f:facet>
                         <div class="row">
-                            <div class="col-4">
-                                <p:panel>
-                                    <f:facet name="header">
-                                        <h:outputText styleClass="fas fa-share-square" />
-                                        <h:outputText class="mx-4" value="Issue Details" />
-                                    </f:facet>
-                                    <h:panelGrid columns="2" class="w-100">
-                                        <h:outputLabel value="Issuing Department"/>
-                                        <p:autoComplete 
-                                            class="w-100"
-                                            inputStyleClass="w-100"
-                                            completeMethod="#{departmentController.completeDept}" 
-                                            forceSelection="true"
-                                            var="w" 
-                                            itemLabel="#{w.name}" 
-                                            itemValue="#{w}"
-                                            value="#{storeIssueController.toDepartment}" 
-                                            id="acDept">
-                                            <p:column headerText="Department Name">
-                                                #{w.name}
-                                            </p:column>
-                                            <p:column headerText="Institution Name">
-                                                #{w.institution.name}
-                                            </p:column>
-                                            <p:ajax process="acDept" update=":#{p:resolveFirstComponentWithId('pBillDetails',view).clientId} #{p:resolveFirstComponentWithId('tblBillItem',view).clientId} " 
-                                                    event="itemSelect"  listener="#{storeIssueController.calculateAllRates}" />
-                                        </p:autoComplete>
-
-                                        <h:outputLabel value="Request Number"/>
-                                        <p:inputText class="w-100" value="#{storeIssueController.preBill.invoiceNumber}" id="req"/>
-
-                                        <h:outputLabel value="Comment"/>
-                                        <p:inputTextarea class="w-100" value="#{storeIssueController.preBill.comments}" id="comment"/>
-
-                                        <p:watermark value="Request Number" for="req"/>
-                                        <p:watermark value="Issuing Department" for="acDept"/>
-                                        <p:watermark value="Comment" for="comment"/>
-                                    </h:panelGrid>
-
-
-                                    <p:commandButton  
-                                        accesskey="s" 
-                                        value="Issue" 
-                                        ajax="false"
-                                        icon="fas fa-check"
-                                        action="#{storeIssueController.settleBill()}" 
-                                        class="w-25 ui-button-warning"
-                                        actionListener="#{storeIssueController.calculateAllRates}">
-
-                                    </p:commandButton>
-                                </p:panel>
-                                <p:panel header="Bill Details" id="pBillDetails" class="my-1" >
-                                    <f:facet name="header">
-                                        <h:outputText styleClass="fas fa-file-invoice"/>
-                                        <h:outputText class="mx-4" value="Bill Details" />
-                                    </f:facet>
-                                    <h:panelGrid columns="2" columnClasses="numberCol, textCol" id="total" >
-                                        <h:outputLabel value="Total" ></h:outputLabel>
-                                        <h:outputLabel value="#{storeIssueController.preBill.total}" >
-                                            <f:convertNumber pattern="#,##0.00" />
-                                        </h:outputLabel>
-
-                                        <h:outputLabel value="Margin" ></h:outputLabel>
-                                        <h:outputLabel value="#{storeIssueController.preBill.margin}" >
-                                            <f:convertNumber pattern="#,##0.00" />
-                                        </h:outputLabel>
-
-                                        <h:outputLabel value="Net Total" ></h:outputLabel>
-                                        <h:outputLabel value="#{storeIssueController.preBill.netTotal}" >
-                                            <f:convertNumber pattern="#,##0.00" />
-                                        </h:outputLabel>
-                                    </h:panelGrid>
-                                </p:panel>
-                            </div>
                             <div class="col-8">
                                 <p:panel>
                                     <f:facet name="header">
@@ -278,6 +201,81 @@
                                 </p:panel>
 
                             </div>
+
+                            <div class="col-4">
+                                <p:panel>
+                                    <f:facet name="header">
+                                        <h:outputText styleClass="fas fa-share-square" />
+                                        <h:outputText class="mx-4" value="Issue Details" />
+                                    </f:facet>
+                                    <h:panelGrid columns="2" class="w-100">
+                                        <h:outputLabel value="Issuing Department"/>
+                                        <p:autoComplete 
+                                            class="w-100"
+                                            inputStyleClass="w-100"
+                                            completeMethod="#{departmentController.completeDept}" 
+                                            forceSelection="true"
+                                            var="w" 
+                                            itemLabel="#{w.name}" 
+                                            itemValue="#{w}"
+                                            value="#{storeIssueController.toDepartment}" 
+                                            id="acDept">
+                                            <p:column headerText="Department Name">
+                                                #{w.name}
+                                            </p:column>
+                                            <p:column headerText="Institution Name">
+                                                #{w.institution.name}
+                                            </p:column>
+                                            <p:ajax process="acDept" update=":#{p:resolveFirstComponentWithId('pBillDetails',view).clientId} #{p:resolveFirstComponentWithId('tblBillItem',view).clientId} " 
+                                                    event="itemSelect"  listener="#{storeIssueController.calculateAllRates}" />
+                                        </p:autoComplete>
+
+                                        <h:outputLabel value="Request Number"/>
+                                        <p:inputText class="w-100" value="#{storeIssueController.preBill.invoiceNumber}" id="req"/>
+
+                                        <h:outputLabel value="Comment"/>
+                                        <p:inputTextarea class="w-100" value="#{storeIssueController.preBill.comments}" id="comment"/>
+
+                                        <p:watermark value="Request Number" for="req"/>
+                                        <p:watermark value="Issuing Department" for="acDept"/>
+                                        <p:watermark value="Comment" for="comment"/>
+                                    </h:panelGrid>
+
+
+                                    <p:commandButton  
+                                        accesskey="s" 
+                                        value="Issue" 
+                                        ajax="false"
+                                        icon="fas fa-check"
+                                        action="#{storeIssueController.settleBill()}" 
+                                        class="w-25 ui-button-warning"
+                                        actionListener="#{storeIssueController.calculateAllRates}">
+
+                                    </p:commandButton>
+                                </p:panel>
+                                <p:panel header="Bill Details" id="pBillDetails" class="my-1" >
+                                    <f:facet name="header">
+                                        <h:outputText styleClass="fas fa-file-invoice"/>
+                                        <h:outputText class="mx-4" value="Bill Details" />
+                                    </f:facet>
+                                    <h:panelGrid columns="2" columnClasses="numberCol, textCol" id="total" >
+                                        <h:outputLabel value="Total" ></h:outputLabel>
+                                        <h:outputLabel value="#{storeIssueController.preBill.total}" >
+                                            <f:convertNumber pattern="#,##0.00" />
+                                        </h:outputLabel>
+
+                                        <h:outputLabel value="Margin" ></h:outputLabel>
+                                        <h:outputLabel value="#{storeIssueController.preBill.margin}" >
+                                            <f:convertNumber pattern="#,##0.00" />
+                                        </h:outputLabel>
+
+                                        <h:outputLabel value="Net Total" ></h:outputLabel>
+                                        <h:outputLabel value="#{storeIssueController.preBill.netTotal}" >
+                                            <f:convertNumber pattern="#,##0.00" />
+                                        </h:outputLabel>
+                                    </h:panelGrid>
+                                </p:panel>
+                            </div>
                         </div>
                     </p:panel>
 
diff --git a/src/main/webapp/store/store_reprint_bill_unit_issue.xhtml b/src/main/webapp/store/store_reprint_bill_unit_issue.xhtml
index f377bf089f..2727fb4ab1 100644
--- a/src/main/webapp/store/store_reprint_bill_unit_issue.xhtml
+++ b/src/main/webapp/store/store_reprint_bill_unit_issue.xhtml
@@ -13,41 +13,73 @@
 
             <ui:define name="content">
                 <h:form>
-                    <p:panel header="Reprint" >
+                    <p:panel  >
                         <f:facet name="header" >
-                            <h:outputLabel value="Reprint Pre Bill" ></h:outputLabel>
-                            <hr/>
-                            <p:commandButton value="Reprint" ajax="false" >
-                                <p:printer target="gpBillPreview" ></p:printer>
-                            </p:commandButton>
-                            <p:commandButton ajax="false" value="Cancel" 
-                                            action="store_cancel_bill_unit_issue" 
-                                             disabled="#{storeBillSearch.bill.cancelled}">                           
+                            <div class="d-flex justify-content-between">
+                                <h:outputLabel value="Reprint Pre Bill" ></h:outputLabel>
+                                <div class="d-flex gap-2">
+                                    <p:commandButton 
+                                        ajax="false" 
+                                        value="To Cancel" 
+                                        icon="fa-solid fa-ban" class="ui-button-danger"
+                                        action="store_cancel_bill_unit_issue?faces-redirect=true" 
+                                        disabled="#{storeBillSearch.bill.cancelled}">                           
+                                    </p:commandButton>
+                                    <p:commandButton 
+                                        ajax="false" 
+                                        value="To Return Item" 
+                                        
+                                        action="store_bill_return_issue?faces-redirect=true"   
+                                        disabled="#{storeBillSearch.bill.cancelled eq true}"  >                                
+                                        <f:setPropertyActionListener 
+                                            value="#{storeBillSearch.bill}" 
+                                            target="#{storeIssueReturnController.bill}"  />
+                                    </p:commandButton>
+                                    <p:commandButton 
+                                        ajax="false" 
+                                        icon="fa-solid fa-arrow-left"
+                                        value="Back to Search List" 
+                                        action="store_search_issue_bill?faces-redirect=true" >                           
+                                    </p:commandButton>
+                                </div>
+                            </div>
+
+                        </f:facet>
+
+                        <div class="d-flex gap-2 justify-content-end">
+                            <p:outputLabel value="Paper Type" class="m-2"></p:outputLabel>
+                            <p:selectOneMenu 
+                                value="#{bookingControllerViewScopeMonth.departmentPreference.pharmacyBillPaperType}" 
+                                class="m-1" 
+                                style="width: 13em;">
+                                <f:selectItem itemLabel="Please Select Paper Type" />
+                                <f:selectItems value="#{enumController.paperTypes}" />
+                            </p:selectOneMenu>
+                            <p:commandButton 
+                                ajax="false" 
+                                icon="fa fa-sync-alt" 
+                                class="ui-button m-1" 
+                                title="Redraw Bill">
                             </p:commandButton>
-                            <p:commandButton ajax="false" value="Return Item" 
-                                            action="store_bill_return_issue"   
-                                             disabled="#{storeBillSearch.bill.cancelled eq true}"  >                                
-                                <f:setPropertyActionListener value="#{storeBillSearch.bill}" 
-                                                             target="#{storeIssueReturnController.bill}"  />
+                            <p:commandButton 
+                                value="Reprint" 
+                                class="m-1 ui-button-info"
+                                icon="fa fa-print"
+                                ajax="false" >
+                                <p:printer target="gpBillPreview" ></p:printer>
                             </p:commandButton>
-                        </f:facet>
+                        </div>
 
+                        <div >
+                            <h:panelGroup id="gpBillPreview" >
+                                <h:panelGroup rendered="#{bookingControllerViewScopeMonth.departmentPreference.pharmacyBillPaperType eq 'PosPaper'}" >
+                                    <st:issue bill="#{storeBillSearch.bill}" duplicate="true" />
+                                </h:panelGroup>
+                            </h:panelGroup>
+                        </div>
                     </p:panel>
-
-
-
-
-                    <h:panelGroup id="gpBillPreview" >
-                        <st:issue bill="#{storeBillSearch.bill}" duplicate="true" />
-                    </h:panelGroup>
-
-
                 </h:form>
             </ui:define>
-
-
-
         </ui:composition>
-
     </h:body>
 </html>
diff --git a/src/main/webapp/store/store_search_issue_bill.xhtml b/src/main/webapp/store/store_search_issue_bill.xhtml
index a1d9df795b..8b808a6aa1 100644
--- a/src/main/webapp/store/store_search_issue_bill.xhtml
+++ b/src/main/webapp/store/store_search_issue_bill.xhtml
@@ -12,143 +12,161 @@
                 <h:form>
                     <p:panel header="Search Issue Bills" >
                         <f:facet name="header" >                          
-                            <h:outputLabel value="STORE ISSUE BILL SEARCH"/>                         
-                            <h:panelGrid columns="5" >
-                                <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" action="#{searchController.listStoreIssue()}"/>
-                                <p:spacer height="30"/><h:outputLabel/><h:outputLabel/><h:outputLabel/><h:outputLabel/>
-
-                                <h:outputLabel value="Bill No"/>
-                                <h:outputLabel value="Request No"/>    
-                                <h:outputLabel value="From Department Name"/>   
-                                <h:outputLabel value="Total"/>
-                                <h:outputLabel value="Net Total"/>
-                                <p:inputText autocomplete="off"  value="#{searchController.searchKeyword.billNo}" />
-                                <p:inputText autocomplete="off" value="#{searchController.searchKeyword.requestNo}" />
-                                <p:inputText autocomplete="off"  value="#{searchController.searchKeyword.department}" />
-                                <p:inputText autocomplete="off"  value="#{searchController.searchKeyword.total}" />
-                                <p:inputText autocomplete="off" value="#{searchController.searchKeyword.netTotal}"/>
-
-                            </h:panelGrid>
-
-
+                            <h:outputLabel value="Store Issue Bill Search"/>                         
                         </f:facet>
 
-                        <p:dataTable 
-                            rowIndexVar="i" 
-                            id="tblBills" 
-                            value="#{searchController.bills}" 
-                            var="bill"
-                            paginator="true"
-                            paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-                            rowsPerPageTemplate="5,10,15"
-
-                            >
-
-                            <p:column headerText="No" styleClass="alignTop">
-                                <h:outputLabel value="#{i+1}"/>
-                            </p:column>
-
-                            <p:column headerText="Bill No" >   
-                                <p:commandLink ajax="false" value="#{bill.deptId}"
-                                              action="store_reprint_bill_unit_issue">
-                                    <f:setPropertyActionListener value="#{bill}" target="#{storeBillSearch.bill}"/>   
-                                </p:commandLink>
-                            </p:column>
-
-                            <p:column headerText="Request No" >
-                                <h:outputLabel value="#{bill.invoiceNumber}" />                                      
-                            </p:column>  
-
-                            <p:column headerText="From Department"  >                                
-                                <h:outputLabel value="#{bill.department.name}" />                                    
-                            </p:column>   
-
-                            <p:column headerText="To Department"  >                                
-                                <h:outputLabel value="#{bill.toDepartment.name}" />                                    
-                            </p:column>   
-
-                            <p:column headerText="Date/Time"  >
-                                <h:outputLabel value="#{bill.createdAt}" >
-                                    <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
-                                </h:outputLabel>
-                                <h:panelGroup rendered="#{bill.refunded or bill.cancelled or bill.retired}" >
-                                    <br/>                                
-                                </h:panelGroup>
-
-                                <h:panelGroup rendered="#{bill.refunded}" >
-                                    <h:outputLabel style="color: red;" value="Returned. Last return bill at " />
-                                    <h:outputLabel style="color: red;" rendered="#{bill.refunded}" 
-                                                   value="#{bill.refundedBill.createdAt}" >
-                                        <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
-                                    </h:outputLabel>
-                                </h:panelGroup>
-                                <h:panelGroup rendered="#{bill.retired}" >
-                                    <h:outputLabel style="color: red;" value="Deleted at " />
-                                    <h:outputLabel style="color: red;"  
-                                                   value="#{bill.retiredAt}" >
-                                        <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
-                                    </h:outputLabel>
-                                </h:panelGroup>
-                                <h:panelGroup rendered="#{bill.cancelled}" >
-                                    <h:outputLabel style="color: red;" value="Cancelled at " />
-                                    <h:outputLabel style="color: red;"  
-                                                   value="#{bill.cancelledBill.createdAt}" >
-                                        <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
-                                    </h:outputLabel>
-                                </h:panelGroup>
-                            </p:column>   
-
-
-
-                            <p:column headerText="User" >
-                                <h:outputLabel value="#{bill.creater.webUserPerson.name}" />                                      
-                                <h:panelGroup rendered="#{bill.refunded or bill.cancelled or bill.retired}" >
-                                    <br/>                                
-                                </h:panelGroup>
-                                <h:panelGroup rendered="#{bill.cancelled}" >
-                                    <h:outputLabel style="color: red;" value="Cancelled By " />
-                                    <h:outputLabel style="color: red;" rendered="#{bill.cancelled}" 
-                                                   value="#{bill.cancelledBill.creater.webUserPerson.name}" >                                       
-                                    </h:outputLabel>
-                                </h:panelGroup>
-                                <h:panelGroup rendered="#{bill.refunded}" >
-                                    <h:outputLabel style="color: red;" value="Last Refunded By " />
-                                    <h:outputLabel style="color: red;" rendered="#{bill.refunded}"
-                                                   value="#{bill.refundedBill.creater.webUserPerson.name}" >
-
-                                    </h:outputLabel>
-                                </h:panelGroup>                               
-                            </p:column>    
-
-
-
-                            <p:column headerText="Value" style="text-align: right; padding-right: 10px;"  >
-                                <h:outputLabel value="#{bill.netTotal}" >
-                                    <f:convertNumber pattern="#,##0.00"/>
-                                </h:outputLabel>
-                            </p:column>
-
-                            <p:column headerText="Comments" >
-                                <h:outputLabel rendered="#{bill.refundedBill ne null}" value="#{bill.refundedBill.comments}" >
-                                </h:outputLabel>
-                                <h:outputLabel  rendered="#{bill.cancelledBill ne null}" value="#{bill.cancelledBill.comments}" >
-                                </h:outputLabel>
-                            </p:column>
-                        </p:dataTable>
-
-
+                        <div class="d-flex gap-3">
+                            <div class="col-2">
+                                <h:panelGrid columns="1"  class="w-100">
+                                    <h:outputLabel value="From Date"/>
+                                    <p:calendar 
+                                        styleClass="dateTimePicker" 
+                                        id="fromDate" 
+                                        value="#{searchController.fromDate}" 
+                                        navigator="false" 
+                                        class="w-100" 
+                                        inputStyleClass="form-control"
+                                        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="ui-button-warning w-100 mt-2 mb-3"
+                                        action="#{searchController.listStoreIssue()}"/>
+
+                                    <h:outputLabel value="Bill No"/>
+                                    <p:inputText autocomplete="off" class="w-100" value="#{searchController.searchKeyword.billNo}" />
+                                    <h:outputLabel value="Request No"/>  
+                                    <p:inputText autocomplete="off" class="w-100" value="#{searchController.searchKeyword.requestNo}" />
+                                    <h:outputLabel value="From Department Name"/>   
+                                    <p:inputText autocomplete="off" class="w-100" value="#{searchController.searchKeyword.department}" />
+                                    <h:outputLabel value="To Department Name"/>   
+                                    <p:inputText autocomplete="off" class="w-100" value="#{searchController.searchKeyword.toDepartment}" />
+                                    <h:outputLabel value="Total"/>
+                                    <p:inputText autocomplete="off" class="w-100" value="#{searchController.searchKeyword.total}" />
+                                    <h:outputLabel value="Net Total"/>
+                                    <p:inputText autocomplete="off" class="w-100" value="#{searchController.searchKeyword.netTotal}"/>
+                                </h:panelGrid>
+
+                            </div>
+                            <div class="col-10">
+                                <p:dataTable 
+                                    rowIndexVar="i" 
+                                    id="tblBills" 
+                                    value="#{searchController.bills}" 
+                                    var="bill"
+                                    rows="10"
+                                    paginatorPosition="bottom"
+                                    paginator="true"
+                                    paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+                                    rowsPerPageTemplate="10,20,50"
+
+                                    >
+
+                                    <p:column headerText="No" width="30" styleClass="alignTop">
+                                        <h:outputLabel value="#{i+1}"/>
+                                    </p:column>
+
+                                    <p:column headerText="Bill No" width="130">   
+                                        <p:commandLink ajax="false" value="#{bill.deptId}"
+                                                       action="store_reprint_bill_unit_issue">
+                                            <f:setPropertyActionListener value="#{bill}" target="#{storeBillSearch.bill}"/>   
+                                        </p:commandLink>
+                                    </p:column>
+
+                                    <p:column headerText="Request No" width="130">
+                                        <h:outputLabel value="#{bill.invoiceNumber}" />                                      
+                                    </p:column>  
+
+                                    <p:column headerText="From Department" width="230" >                                
+                                        <h:outputLabel value="#{bill.department.name}" />                                    
+                                    </p:column>   
+
+                                    <p:column headerText="To Department" width="230" >                                
+                                        <h:outputLabel value="#{bill.toDepartment.name}" />                                    
+                                    </p:column>   
+
+                                    <p:column headerText="Date/Time" width="230" >
+                                        <h:outputLabel value="#{bill.createdAt}" >
+                                            <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                        </h:outputLabel>
+                                        <h:panelGroup rendered="#{bill.refunded or bill.cancelled or bill.retired}" >
+                                            <br/>                                
+                                        </h:panelGroup>
+
+                                        <h:panelGroup rendered="#{bill.refunded}" >
+                                            <h:outputLabel style="color: red;" value="Returned. Last return bill at " />
+                                            <h:outputLabel style="color: red;" rendered="#{bill.refunded}" 
+                                                           value="#{bill.refundedBill.createdAt}" >
+                                                <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                            </h:outputLabel>
+                                        </h:panelGroup>
+                                        <h:panelGroup rendered="#{bill.retired}" >
+                                            <h:outputLabel style="color: red;" value="Deleted at " />
+                                            <h:outputLabel style="color: red;"  
+                                                           value="#{bill.retiredAt}" >
+                                                <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                            </h:outputLabel>
+                                        </h:panelGroup>
+                                        <h:panelGroup rendered="#{bill.cancelled}" >
+                                            <h:outputLabel style="color: red;" value="Cancelled at " />
+                                            <h:outputLabel style="color: red;"  
+                                                           value="#{bill.cancelledBill.createdAt}" >
+                                                <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                            </h:outputLabel>
+                                        </h:panelGroup>
+                                    </p:column>   
+
+                                    <p:column headerText="User" width="60">
+                                        <h:outputLabel value="#{bill.creater.webUserPerson.name}" />                                      
+                                        <h:panelGroup rendered="#{bill.refunded or bill.cancelled or bill.retired}" >
+                                            <br/>                                
+                                        </h:panelGroup>
+                                        <h:panelGroup rendered="#{bill.cancelled}" >
+                                            <h:outputLabel style="color: red;" value="Cancelled By " />
+                                            <h:outputLabel style="color: red;" rendered="#{bill.cancelled}" 
+                                                           value="#{bill.cancelledBill.creater.webUserPerson.name}" >                                       
+                                            </h:outputLabel>
+                                        </h:panelGroup>
+                                        <h:panelGroup rendered="#{bill.refunded}" >
+                                            <h:outputLabel style="color: red;" value="Last Refunded By " />
+                                            <h:outputLabel style="color: red;" rendered="#{bill.refunded}"
+                                                           value="#{bill.refundedBill.creater.webUserPerson.name}" >
+
+                                            </h:outputLabel>
+                                        </h:panelGroup>                               
+                                    </p:column>    
+
+                                    <p:column headerText="Value" width="100" style="text-align: right; padding-right: 10px;"  >
+                                        <h:outputLabel value="#{bill.netTotal}" >
+                                            <f:convertNumber pattern="#,##0.00"/>
+                                        </h:outputLabel>
+                                    </p:column>
+
+                                    <p:column headerText="Comments" >
+                                        <h:outputLabel rendered="#{bill.refundedBill ne null}" value="#{bill.refundedBill.comments}" >
+                                        </h:outputLabel>
+                                        <h:outputLabel  rendered="#{bill.cancelledBill ne null}" value="#{bill.cancelledBill.comments}" >
+                                        </h:outputLabel>
+                                    </p:column>
+                                </p:dataTable>
+                            </div>
+                        </div>
                     </p:panel>
-
                 </h:form>
             </ui:define>
-
-
         </ui:composition>
 
     </h:body>