Skip to content

fix: fix to fetch customers and billing email in PSOA (backport #27363)#46122

Closed
mergify[bot] wants to merge 1 commit intoversion-13-hotfixfrom
mergify/bp/version-13-hotfix/pr-27363
Closed

fix: fix to fetch customers and billing email in PSOA (backport #27363)#46122
mergify[bot] wants to merge 1 commit intoversion-13-hotfixfrom
mergify/bp/version-13-hotfix/pr-27363

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 25, 2025

Issue:
Process Statement of Accounts -

  • System throws the following error even when one has a customer with primary contact email because billing email is missing.
    Screenshot 2021-09-06 at 8 49 10 PM
  • Query to fetch billing email failed to do so

Fix:

  • Fixed the condition to fetch customers
  • Fixed a query to fetch billing email
  • Added a description to the checkbox which goes otherwise unnoticed
    psoa

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

(cherry picked from commit a58e309)

# Conflicts:
#	erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#	erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
@mergify mergify bot requested a review from deepeshgarg007 as a code owner February 25, 2025 00:12
@mergify mergify bot added the conflicts label Feb 25, 2025
@mergify mergify bot requested a review from ruthra-kumar as a code owner February 25, 2025 00:12
@mergify
Copy link
Contributor Author

mergify bot commented Feb 25, 2025

Cherry-pick of a58e309 has failed:

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

You are currently cherry-picking commit a58e309297.
  (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 <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
	both modified:   erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.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

@ankush ankush closed this Feb 25, 2025
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 12, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants