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: partial return on POS invoice (backport #43253) #43342

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 23, 2024

version 15 and 14

fixes: #37998 & https://discuss.frappe.io/t/cant-submit-a-partial-return-on-pos-invoice/133331?u=ncp

Before:

before_pos_return.mp4

After:

after_pos_return.mp4

This is an automatic backport of pull request #43253 done by Mergify.

(cherry picked from commit 76289fa)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.py
(cherry picked from commit 18bdd06)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.py
Copy link
Contributor Author

mergify bot commented Sep 23, 2024

Cherry-pick of 76289fa has failed:

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

You are currently cherry-picking commit 76289fa8dc.
  (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/pos_invoice/pos_invoice.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 18bdd06 has failed:

On branch mergify/bp/version-14-hotfix/pr-43253
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 18bdd06652.
  (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/pos_invoice/pos_invoice.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

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Sep 23, 2024
@Nihantra-Patel Nihantra-Patel merged commit 5ba9fb7 into version-14-hotfix Sep 23, 2024
10 checks passed
@Nihantra-Patel Nihantra-Patel deleted the mergify/bp/version-14-hotfix/pr-43253 branch September 23, 2024 18:06
@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
needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants