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

fix(Treatment Counselling): Add payment entry on_cancel and paid amount calculation (backport #514) #517

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 31, 2024

…nt calculation

(cherry picked from commit 69f4b9d)

# Conflicts:
#	healthcare/healthcare/custom_doctype/payment_entry.py
#	healthcare/healthcare/doctype/treatment_counselling/treatment_counselling.py
#	healthcare/hooks.py
Copy link
Contributor Author

mergify bot commented Oct 31, 2024

Cherry-pick of 69f4b9d has failed:

On branch mergify/bp/version-15-hotfix/pr-514
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 69f4b9d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   healthcare/healthcare/custom_doctype/payment_entry.py
	deleted by us:   healthcare/healthcare/doctype/treatment_counselling/treatment_counselling.py
	both modified:   healthcare/hooks.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@Sajinsr Sajinsr closed this Nov 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant