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: remarks field in payment reconciliation (backport #43886) #43917

Merged
merged 2 commits into from
Oct 30, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 30, 2024

The remarks in payments of Payment Reconciliation is not appearing because of the fieldname is remark and the code has remarks.

Screenshot 2024-10-29 at 11 14 13


This is an automatic backport of pull request #43886 done by [Mergify](https://mergify.com).

(cherry picked from commit 2d5b079)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
Copy link
Contributor Author

mergify bot commented Oct 30, 2024

Cherry-pick of 2d5b079 has failed:

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

You are currently cherry-picking commit 2d5b079949.
  (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)

Changes to be committed:
	modified:   erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
	modified:   erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py
	modified:   erpnext/accounts/utils.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json

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

@github-actions github-actions bot added accounts needs-tests This PR needs automated unit-tests. labels Oct 30, 2024
@ruthra-kumar ruthra-kumar merged commit 3ab31dc into version-15-hotfix Oct 30, 2024
11 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-15-hotfix/pr-43886 branch October 30, 2024 05:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
accounts needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants