From 3100099cfad1c6ad44b935a27d629329e45ac4ff Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 15 Jul 2025 15:04:18 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/doctype/delivery_note/delivery_note.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index 605cf2edb85..8aeb56e5d7c 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -466,12 +466,8 @@ class DeliveryNote(SellingController): self.make_bundle_for_sales_purchase_return(table_name) self.make_bundle_using_old_serial_batch_fields(table_name) -<<<<<<< HEAD -======= self.validate_standalone_serial_nos_customer() - self.update_stock_reservation_entries() ->>>>>>> e073075834 (fix: system was allowing credit notes with serial numbers for any customer) # 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()