From 4de1af498bbe046a78a6858c81e4e8b96dbcc1d7 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 9 Dec 2025 19:51:26 +0530 Subject: [PATCH] chore: resolve 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 9bfef8a81a4..f2c6be169be 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -125,14 +125,10 @@ class DeliveryNote(SellingController): shipping_address: DF.SmallText | None shipping_address_name: DF.Link | None shipping_rule: DF.Link | None -<<<<<<< HEAD source: DF.Link | None - status: DF.Literal["", "Draft", "To Bill", "Completed", "Return Issued", "Cancelled", "Closed"] -======= status: DF.Literal[ "", "Draft", "To Bill", "Completed", "Return", "Return Issued", "Cancelled", "Closed" ] ->>>>>>> dec67eecad (fix: add return status for delivery note) tax_category: DF.Link | None tax_id: DF.Data | None taxes: DF.Table[SalesTaxesandCharges]