Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge mistakes

Browse Source
This commit is contained in:
Pratik Vyas 2015-05-19 13:08:54 +05:30
parent 1a84d8ecd2
commit 803e998e9d
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/accounts/report/financial_statements.py
View File

@ -224,20 +224,6 @@ def sort_root_accounts(roots):
roots.sort(compare_roots) 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): def get_gl_entries(company, from_date, to_date, root_lft, root_rgt, ignore_closing_entries=False):
"""Returns a dict like { "account": [gl entries], ... }""" """Returns a dict like { "account": [gl entries], ... }"""
additional_conditions = [] additional_conditions = []

4
erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
View File

@ -7,9 +7,7 @@ from frappe import _
from frappe.utils import flt, cint, getdate from frappe.utils import flt, cint, getdate
def execute(filters=None): def execute(filters=None):
if not filters: filters = {} if not filters: filters = {}
float_precision = cint(frappe.db.get_default("float_precision")) or 3
float_precision = cint(frappe.db.get_default("float_precision")) or 3 float_precision = cint(frappe.db.get_default("float_precision")) or 3