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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-08-26 15:30:53 +05:30
parent 18a75fef9a
commit e6438b293d
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,12 +6,7 @@ import frappe
from frappe import _, msgprint from frappe import _, msgprint
from frappe.model.document import Document from frappe.model.document import Document
from frappe.query_builder.custom import ConstantColumn from frappe.query_builder.custom import ConstantColumn
<<<<<<< HEAD
from frappe.utils import flt, fmt_money, getdate
=======
from frappe.utils import flt, fmt_money, get_link_to_form, getdate from frappe.utils import flt, fmt_money, get_link_to_form, getdate
from pypika import Order
>>>>>>> 092411b54f (refactor: better err msg on clearance tool)
import erpnext import erpnext