Merge branch 'master' into Issue#6477

.github/counter.txt

@@ -1 +1 @@
-3
+9

README.md

@@ -18,7 +18,8 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio
 
 ## Current Version
 
-Current Version: 3.0.0.20240721.3 (This line will be automatically updated to reflect the latest version)
+Current Version: 3.0.0.20240721.9 (This line will be automatically updated to reflect the latest version)
+
 
 ## History
 

nb-configuration.xml

@@ -15,8 +15,8 @@ That way multiple projects can share the same settings (useful for formatting ru
 Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
         <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
+        <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>pfv5ee8</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
         <netbeans.compile.on.save>none</netbeans.compile.on.save>
         <org-netbeans-modules-maven-j2ee.netbeans_2e_deploy_2e_on_2e_save>false</org-netbeans-modules-maven-j2ee.netbeans_2e_deploy_2e_on_2e_save>
-
     </properties>
 </project-shared-configuration>

pom.xml

@@ -2,10 +2,12 @@
          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>sethma</artifactId>
     <version>3.0.0</version>
     <packaging>war</packaging>
     <name>sethma</name>
+
     <properties>
         <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -306,7 +308,11 @@
             <artifactId>reflections</artifactId>
             <version>0.10.2</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-catalina</artifactId>
+            <version>9.0.83</version> <!-- or the version compatible with your setup -->
+        </dependency>
 
     </dependencies>
 

src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java

@@ -948,7 +948,9 @@ private void createPaymentSummery() {
 
             return row;
         }).collect(Collectors.toList());
+
         getPaymentSummaryBundle().getReportTemplateRows().addAll(rows);
+
     }
 
     public String navigateToViewEndOfSelectedShiftStartSummaryBill(Bill startBill) {
@@ -973,6 +975,7 @@ public String navigateToViewStartToEndOfSelectedShiftStartSummaryBill(Bill start
             JsfUtil.addErrorMessage("No Start Bill");
             return null;
         }
+
         endBill = startBill.getReferenceBill();
         nonClosedShiftStartFundBill = startBill;
         fillPaymentsFromShiftStartToEnd(startBill, endBill, startBill.getCreater());
@@ -1961,6 +1964,7 @@ public List<Bill> getShiaftStartBills() {
 
     public void setShiaftStartBills(List<Bill> shiaftStartBills) {
         this.shiaftStartBills = shiaftStartBills;
+
     }
 
     public List<Payment> getPaymentsSelected() {
@@ -1969,6 +1973,7 @@ public List<Payment> getPaymentsSelected() {
 
     public void setPaymentsSelected(List<Payment> paymentsSelected) {
         this.paymentsSelected = paymentsSelected;
+
     }
 
 }

src/main/resources/META-INF/persistence.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
     <persistence-unit name="hmisPU" transaction-type="JTA">
+
         <jta-data-source>jdbc/sethma</jta-data-source>
+
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>

src/main/resources/VERSION.txt

@@ -1 +1 @@
-3.0.0.20240721.3
+3.0.0.20240721.9