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: posting_time issue (backport #44870) #44872

Merged
merged 2 commits into from
Dec 24, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 24, 2024


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

(cherry picked from commit 079b860)

# Conflicts:
#	erpnext/stock/deprecated_serial_batch.py
@mergify mergify bot added the conflicts label Dec 24, 2024
@mergify mergify bot requested a review from rohitwaghchaure as a code owner December 24, 2024 03:37
Copy link
Contributor Author

mergify bot commented Dec 24, 2024

Cherry-pick of 079b860 has failed:

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

You are currently cherry-picking commit 079b86044e.
  (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/stock/serial_batch_bundle.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/deprecated_serial_batch.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

@github-actions github-actions bot added needs-tests This PR needs automated unit-tests. stock labels Dec 24, 2024
@rohitwaghchaure rohitwaghchaure removed needs-tests This PR needs automated unit-tests. conflicts labels Dec 24, 2024
@ruthra-kumar ruthra-kumar merged commit 72b7204 into version-15-hotfix Dec 24, 2024
11 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-15-hotfix/pr-44870 branch December 24, 2024 08:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants