fix: capacity planning issue in the job card (backport #40092) #40100
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
* fix: capacity planning issue in the job card * test: test case to test capacity planning for workstation (cherry picked from commit 75f8464) # Conflicts: # erpnext/manufacturing/doctype/job_card/job_card.py # erpnext/manufacturing/doctype/work_order/test_work_order.py
rohitwaghchaure
force-pushed
the
mergify/bp/version-14-hotfix/pr-40092
branch
from
1900e4c to
22a3552
Compare
frappe-pr-bot
pushed a commit
that referenced
this pull request
Feb 28, 2024
# [14.64.0](v14.63.3...v14.64.0) (2024-02-28) ### Bug Fixes * add flags for repost to ensure correct accounting from India Compliance App ([8c772cf](8c772cf)) * amount label according to party type ([bb3a7cd](bb3a7cd)) * Cannot read properties of undefined (backport [#40081](#40081)) ([#40082](#40082)) ([579b27d](579b27d)) * capacity planning issue in the job card (backport [#40092](#40092)) ([#40100](#40100)) ([8a573a1](8a573a1)) * check_credit_limit on_update_after_submit of Sales Order ([3112fca](3112fca)) * communication_date in party dashboards (backport [#40005](#40005)) ([#40020](#40020)) ([b364fe7](b364fe7)) * Completed Work Orders report not working ([c8e1409](c8e1409)) * Cr/Dr notes with POS Payments ([e5098c5](e5098c5)) * default taxable value for item not found in item list ([30315ab](30315ab)) * Delete linked asset movement record on cancellation of purchase receipt/invoice ([11bddc1](11bddc1)) * Delete orphaned asset movement item records ([46cd929](46cd929)) * delete PLE containing invoice in against ([08459ce](08459ce)) * do not make MR against raw materials of available sub assemblies (backport [#40085](#40085)) ([#40086](#40086)) ([e461185](e461185)) * incorrect item name in MR (backport [#40018](#40018)) ([#40023](#40023)) ([079ba76](079ba76)) * linter issue ([ea1a0b3](ea1a0b3)) * linting issue ([65a2adf](65a2adf)) * linting issue ([e289aef](e289aef)) * negative stock error while making stock reconciliation (backport [#40016](#40016)) ([#40025](#40025)) ([865cba4](865cba4)) * on unreconciliation, update advance paid ([fe88a11](fe88a11)) * only check for delinked PLEs ([3d243a7](3d243a7)) * only consider contributed qty towards achieved targets ([0484857](0484857)) * parent warehouse checks in the production plan for sub-assemblies (backport [#40150](#40150)) ([#40156](#40156)) ([9a85ab4](9a85ab4)) * remove cancelled payment entry from Payment Period Based On Invoice Date ([2fc490a](2fc490a)) * remove cancelled payment entry from PPBOID report ([a1c0c23](a1c0c23)) * remove config for default bank account in test ([ad60677](ad60677)) * sales funnel text color in light/dark theme ([#40132](#40132)) ([193cd0d](193cd0d)) * skip max discount validation for rate adjustment ([8c7d0d4](8c7d0d4)) * skip SO & DN validation for debit note ([882cf98](882cf98)) * test for plaid bank account validation ([22db6f6](22db6f6)) * timesheet per billed state edge case (backport [#40010](#40010)) ([#40028](#40028)) ([2a2f314](2a2f314)) * translatable columns in Sales Pipeline Analytics report ([3c170b9](3c170b9)) * unique gl account for plaid bank accounts ([8638d14](8638d14)) * use correct variable name for hotfix branches ([812eebf](812eebf)) * Webpages not working without login ([d6fad08](d6fad08)) ### Features * show contributed qty in transaction summary ([89d1942](89d1942)) * update billed amount in PO and PR ([019d8f9](019d8f9))
|
🎉 This PR is included in version 14.64.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #40092 done by Mergify.
Cherry-pick of 75f8464 has failed:
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
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 refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com