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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2025-12-09 19:51:26 +05:30
committed by GitHub
parent 422aec12cb
commit 4de1af498b
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

@@ -125,14 +125,10 @@ class DeliveryNote(SellingController):
shipping_address: DF.SmallText | None shipping_address: DF.SmallText | None
shipping_address_name: DF.Link | None shipping_address_name: DF.Link | None
shipping_rule: DF.Link | None shipping_rule: DF.Link | None
<<<<<<< HEAD
source: DF.Link | None source: DF.Link | None
status: DF.Literal["", "Draft", "To Bill", "Completed", "Return Issued", "Cancelled", "Closed"]
=======
status: DF.Literal[ status: DF.Literal[
"", "Draft", "To Bill", "Completed", "Return", "Return Issued", "Cancelled", "Closed" "", "Draft", "To Bill", "Completed", "Return", "Return Issued", "Cancelled", "Closed"
] ]
>>>>>>> dec67eecad (fix: add return status for delivery note)
tax_category: DF.Link | None tax_category: DF.Link | None
tax_id: DF.Data | None tax_id: DF.Data | None
taxes: DF.Table[SalesTaxesandCharges] taxes: DF.Table[SalesTaxesandCharges]