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

Updates from development #9829

Merged
merged 137 commits into from
Dec 23, 2024
Merged

Updates from development #9829

merged 137 commits into from
Dec 23, 2024

Conversation

GSMgeeth
Copy link
Collaborator

No description provided.

imexh and others added 30 commits December 19, 2024 18:11
…ttps://github.com/hmislk/hmis.git into Issue#9570_F15_report

# Conflicts:
#	src/main/java/com/divudi/bean/common/ReportsController.java

Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
…s://github.com/hmislk/hmis.git into Issue#9571_pharmacy_income_report

# Conflicts:
#	src/main/java/com/divudi/bean/common/ReportsController.java

Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
…mis.git into ####

# Conflicts:
#	src/main/java/com/divudi/bean/common/ReportsController.java

Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
SandithP2001 and others added 29 commits December 22, 2024 09:40
…ps://github.com/hmislk/hmis.git into issue##9785_Improvements_Stock_Ledger

# Conflicts:
#	src/main/java/com/divudi/bean/common/ReportsController.java
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
#9769 Calculation Error UPCR Investigation Closes #9769
…le_Management

#9786 no view lab report in sample management Closes #9786
…_Billing

#6674 add external doctor for cc billing Closes #6674
…g_Option

#9794 add color picker for config option Closes #9794
…Color_in_CC_Statement

#9778 payment identify defferent color in cc statement Closes #9778
…ient_Direct_Medicine_Issue

#9803 bill type atomic for inpatient direct medicine issue Closes #9803
…ient_Issues_for_Requests

#9810 bill type atomic for inpatient issues for requests Closes #9810
…ect_issue_#9811

Bill type atomic for theatre direct issue #9811 Closes #9811
…ues_for_requests_#9815

Bill type atomic for theatre issues for requests #9815 Closes #9815
@GSMgeeth GSMgeeth merged commit 4fadc95 into dev-ci-cd-setup Dec 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.