10260 after grn is canceled it must be removed from the suppler payment list

src/main/java/com/divudi/bean/common/BillController.java

@@ -2837,8 +2837,9 @@ public List<Bill> findUnpaidBills(Date frmDate, Date toDate, List<BillTypeAtomic
 
     public List<Bill> findUnpaidBills(Date frmDate, Date toDate, List<BillTypeAtomic> billTypes,
             PaymentMethod pm, Double balanceGraterThan, Boolean omitPaymentGeneratedBills) {
-        String jpql = "SELECT b FROM Bill b WHERE b.retired = :ret AND b.cancelled = :can "
-                + "AND b.createdAt BETWEEN :frm AND :to";
+        String jpql = "SELECT b FROM Bill b WHERE b.retired = :ret "
+                + " AND b.cancelled = :can " //Cancelled bills are no longer listed here
+                + " AND b.createdAt BETWEEN :frm AND :to";
 
         HashMap<String, Object> params = new HashMap<>();
         params.put("frm", frmDate);

src/main/java/com/divudi/bean/common/ReportsController.java

@@ -61,7 +61,6 @@
 import java.text.SimpleDateFormat;
 import java.util.stream.Collectors;
 import java.text.DecimalFormat;
-
 import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 
 /**
@@ -2651,7 +2650,7 @@ public void generateDebtorBalanceReport(final boolean onlyDueBills) {
     }
 
     public ReportTemplateRowBundle generateDebtorBalanceReportBills(List<BillTypeAtomic> bts, List<PaymentMethod> billPaymentMethods,
-                                                                    boolean onlyDueBills) {
+            boolean onlyDueBills) {
         Map<String, Object> parameters = new HashMap<>();
         String jpql = "SELECT new com.divudi.data.ReportTemplateRow(bill) "
                 + "FROM Bill bill "
@@ -3594,7 +3593,7 @@ public void exportOpdAndInwardOPToPdf() {
             table.setWidths(columnWidths);
 
             String[] headers = {"S. No", "Invoice Date", "Invoice No", "Customer Reference No", "MRNO", "Patient Name",
-                    "Gross Amt", "Disc Amt", "Net Amt", "Patient Share", "Sponsor Share", "Due Amt"};
+                "Gross Amt", "Disc Amt", "Net Amt", "Patient Share", "Sponsor Share", "Due Amt"};
             for (String header : headers) {
                 PdfPCell cell = new PdfPCell(new Phrase(header, boldFont));
                 cell.setHorizontalAlignment(Element.ALIGN_CENTER);
@@ -3817,7 +3816,7 @@ public void exportOpdAndInwardIPToPdf() {
             table.setWidths(columnWidths);
 
             String[] headers = {"S. No", "BHT No", "Invoice Date", "Invoice No", "Customer Reference No", "MRNO", "Patient Name",
-                    "Gross Amt", "Disc Amt", "Net Amt", "Patient Share", "Sponsor Share", "Due Amt"};
+                "Gross Amt", "Disc Amt", "Net Amt", "Patient Share", "Sponsor Share", "Due Amt"};
             for (String header : headers) {
                 PdfPCell cell = new PdfPCell(new Phrase(header, boldFont));
                 cell.setHorizontalAlignment(Element.ALIGN_CENTER);
@@ -4859,8 +4858,8 @@ public void exportDetailedWeeklyOPDReportToPDF() {
     }
 
     private void addWeeklyReportSection(Document document, String sectionTitle, List<String> itemList,
-                                        List<Integer> daysOfWeek, Map<Integer, Map<String, Map<Integer, Double>>> weeklyDailyBillItemMap,
-                                        int week, com.itextpdf.text.Font headerFont, com.itextpdf.text.Font regularFont) throws DocumentException {
+            List<Integer> daysOfWeek, Map<Integer, Map<String, Map<Integer, Double>>> weeklyDailyBillItemMap,
+            int week, com.itextpdf.text.Font headerFont, com.itextpdf.text.Font regularFont) throws DocumentException {
         document.add(new com.itextpdf.text.Paragraph(sectionTitle, headerFont));
         document.add(com.itextpdf.text.Chunk.NEWLINE);
 

src/main/java/com/divudi/bean/pharmacy/SupplierPaymentController.java

@@ -128,7 +128,7 @@ public class SupplierPaymentController implements Serializable {
     private Bill current;
     private Bill currentCancellationBill;
     private List<Bill> currentReturnBills;
-    private List<BillItem> currentPaymentBills;
+    private List<BillItem> currentPaymentBillItems;
     private List<Bill> currentPaymentRefundBills;
     private List<BillItem> currentSummeryBillItems;
     private double currentSummaryPurchaseTotalValue;
@@ -667,6 +667,17 @@ public void updateReferanceBillBalances(List<BillItem> billItemsWithReferanceToS
 //        getCurrent().setNetTotal(n);
     }
 
+    public void updateReferanceBillCompletionStatus(List<BillItem> billItemsWithReferanceToSettlingBills) {
+        for (BillItem payingBillItem : billItemsWithReferanceToSettlingBills) {
+            Bill originalBill = payingBillItem.getReferenceBill();
+            if (originalBill == null) {
+                continue;
+            }
+            originalBill.setPaymentGenerated(false);
+            billFacade.edit(originalBill);
+        }
+    }
+
     public void updateReferanceBillAsPaymentApproved(List<BillItem> billItemsWithReferanceToSettlingBills) {
         for (BillItem payingBillItem : billItemsWithReferanceToSettlingBills) {
             Bill originalBill = payingBillItem.getReferenceBill();
@@ -805,6 +816,27 @@ private boolean errorCheckForSettlingApprovedPayments() {
         return false;
     }
 
+    private boolean errorCheckForCompletingApprovedAndSettledPayment() {
+        if (getCurrent() == null) {
+            JsfUtil.addErrorMessage("Nothing to settle");
+            return true;
+        }
+        if (getCurrent().getBillItems().isEmpty()) {
+            JsfUtil.addErrorMessage("No Bill Item ");
+            return true;
+        }
+
+        if (getCurrent().getToInstitution() == null) {
+            JsfUtil.addErrorMessage("Select Cant settle without Dealor");
+            return true;
+        }
+
+        if (getCurrent().getPaymentMethod() == null) {
+            return true;
+        }
+        return false;
+    }
+
     private boolean errorCheckForSettlingSelectedSupplierBills() {
         if (getSelectedBillItems() == null || getSelectedBillItems().isEmpty()) {
             JsfUtil.addErrorMessage("No Bill is selected to pay");
@@ -1578,6 +1610,65 @@ public void fillSupplierPayments(Boolean completed, Boolean paymentCompleted) {
         netTotal = bills.stream().mapToDouble(Bill::getNetTotal).sum();
     }
 
+    public void fillSupplierPayments(Boolean completed, Boolean paymentApproved, Boolean paymentCompleted) {
+        bills = null;
+        netTotal = 0.0;
+        StringBuilder jpql = new StringBuilder("select b from Bill b "
+                + " where b.retired=:retired "
+                + " and b.cancelled=:cancelled "
+                + " and b.createdAt between :fromDate and :toDate"
+                + " and b.billTypeAtomic in :btas ");
+
+        Map<String, Object> params = new HashMap<>();
+        List<BillTypeAtomic> btas = Arrays.asList(
+                BillTypeAtomic.SUPPLIER_PAYMENT_PREPERATION);
+
+        params.put("btas", btas);
+        params.put("cancelled", false);
+        params.put("retired", false);
+        params.put("fromDate", fromDate);
+        params.put("toDate", toDate);
+
+        // Conditionally append paymentApproved if parameter is not null
+        if (completed != null) {
+            if (completed) {
+                jpql.append(" and b.completed = :completed ");
+                params.put("completed", true);
+            } else {
+                jpql.append(" and b.completed = :completed ");
+                params.put("completed", false);
+            }
+        }
+
+        // Conditionally append paymentCompleted if parameter is not null
+        if (paymentCompleted != null) {
+            if (paymentCompleted) {
+                jpql.append(" and b.paymentCompleted = :completed ");
+                params.put("completed", true);
+            } else {
+                jpql.append(" and b.paymentCompleted = :completed ");
+                params.put("completed", false);
+            }
+        }
+
+        // Conditionally append paymentCompleted if parameter is not null
+        if (paymentApproved != null) {
+            if (paymentApproved) {
+                jpql.append(" and b.paymentApproved = :paymentApproved ");
+                params.put("paymentApproved", true);
+            } else {
+                jpql.append(" and b.paymentApproved = :paymentApproved ");
+                params.put("paymentApproved", false);
+            }
+        }
+
+        System.out.println("jpql = " + jpql);
+        System.out.println("params = " + params);
+        bills = getBillFacade().findByJpql(jpql.toString(), params, TemporalType.TIMESTAMP);
+        System.out.println("bills = " + bills);
+        netTotal = bills.stream().mapToDouble(Bill::getNetTotal).sum();
+    }
+
     public void fillApprovedSupplierPaymentsToSettle() {
         supplierPaymentStatus = "Pending Settling";
         fillSupplierPayments(false, null);
@@ -1595,7 +1686,7 @@ public void fillApprovedSupplierPaymentsSettledOrPending() {
 
     public void fillApprovedSupplierPaymentsToComplete() {
         supplierPaymentStatus = "Pending Completion";
-        fillSupplierPayments(true, false);
+        fillSupplierPayments(null, true, false);
     }
 
     public void fillSupplierPaymentsIgnoringApprovealAndCompletion() {
@@ -1935,13 +2026,13 @@ public String navigateToViewProcurementBill(Bill originalBill) {
         }
         currentSummeryBillItems = createSummeryBillItems(current, currentReturnBills);
 
-        currentPaymentBills = billService.fetchPaymentBills(current);
+        currentPaymentBillItems = billService.fetchPaymentBillItems(current);
         currentSummaryPurchaseTotalValue = current.getTotal();
         currentSummaryPurchaseReturnTotalValue = calculateTotalGrossTotalValue(currentReturnBills);
         currentSummaryPurchaseNetTotalValue = Math.abs(currentSummaryPurchaseTotalValue) - Math.abs(currentSummaryPurchaseReturnTotalValue);
-        currentTotalPaymentSettledValue = calculateTotalValue(currentPaymentBills);
+        currentTotalPaymentSettledValue = calculateTotalValue(currentPaymentBillItems);
 
-        currentTotalPaymentToSettleValue =  Math.abs(currentSummaryPurchaseNetTotalValue) - Math.abs(currentTotalPaymentSettledValue);
+        currentTotalPaymentToSettleValue = Math.abs(currentSummaryPurchaseNetTotalValue) - Math.abs(currentTotalPaymentSettledValue);
 
         return "/dealerPayment/view_purchase_bill?faces-redirect=true";
     }
@@ -2032,7 +2123,7 @@ private double calculateTotalValue(List<BillItem> billItems) {
 
         double totalPurchaseValue = 0.0;
         for (BillItem billItem : billItems) {
-            totalPurchaseValue += billItem.getGrossValue();
+            totalPurchaseValue += billItem.getNetValue();
         }
         return totalPurchaseValue;
     }
@@ -2134,6 +2225,24 @@ public String navigateToSettleSupplierPayment(Bill approvalBill) {
         return "/dealerPayment/settle_approved_supplier_payment?faces-redirect=true";
     }
 
+    public String navigateToCompleteSupplierPayment(Bill approvedAndSettledPaymentBill) {
+        makeNull();
+        if (approvedAndSettledPaymentBill == null) {
+            JsfUtil.addErrorMessage("No Bill Is Selected");
+            return null;
+        }
+        if (!approvedAndSettledPaymentBill.isPaymentApproved()) {
+            JsfUtil.addErrorMessage("Not Approved. Can not complete.");
+            return null;
+        }
+        if (!approvedAndSettledPaymentBill.isPaymentCompleted()) {
+            JsfUtil.addErrorMessage("Already Completed. Can not complete again.");
+            return null;
+        }
+        current = billService.reloadBill(approvedAndSettledPaymentBill);
+        return "/dealerPayment/complete_approved_and_settled_supplier_payment?faces-redirect=true";
+    }
+
     public String navigateToStartSupplierPaymentOfSelectedBills() {
         prepareForNewSupplierPayment();
         if (getSelectedBills().isEmpty()) {
@@ -2165,6 +2274,49 @@ public String navigateToStartSupplierPaymentOfSelectedBills() {
         return "/dealerPayment/pay_supplier?faces-redirect=true";
     }
 
+    public String navigateToPrepareSupplierPaymentForAllSelectedBills() {
+        if (selectedBills == null) {
+            JsfUtil.addErrorMessage("No Bills are Selected");
+            return null;
+        }
+        if (selectedBills.isEmpty()) {
+            JsfUtil.addErrorMessage("No Bills are Selected");
+            return null;
+        }
+        Institution payingSupplier = null;
+        for (Bill b : getSelectedBills()) {
+            if (b.getFromInstitution() == null) {
+                JsfUtil.addErrorMessage("One purchase or GRN bill does not have a Supplier. Can not proceed.");
+                return null;
+            }
+            if (payingSupplier == null) {
+                payingSupplier = b.getFromInstitution();
+            } else {
+                if (!payingSupplier.equals(b.getFromInstitution())) {
+                    JsfUtil.addErrorMessage("Can not settle purchase or GRN bills from more than one supplier at once.");
+                    return null;
+                }
+            }
+
+        }
+        prepareForNewSupplierPaymentGeneration();
+        current.setFromInstitution(sessionController.getInstitution());
+        current.setFromDepartment(sessionController.getDepartment());
+        current.setToInstitution(payingSupplier);
+
+        for (Bill billsPaymentsWillBeCreated : selectedBills) {
+            currentBillItem = new BillItem();
+            currentBillItem.setSearialNo(1);
+            currentBillItem.setReferenceBill(billsPaymentsWillBeCreated);
+            double settlingValue = Math.abs(billsPaymentsWillBeCreated.getNetTotal()) - (Math.abs(billsPaymentsWillBeCreated.getRefundAmount()) + Math.abs(billsPaymentsWillBeCreated.getPaidAmount()));
+            currentBillItem.setNetValue(-settlingValue);
+            currentBillItem.setGrossValue(-settlingValue);
+            getSelectedBillItems().add(currentBillItem);
+        }
+        calculateTotalBySelectedBillItems();
+        return "/dealerPayment/generate_supplier_payment?faces-redirect=true";
+    }
+
     public void settleSupplierPaymentForApprovedPayment() {
         if (errorCheckForSettlingPaymentForApprovedPayment()) {
             return;
@@ -2326,6 +2478,24 @@ public void settleApprovedSupplierPayment() {
 
     }
 
+    public void completeApprovedAndSettledSupplierPayment() {
+        if (errorCheckForCompletingApprovedAndSettledPayment()) {
+            return;
+        }
+        current = billService.reloadBill(current);
+
+        getCurrent().setPaymentCompleted(true);
+        getCurrent().setPaymentCompletedAt(new Date());
+        getCurrent().setPaymentCompletedBy(sessionController.getLoggedUser());
+        getBillFacade().edit(getCurrent());
+
+        updateReferanceBillCompletionStatus(current.getBillItems());
+
+        JsfUtil.addSuccessMessage("Bill Payment Completed");
+        printPreview = true;
+
+    }
+
     public void settleApproveSupplierPayment() {
         if (errorCheckForApprovingSupplierPayment()) {
             return;
@@ -2341,6 +2511,17 @@ public void settleApproveSupplierPayment() {
         }
         updateReferanceBillAsPaymentApproved(getCurrent().getBillItems());
 
+        for (BillItem bi : getCurrent().getBillItems()) {
+            bi.setBill(current);
+            if (bi.getId() == null) {
+                bi.setCreatedAt(new Date());
+                bi.setCreater(sessionController.getLoggedUser());
+                billItemFacade.create(bi);
+            } else {
+                billItemFacade.edit(bi);
+            }
+        }
+
         JsfUtil.addSuccessMessage("Payment Approved");
         printPreview = true;
 
@@ -2388,7 +2569,7 @@ public void settleGenerateSupplierPayment() {
         }
 
         updateReferanceBillAsPaymentGenerated(selectedBillItems);
-
+        current= billService.reloadBill(current);
         JsfUtil.addSuccessMessage("Payment Generated");
         printPreview = true;
 
@@ -2911,12 +3092,12 @@ public void setCurrentReturnBills(List<Bill> currentReturnBills) {
         this.currentReturnBills = currentReturnBills;
     }
 
-    public List<BillItem> getCurrentPaymentBills() {
-        return currentPaymentBills;
+    public List<BillItem> getCurrentPaymentBillItems() {
+        return currentPaymentBillItems;
     }
 
-    public void setCurrentPaymentBills(List<BillItem> currentPaymentBills) {
-        this.currentPaymentBills = currentPaymentBills;
+    public void setCurrentPaymentBillItems(List<BillItem> currentPaymentBillItems) {
+        this.currentPaymentBillItems = currentPaymentBillItems;
     }
 
     public List<Bill> getCurrentPaymentRefundBills() {

src/main/java/com/divudi/ejb/BillNumberGenerator.java

@@ -1498,6 +1498,9 @@ public String departmentBillNumberGenerator(Institution ins, Department dep, Bil
     }
 
     public String departmentBillNumberGeneratorYearly(Department dep, BillTypeAtomic billType) {
+        System.out.println("departmentBillNumberGeneratorYearly = ");
+        System.out.println("billType = " + billType);
+        System.out.println("dep = " + dep);
         if (dep == null) {
             return "";
         }
@@ -1506,7 +1509,7 @@ public String departmentBillNumberGeneratorYearly(Department dep, BillTypeAtomic
         }
         BillNumber billNumber;
         String billSuffix = configOptionApplicationController.getLongTextValueByKey("Bill Number Suffix for " + billType, "");
-
+        System.out.println("billSuffix = " + billSuffix);
         boolean commonBillNumberForAllDepartmentsInstitutionsBillTypeAtomic
                 = configOptionApplicationController.getBooleanValueByKey("Bill Number Generation Strategy - Common Bill Number for All Departments, Institutions and Bill Types", false);
         boolean separateBillNumberForAllDepartmentsInstitutionsBillTypeAtomic
@@ -1534,7 +1537,7 @@ public String departmentBillNumberGeneratorYearly(Department dep, BillTypeAtomic
 
         // Get the last bill number
         Long dd = billNumber.getLastBillNumber();
-
+        System.out.println("dd = " + dd);
         // Increment the bill number
         dd++;