to sent to production #10212
Merged
to sent to production #10212
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
…ers-for-pharmacy-direct-purchase 10044 need sqeuencial bill numbers for pharmacy direct purchase
Co-authored-by: imexh <[email protected]>
* Pharmacy purchase order list ui improvement. Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * fix: Expenses added to the GRN payment Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * 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: Chinthaka Prasad Wijerathna <[email protected]> --------- Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
…nd returns (#10126) * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * 9964 staff welfare bug fixes * Signed-off-by: Isuru Ranaweera <[email protected]> * Signed-off-by: Isuru Ranaweera <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Closed #10050 Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Closed #10036 Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * closes #10062 Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * 9964 staff welfare bug fixes * 10034 discount report bug fixes * changed css file printOnly Signed-off-by: Isuru Ranaweera <[email protected]> * Added a new table to print it without filter boxes Signed-off-by: Isuru Ranaweera <[email protected]> * 10034 staff welfare report bug fixes * 10034 discount report bug fixes * Signed-off-by: Sandith Pivithuru <[email protected]> * Signed-off-by: Sandith Pivithuru <[email protected]> * Signed-off-by: Sandith Pivithuru <[email protected]> * Signed-off-by: Sandith Pivithuru <[email protected]> * Pharmacy purchase order list ui improvement. Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10064 Until now, the atomic bill type for Cancelleation of Pharmacy Direct Issue toi BHTs were not recorded. Now the bill type atomic is recorded. But for past data, have to do to admin functions and click the add missing bill type atomics to correct old data. 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]> * Merge pull request #10063 * Signed-off-by: DamithDeshan <[email protected]> * Fixed #10013 * Signed-off-by: Lawan Samarasekara <[email protected]> * Signed-off-by: Lawan Samarasekara <[email protected]> * Merge branch 'coop-prod' of https://github.com/hmislk/hmis.git into I… * Merge branch 'Issue#10013-Bug_Fix_on_OPD_Card_Can't_Add_Drug' of http… * closes #10062 * Signed-off-by: DamithDeshan <[email protected]> * closes #10079 Signed-off-by: DamithDeshan <[email protected]> * closes #10081 Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * https://youtu.be/GDWy_tlJ2Gk Closes #10086 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Update rh_prod_ci_cd.yml * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10097 Signed-off-by: Buddhika Ariyaratne <[email protected]> **Pull Request Comment** **Summary of Changes** - **Type Visibility**: Restricted the “Type” column to be visible only for admin users. - **True/False Replacement**: Replaced the boolean “true”/“false” text with appropriate icons (“✓” for true, “✕” for false). - **Enhanced Search**: Extended the search functionality to include the “Value” column, making it easier to find specific application options. **Verification & Testing** 1. **Login as Admin**: Confirm that the “Type” column is visible, and icons replace the previous true/false text. 2. **Login as Non-Admin**: Verify that the “Type” column is hidden. 3. **Search**: Ensure searching by the option’s key or value (including yes/no) yields expected results. All changes have been completed and verified locally. Signed-off-by: Buddhika Ariyaratne <[email protected]> * Signed-off-by: Buddhika Ariyaratne <[email protected]> * Signed-off-by: Buddhika Ariyaratne <[email protected]> * Signed-off-by: Buddhika Ariyaratne <[email protected]> * Closes #10077 Signed-off-by: Buddhika Ariyaratne <[email protected]> * Closes with Production persistance.xml Signed-off-by: Buddhika Ariyaratne <[email protected]> * fix: Expenses added to the GRN payment Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Closes #10102 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10111 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10114 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * 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]> * Closes #10114 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10125 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: Chinthaka Prasad Wijerathna <[email protected]> Signed-off-by: Buddhika Ariyaratne <[email protected]> Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> Co-authored-by: imexh <[email protected]> Co-authored-by: Isuru Ranaweera <[email protected]> Co-authored-by: Pubudu-Piyankara <[email protected]> Co-authored-by: DamithDeshan <[email protected]> Co-authored-by: Sandith Pivithuru <[email protected]> Co-authored-by: Chinthaka Prasad Wijerathna <[email protected]> Co-authored-by: H.K. Damith Deshan <[email protected]> Co-authored-by: Geeth Sandaru Madhushan <[email protected]>
…re billing (#10131) * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * 9964 staff welfare bug fixes * Signed-off-by: Isuru Ranaweera <[email protected]> * Signed-off-by: Isuru Ranaweera <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Closed #10050 Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Closed #10036 Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * closes #10062 Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * 9964 staff welfare bug fixes * 10034 discount report bug fixes * changed css file printOnly Signed-off-by: Isuru Ranaweera <[email protected]> * Added a new table to print it without filter boxes Signed-off-by: Isuru Ranaweera <[email protected]> * 10034 staff welfare report bug fixes * 10034 discount report bug fixes * Signed-off-by: Sandith Pivithuru <[email protected]> * Signed-off-by: Sandith Pivithuru <[email protected]> * Signed-off-by: Sandith Pivithuru <[email protected]> * Signed-off-by: Sandith Pivithuru <[email protected]> * Pharmacy purchase order list ui improvement. Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10064 Until now, the atomic bill type for Cancelleation of Pharmacy Direct Issue toi BHTs were not recorded. Now the bill type atomic is recorded. But for past data, have to do to admin functions and click the add missing bill type atomics to correct old data. 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]> * Merge pull request #10063 * Signed-off-by: DamithDeshan <[email protected]> * Fixed #10013 * Signed-off-by: Lawan Samarasekara <[email protected]> * Signed-off-by: Lawan Samarasekara <[email protected]> * Merge branch 'coop-prod' of https://github.com/hmislk/hmis.git into I… * Merge branch 'Issue#10013-Bug_Fix_on_OPD_Card_Can't_Add_Drug' of http… * closes #10062 * Signed-off-by: DamithDeshan <[email protected]> * closes #10079 Signed-off-by: DamithDeshan <[email protected]> * closes #10081 Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * https://youtu.be/GDWy_tlJ2Gk Closes #10086 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Update rh_prod_ci_cd.yml * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10097 Signed-off-by: Buddhika Ariyaratne <[email protected]> **Pull Request Comment** **Summary of Changes** - **Type Visibility**: Restricted the “Type” column to be visible only for admin users. - **True/False Replacement**: Replaced the boolean “true”/“false” text with appropriate icons (“✓” for true, “✕” for false). - **Enhanced Search**: Extended the search functionality to include the “Value” column, making it easier to find specific application options. **Verification & Testing** 1. **Login as Admin**: Confirm that the “Type” column is visible, and icons replace the previous true/false text. 2. **Login as Non-Admin**: Verify that the “Type” column is hidden. 3. **Search**: Ensure searching by the option’s key or value (including yes/no) yields expected results. All changes have been completed and verified locally. Signed-off-by: Buddhika Ariyaratne <[email protected]> * Signed-off-by: Buddhika Ariyaratne <[email protected]> * Signed-off-by: Buddhika Ariyaratne <[email protected]> * Signed-off-by: Buddhika Ariyaratne <[email protected]> * Closes #10077 Signed-off-by: Buddhika Ariyaratne <[email protected]> * Closes with Production persistance.xml Signed-off-by: Buddhika Ariyaratne <[email protected]> * fix: Expenses added to the GRN payment Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Closes #10102 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10111 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10114 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * 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]> * Closes #10114 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10125 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10116 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Update persistence.xml --------- Signed-off-by: Dr M H B Ariyaratne <[email protected]> Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> Signed-off-by: Buddhika Ariyaratne <[email protected]> Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> Co-authored-by: imexh <[email protected]> Co-authored-by: Isuru Ranaweera <[email protected]> Co-authored-by: Pubudu-Piyankara <[email protected]> Co-authored-by: DamithDeshan <[email protected]> Co-authored-by: Sandith Pivithuru <[email protected]> Co-authored-by: Chinthaka Prasad Wijerathna <[email protected]> Co-authored-by: H.K. Damith Deshan <[email protected]> Co-authored-by: Geeth Sandaru Madhushan <[email protected]>
* debtor analysis due search fix * Debtor Analysis-Due Search (Credit Company) fix --------- Co-authored-by: imexh <[email protected]>
Co-authored-by: imexh <[email protected]>
* Signed-off-by: DamithDeshan <[email protected]> * closes #9941 Signed-off-by: DamithDeshan <[email protected]>
* The disposal bill isn't displayed in Bill No Signed-off-by: Pubudu-Piyankara <[email protected]> * The return bill isn't displayed in Bill No Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Closed #9953 Signed-off-by: Pubudu-Piyankara <[email protected]>
* Signed-off-by: Dr M H B Ariyaratne <[email protected]> * 9964 staff welfare bug fixes * Signed-off-by: Isuru Ranaweera <[email protected]> * Signed-off-by: Isuru Ranaweera <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Closed #10050 Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Closed #10036 Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * closes #10062 Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * 9964 staff welfare bug fixes * 10034 discount report bug fixes * changed css file printOnly Signed-off-by: Isuru Ranaweera <[email protected]> * Added a new table to print it without filter boxes Signed-off-by: Isuru Ranaweera <[email protected]> * 10034 staff welfare report bug fixes * 10034 discount report bug fixes * Signed-off-by: Sandith Pivithuru <[email protected]> * Signed-off-by: Sandith Pivithuru <[email protected]> * Signed-off-by: Sandith Pivithuru <[email protected]> * Signed-off-by: Sandith Pivithuru <[email protected]> * Pharmacy purchase order list ui improvement. Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10064 Until now, the atomic bill type for Cancelleation of Pharmacy Direct Issue toi BHTs were not recorded. Now the bill type atomic is recorded. But for past data, have to do to admin functions and click the add missing bill type atomics to correct old data. 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]> * Merge pull request #10063 * Signed-off-by: DamithDeshan <[email protected]> * Fixed #10013 * Signed-off-by: Lawan Samarasekara <[email protected]> * Signed-off-by: Lawan Samarasekara <[email protected]> * Merge branch 'coop-prod' of https://github.com/hmislk/hmis.git into I… * Merge branch 'Issue#10013-Bug_Fix_on_OPD_Card_Can't_Add_Drug' of http… * closes #10062 * Signed-off-by: DamithDeshan <[email protected]> * closes #10079 Signed-off-by: DamithDeshan <[email protected]> * closes #10081 Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * https://youtu.be/GDWy_tlJ2Gk Closes #10086 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Update rh_prod_ci_cd.yml * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10097 Signed-off-by: Buddhika Ariyaratne <[email protected]> **Pull Request Comment** **Summary of Changes** - **Type Visibility**: Restricted the “Type” column to be visible only for admin users. - **True/False Replacement**: Replaced the boolean “true”/“false” text with appropriate icons (“✓” for true, “✕” for false). - **Enhanced Search**: Extended the search functionality to include the “Value” column, making it easier to find specific application options. **Verification & Testing** 1. **Login as Admin**: Confirm that the “Type” column is visible, and icons replace the previous true/false text. 2. **Login as Non-Admin**: Verify that the “Type” column is hidden. 3. **Search**: Ensure searching by the option’s key or value (including yes/no) yields expected results. All changes have been completed and verified locally. Signed-off-by: Buddhika Ariyaratne <[email protected]> * Signed-off-by: Buddhika Ariyaratne <[email protected]> * Signed-off-by: Buddhika Ariyaratne <[email protected]> * Signed-off-by: Buddhika Ariyaratne <[email protected]> * Closes #10077 Signed-off-by: Buddhika Ariyaratne <[email protected]> * Closes with Production persistance.xml Signed-off-by: Buddhika Ariyaratne <[email protected]> * fix: Expenses added to the GRN payment Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Closes #10102 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10111 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10114 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * 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]> * Closes #10114 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10125 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 #10031 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10137 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: Chinthaka Prasad Wijerathna <[email protected]> Signed-off-by: Buddhika Ariyaratne <[email protected]> Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> Co-authored-by: imexh <[email protected]> Co-authored-by: Isuru Ranaweera <[email protected]> Co-authored-by: Pubudu-Piyankara <[email protected]> Co-authored-by: DamithDeshan <[email protected]> Co-authored-by: Sandith Pivithuru <[email protected]> Co-authored-by: Chinthaka Prasad Wijerathna <[email protected]> Co-authored-by: H.K. Damith Deshan <[email protected]> Co-authored-by: Geeth Sandaru Madhushan <[email protected]>
* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10138 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
* Closes #10155 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
…0167) * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * 9964 staff welfare bug fixes * Signed-off-by: Isuru Ranaweera <[email protected]> * Signed-off-by: Isuru Ranaweera <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Closed #10050 Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Closed #10036 Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * closes #10062 Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * 9964 staff welfare bug fixes * 10034 discount report bug fixes * changed css file printOnly Signed-off-by: Isuru Ranaweera <[email protected]> * Added a new table to print it without filter boxes Signed-off-by: Isuru Ranaweera <[email protected]> * 10034 staff welfare report bug fixes * 10034 discount report bug fixes * Signed-off-by: Sandith Pivithuru <[email protected]> * Signed-off-by: Sandith Pivithuru <[email protected]> * Signed-off-by: Sandith Pivithuru <[email protected]> * Signed-off-by: Sandith Pivithuru <[email protected]> * Pharmacy purchase order list ui improvement. Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10064 Until now, the atomic bill type for Cancelleation of Pharmacy Direct Issue toi BHTs were not recorded. Now the bill type atomic is recorded. But for past data, have to do to admin functions and click the add missing bill type atomics to correct old data. 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]> * Merge pull request #10063 * Signed-off-by: DamithDeshan <[email protected]> * Fixed #10013 * Signed-off-by: Lawan Samarasekara <[email protected]> * Signed-off-by: Lawan Samarasekara <[email protected]> * Merge branch 'coop-prod' of https://github.com/hmislk/hmis.git into I… * Merge branch 'Issue#10013-Bug_Fix_on_OPD_Card_Can't_Add_Drug' of http… * closes #10062 * Signed-off-by: DamithDeshan <[email protected]> * closes #10079 Signed-off-by: DamithDeshan <[email protected]> * closes #10081 Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * https://youtu.be/GDWy_tlJ2Gk Closes #10086 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Update rh_prod_ci_cd.yml * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10097 Signed-off-by: Buddhika Ariyaratne <[email protected]> **Pull Request Comment** **Summary of Changes** - **Type Visibility**: Restricted the “Type” column to be visible only for admin users. - **True/False Replacement**: Replaced the boolean “true”/“false” text with appropriate icons (“✓” for true, “✕” for false). - **Enhanced Search**: Extended the search functionality to include the “Value” column, making it easier to find specific application options. **Verification & Testing** 1. **Login as Admin**: Confirm that the “Type” column is visible, and icons replace the previous true/false text. 2. **Login as Non-Admin**: Verify that the “Type” column is hidden. 3. **Search**: Ensure searching by the option’s key or value (including yes/no) yields expected results. All changes have been completed and verified locally. Signed-off-by: Buddhika Ariyaratne <[email protected]> * Signed-off-by: Buddhika Ariyaratne <[email protected]> * Signed-off-by: Buddhika Ariyaratne <[email protected]> * Signed-off-by: Buddhika Ariyaratne <[email protected]> * Closes #10077 Signed-off-by: Buddhika Ariyaratne <[email protected]> * Closes with Production persistance.xml Signed-off-by: Buddhika Ariyaratne <[email protected]> * fix: Expenses added to the GRN payment Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Closes #10102 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10111 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10114 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10114 Signed-off-by: Dr M H B Ariyaratne <[email protected]> --------- Signed-off-by: Dr M H B Ariyaratne <[email protected]> Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> Signed-off-by: Buddhika Ariyaratne <[email protected]> Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> Co-authored-by: imexh <[email protected]> Co-authored-by: Isuru Ranaweera <[email protected]> Co-authored-by: Pubudu-Piyankara <[email protected]> Co-authored-by: DamithDeshan <[email protected]> Co-authored-by: Sandith Pivithuru <[email protected]> Co-authored-by: Chinthaka Prasad Wijerathna <[email protected]> Co-authored-by: H.K. Damith Deshan <[email protected]> Co-authored-by: Geeth Sandaru Madhushan <[email protected]>
* #Improving Credit Company Bill Cancel Page Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * closes #9848 Signed-off-by: DamithDeshan <[email protected]>
Co-authored-by: imexh <[email protected]>
Merge pull request #10085 from hmislk/10044-need-sqeuencial-bill-numb…
* Signed-off-by: Isuru Ranaweera <[email protected]> * Signed-off-by: Isuru Ranaweera <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Closed #10050 Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]> * Closed #10036 Signed-off-by: Pubudu-Piyankara <[email protected]> * add department wise filter for inward pharmacy issue summery Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Closes #10191 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> --------- Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> Co-authored-by: Isuru Ranaweera <[email protected]> Co-authored-by: Pubudu-Piyankara <[email protected]> Co-authored-by: Chinthaka Prasad Wijerathna <[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]>
* fact: add method to find allergy medicines and check with bill item Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * check allergy when settle the bill function is 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: Chinthaka Prasad Wijerathna <[email protected]> * add application option for check allergy of patient Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * create pharmacy service class and tranfer allergy warning feature to it. 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]> * allergy warning feature changes are 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]>
* add department wise filter for inward pharmacy issue summery 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: DamithDeshan <[email protected]> * closes #10053 Signed-off-by: DamithDeshan <[email protected]>
Signed-off-by: Isuru Ranaweera <[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]> * correct qty and rate value of pharmacy issue report 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: Pubudu-Piyankara <[email protected]> * Signed-off-by: Pubudu-Piyankara <[email protected]>
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.
merging
to sent to production