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

chore: resolve conflicts

Browse Source
This commit is contained in:
Gursheen Kaur Anand
2023-11-24 15:30:19 +05:30
committed by GitHub
parent b0aa4efd3d
commit aea169d4d4
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/utils.py
View File

@@ -179,11 +179,7 @@ def get_balance_on(
in_account_currency=True, in_account_currency=True,
cost_center=None, cost_center=None,
ignore_account_permission=False, ignore_account_permission=False,
<<<<<<< HEAD
=======
account_type=None,
start_date=None, start_date=None,
>>>>>>> 52305e3000 (fix: annual income and expenses in digest)
): ):
if not account and frappe.form_dict.get("account"): if not account and frappe.form_dict.get("account"):
account = frappe.form_dict.get("account") account = frappe.form_dict.get("account")