10636 incorrect wording in pharmacy disbursement (#10707)

* Signed-off-by: Buddhika <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * fix: pharmacy tranfer bill improvement done. Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #9681 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10260 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #9676 * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #9679 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10386 New report is filtered by the admission type Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10387 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10425 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10459 No issue was found. sample tunes were not assgined to investigation Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #412 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10467 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10462 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: buddhika <[email protected]> * Signed-off-by: buddhika <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Import export json completed Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Import for Grn Done. Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10471 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10471 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10452 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: buddhika <[email protected]> * Signed-off-by: buddhika <[email protected]> * Lab Test Count Report Improved Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10551 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10413 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10559 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10559 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10559 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10593 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10593 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10601 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10643 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10643 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * [#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 <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * 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 <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10699 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10636 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> --------- Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> Signed-off-by: Dr M H B Ariyaratne <[email protected]> Signed-off-by: buddhika <[email protected]> Co-authored-by: Geeth Sandaru Madhushan <[email protected]> Co-authored-by: Chinthaka Prasad Wijerathna <[email protected]> Co-authored-by: buddhika <[email protected]>
hmislk · Feb 24, 2025 · 18bde6a · 18bde6a
1 parent 179b0f4
commit 18bde6a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git 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
@@ -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
@@ -16,7 +16,7 @@
                     <p:panel >
                         <f:facet name="header" >
                             <h:outputLabel styleClass="fas fa-arrow-right-arrow-left" />
-                            <h:outputLabel value="Transfer Request Reprint" class="mx-4"></h:outputLabel>
+                            <h:outputLabel value="Transfer Request" class="mx-4"></h:outputLabel>
                             <p:commandButton 
                                 ajax="false" 
                                 action="pharmacy_transfer_request_list" 

diff --git a/src/main/webapp/pharmacy/pharmacy_transfer_request.xhtml b/src/main/webapp/pharmacy/pharmacy_transfer_request.xhtml
@@ -174,7 +174,7 @@
                     action="#{transferRequestController.recreate}" >
                 </p:commandButton>
                 <p:commandButton 
-                    value="Reprint"
+                    value="Print"
                     icon="fas fa-print"
                     class="ui-button-info mx-2"
                     ajax="false" >

diff --git 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}">
                                     <f:setPropertyActionListener value="#{p}" target="#{pharmacyBillSearch.bill}"/>
                                 </p:commandButton>