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

#9803 bill type atomic for inpatient direct medicine issue #9812

Conversation

buddhika75
Copy link
Member

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>
Updates from development branch
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>
…s://github.com/hmislk/hmis.git into ####

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

Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
…ttps://github.com/hmislk/hmis.git into ####

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

Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
…m/hmislk/hmis.git into ####

# Conflicts:
#	src/main/java/com/divudi/bean/common/ReportsController.java
#	src/main/resources/META-INF/persistence.xml

Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
DamithDeshan and others added 27 commits December 20, 2024 20:12
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
closes #9794
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
Updates from development branch
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
… Issue#9571_pharmacy_income_report

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

Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
… #9803_Bill_Type_Atomic_for_Inpatient_Direct_Medicine_Issue

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

Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
…thub.com/hmislk/hmis.git into #9803_Bill_Type_Atomic_for_Inpatient_Direct_Medicine_Issue
…into #9803_Bill_Type_Atomic_for_Inpatient_Direct_Medicine_Issue

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

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>
Copy link
Collaborator

@DamithDeshan DamithDeshan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No Issues

@DeshaniPubudu DeshaniPubudu merged commit 2d50922 into development Dec 23, 2024
@DeshaniPubudu DeshaniPubudu deleted the #9803_Bill_Type_Atomic_for_Inpatient_Direct_Medicine_Issue branch December 23, 2024 09:07
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.

7 participants