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

chore: resolve conflicts

Browse Source
This commit is contained in:
Nikhil Kothari
2026-03-17 11:28:37 +05:30
parent ab9d960aa8
commit a85aeb2f9b
2 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/bank_clearance/bank_clearance.py
View File

@@ -7,12 +7,8 @@ from frappe import _, msgprint
from frappe.model.document import Document from frappe.model.document import Document
from frappe.query_builder import Case from frappe.query_builder import Case
from frappe.query_builder.custom import ConstantColumn 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.query_builder.functions import Coalesce, Sum
from frappe.utils import cint, flt, fmt_money, getdate from frappe.utils import flt, fmt_money, get_link_to_form, getdate
>>>>>>> ef32622166 (fix(banking): include paid purchase invoices in reports and bank clearance (#52675))
from pypika import Order from pypika import Order
import erpnext import erpnext

21
erpnext/desktop_icon/banking.json
View File

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