From ba9f571886a631e0691366ddb115a6e1706d12c3 Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Wed, 10 Dec 2025 09:52:37 +0530 Subject: [PATCH] chore: resolve conflict --- .../doctype/share_balance/share_balance.py | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/erpnext/accounts/doctype/share_balance/share_balance.py b/erpnext/accounts/doctype/share_balance/share_balance.py index 4a768caaa23..4c9ec439eed 100644 --- a/erpnext/accounts/doctype/share_balance/share_balance.py +++ b/erpnext/accounts/doctype/share_balance/share_balance.py @@ -6,28 +6,4 @@ from frappe.model.document import Document class ShareBalance(Document): -<<<<<<< HEAD -======= - # begin: auto-generated types - # This code is auto-generated. Do not modify anything in this block. - - from typing import TYPE_CHECKING - - if TYPE_CHECKING: - from frappe.types import DF - - amount: DF.Currency - current_state: DF.Literal["", "Issued", "Purchased"] - from_no: DF.Int - is_company: DF.Check - no_of_shares: DF.Int - parent: DF.Data - parentfield: DF.Data - parenttype: DF.Data - rate: DF.Currency - share_type: DF.Link - to_no: DF.Int - # end: auto-generated types - ->>>>>>> 2fe5fad884 (fix(share balance): use currency field instead of int for rate and amount) pass