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: serial and batch bundle return not working #38754

Merged

Conversation

rohitwaghchaure
Copy link
Collaborator

@rohitwaghchaure rohitwaghchaure commented Dec 14, 2023

Issue

While creating the delivery note returned against the old delivery note which don't have serial and batch bundle, system throw the "Serial No is mandatory" error.

Also while cancelling the old stock transaction system throwing an error "Serial No / Batch No are mandatory"

Fixed #38796

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Dec 14, 2023
@rohitwaghchaure rohitwaghchaure marked this pull request as draft December 14, 2023 16:14
Copy link

codecov bot commented Dec 14, 2023

Codecov Report

Merging #38754 (714937e) into develop (f53ba17) will increase coverage by 0.11%.
Report is 58 commits behind head on develop.
The diff coverage is 84.71%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #38754      +/-   ##
===========================================
+ Coverage    60.07%   60.18%   +0.11%     
===========================================
  Files          759      759              
  Lines        69553    69759     +206     
===========================================
+ Hits         41785    41987     +202     
- Misses       27768    27772       +4     
Files Coverage Δ
erpnext/controllers/selling_controller.py 79.94% <ø> (ø)
erpnext/controllers/stock_controller.py 81.73% <100.00%> (+0.13%) ⬆️
erpnext/crm/doctype/lead/lead.py 57.65% <100.00%> (+0.45%) ⬆️
erpnext/setup/install.py 23.21% <ø> (+0.20%) ⬆️
...k/doctype/stock_ledger_entry/stock_ledger_entry.py 69.72% <100.00%> (+0.33%) ⬆️
erpnext/stock/doctype/serial_no/serial_no.py 39.15% <0.00%> (+1.44%) ⬆️
...serial_and_batch_bundle/serial_and_batch_bundle.py 71.78% <89.28%> (+1.09%) ⬆️
erpnext/stock/serial_batch_bundle.py 86.48% <73.91%> (-0.95%) ⬇️
erpnext/controllers/sales_and_purchase_return.py 90.60% <84.50%> (+3.38%) ⬆️

... and 19 files with indirect coverage changes

@rohitwaghchaure rohitwaghchaure force-pushed the fixed-serial-batch-return-issue branch 2 times, most recently from d77a8c0 to edb0d30 Compare December 16, 2023 11:51
@rohitwaghchaure rohitwaghchaure marked this pull request as ready for review December 16, 2023 15:41
@rohitwaghchaure rohitwaghchaure force-pushed the fixed-serial-batch-return-issue branch from edb0d30 to 8a56bb3 Compare December 16, 2023 15:42
@rohitwaghchaure rohitwaghchaure removed the needs-tests This PR needs automated unit-tests. label Dec 16, 2023
@rohitwaghchaure rohitwaghchaure force-pushed the fixed-serial-batch-return-issue branch 2 times, most recently from 6787c60 to b662061 Compare December 17, 2023 05:32
@rohitwaghchaure rohitwaghchaure force-pushed the fixed-serial-batch-return-issue branch from b662061 to 714937e Compare December 17, 2023 06:50
@rohitwaghchaure rohitwaghchaure merged commit 0743289 into frappe:develop Dec 17, 2023
13 checks passed
mergify bot pushed a commit that referenced this pull request Dec 17, 2023
* fix: serial and batch bundle return not working

* test: added test case for delivery note return against denormalized serial no

(cherry picked from commit 0743289)
rohitwaghchaure added a commit that referenced this pull request Dec 17, 2023
* fix: serial and batch bundle return not working

* test: added test case for delivery note return against denormalized serial no

(cherry picked from commit 0743289)
rohitwaghchaure added a commit that referenced this pull request Dec 17, 2023
…8806)

fix: serial and batch bundle return not working (#38754)

* fix: serial and batch bundle return not working

* test: added test case for delivery note return against denormalized serial no

(cherry picked from commit 0743289)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
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))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

v15 Serial and Batch Bundle - Stock Reconciliation broken for old stock?
1 participant