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

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-11-14 12:35:41 +05:30
parent ba79560c0c
commit 9598b1fc0f
3 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/general_ledger.py
View File

@@ -7,12 +7,7 @@ import copy
import frappe
from frappe import _
from frappe.model.meta import get_field_precision
<<<<<<< HEAD
from frappe.utils import cint, flt, formatdate, getdate, now
=======
from frappe.utils import cint, flt, formatdate, get_link_to_form, getdate, now
from frappe.utils.dashboard import cache_source
>>>>>>> 88e68168e3 (refactor: use separate round off for opening entries)
import erpnext
from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (