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 balance for inventory dimension (backport #43284) #43289

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 19, 2024


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

(cherry picked from commit 3e7a7a5)

# Conflicts:
#	erpnext/stock/report/stock_balance/stock_balance.js
Copy link
Contributor Author

mergify bot commented Sep 19, 2024

Cherry-pick of 3e7a7a5 has failed:

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

You are currently cherry-picking commit 3e7a7a54bf.
  (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_balance/stock_balance.py

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

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 the needs-tests This PR needs automated unit-tests. label Sep 19, 2024
@rohitwaghchaure rohitwaghchaure removed needs-tests This PR needs automated unit-tests. conflicts labels Sep 19, 2024
@rohitwaghchaure rohitwaghchaure merged commit 1bdbcc6 into version-14-hotfix Sep 19, 2024
10 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-14-hotfix/pr-43284 branch September 19, 2024 04:51
frappe-pr-bot pushed a commit that referenced this pull request Sep 25, 2024
## [14.74.2](v14.74.1...v14.74.2) (2024-09-25)

### Bug Fixes

* add currency in financial statement ([6becaba](6becaba))
* AR / AP report to ignore 0.0 outstanding ([79f95ba](79f95ba))
* **Bank Account:** dashboard connections (backport [#43365](#43365)) ([#43366](#43366)) ([4146bdf](4146bdf))
* change dynamic link doctype fieldtype to data ([c0dfda6](c0dfda6))
* incorrect outstanding on non-pos invoice with write_off_account ([79235cd](79235cd))
* incorrect stock balance for inventory dimension (backport [#43284](#43284)) ([#43289](#43289)) ([1bdbcc6](1bdbcc6))
* partial return on POS invoice ([50e0f56](50e0f56))
* partial return on POS invoice ([ef7d4fe](ef7d4fe))
* Payment Ledger Report currency fieldtype fix ([7ac39dc](7ac39dc))
* **Payment Reconciliation:** German translations ([32d4f96](32d4f96))
* Serial No reserved against historical sales order - unable to sell again ([#43294](#43294)) ([8abc1f4](8abc1f4))
* show chart tool tip in report currency ([92438f8](92438f8))
* translate in js ([e43c357](e43c357))
* Translation for button SO to PO ([a8b5bcf](a8b5bcf))
* Translation for button SO to PO --conflicts ([b6ce922](b6ce922))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.74.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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