diff --git a/erpnext/accounts/doctype/bank_clearance/bank_clearance.py b/erpnext/accounts/doctype/bank_clearance/bank_clearance.py index 35030f5828f..36cbb321518 100644 --- a/erpnext/accounts/doctype/bank_clearance/bank_clearance.py +++ b/erpnext/accounts/doctype/bank_clearance/bank_clearance.py @@ -7,12 +7,8 @@ from frappe import _, msgprint from frappe.model.document import Document from frappe.query_builder import Case from frappe.query_builder.custom import ConstantColumn -<<<<<<< HEAD -from frappe.utils import flt, fmt_money, get_link_to_form, getdate -======= from frappe.query_builder.functions import Coalesce, Sum -from frappe.utils import cint, flt, fmt_money, getdate ->>>>>>> ef32622166 (fix(banking): include paid purchase invoices in reports and bank clearance (#52675)) +from frappe.utils import flt, fmt_money, get_link_to_form, getdate from pypika import Order import erpnext diff --git a/erpnext/desktop_icon/banking.json b/erpnext/desktop_icon/banking.json deleted file mode 100644 index 6e55cfa0d02..00000000000 --- a/erpnext/desktop_icon/banking.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "app": "erpnext", - "creation": "2025-11-12 14:51:14.307331", - "docstatus": 0, - "doctype": "Desktop Icon", - "hidden": 0, - "icon": "dollar-sign", - "icon_type": "Link", - "idx": 5, - "label": "Banking", - "link_to": "Banking", - "link_type": "Workspace Sidebar", - "modified": "2026-02-12 12:29:48.687545", - "modified_by": "Administrator", - "name": "Banking", - "owner": "Administrator", - "parent_icon": "Accounting", - "restrict_removal": 0, - "roles": [], - "standard": 1 -}