nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-04 14:08:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-07-15 15:04:18 +05:30
committed by GitHub
parent 9aeb08f968
commit 3100099cfa
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/doctype/delivery_note/delivery_note.py
View File

@@ -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()