Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improving Microbiology Report Antibiotic List and Print Report #10079

Closed
DamithDeshan opened this issue Jan 11, 2025 · 0 comments
Closed

Improving Microbiology Report Antibiotic List and Print Report #10079

DamithDeshan opened this issue Jan 11, 2025 · 0 comments
Assignees

Comments

@DamithDeshan
Copy link
Collaborator

Describe

@DamithDeshan DamithDeshan self-assigned this Jan 11, 2025
DamithDeshan added a commit that referenced this issue Jan 11, 2025
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
GSMgeeth pushed a commit that referenced this issue Jan 12, 2025
* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10089

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* closes #10079

* Merge branch '#10079_improving_microbiology_report_antibiotic_list_an…

* Fixed View Report Page

* Fixed CC Report View Page

* closes #10092

* Merge branch 'development' into #10092-add-pathology-report-format-fo…
GSMgeeth added a commit that referenced this issue Jan 15, 2025
* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10050
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10036
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10062
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 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 <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Merge pull request #10063

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Fixed #10013

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* 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 <hkddrajapaksha@gmail.com>

* closes #10079
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* https://youtu.be/GDWy_tlJ2Gk
Closes #10086
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Update rh_prod_ci_cd.yml

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10077
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes with Production persistance.xml
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

---------

Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
Co-authored-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
Co-authored-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
Co-authored-by: DamithDeshan <hkddrajapaksha@gmail.com>
Co-authored-by: H.K. Damith Deshan <108138918+DamithDeshan@users.noreply.github.com>
Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com>
GSMgeeth added a commit that referenced this issue Jan 16, 2025
…10112)

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10050
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10036
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10062
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* 10034 discount report bug fixes

* changed css file printOnly
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Added a new table to print it without filter boxes
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* 10034 staff welfare report bug fixes

* 10034 discount report bug fixes

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Pharmacy purchase order list ui improvement.

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 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 <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Merge pull request #10063

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Fixed #10013

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* 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 <hkddrajapaksha@gmail.com>

* closes #10079
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10081
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* https://youtu.be/GDWy_tlJ2Gk
Closes #10086
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Update rh_prod_ci_cd.yml

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10097
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
**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 <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10077
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes with Production persistance.xml
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* fix: Expenses added to the GRN payment

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Closes #10102
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

---------

Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>
Co-authored-by: imexh <chandikaranawella@gmail.com>
Co-authored-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
Co-authored-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
Co-authored-by: DamithDeshan <hkddrajapaksha@gmail.com>
Co-authored-by: Sandith Pivithuru <sandithpivithuru@gmail.com>
Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Co-authored-by: H.K. Damith Deshan <108138918+DamithDeshan@users.noreply.github.com>
Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com>
GSMgeeth added a commit that referenced this issue Jan 16, 2025
* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10050
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10036
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10062
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* 10034 discount report bug fixes

* changed css file printOnly
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Added a new table to print it without filter boxes
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* 10034 staff welfare report bug fixes

* 10034 discount report bug fixes

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Pharmacy purchase order list ui improvement.

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 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 <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Merge pull request #10063

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Fixed #10013

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* 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 <hkddrajapaksha@gmail.com>

* closes #10079
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10081
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* https://youtu.be/GDWy_tlJ2Gk
Closes #10086
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Update rh_prod_ci_cd.yml

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10097
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
**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 <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10077
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes with Production persistance.xml
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* fix: Expenses added to the GRN payment

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Closes #10102
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10111

Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

---------

Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>
Co-authored-by: imexh <chandikaranawella@gmail.com>
Co-authored-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
Co-authored-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
Co-authored-by: DamithDeshan <hkddrajapaksha@gmail.com>
Co-authored-by: Sandith Pivithuru <sandithpivithuru@gmail.com>
Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Co-authored-by: H.K. Damith Deshan <108138918+DamithDeshan@users.noreply.github.com>
Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com>
GSMgeeth added a commit that referenced this issue Jan 16, 2025
…0115)

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10050
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10036
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10062
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* 10034 discount report bug fixes

* changed css file printOnly
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Added a new table to print it without filter boxes
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* 10034 staff welfare report bug fixes

* 10034 discount report bug fixes

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Pharmacy purchase order list ui improvement.

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 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 <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Merge pull request #10063

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Fixed #10013

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* 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 <hkddrajapaksha@gmail.com>

* closes #10079
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10081
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* https://youtu.be/GDWy_tlJ2Gk
Closes #10086
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Update rh_prod_ci_cd.yml

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10097
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
**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 <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10077
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes with Production persistance.xml
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* fix: Expenses added to the GRN payment

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Closes #10102
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10111

Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10114
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

---------

Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>
Co-authored-by: imexh <chandikaranawella@gmail.com>
Co-authored-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
Co-authored-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
Co-authored-by: DamithDeshan <hkddrajapaksha@gmail.com>
Co-authored-by: Sandith Pivithuru <sandithpivithuru@gmail.com>
Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Co-authored-by: H.K. Damith Deshan <108138918+DamithDeshan@users.noreply.github.com>
Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com>
GSMgeeth added a commit that referenced this issue Jan 20, 2025
…nd returns (#10126)

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10050
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10036
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10062
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* 10034 discount report bug fixes

* changed css file printOnly
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Added a new table to print it without filter boxes
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* 10034 staff welfare report bug fixes

* 10034 discount report bug fixes

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Pharmacy purchase order list ui improvement.

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 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 <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Merge pull request #10063

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Fixed #10013

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* 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 <hkddrajapaksha@gmail.com>

* closes #10079
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10081
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* https://youtu.be/GDWy_tlJ2Gk
Closes #10086
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Update rh_prod_ci_cd.yml

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10097
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
**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 <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10077
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes with Production persistance.xml
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* fix: Expenses added to the GRN payment

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Closes #10102
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10111

Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10114
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* fact: add expense section to direct purchase and update bill with net total

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* fact:improve purchase bill adding expenses and ui improvements.

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Closes #10114
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10125
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

---------

Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>
Co-authored-by: imexh <chandikaranawella@gmail.com>
Co-authored-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
Co-authored-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
Co-authored-by: DamithDeshan <hkddrajapaksha@gmail.com>
Co-authored-by: Sandith Pivithuru <sandithpivithuru@gmail.com>
Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Co-authored-by: H.K. Damith Deshan <108138918+DamithDeshan@users.noreply.github.com>
Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com>
GSMgeeth added a commit that referenced this issue Jan 20, 2025
…re billing (#10131)

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10050
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10036
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10062
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* 10034 discount report bug fixes

* changed css file printOnly
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Added a new table to print it without filter boxes
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* 10034 staff welfare report bug fixes

* 10034 discount report bug fixes

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Pharmacy purchase order list ui improvement.

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 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 <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Merge pull request #10063

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Fixed #10013

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* 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 <hkddrajapaksha@gmail.com>

* closes #10079
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10081
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* https://youtu.be/GDWy_tlJ2Gk
Closes #10086
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Update rh_prod_ci_cd.yml

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10097
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
**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 <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10077
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes with Production persistance.xml
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* fix: Expenses added to the GRN payment

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Closes #10102
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10111

Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10114
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* fact: add expense section to direct purchase and update bill with net total

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* fact:improve purchase bill adding expenses and ui improvements.

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Closes #10114
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10125
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10116
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Update persistence.xml

---------

Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>
Co-authored-by: imexh <chandikaranawella@gmail.com>
Co-authored-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
Co-authored-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
Co-authored-by: DamithDeshan <hkddrajapaksha@gmail.com>
Co-authored-by: Sandith Pivithuru <sandithpivithuru@gmail.com>
Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Co-authored-by: H.K. Damith Deshan <108138918+DamithDeshan@users.noreply.github.com>
Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com>
GSMgeeth added a commit that referenced this issue Jan 20, 2025
* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10050
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10036
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10062
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* 10034 discount report bug fixes

* changed css file printOnly
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Added a new table to print it without filter boxes
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* 10034 staff welfare report bug fixes

* 10034 discount report bug fixes

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Pharmacy purchase order list ui improvement.

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 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 <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Merge pull request #10063

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Fixed #10013

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* 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 <hkddrajapaksha@gmail.com>

* closes #10079
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10081
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* https://youtu.be/GDWy_tlJ2Gk
Closes #10086
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Update rh_prod_ci_cd.yml

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10097
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
**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 <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10077
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes with Production persistance.xml
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* fix: Expenses added to the GRN payment

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Closes #10102
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10111

Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10114
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* fact: add expense section to direct purchase and update bill with net total

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* fact:improve purchase bill adding expenses and ui improvements.

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Closes #10114
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10125
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10031
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10137
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

---------

Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>
Co-authored-by: imexh <chandikaranawella@gmail.com>
Co-authored-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
Co-authored-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
Co-authored-by: DamithDeshan <hkddrajapaksha@gmail.com>
Co-authored-by: Sandith Pivithuru <sandithpivithuru@gmail.com>
Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Co-authored-by: H.K. Damith Deshan <108138918+DamithDeshan@users.noreply.github.com>
Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com>
GSMgeeth added a commit that referenced this issue Jan 22, 2025
…0167)

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10050
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10036
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10062
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* 10034 discount report bug fixes

* changed css file printOnly
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Added a new table to print it without filter boxes
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* 10034 staff welfare report bug fixes

* 10034 discount report bug fixes

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Pharmacy purchase order list ui improvement.

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 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 <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Merge pull request #10063

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Fixed #10013

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* 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 <hkddrajapaksha@gmail.com>

* closes #10079
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10081
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* https://youtu.be/GDWy_tlJ2Gk
Closes #10086
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Update rh_prod_ci_cd.yml

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10097
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
**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 <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10077
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes with Production persistance.xml
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* fix: Expenses added to the GRN payment

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Closes #10102
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10111

Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10114
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10114
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

---------

Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>
Co-authored-by: imexh <chandikaranawella@gmail.com>
Co-authored-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
Co-authored-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
Co-authored-by: DamithDeshan <hkddrajapaksha@gmail.com>
Co-authored-by: Sandith Pivithuru <sandithpivithuru@gmail.com>
Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Co-authored-by: H.K. Damith Deshan <108138918+DamithDeshan@users.noreply.github.com>
Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com>
GSMgeeth added a commit that referenced this issue Jan 27, 2025
* Signed-off-by: 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 <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>

* Signed-off-by: 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 <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>

* Signed-off-by: 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 <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>

* Signed-off-by: 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 <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>

* Signed-off-by: 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 <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>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10050
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10036
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10062
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* 10034 discount report bug fixes

* changed css file printOnly
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Added a new table to print it without filter boxes
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* 10034 staff welfare report bug fixes

* 10034 discount report bug fixes

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Pharmacy purchase order list ui improvement.

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 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 <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Merge pull request #10063

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Fixed #10013

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* 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 <hkddrajapaksha@gmail.com>

* closes #10079
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10081
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* https://youtu.be/GDWy_tlJ2Gk
Closes #10086
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Update rh_prod_ci_cd.yml

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10097
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
**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 <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10077
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes with Production persistance.xml
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* fix: Expenses added to the GRN payment

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Closes #10102
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10111

Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: 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 <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>

* Signed-off-by: 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 <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>

* Closes #10243
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10239
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

---------

Signed-off-by: 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 <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>
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>
Co-authored-by: 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 <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>
Co-authored-by: imexh <chandikaranawella@gmail.com>
Co-authored-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
Co-authored-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
Co-authored-by: DamithDeshan <hkddrajapaksha@gmail.com>
Co-authored-by: Sandith Pivithuru <sandithpivithuru@gmail.com>
Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Co-authored-by: H.K. Damith Deshan <108138918+DamithDeshan@users.noreply.github.com>
Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com>
GSMgeeth added a commit that referenced this issue Jan 27, 2025
* Signed-off-by: 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 <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>

* Signed-off-by: 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 <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>

* Signed-off-by: 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 <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>

* Signed-off-by: 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 <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>

* Signed-off-by: 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 <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>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10050
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10036
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10062
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* 10034 discount report bug fixes

* changed css file printOnly
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Added a new table to print it without filter boxes
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* 10034 staff welfare report bug fixes

* 10034 discount report bug fixes

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Pharmacy purchase order list ui improvement.

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 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 <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Merge pull request #10063

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Fixed #10013

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* 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 <hkddrajapaksha@gmail.com>

* closes #10079
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10081
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* https://youtu.be/GDWy_tlJ2Gk
Closes #10086
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Update rh_prod_ci_cd.yml

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10097
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
**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 <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10077
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes with Production persistance.xml
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* fix: Expenses added to the GRN payment

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Closes #10102
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10111

Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10114
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: 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 <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>

* Closes #10114
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #4834
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10155
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #9988
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* # Fixed Purchase Rate Adjustment BillItem Double Issue
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* #Fixed Store Sale Rate Adjustment BillItem Bug
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* #Fixed Staff Stock Adjustment Bug
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10221
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10227
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: 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 <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>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10243
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10239
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10233
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

---------

Signed-off-by: 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 <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>
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>
Co-authored-by: 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 <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>
Co-authored-by: imexh <chandikaranawella@gmail.com>
Co-authored-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
Co-authored-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
Co-authored-by: DamithDeshan <hkddrajapaksha@gmail.com>
Co-authored-by: Sandith Pivithuru <sandithpivithuru@gmail.com>
Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Co-authored-by: H.K. Damith Deshan <108138918+DamithDeshan@users.noreply.github.com>
Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com>
GSMgeeth added a commit that referenced this issue Jan 27, 2025
…10249)

* Signed-off-by: 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 <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>

* Signed-off-by: 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 <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>

* Signed-off-by: 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 <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>

* Signed-off-by: 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 <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>

* Signed-off-by: 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 <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>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10050
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Closed #10036
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10062
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 9964 staff welfare bug fixes

* 10034 discount report bug fixes

* changed css file printOnly
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Added a new table to print it without filter boxes
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* 10034 staff welfare report bug fixes

* 10034 discount report bug fixes

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Signed-off-by: Sandith Pivithuru <sandithpivithuru@gmail.com>

* Pharmacy purchase order list ui improvement.

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* 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 <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Merge pull request #10063

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Fixed #10013

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* 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 <hkddrajapaksha@gmail.com>

* closes #10079
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10081
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* https://youtu.be/GDWy_tlJ2Gk
Closes #10086
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Update rh_prod_ci_cd.yml

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10097
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
**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 <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10077
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes with Production persistance.xml
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* fix: Expenses added to the GRN payment

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>

* Closes #10102
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10111

Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #10114
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: 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 <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>

* Closes #10114
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Closes #4834
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10155
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #9988
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* # Fixed Purchase Rate Adjustment BillItem Double Issue
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* #Fixed Store Sale Rate Adjustment BillItem Bug
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* #Fixed Staff Stock Adjustment Bug
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* closes #10221
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10227
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: 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 <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>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10243
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10239
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10233
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #10230
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>

---------

Signed-off-by: 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 <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>
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>
Co-authored-by: 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 <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>
Co-authored-by: imexh <chandikaranawella@gmail.com>
Co-authored-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
Co-authored-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
Co-authored-by: DamithDeshan <hkddrajapaksha@gmail.com>
Co-authored-by: Sandith Pivithuru <sandithpivithuru@gmail.com>
Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Co-authored-by: H.K. Damith Deshan <108138918+DamithDeshan@users.noreply.github.com>
Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

1 participant