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.

Sign up for GitHub

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

Jump to bottom

10077 improvements for bht direct issue from pharmacy #10101

Merged
merged 56 commits into from
Jan 15, 2025
Merged

10077 improvements for bht direct issue from pharmacy #10101

merged 56 commits into from
Jan 15, 2025

Conversation

buddhika75
Copy link
Member

@buddhika75 buddhika75 commented Jan 14, 2025 •
edited
Loading

Completed the following for inpatient direct issue

  • When editing, should give a warning when fewer stocks
  • Rate, Value in Bill Items Lines
  • Bill Total at the Bottom
  • Reduce Space in the header, remove Age, Sex
  • Add Button needs to be fired instead of the Settle button for Enter Key

buddhika75 and others added 30 commits January 6, 2025 09:30
@buddhika75
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
adf2d93
@buddhika75
Merge branch 'support_mobitel_sms_middleware_to_send_sms_#9970' into …
7c7b59b 
…10027-export-amp-list

# Conflicts:
#	src/main/resources/META-INF/persistence.xml

Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
@IsuruUdaraRanaweera
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
4830098
@IsuruUdaraRanaweera
Merge branch 'development' of https://github.com/hmislk/hmis.git into…
574aa75 
… 10003-collection-cente-bill-wise-detail-report-bugs
@IsuruUdaraRanaweera
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
8c1aa9d
@Pubudu-Piyankara
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
4544d67
@Pubudu-Piyankara
Closed #10050
399e305 
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
@Pubudu-Piyankara
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
aeed73e
@Pubudu-Piyankara
Merge branch '10003-collection-cente-bill-wise-detail-report-bugs' of h…
5b554ee 
…ttps://github.com/hmislk/hmis.git into #10050_Grn_return_improvement
@Pubudu-Piyankara
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
5baa186
@Pubudu-Piyankara
Merge branch 'development' of https://github.com/hmislk/hmis.git into…
0b270d5 
… #10036_Grn_report

# Conflicts:
#	src/main/java/com/divudi/bean/pharmacy/GoodsReturnController.java
@Pubudu-Piyankara
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
2ae518e
@Pubudu-Piyankara
Merge branch 'development' of https://github.com/hmislk/hmis.git into…
34025da 
… #10036_Grn_report
@Pubudu-Piyankara
Closed #10036
6bfebab 
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
@DamithDeshan
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
9fc821f
@DamithDeshan
Merge branch 'Issue#10013-Bug_Fix_on_OPD_Card_Can't_Add_Drug' of http…
2d370b0 
…s://github.com/hmislk/hmis.git into ####
@DamithDeshan
closes #10062
06cc404 
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
@DamithDeshan
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
3a82226
@buddhika75
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
823f5e8
@buddhika75
Merge branch 'coop-prod' of https://github.com/hmislk/hmis.git into 1…
27d56d0 
…0064-refunds-and-cancellations-are-not-listed-in-inpatient-medicine-issue-summary
@buddhika75
Merge branch '10027-export-amp-list' into 10064-refunds-and-cancellat…
3df6d2f 
…ions-are-not-listed-in-inpatient-medicine-issue-summary
@buddhika75
Merge branch 'coop-dev' of https://github.com/hmislk/hmis.git into 10…
6577c37 
…064-refunds-and-cancellations-are-not-listed-in-inpatient-medicine-issue-summary
@buddhika75
Merge branch '#10036_Grn_report' of https://github.com/hmislk/hmis.git …
463736a 
…into 10064-refunds-and-cancellations-are-not-listed-in-inpatient-medicine-issue-summary
@buddhika75
Merge branch '10062_cannot_admit_opd_cards_without_room_no' of https:…
5212ed2 
…//github.com/hmislk/hmis.git into 10064-refunds-and-cancellations-are-not-listed-in-inpatient-medicine-issue-summary
@buddhika75
Merge branch 'ruhunu-dev' of https://github.com/hmislk/hmis.git into …
faa0e67 
…10064-refunds-and-cancellations-are-not-listed-in-inpatient-medicine-issue-summary
@DamithDeshan
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
8685fb3
@buddhika75
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
770be79
@buddhika75
Closes #10064
93b32f1 
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>
@buddhika75
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
b939920
@buddhika75
Merge branch '10064-refunds-and-cancellations-are-not-listed-in-inpat…
8394c82 
…ient-medicine-issue-summary' into 10073-refunds-are-not-listed-in-inpatient-medicine-issue-summary
DamithDeshan and others added 25 commits January 11, 2025 14:21
@DamithDeshan
Merge pull request #10063
2ccd3a6 
* 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>
@DamithDeshan
closes #10079
d08d99b 
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
@buddhika75
Merge pull request #10085 from hmislk/10044-need-sqeuencial-bill-numb…
f245f97 
…ers-for-pharmacy-direct-purchase

10044 need sqeuencial bill numbers for pharmacy direct purchase
@buddhika75
Merge branch '10044-need-sqeuencial-bill-numbers-for-pharmacy-direct-…
8f168ff 
…purchase' into 10086-retail-bill-search-total-incorrect

# Conflicts:
#	src/main/resources/META-INF/persistence.xml

Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
@buddhika75
Merge branch '10073-refunds-are-not-listed-in-inpatient-medicine-issu…
23e8407 
…e-summary' into 10086-retail-bill-search-total-incorrect
@buddhika75
Merge branch 'coop-dev' of https://github.com/hmislk/hmis.git into 10…
c583f52 
…086-retail-bill-search-total-incorrect

# Conflicts:
#	src/main/resources/META-INF/persistence.xml

Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
@buddhika75
https://youtu.be/GDWy_tlJ2Gk
2d792ee 
Closes #10086
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
@GSMgeeth
Update rh_prod_ci_cd.yml
d961be7
@buddhika75
Merge pull request #10090 from hmislk/10044-need-sqeuencial-bill-numb…
9604797 
…ers-for-pharmacy-direct-purchase

10044 need sqeuencial bill numbers for pharmacy direct purchase
@buddhika75
Merge pull request #10091 from hmislk/10044-need-sqeuencial-bill-numb…
38553a7 
…ers-for-pharmacy-direct-purchase

Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
@GSMgeeth
Merge pull request #10095 from hmislk/development
257d999 
Updates from development branch
@buddhika75
Merge branch '10086-retail-bill-search-total-incorrect' into 10077-im…
f9d9cc3 
…provements-for-bht-direct-issue-from-pharmacy
@buddhika75
Merge branch 'coop-prod' of https://github.com/hmislk/hmis.git into 1…
dba6ee6 
…0077-improvements-for-bht-direct-issue-from-pharmacy

# Conflicts:
#	src/main/webapp/admin/lims/report_template_availability.xhtml

Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
@buddhika75
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
1a1db2d
@buddhika75
Merge branch '10088-all-cashier-summary-had-calculated-fund-bills' in…
b14572d 
…to 10077-improvements-for-bht-direct-issue-from-pharmacy

# Conflicts:
#	src/main/webapp/admin/lims/report_template_availability.xhtml

Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
@buddhika75
Merge branch '#10071_microbiology_report_in_lab_module' of https://gi…
027f76c 
…thub.com/hmislk/hmis.git into 10077-improvements-for-bht-direct-issue-from-pharmacy

# Conflicts:
#	src/main/webapp/lab/patient_report.xhtml

Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
@buddhika75
Merge branch '#10079_improving_microbiology_report_antibiotic_list_an…
f9b3c31 
…d_print_report' of https://github.com/hmislk/hmis.git into 10077-improvements-for-bht-direct-issue-from-pharmacy

# Conflicts:
#	src/main/resources/META-INF/persistence.xml
#	src/main/webapp/collecting_centre/courier/patient_report_print.xhtml
#	src/main/webapp/lab/patient_report.xhtml
#	src/main/webapp/lab/patient_report_print.xhtml

Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
@buddhika75
Merge branch 'ruhunu-dev' of https://github.com/hmislk/hmis.git into …
6594242 
…10077-improvements-for-bht-direct-issue-from-pharmacy
@buddhika75
Merge branch 'ruhunu-prod' of https://github.com/hmislk/hmis.git into…
e1ec6ac 
… 10077-improvements-for-bht-direct-issue-from-pharmacy
@buddhika75
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
c1f00df
@buddhika75
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
a4251b3
@buddhika75
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
6b33c09
@buddhika75
Closes #10077
358054b 
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
@buddhika75
Merge branch 'development' of https://github.com/hmislk/hmis.git into…
2fc2774 
… 10077-improvements-for-bht-direct-issue-from-pharmacy
@buddhika75
Closes with Production persistance.xml
9f75c26 
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
@buddhika75 buddhika75 linked an issue Jan 14, 2025 that may be closed by this pull request
Improvements for BHT Direct Issue from Pharmacy #10077
Closed
7 tasks
@GSMgeeth GSMgeeth merged commit 79259bb into development Jan 15, 2025
@GSMgeeth GSMgeeth deleted the 10077-improvements-for-bht-direct-issue-from-pharmacy branch January 15, 2025 04:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GSMgeeth GSMgeeth GSMgeeth approved these changes

@IsuruUdaraRanaweera IsuruUdaraRanaweera Awaiting requested review from IsuruUdaraRanaweera

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Improvements for BHT Direct Issue from Pharmacy
5 participants
@buddhika75 @GSMgeeth @IsuruUdaraRanaweera @Pubudu-Piyankara @DamithDeshan