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 stock ledger entries in DN (backport #36944) #37067

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 13, 2023

This is an automatic backport of pull request #36944 done by Mergify.
Cherry-pick of 0e83190 has failed:

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

You are currently cherry-picking commit 0e83190c19.
  (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/stock/doctype/delivery_note/delivery_note.json

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/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 0e83190)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.json
@rohitwaghchaure rohitwaghchaure merged commit 5833c4d into version-13-hotfix Sep 20, 2023
6 checks passed
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-36944 branch September 20, 2023 12:42
deepeshgarg007 pushed a commit that referenced this pull request Sep 27, 2023
* feat: provision to make reposting entries from Stock and Account Value Comparison Report (backport #35365) (#37171)

* feat: provision to make reposting entries from Stock and Account Value Comparison Report

(cherry picked from commit 7b818e9)

* fix: `linter`

* fix(ux): throw if no row selected to create repost entries

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>

* fix: incorrect stock ledger entries in DN (backport #36944) (#37067)

* fix: incorrect stock ledger entries in DN (#36944)

(cherry picked from commit 0e83190)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>

* feat: `Stock Ledger Variance` report (backport #37165) (#37184)

feat: `Stock Ledger Variance` report (#37165)

* feat: `Stock Ledger Variance` report

* refactor: `get_data()`

(cherry picked from commit acda72d)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>

* fix: Update `advance_paid` in SO/PO after unlinking from advance entry

(cherry picked from commit 426350e)

* test: Impact on SO of advance PE submit and unlinking/replacement by SI

(cherry picked from commit 8a4954d)

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
frappe-pr-bot pushed a commit that referenced this pull request Oct 4, 2023
# [13.54.0](v13.53.0...v13.54.0) (2023-10-04)

### Bug Fixes

* incorrect stock ledger entries in DN (backport [#36944](#36944)) ([#37067](#37067)) ([5833c4d](5833c4d))
* trial balance report freezes when adding filters (backport [#37264](#37264)) ([#37267](#37267)) ([ff6b38c](ff6b38c))
* Update `advance_paid` in SO/PO after unlinking from advance entry ([a6bef64](a6bef64))

### Features

* `Stock Ledger Variance` report (backport [#37165](#37165)) ([#37184](#37184)) ([5092ea1](5092ea1))
* provision to make reposting entries from Stock and Account Value Comparison Report (backport [#35365](#35365)) ([#37171](#37171)) ([48eb6a6](48eb6a6))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.54.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants