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: expiry date column in Available Batch Report (backport #42628) #42641

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 6, 2024

Screenshot 2024-08-05 at 4 45 23 PM

#no-docs


This is an automatic backport of pull request #42628 done by Mergify.

(cherry picked from commit faff84c)

# Conflicts:
#	erpnext/stock/report/available_batch_report/available_batch_report.py
@mergify mergify bot requested a review from rohitwaghchaure as a code owner August 6, 2024 06:52
@mergify mergify bot added the conflicts label Aug 6, 2024
@mergify mergify bot requested a review from s-aga-r as a code owner August 6, 2024 06:52
Copy link
Contributor Author

mergify bot commented Aug 6, 2024

Cherry-pick of faff84c has failed:

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

You are currently cherry-picking commit faff84c6e5.
  (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/report/available_batch_report/available_batch_report.py

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/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 Aug 6, 2024
@rohitwaghchaure rohitwaghchaure removed needs-tests This PR needs automated unit-tests. conflicts labels Aug 6, 2024
@rohitwaghchaure rohitwaghchaure merged commit 83928bb into version-14-hotfix Aug 6, 2024
10 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-14-hotfix/pr-42628 branch August 6, 2024 09:54
frappe-pr-bot pushed a commit that referenced this pull request Aug 7, 2024
# [14.71.0](v14.70.14...v14.71.0) (2024-08-07)

### Bug Fixes

* 'undefined' in PL and BS report summary on Consolidated report ([a5e1432](a5e1432))
* company filter for filtring tax withheld vouchers ([b7731c8](b7731c8))
* do not update item price and last purchase rate for inter transf… (backport [#42616](#42616)) ([#42632](#42632)) ([5c5349e](5c5349e))
* filter condition in item-wise purchase register ([bc9b461](bc9b461))
* fixed depreciation calculation as per income tax act ([8df1079](8df1079))
* item_code filter in item-wise sales register ([f0f8a2f](f0f8a2f))
* min height for rows in sales funnel ([7086a96](7086a96))
* set query filters for sales / purchase tax template on PE ([c8d8536](c8d8536))
* slowness in reposting dependent vouchers. (backport [#42282](#42282)) ([#42569](#42569)) ([3fb6f97](3fb6f97))

### Features

* expiry date column in Available Batch Report (backport [#42628](#42628)) ([#42641](#42641)) ([83928bb](83928bb))
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 14.71.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 Aug 24, 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