Up to date changes to southernlanka #10733
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…@users.noreply.github.com>
…@users.noreply.github.com>
…s://github.com/hmislk/hmis.git into 7830-cannot-search-using-grn-no-in-dealer-payment # Conflicts: # src/main/java/com/divudi/bean/pharmacy/SupplierPaymentController.java # src/main/resources/META-INF/persistence.xml # src/main/webapp/dealerPayment/index.xhtml # src/main/webapp/dealerPayment/prepare_supplier_payment.xhtml # src/main/webapp/resources/bill/supplier_payment_preperation.xhtml Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Dev to coop prod
…ttps://github.com/hmislk/hmis.git into 7830-cannot-search-using-grn-no-in-dealer-payment
… 10334-patient-report---retired-reports-are-also-called # Conflicts: # src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
… into 10329-cannot-be-add-more-than-one-bht-in-inward
…830-cannot-search-using-grn-no-in-dealer-payment # Conflicts: # src/main/resources/META-INF/persistence.xml Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
… 7830-cannot-search-using-grn-no-in-dealer-payment
now can search supplier credit bills Make sure you select the option "Approveal necessary is required for Supplier Payments" as false Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
…ellation---multiple-payment-method 10337 pharmacy retail sale cancellation multiple payment method
…ent-method' into 3832-dealer-payment-by-bill
3832 dealer payment by bill
… 3832-dealer-payment-by-bill # Conflicts: # src/main/java/com/divudi/bean/inward/AdmissionController.java Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
…supplier-payment-management
* fact: add expense section to direct purchase and update bill with net total Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * fact:improve purchase bill adding expenses and ui improvements. 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 B Ariyaratne <[email protected]> * Closes #10116 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10187 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10176 * add department wise filter for inward pharmacy issue summery Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10191 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Update mp_prod_ci_cd.yml * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Payment Approval Basics Completed Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10291 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 #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10259 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]> * GRN No, Invoice No added Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #9986 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 #9939 Also adds Supplier Payment Preperation Bill 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: 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]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10334 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 #7830 now can search supplier credit bills Make sure you select the option "Approveal necessary is required for Supplier Payments" as false Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10337 But need to fix pharmacy summery reports, cashier summary as seperate issues * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * create ci cd workflow for southernlanka production Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * grn bill improvement Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Up to date changes to coop qa (#10641) (#10648) * 10614 improvement the print (#10634) * 10601 when bill amount 10000 rate was wrong in bht issue return bill (#10635) --------- Co-authored-by: Lawan Chaamindu Jayalath Samarasekara <[email protected]> Co-authored-by: Sandith Pivithuru <[email protected]> Co-authored-by: Dr. M H B Ariyaratne <[email protected]> * Database swap github action (#10447) * database swap github action * database swap github action * database swap github action * database swap script * Rename directories used in db import/export scripts * restart nginx and vms action file * restart nginx and vms action file * restart nginx and vms action file * restart individual servers * database swap action changes * script refactors * Add minor changes * restart all servers * restart all servers * db swap changes --------- Co-authored-by: imexh <[email protected]> Co-authored-by: Geeth Sandaru Madhushan <[email protected]> * 10654 the supplier filter should function in all three tables from the cancelreturn grn (#10655) * Signed-off-by: SandithP2001 <[email protected]> * Signed-off-by: SandithP2001 <[email protected]> * Signed-off-by: SandithP2001 <[email protected]> * Signed-off-by: SandithP2001 <[email protected]> * Restart all servers action refactors (#10659) * restart all servers action refactors * restart all servers action refactors * restart individual servers action refactors --------- Co-authored-by: imexh <[email protected]> * Signed-off-by: PasinduW99 <[email protected]> (#10657) * 10656 grn table improvements (#10658) * Signed-off-by: SandithP2001 <[email protected]> * Signed-off-by: SandithP2001 <[email protected]> * Signed-off-by: SandithP2001 <[email protected]> * Signed-off-by: SandithP2001 <[email protected]> * Signed-off-by: SandithP2001 <[email protected]> * Signed-off-by: SandithP2001 <[email protected]> * Signed-off-by: SandithP2001 <[email protected]> * Signed-off-by: SandithP2001 <[email protected]> * Signed-off-by: SandithP2001 <[email protected]> * Signed-off-by: SandithP2001 <[email protected]> * Added Email sender to export import db action (#10676) * restart all servers action refactors * restart all servers action refactors * restart individual servers action refactors * add email sender to database exporter * add email sender to database exporter --------- Co-authored-by: imexh <[email protected]> * Signed-off-by: PasinduW99 <[email protected]> (#10678) * DB Export Import action enhancements (#10684) * restart all servers action refactors * restart all servers action refactors * restart individual servers action refactors * add email sender to database exporter * add email sender to database exporter * add email sender to database exporter --------- Co-authored-by: imexh <[email protected]> * Conflict resolution when coop pro is merged in to development branch (#10680) * fact: add expense section to direct purchase and update bill with net total Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * fact:improve purchase bill adding expenses and ui improvements. 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 B Ariyaratne <[email protected]> * Closes #10116 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10187 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10176 * add department wise filter for inward pharmacy issue summery Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10191 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Update mp_prod_ci_cd.yml * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Payment Approval Basics Completed Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10291 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 #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10259 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]> * GRN No, Invoice No added Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #9986 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 #9939 Also adds Supplier Payment Preperation Bill 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: 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]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10334 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 #7830 now can search supplier credit bills Make sure you select the option "Approveal necessary is required for Supplier Payments" as false Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10337 But need to fix pharmacy summery reports, cashier summary as seperate issues * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> --------- Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> Signed-off-by: Dr M H B Ariyaratne <[email protected]> Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> Co-authored-by: Chinthaka Prasad Wijerathna <[email protected]> Co-authored-by: Geeth Sandaru Madhushan <[email protected]> * Revert "Conflict resolution when coop pro is merged in to development branch …" This reverts commit 96c53a561de34d51547755de00b39873bff73708. * Issue#10625 new original bill for final bill (#10696) * Added New Methods to save Original Bill Signed-off-by: Lawan Samarasekara <[email protected]> * New Bill Number Suffix to Original Bill Signed-off-by: Lawan Samarasekara <[email protected]> * New Bill Type For Original Final Bill Signed-off-by: Lawan Samarasekara <[email protected]> * New Bill Type Atomic For Original Final Bill Signed-off-by: Lawan Samarasekara <[email protected]> * Fixed #10625 Signed-off-by: Lawan Samarasekara <[email protected]> --------- Signed-off-by: Lawan Samarasekara <[email protected]> * 10653 grn summary report improvements (#10697) * Signed-off-by: SandithP2001 <[email protected]> * Signed-off-by: SandithP2001 <[email protected]> * Signed-off-by: SandithP2001 <[email protected]> * Signed-off-by: SandithP2001 <[email protected]> * Signed-off-by: SandithP2001 <[email protected]> * Signed-off-by: SandithP2001 <[email protected]> * closed #10701 (#10702) Signed-off-by: pubudu piyankara <[email protected]> * 10700 need to order icons in alphabetical order in user icons (#10703) * 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]> * 10699 print improvement in pharmacy income report (#10705) * 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]> --------- 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]> * 10649 need UI improvement for inward service and investigation bill (#10706) * Signed-off-by: Isuru Ranaweera <[email protected]> * inward service and investigation bill pages improved Signed-off-by: Isuru Ranaweera <[email protected]> * 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]> * 10628 invoice number needs to be autogenerated when making a direct purchase (#10708) * 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]> * Closes #10628 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]> * 10341 cashier summary error for pharmacy retail sale cancellation with multiple payments (#10709) * 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]> * Closes #10628 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10341 No issue was found Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * 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]> * Update southernlanka_prod_ci_cd.yml --------- Signed-off-by: Chinthaka Prasad Wijerathna <[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: Lawan Samarasekara <[email protected]> Signed-off-by: pubudu piyankara <[email protected]> Signed-off-by: buddhika <[email protected]> Co-authored-by: Dr M H B Ariyaratne <[email protected]> Co-authored-by: Geeth Sandaru Madhushan <[email protected]> Co-authored-by: Lawan Chaamindu Jayalath Samarasekara <[email protected]> Co-authored-by: Sandith Pivithuru <[email protected]> Co-authored-by: Imesh Ranawella <[email protected]> Co-authored-by: imexh <[email protected]> Co-authored-by: Pasindu Wathsara <[email protected]> Co-authored-by: Pubudu Piyankara <[email protected]> Co-authored-by: buddhika <[email protected]> Co-authored-by: Isuru Ranaweera <[email protected]>
Co-authored-by: imexh <[email protected]>
… 10660-summary-table-improvements
Co-authored-by: imexh <[email protected]>
Signed-off-by: SandithP2001 <[email protected]>
10660 summary table improvements
Signed-off-by: Lawan Samarasekara <[email protected]>
Signed-off-by: Lawan Samarasekara <[email protected]>
Co-authored-by: imexh <[email protected]>
Signed-off-by: Lawan Samarasekara <[email protected]>
Signed-off-by: Lawan Samarasekara <[email protected]>
Signed-off-by: Lawan Samarasekara <[email protected]>
Signed-off-by: Lawan Samarasekara <[email protected]>
…ellation_Not_Updating_in_Summaries Issue#10681 inward payment cancellation not updating in summaries
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
…ncellation-with-multiple-payments' into 9832-improvements-in-pharmacy-income-reports
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
…ble-after-disbursement-on-the-same-day Closes #10719
…ncome-reports 9832 improvements in pharmacy income reports
# Conflicts: # .github/scripts/db_export_import_scheduler.sh # .github/workflows/database_export_import_scheduler.yml # src/main/webapp/pharmacy/pharmacy_report_grn_detail.xhtml
Coop test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.