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

chore: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2024-05-16 20:27:50 +05:30
parent 32c935bc30
commit 983c55eca1
1 changed files with 0 additions and 5 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 import frappe
from frappe import _ from frappe import _
from frappe.model.meta import get_field_precision from frappe.model.meta import get_field_precision
<<<<<<< HEAD
from frappe.utils import cint, cstr, flt, formatdate, getdate, now from frappe.utils import cint, cstr, flt, formatdate, getdate, now
=======
from frappe.utils import cint, flt, formatdate, getdate, now
from frappe.utils.dashboard import cache_source
>>>>>>> d56f52b0ba (feat: Config to enable immutable ledger)
import erpnext import erpnext
from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import ( from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (