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: incorrect reposting causing stock adjustment entry (backport #35955) #35961

Merged
merged 2 commits into from
Jul 2, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 2, 2023

This is an automatic backport of pull request #35955 done by Mergify.
Cherry-pick of c0c693d has failed:

On branch mergify/bp/develop/pr-35955
Your branch is up to date with 'origin/develop'.

You are currently cherry-picking commit c0c693d8b0.
  (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/stock_ledger.py

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit c0c693d)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@codecov
Copy link

codecov bot commented Jul 2, 2023

Codecov Report

Merging #35961 (232dfad) into develop (3df0c5e) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop   #35961   +/-   ##
========================================
  Coverage    64.20%   64.20%           
========================================
  Files          785      785           
  Lines        60613    60616    +3     
========================================
+ Hits         38914    38918    +4     
+ Misses       21699    21698    -1     
Impacted Files Coverage Δ
erpnext/stock/stock_ledger.py 84.56% <100.00%> (+0.06%) ⬆️

... and 1 file with indirect coverage changes

@rohitwaghchaure rohitwaghchaure merged commit ab58c01 into develop Jul 2, 2023
13 checks passed
@mergify mergify bot deleted the mergify/bp/develop/pr-35955 branch July 2, 2023 05:48
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 20, 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.

None yet

1 participant