From 5d81fd0f3ef3df3881ee9b4961561d802bc877c2 Mon Sep 17 00:00:00 2001
From: Imesh Ranawella <imeshranawella00@gmail.com>
Date: Wed, 19 Feb 2025 12:58:32 +0530
Subject: [PATCH 1/3] OPD Weekly Report issue fix (#10627)

Co-authored-by: imexh <chandikaranawella@gmail.com>
---
 .../divudi/bean/common/ReportsController.java | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/divudi/bean/common/ReportsController.java b/src/main/java/com/divudi/bean/common/ReportsController.java
index 80e8451438..0cbd17e47b 100644
--- a/src/main/java/com/divudi/bean/common/ReportsController.java
+++ b/src/main/java/com/divudi/bean/common/ReportsController.java
@@ -52,10 +52,7 @@
 import javax.persistence.TemporalType;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.time.YearMonth;
-import java.time.LocalDate;
-import java.time.Month;
-import java.time.ZoneId;
+import java.time.*;
 import java.util.*;
 import java.util.List;
 import java.text.SimpleDateFormat;
@@ -1974,20 +1971,33 @@ public List<Integer> getDaysOfWeek(final int weekOfMonth) {
         }
 
         final YearMonth yearMonth = YearMonth.of(LocalDate.now().getYear(), month);
+        final LocalDate firstDayOfMonth = yearMonth.atDay(1);
 
         List<Integer> daysOfWeek = new ArrayList<>();
 
-        LocalDate firstDayOfMonth = yearMonth.atDay(1);
-        int firstDayOfTargetWeek = (weekOfMonth - 1) * 7 + 1;
-
-        for (int i = 0; i < 7; i++) {
-            LocalDate day = firstDayOfMonth.plusDays(firstDayOfTargetWeek - 1 + i);
+        LocalDate firstSunday = firstDayOfMonth;
+        while (firstSunday.getDayOfWeek() != DayOfWeek.SUNDAY) {
+            firstSunday = firstSunday.plusDays(1);
+        }
 
-            if (day.getMonth() != yearMonth.getMonth()) {
-                break;
+        if (weekOfMonth == 1) {
+            LocalDate currentDay = firstDayOfMonth;
+            while (currentDay.getDayOfWeek() != DayOfWeek.SUNDAY && currentDay.getMonthValue() == month.getValue()) {
+                daysOfWeek.add(currentDay.getDayOfMonth());
+                currentDay = currentDay.plusDays(1);
             }
+        } else {
+            LocalDate firstDayOfWeek = firstSunday.plusWeeks(weekOfMonth - 2);
+
+            for (int i = 0; i < 7; i++) {
+                LocalDate day = firstDayOfWeek.plusDays(i);
 
-            daysOfWeek.add(day.getDayOfMonth());
+                if (day.getMonthValue() != month.getValue()) {
+                    break;
+                }
+
+                daysOfWeek.add(day.getDayOfMonth());
+            }
         }
 
         return daysOfWeek;
@@ -2097,12 +2107,6 @@ private ReportTemplateRowBundle generateWeeklyBillItems(List<BillTypeAtomic> bts
         jpql += "AND bill.billTypeAtomic in :bts ";
         parameters.put("bts", bts);
 
-//        if (visitType != null) {
-//            if (visitType.equalsIgnoreCase("IP") || visitType.equalsIgnoreCase("OP")) {
-//                jpql += "AND bill.ipOpOrCc = :type ";
-//                parameters.put("type", visitType);
-//            }
-//        }
         if (getSearchKeyword().getItemName() != null && !getSearchKeyword().getItemName().trim().isEmpty()) {
             jpql += "AND ((bill.billPackege.name) like :itemName ) ";
             parameters.put("itemName", "%" + getSearchKeyword().getItemName().trim().toUpperCase() + "%");

From 938c233300e3149d36c9ddd09eaab5537c48113b Mon Sep 17 00:00:00 2001
From: Chinthaka Prasad Wijerathna
 <118891516+ChinthakaPrasad@users.noreply.github.com>
Date: Wed, 19 Feb 2025 15:28:00 +0530
Subject: [PATCH 2/3] 10423 disposal return recievable amount was wrong
 (#10626)

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* add new view for tranfer issue request and approval process

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* add method to retrive all tranfer request

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Add approval privillage and only privillage holder can approve the request

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

---------

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
---
 pom.xml                                       |   4 +-
 .../divudi/ws/common/ApplicationConfig.java   |   1 -
 src/main/webapp/WEB-INF/glassfish-web.xml     |   2 +-
 .../pharmacy/pharmacy_bill_return_issue.xhtml |  66 ++++++---
 .../pharmacy_reprint_bill_unit_issue.xhtml    |   2 +-
 .../pharmacy_search_issue_bill_item.xhtml     |  25 ++--
 .../pharmacy_search_issue_bill_return.xhtml   |   6 +-
 .../resources/pharmacy/consumptionIssue.xhtml | 130 +++++++++++------
 .../resources/pharmacy/inward/issueBill.xhtml | 101 +++++++++----
 .../pharmacy/inward/returnBill.xhtml          | 135 ++++++++++++++----
 .../pharmacy_disposal_bill_five_five.xhtml    | 125 +++++++++++-----
 .../pharmacy/pharmacy_disposal_bill_pos.xhtml | 113 +++++++++++----
 12 files changed, 506 insertions(+), 204 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2c0acbc9ba..e3f603b436 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,10 +2,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.divudi</groupId>
-    <artifactId>coop</artifactId>
+    <artifactId>rh</artifactId>
     <version>3.0.0</version>
     <packaging>war</packaging>
-    <name>coop</name>
+    <name>rh</name>
     
     <properties>
         <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
diff --git a/src/main/java/com/divudi/ws/common/ApplicationConfig.java b/src/main/java/com/divudi/ws/common/ApplicationConfig.java
index 433b4b84a9..fb765393ba 100644
--- a/src/main/java/com/divudi/ws/common/ApplicationConfig.java
+++ b/src/main/java/com/divudi/ws/common/ApplicationConfig.java
@@ -46,7 +46,6 @@ private void addRestResourceClasses(Set<Class<?>> resources) {
         resources.add(com.divudi.ws.finance.clinical.Fhir.class);
         resources.add(com.divudi.ws.inward.ApiInward.class);
         resources.add(com.divudi.ws.lims.Lims.class);
-        resources.add(com.divudi.ws.lims.LimsMiddlewareController.class);
         resources.add(com.divudi.ws.lims.MiddlewareController.class);
     }
     
diff --git a/src/main/webapp/WEB-INF/glassfish-web.xml b/src/main/webapp/WEB-INF/glassfish-web.xml
index 8947aba09c..157dde8610 100644
--- a/src/main/webapp/WEB-INF/glassfish-web.xml
+++ b/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
 <glassfish-web-app error-url="">
-  <context-root>/coop</context-root>
+  <context-root>/rh</context-root>
   <class-loader delegate="true"/>
   <jsp-config>
     <property name="keepgenerated" value="true">
diff --git a/src/main/webapp/pharmacy/pharmacy_bill_return_issue.xhtml b/src/main/webapp/pharmacy/pharmacy_bill_return_issue.xhtml
index 9055416389..4d21a35e5d 100644
--- a/src/main/webapp/pharmacy/pharmacy_bill_return_issue.xhtml
+++ b/src/main/webapp/pharmacy/pharmacy_bill_return_issue.xhtml
@@ -16,12 +16,14 @@
 
                         <div class="d-flex justify-content-between align-items-center">
                             <div>
-                                <p:outputLabel  value="Recievable Amount :" class="mt-2"/> 
+                                <p:outputLabel  value="Recievable Amount : " class="mt-2"/> 
                                 <p:outputLabel
                                     class="mx-2 mt-2"
                                     id="total"  
-                                    value="#{issueReturnController.returnBill.total}"
+                                    value=""
+                                    styleClass="totalAmount"
                                     >
+                                    <f:convertNumber pattern="#,##0.00"></f:convertNumber>
                                 </p:outputLabel>
                             </div>
                             <div class="d-flex align-items-center">
@@ -55,8 +57,7 @@
                 <p:dataTable 
                     var="ph" 
                     value="#{issueReturnController.billItems}"
-                    scrollable="true" 
-                    scrollHeight="250"
+                    scrollable="true"                    
                     rows="10"
                     id="itemList" >  
 
@@ -69,14 +70,14 @@
                         <h:outputText value=" #{ph.item.name}"  />                     
 
                     </p:column>  
-                    <p:column headerText="BillItem id" style="width:50px!important;">  
-                        <h:outputText value=" #{ph.id}"  />                     
-
-                    </p:column> 
-                    <p:column headerText="Item id" style="width:50px!important;">  
-                        <h:outputText value=" #{ph.item.id}"  />                     
-
-                    </p:column> 
+                    <!--                    <p:column headerText="BillItem id" style="width:50px!important;">  
+                                            <h:outputText value=" #{ph.id}"  />                     
+                    
+                                        </p:column> 
+                                        <p:column headerText="Item id" style="width:50px!important;">  
+                                            <h:outputText value=" #{ph.item.id}"  />                     
+                    
+                                        </p:column> -->
 
                     <p:column headerText="Balance Qty in Unit" style="width:25px!important;"> 
                         <h:outputText value="#{ph.remainingQty}" />                   
@@ -84,7 +85,11 @@
 
                     <p:column headerText="Purchase Rate" style="width:25px!important;"> 
                         <h:outputText value="#{ph.rate}"  />                        
-                    </p:column>                 
+                    </p:column>  
+
+                    <p:column headerText="Retail Rate" style="width:25px!important;"> 
+                        <h:outputText value="#{ph.pharmaceuticalBillItem.retailRate}"  />                        
+                    </p:column>  
 
 
                     <p:column headerText="Batch No" style="width:25px!important;">                       
@@ -96,20 +101,40 @@
                             <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateFormat}"  />
                         </h:outputText>
                     </p:column>
-                   
+
+                    <p:column styleClass="revieveItemPrice" headerText="Recievable Amount" style="width:25px!important;">                       
+                        <h:outputText rendered="#{configOptionApplicationController.getBooleanValueByKey('Disposal bills shows purchase rate of bill items in the bill', false)}" value="#{ph.qty*ph.rate}" >
+                            <f:convertNumber pattern="#,##0.00"></f:convertNumber>
+                        </h:outputText> 
+                        <h:outputText rendered="#{!configOptionApplicationController.getBooleanValueByKey('Disposal bills shows purchase rate of bill items in the bill', false)}" value="#{ph.qty*ph.pharmaceuticalBillItem.retailRate}" >
+                            <f:convertNumber pattern="#,##0.00"></f:convertNumber>
+                        </h:outputText> 
+                    </p:column> 
+
                     <p:column headerText="Returning Qty in Unit" style="width:25px!important;" >                     
                         <p:inputText autocomplete="off" value="#{ph.qty}"  >
-                            <f:ajax 
-                                event="blur" 
-                                render="@this :#{p:resolveFirstComponentWithId('total',view).clientId}" 
-                                execute="@this" 
+                            <p:ajax 
+                                event="change" 
+                                update="@this :#{p:resolveFirstComponentWithId('total',view).clientId} revieveItemPrice itemList" 
+                                process="@this"    
+                                oncomplete="calculateTotalRecievableAmount()"
                                 listener="#{issueReturnController.onEdit(ph)}" >
-                            </f:ajax>
+                            </p:ajax>
                         </p:inputText>
                     </p:column>  
 
                 </p:dataTable>  
             </h:panelGroup>
+            <script>
+                function calculateTotalRecievableAmount() {
+                    const allItemAmount = document.querySelectorAll('.revieveItemPrice');
+
+                    const totalAmount = Array.from(allItemAmount).map(td => parseFloat(td.innerText) || 0).reduce((sum, value) => sum + value, 0);
+                    console.log('start');
+                    document.querySelector('.totalAmount').innerText = totalAmount;
+
+                }
+            </script>
 
             <p:panel rendered="#{issueReturnController.printPreview}">
                 <f:facet name="header">    
@@ -158,6 +183,9 @@
             </p:panel>
 
         </h:form>
+        <script>
+
+        </script>
     </ui:define>  
 
 </ui:composition>
diff --git a/src/main/webapp/pharmacy/pharmacy_reprint_bill_unit_issue.xhtml b/src/main/webapp/pharmacy/pharmacy_reprint_bill_unit_issue.xhtml
index ce3a9a67b9..7f4925eb43 100644
--- a/src/main/webapp/pharmacy/pharmacy_reprint_bill_unit_issue.xhtml
+++ b/src/main/webapp/pharmacy/pharmacy_reprint_bill_unit_issue.xhtml
@@ -32,7 +32,7 @@
                                         value="To Return" 
                                         class="mx-2 ui-button-warning"
                                         icon="fa fa-money-bill-wave"
-                                        action="pharmacy_bill_return_issue"   
+                                        action="pharmacy_bill_return_issue?faces-redirect=true"   
                                         disabled="#{pharmacyBillSearch.bill.cancelled eq true}"  >                                
                                         <f:setPropertyActionListener 
                                             value="#{pharmacyBillSearch.bill}" 
diff --git a/src/main/webapp/pharmacy/pharmacy_search_issue_bill_item.xhtml b/src/main/webapp/pharmacy/pharmacy_search_issue_bill_item.xhtml
index fdb77b5aac..2885fe155b 100644
--- a/src/main/webapp/pharmacy/pharmacy_search_issue_bill_item.xhtml
+++ b/src/main/webapp/pharmacy/pharmacy_search_issue_bill_item.xhtml
@@ -74,7 +74,7 @@
                                     <p:column headerText="No" styleClass="alignTop" width="2%">
                                         <h:outputLabel value="#{i+1}"/>
                                     </p:column>
-                                    <p:column headerText="Bill No" styleClass="alignTop"  >
+                                    <p:column headerText="Bill No" styleClass="alignTop"  width="10em">
                                         <p:commandLink 
                                             ajax="false" 
                                             value="#{pi.bill.deptId}"
@@ -82,14 +82,14 @@
                                             <f:setPropertyActionListener value="#{pi.bill}" target="#{pharmacyBillSearch.bill}"/>
                                         </p:commandLink>
                                     </p:column>
-                                    <p:column headerText="Item Name"  styleClass="alignTop" width="40%">
+                                    <p:column headerText="Item Name"  styleClass="alignTop" width="20em">
                                         <h:outputLabel value="#{pi.item.code}" ></h:outputLabel>
                                         &nbsp;-&nbsp;
-                                         <h:outputLabel value="#{pi.item.name}" />   
-                                        
+                                        <h:outputLabel value="#{pi.item.name}" />   
+
                                     </p:column>
 
-                                    <p:column headerText="Billed At"   width="10%">
+                                    <p:column headerText="Billed At"   width="15em">
                                         <h:outputLabel value="#{pi.bill.createdAt}" >
                                             <f:convertDateTime pattern="dd MMM yyyy - hh mm ss a"/>
                                         </h:outputLabel>
@@ -110,20 +110,27 @@
                                                 <f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}" />
                                             </h:outputLabel>
                                         </h:panelGroup>
-                                    </p:column>     
-                                    <p:column headerText="Qty" >
+                                    </p:column>   
+
+                                    <p:column headerText="Billed By" width="10em" >
+                                        <h:outputLabel value="#{pi.bill.creater.name}" style="text-align: left;">
+                                        </h:outputLabel>                             
+                                    </p:column>
+
+
+                                    <p:column headerText="Qty" width="10em">
                                         <h:outputLabel value="#{pi.qty}" >
                                             <f:convertNumber pattern="#0.00"/>
                                         </h:outputLabel>
                                     </p:column>   
 
-                                    <p:column headerText="Bill item Value">
+                                    <p:column headerText="Bill Retail Total" width="15em">
                                         <h:outputLabel value="#{pi.netValue}" >
                                             <f:convertNumber pattern="#,##0.00"/>
                                         </h:outputLabel>
                                     </p:column>
 
-                                    <p:column headerText="Department"  styleClass="alignTop" >
+                                    <p:column headerText="To Department"  styleClass="alignTop" width="10em">
                                         <h:outputLabel value="#{pi.bill.toDepartment.name}" style="text-align: left;">
                                         </h:outputLabel>                             
                                     </p:column>
diff --git a/src/main/webapp/pharmacy/pharmacy_search_issue_bill_return.xhtml b/src/main/webapp/pharmacy/pharmacy_search_issue_bill_return.xhtml
index 2782d66c2a..a99131e00a 100644
--- a/src/main/webapp/pharmacy/pharmacy_search_issue_bill_return.xhtml
+++ b/src/main/webapp/pharmacy/pharmacy_search_issue_bill_return.xhtml
@@ -82,7 +82,7 @@
                                         <p:commandLink 
                                             ajax="false" 
                                             value="#{bill.deptId}"
-                                            action="pharmacy_reprint_bill_unit_issue_return">
+                                            action="pharmacy_reprint_bill_unit_issue_return?faces-redirect=true">
                                             <f:setPropertyActionListener value="#{bill}" target="#{pharmacyIssueController.bill}"/>   
                                         </p:commandLink>
                                     </p:column>
@@ -150,9 +150,7 @@
                                         </h:panelGroup>                               
                                     </p:column>    
 
-
-
-                                    <p:column headerText="Value" style="text-align: right"  >
+                                    <p:column headerText="Total Sale Value" style="text-align: right"  >
                                         <h:outputLabel value="#{bill.netTotal}" >
                                             <f:convertNumber pattern="#,##0.00"/>
                                         </h:outputLabel>
diff --git a/src/main/webapp/resources/pharmacy/consumptionIssue.xhtml b/src/main/webapp/resources/pharmacy/consumptionIssue.xhtml
index b41fd22938..fedd38ebe8 100644
--- a/src/main/webapp/resources/pharmacy/consumptionIssue.xhtml
+++ b/src/main/webapp/resources/pharmacy/consumptionIssue.xhtml
@@ -72,7 +72,6 @@
 
                     </tr>
 
-
                     <tr>
                         <td style="width: 15% ;text-align: left;" >
                             <h:outputLabel value="Bill ID" ></h:outputLabel>
@@ -86,11 +85,11 @@
 
                         </td>
                         <td style="width: 15%" >
-                            <h:outputLabel value="User" ></h:outputLabel>
+                            <h:outputLabel value="Issued By" ></h:outputLabel>
                         </td>
                         <td>:</td>
                         <td style="width: 30%" >
-                            <h:outputLabel value="#{cc.attrs.bill.creater.staff.code}" >
+                            <h:outputLabel value="#{cc.attrs.bill.creater.staff.person.name}" >
                             </h:outputLabel>
                         </td>
 
@@ -119,16 +118,11 @@
 
                     </tr>
                 </table>
-
-
             </div>
 
-
             <div class="billline">
                 <h:outputLabel value="-----------------------------------------------"   />                           
             </div>
-
-
             <div >
 
                 <table width="100%" style="width: 100%;" >
@@ -159,10 +153,10 @@
 
                         <tr>
                             <td colspan="4" style="overflow: visible;">
-                                <h:outputLabel value="#{bip.item.code}"  styleClass="itemsBlock" style="text-transform: capitalize;" >
+<!--                                <h:outputLabel value="#{bip.item.code}"  styleClass="itemsBlock" style="text-transform: capitalize;" >
                                 </h:outputLabel>
                                 -
-                                &nbsp;
+                                &nbsp;-->
                                 <h:outputLabel value="#{bip.searialNo+1} - #{bip.item.name}"  styleClass="itemsBlock" style="text-transform: capitalize!important;"  >
                                 </h:outputLabel>
 
@@ -173,46 +167,97 @@
                             <td>
 
                             </td>
-                            <td>
-                                <h:outputLabel    value="#{bip.qty}"    styleClass="itemsBlock"   style="text-align: right; padding-right: 30px;" >
-                                    <f:convertNumber integerOnly="true" />
-                                </h:outputLabel>
-                            </td>
-                            <td  styleClass="itemsBlockRight"  style="text-align: right; padding-right: 30px;" >
-                                <h:outputLabel    value="#{bip.netRate}" >
-                                    <f:convertNumber pattern="#,##0.00" />
-                                </h:outputLabel>
-                            </td>
-                            <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 30px;" >
-                                <h:outputLabel    value="#{bip.netValue}"    >
-                                    <f:convertNumber pattern="#,##0.00" />
-                                </h:outputLabel>
-                            </td>
+                            <h:panelGroup rendered="#{configOptionApplicationController.getBooleanValueByKey('Disposal bills shows purchase rate of bill items in the bill', false)}">
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px;" >
+                                    <h:outputLabel value="#{bip.qty}"    >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
+
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px;" >
+                                    <h:outputLabel value="#{bip.rate}" >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
+
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px;" >
+                                    <h:outputLabel styleClass="itemValue" value="#{bip.rate*bip.qty}"    >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
+
+                            </h:panelGroup>
+
+                            <h:panelGroup rendered="#{!configOptionApplicationController.getBooleanValueByKey('Disposal bills shows purchase rate of bill items in the bill', false)}">
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px;" >
+                                    <h:outputLabel value="#{bip.qty}"    >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
+
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px;" >
+                                    <h:outputLabel value="#{bip.pharmaceuticalBillItem.retailRate}" >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                    <br></br>
+                                </td>
+
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px;" >
+                                    <h:outputLabel styleClass="itemValue" value="#{bip.pharmaceuticalBillItem.retailRate*bip.qty}"    >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
+
+                            </h:panelGroup>
+                            <!--                            <td>
+                                                            <h:outputLabel    value="#{bip.qty}"    styleClass="itemsBlock"   style="text-align: right; padding-right: 30px;" >
+                                                                <f:convertNumber integerOnly="true" />
+                                                            </h:outputLabel>
+                                                        </td>
+                                                        <td  styleClass="itemsBlockRight"  style="text-align: right; padding-right: 30px;" >
+                                                            <h:outputLabel    value="#{bip.netRate}" >
+                                                                <f:convertNumber pattern="#,##0.00" />
+                                                            </h:outputLabel>
+                                                        </td>
+                                                        <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 30px;" >
+                                                            <h:outputLabel    value="#{bip.netValue}"    >
+                                                                <f:convertNumber pattern="#,##0.00" />
+                                                            </h:outputLabel>
+                                                        </td>-->
 
                         </tr>
 
-
-
-
                     </ui:repeat>
 
-
-
-
                 </table>
-
-
+                <script>
+                    function calculateTotal() {
+                        const allBillValues = document.querySelectorAll('.itemValue');
+                        console.log(allBillValues.size)
+
+                        const total = Array.from(allBillValues)
+                                .map(
+                                        td => {
+                                            const clearText = td.innerText.replace(/,/g, '').trim();
+                                            const value = parseFloat(clearText) || 0;
+                                            //console.log(value); 
+                                            return value
+                                        })
+                                .reduce((sum, value) => sum + value, 0);
+                        //console.log(total);
+
+                        document.querySelector('.billTotal').innerText = total.toFixed(2);
+                    }
+
+                    setTimeout(calculateTotal, 100);
+                </script>
             </div>
 
-
             <div class="billline">
                 <h:outputLabel value="-----------------------------------------------"   />                           
             </div>
 
-
-
-            <div  >
-
+            <div>
                 <table style="width: 100%;">
                     <tr>
                         <td  class="totalsBlock" style="text-align: left;">
@@ -225,16 +270,16 @@
                                 <f:convertNumber pattern="#,##0.00" />   
                             </h:outputLabel>
 
-                            <h:outputLabel  rendered="#{cc.attrs.bill.discount eq 0.0}"    value="#{cc.attrs.bill.total}">
+                            <h:outputLabel styleClass="billTotal" rendered="#{cc.attrs.bill.discount eq 0.0}"    value="">
                                 <f:convertNumber pattern="#,##0.00" />
                             </h:outputLabel>
                         </td>
                     </tr>
                     <tr>
                         <td  class="totalsBlock" style="text-align: left;">
-                            <h:outputLabel   value="Number of Items Count" />
+                            <h:outputLabel   value="Number of Items Count : " />
                         </td>
-                        <td  class="totalsBlock">
+                        <td class="totalsBlock">
                             <h:outputLabel   value="#{cc.attrs.bill.billItems.size()}">
                                 <f:convertNumber pattern="#,##0.00" />
                             </h:outputLabel>
@@ -246,15 +291,12 @@
 
             </div>
 
-
             <div class="footer">
                 <br/>
                 THANK YOU !<br/>
                 Returns Accepted only within 3 days.
             </div>
 
-
-
         </div>
     </cc:implementation>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/resources/pharmacy/inward/issueBill.xhtml b/src/main/webapp/resources/pharmacy/inward/issueBill.xhtml
index 6c872d46d2..97056b7bc0 100644
--- a/src/main/webapp/resources/pharmacy/inward/issueBill.xhtml
+++ b/src/main/webapp/resources/pharmacy/inward/issueBill.xhtml
@@ -240,7 +240,7 @@
 
                     <tr>
                         <td colspan="4" class="w-100">
-                            <h:outputLabel value="-----------------------------------------"   />                           
+                            <h:outputLabel value="------------------------------------------------------------"   />                           
                         </td>
                     </tr>
 
@@ -255,46 +255,95 @@
                         <tr>
                             <td>
 
-                            </td>
-                            <td>
-                                <h:outputLabel    value="#{bip.qty}"    styleClass="itemsBlock"   style="text-align: right; padding-right: 30px;" >
-                                    <f:convertNumber integerOnly="true" />
-                                </h:outputLabel>
-                            </td>
-                            <td  styleClass="itemsBlockRight"  style="text-align: right; padding-right: 30px;" >
-                                <h:outputLabel    value="#{bip.rate}" >
-                                    <f:convertNumber pattern="#,##0.00" />
-                                </h:outputLabel>
-                            </td>
-                            <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 30px;" >
-                                <h:outputLabel    value="#{bip.grossValue}"    >
-                                    <f:convertNumber pattern="#,##0.00" />
-                                </h:outputLabel>
-                            </td>
-
-                        </tr>
 
 
+                            </td>
+                            <!--                            <td>
+                                                            <h:outputLabel    value="#{bip.qty}"    styleClass="itemsBlock"   style="text-align: right; padding-right: 30px;" >
+                                                                <f:convertNumber integerOnly="true" />
+                                                            </h:outputLabel>
+                                                        </td>
+                                                        <td  styleClass="itemsBlockRight"  style="text-align: right; padding-right: 30px;" >
+                                                            <h:outputLabel    value="#{bip.rate}" >
+                                                                <f:convertNumber pattern="#,##0.00" />
+                                                            </h:outputLabel>
+                                                        </td>
+                                                        <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 30px;" >
+                                                            <h:outputLabel    value="#{bip.grossValue}"    >
+                                                                <f:convertNumber pattern="#,##0.00" />
+                                                            </h:outputLabel>
+                                                        </td>-->
+
+
+
+                            <h:panelGroup rendered="#{configOptionApplicationController.getBooleanValueByKey('Disposal bills shows purchase rate of bill items in the bill', false)}">
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px;" >
+                                    <h:outputLabel value="#{bip.qty}"    >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
+
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px; " >
+                                    <h:outputLabel class="mx-2" value="#{bip.rate}" >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
+
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 15px;" >
+                                    <h:outputLabel class="mx-2" styleClass="itemValueIssue" value="#{bip.rate*bip.qty}"    >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
+
+                            </h:panelGroup>
+
+
+                            <h:panelGroup rendered="#{!configOptionApplicationController.getBooleanValueByKey('Disposal bills shows purchase rate of bill items in the bill', false)}">
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px;" >
+                                    <h:outputLabel value="#{bip.qty}"    >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
+
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px; width: 5em" >
+                                    <h:outputLabel class="mx-2" value="#{bip.pharmaceuticalBillItem.retailRate}" >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                    <br></br>
+                                </td>
+
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 15px;" >
+                                    <h:outputLabel class="mx-2" styleClass="itemValueIssue" value="#{bip.pharmaceuticalBillItem.retailRate*bip.qty}"    >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
+
+                            </h:panelGroup>
 
+                        </tr>
 
                     </ui:repeat>
 
+                </table>
 
+            </div>
+            <script>
 
+                function calculateTotal() {
+                    const itemValuesTotal = Array.from(document.querySelectorAll('.itemValueIssue')).map(td => parseFloat(td.innerText.replace(/,|\s/g, '')) || 0).reduce((sum, value) => sum + value, 0);
+                    document.querySelector('.itemTotalIssue').innerText = itemValuesTotal.toFixed(2);
+                    console.log(itemValuesTotal);
+                }
 
-                </table>
-
+                setTimeout(calculateTotal, 100);
 
-            </div>
+            </script>
 
 
             <div class="billline" style="width: 90%; margin-left: 5%;">
                 <hr/>                         
             </div>
 
-
-
-
             <div  >
 
                 <table style="width: 100%;">
@@ -304,7 +353,7 @@
                             <h:outputLabel value="Total" />
                         </td>
                         <td  class="totalsBlock" style="text-align: right!important; width: 40%; padding-right: 30px;">
-                            <h:outputLabel value="#{cc.attrs.bill.total}" >
+                            <h:outputLabel styleClass="itemTotalIssue" value="0.00" >
                                 <f:convertNumber pattern="#,##0.00" />
                             </h:outputLabel>
                         </td>
diff --git a/src/main/webapp/resources/pharmacy/inward/returnBill.xhtml b/src/main/webapp/resources/pharmacy/inward/returnBill.xhtml
index 8bbe1a191f..9e6f26bb3f 100644
--- a/src/main/webapp/resources/pharmacy/inward/returnBill.xhtml
+++ b/src/main/webapp/resources/pharmacy/inward/returnBill.xhtml
@@ -39,7 +39,7 @@
             </div>
 
             <div class="billline">
-                <h:outputLabel value="-----------------------------------------------"   />                           
+                <h:outputLabel value="----------------------------------------------------------"   />                       
             </div>
 
             <div class="billDetails" >
@@ -71,7 +71,7 @@
 
                     </tr>
 
-                    
+
                     <tr>    
                         <td style="width: 15% ;text-align: left;" >
                             <h:outputLabel value="Inv.No" ></h:outputLabel>
@@ -96,9 +96,9 @@
                         </td>
 
                     </tr>
-                    
+
                     <h:panelGroup rendered="#{cc.attrs.bill.invoiceNumber ne null}">
-                        
+
                         <tr>
                             <td style="width: 15% ;text-align: left;" >
                                 <h:outputLabel value="Bill No" ></h:outputLabel>
@@ -121,7 +121,7 @@
 
                         </tr>
                     </h:panelGroup>
-                    
+
                     <h:panelGroup rendered="#{cc.attrs.bill.patient ne null}" >
                         <tr>
                             <td style="width: 15% ;text-align: left;" >
@@ -149,7 +149,7 @@
 
 
             <div class="billline">
-                <h:outputLabel value="-----------------------------------------------"   />                           
+               <h:outputLabel value="----------------------------------------------------------"   />                       
             </div>
 
 
@@ -163,22 +163,52 @@
                         <td  style="width:15%;">
                             <h:outputLabel value="QTY"  styleClass="itemHeadings" ></h:outputLabel>
                         </td>
-                        
+
+                        <td  style="width:15%;">
+                            <h:outputLabel value="RATE"  styleClass="itemHeadings" ></h:outputLabel>
+                        </td>
+
                         <td  style="width:30%;">
                             <h:outputLabel value="VALUE"  styleClass="itemHeadings" ></h:outputLabel>
                         </td>
-                        
-                      
+
+
                     </tr>
 
+
                     <tr>
                         <td colspan="4" >
-                            <h:outputLabel value="-----------------------------------------------"   />                           
+                            <h:outputLabel value="-------------------------------------------------------------"   />                   
                         </td>
                     </tr>
 
                     <ui:repeat value="#{cc.attrs.bill.billItems}" var="bip">
 
+                        <!--                        <tr>
+                                                    <td colspan="4" style="overflow: visible;">
+                                                        <h:outputLabel value="#{bip.item.name}"  styleClass="itemsBlock"  >
+                                                        </h:outputLabel>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                        
+                                                    </td>
+                                                    <td>
+                                                        <h:outputLabel    value="#{bip.qty}"    styleClass="itemsBlock"  >
+                                                            <f:convertNumber pattern="#,##0.00" />
+                                                        </h:outputLabel>
+                                                    </td>
+                                                    
+                                                    <td>
+                                                        <h:outputLabel    value="#{bip.netValue}"    styleClass="itemsBlock"  >
+                                                            <f:convertNumber pattern="#,##0.00" />
+                                                        </h:outputLabel>
+                                                    </td>
+                        
+                                                </tr>
+                        -->
+
                         <tr>
                             <td colspan="4" style="overflow: visible;">
                                 <h:outputLabel value="#{bip.item.name}"  styleClass="itemsBlock"  >
@@ -189,41 +219,84 @@
                             <td>
 
                             </td>
-                            <td>
-                                <h:outputLabel    value="#{bip.qty}"    styleClass="itemsBlock"  >
-                                    <f:convertNumber pattern="#,##0.00" />
-                                </h:outputLabel>
-                            </td>
-                            
-                            <td>
-                                <h:outputLabel    value="#{bip.netValue}"    styleClass="itemsBlock"  >
-                                    <f:convertNumber pattern="#,##0.00" />
-                                </h:outputLabel>
-                            </td>
 
-                        </tr>
 
+                            <h:panelGroup rendered="#{configOptionApplicationController.getBooleanValueByKey('Disposal bills shows purchase rate of bill items in the bill', false)}">
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 10px;" >
+                                    <h:outputLabel value="#{bip.qty}"    >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
 
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 10px; " >
+                                    <h:outputLabel class="mx-2" value="#{bip.rate}" >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
 
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 15px;" >
+                                    <h:outputLabel class="mx-2" styleClass="itemValueReturnBill" value="#{bip.rate*bip.qty}"    >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
 
-                    </ui:repeat>
+                            </h:panelGroup>
 
 
+                            <h:panelGroup rendered="#{!configOptionApplicationController.getBooleanValueByKey('Disposal bills shows purchase rate of bill items in the bill', false)}">
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 10px;" >
+                                    <h:outputLabel value="#{bip.qty}"    >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
 
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 10px; width: 5em" >
+                                    <h:outputLabel class="mx-2" value="#{bip.pharmaceuticalBillItem.retailRate}" >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                    <br></br>
+                                </td>
 
-                </table>
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 15px;" >
+                                    <h:outputLabel class="mx-2" styleClass="itemValueReturnBill" value="#{bip.pharmaceuticalBillItem.retailRate*bip.qty}"    >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
 
+                            </h:panelGroup>
 
-            </div>
+                        </tr>
 
+                    </ui:repeat>
+
+                </table>
 
-            <div class="billline">
-                <h:outputLabel value="-----------------------------------------------"   />                           
             </div>
+            <script>
+
+                function calculateTotal() {
+                    const itemValuesTotal = Array.from(document.querySelectorAll('.itemValueReturnBill'))
+                            .map(td => {
+                                const rawText = td.innerText; 
+                                const cleanedText = rawText.replace(/[^\d.]/g, '');
+                                const numericValue = parseFloat(cleanedText) || 0;                               
+                                return numericValue;
+                            })
+                            .reduce((sum, value) => sum + value, 0);
 
+                    document.querySelector('.itemTotalReturnBill').innerText = itemValuesTotal.toFixed(2);
+                    console.log(itemValuesTotal);
+                }
 
+                setTimeout(calculateTotal, 100);
+
+            </script>
+
+            <div class="billline">
+                <h:outputLabel value="----------------------------------------------------------"   />                           
+            </div>
 
-            <div  >
+            <div>
 
                 <table style="width: 100%;">
                     <h:panelGroup rendered="#{(webUserController.hasPrivilege('ShowInwardFee'))}">
@@ -231,8 +304,8 @@
                             <td class="totalsBlock" style="text-align: left; width: 60%;">
                                 <h:outputLabel value="Sub Total" />
                             </td>
-                            <td  class="totalsBlock" style="text-align: right!important; width: 40%;">
-                                <h:outputLabel value="#{cc.attrs.bill.total}" >
+                            <td  class="totalsBlock" style="text-align: right!important; width: 40%; padding-right: 15px">
+                                <h:outputLabel styleClass="itemTotalReturnBill" value="0.00" >
                                     <f:convertNumber pattern="#,##0.00" />
                                 </h:outputLabel>
                             </td>
@@ -252,7 +325,7 @@
                                 <h:outputLabel  rendered="#{cc.attrs.bill.discount ne 0.0}"    value="Total" />
                             </td>
                             <td  class="totalsBlock" style="text-align: right!important; ">
-                                <h:outputLabel  rendered="#{cc.attrs.bill.netTotal ne 0.0}"    value="#{cc.attrs.bill.netTotal}">
+                                <h:outputLabel  rendered="#{cc.attrs.bill.discount ne 0.0}"    value="#{cc.attrs.bill.netTotal}">
                                     <f:convertNumber pattern="#,##0.00" />
                                 </h:outputLabel>
                             </td>
diff --git a/src/main/webapp/resources/pharmacy/pharmacy_disposal_bill_five_five.xhtml b/src/main/webapp/resources/pharmacy/pharmacy_disposal_bill_five_five.xhtml
index f20538a349..3e7d071e66 100644
--- a/src/main/webapp/resources/pharmacy/pharmacy_disposal_bill_five_five.xhtml
+++ b/src/main/webapp/resources/pharmacy/pharmacy_disposal_bill_five_five.xhtml
@@ -292,24 +292,75 @@
                                     <h:outputLabel  value="#{bip.searialNo+1} - #{bip.item.name}"  style="font-size: 15px!important; font-family:verdana, Helvetica, sans-serif!important;"  >
                                     </h:outputLabel>
                                 </td>
-                                <td style="width:5%!important;text-align: right; padding-right: 15px!important">
-                                    <h:outputLabel class="itemHeadingsFiveFive" value="#{bip.qty}" >
-                                        <f:convertNumber integerOnly="true" />
-                                    </h:outputLabel>
-                                </td>
-                                <td style="width:10%!important;text-align: right; padding-right: 15px!important">
-                                    <h:outputLabel class="itemHeadingsFiveFive" value="#{bip.rate}" >
-                                        <f:convertNumber pattern="#,##0.00" />
-                                    </h:outputLabel>
-                                </td>
-                                <td style="width:10%!important; text-align: right;">
-                                    <h:outputLabel class="itemHeadingsFiveFive" value="#{bip.rate*bip.qty}">
-                                        <f:convertNumber pattern="#,##0.00" />
-                                    </h:outputLabel>
-                                </td>
-
+                                <h:panelGroup rendered="#{configOptionApplicationController.getBooleanValueByKey('Disposal bills shows purchase rate of bill items in the bill', false)}">
+                                    <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px;" >
+                                        <h:outputLabel value="#{bip.qty}"    >
+                                            <f:convertNumber pattern="#,##0.00" />
+                                        </h:outputLabel>
+                                    </td>
+
+                                    <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px; " >
+                                        <h:outputLabel class="mx-2" value="#{bip.rate}" >
+                                            <f:convertNumber pattern="#,##0.00" />
+                                        </h:outputLabel>
+                                    </td>
+
+                                    <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px;" >
+                                        <h:outputLabel class="mx-2" styleClass="itemValue" value="#{bip.rate*bip.qty}"    >
+                                            <f:convertNumber pattern="#,##0.00" />
+                                        </h:outputLabel>
+                                    </td>
+
+                                </h:panelGroup>
+
+
+                                <h:panelGroup rendered="#{!configOptionApplicationController.getBooleanValueByKey('Disposal bills shows purchase rate of bill items in the bill', false)}">
+                                    <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px;" >
+                                        <h:outputLabel value="#{bip.qty}"    >
+                                            <f:convertNumber pattern="#,##0.00" />
+                                        </h:outputLabel>
+                                    </td>
+
+                                    <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px; width: 5em" >
+                                        <h:outputLabel class="mx-2" value="#{bip.pharmaceuticalBillItem.retailRate}" >
+                                            <f:convertNumber pattern="#,##0.00" />
+                                        </h:outputLabel>
+                                        <br></br>
+                                    </td>
+
+                                    <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px;" >
+                                        <h:outputLabel class="mx-2" styleClass="itemValue" value="#{bip.pharmaceuticalBillItem.retailRate*bip.qty}"    >
+                                            <f:convertNumber pattern="#,##0.00" />
+                                        </h:outputLabel>
+                                    </td>
+
+                                </h:panelGroup>
                             </tr>
 
+
+                            <!--                            <tr>
+                                                            <td style="width:75%!important;">
+                                                                <h:outputLabel  value="#{bip.searialNo+1} - #{bip.item.name}"  style="font-size: 15px!important; font-family:verdana, Helvetica, sans-serif!important;"  >
+                                                                </h:outputLabel>
+                                                            </td>
+                                                            <td style="width:5%!important;text-align: right; padding-right: 15px!important">
+                                                                <h:outputLabel class="itemHeadingsFiveFive" value="#{bip.qty}" >
+                                                                    <f:convertNumber integerOnly="true" />
+                                                                </h:outputLabel>
+                                                            </td>
+                                                            <td style="width:10%!important;text-align: right; padding-right: 15px!important">
+                                                                <h:outputLabel class="itemHeadingsFiveFive" value="#{bip.rate}" >
+                                                                    <f:convertNumber pattern="#,##0.00" />
+                                                                </h:outputLabel>
+                                                            </td>
+                                                            <td style="width:10%!important; text-align: right;">
+                                                                <h:outputLabel class="itemHeadingsFiveFive" value="#{bip.rate*bip.qty}">
+                                                                    <f:convertNumber pattern="#,##0.00" />
+                                                                </h:outputLabel>
+                                                            </td>
+                            
+                                                        </tr>-->
+
                         </ui:repeat>
                     </h:panelGroup>
 
@@ -336,7 +387,7 @@
                                 </td>
 
                                 <td  >
-                                    <h:outputLabel class="itemsBlockRightFiveFive"   value="#{bip.netValue}"    >
+                                    <h:outputLabel class="itemsBlockRightFiveFive" styleClass="itemValue"  value="#{bip.netValue}"    >
                                         <f:convertNumber pattern="#,##0.00" />
                                     </h:outputLabel>
                                 </td>
@@ -345,12 +396,8 @@
                         </ui:repeat>
                     </h:panelGroup>
 
-
-
-
                 </table>
 
-
             </div>
 
 
@@ -358,8 +405,6 @@
                 <h:outputLabel value="--------------------------------------------------------------------------------"   />                           
             </div>
 
-
-
             <div  >
 
                 <table style="width: 100%;">
@@ -370,7 +415,7 @@
                                 <h:outputLabel value="Total" style="font-size: 15px; font-weight: bold;"/>
                             </td>
                             <td  class="totalsBlock" style="text-align: right!important; width: 40%; padding-right: 0px;">
-                                <h:outputLabel value="#{cc.attrs.bill.total}" style="font-size: 15px; font-weight: bold;">
+                                <h:outputLabel styleClass="totalValue" value="0.00" style="font-size: 15px; font-weight: bold;">
                                     <f:convertNumber pattern="#,##0.00" />
                                 </h:outputLabel>
                             </td>
@@ -383,12 +428,22 @@
                                 <h:outputLabel value="Total" style="font-size: 15px; font-weight: bold;"/>
                             </td>
                             <td  class="totalsBlock" style="text-align: right!important; width: 40%; padding-right: 0px;">
-                                <h:outputLabel value="#{cc.attrs.bill.total}" style="font-size: 15px; font-weight: bold;">
+                                <h:outputLabel value="0.00" styleClass="totalValue" style="font-size: 15px; font-weight: bold;">
                                     <f:convertNumber pattern="#,##0.00" />
                                 </h:outputLabel>
                             </td>
                         </tr>
                     </h:panelGroup>
+                    <script>
+                        function calculateTotal() {
+
+                            const total = Array.from(document.querySelectorAll('.itemValue')).map(td => parseFloat(td.innerText) || 0).reduce((sum, value) => sum + value, 0);
+                            document.querySelector('.totalValue').innerText = total.toFixed(2);
+                        }
+
+                        setTimeout(calculateTotal, 100);
+
+                    </script>
 
                     <h:panelGroup rendered="#{cc.attrs.bill.discount ne 0.0}">
                         <tr>
@@ -414,16 +469,16 @@
                         </td>
                     </tr>
 
-<!--                    <tr>
-                        <td class="totalsBlock" style="text-align: left; width: 60%;">
-                            <h:outputLabel value="Balance" />
-                        </td>
-                        <td  class="totalsBlock" style="text-align: right!important; width: 40%; padding-right: 0px;">
-                            <h:outputLabel value="#{cc.attrs.bill.cashPaid-cc.attrs.bill.netTotal}" >
-                                <f:convertNumber pattern="#,##0.00" />
-                            </h:outputLabel>
-                        </td>
-                    </tr>-->
+                    <!--                    <tr>
+                                            <td class="totalsBlock" style="text-align: left; width: 60%;">
+                                                <h:outputLabel value="Balance" />
+                                            </td>
+                                            <td  class="totalsBlock" style="text-align: right!important; width: 40%; padding-right: 0px;">
+                                                <h:outputLabel value="#{cc.attrs.bill.cashPaid-cc.attrs.bill.netTotal}" >
+                                                    <f:convertNumber pattern="#,##0.00" />
+                                                </h:outputLabel>
+                                            </td>
+                                        </tr>-->
 
                     <!--                    <tr>
                                             <td class="totalsBlock" style="text-align: left; width: 60%;">
diff --git a/src/main/webapp/resources/pharmacy/pharmacy_disposal_bill_pos.xhtml b/src/main/webapp/resources/pharmacy/pharmacy_disposal_bill_pos.xhtml
index 480a11e70a..b2d7e374d5 100644
--- a/src/main/webapp/resources/pharmacy/pharmacy_disposal_bill_pos.xhtml
+++ b/src/main/webapp/resources/pharmacy/pharmacy_disposal_bill_pos.xhtml
@@ -41,7 +41,7 @@
             </div>
 
             <div class="billline">
-                <h:outputLabel value="-----------------------------------------------"   />                           
+                <h:outputLabel value="--------------------------------------------------------------"   />                           
             </div>
 
             <div class="billDetails" >
@@ -82,7 +82,7 @@
                             </h:outputLabel>
                         </td>
                     </tr>
-                    
+
                     <h:panelGroup rendered="#{cc.attrs.bill.invoiceNumber ne null}" >
                         <tr>
                             <td style="width: 20% ;text-align: left;" >
@@ -129,11 +129,11 @@
                     </tr>
                     <tr>
                         <td style="width: 15%; text-align: left;" >
-                            <h:outputLabel value="User" ></h:outputLabel>
+                            <h:outputLabel value="Issued By" ></h:outputLabel>
                         </td>
                         <td>:</td>
-                        <td style="width: 30%" >
-                            <h:outputLabel value="#{cc.attrs.bill.creater.staff.code}" >
+                        <td style="width: 40%" >
+                            <h:outputLabel value="#{cc.attrs.bill.creater.staff.person.name}" >
                             </h:outputLabel>
                         </td>
                     </tr>
@@ -145,7 +145,7 @@
                                 <h:outputLabel value="Name" ></h:outputLabel>
                             </td>
                             <td>:</td>
-                            <td style="width: 30%;" >
+                            <td style="width: 40%;" >
                                 <h:outputLabel value="#{cc.attrs.bill.patient.person.nameWithTitle}"  >
                                 </h:outputLabel>
                             </td>
@@ -161,59 +161,87 @@
             </div>
 
             <div class="billline">
-                <h:outputLabel value="-----------------------------------------------"   />                           
+                <h:outputLabel value="--------------------------------------------------------------"   />                           
             </div>
 
             <div >
                 <table style="width: 90%; margin-left: 5%" >
                     <tr>
-                        <td style="width: 40%; ">
+                        <td style="width: 30%; ">
                             <h:outputLabel value="ITEM" styleClass="itemHeadings" ></h:outputLabel>
                         </td>
                         <td  style="width:20%!important;text-align: right; padding-right: 15px!important">
                             <h:outputLabel value="QTY" styleClass="itemHeadings" ></h:outputLabel>
                         </td>
 
-                        <td  style="width:20%!important;text-align: right; padding-right: 15px!important">
+                        <td  style="width:15%!important;text-align: right; padding-right: 15px!important">
                             <h:outputLabel value="RATE" styleClass="itemHeadings" ></h:outputLabel>
                         </td>
-                        <td  style="width:20%;text-align: right; padding-right: 0px;">
+                        <td  style="width:15%;text-align: right; padding-right: 15px;">
                             <h:outputLabel value="VALUE"  styleClass="itemHeadings" ></h:outputLabel>
                         </td>
                     </tr>
 
                     <tr>
                         <td colspan="4" class="text-center">
-                            <h:outputLabel value="-----------------------------------------------"  />                           
+                            <h:outputLabel value="--------------------------------------------------------------"  />                           
                         </td>
                     </tr>
 
                     <ui:repeat value="#{cc.attrs.bill.billItems}" var="bip">
 
                         <tr>
-                            <td style="overflow: visible;" colspan="4">
+                            <td style="overflow: visible;" >
                                 <h:outputLabel value="#{bip.item.name}"  style="text-transform: capitalize!important;"  >
                                 </h:outputLabel>
                             </td>
                         </tr>
                         <tr>
-                            <td></td>
-                            <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px;" >
-                                <h:outputLabel value="#{bip.qty}"    >
-                                    <f:convertNumber pattern="#,##0.00" />
-                                </h:outputLabel>
-                            </td>
-                            <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px;" >
-                                <h:outputLabel value="#{bip.rate}" >
-                                    <f:convertNumber pattern="#,##0.00" />
-                                </h:outputLabel>
-                            </td>
+                            <td width="1px"></td>
 
-                            <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 0px;" >
-                                <h:outputLabel value="#{bip.rate*bip.qty}"    >
-                                    <f:convertNumber pattern="#,##0.00" />
-                                </h:outputLabel>
-                            </td>
+                            <h:panelGroup rendered="#{configOptionApplicationController.getBooleanValueByKey('Disposal bills shows purchase rate of bill items in the bill', false)}">
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 10px;" >
+                                    <h:outputLabel value="#{bip.qty}"    >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
+
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 10px;" >
+                                    <h:outputLabel value="#{bip.rate}" >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
+
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 15px;" >
+                                    <h:outputLabel styleClass="itemValue" value="#{bip.rate*bip.qty}"    >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
+
+                            </h:panelGroup>
+
+
+                            <h:panelGroup rendered="#{!configOptionApplicationController.getBooleanValueByKey('Disposal bills shows purchase rate of bill items in the bill', false)}">
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 10px;" >
+                                    <h:outputLabel value="#{bip.qty}"    >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
+
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 10px;" >
+                                    <h:outputLabel value="#{bip.pharmaceuticalBillItem.retailRate}" >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                    <br></br>
+                                </td>
+
+                                <td  styleClass="itemsBlockRight" style="text-align: right; padding-right: 15px;" >
+                                    <h:outputLabel styleClass="itemValue" value="#{bip.pharmaceuticalBillItem.retailRate*bip.qty}"    >
+                                        <f:convertNumber pattern="#,##0.00" />
+                                    </h:outputLabel>
+                                </td>
+
+                            </h:panelGroup>
 
                         </tr>
                     </ui:repeat>
@@ -221,9 +249,10 @@
             </div>
 
             <div class="billline">
-                <h:outputLabel value="-----------------------------------------------"   />                           
+                <h:outputLabel value="--------------------------------------------------------------"   />                           
             </div>
 
+
             <div  >
                 <table style="width: 90%; margin-left: 5%">
                     <tr>
@@ -231,10 +260,11 @@
                             <h:outputLabel value="Total" />
                         </td>
                         <td  class="totalsBlock" style="text-align: right!important; width: 40%; padding-right: 0px;">
-                            <h:outputLabel value="#{cc.attrs.bill.total}" >
+                            <h:outputLabel styleClass="billTotal" value="" >
                                 <f:convertNumber pattern="#,##0.00" />
-                            </h:outputLabel>
+                            </h:outputLabel>                           
                         </td>
+
                     </tr>
                     <tr>
                         <td  class="totalsBlock" style="text-align: left;">
@@ -261,6 +291,27 @@
 
             </div>
 
+            <script>
+                function calculateTotal(){
+                    const allBillValues = document.querySelectorAll('.itemValue');
+                    console.log(allBillValues.size)
+                    
+                    const total = Array.from(allBillValues)
+                            .map(
+                                td => {
+                                    const clearText = td.innerText.replace(/,/g,'').trim();
+                                    const value = parseFloat(clearText) || 0; 
+                                    //console.log(value); 
+                                    return value})
+                            .reduce((sum, value)=> sum + value, 0);
+                    //console.log(total);
+                    
+                    document.querySelector('.billTotal').innerText = total.toFixed(2);
+                }
+                
+                setTimeout(calculateTotal, 100);
+            </script>
+
             <div class="footer">
                 <br/>
                 THANK YOU !

From de3b898e4891019354fad870c11057e34bb395ea Mon Sep 17 00:00:00 2001
From: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>
Date: Wed, 19 Feb 2025 18:49:59 +0530
Subject: [PATCH 3/3] Fixed #10556 Signed-off-by: Lawan Samarasekara
 <lawan.chaamindu1234@gmail.com>

---
 .../com/divudi/bean/pharmacy/PharmacySaleBhtController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleBhtController.java b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleBhtController.java
index 12d6cde4f8..b2a1295dc6 100644
--- a/src/main/java/com/divudi/bean/pharmacy/PharmacySaleBhtController.java
+++ b/src/main/java/com/divudi/bean/pharmacy/PharmacySaleBhtController.java
@@ -1416,7 +1416,7 @@ public void calculateRates(BillItem bi) {
                 matrixDept = getSessionController().getDepartment();
             }
             if (getPatientEncounter().getCurrentPatientRoom() == null) {
-                matrixDept = getSessionController().getDepartment();
+                matrixDept = getPatientEncounter().getDepartment();
             }
             if (getPatientEncounter().getCurrentPatientRoom() != null) {
                 if (getPatientEncounter().getCurrentPatientRoom().getRoomFacilityCharge() != null) {