nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +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:56:15 +05:30
committed by GitHub
parent ba9f571886
commit 77b9044d8d
1 changed files with 3 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
erpnext/accounts/doctype/share_balance/share_balance.json
View File

@@ -74,14 +74,13 @@
"unique": 0 "unique": 0
}, },
{ {
<<<<<<< HEAD
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "rate", "fieldname": "rate",
"fieldtype": "Int", "fieldtype": "Currency",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
@@ -103,16 +102,7 @@
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
},
=======
"fieldname": "rate",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Rate",
"read_only": 1,
"reqd": 1
}, },
>>>>>>> 2fe5fad884 (fix(share balance): use currency field instead of int for rate and amount)
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
@@ -203,14 +193,13 @@
"unique": 0 "unique": 0
}, },
{ {
<<<<<<< HEAD
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "amount", "fieldname": "amount",
"fieldtype": "Int", "fieldtype": "Currency",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
@@ -232,16 +221,7 @@
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
},
=======
"fieldname": "amount",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Amount",
"read_only": 1,
"reqd": 1
}, },
>>>>>>> 2fe5fad884 (fix(share balance): use currency field instead of int for rate and amount)
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
@@ -333,7 +313,6 @@
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
} }
<<<<<<< HEAD
], ],
"has_web_view": 0, "has_web_view": 0,
"hide_heading": 0, "hide_heading": 0,
@@ -345,7 +324,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-01-10 18:32:36.201124", "modified": "2025-12-10 08:06:40.611761",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Share Balance", "name": "Share Balance",
@@ -361,21 +340,3 @@
"track_changes": 1, "track_changes": 1,
"track_seen": 0 "track_seen": 0
} }
=======
],
"istable": 1,
"links": [],
"modified": "2025-12-10 08:06:40.611761",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Share Balance",
"owner": "Administrator",
"permissions": [],
"quick_entry": 1,
"row_format": "Dynamic",
"sort_field": "creation",
"sort_order": "DESC",
"states": [],
"track_changes": 1
}
>>>>>>> 2fe5fad884 (fix(share balance): use currency field instead of int for rate and amount)