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: add labels for translation in sales_order.js (backport #44500) #44519

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 5, 2024


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

Copy link
Contributor Author

mergify bot commented Dec 5, 2024

Cherry-pick of d544328 has failed:

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

You are currently cherry-picking commit d544328ffe.
  (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/selling/doctype/sales_order/sales_order.js

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

@ruthra-kumar ruthra-kumar force-pushed the mergify/bp/version-14-hotfix/pr-44500 branch from 7ffe4f8 to 3620dda Compare December 5, 2024 04:47
@ruthra-kumar ruthra-kumar merged commit 1436fda into version-14-hotfix Dec 5, 2024
5 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-14-hotfix/pr-44500 branch December 5, 2024 04:49
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.78.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants