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

#9778 payment identify defferent color in cc statement #9798

Merged

Conversation

DamithDeshan
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>
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>
DamithDeshan and others added 24 commits December 20, 2024 12:30
…/hmis.git into #9769_CalCulation_Error

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

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

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

Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
…k/hmis.git into #9769_CalCulation_Error

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

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

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

Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
closes #9794
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
Copy link
Collaborator

@SandithP2001 SandithP2001 left a comment

Choose a reason for hiding this comment

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

Reviewed

@DeshaniPubudu DeshaniPubudu merged commit 6e8e614 into development Dec 23, 2024
@DeshaniPubudu DeshaniPubudu deleted the #9778_Payment_Identify_DefferentColor_in_CC_Statement branch December 23, 2024 06:37
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.

8 participants