nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 12:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove conflicts

Browse Source
This commit is contained in:
Nikhil Kothari
2026-03-17 11:26:28 +05:30
parent a8e7d82746
commit 427d5cf502
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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 cint, 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 cint, flt, fmt_money, 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