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

chore: resolve conflict

Browse Source
This commit is contained in:
Diptanil Saha
2025-12-10 09:52:37 +05:30
committed by GitHub
parent a299392128
commit ba9f571886
1 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
erpnext/accounts/doctype/share_balance/share_balance.py
View File

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