diff --git a/.github/counter.txt b/.github/counter.txt
index 00750edc0..b8626c4cf 100644
--- a/.github/counter.txt
+++ b/.github/counter.txt
@@ -1 +1 @@
-3
+4
diff --git a/README.md b/README.md
index 313451cfd..9434270c5 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio
 
 ## Current Version
 
-Current Version: 3.0.0.20240612.3 (This line will be automatically updated to reflect the latest version)
+Current Version: 3.0.0.20240612.4 (This line will be automatically updated to reflect the latest version)
 
 ## History
 
diff --git a/src/main/java/com/divudi/bean/store/StoreCalculation.java b/src/main/java/com/divudi/bean/store/StoreCalculation.java
index 600bf0e40..47b7acda8 100644
--- a/src/main/java/com/divudi/bean/store/StoreCalculation.java
+++ b/src/main/java/com/divudi/bean/store/StoreCalculation.java
@@ -176,6 +176,21 @@ public double getTotalQty(BillItem b, BillType billType) {
         //System.err.println("GETTING TOTAL QTY " + value);
         return value;
     }
+    public double getTotalFreeQty(BillItem b, BillType billType, Bill bill) {
+        String sql = "Select sum(p.pharmaceuticalBillItem.freeQty) from BillItem p where"
+                + "  type(p.bill)=:class and p.creater is not null and"
+                + " p.referanceBillItem=:bt and p.bill.billType=:btp";
+
+        HashMap hm = new HashMap();
+        hm.put("bt", b);
+        hm.put("btp", billType);
+        hm.put("class", bill.getClass());
+
+        double value = getPharmaceuticalBillItemFacade().findDoubleByJpql(sql, hm);
+
+        //System.err.println("GETTING TOTAL QTY " + value);
+        return value;
+    }
     
     public double getTotalFreeQty(BillItem b, BillType billType) {
         String sql = "Select sum(p.pharmaceuticalBillItem.freeQty) from BillItem p where"
@@ -308,6 +323,18 @@ public double calQty(PharmaceuticalBillItem po) {
 
         return (Math.abs(recieveNet) - Math.abs(retuernedNet));
     }
+    public double calFreeQty(PharmaceuticalBillItem po) {
+
+        double billed = getTotalFreeQty(po.getBillItem(), BillType.StoreGrnBill, new BilledBill());
+        double cancelled = getTotalFreeQty(po.getBillItem(), BillType.StoreGrnBill, new CancelledBill());;
+        double returnedB = getTotalFreeQty(po.getBillItem(), BillType.StoreGrnReturn, new BilledBill());
+        double returnedC = getTotalFreeQty(po.getBillItem(), BillType.StoreGrnReturn, new CancelledBill());
+
+        double recieveNet = Math.abs(billed) - Math.abs(cancelled);
+        double retuernedNet = Math.abs(returnedB) - Math.abs(returnedC);
+
+        return (Math.abs(recieveNet) - Math.abs(retuernedNet));
+    }
 
     public double calQtyInTwoSql(PharmaceuticalBillItem po) {
 
diff --git a/src/main/java/com/divudi/bean/store/StoreGoodsReturnController.java b/src/main/java/com/divudi/bean/store/StoreGoodsReturnController.java
index 37c73380b..657d1414f 100644
--- a/src/main/java/com/divudi/bean/store/StoreGoodsReturnController.java
+++ b/src/main/java/com/divudi/bean/store/StoreGoodsReturnController.java
@@ -11,6 +11,7 @@
 import com.divudi.data.BillClassType;
 import com.divudi.data.BillNumberSuffix;
 import com.divudi.data.BillType;
+import com.divudi.data.BillTypeAtomic;
 import com.divudi.ejb.BillNumberGenerator;
 import com.divudi.entity.Bill;
 import com.divudi.entity.BillItem;
@@ -78,6 +79,8 @@ public Bill getReturnBill() {
         if (returnBill == null) {
             returnBill = new BilledBill();
             returnBill.setBillType(BillType.StoreGrnReturn);
+            returnBill.setBillTypeAtomic(BillTypeAtomic.STORE_GRN_RETURN);
+            returnBill.setReferenceBill(getBill());
 
         }
 
@@ -103,6 +106,11 @@ public void onEdit(BillItem tmp) {
             tmp.setTmpQty(0.0);
             JsfUtil.addErrorMessage("You cant return over than ballanced Qty ");
         }
+        
+        if (tmp.getPharmaceuticalBillItem().getFreeQtyInUnit() > storeCalculation.calFreeQty(tmp.getReferanceBillItem().getReferanceBillItem().getPharmaceuticalBillItem())) {
+            tmp.setTmpFreeQty(0.0);
+            JsfUtil.addErrorMessage("You cant return over than ballanced Qty ");
+        }
 
         calTotal();
         getPharmacyController().setPharmacyItem(tmp.getPharmaceuticalBillItem().getBillItem().getItem());
@@ -196,6 +204,14 @@ private boolean checkGrnItems() {
     }
 
     public void settle() {
+        if (getReturnBill().getToInstitution() == null) {
+            JsfUtil.addErrorMessage("Select Dealor");
+            return;
+        }
+        if (getReturnBill().getComments() == null || getReturnBill().getComments().trim().equals("")) {
+            JsfUtil.addErrorMessage("Please enter a comment");
+            return;
+        }
         if (checkGrnItems()) {
             JsfUtil.addErrorMessage("ITems for this GRN Already issued so you can't Return ");
             return;
@@ -242,11 +258,19 @@ private void generateBillComponent() {
             double rCacnelled = storeCalculation.getTotalQty(grnPh.getBillItem(), BillType.StoreGrnReturn, new CancelledBill());
 
             double netQty = Math.abs(rBilled) - Math.abs(rCacnelled);
+            
+            double rFreeBilled = storeCalculation.getTotalFreeQty(grnPh.getBillItem(), BillType.StoreGrnReturn, new BilledBill());
+            double rFreeCacnelled = storeCalculation.getTotalFreeQty(grnPh.getBillItem(), BillType.StoreGrnReturn, new CancelledBill());
+            double netFreeQty = Math.abs(rFreeBilled) - Math.abs(rFreeCacnelled);
 
             //System.err.println("Billed " + rBilled);
             //System.err.println("Cancelled " + rCacnelled);
             //System.err.println("Net " + netQty);
+            retPh.setQty((double) (grnPh.getQtyInUnit() - netQty));
             retPh.setQtyInUnit((double) (grnPh.getQtyInUnit() - netQty));
+            
+            retPh.setFreeQty((double) (grnPh.getQtyInUnit() - netFreeQty));
+            retPh.setFreeQtyInUnit((double) (grnPh.getFreeQtyInUnit() - netFreeQty));
 
             List<Item> suggessions = new ArrayList<>();
             Item item = bi.getItem();
@@ -261,10 +285,12 @@ private void generateBillComponent() {
 //
 //            
 //            bi.setTmpSuggession(suggessions);
+            bi.setTmpQty((double) (grnPh.getQtyInUnit() - netQty));
             bi.setPharmaceuticalBillItem(retPh);
 
 
             getBillItems().add(bi);
+            calTotal();
 
         }
 
diff --git a/src/main/java/com/divudi/bean/store/StoreGrnController.java b/src/main/java/com/divudi/bean/store/StoreGrnController.java
index af90231b0..810cae233 100644
--- a/src/main/java/com/divudi/bean/store/StoreGrnController.java
+++ b/src/main/java/com/divudi/bean/store/StoreGrnController.java
@@ -31,6 +31,9 @@
 import com.divudi.facade.PharmaceuticalBillItemFacade;
 import com.divudi.facade.StockFacade;
 import com.divudi.bean.common.util.JsfUtil;
+import com.divudi.data.BillTypeAtomic;
+import com.divudi.entity.Payment;
+import com.divudi.facade.PaymentFacade;
 import com.divudi.java.CommonFunctions;
 import java.io.Serializable;
 import java.text.DateFormat;
@@ -74,6 +77,8 @@ public class StoreGrnController implements Serializable {
     StoreBean storeBean;
     @EJB
     private AmpFacade ampFacade;
+    @EJB
+    PaymentFacade paymentFacade;
 
     private CommonFunctions commonFunctions;
     @Inject
@@ -341,6 +346,8 @@ public void settle() {
             getBillItemFacade().create(i);
             getGrnBill().getBillExpenses().add(i);
         }
+        
+        Payment p = createPayment(getGrnBill(), getGrnBill().getPaymentMethod());
 
         getGrnBill().setDeptId(getBillNumberBean().institutionBillNumberGenerator(getSessionController().getDepartment(), BillType.StoreGrnBill, BillClassType.BilledBill, BillNumberSuffix.GRN));
         getGrnBill().setInsId(getBillNumberBean().institutionBillNumberGenerator(getSessionController().getInstitution(), BillType.StoreGrnBill, BillClassType.BilledBill, BillNumberSuffix.GRN));
@@ -369,6 +376,29 @@ public void settle() {
         printPreview = true;
 
     }
+    
+    public Payment createPayment(Bill bill, PaymentMethod pm) {
+        Payment p = new Payment();
+        p.setBill(bill);
+        setPaymentMethodData(p, pm);
+        return p;
+    }
+    
+    public void setPaymentMethodData(Payment p, PaymentMethod pm) {
+
+        p.setInstitution(getSessionController().getInstitution());
+        p.setDepartment(getSessionController().getDepartment());
+        p.setCreatedAt(new Date());
+        p.setCreater(getSessionController().getLoggedUser());
+        p.setPaymentMethod(pm);
+
+        p.setPaidValue(p.getBill().getNetTotal());
+
+        if (p.getId() == null) {
+            paymentFacade.create(p);
+        }
+
+    }
 
     public void purchaseRateUpdateListner(BillItem bi) {
         bi.getPharmaceuticalBillItem().setRetailRate(bi.getPharmaceuticalBillItem().getPurchaseRate());
@@ -428,6 +458,7 @@ public void saveBill() {
         getGrnBill().setFromInstitution(getApproveBill().getToInstitution());
         getGrnBill().setDepartment(getSessionController().getDepartment());
         getGrnBill().setInstitution(getSessionController().getInstitution());
+        getGrnBill().setBillTypeAtomic(BillTypeAtomic.STORE_GRN);
         //   getGrnBill().setDeptId(getBillNumberBean().departmentBillNumberGenerator(getSessionController().getDepartment(), BillType.PharmacyGrnBill, BillNumberSuffix.GRN));
         //   getGrnBill().setInsId(getBillNumberBean().institutionBillNumberGenerator(getSessionController().getInstitution(), getGrnBill(), BillType.PharmacyGrnBill, BillNumberSuffix.GRN));
 
@@ -832,6 +863,7 @@ public Bill getGrnBill() {
         if (grnBill == null) {
             grnBill = new BilledBill();
             grnBill.setBillType(BillType.StoreGrnBill);
+            grnBill.setBillTypeAtomic(BillTypeAtomic.STORE_GRN);
         }
         return grnBill;
     }
diff --git a/src/main/java/com/divudi/bean/store/StorePurchaseOrderController.java b/src/main/java/com/divudi/bean/store/StorePurchaseOrderController.java
index be9842f71..6f655231a 100644
--- a/src/main/java/com/divudi/bean/store/StorePurchaseOrderController.java
+++ b/src/main/java/com/divudi/bean/store/StorePurchaseOrderController.java
@@ -12,6 +12,7 @@
 import com.divudi.data.dataStructure.SearchKeyword;
 import com.divudi.ejb.BillNumberGenerator;
 import com.divudi.bean.common.util.JsfUtil;
+import com.divudi.data.BillTypeAtomic;
 import com.divudi.entity.Bill;
 import com.divudi.entity.BillItem;
 import com.divudi.entity.BilledBill;
@@ -137,7 +138,7 @@ public void approve() {
         getRequestedBill().setReferenceBill(getAprovedBill());
         getBillFacade().edit(getRequestedBill());
 
-        clearList();
+        printPreview = true;
 
        // return viewRequestedList();
         //   printPreview = true;
@@ -183,6 +184,7 @@ public void saveBill() {
         getAprovedBill().setFromInstitution(getRequestedBill().getInstitution());
         getAprovedBill().setReferenceBill(getRequestedBill());
         getAprovedBill().setBackwardReferenceBill(getRequestedBill());
+        getAprovedBill().setBillTypeAtomic(BillTypeAtomic.STORE_ORDER_APPROVAL);
 
 //        getAprovedBill().setDeptId(getBillNumberBean().institutionBillNumberGeneratorWithReference(getRequestedBill().getDepartment(), getAprovedBill(), BillType.StoreOrder, BillNumberSuffix.PO));
 //        getAprovedBill().setInsId(getBillNumberBean().institutionBillNumberGeneratorWithReference(getRequestedBill().getInstitution(), getAprovedBill(), BillType.StoreOrder, BillNumberSuffix.PO));
@@ -240,6 +242,11 @@ public void saveBillComponent() {
 
         getBillFacade().edit(getAprovedBill());
     }
+    
+    public String navigateToPurchaseOrderApproval() {
+        printPreview = false;
+        return "/store/store_purhcase_order_approving?faces-redirect=true";
+    }
 
     public void generateBillComponent() {
 
@@ -250,6 +257,7 @@ public void generateBillComponent() {
             PharmaceuticalBillItem ph = new PharmaceuticalBillItem();
             ph.setBillItem(bi);
             ph.setQtyInUnit(i.getQtyInUnit());
+            ph.setFreeQtyInUnit(i.getFreeQtyInUnit());
             ph.setPurchaseRateInUnit(i.getPurchaseRateInUnit());
             ph.setRetailRateInUnit(i.getRetailRateInUnit());
             bi.setPharmaceuticalBillItem(ph);
diff --git a/src/main/java/com/divudi/bean/store/StorePurchaseOrderRequestController.java b/src/main/java/com/divudi/bean/store/StorePurchaseOrderRequestController.java
index b0de5c154..0741c6028 100644
--- a/src/main/java/com/divudi/bean/store/StorePurchaseOrderRequestController.java
+++ b/src/main/java/com/divudi/bean/store/StorePurchaseOrderRequestController.java
@@ -23,6 +23,7 @@
 import com.divudi.facade.ItemsDistributorsFacade;
 import com.divudi.facade.PharmaceuticalBillItemFacade;
 import com.divudi.bean.common.util.JsfUtil;
+import com.divudi.data.BillTypeAtomic;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -175,7 +176,7 @@ public void saveBill() {
 
         getCurrentBill().setFromDepartment(getSessionController().getLoggedUser().getDepartment());
         getCurrentBill().setFromInstitution(getSessionController().getLoggedUser().getDepartment().getInstitution());
-
+        getCurrentBill().setBillTypeAtomic(BillTypeAtomic.STORE_ORDER_PRE);
         if (getCurrentBill().getId() == null) {
             getBillFacade().create(getCurrentBill());
         } else {
diff --git a/src/main/java/com/divudi/data/BillTypeAtomic.java b/src/main/java/com/divudi/data/BillTypeAtomic.java
index 0dcd334cf..7f98f91f3 100644
--- a/src/main/java/com/divudi/data/BillTypeAtomic.java
+++ b/src/main/java/com/divudi/data/BillTypeAtomic.java
@@ -22,6 +22,20 @@ public enum BillTypeAtomic {
     INWARD_SERVICE_BILL_CANCELLATION_DURING_BATCH_BILL_CANCELLATION("Opd Bill Cancellation with Batch Bill", BillCategory.CANCELLATION, ServiceType.INWARD, BillFinanceType.NO_FINANCE_TRANSACTIONS),
     INWARD_SERVICE_BATCH_BILL_REFUND("Opd Bill Refund", BillCategory.REFUND, ServiceType.INWARD, BillFinanceType.NO_FINANCE_TRANSACTIONS),
     INWARD_SERVICE_PROFESSIONAL_PAYMENT_BILL("OPD Professional Payment bill", BillCategory.BILL, ServiceType.INWARD, BillFinanceType.NO_FINANCE_TRANSACTIONS),
+    //Store
+    STORE_ORDER("Store Order", BillCategory.BILL, ServiceType.STORE, BillFinanceType.CASH_IN),
+    STORE_ORDER_PRE("Store Order Pre", BillCategory.BILL, ServiceType.STORE, BillFinanceType.NO_FINANCE_TRANSACTIONS),
+    STORE_ORDER_CANCELLED("Store Order Cancelled", BillCategory.CANCELLATION, ServiceType.STORE, BillFinanceType.CASH_OUT),
+    STORE_ORDER_APPROVAL("Store Order Approval", BillCategory.BILL, ServiceType.STORE, BillFinanceType.CASH_IN),
+    STORE_ORDER_APPROVAL_CANCELLED("Store Order Approval Cancelled", BillCategory.CANCELLATION, ServiceType.STORE, BillFinanceType.CASH_OUT),
+    STORE_DIRECT_PURCHASE("Store Direct Purchase", BillCategory.BILL, ServiceType.STORE, BillFinanceType.CASH_IN),
+    STORE_DIRECT_PURCHASE_CANCELLED("Store Direct Purchase Cancelled", BillCategory.CANCELLATION, ServiceType.STORE, BillFinanceType.CASH_OUT),
+    STORE_DIRECT_PURCHASE_REFUND("Store Direct Purchase Refund", BillCategory.REFUND, ServiceType.STORE, BillFinanceType.CASH_OUT),
+    STORE_GRN("Store GRN", BillCategory.PAYMENTS, ServiceType.STORE, BillFinanceType.CASH_OUT),
+    STORE_GRN_CANCELLED("Store GRN Cancelled", BillCategory.CANCELLATION, ServiceType.STORE, BillFinanceType.CASH_OUT),
+    STORE_GRN_REFUND("Store GRN Refund", BillCategory.REFUND, ServiceType.STORE, BillFinanceType.CASH_OUT),
+    STORE_GRN_RETURN("Store GRN Return", BillCategory.REFUND, ServiceType.STORE, BillFinanceType.CASH_IN),
+    
     // Pharmacy
     PHARMACY_RETAIL_SALE("Pharmacy Retail Sale", BillCategory.BILL, ServiceType.PHARMACY, BillFinanceType.CASH_IN),
     PHARMACY_RETAIL_SALE_PRE("Pharmacy Retail Sale Pre", BillCategory.BILL, ServiceType.PHARMACY, BillFinanceType.NO_FINANCE_TRANSACTIONS),
diff --git a/src/main/java/com/divudi/data/ServiceType.java b/src/main/java/com/divudi/data/ServiceType.java
index 652dda98d..13cb3d99f 100644
--- a/src/main/java/com/divudi/data/ServiceType.java
+++ b/src/main/java/com/divudi/data/ServiceType.java
@@ -7,6 +7,7 @@ public enum ServiceType {
 
     OPD("Outpatient Department"),
     PHARMACY("Pharmacy"),
+    STORE("Store"),
     CHANNELLING("Channelling"),
     COLLECTING_CENTRE("Colelcting Centre"),
     OTHER("Other"),
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 5ac937d24..0fbab0ca0 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -21,3 +21,4 @@
     </properties>
   </persistence-unit>
 </persistence>
+
diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt
index f63ef1edf..6d5722aca 100644
--- a/src/main/resources/VERSION.txt
+++ b/src/main/resources/VERSION.txt
@@ -1 +1 @@
-3.0.0.20240612.3
+3.0.0.20240612.4
diff --git a/src/main/webapp/lab/patient_report.xhtml b/src/main/webapp/lab/patient_report.xhtml
index 932511690..8a9517acc 100644
--- a/src/main/webapp/lab/patient_report.xhtml
+++ b/src/main/webapp/lab/patient_report.xhtml
@@ -478,7 +478,8 @@
                     </h:form>
                     <h:form id="formPrint">
 
-                        <div class="my-1" >
+                        <div class="my-1 row" >
+                            <div class="col-3">
                             <h:panelGroup rendered="false" >
                                 <p:commandButton value="Print" 
                                                  icon="ui-icon-print" 
@@ -487,26 +488,22 @@
                                     <p:printer target="divPrint" />
                                 </p:commandButton>
                             </h:panelGroup>
-                            <h:panelGrid columns="3" >
+                            <h:panelGrid columns="2" >
                                 <p:commandButton value="Print" ajax="false" actionListener="#{patientReportController.printPatientReport()}"
                                                  icon="fa-solid fa-print"
                                                  class="mx-1 ui-button-info"
                                                  rendered="#{patientReportController.currentPatientReport.approved or userPreferenceController.userPreference.canPrintWithoutPermission }" >
+                                    <f:setPropertyActionListener target="#{patientReportController.showBackground}" value="false"/>
                                     <p:printer target="divPrint" ></p:printer>
-                                </p:commandButton>
 
-                                <p:commandButton value="Print Panel" icon="fa-solid fa-print"
-                                                 disabled="#{!patientReportController.currentPatientReport.approved or userPreferenceController.userPreference.canPrintWithoutPermission}"
-                                                 class="mx-1 ui-button-info">
-                                    <p:printer target="divPrint" />
                                 </p:commandButton>
 
                                 <p:commandButton  ajax="false" 
                                                   rendered="false"
                                                   value="Process" 
                                                   icon="fa-solid fa-file-pdf"
-                                                  class="mx-1 ui-button-danger"
-                                                  />
+                                                  class="ui-button-danger"
+                                                  ></p:commandButton>
 
                                 <p:commandButton  ajax="false" 
                                                   value="PDF" 
@@ -514,7 +511,16 @@
                                                   class="mx-1 ui-button-danger"
                                                   action="#{patientReportController.createPDFAndSaveAsaFile()}" 
                                                   rendered="#{(patientReportController.currentPatientReport.approved or userPreferenceController.userPreference.canPrintWithoutPermission)}" />
+
                             </h:panelGrid>
+                            </div>
+                            <div class="col-4">
+                                <h:outputLabel value="Show Background" class="mx-1" style="font-weight: bold; font-size: 20px;"></h:outputLabel>
+                                <p:selectBooleanButton class="mt-1 mx-4" offLabel="No" onLabel="Yes"  value="#{patientReportController.showBackground}" >
+                                    <p:ajax process="@this" update="divPrint" event="change"/>
+                                </p:selectBooleanButton>
+                            </div>
+
 
                         </div>
 
@@ -533,11 +539,10 @@
 
 
                         <h:panelGroup  id="divPrint" >
-
                             <h:panelGroup rendered="#{patientReportController.currentPatientReport.item.reportType ne 'Microbiology'}"  >
                                 <div id="divReport"  class="labReport"  >
                                     <ez:common_report 
-                                        showBackground="false"
+                                        showBackground="#{patientReportController.showBackground}"
                                         commonReportFormat="#{patientReportController.currentPatientReport.reportFormat}"
                                         patientReport="#{patientReportController.currentPatientReport}"/>
 
@@ -590,7 +595,7 @@
 
                             <h:panelGroup rendered="#{patientReportController.currentPatientReport.item.reportType eq 'Microbiology'}"  >
                                 <div id="divReportM"  class="labReport"   >
-                                    <ez:common_report commonReportFormat="#{patientReportController.currentPatientReport.reportFormat}"
+                                    <ez:common_report showBackground="#{patientReportController.showBackground}" commonReportFormat="#{patientReportController.currentPatientReport.reportFormat}"
                                                       patientReport="#{patientReportController.currentPatientReport}"/>
                                     <div style="position: absolute; top: 27%; width: 97%; left: 1%; text-align: center; font-family:Cambria, Georgia, serif; font-size: 14px; height: 70%; vertical-align: top;" >
                                         <div id="ixName" >
diff --git a/src/main/webapp/lab/patient_report_print.xhtml b/src/main/webapp/lab/patient_report_print.xhtml
index 17e9c2024..64a11647f 100644
--- a/src/main/webapp/lab/patient_report_print.xhtml
+++ b/src/main/webapp/lab/patient_report_print.xhtml
@@ -34,11 +34,15 @@
                         </f:facet>
 
                         <h:panelGroup id="divPrint" >
+                             <h:outputLabel value="Show Background" class="mx-1 my-1" style="font-weight: bold; font-size: 20px;"></h:outputLabel>
+                                <p:selectBooleanButton class="mt-1 mx-4 my-1" offLabel="No" onLabel="Yes"  value="#{patientReportController.showBackground}" >
+                                    <p:ajax process="@this" update="divPrint" event="change"/>
+                                </p:selectBooleanButton>
 
-                            <h:panelGroup rendered="#{patientReportController.currentPatientReport.item.reportType ne 'Microbiology'}"  >
+                             <h:panelGroup rendered="#{patientReportController.currentPatientReport.item.reportType ne 'Microbiology'}" >
                                 <div id="divReport"  class="labReport1" >
                                     <ez:common_report 
-                                        showBackground="false"
+                                        showBackground="#{patientReportController.showBackground}"
                                         commonReportFormat="#{patientReportController.currentPatientReport.reportFormat}"
                                         patientReport="#{patientReportController.currentPatientReport}"/>
 
@@ -92,6 +96,7 @@
                             <h:panelGroup rendered="#{patientReportController.currentPatientReport.item.reportType eq 'Microbiology'}"  >
                                 <div id="divReportM"  class="labReport"   >
                                     <ez:common_report commonReportFormat="#{patientReportController.currentPatientReport.reportFormat}"
+                                                      showBackground="#{patientReportController.showBackground}"
                                                       patientReport="#{patientReportController.currentPatientReport}"/>
                                     <div style="position: absolute; top: 27%; width: 97%; left: 1%; text-align: center; font-family:Cambria, Georgia, serif; font-size: 14px; height: 70%; vertical-align: top;" >
                                         <div id="ixName" >
diff --git a/src/main/webapp/store/store_grn.xhtml b/src/main/webapp/store/store_grn.xhtml
index 6af8ac08a..65a9fc000 100644
--- a/src/main/webapp/store/store_grn.xhtml
+++ b/src/main/webapp/store/store_grn.xhtml
@@ -73,25 +73,6 @@
                         <p:ajax event="rowEditCancel" listener="#{storeGrnController.onEdit}" update=":#{p:resolveFirstComponentWithId('tot',view).clientId} :#{p:resolveFirstComponentWithId('txtBatch',view).clientId}"/> 
 
                         
-
-                        <p:column >
-                            <p:commandButton   value="Add Detail"
-                                               process="@this" 
-                                               update=":#{p:resolveFirstComponentWithId('dialogChannelDetail',view).clientId}"
-                                               style="float: right;" 
-                                               actionListener="#{storeGrnController.addDetailItemListener(bi)}"
-                                               oncomplete="PF('dlgDetail').show();">                        
-                            </p:commandButton>
-                        </p:column>
-
-                        <p:column >
-                            <p:commandButton   value="Add Accessories" process="@this" 
-                                               update=":#{p:resolveFirstComponentWithId('dialogChannelDetail',view).clientId}"
-                                               style="float: right;"                                        
-                                               actionListener="#{storeGrnController.addChildItemListener(bi)}"
-                                               oncomplete="PF('dlgAdd').show();">                        
-                            </p:commandButton>
-                        </p:column>
                         <p:column headerText="Item Name" style="width: 250px!important;"  > 
 
                             <h:outputText id="item" value="#{bi.item.name}" >                                   
@@ -202,6 +183,31 @@
                             </p:cellEditor>
 
                         </p:column>  
+                        
+                        <p:column headerText="Action" >
+                            <p:commandButton   icon="fas fa-wrench" process="@this" 
+                                               class="ui-button-Warning"
+                                               id="accesories"
+                                               update=":#{p:resolveFirstComponentWithId('dialogChannelDetail',view).clientId}"
+                                               style="float: right;"                                        
+                                               actionListener="#{storeGrnController.addChildItemListener(bi)}"
+                                               oncomplete="PF('dlgAdd').show();">                        
+                            </p:commandButton>
+                            
+                            <p:commandButton   icon="fas fa-file-invoice"
+                                               id="itmDetails"
+                                               process="@this" 
+                                               class="ui-button-Warning mx-1"
+                                               update=":#{p:resolveFirstComponentWithId('dialogChannelDetail',view).clientId}"
+                                               style="float: right;" 
+                                               actionListener="#{storeGrnController.addDetailItemListener(bi)}"
+                                               oncomplete="PF('dlgDetail').show();">                        
+                            </p:commandButton>
+                        
+                            
+                            <p:tooltip value="Accessories" for="accesories"/>
+                            <p:tooltip value="Additional Details" for="itmDetails"/>
+                        </p:column>
 
 
                         <p:column style="width:6%">  
diff --git a/src/main/webapp/store/store_grn_list_for_return.xhtml b/src/main/webapp/store/store_grn_list_for_return.xhtml
index c4515ff9f..8755b16a8 100644
--- a/src/main/webapp/store/store_grn_list_for_return.xhtml
+++ b/src/main/webapp/store/store_grn_list_for_return.xhtml
@@ -11,198 +11,196 @@
             <p:panel> 
                 <f:facet name="header">
                     <h:outputLabel value="Good Recieve Note List"/>
+                </f:facet>
 
-                    <h:panelGrid columns="6" >
+                <div class="row">
+                    <div class="col-2">
                         <h:outputLabel value="From Date"/>
-                        <p:calendar styleClass="dateTimePicker" id="fromDate" value="#{searchController.fromDate}" navigator="false" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" >      
+                        <p:calendar id="fromDate" value="#{searchController.fromDate}" navigator="false" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" class="w-100" inputStyleClass="w-100">      
                         </p:calendar>
                         <h:outputLabel value="To Date"/>
-                        <p:calendar id="toDate" value="#{searchController.toDate}" navigator="false" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" >                                                                              
+                        <p:calendar id="toDate" value="#{searchController.toDate}" navigator="false" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" class="w-100" inputStyleClass="w-100">                                                                              
                         </p:calendar>
+
                         <h:panelGroup>
-                            <p:commandButton id="btnSearch" ajax="false" value="Logged Institution Search" action="#{searchController.createGrnTableStore()}"/>
-                            <p:commandButton id="btnSearch2" ajax="false" value="All Search" action="#{searchController.createGrnTableAllInsStore}"/>
+                            <p:commandButton id="btnSearch" ajax="false" value="Logged Institution Search" icon="fas fa-search" action="#{searchController.createGrnTableStore()}" class="w-100 my-1 ui-button-Warning"/>
+                            <p:commandButton id="btnSearch2" ajax="false" value="All Search" icon="fas fa-search" action="#{searchController.createGrnTableAllInsStore}" class="my-1 w-100 ui-button-Warning"/>
                         </h:panelGroup>
-                        <h:outputLabel/>
-                        <p:spacer height="30"/><h:outputLabel/><h:outputLabel/>
-                        <h:outputLabel/><h:outputLabel/><h:outputLabel/>
 
                         <h:outputLabel value="Grn No"/>
+                        <p:inputText autocomplete="off"  value="#{searchController.searchKeyword.billNo}" class="w-100"/>
                         <h:outputLabel value="Invoice Number"/>
+                        <p:inputText autocomplete="off" value="#{searchController.searchKeyword.number}" class="w-100"/>
                         <h:outputLabel value="Po Number"/>
+                        <p:inputText autocomplete="off"  value="#{searchController.searchKeyword.refBillNo}" class="w-100"/>
                         <h:outputLabel value="Distributor"/>
+                        <p:inputText autocomplete="off"  value="#{searchController.searchKeyword.fromInstitution}" class="w-100"/>
                         <h:outputLabel value="Po Value"/>
+                        <p:inputText autocomplete="off" value="#{searchController.searchKeyword.total}" class="w-100"/>
                         <h:outputLabel value="Grn Value"/>
-                        <p:inputText autocomplete="off"  value="#{searchController.searchKeyword.billNo}" />
-                        <p:inputText autocomplete="off" value="#{searchController.searchKeyword.number}" />
-                        <p:inputText autocomplete="off"  value="#{searchController.searchKeyword.refBillNo}" />
-                        <p:inputText autocomplete="off"  value="#{searchController.searchKeyword.fromInstitution}" />
-                        <p:inputText autocomplete="off" value="#{searchController.searchKeyword.total}"/>
-                        <p:inputText autocomplete="off" value="#{searchController.searchKeyword.netTotal}"/>
-                    </h:panelGrid>
-
-                </f:facet>
-
-
-
-                <p:dataTable value="#{searchController.bills}" var="p" >
-
-                    <p:column headerText="GRN No"  >                   
-                        <h:commandLink action="store_reprint_grn"  >    
-                            <h:outputLabel  value="#{p.deptId}"/>
-                            <f:setPropertyActionListener target="#{storeBillSearch.bill}" value="#{p}"/>
-                        </h:commandLink>
-                    </p:column> 
-                    <p:column headerText="Invoice No"  >                   
-                        <h:commandLink action="store_reprint_grn"  >    
-                            <h:outputLabel  value="#{p.invoiceNumber}"/>
-                            <f:setPropertyActionListener target="#{storeBillSearch.bill}" value="#{p}"/>
-                        </h:commandLink>
-                    </p:column> 
-                    <p:column headerText="PO No">                   
-                        <h:commandLink action="store_reprint_grn"  >    
-                            <h:outputLabel  value="#{p.referenceBill.deptId}"/>
-                            <f:setPropertyActionListener target="#{storeBillSearch.bill}" value="#{p}"/>
-                        </h:commandLink>
-                    </p:column> 
-                    <p:column headerText="Distributor" >
-                        <h:commandLink action="store_reprint_grn" >
-                            <h:outputLabel  value="#{p.fromInstitution.name}"/>
-                            <f:setPropertyActionListener target="#{storeBillSearch.bill}" value="#{p}"/>
-                        </h:commandLink>
-                    </p:column>
-
-                    <p:column headerText="Billed at"  >
-                        <h:commandLink action="store_reprint_grn" >
-                            <h:outputLabel value="#{p.createdAt}" >
-                                <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
-                            </h:outputLabel>
-                            <f:setPropertyActionListener value="#{p}" target="#{storeBillSearch.bill}"/>
-                        </h:commandLink>
-                        <br/>
-                        <h:panelGroup rendered="#{p.cancelled}" >
-                            <h:outputLabel style="color: red;" value="Cancelled at " />
-                            <h:outputLabel style="color: red;" rendered="#{p.cancelled}"
-                                           value="#{p.cancelledBill.createdAt}" >
-                                <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
-                            </h:outputLabel>
-                        </h:panelGroup>
-                        <h:panelGroup rendered="#{p.refunded}" >
-                            <h:outputLabel style="color: red;" value="Refunded at " />
-                            <h:outputLabel style="color: red;" rendered="#{p.refunded}" 
-                                           value="#{p.refundedBill.createdAt}" >
-                                <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
-                            </h:outputLabel>
-                        </h:panelGroup>
-                    </p:column> 
-
-                    <p:column headerText="Billed by" >
-                        <h:commandLink action="store_reprint_grn" >
-                            <h:outputLabel value="#{p.creater.webUserPerson.name}" >                                      
-                            </h:outputLabel>
-                            <f:setPropertyActionListener value="#{p}" target="#{storeBillSearch.bill}"/>
-                        </h:commandLink>
-                        <br/>
-                        <h:panelGroup rendered="#{p.cancelled}" >
-                            <h:outputLabel style="color: red;" value="Cancelled by " />
-                            <h:outputLabel style="color: red;" rendered="#{p.cancelled}" value="#{p.cancelledBill.creater.webUserPerson.name}" >                                       
-                            </h:outputLabel>
-                        </h:panelGroup>
-                        <h:panelGroup rendered="#{p.refunded}" >
-                            <h:outputLabel style="color: red;" value="Refunded by " />
-                            <h:outputLabel style="color: red;" rendered="#{p.refunded}"
-                                           value="#{p.refundedBill.creater.webUserPerson.name}" >                         
-                            </h:outputLabel>
-                        </h:panelGroup>
-                    </p:column>    
-
-                    <p:column headerText="PO Value" >
-                        <h:commandLink action="store_reprint_grn"  >    
-                            <h:outputLabel value="#{p.referenceBill.netTotal}">
-                                <f:convertNumber pattern="#,##0.00" />
-                            </h:outputLabel>
-
-                            <f:setPropertyActionListener target="#{storeBillSearch.bill}" value="#{p}"/>
-                        </h:commandLink>
-                    </p:column>
-
-                    <p:column headerText="Grn Value" >
-                        <h:commandLink action="store_reprint_grn"  >    
-                            <h:outputLabel value="#{p.netTotal}">
-                                <f:convertNumber pattern="#,##0.00" />
-                            </h:outputLabel>
-                            <f:setPropertyActionListener target="#{storeBillSearch.bill}" value="#{p}"/>
-                        </h:commandLink>
-                    </p:column>
-                    <p:column>
-                        <p:commandButton ajax="false" value="Return" action="store_return_good" disabled="#{p.cancelled}">
-                            <f:setPropertyActionListener target="#{storeGoodsReturnController.bill}" value="#{p}"/>
-                        </p:commandButton>
-                    </p:column>
-
-                    <p:column headerText="Return Bill">                   
-                        <p:dataTable var="b" value="#{p.listOfBill}">
-                            <p:column  >
-                                <h:commandLink action="store_reprint_grn_return"  >                                
-                                    <h:outputLabel  value="#{b.deptId}"/>
-                                    <f:setPropertyActionListener target="#{storeBillSearch.bill}" value="#{b}"/>
+                        <p:inputText autocomplete="off" value="#{searchController.searchKeyword.netTotal}" class="w-100"/>
+                    </div>
+                    <div class="col-10">
+                        <p:dataTable value="#{searchController.bills}" var="p" >
+
+                            <p:column headerText="GRN No"  >                   
+                                <h:commandLink action="store_reprint_grn"  >    
+                                    <h:outputLabel  value="#{p.deptId}"/>
+                                    <f:setPropertyActionListener target="#{storeBillSearch.bill}" value="#{p}"/>
+                                </h:commandLink>
+                            </p:column> 
+                            <p:column headerText="Invoice No"  >                   
+                                <h:commandLink action="store_reprint_grn"  >    
+                                    <h:outputLabel  value="#{p.invoiceNumber}"/>
+                                    <f:setPropertyActionListener target="#{storeBillSearch.bill}" value="#{p}"/>
+                                </h:commandLink>
+                            </p:column> 
+                            <p:column headerText="PO No">                   
+                                <h:commandLink action="store_reprint_grn"  >    
+                                    <h:outputLabel  value="#{p.referenceBill.deptId}"/>
+                                    <f:setPropertyActionListener target="#{storeBillSearch.bill}" value="#{p}"/>
+                                </h:commandLink>
+                            </p:column> 
+                            <p:column headerText="Distributor" >
+                                <h:commandLink action="store_reprint_grn" >
+                                    <h:outputLabel  value="#{p.fromInstitution.name}"/>
+                                    <f:setPropertyActionListener target="#{storeBillSearch.bill}" value="#{p}"/>
                                 </h:commandLink>
                             </p:column>
-                            <p:column >
-                                <h:commandLink action="store_reprint_grn_return" >
-                                    <h:outputLabel value="#{b.createdAt}" >
+
+                            <p:column headerText="Billed at"  >
+                                <h:commandLink action="store_reprint_grn" >
+                                    <h:outputLabel value="#{p.createdAt}" >
                                         <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
                                     </h:outputLabel>
-                                    <f:setPropertyActionListener value="#{b}" target="#{storeBillSearch.bill}"/>
+                                    <f:setPropertyActionListener value="#{p}" target="#{storeBillSearch.bill}"/>
                                 </h:commandLink>
                                 <br/>
-                                <h:panelGroup rendered="#{b.cancelled}" >
+                                <h:panelGroup rendered="#{p.cancelled}" >
                                     <h:outputLabel style="color: red;" value="Cancelled at " />
-                                    <h:outputLabel style="color: red;" rendered="#{b.cancelled}"
-                                                   value="#{b.cancelledBill.createdAt}" >
+                                    <h:outputLabel style="color: red;" rendered="#{p.cancelled}"
+                                                   value="#{p.cancelledBill.createdAt}" >
                                         <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
                                     </h:outputLabel>
                                 </h:panelGroup>
-                                <h:panelGroup rendered="#{b.refunded}" >
+                                <h:panelGroup rendered="#{p.refunded}" >
                                     <h:outputLabel style="color: red;" value="Refunded at " />
-                                    <h:outputLabel style="color: red;" rendered="#{b.refunded}" 
-                                                   value="#{b.refundedBill.createdAt}" >
+                                    <h:outputLabel style="color: red;" rendered="#{p.refunded}" 
+                                                   value="#{p.refundedBill.createdAt}" >
                                         <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
                                     </h:outputLabel>
                                 </h:panelGroup>
                             </p:column> 
 
-                            <p:column >
-                                <h:commandLink action="store_reprint_grn_return" >
-                                    <h:outputLabel value="#{b.creater.webUserPerson.name}" >                                      
+                            <p:column headerText="Billed by" >
+                                <h:commandLink action="store_reprint_grn" >
+                                    <h:outputLabel value="#{p.creater.webUserPerson.name}" >                                      
                                     </h:outputLabel>
-                                    <f:setPropertyActionListener value="#{b}" target="#{storeBillSearch.bill}"/>
+                                    <f:setPropertyActionListener value="#{p}" target="#{storeBillSearch.bill}"/>
                                 </h:commandLink>
                                 <br/>
-                                <h:panelGroup rendered="#{b.cancelled}" >
+                                <h:panelGroup rendered="#{p.cancelled}" >
                                     <h:outputLabel style="color: red;" value="Cancelled by " />
                                     <h:outputLabel style="color: red;" rendered="#{p.cancelled}" value="#{p.cancelledBill.creater.webUserPerson.name}" >                                       
                                     </h:outputLabel>
                                 </h:panelGroup>
-                                <h:panelGroup rendered="#{b.refunded}" >
+                                <h:panelGroup rendered="#{p.refunded}" >
                                     <h:outputLabel style="color: red;" value="Refunded by " />
-                                    <h:outputLabel style="color: red;" rendered="#{b.refunded}"
-                                                   value="#{b.refundedBill.creater.webUserPerson.name}" >                         
+                                    <h:outputLabel style="color: red;" rendered="#{p.refunded}"
+                                                   value="#{p.refundedBill.creater.webUserPerson.name}" >                         
                                     </h:outputLabel>
                                 </h:panelGroup>
-                            </p:column>                       
-                            <p:column  >
-                                <h:commandLink action="store_reprint_grn_return"  >  
-                                    <h:outputLabel value="#{b.netTotal}">
+                            </p:column>    
+
+                            <p:column headerText="PO Value" >
+                                <h:commandLink action="store_reprint_grn"  >    
+                                    <h:outputLabel value="#{p.referenceBill.netTotal}">
                                         <f:convertNumber pattern="#,##0.00" />
                                     </h:outputLabel>
-                                    <f:setPropertyActionListener target="#{storeBillSearch.bill}" value="#{b}"/>
+
+                                    <f:setPropertyActionListener target="#{storeBillSearch.bill}" value="#{p}"/>
+                                </h:commandLink>
+                            </p:column>
+
+                            <p:column headerText="Grn Value" >
+                                <h:commandLink action="store_reprint_grn"  >    
+                                    <h:outputLabel value="#{p.netTotal}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                    <f:setPropertyActionListener target="#{storeBillSearch.bill}" value="#{p}"/>
                                 </h:commandLink>
                             </p:column>
+                            <p:column>
+                                <p:commandButton ajax="false" value="Return" action="store_return_good" disabled="#{p.cancelled}">
+                                    <f:setPropertyActionListener target="#{storeGoodsReturnController.bill}" value="#{p}"/>
+                                </p:commandButton>
+                            </p:column>
 
+                            <p:column headerText="Return Bill" style="width: 26em;">                   
+                                <p:dataTable var="b" value="#{p.listOfBill}">
+                                    <p:column  >
+                                        <h:commandLink action="store_reprint_grn_return"  >                                
+                                            <h:outputLabel  value="#{b.deptId}"/>
+                                            <f:setPropertyActionListener target="#{storeBillSearch.bill}" value="#{b}"/>
+                                        </h:commandLink>
+                                    </p:column>
+                                    <p:column >
+                                        <h:commandLink action="store_reprint_grn_return" >
+                                            <h:outputLabel value="#{b.createdAt}" >
+                                                <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                            </h:outputLabel>
+                                            <f:setPropertyActionListener value="#{b}" target="#{storeBillSearch.bill}"/>
+                                        </h:commandLink>
+                                        <br/>
+                                        <h:panelGroup rendered="#{b.cancelled}" >
+                                            <h:outputLabel style="color: red;" value="Cancelled at " />
+                                            <h:outputLabel style="color: red;" rendered="#{b.cancelled}"
+                                                           value="#{b.cancelledBill.createdAt}" >
+                                                <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                            </h:outputLabel>
+                                        </h:panelGroup>
+                                        <h:panelGroup rendered="#{b.refunded}" >
+                                            <h:outputLabel style="color: red;" value="Refunded at " />
+                                            <h:outputLabel style="color: red;" rendered="#{b.refunded}" 
+                                                           value="#{b.refundedBill.createdAt}" >
+                                                <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
+                                            </h:outputLabel>
+                                        </h:panelGroup>
+                                    </p:column> 
+
+                                    <p:column >
+                                        <h:commandLink action="store_reprint_grn_return" >
+                                            <h:outputLabel value="#{b.creater.webUserPerson.name}" >                                      
+                                            </h:outputLabel>
+                                            <f:setPropertyActionListener value="#{b}" target="#{storeBillSearch.bill}"/>
+                                        </h:commandLink>
+                                        <br/>
+                                        <h:panelGroup rendered="#{b.cancelled}" >
+                                            <h:outputLabel style="color: red;" value="Cancelled by " />
+                                            <h:outputLabel style="color: red;" rendered="#{p.cancelled}" value="#{p.cancelledBill.creater.webUserPerson.name}" >                                       
+                                            </h:outputLabel>
+                                        </h:panelGroup>
+                                        <h:panelGroup rendered="#{b.refunded}" >
+                                            <h:outputLabel style="color: red;" value="Refunded by " />
+                                            <h:outputLabel style="color: red;" rendered="#{b.refunded}"
+                                                           value="#{b.refundedBill.creater.webUserPerson.name}" >                         
+                                            </h:outputLabel>
+                                        </h:panelGroup>
+                                    </p:column>                       
+                                    <p:column  >
+                                        <h:commandLink action="store_reprint_grn_return"  >  
+                                            <h:outputLabel value="#{b.netTotal}">
+                                                <f:convertNumber pattern="#,##0.00" />
+                                            </h:outputLabel>
+                                            <f:setPropertyActionListener target="#{storeBillSearch.bill}" value="#{b}"/>
+                                        </h:commandLink>
+                                    </p:column>
+
+                                </p:dataTable>
+                            </p:column>
                         </p:dataTable>
-                    </p:column>
-                </p:dataTable>
+                    </div>
+                </div>
             </p:panel>
         </h:form>
     </ui:define>  
diff --git a/src/main/webapp/store/store_purhcase_order_approving.xhtml b/src/main/webapp/store/store_purhcase_order_approving.xhtml
index 0b2dde038..25c970dd1 100644
--- a/src/main/webapp/store/store_purhcase_order_approving.xhtml
+++ b/src/main/webapp/store/store_purhcase_order_approving.xhtml
@@ -22,7 +22,7 @@
                             <p:commandButton ajax="false"  value="Approve" 
                                              class="ui-button-success mx-2" 
                                              icon="fas fa-check"
-                                             style="float: right;" actionListener="#{storePurchaseOrderController.approve}" action="store_purhcase_order_list_to_approve"/>
+                                             style="float: right;" actionListener="#{storePurchaseOrderController.approve}"/>
                             <p:commandButton ajax="false"  value="Back To Po List" style="float: right;"
                                              icon="fas fa-arrow-left" 
                                              class="ui-button-warning" 
@@ -113,11 +113,11 @@
                                 <f:ajax event="focus" render=":#{p:resolveFirstComponentWithId('tab',view).clientId}" listener="#{storePurchaseOrderController.onFocus(bi)}" />
                             </p:inputText>
                         </p:column>  
-                        
+
                         <p:column headerText="Free Qty" style="width:25px!important;">                         
                             <p:inputText autocomplete="off" id="freeQty" value="#{bi.pharmaceuticalBillItem.freeQty}" style="width:100%" label="freeQty">
 
-                               
+
                             </p:inputText>
                         </p:column>  
 
@@ -157,16 +157,28 @@
                     <st:history/>
                 </p:panel>
                 <p:panel rendered="#{storePurchaseOrderController.printPreview}">
-                    <p:commandButton ajax="false" action="#{storePurchaseOrderController.viewRequestedList()}" value="Requested List"/>                    
-                    <p:commandButton value="Print" ajax="false" action="#" >
-                        <p:printer target="gpBillPreview" ></p:printer>
-                    </p:commandButton>
-
-                    <p:panel   id="gpBillPreview">
+                    <f:facet name="header">
+                        <p:commandButton ajax="false"  value="Back To Po List"
+                                         style="float: right;"
+                                         icon="fas fa-arrow-left" 
+                                         class="mx-1 ui-button-warning" 
+                                         action="#{storePurchaseOrderController.viewRequestedList()}"/>
+
+
+                        <p:commandButton value="Print" ajax="false"
+                                         style="float: right;"
+                                         action="#" class="ui-button-info" icon="fas fa-print">
+                            <p:printer target="gpBillPreview" ></p:printer>
+                        </p:commandButton>
+                    </f:facet>
 
-                        <st:po bill="#{storePurchaseOrderController.aprovedBill}"/>
+                    <h:panelGroup id="gpBillPreview">
+                        <div  class="justify-content-between">
+                            <st:po bill="#{storePurchaseOrderController.aprovedBill}"/>
+                        </div>
+                        
 
-                    </p:panel>
+                    </h:panelGroup>
 
                 </p:panel>
             </p:panel>            
diff --git a/src/main/webapp/store/store_purhcase_order_list_to_approve.xhtml b/src/main/webapp/store/store_purhcase_order_list_to_approve.xhtml
index 92baee4aa..02cbc7b72 100644
--- a/src/main/webapp/store/store_purhcase_order_list_to_approve.xhtml
+++ b/src/main/webapp/store/store_purhcase_order_list_to_approve.xhtml
@@ -125,7 +125,7 @@
                                     ajax="false"
                                     icon="fas fa-check-circle"
                                     class="ui-button-success mx-2"
-                                    action="store_purhcase_order_approving?faces-redirect=true"
+                                    action="#{storePurchaseOrderController.navigateToPurchaseOrderApproval()}"
                                     disabled="#{b.referenceBill.creater ne null or b.referenceBill.cancelled eq false or b.cancelled eq true or !webUserController.hasPrivilege('StorePurchaseOrderApprove')}">
                                     <f:setPropertyActionListener target="#{storePurchaseOrderController.requestedBill}" value="#{b}"/>
                                 </p:commandButton>
diff --git a/src/main/webapp/store/store_return_good.xhtml b/src/main/webapp/store/store_return_good.xhtml
index a9757e9e5..1189d1fa8 100644
--- a/src/main/webapp/store/store_return_good.xhtml
+++ b/src/main/webapp/store/store_return_good.xhtml
@@ -14,17 +14,16 @@
             <h:panelGroup rendered="#{!storeGoodsReturnController.printPreview}" styleClass="alignTop" >
                 <p:panel>
 
-                    <f:facet name="header" >      
-
-                        <h:panelGrid columns="15"  >
-                            <h:outputLabel value="Supplier : "/>
+                    <f:facet name="header" >    
+                        <div class="w-100 d-flex" >
+                            <h:outputLabel value="Supplier : " class="my-1"/>
                             <p:autoComplete converter="deal" value="#{storeGoodsReturnController.returnBill.toInstitution}"  
                                             forceSelection="true"
                                             completeMethod="#{dealerController.completeDealor}"
                                             var="vt" itemLabel="#{vt.name}" itemValue="#{vt}" >                               
                             </p:autoComplete>
-                                                          
-                            <p:selectOneMenu   id="cmbPs" value="#{storeGoodsReturnController.returnBill.paymentMethod}">                                                                     
+
+                            <p:selectOneMenu   id="cmbPs" value="#{storeGoodsReturnController.returnBill.paymentMethod}" class="mx-4">                                                                     
                                 <f:selectItems value="#{enumController.paymentMethods}"/>
                                 <p:ajax process="cmbPs" update="lblCardRef txtCardRef lblCheqRef txtCheqRef 
                                         bank lblSlipRef txtSlipRef slipBank" event="change" />
@@ -45,14 +44,21 @@
                                 <f:selectItem itemLabel="Select Bank"/>
                                 <f:selectItems value="#{institutionController.banks}" var="inst" itemLabel="#{inst.name}" itemValue="#{inst}"/>
                             </h:selectOneMenu>
+                            <p:inputText placeholder="Enter Comments to Return Bill" value="#{storeGoodsReturnController.returnBill.comments}" class="p-2 w-25"/>
+
+                            <p:outputLabel  value="Recievable Amount" class="mx-4 my-2"/> 
+                            <div class="my-2">
+                                <p:outputLabel id="total"  value="#{storeGoodsReturnController.returnBill.total}" style=" my-4">
+                                    <f:convertNumber pattern="#,##0.00" />
+                                </p:outputLabel>
+                            </div>
+                            <div style="float: right">
+                                <p:commandButton  value="Return" 
+                                                  action="#{storeGoodsReturnController.settle}" ajax="false" icon="fa fa-cancel" style="float: right;" class="mx-5 ui-button-danger">
+                                </p:commandButton>
+                            </div>
+                        </div>
 
-                            <p:commandButton  value="Return" action="#{storeGoodsReturnController.settle}" ajax="false"  style="width: 150px; padding: 1px;border: 1px solid ; margin: auto;">
-                            </p:commandButton>
-                            <p:outputLabel  value="Recievable Amount" /> 
-                            <p:outputLabel id="total"  value="#{storeGoodsReturnController.returnBill.total}" style="float: right;">
-                                <f:convertNumber pattern="#,##0.00" />
-                            </p:outputLabel>
-                        </h:panelGrid>
                     </f:facet>
                 </p:panel>
 
@@ -82,6 +88,10 @@
                     <p:column  headerText="Balance Qty in Unit" style="width:25px!important;"> 
                         <h:outputText id="qty" value="#{ph.pharmaceuticalBillItem.qty}" />                   
                     </p:column>  
+                    
+                    <p:column  headerText="Balance Free Qty in Unit" style="width:25px!important;"> 
+                        <h:outputText id="freeQty" value="#{ph.referanceBillItem.pharmaceuticalBillItem.freeQty}" />                   
+                    </p:column>  
 
                     <p:column headerText="Purchase Rate" style="width:25px!important;"> 
                         <h:panelGroup id="purchase" >
@@ -109,11 +119,23 @@
 
                             </f:facet>
                             <f:facet name="input">  
-                                <p:inputText autocomplete="off" value="#{ph.tmpQty}" >
+                                <p:inputText autocomplete="off" value="#{ph.tmpQty}" onfocus="this.select()">
                                 </p:inputText>
                             </f:facet>
                         </p:cellEditor>
-                    </p:column>  
+                    </p:column>
+                    <p:column headerText="Returning Free Qty in Unit" style="width:25px!important;">     
+                        <p:cellEditor>  
+                            <f:facet name="output">  
+                                <h:outputLabel value="#{ph.pharmaceuticalBillItem.freeQty}" />
+
+                            </f:facet>
+                            <f:facet name="input">  
+                                <p:inputText autocomplete="off" value="#{ph.tmpFreeQty}" onfocus="this.select()">
+                                </p:inputText>
+                            </f:facet>
+                        </p:cellEditor>
+                    </p:column>
 
                 </p:dataTable>  
                 <p:spacer height="50"/>