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: Translation for button SO to PO (backport #43276) #43277

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 18, 2024

Version 15 and 14

fixes: https://discuss.frappe.io/t/translation-for-button-create-purchase-order-in-so-not-working/133486

(cherry picked from commit a5275e9)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.js
Copy link
Contributor Author

mergify bot commented Sep 18, 2024

Cherry-pick of a5275e9 has failed:

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

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

@Nihantra-Patel Nihantra-Patel merged commit 02f414e into version-14-hotfix Sep 18, 2024
5 checks passed
@Nihantra-Patel Nihantra-Patel deleted the mergify/bp/version-14-hotfix/pr-43276 branch September 18, 2024 16:19
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.74.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 Oct 13, 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.

2 participants