diff --git a/src/main/java/com/divudi/bean/common/BillController.java b/src/main/java/com/divudi/bean/common/BillController.java
index 4b3f2dce97..ab20ec4cec 100644
--- a/src/main/java/com/divudi/bean/common/BillController.java
+++ b/src/main/java/com/divudi/bean/common/BillController.java
@@ -2837,8 +2837,9 @@ public List<Bill> findUnpaidBills(Date frmDate, Date toDate, List<BillTypeAtomic
 
     public List<Bill> findUnpaidBills(Date frmDate, Date toDate, List<BillTypeAtomic> billTypes,
             PaymentMethod pm, Double balanceGraterThan, Boolean omitPaymentGeneratedBills) {
-        String jpql = "SELECT b FROM Bill b WHERE b.retired = :ret AND b.cancelled = :can "
-                + "AND b.createdAt BETWEEN :frm AND :to";
+        String jpql = "SELECT b FROM Bill b WHERE b.retired = :ret "
+                + " AND b.cancelled = :can " //Cancelled bills are no longer listed here
+                + " AND b.createdAt BETWEEN :frm AND :to";
 
         HashMap<String, Object> params = new HashMap<>();
         params.put("frm", frmDate);
diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java
index 07639a69e7..c16e8c0ded 100644
--- a/src/main/java/com/divudi/bean/common/ReportsController.java
+++ b/src/main/java/com/divudi/bean/common/ReportsController.java
@@ -61,7 +61,6 @@
 import java.text.SimpleDateFormat;
 import java.util.stream.Collectors;
 import java.text.DecimalFormat;
-
 import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 
 /**
@@ -2651,7 +2650,7 @@ public void generateDebtorBalanceReport(final boolean onlyDueBills) {
     }
 
     public ReportTemplateRowBundle generateDebtorBalanceReportBills(List<BillTypeAtomic> bts, List<PaymentMethod> billPaymentMethods,
-                                                                    boolean onlyDueBills) {
+            boolean onlyDueBills) {
         Map<String, Object> parameters = new HashMap<>();
         String jpql = "SELECT new com.divudi.data.ReportTemplateRow(bill) "
                 + "FROM Bill bill "
@@ -3594,7 +3593,7 @@ public void exportOpdAndInwardOPToPdf() {
             table.setWidths(columnWidths);
 
             String[] headers = {"S. No", "Invoice Date", "Invoice No", "Customer Reference No", "MRNO", "Patient Name",
-                    "Gross Amt", "Disc Amt", "Net Amt", "Patient Share", "Sponsor Share", "Due Amt"};
+                "Gross Amt", "Disc Amt", "Net Amt", "Patient Share", "Sponsor Share", "Due Amt"};
             for (String header : headers) {
                 PdfPCell cell = new PdfPCell(new Phrase(header, boldFont));
                 cell.setHorizontalAlignment(Element.ALIGN_CENTER);
@@ -3817,7 +3816,7 @@ public void exportOpdAndInwardIPToPdf() {
             table.setWidths(columnWidths);
 
             String[] headers = {"S. No", "BHT No", "Invoice Date", "Invoice No", "Customer Reference No", "MRNO", "Patient Name",
-                    "Gross Amt", "Disc Amt", "Net Amt", "Patient Share", "Sponsor Share", "Due Amt"};
+                "Gross Amt", "Disc Amt", "Net Amt", "Patient Share", "Sponsor Share", "Due Amt"};
             for (String header : headers) {
                 PdfPCell cell = new PdfPCell(new Phrase(header, boldFont));
                 cell.setHorizontalAlignment(Element.ALIGN_CENTER);
@@ -4859,8 +4858,8 @@ public void exportDetailedWeeklyOPDReportToPDF() {
     }
 
     private void addWeeklyReportSection(Document document, String sectionTitle, List<String> itemList,
-                                        List<Integer> daysOfWeek, Map<Integer, Map<String, Map<Integer, Double>>> weeklyDailyBillItemMap,
-                                        int week, com.itextpdf.text.Font headerFont, com.itextpdf.text.Font regularFont) throws DocumentException {
+            List<Integer> daysOfWeek, Map<Integer, Map<String, Map<Integer, Double>>> weeklyDailyBillItemMap,
+            int week, com.itextpdf.text.Font headerFont, com.itextpdf.text.Font regularFont) throws DocumentException {
         document.add(new com.itextpdf.text.Paragraph(sectionTitle, headerFont));
         document.add(com.itextpdf.text.Chunk.NEWLINE);
 
diff --git a/src/main/java/com/divudi/bean/pharmacy/SupplierPaymentController.java b/src/main/java/com/divudi/bean/pharmacy/SupplierPaymentController.java
index b84c089755..4723c1103e 100644
--- a/src/main/java/com/divudi/bean/pharmacy/SupplierPaymentController.java
+++ b/src/main/java/com/divudi/bean/pharmacy/SupplierPaymentController.java
@@ -128,7 +128,7 @@ public class SupplierPaymentController implements Serializable {
     private Bill current;
     private Bill currentCancellationBill;
     private List<Bill> currentReturnBills;
-    private List<BillItem> currentPaymentBills;
+    private List<BillItem> currentPaymentBillItems;
     private List<Bill> currentPaymentRefundBills;
     private List<BillItem> currentSummeryBillItems;
     private double currentSummaryPurchaseTotalValue;
@@ -667,6 +667,17 @@ public void updateReferanceBillBalances(List<BillItem> billItemsWithReferanceToS
 //        getCurrent().setNetTotal(n);
     }
 
+    public void updateReferanceBillCompletionStatus(List<BillItem> billItemsWithReferanceToSettlingBills) {
+        for (BillItem payingBillItem : billItemsWithReferanceToSettlingBills) {
+            Bill originalBill = payingBillItem.getReferenceBill();
+            if (originalBill == null) {
+                continue;
+            }
+            originalBill.setPaymentGenerated(false);
+            billFacade.edit(originalBill);
+        }
+    }
+
     public void updateReferanceBillAsPaymentApproved(List<BillItem> billItemsWithReferanceToSettlingBills) {
         for (BillItem payingBillItem : billItemsWithReferanceToSettlingBills) {
             Bill originalBill = payingBillItem.getReferenceBill();
@@ -805,6 +816,27 @@ private boolean errorCheckForSettlingApprovedPayments() {
         return false;
     }
 
+    private boolean errorCheckForCompletingApprovedAndSettledPayment() {
+        if (getCurrent() == null) {
+            JsfUtil.addErrorMessage("Nothing to settle");
+            return true;
+        }
+        if (getCurrent().getBillItems().isEmpty()) {
+            JsfUtil.addErrorMessage("No Bill Item ");
+            return true;
+        }
+
+        if (getCurrent().getToInstitution() == null) {
+            JsfUtil.addErrorMessage("Select Cant settle without Dealor");
+            return true;
+        }
+
+        if (getCurrent().getPaymentMethod() == null) {
+            return true;
+        }
+        return false;
+    }
+
     private boolean errorCheckForSettlingSelectedSupplierBills() {
         if (getSelectedBillItems() == null || getSelectedBillItems().isEmpty()) {
             JsfUtil.addErrorMessage("No Bill is selected to pay");
@@ -1578,6 +1610,65 @@ public void fillSupplierPayments(Boolean completed, Boolean paymentCompleted) {
         netTotal = bills.stream().mapToDouble(Bill::getNetTotal).sum();
     }
 
+    public void fillSupplierPayments(Boolean completed, Boolean paymentApproved, Boolean paymentCompleted) {
+        bills = null;
+        netTotal = 0.0;
+        StringBuilder jpql = new StringBuilder("select b from Bill b "
+                + " where b.retired=:retired "
+                + " and b.cancelled=:cancelled "
+                + " and b.createdAt between :fromDate and :toDate"
+                + " and b.billTypeAtomic in :btas ");
+
+        Map<String, Object> params = new HashMap<>();
+        List<BillTypeAtomic> btas = Arrays.asList(
+                BillTypeAtomic.SUPPLIER_PAYMENT_PREPERATION);
+
+        params.put("btas", btas);
+        params.put("cancelled", false);
+        params.put("retired", false);
+        params.put("fromDate", fromDate);
+        params.put("toDate", toDate);
+
+        // Conditionally append paymentApproved if parameter is not null
+        if (completed != null) {
+            if (completed) {
+                jpql.append(" and b.completed = :completed ");
+                params.put("completed", true);
+            } else {
+                jpql.append(" and b.completed = :completed ");
+                params.put("completed", false);
+            }
+        }
+
+        // Conditionally append paymentCompleted if parameter is not null
+        if (paymentCompleted != null) {
+            if (paymentCompleted) {
+                jpql.append(" and b.paymentCompleted = :completed ");
+                params.put("completed", true);
+            } else {
+                jpql.append(" and b.paymentCompleted = :completed ");
+                params.put("completed", false);
+            }
+        }
+
+        // Conditionally append paymentCompleted if parameter is not null
+        if (paymentApproved != null) {
+            if (paymentApproved) {
+                jpql.append(" and b.paymentApproved = :paymentApproved ");
+                params.put("paymentApproved", true);
+            } else {
+                jpql.append(" and b.paymentApproved = :paymentApproved ");
+                params.put("paymentApproved", false);
+            }
+        }
+
+        System.out.println("jpql = " + jpql);
+        System.out.println("params = " + params);
+        bills = getBillFacade().findByJpql(jpql.toString(), params, TemporalType.TIMESTAMP);
+        System.out.println("bills = " + bills);
+        netTotal = bills.stream().mapToDouble(Bill::getNetTotal).sum();
+    }
+
     public void fillApprovedSupplierPaymentsToSettle() {
         supplierPaymentStatus = "Pending Settling";
         fillSupplierPayments(false, null);
@@ -1595,7 +1686,7 @@ public void fillApprovedSupplierPaymentsSettledOrPending() {
 
     public void fillApprovedSupplierPaymentsToComplete() {
         supplierPaymentStatus = "Pending Completion";
-        fillSupplierPayments(true, false);
+        fillSupplierPayments(null, true, false);
     }
 
     public void fillSupplierPaymentsIgnoringApprovealAndCompletion() {
@@ -1935,13 +2026,13 @@ public String navigateToViewProcurementBill(Bill originalBill) {
         }
         currentSummeryBillItems = createSummeryBillItems(current, currentReturnBills);
 
-        currentPaymentBills = billService.fetchPaymentBills(current);
+        currentPaymentBillItems = billService.fetchPaymentBillItems(current);
         currentSummaryPurchaseTotalValue = current.getTotal();
         currentSummaryPurchaseReturnTotalValue = calculateTotalGrossTotalValue(currentReturnBills);
         currentSummaryPurchaseNetTotalValue = Math.abs(currentSummaryPurchaseTotalValue) - Math.abs(currentSummaryPurchaseReturnTotalValue);
-        currentTotalPaymentSettledValue = calculateTotalValue(currentPaymentBills);
+        currentTotalPaymentSettledValue = calculateTotalValue(currentPaymentBillItems);
 
-        currentTotalPaymentToSettleValue =  Math.abs(currentSummaryPurchaseNetTotalValue) - Math.abs(currentTotalPaymentSettledValue);
+        currentTotalPaymentToSettleValue = Math.abs(currentSummaryPurchaseNetTotalValue) - Math.abs(currentTotalPaymentSettledValue);
 
         return "/dealerPayment/view_purchase_bill?faces-redirect=true";
     }
@@ -2032,7 +2123,7 @@ private double calculateTotalValue(List<BillItem> billItems) {
 
         double totalPurchaseValue = 0.0;
         for (BillItem billItem : billItems) {
-            totalPurchaseValue += billItem.getGrossValue();
+            totalPurchaseValue += billItem.getNetValue();
         }
         return totalPurchaseValue;
     }
@@ -2134,6 +2225,24 @@ public String navigateToSettleSupplierPayment(Bill approvalBill) {
         return "/dealerPayment/settle_approved_supplier_payment?faces-redirect=true";
     }
 
+    public String navigateToCompleteSupplierPayment(Bill approvedAndSettledPaymentBill) {
+        makeNull();
+        if (approvedAndSettledPaymentBill == null) {
+            JsfUtil.addErrorMessage("No Bill Is Selected");
+            return null;
+        }
+        if (!approvedAndSettledPaymentBill.isPaymentApproved()) {
+            JsfUtil.addErrorMessage("Not Approved. Can not complete.");
+            return null;
+        }
+        if (!approvedAndSettledPaymentBill.isPaymentCompleted()) {
+            JsfUtil.addErrorMessage("Already Completed. Can not complete again.");
+            return null;
+        }
+        current = billService.reloadBill(approvedAndSettledPaymentBill);
+        return "/dealerPayment/complete_approved_and_settled_supplier_payment?faces-redirect=true";
+    }
+
     public String navigateToStartSupplierPaymentOfSelectedBills() {
         prepareForNewSupplierPayment();
         if (getSelectedBills().isEmpty()) {
@@ -2165,6 +2274,49 @@ public String navigateToStartSupplierPaymentOfSelectedBills() {
         return "/dealerPayment/pay_supplier?faces-redirect=true";
     }
 
+    public String navigateToPrepareSupplierPaymentForAllSelectedBills() {
+        if (selectedBills == null) {
+            JsfUtil.addErrorMessage("No Bills are Selected");
+            return null;
+        }
+        if (selectedBills.isEmpty()) {
+            JsfUtil.addErrorMessage("No Bills are Selected");
+            return null;
+        }
+        Institution payingSupplier = null;
+        for (Bill b : getSelectedBills()) {
+            if (b.getFromInstitution() == null) {
+                JsfUtil.addErrorMessage("One purchase or GRN bill does not have a Supplier. Can not proceed.");
+                return null;
+            }
+            if (payingSupplier == null) {
+                payingSupplier = b.getFromInstitution();
+            } else {
+                if (!payingSupplier.equals(b.getFromInstitution())) {
+                    JsfUtil.addErrorMessage("Can not settle purchase or GRN bills from more than one supplier at once.");
+                    return null;
+                }
+            }
+
+        }
+        prepareForNewSupplierPaymentGeneration();
+        current.setFromInstitution(sessionController.getInstitution());
+        current.setFromDepartment(sessionController.getDepartment());
+        current.setToInstitution(payingSupplier);
+
+        for (Bill billsPaymentsWillBeCreated : selectedBills) {
+            currentBillItem = new BillItem();
+            currentBillItem.setSearialNo(1);
+            currentBillItem.setReferenceBill(billsPaymentsWillBeCreated);
+            double settlingValue = Math.abs(billsPaymentsWillBeCreated.getNetTotal()) - (Math.abs(billsPaymentsWillBeCreated.getRefundAmount()) + Math.abs(billsPaymentsWillBeCreated.getPaidAmount()));
+            currentBillItem.setNetValue(-settlingValue);
+            currentBillItem.setGrossValue(-settlingValue);
+            getSelectedBillItems().add(currentBillItem);
+        }
+        calculateTotalBySelectedBillItems();
+        return "/dealerPayment/generate_supplier_payment?faces-redirect=true";
+    }
+
     public void settleSupplierPaymentForApprovedPayment() {
         if (errorCheckForSettlingPaymentForApprovedPayment()) {
             return;
@@ -2326,6 +2478,24 @@ public void settleApprovedSupplierPayment() {
 
     }
 
+    public void completeApprovedAndSettledSupplierPayment() {
+        if (errorCheckForCompletingApprovedAndSettledPayment()) {
+            return;
+        }
+        current = billService.reloadBill(current);
+
+        getCurrent().setPaymentCompleted(true);
+        getCurrent().setPaymentCompletedAt(new Date());
+        getCurrent().setPaymentCompletedBy(sessionController.getLoggedUser());
+        getBillFacade().edit(getCurrent());
+
+        updateReferanceBillCompletionStatus(current.getBillItems());
+
+        JsfUtil.addSuccessMessage("Bill Payment Completed");
+        printPreview = true;
+
+    }
+
     public void settleApproveSupplierPayment() {
         if (errorCheckForApprovingSupplierPayment()) {
             return;
@@ -2341,6 +2511,17 @@ public void settleApproveSupplierPayment() {
         }
         updateReferanceBillAsPaymentApproved(getCurrent().getBillItems());
 
+        for (BillItem bi : getCurrent().getBillItems()) {
+            bi.setBill(current);
+            if (bi.getId() == null) {
+                bi.setCreatedAt(new Date());
+                bi.setCreater(sessionController.getLoggedUser());
+                billItemFacade.create(bi);
+            } else {
+                billItemFacade.edit(bi);
+            }
+        }
+
         JsfUtil.addSuccessMessage("Payment Approved");
         printPreview = true;
 
@@ -2388,7 +2569,7 @@ public void settleGenerateSupplierPayment() {
         }
 
         updateReferanceBillAsPaymentGenerated(selectedBillItems);
-
+        current= billService.reloadBill(current);
         JsfUtil.addSuccessMessage("Payment Generated");
         printPreview = true;
 
@@ -2911,12 +3092,12 @@ public void setCurrentReturnBills(List<Bill> currentReturnBills) {
         this.currentReturnBills = currentReturnBills;
     }
 
-    public List<BillItem> getCurrentPaymentBills() {
-        return currentPaymentBills;
+    public List<BillItem> getCurrentPaymentBillItems() {
+        return currentPaymentBillItems;
     }
 
-    public void setCurrentPaymentBills(List<BillItem> currentPaymentBills) {
-        this.currentPaymentBills = currentPaymentBills;
+    public void setCurrentPaymentBillItems(List<BillItem> currentPaymentBillItems) {
+        this.currentPaymentBillItems = currentPaymentBillItems;
     }
 
     public List<Bill> getCurrentPaymentRefundBills() {
diff --git a/src/main/java/com/divudi/ejb/BillNumberGenerator.java b/src/main/java/com/divudi/ejb/BillNumberGenerator.java
index a1c42b2288..f62c47c8b6 100644
--- a/src/main/java/com/divudi/ejb/BillNumberGenerator.java
+++ b/src/main/java/com/divudi/ejb/BillNumberGenerator.java
@@ -1498,6 +1498,9 @@ public String departmentBillNumberGenerator(Institution ins, Department dep, Bil
     }
 
     public String departmentBillNumberGeneratorYearly(Department dep, BillTypeAtomic billType) {
+        System.out.println("departmentBillNumberGeneratorYearly = ");
+        System.out.println("billType = " + billType);
+        System.out.println("dep = " + dep);
         if (dep == null) {
             return "";
         }
@@ -1506,7 +1509,7 @@ public String departmentBillNumberGeneratorYearly(Department dep, BillTypeAtomic
         }
         BillNumber billNumber;
         String billSuffix = configOptionApplicationController.getLongTextValueByKey("Bill Number Suffix for " + billType, "");
-
+        System.out.println("billSuffix = " + billSuffix);
         boolean commonBillNumberForAllDepartmentsInstitutionsBillTypeAtomic
                 = configOptionApplicationController.getBooleanValueByKey("Bill Number Generation Strategy - Common Bill Number for All Departments, Institutions and Bill Types", false);
         boolean separateBillNumberForAllDepartmentsInstitutionsBillTypeAtomic
@@ -1534,7 +1537,7 @@ public String departmentBillNumberGeneratorYearly(Department dep, BillTypeAtomic
 
         // Get the last bill number
         Long dd = billNumber.getLastBillNumber();
-
+        System.out.println("dd = " + dd);
         // Increment the bill number
         dd++;
 
diff --git a/src/main/java/com/divudi/service/BillService.java b/src/main/java/com/divudi/service/BillService.java
index b6865c11cb..8ffcc2ffcb 100644
--- a/src/main/java/com/divudi/service/BillService.java
+++ b/src/main/java/com/divudi/service/BillService.java
@@ -788,7 +788,7 @@ public List<Bill> fetchReturnBills(Bill inputBill) {
         return fetchedBills;
     }
 
-    public List<BillItem> fetchPaymentBills(Bill inputBill) {
+    public List<BillItem> fetchPaymentBillItems(Bill inputBill) {
         String jpql;
         if (inputBill == null) {
             return null;
@@ -813,15 +813,16 @@ public List<BillItem> fetchPaymentBills(Bill inputBill) {
                 + " from BillItem bi"
                 + " join bi.bill b "
                 + " where b.retired=:ret "
-                + " and bi.referanceBillItem in :inputBillItems "
+                + " and bi.referenceBill = :bill "
                 + " and b.billTypeAtomic in :btas ";
         jpql += " order by b.createdAt";
         params.put("ret", false);
         params.put("btas", btas);
-        params.put("inputBillItems", inputBill.getBillItems());
+        params.put("bill", inputBill);
         System.out.println("jpql = " + jpql);
         System.out.println("params = " + params);
         List<BillItem> fetchedBillItems = billItemFacade.findByJpql(jpql, params, TemporalType.TIMESTAMP);
+        System.out.println("fetchedBillItems = " + fetchedBillItems);
         return fetchedBillItems;
     }
 
diff --git a/src/main/webapp/channel/channel_report_department_wise_bills.xhtml b/src/main/webapp/channel/channel_report_department_wise_bills.xhtml
index 5e4dc60ddf..97cf57dde1 100644
--- a/src/main/webapp/channel/channel_report_department_wise_bills.xhtml
+++ b/src/main/webapp/channel/channel_report_department_wise_bills.xhtml
@@ -92,7 +92,7 @@
                             </p:column>
                             <p:column headerText="Billed at"  >
                                 <h:outputLabel value="#{b.createdAt}" >
-                                    <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                                 </h:outputLabel>
                                 <br/>
                                 <h:panelGroup rendered="#{b.cancelled}" >
diff --git a/src/main/webapp/credit/pharmacy_search_bill_full_paid.xhtml b/src/main/webapp/credit/pharmacy_search_bill_full_paid.xhtml
index b7c7502721..a5a231f0cb 100644
--- a/src/main/webapp/credit/pharmacy_search_bill_full_paid.xhtml
+++ b/src/main/webapp/credit/pharmacy_search_bill_full_paid.xhtml
@@ -43,7 +43,7 @@
                     </p:column>
                     <p:column headerText="Billed at"  >
                         <h:outputLabel value="#{bill.createdAt}" >
-                            <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                            <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                         </h:outputLabel>
                         <br/>
                         <h:panelGroup rendered="#{bill.cancelled}" >
diff --git a/src/main/webapp/credit/pharmacy_search_bill_full_paid_bills.xhtml b/src/main/webapp/credit/pharmacy_search_bill_full_paid_bills.xhtml
index c94fc72b8c..81783fb91b 100644
--- a/src/main/webapp/credit/pharmacy_search_bill_full_paid_bills.xhtml
+++ b/src/main/webapp/credit/pharmacy_search_bill_full_paid_bills.xhtml
@@ -50,7 +50,7 @@
                         </p:column>
                         <p:column headerText="Billed at"  >
                             <h:outputLabel value="#{bill.createdAt}" >
-                                <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                                <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                             </h:outputLabel>
                             <br/>
                             <h:panelGroup rendered="#{bill.cancelled}" >
diff --git a/src/main/webapp/credit/pharmacy_search_bill_to_pay.xhtml b/src/main/webapp/credit/pharmacy_search_bill_to_pay.xhtml
index 10715f8635..59a9f9392a 100644
--- a/src/main/webapp/credit/pharmacy_search_bill_to_pay.xhtml
+++ b/src/main/webapp/credit/pharmacy_search_bill_to_pay.xhtml
@@ -63,7 +63,7 @@
                     </p:column>
                     <p:column headerText="Billed at"  >
                         <h:outputLabel value="#{bill.createdAt}" >
-                            <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                            <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                         </h:outputLabel>
                         <br/>
                         <h:panelGroup rendered="#{bill.cancelled}" >
diff --git a/src/main/webapp/dealerPayment/approve_supplier_payment.xhtml b/src/main/webapp/dealerPayment/approve_supplier_payment.xhtml
index 5587070fda..cdb09151cd 100644
--- a/src/main/webapp/dealerPayment/approve_supplier_payment.xhtml
+++ b/src/main/webapp/dealerPayment/approve_supplier_payment.xhtml
@@ -13,136 +13,160 @@
         <ui:composition template="/dealerPayment/index.xhtml">
             <ui:define name="subcontent">
 
-                <h:panelGroup >
-                    <h:form  >
-                        <p:panel rendered="#{!supplierPaymentController.printPreview}" >
-                            <f:facet name="header" >
-                                <h:outputLabel value="Approve Supplier Payment" ></h:outputLabel>
-                                <p:commandButton
-                                    id="btnSettle" 
-                                    value="Approve Payment"
-                                    action="#{supplierPaymentController.settleApproveSupplierPayment}"
-                                    ajax="false" 
-                                    class="me-5"
-                                    style="float: right">
-                                </p:commandButton>
-                            </f:facet>
-
-
-                            <p:panelGrid layout="tabular" columns="2" class="w-100">
-                                <h:outputLabel value="Supplier" />
-                                <h:outputLabel value="#{supplierPaymentController.current.toInstitution.name}" />
-
-                                <h:outputLabel value="Payment Method" />
-                                <p:selectOneMenu 
-                                    id="cmbPs" 
-                                    required="true"
-                                    requiredMessage="You must select a payment method to approve"
-                                    value="#{supplierPaymentController.current.paymentMethod}">                                                                     
-                                    <f:selectItem itemLabel="Select Payment Method" ></f:selectItem>
-                                    <f:selectItems value="#{enumController.paymentMethodsWithoutCredit}"  />
-                                </p:selectOneMenu>
-
-                                <p:outputLabel value="Total" />
-                                <p:inputText
-                                    readonly="true"
-                                    class="text-end"
-                                    id="lblTotal"
-                                    value="#{supplierPaymentController.current.total}">
+
+                <h:form  >
+                    <p:panel rendered="#{!supplierPaymentController.printPreview}" class="m-1">
+                        <f:facet name="header" >
+                            <h:outputLabel value="Approve Supplier Payment" ></h:outputLabel>
+                            <p:commandButton
+                                id="btnSettle" 
+                                value="Approve Payment"
+                                icon="pi pi-check"
+                                action="#{supplierPaymentController.settleApproveSupplierPayment}"
+                                ajax="false" 
+                                class="me-5 ui-button-success"
+                                style="float: right">
+                            </p:commandButton>
+                        </f:facet>
+
+
+                        <p:panelGrid layout="tabular" columns="2" >
+                            <h:outputLabel value="Supplier" />
+                            <h:outputLabel value="#{supplierPaymentController.current.toInstitution.name}" />
+
+                            <h:outputLabel value="Payment No" />
+                            <h:outputLabel value="#{supplierPaymentController.current.deptId}" />
+
+                            <h:outputLabel value="Payment Method" />
+                            <p:outputLabel 
+                                id="cmbPs" 
+                                value="#{supplierPaymentController.current.paymentMethod.label}">                                                                     
+                            </p:outputLabel>
+
+                            <p:outputLabel value="Total" />
+                            <p:outputLabel
+                                class="text-end w-100"
+                                id="lblTotal"
+                                value="#{supplierPaymentController.current.total}">
+                                <f:convertNumber pattern="#,##0.00" />
+                            </p:outputLabel>
+
+                            <p:outputLabel value="Discount" />
+                            <p:outputLabel 
+                                id="txtDiscount"  
+                                class="text-end w-100"
+                                value="#{supplierPaymentController.current.discount}">
+                                <f:convertNumber pattern="#,##0.00" />
+                            </p:outputLabel>
+
+                            <p:outputLabel value="Net Total" />
+                            <p:outputLabel 
+                                id="lblNetTotal"
+                                class="text-end w-100"
+                                value="#{supplierPaymentController.current.netTotal}">
+                                <f:convertNumber pattern="#,##0.00" />
+                            </p:outputLabel>
+
+                            <p:outputLabel value="Payment Creation Comments"/>
+                            <p:outputLabel
+                                class="w-100"
+                                value="#{supplierPaymentController.current.comments}"/>       
+
+                            <p:outputLabel value="Approval Comments"/>
+                            <p:inputTextarea
+                                class="w-100"
+                                style="min-width: 20em;"
+                                rows="5"
+                                value="#{supplierPaymentController.current.paymentApprovalComments}"/>                                                         
+
+
+
+                        </p:panelGrid>
+
+                        <p:dataTable  
+                            value="#{supplierPaymentController.current.billItems}"
+                            var="b" 
+                            id="itms" 
+                            class="m-1"
+                            rowKey="#{b.searialNo}" 
+                            rowIndexVar="n">
+                            <p:column  class="text-end" width="2em">  
+                                <f:facet name="header">
+                                    <h:outputLabel value="No"/>                                  
+                                </f:facet>                
+                                <p:outputLabel value="#{n+1}" ></p:outputLabel>
+                            </p:column> 
+                            <p:column >  
+                                <f:facet name="header">
+                                    <h:outputLabel value="GRN No"/>                                  
+                                </f:facet> 
+                                <p:outputLabel value=" #{b.referenceBill.invoiceNumber}" ></p:outputLabel>
+                            </p:column> 
+                            <p:column >  
+                                <f:facet name="header">
+                                    <h:outputLabel value="Invoice No"/>                                  
+                                </f:facet> 
+                                <p:outputLabel value=" #{b.referenceBill.invoiceNumber}" ></p:outputLabel>
+                            </p:column> 
+                            <p:column class="text-end" headerText="GRN Amount">
+                                <p:outputLabel value="#{b.referenceBill.netTotal}">
                                     <f:convertNumber pattern="#,##0.00" />
-                                </p:inputText>
-
-                                <p:outputLabel value="Discount" />
-                                <p:inputText 
-                                    id="txtDiscount"  
-                                    onfocus="this.select();"
-                                    class="text-end"
-                                     readonly="true"
-                                    value="#{supplierPaymentController.current.discount}">
+                                </p:outputLabel>
+                            </p:column>
+                            <p:column class="text-end" headerText="GRN Return Amount">
+                                <p:outputLabel value="#{b.referenceBill.tmpReturnTotal}">
                                     <f:convertNumber pattern="#,##0.00" />
-                                </p:inputText>
-
-                                <p:outputLabel value="Net Total" />
-                                <p:inputText 
-                                    id="lblNetTotal"
-                                    class="text-end"
-                                    readonly="true"
-                                    value="#{supplierPaymentController.current.netTotal}">
+                                </p:outputLabel>
+                            </p:column>
+                            <p:column class="text-end" headerText="Paid Amount">
+                                <p:outputLabel value="#{b.referenceBill.paidAmount}">
                                     <f:convertNumber pattern="#,##0.00" />
-                                </p:inputText>
-
-                                <p:outputLabel value="Description"/>
-                                <p:inputTextarea
-                                    class="w-100"
-                                    value="#{supplierPaymentController.current.comments}"/>                                                         
-
-
-
-                            </p:panelGrid>
-
-                            <p:dataTable  
-                                value="#{supplierPaymentController.current.billItems}"
-                                var="b" 
-                                id="itms" rowKey="#{b.searialNo}" >
-                                <p:column >  
-                                    <f:facet name="header">
-                                        <h:outputLabel value="GRN No"/>                                  
-                                    </f:facet>                              
-                                    #{b.referenceBill.deptId}
-                                </p:column> 
-                                <p:column >  
-                                    <f:facet name="header">
-                                        <h:outputLabel value="Invoice No"/>                                  
-                                    </f:facet>                              
-                                    #{b.referenceBill.invoiceNumber}
-                                </p:column> 
-                                <p:column headerText="GRN Amount">
-                                    <p:outputLabel value="#{b.referenceBill.netTotal}">
-                                        <f:convertNumber pattern="#,##0.00" />
-                                    </p:outputLabel>
-                                </p:column>
-                                <p:column headerText="GRN Return Amount">
-                                    <p:outputLabel value="#{b.referenceBill.tmpReturnTotal}">
-                                        <f:convertNumber pattern="#,##0.00" />
-                                    </p:outputLabel>
-                                </p:column>
-                                <p:column headerText="Paid Amount">
-                                    <p:outputLabel value="#{b.referenceBill.paidAmount}">
-                                        <f:convertNumber pattern="#,##0.00" />
-                                    </p:outputLabel>
-                                </p:column>
-                                <p:column headerText="Recievable Amount">
-                                    <p:outputLabel value="#{(b.referenceBill.balance)}">
-                                        <f:convertNumber pattern="#,##0.00" />
-                                    </p:outputLabel>
-                                </p:column>
-                                <p:column headerText="Paying Amount">
-                                    <p:inputText 
-                                        class="w-100 text-end"
-                                        autocomplete="off"
-                                        readonly="true"
-                                        onfocus="this.select();"
-                                        value="#{b.netValue}">    
-                                        <f:convertNumber pattern="#,##0.00" />
-                                    </p:inputText>
-                                </p:column>
-
-
-                            </p:dataTable>
+                                </p:outputLabel>
+                            </p:column>
+                            <p:column class="text-end" headerText="Recievable Amount">
+                                <p:outputLabel value="#{(b.referenceBill.balance)}">
+                                    <f:convertNumber pattern="#,##0.00" />
+                                </p:outputLabel>
+                            </p:column>
+                            <p:column class="text-end" headerText="Paying Amount">
+                                <p:outputLabel 
+                                    class="w-100 text-end"
+                                    value="#{b.netValue}">    
+                                    <f:convertNumber pattern="#,##0.00" />
+                                </p:outputLabel>
+                            </p:column>
+                            <p:column width="8em" class="text-center" headerText="Actions">
+                                <p:commandButton 
+                                    value="View" 
+                                    icon="pi pi-eye"
+                                    style="width: 6em;"
+                                    class="ui-button-primary mx-1"
+                                    action="#{supplierPaymentController.navigateToViewProcurementBill(b)}" 
+                                    ajax="false" >
+                                </p:commandButton>
+                            </p:column>
 
 
-                        </p:panel>
+                        </p:dataTable>
 
-                        <p:panel rendered="#{supplierPaymentController.printPreview}">                                
-                            <p:commandButton value="Print" ajax="false" action="#" >
-                                <p:printer target="gpBillPreview" ></p:printer>
-                            </p:commandButton>
-                            <p:panel   id="gpBillPreview">
-                                <bi:supplier_payment_approval bill="#{supplierPaymentController.current}" billController="#{supplierPaymentController}" dup="false"/>
-                            </p:panel>
+
+                    </p:panel>
+
+                    <p:panel rendered="#{supplierPaymentController.printPreview}">                                
+                        <p:commandButton 
+                            value="Print" 
+                            ajax="false" 
+                            action="#"  
+                            class="ui-button-info m-1"
+                            icon="pi pi-print">
+                            <p:printer target="gpBillPreview" ></p:printer>
+                        </p:commandButton>
+                        <p:panel   id="gpBillPreview">
+                            <bi:supplier_payment_approval bill="#{supplierPaymentController.current}" billController="#{supplierPaymentController}" dup="false"/>
                         </p:panel>
-                    </h:form>
-                </h:panelGroup>
+                    </p:panel>
+                </h:form>
+
 
 
             </ui:define>
diff --git a/src/main/webapp/dealerPayment/complete_approved_and_settled_supplier_payment.xhtml b/src/main/webapp/dealerPayment/complete_approved_and_settled_supplier_payment.xhtml
new file mode 100644
index 0000000000..1b4e771dfc
--- /dev/null
+++ b/src/main/webapp/dealerPayment/complete_approved_and_settled_supplier_payment.xhtml
@@ -0,0 +1,162 @@
+<?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:ui="http://xmlns.jcp.org/jsf/facelets"
+    xmlns:h="http://xmlns.jcp.org/jsf/html"
+    xmlns:f="http://xmlns.jcp.org/jsf/core"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:p="http://primefaces.org/ui"                
+    xmlns:bi="http://xmlns.jcp.org/jsf/composite/bill"
+    xmlns:pa="http://xmlns.jcp.org/jsf/composite/paymentMethod">
+
+    <h:body>
+        <ui:composition template="/dealerPayment/index.xhtml">
+            <ui:define name="subcontent">
+
+                <h:panelGroup >
+                    <h:form  >
+                        <p:panel rendered="#{!supplierPaymentController.printPreview}" >
+                            <f:facet name="header" >
+                                <h:outputLabel value="Complete Approved And Settled Supplier Payment" ></h:outputLabel>
+                                <p:commandButton
+                                    id="btnSettle" 
+                                    value="Settle"
+                                    action="#{supplierPaymentController.settleApprovedSupplierPayment()}"
+                                    ajax="false" 
+                                    class="me-5"
+                                    style="float: right">
+                                </p:commandButton>
+                            </f:facet>
+
+
+                            <p:panelGrid layout="tabular" columns="2" class="w-100">
+                                <h:outputLabel value="Supplier" />
+                                <h:outputLabel value="#{supplierPaymentController.current.toInstitution.name}" />
+
+                                <h:outputLabel value="Payment Method" />
+                                <p:selectOneMenu id="cmbPs" value="#{supplierPaymentController.current.paymentMethod}">                                                                     
+                                    <f:selectItems value="#{enumController.paymentMethodsWithoutCredit}"  />
+                                    <p:ajax 
+                                        process="cmbPs"
+                                        update="gpPaymentMethodDetails" 
+                                        event="change" />
+                                </p:selectOneMenu>
+
+                                <h:outputLabel value="Payment Details" />
+                                <h:panelGroup id="gpPaymentMethodDetails" >
+                                    <h:panelGroup id="creditCard" style="display: #{supplierPaymentController.current.paymentMethod ne 'Card' ? 'none' : 'block'} ; ">
+                                        <pa:creditCardDetailsAsOnlyPayment paymentMethodData="#{supplierPaymentController.paymentMethodData}"/>
+                                    </h:panelGroup>
+
+                                    <h:panelGroup id="cheque" style="display: #{supplierPaymentController.current.paymentMethod ne 'Cheque' ? 'none' : 'block'} ; " >
+                                        <pa:chequeDetailsAsOnlyPayment paymentMethodData="#{supplierPaymentController.paymentMethodData}"/>
+                                    </h:panelGroup>
+
+                                    <h:panelGroup id="slip" style="display: #{supplierPaymentController.current.paymentMethod ne 'Slip' ? 'none' : 'block'} ;">
+                                        <pa:slipDetailsAsOnlyPayment paymentMethodData="#{supplierPaymentController.paymentMethodData}"/>
+                                    </h:panelGroup>
+                                </h:panelGroup>
+
+                                <p:outputLabel value="Total" />
+                                <p:inputText
+                                    id="lblTotal"
+                                    readonly="true"
+                                    class="text-end"
+                                    value="#{supplierPaymentController.current.total}">
+                                    <f:convertNumber pattern="#,##0.00" />
+                                </p:inputText>
+
+                                <p:outputLabel value="Discount" />
+                                <p:inputText 
+                                    id="txtDiscount"
+                                    class="text-end"
+                                    readonly="true"
+                                    onfocus="this.select();"
+                                    value="#{supplierPaymentController.current.discount}">
+                                    <f:convertNumber pattern="#,##0.00" />
+                                </p:inputText>
+
+                                <p:outputLabel value="Net Total" />
+                                <p:inputText 
+                                    id="lblNetTotal" 
+                                    readonly="true"
+                                    class="text-end"
+                                    value="#{supplierPaymentController.current.netTotal}">
+                                    <f:convertNumber pattern="#,##0.00" />
+                                </p:inputText>
+
+                                <p:outputLabel 
+                                    value="Description"/>
+                                <p:inputTextarea 
+                                    class="w-100"
+                                    value="#{supplierPaymentController.current.comments}"/>                                                         
+
+
+
+                            </p:panelGrid>
+
+                            <p:dataTable  
+                                value="#{supplierPaymentController.current.billItems}"
+                                var="b" 
+                                id="itms" rowKey="#{b.searialNo}" >
+                                <p:column >  
+                                    <f:facet name="header">
+                                        <h:outputLabel value="GRN No"/>                                  
+                                    </f:facet>                              
+                                    #{b.referenceBill.deptId}
+                                </p:column> 
+                                <p:column >  
+                                    <f:facet name="header">
+                                        <h:outputLabel value="Invoice No"/>                                  
+                                    </f:facet>                              
+                                    #{b.referenceBill.invoiceNumber}
+                                </p:column> 
+                                <p:column headerText="GRN Amount">
+                                    <p:outputLabel value="#{b.referenceBill.netTotal}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </p:outputLabel>
+                                </p:column>
+                                <p:column headerText="GRN Return Amount">
+                                    <p:outputLabel value="#{b.referenceBill.tmpReturnTotal}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </p:outputLabel>
+                                </p:column>
+                                <p:column headerText="Paid Amount">
+                                    <p:outputLabel value="#{b.referenceBill.paidAmount}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </p:outputLabel>
+                                </p:column>
+                                <p:column headerText="Recievable Amount">
+                                    <p:outputLabel value="#{(b.referenceBill.balance)}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </p:outputLabel>
+                                </p:column>
+                                <p:column headerText="Paying Amount">
+                                    <p:outputLabel value="#{b.netValue}">    
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </p:outputLabel>
+                                </p:column>
+
+                                
+                            </p:dataTable>
+
+
+                        </p:panel>
+
+                        <p:panel rendered="#{supplierPaymentController.printPreview}">                                
+                            <p:commandButton value="Print" ajax="false" action="#" >
+                                <p:printer target="gpBillPreview" ></p:printer>
+                            </p:commandButton>
+                            <p:panel   id="gpBillPreview">
+                                <bi:grn_payment billItems="#{supplierPaymentController.current.billItems}" bill="#{supplierPaymentController.current}"/>
+                                <!--<bi:grnCheque bill="#{supplierPaymentController.current}" billController="#{supplierPaymentController}" dup="false"/>-->
+                            </p:panel>
+                        </p:panel>
+                    </h:form>
+                </h:panelGroup>
+
+
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/dealerPayment/generate_supplier_payment.xhtml b/src/main/webapp/dealerPayment/generate_supplier_payment.xhtml
index 423390222c..2a4e651da9 100644
--- a/src/main/webapp/dealerPayment/generate_supplier_payment.xhtml
+++ b/src/main/webapp/dealerPayment/generate_supplier_payment.xhtml
@@ -13,151 +13,174 @@
         <ui:composition template="/dealerPayment/index.xhtml">
             <ui:define name="subcontent">
 
-                <h:panelGroup >
-                    <h:form  >
-                        <p:panel rendered="#{!supplierPaymentController.printPreview}" >
-                            <f:facet name="header" >
-                                <h:outputLabel value="Generate Supplier Payment" ></h:outputLabel>
-                                <p:commandButton
-                                    id="btnSettle" 
-                                    value="Complete Generation of Payment"
-                                    action="#{supplierPaymentController.settleGenerateSupplierPayment}"
-                                    ajax="false" 
-                                    class="me-5"
-                                    style="float: right">
-                                </p:commandButton>
-                            </f:facet>
-
-
-                            <p:panelGrid layout="tabular" columns="2" class="w-100">
-                                <h:outputLabel value="Supplier" />
-                                <h:outputLabel value="#{supplierPaymentController.current.toInstitution.name}" />
-
-                                <h:outputLabel value="Payment Method" />
-                                <p:selectOneMenu 
-                                    id="cmbPs" 
-                                    required="true"
-                                    requiredMessage="You must select a payment method to approve"
-                                    value="#{supplierPaymentController.current.paymentMethod}">                                                                     
-                                    <f:selectItem itemLabel="Select Payment Method" ></f:selectItem>
-                                    <f:selectItems value="#{enumController.paymentMethodsWithoutCredit}"  />
-                                </p:selectOneMenu>
-
-                                <p:outputLabel value="Total" />
-                                <p:inputText
-                                    readonly="true"
-                                    class="text-end"
-                                    id="lblTotal"
-                                    value="#{supplierPaymentController.current.total}">
-                                    <f:convertNumber pattern="#,##0.00" />
-                                </p:inputText>
 
-                                <p:outputLabel value="Discount" />
+                <h:form  >
+                    <p:panel rendered="#{!supplierPaymentController.printPreview}" class="m-1" >
+                        <f:facet name="header" >
+                            <h:outputLabel value="Generate Supplier Payment" ></h:outputLabel>
+                            <p:commandButton
+                                id="btnSettle" 
+                                value="Generate Supplier Payment"
+                                action="#{supplierPaymentController.settleGenerateSupplierPayment}"
+                                ajax="false" 
+                                class="me-5"
+                                style="float: right">
+                            </p:commandButton>
+                        </f:facet>
+
+
+                        <p:panelGrid layout="tabular" columns="2" >
+                            <h:outputLabel value="Supplier" />
+                            <h:outputLabel value="#{supplierPaymentController.current.toInstitution.name}" />
+
+                            <h:outputLabel value="Payment Method" />
+                            <p:selectOneMenu 
+                                id="cmbPs" 
+                                required="true"
+                                class="w-100"
+                                requiredMessage="You must select a payment method to approve"
+                                value="#{supplierPaymentController.current.paymentMethod}">                                                                     
+                                <f:selectItem itemLabel="Select Payment Method" ></f:selectItem>
+                                <f:selectItems value="#{enumController.paymentMethodsWithoutCredit}"  />
+                            </p:selectOneMenu>
+
+                            <p:outputLabel value="Total" />
+                            <p:inputText
+                                readonly="true"
+                                class="text-end w-100"
+                                id="lblTotal"
+                                value="#{supplierPaymentController.current.total}">
+                                <f:convertNumber pattern="#,##0.00" />
+                            </p:inputText>
+
+                            <p:outputLabel value="Discount" />
+                            <p:inputText 
+                                id="txtDiscount"  
+                                onfocus="this.select();"
+                                class="text-end w-100"
+                                value="#{supplierPaymentController.current.discount}">
+                                <f:convertNumber pattern="#,##0.00" />
+                                <f:ajax 
+                                    event="blur" 
+                                    execute="@this" 
+                                    render="@all" 
+                                    listener="#{supplierPaymentController.changeDiscountListenerForPaymentPreperation}"/>
+                            </p:inputText>
+
+                            <p:outputLabel value="Net Total" />
+                            <p:inputText 
+                                id="lblNetTotal"
+                                class="text-end w-100"
+                                readonly="true"
+                                value="#{supplierPaymentController.current.netTotal}">
+                                <f:convertNumber pattern="#,##0.00" />
+                            </p:inputText>
+
+                            <p:outputLabel value="Description"/>
+                            <p:inputTextarea
+                                class="w-100"
+                                style="min-width: 20em;"
+                                rows="5"
+                                value="#{supplierPaymentController.current.comments}"/>                                                         
+
+
+
+                        </p:panelGrid>
+
+                        <p:dataTable  
+                            value="#{supplierPaymentController.selectedBillItems}"
+                            var="b" 
+                            rowIndexVar="n"
+                            id="itms" 
+                            class="m-1 w-100"
+                            rowKey="#{b.searialNo}" >
+                            <p:column width="2em">  
+                                <f:facet name="header">
+                                    <h:outputLabel value="No"/>                                  
+                                </f:facet>      
+                                <p:outputLabel value="#{n+1}"/>
+                            </p:column> 
+                            <p:column  class="text-end">  
+                                <f:facet name="header">
+                                    <h:outputLabel value="GRN No"/>                                  
+                                </f:facet>      
+                                <p:outputLabel value="#{b.referenceBill.deptId}"/>
+                            </p:column> 
+                            <p:column  class="text-end">  
+                                <f:facet name="header">
+                                    <h:outputLabel value="Invoice No"/>                                  
+                                </f:facet>       
+                                <p:outputLabel value="#{b.referenceBill.invoiceNumber}"></p:outputLabel>
+                            </p:column> 
+                            <p:column headerText="GRN Amount" class="text-end">
+                                <p:outputLabel value="#{b.referenceBill.netTotal}">
+                                    <f:convertNumber pattern="#,##0.00" />
+                                </p:outputLabel>
+                            </p:column>
+                            <p:column headerText="GRN Return Amount" class="text-end">
+                                <p:outputLabel value="#{b.referenceBill.tmpReturnTotal}">
+                                    <f:convertNumber pattern="#,##0.00" />
+                                </p:outputLabel>
+                            </p:column>
+                            <p:column headerText="Paid Amount" class="text-end">
+                                <p:outputLabel value="#{b.referenceBill.paidAmount}">
+                                    <f:convertNumber pattern="#,##0.00" />
+                                </p:outputLabel>
+                            </p:column>
+                            <p:column headerText="Recievable Amount" class="text-end">
+                                <p:outputLabel value="#{(b.referenceBill.balance)}">
+                                    <f:convertNumber pattern="#,##0.00" />
+                                </p:outputLabel>
+                            </p:column>
+                            <p:column headerText="Paying Amount" class="text-end">
                                 <p:inputText 
-                                    id="txtDiscount"  
+                                    class="w-100 text-end"
+                                    autocomplete="off"
                                     onfocus="this.select();"
-                                    class="text-end"
-                                    value="#{supplierPaymentController.current.discount}">
+                                    value="#{b.netValue}">    
                                     <f:convertNumber pattern="#,##0.00" />
                                     <f:ajax 
                                         event="blur" 
                                         execute="@this" 
                                         render="@all" 
-                                        listener="#{supplierPaymentController.changeDiscountListenerForPaymentPreperation}"/>
+                                        listener="#{supplierPaymentController.changeNetValueListener(b)}"/>
                                 </p:inputText>
+                            </p:column>
+
+                            <p:column width="15em" class="text-center" headerText="Actions">
+                                <p:commandButton 
+                                    value="View" 
+                                    icon="pi pi-eye"
+                                    style="width: 6em;"
+                                    class="ui-button-primary mx-1"
+                                    action="#{supplierPaymentController.navigateToViewProcurementBill(b)}" 
+                                    ajax="false" >
+                                </p:commandButton>
+                                <p:commandButton 
+                                    ajax="false" 
+                                    class="ui-button-danger mx-1"
+                                    icon="pi pi-trash"
+                                    style="width: 7em;"
+                                    action="#{supplierPaymentController.remove(b)}" 
+                                    value="Remove">
+                                </p:commandButton>
 
-                                <p:outputLabel value="Net Total" />
-                                <p:inputText 
-                                    id="lblNetTotal"
-                                    class="text-end"
-                                    readonly="true"
-                                    value="#{supplierPaymentController.current.netTotal}">
-                                    <f:convertNumber pattern="#,##0.00" />
-                                </p:inputText>
+                            </p:column>
+                        </p:dataTable>
 
-                                <p:outputLabel value="Description"/>
-                                <p:inputTextarea
-                                    class="w-100"
-                                    value="#{supplierPaymentController.current.comments}"/>                                                         
-
-
-
-                            </p:panelGrid>
-
-                            <p:dataTable  
-                                value="#{supplierPaymentController.selectedBillItems}"
-                                var="b" 
-                                id="itms" rowKey="#{b.searialNo}" >
-                                <p:column >  
-                                    <f:facet name="header">
-                                        <h:outputLabel value="GRN No"/>                                  
-                                    </f:facet>                              
-                                    #{b.referenceBill.deptId}
-                                </p:column> 
-                                <p:column >  
-                                    <f:facet name="header">
-                                        <h:outputLabel value="Invoice No"/>                                  
-                                    </f:facet>                              
-                                    #{b.referenceBill.invoiceNumber}
-                                </p:column> 
-                                <p:column headerText="GRN Amount">
-                                    <p:outputLabel value="#{b.referenceBill.netTotal}">
-                                        <f:convertNumber pattern="#,##0.00" />
-                                    </p:outputLabel>
-                                </p:column>
-                                <p:column headerText="GRN Return Amount">
-                                    <p:outputLabel value="#{b.referenceBill.tmpReturnTotal}">
-                                        <f:convertNumber pattern="#,##0.00" />
-                                    </p:outputLabel>
-                                </p:column>
-                                <p:column headerText="Paid Amount">
-                                    <p:outputLabel value="#{b.referenceBill.paidAmount}">
-                                        <f:convertNumber pattern="#,##0.00" />
-                                    </p:outputLabel>
-                                </p:column>
-                                <p:column headerText="Recievable Amount">
-                                    <p:outputLabel value="#{(b.referenceBill.balance)}">
-                                        <f:convertNumber pattern="#,##0.00" />
-                                    </p:outputLabel>
-                                </p:column>
-                                <p:column headerText="Paying Amount">
-                                    <p:inputText 
-                                        class="w-100 text-end"
-                                        autocomplete="off"
-                                        onfocus="this.select();"
-                                        value="#{b.netValue}">    
-                                        <f:convertNumber pattern="#,##0.00" />
-
-                                        <f:ajax 
-                                            event="blur" 
-                                            execute="@this" 
-                                            render="@all" 
-                                            listener="#{supplierPaymentController.changeNetValueListener(b)}"/>
-                                    </p:inputText>
-                                </p:column>
-
-                                <p:column headerText="Remove">
-                                    <p:commandButton 
-                                        ajax="false" 
-                                        action="#{supplierPaymentController.remove(b)}" 
-                                        value="Remove">
-                                    </p:commandButton>
-                                </p:column>
-                            </p:dataTable>
 
+                    </p:panel>
 
+                    <p:panel rendered="#{supplierPaymentController.printPreview}">                                
+                        <p:commandButton value="Print" ajax="false" action="#" >
+                            <p:printer target="gpBillPreview" ></p:printer>
+                        </p:commandButton>
+                        <p:panel   id="gpBillPreview">
+                            <bi:supplier_payment_preperation bill="#{supplierPaymentController.current}" billController="#{supplierPaymentController}" dup="false"/>
                         </p:panel>
+                    </p:panel>
+                </h:form>
 
-                        <p:panel rendered="#{supplierPaymentController.printPreview}">                                
-                            <p:commandButton value="Print" ajax="false" action="#" >
-                                <p:printer target="gpBillPreview" ></p:printer>
-                            </p:commandButton>
-                            <p:panel   id="gpBillPreview">
-                                <bi:supplier_payment_preperation bill="#{supplierPaymentController.current}" billController="#{supplierPaymentController}" dup="false"/>
-                            </p:panel>
-                        </p:panel>
-                    </h:form>
-                </h:panelGroup>
 
 
             </ui:define>
diff --git a/src/main/webapp/dealerPayment/index.xhtml b/src/main/webapp/dealerPayment/index.xhtml
index d8e84879f7..b0190d6e18 100644
--- a/src/main/webapp/dealerPayment/index.xhtml
+++ b/src/main/webapp/dealerPayment/index.xhtml
@@ -90,7 +90,7 @@
                                         value="Complete Payments"
                                         icon="fas fa-check-circle"  
                                         styleClass="ui-button-secondary"
-                                        action="#{supplierPaymentController.navigateToSettleSupplierPayments}"
+                                        action="#{supplierPaymentController.navigateToCompleteSupplierPayments()}"
                                         rendered="#{webUserController.hasPrivilege('PharmacyGRNPaymentDoneSearch')}" />
 
                                     <p:commandButton 
diff --git a/src/main/webapp/dealerPayment/list_bills_to_approve_supplier_payments.xhtml b/src/main/webapp/dealerPayment/list_bills_to_approve_supplier_payments.xhtml
index 27d8775c7a..4dcba89924 100644
--- a/src/main/webapp/dealerPayment/list_bills_to_approve_supplier_payments.xhtml
+++ b/src/main/webapp/dealerPayment/list_bills_to_approve_supplier_payments.xhtml
@@ -32,11 +32,13 @@
                                 </p:calendar>
 
                                 <p:commandButton 
-                                    value="Pharmacy Payments to Approve" 
+                                    value="List Pharmacy Payments to Approve" 
                                     action="#{supplierPaymentController.fillSupplierPaymentsToApprove}" 
                                     ajax="false"  
-                                    icon="fas fa-prescription-bottle-alt" 
-                                    class="my-1 w-100 ui-button-warning" />
+                                    class="my-3 w-100 ui-button-primary"
+                                    icon="pi pi-list">
+                                </p:commandButton>
+
 
                             </div>
                             <div class="col-10">
@@ -55,20 +57,30 @@
                                         <h:outputText value="#{b.deptId}" />
                                     </p:column>
 
-                                    <p:column headerText="Date" sortBy="#{b.billDate}" filterBy="#{b.billDate}" filterMatchMode="contains">
-                                        <h:outputText value="#{b.billDate}">
-                                            <f:convertDateTime pattern="#{sessionController.applicationPreference.shortDateFormat}" />
-                                        </h:outputText>
+                                    <p:column headerText="Supplier" sortBy="#{b.toInstitution.name}" filterBy="#{b.toInstitution.name}" filterMatchMode="contains">
+                                        <h:outputText value="#{b.toInstitution.name}" />
                                     </p:column>
 
-                                    <p:column headerText="Supplier" sortBy="#{b.fromInstitution.name}" filterBy="#{b.fromInstitution.name}" filterMatchMode="contains">
-                                        <h:outputText value="#{b.fromInstitution.name}" />
+                                    <p:column 
+                                        width="20em"
+                                        headerText="Created at"
+                                        sortBy="#{b.createdAt}"
+                                        filterBy="#{b.createdAt}">
+                                        <h:outputText value="#{b.createdAt}" >
+                                            <f:convertDateTime pattern="#{sessionController.applicationPreference.shortDateTimeFormat}" />
+                                        </h:outputText>
                                     </p:column>
 
-                                    <p:column headerText="Bill Type" sortBy="#{b.billTypeAtomic.label}" filterBy="#{b.billTypeAtomic.label}" filterMatchMode="contains">
-                                        <h:outputText value="#{b.billTypeAtomic.label}" />
+                                    <p:column 
+                                        headerText="Creted By" 
+                                        sortBy="#{b.creater.webUserPerson.name}"
+                                        filterBy="#{b.creater.webUserPerson.name}"
+                                        filterMatchMode="contains">
+                                        <h:outputText value="#{b.creater.webUserPerson.name}" />
                                     </p:column>
 
+
+
                                     <p:column  class="text-end" headerText="Total" sortBy="#{b.netTotal}" filterBy="#{b.netTotal}" filterMatchMode="contains">
                                         <h:outputText value="#{b.netTotal}">
                                             <f:convertNumber pattern="#,##0.00;(#,##0.00)" />
@@ -80,12 +92,16 @@
                                         </f:facet>
                                     </p:column>
 
-                                    <p:column  headerText="Actions" >
+                                    <p:column width="18em" class="text-center" headerText="Actions" >
                                         <p:commandButton
                                             value="To Approve Payment" 
                                             action="#{supplierPaymentController.navigateToApproveSupplierPayment(b)}" 
-                                            ajax="false" >
+                                            ajax="false"
+                                            style="width:16em;"
+                                            class="ui-button-warning"
+                                            icon="pi pi-thumbs-up">
                                         </p:commandButton>
+
                                     </p:column>
                                 </p:dataTable>
 
diff --git a/src/main/webapp/dealerPayment/list_bills_to_complete_supplier_payments.xhtml b/src/main/webapp/dealerPayment/list_bills_to_complete_supplier_payments.xhtml
index 105cfb4df9..554feb224e 100644
--- a/src/main/webapp/dealerPayment/list_bills_to_complete_supplier_payments.xhtml
+++ b/src/main/webapp/dealerPayment/list_bills_to_complete_supplier_payments.xhtml
@@ -11,7 +11,7 @@
         <ui:composition template="/dealerPayment/index.xhtml">
             <ui:define name="subcontent">
                 <h:form>
-                    <p:panel>
+                    <p:panel class="m-1">
                         <f:facet name="header" > 
                             <h:outputText styleClass="fas fa-file-invoice"/>
                             <h:outputLabel class="mx-4" value="Complete Supplier Payments"/>  
@@ -33,7 +33,7 @@
 
                                 <p:commandButton 
                                     value="Pharmacy Credit Bills to Mark as Complete" 
-                                    action="#{supplierPaymentController.fillUnsettledCreditPharmacyBills}" 
+                                    action="#{supplierPaymentController.fillApprovedSupplierPaymentsToComplete()}" 
                                     ajax="false"  
                                     icon="fas fa-prescription-bottle-alt" 
                                     class="my-1 w-100 ui-button-warning" />
@@ -49,38 +49,15 @@
                                     selectionRowMode="add"
                                     selectionPageOnly="false"
                                     rows="10"
-                                    selection="#{supplierPaymentController.selectedBills}"
                                     paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
                                     rowsPerPageTemplate="5,10,15">
 
-                                    <p:column selectionBox="true" width="20">
-
-                                    </p:column>
-
-                                    <p:column headerText="GRN No" sortBy="#{b.deptId}" filterBy="#{b.deptId}" filterMatchMode="contains">
+                                    <p:column headerText="Payment No" sortBy="#{b.deptId}" filterBy="#{b.deptId}" filterMatchMode="contains">
                                         <h:outputText value="#{b.deptId}" />
                                     </p:column>
-
-                                    <p:column headerText="Date" sortBy="#{b.billDate}" filterBy="#{b.billDate}" filterMatchMode="contains">
-                                        <h:outputText value="#{b.billDate}">
-                                            <f:convertDateTime pattern="#{sessionController.applicationPreference.shortDateFormat}" />
-                                        </h:outputText>
-                                    </p:column>
-
-                                    <p:column headerText="Supplier" sortBy="#{b.fromInstitution.name}" filterBy="#{b.fromInstitution.name}" filterMatchMode="contains">
-                                        <h:outputText value="#{b.fromInstitution.name}" />
-                                    </p:column>
-
-                                    <p:column headerText="Bill Type" sortBy="#{b.billTypeAtomic.label}" filterBy="#{b.billTypeAtomic.label}" filterMatchMode="contains">
-                                        <h:outputText value="#{b.billTypeAtomic.label}" />
-                                    </p:column>
-
-                                    <p:column headerText="Invoice No"
-                                              filterMatchMode="contains"
-                                              sortBy="#{b.invoiceNumber}" filterBy="#{b.invoiceNumber}">
-                                        <h:outputText value="#{b.invoiceNumber}" />
+                                    <p:column width="16em" headerText="Supplier" sortBy="#{b.toInstitution.name}" filterBy="#{b.toInstitution.name}" filterMatchMode="contains">
+                                        <h:outputText value="#{b.toInstitution.name}" />
                                     </p:column>
-
                                     <p:column  class="text-end" headerText="Total" sortBy="#{b.netTotal}" filterBy="#{b.netTotal}" filterMatchMode="contains">
                                         <h:outputText value="#{b.netTotal}">
                                             <f:convertNumber pattern="#,##0.00;(#,##0.00)" />
@@ -92,45 +69,44 @@
                                         </f:facet>
                                     </p:column>
 
-                                    <p:column class="text-end" headerText="Returned" sortBy="#{b.refundAmount}" filterBy="#{b.refundAmount}" filterMatchMode="contains">
-                                        <h:outputText value="#{b.refundAmount}">
-                                            <f:convertNumber pattern="#,##0.00;(#,##0.00)" />
+
+                                    <p:column headerText="Created At" sortBy="#{b.createdAt}" filterBy="#{b.createdAt}" filterMatchMode="contains">
+                                        <h:outputText value="#{b.createdAt}">
+                                            <f:convertDateTime pattern="#{sessionController.applicationPreference.shortDateTimeFormat}" />
                                         </h:outputText>
-                                        <f:facet name="footer">
-                                            <h:outputText value="#{supplierPaymentController.refundAmount}">
-                                                <f:convertNumber pattern="#,##0.00;(#,##0.00)" />
-                                            </h:outputText>
-                                        </f:facet>
                                     </p:column>
 
-                                    <p:column  class="text-end" headerText="Paid Total" sortBy="#{b.paidAmount}" filterBy="#{b.paidAmount}" filterMatchMode="contains">
-                                        <h:outputText value="#{b.paidAmount}">
-                                            <f:convertNumber pattern="#,##0.00;(#,##0.00)" />
+                                    <p:column headerText="Created By" sortBy="#{b.creater.webUserPerson.name}" filterBy="#{b.creater.webUserPerson.name}" filterMatchMode="contains">
+                                        <h:outputText value="#{b.creater.webUserPerson.name}">
                                         </h:outputText>
-                                        <f:facet name="footer">
-                                            <h:outputText value="#{supplierPaymentController.paidAmount}">
-                                                <f:convertNumber pattern="#,##0.00;(#,##0.00)" />
-                                            </h:outputText>
-                                        </f:facet>
                                     </p:column>
 
-                                    <p:column  class="text-end" headerText="Balance" sortBy="#{b.balance}" filterBy="#{b.balance}" filterMatchMode="contains">
-                                        <h:outputText value="#{b.balance}">
-                                            <f:convertNumber pattern="#,##0.00;(#,##0.00)" />
+                                    <p:column headerText="Approved At" sortBy="#{b.paymentApprovedAt}" filterBy="#{b.paymentApprovedAt}" filterMatchMode="contains">
+                                        <h:outputText value="#{b.paymentApprovedAt}">
+                                            <f:convertDateTime pattern="#{sessionController.applicationPreference.shortDateTimeFormat}" />
+                                        </h:outputText>
+                                    </p:column>
+                                    <p:column headerText="Approved By" sortBy="#{b.creater.webUserPerson.name}" filterBy="#{b.creater.webUserPerson.name}" filterMatchMode="contains">
+                                        <h:outputText value="#{b.creater.webUserPerson.name}">
+                                        </h:outputText>
+                                    </p:column>
+
+                                    <p:column headerText="Settled At" sortBy="#{b.paymentGeneratedAt}" filterBy="#{b.paymentGeneratedAt}" filterMatchMode="contains">
+                                        <h:outputText value="#{b.paymentGeneratedAt}">
+                                            <f:convertDateTime pattern="#{sessionController.applicationPreference.shortDateTimeFormat}" />
+                                        </h:outputText>
+                                    </p:column>
+                                    <p:column headerText="Settled By" sortBy="#{b.creater.webUserPerson.name}" filterBy="#{b.creater.webUserPerson.name}" filterMatchMode="contains">
+                                        <h:outputText value="#{b.paymentGeneratedBy.webUserPerson.name}">
                                         </h:outputText>
-                                        <f:facet name="footer">
-                                            <h:outputText value="#{supplierPaymentController.balance}">
-                                                <f:convertNumber pattern="#,##0.00;(#,##0.00)" />
-                                            </h:outputText>
-                                        </f:facet>
                                     </p:column>
 
                                     <p:column  headerText="Actions" >
                                         <p:commandButton
                                             rendered="#{configOptionApplicationController.getBooleanValueByKey('Approval is necessary for Procument Payments', false)}"
-                                            value="Prepare Payment" 
+                                            value="Complete Payment" 
                                             update="@form" 
-                                            action="#{supplierPaymentController.navigateToPrepareSupplierPayment(b)}" 
+                                            action="#{supplierPaymentController.navigateToSettleSupplierPayment(b)}" 
                                             ajax="false" 
                                             disabled="#{b.referenceBill.billTypeAtomic eq 'SUPPLIER_PAYMENT' or b.paidAmount ne 0.0}" >
                                         </p:commandButton>
diff --git a/src/main/webapp/dealerPayment/list_bills_to_generate_supplier_payments.xhtml b/src/main/webapp/dealerPayment/list_bills_to_generate_supplier_payments.xhtml
index ccd537ce36..dbaba06875 100644
--- a/src/main/webapp/dealerPayment/list_bills_to_generate_supplier_payments.xhtml
+++ b/src/main/webapp/dealerPayment/list_bills_to_generate_supplier_payments.xhtml
@@ -30,6 +30,8 @@
                                             class="w-100" inputStyleClass="w-100">
 
                                 </p:calendar>
+                                
+                                <p:separator></p:separator>
 
                                 <p:commandButton 
                                     value="Pharmacy Credit Bills to Generate Payments" 
@@ -57,15 +59,15 @@
 
                                 <p:commandButton 
                                     value="Generate for All Selected Bills" 
-                                    action="#{supplierPaymentController.navigateToStartSupplierPaymentOfSelectedBills()}" 
+                                    action="#{supplierPaymentController.navigateToPrepareSupplierPaymentForAllSelectedBills()}" 
                                     ajax="false" 
                                     icon="fas fa-hand-point-right" 
                                     class="my-1 w-100  ui-button-success" />
 
-                                <p:separator></p:separator>
+                                <p:separator rendered="#{webUserController.hasPrivilege('Developers') and false}"></p:separator>
 
                                 <p:commandButton 
-                                    rendered="#{webUserController.hasPrivilege('Developers')}"
+                                    rendered="#{webUserController.hasPrivilege('Developers') and false}"
                                     value="List GRNs to Settle Payment (Old Method for Developers to Cross Check)" 
                                     action="#{supplierPaymentController.fillPharmacyDue}" 
                                     ajax="false"  
@@ -160,14 +162,24 @@
                                         </f:facet>
                                     </p:column>
 
-                                    <p:column  headerText="Actions" >
+                                    <p:column styleClass="text-center"  headerText="Actions" width="20em">
+                                        <p:commandButton 
+                                            value="View" 
+                                            icon="pi pi-eye"
+                                            class="ui-button-primary mx-1"
+                                            style="width:6em;"
+                                            action="#{supplierPaymentController.navigateToViewProcurementBill(b)}" 
+                                            ajax="false" >
+                                        </p:commandButton>
                                         <p:commandButton
                                             rendered="#{configOptionApplicationController.getBooleanValueByKey('Approval is necessary for Procument Payments', false)}"
                                             value="Prepare Payment" 
-                                            update="@form" 
                                             action="#{supplierPaymentController.navigateToPrepareSupplierPayment(b)}" 
                                             ajax="false" 
-                                            disabled="#{b.referenceBill.billTypeAtomic eq 'SUPPLIER_PAYMENT' or b.paidAmount ne 0.0}" >
+                                            icon="pi pi-check"
+                                            style="width:12em;"
+                                            class="ui-button-success mx-1"
+                                            disabled="#{b.balance lt 0.01}" >
                                         </p:commandButton>
                                     </p:column>
                                 </p:dataTable>
diff --git a/src/main/webapp/opd_search_bill_full_paid.xhtml b/src/main/webapp/opd_search_bill_full_paid.xhtml
index 43dce4298e..da18588185 100644
--- a/src/main/webapp/opd_search_bill_full_paid.xhtml
+++ b/src/main/webapp/opd_search_bill_full_paid.xhtml
@@ -59,7 +59,7 @@
                                         </p:column>
                                         <p:column headerText="Billed At"  >
                                             <h:outputLabel value="#{bill.createdAt}" >
-                                                <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                                                <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                                             </h:outputLabel>
                                             <br/>
                                             <h:panelGroup rendered="#{bill.cancelled}" >
diff --git a/src/main/webapp/opd_search_bill_full_paid_bills.xhtml b/src/main/webapp/opd_search_bill_full_paid_bills.xhtml
index ad9ae1e143..95567cddfc 100644
--- a/src/main/webapp/opd_search_bill_full_paid_bills.xhtml
+++ b/src/main/webapp/opd_search_bill_full_paid_bills.xhtml
@@ -70,7 +70,7 @@
                                         </p:column>
                                         <p:column headerText="Billed At"  >
                                             <h:outputLabel value="#{bill.createdAt}" >
-                                                <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                                                <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                                             </h:outputLabel>
                                             <br/>
                                             <h:panelGroup rendered="#{bill.cancelled}" >
diff --git a/src/main/webapp/opd_search_bill_to_pay.xhtml b/src/main/webapp/opd_search_bill_to_pay.xhtml
index 02d39a842f..1d6ca94766 100644
--- a/src/main/webapp/opd_search_bill_to_pay.xhtml
+++ b/src/main/webapp/opd_search_bill_to_pay.xhtml
@@ -70,7 +70,7 @@
                                     </p:column>
                                     <p:column headerText="Billed At"  >
                                         <h:outputLabel value="#{bill.createdAt}" >
-                                            <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                                            <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                                         </h:outputLabel>
                                         <br/>
                                         <h:panelGroup rendered="#{bill.cancelled}" >
diff --git a/src/main/webapp/pharmacy/pharmacy_report_grn_registory.xhtml b/src/main/webapp/pharmacy/pharmacy_report_grn_registory.xhtml
index a1fa988802..7ee2721d51 100644
--- a/src/main/webapp/pharmacy/pharmacy_report_grn_registory.xhtml
+++ b/src/main/webapp/pharmacy/pharmacy_report_grn_registory.xhtml
@@ -84,7 +84,7 @@
                                         <p:outputLabel value="GRN Date" />
                                     </f:facet>
                                     <h:outputLabel value="#{bill.createdAt}" >
-                                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                                     </h:outputLabel>
                                 </p:column>                 
                                 <p:column>
diff --git a/src/main/webapp/pharmacy/pharmacy_report_institution_movement_by_persentage.xhtml b/src/main/webapp/pharmacy/pharmacy_report_institution_movement_by_persentage.xhtml
index 91733fdd92..55782c41a4 100644
--- a/src/main/webapp/pharmacy/pharmacy_report_institution_movement_by_persentage.xhtml
+++ b/src/main/webapp/pharmacy/pharmacy_report_institution_movement_by_persentage.xhtml
@@ -27,10 +27,10 @@
                             <h:inputText value="#{pharmacyController.persentage}" />
                             <h:outputLabel value="From" ></h:outputLabel>
                             <p:calendar value="#{pharmacyController.fromDate}"
-                                        pattern="dd MM yyyy hh mm a" ></p:calendar>
+                                        pattern="#{sessionController.applicationPreference.longDateTimeFormat}" ></p:calendar>
                             <h:outputLabel value="To" ></h:outputLabel>
                             <p:calendar value="#{pharmacyController.toDate}"
-                                        pattern="dd MM yyyy hh mm a" ></p:calendar>
+                                        pattern="#{sessionController.applicationPreference.longDateTimeFormat}" ></p:calendar>
                             <h:outputLabel value="" ></h:outputLabel>
                             <p:commandButton ajax="false" value="Average By Date"
                                             actionListener="#{pharmacyController.averageByDatePercentage()}" ></p:commandButton>
diff --git a/src/main/webapp/pharmacy/pharmacy_search_purcharse_GRN_bill.xhtml b/src/main/webapp/pharmacy/pharmacy_search_purcharse_GRN_bill.xhtml
index 0352249273..251524bb03 100644
--- a/src/main/webapp/pharmacy/pharmacy_search_purcharse_GRN_bill.xhtml
+++ b/src/main/webapp/pharmacy/pharmacy_search_purcharse_GRN_bill.xhtml
@@ -82,7 +82,7 @@
                             <p:column headerText="Billed at"  >
                                 <h:commandLink action="pharmacy_reprint_purchase" >
                                     <h:outputLabel value="#{bill.createdAt}" >
-                                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                                     </h:outputLabel>
                                     <f:setPropertyActionListener value="#{bill}" target="#{pharmacyBillSearch.bill}"/>
                                 </h:commandLink>
diff --git a/src/main/webapp/pharmacy/pharmacy_search_purcharse_bill.xhtml b/src/main/webapp/pharmacy/pharmacy_search_purcharse_bill.xhtml
index 5623f6fa61..bad2bbaee4 100644
--- a/src/main/webapp/pharmacy/pharmacy_search_purcharse_bill.xhtml
+++ b/src/main/webapp/pharmacy/pharmacy_search_purcharse_bill.xhtml
@@ -112,7 +112,7 @@
                             <p:column headerText="Billed At"  >
                                 <h:commandLink action="pharmacy_reprint_purchase" >
                                     <h:outputLabel value="#{bill.createdAt}" >
-                                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                                     </h:outputLabel>
                                     <f:setPropertyActionListener value="#{bill}" target="#{pharmacyController.bill}"/>
                                 </h:commandLink>
diff --git a/src/main/webapp/pharmacy/pharmacy_search_purcharse_bill_1.xhtml b/src/main/webapp/pharmacy/pharmacy_search_purcharse_bill_1.xhtml
index 380f5641ec..45e7e15894 100644
--- a/src/main/webapp/pharmacy/pharmacy_search_purcharse_bill_1.xhtml
+++ b/src/main/webapp/pharmacy/pharmacy_search_purcharse_bill_1.xhtml
@@ -71,7 +71,7 @@
                             <p:column headerText="Billed at"  >
                                 <h:commandLink action="pharmacy_reprint_purchase" >
                                     <h:outputLabel value="#{bill.createdAt}" >
-                                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                                     </h:outputLabel>
                                     <f:setPropertyActionListener value="#{bill}" target="#{pharmacyBillSearch.bill}"/>
                                 </h:commandLink>
diff --git a/src/main/webapp/pharmacy/report_prescreption.xhtml b/src/main/webapp/pharmacy/report_prescreption.xhtml
index 73ab2f6732..77e14b35d3 100644
--- a/src/main/webapp/pharmacy/report_prescreption.xhtml
+++ b/src/main/webapp/pharmacy/report_prescreption.xhtml
@@ -65,7 +65,7 @@
 
                             <p:column headerText="Billed at"  >
                                 <h:outputLabel value="#{bill.createdAt}" >
-                                    <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                                 </h:outputLabel>
 
                                 <br/>
diff --git a/src/main/webapp/resources/bill/grnCheque.xhtml b/src/main/webapp/resources/bill/grnCheque.xhtml
index ca4a143856..7f4e775b6a 100644
--- a/src/main/webapp/resources/bill/grnCheque.xhtml
+++ b/src/main/webapp/resources/bill/grnCheque.xhtml
@@ -67,7 +67,7 @@
                                     <h:outputLabel value="#{cc.attrs.bill.toInstitution.name}"/>
                                     <h:outputLabel value="Date :"  style="position: relative; left: 70%;" />
                                     <h:outputLabel value="#{cc.attrs.bill.createdAt}"  style="position: relative; left: 70%;" >
-                                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                                     </h:outputLabel>
 
                                 </div>
diff --git a/src/main/webapp/resources/bill/grn_payment.xhtml b/src/main/webapp/resources/bill/grn_payment.xhtml
index 07d1daf01c..0283fab25d 100644
--- a/src/main/webapp/resources/bill/grn_payment.xhtml
+++ b/src/main/webapp/resources/bill/grn_payment.xhtml
@@ -33,7 +33,7 @@
                     <h:outputLabel value="#{cc.attrs.bill.toInstitution.name}"/>
                     <h:outputLabel value="Date :"  style="position: relative; left: 70%;" />
                     <h:outputLabel value="#{cc.attrs.bill.createdAt}"  style="position: relative; left: 70%;" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     
                 </div>
diff --git a/src/main/webapp/resources/bill/supplier_payment_approval.xhtml b/src/main/webapp/resources/bill/supplier_payment_approval.xhtml
index 20b5dd1dba..650638e498 100644
--- a/src/main/webapp/resources/bill/supplier_payment_approval.xhtml
+++ b/src/main/webapp/resources/bill/supplier_payment_approval.xhtml
@@ -14,76 +14,125 @@
 
     <!-- IMPLEMENTATION -->
     <cc:implementation>
+        <h:outputStylesheet library="css" name="pharmacyA4.css"/>
 
-        <div >
-            <div >
-                <div >
-
-                    <h:outputStylesheet name="printing.css" library="css" />
-                    <div class="d-flex justify-content-end">
-                        <p:commandButton 
-                            style="width: 100px" 
-                            value="Print" 
-                            ajax="false" 
-                            action="#"  
-                            class="ui-button-info mb-2"
-                            icon="fa fa-print">
-                            <p:printer target="gpBillPreview" ></p:printer>
-                        </p:commandButton>
-                    </div>
-
-                    <cc:implementation>
-                        <h:outputStylesheet library="css" name="pharmacyA4.css"/>
-
-                        <div  >
+        <h:panelGroup id="gpBillPreview" >
+            <div  >
+                <div class="institutionName">
+                    <h:outputLabel value="#{cc.attrs.bill.creater.department.printingName}"/>
+                </div>
+                <div class="institutionName">
+                    <h:outputLabel value="#{cc.attrs.bill.department.name}"/>
+                </div>
 
-                            <div class="institutionName">
-                                <h:outputLabel value="#{cc.attrs.bill.creater.department.printingName}"/>
-                            </div>
-                            <div class="institutionName">
-                                <h:outputLabel value="#{cc.attrs.bill.department.name}"/>
-                            </div>
+                <div>
+                    <h4 style="color: #000000; text-align: center " >
+                        <h:outputLabel value="Supplier Payment Approval" style="text-decoration: underline;"/>
+                    </h4>
+                </div>
 
-                            <div>
-                                <h4 style="color: #000000; text-align: center " >
-                                    <h:outputLabel value="Supplier Payment Approval" style="text-decoration: underline;"/>
-                                </h4>
-                            </div>
+                <div class="row" >
+                    <div class="col-md-4 p-1" >
+                        <h:panelGrid columns="2" columnClasses="text-start, text-end" >
+                            <h:outputLabel value="Payee : " />
+                            <h:outputLabel value="#{cc.attrs.bill.toInstitution.name}"/>
+                            <h:outputLabel value="Payment No : " />
+                            <h:outputLabel value="#{cc.attrs.bill.insId}"/>
+                            <h:outputLabel value="Total : " />
+                            <h:outputLabel value="#{cc.attrs.bill.total}" >
+                                <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                            </h:outputLabel>
+                            <h:outputLabel value="Discount : " />
+                            <h:outputLabel value="#{cc.attrs.bill.discount}" >
+                                <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                            </h:outputLabel>
+                            <h:outputLabel value="Net : " />
+                            <h:outputLabel value="#{cc.attrs.bill.netTotal}" >
+                                <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
+                            </h:outputLabel>
+                        </h:panelGrid>
+                    </div>
+                    <div class="col-md-4 p-1" >
+                        <h:panelGrid columns="2" columnClasses="text-start, text-end" >
+                            <h:outputLabel value="Prepaired By : " />
+                            <h:outputLabel value="#{cc.attrs.bill.creater.webUserPerson.name}" >
+                            </h:outputLabel>
+                            <h:outputLabel value="Comments : " />
+                            <h:outputLabel value="#{cc.attrs.bill.comments}" >
+                            </h:outputLabel>
+                            <h:outputLabel value="Prepaired at :"  />
+                            <h:outputLabel value="#{cc.attrs.bill.createdAt}"  >
+                                <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
+                            </h:outputLabel>
+                        </h:panelGrid>
+                    </div>
 
+                    <div class="col-md-4 p-1" >
+                        <h:panelGrid columns="2" columnClasses="text-start, text-end" >
+                            <h:outputLabel value="Approved By : " />
+                            <h:outputLabel value="#{cc.attrs.bill.paymentApprovedBy.webUserPerson.name}" >
+                            </h:outputLabel>
+                            <h:outputLabel value="Comments : " />
+                            <h:outputLabel value="#{cc.attrs.bill.paymentApprovalComments}" >
+                            </h:outputLabel>
+                            <h:outputLabel value="Prepaired at :"  />
+                            <h:outputLabel value="#{cc.attrs.bill.paymentApprovedAt}"  >
+                                <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
+                            </h:outputLabel>
+                        </h:panelGrid>
+                    </div>
+                </div>
 
-                            <p:panelGrid columns="2" >
-                                <h:outputLabel value="Payee : " />
-                                <h:outputLabel value="#{cc.attrs.bill.toInstitution.name}"/>
-                                <h:outputLabel value="Date :"  />
-                                <h:outputLabel value="#{cc.attrs.bill.createdAt}"  >
-                                    <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
-                                </h:outputLabel>
-                                <h:outputLabel value="Total : " />
-                                <h:outputLabel value="#{cc.attrs.bill.total}" >
-                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
-                                </h:outputLabel>
-                                <h:outputLabel value="Discount : " />
-                                <h:outputLabel value="#{cc.attrs.bill.discount}" >
-                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
-                                </h:outputLabel>
-                                <h:outputLabel value="Net : " />
-                                <h:outputLabel value="#{cc.attrs.bill.netTotal}" >
-                                    <f:convertNumber pattern="#,##0.00" ></f:convertNumber>
-                                </h:outputLabel>
-                                <h:outputLabel value="Prepaired By : " />
-                                <h:outputLabel value="#{cc.attrs.bill.creater.webUserPerson.name}" >
-                                </h:outputLabel>
-                            </p:panelGrid>
 
 
 
+                <p:dataTable  
+                    value="#{cc.attrs.bill.billItems}"
+                    var="b" 
+                    id="itms" 
+                    styleClass="ui-datatable-borderless ui-datatable-sm compact-datatable"
+                    rowIndexVar="n"
+                    rowKey="#{b.searialNo}" >
+                    <p:column width="2em">  
+                        <f:facet name="header">
+                            <h:outputLabel value="No"/>                                  
+                        </f:facet>      
+                        <p:outputLabel value="#{n+1}"/>
+                    </p:column> 
+                    <p:column  class="text-end">  
+                        <f:facet name="header">
+                            <h:outputLabel value="GRN No"/>                                  
+                        </f:facet>      
+                        <p:outputLabel value="#{b.referenceBill.deptId}"/>
+                    </p:column> 
+                    <p:column  class="text-end">  
+                        <f:facet name="header">
+                            <h:outputLabel value="Invoice No"/>                                  
+                        </f:facet>       
+                        <p:outputLabel value="#{b.referenceBill.invoiceNumber}"></p:outputLabel>
+                    </p:column> 
+                    <p:column headerText="GRN Amount" class="text-end">
+                        <p:outputLabel value="#{b.referenceBill.netTotal}">
+                            <f:convertNumber pattern="#,##0.00" />
+                        </p:outputLabel>
+                    </p:column>
+                    <p:column headerText="GRN Return Amount" class="text-end">
+                        <p:outputLabel value="#{b.referenceBill.tmpReturnTotal}">
+                            <f:convertNumber pattern="#,##0.00" />
+                        </p:outputLabel>
+                    </p:column>
+                    <p:column headerText="Paying Amount" class="text-end">
+                        <p:outputLabel 
+                            value="#{b.netValue}">    
+                            <f:convertNumber pattern="#,##0.00" />
+                        </p:outputLabel>
+                    </p:column>
+                </p:dataTable>
 
 
-                        </div>
-                    </cc:implementation>
-                </div>
             </div>
-        </div>
+
+        </h:panelGroup>
 
 
     </cc:implementation>
diff --git a/src/main/webapp/resources/bill/supplier_payment_preperation.xhtml b/src/main/webapp/resources/bill/supplier_payment_preperation.xhtml
index bef9d822eb..2e156b4426 100644
--- a/src/main/webapp/resources/bill/supplier_payment_preperation.xhtml
+++ b/src/main/webapp/resources/bill/supplier_payment_preperation.xhtml
@@ -56,7 +56,7 @@
                                 <h:outputLabel value="#{cc.attrs.bill.toInstitution.name}"/>
                                 <h:outputLabel value="Date :"  />
                                 <h:outputLabel value="#{cc.attrs.bill.createdAt}"  >
-                                    <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                                 </h:outputLabel>
                                 <h:outputLabel value="Total : " />
                                 <h:outputLabel value="#{cc.attrs.bill.total}" >
@@ -76,7 +76,56 @@
                             </p:panelGrid>
 
 
-
+                            <p:dataTable  
+                                value="#{cc.attrs.bill.billItems}"
+                                var="b" 
+                                id="itms" 
+                                rowIndexVar="n"
+                                rowKey="#{b.searialNo}" >
+                                <p:column >  
+                                    <f:facet name="header">
+                                        <h:outputLabel value="No"/>                                  
+                                    </f:facet>      
+                                    <p:outputLabel value="#{n+1}"/>
+                                </p:column> 
+                                <p:column >  
+                                    <f:facet name="header">
+                                        <h:outputLabel value="GRN No"/>                                  
+                                    </f:facet>      
+                                    <p:outputLabel value="#{b.referenceBill.deptId}"/>
+                                </p:column> 
+                                <p:column >  
+                                    <f:facet name="header">
+                                        <h:outputLabel value="Invoice No"/>                                  
+                                    </f:facet>       
+                                    <p:outputLabel value="#{b.referenceBill.invoiceNumber}"></p:outputLabel>
+                                </p:column> 
+                                <p:column headerText="GRN Amount">
+                                    <p:outputLabel value="#{b.referenceBill.netTotal}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </p:outputLabel>
+                                </p:column>
+                                <p:column headerText="GRN Return Amount">
+                                    <p:outputLabel value="#{b.referenceBill.tmpReturnTotal}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </p:outputLabel>
+                                </p:column>
+                                <p:column headerText="Paying Amount">
+                                    <p:inputText 
+                                        class="w-100 text-end"
+                                        autocomplete="off"
+                                        onfocus="this.select();"
+                                        value="#{b.netValue}">    
+                                        <f:convertNumber pattern="#,##0.00" />
+
+                                        <f:ajax 
+                                            event="blur" 
+                                            execute="@this" 
+                                            render="@all" 
+                                            listener="#{supplierPaymentController.changeNetValueListener(b)}"/>
+                                    </p:inputText>
+                                </p:column>
+                            </p:dataTable>
 
 
                         </div>
diff --git a/src/main/webapp/resources/ezcomp/midding_data_fields.xhtml b/src/main/webapp/resources/ezcomp/midding_data_fields.xhtml
index ae805e7c95..7d7e51ce90 100644
--- a/src/main/webapp/resources/ezcomp/midding_data_fields.xhtml
+++ b/src/main/webapp/resources/ezcomp/midding_data_fields.xhtml
@@ -35,7 +35,8 @@
 
                 <p:outputLabel value="Data table Create SQL statement" ></p:outputLabel>
                 <p:inputTextarea 
-                    rows="2"
+                    rows="6"
+                    autoResize="false"
                     value="#{dataAdministrationController.createdSql}" 
                     class="w-100"/>
 
@@ -47,7 +48,8 @@
 
                 <p:outputLabel value="SQL to Run" ></p:outputLabel>
                 <p:inputTextarea
-                    rows="2"
+                    rows="6"
+                    autoResize="false"
                     value="#{dataAdministrationController.suggestedSql}" 
                     class="w-100"/>
 
@@ -59,7 +61,8 @@
 
                 <p:outputLabel value="Execution Feedback" ></p:outputLabel>
                 <p:inputTextarea
-                    rows="2"
+                    rows="6"
+                    autoResize="false"
                     value="#{dataAdministrationController.executionFeedback}" 
                     readonly="true"
                     class="w-100"/>
diff --git a/src/main/webapp/resources/inward/breakDown/outSideCharges.xhtml b/src/main/webapp/resources/inward/breakDown/outSideCharges.xhtml
index 2524c3f5c2..aedf48ba1b 100644
--- a/src/main/webapp/resources/inward/breakDown/outSideCharges.xhtml
+++ b/src/main/webapp/resources/inward/breakDown/outSideCharges.xhtml
@@ -23,7 +23,7 @@
             </p:column>
             <p:column headerText="Added Date" style="text-align: center;">
                 <h:outputLabel value="#{bil.createdAt}">
-                    <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                 </h:outputLabel>
             </p:column>
             <p:column headerText="Added Time" style="text-align: center;">
diff --git a/src/main/webapp/resources/pharmacy/adjustmentBill.xhtml b/src/main/webapp/resources/pharmacy/adjustmentBill.xhtml
index 41037ec870..6bf9e0b1ce 100644
--- a/src/main/webapp/resources/pharmacy/adjustmentBill.xhtml
+++ b/src/main/webapp/resources/pharmacy/adjustmentBill.xhtml
@@ -53,7 +53,7 @@
 
                         <td>
                             <h:outputLabel value="#{cc.attrs.bill.createdAt}">
-                                <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                                <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                             </h:outputLabel >
                         </td>
 
diff --git a/src/main/webapp/resources/pharmacy/adjustmentBill_Single.xhtml b/src/main/webapp/resources/pharmacy/adjustmentBill_Single.xhtml
index f557c0395a..25239b58fc 100644
--- a/src/main/webapp/resources/pharmacy/adjustmentBill_Single.xhtml
+++ b/src/main/webapp/resources/pharmacy/adjustmentBill_Single.xhtml
@@ -53,7 +53,7 @@
 
                         <td>
                             <h:outputLabel value="#{cc.attrs.bill.createdAt}">
-                                <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                                <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                             </h:outputLabel >
                         </td>
 
diff --git a/src/main/webapp/resources/pharmacy/adjustmentBill_expiry_date.xhtml b/src/main/webapp/resources/pharmacy/adjustmentBill_expiry_date.xhtml
index 6a9a1ed75c..319db82943 100644
--- a/src/main/webapp/resources/pharmacy/adjustmentBill_expiry_date.xhtml
+++ b/src/main/webapp/resources/pharmacy/adjustmentBill_expiry_date.xhtml
@@ -29,7 +29,7 @@
 
                 <h:outputLabel value="Adjusted At  "/>
                 <h:outputLabel value="#{cc.attrs.bill.createdAt}">
-                    <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                 </h:outputLabel >
 
                 <h:outputLabel value="Adjusted By  "/>
diff --git a/src/main/webapp/resources/pharmacy/adjustmentBill_purchase_price.xhtml b/src/main/webapp/resources/pharmacy/adjustmentBill_purchase_price.xhtml
index 0807f16da4..14abe71491 100644
--- a/src/main/webapp/resources/pharmacy/adjustmentBill_purchase_price.xhtml
+++ b/src/main/webapp/resources/pharmacy/adjustmentBill_purchase_price.xhtml
@@ -29,7 +29,7 @@
 
                 <h:outputLabel value="Adjusted At  "/>
                 <h:outputLabel value="#{cc.attrs.bill.createdAt}">
-                    <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                 </h:outputLabel >
 
                 <h:outputLabel value="Adjusted By  "/>
diff --git a/src/main/webapp/resources/pharmacy/adjustmentBill_sale_price.xhtml b/src/main/webapp/resources/pharmacy/adjustmentBill_sale_price.xhtml
index 11ecb8562d..33959136e7 100644
--- a/src/main/webapp/resources/pharmacy/adjustmentBill_sale_price.xhtml
+++ b/src/main/webapp/resources/pharmacy/adjustmentBill_sale_price.xhtml
@@ -29,7 +29,7 @@
 
                 <h:outputLabel value="Adjusted At  "/>
                 <h:outputLabel value="#{cc.attrs.bill.createdAt}">
-                    <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                 </h:outputLabel >
 
                 <h:outputLabel value="Adjusted By  "/>
diff --git a/src/main/webapp/resources/pharmacy/adjustmentBill_wholesale_price.xhtml b/src/main/webapp/resources/pharmacy/adjustmentBill_wholesale_price.xhtml
index 7a1a4772cc..3ef15cf52e 100644
--- a/src/main/webapp/resources/pharmacy/adjustmentBill_wholesale_price.xhtml
+++ b/src/main/webapp/resources/pharmacy/adjustmentBill_wholesale_price.xhtml
@@ -29,7 +29,7 @@
 
                 <h:outputLabel value="Adjusted At  "/>
                 <h:outputLabel value="#{cc.attrs.bill.createdAt}">
-                    <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                 </h:outputLabel >
 
                 <h:outputLabel value="Adjusted By  "/>
diff --git a/src/main/webapp/resources/pharmacy/search/adjustment.xhtml b/src/main/webapp/resources/pharmacy/search/adjustment.xhtml
index 5f04525955..2087af1af2 100644
--- a/src/main/webapp/resources/pharmacy/search/adjustment.xhtml
+++ b/src/main/webapp/resources/pharmacy/search/adjustment.xhtml
@@ -38,7 +38,7 @@
             <p:column headerText="Billed at"  >
 
                 <h:outputLabel value="#{bill.createdAt}" >
-                    <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                 </h:outputLabel>
                 <br/>
                 <h:panelGroup rendered="#{bill.cancelled}" >
diff --git a/src/main/webapp/resources/pharmacy/search/grn.xhtml b/src/main/webapp/resources/pharmacy/search/grn.xhtml
index 6dd1c31042..f624e55ede 100644
--- a/src/main/webapp/resources/pharmacy/search/grn.xhtml
+++ b/src/main/webapp/resources/pharmacy/search/grn.xhtml
@@ -77,7 +77,7 @@
             <p:column headerText="Billed at"  >
                 <h:commandLink action="/pharmacy/pharmacy_reprint_grn" >
                     <h:outputLabel value="#{bill.createdAt}" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     <f:setPropertyActionListener value="#{bill}" target="#{pharmacyBillSearch.bill}"/>
                 </h:commandLink>
diff --git a/src/main/webapp/resources/pharmacy/search/grn_payment.xhtml b/src/main/webapp/resources/pharmacy/search/grn_payment.xhtml
index 7ac44a9191..27ce2a560c 100644
--- a/src/main/webapp/resources/pharmacy/search/grn_payment.xhtml
+++ b/src/main/webapp/resources/pharmacy/search/grn_payment.xhtml
@@ -87,7 +87,7 @@
             <p:column headerText="Billed at"  >
                 <h:commandLink action="/dealerPayment/bill_dealor_all" value="#{bill.createdAt}">
                     <h:outputLabel value="#{bill.createdAt}" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     <f:setPropertyActionListener value="#{bill}" target="#{supplierPaymentController.current}"/>
                     <f:setPropertyActionListener value="#{bill.billItems}" target="#{supplierPaymentController.billItems}"/>
diff --git a/src/main/webapp/resources/pharmacy/search/grn_return.xhtml b/src/main/webapp/resources/pharmacy/search/grn_return.xhtml
index cd544f6391..13752d2322 100644
--- a/src/main/webapp/resources/pharmacy/search/grn_return.xhtml
+++ b/src/main/webapp/resources/pharmacy/search/grn_return.xhtml
@@ -52,7 +52,7 @@
             <p:column headerText="Billed at"  >
                 <h:commandLink action="/pharmacy/pharmacy_reprint_grn_return" >
                     <h:outputLabel value="#{bill.createdAt}" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     <f:setPropertyActionListener value="#{bill}" target="#{pharmacyBillSearch.bill}"/>
                 </h:commandLink>
diff --git a/src/main/webapp/resources/pharmacy/search/grn_return_without_traising.xhtml b/src/main/webapp/resources/pharmacy/search/grn_return_without_traising.xhtml
index 307ece20cf..0958c5039d 100644
--- a/src/main/webapp/resources/pharmacy/search/grn_return_without_traising.xhtml
+++ b/src/main/webapp/resources/pharmacy/search/grn_return_without_traising.xhtml
@@ -46,7 +46,7 @@
             <p:column headerText="Billed at"  >
                 <h:commandLink action="/pharmacy/pharmacy_return_withouttresing" >
                     <h:outputLabel value="#{bill.createdAt}" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     <f:setPropertyActionListener value="#{bill}" target="#{pharmacyReturnwithouttresing.printBill}"/>
                     <f:setPropertyActionListener value="true" target="#{pharmacyReturnwithouttresing.billPreview}"/>
diff --git a/src/main/webapp/resources/pharmacy/search/pharmacy_whole_sale.xhtml b/src/main/webapp/resources/pharmacy/search/pharmacy_whole_sale.xhtml
index 3d2882a665..15ed715ae0 100644
--- a/src/main/webapp/resources/pharmacy/search/pharmacy_whole_sale.xhtml
+++ b/src/main/webapp/resources/pharmacy/search/pharmacy_whole_sale.xhtml
@@ -44,7 +44,7 @@
             <p:column headerText="Billed at"  >
 
                 <h:outputLabel value="#{bill.createdAt}" >
-                    <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                 </h:outputLabel>
                 <br/>
                 <h:panelGroup rendered="#{bill.cancelled}" >
diff --git a/src/main/webapp/resources/pharmacy/search/po_approve.xhtml b/src/main/webapp/resources/pharmacy/search/po_approve.xhtml
index 6b01194f64..80526849df 100644
--- a/src/main/webapp/resources/pharmacy/search/po_approve.xhtml
+++ b/src/main/webapp/resources/pharmacy/search/po_approve.xhtml
@@ -64,7 +64,7 @@
             <p:column headerText="Billed at"  >
                 <h:commandLink action="pharmacy_reprint_grn_return" >
                     <h:outputLabel value="#{bill.createdAt}" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     <f:setPropertyActionListener value="#{bill}" target="#{pharmacyBillSearch.bill}"/>
                 </h:commandLink>
diff --git a/src/main/webapp/resources/pharmacy/search/po_request.xhtml b/src/main/webapp/resources/pharmacy/search/po_request.xhtml
index 6a3d16a546..7fea476090 100644
--- a/src/main/webapp/resources/pharmacy/search/po_request.xhtml
+++ b/src/main/webapp/resources/pharmacy/search/po_request.xhtml
@@ -52,7 +52,7 @@
             <p:column headerText="Billed at"  >
                 <h:commandLink action="pharmacy_reprint_order_request" >
                     <h:outputLabel value="#{bill.createdAt}" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     <f:setPropertyActionListener value="#{bill}" target="#{pharmacyBillSearch.bill}"/>
                 </h:commandLink>
diff --git a/src/main/webapp/resources/pharmacy/search/pre_bill.xhtml b/src/main/webapp/resources/pharmacy/search/pre_bill.xhtml
index 450cf12c11..8be733e3ff 100644
--- a/src/main/webapp/resources/pharmacy/search/pre_bill.xhtml
+++ b/src/main/webapp/resources/pharmacy/search/pre_bill.xhtml
@@ -44,7 +44,7 @@
             <p:column headerText="Billed at"  >
                 <h:commandLink action="pharmacy_reprint_bill_pre" >
                     <h:outputLabel value="#{bill.createdAt}" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     <f:setPropertyActionListener value="#{bill}" target="#{pharmacyBillSearch.bill}"/>
                 </h:commandLink>
diff --git a/src/main/webapp/resources/pharmacy/search/purchase.xhtml b/src/main/webapp/resources/pharmacy/search/purchase.xhtml
index d367a71f31..3944ca3124 100644
--- a/src/main/webapp/resources/pharmacy/search/purchase.xhtml
+++ b/src/main/webapp/resources/pharmacy/search/purchase.xhtml
@@ -56,7 +56,7 @@
             <p:column headerText="Billed at"  >
                 <h:commandLink action="pharmacy_reprint_purchase" >
                     <h:outputLabel value="#{bill.createdAt}" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     <f:setPropertyActionListener value="#{bill}" target="#{pharmacyBillSearch.bill}"/>
                 </h:commandLink>
diff --git a/src/main/webapp/resources/pharmacy/search/purchase_return.xhtml b/src/main/webapp/resources/pharmacy/search/purchase_return.xhtml
index 7ce44a9aa1..937a288479 100644
--- a/src/main/webapp/resources/pharmacy/search/purchase_return.xhtml
+++ b/src/main/webapp/resources/pharmacy/search/purchase_return.xhtml
@@ -78,7 +78,7 @@
                 </f:facet>
                 <h:commandLink action="pharmacy_reprint_purchase_return" >
                     <h:outputLabel value="#{bill.createdAt}" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     <f:setPropertyActionListener value="#{bill}" target="#{pharmacyBillSearch.bill}"/>
                 </h:commandLink>
diff --git a/src/main/webapp/resources/pharmacy/search/sale.xhtml b/src/main/webapp/resources/pharmacy/search/sale.xhtml
index 15acf01cc7..3dfdce0989 100644
--- a/src/main/webapp/resources/pharmacy/search/sale.xhtml
+++ b/src/main/webapp/resources/pharmacy/search/sale.xhtml
@@ -48,7 +48,7 @@
             <p:column headerText="Billed at"  >
                 <h:commandLink action="pharmacy_reprint_bill_sale" >
                     <h:outputLabel value="#{bill.createdAt}" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     <f:setPropertyActionListener value="#{bill}" target="#{pharmacyBillSearch.bill}"/>
                 </h:commandLink>
diff --git a/src/main/webapp/resources/pharmacy/search/transfer_request.xhtml b/src/main/webapp/resources/pharmacy/search/transfer_request.xhtml
index b58cd35c40..beb635718e 100644
--- a/src/main/webapp/resources/pharmacy/search/transfer_request.xhtml
+++ b/src/main/webapp/resources/pharmacy/search/transfer_request.xhtml
@@ -45,7 +45,7 @@
             <p:column headerText="Requested at"  >
 
                 <h:outputLabel value="#{bill.createdAt}" >
-                    <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                 </h:outputLabel>
                 <br/>
                 <h:panelGroup rendered="#{bill.cancelled}" >
diff --git a/src/main/webapp/resources/store/adjustmentBill.xhtml b/src/main/webapp/resources/store/adjustmentBill.xhtml
index dca0574411..2a150fcb39 100644
--- a/src/main/webapp/resources/store/adjustmentBill.xhtml
+++ b/src/main/webapp/resources/store/adjustmentBill.xhtml
@@ -64,7 +64,7 @@
 
                     <h:outputLabel value="Adjusted At  "/>
                     <h:outputLabel value="#{cc.attrs.bill.createdAt}">
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel >
 
                     <h:outputLabel value="Adjusted By  "/>
diff --git a/src/main/webapp/resources/store/adjustmentBill_purchase_price.xhtml b/src/main/webapp/resources/store/adjustmentBill_purchase_price.xhtml
index 54df405d6b..f648cd5f15 100644
--- a/src/main/webapp/resources/store/adjustmentBill_purchase_price.xhtml
+++ b/src/main/webapp/resources/store/adjustmentBill_purchase_price.xhtml
@@ -65,7 +65,7 @@
 
                     <h:outputLabel value="Adjusted At  "/>
                     <h:outputLabel value="#{cc.attrs.bill.createdAt}">
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel >
 
                     <h:outputLabel value="Adjusted By  "/>
diff --git a/src/main/webapp/resources/store/adjustmentBill_sale_price.xhtml b/src/main/webapp/resources/store/adjustmentBill_sale_price.xhtml
index e039af5855..a2441f770f 100644
--- a/src/main/webapp/resources/store/adjustmentBill_sale_price.xhtml
+++ b/src/main/webapp/resources/store/adjustmentBill_sale_price.xhtml
@@ -66,7 +66,7 @@
 
                     <h:outputLabel value="Adjusted At  "/>
                     <h:outputLabel value="#{cc.attrs.bill.createdAt}">
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel >
 
                     <h:outputLabel value="Adjusted By  "/>
diff --git a/src/main/webapp/resources/store/adjustmentStaffStock_Bill.xhtml b/src/main/webapp/resources/store/adjustmentStaffStock_Bill.xhtml
index 5cd67ec0ee..25edf337a4 100644
--- a/src/main/webapp/resources/store/adjustmentStaffStock_Bill.xhtml
+++ b/src/main/webapp/resources/store/adjustmentStaffStock_Bill.xhtml
@@ -64,7 +64,7 @@
 
                     <h:outputLabel value="Adjusted At  "/>
                     <h:outputLabel value="#{cc.attrs.bill.createdAt}">
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel >
 
                     <h:outputLabel value="Adjusted By  "/>
diff --git a/src/main/webapp/resources/store/search/adjustment.xhtml b/src/main/webapp/resources/store/search/adjustment.xhtml
index 864cc9d3a2..c1315995c9 100644
--- a/src/main/webapp/resources/store/search/adjustment.xhtml
+++ b/src/main/webapp/resources/store/search/adjustment.xhtml
@@ -31,7 +31,7 @@
             <p:column headerText="Billed At"  >
 
                 <h:outputLabel value="#{bill.createdAt}" >
-                    <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                 </h:outputLabel>
                 <br/>
                 <h:panelGroup rendered="#{bill.cancelled}" >
diff --git a/src/main/webapp/resources/store/search/grn.xhtml b/src/main/webapp/resources/store/search/grn.xhtml
index 7ad6e1d343..ec6e1f75f8 100644
--- a/src/main/webapp/resources/store/search/grn.xhtml
+++ b/src/main/webapp/resources/store/search/grn.xhtml
@@ -66,7 +66,7 @@
             <p:column headerText="Billed At"  >
                 <h:commandLink action="store_reprint_grn" >
                     <h:outputLabel value="#{bill.createdAt}" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     <f:setPropertyActionListener value="#{bill}" target="#{storeBillSearch.bill}"/>
                 </h:commandLink>
diff --git a/src/main/webapp/resources/store/search/grn_return.xhtml b/src/main/webapp/resources/store/search/grn_return.xhtml
index 873b7becc5..4b97737c53 100644
--- a/src/main/webapp/resources/store/search/grn_return.xhtml
+++ b/src/main/webapp/resources/store/search/grn_return.xhtml
@@ -39,7 +39,7 @@
             <p:column headerText="Billed At"  >
                 <h:commandLink action="store_reprint_grn_return" >
                     <h:outputLabel value="#{bill.createdAt}" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     <f:setPropertyActionListener value="#{bill}" target="#{storeBillSearch.bill}"/>
                 </h:commandLink>
diff --git a/src/main/webapp/resources/store/search/po_approve.xhtml b/src/main/webapp/resources/store/search/po_approve.xhtml
index ddbc75de56..90cad672fb 100644
--- a/src/main/webapp/resources/store/search/po_approve.xhtml
+++ b/src/main/webapp/resources/store/search/po_approve.xhtml
@@ -51,7 +51,7 @@
             <p:column headerText="Billed At"  >
                 <h:commandLink action="store_reprint_grn_return" >
                     <h:outputLabel value="#{bill.createdAt}" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     <f:setPropertyActionListener value="#{bill}" target="#{storeBillSearch.bill}"/>
                 </h:commandLink>
diff --git a/src/main/webapp/resources/store/search/po_request.xhtml b/src/main/webapp/resources/store/search/po_request.xhtml
index eb61cbdf55..e9fdd8b6dd 100644
--- a/src/main/webapp/resources/store/search/po_request.xhtml
+++ b/src/main/webapp/resources/store/search/po_request.xhtml
@@ -39,7 +39,7 @@
             <p:column headerText="Billed At"  >
                 <h:commandLink action="store_reprint_order_request" >
                     <h:outputLabel value="#{bill.createdAt}" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     <f:setPropertyActionListener value="#{bill}" target="#{storeBillSearch.bill}"/>
                 </h:commandLink>
diff --git a/src/main/webapp/resources/store/search/pre_bill.xhtml b/src/main/webapp/resources/store/search/pre_bill.xhtml
index cc59d665e2..7642ad3d0a 100644
--- a/src/main/webapp/resources/store/search/pre_bill.xhtml
+++ b/src/main/webapp/resources/store/search/pre_bill.xhtml
@@ -35,7 +35,7 @@
             <p:column headerText="Billed At"  >
                 <h:commandLink action="store_reprint_bill_pre" >
                     <h:outputLabel value="#{bill.createdAt}" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     <f:setPropertyActionListener value="#{bill}" target="#{storeBillSearch.bill}"/>
                 </h:commandLink>
diff --git a/src/main/webapp/resources/store/search/purchase.xhtml b/src/main/webapp/resources/store/search/purchase.xhtml
index 69cb8c6376..e1955a26dc 100644
--- a/src/main/webapp/resources/store/search/purchase.xhtml
+++ b/src/main/webapp/resources/store/search/purchase.xhtml
@@ -27,7 +27,7 @@
             <p:column headerText="Billed At"  >
                 <h:commandLink action="store_reprint_purchase" >
                     <h:outputLabel value="#{bill.createdAt}" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     <f:setPropertyActionListener value="#{bill}" target="#{storeBillSearch.bill}"/>
                 </h:commandLink>
diff --git a/src/main/webapp/resources/store/search/purchase_return.xhtml b/src/main/webapp/resources/store/search/purchase_return.xhtml
index badc7c9132..4952fce933 100644
--- a/src/main/webapp/resources/store/search/purchase_return.xhtml
+++ b/src/main/webapp/resources/store/search/purchase_return.xhtml
@@ -67,7 +67,7 @@
                     </f:facet>
                     <h:commandLink action="store_reprint_purchase_return" >
                         <h:outputLabel value="#{bill.createdAt}" >
-                            <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                            <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                         </h:outputLabel>
                         <f:setPropertyActionListener value="#{bill}" target="#{storeBillSearch.bill}"/>
                     </h:commandLink>
diff --git a/src/main/webapp/resources/store/search/sale.xhtml b/src/main/webapp/resources/store/search/sale.xhtml
index 7384f6c035..db7d73f0d5 100644
--- a/src/main/webapp/resources/store/search/sale.xhtml
+++ b/src/main/webapp/resources/store/search/sale.xhtml
@@ -28,7 +28,7 @@
             <p:column headerText="Billed At"  >
                 <h:commandLink action="pharmacy_reprint_bill_sale" >
                     <h:outputLabel value="#{bill.createdAt}" >
-                        <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                     </h:outputLabel>
                     <f:setPropertyActionListener value="#{bill}" target="#{pharmacyBillSearch.bill}"/>
                 </h:commandLink>
diff --git a/src/main/webapp/resources/store/search/transfer_request.xhtml b/src/main/webapp/resources/store/search/transfer_request.xhtml
index 1595cf5a70..abbb821c66 100644
--- a/src/main/webapp/resources/store/search/transfer_request.xhtml
+++ b/src/main/webapp/resources/store/search/transfer_request.xhtml
@@ -34,7 +34,7 @@
             <p:column headerText="Requested At"  >
 
                 <h:outputLabel value="#{bill.createdAt}" >
-                    <f:convertDateTime pattern="dd MM yyyy hh mm a"/>
+                    <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"/>
                 </h:outputLabel>
                 <br/>
                 <h:panelGroup rendered="#{bill.cancelled}" >