From 9db9ec3720b7506749792c88a6b84afb36f4440a Mon Sep 17 00:00:00 2001
From: Senula88 <senulananayakkara88@gmail.com>
Date: Mon, 22 Apr 2024 17:19:41 +0530
Subject: [PATCH 1/3] Signed-off-by: Senula88 <senulananayakkara88@gmail.com>

---
 .../divudi/bean/pharmacy/GrnController.java   |  2 ++
 .../webapp/pharmacy/pharmacy_grn_wh.xhtml     | 26 +++++++++++--------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/divudi/bean/pharmacy/GrnController.java b/src/main/java/com/divudi/bean/pharmacy/GrnController.java
index 08186c749e..90c7d08dec 100644
--- a/src/main/java/com/divudi/bean/pharmacy/GrnController.java
+++ b/src/main/java/com/divudi/bean/pharmacy/GrnController.java
@@ -142,6 +142,8 @@ public String navigateToReceiveWholesale() {
         pos = null;
         printPreview = false;
         billItems = null;
+        difference = 0;
+        insTotal = 0;
         createGrnWholesale();
         return "/pharmacy/pharmacy_grn_wh?faces-redirect=true";
     }
diff --git a/src/main/webapp/pharmacy/pharmacy_grn_wh.xhtml b/src/main/webapp/pharmacy/pharmacy_grn_wh.xhtml
index 780cf93d8e..3402b68638 100644
--- a/src/main/webapp/pharmacy/pharmacy_grn_wh.xhtml
+++ b/src/main/webapp/pharmacy/pharmacy_grn_wh.xhtml
@@ -214,13 +214,13 @@
                             icon="fas fa-trash"
                             class="ui-button-danger"
                             action="#{grnController.removeItem(bi)}"/>
-                         <p:commandButton 
-                                process=":#{p:resolveFirstComponentWithId('itemList',view).clientId}"
-                                update=":#{p:resolveFirstComponentWithId('tot',view).clientId} :#{p:resolveFirstComponentWithId('itemList',view).clientId} "
-                                style="float: right;"
-                                icon="fas fa-plus"
-                                class="ui-button-danger mx-1"
-                                action="#{grnController.duplicateItem(bi)}"/>
+                        <p:commandButton 
+                            process=":#{p:resolveFirstComponentWithId('itemList',view).clientId}"
+                            update=":#{p:resolveFirstComponentWithId('tot',view).clientId} :#{p:resolveFirstComponentWithId('itemList',view).clientId} "
+                            style="float: right;"
+                            icon="fas fa-plus"
+                            class="ui-button-danger mx-1"
+                            action="#{grnController.duplicateItem(bi)}"/>
                         <p:rowEditor /> 
                     </p:column>
 
@@ -297,13 +297,17 @@
                     </div>
                 </f:facet>
 
-                <h:panelGroup  id="gpBillPreview"   style="border: none; width: 214mm;" >
+                <p:panel   id="gpBillPreview"   style="border: none;">
 
-                    <h:panelGroup rendered="#{sessionController.loggedPreference.grnBillDetailed eq false}" class="d-flex justify-content-center">
-                        <ph:grn bill="#{grnController.grnBill}"/>
+                    <h:panelGroup rendered="#{sessionController.loggedPreference.grnBillDetailed eq false}" >
+                        <ph:grn_wh bill="#{grnController.grnBill}"/>
                     </h:panelGroup>
 
-                </h:panelGroup>
+                    <h:panelGroup rendered="#{sessionController.loggedPreference.grnBillDetailed eq true}" >
+                        <ph:grn_detail_wh bill="#{grnController.grnBill}"/>
+                    </h:panelGroup>
+
+                </p:panel>
             </p:panel>
 
         </h:form>

From 2de3f263725100cc9c20108b750cf8283a8bbcec Mon Sep 17 00:00:00 2001
From: DamithDeshan <hkddrajapaksha@gmail.com>
Date: Mon, 22 Apr 2024 18:31:58 +0530
Subject: [PATCH 2/3] Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

---
 src/main/resources/META-INF/persistence.xml   |   2 +-
 .../webapp/pharmacy/pharmacy_grn_wh.xhtml     |  51 ++-
 .../resources/pharmacy/grn_wholesale.xhtml    | 346 ++++++++++++++++++
 3 files changed, 390 insertions(+), 9 deletions(-)
 create mode 100644 src/main/webapp/resources/pharmacy/grn_wholesale.xhtml

diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index fdb64d0838..0de2d33873 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -2,7 +2,7 @@
 <persistence version="2.2" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
     <persistence-unit name="hmisPU" transaction-type="JTA">
         <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-        <jta-data-source>jdbc/arogyaNew</jta-data-source>
+        <jta-data-source>jdbc/arogya</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="eclipselink.logging.level.sql" value="SEVERE"/>
diff --git a/src/main/webapp/pharmacy/pharmacy_grn_wh.xhtml b/src/main/webapp/pharmacy/pharmacy_grn_wh.xhtml
index 3402b68638..5d8e69dd20 100644
--- a/src/main/webapp/pharmacy/pharmacy_grn_wh.xhtml
+++ b/src/main/webapp/pharmacy/pharmacy_grn_wh.xhtml
@@ -271,7 +271,8 @@
                     </p:panelGrid>
                 </p:panel>
             </p:panel>
-
+            
+            
             <p:panel rendered="#{grnController.printPreview}" style="border: none;">
                 <f:facet name="header">
                     <div class="d-flex justify-content-between">
@@ -297,18 +298,52 @@
                     </div>
                 </f:facet>
 
-                <p:panel   id="gpBillPreview"   style="border: none;">
+                <h:panelGroup  id="gpBillPreview"   style="border: none; width: 214mm;" >
 
-                    <h:panelGroup rendered="#{sessionController.loggedPreference.grnBillDetailed eq false}" >
-                        <ph:grn_wh bill="#{grnController.grnBill}"/>
+                    <h:panelGroup rendered="#{sessionController.loggedPreference.grnBillDetailed eq false}" class="d-flex justify-content-center">
+                        <ph:grn_wholesale bill="#{grnController.grnBill}"/>
                     </h:panelGroup>
+                    
+                </h:panelGroup>
+            </p:panel>
+            
+            
+            
+            
 
-                    <h:panelGroup rendered="#{sessionController.loggedPreference.grnBillDetailed eq true}" >
-                        <ph:grn_detail_wh bill="#{grnController.grnBill}"/>
-                    </h:panelGroup>
+<!--            <p:panel rendered="#{grnController.printPreview}" style="border: none;">
+                <f:facet name="header">
+                    <div class="d-flex justify-content-between">
+                        <h:outputLabel value="GRN Preview " class="mt-2"/>
+                        <div class="d-flex gap-2">
+                            <p:commandButton 
+                                ajax="false" 
+                                action="pharmacy_purchase_order_list_for_recieve"
+                                class="ui-button-warning"
+                                icon="fa fa-arrow-left"
+                                actionListener="#{grnController.viewPoList()}" 
+                                value="Back to PO List"> 
+                            </p:commandButton>                   
+                            <p:commandButton 
+                                value="Print" 
+                                ajax="false" 
+                                icon="fa fa-print"
+                                class="ui-button-info"
+                                action="#" >
+                                <p:printer target="gpBillPreview" ></p:printer>
+                            </p:commandButton>
+                        </div>
+                    </div>
+                </f:facet>
 
+                <p:panel   id="gpBillPreview"   style="border: none;">
+
+                    <ph:grn_wh bill="#{grnController.grnBill}"/>
+                    
+                    <ph:grn_detail_wh bill="#{grnController.grnBill}"/>
+                    
                 </p:panel>
-            </p:panel>
+            </p:panel>-->
 
         </h:form>
     </ui:define>  
diff --git a/src/main/webapp/resources/pharmacy/grn_wholesale.xhtml b/src/main/webapp/resources/pharmacy/grn_wholesale.xhtml
new file mode 100644
index 0000000000..d1b7d38c16
--- /dev/null
+++ b/src/main/webapp/resources/pharmacy/grn_wholesale.xhtml
@@ -0,0 +1,346 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:p="http://primefaces.org/ui"
+      xmlns:f="http://xmlns.jcp.org/jsf/core"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <!-- INTERFACE -->
+    <cc:interface>
+        <cc:attribute name="bill" />
+    </cc:interface>
+
+    <!-- IMPLEMENTATION -->
+    <cc:implementation>
+        <h:outputStylesheet library="css" name="pharmacyA4.css"/>
+        <div  style="width: 210mm;">
+
+            <div class="institutionName">
+                <h:outputLabel value="#{cc.attrs.bill.department.printingName}"/>
+            </div>
+            <div class="institutionContact" >
+                <div>
+                    <h:outputLabel value="#{cc.attrs.bill.department.address}"/>
+                </div>
+                <div class="d-flex justify-content-center gap-2">
+                    <h:outputLabel value="Tel : "/>
+                    <h:outputLabel value="#{cc.attrs.bill.department.telephone1} "/>
+                    <h:outputLabel value="/ #{cc.attrs.bill.department.telephone2}" rendered="#{cc.attrs.bill.department.telephone2 ne null}"/>
+                </div>
+                <div  class="d-flex justify-content-center gap-2">
+                    <h:outputLabel value="Fax :"/>
+                    <h:outputLabel value="#{cc.attrs.bill.department.fax}"/>                                                 
+                </div>
+                <div  class="d-flex justify-content-center gap-2">
+                    <h:outputLabel value="Email : "/>
+                    <h:outputLabel value="#{cc.attrs.bill.department.email}"/>                                                 
+                </div>
+            </div>
+
+            <div class="headingBill">
+                <h:outputLabel value="Good Recieve Note (Wholesale)" style="text-decoration: underline;"/>                           
+            </div>
+
+            <div style="min-width: 90%; margin-left: 5%; margin-right: 5%; font-size: 15px;" class="row justify-content-center" >
+                <div class="row">
+                    <h:outputLabel value="P.O. No " class="col-3"/>
+                    <h:outputLabel value="#{cc.attrs.bill.referenceBill.deptId}" class="col-3"/>
+                    <h:outputLabel value="G.R.N. No " class="col-2"/>
+                    <h:outputLabel value="#{cc.attrs.bill.deptId}" class="col-4"/>
+                </div>
+
+                <div class="row">
+                    <h:outputLabel value="P.O. Date" class="col-3"/>
+                    <h:outputLabel value="#{cc.attrs.bill.referenceBill.createdAt}" class="col-3">
+                        <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.shortDateFormat}" />
+                    </h:outputLabel>
+                    <h:outputLabel value="G.R.N. Date" class="col-2"/>
+                    <h:outputLabel value="#{cc.attrs.bill.createdAt}" class="col-4">
+                        <f:convertDateTime  timeZone="Asia/Colombo" pattern="#{sessionController.applicationPreference.shortDateFormat}" />
+                    </h:outputLabel>
+                </div>
+
+                <div class="row">
+                    <h:outputLabel value="P.O. Time" class="col-3"/>
+                    <h:outputLabel value="#{cc.attrs.bill.referenceBill.createdAt}" class="col-3">
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.shortTimeFormat}"/>
+                    </h:outputLabel>
+                    <h:outputLabel value="G.R.N. Time" class="col-2"/>
+                    <h:outputLabel value="#{cc.attrs.bill.createdAt}" class="col-4">
+                        <f:convertDateTime pattern="#{sessionController.applicationPreference.shortTimeFormat}"/>
+                    </h:outputLabel>
+                </div>
+                
+                
+                <div class="row">
+                    <h:outputLabel value="P.O. Approve By " class="col-3"/>
+                    <h:outputLabel value="#{cc.attrs.bill.referenceBill.creater.staff.code}" class="col-3"/>
+                    <h:outputLabel value="Invoice No" class="col-2"/>
+                    <h:outputLabel value="#{cc.attrs.bill.invoiceNumber}" class="col-4"/>
+                </div>
+
+                <div class="row">
+                    <h:outputLabel value="Location" class="col-3"/>
+                    <h:outputLabel value="#{cc.attrs.bill.department.name}" class="col-3"/>
+                    <h:outputLabel value="Supplier" class="col-2"/>
+                    <h:outputLabel value="#{cc.attrs.bill.fromInstitution.name}" class="col-4"/>
+                </div>
+                
+                <div class="row">
+                    <h:outputLabel value="Payment Method" class="col-3"/>
+                    <h:outputLabel value="#{cc.attrs.bill.paymentMethod}" class="col-3"/>
+                    <h:outputLabel value="Crd. Duration" class="col-2" rendered="#{cc.attrs.bill.paymentMethod eq 'Credit'}"/>
+                    <h:outputLabel value="#{cc.attrs.bill.creditDuration}" class="col-2" style="text-align: left;" rendered="#{cc.attrs.bill.paymentMethod eq 'Credit'}"/>
+                </div>
+
+            </div>
+
+            <style>
+                table {
+                    font-family: arial, sans-serif;
+                    border-collapse: collapse;
+                    width: 100%;
+                }
+
+                td, th {
+                    border: 1px solid #dddddd;
+                    text-align: left;
+                    padding: 4px;
+                }
+
+            </style>
+
+                <div style="width: 100%;" class=" mt-2">
+
+                <table style="text-align: center; width: 100%; border: 2px!important;">
+                    <thead style="font-size: 14px;">
+                        <tr>
+                            <th style="text-align: left!important;min-width: 36%; font-weight: bold!important;">Item</th>
+                            <th style="width: 4%; text-align: right!important; font-weight: bold!important;">Code</th>
+                            <th style="width: 10%; text-align: right!important; font-weight: bold!important;">Expiry</th>
+                            <th style="width: 9%; text-align: right!important; font-weight: bold!important;">Received Qty</th>
+                            <th style="width: 9%; text-align: right!important; font-weight: bold!important;">Received Free Qty</th>
+                            <th style="width: 10%; text-align: right!important; font-weight: bold!important;">Purchase Price</th>
+                            <th style="width: 10%; text-align: right!important; font-weight: bold!important;">Wholesale Price</th>
+                            <th style="width: 4%; text-align: right!important; font-weight: bold!important;">GP Profit%</th>
+                            <th style="width: 10%; text-align: right!important; font-weight: bold!important;">Value</th>
+                        </tr>
+                    </thead> 
+
+                    <tbody style="font-size: 13px;">
+                        <ui:repeat value="#{cc.attrs.bill.billItems}" var="bip">
+                            <tr>
+                                <td style="text-align: left;">#{bip.item.name}</td>
+                                <td style="text-align: right;">
+                                    <h:outputText value="#{bip.item.code}">
+                                    </h:outputText>
+                                </td>
+                                <td style="text-align: right;">
+                                    <h:outputText value="#{bip.pharmaceuticalBillItem.doe}">
+                                        <f:convertDateTime pattern="d/M/yy"/>
+                                    </h:outputText>
+                                </td>
+                                
+                                <td style="text-align: right;">
+                                    <h:outputText value="#{bip.pharmaceuticalBillItem.qty}">
+                                        <f:convertNumber pattern="#,##0"/>
+                                    </h:outputText>
+                                </td>
+                                <td style="text-align: right;">
+                                    <h:outputText value="#{bip.pharmaceuticalBillItem.freeQty}">
+                                        <f:convertNumber pattern="#,##0"/>
+                                    </h:outputText>
+                                </td>
+                                <td style="text-align: right;">
+                                    <h:outputText value="#{bip.pharmaceuticalBillItem.purchaseRate}">
+                                        <f:convertNumber pattern="#,##0.00"/>
+                                    </h:outputText>
+                                </td>
+                                <td style="text-align: right;">
+                                    <h:outputText value="#{bip.pharmaceuticalBillItem.wholesaleRate}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                                <td style="text-align: right;">                  
+                                    <h:outputText id="profMargin" value="#{((bip.pharmaceuticalBillItem.retailRate - bip.pharmaceuticalBillItem.purchaseRate ) / bip.pharmaceuticalBillItem.purchaseRate)*100}" >
+                                        <f:convertNumber pattern="0.0" ></f:convertNumber>
+                                    </h:outputText>
+                                </td>
+                                <td style="text-align: right;">
+                                    <h:outputText value="#{bip.pharmaceuticalBillItem.purchaseRate*bip.pharmaceuticalBillItem.qty}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                                
+                            </tr>
+                        </ui:repeat>
+                    </tbody>
+
+                    <tfoot class="mt-4" style="font-size: 13px;">
+
+                        <tr>
+                            <td colspan="7" style="text-align: left; font-weight: bold!important;">Wholesale Value</td>
+                            <td colspan="2" style="text-align: right; font-weight: bold!important;">
+
+                                <h:outputText value="#{cc.attrs.bill.saleValue}">
+
+                                    <f:convertNumber pattern="#,##0.00" />
+                                </h:outputText>
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td colspan="7" style="text-align: left; font-weight: bold!important;">Total</td>
+                            <td colspan="2" style="text-align: right; font-weight: bold!important;">
+                                <h:outputText value="#{0-cc.attrs.bill.total}">
+                                    <f:convertNumber pattern="#,##0.00" />
+                                </h:outputText>
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td colspan="7" style="text-align: left; font-weight: bold!important;">Expenses</td>
+                            <td colspan="2" style="text-align: right; font-weight: bold!important;">
+                                <h:outputText value="#{0-cc.attrs.bill.expenseTotal}">
+                                    <f:convertNumber pattern="#,##0.00" />
+                                </h:outputText>
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td colspan="7" style="text-align: left; font-weight: bold!important;">Tax</td>
+                            <td colspan="2" style="text-align: right; font-weight: bold!important;">
+                                <h:outputText value="#{cc.attrs.bill.tax}">
+                                    <f:convertNumber pattern="#,##0.00" />
+                                </h:outputText>
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td colspan="7" style="text-align: left; font-weight: bold!important;">Discount</td>
+                            <td colspan="2" style="text-align: right; font-weight: bold!important;">
+                                <h:outputText value="#{0-cc.attrs.bill.discount}">
+                                    <f:convertNumber pattern="#,##0.00" />
+                                </h:outputText>
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td colspan="7" style="text-align: left; font-weight: bold!important;">Net Total</td>
+                            <td colspan="2" style="text-align: right; font-weight: bold!important;">
+                                <h:outputText value="#{0-cc.attrs.bill.netTotal}">
+                                    <f:convertNumber pattern="#,##0.00" />
+                                </h:outputText>
+                            </td>
+                        </tr>
+
+                    </tfoot>
+                </table>
+            </div>
+
+            <div class="mt-2 w-100">
+
+                <table  style="text-align: center; width: 100%; border: 2px!important;">
+                    <thead style="font-size: 15px;">
+                        <tr>
+                            <th style="text-align: left!important;min-width: 60%; font-weight: bold!important;">Expense</th>
+                            <th style="width: 20%; text-align: right!important; font-weight: bold!important;">Value</th>
+                            <th style="width: 20%; text-align: right!important; font-weight: bold!important;">Description</th>
+                        </tr>
+                    </thead> 
+
+                    <tbody>
+                        <ui:repeat value="#{cc.attrs.bill.billExpenses}" var="be">
+                            <tr>
+                                <td>#{be.item.name}</td>
+                                <td>
+                                    <h:outputText value="#{be.netValue}">
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputText>
+                                </td>
+                                <td>#{be.description}</td>
+                            </tr>
+                        </ui:repeat>
+                    </tbody>
+                    <tfoot>
+                        <tr>
+                            <td colspan="3" style="text-align: left;" class="empty-message">No Bill Expenses</td>
+                        </tr>
+                    </tfoot>
+                </table>
+
+            </div>
+
+            <div class="preparedBy mt-3">
+                <h:outputLabel value="Prepared By : #{cc.attrs.bill.creater.webUserPerson.nameWithTitle}" style="text-align: right!important;"/>
+            </div>
+
+            <div class="mb-4">
+                <h:outputLabel value="Received By : " style="text-align: right!important;"/>
+            </div>
+
+
+            <div style="page-break-after: always;"></div>
+
+            <div >
+
+                <h4 style="color: #000000; text-align: center " >
+                    <h:outputLabel value="Payment Voucher" style="text-decoration: underline; margin-bottom: 20px;"/>
+                </h4>
+
+
+                <div>
+                    <h:outputLabel value="Date :"  style="position: relative; left: 70%;" />
+                    <h:outputLabel value="Payee : " style="text-align: right!important;"/>
+                    <h:outputLabel value="#{cc.attrs.bill.fromInstitution.name}" class="mx-2"/>
+                </div>
+                <div>
+                    <br></br>
+                    <h:outputLabel value="Prepared By :" /> 
+                    <h:outputLabel value="................................................................."/>
+                    <br></br>                
+                    <br></br>         
+                    <h:outputLabel value="Approved By :"/>
+                    <h:outputLabel value="................................................................."/>
+                    <br></br>                                      
+                    <br></br>
+                    <h:outputLabel value="Authorized By :"/>
+                    <h:outputLabel value="................................................................"/>
+                    <br></br>
+                    <br></br>
+
+                    <h:outputLabel value="Cheque No :"/>
+                    <h:outputLabel value="...................................................................."/>
+                    <h:outputLabel value="Amount : Rs. ...................." style="position: relative; left: 30%;"/>
+                    <br></br>
+                    <br></br>
+                    <h:outputLabel value="Received with thanks sum of Rupees ................................................................................................................................................................ #{cc.attrs.bill.creater.institution.name} &nbsp; : "/>
+                    <br></br>
+
+                    <!--                    <div >-->
+
+                    <!--<h:outputLabel value="Date :"  style="position: relative; left: 70%;" />-->
+                    <!--                        <br/>-->
+                    <!--                        <h:outputLabel value="Amount : Rs. " style="font-weight: bold;position: relative; left: 70%;"/>-->
+                    <!--                        <h:outputLabel value="#{0-cc.attrs.bill.netTotal}" style="font-weight: bold;position: relative; left: 71%;">-->
+                    <!--<f:convertNumber pattern="#,##0.00" />-->
+                    <!--                        </h:outputLabel>-->
+                    <!--                        <br/>-->
+                    <div>
+                        <h:outputLabel value="Stamp : " style="position: relative; left: 70%; "/>
+                        <div style="position: relative; border: 1px black dashed!important;height: 60px;width: 50px; left: 75%;">
+                        </div>
+                        <!--                        <h:outputLabel value="Stamp " style="position: relative; left: 70%;"/>-->
+                        <!--                        <br></br>-->
+                        <h:outputLabel value="Date : " style="position: relative; left: 70%;"/>
+                        <br></br>
+                        <h:outputLabel value="Name : " style="position: relative; left: 70%;"/>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </cc:implementation>
+</html>

From 33e1878061cae740e91c23b5ca180c8ccfe5dcd6 Mon Sep 17 00:00:00 2001
From: DamithDeshan <hkddrajapaksha@gmail.com>
Date: Mon, 22 Apr 2024 22:10:37 +0530
Subject: [PATCH 3/3] Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

---
 src/main/webapp/resources/pharmacy/grn_wholesale.xhtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/resources/pharmacy/grn_wholesale.xhtml b/src/main/webapp/resources/pharmacy/grn_wholesale.xhtml
index d1b7d38c16..7ffbe1dde6 100644
--- a/src/main/webapp/resources/pharmacy/grn_wholesale.xhtml
+++ b/src/main/webapp/resources/pharmacy/grn_wholesale.xhtml
@@ -40,7 +40,7 @@
             </div>
 
             <div class="headingBill">
-                <h:outputLabel value="Good Recieve Note (Wholesale)" style="text-decoration: underline;"/>                           
+                <h:outputLabel value="Good Recieve Note" style="text-decoration: underline;"/>                           
             </div>
 
             <div style="min-width: 90%; margin-left: 5%; margin-right: 5%; font-size: 15px;" class="row justify-content-center" >
@@ -181,7 +181,7 @@
                     <tfoot class="mt-4" style="font-size: 13px;">
 
                         <tr>
-                            <td colspan="7" style="text-align: left; font-weight: bold!important;">Wholesale Value</td>
+                            <td colspan="7" style="text-align: left; font-weight: bold!important;">Retail Sale Value</td>
                             <td colspan="2" style="text-align: right; font-weight: bold!important;">
 
                                 <h:outputText value="#{cc.attrs.bill.saleValue}">