From 18bde6abaf0c352bdf8f5f8f552b346fccc21cfd Mon Sep 17 00:00:00 2001 From: "Dr. M H B Ariyaratne" Date: Mon, 24 Feb 2025 08:47:58 +0530 Subject: [PATCH] 10636 incorrect wording in pharmacy disbursement (#10707) * Signed-off-by: Buddhika * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * fix: pharmacy tranfer bill improvement done. 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: Dr M H Buddhika Ariyaratne * Closes #3832 For Institutions where GRN payment approval is NOT necessary (Make the configuration) Payments Menu > SUpplier Payment > Settle Bills by SUpplier * Signed-off-by: Dr M H Buddhika Ariyaratne * Improved supplier payment management where Approval is necessary Need to improve UIs, navigations, have to check GRN Returns, not checked Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #9681 Improved supplier payment management where Approval is necessary Need to improve UIs, navigations, have to check GRN Returns, not checked Signed-off-by: Dr M H Buddhika Ariyaratne Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #9681 Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Closes #10260 Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Closes #9676 * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Closes #9679 Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10386 New report is filtered by the admission type Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10387 Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Closes #10425 Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10459 No issue was found. sample tunes were not assgined to investigation Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #412 Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10467 Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10462 Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: buddhika * Signed-off-by: buddhika * Signed-off-by: Dr M H B Ariyaratne * Import export json completed Signed-off-by: Dr M H B Ariyaratne * Import for Grn Done. Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10471 Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10471 Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10452 Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: buddhika * Signed-off-by: buddhika * Lab Test Count Report Improved Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10551 Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10413 Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10559 Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10559 Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10559 Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10593 Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10593 Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10601 Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H B Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10643 Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10643 Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * [#10700] Enhanced icon sorting and filtering in user selection Closes #10700 -need-to-order-icons-in-alphabetical-order-in-user-icons - Sorted icons alphabetically in `p:selectOneMenu` dropdown to improve usability. - Implemented a custom filtering method to allow multi-word searches. - Filtering now matches all space-separated words against any part of the icon labels. - Improved user experience by making icon selection more intuitive and efficient. * Closes #10700 -need-to-order-icons-in-alphabetical-order-in-user-icons * Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Issue #10704 is now resolved. The Pharmacy Analytics icon has been added to the homepage, dynamically displayed based on the user's icon selection under User Management. Closing this issue as it is tracked under #10699. Signed-off-by: Dr M H Buddhika Ariyaratne * Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10699 Signed-off-by: Dr M H Buddhika Ariyaratne * Closes #10636 Signed-off-by: Dr M H Buddhika Ariyaratne --------- Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Signed-off-by: Dr M H Buddhika Ariyaratne Signed-off-by: Dr M H B Ariyaratne Signed-off-by: buddhika Co-authored-by: Geeth Sandaru Madhushan Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Co-authored-by: buddhika --- .../java/com/divudi/bean/pharmacy/PharmacyBillSearch.java | 8 ++++++++ .../com/divudi/bean/pharmacy/TransferIssueController.java | 6 +++--- .../pharmacy/pharmacy_reprint_transfer_request.xhtml | 2 +- src/main/webapp/pharmacy/pharmacy_transfer_request.xhtml | 2 +- .../webapp/pharmacy/pharmacy_transfer_request_list.xhtml | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java b/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java index 49280fa887..23bed265e9 100644 --- a/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java +++ b/src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java @@ -183,6 +183,14 @@ public String navigateToCancelPharmacyRetailSale() { public String navigatePharmacyReprintPo() { return "pharmacy_reprint_po?faces-redirect=true"; } + + public String navigateToViewPharmacyTransferReqest() { + if(bill==null){ + JsfUtil.addErrorMessage("No Bill Selected"); + return null; + } + return "/pharmacy/pharmacy_reprint_transfer_request?faces-redirect=true"; + } public String navigatePharmacyReprintRetailBill() { if (bill == null) { diff --git a/src/main/java/com/divudi/bean/pharmacy/TransferIssueController.java b/src/main/java/com/divudi/bean/pharmacy/TransferIssueController.java index f3587c74c1..0cb123008a 100644 --- a/src/main/java/com/divudi/bean/pharmacy/TransferIssueController.java +++ b/src/main/java/com/divudi/bean/pharmacy/TransferIssueController.java @@ -103,7 +103,7 @@ public String navigateToPharmacyIssueForRequests() { return ""; } - return "/pharmacy/pharmacy_transfer_issue"; + return "/pharmacy/pharmacy_transfer_issue?faces-redirect=true"; } // public boolean isFullyIssued() { @@ -144,7 +144,7 @@ public String navigateToPharmacyDirectIssueForRequests() { return ""; } createRequestIssueBillItems(requestedBill); - return "/pharmacy/pharmacy_transfer_issue_direct_department"; + return "/pharmacy/pharmacy_transfer_issue_direct_department?faces-redirect=true"; } public String navigateToPharmacyIssueFromGrn() { @@ -165,7 +165,7 @@ public String navigateToDirectPharmacyIssue() { createDirectIssueBillItems(); getIssuedBill().setFromDepartment(getSessionController().getDepartment()); - return "/pharmacy/pharmacy_transfer_issue_direct_department"; + return "/pharmacy/pharmacy_transfer_issue_direct_department?faces-redirect=true"; } public UserStockContainer getUserStockContainer() { diff --git a/src/main/webapp/pharmacy/pharmacy_reprint_transfer_request.xhtml b/src/main/webapp/pharmacy/pharmacy_reprint_transfer_request.xhtml index 3b9f8796fb..7f2c27095a 100644 --- a/src/main/webapp/pharmacy/pharmacy_reprint_transfer_request.xhtml +++ b/src/main/webapp/pharmacy/pharmacy_reprint_transfer_request.xhtml @@ -16,7 +16,7 @@ - + diff --git a/src/main/webapp/pharmacy/pharmacy_transfer_request_list.xhtml b/src/main/webapp/pharmacy/pharmacy_transfer_request_list.xhtml index e6e68a7f14..5acf0832c3 100644 --- a/src/main/webapp/pharmacy/pharmacy_transfer_request_list.xhtml +++ b/src/main/webapp/pharmacy/pharmacy_transfer_request_list.xhtml @@ -97,7 +97,7 @@ title="View Request" icon="far fa-eye" class="ui-button-info " - action="pharmacy_reprint_transfer_request"> + action="#{pharmacyBillSearch.navigateToViewPharmacyTransferReqest}">