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.

Sign up for GitHub

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

refactor: removed unrequired code and test for standalone delivery note serial return #30276

Merged
merged 2 commits into from
Mar 16, 2022
Merged

refactor: removed unrequired code and test for standalone delivery note serial return #30276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a82bbb4
refactor: removed unrequired code and test for standalone delivery no…
noahjacob Mar 16, 2022
b01bdf1
Merge branch 'develop' into remove_update_srs_delivery_return
ankush Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions erpnext/stock/doctype/delivery_note/delivery_note.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
from erpnext.controllers.accounts_controller import get_taxes_and_charges
from erpnext.controllers.selling_controller import SellingController
from erpnext.stock.doctype.batch.batch import set_batch_nos
from erpnext.stock.doctype.serial_no.serial_no import (
get_delivery_note_serial_no,
update_serial_nos_after_submit,
)
from erpnext.stock.doctype.serial_no.serial_no import get_delivery_note_serial_no

form_grid_templates = {
"items": "templates/form_grid/item_grid.html"
Expand Down Expand Up @@ -218,9 +215,6 @@ def on_submit(self):
# Updating stock ledger should always be called after updating prevdoc status,
# because updating reserved qty in bin depends upon updated delivered qty in SO
self.update_stock_ledger()
if self.is_return:
update_serial_nos_after_submit(self, "items")

self.make_gl_entries()
self.repost_future_sle_and_gle()

Expand Down
5 changes: 0 additions & 5 deletions erpnext/stock/doctype/delivery_note/test_delivery_note.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,11 +823,6 @@ def test_payment_terms_are_fetched_when_creating_sales_invoice(self):

automatically_fetch_payment_terms(enable=0)

def test_standalone_serial_no_return(self):
dn = create_delivery_note(item_code="_Test Serialized Item With Series", is_return=True, qty=-1)
dn.reload()
self.assertTrue(dn.items[0].serial_no)

def create_delivery_note(**args):
dn = frappe.new_doc("Delivery Note")
args = frappe._dict(args)
Expand Down