Skip to content

fix: General Ledger translation issues (backport #27298)#46149

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

fix: General Ledger translation issues (backport #27298)#46149
mergify[bot] wants to merge 1 commit intoversion-13-hotfixfrom
mergify/bp/version-13-hotfix/pr-27298

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 26, 2025

Options of group_by filter are translated. Assertions were made against English sentences and hence would always return false in cases where English isn't the system language.

Solution: don't translate options server side. Only displayed labels are translated client side.

closes #27277


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

* fix: remove translations from GL report options

Options need not be translated, their display label gets translated
client side.

* fix: make group by options translatable

* ci: semgrep rule for translated options in report

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit fa819f2)

# Conflicts:
#	.github/helper/semgrep_rules/report.yml
#	erpnext/accounts/report/general_ledger/general_ledger.py
@mergify
Copy link
Contributor Author

mergify bot commented Feb 26, 2025

Cherry-pick of fa819f2 has failed:

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

You are currently cherry-picking commit fa819f2fb0.
  (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:   .github/helper/semgrep_rules/report.yml
	both modified:   erpnext/accounts/report/general_ledger/general_ledger.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 26, 2025
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 13, 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