diff --git a/src/main/webapp/pharmacy/pharmacy_report_all_staff_stock_by_batch.xhtml b/src/main/webapp/pharmacy/pharmacy_report_all_staff_stock_by_batch.xhtml
index d2c5ac24e3..a439382047 100644
--- a/src/main/webapp/pharmacy/pharmacy_report_all_staff_stock_by_batch.xhtml
+++ b/src/main/webapp/pharmacy/pharmacy_report_all_staff_stock_by_batch.xhtml
@@ -5,264 +5,15 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:f="http://xmlns.jcp.org/jsf/core"
-      >
+          
+      xmlns:ph="http://xmlns.jcp.org/jsf/composite/ezcomp/pharmacy">
 
     <h:body>
 
         <ui:composition template="/pharmacy/pharmacy_analytics.xhtml">
             <ui:define name="subcontent">
-                <h:form>
-                    <p:panel header="Staff Stock Report by Batch" >
-                        <h:panelGrid columns="5" class="my-2" >
-                            <!--                            <h:outputLabel value="Staff" >
-                                                        </h:outputLabel>
-                                                        <p:autoComplete completeMethod="#{staffController.completeStaff}" var="staff" itemLabel="#{staff.person.name}" itemValue="#{staff}" forceSelection="true" value="#{reportsStock.staff}"  >
-                                                        </p:autoComplete>-->
-                            <p:commandButton class="ui-button-warning " icon="fas fa-fill"  ajax="false" value="Fill" action="#{reportsStock.fillAllStaffStocks}" ></p:commandButton>
-                            <p:commandButton class="ui-button-info mx-2" icon="fas fa-print" value="Print" ajax="false" action="#" >
-                                <p:printer target="gpBillPreview" >
-                                </p:printer>
-                            </p:commandButton>
-                            <p:commandButton  class="ui-button-success " icon="fas fa-file-excel" value="Excel" ajax="false">
-                                <p:dataExporter type="xlsx" target="tbl" fileName="Staff_Stock_Report"
-                                                />
-                            </p:commandButton>
-                        </h:panelGrid>
-                        <h:panelGroup id="gpBillPreview" styleClass="noBorder summeryBorder">
-                            <!--                            <p:dataTable id="tbl"
-                                                                     rowStyleClass="#{i.stock eq 0 ?'noDisplayRow' : ''}" 
-                                                                     value="#{reportsStock.stocks}" var="i"  
-                                                                     >
-                                                            <f:facet name="header">
-                                                                <h:outputLabel value="Stock"/>
-                                                                 
-                                                            </f:facet>
-                                                            
-                                                            <p:column headerText="Staff" 
-                                                                      sortBy="#{i.staff.person.name}"
-                                                                      filterBy="#{i.staff.person.name}"
-                                                                      filterMatchMode="contains">
-                                                                <f:facet name="header">
-                                                                    <h:outputLabel value="Staff"/>
-                                                                </f:facet>
-                                                                <h:outputLabel value="#{i.staff.person.name}"/> 
-                                                            </p:column>
-                                                            <p:column headerText="Item" 
-                                                                      style="min-width: 25px;"
-                                                                      sortBy="#{i.itemBatch.item.name}"
-                                                                      filterBy="#{i.itemBatch.item.name}"
-                                                                      filterMatchMode="contains"
-                                                                      >
-                                                                <f:facet name="header">
-                                                                    <h:outputLabel value="Item"/>
-                                                                </f:facet>
-                                                                <h:outputLabel value="#{i.itemBatch.item.name}" ></h:outputLabel>
-                                                            </p:column>
-                                                            
-                                                            <p:column headerText="Code"
-                                                                      sortBy="#{i.itemBatch.item.code}"
-                                                                      filterBy="#{i.itemBatch.item.code}"
-                                                                      filterMatchMode="contains">
-                                                                <f:facet name="header">
-                                                                    <h:outputLabel value="Code"/>
-                                                                </f:facet>
-                                                                <h:outputLabel value="#{i.itemBatch.item.code}" style="width: 100px!important;" ></h:outputLabel>
-                                                            </p:column>
-                                                            
-                                                            <p:column headerText="Stock Quantity"
-                                                                      sortBy="#{i.stock}"
-                                                                      filterBy="#{i.stock}"
-                                                                      filterMatchMode="contains">
-                                                                 <f:facet name="header">
-                                                                    <h:outputLabel value="Stock Quantity"/>
-                                                                </f:facet>
-                                                                <h:outputLabel value="#{i.stock}"  >
-                                                                    <f:convertNumber pattern="#,###" ></f:convertNumber>
-                                                                </h:outputLabel>                                 
-                                                            </p:column>
-                                                            
-                                                            <p:column headerText="Expiry"
-                                                                      sortBy="#{i.itemBatch.dateOfExpire}">
-                                                                 <f:facet name="header">
-                                                                    <h:outputLabel value="Expiry"/>
-                                                                </f:facet>
-                                                                <h:outputLabel value="#{i.itemBatch.dateOfExpire}"  >
-                                                                    <f:convertDateTime pattern="MMM yyyy" ></f:convertDateTime>
-                                                                </h:outputLabel>
-                                                            </p:column>
-                                                            
-                                                             <p:column headerText="Batch"
-                                                                       sortBy="#{i.itemBatch.batchNo}">
-                                                                 <f:facet name="header">
-                                                                    <h:outputLabel value="Batch"/>
-                                                                </f:facet>
-                                                                 <h:outputLabel value="#{i.itemBatch.batchNo}"  >
-                                                                </h:outputLabel>
-                                                            </p:column>
-                                                            
-                                                            <p:column headerText="Purchase Rate"
-                                                                      styleClass="averageNumericColumn"
-                                                                      sortBy="#{i.itemBatch.purcahseRate}">
-                                                                 <f:facet name="header">
-                                                                    <h:outputLabel value="Purchase Rate"/>
-                                                                </f:facet>
-                                                                <h:outputLabel value="#{i.itemBatch.purcahseRate}"  >
-                                                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
-                                                                </h:outputLabel>
-                                                            </p:column>
-                                                            
-                                                            <p:column headerText="Purchase Value" 
-                                                                     styleClass="averageNumericColumn"
-                                                                      sortBy="#{i.itemBatch.purcahseRate * i.stock}"
-                                                                      >
-                                                                 <f:facet name="header">
-                                                                    <h:outputLabel value="Purchase Value"/>
-                                                                </f:facet>
-                                                                <h:outputLabel value="#{i.itemBatch.purcahseRate * i.stock}"  >
-                                                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
-                                                                </h:outputLabel>
-                                                                <f:facet name="footer" >
-                                                                    <h:outputLabel value="#{reportsStock.stockPurchaseValue}" >
-                                                                        <f:convertNumber parent="#,##0.00" ></f:convertNumber>
-                                                                    </h:outputLabel>
-                                                                </f:facet>
-                                                            </p:column>
-                            
-                                                            <p:column headerText="Retail Sale Rate" 
-                                                                      styleClass="averageNumericColumn"
-                                                                      sortBy="#{i.itemBatch.retailsaleRate}">
-                                                                 <f:facet name="header">
-                                                                    <h:outputLabel value="Retail Sale Rate"/>
-                                                                </f:facet>
-                                                                <h:outputLabel value="#{i.itemBatch.retailsaleRate}"  >
-                                                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
-                                                                </h:outputLabel>
-                                                            </p:column>
-                                                            
-                                                            <p:column headerText="Retail Sale Value" 
-                                                                      styleClass="averageNumericColumn"
-                                                                      sortBy="#{i.itemBatch.retailsaleRate * i.stock}">
-                                                                 <f:facet name="header">
-                                                                    <h:outputLabel value="Retail Sale Value"/>
-                                                                </f:facet>
-                                                                <h:outputLabel value="#{i.itemBatch.retailsaleRate * i.stock}"  >
-                                                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
-                                                                </h:outputLabel>
-                                                                <f:facet name="footer" >
-                                                                    <h:outputLabel value="#{reportsStock.stockSaleValue}" >
-                                                                        <f:convertNumber parent="#,##0.00" ></f:convertNumber>
-                                                                    </h:outputLabel>
-                                                                </f:facet>
-                                                            </p:column>
-                                                            <p:columnGroup type="footer">
-                                                                    <p:row>
-                                                                    <p:column colspan="9">
-                                                                        <f:facet name="footer" >
-                                                                            <h:outputLabel value="Printed At " ></h:outputLabel>
-                                                                            <h:outputLabel value="#{sessionController.currentDate}" >
-                                                                                <f:convertDateTime pattern="dd MMMM yyyy - hh:mm a" ></f:convertDateTime>
-                                                                            </h:outputLabel>
-                                                                        </f:facet>
-                                                                    </p:column>
-                                                                    </p:row>
-                                                                   
-                                                                </p:columnGroup>
-                                                           
-                                                        </p:dataTable>-->
-
-                            <p:dataTable id="tbl"
-                                         value="#{reportsStock.billItems}" var="bi"  
-                                         >
-                                <f:facet name="header">
-                                    <h:outputLabel value="Stock"/>
-
-                                </f:facet>
-
-                                <p:column headerText="Staff" 
-                                          sortBy="#{bi.bill.toStaff.person.name}"
-                                          filterBy="#{bi.bill.toStaff.person.name}"
-                                          filterMatchMode="contains">
-                                    <f:facet name="header">
-                                        <h:outputLabel value="Staff"/>
-                                    </f:facet>
-                                    <h:outputLabel value="#{bi.bill.toStaff.person.name}"/> 
-                                </p:column>
-                                <p:column headerText="Item" 
-                                          sortBy="#{bi.item.name}"
-                                          filterBy="#{bi.item.name}"
-                                          filterMatchMode="contains">
-                                    <f:facet name="header">
-                                        <h:outputLabel value="Item"/>
-                                    </f:facet>
-                                    <h:outputLabel value="#{bi.item.name}"/> 
-                                </p:column>
-                                <p:column headerText="Code" 
-                                          sortBy="#{bi.item.code}"
-                                          filterBy="#{bi.item.code}"
-                                          filterMatchMode="contains">
-                                    <f:facet name="header">
-                                        <h:outputLabel value="Code"/>
-                                    </f:facet>
-                                    <h:outputLabel value="#{bi.item.code}"/> 
-                                </p:column>
-                                <p:column headerText="Stock" 
-                                          sortBy="#{bi.qty}"
-                                          >
-                                    <f:facet name="header">
-                                        <h:outputLabel value="Stock"/>
-                                    </f:facet>
-                                    <h:outputLabel value="#{bi.qty}"/> 
-                                </p:column>
-                                <p:column headerText="Expiry"
-                                          sortBy="#{bi.pharmaceuticalBillItem.itemBatch.dateOfExpire}">
-                                    <f:facet name="header">
-                                        <h:outputLabel value="Expiry"/>
-                                    </f:facet>
-                                    <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="From Department"
-                                          sortBy="#{bi.bill.fromDepartment.name}">
-                                    <f:facet name="header">
-                                        <h:outputLabel value="From Department"/>
-                                    </f:facet>
-                                    <h:outputLabel value="#{bi.bill.fromDepartment.name}"  >
-                                    </h:outputLabel>
-                                </p:column>
-                                <p:column headerText="Issued Date"
-                                          sortBy="#{bi.bill.createdAt}">
-                                    <f:facet name="header">
-                                        <h:outputLabel value="Issued Date"/>
-                                    </f:facet>
-                                    <h:outputLabel value="#{bi.bill.createdAt}"  >
-                                        <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.shortDateFormat}"  ></f:convertDateTime>
-                                    </h:outputLabel>
-                                </p:column>
-                                <p:column headerText="Retail Sale Value" 
-                                          styleClass="averageNumericColumn">
-                                    <f:facet name="header">
-                                        <h:outputLabel value="Purchase Sale Value"/>
-                                    </f:facet>
-                                    <h:outputLabel value="#{bi.pharmaceuticalBillItem.itemBatch.retailsaleRate * bi.qty}"  >
-                                        <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
-                                    </h:outputLabel>
-                                </p:column>
-                                <p:column headerText="Purchase Sale Value" 
-                                          styleClass="averageNumericColumn">
-                                    <f:facet name="header">
-                                        <h:outputLabel value="Purchase Sale Value"/>
-                                    </f:facet>
-                                    <h:outputLabel value="#{bi.pharmaceuticalBillItem.itemBatch.purcahseRate * bi.qty}"  >
-                                        <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
-                                    </h:outputLabel>
-                                </p:column>
-                                
-                            </p:dataTable>
-                        </h:panelGroup>
-                    </p:panel>
-                </h:form>
-
+                
+                <ph:stock_transist_report/>
 
             </ui:define>
 
diff --git a/src/main/webapp/reports/inventoryReports/good_in_transit.xhtml b/src/main/webapp/reports/inventoryReports/good_in_transit.xhtml
index 28e380f65b..981e360ca7 100644
--- a/src/main/webapp/reports/inventoryReports/good_in_transit.xhtml
+++ b/src/main/webapp/reports/inventoryReports/good_in_transit.xhtml
@@ -4,306 +4,314 @@
       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">
+      xmlns:f="http://xmlns.jcp.org/jsf/core"
+      xmlns:ph="http://xmlns.jcp.org/jsf/composite/ezcomp/pharmacy">
+
     <h:body>
         <ui:composition template="/reports/index.xhtml">
             <ui:define name="subcontent">
-                <h:form >
-                    <p:panel header="Good In Transit" >
-
-                        <p:panelGrid columns="6" class="w-100">
-
-                            <h:panelGroup layout="block" styleClass="form-group" class="my-1">
-                                <h:outputText value="&#xf073;" styleClass="fa ml-5" />
-                                <p:outputLabel value="From Date" class="mx-2" >
-                                </p:outputLabel>
-                            </h:panelGroup>
-                            <p:datePicker value="" 
-                                          inputStyleClass="w-100"
-                                          class="w-100"
-                                          pattern="#{sessionController.applicationPreference.longDateFormat}">
-                            </p:datePicker>
-
-
-
-                            <h:panelGroup layout="block" styleClass="form-group" class="my-1">
-                                <h:outputText value="&#xf073;" styleClass="fa ml-5" />
-                                <p:outputLabel value="To Date" class="mx-2" >
-                                </p:outputLabel>
-                            </h:panelGroup>
-                            <p:datePicker value=""
-                                          inputStyleClass="w-100"
-                                          class="w-100"
-                                          pattern="#{sessionController.applicationPreference.longDateFormat}">
-                            </p:datePicker>
-
-
-
-                            <h:panelGroup layout="block" styleClass="form-group">
-                                <h:outputText styleClass="fa fa-university ml-5" />
-                                <p:outputLabel value="Receiving Institution" class="mx-2" >
-                                </p:outputLabel>
-                            </h:panelGroup>
-                            <p:selectOneMenu class="w-100">
-                                <f:selectItem itemLabel="All" ></f:selectItem>
-                                <f:selectItems ></f:selectItems>
-                            </p:selectOneMenu>
-
-
-
-                            <h:panelGroup layout="block" styleClass="form-group">
-                                <h:outputText styleClass="fa fa-map-marker-alt ml-5" />
-                                <p:outputLabel value="Receiving Site" class="mx-2"></p:outputLabel>
-                            </h:panelGroup>
-                            <p:selectOneMenu class="w-100 ">
-                                <f:selectItem itemLabel="All" ></f:selectItem>
-                                <f:selectItems ></f:selectItems>
-                            </p:selectOneMenu>                           
-
-
-
-                            <h:panelGroup layout="block" styleClass="form-group">
-                                <h:outputText styleClass="fa fa-building ml-5" />
-                                <p:outputLabel value="Receiving Department" class="mx-2">
-                                </p:outputLabel>
-                            </h:panelGroup>
-                            <p:selectOneMenu class="w-100 ">
-                                <f:selectItem itemLabel="All" ></f:selectItem>
-                                <f:selectItems ></f:selectItems>
-                            </p:selectOneMenu>
-
-
-
-                            <h:panelGroup layout="block" styleClass="form-group">
-                                <h:outputText styleClass="fa fa-store ml-5" />
-                                <p:outputLabel value="Receiving Store" class="mx-2">
-                                </p:outputLabel>
-                            </h:panelGroup>
-                            <p:selectOneMenu class="w-100">
-                                <f:selectItem itemLabel="All" ></f:selectItem>
-                                <f:selectItems></f:selectItems>
-                            </p:selectOneMenu>
-
-
-
-                            <h:panelGroup layout="block" styleClass="form-group" class="my-1">
-                                <h:outputText styleClass="fa fa-university ml-5" />
-                                <p:outputLabel value="Issue Institution" class="mx-2" >
-                                </p:outputLabel>
-                            </h:panelGroup>
-                            <p:selectOneMenu class="w-100">
-                                <f:selectItem itemLabel="All" ></f:selectItem>
-                                <f:selectItems ></f:selectItems>
-                            </p:selectOneMenu>
-
-
-
-                            <h:panelGroup layout="block" styleClass="form-group" class="my-1">
-                                <h:outputText styleClass="fa fa-map-marker-alt ml-5" />
-                                <p:outputLabel value="Issue Site" class="mx-2">                                   
-                                </p:outputLabel>
-                            </h:panelGroup>
-                            <p:selectOneMenu class="w-100 ">
-                                <f:selectItem itemLabel="All" ></f:selectItem>
-                                <f:selectItems ></f:selectItems>
-                            </p:selectOneMenu>
-
-
-
-                            <h:panelGroup layout="block" styleClass="form-group">
-                                <h:outputText styleClass="fa fa-building ml-5" />
-                                <p:outputLabel value="Issue Department" class="mx-2">
-                                </p:outputLabel>
-                            </h:panelGroup>
-                            <p:selectOneMenu class="w-100 ">
-                                <f:selectItem itemLabel="All" ></f:selectItem>
-                                <f:selectItems ></f:selectItems>
-                            </p:selectOneMenu>
-
-
 
-                            <h:panelGroup layout="block" styleClass="form-group">
-                                <h:outputText styleClass="fa fa-store ml-5" />
-                                <p:outputLabel value="Issue Store" class="mx-2">                           
-                                </p:outputLabel>
-                            </h:panelGroup>
-                            <p:selectOneMenu class="w-100">
-                                <f:selectItem itemLabel="All" ></f:selectItem>
-                                <f:selectItems></f:selectItems>
-                            </p:selectOneMenu>
+                <ph:stock_transist_report/>
 
-
-
-                            <h:panelGroup layout="block" styleClass="form-group">
-                                <h:outputText styleClass="fa fa-tag ml-5" />
-                                <p:outputLabel value="Item Name/Code" class="mx-2">
-                                </p:outputLabel>
-                            </h:panelGroup>
-                            <p:selectOneMenu class="w-100">
-                                <f:selectItem itemLabel="All" ></f:selectItem>
-                                <f:selectItems></f:selectItems>
-                            </p:selectOneMenu>
-
-
-
-                            <h:panelGroup layout="block" styleClass="form-group">
-                                <h:outputText styleClass="fa fa-box ml-5" />
-                                <p:outputLabel value="Item Category" class="mx-3">
-                                </p:outputLabel>
-                            </h:panelGroup>
-                            <p:selectOneMenu class="w-100 ">
-                                <f:selectItem itemLabel="All" ></f:selectItem>
-                                <f:selectItems ></f:selectItems>
-                            </p:selectOneMenu>
-
-
-
-                            <h:panelGroup layout="block" styleClass="form-group">
-                                <h:outputText styleClass="fa fa-clock ml-5" />
-                                <p:outputLabel value="Show only Pending Docs" class="mx-2" >
-                                </p:outputLabel>
-                            </h:panelGroup>
-                            <p:selectOneMenu class="w-100">
-                                <f:selectItem itemLabel="All" ></f:selectItem>
-                                <f:selectItems ></f:selectItems>
-                            </p:selectOneMenu>
-
-
-                            <h:panelGroup layout="block" styleClass="form-group">
-                                <h:outputText styleClass="fa fa-exchange-alt ml-5" />
-                                <p:outputLabel value="Issuing/Returning Doc.Status" class="mx-3" />
-                            </h:panelGroup>
-                            <p:selectOneMenu class="w-100">
-                                <f:selectItem itemLabel="All" ></f:selectItem>
-                                <f:selectItems ></f:selectItems>
-                            </p:selectOneMenu>
-
-
-
-
-                            <h:panelGroup layout="block" styleClass="form-group">
-                                <h:outputText styleClass="fa fa-people-carry ml-5" />
-                                <p:outputLabel value="Transit Store/Staff" class="mx-2" >
-                                </p:outputLabel>
-                            </h:panelGroup>
-                            <p:selectOneMenu class="w-100">
-                                <f:selectItem itemLabel="All" ></f:selectItem>
-                                <f:selectItems></f:selectItems>
-                            </p:selectOneMenu>
-
-
-
-                        </p:panelGrid>
-
-                        <div class="d-flex align-items-center">
-                            <p:commandButton class="ui-button-warning mx-1" icon="fas fa-cogs" ajax="false"  value="Process" >
-                            </p:commandButton>
-                            <p:commandButton class="ui-button- mx-1" icon="fas fa-print" ajax="false" value="Print All">
-                            </p:commandButton>
-                            <p:commandButton class="ui-button-success mx-1" icon="fas fa-file-excel" ajax="false" value="Download">
-                            </p:commandButton>
-                            <p:commandButton class="ui-button-danger mx-1" icon= "fas fa-file-pdf" ajax="false" value="PDF">
-                            </p:commandButton>
-                        </div>
-
-
-                        <div class="mt-5">
-
-                            <h5>Transit Store Transactions</h5>
-                            <br></br>
-                            <h6>Stock Issues</h6>
-
-                            <p:dataTable id="tbl1" value="" 
-                                         var="f" 
-                                         rowIndexVar="n" 
-                                         paginator="true" 
-                                         rows="10" 
-                                         paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-                                         currentPageReportTemplate="Showing {startRecord} to {endRecord} of {totalRecords}" 
-                                         rowsPerPageTemplate="5,10,15,25,50,100,500,1000">
-
-                                <p:column headerText="Item Code" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Issue Qty" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Issue Doc. Type " width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Issuing Institution" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Issuing Site" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Issuing Department" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Issuing Store" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Issue Doc. Approval Date" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Issue Prepared By" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Receipt Qty" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Receipt Stock Value" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Receipt Approval Stock Value" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Receipt Doc. No" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Receipt Doc. Type " width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Receiving Institution" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Receiving Site" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Receiving Department" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Receiving Store" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Receipt Doc. Date" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Receipt Doc. Approval Date" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Receipt Prepared By" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Receipt Approved By" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-                                <p:column headerText="Receipt Approval Status" width="10em">
-                                    <h:outputText value="" />
-                                </p:column>
-
-                            </p:dataTable>
-
-                        </div>
-
-                    </p:panel>
-
-                </h:form>
+                
+                <!--                Do not delete this
+                
+                <h:form >
+                                    <p:panel header="Good In Transit" >
+                
+                                        <p:panelGrid columns="6" class="w-100">
+                
+                                            <h:panelGroup layout="block" styleClass="form-group" class="my-1">
+                                                <h:outputText value="&#xf073;" styleClass="fa ml-5" />
+                                                <p:outputLabel value="From Date" class="mx-2" >
+                                                </p:outputLabel>
+                                            </h:panelGroup>
+                                            <p:datePicker value="" 
+                                                          inputStyleClass="w-100"
+                                                          class="w-100"
+                                                          pattern="#{sessionController.applicationPreference.longDateFormat}">
+                                            </p:datePicker>
+                
+                
+                
+                                            <h:panelGroup layout="block" styleClass="form-group" class="my-1">
+                                                <h:outputText value="&#xf073;" styleClass="fa ml-5" />
+                                                <p:outputLabel value="To Date" class="mx-2" >
+                                                </p:outputLabel>
+                                            </h:panelGroup>
+                                            <p:datePicker value=""
+                                                          inputStyleClass="w-100"
+                                                          class="w-100"
+                                                          pattern="#{sessionController.applicationPreference.longDateFormat}">
+                                            </p:datePicker>
+                
+                
+                
+                                            <h:panelGroup layout="block" styleClass="form-group">
+                                                <h:outputText styleClass="fa fa-university ml-5" />
+                                                <p:outputLabel value="Receiving Institution" class="mx-2" >
+                                                </p:outputLabel>
+                                            </h:panelGroup>
+                                            <p:selectOneMenu class="w-100">
+                                                <f:selectItem itemLabel="All" ></f:selectItem>
+                                                <f:selectItems ></f:selectItems>
+                                            </p:selectOneMenu>
+                
+                
+                
+                                            <h:panelGroup layout="block" styleClass="form-group">
+                                                <h:outputText styleClass="fa fa-map-marker-alt ml-5" />
+                                                <p:outputLabel value="Receiving Site" class="mx-2"></p:outputLabel>
+                                            </h:panelGroup>
+                                            <p:selectOneMenu class="w-100 ">
+                                                <f:selectItem itemLabel="All" ></f:selectItem>
+                                                <f:selectItems ></f:selectItems>
+                                            </p:selectOneMenu>                           
+                
+                
+                
+                                            <h:panelGroup layout="block" styleClass="form-group">
+                                                <h:outputText styleClass="fa fa-building ml-5" />
+                                                <p:outputLabel value="Receiving Department" class="mx-2">
+                                                </p:outputLabel>
+                                            </h:panelGroup>
+                                            <p:selectOneMenu class="w-100 ">
+                                                <f:selectItem itemLabel="All" ></f:selectItem>
+                                                <f:selectItems ></f:selectItems>
+                                            </p:selectOneMenu>
+                
+                
+                
+                                            <h:panelGroup layout="block" styleClass="form-group">
+                                                <h:outputText styleClass="fa fa-store ml-5" />
+                                                <p:outputLabel value="Receiving Store" class="mx-2">
+                                                </p:outputLabel>
+                                            </h:panelGroup>
+                                            <p:selectOneMenu class="w-100">
+                                                <f:selectItem itemLabel="All" ></f:selectItem>
+                                                <f:selectItems></f:selectItems>
+                                            </p:selectOneMenu>
+                
+                
+                
+                                            <h:panelGroup layout="block" styleClass="form-group" class="my-1">
+                                                <h:outputText styleClass="fa fa-university ml-5" />
+                                                <p:outputLabel value="Issue Institution" class="mx-2" >
+                                                </p:outputLabel>
+                                            </h:panelGroup>
+                                            <p:selectOneMenu class="w-100">
+                                                <f:selectItem itemLabel="All" ></f:selectItem>
+                                                <f:selectItems ></f:selectItems>
+                                            </p:selectOneMenu>
+                
+                
+                
+                                            <h:panelGroup layout="block" styleClass="form-group" class="my-1">
+                                                <h:outputText styleClass="fa fa-map-marker-alt ml-5" />
+                                                <p:outputLabel value="Issue Site" class="mx-2">                                   
+                                                </p:outputLabel>
+                                            </h:panelGroup>
+                                            <p:selectOneMenu class="w-100 ">
+                                                <f:selectItem itemLabel="All" ></f:selectItem>
+                                                <f:selectItems ></f:selectItems>
+                                            </p:selectOneMenu>
+                
+                
+                
+                                            <h:panelGroup layout="block" styleClass="form-group">
+                                                <h:outputText styleClass="fa fa-building ml-5" />
+                                                <p:outputLabel value="Issue Department" class="mx-2">
+                                                </p:outputLabel>
+                                            </h:panelGroup>
+                                            <p:selectOneMenu class="w-100 ">
+                                                <f:selectItem itemLabel="All" ></f:selectItem>
+                                                <f:selectItems ></f:selectItems>
+                                            </p:selectOneMenu>
+                
+                
+                
+                                            <h:panelGroup layout="block" styleClass="form-group">
+                                                <h:outputText styleClass="fa fa-store ml-5" />
+                                                <p:outputLabel value="Issue Store" class="mx-2">                           
+                                                </p:outputLabel>
+                                            </h:panelGroup>
+                                            <p:selectOneMenu class="w-100">
+                                                <f:selectItem itemLabel="All" ></f:selectItem>
+                                                <f:selectItems></f:selectItems>
+                                            </p:selectOneMenu>
+                
+                
+                
+                                            <h:panelGroup layout="block" styleClass="form-group">
+                                                <h:outputText styleClass="fa fa-tag ml-5" />
+                                                <p:outputLabel value="Item Name/Code" class="mx-2">
+                                                </p:outputLabel>
+                                            </h:panelGroup>
+                                            <p:selectOneMenu class="w-100">
+                                                <f:selectItem itemLabel="All" ></f:selectItem>
+                                                <f:selectItems></f:selectItems>
+                                            </p:selectOneMenu>
+                
+                
+                
+                                            <h:panelGroup layout="block" styleClass="form-group">
+                                                <h:outputText styleClass="fa fa-box ml-5" />
+                                                <p:outputLabel value="Item Category" class="mx-3">
+                                                </p:outputLabel>
+                                            </h:panelGroup>
+                                            <p:selectOneMenu class="w-100 ">
+                                                <f:selectItem itemLabel="All" ></f:selectItem>
+                                                <f:selectItems ></f:selectItems>
+                                            </p:selectOneMenu>
+                
+                
+                
+                                            <h:panelGroup layout="block" styleClass="form-group">
+                                                <h:outputText styleClass="fa fa-clock ml-5" />
+                                                <p:outputLabel value="Show only Pending Docs" class="mx-2" >
+                                                </p:outputLabel>
+                                            </h:panelGroup>
+                                            <p:selectOneMenu class="w-100">
+                                                <f:selectItem itemLabel="All" ></f:selectItem>
+                                                <f:selectItems ></f:selectItems>
+                                            </p:selectOneMenu>
+                
+                
+                                            <h:panelGroup layout="block" styleClass="form-group">
+                                                <h:outputText styleClass="fa fa-exchange-alt ml-5" />
+                                                <p:outputLabel value="Issuing/Returning Doc.Status" class="mx-3" />
+                                            </h:panelGroup>
+                                            <p:selectOneMenu class="w-100">
+                                                <f:selectItem itemLabel="All" ></f:selectItem>
+                                                <f:selectItems ></f:selectItems>
+                                            </p:selectOneMenu>
+                
+                
+                
+                
+                                            <h:panelGroup layout="block" styleClass="form-group">
+                                                <h:outputText styleClass="fa fa-people-carry ml-5" />
+                                                <p:outputLabel value="Transit Store/Staff" class="mx-2" >
+                                                </p:outputLabel>
+                                            </h:panelGroup>
+                                            <p:selectOneMenu class="w-100">
+                                                <f:selectItem itemLabel="All" ></f:selectItem>
+                                                <f:selectItems></f:selectItems>
+                                            </p:selectOneMenu>
+                
+                
+                
+                                        </p:panelGrid>
+                
+                                        <div class="d-flex align-items-center">
+                                            <p:commandButton class="ui-button-warning mx-1" icon="fas fa-cogs" ajax="false"  value="Process" >
+                                            </p:commandButton>
+                                            <p:commandButton class="ui-button- mx-1" icon="fas fa-print" ajax="false" value="Print All">
+                                            </p:commandButton>
+                                            <p:commandButton class="ui-button-success mx-1" icon="fas fa-file-excel" ajax="false" value="Download">
+                                            </p:commandButton>
+                                            <p:commandButton class="ui-button-danger mx-1" icon= "fas fa-file-pdf" ajax="false" value="PDF">
+                                            </p:commandButton>
+                                        </div>
+                
+                
+                                        <div class="mt-5">
+                
+                                            <h5>Transit Store Transactions</h5>
+                                            <br></br>
+                                            <h6>Stock Issues</h6>
+                
+                                            <p:dataTable id="tbl1" value="" 
+                                                         var="f" 
+                                                         rowIndexVar="n" 
+                                                         paginator="true" 
+                                                         rows="10" 
+                                                         paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+                                                         currentPageReportTemplate="Showing {startRecord} to {endRecord} of {totalRecords}" 
+                                                         rowsPerPageTemplate="5,10,15,25,50,100,500,1000">
+                
+                                                <p:column headerText="Item Code" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Issue Qty" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Issue Doc. Type " width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Issuing Institution" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Issuing Site" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Issuing Department" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Issuing Store" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Issue Doc. Approval Date" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Issue Prepared By" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Receipt Qty" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Receipt Stock Value" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Receipt Approval Stock Value" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Receipt Doc. No" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Receipt Doc. Type " width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Receiving Institution" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Receiving Site" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Receiving Department" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Receiving Store" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Receipt Doc. Date" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Receipt Doc. Approval Date" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Receipt Prepared By" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Receipt Approved By" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                                                <p:column headerText="Receipt Approval Status" width="10em">
+                                                    <h:outputText value="" />
+                                                </p:column>
+                
+                                            </p:dataTable>
+                
+                                        </div>
+                
+                                    </p:panel>
+                
+                                </h:form>-->
 
             </ui:define>
 
         </ui:composition>
 
     </h:body>
-    
+
 </html>
diff --git a/src/main/webapp/resources/ezcomp/pharmacy/stock_transist_report.xhtml b/src/main/webapp/resources/ezcomp/pharmacy/stock_transist_report.xhtml
new file mode 100644
index 0000000000..51aa5ed04f
--- /dev/null
+++ b/src/main/webapp/resources/ezcomp/pharmacy/stock_transist_report.xhtml
@@ -0,0 +1,269 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:f="http://xmlns.jcp.org/jsf/core"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:p="http://primefaces.org/ui">
+
+    <!-- INTERFACE -->
+    <cc:interface>
+    </cc:interface>
+
+    <!-- IMPLEMENTATION -->
+    <cc:implementation>
+
+        <h:form>
+            <p:panel header="Staff Stock Report by Batch" >
+                <h:panelGrid columns="5" class="my-2" >
+                    <!--                            <h:outputLabel value="Staff" >
+                                                </h:outputLabel>
+                                                <p:autoComplete completeMethod="#{staffController.completeStaff}" var="staff" itemLabel="#{staff.person.name}" itemValue="#{staff}" forceSelection="true" value="#{reportsStock.staff}"  >
+                                                </p:autoComplete>-->
+                    <p:commandButton class="ui-button-warning " icon="fas fa-fill"  ajax="false" value="Fill" action="#{reportsStock.fillAllStaffStocks}" ></p:commandButton>
+                    <p:commandButton class="ui-button-info mx-2" icon="fas fa-print" value="Print" ajax="false" action="#" >
+                        <p:printer target="gpBillPreview" >
+                        </p:printer>
+                    </p:commandButton>
+                    <p:commandButton  class="ui-button-success " icon="fas fa-file-excel" value="Excel" ajax="false">
+                        <p:dataExporter type="xlsx" target="tbl" fileName="Staff_Stock_Report"
+                                        />
+                    </p:commandButton>
+                </h:panelGrid>
+                <h:panelGroup id="gpBillPreview" styleClass="noBorder summeryBorder">
+                    <!--                            <p:dataTable id="tbl"
+                                                             rowStyleClass="#{i.stock eq 0 ?'noDisplayRow' : ''}" 
+                                                             value="#{reportsStock.stocks}" var="i"  
+                                                             >
+                                                    <f:facet name="header">
+                                                        <h:outputLabel value="Stock"/>
+                                                         
+                                                    </f:facet>
+                                                    
+                                                    <p:column headerText="Staff" 
+                                                              sortBy="#{i.staff.person.name}"
+                                                              filterBy="#{i.staff.person.name}"
+                                                              filterMatchMode="contains">
+                                                        <f:facet name="header">
+                                                            <h:outputLabel value="Staff"/>
+                                                        </f:facet>
+                                                        <h:outputLabel value="#{i.staff.person.name}"/> 
+                                                    </p:column>
+                                                    <p:column headerText="Item" 
+                                                              style="min-width: 25px;"
+                                                              sortBy="#{i.itemBatch.item.name}"
+                                                              filterBy="#{i.itemBatch.item.name}"
+                                                              filterMatchMode="contains"
+                                                              >
+                                                        <f:facet name="header">
+                                                            <h:outputLabel value="Item"/>
+                                                        </f:facet>
+                                                        <h:outputLabel value="#{i.itemBatch.item.name}" ></h:outputLabel>
+                                                    </p:column>
+                                                    
+                                                    <p:column headerText="Code"
+                                                              sortBy="#{i.itemBatch.item.code}"
+                                                              filterBy="#{i.itemBatch.item.code}"
+                                                              filterMatchMode="contains">
+                                                        <f:facet name="header">
+                                                            <h:outputLabel value="Code"/>
+                                                        </f:facet>
+                                                        <h:outputLabel value="#{i.itemBatch.item.code}" style="width: 100px!important;" ></h:outputLabel>
+                                                    </p:column>
+                                                    
+                                                    <p:column headerText="Stock Quantity"
+                                                              sortBy="#{i.stock}"
+                                                              filterBy="#{i.stock}"
+                                                              filterMatchMode="contains">
+                                                         <f:facet name="header">
+                                                            <h:outputLabel value="Stock Quantity"/>
+                                                        </f:facet>
+                                                        <h:outputLabel value="#{i.stock}"  >
+                                                            <f:convertNumber pattern="#,###" ></f:convertNumber>
+                                                        </h:outputLabel>                                 
+                                                    </p:column>
+                                                    
+                                                    <p:column headerText="Expiry"
+                                                              sortBy="#{i.itemBatch.dateOfExpire}">
+                                                         <f:facet name="header">
+                                                            <h:outputLabel value="Expiry"/>
+                                                        </f:facet>
+                                                        <h:outputLabel value="#{i.itemBatch.dateOfExpire}"  >
+                                                            <f:convertDateTime pattern="MMM yyyy" ></f:convertDateTime>
+                                                        </h:outputLabel>
+                                                    </p:column>
+                                                    
+                                                     <p:column headerText="Batch"
+                                                               sortBy="#{i.itemBatch.batchNo}">
+                                                         <f:facet name="header">
+                                                            <h:outputLabel value="Batch"/>
+                                                        </f:facet>
+                                                         <h:outputLabel value="#{i.itemBatch.batchNo}"  >
+                                                        </h:outputLabel>
+                                                    </p:column>
+                                                    
+                                                    <p:column headerText="Purchase Rate"
+                                                              styleClass="averageNumericColumn"
+                                                              sortBy="#{i.itemBatch.purcahseRate}">
+                                                         <f:facet name="header">
+                                                            <h:outputLabel value="Purchase Rate"/>
+                                                        </f:facet>
+                                                        <h:outputLabel value="#{i.itemBatch.purcahseRate}"  >
+                                                            <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                                        </h:outputLabel>
+                                                    </p:column>
+                                                    
+                                                    <p:column headerText="Purchase Value" 
+                                                             styleClass="averageNumericColumn"
+                                                              sortBy="#{i.itemBatch.purcahseRate * i.stock}"
+                                                              >
+                                                         <f:facet name="header">
+                                                            <h:outputLabel value="Purchase Value"/>
+                                                        </f:facet>
+                                                        <h:outputLabel value="#{i.itemBatch.purcahseRate * i.stock}"  >
+                                                            <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                                        </h:outputLabel>
+                                                        <f:facet name="footer" >
+                                                            <h:outputLabel value="#{reportsStock.stockPurchaseValue}" >
+                                                                <f:convertNumber parent="#,##0.00" ></f:convertNumber>
+                                                            </h:outputLabel>
+                                                        </f:facet>
+                                                    </p:column>
+                    
+                                                    <p:column headerText="Retail Sale Rate" 
+                                                              styleClass="averageNumericColumn"
+                                                              sortBy="#{i.itemBatch.retailsaleRate}">
+                                                         <f:facet name="header">
+                                                            <h:outputLabel value="Retail Sale Rate"/>
+                                                        </f:facet>
+                                                        <h:outputLabel value="#{i.itemBatch.retailsaleRate}"  >
+                                                            <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                                        </h:outputLabel>
+                                                    </p:column>
+                                                    
+                                                    <p:column headerText="Retail Sale Value" 
+                                                              styleClass="averageNumericColumn"
+                                                              sortBy="#{i.itemBatch.retailsaleRate * i.stock}">
+                                                         <f:facet name="header">
+                                                            <h:outputLabel value="Retail Sale Value"/>
+                                                        </f:facet>
+                                                        <h:outputLabel value="#{i.itemBatch.retailsaleRate * i.stock}"  >
+                                                            <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                                                        </h:outputLabel>
+                                                        <f:facet name="footer" >
+                                                            <h:outputLabel value="#{reportsStock.stockSaleValue}" >
+                                                                <f:convertNumber parent="#,##0.00" ></f:convertNumber>
+                                                            </h:outputLabel>
+                                                        </f:facet>
+                                                    </p:column>
+                                                    <p:columnGroup type="footer">
+                                                            <p:row>
+                                                            <p:column colspan="9">
+                                                                <f:facet name="footer" >
+                                                                    <h:outputLabel value="Printed At " ></h:outputLabel>
+                                                                    <h:outputLabel value="#{sessionController.currentDate}" >
+                                                                        <f:convertDateTime pattern="dd MMMM yyyy - hh:mm a" ></f:convertDateTime>
+                                                                    </h:outputLabel>
+                                                                </f:facet>
+                                                            </p:column>
+                                                            </p:row>
+                                                           
+                                                        </p:columnGroup>
+                                                   
+                                                </p:dataTable>-->
+
+                    <p:dataTable id="tbl"
+                                 value="#{reportsStock.billItems}" var="bi"  
+                                 >
+                        <f:facet name="header">
+                            <h:outputLabel value="Stock"/>
+
+                        </f:facet>
+
+                        <p:column headerText="Staff" 
+                                  sortBy="#{bi.bill.toStaff.person.name}"
+                                  filterBy="#{bi.bill.toStaff.person.name}"
+                                  filterMatchMode="contains">
+                            <f:facet name="header">
+                                <h:outputLabel value="Staff"/>
+                            </f:facet>
+                            <h:outputLabel value="#{bi.bill.toStaff.person.name}"/> 
+                        </p:column>
+                        <p:column headerText="Item" 
+                                  sortBy="#{bi.item.name}"
+                                  filterBy="#{bi.item.name}"
+                                  filterMatchMode="contains">
+                            <f:facet name="header">
+                                <h:outputLabel value="Item"/>
+                            </f:facet>
+                            <h:outputLabel value="#{bi.item.name}"/> 
+                        </p:column>
+                        <p:column headerText="Code" 
+                                  sortBy="#{bi.item.code}"
+                                  filterBy="#{bi.item.code}"
+                                  filterMatchMode="contains">
+                            <f:facet name="header">
+                                <h:outputLabel value="Code"/>
+                            </f:facet>
+                            <h:outputLabel value="#{bi.item.code}"/> 
+                        </p:column>
+                        <p:column headerText="Stock" 
+                                  sortBy="#{bi.qty}"
+                                  >
+                            <f:facet name="header">
+                                <h:outputLabel value="Stock"/>
+                            </f:facet>
+                            <h:outputLabel value="#{bi.qty}"/> 
+                        </p:column>
+                        <p:column headerText="Expiry"
+                                  sortBy="#{bi.pharmaceuticalBillItem.itemBatch.dateOfExpire}">
+                            <f:facet name="header">
+                                <h:outputLabel value="Expiry"/>
+                            </f:facet>
+                            <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="From Department"
+                                  sortBy="#{bi.bill.fromDepartment.name}">
+                            <f:facet name="header">
+                                <h:outputLabel value="From Department"/>
+                            </f:facet>
+                            <h:outputLabel value="#{bi.bill.fromDepartment.name}"  >
+                            </h:outputLabel>
+                        </p:column>
+                        <p:column headerText="Issued Date"
+                                  sortBy="#{bi.bill.createdAt}">
+                            <f:facet name="header">
+                                <h:outputLabel value="Issued Date"/>
+                            </f:facet>
+                            <h:outputLabel value="#{bi.bill.createdAt}"  >
+                                <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.shortDateFormat}"  ></f:convertDateTime>
+                            </h:outputLabel>
+                        </p:column>
+                        <p:column headerText="Retail Sale Value" 
+                                  styleClass="averageNumericColumn">
+                            <f:facet name="header">
+                                <h:outputLabel value="Purchase Sale Value"/>
+                            </f:facet>
+                            <h:outputLabel value="#{bi.pharmaceuticalBillItem.itemBatch.retailsaleRate * bi.qty}"  >
+                                <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                            </h:outputLabel>
+                        </p:column>
+                        <p:column headerText="Purchase Sale Value" 
+                                  styleClass="averageNumericColumn">
+                            <f:facet name="header">
+                                <h:outputLabel value="Purchase Sale Value"/>
+                            </f:facet>
+                            <h:outputLabel value="#{bi.pharmaceuticalBillItem.itemBatch.purcahseRate * bi.qty}"  >
+                                <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                            </h:outputLabel>
+                        </p:column>
+
+                    </p:dataTable>
+                </h:panelGroup>
+            </p:panel>
+        </h:form>
+
+    </cc:implementation>
+</html>