fix: not able to cancel SCR with Batch #38817
Merged
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
rohitwaghchaure
force-pushed
the
fied-not-able-to-cancel-SCR-with-Batch
branch
from
896f9f1 to
19d61de
Compare
rohitwaghchaure
added
the
backport develop
mergify bot
pushed a commit
that referenced
this pull request
Dec 18, 2023
(cherry picked from commit fb5090f) # Conflicts: # erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
rohitwaghchaure
added a commit
that referenced
this pull request
Dec 18, 2023
* fix: not able to cancel SCR with Batch (#38817) (cherry picked from commit fb5090f) # Conflicts: # erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py * chore: fix test case * chore: fix test case * chore: fix test case * chore: fix test case --------- Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
mergify bot
added a commit
that referenced
this pull request
Dec 18, 2023
* fix: not able to cancel SCR with Batch (#38817) (cherry picked from commit fb5090f) # Conflicts: # erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py * chore: fix test case * chore: fix test case * chore: fix test case * chore: fix test case --------- Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> (cherry picked from commit 71e833c)
rohitwaghchaure
pushed a commit
that referenced
this pull request
Dec 18, 2023
…8821) (#38829) fix: not able to cancel SCR with Batch (backport #38817) (#38821) * fix: not able to cancel SCR with Batch (#38817) (cherry picked from commit fb5090f) # Conflicts: # erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py * chore: fix test case * chore: fix test case * chore: fix test case * chore: fix test case --------- Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> (cherry picked from commit 71e833c) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Dec 20, 2023
# [14.55.0](v14.54.2...v14.55.0) (2023-12-20) ### Bug Fixes * close PO on SCO close (backport [#38667](#38667)) ([#38680](#38680)) ([22b442d](22b442d)) * **customer:** contact creation for companies ([#38055](#38055)) ([ed9b38b](ed9b38b)) * **customer:** quick form and integration fixes ([#37386](#37386)) ([6ed7c66](6ed7c66)) * error while filtering on name on reconciliation tool ([30b6321](30b6321)) * fetch exc rate of multi currency journals ([bf585de](bf585de)) * fetch item_tax_template values if fields with fetch_from exisit ([24ae45c](24ae45c)) * get customers for leaderboard ([9dfe342](9dfe342)) * get items for leaderboard ([812b301](812b301)) * get sales partner for leaderboard ([c63f873](c63f873)) * get sales person for leaderboard ([df93447](df93447)) * get suppliers for leaderboard ([7477ff3](7477ff3)) * if not budget then don't validate ([#38861](#38861)) ([d375164](d375164)) * incoming rate for sales return with Moving Average valuation method ([#38849](#38849)) ([7fdac62](7fdac62)) * incorrect limit ([#38818](#38818)) ([e18dc5c](e18dc5c)) * Init internal child table values ([d593f81](d593f81)) * item variant with manufacturer ([#38845](#38845)) ([e0c8ff1](e0c8ff1)) * not able to cancel SCR with Batch ([#38817](#38817)) ([fb5090f](fb5090f)) * not able to make inter-company po from so ([#38826](#38826)) ([23042df](23042df)) * on closed unreserved the production plan qty ([#38848](#38848)) ([2184e8e](2184e8e)) * Reset SLA on issue doesn't work (backport [#38789](#38789)) ([#38790](#38790)) ([942f34a](942f34a)) * supplier removed on selection of item (backport [#38712](#38712)) ([#38732](#38732)) ([dda95ea](dda95ea)) * timezone aware SLA banner (backport [#38745](#38745)) ([#38746](#38746)) ([73d525e](73d525e)) * **ux:** don't override Item Name and Description in MR (backport [#38720](#38720)) ([#38762](#38762)) ([f7bfbd8](f7bfbd8)) * validation error on reconciling PE to Journals as Invoice ([9836205](9836205)) * wrong currency in Stock Balance report (backport [#38778](#38778)) ([#38779](#38779)) ([e05b23c](e05b23c)) * wrong paid and cn amount on pos invoice ([77da0da](77da0da)) ### Features * **RFQ:** special properties in print preview (backport [#38725](#38725)) ([#38726](#38726)) ([2290750](2290750)) * set lead name from email ([1469ca7](1469ca7)) ### Performance Improvements * index `return_against` on delivery note (backport [#38827](#38827)) ([#38831](#38831)) ([4114760](4114760))
frappe-pr-bot
pushed a commit
that referenced
this pull request
Dec 20, 2023
# [15.7.0](v15.6.1...v15.7.0) (2023-12-20) ### Bug Fixes * asset patch failure due to missing shift_based column (backport [#38776](#38776)) ([#38777](#38777)) ([6e92c78](6e92c78)) * barcode scanning for the stock entry (backport [#38716](#38716)) ([#38718](#38718)) ([1dcb065](1dcb065)) * **demo:** Demo setup for canadian COA ([7d84441](7d84441)) * fetch exc rate of multi currency journals ([f55b561](f55b561)) * fetch item_tax_template values if fields with fetch_from exisit ([fba28d6](fba28d6)) * groups for current accounts in German CoAs ([58de991](58de991)) * homepage not working (backport [#38755](#38755)) ([#38756](#38756)) ([ad3a5b5](ad3a5b5)) * if not budget then don't validate (backport [#38861](#38861)) ([#38865](#38865)) ([5ec75fb](5ec75fb)) * incoming rate for sales return with Moving Average valuation method (backport [#38849](#38849)) (backport [#38863](#38863)) ([#38866](#38866)) ([d65be69](d65be69)) * incorrect available qty for backdated stock reco with batch (backport [#37858](#37858)) ([#38811](#38811)) ([18bd330](18bd330)) * Init internal child table values ([7802f6c](7802f6c)) * item variant with manufacturer (backport [#38845](#38845)) (backport [#38847](#38847)) ([#38851](#38851)) ([7320440](7320440)) * not able to cancel SCR with Batch (backport [#38817](#38817)) (backport [#38821](#38821)) ([#38829](#38829)) ([4bd1a5f](4bd1a5f)) * not able to make inter-company po from so (backport [#38826](#38826)) (backport [#38828](#38828)) ([#38833](#38833)) ([02ceee6](02ceee6)) * on closed unreserved the production plan qty (backport [#38848](#38848)) (backport [#38859](#38859)) ([#38862](#38862)) ([cbbc6af](cbbc6af)) * **pe:** show split alert only on splitting ([77dba48](77dba48)) * Reset SLA on issue doesn't work (backport [#38789](#38789)) ([#38791](#38791)) ([2045306](2045306)) * serial and batch bundle return not working (backport [#38754](#38754)) ([#38806](#38806)) ([8990c48](8990c48)) * set `fg-itm-qty` based on `qty` instead of the other way round in Subcontracting POs (backport [#38842](#38842)) ([#38855](#38855)) ([4e27174](4e27174)) * show bill_date and bill_no in Purchase Register ([4ed86db](4ed86db)) * skip jvs against bank accounts ([bf8a2d0](bf8a2d0)) * supplier removed on selection of item (backport [#38712](#38712)) ([#38713](#38713)) ([feb452b](feb452b)) * timezone aware SLA banner (backport [#38745](#38745)) ([#38747](#38747)) ([a551660](a551660)) * **ux:** don't override Item Name and Description in MR (backport [#38720](#38720)) ([#38763](#38763)) ([703be50](703be50)) * validation error on reconciling PE to Journals as Invoice ([aa5e16e](aa5e16e)) * wrong currency in Stock Balance report (backport [#38778](#38778)) ([#38780](#38780)) ([7fc8150](7fc8150)) * wrong paid and cn amount on pos invoice ([cff9e47](cff9e47)) ### Features * RFQ print preview ([f30bede](f30bede)) * set lead name from email ([f770621](f770621)) ### Performance Improvements * index `return_against` on delivery note (backport [#38827](#38827)) ([#38832](#38832)) ([6ad75e7](6ad75e7))
|
🎉 This PR is included in version 14.55.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.
While cancelling the Subcontracting Receipt with batch getting the below error