diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java
index 8b6557b856..4a2d2b3815 100644
--- a/src/main/java/com/divudi/bean/common/ReportsController.java
+++ b/src/main/java/com/divudi/bean/common/ReportsController.java
@@ -2832,7 +2832,7 @@ public void generateCollectionCenterBookWiseDetailReport() {
         opdBts.add(BillTypeAtomic.CC_BILL);
         opdBts.add(BillTypeAtomic.CC_BILL_CANCELLATION);
         opdBts.add(BillTypeAtomic.CC_BILL_REFUND);
-        opdBts.add(BillTypeAtomic.CC_PAYMENT_RECEIVED_BILL);
+//        opdBts.add(BillTypeAtomic.CC_PAYMENT_RECEIVED_BILL);
 
         bundle.setName("Bills");
         bundle.setBundleType("billList");
diff --git a/src/main/java/com/divudi/entity/pharmacy/Stock.java b/src/main/java/com/divudi/entity/pharmacy/Stock.java
index d1d86a8773..7a8a3055ff 100644
--- a/src/main/java/com/divudi/entity/pharmacy/Stock.java
+++ b/src/main/java/com/divudi/entity/pharmacy/Stock.java
@@ -55,6 +55,7 @@ public class Stock implements Serializable, RetirableEntity {
     private Date retiredAt;
 
     private String retireComments;
+    private String stockLocator;
 
     @ManyToOne
     Stock parentStock;
@@ -220,4 +221,12 @@ public void setRetireComments(String retireComments) {
         this.retireComments = retireComments;
     }
 
+    public String getStockLocator() {
+        return stockLocator;
+    }
+
+    public void setStockLocator(String stockLocator) {
+        this.stockLocator = stockLocator;
+    }
+
 }
diff --git a/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml b/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml
index ccf91abbb0..89e79f7f85 100644
--- a/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml
+++ b/src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml
@@ -157,27 +157,27 @@
                                                         completeMethod="#{stockController.completeAvailableStocks}" 
                                                         var="i" itemLabel="#{i.itemBatch.item.name}" itemValue="#{i}" 
                                                         >
-                                            <p:column headerText="Item" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
+                                            <p:column headerText="Item" style="padding: 6px;" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
                                                 <h:outputLabel value="#{i.itemBatch.item.name}">
                                                     &nbsp;<p:tag rendered="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'true': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'true':'false'}" value="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'Expired ': 
                                                                              commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'Expired Soon':''}"
                                                                  severity="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'danger': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'warning':''}" />
                                                 </h:outputLabel>
                                             </p:column>
-                                            <p:column headerText="Code" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
+                                            <p:column style="padding: 6px;" headerText="Code" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
                                                 <h:outputLabel value="#{i.itemBatch.item.code}" ></h:outputLabel>
                                             </p:column>
-                                            <p:column headerText="Stocks" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
+                                            <p:column style="padding: 6px;" headerText="Stocks" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
                                                 <h:outputLabel value="#{i.stock}" >
                                                     <f:convertNumber pattern="#,###" ></f:convertNumber>
                                                 </h:outputLabel>
                                             </p:column>
-                                            <p:column headerText="Expiry" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
+                                            <p:column style="padding: 6px;" headerText="Expiry" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
                                                 <h:outputLabel value="#{i.itemBatch.dateOfExpire}">
                                                     <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateFormat}" ></f:convertDateTime>
                                                 </h:outputLabel>
                                             </p:column>
-                                            <p:column headerText="Price" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
+                                            <p:column style="padding: 6px;" headerText="Price" styleClass="#{commonController.currentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-fatal': commonController.dateAfterThreeMonthsCurrentDateTime > i.itemBatch.dateOfExpire ?'ui-messages-warn':''}">
                                                 <h:outputLabel value="#{i.itemBatch.retailsaleRate}">
                                                 </h:outputLabel>
                                             </p:column>
@@ -224,14 +224,14 @@
                                     <p:ajax event="rowEditCancel" listener="#{pharmacySaleBhtController.onEdit}"/> 
 
 
-                                    <p:column headerText="Item" style="width: 30%">
+                                    <p:column headerText="Item" style="width: 48%; padding: 6px;">
                                         <h:outputLabel value="#{bi.pharmaceuticalBillItem.itemBatch.item.name}" >
                                             &nbsp;<p:tag rendered="#{commonController.currentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'true': commonController.dateAfterThreeMonthsCurrentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'true':'false'}" value="#{commonController.currentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'Expired ': 
                                                                      commonController.dateAfterThreeMonthsCurrentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'Expired Soon':''}"
                                                          severity="#{commonController.currentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'danger': commonController.dateAfterThreeMonthsCurrentDateTime > bi.pharmaceuticalBillItem.itemBatch.dateOfExpire ?'warning':''}" />
                                         </h:outputLabel>
                                     </p:column>
-                                    <p:column headerText="Quantity">
+                                    <p:column style="padding: 6px;width: 10%;" headerText="Quantity">
                                         <p:cellEditor>  
                                             <f:facet name="output">  
                                                 <h:outputText value="#{bi.qty}" >
@@ -243,20 +243,20 @@
                                             </f:facet>  
                                         </p:cellEditor> 
                                     </p:column>
-                                    <p:column >  
+
+                                    <p:column style="padding: 6px;width: 15%;" >  
                                         <p:rowEditor />  
                                     </p:column>  
 
-
-
-                                    <p:column headerText="Expiry">
+                                    <p:column style="padding: 6px; width: 17%;" headerText="Expiry">
                                         <h:outputLabel value="#{bi.pharmaceuticalBillItem.itemBatch.dateOfExpire}" >
                                             <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.shortDateFormat}"  ></f:convertDateTime>
                                         </h:outputLabel>
 
                                     </p:column>
-                                    <p:column headerText="Remove">
-                                        <p:commandButton class="ui-button-danger" icon="fas fa-trash" value="Remove" action="#{pharmacySaleBhtController.removeBillItem(bi)}" ajax="false"   >
+                                    <p:column style="padding: 6px;width: 10%;" headerText="Remove">
+                                        
+                                        <p:commandButton class="ui-button-danger" icon="fas fa-trash" title="Remove" action="#{pharmacySaleBhtController.removeBillItem(bi)}" ajax="false"   >
 
                                         </p:commandButton>
                                     </p:column>
diff --git a/src/main/webapp/pharmacy/pharmacy_purhcase_order_approving.xhtml b/src/main/webapp/pharmacy/pharmacy_purhcase_order_approving.xhtml
index c8f37ec8b3..983db50520 100644
--- a/src/main/webapp/pharmacy/pharmacy_purhcase_order_approving.xhtml
+++ b/src/main/webapp/pharmacy/pharmacy_purhcase_order_approving.xhtml
@@ -16,20 +16,18 @@
                     <f:facet name="header">
                         <p:outputLabel value="Purchase order Request Order"/>
                         <div style="float:right;" >
-                            <p:commandButton 
-                                ajax="false"  
-                                value="Approve" 
-                                class="ui-button-success mx-2" 
-                                icon="fas fa-check" 
-                                disabled="#{!webUserController.hasPrivilege('PurchaseOrdersApprovel')}"
-                                action="#{purchaseOrderController.approve}">
+                            <p:commandButton ajax="false"  
+                                             value="Approve" 
+                                             class="ui-button-success mx-2" 
+                                             icon="fas fa-check" 
+                                             disabled="#{!webUserController.hasPrivilege('PurchaseOrdersApprovel')}"
+                                             action="#{purchaseOrderController.approve}">
                             </p:commandButton>
-                            <p:commandButton 
-                                ajax="false"  
-                                value="Back To Po List" 
-                                class="ui-button-warning" 
-                                icon="fas fa-arrow-left" 
-                                action="pharmacy_purhcase_order_list_to_approve">
+                            <p:commandButton ajax="false"  
+                                             value="Back To Po List" 
+                                             class="ui-button-warning" 
+                                             icon="fas fa-arrow-left" 
+                                             action="pharmacy_purhcase_order_list_to_approve">
                             </p:commandButton>
                         </div>
                     </f:facet>
@@ -86,23 +84,18 @@
                                 <p:commandButton process="itemList @this" update=":#{p:resolveFirstComponentWithId('itemList',view).clientId} :#{p:resolveFirstComponentWithId('po',view).clientId}" value="Remove All" class="ui-button-Danger" style="float: right" action="#{purchaseOrderController.removeSelected()}"/>                            
                             </div>
                         </f:facet>
-                        <p:dataTable 
-                            scrollable="true" 
-                            styleClass="noBorder" 
-                            scrollHeight="250"
-                            var="bi" 
-                            value="#{purchaseOrderController.billItems}"
-                            id="itemList" 
-                            sortBy="#{bi.searialNo}"  
-                            rowKey="#{bi.searialNo}"
-                            paginator="true" 
-                            rows="10" 
-                            paginatorPosition="bottom"
-                            paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-                            rowsPerPageTemplate="5,10,15"
-                            selection="#{purchaseOrderController.selectedItems}">  
-
-                            <p:column selectionMode="multiple" style="width: 30px;"></p:column>
+                        <p:dataTable scrollable="true" styleClass="noBorder" scrollHeight="250"
+                                     var="bi" value="#{purchaseOrderController.billItems}"
+                                     id="itemList" sortBy="#{bi.searialNo}"  rowKey="#{bi.searialNo}"
+                                     paginator="true" 
+                                     rows="10" 
+                                     selectionMode="multiple"
+                                     paginatorPosition="bottom"
+                                     paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+                                     rowsPerPageTemplate="5,10,15"
+                                     selection="#{purchaseOrderController.selectedItems}">  
+
+                            <p:column selectionBox="true" style="width: 30px;"></p:column>
 
                             <p:column headerText="No" style="width: 50px;" >
                                 <p:outputLabel value="#{bi.searialNo + 1}" ></p:outputLabel>
diff --git a/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml b/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml
index 8ea33b22d3..271f8b5168 100644
--- a/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml
+++ b/src/main/webapp/reports/collectionCenterReports/collection_centre_book_wise_detail.xhtml
@@ -1,54 +1,54 @@
 <?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">
+    "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:f="http://xmlns.jcp.org/jsf/core">
 
-<h:body>
-    <ui:composition template="/reports/index.xhtml">
-        <ui:define name="subcontent">
-            <h:form>
-                <p:panel header="Collection Center Book Wise Detail">
+    <h:body>
+        <ui:composition template="/reports/index.xhtml">
+            <ui:define name="subcontent">
+                <h:form>
+                    <p:panel header="Collection Center Book Wise Detail">
 
-                    <p:panelGrid columns="5" layout="tabular" class="w-100">
-                        <h:panelGroup>
-                            <h:outputText value="&#xf073;" styleClass="fa ml-5"/>
-                            <p:outputLabel value="From Date" class="mx-3">
-                            </p:outputLabel>
-                        </h:panelGroup>
-                        <p:calendar
+                        <p:panelGrid columns="5" layout="tabular" class="w-100">
+                            <h:panelGroup>
+                                <h:outputText value="&#xf073;" styleClass="fa ml-5"/>
+                                <p:outputLabel value="From Date" class="mx-3">
+                                </p:outputLabel>
+                            </h:panelGroup>
+                            <p:calendar
                                 class="w-100 "
                                 inputStyleClass="w-100"
                                 id="fromDate"
                                 value="#{reportsController.fromDate}"
                                 pattern="#{sessionController.applicationPreference.longDateTimeFormat}">
-                        </p:calendar>
+                            </p:calendar>
 
-                        <p:spacer width="5em"/>
+                            <p:spacer width="5em"/>
 
-                        <h:panelGroup>
-                            <h:outputText value="&#xf073;" styleClass="fa ml-5"/>
-                            <p:outputLabel value="To Date" class="mx-3">
-                            </p:outputLabel>
-                        </h:panelGroup>
-                        <p:calendar
+                            <h:panelGroup>
+                                <h:outputText value="&#xf073;" styleClass="fa ml-5"/>
+                                <p:outputLabel value="To Date" class="mx-3">
+                                </p:outputLabel>
+                            </h:panelGroup>
+                            <p:calendar
                                 class="w-100 "
                                 inputStyleClass="w-100"
                                 id="toDate"
                                 value="#{reportsController.toDate}"
                                 navigator="false"
                                 pattern="#{sessionController.applicationPreference.longDateTimeFormat}">
-                        </p:calendar>
+                            </p:calendar>
 
-                        <h:panelGroup class="col-md-2">
-                            <h:outputText value="&#xf19c;" styleClass="fa mr-2"/>
-                            <p:outputLabel value="Collecting Centre" class="mx-3">
-                            </p:outputLabel>
-                        </h:panelGroup>
-                        <p:autoComplete
+                            <h:panelGroup class="col-md-2">
+                                <h:outputText value="&#xf19c;" styleClass="fa mr-2"/>
+                                <p:outputLabel value="Collecting Centre" class="mx-3">
+                                </p:outputLabel>
+                            </h:panelGroup>
+                            <p:autoComplete
                                 converter="deal"
                                 value="#{reportsController.collectingCentre}"
                                 forceSelection="true" id="acColl"
@@ -57,95 +57,125 @@
                                 maxResults="15"
                                 class="w-100 mb-1"
                                 inputStyleClass="form-control">
-                            <p:column style="padding: 6px;">#{vt.code}</p:column>
-                            <p:column style="padding: 6px;">#{vt.name}</p:column>
-                        </p:autoComplete>
+                                <p:column style="padding: 6px;">#{vt.code}</p:column>
+                                <p:column style="padding: 6px;">#{vt.name}</p:column>
+                            </p:autoComplete>
 
-                        <p:spacer width="5em"/>
+                            <p:spacer width="5em"/>
 
-                        <h:panelGroup class="col-md-2">
-                            <i class="fa fa-object-group"/>
-                            <p:outputLabel value="Book Number" class="mx-3"/>
-                        </h:panelGroup>
-                        <p:inputText value="#{reportsController.cashBookNumber}" class="w-100"/>
-                    </p:panelGrid>
+                            <h:panelGroup class="col-md-2">
+                                <i class="fa fa-object-group"/>
+                                <p:outputLabel value="Book Number" class="mx-3"/>
+                            </h:panelGroup>
+                            <p:inputText value="#{reportsController.cashBookNumber}" class="w-100"/>
+                        </p:panelGrid>
 
-                    <div class="row mb-2">
-                        <div class="col-md-12">
-                            <p:commandButton ajax="false"
-                                             value="Process"
-                                             icon="fas fa-cogs"
-                                             class="ui-button-warning"
-                                             style="width: 150px"
-                                             action="#{reportsController.generateCollectionCenterBookWiseDetailReport()}">
-                            </p:commandButton>
+                        <div class="row mb-2">
+                            <div class="col-md-12">
+                                <p:commandButton ajax="false"
+                                                 value="Process"
+                                                 icon="fas fa-cogs"
+                                                 class="ui-button-warning"
+                                                 style="width: 150px"
+                                                 action="#{reportsController.generateCollectionCenterBookWiseDetailReport()}">
+                                </p:commandButton>
 
-                            <p:commandButton
+                                <p:commandButton
                                     icon="fa-solid fa-print"
                                     class="mx-1 ui-button-info mx-2"
                                     ajax="false"
                                     style="width: 150px"
                                     value="Print">
-                                <p:printer target="tbl"/>
-                            </p:commandButton>
-                            <p:commandButton
+                                    <p:printer target="tbl"/>
+                                </p:commandButton>
+                                <p:commandButton
                                     id="btnExcel" class="m-1 ui-button-success"
                                     icon="fas fa-file-excel"
                                     style="width: 150px"
                                     ajax="false" value="Excel">
-                                <p:dataExporter type="xlsx" target="tbl"
-                                                fileName="collection_center_book_wise_detail_report"/>
-                            </p:commandButton>
-                            <p:commandButton
+                                    <p:dataExporter type="xlsx" target="tbl"
+                                                    fileName="collection_center_book_wise_detail_report"/>
+                                </p:commandButton>
+                                <p:commandButton
                                     class="m-2 ui-button-danger"
                                     icon="fa-solid fa-file-pdf"
                                     ajax="false"
                                     style="width: 150px"
                                     value="PDF">
-                                <p:dataExporter type="pdf" target="tbl"
-                                                fileName="collection_center_book_wise_detail_report"/>
-                            </p:commandButton>
+                                    <p:dataExporter type="pdf" target="tbl"
+                                                    fileName="collection_center_book_wise_detail_report"/>
+                                </p:commandButton>
+                            </div>
                         </div>
-                    </div>
 
-                    <p:dataTable id="tbl"
-                                 class="w-100 m-2"
-                                 value="#{reportsController.bundle.reportTemplateRows}"
-                                 var="c"
-                                 paginator="true"
-                                 paginatorAlwaysVisible="false"
-                                 paginatorPosition="bottom"
-                                 rows="10"
-                                 rowIndexVar="b"
-                                 paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-                                 rowsPerPageTemplate="5,10,20">
-                        <p:column headerText="Bill No" width="5rem">
-                            <h:outputText value="#{c.bill.deptId}"/>
-                        </p:column>
-                        <p:column headerText="Book Reference No" width="5rem">
-                            <h:outputText value="#{c.bill.referenceNumber}"/>
-                        </p:column>
-                        <p:column headerText="Patient" width="5rem">
-                            <h:outputText value="#{c.bill.patient.person.nameWithTitle}"/>
-                        </p:column>
-                        <p:column headerText="Creater" width="5rem">
-                            <h:outputText value="#{c.bill.creater.webUserPerson.name}"/>
-                        </p:column>
-                        <p:column headerText="Created Date" width="5rem">
-                            <h:outputText value="#{c.bill.createdAt}">
-                                <f:convertDateTime
+                        <p:dataTable id="tbl"
+                                     class="w-100 m-2"
+                                     value="#{reportsController.bundle.reportTemplateRows}"
+                                     var="c"
+                                     rowIndexVar="b">
+                            <p:column 
+                                headerText="Bill No" 
+                                width="5rem" 
+                                sortBy="#{c.bill.deptId}" 
+                                filterBy="#{c.bill.deptId}" 
+                                filterMatchMode="contains">
+                                <h:outputText value="#{c.bill.deptId}"/>
+                            </p:column>
+                            <p:column 
+                                headerText="Book Reference No" 
+                                width="5rem"
+                                sortBy="#{c.bill.referenceNumber}" 
+                                filterBy="#{c.bill.referenceNumber}" 
+                                filterMatchMode="contains">
+                                <h:outputText value="#{c.bill.referenceNumber}"/>
+                            </p:column>
+                            <p:column 
+                                headerText="Patient" 
+                                width="5rem"
+                                sortBy="#{c.bill.patient.person.nameWithTitle}" 
+                                filterBy="#{c.bill.patient.person.nameWithTitle}" 
+                                filterMatchMode="contains">
+                                <h:outputText value="#{c.bill.patient.person.nameWithTitle}"/>
+                            </p:column>
+                            <p:column 
+                                headerText="Creater" 
+                                width="5rem"
+                                sortBy="#{c.bill.creater.webUserPerson.name}" 
+                                filterBy="#{c.bill.creater.webUserPerson.name}" 
+                                filterMatchMode="contains">
+                                <h:outputText value="#{c.bill.creater.webUserPerson.name}"/>
+                            </p:column>
+                            <p:column 
+                                headerText="Created Date" 
+                                width="5rem"
+                                sortBy="#{c.bill.createdAt}" 
+                                filterBy="#{c.bill.createdAt}" 
+                                filterMatchMode="contains">
+                                <h:outputText value="#{c.bill.createdAt}">
+                                    <f:convertDateTime
                                         pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
-                            </h:outputText>
-                        </p:column>
-                        <p:column headerText="Bill Value" width="5rem">
-                            <h:outputText value="#{c.bill.netTotal}">
-                                <f:convertNumber pattern="#,##0.00"/>
-                            </h:outputText>
-                        </p:column>
-                    </p:dataTable>
-                </p:panel>
-            </h:form>
-        </ui:define>
-    </ui:composition>
-</h:body>
+                                </h:outputText>
+                            </p:column>
+                            <p:column 
+                                headerText="Bill Value" 
+                                width="5rem" 
+                                style="text-align: right;"
+                                sortBy="#{c.bill.netTotal}" 
+                                filterBy="#{c.bill.netTotal}" 
+                                filterMatchMode="contains">
+                                <h:outputText value="#{c.bill.netTotal}">
+                                    <f:convertNumber pattern="#,##0.00"/>
+                                </h:outputText>
+                                <f:facet name="footer">
+                                    <h:outputText value="#{reportsController.bundle.grossTotal}">
+                                    <f:convertNumber pattern="#,##0.00"/>
+                                </h:outputText>
+                            </f:facet>
+                            </p:column>
+                        </p:dataTable>
+                    </p:panel>
+                </h:form>
+            </ui:define>
+        </ui:composition>
+    </h:body>
 </html>
diff --git a/src/main/webapp/reports/inventoryReports/expiry_item.xhtml b/src/main/webapp/reports/inventoryReports/expiry_item.xhtml
index db02740359..9b9fd4f63b 100644
--- a/src/main/webapp/reports/inventoryReports/expiry_item.xhtml
+++ b/src/main/webapp/reports/inventoryReports/expiry_item.xhtml
@@ -230,11 +230,32 @@
                                 value="Process"
                                 action="#{pharmacyReportController.processExpiryItemReport()}">
                             </p:commandButton>
-                            <p:commandButton class="ui-button- mx-1" icon="fas fa-print" ajax="false" value="Print All">
+                            <p:commandButton 
+                                class="ui-button- mx-1" 
+                                icon="fas fa-print" 
+                                ajax="false" 
+                                value="Print All">
+                                <p:printer target="tbl" />
                             </p:commandButton>
-                            <p:commandButton class="ui-button-success mx-1" icon="fas fa-file-excel" ajax="false" value="Download">
+                            <p:commandButton 
+                                class="ui-button-success mx-1" 
+                                icon="fas fa-file-excel" 
+                                ajax="false" 
+                                value="Download">
+                                <p:dataExporter 
+                                    type="xlsx" 
+                                    fileName="Expiry Item Report" 
+                                    target="tbl"  />
                             </p:commandButton>
-                            <p:commandButton class="ui-button-danger mx-1" icon= "fas fa-file-pdf" ajax="false" value="PDF">
+                            <p:commandButton 
+                                class="ui-button-danger mx-1" 
+                                icon= "fas fa-file-pdf" 
+                                ajax="false" 
+                                value="PDF">
+                                <p:dataExporter 
+                                    type="pdf" 
+                                    target="tbl" 
+                                    fileName="Expiry Item Report" />
                             </p:commandButton>
                         </div>
 
@@ -243,7 +264,7 @@
 
                             <h5>Expiry Item Report</h5>
 
-                            <p:dataTable id="tbl1" 
+                            <p:dataTable id="tbl" 
                                          value="#{pharmacyReportController.stocks}" 
                                          var="f" 
                                          rowIndexVar="n" 
@@ -253,18 +274,12 @@
                                          currentPageReportTemplate="Showing {startRecord} to {endRecord} of {totalRecords}" 
                                          rowsPerPageTemplate="5,10,15,25,50,100,500,1000">
 
-                                <p:column headerText=" Item name wise" width="10em">
+                                <p:column headerText="Department" width="10em">
                                     <h:outputText value="#{f.department.name}" />
                                     <f:facet name="footer">
                                         <h:outputText value="Total" />
                                     </f:facet>
                                 </p:column>
-                                <p:column headerText="Parenct Category Code" width="10em">
-                                    <h:outputText value="#{f.itemBatch.item.category.parentCategory.code}" />
-                                </p:column>
-                                <p:column headerText="Parent Category Name" width="10em">
-                                    <h:outputText value="#{f.itemBatch.item.category.parentCategory.name}" />
-                                </p:column>
                                 <p:column headerText="Item Category Code" width="10em">
                                     <h:outputText value="#{f.itemBatch.item.category.id}" />
                                 </p:column>
@@ -280,9 +295,6 @@
                                 <p:column headerText="Base UOM" width="10em">
                                     <h:outputText value="#{f.itemBatch.item.measurementUnit.name}" />
                                 </p:column>
-                                <p:column headerText="Secondary UOM" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
                                 <p:column headerText="Item Type" width="10em">
                                     <h:outputText value="#{f.itemBatch.item.category.name}" />
                                 </p:column>
@@ -347,9 +359,7 @@
                                             <f:convertNumber parent="#,##0.00" ></f:convertNumber>
                                         </h:outputLabel>
                                     </f:facet>
-                                </p:column>
-                                
-                                
+                                </p:column>   
                                 
 
                             </p:dataTable>