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: auto fetch batch and serial no for draft stock transactions (backport #45241) #45258

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 14, 2025

Issue

Screen.Recording.2025-01-13.at.4.45.09.PM.mov

After Fix

Screen.Recording.2025-01-13.at.4.44.04.PM.mov

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

(cherry picked from commit 88ab9be)

# Conflicts:
#	erpnext/stock/get_item_details.py
@mergify mergify bot requested a review from deepeshgarg007 as a code owner January 14, 2025 07:06
@mergify mergify bot added the conflicts label Jan 14, 2025
@mergify mergify bot requested a review from rohitwaghchaure as a code owner January 14, 2025 07:06
Copy link
Contributor Author

mergify bot commented Jan 14, 2025

Cherry-pick of 88ab9be has failed:

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

You are currently cherry-picking commit 88ab9be79c.
  (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/controllers/accounts_controller.py
	modified:   erpnext/public/js/controllers/transaction.js
	modified:   erpnext/stock/doctype/batch/batch.py
	modified:   erpnext/stock/doctype/delivery_note/test_delivery_note.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/get_item_details.py

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

@rohitwaghchaure rohitwaghchaure force-pushed the mergify/bp/version-15-hotfix/pr-45241 branch from b1c0bbb to 3c2a55b Compare January 14, 2025 12:19
@rohitwaghchaure rohitwaghchaure force-pushed the mergify/bp/version-15-hotfix/pr-45241 branch from 3c2a55b to af21bca Compare January 14, 2025 12:45
@rohitwaghchaure rohitwaghchaure merged commit 1be8051 into version-15-hotfix Jan 14, 2025
11 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-15-hotfix/pr-45241 branch January 14, 2025 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant