Merge branch 'master' of https://[email protected]/hmislk/hmis.git …

…into Issue#6398 # Conflicts: # pom.xml # src/main/java/com/divudi/bean/common/EnumController.java # src/main/java/com/divudi/data/inward/InwardChargeType.java # src/main/resources/META-INF/persistence.xml # src/main/webapp/WEB-INF/glassfish-web.xml Signed-off-by: buddhika75 <[email protected]>
hmislk · Jul 14, 2024 · 08a6860 · 08a6860
2 parents 5535262 + 8c54c4a
commit 08a6860
Show file tree

Hide file tree

Showing 119 changed files with 5,474 additions and 1,197 deletions.
diff --git a/.github/counter.txt b/.github/counter.txt
@@ -1 +1 @@
-2
+1
diff --git a/.github/last_date.txt b/.github/last_date.txt
@@ -1 +1 @@
-20240708
+20240713
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Developed using Java Enterprise Edition, the system offers both a web applicatio
 
 ## Current Version
 
-Current Version: 3.0.0.20240708.2 (This line will be automatically updated to reflect the latest version)
+Current Version: 3.0.0.20240713.1 (This line will be automatically updated to reflect the latest version)
 
 ## History
 

diff --git a/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java b/src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java
@@ -269,6 +269,7 @@ public void resetClassVariables() {
         selectedBill = null;
         nonClosedShiftStartFundBill = null;
         paymentsFromShiftSratToNow = null;
+
     }
 
     public void resetClassVariablesWithoutSelectedBill() {
@@ -694,8 +695,24 @@ public void calculateBillValuesFromBillTypes(Bill p) {
     }
 
     public void calculateTotalFundsFromShiftStartToNow() {
-        additions = financialReportByPayments.getCashTotal() + financialReportByPayments.getNetCreditCardTotal() + financialReportByPayments.getCollectedVoucher() + financialReportByPayments.getNetOtherNonCreditTotal() + financialReportByPayments.getBankWithdrawals();
-        Deductions = financialReportByPayments.getRefundedCash() + financialReportByPayments.getRefundedCreditCard() + financialReportByPayments.getRefundedVoucher() + financialReportByPayments.getRefundedOtherNonCredit() + financialReportByPayments.getFloatHandover() + financialReportByPayments.getBankDeposits();
+        //System.out.println("additions");
+        //System.out.println("financialReportByPayments.getBankWithdrawals() = " + financialReportByPayments.getBankWithdrawals());
+        //System.out.println("financialReportByPayments.getCashTotal() = " + financialReportByPayments.getCashTotal());
+        //System.out.println("financialReportByPayments.getNetCreditCardTotal() = " + financialReportByPayments.getNetCreditCardTotal());
+        //System.out.println("financialReportByPayments.getCollectedVoucher() = " + financialReportByPayments.getCollectedVoucher());
+        //System.out.println("financialReportByPayments.getNetOtherNonCreditTotal() = " + financialReportByPayments.getNetOtherNonCreditTotal());
+        //System.out.println("financialReportByPayments.getBankWithdrawals() = " + financialReportByPayments.getFloatReceived());
+
+        //additions = financialReportByPayments.getCashTotal() + financialReportByPayments.getNetCreditCardTotal() + financialReportByPayments.getCollectedVoucher() + financialReportByPayments.getNetOtherNonCreditTotal() + financialReportByPayments.getBankWithdrawals();
+        //Deductions = financialReportByPayments.getRefundedCash() + financialReportByPayments.getRefundedCreditCard() + financialReportByPayments.getRefundedVoucher() + financialReportByPayments.getRefundedOtherNonCredit() + financialReportByPayments.getFloatHandover() + financialReportByPayments.getBankDeposits();
+
+        additions = financialReportByPayments.getBankWithdrawals() + financialReportByPayments.getCashTotal() + financialReportByPayments.getNetCreditCardTotal() + financialReportByPayments.getCollectedVoucher() + financialReportByPayments.getNetOtherNonCreditTotal() + financialReportByPayments.getFloatReceived();
+        Deductions = financialReportByPayments.getFloatHandover() + financialReportByPayments.getBankDeposits();
+
+        //System.out.println("\n\nDeductions");
+        //System.out.println("financialReportByPayments.getFloatHandover() = " + financialReportByPayments.getFloatHandover());
+        //System.out.println("financialReportByPayments.getBankDeposits() = " + financialReportByPayments.getBankDeposits());
+
         totalFunds = additions - Deductions;
         shiftEndTotalValue = totalFunds;
 
@@ -964,6 +981,7 @@ public String navigateToCreateNewFundWithdrawalBill() {
     }
 
     private void prepareToAddNewWithdrawalProcessingBill() {
+        currentBillPayments = null;
         currentBill = new Bill();
         currentBill.setBillType(BillType.WithdrawalFundBill);
         currentBill.setBillTypeAtomic(BillTypeAtomic.FUND_WITHDRAWAL_BILL);

diff --git a/src/main/java/com/divudi/bean/channel/BookingController.java b/src/main/java/com/divudi/bean/channel/BookingController.java
@@ -2790,6 +2790,7 @@ private Bill saveBilledBill(boolean forReservedNumbers) {
 
         List<BillItem> savingBillItems = new ArrayList<>();
         savingBillItems.add(savingBillItem);
+        savingBillItems.add(additionalBillItem);
         getBillItemFacade().edit(savingBillItem);
         savingBillItem.setHospitalFee(billBeanController.calFeeValue(FeeType.OwnInstitution, savingBillItem));
         savingBillItem.setStaffFee(billBeanController.calFeeValue(FeeType.Staff, savingBillItem));