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: link cash flow rows and fix summary linking (backport #42524) #44419

Merged
merged 3 commits into from
Nov 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 29, 2024

Context

  • Cashflow rows link into nowhere useful
  • Summary lines ditto

Solutions

  • Avoid linking summary lines (through consequent quoting)
  • Link cashflow lines to GL report with the filter set to each row's (multiple) its constituent accounts

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

(cherry picked from commit b94af28)

# Conflicts:
#	erpnext/public/js/financial_statements.js
Copy link
Contributor Author

mergify bot commented Nov 29, 2024

Cherry-pick of b94af28 has failed:

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

You are currently cherry-picking commit b94af28587.
  (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/report/cash_flow/cash_flow.js
	modified:   erpnext/accounts/report/cash_flow/cash_flow.py
	modified:   erpnext/accounts/report/financial_statements.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/public/js/financial_statements.js

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 the needs-tests This PR needs automated unit-tests. label Nov 29, 2024
@ruthra-kumar ruthra-kumar self-assigned this Nov 29, 2024
@ruthra-kumar ruthra-kumar merged commit 5b2fce2 into version-15-hotfix Nov 29, 2024
11 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-15-hotfix/pr-42524 branch November 29, 2024 06:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants