Fix merge mistakes
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index 8a954a6..88d1beb 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -224,20 +224,6 @@
roots.sort(compare_roots)
-def sort_root_accounts(roots):
- """Sort root types as Asset, Liability, Equity, Income, Expense"""
-
- def compare_roots(a, b):
- if a.report_type != b.report_type and a.report_type == "Balance Sheet":
- return -1
- if a.root_type != b.root_type and a.root_type == "Asset":
- return -1
- if a.root_type == "Liability" and b.root_type == "Equity":
- return -1
- return 1
-
- roots.sort(compare_roots)
-
def get_gl_entries(company, from_date, to_date, root_lft, root_rgt, ignore_closing_entries=False):
"""Returns a dict like { "account": [gl entries], ... }"""
additional_conditions = []
diff --git a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
index c6ef82f..d911975 100644
--- a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
+++ b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
@@ -7,9 +7,7 @@
from frappe.utils import flt, cint, getdate
def execute(filters=None):
- if not filters: filters = {}
-
- float_precision = cint(frappe.db.get_default("float_precision")) or 3
+ if not filters: filters = {}
float_precision = cint(frappe.db.get_default("float_precision")) or 3