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

feat: provision to create RIV from Stock Ledger Invariant Check report (backport #37115) #37149

Merged
merged 2 commits into from
Sep 19, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 19, 2023

This is an automatic backport of pull request #37115 done by Mergify.
Cherry-pick of 9c9d0ec has failed:

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

You are currently cherry-picking commit 9c9d0ecb73.
  (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/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js

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

…ort (#37115)

* feat: provision to create RIV from `Stock Ledger Invariant Check` report

* fix: `linter`

(cherry picked from commit 9c9d0ec)

# Conflicts:
#	erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py
@s-aga-r s-aga-r removed the conflicts label Sep 19, 2023
@s-aga-r s-aga-r enabled auto-merge (squash) September 19, 2023 08:56
@s-aga-r s-aga-r merged commit 86b152f into version-13-hotfix Sep 19, 2023
7 checks passed
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-37115 branch September 19, 2023 09:21
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.53.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

frappe-pr-bot pushed a commit that referenced this pull request Sep 19, 2023
# [13.53.0](v13.52.15...v13.53.0) (2023-09-19)

### Bug Fixes

* fetch logic for repay_from_salary in loan_repayment [v13] ([#37136](#37136)) ([d4f8b05](d4f8b05))

### Features

* provision to create RIV from `Stock Ledger Invariant Check` report (backport [#37115](#37115)) ([#37149](#37149)) ([86b152f](86b152f))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 29, 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.

2 participants